Media sources: rework layout

Place remark about password in bottom band

1 files changed, 31 insertions, 19 deletions

diff --git a/qml/mw-ui.qml b/qml/mw-ui.qml
index 36c6a01..834708c 100644
--- a/qml/mw-ui.qml
+++ b/qml/mw-ui.qml
@@ -8,7 +8,7 @@ import QtGraphicalEffects 1
 
 Rectangle {
     id: box
-    width: 1000; height: 650
+    width: 1000; height: 700
     property alias view: view
 
     // For RTL tests
@@ -98,17 +98,23 @@ Rectangle {
             Loader { sourceComponent: slidebackground ;
                 anchors.fill: parent}
 
-            Column {
-                anchors.left: parent.left
-                anchors.leftMargin: 20
-                y: 10
-                Label { text: qsTr("Configure software repositories"); font.bold: true;
-                    color: "white" }
-                Label { text: qsTr("Mageia official repositories contain:");
-                    color: "white"  }
-                GridLayout {
-                    columns: 2
+            //Column {
+                //anchors.left: parent.left
+               // y: 10
+            GridLayout {
+                columns: 2
+                    Label {
+                        Layout.columnSpan: 2
+                        Layout.margins: 10
+                        text: qsTr("Configure software repositories"); font.bold: true;
+                        color: "white" }
+                    Label {
+                        Layout.columnSpan: 2
+                        Layout.margins: 10
+                        text: qsTr("Mageia official repositories contain:");
+                        color: "white"  }
                     Rectangle {id: coreBg
+                        Layout.margins: 5
                         LinearGradient {
                             anchors.fill: parent
                             start: Qt.point(0, 0)
@@ -124,16 +130,18 @@ Rectangle {
                         Layout.fillWidth: true
                         Label {
                             anchors.centerIn: parent
+                            //: Should be as displayed in software manager, thus in general not translated
                             text: qsTr("core"); font.bold: true;  }
                     }
                     Label {
                         text: qsTr("- the free-open-source packages");
                         wrapMode: Text.WordWrap
-                        Layout.maximumWidth: slideshow.width -110
+                        Layout.maximumWidth: slideshow.width -20 - coreBg.width
                         color: "white"
                     }
 
                     Rectangle {id: nonfreeBg
+                        Layout.margins: 5
                         LinearGradient {
                             anchors.fill: parent
                             start: Qt.point(0, 0)
@@ -148,6 +156,7 @@ Rectangle {
                         Layout.fillWidth: true
                         Label {
                             anchors.centerIn: parent
+                            //: Should be as displayed in software manager, thus in general not translated
                             text: qsTr("nonfree"); font.bold: true;
                             color: "white"}
                         }
@@ -159,6 +168,7 @@ Rectangle {
                         color: "white"
                     }
                     Rectangle {id: taintedBg
+                        Layout.margins: 5
                         LinearGradient {
                             anchors.fill: parent
                             start: Qt.point(0, 0)
@@ -173,6 +183,7 @@ Rectangle {
                         Layout.fillWidth: true
                         Label {
                             anchors.centerIn: parent
+                            //: Should be as displayed in software manager, thus in general not translated
                             text: qsTr("tainted"); font.bold: true;
                             color: "white"  }
                         }
@@ -183,6 +194,7 @@ Rectangle {
                         color: "white"
                     }
                     Rectangle {id: backports
+                        Layout.margins: 5
                         LinearGradient {
                             anchors.fill: parent
                             start: Qt.point(0, 0)
@@ -196,6 +208,7 @@ Rectangle {
                         Layout.alignment: Qt.AlignTop
                         Layout.fillWidth: true
                         Label { anchors.centerIn: parent
+                            //: Should be as displayed in software manager, thus in general not translated
                             text: qsTr("backports"); font.bold: true;  }
                         }
                     Label {
@@ -220,6 +233,7 @@ Rectangle {
                         }
                     }
                     Rectangle {id: noteBg
+                        Layout.margins: 5
                         color: "#e6c200";
                         height: 30
                         Layout.alignment: Qt.AlignTop
@@ -242,13 +256,14 @@ Rectangle {
 
                 Label {
                     x: 84
+                    anchors {top: parent.bottom; topMargin: 3; }
                     text: qsTr("(*) Administrator password is needed.")
                     Layout.maximumWidth: slideshow.width * .25
                     wrapMode: Text.WordWrap
                     font.italic: true
                     color: "white"
                 }
-            }
+
         }
         // Update page
         Rectangle {
@@ -303,8 +318,7 @@ Rectangle {
 
             }
             Label {
-                anchors {bottom: parent.bottom; }
-                anchors.bottomMargin: 10
+                anchors {top: parent.bottom; topMargin: 3 }
                 x:20
                 text: qsTr("(*) User password is needed")
                 wrapMode: Text.WordWrap
@@ -379,8 +393,7 @@ Rectangle {
                     }
                 }
                 Label {
-                anchors {bottom: parent.bottom; }
-                anchors.bottomMargin: 10
+                anchors {top: parent.bottom; topMargin: 3; }
                 x:20
                 text: qsTr("(*) Administrator password is needed")
                 wrapMode: Text.WordWrap
@@ -470,8 +483,7 @@ Rectangle {
                    }
             }
             Label {
-                anchors {bottom: parent.bottom; }
-                anchors.bottomMargin: 10
+                anchors {top: parent.bottom; topMargin: 3}
                 x:20
                 text: qsTr("(*) Administrator password is needed")
                 wrapMode: Text.WordWrap