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

Merge pull request #107 from redstrate/fix_icon_bug

Browse Source 
Fix icons changing when exiting the settings window
This commit is contained in:
swirl 2022-01-28 09:31:41 -05:00 committed by GitHub
commit f36930d812
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,33 +246,32 @@ void LauncherPage::applySettings()
//FIXME: make generic
switch (ui->themeComboBox->currentIndex())
{
case 1:
case 0:
s->set("IconTheme", "pe_dark");
break;
case 2:
case 1:
s->set("IconTheme", "pe_light");
break;
case 3:
case 2:
s->set("IconTheme", "pe_blue");
break;
case 4:
s->set("IconTheme", "multimc");
case 3:
s->set("IconTheme", "pe_colored");
break;
case 5:
case 4:
s->set("IconTheme", "OSX");
break;
case 6:
case 5:
s->set("IconTheme", "iOS");
break;
case 7:
case 6:
s->set("IconTheme", "flat");
break;
case 8:
case 7:
s->set("IconTheme", "custom");
break;
case 0:
default:
s->set("IconTheme", "pe_colored");
case 8:
s->set("IconTheme", "multimc");
break;
}
@ -327,29 +326,33 @@ void LauncherPage::loadSettings()
auto theme = s->get("IconTheme").toString();
if (theme == "pe_dark")
{
ui->themeComboBox->setCurrentIndex(1);
ui->themeComboBox->setCurrentIndex(0);
}
else if (theme == "pe_light")
{
ui->themeComboBox->setCurrentIndex(2);
ui->themeComboBox->setCurrentIndex(1);
}
else if (theme == "pe_blue")
{
ui->themeComboBox->setCurrentIndex(3);
ui->themeComboBox->setCurrentIndex(2);
}
else if (theme == "pe_colored")
{
ui->themeComboBox->setCurrentIndex(4);
ui->themeComboBox->setCurrentIndex(3);
}
else if (theme == "OSX")
{
ui->themeComboBox->setCurrentIndex(5);
ui->themeComboBox->setCurrentIndex(4);
}
else if (theme == "iOS")
{
ui->themeComboBox->setCurrentIndex(6);
ui->themeComboBox->setCurrentIndex(5);
}
else if (theme == "flat")
{
ui->themeComboBox->setCurrentIndex(6);
}
else if (theme == "multimc")
{
ui->themeComboBox->setCurrentIndex(7);
}
@ -357,10 +360,6 @@ void LauncherPage::loadSettings()
{
ui->themeComboBox->setCurrentIndex(8);
}
else
{
ui->themeComboBox->setCurrentIndex(0);
}
{
auto currentTheme = s->get("ApplicationTheme").toString();

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

@ -262,11 +262,6 @@
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<item>
<property name="text">
<string>Default</string>
</property>
</item>
<item>
<property name="text">
<string>Simple (Dark Icons)</string>
@ -307,6 +302,11 @@
<string>Custom</string>
</property>
</item>
<item>
<property name="text">
<string>MultiMC</string>
</property>
</item>
</widget>
</item>
<item row="1" column="1">