diff options
| author | leo78913 <leo3758@riseup.net> | 2022-10-28 15:46:02 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-28 15:46:02 -0300 |
| commit | 4500e345b37f007f9e6311637db9df0351a57dfb (patch) | |
| tree | c523d60512749da628e822b579b47dda898782bc /launcher/ui/pages/global | |
| parent | 43bf601f120c9b1eac1c73feb31c67df54955b6d (diff) | |
| parent | e885f3c26a030d093e2c7e60770c069e4d958cff (diff) | |
| download | PrismLauncher-4500e345b37f007f9e6311637db9df0351a57dfb.tar.gz PrismLauncher-4500e345b37f007f9e6311637db9df0351a57dfb.tar.bz2 PrismLauncher-4500e345b37f007f9e6311637db9df0351a57dfb.zip | |
Merge branch 'PrismLauncher:develop' into toolbar-icons
Diffstat (limited to 'launcher/ui/pages/global')
| -rw-r--r-- | launcher/ui/pages/global/LauncherPage.cpp | 13 | ||||
| -rw-r--r-- | launcher/ui/pages/global/LauncherPage.ui | 5 |
2 files changed, 15 insertions, 3 deletions
diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp index b8431e8c..536ab22e 100644 --- a/launcher/ui/pages/global/LauncherPage.cpp +++ b/launcher/ui/pages/global/LauncherPage.cpp @@ -310,9 +310,12 @@ void LauncherPage::applySettings() s->set("IconTheme", "flat"); break; case 7: - s->set("IconTheme", "multimc"); + s->set("IconTheme", "flat_white"); break; case 8: + s->set("IconTheme", "multimc"); + break; + case 9: s->set("IconTheme", "custom"); break; } @@ -408,14 +411,18 @@ void LauncherPage::loadSettings() { ui->themeComboBox->setCurrentIndex(6); } - else if (theme == "multimc") + else if (theme == "flat_white") { ui->themeComboBox->setCurrentIndex(7); } - else if (theme == "custom") + else if (theme == "multimc") { ui->themeComboBox->setCurrentIndex(8); } + else if (theme == "custom") + { + ui->themeComboBox->setCurrentIndex(9); + } { auto currentTheme = s->get("ApplicationTheme").toString(); diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui index 0d14f147..76a25f2e 100644 --- a/launcher/ui/pages/global/LauncherPage.ui +++ b/launcher/ui/pages/global/LauncherPage.ui @@ -302,6 +302,11 @@ </item> <item> <property name="text"> + <string>Flat (White)</string> + </property> + </item> + <item> + <property name="text"> <string>Legacy</string> </property> </item> |