---
launcher/ui/dialogs/AboutDialog.cpp | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
(limited to 'launcher')
diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp
index 52d6baef..a36e4a3d 100644
--- a/launcher/ui/dialogs/AboutDialog.cpp
+++ b/launcher/ui/dialogs/AboutDialog.cpp
@@ -73,17 +73,12 @@ QString getCreditsHtml()
stream << "" << QObject::tr("%1 Developers", "About Credits").arg(BuildConfig.LAUNCHER_DISPLAYNAME) << "
\n";
stream << QString("Sefa Eyeoglu (Scrumplex) %1
\n") .arg(getWebsite("https://scrumplex.net"));
stream << QString("dada513 %1
\n") .arg(getGitHub("dada513"));
- stream << QString("txtsd %1
\n") .arg(getGitHub("txtsd"));
+ stream << QString("txtsd %1
\n") .arg(getWebsite("https://ihavea.quest"));
stream << QString("timoreo %1
\n") .arg(getGitHub("timoreo22"));
stream << QString("Ezekiel Smith (ZekeSmith) %1
\n") .arg(getGitHub("ZekeSmith"));
stream << QString("cozyGalvinism %1
\n") .arg(getGitHub("cozyGalvinism"));
- stream << "
\n";
-
- //: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Contributors"
- stream << "" << QObject::tr("%1 Contributors", "About Credits").arg(BuildConfig.LAUNCHER_DISPLAYNAME) << "
\n";
stream << QString("DioEgizio %1
\n") .arg(getGitHub("DioEgizio"));
stream << QString("flowln %1
\n") .arg(getGitHub("flowln"));
- stream << QString("swirl %1
\n") .arg(getWebsite("https://swurl.xyz/"));
stream << "
\n";
// TODO: possibly retrieve from git history at build time?
--
cgit
From 0a0ce74105b1c01bb312175a823e715d6abb310c Mon Sep 17 00:00:00 2001
From: Santiago Cézar
Date: Tue, 1 Nov 2022 19:06:27 -0300
Subject: add rory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Santiago Cézar
Co-authored-by: Ashtaka <66513643+AshtakaOOf@users.noreply.github.com>
---
launcher/Application.cpp | 1 +
launcher/resources/backgrounds/backgrounds.qrc | 9 ++++---
launcher/resources/backgrounds/catbgrnd2.png | Bin 62973 -> 0 bytes
launcher/resources/backgrounds/catmas.png | Bin 72818 -> 0 bytes
launcher/resources/backgrounds/cattiversary.png | Bin 99736 -> 0 bytes
launcher/resources/backgrounds/generic.jpg | Bin 0 -> 335269 bytes
launcher/resources/backgrounds/kitteh-bday.png | Bin 0 -> 99736 bytes
launcher/resources/backgrounds/kitteh-xmas.png | Bin 0 -> 72818 bytes
launcher/resources/backgrounds/kitteh.png | Bin 0 -> 62973 bytes
launcher/resources/backgrounds/rory-bday.png | Bin 0 -> 89472 bytes
launcher/resources/backgrounds/rory-xmas.png | Bin 0 -> 90158 bytes
launcher/resources/backgrounds/rory.png | Bin 0 -> 90624 bytes
launcher/ui/MainWindow.cpp | 17 ++++++------
launcher/ui/pages/global/LauncherPage.cpp | 16 ++++++++++++
launcher/ui/pages/global/LauncherPage.ui | 33 ++++++++++++++++++++++++
15 files changed, 65 insertions(+), 11 deletions(-)
delete mode 100644 launcher/resources/backgrounds/catbgrnd2.png
delete mode 100644 launcher/resources/backgrounds/catmas.png
delete mode 100644 launcher/resources/backgrounds/cattiversary.png
create mode 100644 launcher/resources/backgrounds/generic.jpg
create mode 100644 launcher/resources/backgrounds/kitteh-bday.png
create mode 100644 launcher/resources/backgrounds/kitteh-xmas.png
create mode 100644 launcher/resources/backgrounds/kitteh.png
create mode 100644 launcher/resources/backgrounds/rory-bday.png
create mode 100644 launcher/resources/backgrounds/rory-xmas.png
create mode 100644 launcher/resources/backgrounds/rory.png
(limited to 'launcher')
diff --git a/launcher/Application.cpp b/launcher/Application.cpp
index 2da8ac56..5772d7ca 100644
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@@ -501,6 +501,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
// Theming
m_settings->registerSetting("IconTheme", QString("pe_colored"));
m_settings->registerSetting("ApplicationTheme", QString("system"));
+ m_settings->registerSetting("BackgroundCat", QString("kitteh"));
// Remembered state
m_settings->registerSetting("LastUsedGroupForNewInstance", QString());
diff --git a/launcher/resources/backgrounds/backgrounds.qrc b/launcher/resources/backgrounds/backgrounds.qrc
index 52921512..db48af8b 100644
--- a/launcher/resources/backgrounds/backgrounds.qrc
+++ b/launcher/resources/backgrounds/backgrounds.qrc
@@ -1,8 +1,11 @@
- catbgrnd2.png
- catmas.png
- cattiversary.png
+ kitteh.png
+ kitteh-xmas.png
+ kitteh-bday.png
+ rory.png
+ rory-xmas.png
+ rory-bday.png
diff --git a/launcher/resources/backgrounds/catbgrnd2.png b/launcher/resources/backgrounds/catbgrnd2.png
deleted file mode 100644
index e9de7f27..00000000
Binary files a/launcher/resources/backgrounds/catbgrnd2.png and /dev/null differ
diff --git a/launcher/resources/backgrounds/catmas.png b/launcher/resources/backgrounds/catmas.png
deleted file mode 100644
index 8bdb1d5c..00000000
Binary files a/launcher/resources/backgrounds/catmas.png and /dev/null differ
diff --git a/launcher/resources/backgrounds/cattiversary.png b/launcher/resources/backgrounds/cattiversary.png
deleted file mode 100644
index 09a36566..00000000
Binary files a/launcher/resources/backgrounds/cattiversary.png and /dev/null differ
diff --git a/launcher/resources/backgrounds/generic.jpg b/launcher/resources/backgrounds/generic.jpg
new file mode 100644
index 00000000..c4832b0a
Binary files /dev/null and b/launcher/resources/backgrounds/generic.jpg differ
diff --git a/launcher/resources/backgrounds/kitteh-bday.png b/launcher/resources/backgrounds/kitteh-bday.png
new file mode 100644
index 00000000..09a36566
Binary files /dev/null and b/launcher/resources/backgrounds/kitteh-bday.png differ
diff --git a/launcher/resources/backgrounds/kitteh-xmas.png b/launcher/resources/backgrounds/kitteh-xmas.png
new file mode 100644
index 00000000..8bdb1d5c
Binary files /dev/null and b/launcher/resources/backgrounds/kitteh-xmas.png differ
diff --git a/launcher/resources/backgrounds/kitteh.png b/launcher/resources/backgrounds/kitteh.png
new file mode 100644
index 00000000..e9de7f27
Binary files /dev/null and b/launcher/resources/backgrounds/kitteh.png differ
diff --git a/launcher/resources/backgrounds/rory-bday.png b/launcher/resources/backgrounds/rory-bday.png
new file mode 100644
index 00000000..c1f576f0
Binary files /dev/null and b/launcher/resources/backgrounds/rory-bday.png differ
diff --git a/launcher/resources/backgrounds/rory-xmas.png b/launcher/resources/backgrounds/rory-xmas.png
new file mode 100644
index 00000000..6134c71a
Binary files /dev/null and b/launcher/resources/backgrounds/rory-xmas.png differ
diff --git a/launcher/resources/backgrounds/rory.png b/launcher/resources/backgrounds/rory.png
new file mode 100644
index 00000000..9dc69354
Binary files /dev/null and b/launcher/resources/backgrounds/rory.png differ
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index eda234df..2a6e8c1f 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1560,15 +1560,15 @@ 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));
- QString cat;
+ QString cat = APPLICATION->settings()->get("BackgroundCat").toString();
+
+ qDebug() << "The choosen cat is " << cat << ".";
+
if(non_stupid_abs(now.daysTo(xmas)) <= 4) {
- cat = "catmas";
+ cat += "-xmas";
}
else if (non_stupid_abs(now.daysTo(birthday)) <= 12) {
- cat = "cattiversary";
- }
- else {
- cat = "kitteh";
+ cat += "-bday";
}
view->setStyleSheet(QString(R"(
InstanceView
@@ -1576,10 +1576,11 @@ InstanceView
background-image: url(:/backgrounds/%1);
background-attachment: fixed;
background-clip: padding;
- background-position: top right;
+ background-position: bottom left;
background-repeat: none;
background-color:palette(base);
-})").arg(cat));
+})")
+ .arg(cat));
}
else
{
diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index 4ae7509c..44421d3b 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -334,6 +334,15 @@ void LauncherPage::applySettings()
APPLICATION->setApplicationTheme(newAppTheme, false);
}
+ switch (ui->themeBackgroundCat->currentIndex()) {
+ case 0: // original cat
+ s->set("BackgroundCat", "kitteh");
+ break;
+ case 1: // rory the cat
+ s->set("BackgroundCat", "rory");
+ break;
+ }
+
s->set("MenuBarInsteadOfToolBar", ui->preferMenuBarCheckBox->isChecked());
// Console settings
@@ -425,6 +434,13 @@ void LauncherPage::loadSettings()
ui->themeComboBox->setCurrentIndex(9);
}
+ auto cat = s->get("BackgroundCat").toString();
+ if (cat == "kitteh") {
+ ui->themeBackgroundCat->setCurrentIndex(0);
+ } else if (cat == "rory") {
+ ui->themeBackgroundCat->setCurrentIndex(1);
+ }
+
{
auto currentTheme = s->get("ApplicationTheme").toString();
auto themes = APPLICATION->getValidApplicationThemes();
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index 76a25f2e..3a4e7da4 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -340,6 +340,39 @@