Merge remote branch 'scrawl/settingswindow'

apps/launcher/graphicspage.cpp

@@ -1,12 +1,11 @@
-#include "graphicspage.hpp"
-
 #include <QtGui>
 
-#include <boost/lexical_cast.hpp>
-
 #include <components/files/configurationmanager.hpp>
 #include <components/settings/settings.hpp>
 
+#include "graphicspage.hpp"
+#include "naturalsort.hpp"
+
 GraphicsPage::GraphicsPage(Files::ConfigurationManager &cfg, QWidget *parent)
     : QWidget(parent)
     , mCfgMgr(cfg)
@@ -21,57 +20,38 @@ GraphicsPage::GraphicsPage(Files::ConfigurationManager &cfg, QWidget *parent)
     renderSystemLayout->addWidget(rendererLabel, 0, 0, 1, 1);
     renderSystemLayout->addWidget(mRendererComboBox, 0, 1, 1, 1);
 
-    QVBoxLayout *rendererGroupLayout = new QVBoxLayout(rendererGroup);
-
-    rendererGroupLayout->addLayout(renderSystemLayout);
-
     // Display
     QGroupBox *displayGroup = new QGroupBox(tr("Display"), this);
 
-    mDisplayStackedWidget = new QStackedWidget(displayGroup);
+    mVSyncCheckBox = new QCheckBox(tr("Vertical Sync"), displayGroup);
+    mFullScreenCheckBox = new QCheckBox(tr("Full Screen"), displayGroup);
 
-    QVBoxLayout *displayGroupLayout = new QVBoxLayout(displayGroup);
+    QLabel *antiAliasingLabel = new QLabel(tr("Antialiasing:"), displayGroup);
-    QSpacerItem *vSpacer3 = new QSpacerItem(20, 10, QSizePolicy::Minimum, QSizePolicy::Expanding);
+    QLabel *resolutionLabel = new QLabel(tr("Resolution:"), displayGroup);
 
-    displayGroupLayout->addWidget(mDisplayStackedWidget);
+    mResolutionComboBox = new QComboBox(displayGroup);
-    displayGroupLayout->addItem(vSpacer3);
+    mAntiAliasingComboBox = new QComboBox(displayGroup);
+
+    QVBoxLayout *rendererGroupLayout = new QVBoxLayout(rendererGroup);
+    rendererGroupLayout->addLayout(renderSystemLayout);
+
+    QGridLayout *displayGroupLayout = new QGridLayout(displayGroup);
+    displayGroupLayout->addWidget(mVSyncCheckBox, 0, 0, 1, 1);
+    displayGroupLayout->addWidget(mFullScreenCheckBox, 1, 0, 1, 1);
+    displayGroupLayout->addWidget(antiAliasingLabel, 2, 0, 1, 1);
+    displayGroupLayout->addWidget(mAntiAliasingComboBox, 2, 1, 1, 1);
+    displayGroupLayout->addWidget(resolutionLabel, 3, 0, 1, 1);
+    displayGroupLayout->addWidget(mResolutionComboBox, 3, 1, 1, 1);
 
     // Layout for the whole page
     QVBoxLayout *pageLayout = new QVBoxLayout(this);
+    QSpacerItem *vSpacer1 = new QSpacerItem(20, 10, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
     pageLayout->addWidget(rendererGroup);
     pageLayout->addWidget(displayGroup);
+    pageLayout->addItem(vSpacer1);
 
     connect(mRendererComboBox, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(rendererChanged(const QString&)));
-
-    createPages();
-}
-
-void GraphicsPage::createPages()
-{
-    QWidget *main = new QWidget();
-    QGridLayout *grid = new QGridLayout(main);
-
-    mVSyncCheckBox = new QCheckBox(tr("Vertical Sync"), main);
-    grid->addWidget(mVSyncCheckBox, 0, 0, 1, 1);
-
-    mFullScreenCheckBox = new QCheckBox(tr("Full Screen"), main);
-    grid->addWidget(mFullScreenCheckBox, 1, 0, 1, 1);
-
-    QLabel *antiAliasingLabel = new QLabel(tr("Antialiasing:"), main);
-    mAntiAliasingComboBox = new QComboBox(main);
-    grid->addWidget(antiAliasingLabel, 2, 0, 1, 1);
-    grid->addWidget(mAntiAliasingComboBox, 2, 1, 1, 1);
-
-    QLabel *resolutionLabel = new QLabel(tr("Resolution:"), main);
-    mResolutionComboBox = new QComboBox(main);
-    grid->addWidget(resolutionLabel, 3, 0, 1, 1);
-    grid->addWidget(mResolutionComboBox, 3, 1, 1, 1);
-
-    QSpacerItem *vSpacer1 = new QSpacerItem(20, 10, QSizePolicy::Minimum, QSizePolicy::Expanding);
-    grid->addItem(vSpacer1, 4, 0, 1, 1);
-
-    mDisplayStackedWidget->addWidget(main);
 }
 
 bool GraphicsPage::setupOgre()
