remove fucking connector

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

@@ -19,6 +19,8 @@ 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
@@ -27,8 +29,8 @@ Item {
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    Loader { id: connector; source: "connector.qml" }
+    property bool debug: AWKeys.isDebugEnabled()
-    property bool debug: connector.item.debug
+
 
     Column {
         id: pageColumn
@@ -43,20 +45,20 @@ Item {
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignHCenter
-                        text: connector.item.getAboutText("header")
+                        text: AWActions.getAboutText("header")
                     }
 
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignJustify
-                        text: connector.item.getAboutText("description")
+                        text: AWActions.getAboutText("description")
                     }
 
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignLeft
                         textFormat: Text.RichText
-                        text: connector.item.getAboutText("links")
+                        text: AWActions.getAboutText("links")
                     }
 
                     QtControls.Label {
@@ -64,7 +66,7 @@ Item {
                         font.capitalization: Font.SmallCaps
                         horizontalAlignment: Text.AlignHCenter
                         textFormat: Text.RichText
-                        text: connector.item.getAboutText("copy")
+                        text: AWActions.getAboutText("copy")
                     }
                 }
             }
@@ -77,14 +79,14 @@ Item {
                         QtLayouts.Layout.fillWidth: true
                         wrapMode: Text.WordWrap
                         horizontalAlignment: Text.AlignJustify
-                        text: connector.item.getAboutText("translators")
+                        text: AWActions.getAboutText("translators")
                     }
 
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignJustify
                         textFormat: Text.RichText
-                        text: connector.item.getAboutText("3rdparty")
+                        text: AWActions.getAboutText("3rdparty")
                     }
                 }
             }

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

@@ -20,6 +20,8 @@ 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
@@ -28,8 +30,7 @@ Item {
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    Loader { id: connector; source: "connector.qml" }
+    property bool debug: AWKeys.isDebugEnabled()
-    property bool debug: connector.item.debug
 
     property alias cfg_background: background.checked
     property alias cfg_customTime: customTime.text
@@ -158,10 +159,10 @@ Item {
             QtControls.Button {
                 width: parent.width * 3 / 5
                 text: i18n("Select devices")
-                onClicked: plasmoid.configuration.tempDevice = connector.item.selectDevices(
+                onClicked: plasmoid.configuration.tempDevice = AWActions.selectDevices(
-                                                               connector.item.getTempDevices(),
+                                                               AWActions.getTempDevices(),
                                                                plasmoid.configuration.tempDevice.split("@@")
-                                                                                           )
+                                                                                      )
             }
         }
 
@@ -178,10 +179,10 @@ Item {
             QtControls.Button {
                 width: parent.width * 3 / 5
                 text: i18n("Select devices")
-                onClicked: plasmoid.configuration.fanDevice = connector.item.selectDevice(
+                onClicked: plasmoid.configuration.fanDevice = AWActions.selectDevice(
-                                                              connector.item.getFanDevices(),
+                                                              AWActions.getFanDevices(),
                                                               plasmoid.configuration.fanDevice.split("@@")
-                                                                                         )
+                                                                                    )
             }
         }
 
@@ -198,9 +199,10 @@ Item {
             QtControls.Button {
                 width: parent.width * 3 / 5
                 text: i18n("Select devices")
-                onClicked: plasmoid.configuration.mount = connector.item.selectDevices(connector.item.getMountDevices(),
+                onClicked: plasmoid.configuration.mount = AWActions.selectDevices(
-                                                                                       plasmoid.configuration.mount.split("@@")
+                                                          AWActions.getMountDevices(),
-                                                                                      )
+                                                          plasmoid.configuration.mount.split("@@")
+                                                                                 )
             }
         }
 
@@ -217,10 +219,10 @@ Item {
             QtControls.Button {
                 width: parent.width * 3 / 5
                 text: i18n("Select devices")
-                onClicked: plasmoid.configuration.disk = connector.item.selectDevices(
+                onClicked: plasmoid.configuration.disk = AWActions.selectDevices(
-                                                         connector.item.getDiskDevices(),
+                                                         AWActions.getDiskDevices(),
                                                          plasmoid.configuration.disk.split("@@")
-                                                                                     )
+                                                                                )
             }
         }
 
@@ -237,10 +239,10 @@ Item {
             QtControls.Button {
                 width: parent.width * 3 / 5
                 text: i18n("Select devices")
-                onClicked: plasmoid.configuration.hdd = connector.item.selectDevices(
+                onClicked: plasmoid.configuration.hdd = AWActions.selectDevices(
-                                                        connector.item.getHddDevices(),
+                                                        AWActions.getHddDevices(),
                                                         plasmoid.configuration.hdd.split("@@")
-                                                                                    )
+                                                                               )
             }
         }
 
@@ -257,10 +259,10 @@ Item {
             QtControls.Button {
                 width: parent.width * 3 / 5
                 text: i18n("Select devices")
-                onClicked: plasmoid.configuration.customNetdev = connector.item.selectDevices(
+                onClicked: plasmoid.configuration.customNetdev = AWActions.selectDevices(
-                                                                 connector.item.getNetworkDevices(),
+                                                                 AWActions.getNetworkDevices(),
                                                                  plasmoid.configuration.customNetdev.split("@@")
-                                                                                             )
+                                                                                        )
             }
         }
 
@@ -311,7 +313,7 @@ Item {
             QtControls.Button {
                 width: parent.width * 3 / 5
                 text: i18n("Edit bars")
-                onClicked: connector.item.editItem("graphicalitem")
+                onClicked: AWKeys.editItem("graphicalitem")
             }
         }
     }
