diff options
| author | Ezekiel Smith <ezekielsmith@protonmail.com> | 2022-03-08 01:20:35 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-08 01:20:35 +1100 |
| commit | b6cf0359faf1d366a4afd92930008d25ea492049 (patch) | |
| tree | 3dd654dfc3a7a7f92bd5b621cafb0d91579a3783 /launcher/ui/pages | |
| parent | 53468ea474fb29886192a6fab0a25d1219fd9a1c (diff) | |
| parent | 3697d70b48ec2c54d1574fdb0b051c61c2430f51 (diff) | |
| download | PrismLauncher-b6cf0359faf1d366a4afd92930008d25ea492049.tar.gz PrismLauncher-b6cf0359faf1d366a4afd92930008d25ea492049.tar.bz2 PrismLauncher-b6cf0359faf1d366a4afd92930008d25ea492049.zip | |
Merge pull request #230 from Scrumplex/fix-iconthemes
Reorganize icon themes
Diffstat (limited to 'launcher/ui/pages')
| -rw-r--r-- | launcher/ui/pages/global/LauncherPage.cpp | 16 | ||||
| -rw-r--r-- | launcher/ui/pages/global/LauncherPage.ui | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp index 0ffe8050..cec496dc 100644 --- a/launcher/ui/pages/global/LauncherPage.cpp +++ b/launcher/ui/pages/global/LauncherPage.cpp @@ -247,16 +247,16 @@ void LauncherPage::applySettings() switch (ui->themeComboBox->currentIndex()) { case 0: - s->set("IconTheme", "pe_dark"); + s->set("IconTheme", "pe_colored"); break; case 1: s->set("IconTheme", "pe_light"); break; case 2: - s->set("IconTheme", "pe_blue"); + s->set("IconTheme", "pe_dark"); break; case 3: - s->set("IconTheme", "pe_colored"); + s->set("IconTheme", "pe_blue"); break; case 4: s->set("IconTheme", "OSX"); @@ -268,10 +268,10 @@ void LauncherPage::applySettings() s->set("IconTheme", "flat"); break; case 7: - s->set("IconTheme", "custom"); + s->set("IconTheme", "multimc"); break; case 8: - s->set("IconTheme", "multimc"); + s->set("IconTheme", "custom"); break; } @@ -324,7 +324,7 @@ void LauncherPage::loadSettings() m_currentUpdateChannel = s->get("UpdateChannel").toString(); //FIXME: make generic auto theme = s->get("IconTheme").toString(); - if (theme == "pe_dark") + if (theme == "pe_colored") { ui->themeComboBox->setCurrentIndex(0); } @@ -332,11 +332,11 @@ void LauncherPage::loadSettings() { ui->themeComboBox->setCurrentIndex(1); } - else if (theme == "pe_blue") + else if (theme == "pe_dark") { ui->themeComboBox->setCurrentIndex(2); } - else if (theme == "pe_colored") + else if (theme == "pe_blue") { ui->themeComboBox->setCurrentIndex(3); } diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui index 47fed873..59096a28 100644 --- a/launcher/ui/pages/global/LauncherPage.ui +++ b/launcher/ui/pages/global/LauncherPage.ui @@ -264,7 +264,7 @@ </property> <item> <property name="text"> - <string>Simple (Dark Icons)</string> + <string>Simple (Colored Icons)</string> </property> </item> <item> @@ -274,12 +274,12 @@ </item> <item> <property name="text"> - <string>Simple (Blue Icons)</string> + <string>Simple (Dark Icons)</string> </property> </item> <item> <property name="text"> - <string>Simple (Colored Icons)</string> + <string>Simple (Blue Icons)</string> </property> </item> <item> @@ -294,17 +294,17 @@ </item> <item> <property name="text"> - <string notr="true">Flat</string> + <string>Flat</string> </property> </item> <item> <property name="text"> - <string>Custom</string> + <string>Legacy</string> </property> </item> <item> <property name="text"> - <string>MultiMC</string> + <string>Custom</string> </property> </item> </widget> |