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)

2 files changed, 11 insertions, 3 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);
+        }
     }
 }