@@ -319,5 +321,8 @@ Item {
 
     Component.onCompleted: {
         if (debug) console.log("[advanced::onCompleted]")
+
+        // init submodule
+        AWKeys.initKeys(pattern, settings, tooltipSettings)
     }
 }

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

@@ -21,6 +21,9 @@ 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
+import "."
+
 
 Item {
     id: appearancePage
@@ -29,8 +32,7 @@ Item {
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    Loader { id: connector; source: "connector.qml" }
+    property bool debug: AWKeys.isDebugEnabled()
-    property bool debug: connector.item.debug
     property variant weight: {
         25: 0,
         50: 1,

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

@@ -15,16 +15,11 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
+pragma Singleton
 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,
@@ -38,7 +33,6 @@ QtObject {
         "right": Text.AlignRight,
         "justify": Text.AlignJustify
     }
-    // external
     property variant settings: {
         "customTime": plasmoid.configuration.customTime,
         "customUptime": plasmoid.configuration.customUptime,
@@ -72,92 +66,4 @@ QtObject {
         "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,15 +21,18 @@ 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
+import "."
+
 
 Item {
     id: main
 
-    Loader { id: connector; source: "connector.qml" }
+    property bool debug: AWKeys.isDebugEnabled()
-    property bool debug: connector.item.debug
 
     signal needUpdate
 
+
     // init
     Plasmoid.icon: "utilities-system-monitor"
     Plasmoid.backgroundHints: "DefaultBackground"
@@ -45,14 +48,14 @@ Item {
         onNewData: {
             if (debug) console.log("[main::onNewData] : Update source " + sourceName)
 
-            if (!connector.item.checkKeys(data)) return
+            if (!AWActions.checkKeys(data)) return
-            if (connector.item.isReady()) connector.item.setDataBySource(sourceName, data)
+            if (AWKeys.isReady()) AWKeys.setDataBySource(sourceName, data, general.settings)
         }
 
         onSourceAdded: {
             if (debug) console.log("[main::onSourceAdded] : Source " + source)
 
-            connector.item.addDevice(source)
+            AWActions.addDevice(source)
         }
     }
 
@@ -65,8 +68,8 @@ Item {
         onNewData: {
             if (debug) console.log("[main::onNewData] : Update source " + sourceName)
 
-            if (!connector.item.checkKeys(data)) return
+            if (!AWActions.checkKeys(data)) return
-            if (connector.item.isReady()) connector.item.setDataBySource(sourceName, data)
+            if (AWKeys.isReady()) AWKeys.setDataBySource(sourceName, data, general.settings)
             // update
             if (sourceName == "update") needUpdate()
         }
@@ -81,8 +84,8 @@ Item {
         onNewData: {
             if (debug) console.log("[main::onNewData] : Update source " + sourceName)
 
-            if (!connector.item.checkKeys(data)) return
+            if (!AWActions.checkKeys(data)) return
-            if (connector.item.isReady()) connector.item.setDataBySource(sourceName, data)
+            if (AWKeys.isReady()) AWKeys.setDataBySource(sourceName, data, general.settings)
         }
     }
 
@@ -97,8 +100,8 @@ Item {
             font.family: plasmoid.configuration.fontFamily
             font.italic: plasmoid.configuration.fontStyle == "italic" ? true : false
             font.pointSize: plasmoid.configuration.fontSize
-            font.weight: connector.item.fontWeight[plasmoid.configuration.fontWeight]
+            font.weight: general.fontWeight[plasmoid.configuration.fontWeight]
-            horizontalAlignment: connector.item.align[plasmoid.configuration.textAlign]
+            horizontalAlignment: general.align[plasmoid.configuration.textAlign]
             textFormat: Text.RichText
             text: plasmoid.configuration.text
         }
@@ -107,6 +110,8 @@ Item {
     Component.onCompleted: {
         if (debug) console.log("[main::onCompleted]")
 
+        // init submodule
+        AWKeys.initKeys(plasmoid.configuration.text, general.settings, general.tooltipSettings)
         // actions
         plasmoid.setAction("showReadme", i18n("Show README"), "text-x-readme")
         plasmoid.setAction("updateText", i18n("Update text"), "stock-refresh")
@@ -116,7 +121,7 @@ Item {
     onNeedUpdate: {
         if (debug) console.log("[main::onNeedUpdate]")
 
-        text.text = connector.item.parsePattern()
+        text.text = AWKeys.parsePattern(plasmoid.configuration.text)
         // update geometry
         text.update()
         height = text.contentHeight
@@ -127,13 +132,13 @@ Item {
     function action_checkUpdates() {
         if (debug) console.log("[main::action_checkUpdates]")
 
-        connector.item.checkUpdates()
+        AWActions.checkUpdates()
     }
 
     function action_showReadme() {
         if (debug) console.log("[main::action_showReadme]")
 
-        connector.item.showReadme()
+        AWActions.showReadme()
     }
 
     function action_updateText() {

sources/awesome-widget-kf5/package/contents/ui/qmldir

@@ -0,0 +1 @@
+singleton general general.qml

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

@@ -21,6 +21,9 @@ 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
+import "."
+
 
 Item {
     id: widgetPage
@@ -29,8 +32,7 @@ Item {
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    Loader { id: connector; source: "connector.qml" }
+    property bool debug: AWKeys.isDebugEnabled()
-    property bool debug: connector.item.debug
 
     property alias cfg_text: textPattern.text
 
@@ -59,7 +61,7 @@ Item {
                         "family": plasmoid.configuration.fontFamily,
                         "size": plasmoid.configuration.fontSize
                     }
-                    var font = connector.item.getFont(defaultFont)
+                    var font = AWActions.getFont(defaultFont)
                     var pos = textPattern.cursorPosition
                     var selected = textPattern.selectedText
                     textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
@@ -182,7 +184,7 @@ Item {
 
             QtControls.ComboBox {
                 id: tags
-                model: connector.item.dictKeys()
+                model: AWKeys.dictKeys()
             }
             QtControls.Button {
                 text: i18n("Add")
@@ -204,8 +206,8 @@ Item {
 
                     var message = i18n("Tag: %1", tags.currentText)
                     message += "<br>"
-                    message += i18n("Value: %1", connector.item.showValue(tags.currentText))
+                    message += i18n("Value: %1", AWKeys.valueByKey(tags.currentText))
-                    connector.item.sendNotification("tag", message)
+                    AWActions.sendNotification("tag", message)
                 }
             }
         }
@@ -220,5 +222,8 @@ Item {
 
     Component.onCompleted: {
         if (debug) console.log("[widget::onCompleted]")
+
+        // init submodule
+        AWKeys.initKeys(plasmoid.configuration.text, general.settings, general.tooltipSettings)
     }
 }