Code cleanup and revert incorrect settings.

apps/opencs/editor.cpp

@@ -314,7 +314,14 @@ std::auto_ptr<sh::Factory> CS::Editor::setupGraphics()
 
     factory->loadAllFiles();
 
-    std::string fog("true"); // default if setting does not exist
+    bool shaders = true; // default if setting does not exist
+    if(mUserSettings.hasSettingDefinitions("Objects/shaders"))
+        shaders = mUserSettings.settingValue("Objects/shaders").toStdString() == "true" ? true : false;
+    else
+        mUserSettings.setDefinitions("Objects/shaders", (QStringList() << QString(shaders ? "true" : "false")));
+    sh::Factory::getInstance ().setShadersEnabled (shaders);
+
+    std::string fog("true");
     if(mUserSettings.hasSettingDefinitions("Shader/fog"))
         fog = mUserSettings.settingValue("Shader/fog").toStdString();
     else
@@ -323,7 +330,7 @@ std::auto_ptr<sh::Factory> CS::Editor::setupGraphics()
 
     std::string shadows("false");
     if(mUserSettings.hasSettingDefinitions("Shader/shadows"))
-        shadows = mUserSettings.settingValue("Shader/shadows").toStdString();
+        shadows = shaders? mUserSettings.settingValue("Shader/shadows").toStdString() : "false";
     else
         mUserSettings.setDefinitions("Shader/shadows", (QStringList() << QString(shadows.c_str())));
     sh::Factory::getInstance().setGlobalSetting ("shadows", shadows);
@@ -347,7 +354,7 @@ std::auto_ptr<sh::Factory> CS::Editor::setupGraphics()
     sh::Factory::getInstance ().setGlobalSetting ("viewproj_fix", "false");
 
     sh::Factory::getInstance ().setGlobalSetting ("num_lights",
-        mUserSettings.settingValue("shader/num_lights").toStdString());
+        mUserSettings.settingValue("Objects/num_lights").toStdString());
 
     /// \todo add more configurable shiny settings
 

apps/opencs/model/settings/usersettings.cpp

