X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_PagedContainer.cpp;h=9f32442a577901139b5a810492c2828dc1195cd1;hb=ced1c42d80f02b1efa749ecdf35e620dcca4d9cc;hp=b4e8b5690604a1e99bf607ec79cbb0a8b704d06d;hpb=368eb86f8835d384a102ad84410a6c825c597a8c;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_PagedContainer.cpp b/src/ModuleBase/ModuleBase_PagedContainer.cpp index b4e8b5690..9f32442a5 100644 --- a/src/ModuleBase/ModuleBase_PagedContainer.cpp +++ b/src/ModuleBase/ModuleBase_PagedContainer.cpp @@ -22,6 +22,9 @@ ModuleBase_PagedContainer::ModuleBase_PagedContainer(QWidget* theParent, const C : ModuleBase_ModelWidget(theParent, theData, theParentId), myIsFocusOnCurrentPage(false) { + // it is not obligatory to be ignored when property panel tries to activate next active widget + // but if focus is moved to this control, it can accept it. + myIsObligatory = false; } ModuleBase_PagedContainer::~ModuleBase_PagedContainer() @@ -29,7 +32,8 @@ ModuleBase_PagedContainer::~ModuleBase_PagedContainer() } int ModuleBase_PagedContainer::addPage(ModuleBase_PageBase* thePage, - const QString& theName, const QString& theCaseId) + const QString& theName, const QString& theCaseId, + const QPixmap& theIcon ) { if (!myPages.count()) { setDefaultValue(theCaseId.toStdString()); @@ -69,7 +73,7 @@ void ModuleBase_PagedContainer::enableFocusProcessing() myIsFocusOnCurrentPage = true; } -bool ModuleBase_PagedContainer::restoreValue() +bool ModuleBase_PagedContainer::restoreValueCustom() { // A rare case when plugin was not loaded. if(!myFeature)