unclutter user settings declarations

apps/opencs/model/settings/setting.cpp

@@ -3,7 +3,7 @@
 
 CSMSettings::Setting::Setting(SettingType typ, const QString &settingName,
                              const QString &pageName)
-    : mIsEditorSetting (false)
+    : mIsEditorSetting (true)
 {
     buildDefaultSetting();
 
@@ -290,14 +290,16 @@ CSMSettings::SettingType CSMSettings::Setting::type() const
                                         Property_SettingType).at(0).toInt());
 }
 
-void CSMSettings::Setting::setMaximum (int value)
+void CSMSettings::Setting::setRange (int min, int max)
 {
-    setProperty (Property_Maximum, value);
+    setProperty (Property_Minimum, min);
+    setProperty (Property_Maximum, max);
 }
 
-void CSMSettings::Setting::setMaximum (double value)
+void CSMSettings::Setting::setRange (double min, double max)
 {
-    setProperty (Property_Maximum, value);
+    setProperty (Property_Minimum, min);
+    setProperty (Property_Maximum, max);
 }
 
 QString CSMSettings::Setting::maximum() const
@@ -305,16 +307,6 @@ QString CSMSettings::Setting::maximum() const
     return property (Property_Maximum).at(0);
 }
 
-void CSMSettings::Setting::setMinimum (int value)
-{
-    setProperty (Property_Minimum, value);
-}
-
-void CSMSettings::Setting::setMinimum (double value)
-{
-    setProperty (Property_Minimum, value);
-}
-
 QString CSMSettings::Setting::minimum() const
 {
     return property (Property_Minimum).at(0);

apps/opencs/model/settings/setting.hpp

@@ -66,12 +66,11 @@ namespace CSMSettings
         void setMask (const QString &value);
         QString mask() const;
 
-        void setMaximum (int value);
+        void setRange (int min, int max);
-        void setMaximum (double value);
+        void setRange (double min, double max);
+
         QString maximum() const;
 
-        void setMinimum (int value);
-        void setMinimum (double value);
         QString minimum() const;
 
         void setName (const QString &value);

apps/opencs/model/settings/usersettings.cpp

@@ -54,86 +54,41 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
     {
         Setting *numLights = createSetting (Type_SpinBox, section, "num_lights");
         numLights->setDefaultValue(8);
-        numLights->setEditorSetting(true);
+        numLights->setRange (0, 100);
-        numLights->setColumnSpan (1);
-        numLights->setMinimum (0);
-        numLights->setMaximum (100); // FIXME: not sure what the max value should be
-        numLights->setWidgetWidth (10);
-        numLights->setViewLocation(1, 2);
 
         Setting *shaders = createSetting (Type_CheckBox, section, "shaders");
-        shaders->setDeclaredValues(QStringList() << "true" << "false");
         shaders->setDefaultValue("true");
-        shaders->setEditorSetting(true);
         shaders->setSpecialValueText("Enable Shaders");
-        shaders->setWidgetWidth(25);
-        shaders->setColumnSpan (3);
-        shaders->setStyleSheet ("QGroupBox { border: 0px; }");
-        shaders->setViewLocation(2, 1);
     }
 
     section = "Scene";
     {
         Setting *fastFactor = createSetting (Type_SpinBox, section, "fast factor");
         fastFactor->setDefaultValue(4);
-        fastFactor->setEditorSetting(true);
+        fastFactor->setRange (1, 100);
-        fastFactor->setColumnSpan (1);
-        fastFactor->setMinimum (1);
-        fastFactor->setSpecialValueText ("1"); // FIXME: workaround
-        fastFactor->setMaximum (100); // FIXME: not sure what the max value should be
-        fastFactor->setWidgetWidth (10);
-        fastFactor->setViewLocation(1, 2);
 
         Setting *farClipDist = createSetting (Type_DoubleSpinBox, section, "far clip distance");
         farClipDist->setDefaultValue(300000);
-        farClipDist->setEditorSetting(true);
+        farClipDist->setRange (0, 1000000);
-        farClipDist->setColumnSpan (1);
-        farClipDist->setMinimum (0);
-        farClipDist->setMaximum (1000000); // FIXME: not sure what the max value should be
-        farClipDist->setWidgetWidth (10);
-        farClipDist->setViewLocation(2, 2);
 
         Setting *timerStart = createSetting (Type_SpinBox, section, "timer start");
         timerStart->setDefaultValue(20);
-        timerStart->setEditorSetting(true);
+        timerStart->setRange (1, 100);
-        timerStart->setColumnSpan (1);
-        timerStart->setMinimum (0);
-        timerStart->setMaximum (100); // FIXME: not sure what the max value should be
-        timerStart->setWidgetWidth (10);
-        timerStart->setViewLocation(3, 2);
     }
 
     section = "SubView";
     {
         Setting *maxSubView = createSetting (Type_SpinBox, section, "max subviews");
         maxSubView->setDefaultValue(256);
-        maxSubView->setEditorSetting(true);
+        maxSubView->setRange (1, 256);
-        maxSubView->setColumnSpan (1);
-        maxSubView->setMinimum (1);
-        maxSubView->setSpecialValueText ("1");
-        maxSubView->setMaximum (256); // FIXME: not sure what the max value should be
-        maxSubView->setWidgetWidth (10);
-        maxSubView->setViewLocation(1, 2);
 
         Setting *minWidth = createSetting (Type_SpinBox, section, "minimum width");
         minWidth->setDefaultValue(325);
-        minWidth->setEditorSetting(true);
+        minWidth->setRange (50, 10000);
-        minWidth->setColumnSpan (1);
-        minWidth->setMinimum (50);
-        minWidth->setSpecialValueText ("50");
-        minWidth->setMaximum (10000); // FIXME: not sure what the max value should be
-        minWidth->setWidgetWidth (10);
-        minWidth->setViewLocation(2, 2);
 
         Setting *reuse = createSetting (Type_CheckBox, section, "reuse");
-        reuse->setDeclaredValues(QStringList() << "true" << "false");
         reuse->setDefaultValue("true");
-        reuse->setEditorSetting(true);
         reuse->setSpecialValueText("Reuse SubView");
-        reuse->setWidgetWidth(25);
-        reuse->setColumnSpan (3);
-        reuse->setStyleSheet ("QGroupBox { border: 0px; }");
-        reuse->setViewLocation(3, 2);
     }
 
     section = "Window Size";
@@ -141,15 +96,9 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
         Setting *width = createSetting (Type_LineEdit, section, "Width");
         Setting *height = createSetting (Type_LineEdit, section, "Height");
 
-        width->setWidgetWidth (5);
-        height->setWidgetWidth (8);
-
         width->setDefaultValues (QStringList() << "1024");
         height->setDefaultValues (QStringList() << "768");
 
-        width->setEditorSetting (true);
-        height->setEditorSetting (true);
-
         height->setViewLocation (2,2);
         width->setViewLocation (2,1);
 
@@ -159,11 +108,12 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
         Setting *preDefined = createSetting (Type_ComboBox, section,
                                              "Pre-Defined");
 
+        preDefined->setEditorSetting (false);
+
         preDefined->setDeclaredValues (QStringList() << "640 x 480"
                                 << "800 x 600" << "1024 x 768" << "1440 x 900");
 
         preDefined->setViewLocation (1, 1);
-        preDefined->setWidgetWidth (10);
         preDefined->setColumnSpan (2);
 
         preDefined->addProxy (width,
@@ -190,9 +140,6 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
 
         rsd->setDeclaredValues (values);
         ritd->setDeclaredValues (values);
-
-        rsd->setEditorSetting (true);
-        ritd->setEditorSetting (true);
     }
 
     section = "Video";
@@ -202,8 +149,6 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
                         << defaultValue << "MSAA 2" << "MSAA 4" << "MSAA 8" << "MSAA 16";
         Setting *antialiasing = createSetting (Type_SpinBox, section, "antialiasing");
         antialiasing->setDeclaredValues (values);
-        antialiasing->setEditorSetting (true);
-        antialiasing->setWidgetWidth(15);
     }
 
     section = "Proxy Selection Test";
