diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-06-30 22:22:09 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-06-30 22:22:09 +0200 |
| commit | e241c3625c2e0f005ee2cb01577ceeb054bbbd98 (patch) | |
| tree | b874caae329a536ca15b331be386cf481307d28f /gui/dialogs | |
| parent | 421a46e3d3036ea0dea4889125ee58309d0ed21e (diff) | |
| parent | d2b2d55aa9a4031d1e179534796cbe07bc57080f (diff) | |
| download | MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.tar MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.tar.gz MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.tar.lz MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.tar.xz MultiMC-e241c3625c2e0f005ee2cb01577ceeb054bbbd98.zip | |
Merge branch 'feature_theme_support' into develop
Conflicts:
main.cpp
Diffstat (limited to 'gui/dialogs')
| -rw-r--r-- | gui/dialogs/SettingsDialog.cpp | 30 | ||||
| -rw-r--r-- | gui/dialogs/SettingsDialog.ui | 39 |
2 files changed, 66 insertions, 3 deletions
diff --git a/gui/dialogs/SettingsDialog.cpp b/gui/dialogs/SettingsDialog.cpp index 65b17885..87da0c68 100644 --- a/gui/dialogs/SettingsDialog.cpp +++ b/gui/dialogs/SettingsDialog.cpp @@ -326,7 +326,20 @@ void SettingsDialog::applySettings(SettingsObject *s) // Updates s->set("AutoUpdate", ui->autoUpdateCheckBox->isChecked()); s->set("UpdateChannel", m_currentUpdateChannel); - + //FIXME: make generic + switch (ui->themeComboBox->currentIndex()) + { + case 1: + s->set("IconTheme", "pe_dark"); + break; + case 2: + s->set("IconTheme", "pe_light"); + break; + case 0: + default: + s->set("IconTheme", "multimc"); + break; + } // FTB s->set("TrackFTBInstances", ui->trackFtbBox->isChecked()); s->set("FTBLauncherRoot", ui->ftbLauncherBox->text()); @@ -429,7 +442,20 @@ void SettingsDialog::loadSettings(SettingsObject *s) // Updates ui->autoUpdateCheckBox->setChecked(s->get("AutoUpdate").toBool()); m_currentUpdateChannel = s->get("UpdateChannel").toString(); - + //FIXME: make generic + auto theme = s->get("IconTheme").toString(); + if (theme == "pe_dark") + { + ui->themeComboBox->setCurrentIndex(1); + } + else if (theme == "pe_light") + { + ui->themeComboBox->setCurrentIndex(2); + } + else + { + ui->themeComboBox->setCurrentIndex(0); + } // FTB ui->trackFtbBox->setChecked(s->get("TrackFTBInstances").toBool()); ui->ftbLauncherBox->setText(s->get("FTBLauncherRoot").toString()); diff --git a/gui/dialogs/SettingsDialog.ui b/gui/dialogs/SettingsDialog.ui index 74ed68d2..d4e90302 100644 --- a/gui/dialogs/SettingsDialog.ui +++ b/gui/dialogs/SettingsDialog.ui @@ -20,7 +20,7 @@ <string>Settings</string> </property> <property name="windowIcon"> - <iconset resource="../../graphics.qrc"> + <iconset> <normaloff>:/icons/toolbar/settings</normaloff>:/icons/toolbar/settings</iconset> </property> <property name="modal"> @@ -327,6 +327,43 @@ </widget> </item> <item> + <widget class="QGroupBox" name="themeBox"> + <property name="title"> + <string>Icon Theme</string> + </property> + <layout class="QHBoxLayout" name="themeBoxLayout"> + <item> + <widget class="QComboBox" name="themeComboBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string>Default</string> + </property> + </item> + <item> + <property name="text"> + <string>Simple</string> + </property> + </item> + <item> + <property name="text"> + <string>Simple (Light Icons)</string> + </property> + </item> + </widget> + </item> + </layout> + </widget> + </item> + <item> <widget class="QGroupBox" name="editorsBox"> <property name="title"> <string>External Editors (leave empty for system default)</string> |