Tuning of colors and positions

1 files changed, 48 insertions, 17 deletions

diff --git a/qml/mw-ui.qml b/qml/mw-ui.qml
index 9bd9440..938073e 100644
--- a/qml/mw-ui.qml
+++ b/qml/mw-ui.qml
@@ -88,7 +88,16 @@ and help you with the configuration of your newly installed system.
                 GridLayout {
                     columns: 3
                     Rectangle {id: coreBg
-                        color: "lightgreen"
+                        LinearGradient {
+                            anchors.fill: parent
+                            start: Qt.point(0, 0)
+                            end: Qt.point(0, 20)
+                            gradient: Gradient {
+                                GradientStop { position: 0.0; color: "lightgreen" }
+                                GradientStop { position: 1.0; color: "green" }
+                            }
+                        }
+                        radius: 5
                         width: 80;
                         height: 20
                         Layout.alignment: Qt.AlignTop
@@ -106,12 +115,21 @@ and help you with the configuration of your newly installed system.
                     }
 
                     Rectangle {id: nonfreeBg
-                        color: "red"
+                        LinearGradient {
+                            anchors.fill: parent
+                            start: Qt.point(0, 0)
+                            end: Qt.point(0, 20)
+                            gradient: Gradient {
+                                GradientStop { position: 0.0; color: "red" }
+                                GradientStop { position: 1.0; color: "darkred" }
+                            }
+                        }
+                        radius: 5
                         width: 80; height: 20
                         Layout.alignment: Qt.AlignTop
                         Layout.fillWidth: true
                         Label { text: qsTr("nonfree");
-
+                            color: "white"
                             wrapMode: Text.WordWrap}
                         }
                     Label {
@@ -133,11 +151,21 @@ and help you with the configuration of your newly installed system.
                         }
                     }
                     Rectangle {id: taintedBg
-                        color: "red"
+                        LinearGradient {
+                            anchors.fill: parent
+                            start: Qt.point(0, 0)
+                            end: Qt.point(0, 20)
+                            gradient: Gradient {
+                                GradientStop { position: 0.0; color: "red" }
+                                GradientStop { position: 1.0; color: "darkred" }
+                            }
+                        }
+                        radius: 5
                         width: 80; height: 20
                         Layout.alignment: Qt.AlignTop
                         Layout.fillWidth: true
-                        Label { text: qsTr("tainted");   }
+                        Label { text: qsTr("tainted");
+                            color: "white"  }
                         }
                     Label {
                         text: qsTr("- these packages may infringe on patents or copyright laws in certain countries, eg audio and video codecs needed for certain multimedia files or commercial DVDs");
@@ -149,7 +177,8 @@ and help you with the configuration of your newly installed system.
 
                     }
                     Rectangle {
-                        color: "white"
+                        color: "lightgrey"
+                        radius:5
                         width: 80; height: 20
                         Layout.alignment: Qt.AlignTop
                         Layout.fillWidth: true
@@ -167,7 +196,7 @@ and help you with the configuration of your newly installed system.
                         font.italic: true
                     }
                     Rectangle {id: noteBg
-                        color: "yellow";
+                        color: "gold";
                         width: 70
                         height: 20
                         Layout.alignment: Qt.AlignTop
@@ -208,8 +237,7 @@ and help you with the configuration of your newly installed system.
                 Label { text: qsTr("Update"); font.bold: true;  }
                 Label {
                     width: slideshow.width * .7
-                    text: qsTr("
-Mageia provides software which may be updated in order to fix bugs or security issues.
+                    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.");
                     wrapMode: Text.WordWrap
                 }
@@ -217,7 +245,9 @@ It is highly recommended that you update your system regularly. An Update icon w
             Column {
                 anchors.right: parent.right
                 anchors.verticalCenter:  parent.verticalCenter
+                anchors.leftMargin: 10
                 Button {
+                    width: view.width * .25;
                     objectName: "launch"
                     onClicked:{ launch.command(["drakrpm-update",])}
                     style: ButtonStyle {
@@ -229,6 +259,7 @@ It is highly recommended that you update your system regularly. An Update icon w
                     }
                 }
                     Label {
+                        width: view.width * .27;
                         text: qsTr("(*) User password is needed")
                         wrapMode: Text.WordWrap
                         font.italic: true
@@ -296,7 +327,7 @@ It is highly recommended that you update your system regularly. An Update icon w
                    Label {
                        text: qsTr("(*) Administrator password is needed")
                        wrapMode: Text.WordWrap
-                       width: view.width * .3;
+                       width: view.width * .25;
                        font.italic: true
                    }
                }
@@ -374,14 +405,14 @@ It is highly recommended that you update your system regularly. An Update icon w
                            style: ButtonStyle {
                                label: Label {
                                    text: qsTr("RPMdrake")+" *";
-                                   width: slideshow.width * .3
+                                   width: slideshow.width * .25
                                    wrapMode: Text.WordWrap
                                }
                            }
                        }
                        Label {
                            text: qsTr("(*) Administrator password is needed")
-                           width: slideshow.width * .3
+                           width: slideshow.width * .25
                            wrapMode: Text.WordWrap
                            font.italic: true
                        }
@@ -409,7 +440,7 @@ It is highly recommended that you update your system regularly. An Update icon w
                     id: warning
                     width: view.width
                     height: 60
-                    color: "yellow"
+                    color: "gold"
                     Label {anchors {verticalCenter: parent.verticalCenter;}
                         text: qsTr("Here is a small selection of popular applications - any of which may be installed at this point.")+"<BR />"+"Be sure you have enabled <i>online repositories</i>"
                         textFormat: Text.RichText
@@ -688,7 +719,7 @@ It is highly recommended that you update your system regularly. An Update icon w
         id: buttonbox
         width: banner.width; height: 42
         anchors { top: banner.bottom;  }
-        color: "gray"
+        color: "#2397D4"
 
         Row {
             anchors.centerIn: parent
@@ -699,13 +730,13 @@ It is highly recommended that you update your system regularly. An Update icon w
 
                 Rectangle {
                     width: banner.width/9; height: 35
-                    radius: 3
-                    color: view.currentIndex == index ? "blue" : "white"
+                    radius: 5
+                    color: view.currentIndex == index ? "#262F45" : "white"
                     Label{
                         text: itemModel.get(index).title
                         font.pointSize: 8
                         width: parent.width
-                        color: view.currentIndex == index ? "white" : "black"
+                        color: view.currentIndex == index ? "white" : "#262F45"
                         horizontalAlignment: Text.AlignHCenter
                         wrapMode : Text.WordWrap
                     }