add rory
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com> Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com>
@ -501,6 +501,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
|
|||||||
// Theming
|
// Theming
|
||||||
m_settings->registerSetting("IconTheme", QString("pe_colored"));
|
m_settings->registerSetting("IconTheme", QString("pe_colored"));
|
||||||
m_settings->registerSetting("ApplicationTheme", QString("system"));
|
m_settings->registerSetting("ApplicationTheme", QString("system"));
|
||||||
|
m_settings->registerSetting("BackgroundCat", QString("kitteh"));
|
||||||
|
|
||||||
// Remembered state
|
// Remembered state
|
||||||
m_settings->registerSetting("LastUsedGroupForNewInstance", QString());
|
m_settings->registerSetting("LastUsedGroupForNewInstance", QString());
|
||||||
|
@ -1,8 +1,11 @@
|
|||||||
<!DOCTYPE RCC>
|
<!DOCTYPE RCC>
|
||||||
<RCC version="1.0">
|
<RCC version="1.0">
|
||||||
<qresource prefix="/backgrounds">
|
<qresource prefix="/backgrounds">
|
||||||
<file alias="kitteh">catbgrnd2.png</file>
|
<file alias="kitteh">kitteh.png</file>
|
||||||
<file alias="catmas">catmas.png</file>
|
<file alias="kitteh-xmas">kitteh-xmas.png</file>
|
||||||
<file alias="cattiversary">cattiversary.png</file>
|
<file alias="kitteh-bday">kitteh-bday.png</file>
|
||||||
|
<file alias="rory">rory.png</file>
|
||||||
|
<file alias="rory-xmas">rory-xmas.png</file>
|
||||||
|
<file alias="rory-bday">rory-bday.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
BIN
launcher/resources/backgrounds/generic.jpg
Normal file
After Width: | Height: | Size: 327 KiB |
Before Width: | Height: | Size: 97 KiB After Width: | Height: | Size: 97 KiB |
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 71 KiB |
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 62 KiB |
BIN
launcher/resources/backgrounds/rory-bday.png
Normal file
After Width: | Height: | Size: 87 KiB |
BIN
launcher/resources/backgrounds/rory-xmas.png
Normal file
After Width: | Height: | Size: 88 KiB |
BIN
launcher/resources/backgrounds/rory.png
Normal file
After Width: | Height: | Size: 88 KiB |
@ -1560,15 +1560,15 @@ void MainWindow::setCatBackground(bool enabled)
|
|||||||
QDateTime now = QDateTime::currentDateTime();
|
QDateTime now = QDateTime::currentDateTime();
|
||||||
QDateTime birthday(QDate(now.date().year(), 11, 30), QTime(0, 0));
|
QDateTime birthday(QDate(now.date().year(), 11, 30), QTime(0, 0));
|
||||||
QDateTime xmas(QDate(now.date().year(), 12, 25), QTime(0, 0));
|
QDateTime xmas(QDate(now.date().year(), 12, 25), QTime(0, 0));
|
||||||
QString cat;
|
QString cat = APPLICATION->settings()->get("BackgroundCat").toString();
|
||||||
|
|
||||||
|
qDebug() << "The choosen cat is " << cat << ".";
|
||||||
|
|
||||||
if(non_stupid_abs(now.daysTo(xmas)) <= 4) {
|
if(non_stupid_abs(now.daysTo(xmas)) <= 4) {
|
||||||
cat = "catmas";
|
cat += "-xmas";
|
||||||
}
|
}
|
||||||
else if (non_stupid_abs(now.daysTo(birthday)) <= 12) {
|
else if (non_stupid_abs(now.daysTo(birthday)) <= 12) {
|
||||||
cat = "cattiversary";
|
cat += "-bday";
|
||||||
}
|
|
||||||
else {
|
|
||||||
cat = "kitteh";
|
|
||||||
}
|
}
|
||||||
view->setStyleSheet(QString(R"(
|
view->setStyleSheet(QString(R"(
|
||||||
InstanceView
|
InstanceView
|
||||||
@ -1576,10 +1576,11 @@ InstanceView
|
|||||||
background-image: url(:/backgrounds/%1);
|
background-image: url(:/backgrounds/%1);
|
||||||
background-attachment: fixed;
|
background-attachment: fixed;
|
||||||
background-clip: padding;
|
background-clip: padding;
|
||||||
background-position: top right;
|
background-position: bottom left;
|
||||||
background-repeat: none;
|
background-repeat: none;
|
||||||
background-color:palette(base);
|
background-color:palette(base);
|
||||||
})").arg(cat));
|
})")
|
||||||
|
.arg(cat));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -334,6 +334,15 @@ void LauncherPage::applySettings()
|
|||||||
APPLICATION->setApplicationTheme(newAppTheme, false);
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
s->set("MenuBarInsteadOfToolBar", ui->preferMenuBarCheckBox->isChecked());
|
s->set("MenuBarInsteadOfToolBar", ui->preferMenuBarCheckBox->isChecked());
|
||||||
|
|
||||||
// Console settings
|
// Console settings
|
||||||
@ -425,6 +434,13 @@ void LauncherPage::loadSettings()
|
|||||||
ui->themeComboBox->setCurrentIndex(9);
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
auto currentTheme = s->get("ApplicationTheme").toString();
|
auto currentTheme = s->get("ApplicationTheme").toString();
|
||||||
auto themes = APPLICATION->getValidApplicationThemes();
|
auto themes = APPLICATION->getValidApplicationThemes();
|
||||||
|
@ -340,6 +340,39 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="2" column="0">
|
||||||
|
<widget class="QLabel" name="label_5">
|
||||||
|
<property name="text">
|
||||||
|
<string>Cat</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>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|