update szep.25 calamares fixHEADmain

2 files changed, 28 insertions, 8 deletions

diff --git a/raveos-calamares-theme/PKGBUILD b/raveos-calamares-theme/PKGBUILD
index b08218d..f0d55d7 100644
--- a/raveos-calamares-theme/PKGBUILD
+++ b/raveos-calamares-theme/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: nippy <nippy@tuta.io>
 pkgname=raveos-calamares-theme
 pkgver=2.0.0
-pkgrel=64
+pkgrel=65
 pkgdesc="RaveOS Calamares Theme"
 arch=('any')
 url="https://git.rp1.hu/RaveOS"
diff --git a/raveos-calamares-theme/etc/calamares/branding/raveos/finishedq.qml b/raveos-calamares-theme/etc/calamares/branding/raveos/finishedq.qml
index 256edb2..b72a368 100644
--- a/raveos-calamares-theme/etc/calamares/branding/raveos/finishedq.qml
+++ b/raveos-calamares-theme/etc/calamares/branding/raveos/finishedq.qml
@@ -5,8 +5,9 @@
  * Sok nev eseten automatikusan lapoz (4s). A lista: supporters.js (import).
  * Ha nincs nev, a teljes tamogatoi panel el van rejtve.
  *
- * Nyelvek: hu / de / en. A szovegek qsTr()-rel mennek, a branding
- * calamares-raveos_<lang>.qm fordításokat a RaveWelcome tolti be.
+ * Nyelvek: hu / de / en. A desktop selector mintaja szerint: a lap
+ * aktivalasakor (onActivate) frissitjuk a nyelvet, es minden szoveg
+ * property bindinggel koveti (uiLang).
  */
 
 import io.calamares.core 1.0
@@ -27,6 +28,24 @@ Item {
     readonly property bool hasSupporters: Supporters.names.length > 0
     readonly property int supportersPageCount: Math.max(1, Math.ceil(Supporters.names.length / supportersPerPage))
 
+    // Szovegek a branding .qm fordításokbol; a lap aktivalasakor frissulnek
+    // (a QQuickWidget nem forditja ujra a qsTr bindingeket nyelvvaltaskor)
+    property string titleText: ""
+    property string descText: ""
+    property string restartText: ""
+    property string supportersHeadText: ""
+    property string thanksText: ""
+
+    function updateTexts() {
+        titleText = qsTr("Installation complete");
+        descText = qsTr("Restart the system to start using %1.").arg(Branding.string(Branding.ProductName));
+        restartText = qsTr("Restart now");
+        supportersHeadText = qsTr("RaveOS Supporters");
+        thanksText = qsTr("Thank you for your support, from every member of the team!");
+    }
+
+    Component.onCompleted: updateTexts()
+
     property int supportersPage: 0
 
     // Az aktualis oldal szovege: soronkent 3 nev, kozepre igazitva
@@ -73,7 +92,7 @@ Item {
                 font.family: "Ubuntu"
                 font.pixelSize: 26
                 font.bold: true
-                text: qsTr("Installation complete")
+                text: finishedRoot.titleText
             }
 
             Text {
@@ -83,13 +102,13 @@ Item {
                 font.family: "Ubuntu"
                 font.pixelSize: 15
                 wrapMode: Text.WordWrap
-                text: qsTr("Restart the system to start using %1.").arg(Branding.string(Branding.ProductName))
+                text: finishedRoot.descText
             }
 
             Button {
                 id: restartButton
                 Layout.alignment: Qt.AlignHCenter
-                text: qsTr("Restart now")
+                text: finishedRoot.restartText
                 hoverEnabled: true
                 onClicked: config.doRestart(true)
 
@@ -138,7 +157,7 @@ Item {
                 font.family: "Ubuntu"
                 font.pixelSize: 15
                 font.bold: true
-                text: qsTr("RaveOS Supporters")
+                text: finishedRoot.supportersHeadText
             }
 
             Text {
@@ -173,7 +192,7 @@ Item {
                 font.pixelSize: 13
                 font.italic: true
                 wrapMode: Text.WordWrap
-                text: qsTr("Thank you for your support, from every member of the team!")
+                text: finishedRoot.thanksText
             }
         }
     }
@@ -201,6 +220,7 @@ Item {
 
     function onActivate()
     {
+        updateTexts();
     }
 
     function onLeave()