more adaptative layout to RTL/LTR (Update and MCC)

1 files changed, 15 insertions, 11 deletions

diff --git a/qml/mw-ui.qml b/qml/mw-ui.qml
index 9ebc589..a36cc49 100644
--- a/qml/mw-ui.qml
+++ b/qml/mw-ui.qml
@@ -16,6 +16,8 @@ Rectangle {
     //: For Right to Left language, set this string to RTL
     property var direction: qsTr("LTR")
     LayoutMirroring.enabled: (direction == "LTR" ? false : true)
+    // for tests
+    //LayoutMirroring.enabled: true
     LayoutMirroring.childrenInherit: true
 
     Settings {
@@ -256,7 +258,7 @@ Rectangle {
                         onClicked: { launch.command(["drakrpm-edit-media",])}
                         style: ButtonStyle {
                             label: Label {
-                                text: qsTr("Edit software repositories")+" *";
+                                text: qsTr("Edit software sources")+" *";
                                 width: parent.width
                                 wrapMode: Text.WordWrap
                                 color: "black"
@@ -307,21 +309,21 @@ Rectangle {
             Loader { sourceComponent: slidebackground ;
                 anchors.fill: parent}
             Column {
-                x:10; y: 30
                 spacing: 10
-                Label { text: qsTr("How Mageia manages updates"); font.bold: true; padding: 10
+                Label { text: qsTr("How Mageia manages updates"); font.bold: true;
+                    topPadding: 30 ; leftPadding: 20
                     color: "white"}
                 Label {
-                    width: slideshow.width * .9
-                    padding: 10
+                    width: slideshow.width - 40
+                    padding: 20
                     text: qsTr("Mageia provides software which may be updated in order to fix bugs or security issues. It is highly recommended that you update your system regularly. An Update icon will appear in your task bar when new updates are available. To run the updates, just click on the icon below and give your user password - or use the Software Manager (root password). This is a background process and you will be able to use your computer normally during the updates."+"\n");
                     wrapMode: Text.WordWrap
                     color: "white"
                 }
 
                 Button {
-                    x:10
-                    width: view.width * .18;
+                    width: view.width * .18
+                    anchors.horizontalCenter:  parent.horizontalCenter
                     objectName: "launch"
                     onClicked:{ launch.command(["drakrpm-update",])}
                     style: ButtonStyle {
@@ -337,6 +339,7 @@ Rectangle {
                 Button {
                     x:10
                     width: view.width * .18;
+                    anchors.horizontalCenter:  parent.horizontalCenter
                     objectName: "link"
                     onClicked:{ link.weblink("https://advisories.mageia.org/")}
                     style: ButtonStyle {
@@ -381,6 +384,7 @@ Rectangle {
                    }
                    Label {
                        padding: 5
+                       anchors.horizontalCenter: parent.horizontalCenter
                        text: "<ul><li>"+qsTr("Software Management")+"</li><li>"
                    + qsTr("Hardware")+"</li><li>"
                    + qsTr("Network and Internet")+"</li><li>"
@@ -389,15 +393,15 @@ Rectangle {
                    + qsTr("Local Disks")+"</li><li>"
                    + qsTr("Security")+"</li><li>"
                    + qsTr("Boot")+"</li></ul>";
-                       width: view.width/2; wrapMode: Text.WordWrap;textFormat: Text.RichText
+                       wrapMode: Text.WordWrap;textFormat: Text.RichText
                        color: "white"
                    }
 
 
                    Button {
                        id: mcc
-                       x: 10
                        width: view.width * .18;
+                       anchors.horizontalCenter: parent.horizontalCenter
                        objectName: "launch"
                        onClicked: { launch.command(["drakconf"])}
                        style: ButtonStyle {
@@ -411,8 +415,8 @@ Rectangle {
                        }
                    }
                     Button {
-                    x: 10
-                    width: view.width * .18;
+                        width: view.width * .18;
+                        anchors.horizontalCenter: parent.horizontalCenter
                         objectName: "link"
                         onClicked: { link.weblink("https://www.mageia.org/doc")}
                         style: ButtonStyle {