@@ -55,7 +55,7 @@ void UserSettings::buildSettingModelDefaults()
 {
     QString page;
 
-    page = "Shader";
+    page = "Objects";
     {
         QString section = "Group1";
 
@@ -66,96 +66,17 @@ void UserSettings::buildSettingModelDefaults()
         numLights->setMinimum (0);
         numLights->setMaximum (100); // FIXME: not sure what the max value should be
         numLights->setWidgetWidth (10);
-        numLights->setSpecialValueText ("Nothing!"); // text to display when value is 0
         numLights->setViewLocation(1, 2);
-        Setting *nlText = createSetting (Type_Undefined, page, "nlText");
-        nlText->setSpecialValueText("Num Lights"); // hack to place text labels
-        nlText->setEditorSetting(false);
-        nlText->setSerializable (false);
-        nlText->setColumnSpan (1);
-        nlText->setWidgetWidth (10);
-        nlText->setViewLocation(1, 1);
-
-
-        Setting *simpleWater = createSetting (Type_CheckBox, page, "simple_water");
-        simpleWater->setDeclaredValues(QStringList() << "true" << "false");
-        simpleWater->setDefaultValue("false");
-        simpleWater->setEditorSetting(true);
-        simpleWater->setSpecialValueText("Enable Simple Water");
-        simpleWater->setWidgetWidth(25);
-        simpleWater->setColumnSpan (3);
-        simpleWater->setStyleSheet ("QGroupBox { border: 0px; }");
-        simpleWater->setViewLocation(1, 5);
-
-        Setting *waterEnabled = createSetting (Type_DoubleSpinBox, page, "waterEnabled");
-        waterEnabled->setDefaultValue(0.00);
-        waterEnabled->setEditorSetting(true);
-        waterEnabled->setColumnSpan (1);
-        waterEnabled->setMinimum (0);
-        waterEnabled->setMaximum (100.00); // FIXME: not sure what the max value should be
-        waterEnabled->setWidgetWidth (10);
-        waterEnabled->setViewLocation(2, 6);
-        Setting *weText = createSetting (Type_Undefined, page, "weText");
-        weText->setSpecialValueText("Water Enabled");
-        weText->setEditorSetting(false);
-        weText->setSerializable (false);
-        weText->setColumnSpan (1);
-        weText->setWidgetWidth (10);
-        weText->setViewLocation(2, 5);
-
-        Setting *waterLevel = createSetting (Type_DoubleSpinBox, page, "waterLevel");
-        waterLevel->setDefaultValue(0.00);
-        waterLevel->setEditorSetting(true);
-        waterLevel->setColumnSpan (1);
-        waterLevel->setMinimum (0);
-        waterLevel->setMaximum (100.00); // FIXME: not sure what the max value should be
-        waterLevel->setWidgetWidth (10);
-        waterLevel->setViewLocation(3, 6);
-        Setting *wlText = createSetting (Type_Undefined, page, "wlText");
-        wlText->setSpecialValueText("Water Level");
-        wlText->setEditorSetting(false);
-        wlText->setSerializable (false);
-        wlText->setColumnSpan (1);
-        wlText->setWidgetWidth (10);
-        wlText->setViewLocation(3, 5);
-
-        Setting *waterTimer = createSetting (Type_DoubleSpinBox, page, "waterTimer");
-        waterTimer->setDefaultValue(0.00);
-        waterTimer->setEditorSetting(true);
-        waterTimer->setColumnSpan (1);
-        waterTimer->setMinimum (0);
-        waterTimer->setMaximum (100.00); // FIXME: not sure what the max value should be
-        waterTimer->setWidgetWidth (10);
-        waterTimer->setViewLocation(4, 6);
-        Setting *wtText = createSetting (Type_Undefined, page, "wtText");
-        wtText->setSpecialValueText("Water Timer");
-        wtText->setEditorSetting(false);
-        wtText->setSerializable (false);
-        wtText->setColumnSpan (1);
-        wtText->setWidgetWidth (10);
-        wtText->setViewLocation(4, 5);
-
-
-        Setting *spaceText = createSetting (Type_Undefined, page, "spaceText");
-        spaceText->setSpecialValueText(" ");
-        spaceText->setEditorSetting(false);
-        spaceText->setSerializable (false);
-        spaceText->setColumnSpan (1);
-        spaceText->setWidgetWidth (5);
-        spaceText->setViewLocation(3, 4);
-        Setting *spaceText2 = createSetting (Type_Undefined, page, "spaceText2");
-        spaceText2->setSpecialValueText(" ");
-        spaceText2->setEditorSetting(false);
-        spaceText2->setSerializable (false);
-        spaceText2->setColumnSpan (1);
-        spaceText2->setWidgetWidth (5);
-        spaceText2->setViewLocation(3, 7);
 
-#if 0
-sh::Factory::getInstance ().setSharedParameter ("windDir_windSpeed", sh::makeProperty<sh::Vector3>(new sh::Vector3(0.5, -0.8, 0.2)));
-sh::Factory::getInstance ().setSharedParameter ("waterSunFade_sunHeight", sh::makeProperty<sh::Vector2>(new sh::Vector2(1, 0.6)));
-sh::Factory::getInstance ().setSharedParameter ("vpRow2Fix", sh::makeProperty<sh::Vector4> (new sh::Vector4(0,0,0,0)));
-#endif
+        Setting *shaders = createSetting (Type_CheckBox, page, "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);
     }
 
     page = "Scene";
@@ -171,13 +92,6 @@ sh::Factory::getInstance ().setSharedParameter ("vpRow2Fix", sh::makeProperty<sh
         fastFactor->setMaximum (100); // FIXME: not sure what the max value should be
         fastFactor->setWidgetWidth (10);
         fastFactor->setViewLocation(1, 2);
-        Setting *ffText = createSetting (Type_Undefined, page, "ffText");
-        ffText->setSpecialValueText("Fast Factor"); // hack to place text labels
-        ffText->setEditorSetting(false);
-        ffText->setSerializable (false);
-        ffText->setColumnSpan (1);
-        ffText->setWidgetWidth (10);
-        ffText->setViewLocation(1, 1);
 
         Setting *farClipDist = createSetting (Type_SpinBox, page, "far clip distance");
         farClipDist->setDefaultValue(300000);
@@ -187,13 +101,6 @@ sh::Factory::getInstance ().setSharedParameter ("vpRow2Fix", sh::makeProperty<sh
         farClipDist->setMaximum (1000000); // FIXME: not sure what the max value should be
         farClipDist->setWidgetWidth (10);
         farClipDist->setViewLocation(2, 2);
-        Setting *fcText = createSetting (Type_Undefined, page, "fcText");
-        fcText->setSpecialValueText("Far Clip Distance");
-        fcText->setEditorSetting(false);
-        fcText->setSerializable (false);
-        fcText->setColumnSpan (1);
-        fcText->setWidgetWidth (10);
-        fcText->setViewLocation(2, 1);
 
         Setting *timerStart = createSetting (Type_SpinBox, page, "timer start");
         timerStart->setDefaultValue(20);
@@ -203,13 +110,6 @@ sh::Factory::getInstance ().setSharedParameter ("vpRow2Fix", sh::makeProperty<sh
         timerStart->setMaximum (100); // FIXME: not sure what the max value should be
         timerStart->setWidgetWidth (10);
         timerStart->setViewLocation(3, 2);
-        Setting *tsText = createSetting (Type_Undefined, page, "tsText");
-        tsText->setSpecialValueText("Timer Start");
-        tsText->setEditorSetting(false);
-        tsText->setSerializable (false);
-        tsText->setColumnSpan (1);
-        tsText->setWidgetWidth (10);
-        tsText->setViewLocation(3, 1);
     }
 
 #if 0
@@ -251,6 +151,7 @@ sh::Factory::getInstance ().setSharedParameter ("vpRow2Fix", sh::makeProperty<sh
                              QStringList() << "480" << "600" << "768" << "900"
                              );
     }
+#endif
 
     page = "Display Format";
     {
@@ -271,7 +172,6 @@ sh::Factory::getInstance ().setSharedParameter ("vpRow2Fix", sh::makeProperty<sh
         rsd->setEditorSetting (true);
         ritd->setEditorSetting (true);
     }
-#endif
 
     page = "Proxy Selection Test";
     {

apps/opencs/view/doc/view.cpp

@@ -376,9 +376,6 @@ CSVDoc::View::View (ViewManager& viewManager, CSMDoc::Document *document, int to
     hide();
     resize (width.toInt() - (frameGeometry().width() - geometry().width()),
             height.toInt() - (frameGeometry().height() - geometry().height()));
-    // start at the centre of the screen
-    QPoint screenCenter = QApplication::desktop()->screenGeometry().center();
-    move(screenCenter - QPoint(frameGeometry().width()/2, frameGeometry().height()/2));
 
     mSubViewWindow.setDockOptions (QMainWindow::AllowNestedDocks);
 
@@ -517,14 +514,6 @@ void CSVDoc::View::addSubView (const CSMWorld::UniversalId& id, const std::strin
     view->setMinimumWidth(minWidth);
 
     view->setStatusBar (mShowStatusBar->isChecked());
-// NOTE: only required if show status bar setting should be applied to existing
-// window
-#if 0
-    std::string showStatusBar =
-        CSMSettings::UserSettings::instance().settingValue("Display/show statusbar").toStdString();
-
-    view->setStatusBar (showStatusBar == "true");
-#endif
 
     mSubViewWindow.addDockWidget (Qt::TopDockWidgetArea, view);
 

apps/opencs/view/doc/viewmanager.cpp

@@ -401,13 +401,6 @@ bool CSVDoc::ViewManager::removeDocument (CSVDoc::View *view)
     return true;
 }
 
-void CSVDoc::ViewManager::toggleStatusBar(bool checked)
-{
-    // NOTE: below only required if status bar change is to be applied to existing
-    //for (std::vector<View *>::const_iterator iter (mViews.begin()); iter!=mViews.end(); ++iter)
-        //(*iter)->toggleStatusBar(checked);
-}
-
 void CSVDoc::ViewManager::exitApplication (CSVDoc::View *view)
 {
     if(!removeDocument(view)) // close the current document first

apps/opencs/view/doc/viewmanager.hpp

@@ -81,8 +81,6 @@ namespace CSVDoc
 
             void exitApplication (CSVDoc::View *view);
 
-            void toggleStatusBar(bool checked);
-
         private slots:
 
             void documentStateChanged (int state, CSMDoc::Document *document);

apps/opencs/view/settings/dialog.cpp

@@ -87,27 +87,12 @@ QStringList getAvailableResolutions()
     Ogre::ConfigOptionMap::iterator it = renderOpt.begin();
     for(;it != renderOpt.end(); ++it)
     {
-        if(it->first == "Rendering Device" )
-        {
-            if(it->second.possibleValues.empty())
-            {
-                return result;  // FIXME: add error message
-            }
-            // Store Available Rendering Devices
-            Ogre::StringVector::iterator iter = it->second.possibleValues.begin();
-            for(;iter != it->second.possibleValues.end(); ++iter)
-            {
-                std::cout << "rd: " << *iter << std::endl; // FIXME: debug
-            }
-        }
         if(it->first == "Video Mode" )
         {
             if(it->second.possibleValues.empty())
             {
                 return result;  // FIXME: add error message
             }
-            // FIXME: how to default to the current value?
-            std::cout << "vm current: " << it->second.currentValue << std::endl; // FIXME: debug
             // Store Available Resolutions
             Ogre::StringVector::iterator iter = it->second.possibleValues.begin();
             for(; iter != it->second.possibleValues.end(); ++iter)
@@ -138,7 +123,7 @@ QStringList getAvailableResolutions()
 
 
 CSVSettings::Dialog::Dialog(QTabWidget *parent)
-    : /*mStackedWidget (0),*/ mDebugMode (false), SettingWindow (parent)
+    : mDebugMode (false), SettingWindow (parent)
 {
     setObjectName(QString::fromUtf8 ("User Settings"));
 
@@ -151,12 +136,8 @@ CSVSettings::Dialog::Dialog(QTabWidget *parent)
 
     connect(cbOverride, SIGNAL(toggled(bool)), this, SLOT(slotOverrideToggled(bool)));
     connect(cmbRenderSys, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(slotRendererChanged(const QString&)));
-    // to update the checkbox on the view menu
-    connect(cbStatusBar, SIGNAL(toggled(bool)), this, SIGNAL (toggleStatusBar(bool)));
 
     displayGroup_Window->installEventFilter(this);
-
-    setupDialog();
 }
 
 bool CSVSettings::Dialog::eventFilter(QObject *target, QEvent *event)
@@ -185,19 +166,6 @@ void CSVSettings::Dialog::slotRendererChanged(const QString &renderer)
 
     cmbShaderLang->clear();
     cmbShaderLang->addItems(model()->getShaderLanguageByRenderer(renderer));
-
-    if(model()->settingValue("Video/use settings.cfg") == "true")
-    {
-        labRenderSys->setEnabled(false);
-        cmbRenderSys->setEnabled(false);
-        labAntiAlias->setEnabled(false);
-        cmbAntiAlias->setEnabled(false);
-        //cbVsync->setEnabled(false);
-        labShaderLang->setEnabled(false);
-        cmbShaderLang->setEnabled(false);
-    }
-    else
-        cbOverride->setChecked(false);
 }
 
 void CSVSettings::Dialog::slotOverrideToggled(bool checked)
@@ -208,7 +176,6 @@ void CSVSettings::Dialog::slotOverrideToggled(bool checked)
         cmbRenderSys->setEnabled(false);
         labAntiAlias->setEnabled(false);
         cmbAntiAlias->setEnabled(false);
-        //cbVsync->setEnabled(false);
         labShaderLang->setEnabled(false);
         cmbShaderLang->setEnabled(false);
     }
@@ -218,16 +185,11 @@ void CSVSettings::Dialog::slotOverrideToggled(bool checked)
         cmbRenderSys->setEnabled(true);
         labAntiAlias->setEnabled(true);
         cmbAntiAlias->setEnabled(true);
-        //cbVsync->setEnabled(true);
         labShaderLang->setEnabled(true);
         cmbShaderLang->setEnabled(true);
     }
 }
 
-void CSVSettings::Dialog::setupDialog()
-{
-}
-
 void CSVSettings::Dialog::buildPages()
 {
     int index = -1;
@@ -238,7 +200,6 @@ void CSVSettings::Dialog::buildPages()
     // Ogre renderer
     cmbRenderSys->clear();
     cmbRenderSys->addItems(model()->getOgreRenderers());
-    //slotRendererChanged(Ogre::Root::getSingleton().getRenderSystem()->getName().c_str());
 
     // antialiasing
     QString antialiasing = model()->settingValue("Video/antialiasing");
@@ -246,11 +207,6 @@ void CSVSettings::Dialog::buildPages()
     if(index != -1)
         cmbAntiAlias->setCurrentIndex(index);
 
-    // vsync
-    //cbVsync->setChecked(model()->settingValue("Video/vsync") == "true");
-    cbVsync->setChecked(false); // disable vsync option for now
-    cbVsync->setEnabled(false); // disable vsync option for now
-
     // shader lang
     QString shaderlang = model()->settingValue("General/shader mode");
     index = cmbShaderLang->findData(shaderlang, Qt::DisplayRole);
@@ -288,17 +244,6 @@ void CSVSettings::Dialog::buildPages()
     // status bar
     cbStatusBar->setChecked(model()->settingValue("Display/show statusbar") == "true");
 
-    // display format
-    QString recStat = model()->settingValue("Display Format/Record Status Display");
-    index = cmbRecStatus->findData(recStat, Qt::DisplayRole);
-    if(index != -1)
-        cmbRecStatus->setCurrentIndex(index);
-
-    QString refIdType = model()->settingValue("Display Format/Referenceable ID Type Display");
-    index = cmbRefIdType->findData(refIdType, Qt::DisplayRole);
-    if(index != -1)
-        cmbRefIdType->setCurrentIndex(index);
-
     // subview
     if(model()->hasSettingDefinitions("SubView/minimum width"))
         sbMinSubViewWidth->setValue(model()->settingValue("SubView/minimum width").toInt());
@@ -341,20 +286,9 @@ void CSVSettings::Dialog::closeEvent (QCloseEvent *event)
     model()->setDefinitions("Video/render system",
                            QStringList(cmbRenderSys->currentText()));
 
-    // vsync
-    if(cbVsync->isChecked())
-        model()->setDefinitions("Video/vsync", QStringList("true"));
-    else
-        model()->setDefinitions("Video/vsync", QStringList("false"));
-
     // antialiasing
     model()->setDefinitions("Video/antialiasing",
                            QStringList(cmbAntiAlias->currentText()));
-#if 0
-    QRegExp reAA("^\\D*(\\d+)\\D*");
-    if(reAA.indexIn(cmbAntiAlias->currentText()) > -1)
-        model()->setDefinitions("Video/antialiasing", QStringList(reAA.cap(1)));
-#endif
 
     // shader lang (no group means "General" group)
     model()->setDefinitions("shader mode",
@@ -384,11 +318,6 @@ void CSVSettings::Dialog::closeEvent (QCloseEvent *event)
     else
         model()->setDefinitions("Display/show statusbar", QStringList("false"));
 
-    // display format
-    model()->setDefinitions("Display Format/Record Status Display",
-                           QStringList(cmbRecStatus->currentText()));
-    model()->setDefinitions("Display Format/Referenceable ID Type Display",
-                           QStringList(cmbRefIdType->currentText()));
     // subview
     model()->setDefinitions("SubView/minimum width",
                            QStringList(QString::number(sbMinSubViewWidth->value())));

apps/opencs/view/settings/dialog.hpp

@@ -31,8 +31,6 @@ namespace CSVSettings {
         /// Settings are written on close
         void closeEvent (QCloseEvent *event);
 
-        void setupDialog();
-
         bool eventFilter(QObject *target, QEvent *event);
 
     private:
@@ -47,10 +45,6 @@ namespace CSVSettings {
 
         void slotOverrideToggled(bool checked);
         void slotRendererChanged(const QString &renderer);
-
-    signals:
-
-        void toggleStatusBar(bool checked); // FIXME: maybe not needed
     };
 }
 #endif // CSVSETTINGS_DIALOG_H

apps/opencs/view/settings/frame.cpp

@@ -3,7 +3,7 @@
 #include <QWidget>
 
 const QString CSVSettings::Frame::sInvisibleBoxStyle =
-    QString::fromUtf8("Frame { border:2px; padding 2px; margin: 2px;}");
+    QString::fromUtf8("Frame { border:2px; padding: 2px; margin: 2px;}");
 
 CSVSettings::Frame::Frame (bool isVisible, const QString &title,
                                                                QWidget *parent)
@@ -16,8 +16,7 @@ CSVSettings::Frame::Frame (bool isVisible, const QString &title,
     if (!isVisible)
     {
         // must be Page, not a View
-        //setStyleSheet (sInvisibleBoxStyle);
-        setStyleSheet("QGroupBox { border:0px; }");
+        setStyleSheet (sInvisibleBoxStyle);
         mLayout->setContentsMargins(10, 15, 10, 15);
     }
 

files/ui/settingstab.ui

@@ -20,161 +20,51 @@
    <attribute name="title">
     <string>Display Settings</string>
    </attribute>
-   <widget class="QGroupBox" name="displayGroup_DisplayFormat">
+   <widget class="QGroupBox" name="displayGroup_Subviews">
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>10</y>
+      <y>200</y>
       <width>371</width>
-      <height>81</height>
+      <height>79</height>
      </rect>
     </property>
     <property name="title">
-     <string>Display Format</string>
+     <string>Subviews</string>
     </property>
-    <widget class="QWidget" name="layoutWidget_DisplayFormat">
+    <widget class="QCheckBox" name="cbStatusBar">
      <property name="geometry">
       <rect>
-       <x>10</x>
-       <y>20</y>
-       <width>351</width>
-       <height>48</height>
+       <x>240</x>
+       <y>21</y>
+       <width>102</width>
+       <height>17</height>
       </rect>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QLabel" name="labRecStatus">
-        <property name="text">
-         <string>Record Status:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="cmbRecStatus">
-        <item>
-         <property name="text">
-          <string>Text Only</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Icon Only</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Icon and Text</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="labRefIdType">
-        <property name="text">
-         <string>Referenceable ID Type:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="cmbRefIdType">
-        <item>
-         <property name="text">
-          <string>Text Only</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Icon Only</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Icon and Text</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-     </layout>
+     <property name="text">
+      <string>Show Status Bar</string>
+     </property>
+    </widget>
+    <widget class="QCheckBox" name="cbReuseSubView">
+     <property name="geometry">
+      <rect>
+       <x>240</x>
+       <y>49</y>
+       <width>101</width>
+       <height>17</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Reuse Subviews</string>
+     </property>
     </widget>
-   </widget>
-   <widget class="QGroupBox" name="displayGroup_Subviews">
-    <property name="geometry">
-     <rect>
-      <x>9</x>
-      <y>160</y>
-      <width>371</width>
-      <height>101</height>
-     </rect>
-    </property>
-    <property name="title">
-     <string>Subviews</string>
-    </property>
-   </widget>
-   <widget class="QWidget" name="layoutWidget_Subviews">
-    <property name="geometry">
-     <rect>
-      <x>21</x>
-      <y>180</y>
-      <width>351</width>
-      <height>71</height>
-     </rect>
-    </property>
-    <layout class="QGridLayout" name="gridLayout_3">
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_MaxSubviews">
-       <property name="text">
-        <string>Max Number of Subviews:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <widget class="QSpinBox" name="sbMaxSubViews">
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-       <property name="minimum">
-        <number>1</number>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_MinSubviewWidth">
-       <property name="text">
-        <string>Min Subview Width:</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QSpinBox" name="sbMinSubViewWidth">
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-       <property name="minimum">
-        <number>50</number>
-       </property>
-       <property name="maximum">
-        <number>20000</number>
-       </property>
-       <property name="singleStep">
-        <number>5</number>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QCheckBox" name="cbReuseSubView">
-       <property name="text">
-        <string>Reuse Subviews</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
    </widget>
    <widget class="QGroupBox" name="displayGroup_Window">
     <property name="geometry">
      <rect>
       <x>10</x>
-      <y>100</y>
-      <width>201</width>
+      <y>140</y>
+      <width>211</width>
       <height>51</height>
      </rect>
     </property>
@@ -189,7 +79,7 @@
       <rect>
        <x>10</x>
        <y>20</y>
-       <width>181</width>
+       <width>191</width>
        <height>22</height>
       </rect>
      </property>
@@ -205,7 +95,7 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>181</width>
+         <width>191</width>
          <height>22</height>
         </rect>
        </property>
@@ -242,7 +132,7 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>181</width>
+         <width>191</width>
          <height>22</height>
         </rect>
        </property>
@@ -250,153 +140,177 @@
      </widget>
     </widget>
    </widget>
-   <widget class="QCheckBox" name="cbStatusBar">
+   <widget class="QCheckBox" name="cbOverride">
     <property name="geometry">
      <rect>
-      <x>240</x>
-      <y>120</y>
-      <width>102</width>
+      <x>21</x>
+      <y>29</y>
+      <width>231</width>
       <height>17</height>
      </rect>
     </property>
     <property name="text">
-     <string>Show Status Bar</string>
+     <string>Use Render System Settings from OpenMW</string>
+    </property>
+    <property name="checked">
+     <bool>true</bool>
     </property>
    </widget>
-   <zorder>displayGroup_Subviews</zorder>
-   <zorder>layoutWidget_Subviews</zorder>
-   <zorder>displayGroup_Window</zorder>
-   <zorder>displayGroup_DisplayFormat</zorder>
-   <zorder>cbStatusBar</zorder>
-  </widget>
-  <widget class="QWidget" name="VideoSettings">
-   <attribute name="title">
-    <string>Video Settings</string>
-   </attribute>
-   <widget class="QWidget" name="layoutWidget_Render">
+   <widget class="QGroupBox" name="displayGroup_Render">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>10</y>
+      <width>371</width>
+      <height>125</height>
+     </rect>
+    </property>
+    <property name="title">
+     <string>Render System</string>
+    </property>
+    <widget class="QComboBox" name="cmbRenderSys">
+     <property name="geometry">
+      <rect>
+       <x>172</x>
+       <y>42</y>
+       <width>181</width>
+       <height>20</height>
+      </rect>
+     </property>
+     <property name="editable">
+      <bool>false</bool>
+     </property>
+    </widget>
+    <widget class="QLabel" name="labAntiAlias">
+     <property name="geometry">
+      <rect>
+       <x>12</x>
+       <y>94</y>
+       <width>54</width>
+       <height>16</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Antialiasing</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="labShaderLang">
+     <property name="geometry">
+      <rect>
+       <x>12</x>
+       <y>68</y>
+       <width>84</width>
+       <height>16</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Shader Language</string>
+     </property>
+    </widget>
+    <widget class="QLabel" name="labRenderSys">
+     <property name="geometry">
+      <rect>
+       <x>12</x>
+       <y>42</y>
+       <width>104</width>
+       <height>16</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Rendering Subsystem</string>
+     </property>
+    </widget>
+    <widget class="QComboBox" name="cmbShaderLang">
+     <property name="geometry">
+      <rect>
+       <x>172</x>
+       <y>68</y>
+       <width>181</width>
+       <height>20</height>
+      </rect>
+     </property>
+    </widget>
+    <widget class="QComboBox" name="cmbAntiAlias">
+     <property name="geometry">
+      <rect>
+       <x>172</x>
+       <y>94</y>
+       <width>181</width>
+       <height>20</height>
+      </rect>
+     </property>
+    </widget>
+   </widget>
+   <widget class="QWidget" name="layoutWidget_2">
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>26</y>
-      <width>351</width>
-      <height>129</height>
+      <y>220</y>
+      <width>191</width>
+      <height>48</height>
      </rect>
     </property>
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0" colspan="2">
-      <widget class="QCheckBox" name="cbOverride">
-       <property name="text">
-        <string>Use Render System Settings from OpenMW</string>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="labRenderSys">
+    <layout class="QGridLayout" name="gridLayout_2">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_MaxSubviews">
        <property name="text">
-        <string>Rendering Subsystem</string>
+        <string>Max Number of Subviews:</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
-      <widget class="QComboBox" name="cmbRenderSys">
-       <property name="editable">
-        <bool>false</bool>
+     <item row="0" column="1">
+      <widget class="QSpinBox" name="sbMaxSubViews">
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
-      </widget>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="labAntiAlias">
-       <property name="text">
-        <string>Antialiasing</string>
+       <property name="minimum">
+        <number>1</number>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
-      <widget class="QCheckBox" name="cbVsync">
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_MinSubviewWidth">
        <property name="text">
-        <string>Vertical Sync</string>
+        <string>Min Subview Width:</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="0">
-      <widget class="QLabel" name="labShaderLang">
-       <property name="text">
-        <string>Shader Language</string>
+     <item row="1" column="1">
+      <widget class="QSpinBox" name="sbMinSubViewWidth">
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
-      </widget>
-     </item>
-     <item row="5" column="1">
-      <widget class="QComboBox" name="cmbShaderLang"/>
-     </item>
-     <item row="4" column="1">
-      <widget class="QComboBox" name="cmbAntiAlias"/>
-     </item>
-     <item row="1" column="0" colspan="2">
-      <widget class="Line" name="line">
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>2</height>
-        </size>
+       <property name="minimum">
+        <number>50</number>
        </property>
-       <property name="styleSheet">
-        <string notr="true">color: rgb(215, 215, 215);</string>
+       <property name="maximum">
+        <number>20000</number>
        </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+       <property name="singleStep">
+        <number>5</number>
        </property>
       </widget>
      </item>
     </layout>
    </widget>
-   <widget class="QGroupBox" name="displayGroup_Render">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>8</y>
-      <width>371</width>
-      <height>156</height>
-     </rect>
-    </property>
-    <property name="title">
-     <string>Render System</string>
-    </property>
-   </widget>
-   <widget class="QGroupBox" name="groupBox">
-    <property name="geometry">
-     <rect>
-      <x>9</x>
-      <y>169</y>
-      <width>371</width>
-      <height>101</height>
-     </rect>
-    </property>
-    <property name="title">
-     <string>title</string>
-    </property>
-   </widget>
    <zorder>displayGroup_Render</zorder>
-   <zorder>layoutWidget_Render</zorder>
-   <zorder>groupBox</zorder>
+   <zorder>displayGroup_Subviews</zorder>
+   <zorder>displayGroup_Window</zorder>
+   <zorder>cbOverride</zorder>
+   <zorder>layoutWidget_2</zorder>
   </widget>
  </widget>
  <tabstops>
-  <tabstop>cmbRecStatus</tabstop>
-  <tabstop>cmbRefIdType</tabstop>
+  <tabstop>cbOverride</tabstop>
+  <tabstop>cmbRenderSys</tabstop>
+  <tabstop>cmbShaderLang</tabstop>
+  <tabstop>cmbAntiAlias</tabstop>
   <tabstop>sbWidth</tabstop>
   <tabstop>sbHeight</tabstop>
-  <tabstop>cbStatusBar</tabstop>
   <tabstop>sbMaxSubViews</tabstop>
   <tabstop>sbMinSubViewWidth</tabstop>
+  <tabstop>cbStatusBar</tabstop>
   <tabstop>cbReuseSubView</tabstop>
-  <tabstop>cbOverride</tabstop>
-  <tabstop>cmbRenderSys</tabstop>
-  <tabstop>cbVsync</tabstop>
-  <tabstop>cmbAntiAlias</tabstop>
-  <tabstop>cmbShaderLang</tabstop>
   <tabstop>cmbStdWinSize</tabstop>
  </tabstops>
  <resources/>