@@ -85,11 +65,11 @@ bool GraphicsPage::setupOgre()
 
     try
     {
-    #if defined(ENABLE_PLUGIN_GL) || defined(ENABLE_PLUGIN_Direct3D9)
+#if defined(ENABLE_PLUGIN_GL) || defined(ENABLE_PLUGIN_Direct3D9)
         mOgre = new Ogre::Root("", "", "./launcherOgre.log");
-    #else
+#else
         mOgre = new Ogre::Root(pluginCfg.toStdString(), "", "./launcherOgre.log");
-    #endif
+#endif
     }
     catch(Ogre::Exception &ex)
     {
@@ -108,14 +88,14 @@ bool GraphicsPage::setupOgre()
         return false;
     }
 
-	#ifdef ENABLE_PLUGIN_GL
+#ifdef ENABLE_PLUGIN_GL
-	mGLPlugin = new Ogre::GLPlugin();
+    mGLPlugin = new Ogre::GLPlugin();
-	mOgre->installPlugin(mGLPlugin);
+    mOgre->installPlugin(mGLPlugin);
-	#endif
+#endif
-	#ifdef ENABLE_PLUGIN_Direct3D9
+#ifdef ENABLE_PLUGIN_Direct3D9
-	mD3D9Plugin = new Ogre::D3D9Plugin();
+    mD3D9Plugin = new Ogre::D3D9Plugin();
-	mOgre->installPlugin(mD3D9Plugin);
+    mOgre->installPlugin(mD3D9Plugin);
-	#endif
+#endif
 
     // Get the available renderers and put them in the combobox
     const Ogre::RenderSystemList &renderers = mOgre->getAvailableRenderers();
@@ -125,30 +105,16 @@ bool GraphicsPage::setupOgre()
         mRendererComboBox->addItem((*r)->getName().c_str());
     }
 
-    int index = mRendererComboBox->findText(QString::fromStdString(Settings::Manager::getString("render system", "Video")));
+    QString openGLName = QString("OpenGL Rendering Subsystem");
-
+    QString direct3DName = QString("Direct3D9 Rendering Subsystem");
-    if ( index != -1) {
-        mRendererComboBox->setCurrentIndex(index);
-    }
-    else
-    {
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-        mRendererComboBox->setCurrentIndex(mRendererComboBox->findText("Direct3D9 Rendering Subsystem"));
-#else
-        mRendererComboBox->setCurrentIndex(mRendererComboBox->findText("OpenGL Rendering Subsystem"));
-#endif
-    }
 
     // Create separate rendersystems
