Get rid of compilation warnings. Part I.

[modules/shaper.git] / src / ModuleBase / ModuleBase_Preferences.cpp

diff --git a/src/ModuleBase/ModuleBase_Preferences.cpp b/src/ModuleBase/ModuleBase_Preferences.cpp
index 68e275d213504e78b2adf87a9fdbfe3bdc53328f..e07a3119b7f76bddac3062752f67b185d9d1c425 100644 (file)
--- 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,25 +168,32 @@ 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;
-        if (aProp->type() == Config_Prop::Directory) {
+        switch (aProp->type()) {
+        case Config_Prop::Directory:
           aPrefType = SUIT_PreferenceMgr::File;
-        } else {
+          break;
+        case Config_Prop::Cursor:
+          aPrefType = SUIT_PreferenceMgr::Selector;
+          break;
+        default:
           aPrefType = (SUIT_PreferenceMgr::PrefItemType) aProp->type();
         }
+
         int anId = thePref->addPreference(QObject::tr(aProp->title().c_str()), aTab, aPrefType,
                                           QString::fromStdString(aProp->section()),
                                           QString::fromStdString(aProp->name()));
-        if(aProp->type() == Config_Prop::Directory) {
+
+        switch (aProp->type()) {
+        case Config_Prop::Directory:
           thePref->setItemProperty("path_type", Qtx::PT_Directory, anId);
-        }
-        if (aPrefType == SUIT_PreferenceMgr::DblSpin) {
+          break;
+        case SUIT_PreferenceMgr::DblSpin:
           if (aProp->min() != "") {
             double aMin = QString(aProp->min().c_str()).toDouble();
             thePref->setItemProperty("min", aMin, anId);
@@ -196,8 +202,8 @@ void ModuleBase_Preferences::createCustomPage(ModuleBase_IPrefMgr* thePref, int
             double aMax = QString(aProp->max().c_str()).toDouble();
             thePref->setItemProperty("max", aMax, anId);
           }
-        }
-        if (aPrefType == SUIT_PreferenceMgr::IntSpin) {
+          break;
+        case SUIT_PreferenceMgr::IntSpin:
           if (aProp->min() != "") {
             int aMin = QString(aProp->min().c_str()).toInt();
             thePref->setItemProperty("min", aMin, anId);
@@ -206,6 +212,22 @@ void ModuleBase_Preferences::createCustomPage(ModuleBase_IPrefMgr* thePref, int
             int aMax = QString(aProp->max().c_str()).toInt();
             thePref->setItemProperty("max", aMax, anId);
           }
+          break;
+        case Config_Prop::Cursor:
+          {
+            QList<QVariant> aIndicesList;
+            QList<QVariant> aIconsList;
+            aIndicesList << 0 << 1 << 2;
+            aIconsList << QPixmap(":pictures/ArrowCursor.png") <<
+              QPixmap(":pictures/CrossCursor.png") <<
+              QPixmap(":pictures/HandCursor.png");
+
+            thePref->setItemProperty("indexes", aIndicesList, anId);
+            thePref->setItemProperty("icons", aIconsList, anId);
+          }
+          break;
+        default: // [to avoid compilation warnings]
+          break;
         }
       }
     }
@@ -245,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"));
@@ -273,7 +296,6 @@ ModuleBase_PreferencesDlg::ModuleBase_PreferencesDlg(SUIT_ResourceMgr* theResurc
   createEditors();
 
   myPreferences->retrieve();
-  setMinimumSize(820, 300);
 }
 
 ModuleBase_PreferencesDlg::~ModuleBase_PreferencesDlg()
@@ -436,6 +458,12 @@ void ModuleBase_PreferencesDlg::onDefault()
   ModuleBase_Preferences::resetConfigPropPreferences(myPreferences);
 }
 
+void ModuleBase_PreferencesDlg::showEvent(QShowEvent* theEvent)
+{
+  QDialog::showEvent(theEvent);
+  adjustSize();
+}
+
 //**********************************************************
 //**********************************************************
 //**********************************************************