0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #230 from Scrumplex/fix-iconthemes

Browse Source 
Reorganize icon themes
This commit is contained in:
Ezekiel Smith 2022-03-08 01:20:35 +11:00 committed by GitHub
commit b6cf0359fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
}

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

@ -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,7 +294,12 @@
</item>
<item>
<property name="text">
<string notr="true">Flat</string>
<string>Flat</string>
</property>
</item>
<item>
<property name="text">
<string>Legacy</string>
</property>
</item>
<item>
@ -302,11 +307,6 @@
<string>Custom</string>
</property>
</item>
<item>
<property name="text">
<string>MultiMC</string>
</property>
</item>
</widget>
</item>
<item row="1" column="1">