-    QString openGLName = mRendererComboBox->itemText(mRendererComboBox->findText(QString("OpenGL"), Qt::MatchStartsWith));
-    QString direct3DName = mRendererComboBox->itemText(mRendererComboBox->findText(QString("Direct3D"), Qt::MatchStartsWith));
-
     mOpenGLRenderSystem = mOgre->getRenderSystemByName(openGLName.toStdString());
     mDirect3DRenderSystem = mOgre->getRenderSystemByName(direct3DName.toStdString());
 
     if (!mOpenGLRenderSystem && !mDirect3DRenderSystem) {
         QMessageBox msgBox;
-        msgBox.setWindowTitle("Error creating renderer");
+        msgBox.setWindowTitle(tr("Error creating renderer"));
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setStandardButtons(QMessageBox::Ok);
         msgBox.setText(tr("<br><b>Could not select a valid render system</b><br><br> \
@@ -159,10 +125,24 @@ bool GraphicsPage::setupOgre()
     }
 
     // Now fill the GUI elements
+    int index = mRendererComboBox->findText(QString::fromStdString(Settings::Manager::getString("render system", "Video")));
+
+    if ( index != -1) {
+        mRendererComboBox->setCurrentIndex(index);
+    }
+    else
+    {
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+        mRendererComboBox->setCurrentIndex(mRendererComboBox->findText(direct3DName));
+#else
+        mRendererComboBox->setCurrentIndex(mRendererComboBox->findText(openGLName));
+#endif
+    }
+
     mAntiAliasingComboBox->clear();
     mResolutionComboBox->clear();
     mAntiAliasingComboBox->addItems(getAvailableOptions(QString("FSAA"), mSelectedRenderSystem));
-    mResolutionComboBox->addItems(getAvailableOptions(QString("Video Mode"), mSelectedRenderSystem));
+    mResolutionComboBox->addItems(getAvailableResolutions(mSelectedRenderSystem));
 
     readConfig();
     return true;
@@ -180,9 +160,10 @@ void GraphicsPage::readConfig()
     if (aaIndex != -1)
         mAntiAliasingComboBox->setCurrentIndex(aaIndex);
 
-    std::string resolution = boost::lexical_cast<std::string>(Settings::Manager::getInt("resolution x", "Video"))
+    QString resolution = QString::number(Settings::Manager::getInt("resolution x", "Video"));
-        + " x " + boost::lexical_cast<std::string>(Settings::Manager::getInt("resolution y", "Video"));
+    resolution.append(" x " + QString::number(Settings::Manager::getInt("resolution y", "Video")));
-    int resIndex = mResolutionComboBox->findText(QString::fromStdString(resolution));
+
+    int resIndex = mResolutionComboBox->findText(resolution);
     if (resIndex != -1)
         mResolutionComboBox->setCurrentIndex(resIndex);
 }
@@ -197,8 +178,9 @@ void GraphicsPage::writeConfig()
     // parse resolution x and y from a string like "800 x 600"
     QString resolution = mResolutionComboBox->currentText();
     QStringList tokens = resolution.split(" ", QString::SkipEmptyParts);
-    int resX = boost::lexical_cast<int>(tokens.at(0).toStdString());
+
-    int resY = boost::lexical_cast<int>(tokens.at(2).toStdString());
+    int resX = tokens.at(0).toInt();
+    int resY = tokens.at(2).toInt();
     Settings::Manager::setInt("resolution x", "Video", resX);
     Settings::Manager::setInt("resolution y", "Video", resY);
 }
@@ -220,15 +202,21 @@ QStringList GraphicsPage::getAvailableOptions(const QString &key, Ogre::RenderSy
 
             if (strcmp (key.toStdString().c_str(), i->first.c_str()) == 0)
             {
-                if (key == "FSAA" && *opt_it == "0")
+                result << ((key == "FSAA") ? QString("MSAA ") : QString("")) + QString::fromStdString((*opt_it).c_str()).simplified();
-                    result << QString("none");
-                else
-                    result << ((key == "FSAA") ? QString("MSAA ") : QString("")) + QString::fromStdString((*opt_it).c_str()).simplified();
             }
         }
 
     }
 
+    // Sort ascending
+    qSort(result.begin(), result.end(), naturalSortLessThanCI);
+
+    // Replace the zero option with Off
+    int index = result.indexOf("MSAA 0");
+
+    if (index != -1)
+        result.replace(index, tr("Off"));
+
     return result;
 }
 
@@ -265,6 +253,9 @@ QStringList GraphicsPage::getAvailableResolutions(Ogre::RenderSystem *renderer)
 
     }
 
+    // Sort the resolutions in descending order
+    qSort(result.begin(), result.end(), naturalSortGreaterThanCI);
+
     return result;
 }
 

apps/launcher/maindialog.cpp

@@ -229,7 +229,6 @@ void MainDialog::closeEvent(QCloseEvent *event)
 
     // Save user settings
     const std::string settingspath = (mCfgMgr.getUserPath() / "settings.cfg").string();
-    qDebug() << QString::fromStdString(settingspath);
     mSettings.saveUser(settingspath);
 
     event->accept();
@@ -241,6 +240,10 @@ void MainDialog::play()
     mDataFilesPage->writeConfig();
     mGraphicsPage->writeConfig();
 
