Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1627 from HeyaGlitz/develop

Browse Source 
Make Christmas cat last longer
This commit is contained in:
Lenny McLennington 2024-01-07 05:10:36 +00:00 committed by GitHub
commit 3f54396705
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
launcher/ui/MainWindow.cpp
View File

@ -1602,7 +1602,8 @@ 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 christmasStart(QDate(now.date().year(), 12, 25), QTime(0, 0));
QDateTime christmasEnd(QDate(now.date().year(), 1, 7), QTime(0, 0)); //end at midnight of the 7th
QString cat = "default"; QString cat = "default";
QString catStyleOpt = APPLICATION->settings()->get("CatStyle").toString(); QString catStyleOpt = APPLICATION->settings()->get("CatStyle").toString();
@ -1611,7 +1612,7 @@ void MainWindow::setCatBackground(bool enabled)
else if(catStyleOpt == "Jinx") else if(catStyleOpt == "Jinx")
cat = "jinx"; cat = "jinx";
if(non_stupid_abs(now.daysTo(xmas)) <= 4) { if(christmasStart <= now || now < christmasEnd) {
cat += "Catmas"; cat += "Catmas";
} }
else if (non_stupid_abs(now.daysTo(birthday)) <= 12) { else if (non_stupid_abs(now.daysTo(birthday)) <= 12) {