Merge pull request #396 from leozamboni/develop
This commit is contained in:
commit
ba8322aa5c
@ -4,6 +4,7 @@
|
||||
<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="rory">rory.png</file>
|
||||
<file alias="rory-xmas">rory-xmas.png</file>
|
||||
<file alias="rory-bday">rory-bday.png</file>
|
||||
|
BIN
launcher/resources/backgrounds/kitteh-ween.png
Normal file
BIN
launcher/resources/backgrounds/kitteh-ween.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 92 KiB |
@ -1560,12 +1560,13 @@ void MainWindow::setCatBackground(bool enabled)
|
||||
QDateTime now = QDateTime::currentDateTime();
|
||||
QDateTime birthday(QDate(now.date().year(), 11, 30), 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();
|
||||
|
||||
if (non_stupid_abs(now.daysTo(xmas)) <= 4) {
|
||||
cat += "-xmas";
|
||||
}
|
||||
else if (non_stupid_abs(now.daysTo(birthday)) <= 12) {
|
||||
} else if (cat == "kitteh" && non_stupid_abs(now.daysTo(halloween)) <= 4) {
|
||||
cat += "-ween";
|
||||
} else if (non_stupid_abs(now.daysTo(birthday)) <= 12) {
|
||||
cat += "-bday";
|
||||
}
|
||||
view->setStyleSheet(QString(R"(
|
||||
|
Loading…
Reference in New Issue
Block a user