Merge remote-tracking branch 'pvdk/uifix'

apps/launcher/datafilespage.cpp

@@ -17,19 +17,6 @@
 
 #include "utils/textinputdialog.hpp"
 
-
-//sort QModelIndexList ascending
-bool rowGreaterThan(const QModelIndex &index1, const QModelIndex &index2)
-{
-    return index1.row() >= index2.row();
-}
-
-//sort QModelIndexList descending
-bool rowSmallerThan(const QModelIndex &index1, const QModelIndex &index2)
-{
-    return index1.row() <= index2.row();
-}
-
 DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, GameSettings &gameSettings, LauncherSettings &launcherSettings, QWidget *parent)
     : mCfgMgr(cfg)
     , mGameSettings(gameSettings)
@@ -121,35 +108,15 @@ DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, GameSettings &gam
 
 void DataFilesPage::createActions()
 {
-    // Refresh the plugins
-    QAction *refreshAction = new QAction(tr("Refresh"), this);
-    refreshAction->setShortcut(QKeySequence(tr("F5")));
-    connect(refreshAction, SIGNAL(triggered()), this, SLOT(refresh()));
 
-    // We can't create actions inside the .ui file
+    // Add the actions to the toolbuttons
-    mNewProfileAction = new QAction(QIcon::fromTheme("document-new"), tr("&New Profile"), this);
+    newProfileButton->setDefaultAction(newProfileAction);
-    mNewProfileAction->setToolTip(tr("New Profile"));
+    deleteProfileButton->setDefaultAction(deleteProfileAction);
-    mNewProfileAction->setShortcut(QKeySequence(tr("Ctrl+N")));
-    connect(mNewProfileAction, SIGNAL(triggered()), this, SLOT(newProfile()));
-
-    mDeleteProfileAction = new QAction(QIcon::fromTheme("edit-delete"), tr("Delete Profile"), this);
-    mDeleteProfileAction->setToolTip(tr("Delete Profile"));
-    connect(mDeleteProfileAction, SIGNAL(triggered()), this, SLOT(deleteProfile()));
-
-    // Add the newly created actions to the toolbuttons
-    newProfileButton->setDefaultAction(mNewProfileAction);
-    deleteProfileButton->setDefaultAction(mDeleteProfileAction);
 
     // Context menu actions
-    mCheckAction = new QAction(tr("Check Selection"), this);
-    connect(mCheckAction, SIGNAL(triggered()), this, SLOT(check()));
-
-    mUncheckAction = new QAction(tr("Uncheck Selection"), this);
-    connect(mUncheckAction, SIGNAL(triggered()), this, SLOT(uncheck()));
-
     mContextMenu = new QMenu(this);
-    mContextMenu->addAction(mCheckAction);
+    mContextMenu->addAction(checkAction);
-    mContextMenu->addAction(mUncheckAction);
+    mContextMenu->addAction(uncheckAction);
 }
 
 void DataFilesPage::setupDataFiles()
@@ -184,6 +151,8 @@ void DataFilesPage::setupDataFiles()
         profilesComboBox->addItem(QString("Default"));
 
     if (profile.isEmpty() || profile == QLatin1String("Default")) {
+        deleteProfileAction->setEnabled(false);
+        profilesComboBox->setEditEnabled(false);
         profilesComboBox->setCurrentIndex(profilesComboBox->findText(QString("Default")));
     } else {
         profilesComboBox->setEditEnabled(true);
@@ -257,15 +226,6 @@ void DataFilesPage::saveSettings()
 
 }
 
-void DataFilesPage::newProfile()
-{
-    if (mNewProfileDialog->exec() == QDialog::Accepted) {
-        QString profile = mNewProfileDialog->lineEdit()->text();
-        profilesComboBox->addItem(profile);
-        profilesComboBox->setCurrentIndex(profilesComboBox->findText(profile));
-    }
-}
-
 void DataFilesPage::updateOkButton(const QString &text)
 {
     // We do this here because we need the profiles combobox text
@@ -331,7 +291,16 @@ int DataFilesPage::profilesComboBoxIndex()
     return profilesComboBox->currentIndex();
 }
 
-void DataFilesPage::deleteProfile()
+void DataFilesPage::on_newProfileAction_triggered()
+{
+    if (mNewProfileDialog->exec() == QDialog::Accepted) {
+        QString profile = mNewProfileDialog->lineEdit()->text();
+        profilesComboBox->addItem(profile);
+        profilesComboBox->setCurrentIndex(profilesComboBox->findText(profile));
+    }
+}
+
+void DataFilesPage::on_deleteProfileAction_triggered()
 {
     QString profile = profilesComboBox->currentText();
 
@@ -358,7 +327,7 @@ void DataFilesPage::deleteProfile()
     }
 }
 
