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

Merge pull request #405 from AshtakaOOf/spooky

Browse Source
This commit is contained in:
DioEgizio 2022-11-06 07:27:39 +01:00 committed by GitHub
commit 126bbd67f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,12 +4,14 @@
<file alias="kitteh">kitteh.png</file>
<file alias="kitteh-xmas">kitteh-xmas.png</file>
<file alias="kitteh-bday">kitteh-bday.png</file>
<file alias="kitteh-ween">kitteh-ween.png</file>
<file alias="kitteh-spooky">kitteh-spooky.png</file>
<file alias="rory">rory.png</file>
<file alias="rory-xmas">rory-xmas.png</file>
<file alias="rory-bday">rory-bday.png</file>
<file alias="rory-spooky">rory-spooky.png</file>
<file alias="rory-flat">rory-flat.png</file>
<file alias="rory-flat-xmas">rory-flat-xmas.png</file>
<file alias="rory-flat-bday">rory-flat-bday.png</file>
<file alias="rory-flat-spooky">rory-flat-spooky.png</file>
</qresource>
</RCC>

0
launcher/resources/backgrounds/kitteh-ween.png → launcher/resources/backgrounds/kitteh-spooky.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 92 KiB

BIN
launcher/resources/backgrounds/rory-flat-spooky.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 65 KiB

BIN
launcher/resources/backgrounds/rory-spooky.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 94 KiB

4
launcher/ui/MainWindow.cpp
View File

@ -1590,8 +1590,8 @@ void MainWindow::setCatBackground(bool enabled)
QString cat = APPLICATION->settings()->get("BackgroundCat").toString();
if (non_stupid_abs(now.daysTo(xmas)) <= 4) {
cat += "-xmas";
} else if (cat == "kitteh" && non_stupid_abs(now.daysTo(halloween)) <= 4) {
cat += "-ween";
} else if (non_stupid_abs(now.daysTo(halloween)) <= 4) {
cat += "-spooky";
} else if (non_stupid_abs(now.daysTo(birthday)) <= 12) {
cat += "-bday";
}