calamares update

6 files changed, 103 insertions, 7 deletions

diff --git a/raveos-calamares-theme/PKGBUILD b/raveos-calamares-theme/PKGBUILD
index 06cedfa..b54b07f 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=21
+pkgrel=22
 pkgdesc="RaveOS Calamares Theme"
 arch=('any')
 url="https://git.rp1.hu/RaveOS"
diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/arrow-down.png b/raveos-calamares-theme/etc/calamares/branding/raveos/arrow-down.png
new file mode 100644
index 0000000..825b39f
--- /dev/null
+++ b/raveos-calamares-theme/etc/calamares/branding/raveos/arrow-down.png
diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/arrow-down.svg b/raveos-calamares-theme/etc/calamares/branding/raveos/arrow-down.svg
new file mode 100644
index 0000000..d71760c
--- /dev/null
+++ b/raveos-calamares-theme/etc/calamares/branding/raveos/arrow-down.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="8" viewBox="0 0 12 8">
+  <polygon points="0,0 12,0 6,8" fill="white"/>
+</svg>
\ No newline at end of file
diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/show.qml b/raveos-calamares-theme/etc/calamares/branding/raveos/show.qml
index a82b0fe..fbbee94 100755
--- a/raveos-calamares-theme/etc/calamares/branding/raveos/show.qml
+++ b/raveos-calamares-theme/etc/calamares/branding/raveos/show.qml
@@ -28,7 +28,7 @@ Presentation
 
     Timer {
         id: advanceTimer
-        interval: 15000
+        interval: 20000
         running: presentation.activatedInCalamares
         repeat: true
         onTriggered: nextSlide()
diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss b/raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss
index 8a12280..7c17798 100644
--- a/raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss
+++ b/raveos-calamares-theme/etc/calamares/branding/raveos/stylesheet.qss
@@ -3,6 +3,40 @@
 /* Main: #404040 | Accent: #3d7839 | Border: #7f8c8d    */
 /* ===================================================== */
 
+/* ---------------- Language Selector ---------------- */
+
+#languageWidget {
+    background-color: #2B2B2B;
+    padding: 4px;
+}
+
+#selector {
+    background-color: #2B2B2B;
+    color: #FFFFFF;
+    border: 2px solid #3d7839;
+    border-radius: 4px;
+    padding: 4px 10px;
+    min-width: 200px;
+}
+
+#selector:hover {
+    border-color: #4d9849;
+}
+
+#selector::drop-down {
+    border: none;
+    width: 20px;
+}
+
+#selector QAbstractItemView {
+    background-color: #2B2B2B;
+    color: #FFFFFF;
+    selection-background-color: #3d7839;
+    selection-color: #FFFFFF;
+    border: 2px solid #3d7839;
+    outline: 0;
+}
+
 /* ---------------- Global ---------------- */
 
 * {
@@ -122,15 +156,17 @@ QComboBox:focus {
 
 QComboBox::drop-down {
     border: none;
-    width: 18px;
+    width: 20px;
     background: transparent;
 }
 
 QComboBox::down-arrow {
-    background: transparent;
-    border: none;
+    image: url(/usr/share/calamares/branding/raveos/arrow-down.svg);
+    width: 12px;
+    height: 12px;
 }
 
+
 QComboBox QAbstractItemView {
     background-color: #2B2B2B;
     color: #FFFFFF;
diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/welcomeq.qml b/raveos-calamares-theme/etc/calamares/branding/raveos/welcomeq.qml
index 4ebbe44..b45bf14 100644
--- a/raveos-calamares-theme/etc/calamares/branding/raveos/welcomeq.qml
+++ b/raveos-calamares-theme/etc/calamares/branding/raveos/welcomeq.qml
@@ -1,15 +1,72 @@
 import QtQuick 2.10
+import QtQuick.Controls 2.3
+import QtQuick.Layouts 1.3
 
 Item {
     id: welcomeRoot
     anchors.fill: parent
 
+    // Adaptive background image
     Image {
         anchors.fill: parent
         source: "images/raveos-welcome.png"
         fillMode: Image.Stretch
-        horizontalAlignment: Image.AlignHCenter
-        verticalAlignment: Image.AlignVCenter
         smooth: true
     }
+
+    // Bottom overlay for language selector
+    Rectangle {
+        anchors.bottom: parent.bottom
+        anchors.left: parent.left
+        anchors.right: parent.right
+        height: 56
+        gradient: Gradient {
+            GradientStop { position: 0.0; color: "#002B2B2B" }
+            GradientStop { position: 1.0; color: "#DD2B2B2B" }
+        }
+
+        RowLayout {
+            anchors.centerIn: parent
+            spacing: 10
+
+            Image {
+                source: "qrc:/welcome/language-icon-48px.png"
+                width: 22
+                height: 22
+                smooth: true
+            }
+
+            ComboBox {
+                id: languageCombo
+                currentIndex: config.localeIndex
+                onActivated: function(idx) {
+                    console.log("QML: activating locale idx=" + idx);
+                    config.localeIndex = idx;
+                    console.log("QML: after set, localeIndex=" + config.localeIndex);
+                }
+                implicitWidth: 260
+                implicitHeight: 36
+
+                Component.onCompleted: {
+                    var m = config.languagesModel;
+                    var items = [];
+                    for (var i = 0; i < m.rowCount(); i++) {
+                        var idx = m.index(i, 0);
+                        var val = m.data(idx, Qt.DisplayRole);
+                        items.push(val !== undefined ? val : m.data(idx, Qt.UserRole));
+                    }
+                    model = items;
+                    currentIndex = config.localeIndex;
+                }
+            }
+
+            Connections {
+                target: config
+                function onLocaleIndexChanged() {
+                    console.log("QML: localeIndexChanged signal fired! new=" + config.localeIndex);
+                    languageCombo.currentIndex = config.localeIndex;
+                }
+            }
+        }
+    }
 }