From 369419870e6d241e4e21bae2ef243dc6a12ac7d4 Mon Sep 17 00:00:00 2001
From: Adrien <66513643+AshtakaOOf@users.noreply.github.com>
Date: Sat, 5 Nov 2022 23:55:43 +0100
Subject: add: Spooky Rory

Signed-off-by: Adrien <66513643+AshtakaOOf@users.noreply.github.com>
---
 launcher/resources/backgrounds/backgrounds.qrc      |   2 ++
 launcher/resources/backgrounds/rory-flat-spooky.png | Bin 0 -> 66906 bytes
 launcher/resources/backgrounds/rory-spooky.png      | Bin 0 -> 95940 bytes
 3 files changed, 2 insertions(+)
 create mode 100644 launcher/resources/backgrounds/rory-flat-spooky.png
 create mode 100644 launcher/resources/backgrounds/rory-spooky.png

(limited to 'launcher/resources')

diff --git a/launcher/resources/backgrounds/backgrounds.qrc b/launcher/resources/backgrounds/backgrounds.qrc
index 652e7084..edfa44c0 100644
--- a/launcher/resources/backgrounds/backgrounds.qrc
+++ b/launcher/resources/backgrounds/backgrounds.qrc
@@ -8,8 +8,10 @@
         <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>
diff --git a/launcher/resources/backgrounds/rory-flat-spooky.png b/launcher/resources/backgrounds/rory-flat-spooky.png
new file mode 100644
index 00000000..6360c612
Binary files /dev/null and b/launcher/resources/backgrounds/rory-flat-spooky.png differ
diff --git a/launcher/resources/backgrounds/rory-spooky.png b/launcher/resources/backgrounds/rory-spooky.png
new file mode 100644
index 00000000..a727619b
Binary files /dev/null and b/launcher/resources/backgrounds/rory-spooky.png differ
-- 
cgit 


From 4708ce4226e7b23046b8a099dd033192e68f8fd5 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 6 Nov 2022 00:47:33 +0100
Subject: refactor: rename halloween cats to -spooky

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 launcher/resources/backgrounds/backgrounds.qrc   |   2 +-
 launcher/resources/backgrounds/kitteh-spooky.png | Bin 0 -> 94677 bytes
 launcher/resources/backgrounds/kitteh-ween.png   | Bin 94677 -> 0 bytes
 launcher/ui/MainWindow.cpp                       |   2 +-
 4 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 launcher/resources/backgrounds/kitteh-spooky.png
 delete mode 100644 launcher/resources/backgrounds/kitteh-ween.png

(limited to 'launcher/resources')

diff --git a/launcher/resources/backgrounds/backgrounds.qrc b/launcher/resources/backgrounds/backgrounds.qrc
index edfa44c0..e55faf15 100644
--- a/launcher/resources/backgrounds/backgrounds.qrc
+++ b/launcher/resources/backgrounds/backgrounds.qrc
@@ -4,7 +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="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>
diff --git a/launcher/resources/backgrounds/kitteh-spooky.png b/launcher/resources/backgrounds/kitteh-spooky.png
new file mode 100644
index 00000000..deb0bebb
Binary files /dev/null and b/launcher/resources/backgrounds/kitteh-spooky.png differ
diff --git a/launcher/resources/backgrounds/kitteh-ween.png b/launcher/resources/backgrounds/kitteh-ween.png
deleted file mode 100644
index deb0bebb..00000000
Binary files a/launcher/resources/backgrounds/kitteh-ween.png and /dev/null differ
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 8cf2bde7..f6b9888f 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1565,7 +1565,7 @@ void MainWindow::setCatBackground(bool enabled)
         if (non_stupid_abs(now.daysTo(xmas)) <= 4) {
             cat += "-xmas";
         } else if (non_stupid_abs(now.daysTo(halloween)) <= 4) {
-            cat += "-ween";
+            cat += "-spooky";
         } else if (non_stupid_abs(now.daysTo(birthday)) <= 12) {
             cat += "-bday";
         }
-- 
cgit