some work on configuration interface

correct file locations
create configuration slots
TODO сделать этот ебаный коннектор или выкинуть его нахуй

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

@@ -19,8 +19,6 @@ import QtQuick 2.0
 import QtQuick.Controls 1.3 as QtControls
 import QtQuick.Layouts 1.0 as QtLayouts
 
-import org.kde.plasma.private.awesomewidget 1.0
-
 
 Item {
     id: aboutPage
@@ -29,7 +27,8 @@ Item {
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    property bool debug: AWKeys.isDebugEnabled()
+    Loader { id: connector; source: "connector.qml" }
+    property bool debug: connector.item.debug
 
     Column {
         id: pageColumn
@@ -44,20 +43,20 @@ Item {
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignHCenter
-                        text: AWActions.getAboutText("header")
+                        text: connector.item.getAboutText("header")
                     }
 
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignJustify
-                        text: AWActions.getAboutText("description")
+                        text: connector.item.getAboutText("description")
                     }
 
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignLeft
                         textFormat: Text.RichText
-                        text: AWActions.getAboutText("links")
+                        text: connector.item.getAboutText("links")
                     }
 
                     QtControls.Label {
@@ -65,7 +64,7 @@ Item {
                         font.capitalization: Font.SmallCaps
                         horizontalAlignment: Text.AlignHCenter
                         textFormat: Text.RichText
-                        text: AWActions.getAboutText("copy")
+                        text: connector.item.getAboutText("copy")
                     }
                 }
             }
@@ -78,14 +77,14 @@ Item {
                         QtLayouts.Layout.fillWidth: true
                         wrapMode: Text.WordWrap
                         horizontalAlignment: Text.AlignJustify
-                        text: AWActions.getAboutText("translators")
+                        text: connector.item.getAboutText("translators")
                     }
 
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignJustify
                         textFormat: Text.RichText
-                        text: AWActions.getAboutText("3rdparty")
+                        text: connector.item.getAboutText("3rdparty")
                     }
                 }
             }

sources/awesome-widget-kf5/package/contents/ui/advanced.qml

@@ -20,8 +20,6 @@ import QtQuick.Controls 1.3 as QtControls
 import QtQuick.Layouts 1.0 as QtLayouts
 import QtQuick.Controls.Styles 1.3 as QtStyles
 
