X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModuleBase%2FModuleBase_Preferences.cpp;h=e07a3119b7f76bddac3062752f67b185d9d1c425;hb=db0bda841e8d70e188a800f3a662d259246d4a20;hp=4d5f2a1c50d0f84b5912425809543a06540c30e5;hpb=5cd9804b0680fcf9c89c4265964679e36c015773;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_Preferences.cpp b/src/ModuleBase/ModuleBase_Preferences.cpp
index 4d5f2a1c5..e07a3119b 100644
--- a/src/ModuleBase/ModuleBase_Preferences.cpp
+++ b/src/ModuleBase/ModuleBase_Preferences.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2020  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -153,7 +153,6 @@ void ModuleBase_Preferences::resetConfigPropPreferences(SUIT_PreferenceMgr* theP
 void ModuleBase_Preferences::createCustomPage(ModuleBase_IPrefMgr* thePref, int thePageId)
 {
   SUIT_ResourceMgr* aResMgr = ModuleBase_Preferences::resourceMgr();
-  bool isResModified = false;
 
   // Make a Tab from each section
   std::list<std::string> aSections = Config_PropManager::getSections();
@@ -169,10 +168,9 @@ void ModuleBase_Preferences::createCustomPage(ModuleBase_IPrefMgr* thePref, int
       // check that the property is defined
       QString aSection(aProp->section().c_str());
       QString aName(aProp->name().c_str());
-      if (!aResMgr->hasValue(aSection, aName)) {
+      if (!aResMgr->hasValue(aSection, aName))
         aResMgr->setValue(aSection, aName, QString(aProp->value().c_str()));
-        isResModified = true;
-      }
+
       // Add item
       if (aProp->type() != Config_Prop::Disabled) {
         SUIT_PreferenceMgr::PrefItemType aPrefType = SUIT_PreferenceMgr::Auto;
@@ -228,6 +226,8 @@ void ModuleBase_Preferences::createCustomPage(ModuleBase_IPrefMgr* thePref, int
             thePref->setItemProperty("icons", aIconsList, anId);
           }
           break;
+        default: // [to avoid compilation warnings]
+          break;
         }
       }
     }
@@ -267,7 +267,8 @@ private:
 //**********************************************************
 ModuleBase_PreferencesDlg::ModuleBase_PreferencesDlg(SUIT_ResourceMgr* theResurces,
   QWidget* theParent)
-    : QDialog(theParent),
+    : QDialog(theParent,
+      Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint),
       myIsChanged(false)
 {
   setWindowTitle(tr("Edit preferences"));
@@ -295,7 +296,6 @@ ModuleBase_PreferencesDlg::ModuleBase_PreferencesDlg(SUIT_ResourceMgr* theResurc
   createEditors();
 
   myPreferences->retrieve();
-  setMinimumSize(820, 300);
 }
 
 ModuleBase_PreferencesDlg::~ModuleBase_PreferencesDlg()
@@ -458,6 +458,12 @@ void ModuleBase_PreferencesDlg::onDefault()
   ModuleBase_Preferences::resetConfigPropPreferences(myPreferences);
 }
 
+void ModuleBase_PreferencesDlg::showEvent(QShowEvent* theEvent)
+{
+  QDialog::showEvent(theEvent);
+  adjustSize();
+}
+
 //**********************************************************
 //**********************************************************
 //**********************************************************