From 62ee9889b707ab7faac3ebc5857055025517b852 Mon Sep 17 00:00:00 2001 From: Antony Baker Date: Thu, 20 Dec 2018 16:06:19 +0000 Subject: Update/MCC/Install: 1. Increase left and top margins. 2. Align buttons. 3. Reposition Password required. 4. Slight adjustment to text. --- qml/mw-ui.qml | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/qml/mw-ui.qml b/qml/mw-ui.qml index d690a31..4cb9de8 100644 --- a/qml/mw-ui.qml +++ b/qml/mw-ui.qml @@ -234,21 +234,23 @@ Rectangle { } Column { + x:10; y: 35 Label { text: qsTr("How Mageia manages updates"); font.bold: true; padding: 10 } Label { width: slideshow.width * .9 padding: 10 - 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 this icon 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. 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 } Button { + x:10 width: view.width * .18; objectName: "launch" onClicked:{ launch.command(["drakrpm-update",])} style: ButtonStyle { label: Label { + horizontalAlignment: TextInput.AlignHCenter text: qsTr("Check system updates")+" *"; width: parent.width wrapMode: Text.WordWrap @@ -258,9 +260,9 @@ It is highly recommended that you update your system regularly. An Update icon w } Label { - anchors {bottom: parent.bottom; horizontalCenter: parent.horizontalCenter} - width: view.width * .5; - padding: 5 + anchors {bottom: parent.bottom; } + anchors.bottomMargin: 10 + x:20 text: qsTr("(*) User password is needed") wrapMode: Text.WordWrap font.italic: true @@ -283,6 +285,7 @@ It is highly recommended that you update your system regularly. An Update icon w } Column { + x: 10; y: 35 Label { text: qsTr("Mageia Control Center (aka drakconf) is a set of tools to help you configure your system.") width: view.width * 0.9 @@ -305,6 +308,7 @@ It is highly recommended that you update your system regularly. An Update icon w Button { id: mcc + x: 10 objectName: "launch" onClicked: { launch.command(["drakconf"])} style: ButtonStyle { @@ -315,6 +319,7 @@ It is highly recommended that you update your system regularly. An Update icon w } } Button { + x: 10 objectName: "link" onClicked: { link.weblink("https://www.mageia.org/doc")} style: ButtonStyle { @@ -326,12 +331,12 @@ It is highly recommended that you update your system regularly. An Update icon w } } Label { - text: qsTr("(*) Administrator password is needed") - anchors {bottom: parent.bottom; horizontalCenter: parent.horizontalCenter} - wrapMode: Text.WordWrap - padding: 5 - width: view.width * .4; - font.italic: true + anchors {bottom: parent.bottom; } + anchors.bottomMargin: 10 + x:20 + text: qsTr("(*) Administrator password is needed") + wrapMode: Text.WordWrap + font.italic: true } } // Install software page @@ -352,36 +357,38 @@ It is highly recommended that you update your system regularly. An Update icon w Column { //anchors.left: parent.left //anchors.verticalCenter: parent.verticalCenter + x:10; y: 35 Label { text: qsTr("Install and remove software") width: slideshow.width * .9 - padding: 5 + padding: 10 font.bold: true wrapMode: Text.WordWrap } Label { text: qsTr("With Mageia, you will find the software in the media repositories. Mageia users simply access these media via one of the Software Managers."); width: slideshow.width * .9; - padding: 5 + padding: 10 wrapMode: Text.WordWrap textFormat: Text.RichText } Label { - text: qsTr("Next slide shows a small selection of popular applications - any of which may be installed at this point.
"); + text: qsTr("The next slide shows a small selection of popular applications - any of which may be installed at this point.
"); width: slideshow.width * .9; - padding: 5 + padding: 10 wrapMode: Text.WordWrap textFormat: Text.RichText } Label { text: qsTr("You can find a more detailed list here:"); width: slideshow.width * .9; - padding: 5 + padding: 10 wrapMode: Text.WordWrap textFormat: Text.RichText } Button { id: listApplicationsWiki + x: 10 objectName: "link" onClicked: { link.weblink(qsTr("https://wiki.mageia.org/en/List_of_applications"))} style: ButtonStyle { @@ -395,12 +402,13 @@ It is highly recommended that you update your system regularly. An Update icon w Label { text: "
"+qsTr("You can find details of how to contact the community by selecting the More information tab."); width: slideshow.width * .9; - padding: 5 + padding: 10 wrapMode: Text.WordWrap textFormat: Text.RichText } Button { id: rpmdrake + x: 10 objectName: "launch" onClicked: { launch.command(["rpmdrake",])} @@ -414,10 +422,10 @@ It is highly recommended that you update your system regularly. An Update icon w } } Label { - anchors {bottom: parent.bottom; horizontalCenter: parent.horizontalCenter} + anchors {bottom: parent.bottom; } + anchors.bottomMargin: 10 + x:20 text: qsTr("(*) Administrator password is needed") - width: slideshow.width * .45 - padding: 5 wrapMode: Text.WordWrap font.italic: true } -- cgit v1.2.1