@@ -545,7 +490,7 @@ CSMSettings::SettingPageMap CSMSettings::UserSettings::settingPageMap() const
 }
 
 CSMSettings::Setting *CSMSettings::UserSettings::createSetting
-        (CSMSettings::SettingType typ, const QString &page, const QString &name)
+        (CSMSettings::SettingType type, const QString &page, const QString &name)
 {
     //get list of all settings for the current setting name
     if (findSetting (page, name))
@@ -555,8 +500,40 @@ CSMSettings::Setting *CSMSettings::UserSettings::createSetting
         return 0;
     }
 
-    Setting *setting = new Setting (typ, name, page);
+    Setting *setting = new Setting (type, name, page);
 
+    // set useful defaults
+    int row = 1;
+
+    if (!mSettings.empty())
+        row = mSettings.back()->viewRow()+1;
+
+    int column = 2;
+
+    if (type==Type_CheckBox)
+        column = 1;
+
+    setting->setViewLocation (row, column);
+
+    int span = 1;
+
+    if (type==Type_CheckBox)
+        span = 3;
+
+    setting->setColumnSpan (span);
+
+    int width = 10;
+
+    if (type==Type_CheckBox)
+        width = 40;
+
+    setting->setWidgetWidth (width);
+
+    if (type==Type_CheckBox)
+        setting->setStyleSheet ("QGroupBox { border: 0px; }");
+
+    if (type==Type_CheckBox)
+        setting->setDeclaredValues(QStringList() << "true" << "false");
 
     //add declaration to the model
     mSettings.append (setting);