CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: add flat_white to code

Browse Source
This commit is contained in:
he3als 2022-10-22 15:50:06 +01:00
parent a6e65dfc7a
commit 99e1c13e80
5 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
launcher/CMakeLists.txt
View File

@ -602,6 +602,7 @@ SET(LAUNCHER_SOURCES
resources/OSX/OSX.qrc resources/OSX/OSX.qrc
resources/iOS/iOS.qrc resources/iOS/iOS.qrc
resources/flat/flat.qrc resources/flat/flat.qrc
resources/flat_white/flat_white.qrc
resources/documents/documents.qrc resources/documents/documents.qrc
../${Launcher_Branding_LogoQRC} ../${Launcher_Branding_LogoQRC}

1
launcher/main.cpp
View File

@ -84,6 +84,7 @@ int main(int argc, char *argv[])
Q_INIT_RESOURCE(OSX); Q_INIT_RESOURCE(OSX);
Q_INIT_RESOURCE(iOS); Q_INIT_RESOURCE(iOS);
Q_INIT_RESOURCE(flat); Q_INIT_RESOURCE(flat);
Q_INIT_RESOURCE(flat_white);
return app.exec(); return app.exec();
} }
case Application::Failed: case Application::Failed:

2
launcher/resources/flat_white/index.theme
View File

@ -1,5 +1,5 @@
[Icon Theme] [Icon Theme]
Name=White Flat Name=Flat (White)
Comment=White version of the flat icons (for dark mode) Comment=White version of the flat icons (for dark mode)
Inherits=multimc Inherits=multimc
Directories=scalable Directories=scalable

13
launcher/ui/pages/global/LauncherPage.cpp
View File

@ -310,9 +310,12 @@ void LauncherPage::applySettings()
s->set("IconTheme", "flat"); s->set("IconTheme", "flat");
break; break;
case 7: case 7:
s->set("IconTheme", "multimc"); s->set("IconTheme", "flat_white");
break; break;
case 8: case 8:
s->set("IconTheme", "multimc");
break;
case 9:
s->set("IconTheme", "custom"); s->set("IconTheme", "custom");
break; break;
} }
@ -408,14 +411,18 @@ void LauncherPage::loadSettings()
{ {
ui->themeComboBox->setCurrentIndex(6); ui->themeComboBox->setCurrentIndex(6);
} }
else if (theme == "multimc") else if (theme == "flat_white")
{ {
ui->themeComboBox->setCurrentIndex(7); ui->themeComboBox->setCurrentIndex(7);
} }
else if (theme == "custom") else if (theme == "multimc")
{ {
ui->themeComboBox->setCurrentIndex(8); ui->themeComboBox->setCurrentIndex(8);
} }
else if (theme == "custom")
{
ui->themeComboBox->setCurrentIndex(9);
}
{ {
auto currentTheme = s->get("ApplicationTheme").toString(); auto currentTheme = s->get("ApplicationTheme").toString();

5
launcher/ui/pages/global/LauncherPage.ui
View File

@ -300,6 +300,11 @@
<string>Flat</string> <string>Flat</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Flat (White)</string>
</property>
</item>
<item> <item>
<property name="text"> <property name="text">
<string>Legacy</string> <string>Legacy</string>