summaryrefslogtreecommitdiffstats
path: root/application/pages/global
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-12-03 21:52:40 +0100
committerPetr Mrázek <peterix@gmail.com>2017-12-03 21:52:40 +0100
commit90a3997d2c74e1a4375d01ae9e5162ed65c48b64 (patch)
tree6406a3ecf303185e1603cab866593f5e072f864a /application/pages/global
parentd6fc37e486ed656f6bb8e687a432595819661b3a (diff)
downloadMultiMC-90a3997d2c74e1a4375d01ae9e5162ed65c48b64.tar
MultiMC-90a3997d2c74e1a4375d01ae9e5162ed65c48b64.tar.gz
MultiMC-90a3997d2c74e1a4375d01ae9e5162ed65c48b64.tar.lz
MultiMC-90a3997d2c74e1a4375d01ae9e5162ed65c48b64.tar.xz
MultiMC-90a3997d2c74e1a4375d01ae9e5162ed65c48b64.zip
NOISSUE add flat icon theme by Michael
It's the google icon font, all scalable and grey.
Diffstat (limited to 'application/pages/global')
-rw-r--r--application/pages/global/MultiMCPage.cpp9
-rw-r--r--application/pages/global/MultiMCPage.ui5
2 files changed, 13 insertions, 1 deletions
diff --git a/application/pages/global/MultiMCPage.cpp b/application/pages/global/MultiMCPage.cpp
index 88c3a3b1..3b93ebee 100644
--- a/application/pages/global/MultiMCPage.cpp
+++ b/application/pages/global/MultiMCPage.cpp
@@ -270,6 +270,9 @@ void MultiMCPage::applySettings()
s->set("IconTheme", "iOS");
break;
case 7:
+ s->set("IconTheme", "flat");
+ break;
+ case 8:
s->set("IconTheme", "custom");
break;
case 0:
@@ -363,10 +366,14 @@ void MultiMCPage::loadSettings()
{
ui->themeComboBox->setCurrentIndex(6);
}
- else if (theme == "custom")
+ else if (theme == "flat")
{
ui->themeComboBox->setCurrentIndex(7);
}
+ else if (theme == "custom")
+ {
+ ui->themeComboBox->setCurrentIndex(8);
+ }
else
{
ui->themeComboBox->setCurrentIndex(0);
diff --git a/application/pages/global/MultiMCPage.ui b/application/pages/global/MultiMCPage.ui
index 6280439a..124401c3 100644
--- a/application/pages/global/MultiMCPage.ui
+++ b/application/pages/global/MultiMCPage.ui
@@ -304,6 +304,11 @@
</item>
<item>
<property name="text">
+ <string notr="true">Flat</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
<string>Custom</string>
</property>
</item>