Merge pull request #372 from santiagocezar/rory
This commit is contained in:
@ -334,6 +334,18 @@ void LauncherPage::applySettings()
|
||||
APPLICATION->setApplicationTheme(newAppTheme, false);
|
||||
}
|
||||
|
||||
switch (ui->themeBackgroundCat->currentIndex()) {
|
||||
case 0: // original cat
|
||||
s->set("BackgroundCat", "kitteh");
|
||||
break;
|
||||
case 1: // rory the cat
|
||||
s->set("BackgroundCat", "rory");
|
||||
break;
|
||||
case 2: // rory the cat flat edition
|
||||
s->set("BackgroundCat", "rory-flat");
|
||||
break;
|
||||
}
|
||||
|
||||
s->set("MenuBarInsteadOfToolBar", ui->preferMenuBarCheckBox->isChecked());
|
||||
|
||||
// Console settings
|
||||
@ -425,6 +437,15 @@ void LauncherPage::loadSettings()
|
||||
ui->themeComboBox->setCurrentIndex(9);
|
||||
}
|
||||
|
||||
auto cat = s->get("BackgroundCat").toString();
|
||||
if (cat == "kitteh") {
|
||||
ui->themeBackgroundCat->setCurrentIndex(0);
|
||||
} else if (cat == "rory") {
|
||||
ui->themeBackgroundCat->setCurrentIndex(1);
|
||||
} else if (cat == "rory-flat") {
|
||||
ui->themeBackgroundCat->setCurrentIndex(2);
|
||||
}
|
||||
|
||||
{
|
||||
auto currentTheme = s->get("ApplicationTheme").toString();
|
||||
auto themes = APPLICATION->getValidApplicationThemes();
|
||||
|
@ -340,6 +340,44 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="text">
|
||||
<string>C&at</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>themeBackgroundCat</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QComboBox" name="themeBackgroundCat">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="focusPolicy">
|
||||
<enum>Qt::StrongFocus</enum>
|
||||
</property>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Background Cat (from MultiMC)</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Rory ID 11 (drawn by Ashtaka)</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Rory ID 11 (flat edition, drawn by Ashtaka)</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
|
Reference in New Issue
Block a user