All buttons with new design

1 files changed, 34 insertions, 90 deletions

diff --git a/qml/mw-ui.qml b/qml/mw-ui.qml
index 0286384..e97eb41 100644
--- a/qml/mw-ui.qml
+++ b/qml/mw-ui.qml
@@ -325,37 +325,18 @@ This is a background process and you will be able to use your computer normally
                     color: "white"
                 }
 
-                Button {
-                    width: view.width * .18
+                MButton {
                     anchors.horizontalCenter:  parent.horizontalCenter
                     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
-                            color: "black"
-                        }
-                    }
+                    onMbuttonClicked: { launch.command(["drakrpm-update",])}
+                    buttonText: qsTr("Check system updates")+" *"
                 }
-                Button {
-                    x:10
-                    width: view.width * .18;
+                MButton {
                     anchors.horizontalCenter:  parent.horizontalCenter
                     objectName: "link"
-                    onClicked:{ link.weblink("https://advisories.mageia.org/")}
-                    style: ButtonStyle {
-                        label: Label {
-                            horizontalAlignment: TextInput.AlignHCenter
-                            //: (en) indicates that the content of the link is in English
-                            text: qsTr("Advisories of updates (en)");
-                            width: parent.width
-                            wrapMode: Text.WordWrap
-                            color: "black"
-                        }
-                    }
+                    //: (en) indicates that the content of the link is in English
+                    onMbuttonClicked: { link.weblink(["drakrpm-update",])}
+                    buttonText: qsTr("Advisories of updates (en)")
                 }
 
             }
@@ -401,38 +382,18 @@ This is a background process and you will be able to use your computer normally
                        color: "white"
                    }
 
-
-                   Button {
-                       id: mcc
-                       width: view.width * .18;
-                       anchors.horizontalCenter: parent.horizontalCenter
+                   MButton {
+                       anchors.horizontalCenter:  parent.horizontalCenter
                        objectName: "launch"
-                       onClicked: { launch.command(["drakconf"])}
-                       style: ButtonStyle {
-                           label: Label {
-                               horizontalAlignment: TextInput.AlignHCenter
-                               text: qsTr("Mageia Control Center")+" *";
-                               width: parent.width
-                               wrapMode: Text.WordWrap
-                               color: "black"
-                           }
-                       }
+                       onMbuttonClicked: { launch.command(["drakconf",])}
+                       buttonText: qsTr("Mageia Control Center")+" *"
+                   }
+                   MButton {
+                       anchors.horizontalCenter:  parent.horizontalCenter
+                       objectName: "link"
+                       onMbuttonClicked: { link.weblink("https://www.mageia.org/doc")}
+                       buttonText: qsTr("MCC documentation")
                    }
-                    Button {
-                        width: view.width * .18;
-                        anchors.horizontalCenter: parent.horizontalCenter
-                        objectName: "link"
-                        onClicked: { link.weblink("https://www.mageia.org/doc")}
-                        style: ButtonStyle {
-                            label: Label {
-                                horizontalAlignment: TextInput.AlignHCenter
-                                text: qsTr("MCC documentation");
-                                width: parent.width
-                                wrapMode: Text.WordWrap
-                                color: "black"
-                            }
-                        }
-                    }
                 }
                 Label {
                 anchors {top: parent.bottom; topMargin: 3; horizontalCenter: parent.left; horizontalCenterOffset: parent.width * .4 }
@@ -466,20 +427,12 @@ This is a background process and you will be able to use your computer normally
                        textFormat: Text.RichText
                        color: "white"
                    }
-                   Button {
-                       id: rpmdrake
+                   MButton {
                        anchors.left: parent.left; anchors.leftMargin: 20;
+                       width: slideshow.width * .35
                        objectName: "launch"
-                       onClicked: {
-                           launch.command(["rpmdrake",])}
-                       style: ButtonStyle {
-                           label: Label {
-                               text: qsTr("RPMdrake")+" *";
-                               width: slideshow.width * .35
-                               wrapMode: Text.WordWrap
-                               color: "black"
-                           }
-                       }
+                       onMbuttonClicked: { launch.command(["rpmdrake",])}
+                       buttonText: qsTr("RPMdrake")+" *"
                    }
                    Label {
                        text: qsTr("The next slide shows a small selection of popular applications - any of which may be installed at this point.<BR/>");
@@ -497,20 +450,13 @@ This is a background process and you will be able to use your computer normally
                        textFormat: Text.RichText
                        color: "white"
                    }
-                   Button {
-                       id: listApplicationsWiki
+                   MButton {
                        anchors.left: parent.left; anchors.leftMargin: 20
+                       width: slideshow.width * .35
                        objectName: "link"
                        //: Translate only if the link is to a specific page for your language
-                       onClicked: { link.weblink(qsTr("https://wiki.mageia.org/en/List_of_applications"))}
-                       style: ButtonStyle {
-                           label: Label {
-                               text: qsTr("List of applications (wiki)");
-                               width: slideshow.width * .5
-                               wrapMode: Text.WordWrap
-                               color: "black"
-                           }
-                       }
+                       onMbuttonClicked: { link.weblink(qsTr("https://wiki.mageia.org/en/List_of_applications"))}
+                       buttonText: qsTr("List of applications (wiki)")
                    }
             }
             Label {
@@ -805,18 +751,12 @@ This is a background process and you will be able to use your computer normally
                         color: "white"
                     }
                 }
-                Button {
-                    x: (view.width - width)/2
-                    onClicked: about.open()
-                    style: ButtonStyle {
-                        label: Label {
-                            horizontalAlignment: TextInput.AlignHCenter
-                            text: qsTr("About")
-                            color: "black"
-                        }
-                    }
+                MButton {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    objectName: "launch"
+                    onMbuttonClicked: { about.open() }
+                    buttonText: qsTr("About")
                 }
-
                 MessageDialog {
                     id: about
                     title: qsTr("About Mageiawelcome")
@@ -900,6 +840,10 @@ This is a background process and you will be able to use your computer normally
                                         color: "black"
                                         width: parent.width
                                         wrapMode: Text.WordWrap }
+                                    background: Rectangle {
+                                        color: "lightgrey"
+                                        radius: 5
+                                    }
                                 }
                             }
                     }