update desktoppanel qml part

sources/awesome-widget/package/contents/ui/about.qml

@@ -22,6 +22,7 @@ import org.kde.plasma.private.awesomewidget 1.0
 
 Item {
     id: aboutPage
+    // backend
     AWActions {
         id: awActions
     }

sources/desktop-panel/package/contents/ui/about.qml

@@ -22,6 +22,7 @@ import org.kde.plasma.private.desktoppanel 1.0
 
 Item {
     id: aboutPage
+    // backend
     DPAdds {
         id: dpAdds
     }

sources/desktop-panel/package/contents/ui/activeapp.qml

@@ -16,11 +16,9 @@
  ***************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Controls 1.3 as QtControls
-import QtQuick.Controls.Styles 1.3 as QtStyles
-import QtQuick.Dialogs 1.1 as QtDialogs
 
 import org.kde.plasma.private.desktoppanel 1.0
+import "."
 
 
 Item {
@@ -36,280 +34,69 @@ Item {
     implicitHeight: pageColumn.implicitHeight
 
     property bool debug: dpAdds.isDebugEnabled()
-    property variant weight: {
-        25: 0,
-        50: 1,
-        63: 3,
-        75: 4,
-        87: 5
-    }
 
-    property alias cfg_currentFontFamily: selectFont.text
+    property alias cfg_currentFontFamily: font.value
     property alias cfg_currentFontSize: fontSize.value
-    property string cfg_currentFontWeight: fontWeight.currentText
+    property string cfg_currentFontWeight: fontWeight.value
-    property string cfg_currentFontStyle: fontStyle.currentText
+    property string cfg_currentFontStyle: fontStyle.value
     property alias cfg_currentFontColor: selectColor.text
     property alias cfg_currentTextStyleColor: selectStyleColor.text
-    property string cfg_currentTextStyle: textStyle.currentText
+    property string cfg_currentTextStyle: textStyle.value
 
 
     Column {
         id: pageColumn
         anchors.fill: parent
-        Row {
+
-            height: implicitHeight
+        FontSelector {
-            width: parent.width
+            id: font
-            QtControls.Label {
+            text: i18n("Font")
-                height: parent.height
+            value: plasmoid.configuration.currentFontFamily
-                width: parent.width / 3
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Font")
-            }
-            QtControls.Button {
-                id: selectFont
-                width: parent.width * 2 / 3
-                text: plasmoid.configuration.currentFontFamily
-                onClicked: {
-                    if (debug) console.debug()
-                    fontDialog.setFont()
-                    fontDialog.visible = true
-                }
-            }
         }
 
-        Row {
+        IntegerSelector {
-            height: implicitHeight
+            id: fontSize
-            width: parent.width
+            maximumValue: 32
-            QtControls.Label {
+            minimumValue: 8
-                height: parent.height
+            stepSize: 1
-                width: parent.width / 3
+            text: i18n("Font size")
-                horizontalAlignment: Text.AlignRight
+            value: plasmoid.configuration.currentFontSize
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Font size")
-            }
-            QtControls.SpinBox {
-                id: fontSize
-                width: parent.width * 2 / 3
-                minimumValue: 8
-                maximumValue: 32
-                stepSize: 1
-                value: plasmoid.configuration.currentFontSize
-            }
         }
 
-        Row {
+        ComboBoxSelector {
-            height: implicitHeight
+            id: fontWeight
-            width: parent.width
+            model: general.fontWeightModel
-            QtControls.Label {
+            text: i18n("Font weight")
-                height: parent.height
+            value: plasmoid.configuration.currentFontWeight
-                width: parent.width / 3
+            onValueEdited: cfg_currentFontWeight = newValue
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Font weight")
-            }
-            QtControls.ComboBox {
-                id: fontWeight
-                width: parent.width * 2 / 3
-                textRole: "label"
-                model: [
-                    {
-                        'label': i18n("light"),
-                        'name': "light"
-                    },
-                    {
-                        'label': i18n("normal"),
-                        'name': "normal"
-                    },
-                    {
-                        'label': i18n("demi bold"),
-                        'name': "demibold"
-                    },
-                    {
-                        'label': i18n("bold"),
-                        'name': "bold"
-                    },
-                    {
-                        'label': i18n("black"),
-                        'name': "black"
-                    }
-                ]
-                onCurrentIndexChanged: cfg_currentFontWeight = model[currentIndex]["name"]
-                Component.onCompleted: {
-                    if (debug) console.debug()
-                    for (var i = 0; i < model.length; i++) {
-                        if (model[i]["name"] == plasmoid.configuration.currentFontWeight) {
-                            if (debug) console.info("Found", model[i]["name"], "on", i)
-                            fontWeight.currentIndex = i
-                        }
-                    }
-                }
-            }
         }
 
-        Row {
+        ComboBoxSelector {
-            height: implicitHeight
+            id: fontStyle
-            width: parent.width
+            model: general.fontStyleModel
-            QtControls.Label {
+            text: i18n("Font style")
-                height: parent.height
+            value: plasmoid.configuration.currentFontStyle
-                width: parent.width / 3
+            onValueEdited: cfg_currentFontStyle = newValue
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Font style")
-            }
-            QtControls.ComboBox {
-                id: fontStyle
-                width: parent.width * 2 / 3
-                textRole: "label"
-                model: [
-                    {
-                        'label': i18n("normal"),
-                        'name': "normal"
-                    },
-                    {
-                        'label': i18n("italic"),
-                        'name': "italic"
-                    }
-                ]
-                onCurrentIndexChanged: cfg_currentFontStyle = model[currentIndex]["name"]
-                Component.onCompleted: {
-                    if (debug) console.debug()
-                    for (var i = 0; i < model.length; i++) {
-                        if (model[i]["name"] == plasmoid.configuration.currentFontStyle) {
-                            if (debug) console.info("Found", model[i]["name"], "on", i)
-                            fontStyle.currentIndex = i
-                        }
-                    }
-                }
-            }
         }
 
-        Row {
+        ColorSelector {
-            height: implicitHeight
+            id: selectColor
-            width: parent.width
+            text: i18n("Font color")
-            QtControls.Label {
+            value: plasmoid.configuration.currentFontColor
-                height: parent.height
-                width: parent.width / 3
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Font color")
-            }
-            QtControls.Button {
-                id: selectColor
-                width: parent.width * 2 / 3
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.currentFontColor
-                    }
-                }
-                text: plasmoid.configuration.currentFontColor
-                onClicked: colorDialog.visible = true
-            }
         }
 
-        Row {
+        ComboBoxSelector {
-            height: implicitHeight
+            id: textStyle
-            width: parent.width
+            model: general.textStyleModel
-            QtControls.Label {
+            text: i18n("Style")
-                height: parent.height
+            value: plasmoid.configuration.currentTextStyle
-                width: parent.width / 3
+            onValueEdited: cfg_currentTextStyle = newValue
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Style")
-            }
-            QtControls.ComboBox {
-                id: textStyle
-                width: parent.width * 2 / 3
-                textRole: "label"
-                model: [
-                    {
-                        'label': i18n("normal"),
-                        'name': "normal"
-                    },
-                    {
-                        'label': i18n("outline"),
-                        'name': "outline"
-                    },
-                    {
-                        'label': i18n("raised"),
-                        'name': "raised"
-                    },
-                    {
-                        'label': i18n("sunken"),
-                        'name': "sunken"
-                    }
-                ]
-                onCurrentIndexChanged: cfg_currentTextStyle = model[currentIndex]["name"]
-                Component.onCompleted: {
-                    if (debug) console.debug()
-                    for (var i = 0; i < model.length; i++) {
-                        if (model[i]["name"] == plasmoid.configuration.currentTextStyle) {
-                            if (debug) console.info("Found", model[i]["name"], "on", i)
-                            textStyle.currentIndex = i
-                        }
-                    }
-                }
-            }
         }
 
-        Row {
+        ColorSelector {
-            height: implicitHeight
+            id: selectStyleColor
-            width: parent.width
+            text: i18n("Style color")
-            QtControls.Label {
+            value: plasmoid.configuration.currentTextStyleColor
-                height: parent.height
-                width: parent.width / 3
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Style color")
-            }
-            QtControls.Button {
-                id: selectStyleColor
-                width: parent.width * 2 / 3
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.currentTextStyleColor
-                    }
-                }
-                text: plasmoid.configuration.currentTextStyleColor
-                onClicked: textStyleColorDialog.visible = true
-            }
-        }
-    }
-
-    QtDialogs.ColorDialog {
-        id: colorDialog
-        title: i18n("Select a color")
-        color: selectColor.text
-        onAccepted: selectColor.text = colorDialog.color
-    }
-
-    QtDialogs.ColorDialog {
-        id: textStyleColorDialog
-        title: i18n("Select a color")
-        color: selectStyleColor.text
-        onAccepted: selectStyleColor.text = textStyleColorDialog.color
-    }
-
-    QtDialogs.FontDialog {
-        id: fontDialog
-        title: i18n("Select a font")
-        signal setFont
-
-        onAccepted: {
-            if (debug) console.debug()
-            selectFont.text = fontDialog.font.family
-            fontSize.value = fontDialog.font.pointSize
-            fontStyle.currentIndex = fontDialog.font.italic ? 1 : 0
-            fontWeight.currentIndex = weight[fontDialog.font.weight]
-        }
-        onSetFont: {
-            if (debug) console.debug()
-            fontDialog.font = Qt.font({
-                family: selectFont.text,
-                pointSize: fontSize.value > 0 ? fontSize.value : 12,
-                italic: fontStyle.currentIndex == 1,
-                weight: Font.Normal,
-            })
         }
     }
 

sources/desktop-panel/package/contents/ui/advanced.qml

@@ -17,8 +17,6 @@
 
 import QtQuick 2.0
 import QtQuick.Controls 1.3 as QtControls
-import QtQuick.Controls.Styles 1.3 as QtStyles
-import QtQuick.Dialogs 1.1 as QtDialogs
 
 import org.kde.plasma.private.desktoppanel 1.0
 

sources/desktop-panel/package/contents/ui/inactiveapp.qml

@@ -16,11 +16,9 @@
  ***************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Controls 1.3 as QtControls
-import QtQuick.Controls.Styles 1.3 as QtStyles
-import QtQuick.Dialogs 1.1 as QtDialogs
 
 import org.kde.plasma.private.desktoppanel 1.0
+import "."
 
 
 Item {
@@ -36,280 +34,69 @@ Item {
     implicitHeight: pageColumn.implicitHeight
 
     property bool debug: dpAdds.isDebugEnabled()
-    property variant weight: {
-        25: 0,
-        50: 1,
-        63: 3,
-        75: 4,
-        87: 5
-    }
 
-    property alias cfg_fontFamily: selectFont.text
+    property alias cfg_fontFamily: font.value
     property alias cfg_fontSize: fontSize.value
-    property string cfg_fontWeight: fontWeight.currentText
+    property string cfg_fontWeight: fontWeight.value
-    property string cfg_fontStyle: fontStyle.currentText
+    property string cfg_fontStyle: fontStyle.value
-    property alias cfg_fontColor: selectColor.text
+    property alias cfg_fontColor: selectColor.value
-    property alias cfg_textStyleColor: selectStyleColor.text
+    property alias cfg_textStyleColor: selectStyleColor.value
-    property string cfg_textStyle: textStyle.currentText
+    property string cfg_textStyle: textStyle.value
 
 
     Column {
         id: pageColumn
         anchors.fill: parent
-        Row {
+
-            height: implicitHeight
+        FontSelector {
-            width: parent.width
+            id: font
-            QtControls.Label {
+            text: i18n("Font")
-                height: parent.height
+            value: plasmoid.configuration.fontFamily
-                width: parent.width / 3
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Font")
-            }
-            QtControls.Button {
-                id: selectFont
-                width: parent.width * 2 / 3
-                text: plasmoid.configuration.fontFamily
-                onClicked: {
-                    if (debug) console.debug()
-                    fontDialog.setFont()
-                    fontDialog.visible = true
-                }
-            }
         }
 
-        Row {
+        IntegerSelector {
-            height: implicitHeight
+            id: fontSize
-            width: parent.width
+            maximumValue: 32
-            QtControls.Label {
+            minimumValue: 8
-                height: parent.height
+            stepSize: 1
-                width: parent.width / 3
+            text: i18n("Font size")
-                horizontalAlignment: Text.AlignRight
+            value: plasmoid.configuration.fontSize
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Font size")
-            }
-            QtControls.SpinBox {
-                id: fontSize
-                width: parent.width * 2 / 3
-                minimumValue: 8
-                maximumValue: 32
-                stepSize: 1
-                value: plasmoid.configuration.fontSize
-            }
         }
 
-        Row {
+        ComboBoxSelector {
-            height: implicitHeight
+            id: fontWeight
-            width: parent.width
+            model: general.fontWeightModel
-            QtControls.Label {
+            text: i18n("Font weight")
-                height: parent.height
+            value: plasmoid.configuration.fontWeight
-                width: parent.width / 3
+            onValueEdited: cfg_fontWeight = newValue
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Font weight")
-            }
-            QtControls.ComboBox {
-                id: fontWeight
-                width: parent.width * 2 / 3
-                textRole: "label"
-                model: [
-                    {
-                        'label': i18n("light"),
-                        'name': "light"
-                    },
-                    {
-                        'label': i18n("normal"),
-                        'name': "normal"
-                    },
-                    {
-                        'label': i18n("demi bold"),
-                        'name': "demibold"
-                    },
-                    {
-                        'label': i18n("bold"),
-                        'name': "bold"
-                    },
-                    {
-                        'label': i18n("black"),
-                        'name': "black"
-                    }
-                ]
-                onCurrentIndexChanged: cfg_fontWeight = model[currentIndex]["name"]
-                Component.onCompleted: {
-                    if (debug) console.debug()
-                    for (var i = 0; i < model.length; i++) {
-                        if (model[i]["name"] == plasmoid.configuration.fontWeight) {
-                            if (debug) console.info("Found", model[i]["name"], "on", i)
-                            fontWeight.currentIndex = i
-                        }
-                    }
-                }
-            }
         }
 
-        Row {
+        ComboBoxSelector {
-            height: implicitHeight
+            id: fontStyle
-            width: parent.width
+            model: general.fontStyleModel
-            QtControls.Label {
+            text: i18n("Font style")
-                height: parent.height
+            value: plasmoid.configuration.fontStyle
-                width: parent.width / 3
+            onValueEdited: cfg_fontStyle = newValue
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Font style")
-            }
-            QtControls.ComboBox {
-                id: fontStyle
-                width: parent.width * 2 / 3
-                textRole: "label"
-                model: [
-                    {
-                        'label': i18n("normal"),
-                        'name': "normal"
-                    },
-                    {
-                        'label': i18n("italic"),
-                        'name': "italic"
-                    }
-                ]
-                onCurrentIndexChanged: cfg_fontStyle = model[currentIndex]["name"]
-                Component.onCompleted: {
-                    if (debug) console.debug()
-                    for (var i = 0; i < model.length; i++) {
-                        if (model[i]["name"] == plasmoid.configuration.fontStyle) {
-                            if (debug) console.info("Found", model[i]["name"], "on", i)
-                            fontStyle.currentIndex = i
-                        }
-                    }
-                }
-            }
         }
 
-        Row {
+        ColorSelector {
-            height: implicitHeight
+            id: selectColor
-            width: parent.width
+            text: i18n("Font color")
-            QtControls.Label {
+            value: plasmoid.configuration.fontColor
-                height: parent.height
-                width: parent.width / 3
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Font color")
-            }
-            QtControls.Button {
-                id: selectColor
-                width: parent.width * 2 / 3
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.fontColor
-                    }
-                }
-                text: plasmoid.configuration.fontColor
-                onClicked: colorDialog.visible = true
-            }
         }
 
-        Row {
+        ComboBoxSelector {
-            height: implicitHeight
+            id: textStyle
-            width: parent.width
+            model: general.textStyleModel
-            QtControls.Label {
+            text: i18n("Style")
-                height: parent.height
+            value: plasmoid.configuration.textStyle
-                width: parent.width / 3
+            onValueEdited: cfg_textStyle = newValue
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Style")
-            }
-            QtControls.ComboBox {
-                id: textStyle
-                width: parent.width * 2 / 3
-                textRole: "label"
-                model: [
-                    {
-                        'label': i18n("normal"),
-                        'name': "normal"
-                    },
-                    {
-                        'label': i18n("outline"),
-                        'name': "outline"
-                    },
-                    {
-                        'label': i18n("raised"),
-                        'name': "raised"
-                    },
-                    {
-                        'label': i18n("sunken"),
-                        'name': "sunken"
-                    }
-                ]
-                onCurrentIndexChanged: cfg_textStyle = model[currentIndex]["name"]
-                Component.onCompleted: {
-                    if (debug) console.debug()
-                    for (var i = 0; i < model.length; i++) {
-                        if (model[i]["name"] == plasmoid.configuration.textStyle) {
-                            if (debug) console.info("Found", model[i]["name"], "on", i)
-                            textStyle.currentIndex = i
-                        }
-                    }
-                }
-            }
         }
 
-        Row {
+        ColorSelector {
-            height: implicitHeight
+            id: selectStyleColor
-            width: parent.width
+            text: i18n("Style color")
-            QtControls.Label {
+            value: plasmoid.configuration.textStyleColor
-                height: parent.height
-                width: parent.width / 3
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Style color")
-            }
-            QtControls.Button {
-                id: selectStyleColor
-                width: parent.width * 2 / 3
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.textStyleColor
-                    }
-                }
-                text: plasmoid.configuration.textStyleColor
-                onClicked: textStyleColorDialog.visible = true
-            }
-        }
-    }
-
-    QtDialogs.ColorDialog {
-        id: colorDialog
-        title: i18n("Select a color")
-        color: selectColor.text
-        onAccepted: selectColor.text = colorDialog.color
-    }
-
-    QtDialogs.ColorDialog {
-        id: textStyleColorDialog
-        title: i18n("Select a color")
-        color: selectStyleColor.text
-        onAccepted: selectStyleColor.text = textStyleColorDialog.color
-    }
-
-    QtDialogs.FontDialog {
-        id: fontDialog
-        title: i18n("Select a font")
-        signal setFont
-
-        onAccepted: {
-            if (debug) console.debug()
-            selectFont.text = fontDialog.font.family
-            fontSize.value = fontDialog.font.pointSize
-            fontStyle.currentIndex = fontDialog.font.italic ? 1 : 0
-            fontWeight.currentIndex = weight[fontDialog.font.weight]
-        }
-        onSetFont: {
-            if (debug) console.debug()
-            fontDialog.font = Qt.font({
-                family: selectFont.text,
-                pointSize: fontSize.value > 0 ? fontSize.value : 12,
-                italic: fontStyle.currentIndex == 1,
-                weight: Font.Normal,
-            })
         }
     }