calamares: theme v26, module v4 - UI fixes and language propagation fix

- stylesheet: disabled button dark grey, about button deep green, button alignment fix
- branding: icon changed to raveos-icon2.png
- ravewelcome: fix language selection propagating to installed system locale (localeConf.LANG)

7 files changed, 38 insertions, 12 deletions

diff --git a/raveos-calamares-module/PKGBUILD b/raveos-calamares-module/PKGBUILD
index 2a99b9f..36870a7 100644
--- a/raveos-calamares-module/PKGBUILD
+++ b/raveos-calamares-module/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=raveos-calamares-module
 pkgver=2.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="RaveOS Calamares Wi-Fi viewmodule"
 arch=('x86_64')
 options=('!debug')
diff --git a/raveos-calamares-module/welcome/RaveWelcomeViewStep.cpp b/raveos-calamares-module/welcome/RaveWelcomeViewStep.cpp
index 28d3895..617c8c9 100644
--- a/raveos-calamares-module/welcome/RaveWelcomeViewStep.cpp
+++ b/raveos-calamares-module/welcome/RaveWelcomeViewStep.cpp
@@ -140,12 +140,20 @@ void RaveWelcomeViewStep::onLanguageChanged(int index)
     Calamares::Locale::Translation::Id tid { localeId };
     Calamares::installTranslator(tid, brandingTranslationsPrefix());
 
-    // Store locale in GlobalStorage for the installed system
+    // Store locale in GlobalStorage for the installed system.
+    // The locale module reads gs["localeConf"]["LANG"] via Calamares::Locale::readGS.
     if (Calamares::JobQueue::instance())
     {
         Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
         if (gs)
-            gs->insert("localeLanguage", localeId);
+        {
+            QString fullLocale = QLocale(localeId).name(); // e.g. "hu" -> "hu_HU"
+            if (!fullLocale.contains('.'))
+                fullLocale += ".UTF-8";
+            QVariantMap localeConf = gs->value("localeConf").toMap();
+            localeConf.insert("LANG", fullLocale);
+            gs->insert("localeConf", localeConf);
+        }
     }
 }
 
diff --git a/raveos-calamares-theme/PKGBUILD b/raveos-calamares-theme/PKGBUILD
index 70350f6..f4ccb6a 100644
--- a/raveos-calamares-theme/PKGBUILD
+++ b/raveos-calamares-theme/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: AlexC <alexc@alexc.hu>
 pkgname=raveos-calamares-theme
 pkgver=2.0.0
-pkgrel=25
+pkgrel=26
 pkgdesc="RaveOS Calamares Theme"
 arch=('any')
 url="https://git.rp1.hu/RaveOS"
diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/branding.desc b/raveos-calamares-theme/etc/calamares/branding/raveos/branding.desc
index 773d6a2..dbe01ba 100755
--- a/raveos-calamares-theme/etc/calamares/branding/raveos/branding.desc
+++ b/raveos-calamares-theme/etc/calamares/branding/raveos/branding.desc
@@ -92,8 +92,8 @@ strings:
     bootloaderEntryName: RaveOS Linux
 
 images:
-    productIcon:         "icons/raveos-icon.jpg"
-    productLogo:         "icons/raveos-icon.jpg"
+    productIcon:         "icons/raveos-icon2.png"
+    productLogo:         "icons/raveos-icon2.png"
     productWelcome:      "images/raveos-welcome.png"
 
 # Szöveg és háttér komponensek színei. (Baloldali menu színei welcome,local.keyboard stb)
diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/icons/raveos-icon.jpg b/raveos-calamares-theme/etc/calamares/branding/raveos/icons/raveos-icon.jpg
deleted file mode 100644
index b76bfb8..0000000
--- a/raveos-calamares-theme/etc/calamares/branding/raveos/icons/raveos-icon.jpg
+++ /dev/null
diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/icons/raveos-icon2.png b/raveos-calamares-theme/etc/calamares/branding/raveos/icons/raveos-icon2.png
new file mode 100755
index 0000000..9903765
--- /dev/null
+++ b/raveos-calamares-theme/etc/calamares/branding/raveos/icons/raveos-icon2.png
diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss b/raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss
index 724316c..56cc368 100644
--- a/raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss
+++ b/raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss
@@ -254,6 +254,16 @@ QAbstractItemView::item:selected {
     color: #FFFFFF;
 }
 
+QAbstractItemView::item:selected:!active {
+    background-color: #3d7839;
+    color: #FFFFFF;
+}
+
+QAbstractItemView::item:focus {
+    background-color: #3d7839;
+    color: #FFFFFF;
+}
+
 /* ---------------- Buttons ---------------- */
 
 QPushButton {
@@ -263,6 +273,7 @@ QPushButton {
     border-radius: 4px;
     padding: 8px 18px;
     font-weight: bold;
+    margin-top: 4px;
 }
 
 QPushButton:hover {
@@ -274,22 +285,29 @@ QPushButton:pressed {
 }
 
 QPushButton:disabled {
-    background-color: #7f8c8d;
-    color: #bdc3c7;
+    background-color: #303030;
+    color: #7f8c8d;
 }
 
 /* Secondary buttons (Back / Cancel) */
-#debugButton,
-#aboutButton {
+#debugButton {
     background-color: #7f8c8d;
     color: #ffffff;
 }
 
-#debugButton:hover,
-#aboutButton:hover {
+#debugButton:hover {
     background-color: #95a5a6;
 }
 
+#aboutButton {
+    background-color: #1e5c1a;
+    color: #ffffff;
+}
+
+#aboutButton:hover {
+    background-color: #285226;
+}
+
 /* ---------------- Checkbox ---------------- */
 
 QCheckBox {