From 49d317b19aa61fed056e0f14c12eb1997f68982d Mon Sep 17 00:00:00 2001
From: Tayou <tayou@gmx.net>
Date: Mon, 9 Jan 2023 16:54:10 +0100
Subject: UX tweak + formatting + added cat to wizard

Signed-off-by: Tayou <tayou@gmx.net>
---
 launcher/ui/widgets/ThemeCustomizationWidget.cpp | 79 ++++++++++++------------
 launcher/ui/widgets/ThemeCustomizationWidget.h   |  1 +
 launcher/ui/widgets/ThemeCustomizationWidget.ui  |  5 +-
 3 files changed, 46 insertions(+), 39 deletions(-)

(limited to 'launcher/ui/widgets')

diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.cpp b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
index 0830a030..eafcf482 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.cpp
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
@@ -36,18 +36,40 @@ ThemeCustomizationWidget::~ThemeCustomizationWidget()
     delete ui;
 }
 
+/// <summary>
+/// The layout was not quite right, so currently this just disables the UI elements, which should be hidden instead
+/// TODO FIXME
+/// 
+/// Original Method One:
+/// ui->iconsComboBox->setVisible(features& ThemeFields::ICONS);
+/// ui->iconsLabel->setVisible(features& ThemeFields::ICONS);
+/// ui->widgetStyleComboBox->setVisible(features& ThemeFields::WIDGETS);
+/// ui->widgetThemeLabel->setVisible(features& ThemeFields::WIDGETS);
+/// ui->backgroundCatComboBox->setVisible(features& ThemeFields::CAT);
+/// ui->backgroundCatLabel->setVisible(features& ThemeFields::CAT);
+/// 
+/// original Method Two:
+///     if (!(features & ThemeFields::ICONS)) {
+///         ui->formLayout->setRowVisible(0, false);
+///     }
+///     if (!(features & ThemeFields::WIDGETS)) {
+///         ui->formLayout->setRowVisible(1, false);
+///     }
+///     if (!(features & ThemeFields::CAT)) {
+///         ui->formLayout->setRowVisible(2, false);
+///     }
+/// </summary>
+/// <param name="features"></param>
 void ThemeCustomizationWidget::showFeatures(ThemeFields features) {
-    ui->iconsComboBox->setVisible(features & ThemeFields::ICONS);
-    ui->iconsLabel->setVisible(features & ThemeFields::ICONS);
-    ui->widgetStyleComboBox->setVisible(features & ThemeFields::WIDGETS);
-    ui->widgetThemeLabel->setVisible(features & ThemeFields::WIDGETS);
-    ui->backgroundCatComboBox->setVisible(features & ThemeFields::CAT);
-    ui->backgroundCatLabel->setVisible(features & ThemeFields::CAT);
+    ui->iconsComboBox->setEnabled(features & ThemeFields::ICONS);
+    ui->iconsLabel->setEnabled(features & ThemeFields::ICONS);
+    ui->widgetStyleComboBox->setEnabled(features & ThemeFields::WIDGETS);
+    ui->widgetThemeLabel->setEnabled(features & ThemeFields::WIDGETS);
+    ui->backgroundCatComboBox->setEnabled(features & ThemeFields::CAT);
+    ui->backgroundCatLabel->setEnabled(features & ThemeFields::CAT);
 }
 
 void ThemeCustomizationWidget::applyIconTheme(int index) {
-    emit currentIconThemeChanged(index);
-
     auto settings = APPLICATION->settings();
     auto original = settings->get("IconTheme").toString();
     // FIXME: make generic
@@ -56,11 +78,11 @@ void ThemeCustomizationWidget::applyIconTheme(int index) {
     if (original != settings->get("IconTheme")) {
         APPLICATION->applyCurrentlySelectedTheme();
     }
+
+    emit currentIconThemeChanged(index);
 }
 
 void ThemeCustomizationWidget::applyWidgetTheme(int index) {
-    emit currentWidgetThemeChanged(index);
-
     auto settings = APPLICATION->settings();
     auto originalAppTheme = settings->get("ApplicationTheme").toString();
     auto newAppTheme = ui->widgetStyleComboBox->currentData().toString();
@@ -68,26 +90,15 @@ void ThemeCustomizationWidget::applyWidgetTheme(int index) {
         settings->set("ApplicationTheme", newAppTheme);
         APPLICATION->applyCurrentlySelectedTheme();
     }
+
+    emit currentWidgetThemeChanged(index);
 }
 
 void ThemeCustomizationWidget::applyCatTheme(int index) {
-    emit currentCatChanged(index);
-
     auto settings = APPLICATION->settings();
-    switch (index) {
-        case 0: // original cat
-            settings->set("BackgroundCat", "kitteh");
-            break;
-        case 1: // rory the cat
-            settings->set("BackgroundCat", "rory");
-            break;
-        case 2: // rory the cat flat edition
-            settings->set("BackgroundCat", "rory-flat");
-            break;
-        case 3:  // teawie
-            settings->set("BackgroundCat", "teawie");
-            break;
-    }
+    settings->set("BackgroundCat", m_catOptions[index]);
+
+    emit currentCatChanged(index);
 }
 
 void ThemeCustomizationWidget::applySettings()
@@ -101,8 +112,8 @@ void ThemeCustomizationWidget::loadSettings()
     auto settings = APPLICATION->settings();
 
     // FIXME: make generic
-    auto theme = settings->get("IconTheme").toString();
-    ui->iconsComboBox->setCurrentIndex(m_iconThemeOptions.indexOf(theme));
+    auto iconTheme = settings->get("IconTheme").toString();
+    ui->iconsComboBox->setCurrentIndex(m_iconThemeOptions.indexOf(iconTheme));
 
     {
         auto currentTheme = settings->get("ApplicationTheme").toString();
@@ -118,18 +129,10 @@ void ThemeCustomizationWidget::loadSettings()
     }
 
     auto cat = settings->get("BackgroundCat").toString();
-    if (cat == "kitteh") {
-        ui->backgroundCatComboBox->setCurrentIndex(0);
-    } else if (cat == "rory") {
-        ui->backgroundCatComboBox->setCurrentIndex(1);
-    } else if (cat == "rory-flat") {
-        ui->backgroundCatComboBox->setCurrentIndex(2);
-    } else if (cat == "teawie") {
-        ui->backgroundCatComboBox->setCurrentIndex(3);
-    }
+    ui->backgroundCatComboBox->setCurrentIndex(m_catOptions.indexOf(cat));
 }
 
 void ThemeCustomizationWidget::retranslate()
 {
     ui->retranslateUi(this);
-}
\ No newline at end of file
+}
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.h b/launcher/ui/widgets/ThemeCustomizationWidget.h
index e17286e1..653e89e7 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.h
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.h
@@ -61,4 +61,5 @@ signals:
 private:
 
     QStringList m_iconThemeOptions{ "pe_colored", "pe_light", "pe_dark", "pe_blue", "breeze_light", "breeze_dark", "OSX", "iOS", "flat", "flat_white", "multimc", "custom" };
+    QStringList m_catOptions{ "kitteh", "rory", "rory-flat" };
 };
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.ui b/launcher/ui/widgets/ThemeCustomizationWidget.ui
index c184b8f3..9cc5cc76 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.ui
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.ui
@@ -11,9 +11,12 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QFormLayout" name="formLayout">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetMinimumSize</enum>
+   </property>
    <property name="leftMargin">
     <number>0</number>
    </property>
-- 
cgit