-import org.kde.plasma.private.awesomewidget 1.0
-
 
 Item {
     id: advancedPage
@@ -30,12 +28,15 @@ Item {
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    property bool debug: AWKeys.isDebugEnabled()
+    Loader { id: connector; source: "connector.qml" }
+    property bool debug: connector.item.debug
 
     property alias cfg_background: background.checked
     property alias cfg_customTime: customTime.text
     property alias cfg_customUptime: customUptime.text
     property string cfg_tempUnits: tempUnits.currentText
+    property alias cfg_acOnline: acOnline.text
+    property alias cfg_acOffline: acOffline.text
 
 
     Column {
@@ -157,8 +158,160 @@ Item {
             QtControls.Button {
                 width: parent.width * 3 / 5
                 text: i18n("Select devices")
-                onClicked: plasmoid.configuration.customNetdev = AWActions.selectDevices(AWActions.getNetworkDevices(),
-                                                                                         plasmoid.configuration.customNetdev.split("@@"))
+                onClicked: plasmoid.configuration.tempDevice = connector.item.selectDevices(
+                                                               connector.item.getTempDevices(),
+                                                               plasmoid.configuration.tempDevice.split("@@")
+                                                                                           )
+            }
+        }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: implicitHeight
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("Fan devices")
+            }
+            QtControls.Button {
+                width: parent.width * 3 / 5
+                text: i18n("Select devices")
+                onClicked: plasmoid.configuration.fanDevice = connector.item.selectDevice(
+                                                              connector.item.getFanDevices(),
+                                                              plasmoid.configuration.fanDevice.split("@@")
+                                                                                         )
+            }
+        }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: implicitHeight
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("Mount devices")
+            }
+            QtControls.Button {
+                width: parent.width * 3 / 5
+                text: i18n("Select devices")
+                onClicked: plasmoid.configuration.mount = connector.item.selectDevices(connector.item.getMountDevices(),
+                                                                                       plasmoid.configuration.mount.split("@@")
+                                                                                      )
+            }
+        }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: implicitHeight
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("HDD devices (speed)")
+            }
+            QtControls.Button {
+                width: parent.width * 3 / 5
+                text: i18n("Select devices")
+                onClicked: plasmoid.configuration.disk = connector.item.selectDevices(
+                                                         connector.item.getDiskDevices(),
+                                                         plasmoid.configuration.disk.split("@@")
+                                                                                     )
+            }
+        }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: implicitHeight
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("HDD devices (temp)")
+            }
+            QtControls.Button {
+                width: parent.width * 3 / 5
+                text: i18n("Select devices")
+                onClicked: plasmoid.configuration.hdd = connector.item.selectDevices(
+                                                        connector.item.getHddDevices(),
+                                                        plasmoid.configuration.hdd.split("@@")
+                                                                                    )
+            }
+        }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: implicitHeight
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("Network devices")
+            }
+            QtControls.Button {
+                width: parent.width * 3 / 5
+                text: i18n("Select devices")
+                onClicked: plasmoid.configuration.customNetdev = connector.item.selectDevices(
+                                                                 connector.item.getNetworkDevices(),
+                                                                 plasmoid.configuration.customNetdev.split("@@")
+                                                                                             )
+            }
+        }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: parent.height
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("AC online tag")
+            }
+            QtControls.TextField {
+                id: acOnline
+                width: parent.width * 3 / 5
+                text: plasmoid.configuration.acOnline
+            }
+        }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: parent.height
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("AC offline tag")
+            }
+            QtControls.TextField {
+                id: acOffline
+                width: parent.width * 3 / 5
+                text: plasmoid.configuration.acOffline
+            }
+        }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: implicitHeight
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("Bars")
+            }
+            QtControls.Button {
+                width: parent.width * 3 / 5
+                text: i18n("Edit bars")
+                onClicked: connector.item.editItem("graphicalitem")
             }
         }
     }

sources/awesome-widget-kf5/package/contents/ui/appearance.qml

@@ -21,8 +21,6 @@ import QtQuick.Controls.Styles 1.3 as QtStyles
 import QtQuick.Dialogs 1.1 as QtDialogs
 import QtQuick.Layouts 1.0 as QtLayouts
 
