From 6daa45783894fc7517917d6f6df0deaac1a41ba3 Mon Sep 17 00:00:00 2001
From: Tayou <tayou@gmx.net>
Date: Mon, 9 Jan 2023 16:58:27 +0100
Subject: Implement Suggestions from flow & Scrumplex

Signed-off-by: Tayou <tayou@gmx.net>
---
 launcher/ui/setupwizard/ThemeWizardPage.cpp | 27 ++++-----------------------
 launcher/ui/setupwizard/ThemeWizardPage.h   | 16 +++++++---------
 2 files changed, 11 insertions(+), 32 deletions(-)

(limited to 'launcher/ui/setupwizard')

diff --git a/launcher/ui/setupwizard/ThemeWizardPage.cpp b/launcher/ui/setupwizard/ThemeWizardPage.cpp
index 4e1eb488..cc2d335b 100644
--- a/launcher/ui/setupwizard/ThemeWizardPage.cpp
+++ b/launcher/ui/setupwizard/ThemeWizardPage.cpp
@@ -20,6 +20,7 @@
 
 #include "Application.h"
 #include "ui/themes/ITheme.h"
+#include "ui/themes/ThemeManager.h"
 #include "ui/widgets/ThemeCustomizationWidget.h"
 #include "ui_ThemeCustomizationWidget.h"
 
@@ -27,8 +28,8 @@ ThemeWizardPage::ThemeWizardPage(QWidget* parent) : BaseWizardPage(parent), ui(n
 {
     ui->setupUi(this);
 
-    connect(ui->themeCustomizationWidget, QOverload<int>::of(&ThemeCustomizationWidget::currentIconThemeChanged), this, &ThemeWizardPage::updateIcons);
-    connect(ui->themeCustomizationWidget, QOverload<int>::of(&ThemeCustomizationWidget::currentCatChanged), this, &ThemeWizardPage::updateCat);
+    connect(ui->themeCustomizationWidget, &ThemeCustomizationWidget::currentIconThemeChanged, this, &ThemeWizardPage::updateIcons);
+    connect(ui->themeCustomizationWidget, &ThemeCustomizationWidget::currentCatChanged, this, &ThemeWizardPage::updateCat);
 
     updateIcons();
     updateCat();
@@ -39,13 +40,6 @@ ThemeWizardPage::~ThemeWizardPage()
     delete ui;
 }
 
-void ThemeWizardPage::initializePage() {}
-
-bool ThemeWizardPage::validatePage()
-{
-    return true;
-}
-
 void ThemeWizardPage::updateIcons()
 {
     qDebug() << "Setting Icons";
@@ -67,20 +61,7 @@ void ThemeWizardPage::updateIcons()
 void ThemeWizardPage::updateCat()
 {
     qDebug() << "Setting Cat";
-
-    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 (std::abs(now.daysTo(xmas)) <= 4) {
-        cat += "-xmas";
-    } else if (std::abs(now.daysTo(halloween)) <= 4) {
-        cat += "-spooky";
-    } else if (std::abs(now.daysTo(birthday)) <= 12) {
-        cat += "-bday";
-    }
-    ui->catImagePreviewButton->setIcon(QIcon(QString(R"(:/backgrounds/%1)").arg(cat)));
+    ui->catImagePreviewButton->setIcon(QIcon(QString(R"(:/backgrounds/%1)").arg(ThemeManager::getCatImage())));
 }
 
 void ThemeWizardPage::retranslate()
diff --git a/launcher/ui/setupwizard/ThemeWizardPage.h b/launcher/ui/setupwizard/ThemeWizardPage.h
index 6562ad2e..992ba2ca 100644
--- a/launcher/ui/setupwizard/ThemeWizardPage.h
+++ b/launcher/ui/setupwizard/ThemeWizardPage.h
@@ -24,22 +24,20 @@ namespace Ui {
 class ThemeWizardPage;
 }
 
-class ThemeWizardPage : public BaseWizardPage
-{
+class ThemeWizardPage : public BaseWizardPage {
     Q_OBJECT
 
-public:
-    explicit ThemeWizardPage(QWidget *parent = nullptr);
+   public:
+    explicit ThemeWizardPage(QWidget* parent = nullptr);
     ~ThemeWizardPage();
 
-    void initializePage() override;
-    bool validatePage() override;
+    bool validatePage() override { return true; };
     void retranslate() override;
 
-private slots:
+   private slots:
     void updateIcons();
     void updateCat();
 
-private:
-    Ui::ThemeWizardPage *ui;
+   private:
+    Ui::ThemeWizardPage* ui;
 };
-- 
cgit