diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-10-26 23:44:20 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-10-26 23:44:20 +0100 |
| commit | 8f7aec032b11a2e2b3034c9d9719a74726dad130 (patch) | |
| tree | 607355469c2305aca17e40af49d85f0365c30f4f /gui/pages | |
| parent | 92560bf0cd8bab77405081f30711a32282e29ba2 (diff) | |
| download | MultiMC-8f7aec032b11a2e2b3034c9d9719a74726dad130.tar MultiMC-8f7aec032b11a2e2b3034c9d9719a74726dad130.tar.gz MultiMC-8f7aec032b11a2e2b3034c9d9719a74726dad130.tar.lz MultiMC-8f7aec032b11a2e2b3034c9d9719a74726dad130.tar.xz MultiMC-8f7aec032b11a2e2b3034c9d9719a74726dad130.zip | |
Add dark, light, blue and colored theme from pe.
Replaces the old dark and light themes
Diffstat (limited to 'gui/pages')
| -rw-r--r-- | gui/pages/LegacyJarModPage.h | 2 | ||||
| -rw-r--r-- | gui/pages/global/ExternalToolsPage.h | 2 | ||||
| -rw-r--r-- | gui/pages/global/MultiMCPage.cpp | 14 | ||||
| -rw-r--r-- | gui/pages/global/MultiMCPage.ui | 12 |
4 files changed, 27 insertions, 3 deletions
diff --git a/gui/pages/LegacyJarModPage.h b/gui/pages/LegacyJarModPage.h index 1a72abf3..90c7f228 100644 --- a/gui/pages/LegacyJarModPage.h +++ b/gui/pages/LegacyJarModPage.h @@ -41,7 +41,7 @@ public: } virtual QIcon icon() const { - return QIcon::fromTheme("plugin-red"); + return QIcon::fromTheme("jarmods"); } virtual QString id() const { diff --git a/gui/pages/global/ExternalToolsPage.h b/gui/pages/global/ExternalToolsPage.h index 027e164e..1188f22b 100644 --- a/gui/pages/global/ExternalToolsPage.h +++ b/gui/pages/global/ExternalToolsPage.h @@ -37,7 +37,7 @@ public: } QIcon icon() const override { - return QIcon::fromTheme("plugin-blue"); + return QIcon::fromTheme("externaltools"); } QString id() const override { diff --git a/gui/pages/global/MultiMCPage.cpp b/gui/pages/global/MultiMCPage.cpp index 73a5ff20..9694a138 100644 --- a/gui/pages/global/MultiMCPage.cpp +++ b/gui/pages/global/MultiMCPage.cpp @@ -276,6 +276,12 @@ void MultiMCPage::applySettings() case 2: s->set("IconTheme", "pe_light"); break; + case 3: + s->set("IconTheme", "pe_blue"); + break; + case 4: + s->set("IconTheme", "pe_colored"); + break; case 0: default: s->set("IconTheme", "multimc"); @@ -333,6 +339,14 @@ void MultiMCPage::loadSettings() { ui->themeComboBox->setCurrentIndex(2); } + else if (theme == "pe_blue") + { + ui->themeComboBox->setCurrentIndex(3); + } + else if (theme == "pe_colored") + { + ui->themeComboBox->setCurrentIndex(4); + } else { ui->themeComboBox->setCurrentIndex(0); diff --git a/gui/pages/global/MultiMCPage.ui b/gui/pages/global/MultiMCPage.ui index f456ebc1..94592476 100644 --- a/gui/pages/global/MultiMCPage.ui +++ b/gui/pages/global/MultiMCPage.ui @@ -336,7 +336,7 @@ </item> <item> <property name="text"> - <string>Simple</string> + <string>Simple (Dark Icons)</string> </property> </item> <item> @@ -344,6 +344,16 @@ <string>Simple (Light Icons)</string> </property> </item> + <item> + <property name="text"> + <string>Simple (Blue Icons)</string> + </property> + </item> + <item> + <property name="text"> + <string>Simple (Colored Icons)</string> + </property> + </item> </widget> </item> </layout> |