diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
index 17e19b58..5ced4979 100644
--- a/application/CMakeLists.txt
+++ b/application/CMakeLists.txt
@@ -279,6 +279,7 @@ set(MULTIMC_QRCS
resources/pe_blue/pe_blue.qrc
resources/OSX/OSX.qrc
resources/iOS/iOS.qrc
+ resources/flat/flat.qrc
resources/documents/documents.qrc
)
diff --git a/application/main.cpp b/application/main.cpp
index 48983dd6..ade05faf 100644
--- a/application/main.cpp
+++ b/application/main.cpp
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
Q_INIT_RESOURCE(pe_colored);
Q_INIT_RESOURCE(OSX);
Q_INIT_RESOURCE(iOS);
+ Q_INIT_RESOURCE(flat);
return app.exec();
}
case MultiMC::Failed:
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
@@ -302,6 +302,11 @@
iOS
+ -
+
+ Flat
+
+
-
Custom
diff --git a/application/resources/flat/flat.qrc b/application/resources/flat/flat.qrc
new file mode 100644
index 00000000..aee2e30c
--- /dev/null
+++ b/application/resources/flat/flat.qrc
@@ -0,0 +1,44 @@
+
+
+
+ index.theme
+ scalable/about.svg
+ scalable/accounts.svg
+ scalable/bug.svg
+ scalable/cat.svg
+ scalable/centralmods.svg
+ scalable/checkupdate.svg
+ scalable/copy.svg
+ scalable/coremods.svg
+ scalable/discord.svg
+ scalable/externaltools.svg
+ scalable/help.svg
+ scalable/instance-settings.svg
+ scalable/jarmods.svg
+ scalable/java.svg
+ scalable/loadermods.svg
+ scalable/log.svg
+ scalable/minecraft.svg
+ scalable/multimc.svg
+ scalable/new.svg
+ scalable/news.svg
+ scalable/notes.svg
+ scalable/packages.svg
+ scalable/patreon.svg
+ scalable/proxy.svg
+ scalable/quickmods.svg
+ scalable/reddit-alien.svg
+ scalable/refresh.svg
+ scalable/resourcepacks.svg
+ scalable/screenshot-placeholder.svg
+ scalable/screenshots.svg
+ scalable/settings.svg
+ scalable/star.svg
+ scalable/status-bad.svg
+ scalable/status-good.svg
+ scalable/status-running.svg
+ scalable/status-yellow.svg
+ scalable/viewfolder.svg
+ scalable/worlds.svg
+
+
diff --git a/application/resources/flat/index.theme b/application/resources/flat/index.theme
new file mode 100644
index 00000000..34e27aa0
--- /dev/null
+++ b/application/resources/flat/index.theme
@@ -0,0 +1,11 @@
+[Icon Theme]
+Name=Flat
+Comment=Flat icons
+Inherits=multimc
+Directories=scalable
+
+[scalable]
+Size=48
+Type=Scalable
+MinSize=16
+MaxSize=256
diff --git a/application/resources/flat/scalable/about.svg b/application/resources/flat/scalable/about.svg
new file mode 100644
index 00000000..4f85045d
--- /dev/null
+++ b/application/resources/flat/scalable/about.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/accounts.svg b/application/resources/flat/scalable/accounts.svg
new file mode 100644
index 00000000..e6a1328d
--- /dev/null
+++ b/application/resources/flat/scalable/accounts.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/bug.svg b/application/resources/flat/scalable/bug.svg
new file mode 100644
index 00000000..ea370faa
--- /dev/null
+++ b/application/resources/flat/scalable/bug.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/cat.svg b/application/resources/flat/scalable/cat.svg
new file mode 100644
index 00000000..e90763b5
--- /dev/null
+++ b/application/resources/flat/scalable/cat.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/centralmods.svg b/application/resources/flat/scalable/centralmods.svg
new file mode 100644
index 00000000..c694662a
--- /dev/null
+++ b/application/resources/flat/scalable/centralmods.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/checkupdate.svg b/application/resources/flat/scalable/checkupdate.svg
new file mode 100644
index 00000000..e6525a08
--- /dev/null
+++ b/application/resources/flat/scalable/checkupdate.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/copy.svg b/application/resources/flat/scalable/copy.svg
new file mode 100644
index 00000000..36986e0d
--- /dev/null
+++ b/application/resources/flat/scalable/copy.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/coremods.svg b/application/resources/flat/scalable/coremods.svg
new file mode 100644
index 00000000..21a3450e
--- /dev/null
+++ b/application/resources/flat/scalable/coremods.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/discord.svg b/application/resources/flat/scalable/discord.svg
new file mode 100644
index 00000000..ad63180f
--- /dev/null
+++ b/application/resources/flat/scalable/discord.svg
@@ -0,0 +1,4 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/externaltools.svg b/application/resources/flat/scalable/externaltools.svg
new file mode 100644
index 00000000..55820dfc
--- /dev/null
+++ b/application/resources/flat/scalable/externaltools.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/help.svg b/application/resources/flat/scalable/help.svg
new file mode 100644
index 00000000..26d5d7f4
--- /dev/null
+++ b/application/resources/flat/scalable/help.svg
@@ -0,0 +1,17 @@
+
+
diff --git a/application/resources/flat/scalable/instance-settings.svg b/application/resources/flat/scalable/instance-settings.svg
new file mode 100644
index 00000000..dd9d86ed
--- /dev/null
+++ b/application/resources/flat/scalable/instance-settings.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/jarmods.svg b/application/resources/flat/scalable/jarmods.svg
new file mode 100644
index 00000000..db90fa34
--- /dev/null
+++ b/application/resources/flat/scalable/jarmods.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/java.svg b/application/resources/flat/scalable/java.svg
new file mode 100644
index 00000000..dc19ee23
--- /dev/null
+++ b/application/resources/flat/scalable/java.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/loadermods.svg b/application/resources/flat/scalable/loadermods.svg
new file mode 100644
index 00000000..8a2fd12c
--- /dev/null
+++ b/application/resources/flat/scalable/loadermods.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/log.svg b/application/resources/flat/scalable/log.svg
new file mode 100644
index 00000000..e8caa08a
--- /dev/null
+++ b/application/resources/flat/scalable/log.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/minecraft.svg b/application/resources/flat/scalable/minecraft.svg
new file mode 100644
index 00000000..c17c44cd
--- /dev/null
+++ b/application/resources/flat/scalable/minecraft.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/multimc.svg b/application/resources/flat/scalable/multimc.svg
new file mode 100644
index 00000000..1c1f2359
--- /dev/null
+++ b/application/resources/flat/scalable/multimc.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/new.svg b/application/resources/flat/scalable/new.svg
new file mode 100644
index 00000000..01f19d7c
--- /dev/null
+++ b/application/resources/flat/scalable/new.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/news.svg b/application/resources/flat/scalable/news.svg
new file mode 100644
index 00000000..8868414e
--- /dev/null
+++ b/application/resources/flat/scalable/news.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/notes.svg b/application/resources/flat/scalable/notes.svg
new file mode 100644
index 00000000..ebe0cb5a
--- /dev/null
+++ b/application/resources/flat/scalable/notes.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/packages.svg b/application/resources/flat/scalable/packages.svg
new file mode 100644
index 00000000..fe576a43
--- /dev/null
+++ b/application/resources/flat/scalable/packages.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/patreon.svg b/application/resources/flat/scalable/patreon.svg
new file mode 100644
index 00000000..ad561f57
--- /dev/null
+++ b/application/resources/flat/scalable/patreon.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/proxy.svg b/application/resources/flat/scalable/proxy.svg
new file mode 100644
index 00000000..4956fec8
--- /dev/null
+++ b/application/resources/flat/scalable/proxy.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/quickmods.svg b/application/resources/flat/scalable/quickmods.svg
new file mode 100644
index 00000000..952d1e0e
--- /dev/null
+++ b/application/resources/flat/scalable/quickmods.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/reddit-alien.svg b/application/resources/flat/scalable/reddit-alien.svg
new file mode 100644
index 00000000..9bcfbedc
--- /dev/null
+++ b/application/resources/flat/scalable/reddit-alien.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/refresh.svg b/application/resources/flat/scalable/refresh.svg
new file mode 100644
index 00000000..94be1e27
--- /dev/null
+++ b/application/resources/flat/scalable/refresh.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/resourcepacks.svg b/application/resources/flat/scalable/resourcepacks.svg
new file mode 100644
index 00000000..b6054baf
--- /dev/null
+++ b/application/resources/flat/scalable/resourcepacks.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/screenshot-placeholder.svg b/application/resources/flat/scalable/screenshot-placeholder.svg
new file mode 100644
index 00000000..99e0c17a
--- /dev/null
+++ b/application/resources/flat/scalable/screenshot-placeholder.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/screenshots.svg b/application/resources/flat/scalable/screenshots.svg
new file mode 100644
index 00000000..208bb104
--- /dev/null
+++ b/application/resources/flat/scalable/screenshots.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/settings.svg b/application/resources/flat/scalable/settings.svg
new file mode 100644
index 00000000..dd9d86ed
--- /dev/null
+++ b/application/resources/flat/scalable/settings.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/star.svg b/application/resources/flat/scalable/star.svg
new file mode 100644
index 00000000..878bdca8
--- /dev/null
+++ b/application/resources/flat/scalable/star.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/status-bad.svg b/application/resources/flat/scalable/status-bad.svg
new file mode 100644
index 00000000..3f8e0116
--- /dev/null
+++ b/application/resources/flat/scalable/status-bad.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/status-good.svg b/application/resources/flat/scalable/status-good.svg
new file mode 100644
index 00000000..3503d6ba
--- /dev/null
+++ b/application/resources/flat/scalable/status-good.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/status-running.svg b/application/resources/flat/scalable/status-running.svg
new file mode 100644
index 00000000..7c750319
--- /dev/null
+++ b/application/resources/flat/scalable/status-running.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/status-yellow.svg b/application/resources/flat/scalable/status-yellow.svg
new file mode 100644
index 00000000..ac2d2349
--- /dev/null
+++ b/application/resources/flat/scalable/status-yellow.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/viewfolder.svg b/application/resources/flat/scalable/viewfolder.svg
new file mode 100644
index 00000000..2f5e29c9
--- /dev/null
+++ b/application/resources/flat/scalable/viewfolder.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/application/resources/flat/scalable/worlds.svg b/application/resources/flat/scalable/worlds.svg
new file mode 100644
index 00000000..95a59bd4
--- /dev/null
+++ b/application/resources/flat/scalable/worlds.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file