-void DataFilesPage::check()
+void DataFilesPage::on_checkAction_triggered()
 {
     if (pluginsTable->hasFocus())
         setPluginsCheckstates(Qt::Checked);
@@ -368,7 +337,7 @@ void DataFilesPage::check()
 
 }
 
-void DataFilesPage::uncheck()
+void DataFilesPage::on_uncheckAction_triggered()
 {
     if (pluginsTable->hasFocus())
         setPluginsCheckstates(Qt::Unchecked);
@@ -377,14 +346,6 @@ void DataFilesPage::uncheck()
         setMastersCheckstates(Qt::Unchecked);
 }
 
-void DataFilesPage::refresh()
-{
-//    mDataFilesModel->sort(0);
-
-    // Refresh the plugins table
-    pluginsTable->scrollToTop();
-}
-
 void DataFilesPage::setMastersCheckstates(Qt::CheckState state)
 {
     if (!mastersTable->selectionModel()->hasSelection()) {
@@ -476,10 +437,10 @@ void DataFilesPage::profileChanged(const QString &previous, const QString &curre
 {
     // Prevent the deletion of the default profile
     if (current == QLatin1String("Default")) {
-        mDeleteProfileAction->setEnabled(false);
+        deleteProfileAction->setEnabled(false);
         profilesComboBox->setEditEnabled(false);
     } else {
-        mDeleteProfileAction->setEnabled(true);
+        deleteProfileAction->setEnabled(true);
         profilesComboBox->setEditEnabled(true);
     }
 
@@ -533,8 +494,8 @@ void DataFilesPage::showContextMenu(const QPoint &point)
         QModelIndexList indexes = pluginsTable->selectionModel()->selectedIndexes();
 
         // Show the check/uncheck actions depending on the state of the selected items
-        mUncheckAction->setEnabled(false);
+        uncheckAction->setEnabled(false);
-        mCheckAction->setEnabled(false);
+        checkAction->setEnabled(false);
 
         foreach (const QModelIndex &index, indexes)
         {
@@ -548,8 +509,8 @@ void DataFilesPage::showContextMenu(const QPoint &point)
                 return;
 
             (mDataFilesModel->checkState(sourceIndex) == Qt::Checked)
-                    ? mUncheckAction->setEnabled(true)
+                    ? uncheckAction->setEnabled(true)
-                    : mCheckAction->setEnabled(true);
+                    : checkAction->setEnabled(true);
         }
 
         // Show menu
@@ -564,8 +525,8 @@ void DataFilesPage::showContextMenu(const QPoint &point)
         QModelIndexList indexes = mastersTable->selectionModel()->selectedIndexes();
 
         // Show the check/uncheck actions depending on the state of the selected items
-        mUncheckAction->setEnabled(false);
+        uncheckAction->setEnabled(false);
-        mCheckAction->setEnabled(false);
+        checkAction->setEnabled(false);
 
         foreach (const QModelIndex &index, indexes)
         {
@@ -578,8 +539,8 @@ void DataFilesPage::showContextMenu(const QPoint &point)
                 return;
 
             (mDataFilesModel->checkState(sourceIndex) == Qt::Checked)
-                    ? mUncheckAction->setEnabled(true)
+                    ? uncheckAction->setEnabled(true)
-                    : mCheckAction->setEnabled(true);
+                    : checkAction->setEnabled(true);
         }
 
         mContextMenu->exec(globalPos);

apps/launcher/datafilespage.hpp

@@ -48,11 +48,10 @@ public slots:
     void updateViews();
 
     // Action slots
-    void newProfile();
+    void on_newProfileAction_triggered();
-    void deleteProfile();
+    void on_deleteProfileAction_triggered();
-    void check();
+    void on_checkAction_triggered();
-    void uncheck();
+    void on_uncheckAction_triggered();
-    void refresh();
 
 private slots:
     void slotCurrentIndexChanged(int index);
@@ -65,23 +64,7 @@ private:
 
     QSortFilterProxyModel *mFilterProxyModel;
 
-//    QTableView *mMastersTable;
-//    QTableView *mPluginsTable;
-
-
-//    QToolBar *mProfileToolBar;
     QMenu *mContextMenu;
-//    QSplitter *mSplitter;
-
-    QAction *mNewProfileAction;
-    QAction *mDeleteProfileAction;
-    QAction *mCheckAction;
-    QAction *mUncheckAction;
-
-//    QAction *mMoveUpAction;
-//    QAction *mMoveDownAction;
-//    QAction *mMoveTopAction;
-//    QAction *mMoveBottomAction;
 
     Files::ConfigurationManager &mCfgMgr;
 

apps/launcher/playpage.cpp

@@ -6,13 +6,12 @@ PlayPage::PlayPage(QWidget *parent) : QWidget(parent)
 {
     setupUi(this);
 
-    // Hacks to get the stylesheet look properly on different platforms
+    // Hacks to get the stylesheet look properly
+#ifdef Q_OS_MAC
     QPlastiqueStyle *style = new QPlastiqueStyle;
-    QFont font = QApplication::font();
-    font.setPointSize(12); // Fixes problem with overlapping items
-
     profilesComboBox->setStyle(style);
-    profilesComboBox->setFont(font);
+#endif
+    profilesComboBox->setView(new QListView());
 
     connect(profilesComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(slotCurrentIndexChanged(int)));
     connect(playButton, SIGNAL(clicked()), this, SLOT(slotPlayClicked()));

apps/launcher/utils/textinputdialog.cpp

@@ -1,14 +1,14 @@
+#include "textinputdialog.hpp"
+
 #include <QDialogButtonBox>
 #include <QApplication>
 #include <QPushButton>
-#include <QLabel>
 #include <QVBoxLayout>
 #include <QValidator>
+#include <QLabel>
 
 #include <components/fileorderlist/utils/lineedit.hpp>
 
-#include "textinputdialog.hpp"
-
 TextInputDialog::TextInputDialog(const QString& title, const QString &text, QWidget *parent) :
     QDialog(parent)
 {
@@ -38,7 +38,6 @@ TextInputDialog::TextInputDialog(const QString& title, const QString &text, QWid
     Q_UNUSED(title);
 #endif
 
-    setMaximumHeight(height());
     setOkButtonEnabled(false);
     setModal(true);
 

files/ui/datafilespage.ui

@@ -67,6 +67,9 @@
      </item>
      <item>
       <widget class="ProfilesComboBox" name="profilesComboBox">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -107,6 +110,41 @@
     </layout>
    </item>
   </layout>
+  <action name="newProfileAction">
+   <property name="icon">
+    <iconset theme="document-new"/>
+   </property>
+   <property name="text">
+    <string>New Profile</string>
+   </property>
+   <property name="toolTip">
+    <string>New Profile</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+N</string>
+   </property>
+  </action>
+  <action name="deleteProfileAction">
+   <property name="icon">
+    <iconset theme="edit-delete"/>
+   </property>
+   <property name="text">
+    <string>Delete Profile</string>
+   </property>
+   <property name="toolTip">
+    <string>Delete Profile</string>
+   </property>
+  </action>
+  <action name="checkAction">
+   <property name="text">
+    <string>Check Selection</string>
+   </property>
+  </action>
+  <action name="uncheckAction">
+   <property name="text">
+    <string>Uncheck Selection</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

files/ui/mainwindow.ui

@@ -2,25 +2,17 @@
 <ui version="4.0">
  <class>MainWindow</class>
  <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>575</width>
-    <height>575</height>
-   </rect>
-  </property>
   <property name="minimumSize">
    <size>
     <width>575</width>
-    <height>575</height>
+    <height>525</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>OpenMW Launcher</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../resources.qrc">
+   <iconset resource="../launcher/launcher.qrc">
     <normaloff>:/images/openmw.png</normaloff>:/images/openmw.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
@@ -42,7 +34,7 @@
       <property name="styleSheet">
        <string notr="true">#iconWidget {
     background-image: url(&quot;:/images/openmw-header.png&quot;);
-    background-color: white;
+    background-color: palette(base);
     background-repeat: no-repeat;
     background-attachment: scroll;
     background-position: right;
@@ -74,7 +66,7 @@
   </widget>
  </widget>
  <resources>
-  <include location="../resources.qrc"/>
+  <include location="../launcher/launcher.qrc"/>
  </resources>
  <connections/>
 </ui>

files/ui/playpage.ui

@@ -58,6 +58,7 @@
 
     font-size: 12pt;
     font-family: "EB Garamond", "EB Garamond 08";
+	color: black;
 }
 
 #profilesComboBox::drop-down {
@@ -81,11 +82,10 @@
     left: 1px;
 }
 
+
 #profilesComboBox QAbstractItemView {
-    border: 2px solid lightgray;
+    border: 0px;
-    border-radius: 5px;
+}</string>
-}
-</string>
         </property>
        </widget>
       </item>
@@ -95,6 +95,7 @@
          <string notr="true">#profileLabel {
     font-size: 18pt;
     font-family: &quot;EB Garamond&quot;, &quot;EB Garamond 08&quot;;
+	color: black;
 }
 </string>
         </property>
@@ -185,8 +186,6 @@
    </item>
   </layout>
  </widget>
- <resources>
+ <resources/>
-  <include location="../resources.qrc"/>
- </resources>
  <connections/>
 </ui>