+    // Save user settings
+    const std::string settingspath = (mCfgMgr.getUserPath() / "settings.cfg").string();
+    mSettings.saveUser(settingspath);
+
 #ifdef Q_WS_WIN
     QString game = "./openmw.exe";
     QFile file(game);

apps/launcher/naturalsort.cpp

@@ -93,3 +93,13 @@ bool naturalSortLessThanCI( const QString &left, const QString &right )
 {
     return (naturalCompare( left, right, Qt::CaseInsensitive ) < 0);
 }
+
+bool naturalSortGreaterThanCS( const QString &left, const QString &right )
+{
+    return (naturalCompare( left, right, Qt::CaseSensitive ) > 0);
+}
+
+bool naturalSortGreaterThanCI( const QString &left, const QString &right )
+{
+    return (naturalCompare( left, right, Qt::CaseInsensitive ) > 0);
+}

apps/launcher/naturalsort.hpp

@@ -5,5 +5,7 @@
 
 bool naturalSortLessThanCS( const QString &left, const QString &right );
 bool naturalSortLessThanCI( const QString &left, const QString &right );
+bool naturalSortGreaterThanCS( const QString &left, const QString &right );
+bool naturalSortGreaterThanCI( const QString &left, const QString &right );
 
-#endif
+#endif

apps/launcher/pluginsview.cpp

@@ -1,4 +1,3 @@
-#include <QDebug>
 #include <QSortFilterProxyModel>
 
 #include "pluginsview.hpp"

apps/openmw/mwgui/settingswindow.cpp

@@ -6,6 +6,7 @@
 
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
+#include <boost/math/common_factor_rt.hpp>
 
 #include <components/settings/settings.hpp>
 
@@ -51,6 +52,24 @@ namespace
         x = boost::lexical_cast<int> (split[0]);
         y = boost::lexical_cast<int> (split[1]);
     }
+
+    bool sortResolutions (std::pair<int, int> left, std::pair<int, int> right)
+    {
+        if (left.first == right.first)
+            return left.second > right.second;
+        return left.first > right.first;
+    }
+
+    std::string getAspect (int x, int y)
+    {
+        int gcd = boost::math::gcd (x, y);
+        int xaspect = x / gcd;
+        int yaspect = y / gcd;
+        // special case: 8 : 5 is usually referred to as 16:10
+        if (xaspect == 8 && yaspect == 5)
+            return "16 : 10";
+        return boost::lexical_cast<std::string>(xaspect) + " : " + boost::lexical_cast<std::string>(yaspect);
+    }
 }
 
 namespace MWGui
@@ -111,13 +130,22 @@ namespace MWGui
 
         // fill resolution list
         Ogre::RenderSystem* rs = Ogre::Root::getSingleton().getRenderSystem();
-        const Ogre::StringVector& videoModes = rs->getConfigOptions()["Video Mode"].possibleValues;
+        Ogre::StringVector videoModes = rs->getConfigOptions()["Video Mode"].possibleValues;
+        std::vector < std::pair<int, int> > resolutions;
         for (Ogre::StringVector::const_iterator it=videoModes.begin();
             it!=videoModes.end(); ++it)
         {
+
             int resX, resY;
             parseResolution (resX, resY, *it);
-            std::string str = boost::lexical_cast<std::string>(resX) + " x " + boost::lexical_cast<std::string>(resY);
+            resolutions.push_back(std::make_pair(resX, resY));
+        }
+        std::sort(resolutions.begin(), resolutions.end(), sortResolutions);
+        for (std::vector < std::pair<int, int> >::const_iterator it=resolutions.begin();
+             it!=resolutions.end(); ++it)
+        {
+            std::string str = boost::lexical_cast<std::string>(it->first) + " x " + boost::lexical_cast<std::string>(it->second)
+                    + " (" + getAspect(it->first,it->second) + ")";
 
             if (mResolutionList->findItemIndexWith(str) == MyGUI::ITEM_NONE)
                 mResolutionList->addItem(str);
@@ -185,7 +213,6 @@ namespace MWGui
         dialog->eventOkClicked.clear();
         dialog->eventOkClicked += MyGUI::newDelegate(this, &SettingsWindow::onResolutionAccept);
         dialog->eventCancelClicked.clear();
-        dialog->eventCancelClicked += MyGUI::newDelegate(this, &SettingsWindow::onResolutionAccept);
     }
 
     void SettingsWindow::onResolutionAccept()