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

Merge pull request #396 from leozamboni/develop

Browse Source
This commit is contained in:
Sefa Eyeoglu 2022-11-05 11:17:13 +01:00 committed by GitHub
commit ba8322aa5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
launcher/resources/backgrounds/backgrounds.qrc
View File

@ -4,6 +4,7 @@
<file alias="kitteh">kitteh.png</file> <file alias="kitteh">kitteh.png</file>
<file alias="kitteh-xmas">kitteh-xmas.png</file> <file alias="kitteh-xmas">kitteh-xmas.png</file>
<file alias="kitteh-bday">kitteh-bday.png</file> <file alias="kitteh-bday">kitteh-bday.png</file>
<file alias="kitteh-ween">kitteh-ween.png</file>
<file alias="rory">rory.png</file> <file alias="rory">rory.png</file>
<file alias="rory-xmas">rory-xmas.png</file> <file alias="rory-xmas">rory-xmas.png</file>
<file alias="rory-bday">rory-bday.png</file> <file alias="rory-bday">rory-bday.png</file>

BIN
launcher/resources/backgrounds/kitteh-ween.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 92 KiB

7
launcher/ui/MainWindow.cpp
View File

@ -1560,12 +1560,13 @@ 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));
QDateTime halloween(QDate(now.date().year(), 10, 31), QTime(0, 0));
QString cat = APPLICATION->settings()->get("BackgroundCat").toString(); QString cat = APPLICATION->settings()->get("BackgroundCat").toString();
if (non_stupid_abs(now.daysTo(xmas)) <= 4) { if (non_stupid_abs(now.daysTo(xmas)) <= 4) {
cat += "-xmas"; cat += "-xmas";
} } else if (cat == "kitteh" && non_stupid_abs(now.daysTo(halloween)) <= 4) {
else if (non_stupid_abs(now.daysTo(birthday)) <= 12) { cat += "-ween";
} else if (non_stupid_abs(now.daysTo(birthday)) <= 12) {
cat += "-bday"; cat += "-bday";
} }
view->setStyleSheet(QString(R"( view->setStyleSheet(QString(R"(