-import org.kde.plasma.private.awesomewidget 1.0
-
 
 Item {
     id: appearancePage
@@ -31,7 +29,8 @@ Item {
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    property bool debug: AWKeys.isDebugEnabled()
+    Loader { id: connector; source: "connector.qml" }
+    property bool debug: connector.item.debug
     property variant weight: {
         25: 0,
         50: 1,

sources/awesome-widget-kf5/package/contents/ui/connector.qml

@@ -0,0 +1,163 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+import QtQuick 2.0
+
+import org.kde.plasma.private.awesomewidget 1.0
+
+
+QtObject {
+    id: connector
+
+    // variables
+    property bool debug: AWKeys.isDebugEnabled()
+    property variant fontWeight: {
+        "light": Font.Light,
+        "normal": Font.Normal,
+        "demibold": Font.DemiBold,
+        "bold": Font.Bold,
+        "black": Font.Black
+    }
+    property variant align: {
+        "left": Text.AlignLeft,
+        "center": Text.AlignHCenter,
+        "right": Text.AlignRight,
+        "justify": Text.AlignJustify
+    }
+    // external
+    property variant settings: {
+        "customTime": plasmoid.configuration.customTime,
+        "customUptime": plasmoid.configuration.customUptime,
+        "tempUnits": plasmoid.configuration.tempUnits,
+        "tempDevice": plasmoid.configuration.tempDevice,
+        "fanDevice": plasmoid.configuration.fanDevice,
+        "mount": plasmoid.configuration.mount,
+        "hdd": plasmoid.configuration.hdd,
+        "disk": plasmoid.configuration.disk,
+        "customNetdev": plasmoid.configuration.customNetdev,
+        "acOnline": plasmoid.configuration.acOnline,
+        "acOffline": plasmoid.configuration.acOffline
+    }
+    property variant tooltipSettings: {
+        "tooltipNumber": plasmoid.configuration.tooltipNumber,
+        "useTooltipBackground": plasmoid.configuration.useTooltipBackground,
+        "tooltipBackgroung": plasmoid.configuration.tooltipBackgroung,
+        "cpuTooltip": plasmoid.configuration.cpuTooltip,
+        "cpuclTooltip": plasmoid.configuration.cpuclTooltip,
+        "memTooltip": plasmoid.configuration.memTooltip,
+        "swapTooltip": plasmoid.configuration.swapTooltip,
+        "downTooltip": plasmoid.configuration.downTooltip,
+        "upTooltip": plasmoid.configuration.downTooltip,
+        "batteryTooltip": plasmoid.configuration.batteryTooltip,
+        "cpuTooltipColor": plasmoid.configuration.cpuTooltipColor,
+        "cpuclTooltipColor": plasmoid.configuration.cpuclTooltipColor,
+        "memTooltipColor": plasmoid.configuration.memTooltipColor,
+        "swapTooltipColor": plasmoid.configuration.swapTooltipColor,
+        "downTooltipColor": plasmoid.configuration.downTooltipColor,
+        "upTooltipColor": plasmoid.configuration.upTooltipColor,
+        "batteryTooltipColor": plasmoid.configuration.batteryTooltipColor,
+        "batteryInTooltipColor": plasmoid.configuration.batteryInTooltipColor
+    }
+    property string pattern: plasmoid.configuration.text
+
+    Component.onCompleted: {
+        if (debug) console.log("[connector::onCompleted]")
+
+        // init submodule
+        AWKeys.initKeys(pattern, settings, tooltipSettings)
+    }
+
+    function addDevice(source) {
+        AWActions.addDevice(source)
+    }
+
+    function checkKeys(data) {
+        return AWActions.checkKeys(data)
+    }
+
+    function checkUpdates() {
+        AWActions.checkUpdates()
+    }
+
+    function dictKeys() {
+        return AWKeys.dictKeys()
+    }
+
+    function editItem(type) {
+        AWKeys.editItem(type)
+    }
+
+    function getAboutText(type) {
+        AWActions.getAboutText(type)
+    }
+
+    function getDiskDevices() {
+        return AWActions.getDiskDevices()
+    }
+
+    function getFanDevices() {
+        return AWActions.getFanDevices()
+    }
+
+    function getFont(defaultFont) {
+        return AWActions.getFont(defaultFont)
+    }
+
+    function getHddDevices() {
+        return AWActions.getHddDevices()
+    }
+
+    function getMountDevices() {
+        return AWActions.getMountDevices()
+    }
+
+    function getNetworkDevices() {
+        return AWActions.getNetworkDevices()
+    }
+
+    function getTempDevices() {
+        return AWActions.getTempDevices()
+    }
+
+    function isReady() {
+        return AWKeys.isReady()
+    }
+
+    function parsePattern() {
+        return AWKeys.parsePattern(pattern)
+    }
+
+    function selectDevice(all, current) {
+        return AWActions.selectDevices(all, current)
+    }
+
+    function sendNotification(event, message) {
+        AWActions.sendNotification(event, message)
+    }
+
+    function setDataBySource(sourceName, data) {
+        AWKeys.setDataBySource(sourceName, data, settings)
+    }
+
+    function showValue(tag) {
+        return AWKeys.valueByKey(tag)
+    }
+
+    function showReadme() {
+        AWActions.showReadme()
+    }
+}

sources/awesome-widget-kf5/package/contents/ui/main.qml

@@ -21,64 +21,13 @@ import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
-import org.kde.plasma.private.awesomewidget 1.0
-
 
 Item {
     id: main
 
-    // variables
-    // internal
-    property bool debug: AWKeys.isDebugEnabled()
-    property variant fontWeight: {
-        "light": Font.Light,
-        "normal": Font.Normal,
-        "demibold": Font.DemiBold,
-        "bold": Font.Bold,
-        "black": Font.Black
-    }
-    property variant align: {
-        "left": Text.AlignLeft,
-        "center": Text.AlignHCenter,
-        "right": Text.AlignRight,
-        "justify": Text.AlignJustify
-    }
-    // external
-    property variant settings: {
-        "customTime": plasmoid.configuration.customTime,
-        "customUptime": plasmoid.configuration.customUptime,
-        "tempUnits": plasmoid.configuration.tempUnits,
-        "tempDevice": plasmoid.configuration.tempDevice,
-        "fanDevice": plasmoid.configuration.fanDevice,
-        "mount": plasmoid.configuration.mount,
-        "hdd": plasmoid.configuration.hdd,
-        "disk": plasmoid.configuration.disk,
-        "customNetdev": plasmoid.configuration.customNetdev,
-        "acOnline": plasmoid.configuration.acOnline,
-        "acOffline": plasmoid.configuration.acOffline
-    }
-    property variant tooltipSettings: {
-        "tooltipNumber": plasmoid.configuration.tooltipNumber,
-        "useTooltipBackground": plasmoid.configuration.useTooltipBackground,
-        "tooltipBackgroung": plasmoid.configuration.tooltipBackgroung,
-        "cpuTooltip": plasmoid.configuration.cpuTooltip,
-        "cpuclTooltip": plasmoid.configuration.cpuclTooltip,
-        "memTooltip": plasmoid.configuration.memTooltip,
-        "swapTooltip": plasmoid.configuration.swapTooltip,
-        "downTooltip": plasmoid.configuration.downTooltip,
-        "upTooltip": plasmoid.configuration.downTooltip,
-        "batteryTooltip": plasmoid.configuration.batteryTooltip,
-        "cpuTooltipColor": plasmoid.configuration.cpuTooltipColor,
-        "cpuclTooltipColor": plasmoid.configuration.cpuclTooltipColor,
-        "memTooltipColor": plasmoid.configuration.memTooltipColor,
-        "swapTooltipColor": plasmoid.configuration.swapTooltipColor,
-        "downTooltipColor": plasmoid.configuration.downTooltipColor,
-        "upTooltipColor": plasmoid.configuration.upTooltipColor,
-        "batteryTooltipColor": plasmoid.configuration.batteryTooltipColor,
-        "batteryInTooltipColor": plasmoid.configuration.batteryInTooltipColor
-    }
-    property string pattern: plasmoid.configuration.text
-    // signals
+    Loader { id: connector; source: "connector.qml" }
+    property bool debug: connector.item.debug
+
     signal needUpdate
 
     // init
@@ -96,14 +45,14 @@ Item {
         onNewData: {
             if (debug) console.log("[main::onNewData] : Update source " + sourceName)
 
-            if (!AWActions.checkKeys(data)) return
-            if (AWKeys.isReady()) AWKeys.setDataBySource(sourceName, data, settings)
+            if (!connector.item.checkKeys(data)) return
+            if (connector.item.isReady()) connector.item.setDataBySource(sourceName, data)
         }
 
         onSourceAdded: {
             if (debug) console.log("[main::onSourceAdded] : Source " + source)
 
-            AWActions.addDevice(source)
+            connector.item.addDevice(source)
         }
     }
 
@@ -116,8 +65,8 @@ Item {
         onNewData: {
             if (debug) console.log("[main::onNewData] : Update source " + sourceName)
 
-            if (!AWActions.checkKeys(data)) return
-            if (AWKeys.isReady()) AWKeys.setDataBySource(sourceName, data, settings)
+            if (!connector.item.checkKeys(data)) return
+            if (connector.item.isReady()) connector.item.setDataBySource(sourceName, data)
             // update
             if (sourceName == "update") needUpdate()
         }
@@ -132,8 +81,8 @@ Item {
         onNewData: {
             if (debug) console.log("[main::onNewData] : Update source " + sourceName)
 
-            if (!AWActions.checkKeys(data)) return
-            if (AWKeys.isReady()) AWKeys.setDataBySource(sourceName, data, settings)
+            if (!connector.item.checkKeys(data)) return
+            if (connector.item.isReady()) connector.item.setDataBySource(sourceName, data)
         }
     }
 
@@ -148,8 +97,8 @@ Item {
             font.family: plasmoid.configuration.fontFamily
             font.italic: plasmoid.configuration.fontStyle == "italic" ? true : false
             font.pointSize: plasmoid.configuration.fontSize
-            font.weight: fontWeight[plasmoid.configuration.fontWeight]
-            horizontalAlignment: align[plasmoid.configuration.textAlign]
+            font.weight: connector.item.fontWeight[plasmoid.configuration.fontWeight]
+            horizontalAlignment: connector.item.align[plasmoid.configuration.textAlign]
             textFormat: Text.RichText
             text: plasmoid.configuration.text
         }
@@ -158,8 +107,6 @@ Item {
     Component.onCompleted: {
         if (debug) console.log("[main::onCompleted]")
 
-        // init submodule
-        AWKeys.initKeys(pattern, settings, tooltipSettings)
         // actions
         plasmoid.setAction("showReadme", i18n("Show README"), "text-x-readme")
         plasmoid.setAction("updateText", i18n("Update text"), "stock-refresh")
@@ -169,7 +116,7 @@ Item {
     onNeedUpdate: {
         if (debug) console.log("[main::onNeedUpdate]")
 
-        text.text = AWKeys.parsePattern(pattern)
+        text.text = connector.item.parsePattern()
         // update geometry
         text.update()
         height = text.contentHeight
@@ -180,13 +127,13 @@ Item {
     function action_checkUpdates() {
         if (debug) console.log("[main::action_checkUpdates]")
 
-        AWActions.checkUpdates()
+        connector.item.checkUpdates()
     }
 
     function action_showReadme() {
         if (debug) console.log("[main::action_showReadme]")
 
-        AWActions.showReadme()
+        connector.item.showReadme()
     }
 
     function action_updateText() {

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

@@ -21,8 +21,6 @@ import QtQuick.Dialogs 1.1 as QtDialogs
 import QtQuick.Layouts 1.0 as QtLayouts
 import QtQuick.Controls.Styles 1.3 as QtStyles
 
-import org.kde.plasma.private.awesomewidget 1.0
-
 
 Item {
     id: widgetPage
@@ -31,7 +29,8 @@ Item {
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    property bool debug: AWKeys.isDebugEnabled()
+    Loader { id: connector; source: "connector.qml" }
+    property bool debug: connector.item.debug
 
     property alias cfg_text: textPattern.text
 
@@ -60,7 +59,7 @@ Item {
                         "family": plasmoid.configuration.fontFamily,
                         "size": plasmoid.configuration.fontSize
                     }
-                    var font = AWActions.getFont(defaultFont)
+                    var font = connector.item.getFont(defaultFont)
                     var pos = textPattern.cursorPosition
                     var selected = textPattern.selectedText
                     textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
@@ -183,7 +182,7 @@ Item {
 
             QtControls.ComboBox {
                 id: tags
-                model: AWKeys.dictKeys()
+                model: connector.item.dictKeys()
             }
             QtControls.Button {
                 text: i18n("Add")
@@ -203,8 +202,10 @@ Item {
                 onClicked: {
                     if (debug) console.log("[widget::onClicked] : Show tag button")
 
-                    var message = i18n("Tag: %1<br>Value: %2", tags.currentText, AWKeys.valueByKey(tags.currentText))
-                    AWActions.sendNotification("tag", message)
+                    var message = i18n("Tag: %1", tags.currentText)
+                    message += "<br>"
+                    message += i18n("Value: %1", connector.item.showValue(tags.currentText))
+                    connector.item.sendNotification("tag", message)
                 }
             }
         }