Update: icon not availble in Gnome

Software sources: move button

1 files changed, 29 insertions, 19 deletions

diff --git a/qml/mw-ui.qml b/qml/mw-ui.qml
index ed75495..fb1e309 100644
--- a/qml/mw-ui.qml
+++ b/qml/mw-ui.qml
@@ -252,21 +252,6 @@ Rectangle {
                         color: "white"
                     }
                     Button {
-                        Layout.maximumWidth: slideshow.width * .40
-                        Layout.columnSpan: 2
-                        Layout.alignment: Qt.AlignHCenter
-                        objectName: "launch"
-                        onClicked: { launch.command(["drakrpm-edit-media",])}
-                        style: ButtonStyle {
-                            label: Label {
-                                text: qsTr("Edit software sources")+" *";
-                                width: parent.width
-                                wrapMode: Text.WordWrap
-                                color: "black"
-                            }
-                        }
-                    }
-                    Button {
                         Layout.margins: 5
                         Layout.alignment: Qt.AlignTop
                         Layout.fillWidth: true
@@ -283,15 +268,38 @@ Rectangle {
                         }
                     }
                     Label { text: qsTr("If you enabled the online repositories during installation, some media sources should be installed already. Otherwise, we will now configure these online repositories.
-    If this computer will have access to the Internet, you can delete the <i>Local</i> entry from the list of repositories.")+"<BR /><BR />"+
-                               qsTr("Now, please enable or disable the online repositories of your choice: click on the <i>Edit software repositories</i> button. Select at least the <i>release</i> and <i>updates</i> pair. <i>Debug</i> and <i>Testing</i> are for special cases.")+"<BR />"+
-                               qsTr("After you have checked and enabled the repositories you need, you can go to the next slide.<BR />");
+    If this computer will have access to the Internet, you can delete the <i>Local</i> entry from the list of repositories.");
                           wrapMode: Text.WordWrap
                           textFormat: Text.RichText
                           color: "white"
                           Layout.fillWidth: true
                           Layout.maximumWidth: slideshow.width - 110
                         }
+                    Label { text: qsTr("Now, please enable or disable the online repositories of your choice: click on the <i>Edit software repositories</i> button. Select at least the <i>release</i> and <i>updates</i> pair. <i>Debug</i> and <i>Testing</i> are for special cases.")+"<BR />"+
+                                  qsTr("After you have checked and enabled the repositories you need, you can go to the next slide.")
+                          wrapMode: Text.WordWrap
+                          textFormat: Text.RichText
+                          color: "white"
+                          Layout.fillWidth: true
+                          Layout.maximumWidth: slideshow.width - 10
+                          Layout.columnSpan: 2
+                          Layout.margins: 10
+                        }
+                    Button {
+                        Layout.maximumWidth: slideshow.width * .40
+                        Layout.columnSpan: 2
+                        Layout.alignment: Qt.AlignHCenter
+                        objectName: "launch"
+                        onClicked: { launch.command(["drakrpm-edit-media",])}
+                        style: ButtonStyle {
+                            label: Label {
+                                text: qsTr("Edit software sources")+" *";
+                                width: parent.width
+                                wrapMode: Text.WordWrap
+                                color: "black"
+                            }
+                        }
+                    }
                 }
 
                 Label {
@@ -317,7 +325,9 @@ Rectangle {
                 Label {
                     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");
+                    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 (not available with Gnome). 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"
                 }