Removed fullscreen checkbox and associated code. Doesn't really make sense for opencs and a fullscreen windowed mode is just a click or keyboard shortcut away, anyway.

apps/opencs/editor.cpp

@@ -283,9 +283,7 @@ std::auto_ptr<sh::Factory> CS::Editor::setupGraphics()
 #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
     params.insert(std::make_pair("macAPI", "cocoa"));
 #endif
-    // FIXME: don't apply the fullscreen here, apply to the editor window
+    // NOTE: fullscreen mode not supported (doesn't really make sense for opencs)
-    //bool fullscreen = mUserSettings.settingValue("Video/fullscreen").toStdString() == "true" ? true : false;
-    //Ogre::RenderWindow* hiddenWindow = Ogre::Root::getSingleton().createRenderWindow("InactiveHidden", 1, 1, fullscreen, &params);
     Ogre::RenderWindow* hiddenWindow = Ogre::Root::getSingleton().createRenderWindow("InactiveHidden", 1, 1, false, &params);
     hiddenWindow->setActive(false);
 

apps/opencs/view/settings/settingsdialog.cpp

@@ -164,7 +164,6 @@ CSVSettings::SettingsDialog::SettingsDialog(QTabWidget *parent)
     spinBox_y->setMaximum(res.height());
 
     connect(comboBox_rendersystem, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(rendererChanged(const QString&)));
-    connect(checkBox_fullscreen, SIGNAL(stateChanged(int)), this, SLOT(slotFullScreenChanged(int)));
     connect(radioButton_standard_res, SIGNAL(toggled(bool)), this, SLOT(slotStandardToggled(bool)));
 }
 
@@ -174,27 +173,6 @@ void CSVSettings::SettingsDialog::rendererChanged()
     comboBox_antialiasing->addItems(getAvailableOptions(QString("FSAA")));
 }
 
-void CSVSettings::SettingsDialog::slotFullScreenChanged(int state)
-{
-    if (state == Qt::Checked) {
-        label_Resolution->setEnabled(false);
-        radioButton_standard_res->setEnabled(false);
-        radioButton_custom_res->setEnabled(false);
-        comboBox_std_window_size->setEnabled(false);
-        spinBox_x->setEnabled(false);
-        spinBox_y->setEnabled(false);
-    }
-    else
-    {
-        label_Resolution->setEnabled(true);
-        radioButton_standard_res->setEnabled(true);
-        radioButton_custom_res->setEnabled(true);
-        comboBox_std_window_size->setEnabled(true);
-        spinBox_x->setEnabled(true);
-        spinBox_y->setEnabled(true);
-    }
-}
-
 // FIXME: what to do with updating window size
 void CSVSettings::SettingsDialog::slotStandardToggled(bool checked)
 {
@@ -254,17 +232,6 @@ void CSVSettings::SettingsDialog::setViewValues()
         comboBox_std_window_size->setCurrentIndex(index);
 
     slotStandardToggled(radioButton_standard_res->isChecked() ? true : false);
-
-    if(CSMSettings::UserSettings::instance().settingValue("Video/fullscreen") == "true")
-    {
-        checkBox_fullscreen->setChecked(true);
-        slotFullScreenChanged(Qt::Checked);
-    }
-    else
-    {
-        checkBox_fullscreen->setChecked(false);
-        slotFullScreenChanged(Qt::Unchecked);
-    }
 }
 
 void CSVSettings::SettingsDialog::closeEvent (QCloseEvent *event)

apps/opencs/view/settings/settingsdialog.hpp

@@ -37,7 +37,6 @@ namespace CSVSettings {
 
         void show();
         void rendererChanged();
-        void slotFullScreenChanged(int state);
         void slotStandardToggled(bool checked);
     };
 }

files/ui/settingstab.ui

@@ -26,11 +26,24 @@
       <x>20</x>
       <y>188</y>
       <width>351</width>
-      <height>81</height>
+      <height>51</height>
      </rect>
     </property>
     <layout class="QGridLayout" name="gridLayout_Screen">
-     <item row="2" column="1">
+     <item row="1" column="3">
+      <widget class="QSpinBox" name="spinBox_y"/>
+     </item>
+     <item row="1" column="2">
+      <widget class="QSpinBox" name="spinBox_x">
+       <property name="maximumSize">
+        <size>
+         <width>186</width>
+         <height>16777215</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
       <widget class="QRadioButton" name="radioButton_standard_res">
        <property name="text">
         <string>Standard:</string>
@@ -43,21 +56,7 @@
        </attribute>
       </widget>
      </item>
-     <item row="2" column="0">
+     <item row="1" column="1">
-      <widget class="QLabel" name="label_Resolution">
-       <property name="text">
-        <string>Resolution</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0" colspan="2">
-      <widget class="QCheckBox" name="checkBox_fullscreen">
-       <property name="text">
-        <string>Full Screen</string>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="1">
       <widget class="QRadioButton" name="radioButton_custom_res">
        <property name="text">
         <string>Custom;</string>
@@ -67,20 +66,14 @@
        </attribute>
       </widget>
      </item>
-     <item row="3" column="2">
+     <item row="0" column="0">
-      <widget class="QSpinBox" name="spinBox_x">
+      <widget class="QLabel" name="label_Resolution">
-       <property name="maximumSize">
+       <property name="text">
-        <size>
+        <string>Window Size</string>
-         <width>186</width>
-         <height>16777215</height>
-        </size>
        </property>
       </widget>
      </item>
-     <item row="3" column="3">
+     <item row="0" column="2" colspan="2">
-      <widget class="QSpinBox" name="spinBox_y"/>
-     </item>
-     <item row="2" column="2" colspan="2">
       <widget class="QComboBox" name="comboBox_std_window_size">
        <property name="minimumSize">
         <size>
@@ -90,19 +83,6 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0" colspan="4">
-      <widget class="Line" name="line_2">
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>2</height>
-        </size>
-       </property>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
     </layout>
    </widget>
    <widget class="QGroupBox" name="renderGroup">
@@ -124,7 +104,7 @@
       <x>10</x>
       <y>170</y>
       <width>371</width>
-      <height>108</height>
+      <height>81</height>
      </rect>
     </property>
     <property name="title">
@@ -211,8 +191,7 @@
       </widget>
      </item>
      <item row="4" column="1">
-      <widget class="QComboBox" name="comboBox_antialiasing">
+      <widget class="QComboBox" name="comboBox_antialiasing"/>
-      </widget>
      </item>
      <item row="1" column="0" colspan="2">
       <widget class="Line" name="line">