From 668342b4708fca830a0650a6902805de3ff1380a Mon Sep 17 00:00:00 2001
From: Santiago Cézar <santiagocezar2013@gmail.com>
Date: Tue, 1 Nov 2022 19:31:37 -0300
Subject: add rory flat too (and holiday variants)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Santiago Cézar <santiagocezar2013@gmail.com>
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com>
---
launcher/resources/backgrounds/generic.jpg | Bin 335269 -> 0 bytes
launcher/resources/backgrounds/rory-bday.png | Bin 89472 -> 83235 bytes
launcher/resources/backgrounds/rory-flat-bday.png | Bin 0 -> 57713 bytes
launcher/resources/backgrounds/rory-flat-xmas.png | Bin 0 -> 59495 bytes
launcher/resources/backgrounds/rory-flat.png | Bin 0 -> 52337 bytes
launcher/resources/backgrounds/rory-xmas.png | Bin 90158 -> 85543 bytes
launcher/resources/backgrounds/rory.png | Bin 90624 -> 76448 bytes
launcher/ui/pages/global/LauncherPage.cpp | 5 +++++
launcher/ui/pages/global/LauncherPage.ui | 5 +++++
9 files changed, 10 insertions(+)
delete mode 100644 launcher/resources/backgrounds/generic.jpg
create mode 100644 launcher/resources/backgrounds/rory-flat-bday.png
create mode 100644 launcher/resources/backgrounds/rory-flat-xmas.png
create mode 100644 launcher/resources/backgrounds/rory-flat.png
(limited to 'launcher')
diff --git a/launcher/resources/backgrounds/generic.jpg b/launcher/resources/backgrounds/generic.jpg
deleted file mode 100644
index c4832b0a..00000000
Binary files a/launcher/resources/backgrounds/generic.jpg and /dev/null differ
diff --git a/launcher/resources/backgrounds/rory-bday.png b/launcher/resources/backgrounds/rory-bday.png
index c1f576f0..66b88094 100644
Binary files a/launcher/resources/backgrounds/rory-bday.png and b/launcher/resources/backgrounds/rory-bday.png differ
diff --git a/launcher/resources/backgrounds/rory-flat-bday.png b/launcher/resources/backgrounds/rory-flat-bday.png
new file mode 100644
index 00000000..8a6e366d
Binary files /dev/null and b/launcher/resources/backgrounds/rory-flat-bday.png differ
diff --git a/launcher/resources/backgrounds/rory-flat-xmas.png b/launcher/resources/backgrounds/rory-flat-xmas.png
new file mode 100644
index 00000000..96c3ae38
Binary files /dev/null and b/launcher/resources/backgrounds/rory-flat-xmas.png differ
diff --git a/launcher/resources/backgrounds/rory-flat.png b/launcher/resources/backgrounds/rory-flat.png
new file mode 100644
index 00000000..ccec0662
Binary files /dev/null and b/launcher/resources/backgrounds/rory-flat.png differ
diff --git a/launcher/resources/backgrounds/rory-xmas.png b/launcher/resources/backgrounds/rory-xmas.png
index 6134c71a..107feb78 100644
Binary files a/launcher/resources/backgrounds/rory-xmas.png and b/launcher/resources/backgrounds/rory-xmas.png differ
diff --git a/launcher/resources/backgrounds/rory.png b/launcher/resources/backgrounds/rory.png
index 9dc69354..577f4dce 100644
Binary files a/launcher/resources/backgrounds/rory.png and b/launcher/resources/backgrounds/rory.png differ
diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index 44421d3b..822c69b0 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -341,6 +341,9 @@ void LauncherPage::applySettings()
case 1: // rory the cat
s->set("BackgroundCat", "rory");
break;
+ case 2: // rory the cat flat edition
+ s->set("BackgroundCat", "rory-flat");
+ break;
}
s->set("MenuBarInsteadOfToolBar", ui->preferMenuBarCheckBox->isChecked());
@@ -439,6 +442,8 @@ void LauncherPage::loadSettings()
ui->themeBackgroundCat->setCurrentIndex(0);
} else if (cat == "rory") {
ui->themeBackgroundCat->setCurrentIndex(1);
+ } else if (cat == "rory-flat") {
+ ui->themeBackgroundCat->setCurrentIndex(2);
}
{
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index 3a4e7da4..0b36652c 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -371,6 +371,11 @@
<string>Rory ID 11 (drawn by Ashtaka)</string>
</property>
</item>
+ <item>
+ <property name="text">
+ <string>Rory ID 11 (flat edition, drawn by Ashtaka)</string>
+ </property>
+ </item>
</widget>
</item>
</layout>
--
cgit