do not derive from qwidget in aggregates

sensors

@@ -0,0 +1,284 @@
+cpu
+cpu/all
+cpu/all/averageFrequency
+cpu/all/averageTemperature
+cpu/all/coreCount
+cpu/all/cpuCount
+cpu/all/maximumFrequency
+cpu/all/maximumTemperature
+cpu/all/minimumFrequency
+cpu/all/minimumTemperature
+cpu/all/name
+cpu/all/system
+cpu/all/usage
+cpu/all/user
+cpu/all/wait
+cpu/cpu0
+cpu/cpu0/frequency
+cpu/cpu0/name
+cpu/cpu0/system
+cpu/cpu0/temperature
+cpu/cpu0/usage
+cpu/cpu0/user
+cpu/cpu0/wait
+cpu/cpu1
+cpu/cpu1/frequency
+cpu/cpu1/name
+cpu/cpu1/system
+cpu/cpu1/temperature
+cpu/cpu1/usage
+cpu/cpu1/user
+cpu/cpu1/wait
+cpu/cpu10
+cpu/cpu10/frequency
+cpu/cpu10/name
+cpu/cpu10/system
+cpu/cpu10/temperature
+cpu/cpu10/usage
+cpu/cpu10/user
+cpu/cpu10/wait
+cpu/cpu11
+cpu/cpu11/frequency
+cpu/cpu11/name
+cpu/cpu11/system
+cpu/cpu11/temperature
+cpu/cpu11/usage
+cpu/cpu11/user
+cpu/cpu11/wait
+cpu/cpu12
+cpu/cpu12/frequency
+cpu/cpu12/name
+cpu/cpu12/system
+cpu/cpu12/temperature
+cpu/cpu12/usage
+cpu/cpu12/user
+cpu/cpu12/wait
+cpu/cpu13
+cpu/cpu13/frequency
+cpu/cpu13/name
+cpu/cpu13/system
+cpu/cpu13/temperature
+cpu/cpu13/usage
+cpu/cpu13/user
+cpu/cpu13/wait
+cpu/cpu14
+cpu/cpu14/frequency
+cpu/cpu14/name
+cpu/cpu14/system
+cpu/cpu14/temperature
+cpu/cpu14/usage
+cpu/cpu14/user
+cpu/cpu14/wait
+cpu/cpu15
+cpu/cpu15/frequency
+cpu/cpu15/name
+cpu/cpu15/system
+cpu/cpu15/temperature
+cpu/cpu15/usage
+cpu/cpu15/user
+cpu/cpu15/wait
+cpu/cpu16
+cpu/cpu16/frequency
+cpu/cpu16/name
+cpu/cpu16/system
+cpu/cpu16/temperature
+cpu/cpu16/usage
+cpu/cpu16/user
+cpu/cpu16/wait
+cpu/cpu17
+cpu/cpu17/frequency
+cpu/cpu17/name
+cpu/cpu17/system
+cpu/cpu17/temperature
+cpu/cpu17/usage
+cpu/cpu17/user
+cpu/cpu17/wait
+cpu/cpu18
+cpu/cpu18/frequency
+cpu/cpu18/name
+cpu/cpu18/system
+cpu/cpu18/temperature
+cpu/cpu18/usage
+cpu/cpu18/user
+cpu/cpu18/wait
+cpu/cpu19
+cpu/cpu19/frequency
+cpu/cpu19/name
+cpu/cpu19/system
+cpu/cpu19/temperature
+cpu/cpu19/usage
+cpu/cpu19/user
+cpu/cpu19/wait
+cpu/cpu2
+cpu/cpu2/frequency
+cpu/cpu2/name
+cpu/cpu2/system
+cpu/cpu2/temperature
+cpu/cpu2/usage
+cpu/cpu2/user
+cpu/cpu2/wait
+cpu/cpu3
+cpu/cpu3/frequency
+cpu/cpu3/name
+cpu/cpu3/system
+cpu/cpu3/temperature
+cpu/cpu3/usage
+cpu/cpu3/user
+cpu/cpu3/wait
+cpu/cpu4
+cpu/cpu4/frequency
+cpu/cpu4/name
+cpu/cpu4/system
+cpu/cpu4/temperature
+cpu/cpu4/usage
+cpu/cpu4/user
+cpu/cpu4/wait
+cpu/cpu5
+cpu/cpu5/frequency
+cpu/cpu5/name
+cpu/cpu5/system
+cpu/cpu5/temperature
+cpu/cpu5/usage
+cpu/cpu5/user
+cpu/cpu5/wait
+cpu/cpu6
+cpu/cpu6/frequency
+cpu/cpu6/name
+cpu/cpu6/system
+cpu/cpu6/temperature
+cpu/cpu6/usage
+cpu/cpu6/user
+cpu/cpu6/wait
+cpu/cpu7
+cpu/cpu7/frequency
+cpu/cpu7/name
+cpu/cpu7/system
+cpu/cpu7/temperature
+cpu/cpu7/usage
+cpu/cpu7/user
+cpu/cpu7/wait
+cpu/cpu8
+cpu/cpu8/frequency
+cpu/cpu8/name
+cpu/cpu8/system
+cpu/cpu8/temperature
+cpu/cpu8/usage
+cpu/cpu8/user
+cpu/cpu8/wait
+cpu/cpu9
+cpu/cpu9/frequency
+cpu/cpu9/name
+cpu/cpu9/system
+cpu/cpu9/temperature
+cpu/cpu9/usage
+cpu/cpu9/user
+cpu/cpu9/wait
+cpu/loadaverages
+cpu/loadaverages/loadaverage1
+cpu/loadaverages/loadaverage15
+cpu/loadaverages/loadaverage5
+disk
+disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85
+disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85/free
+disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85/freePercent
+disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85/name
+disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85/read
+disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85/total
+disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85/used
+disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85/usedPercent
+disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85/write
+disk/all
+disk/all/free
+disk/all/freePercent
+disk/all/read
+disk/all/total
+disk/all/used
+disk/all/usedPercent
+disk/all/write
+disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258
+disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258/free
+disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258/freePercent
+disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258/name
+disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258/read
+disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258/total
+disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258/used
+disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258/usedPercent
+disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258/write
+disk/nvme0n1
+disk/nvme0n1/name
+disk/nvme0n1/read
+disk/nvme0n1/total
+disk/nvme0n1/write
+gpu
+lmsensors
+lmsensors/BAT0-acpi-0
+lmsensors/BAT0-acpi-0/in0
+lmsensors/acpitz-acpi-0
+lmsensors/acpitz-acpi-0/temp1
+lmsensors/iwlwifi_1-virtual-0
+lmsensors/iwlwifi_1-virtual-0/temp1
+lmsensors/nvme-pci-0400
+lmsensors/nvme-pci-0400/temp1
+lmsensors/thinkpad-isa-0000
+lmsensors/thinkpad-isa-0000/fan1
+lmsensors/thinkpad-isa-0000/fan2
+lmsensors/thinkpad-isa-0000/temp1
+lmsensors/thinkpad-isa-0000/temp2
+lmsensors/thinkpad-isa-0000/temp3
+lmsensors/thinkpad-isa-0000/temp4
+lmsensors/thinkpad-isa-0000/temp5
+lmsensors/thinkpad-isa-0000/temp6
+lmsensors/thinkpad-isa-0000/temp7
+lmsensors/thinkpad-isa-0000/temp8
+lmsensors/ucsi_source_psy_USBC000:001-isa-0000
+lmsensors/ucsi_source_psy_USBC000:001-isa-0000/curr1
+lmsensors/ucsi_source_psy_USBC000:001-isa-0000/in0
+lmsensors/ucsi_source_psy_USBC000:002-isa-0000
+lmsensors/ucsi_source_psy_USBC000:002-isa-0000/curr1
+lmsensors/ucsi_source_psy_USBC000:002-isa-0000/in0
+memory
+memory/physical
+memory/physical/application
+memory/physical/applicationPercent
+memory/physical/buffer
+memory/physical/bufferPercent
+memory/physical/cache
+memory/physical/cachePercent
+memory/physical/free
+memory/physical/freePercent
+memory/physical/total
+memory/physical/used
+memory/physical/usedPercent
+memory/swap
+memory/swap/free
+memory/swap/freePercent
+memory/swap/total
+memory/swap/used
+memory/swap/usedPercent
+os
+os/kernel
+os/kernel/name
+os/kernel/prettyName
+os/kernel/version
+os/plasma
+os/plasma/kfVersion
+os/plasma/plasmaVersion
+os/plasma/qtVersion
+os/plasma/windowsystem
+os/system
+os/system/hostname
+os/system/logo
+os/system/name
+os/system/prettyName
+os/system/uptime
+os/system/url
+os/system/version
+power
+power/4870
+power/4870/capacity
+power/4870/charge
+power/4870/chargePercentage
+power/4870/chargeRate
+power/4870/design
+power/4870/health
+power/4870/name

sources/3rdparty/fontdialog/fontdialog.cpp

@@ -39,81 +39,6 @@ void CFont::setCurrentColor(const QColor color)
 }
 
 
-int CFont::html2QFont(const int htmlWeight)
-{
-    int weight = 16;
-    switch(htmlWeight) {
-    case 100:
-        weight = 16;
-        break;
-    case 200:
-    case 300:
-        weight = 25;
-        break;
-    case 400:
-        weight = 50;
-        break;
-    case 500:
-    case 600:
-        weight = 63;
-        break;
-    case 700:
-    case 800:
-        weight = 75;
-        break;
-    case 900:
-        weight = 87;
-        break;
-    default:
-        break;
-    }
-
-    return weight;
-}
-
-
-int CFont::qFont2html(const int weight)
-{
-    int htmlWeight = 400;
-    switch(weight) {
-    case 16:
-        htmlWeight = 100;
-        break;
-    case 25:
-        htmlWeight = 300;
-        break;
-    case 50:
-        htmlWeight = 400;
-        break;
-    case 63:
-        htmlWeight = 600;
-        break;
-    case 75:
-        htmlWeight = 800;
-        break;
-    case 87:
-        htmlWeight = 900;
-        break;
-    default:
-        break;
-    }
-
-    return htmlWeight;
-}
-
-
-int CFont::htmlWeight()
-{
-    return CFont::qFont2html(weight());
-}
-
-
-void CFont::setHtmlWeight(const int htmlWeight)
-{
-    setWeight(CFont::html2QFont(htmlWeight));
-}
-
-
 CFont CFont::fromQFont(const QFont font, const QColor color)
 {
     return CFont(font.family(), font.pointSize(), font.weight(), font.italic(), color);

sources/3rdparty/fontdialog/fontdialog.h

@@ -34,11 +34,6 @@ public:
     // color properties
     QColor color();
     void setCurrentColor(const QColor color);
-    // html weight properties
-    static int html2QFont(const int htmlWeight);
-    static int qFont2html(const int weight);
-    int htmlWeight();
-    void setHtmlWeight(const int htmlWeight);
     // conversion to QFont
     static CFont fromQFont(const QFont font,
                            const QColor color = QColor(QString("#000000")));

sources/awesome-widget/CMakeLists.txt

@@ -1,7 +1,7 @@
 set(SUBPROJECT plasma_applet_awesome-widget)
 message(STATUS "Subproject ${SUBPROJECT}")
 
-configure_file(metadata.desktop ${CMAKE_CURRENT_SOURCE_DIR}/package/metadata.desktop)
+configure_file(metadata.json ${CMAKE_CURRENT_SOURCE_DIR}/package/metadata.json)
 
 add_subdirectory(plugin)
 plasma_install_package(package org.kde.plasma.awesomewidget)

sources/awesome-widget/metadata.desktop

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Awesome Widget
-Comment=A minimalistic Plasmoid
-Comment[en]=A minimalistic Plasmoid
-Comment[es]=Un plasmoide minimalista
-Comment[es]=Un script Plasmoïde minimaliste
-Comment[pt_BR]=Um script Plasmoid
-Comment[ru]=Минималистичный плазмоид
-Comment[uk]=Мінімалістичний плазмоїд
-X-KDE-ServiceTypes=Plasma/Applet
-Type=Service
-Icon=utilities-system-monitor
-
-X-KDE-ServiceTypes=Plasma/Applet
-X-Plasma-API=declarativeappletscript
-X-Plasma-MainScript=ui/main.qml
-
-X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
-X-KDE-PluginInfo-Email=esalexeev@gmail.com
-X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
-X-KDE-PluginInfo-Version=@PROJECT_VERSION@
-X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
-X-KDE-PluginInfo-Category=System Information
-X-KDE-PluginInfo-License=GPLv3
-X-KDE-PluginInfo-EnabledByDefault=true

sources/awesome-widget/metadata.json

@@ -0,0 +1,26 @@
+{
+    "KPackageStructure": "Plasma/Applet",
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "esalexeev@gmail.com",
+                "Name": "Evgeniy Alekseev aka arcanis"
+            }
+        ],
+        "Category": "System Information",
+        "Description": "A minimalistic Plasmoid",
+        "Description[en]": "A minimalistic Plasmoid",
+        "Description[es]": "Un script Plasmoïde minimaliste",
+        "Description[pt_BR]": "Um script Plasmoid",
+        "Description[ru]": "Минималистичный плазмоид",
+        "Description[uk]": "Мінімалістичний плазмоїд",
+        "EnabledByDefault": true,
+        "Icon": "utilities-system-monitor",
+        "Id": "org.kde.plasma.awesomewidget",
+        "License": "GPLv3",
+        "Name": "Awesome Widget",
+        "Version": "@PROJECT_VERSION@",
+        "Website": "https://arcanis.me/projects/awesome-widgets/"
+    },
+    "X-Plasma-API-Minimum-Version": "6.0"
+}

sources/awesome-widget/package/contents/config/config.qml

@@ -15,7 +15,7 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.15
 
 import org.kde.plasma.configuration 2.0
 

sources/awesome-widget/package/contents/config/main.xml

@@ -7,150 +7,150 @@
 
     <group name="Widget">
         <!--   widget -->
-        <entry name="text" type="string">
+        <entry name="text" type="String">
             <default>[cpu: $cpu%] [mem: $mem%] [swap: $swap%] [$netdev: $down/$upKB/s]</default>
         </entry>
     </group>
 
     <group name="Advanced">
         <!--   advanced -->
-        <entry name="background" type="bool">
+        <entry name="background" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="translateStrings" type="bool">
+        <entry name="translateStrings" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="wrapNewLines" type="bool">
+        <entry name="wrapNewLines" type="Bool">
             <default>false</default>
         </entry>
-        <entry name="wrapText" type="bool">
+        <entry name="wrapText" type="Bool">
             <default>false</default>
         </entry>
-        <entry name="notify" type="bool">
+        <entry name="notify" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="checkUpdates" type="bool">
+        <entry name="checkUpdates" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="optimize" type="bool">
+        <entry name="optimize" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="height" type="int">
+        <entry name="height" type="Int">
             <default>0</default>
         </entry>
-        <entry name="width" type="int">
+        <entry name="width" type="Int">
             <default>0</default>
         </entry>
-        <entry name="interval" type="int">
+        <entry name="interval" type="Int">
             <default>1000</default>
         </entry>
-        <entry name="queueLimit" type="int">
+        <entry name="queueLimit" type="Int">
             <default>0</default>
         </entry>
-        <entry name="tempUnits" type="string">
+        <entry name="tempUnits" type="String">
             <default>Celsius</default>
         </entry>
-        <entry name="customTime" type="string">
+        <entry name="customTime" type="String">
             <default>$hh:$mm</default>
         </entry>
-        <entry name="customUptime" type="string">
+        <entry name="customUptime" type="String">
             <default>$dd,$hh,$mm</default>
         </entry>
-        <entry name="acOnline" type="string">
+        <entry name="acOnline" type="String">
             <default>(*)</default>
         </entry>
-        <entry name="acOffline" type="string">
+        <entry name="acOffline" type="String">
             <default>( )</default>
         </entry>
-        <entry name="telemetryCount" type="int">
+        <entry name="telemetryCount" type="Int">
             <default>100</default>
         </entry>
-        <entry name="telemetryRemote" type="bool">
+        <entry name="telemetryRemote" type="Bool">
             <default>false</default>
         </entry>
-        <entry name="telemetryId" type="string">
+        <entry name="telemetryId" type="String">
             <default></default>
         </entry>
     </group>
 
     <group name="Tooltip">
-        <entry name="tooltipNumber" type="int">
+        <entry name="tooltipNumber" type="Int">
             <default>100</default>
         </entry>
-        <entry name="useTooltipBackground" type="bool">
+        <entry name="useTooltipBackground" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="tooltipBackground" type="string">
+        <entry name="tooltipBackground" type="String">
             <default>#ffffff</default>
         </entry>
-        <entry name="cpuTooltip" type="bool">
+        <entry name="cpuTooltip" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="cpuTooltipColor" type="string">
+        <entry name="cpuTooltipColor" type="String">
             <default>#ff0000</default>
         </entry>
-        <entry name="cpuclTooltip" type="bool">
+        <entry name="cpuclTooltip" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="cpuclTooltipColor" type="string">
+        <entry name="cpuclTooltipColor" type="String">
             <default>#00ff00</default>
         </entry>
-        <entry name="memTooltip" type="bool">
+        <entry name="memTooltip" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="memTooltipColor" type="string">
+        <entry name="memTooltipColor" type="String">
             <default>#0000ff</default>
         </entry>
-        <entry name="swapTooltip" type="bool">
+        <entry name="swapTooltip" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="swapTooltipColor" type="string">
+        <entry name="swapTooltipColor" type="String">
             <default>#ffff00</default>
         </entry>
-        <entry name="downkbTooltip" type="bool">
+        <entry name="downkbTooltip" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="downkbTooltipColor" type="string">
+        <entry name="downkbTooltipColor" type="String">
             <default>#00ffff</default>
         </entry>
-        <entry name="upkbTooltipColor" type="string">
+        <entry name="upkbTooltipColor" type="String">
             <default>#ff00ff</default>
         </entry>
-        <entry name="batTooltip" type="bool">
+        <entry name="batTooltip" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="batTooltipColor" type="string">
+        <entry name="batTooltipColor" type="String">
             <default>#008800</default>
         </entry>
-        <entry name="batInTooltipColor" type="string">
+        <entry name="batInTooltipColor" type="String">
             <default>#880000</default>
         </entry>
     </group>
 
     <group name="Appearance">
         <!--   appearance -->
-        <entry name="textAlign" type="string">
+        <entry name="textAlign" type="String">
             <default>center</default>
         </entry>
-        <entry name="fontFamily" type="string">
+        <entry name="fontFamily" type="String">
             <default>Terminus</default>
         </entry>
-        <entry name="fontSize" type="int">
+        <entry name="fontSize" type="Int">
             <default>12</default>
         </entry>
-        <entry name="fontColor" type="string">
+        <entry name="fontColor" type="String">
             <default>#000000</default>
         </entry>
-        <entry name="fontWeight" type="string">
+        <entry name="fontWeight" type="String">
             <default>normal</default>
         </entry>
-        <entry name="fontStyle" type="string">
+        <entry name="fontStyle" type="String">
             <default>normal</default>
         </entry>
-        <entry name="textStyle" type="string">
+        <entry name="textStyle" type="String">
             <default>normal</default>
         </entry>
-        <entry name="textStyleColor" type="string">
+        <entry name="textStyleColor" type="String">
             <default>#000000</default>
         </entry>
     </group>

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

@@ -15,7 +15,7 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.15
 
 import org.kde.plasma.private.awesomewidget 1.0
 

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

@@ -15,8 +15,8 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.15
-import QtQuick.Controls 1.3 as QtControls
+import QtQuick.Controls
 
 import org.kde.plasma.private.awesomewidget 1.0
 
@@ -165,7 +165,7 @@ Item {
             ]
             text: i18n("Temperature units")
             value: plasmoid.configuration.tempUnits
-            onValueEdited: cfg_tempUnits = newValue
+            onValueEdited: newValue => cfg_tempUnits = newValue
         }
 
         LineSelector {
@@ -192,13 +192,11 @@ Item {
             value: plasmoid.configuration.acOffline
         }
 
-        QtControls.GroupBox {
+        GroupBox {
-            height: implicitHeight
             width: parent.width
             title: i18n("Actions")
 
             Column {
-                height: implicitHeight
                 width: parent.width
                 ButtonSelector {
                     value: i18n("Drop key cache")
@@ -226,13 +224,11 @@ Item {
             }
         }
 
-        QtControls.GroupBox {
+        GroupBox {
-            height: implicitHeight
             width: parent.width
             title: i18n("Telemetry")
 
             Column {
-                height: implicitHeight
                 width: parent.width
                 CheckBoxSelector {
                     id: telemetryRemote

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

@@ -15,7 +15,7 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.15
 
 import org.kde.plasma.private.awesomewidget 1.0
 import "."
@@ -75,7 +75,7 @@ Item {
             model: General.fontWeightModel
             text: i18n("Font weight")
             value: plasmoid.configuration.fontWeight
-            onValueEdited: cfg_fontWeight = newValue
+            onValueEdited: newValue => cfg_fontWeight = newValue
         }
 
         ComboBoxSelector {
@@ -83,7 +83,7 @@ Item {
             model: General.fontStyleModel
             text: i18n("Font style")
             value: plasmoid.configuration.fontStyle
-            onValueEdited: cfg_fontStyle = newValue
+            onValueEdited: newValue => cfg_fontStyle = newValue
         }
 
         ColorSelector {
@@ -97,7 +97,7 @@ Item {
             model: General.textStyleModel
             text: i18n("Style")
             value: plasmoid.configuration.textStyle
-            onValueEdited: cfg_textStyle = newValue
+            onValueEdited: newValue => cfg_textStyle = newValue
         }
 
         ColorSelector {

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

@@ -15,9 +15,8 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.15
-import QtQuick.Controls 1.3 as QtControls
+import QtQuick.Controls
-import QtQuick.Dialogs 1.1 as QtDialogs
 
 import org.kde.plasma.private.awesomewidget 1.0
 
@@ -48,18 +47,18 @@ Item {
     Column {
         id: pageColumn
         anchors.fill: parent
-        QtControls.GroupBox {
+        GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("ACPI")
             LineSelector {
                 text: i18n("ACPI path")
                 value: cfg_dataengine["ACPIPATH"]
-                onValueEdited: cfg_dataengine["ACPIPATH"] = newValue
+                onValueEdited: newValue => cfg_dataengine["ACPIPATH"] = newValue
             }
         }
 
-        QtControls.GroupBox {
+        GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("GPU")
@@ -84,11 +83,11 @@ Item {
                 ]
                 text: i18n("GPU device")
                 value: cfg_dataengine["GPUDEV"]
-                onValueEdited: cfg_dataengine["GPUDEV"] = newValue
+                onValueEdited: newValue => cfg_dataengine["GPUDEV"] = newValue
             }
         }
 
-        QtControls.GroupBox {
+        GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("HDD temperature")
@@ -99,18 +98,18 @@ Item {
                     id: hdd
                     text: i18n("HDD")
                     value: cfg_dataengine["HDDDEV"]
-                    onValueEdited: cfg_dataengine["HDDDEV"] = newValue
+                    onValueEdited: newValue => cfg_dataengine["HDDDEV"] = newValue
                 }
 
                 LineSelector {
                     text: i18n("hddtemp cmd")
                     value: cfg_dataengine["HDDTEMPCMD"]
-                    onValueEdited: cfg_dataengine["HDDTEMPCMD"] = newValue
+                    onValueEdited: newValue => cfg_dataengine["HDDTEMPCMD"] = newValue
                 }
             }
         }
 
-        QtControls.GroupBox {
+        GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("Player")
@@ -123,7 +122,7 @@ Item {
                     stepSize: 1
                     text: i18n("Player data symbols")
                     value: cfg_dataengine["PLAYERSYMBOLS"]
-                    onValueEdited: cfg_dataengine["PLAYERSYMBOLS"] = newValue
+                    onValueEdited: newValue => cfg_dataengine["PLAYERSYMBOLS"] = newValue
                 }
 
                 ComboBoxSelector {
@@ -143,7 +142,7 @@ Item {
                     ]
                     text: i18n("Music player")
                     value: cfg_dataengine["PLAYER"]
-                    onValueEdited: cfg_dataengine["PLAYER"] = newValue
+                    onValueEdited: newValue => cfg_dataengine["PLAYER"] = newValue
                 }
 
                 ComboBoxSelector {
@@ -194,7 +193,7 @@ Item {
                 LineSelector {
                     text: i18n("MPD address")
                     value: cfg_dataengine["MPDADDRESS"]
-                    onValueEdited: cfg_dataengine["MPDADDRESS"] = newValue
+                    onValueEdited: newValue => cfg_dataengine["MPDADDRESS"] = newValue
                 }
 
                 IntegerSelector {
@@ -203,12 +202,12 @@ Item {
                     stepSize: 1
                     text: i18n("MPD port")
                     value: cfg_dataengine["MPDPORT"]
-                    onValueEdited: cfg_dataengine["MPDPORT"] = newValue
+                    onValueEdited: newValue => cfg_dataengine["MPDPORT"] = newValue
                 }
             }
         }
 
-        QtControls.GroupBox {
+        GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("Extensions")

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

@@ -15,19 +15,18 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.4
+import QtQuick 2.15
-import QtQuick.Controls 1.3 as QtControls
+import QtQuick.Controls
-import QtQuick.Dialogs 1.2 as QtDialogs
+import QtQuick.Dialogs
-import QtQuick.Layouts 1.1
+import QtQuick.Layouts
+import org.kde.plasma.core as PlasmaCore
 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 {
+PlasmoidItem {
     id: main
     // backend
     AWKeys {
@@ -74,17 +73,12 @@ Item {
     signal sizeUpdate
 
 
-    // init
+    Layout.fillWidth: PlasmoidItem.formFactor != PlasmaCore.Planar
-    Plasmoid.preferredRepresentation: Plasmoid.fullRepresentation
+    Layout.fillHeight: PlasmoidItem.formFactor != PlasmaCore.Planar
-    Plasmoid.compactRepresentation: Plasmoid.fullRepresentation
-
-    Layout.fillWidth: plasmoid.formFactor != PlasmaCore.Planar
-    Layout.fillHeight: plasmoid.formFactor != PlasmaCore.Planar
     Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
     Plasmoid.icon: "utilities-system-monitor"
     Plasmoid.backgroundHints: plasmoid.configuration.background ? "DefaultBackground" : "NoBackground"
-    Plasmoid.associatedApplication: "ksysguard"
 
 
     // ui
@@ -119,11 +113,11 @@ Item {
         }
     }
 
-    QtDialogs.Dialog {
+    Dialog {
         id: tagSelector
         title: i18n("Select tag")
 
-        QtControls.ComboBox {
+        ComboBox {
             id: tagSelectorBox
             width: parent.width
             editable: true
@@ -140,17 +134,29 @@ Item {
         }
     }
 
+    Plasmoid.contextualActions: [
+        PlasmaCore.Action {
+            text: i18n("Request key")
+            icon.name: "utilities-system-monitor"
+        },
+        PlasmaCore.Action {
+            text: i18n("Show README")
+            icon.name: "text-x-readme"
+        },
+        PlasmaCore.Action {
+            text: i18n("Check updates")
+            icon.name: "system-software-update"
+        },
+        PlasmaCore.Action {
+            text: i18n("Report bug")
+            icon.name: "tools-report-bug"
+        }
+    ]
+
 
     Component.onCompleted: {
         if (debug) console.debug()
 
-        // actions
-        // it makes no sense to use this field with optimization enable
-        if (!plasmoid.configuration.optimize)
-            plasmoid.setAction("requestKey", i18n("Request key"), "utilities-system-monitor")
-        plasmoid.setAction("showReadme", i18n("Show README"), "text-x-readme")
-        plasmoid.setAction("checkUpdates", i18n("Check updates"), "system-software-update")
-        plasmoid.setAction("reportBug", i18n("Report bug"), "tools-report-bug")
         // init submodule
         Plasmoid.userConfiguringChanged(false)
         // connect data
@@ -160,14 +166,14 @@ Item {
         if (plasmoid.configuration.checkUpdates) return awActions.checkUpdates(false)
     }
 
-    onNeedTextUpdate: {
+    onNeedTextUpdate: newText => {
         if (debug) console.debug()
 
         text.text = newText
         sizeUpdate()
     }
 
-    onNeedToolTipUpdate: {
+    onNeedToolTipUpdate: newText => {
         if (debug) console.debug()
 
         tooltip.text = newText

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

@@ -15,8 +15,8 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.15
-import QtQuick.Controls 1.3 as QtControls
+import QtQuick.Controls
 
 import org.kde.plasma.private.awesomewidget 1.0
 
@@ -46,7 +46,7 @@ Item {
     property alias cfg_memTooltipColor: memTooltipColor.value
     property alias cfg_swapTooltip: swapTooltip.checked
     property alias cfg_swapTooltipColor: swapTooltipColor.value
-    property alias cfg_downkbTooltip: downkbTooltip.checked
+    property alias cfg_downkbTooltip: networkTooltip.checked
     property alias cfg_downkbTooltipColor: downkbTooltipColor.value
     property alias cfg_upkbTooltipColor: upkbTooltipColor.value
     property alias cfg_batTooltip: batTooltip.checked
@@ -57,7 +57,8 @@ Item {
     Column {
         id: pageColumn
         anchors.fill: parent
-        QtControls.Label {
+
+        Label {
           width: parent.width
           horizontalAlignment: Text.AlignHCenter
           verticalAlignment: Text.AlignVCenter
@@ -74,80 +75,109 @@ Item {
             value: plasmoid.configuration.tooltipNumber
         }
 
-        QtControls.GroupBox {
+        GroupBox {
             id: useTooltipBackground
-            height: implicitHeight
             width: parent.width
-            checkable: true
+
-            title: i18n("Background")
+            property alias checked: useTooltipBackgroundLabel.checked
+            label: CheckBox {
+                id: useTooltipBackgroundLabel
+                text: i18n("Background")
+            }
+
             ColorSelector {
                 id: tooltipBackground
+                enabled: useTooltipBackgroundLabel.checked
                 text: i18n("Background color")
                 value: plasmoid.configuration.tooltipBackground
             }
         }
 
-        QtControls.GroupBox {
+        GroupBox {
             id: cpuTooltip
-            height: implicitHeight
             width: parent.width
-            checkable: true
+
-            title: i18n("CPU")
+            property alias checked: cpuTooltipLabel.checked
+            label: CheckBox {
+                id: cpuTooltipLabel
+                text: i18n("CPU")
+            }
+
             ColorSelector {
                 id: cpuTooltipColor
+                enabled: cpuTooltipLabel.checked
                 text: i18n("CPU color")
                 value: plasmoid.configuration.cpuTooltipColor
             }
         }
 
-        QtControls.GroupBox {
+        GroupBox {
             id: cpuclTooltip
-            height: implicitHeight
             width: parent.width
-            checkable: true
+
-            title: i18n("CPU clock")
+            property alias checked: cpuclTooltipLabel.checked
+            label: CheckBox {
+                id: cpuclTooltipLabel
+                text: i18n("CPU clock")
+            }
+
             ColorSelector {
                 id: cpuclTooltipColor
+                enabled: cpuclTooltipLabel.checked
                 text: i18n("CPU clock color")
                 value: plasmoid.configuration.cpuclTooltipColor
             }
         }
 
-        QtControls.GroupBox {
+        GroupBox {
             id: memTooltip
-            height: implicitHeight
             width: parent.width
-            checkable: true
+
-            title: i18n("Memory")
+            property alias checked: memTooltipLabel.checked
+            label: CheckBox {
+                id: memTooltipLabel
+                text: i18n("Memory")
+            }
+
             ColorSelector {
                 id: memTooltipColor
+                enabled: memTooltipLabel.checked
                 text: i18n("Memory color")
                 value: plasmoid.configuration.memTooltipColor
             }
         }
 
-        QtControls.GroupBox {
+        GroupBox {
             id: swapTooltip
-            height: implicitHeight
             width: parent.width
-            checkable: true
+
-            title: i18n("Swap")
+            property alias checked: swapTooltipLabel.checked
+            label: CheckBox {
+                id: swapTooltipLabel
+                text: i18n("Swap")
+            }
+
             ColorSelector {
                 id: swapTooltipColor
+                enabled: swapTooltipLabel.checked
                 text: i18n("Swap color")
                 value: plasmoid.configuration.swapTooltipColor
             }
         }
 
-        QtControls.GroupBox {
+        GroupBox {
-            id: downkbTooltip
+            id: networkTooltip
-            height: implicitHeight
             width: parent.width
-            checkable: true
+
-            title: i18n("Network")
+            property alias checked: networkTooltipLabel.checked
+            label: CheckBox {
+                id: networkTooltipLabel
+                text: i18n("Network")
+            }
+
             Column {
-                height: implicitHeight
                 width: parent.width
+                enabled: networkTooltipLabel.checked
                 ColorSelector {
                     id: downkbTooltipColor
                     text: i18n("Download speed color")
@@ -161,15 +191,19 @@ Item {
             }
         }
 
-        QtControls.GroupBox {
+        GroupBox {
             id: batTooltip
-            height: implicitHeight
             width: parent.width
-            checkable: true
+
-            title: i18n("Battery")
+            property alias checked: batteryTooltipLabel.checked
+            label: CheckBox {
+                id: batteryTooltipLabel
+                text: i18n("Battery")
+            }
+
             Column {
-                height: implicitHeight
                 width: parent.width
+                enabled: batteryTooltipLabel.checked
                 ColorSelector {
                     id: batTooltipColor
                     text: i18n("Battery active color")

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

@@ -15,7 +15,7 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.2
+import QtQuick 2.15
 
 import org.kde.plasma.private.awesomewidget 1.0
 import "."
@@ -90,7 +90,7 @@ Item {
         awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings)
     }
 
-    onNeedTextUpdate: {
+    onNeedTextUpdate: newText => {
         if (lock) return
         if (debug) console.debug()
 

sources/awesome-widget/package/metadata.desktop

@@ -1,26 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Awesome Widget
-Comment=A minimalistic Plasmoid
-Comment[en]=A minimalistic Plasmoid
-Comment[es]=Un plasmoide minimalista
-Comment[es]=Un script Plasmoïde minimaliste
-Comment[pt_BR]=Um script Plasmoid
-Comment[ru]=Минималистичный плазмоид
-Comment[uk]=Мінімалістичний плазмоїд
-X-KDE-ServiceTypes=Plasma/Applet
-Type=Service
-Icon=utilities-system-monitor
-
-X-KDE-ServiceTypes=Plasma/Applet
-X-Plasma-API=declarativeappletscript
-X-Plasma-MainScript=ui/main.qml
-
-X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
-X-KDE-PluginInfo-Email=esalexeev@gmail.com
-X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
-X-KDE-PluginInfo-Version=3.5.1
-X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
-X-KDE-PluginInfo-Category=System Information
-X-KDE-PluginInfo-License=GPLv3
-X-KDE-PluginInfo-EnabledByDefault=true

sources/awesome-widget/package/metadata.json

@@ -0,0 +1,26 @@
+{
+    "KPackageStructure": "Plasma/Applet",
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "esalexeev@gmail.com",
+                "Name": "Evgeniy Alekseev aka arcanis"
+            }
+        ],
+        "Category": "System Information",
+        "Description": "A minimalistic Plasmoid",
+        "Description[en]": "A minimalistic Plasmoid",
+        "Description[es]": "Un script Plasmoïde minimaliste",
+        "Description[pt_BR]": "Um script Plasmoid",
+        "Description[ru]": "Минималистичный плазмоид",
+        "Description[uk]": "Мінімалістичний плазмоїд",
+        "EnabledByDefault": true,
+        "Icon": "utilities-system-monitor",
+        "Id": "org.kde.plasma.awesomewidget",
+        "License": "GPLv3",
+        "Name": "Awesome Widget",
+        "Version": "3.5.1",
+        "Website": "https://arcanis.me/projects/awesome-widgets/"
+    },
+    "X-Plasma-API-Minimum-Version": "6.0"
+}

sources/awesome-widget/plugin/CMakeLists.txt

@@ -7,17 +7,17 @@ include_directories(
         ${CMAKE_CURRENT_SOURCE_DIR}/../../${PROJECT_LIBRARY}/
         ${PROJECT_TRDPARTY_DIR}
         ${Qt_INCLUDE}
-        ${Kf5_INCLUDE}
+        ${Kf6_INCLUDE}
 )
 
 file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
 file(GLOB SUBPROJECT_UI *.ui)
 file(GLOB SUBPROJECT_NOTIFY *.notifyrc)
 
-qt5_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
+qt6_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
 add_library(${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE} ${SUBPROJECT_UI_HEADER})
-target_link_libraries(${PLUGIN_NAME} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
+target_link_libraries(${PLUGIN_NAME} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf6_LIBRARIES})
 
-install(TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget)
+install(TARGETS ${PLUGIN_NAME} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/awesomewidget)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget)
+install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/awesomewidget)
-install(FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KNOTIFYRC_INSTALL_DIR})
+install(FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})

sources/awesome-widget/plugin/awconfighelper.cpp

@@ -21,7 +21,6 @@
 #include <QQmlPropertyMap>
 #include <QSettings>
 #include <QStandardPaths>
-#include <QTextCodec>
 
 #include "awdebug.h"
 
@@ -285,7 +284,6 @@ void AWConfigHelper::writeFile(QSettings &_settings, const QString &_key, const
     QFile file(_fileName);
     if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
         QTextStream out(&file);
-        out.setCodec("UTF-8");
         out << _settings.value(_key).toString().toUtf8();
         out.flush();
         file.close();

sources/awesome-widget/plugin/awdataengineaggregator.cpp

@@ -17,7 +17,9 @@
 
 #include "awdataengineaggregator.h"
 
-#include <Plasma/DataContainer>
+#include <QDBusConnection>
+#include <ksysguard/formatter/Unit.h>
+#include <ksysguard/systemstats/DBusInterface.h>
 
 #include "awdebug.h"
 
@@ -27,20 +29,19 @@ AWDataEngineAggregator::AWDataEngineAggregator(QObject *_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    m_consumer = new Plasma::DataEngineConsumer();
+    qDBusRegisterMetaType<KSysGuard::SensorData>();
-    m_dataEngines["systemmonitor"] = m_consumer->dataEngine("systemmonitor");
+    qDBusRegisterMetaType<KSysGuard::SensorInfo>();
-    m_dataEngines["extsysmon"] = m_consumer->dataEngine("extsysmon");
+    qDBusRegisterMetaType<KSysGuard::SensorDataList>();
-    m_dataEngines["time"] = m_consumer->dataEngine("time");
+    qDBusRegisterMetaType<QHash<QString, KSysGuard::SensorInfo>>();
 
-    // additional method required by systemmonitor structure
+    m_interface = new KSysGuard::SystemStats::DBusInterface();
-    m_newSourceConnection
-        = connect(m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded, [this](const QString &source) {
-              emit(deviceAdded(source));
-              m_dataEngines["systemmonitor"]->connectSource(source, parent(), 1000);
-          });
 
-    // required to define Qt::QueuedConnection for signal-slot connection
+    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::newSensorData, this, &AWDataEngineAggregator::updateData);
-    qRegisterMetaType<Plasma::DataEngine::Data>("Plasma::DataEngine::Data");
+    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::sensorMetaDataChanged, this, &AWDataEngineAggregator::updateSensors);
+    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::sensorAdded, this, &AWDataEngineAggregator::sensorAdded);
+    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::sensorRemoved, this, &AWDataEngineAggregator::sensorRemoved);
+
+    loadSources();
 }
 
 
@@ -49,67 +50,85 @@ AWDataEngineAggregator::~AWDataEngineAggregator()
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
     disconnectSources();
+    m_interface->deleteLater();
 }
 
 
 void AWDataEngineAggregator::disconnectSources()
 {
-    for (auto dataEngine : m_dataEngines.values())
+    m_interface->unsubscribe(m_sensors.keys());
-        for (auto &source : dataEngine->sources())
-            dataEngine->disconnectSource(source, parent());
-    disconnect(m_newSourceConnection);
 }
 
 
-void AWDataEngineAggregator::reconnectSources(const int _interval)
+bool AWDataEngineAggregator::isValidSensor(const KSysGuard::SensorInfo &_sensor)
 {
-    qCDebug(LOG_AW) << "Reconnect sources with interval" << _interval;
+    return _sensor.unit != KSysGuard::UnitInvalid;
+}
+
+
+void AWDataEngineAggregator::loadSources()
+{
+    auto response = m_interface->allSensors();
+    response.waitForFinished();
+
+    auto sensors = response.value();
+    updateSensors(sensors);
+}
+
+
+void AWDataEngineAggregator::reconnectSources(const int interval)
+{
+    qCDebug(LOG_AW) << "Reconnect all sensors with update interval" << interval;
 
     disconnectSources();
-
+    m_interface->subscribe(m_sensors.keys());
-    m_dataEngines["systemmonitor"]->connectAllSources(parent(), (uint)_interval);
-    m_dataEngines["extsysmon"]->connectAllSources(parent(), (uint)_interval);
-    m_dataEngines["time"]->connectSource("Local", parent(), 1000);
-
-    m_newSourceConnection = connect(
-        m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded, [this, _interval](const QString &source) {
-            emit(deviceAdded(source));
-            m_dataEngines["systemmonitor"]->connectSource(source, parent(), (uint)_interval);
-        });
-
-#ifdef BUILD_FUTURE
-    createQueuedConnection();
-#endif /* BUILD_FUTURE */
 }
 
 
 void AWDataEngineAggregator::dropSource(const QString &_source)
 {
-    qCDebug(LOG_AW) << "Source" << _source;
+    qCDebug(LOG_AW) << "Disconnect sensor" << _source;
 
-    // HACK there is no possibility to check to which dataengine source
+    m_interface->unsubscribe({_source});
-    // connected we will try to disconnect it from all engines
-    for (auto dataEngine : m_dataEngines.values())
-        dataEngine->disconnectSource(_source, parent());
 }
 
 
-void AWDataEngineAggregator::createQueuedConnection()
+void AWDataEngineAggregator::sensorAdded(const QString &_sensor)
 {
-    // HACK additional method which forces QueuedConnection instead of Auto one
+    qCDebug(LOG_AW) << "New sensor added" << _sensor;
-    // for more details refer to plasma-framework source code
+
-    for (auto &dataEngine : m_dataEngines.keys()) {
+    // check if sensor is actually valid
-        // different source set for different engines
+    auto response = m_interface->sensors({_sensor});
-        QStringList sources = dataEngine == "time" ? QStringList() << "Local" : m_dataEngines[dataEngine]->sources();
+    response.waitForFinished();
-        // reconnect sources
+    auto info = response.value();
-        for (auto &source : sources) {
+    if (info.count() != 1)
-            Plasma::DataContainer *container = m_dataEngines[dataEngine]->containerForSource(source);
+        return;
-            // disconnect old connections first
+
-            disconnect(container, SIGNAL(dataUpdated(QString, Plasma::DataEngine::Data)), parent(),
+    qCWarning(LOG_AW) << info.keys();
-                       SLOT(dataUpdated(QString, Plasma::DataEngine::Data)));
+
-            // and now reconnect with Qt::QueuedConnection type
+    m_interface->subscribe({_sensor});
-            connect(container, SIGNAL(dataUpdated(QString, Plasma::DataEngine::Data)), parent(),
+}
-                    SLOT(dataUpdated(QString, Plasma::DataEngine::Data)), Qt::QueuedConnection);
+
-        }
+
+void AWDataEngineAggregator::sensorRemoved(const QString &_sensor)
+{
+    qCDebug(LOG_AW) << "Sensor" << _sensor << "has been removed";
+
+    m_sensors.remove(_sensor);
+    m_interface->unsubscribe({_sensor});
+}
+
+void AWDataEngineAggregator::updateData(KSysGuard::SensorDataList _data)
+{
+    emit(dataUpdated(m_sensors, _data));
+}
+
+
+void AWDataEngineAggregator::updateSensors(const QHash<QString, KSysGuard::SensorInfo> &_sensors)
+{
+    for (auto sensor = _sensors.cbegin(); sensor != _sensors.cend(); ++sensor) {
+        if (!isValidSensor(sensor.value()))
+            continue;
+        m_sensors.insert(sensor.key(), sensor.value());
     }
 }

sources/awesome-widget/plugin/awdataengineaggregator.h

@@ -19,10 +19,17 @@
 #ifndef AWDATAENGINEAGGREGATOR_H
 #define AWDATAENGINEAGGREGATOR_H
 
-#include <Plasma/DataEngine>
+#include <ksysguard/systemstats/SensorInfo.h>
-#include <Plasma/DataEngineConsumer>
 
+#include <QHash>
 #include <QObject>
+#include <QSet>
+
+
+namespace KSysGuard::SystemStats
+{
+class DBusInterface;
+}
 
 
 class AWDataEngineAggregator : public QObject
@@ -33,19 +40,24 @@ public:
     explicit AWDataEngineAggregator(QObject *_parent = nullptr);
     ~AWDataEngineAggregator() override;
     void disconnectSources();
-    void reconnectSources(int _interval);
+    [[nodiscard]] bool isValidSensor(const KSysGuard::SensorInfo &_sensor);
+    void loadSources();
+    void reconnectSources(const int interval);
 
 signals:
+    void dataUpdated(const QHash<QString, KSysGuard::SensorInfo> &_sensors, const KSysGuard::SensorDataList &_data);
     void deviceAdded(const QString &_source);
 
 public slots:
     void dropSource(const QString &_source);
+    void sensorAdded(const QString &_sensor);
+    void sensorRemoved(const QString &_sensor);
+    void updateData(KSysGuard::SensorDataList _data);
+    void updateSensors(const QHash<QString, KSysGuard::SensorInfo> &_sensors);
 
 private:
-    void createQueuedConnection();
+    KSysGuard::SystemStats::DBusInterface *m_interface = nullptr;
-    Plasma::DataEngineConsumer *m_consumer = nullptr;
+    QHash<QString, KSysGuard::SensorInfo> m_sensors;
-    QHash<QString, Plasma::DataEngine *> m_dataEngines;
-    QMetaObject::Connection m_newSourceConnection;
 };
 
 

sources/awesome-widget/plugin/awdataenginemapper.cpp

@@ -17,7 +17,7 @@
 
 #include "awdataenginemapper.h"
 
-#include <QRegExp>
+#include <QRegularExpression>
 
 #include "awdebug.h"
 #include "awformatterhelper.h"
@@ -76,75 +76,76 @@ QStringList AWDataEngineMapper::keysFromSource(const QString &_source) const
 
 // HACK units required to define should the value be calculated as temperature
 // or fan data
-QStringList AWDataEngineMapper::registerSource(const QString &_source, const QString &_units, const QStringList &_keys)
+QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSysGuard::Unit _units,
+                                               const QStringList &_keys)
 {
     qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
 
     // regular expressions
-    QRegExp cpuRegExp = QRegExp("cpu/cpu.*/TotalLoad");
+    auto cpuRegExp = QRegularExpression("^cpu/cpu.*/usage$");
-    QRegExp cpuclRegExp = QRegExp("cpu/cpu.*/clock");
+    auto cpuclRegExp = QRegularExpression("^cpu/cpu.*/frequency$");
-    QRegExp hddrRegExp = QRegExp("disk/.*/Rate/rblk");
+    auto hddrRegExp = QRegularExpression("^disk/.*/read$");
-    QRegExp hddwRegExp = QRegExp("disk/.*/Rate/wblk");
+    auto hddwRegExp = QRegularExpression("^disk/.*/write$");
-    QRegExp mountFillRegExp = QRegExp("partitions/.*/filllevel");
+    auto mountFillRegExp = QRegularExpression("^disk/.*/usedPercent$");
-    QRegExp mountFreeRegExp = QRegExp("partitions/.*/freespace");
+    auto mountFreeRegExp = QRegularExpression("^disk/.*/free$");
-    QRegExp mountUsedRegExp = QRegExp("partitions/.*/usedspace");
+    auto mountUsedRegExp = QRegularExpression("^disk/.*/used$");
-    QRegExp netRegExp = QRegExp("network/interfaces/.*/(receiver|transmitter)/data$");
+    auto netRegExp = QRegularExpression("^network/.*/(download|upload)$");
-    QRegExp netTotalRegExp = QRegExp("network/interfaces/.*/(receiver|transmitter)/dataTotal$");
+    auto netTotalRegExp = QRegularExpression("^network/.*/(totalDownload|totalUpload)$");
 
-    if (_source == "battery/ac") {
+    if (_source == "extsysmon/battery/ac") {
         // AC
         m_map.insert(_source, "ac");
         m_formatter["ac"] = AWKeysAggregator::FormatterType::ACFormat;
-    } else if (_source.startsWith("battery/")) {
+    } else if (_source.startsWith("extsysmon/battery/")) {
         // battery stats
         QString key = _source;
-        key.remove("battery/");
+        key.remove("extsysmon/battery/");
         m_map.insert(_source, key);
         m_formatter[key] = _source.contains("rate") ? AWKeysAggregator::FormatterType::Float
                                                     : AWKeysAggregator::FormatterType::IntegerThree;
-    } else if (_source == "cpu/system/TotalLoad") {
+    } else if (_source == "cpu/all/usage") {
         // cpu
         m_map.insert(_source, "cpu");
         m_formatter["cpu"] = AWKeysAggregator::FormatterType::Float;
     } else if (_source.contains(cpuRegExp)) {
         // cpus
         QString key = _source;
-        key.remove("cpu/").remove("/TotalLoad");
+        key.remove("cpu/").remove("/usage");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::Float;
-    } else if (_source == "cpu/system/AverageClock") {
+    } else if (_source == "cpu/all/averageFrequency") {
         // cpucl
         m_map.insert(_source, "cpucl");
         m_formatter["cpucl"] = AWKeysAggregator::FormatterType::Integer;
     } else if (_source.contains(cpuclRegExp)) {
         // cpucls
         QString key = _source;
-        key.remove("cpu/cpu").remove("/clock");
+        key.remove("cpu/cpu").remove("/frequency");
         key = QString("cpucl%1").arg(key);
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
-    } else if (_source.startsWith("custom")) {
+    } else if (_source.startsWith("extsysmon/custom")) {
         // custom
         QString key = _source;
-        key.remove("custom/");
+        key.remove("extsysmon/custom/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "desktop/current/name") {
+    } else if (_source == "extsysmon/desktop/current/name") {
         // current desktop name
         m_map.insert(_source, "desktop");
         m_formatter["desktop"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "desktop/current/number") {
+    } else if (_source == "extsysmon/desktop/current/number") {
         // current desktop number
         m_map.insert(_source, "ndesktop");
         m_formatter["ndesktop"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "desktop/total/number") {
+    } else if (_source == "extsysmon/desktop/total/number") {
         // desktop count
         m_map.insert(_source, "tdesktops");
         m_formatter["tdesktops"] = AWKeysAggregator::FormatterType::NoFormat;
     } else if (_source.contains(hddrRegExp)) {
         // read speed
         QString device = _source;
-        device.remove("/Rate/rblk");
+        device.remove("disk/").remove("/read");
         int index = m_devices["disk"].indexOf(device);
         if (index > -1) {
             QString key = QString("hddr%1").arg(index);
@@ -154,25 +155,25 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const QSt
     } else if (_source.contains(hddwRegExp)) {
         // write speed
         QString device = _source;
-        device.remove("/Rate/wblk");
+        device.remove("disk/").remove("/write");
         int index = m_devices["disk"].indexOf(device);
         if (index > -1) {
             QString key = QString("hddw%1").arg(index);
             m_map.insert(_source, key);
             m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
         }
-    } else if (_source == "gpu/load") {
+    } else if (_source == "extsysmon/gpuload/load") {
         // gpu load
         m_map.insert(_source, "gpu");
         m_formatter["gpu"] = AWKeysAggregator::FormatterType::Float;
-    } else if (_source == "gpu/temperature") {
+    } else if (_source == "extsysmon/gputemp/temperature") {
         // gpu temperature
         m_map.insert(_source, "gputemp");
         m_formatter["gputemp"] = AWKeysAggregator::FormatterType::Temperature;
     } else if (_source.contains(mountFillRegExp)) {
         // fill level
         QString device = _source;
-        device.remove("partitions").remove("/filllevel");
+        device.remove("disk/").remove("/usedPercent");
         int index = m_devices["mount"].indexOf(device);
         if (index > -1) {
             QString key = QString("hdd%1").arg(index);
@@ -185,7 +186,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const QSt
     } else if (_source.contains(mountFreeRegExp)) {
         // free space
         QString device = _source;
-        device.remove("partitions").remove("/freespace");
+        device.remove("disk/").remove("/free");
         int index = m_devices["mount"].indexOf(device);
         if (index > -1) {
             // mb
@@ -200,7 +201,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const QSt
     } else if (_source.contains(mountUsedRegExp)) {
         // used
         QString device = _source;
-        device.remove("partitions").remove("/usedspace");
+        device.remove("disk/").remove("/used");
         int index = m_devices["mount"].indexOf(device);
         if (index > -1) {
             // mb
@@ -212,7 +213,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const QSt
             m_map.insert(_source, key);
             m_formatter[key] = AWKeysAggregator::FormatterType::MemGBFormat;
         }
-    } else if (_source.startsWith("hdd/temperature")) {
+    } else if (_source.startsWith("extsysmon/hdd/temperature")) {
         // hdd temperature
         QString device = _source;
         device.remove("hdd/temperature");
@@ -222,14 +223,14 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const QSt
             m_map.insert(_source, key);
             m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
         }
-    } else if (_source.startsWith("cpu/system/loadavg")) {
+    } else if (_source.startsWith("cpu/loadaverages/loadaverage")) {
         // load average
         QString time = _source;
-        time.remove("cpu/system/loadavg");
+        time.remove("cpu/loadaverages/loadaverage");
         QString key = QString("la%1").arg(time);
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::FloatTwoSymbols;
-    } else if (_source == "mem/physical/application") {
+    } else if (_source == "memory/physical/application") {
         // app memory
         // mb
         m_map.insert(_source, "memmb");
@@ -237,7 +238,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const QSt
         // gb
         m_map.insert(_source, "memgb");
         m_formatter["memgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
-    } else if (_source == "mem/physical/free") {
+    } else if (_source == "memory/physical/free") {
         // free memory
         // mb
         m_map.insert(_source, "memfreemb");
@@ -245,7 +246,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const QSt
         // gb
         m_map.insert(_source, "memfreegb");
         m_formatter["memfreegb"] = AWKeysAggregator::FormatterType::MemGBFormat;
-    } else if (_source == "mem/physical/used") {
+    } else if (_source == "memory/physical/used") {
         // used memory
         // mb
         m_map.insert(_source, "memusedmb");
@@ -253,23 +254,23 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const QSt
         // gb
         m_map.insert(_source, "memusedgb");
         m_formatter["memusedgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
-    } else if (_source == "network/current/name") {
+    } else if (_source == "extsysmon/network/device") {
         // network device
         m_map.insert(_source, "netdev");
         m_formatter["netdev"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "network/current/ssid") {
+    } else if (_source == "extsysmon/network/ssid") {
         // current ssid
         m_map.insert(_source, "ssid");
         m_formatter["ssid"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source.startsWith("network/response")) {
+    } else if (_source.startsWith("extsysmon/requests/response")) {
         // network response
         QString key = _source;
-        key.remove("network/");
+        key.remove("extsysmon/requests/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
     } else if (_source.contains(netRegExp)) {
         // network speed
-        QString type = _source.contains("receiver") ? "down" : "up";
+        QString type = _source.contains("download") ? "down" : "up";
         int index = m_devices["net"].indexOf(_source.split('/')[2]);
         if (index > -1) {
             // kb
@@ -287,7 +288,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const QSt
         }
     } else if (_source.contains(netTotalRegExp)) {
         // network data total
-        QString type = _source.contains("receiver") ? "down" : "up";
+        QString type = _source.contains("download") ? "down" : "up";
         int index = m_devices["net"].indexOf(_source.split('/')[2]);
         if (index > -1) {
             // kb
@@ -299,37 +300,37 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const QSt
             m_map.insert(_source, key);
             m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
         }
-    } else if (_source.startsWith("upgrade")) {
+    } else if (_source.startsWith("extsysmon/upgrade")) {
         // package manager
         QString key = _source;
-        key.remove("upgrade/");
+        key.remove("extsysmon/upgrade/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::IntegerThree;
-    } else if (_source.startsWith("player")) {
+    } else if (_source.startsWith("extsysmon/player")) {
         // player
         QString key = _source;
-        key.remove("player/");
+        key.remove("extsysmon/player/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "ps/running/count") {
+    } else if (_source == "extsysmon/ps/running/count") {
         // running processes count
         m_map.insert(_source, "pscount");
         m_formatter["pscount"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "ps/running/list") {
+    } else if (_source == "extsysmon/ps/running/list") {
         // list of running processes
         m_map.insert(_source, "ps");
         m_formatter["ps"] = AWKeysAggregator::FormatterType::List;
-    } else if (_source == "ps/total/count") {
+    } else if (_source == "extsysmon/ps/total/count") {
         // total processes count
         m_map.insert(_source, "pstot");
         m_formatter["pstot"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source.startsWith("quotes")) {
+    } else if (_source.startsWith("extsysmon/quotes")) {
         // quotes
         QString key = _source;
-        key.remove("quotes/");
+        key.remove("extsysmon/quotes/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::Quotes;
-    } else if (_source == "mem/swap/free") {
+    } else if (_source == "memory/swap/free") {
         // free swap
         // mb
         m_map.insert(_source, "swapfreemb");
@@ -337,7 +338,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const QSt
         // gb
         m_map.insert(_source, "swapfreegb");
         m_formatter["swapfreegb"] = AWKeysAggregator::FormatterType::MemGBFormat;
-    } else if (_source == "mem/swap/used") {
+    } else if (_source == "memory/swap/used") {
         // used swap
         // mb
         m_map.insert(_source, "swapmb");
@@ -349,13 +350,13 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const QSt
         // temperature
         int index = m_devices["temp"].indexOf(_source);
         // HACK on DE initialization there are no units key
-        if (_units.isEmpty())
+        if (_units == KSysGuard::UnitInvalid)
             return QStringList({QString("temp%1").arg(index)});
         if (index > -1) {
             QString key = QString("temp%1").arg(index);
             m_map.insert(_source, key);
-            m_formatter[key] = _units == "°C" ? AWKeysAggregator::FormatterType::Temperature
+            m_formatter[key] = _units == KSysGuard::UnitCelsius ? AWKeysAggregator::FormatterType::Temperature
-                                              : AWKeysAggregator::FormatterType::Integer;
+                                                                : AWKeysAggregator::FormatterType::Integer;
         }
     } else if (_source == "Local") {
         // time
@@ -376,35 +377,35 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const QSt
         // timestamp
         m_map.insert(_source, "tstime");
         m_formatter["tstime"] = AWKeysAggregator::FormatterType::Timestamp;
-    } else if (_source == "system/brightness") {
+    } else if (_source == "extsysmon/system/brightness") {
         m_map.insert(_source, "brightness");
         m_formatter["brightness"] = AWKeysAggregator::FormatterType::IntegerThree;
-    } else if (_source == "system/volume") {
+    } else if (_source == "extsysmon/system/volume") {
         m_map.insert(_source, "volume");
         m_formatter["volume"] = AWKeysAggregator::FormatterType::IntegerThree;
-    } else if (_source == "system/uptime") {
+    } else if (_source == "os/system/uptime") {
         // uptime
         m_map.insert(_source, "uptime");
         m_formatter["uptime"] = AWKeysAggregator::FormatterType::Uptime;
         // custom uptime
         m_map.insert(_source, "cuptime");
         m_formatter["cuptime"] = AWKeysAggregator::FormatterType::UptimeCustom;
-    } else if (_source.startsWith("weather/temperature")) {
+    } else if (_source.startsWith("extsysmon/weather/temperature")) {
         // temperature
         QString key = _source;
-        key.remove("weather/");
+        key.remove("extsysmon/weather/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
-    } else if (_source.startsWith("weather/")) {
+    } else if (_source.startsWith("extsysmon/weather/")) {
         // other weather
         QString key = _source;
-        key.remove("weather/");
+        key.remove("extsysmon/weather/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source.startsWith("load/load")) {
+    } else if (_source.startsWith("extsysmon/load/load")) {
         // load source
         QString key = _source;
-        key.remove("load/");
+        key.remove("extsysmon/load/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
     }

sources/awesome-widget/plugin/awdataenginemapper.h

@@ -19,6 +19,8 @@
 #ifndef AWDATAENGINEMAPPER_H
 #define AWDATAENGINEMAPPER_H
 
+#include <ksysguard/formatter/Unit.h>
+
 #include <QMultiHash>
 #include <QObject>
 
@@ -38,7 +40,7 @@ public:
     [[nodiscard]] AWKeysAggregator::FormatterType formatter(const QString &_key) const;
     [[nodiscard]] QStringList keysFromSource(const QString &_source) const;
     // set methods
-    QStringList registerSource(const QString &_source, const QString &_units, const QStringList &_keys);
+    QStringList registerSource(const QString &_source, const KSysGuard::Unit _units, const QStringList &_keys);
     void setDevices(const QHash<QString, QStringList> &_devices);
 
 private:

sources/awesome-widget/plugin/awformatterhelper.cpp

@@ -114,8 +114,7 @@ QStringList AWFormatterHelper::rightKeys()
 
 void AWFormatterHelper::editItems()
 {
-    repaintList();
+    auto ret = exec();
-    int ret = exec();
     qCInfo(LOG_AW) << "Dialog returns" << ret;
 }
 
@@ -200,20 +199,20 @@ QPair<QString, AWAbstractFormatter::FormatterClass> AWFormatterHelper::readMetad
 
     QSettings settings(_filePath, QSettings::IniFormat);
     settings.beginGroup("Desktop Entry");
-    QString name = settings.value("Name", _filePath).toString();
+    auto name = settings.value("Name", _filePath).toString();
-    QString type = settings.value("X-AW-Type", "NoFormat").toString();
+    auto type = settings.value("X-AW-Type", "NoFormat").toString();
-    AWAbstractFormatter::FormatterClass formatter = defineFormatterClass(type);
+    auto formatter = defineFormatterClass(type);
     settings.endGroup();
 
     return QPair<QString, AWAbstractFormatter::FormatterClass>(name, formatter);
 }
 
 
-void AWFormatterHelper::doCreateItem()
+void AWFormatterHelper::doCreateItem(QListWidget *_widget)
 {
     QStringList selection = {"NoFormat", "DateTime", "Float", "List", "Script", "String", "Json"};
     bool ok;
-    QString select = QInputDialog::getItem(this, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok);
+    auto select = QInputDialog::getItem(nullptr, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok);
     if (!ok) {
         qCWarning(LOG_AW) << "No type selected";
         return;
@@ -223,18 +222,18 @@ void AWFormatterHelper::doCreateItem()
     AWAbstractFormatter::FormatterClass formatter = defineFormatterClass(select);
     switch (formatter) {
     case AWAbstractFormatter::FormatterClass::DateTime:
-        return createItem<AWDateTimeFormatter>();
+        return createItem<AWDateTimeFormatter>(_widget);
     case AWAbstractFormatter::FormatterClass::Float:
-        return createItem<AWFloatFormatter>();
+        return createItem<AWFloatFormatter>(_widget);
     case AWAbstractFormatter::FormatterClass::List:
-        return createItem<AWListFormatter>();
+        return createItem<AWListFormatter>(_widget);
     case AWAbstractFormatter::FormatterClass::Script:
-        return createItem<AWScriptFormatter>();
+        return createItem<AWScriptFormatter>(_widget);
     case AWAbstractFormatter::FormatterClass::String:
-        return createItem<AWStringFormatter>();
+        return createItem<AWStringFormatter>(_widget);
     case AWAbstractFormatter::FormatterClass::Json:
-        return createItem<AWJsonFormatter>();
+        return createItem<AWJsonFormatter>(_widget);
     case AWAbstractFormatter::FormatterClass::NoFormat:
-        return createItem<AWNoFormatter>();
+        return createItem<AWNoFormatter>(_widget);
     }
 }

sources/awesome-widget/plugin/awformatterhelper.h

@@ -51,7 +51,7 @@ private:
     void initFormatters();
     [[nodiscard]] static QPair<QString, AWAbstractFormatter::FormatterClass> readMetadata(const QString &_filePath);
     // parent methods
-    void doCreateItem() override;
+    void doCreateItem(QListWidget *_widget) override;
     // properties
     QHash<QString, AWAbstractFormatter *> m_formatters;
     QHash<QString, AWAbstractFormatter *> m_formattersClasses;

sources/awesome-widget/plugin/awkeycache.cpp

@@ -20,6 +20,7 @@
 
 #include <QDir>
 #include <QNetworkInterface>
+#include <QRegularExpression>
 #include <QSettings>
 #include <QStandardPaths>
 
@@ -42,7 +43,7 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
 
     if (_type == "hdd") {
         QStringList allDevices = QDir("/dev").entryList(QDir::System, QDir::Name);
-        QStringList devices = allDevices.filter(QRegExp("^[hms]d[a-z]$"));
+        QStringList devices = allDevices.filter(QRegularExpression("^[hms]d[a-z]$"));
         for (auto &dev : devices) {
             QString device = QString("/dev/%1").arg(dev);
             if (cachedValues.contains(device))
@@ -93,7 +94,7 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
 
     // insert depending keys, refer to AWKeys::calculateValues()
     // hddtotmb*
-    for (auto &key : _allKeys.filter(QRegExp("^hddtotmb"))) {
+    for (auto &key : _allKeys.filter(QRegularExpression("^hddtotmb"))) {
         if (!used.contains(key))
             continue;
         key.remove("hddtotmb");
@@ -101,7 +102,7 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
         used << QString("hddfreemb%1").arg(index) << QString("hddmb%1").arg(index);
     }
     // hddtotgb*
-    for (auto &key : _allKeys.filter(QRegExp("^hddtotgb"))) {
+    for (auto &key : _allKeys.filter(QRegularExpression("^hddtotgb"))) {
         if (!used.contains(key))
             continue;
         key.remove("hddtotgb");
@@ -138,7 +139,7 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
     for (auto &key : netKeys) {
         if (!used.contains(key))
             continue;
-        QStringList filt = _allKeys.filter(QRegExp(QString("^%1[0-9]{1,}").arg(key)));
+        QStringList filt = _allKeys.filter(QRegularExpression(QString("^%1[0-9]{1,}").arg(key)));
         for (auto &filtered : filt)
             used << filtered;
     }

sources/awesome-widget/plugin/awkeyoperations.cpp

@@ -18,7 +18,7 @@
 #include "awkeyoperations.h"
 
 #include <QDir>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QThread>
 
 #include "awcustomkeyshelper.h"
@@ -206,7 +206,7 @@ QString AWKeyOperations::infoByKey(const QString &_key) const
     qCDebug(LOG_AW) << "Requested key" << _key;
 
     QString stripped = _key;
-    stripped.remove(QRegExp("\\d+"));
+    stripped.remove(QRegularExpression("\\d+"));
     QString output;
 
     if (_key.startsWith("bar")) {
@@ -217,31 +217,31 @@ QString AWKeyOperations::infoByKey(const QString &_key) const
         AbstractExtItem *item = m_extScripts->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
-    } else if (_key.contains(QRegExp("^hdd[rw]"))) {
+    } else if (_key.contains(QRegularExpression("^hdd[rw]"))) {
         QString index = _key;
-        index.remove(QRegExp("hdd[rw]"));
+        index.remove(QRegularExpression("hdd[rw]"));
         output = m_devices["disk"][index.toInt()];
-    } else if (_key.contains(QRegExp("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)"))) {
+    } else if (_key.contains(QRegularExpression("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)"))) {
         QString index = _key;
-        index.remove(QRegExp("^hdd(|mb|gb|freemb|freegb|totmb|totgb)"));
+        index.remove(QRegularExpression("^hdd(|mb|gb|freemb|freegb|totmb|totgb)"));
         output = m_devices["mount"][index.toInt()];
     } else if (_key.startsWith("hddtemp")) {
         QString index = _key;
         index.remove("hddtemp");
         output = m_devices["hdd"][index.toInt()];
-    } else if (_key.contains(QRegExp("^(down|up)[0-9]"))) {
+    } else if (_key.contains(QRegularExpression("^(down|up)[0-9]"))) {
         QString index = _key;
-        index.remove(QRegExp("^(down|up)"));
+        index.remove(QRegularExpression("^(down|up)"));
         output = m_devices["net"][index.toInt()];
     } else if (_key.startsWith("pkgcount")) {
         AbstractExtItem *item = m_extUpgrade->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
-    } else if (_key.contains(QRegExp("(^|perc)(ask|bid|price)(chg|)"))) {
+    } else if (_key.contains(QRegularExpression("(^|perc)(ask|bid|price)(chg|)"))) {
         AbstractExtItem *item = m_extQuotes->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
-    } else if (_key.contains(QRegExp("(weather|weatherId|humidity|pressure|temperature)"))) {
+    } else if (_key.contains(QRegularExpression("(weather|weatherId|humidity|pressure|temperature)"))) {
         AbstractExtItem *item = m_extWeather->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
@@ -280,7 +280,7 @@ void AWKeyOperations::editItem(const QString &_type)
     qCDebug(LOG_AW) << "Item type" << _type;
 
     if (_type == "graphicalitem") {
-        QStringList keys = dictKeys().filter(QRegExp("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)"));
+        QStringList keys = dictKeys().filter(QRegularExpression("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)"));
         keys.sort();
         m_graphicalItems->setConfigArgs(keys);
         return m_graphicalItems->editItems();
@@ -302,8 +302,8 @@ void AWKeyOperations::addDevice(const QString &_source)
 {
     qCDebug(LOG_AW) << "Source" << _source;
 
-    QRegExp diskRegexp = QRegExp("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)");
+    auto diskRegexp = QRegularExpression("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)");
-    QRegExp mountRegexp = QRegExp("partitions/.*/filllevel");
+    auto mountRegexp = QRegularExpression("partitions/.*/filllevel");
 
     if (_source.contains(diskRegexp)) {
         QString device = _source;

sources/awesome-widget/plugin/awkeys.cpp

@@ -56,16 +56,16 @@ AWKeys::AWKeys(QObject *_parent)
     createDBusInterface();
 
     // update key data if required
-    connect(m_keyOperator, SIGNAL(updateKeys(const QStringList &)), this, SLOT(reinitKeys(const QStringList &)));
+    connect(m_keyOperator, &AWKeyOperations::updateKeys, this, &AWKeys::reinitKeys);
-    connect(m_timer, SIGNAL(timeout()), this, SLOT(updateTextData()));
+    connect(m_timer, &QTimer::timeout, this, &AWKeys::updateTextData);
+
     // transfer signal from AWDataAggregator object to QML ui
-    connect(m_dataAggregator, SIGNAL(toolTipPainted(const QString &)), this,
+    connect(m_dataAggregator, &AWDataAggregator::toolTipPainted, [this](const QString &_tooltip) { emit(needToolTipToBeUpdated(_tooltip)); });
-            SIGNAL(needToolTipToBeUpdated(const QString &)));
+
-    connect(this, SIGNAL(dropSourceFromDataengine(const QString &)), m_dataEngineAggregator,
+    connect(this, &AWKeys::dropSourceFromDataengine, m_dataEngineAggregator, &AWDataEngineAggregator::dropSource);
-            SLOT(dropSource(const QString &)));
+    connect(m_dataEngineAggregator, &AWDataEngineAggregator::dataUpdated, this, &AWKeys::dataUpdated);
     // transfer signal from dataengine to update source list
-    connect(m_dataEngineAggregator, SIGNAL(deviceAdded(const QString &)), m_keyOperator,
+    connect(m_dataEngineAggregator, &AWDataEngineAggregator::deviceAdded, m_keyOperator, &AWKeyOperations::addDevice);
-            SLOT(addDevice(const QString &)));
 }
 
 
@@ -148,7 +148,7 @@ QStringList AWKeys::dictKeys(const bool _sorted, const QString &_regexp) const
     if (_sorted)
         allKeys.sort();
 
-    return allKeys.filter(QRegExp(_regexp));
+    return allKeys.filter(QRegularExpression(_regexp));
 }
 
 
@@ -185,9 +185,9 @@ QString AWKeys::valueByKey(const QString &_key) const
 {
     qCDebug(LOG_AW) << "Requested value for key" << _key;
 
-    QString trueKey = _key.startsWith("bar") ? m_keyOperator->infoByKey(_key) : _key;
+    auto realKey = _key.startsWith("bar") ? m_keyOperator->infoByKey(_key) : _key;
 
-    return m_aggregator->formatter(m_values[trueKey], trueKey, true);
+    return m_aggregator->formatter(m_values[realKey], realKey, true);
 }
 
 
@@ -199,10 +199,15 @@ void AWKeys::editItem(const QString &_type)
 }
 
 
-void AWKeys::dataUpdated(const QString &_sourceName, const Plasma::DataEngine::Data &_data)
+void AWKeys::dataUpdated(const QHash<QString, KSysGuard::SensorInfo> &_sensors, const KSysGuard::SensorDataList &_data)
 {
-    // run concurrent data update
+    for (auto &single : _data) {
-    QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, _sourceName, _data);
+        if (_sensors.contains(single.sensorProperty)) {
+            setDataBySource(single.sensorProperty, _sensors.value(single.sensorProperty), single);
+        }
+        // TODO use QtConcurrent::map or something like that
+        //        QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, "ss", sensor);
+    }
 }
 
 
@@ -239,7 +244,7 @@ void AWKeys::updateTextData()
     // do not do it in parallel to avoid race condition
     m_mutex.lock();
     calculateValues();
-    QString text = parsePattern(m_keyOperator->pattern());
+    auto text = parsePattern(m_keyOperator->pattern());
     // update tooltip values under lock
     m_dataAggregator->dataUpdate(m_values);
     m_mutex.unlock();
@@ -256,17 +261,17 @@ void AWKeys::calculateValues()
     QStringList mountDevices = m_keyOperator->devices("mount");
     for (auto &device : mountDevices) {
         int index = mountDevices.indexOf(device);
-        m_values[QString("hddtotmb%1").arg(index)]
+        m_values[QString("hddtotmb%1").arg(index)] = m_values[QString("hddfreemb%1").arg(index)].toDouble()
-            = m_values[QString("hddfreemb%1").arg(index)].toFloat() + m_values[QString("hddmb%1").arg(index)].toFloat();
+                                                     + m_values[QString("hddmb%1").arg(index)].toDouble();
-        m_values[QString("hddtotgb%1").arg(index)]
+        m_values[QString("hddtotgb%1").arg(index)] = m_values[QString("hddfreegb%1").arg(index)].toDouble()
-            = m_values[QString("hddfreegb%1").arg(index)].toFloat() + m_values[QString("hddgb%1").arg(index)].toFloat();
+                                                     + m_values[QString("hddgb%1").arg(index)].toDouble();
     }
 
     // memtot*
-    m_values["memtotmb"] = m_values["memusedmb"].toInt() + m_values["memfreemb"].toInt();
+    m_values["memtotmb"] = m_values["memusedmb"].toLongLong() + m_values["memfreemb"].toLongLong();
-    m_values["memtotgb"] = m_values["memusedgb"].toFloat() + m_values["memfreegb"].toFloat();
+    m_values["memtotgb"] = m_values["memusedgb"].toDouble() + m_values["memfreegb"].toDouble();
     // mem
-    m_values["mem"] = 100.0f * m_values["memmb"].toFloat() / m_values["memtotmb"].toFloat();
+    m_values["mem"] = 100.0f * m_values["memmb"].toDouble() / m_values["memtotmb"].toDouble();
 
     // up, down, upkb, downkb, upunits, downunits
     int netIndex = m_keyOperator->devices("net").indexOf(m_values["netdev"].toString());
@@ -282,10 +287,10 @@ void AWKeys::calculateValues()
     m_values["upunits"] = m_values[QString("upunits%1").arg(netIndex)];
 
     // swaptot*
-    m_values["swaptotmb"] = m_values["swapmb"].toInt() + m_values["swapfreemb"].toInt();
+    m_values["swaptotmb"] = m_values["swapmb"].toLongLong() + m_values["swapfreemb"].toLongLong();
-    m_values["swaptotgb"] = m_values["swapgb"].toFloat() + m_values["swapfreegb"].toFloat();
+    m_values["swaptotgb"] = m_values["swapgb"].toDouble() + m_values["swapfreegb"].toDouble();
     // swap
-    m_values["swap"] = 100.0f * m_values["swapmb"].toFloat() / m_values["swaptotmb"].toFloat();
+    m_values["swap"] = 100.0f * m_values["swapmb"].toDouble() / m_values["swaptotmb"].toDouble();
 
     // user defined keys
     for (auto &key : m_keyOperator->userKeys())
@@ -323,7 +328,7 @@ void AWKeys::createDBusInterface()
 QString AWKeys::parsePattern(QString _pattern) const
 {
     // screen sign
-    _pattern.replace("$$", QString(0x1d));
+    _pattern.replace("$$", QChar(0x1d));
 
     // lambdas
     for (auto &key : m_foundLambdas)
@@ -343,7 +348,7 @@ QString AWKeys::parsePattern(QString _pattern) const
     }
 
     // prepare strings
-    _pattern.replace(QString(0x1d), "$");
+    _pattern.replace(QChar(0x1d), "$");
     if (m_wrapNewLines)
         _pattern.replace("\n", "<br>");
 
@@ -351,25 +356,24 @@ QString AWKeys::parsePattern(QString _pattern) const
 }
 
 
-void AWKeys::setDataBySource(const QString &_sourceName, const QVariantMap &_data)
+void AWKeys::setDataBySource(const QString &_source, const KSysGuard::SensorInfo &_sensor,
+                             const KSysGuard::SensorData &_data)
 {
-    qCDebug(LOG_AW) << "Source" << _sourceName << "with data" << _data;
+    qCDebug(LOG_AW) << "Source" << _source << _sensor.name << "with data" << _data.payload;
 
     // first list init
-    QStringList tags = m_aggregator->keysFromSource(_sourceName);
+    auto tags = m_aggregator->keysFromSource(_source);
     if (tags.isEmpty())
-        tags = m_aggregator->registerSource(_sourceName, _data["units"].toString(), m_requiredKeys);
+        tags = m_aggregator->registerSource(_source, _sensor.unit, m_requiredKeys);
 
     // update data or drop source if there are no matches and exit
     if (tags.isEmpty()) {
-        qCInfo(LOG_AW) << "Source" << _sourceName << "not found";
+        qCInfo(LOG_AW) << "Sensor" << _source << "not found";
-        return emit(dropSourceFromDataengine(_sourceName));
+        return emit(dropSourceFromDataengine(_source));
     }
 
     m_mutex.lock();
     // HACK workaround for time values which are stored in the different path
-    std::for_each(tags.cbegin(), tags.cend(), [this, &_data, &_sourceName](const QString &tag) {
+    std::for_each(tags.cbegin(), tags.cend(), [this, &_data](const QString &tag) { m_values[tag] = _data.payload; });
-        m_values[tag] = _sourceName == "Local" ? _data["DateTime"] : _data["value"];
-    });
     m_mutex.unlock();
 }

sources/awesome-widget/plugin/awkeys.h

@@ -19,11 +19,11 @@
 #ifndef AWKEYS_H
 #define AWKEYS_H
 
-#include <Plasma/DataEngine>
-
 #include <QMutex>
 #include <QObject>
 
+#include <ksysguard/systemstats/SensorInfo.h>
+
 
 class AWDataAggregator;
 class AWDataEngineAggregator;
@@ -56,9 +56,7 @@ public:
     Q_INVOKABLE void editItem(const QString &_type);
 
 public slots:
-    void dataUpdated(const QString &_sourceName, const Plasma::DataEngine::Data &_data);
+    void dataUpdated(const QHash<QString, KSysGuard::SensorInfo> &_sensors, const KSysGuard::SensorDataList &_data);
-    // dummy method required by DataEngine connections
-    static void modelChanged(const QString &, QAbstractItemModel *){};
 
 signals:
     void dropSourceFromDataengine(const QString &_source);
@@ -74,7 +72,8 @@ private:
     void calculateValues();
     void createDBusInterface();
     [[nodiscard]] QString parsePattern(QString _pattern) const;
-    void setDataBySource(const QString &_sourceName, const QVariantMap &_data);
+    void setDataBySource(const QString &_source, const KSysGuard::SensorInfo &_sensor,
+                         const KSysGuard::SensorData &_data);
     // objects
     AWDataAggregator *m_dataAggregator = nullptr;
     AWDataEngineAggregator *m_dataEngineAggregator = nullptr;

sources/awesome-widget/plugin/awkeysaggregator.cpp

@@ -64,19 +64,19 @@ QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key,
     // case block
     switch (m_mapper->formatter(_key)) {
     case FormatterType::Float:
-        output = QString("%1").arg(_data.toFloat(), 5, 'f', 1);
+        output = QString("%1").arg(_data.toDouble(), 5, 'f', 1);
         break;
     case FormatterType::FloatTwoSymbols:
-        output = QString("%1").arg(_data.toFloat(), 5, 'f', 2);
+        output = QString("%1").arg(_data.toDouble(), 5, 'f', 2);
         break;
     case FormatterType::Integer:
-        output = QString("%1").arg(_data.toFloat(), 4, 'f', 0);
+        output = QString("%1").arg(_data.toDouble(), 4, 'f', 0);
         break;
     case FormatterType::IntegerFive:
-        output = QString("%1").arg(_data.toFloat(), 5, 'f', 0);
+        output = QString("%1").arg(_data.toDouble(), 5, 'f', 0);
         break;
     case FormatterType::IntegerThree:
-        output = QString("%1").arg(_data.toFloat(), 3, 'f', 0);
+        output = QString("%1").arg(_data.toDouble(), 3, 'f', 0);
         break;
     case FormatterType::List:
         output = _data.toStringList().join(',');
@@ -85,10 +85,10 @@ QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key,
         output = _data.toBool() ? m_acOnline : m_acOffline;
         break;
     case FormatterType::MemGBFormat:
-        output = QString("%1").arg(_data.toFloat() / (1024.0 * 1024.0), 5, 'f', 1);
+        output = QString("%1").arg(_data.toDouble() / (1024.0 * 1024.0), 5, 'f', 1);
         break;
     case FormatterType::MemMBFormat:
-        output = QString("%1").arg(_data.toFloat() / 1024.0, 5, 'f', 0);
+        output = QString("%1").arg(_data.toDouble() / 1024.0, 5, 'f', 0);
         break;
     case FormatterType::NetSmartFormat:
         output = [](const float value) {
@@ -96,10 +96,10 @@ QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key,
                 return QString("%1").arg(value / 1024.0, 4, 'f', 1);
             else
                 return QString("%1").arg(value, 4, 'f', 0);
-        }(_data.toFloat());
+        }(_data.toDouble());
         break;
     case FormatterType::NetSmartUnits:
-        if (_data.toFloat() > 1024.0)
+        if (_data.toDouble() > 1024.0)
             output = m_translate ? i18n("MB/s") : "MB/s";
         else
             output = m_translate ? i18n("KB/s") : "KB/s";
@@ -110,7 +110,7 @@ QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key,
         output = output.rightJustified(8, QLatin1Char(' '), true);
         break;
     case FormatterType::Temperature:
-        output = QString("%1").arg(temperature(_data.toFloat()), 5, 'f', 1);
+        output = QString("%1").arg(temperature(_data.toDouble()), 5, 'f', 1);
         break;
     case FormatterType::Time:
         output = _data.toDateTime().toString();
@@ -150,7 +150,7 @@ QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key,
                 source.replace("$m", QString("%1").arg(minutes));
                 return source;
             }(m_mapper->formatter(_key) == FormatterType::Uptime ? "$ddd$hhh$mmm" : m_customUptime,
-              static_cast<int>(_data.toFloat()));
+              static_cast<int>(_data.toDouble()));
         break;
     case FormatterType::NoFormat:
         output = _data.toString();
@@ -234,7 +234,8 @@ void AWKeysAggregator::setTranslate(const bool _translate)
 }
 
 
-QStringList AWKeysAggregator::registerSource(const QString &_source, const QString &_units, const QStringList &_keys)
+QStringList AWKeysAggregator::registerSource(const QString &_source, const KSysGuard::Unit &_units,
+                                             const QStringList &_keys)
 {
     qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
 

sources/awesome-widget/plugin/awkeysaggregator.h

@@ -19,6 +19,8 @@
 #ifndef AWKEYSAGGREGATOR_H
 #define AWKEYSAGGREGATOR_H
 
+#include <ksysguard/formatter/Unit.h>
+
 #include <QHash>
 #include <QObject>
 
@@ -81,7 +83,7 @@ public:
     void setTranslate(bool _translate);
 
 public slots:
-    QStringList registerSource(const QString &_source, const QString &_units, const QStringList &_keys);
+    QStringList registerSource(const QString &_source, const KSysGuard::Unit &_units, const QStringList &_keys);
 
 private:
     [[nodiscard]] float temperature(float temp) const;

sources/awesome-widget/plugin/awpatternfunctions.cpp

@@ -105,9 +105,9 @@ QList<AWPatternFunctions::AWFunction> AWPatternFunctions::findFunctionCalls(cons
             metadata.args = QStringList();
         } else {
             // replace '$,' to 0x1d
-            argsString.replace("$,", QString(0x1d));
+            argsString.replace("$,", QChar(0x1d));
             QStringList args = argsString.split(',');
-            std::for_each(args.begin(), args.end(), [](QString &arg) { arg.replace(QString(0x1d), ","); });
+            std::for_each(args.begin(), args.end(), [](QString &arg) { arg.replace(QChar(0x1d), ","); });
             metadata.args = args;
         }
         // other variables
@@ -130,7 +130,7 @@ QString AWPatternFunctions::insertAllKeys(QString _code, const QStringList &_key
     QList<AWPatternFunctions::AWFunction> found = AWPatternFunctions::findFunctionCalls("aw_all", _code);
     for (auto &function : found) {
         QString separator = function.args.isEmpty() ? "," : function.args.at(0);
-        QStringList required = _keys.filter(QRegExp(function.body));
+        QStringList required = _keys.filter(QRegularExpression(function.body));
         std::for_each(required.begin(), required.end(), [](QString &value) { value = QString("%1: $%1").arg(value); });
 
         _code.replace(function.what, required.join(separator));
@@ -146,7 +146,7 @@ QString AWPatternFunctions::insertKeyCount(QString _code, const QStringList &_ke
 
     QList<AWPatternFunctions::AWFunction> found = AWPatternFunctions::findFunctionCalls("aw_count", _code);
     for (auto &function : found) {
-        int count = _keys.filter(QRegExp(function.body)).count();
+        int count = _keys.filter(QRegularExpression(function.body)).count();
 
         _code.replace(function.what, QString::number(count));
     }
@@ -162,7 +162,7 @@ QString AWPatternFunctions::insertKeyNames(QString _code, const QStringList &_ke
     QList<AWPatternFunctions::AWFunction> found = AWPatternFunctions::findFunctionCalls("aw_names", _code);
     for (auto &function : found) {
         QString separator = function.args.isEmpty() ? "," : function.args.at(0);
-        QStringList required = _keys.filter(QRegExp(function.body));
+        QStringList required = _keys.filter(QRegularExpression(function.body));
 
         _code.replace(function.what, required.join(separator));
     }
@@ -178,7 +178,7 @@ QString AWPatternFunctions::insertKeys(QString _code, const QStringList &_keys)
     QList<AWPatternFunctions::AWFunction> found = AWPatternFunctions::findFunctionCalls("aw_keys", _code);
     for (auto &function : found) {
         QString separator = function.args.isEmpty() ? "," : function.args.at(0);
-        QStringList required = _keys.filter(QRegExp(function.body));
+        QStringList required = _keys.filter(QRegularExpression(function.body));
         std::for_each(required.begin(), required.end(), [](QString &value) { value = QString("$%1").arg(value); });
 
         _code.replace(function.what, required.join(separator));

sources/awesome-widget/plugin/awupdatehelper.cpp

@@ -24,6 +24,7 @@
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QSettings>
+#include <QStandardPaths>
 
 #include "awdebug.h"
 

sources/awesomewidgets/CMakeLists.txt

@@ -7,7 +7,7 @@ include_directories(
         ${CMAKE_BINARY_DIR}
         ${PROJECT_TRDPARTY_DIR}
         ${Qt_INCLUDE}
-        ${Kf5_INCLUDE}
+        ${Kf6_INCLUDE}
 )
 
 file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/qreplytimeout/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
@@ -28,9 +28,9 @@ file(RELATIVE_PATH SUBPROJECT_WEATHER_JSON ${CMAKE_SOURCE_DIR} ${SUBPROJECT_WEAT
 # prepare
 configure_file(${SUBPROJECT_WEATHER_JSON_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_WEATHER_JSON})
 
-qt5_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
+qt6_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
 add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER} ${SUBPROJECT_UI_HEADER})
-target_link_libraries(${SUBPROJECT} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
+target_link_libraries(${SUBPROJECT} ${Qt_LIBRARIES} ${Kf6_LIBRARIES})
 
 # install
 install(DIRECTORY ${SUBPROJECT_CONFIGS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
@@ -41,5 +41,5 @@ install(DIRECTORY ${SUBPROJECT_SCRIPTS} DESTINATION ${DATA_INSTALL_DIR}/${PROJEC
 install(DIRECTORY ${SUBPROJECT_REQUESTS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
 install(DIRECTORY ${SUBPROJECT_UPGRADE} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
 install(DIRECTORY ${SUBPROJECT_WEATHER} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
-install(FILES ${SUBPROJECT_INI} DESTINATION ${CONFIG_INSTALL_DIR})
+install(FILES ${SUBPROJECT_INI} DESTINATION ${KDE_INSTALL_CONFDIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_WEATHER_JSON} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/weather)

sources/awesomewidgets/abstractextitem.cpp

@@ -27,8 +27,8 @@
 #include "qcronscheduler.h"
 
 
-AbstractExtItem::AbstractExtItem(QWidget *_parent, const QString &_filePath)
+AbstractExtItem::AbstractExtItem(QObject *_parent, const QString &_filePath)
-    : QDialog(_parent)
+    : QObject(_parent)
     , m_fileName(_filePath)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
@@ -97,15 +97,13 @@ void AbstractExtItem::startTimer()
 
 QString AbstractExtItem::writtableConfig() const
 {
-    QString path = m_fileName;
+    auto path = m_fileName;
-    QString name = QFileInfo(path).fileName();
+    auto name = QFileInfo(path).fileName();
-    path.remove(path.count() - name.count() - 1, name.count() + 1);
+    path.remove(path.length() - name.length() - 1, name.length() + 1);
-    QString dir = QFileInfo(path).fileName();
+    auto dir = QFileInfo(path).fileName();
 
     return QString("%1/awesomewidgets/%2/%3")
-        .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
+        .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation), dir, name);
-        .arg(dir)
-        .arg(name);
 }
 
 
@@ -269,8 +267,8 @@ void AbstractExtItem::deinitSocket()
 
     m_socket->close();
     QLocalServer::removeServer(socket());
-    delete m_socket;
     disconnect(m_socket, SIGNAL(newConnection()), this, SLOT(newConnectionReceived()));
+    delete m_socket;
 }
 
 

sources/awesomewidgets/abstractextitem.h

@@ -18,14 +18,14 @@
 #ifndef ABSTRACTEXTITEM_H
 #define ABSTRACTEXTITEM_H
 
-#include <QDialog>
 #include <QVariant>
 
 
 class QCronScheduler;
 class QLocalServer;
+class QWidget;
 
-class AbstractExtItem : public QDialog
+class AbstractExtItem : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool active READ isActive WRITE setActive)
@@ -40,7 +40,7 @@ class AbstractExtItem : public QDialog
     Q_PROPERTY(QString uniq READ uniq)
 
 public:
-    explicit AbstractExtItem(QWidget *_parent = nullptr, const QString &_filePath = "");
+    explicit AbstractExtItem(QObject *_parent = nullptr, const QString &_filePath = "");
     ~AbstractExtItem() override;
     virtual void bumpApi(int _newVer);
     virtual AbstractExtItem *copy(const QString &_fileName, int _number) = 0;
@@ -78,7 +78,7 @@ public slots:
     virtual void initSocket();
     virtual void readConfiguration();
     virtual QVariantHash run() = 0;
-    virtual int showConfiguration(const QVariant &_args) = 0;
+    virtual int showConfiguration(QWidget *_parent, const QVariant &_args) = 0;
     [[nodiscard]] virtual bool tryDelete() const;
     virtual void writeConfiguration() const;
 
@@ -89,7 +89,8 @@ private:
     QCronScheduler *m_scheduler = nullptr;
     QString m_fileName = "/dev/null";
     int m_times = 0;
-    virtual void translate() = 0;
+    // FIXME find a better way to do it
+    virtual void translate(void *_ui) = 0;
     // properties
     int m_apiVersion = 0;
     bool m_active = true;

sources/awesomewidgets/abstractextitemaggregator.cpp

@@ -26,65 +26,45 @@
 #include <utility>
 
 
-AbstractExtItemAggregator::AbstractExtItemAggregator(QWidget *_parent, QString _type)
+AbstractExtItemAggregator::AbstractExtItemAggregator(QObject *_parent, QString _type)
-    : QDialog(_parent)
+    : QObject(_parent)
-    , ui(new Ui::AbstractExtItemAggregator)
     , m_type(std::move(_type))
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
     // create directory at $HOME
-    QString localDir = QString("%1/awesomewidgets/%2")
+    auto localDir = QString("%1/awesomewidgets/%2")
-                           .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
+                        .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation), type());
-                           .arg(type());
     QDir localDirectory;
     if (localDirectory.mkpath(localDir))
         qCInfo(LOG_LIB) << "Created directory" << localDir;
-
-    ui->setupUi(this);
-    copyButton = ui->buttonBox->addButton(i18n("Copy"), QDialogButtonBox::ActionRole);
-    createButton = ui->buttonBox->addButton(i18n("Create"), QDialogButtonBox::ActionRole);
-    deleteButton = ui->buttonBox->addButton(i18n("Remove"), QDialogButtonBox::ActionRole);
-
-    connect(ui->buttonBox, SIGNAL(clicked(QAbstractButton *)), this, SLOT(editItemButtonPressed(QAbstractButton *)));
-    connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-    connect(ui->listWidget, SIGNAL(itemActivated(QListWidgetItem *)), this, SLOT(editItemActivated(QListWidgetItem *)));
 }
 
 
-AbstractExtItemAggregator::~AbstractExtItemAggregator()
+void AbstractExtItemAggregator::copyItem(QListWidget *_widget)
 {
-    qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
+    auto source = itemFromWidget(_widget);
-
+    auto fileName = getName();
-    delete ui;
+    auto number = uniqNumber();
-}
+    auto dir = QString("%1/awesomewidgets/%2")
-
+                   .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation), m_type);
-
-void AbstractExtItemAggregator::copyItem()
-{
-    AbstractExtItem *source = itemFromWidget();
-    QString fileName = getName();
-    int number = uniqNumber();
-    QString dir = QString("%1/awesomewidgets/%2")
-                      .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
-                      .arg(m_type);
     if ((!source) || (fileName.isEmpty())) {
         qCWarning(LOG_LIB) << "Nothing to copy";
         return;
     }
-    QString filePath = QString("%1/%2").arg(dir).arg(fileName);
+    auto filePath = QString("%1/%2").arg(dir, fileName);
 
-    AbstractExtItem *newItem = source->copy(filePath, number);
+    auto newItem = source->copy(filePath, number);
-    if (newItem->showConfiguration(configArgs()) == 1) {
+    if (newItem->showConfiguration(nullptr, configArgs()) == 1) {
         initItems();
-        repaintList();
+        repaintList(_widget);
     }
 }
 
 
-void AbstractExtItemAggregator::deleteItem()
+void AbstractExtItemAggregator::deleteItem(QListWidget *_widget)
 {
-    AbstractExtItem *source = itemFromWidget();
+    auto source = itemFromWidget(_widget);
     if (!source) {
         qCWarning(LOG_LIB) << "Nothing to delete";
         return;
@@ -92,30 +72,63 @@ void AbstractExtItemAggregator::deleteItem()
 
     if (source->tryDelete()) {
         initItems();
-        repaintList();
+        repaintList(_widget);
     }
 }
 
 
-void AbstractExtItemAggregator::editItem()
+void AbstractExtItemAggregator::editItem(QListWidget *_widget)
 {
-    AbstractExtItem *source = itemFromWidget();
+    auto source = itemFromWidget(_widget);
     if (!source) {
         qCWarning(LOG_LIB) << "Nothing to edit";
         return;
     }
 
-    if (source->showConfiguration(configArgs()) == 1) {
+    if (source->showConfiguration(nullptr, configArgs()) == 1) {
         initItems();
-        repaintList();
+        repaintList(_widget);
     }
 }
 
 
+int AbstractExtItemAggregator::exec()
+{
+    auto dialog = new QDialog();
+    auto ui = new Ui::AbstractExtItemAggregator();
+    ui->setupUi(dialog);
+
+    auto copyButton = ui->buttonBox->addButton(i18n("Copy"), QDialogButtonBox::ActionRole);
+    auto createButton = ui->buttonBox->addButton(i18n("Create"), QDialogButtonBox::ActionRole);
+    auto deleteButton = ui->buttonBox->addButton(i18n("Remove"), QDialogButtonBox::ActionRole);
+
+    connect(ui->buttonBox, &QDialogButtonBox::clicked, [&](QAbstractButton *_button) {
+        if (dynamic_cast<QPushButton *>(_button) == copyButton)
+            copyItem(ui->listWidget);
+        else if (dynamic_cast<QPushButton *>(_button) == createButton)
+            doCreateItem(ui->listWidget);
+        else if (dynamic_cast<QPushButton *>(_button) == deleteButton)
+            deleteItem(ui->listWidget);
+        else if (ui->buttonBox->buttonRole(_button) == QDialogButtonBox::AcceptRole)
+            editItem(ui->listWidget);
+    });
+    connect(ui->buttonBox, &QDialogButtonBox::rejected, [dialog]() { dialog->reject(); });
+    connect(ui->listWidget, &QListWidget::itemActivated, [&](QListWidgetItem *) { editItem(ui->listWidget); });
+
+    repaintList(ui->listWidget);
+    auto ret = dialog->exec();
+
+    dialog->deleteLater();
+    delete ui;
+
+    return ret;
+}
+
+
 QString AbstractExtItemAggregator::getName()
 {
     bool ok;
-    QString name = QInputDialog::getText(this, i18n("Enter file name"), i18n("File name"), QLineEdit::Normal, "", &ok);
+    auto name = QInputDialog::getText(nullptr, i18n("Enter file name"), i18n("File name"), QLineEdit::Normal, "", &ok);
     if ((!ok) || (name.isEmpty()))
         return "";
     if (!name.endsWith(".desktop"))
@@ -125,15 +138,15 @@ QString AbstractExtItemAggregator::getName()
 }
 
 
-AbstractExtItem *AbstractExtItemAggregator::itemFromWidget() const
+AbstractExtItem *AbstractExtItemAggregator::itemFromWidget(QListWidget *_widget) const
 {
-    QListWidgetItem *widgetItem = ui->listWidget->currentItem();
+    auto widgetItem = _widget->currentItem();
     if (!widgetItem)
         return nullptr;
 
     AbstractExtItem *found = nullptr;
     for (auto &item : items()) {
-        QString fileName = QFileInfo(item->fileName()).fileName();
+        auto fileName = QFileInfo(item->fileName()).fileName();
         if (fileName != widgetItem->text())
             continue;
         found = item;
@@ -146,18 +159,18 @@ AbstractExtItem *AbstractExtItemAggregator::itemFromWidget() const
 }
 
 
-void AbstractExtItemAggregator::repaintList() const
+void AbstractExtItemAggregator::repaintList(QListWidget *_widget) const
 {
-    ui->listWidget->clear();
+    _widget->clear();
     for (auto &_item : items()) {
         QString fileName = QFileInfo(_item->fileName()).fileName();
-        auto *item = new QListWidgetItem(fileName, ui->listWidget);
+        auto item = new QListWidgetItem(fileName, _widget);
         QStringList tooltip;
         tooltip.append(i18n("Name: %1", _item->name()));
         tooltip.append(i18n("Comment: %1", _item->comment()));
         tooltip.append(i18n("Identity: %1", _item->uniq()));
         item->setToolTip(tooltip.join('\n'));
-        ui->listWidget->addItem(item);
+        _widget->addItem(item);
     }
 }
 
@@ -202,22 +215,3 @@ void AbstractExtItemAggregator::setConfigArgs(const QVariant &_configArgs)
 
     m_configArgs = _configArgs;
 }
-
-
-void AbstractExtItemAggregator::editItemActivated(QListWidgetItem *)
-{
-    return editItem();
-}
-
-
-void AbstractExtItemAggregator::editItemButtonPressed(QAbstractButton *_button)
-{
-    if (dynamic_cast<QPushButton *>(_button) == copyButton)
-        return copyItem();
-    else if (dynamic_cast<QPushButton *>(_button) == createButton)
-        return doCreateItem();
-    else if (dynamic_cast<QPushButton *>(_button) == deleteButton)
-        return deleteItem();
-    else if (ui->buttonBox->buttonRole(_button) == QDialogButtonBox::AcceptRole)
-        return editItem();
-}

sources/awesomewidgets/abstractextitemaggregator.h

@@ -18,7 +18,6 @@
 #ifndef ABSTRACTEXTITEMAGGREGATOR_H
 #define ABSTRACTEXTITEMAGGREGATOR_H
 
-#include <QDialog>
 #include <QStandardPaths>
 
 #include "abstractextitem.h"
@@ -26,49 +25,45 @@
 
 
 class QAbstractButton;
+class QListWidget;
 class QListWidgetItem;
-namespace Ui
-{
-class AbstractExtItemAggregator;
-}
 
-class AbstractExtItemAggregator : public QDialog
+class AbstractExtItemAggregator : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QVariant configArgs READ configArgs WRITE setConfigArgs)
     Q_PROPERTY(QVariant type READ type)
 
 public:
-    explicit AbstractExtItemAggregator(QWidget *_parent, QString _type);
+    explicit AbstractExtItemAggregator(QObject *_parent, QString _type);
-    ~AbstractExtItemAggregator() override;
     // methods
-    void copyItem();
+    void copyItem(QListWidget *_widget);
-    template <class T> void createItem()
+    template <class T> void createItem(QListWidget *_widget)
     {
-        QString fileName = getName();
+        auto fileName = getName();
-        int number = uniqNumber();
+        auto number = uniqNumber();
-        QString dir = QString("%1/awesomewidgets/%2")
+        auto dir = QString("%1/awesomewidgets/%2")
-                          .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
+                       .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation), m_type);
-                          .arg(m_type);
         if (fileName.isEmpty()) {
             qCWarning(LOG_LIB) << "Nothing to create";
             return;
         }
-        QString filePath = QString("%1/%2").arg(dir).arg(fileName);
+        auto filePath = QString("%1/%2").arg(dir, fileName);
 
-        T *newItem = new T(this, filePath);
+        auto newItem = new T(this, filePath);
         newItem->setNumber(number);
-        if (newItem->showConfiguration(configArgs()) == 1) {
+        if (newItem->showConfiguration(nullptr, configArgs()) == 1) {
             initItems();
-            repaintList();
+            repaintList(_widget);
         }
     };
-    void deleteItem();
+    void deleteItem(QListWidget *_widget);
-    void editItem();
+    void editItem(QListWidget *_widget);
+    [[nodiscard]] int exec();
     QString getName();
     virtual void initItems() = 0;
-    [[nodiscard]] AbstractExtItem *itemFromWidget() const;
+    [[nodiscard]] AbstractExtItem *itemFromWidget(QListWidget *_widget) const;
-    void repaintList() const;
+    void repaintList(QListWidget *_widget) const;
     [[nodiscard]] int uniqNumber() const;
     // get methods
     [[nodiscard]] QVariant configArgs() const;
@@ -78,21 +73,12 @@ public:
     // set methods
     void setConfigArgs(const QVariant &_configArgs);
 
-private slots:
-    void editItemActivated(QListWidgetItem *);
-    void editItemButtonPressed(QAbstractButton *_button);
-
 private:
-    // ui
-    Ui::AbstractExtItemAggregator *ui = nullptr;
-    QPushButton *copyButton = nullptr;
-    QPushButton *createButton = nullptr;
-    QPushButton *deleteButton = nullptr;
     // properties
     QVariant m_configArgs;
     QString m_type;
     // ui methods
-    virtual void doCreateItem() = 0;
+    virtual void doCreateItem(QListWidget *_widget) = 0;
 };
 
 

sources/awesomewidgets/awabstractformatter.cpp

@@ -22,19 +22,13 @@
 #include "awdebug.h"
 
 
-AWAbstractFormatter::AWAbstractFormatter(QWidget *_parent, const QString &_filePath)
+AWAbstractFormatter::AWAbstractFormatter(QObject *_parent, const QString &_filePath)
     : AbstractExtItem(_parent, _filePath)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 }
 
 
-AWAbstractFormatter::~AWAbstractFormatter()
-{
-    qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
-}
-
-
 void AWAbstractFormatter::copyDefaults(AbstractExtItem *_other) const
 {
     AbstractExtItem::copyDefaults(_other);
@@ -45,7 +39,7 @@ void AWAbstractFormatter::copyDefaults(AbstractExtItem *_other) const
 
 QString AWAbstractFormatter::uniq() const
 {
-    return QString("%1(%2)").arg(name()).arg(strType());
+    return QString("%1(%2)").arg(name(), strType());
 }
 
 

sources/awesomewidgets/awabstractformatter.h

@@ -18,6 +18,8 @@
 #ifndef AWABSTRACTFORMATTER_H
 #define AWABSTRACTFORMATTER_H
 
+#include <QRegularExpression>
+
 #include "abstractextitem.h"
 
 
@@ -30,8 +32,8 @@ class AWAbstractFormatter : public AbstractExtItem
 public:
     enum class FormatterClass { DateTime, Float, List, Script, String, NoFormat, Json };
 
-    explicit AWAbstractFormatter(QWidget *_parent = nullptr, const QString &_filePath = "");
+    explicit AWAbstractFormatter(QObject *_parent = nullptr, const QString &_filePath = "");
-    ~AWAbstractFormatter() override;
+    ~AWAbstractFormatter() override = default;
     [[nodiscard]] virtual QString convert(const QVariant &_value) const = 0;
     void copyDefaults(AbstractExtItem *_other) const override;
     [[nodiscard]] QString uniq() const override;

sources/awesomewidgets/awdatetimeformatter.cpp

@@ -15,7 +15,6 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
 #include "awdatetimeformatter.h"
 #include "ui_awdatetimeformatter.h"
 
@@ -27,24 +26,13 @@
 #include "awdebug.h"
 
 
-AWDateTimeFormatter::AWDateTimeFormatter(QWidget *_parent, const QString &_filePath)
+AWDateTimeFormatter::AWDateTimeFormatter(QObject *_parent, const QString &_filePath)
     : AWAbstractFormatter(_parent, _filePath)
-    , ui(new Ui::AWDateTimeFormatter)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
     if (!_filePath.isEmpty())
         AWDateTimeFormatter::readConfiguration();
-    ui->setupUi(this);
-    AWDateTimeFormatter::translate();
-}
-
-
-AWDateTimeFormatter::~AWDateTimeFormatter()
-{
-    qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
-
-    delete ui;
 }
 
 
@@ -60,7 +48,7 @@ AWDateTimeFormatter *AWDateTimeFormatter::copy(const QString &_fileName, const i
 {
     qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
 
-    auto *item = new AWDateTimeFormatter(dynamic_cast<QWidget *>(parent()), _fileName);
+    auto item = new AWDateTimeFormatter(parent(), _fileName);
     AWAbstractFormatter::copyDefaults(item);
     item->setFormat(format());
     item->setTranslateString(translateString());
@@ -114,27 +102,36 @@ void AWDateTimeFormatter::readConfiguration()
 }
 
 
-int AWDateTimeFormatter::showConfiguration(const QVariant &_args)
+int AWDateTimeFormatter::showConfiguration(QWidget *_parent, const QVariant &_args)
 {
     Q_UNUSED(_args)
 
+    auto dialog = new QDialog(_parent);
+    auto ui = new Ui::AWDateTimeFormatter();
+    ui->setupUi(dialog);
+    translate(ui);
+
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
     ui->label_typeValue->setText("DateTime");
     ui->lineEdit_format->setText(format());
     ui->checkBox_translate->setCheckState(translateString() ? Qt::Checked : Qt::Unchecked);
 
-    int ret = exec();
+    auto ret = dialog->exec();
-    if (ret != 1)
+    if (ret == 1) {
-        return ret;
+        setName(ui->lineEdit_name->text());
-    setName(ui->lineEdit_name->text());
+        setComment(ui->lineEdit_comment->text());
-    setComment(ui->lineEdit_comment->text());
+        setApiVersion(AW_FORMATTER_API);
-    setApiVersion(AW_FORMATTER_API);
+        setStrType(ui->label_typeValue->text());
-    setStrType(ui->label_typeValue->text());
+        setFormat(ui->lineEdit_format->text());
-    setFormat(ui->lineEdit_format->text());
+        setTranslateString(ui->checkBox_translate->checkState() == Qt::Checked);
-    setTranslateString(ui->checkBox_translate->checkState() == Qt::Checked);
+
+        writeConfiguration();
+    }
+
+    dialog->deleteLater();
+    delete ui;
 
-    writeConfiguration();
     return ret;
 }
 
@@ -160,9 +157,10 @@ void AWDateTimeFormatter::initLocale()
     m_locale = m_translate ? QLocale::system() : QLocale::c();
 }
 
-
+void AWDateTimeFormatter::translate(void *_ui)
-void AWDateTimeFormatter::translate()
 {
+    auto ui = reinterpret_cast<Ui::AWDateTimeFormatter *>(_ui);
+
     ui->label_name->setText(i18n("Name"));
     ui->label_comment->setText(i18n("Comment"));
     ui->label_type->setText(i18n("Type"));

sources/awesomewidgets/awdatetimeformatter.h

@@ -23,11 +23,6 @@
 #include "awabstractformatter.h"
 
 
-namespace Ui
-{
-class AWDateTimeFormatter;
-}
-
 class AWDateTimeFormatter : public AWAbstractFormatter
 {
     Q_OBJECT
@@ -35,8 +30,7 @@ class AWDateTimeFormatter : public AWAbstractFormatter
     Q_PROPERTY(bool translateString READ translateString WRITE setTranslateString)
 
 public:
-    explicit AWDateTimeFormatter(QWidget *_parent = nullptr, const QString &_filePath = "");
+    explicit AWDateTimeFormatter(QObject *_parent = nullptr, const QString &_filePath = "");
-    ~AWDateTimeFormatter() override;
     [[nodiscard]] QString convert(const QVariant &_value) const override;
     AWDateTimeFormatter *copy(const QString &_fileName, int _number) override;
     // properties
@@ -47,13 +41,12 @@ public:
 
 public slots:
     void readConfiguration() override;
-    int showConfiguration(const QVariant &_args) override;
+    int showConfiguration(QWidget *_parent, const QVariant &_args) override;
     void writeConfiguration() const override;
 
 private:
-    Ui::AWDateTimeFormatter *ui = nullptr;
     void initLocale();
-    void translate() override;
+    void translate(void *_ui) override;
     // properties
     QLocale m_locale;
     QString m_format = "";

sources/awesomewidgets/awfloatformatter.cpp

@@ -15,7 +15,6 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
 #include "awfloatformatter.h"
 #include "ui_awfloatformatter.h"
 
@@ -26,24 +25,13 @@
 #include "awdebug.h"
 
 
-AWFloatFormatter::AWFloatFormatter(QWidget *_parent, const QString &_filePath)
+AWFloatFormatter::AWFloatFormatter(QObject *_parent, const QString &_filePath)
     : AWAbstractFormatter(_parent, _filePath)
-    , ui(new Ui::AWFloatFormatter)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
     if (!_filePath.isEmpty())
         AWFloatFormatter::readConfiguration();
-    ui->setupUi(this);
-    AWFloatFormatter::translate();
-}
-
-
-AWFloatFormatter::~AWFloatFormatter()
-{
-    qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
-
-    delete ui;
 }
 
 
@@ -51,7 +39,7 @@ QString AWFloatFormatter::convert(const QVariant &_value) const
 {
     qCDebug(LOG_LIB) << "Convert value" << _value;
 
-    QString output
+    auto output
         = QString("%1").arg(_value.toDouble() * multiplier() + summand(), count(), format(), precision(), fillChar());
     if (forceWidth())
         output = output.left(count());
@@ -64,7 +52,7 @@ AWFloatFormatter *AWFloatFormatter::copy(const QString &_fileName, const int _nu
 {
     qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
 
-    auto *item = new AWFloatFormatter(dynamic_cast<QWidget *>(parent()), _fileName);
+    auto item = new AWFloatFormatter(parent(), _fileName);
     AWAbstractFormatter::copyDefaults(item);
     item->setCount(count());
     item->setFormat(format());
@@ -202,10 +190,15 @@ void AWFloatFormatter::readConfiguration()
 }
 
 
-int AWFloatFormatter::showConfiguration(const QVariant &_args)
+int AWFloatFormatter::showConfiguration(QWidget *_parent, const QVariant &_args)
 {
     Q_UNUSED(_args)
 
+    auto dialog = new QDialog(_parent);
+    auto ui = new Ui::AWFloatFormatter();
+    ui->setupUi(dialog);
+    translate(ui);
+
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
     ui->label_typeValue->setText("Float");
@@ -217,22 +210,26 @@ int AWFloatFormatter::showConfiguration(const QVariant &_args)
     ui->doubleSpinBox_multiplier->setValue(multiplier());
     ui->doubleSpinBox_summand->setValue(summand());
 
-    int ret = exec();
+    auto ret = dialog->exec();
-    if (ret != 1)
+    if (ret == 1) {
-        return ret;
+        setName(ui->lineEdit_name->text());
-    setName(ui->lineEdit_name->text());
+        setComment(ui->lineEdit_comment->text());
-    setComment(ui->lineEdit_comment->text());
+        setApiVersion(AW_FORMATTER_API);
-    setApiVersion(AW_FORMATTER_API);
+        setStrType(ui->label_typeValue->text());
-    setStrType(ui->label_typeValue->text());
+        setFormat(ui->comboBox_format->currentText().at(0).toLatin1());
-    setFormat(ui->comboBox_format->currentText().at(0).toLatin1());
+        setPrecision(ui->spinBox_precision->value());
-    setPrecision(ui->spinBox_precision->value());
+        setCount(ui->spinBox_width->value());
-    setCount(ui->spinBox_width->value());
+        setFillChar(ui->lineEdit_fill->text().at(0));
-    setFillChar(ui->lineEdit_fill->text().at(0));
+        setForceWidth(ui->checkBox_forceWidth->checkState() == Qt::Checked);
-    setForceWidth(ui->checkBox_forceWidth->checkState() == Qt::Checked);
+        setMultiplier(ui->doubleSpinBox_multiplier->value());
-    setMultiplier(ui->doubleSpinBox_multiplier->value());
+        setSummand(ui->doubleSpinBox_summand->value());
-    setSummand(ui->doubleSpinBox_summand->value());
+
+        writeConfiguration();
+    }
+
+    dialog->deleteLater();
+    delete ui;
 
-    writeConfiguration();
     return ret;
 }
 
@@ -258,8 +255,10 @@ void AWFloatFormatter::writeConfiguration() const
 }
 
 
-void AWFloatFormatter::translate()
+void AWFloatFormatter::translate(void *_ui)
 {
+    auto ui = reinterpret_cast<Ui::AWFloatFormatter *>(_ui);
+
     ui->label_name->setText(i18n("Name"));
     ui->label_comment->setText(i18n("Comment"));
     ui->label_type->setText(i18n("Type"));

sources/awesomewidgets/awfloatformatter.h

@@ -21,11 +21,6 @@
 #include "awabstractformatter.h"
 
 
-namespace Ui
-{
-class AWFloatFormatter;
-}
-
 class AWFloatFormatter : public AWAbstractFormatter
 {
     Q_OBJECT
@@ -38,8 +33,7 @@ class AWFloatFormatter : public AWAbstractFormatter
     Q_PROPERTY(double summand READ summand WRITE setSummand)
 
 public:
-    explicit AWFloatFormatter(QWidget *_parent = nullptr, const QString &_filePath = "");
+    explicit AWFloatFormatter(QObject *_parent = nullptr, const QString &_filePath = "");
-    ~AWFloatFormatter() override;
     [[nodiscard]] QString convert(const QVariant &_value) const override;
     AWFloatFormatter *copy(const QString &_fileName, int _number) override;
     // properties
@@ -60,12 +54,11 @@ public:
 
 public slots:
     void readConfiguration() override;
-    int showConfiguration(const QVariant &_args) override;
+    int showConfiguration(QWidget *_parent, const QVariant &_args) override;
     void writeConfiguration() const override;
 
 private:
-    Ui::AWFloatFormatter *ui = nullptr;
+    void translate(void *_ui) override;
-    void translate() override;
     // properties
     int m_count = 0;
     QChar m_fillChar = QChar();

sources/awesomewidgets/awjsonformatter.cpp

@@ -15,7 +15,6 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
 #include "awjsonformatter.h"
 #include "ui_awjsonformatter.h"
 
@@ -27,24 +26,13 @@
 #include "awdebug.h"
 
 
-AWJsonFormatter::AWJsonFormatter(QWidget *_parent, const QString &_filePath)
+AWJsonFormatter::AWJsonFormatter(QObject *_parent, const QString &_filePath)
     : AWAbstractFormatter(_parent, _filePath)
-    , ui(new Ui::AWJsonFormatter)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
     if (!_filePath.isEmpty())
         AWJsonFormatter::readConfiguration();
-    ui->setupUi(this);
-    AWJsonFormatter::translate();
-}
-
-
-AWJsonFormatter::~AWJsonFormatter()
-{
-    qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
-
-    delete ui;
 }
 
 
@@ -53,8 +41,8 @@ QString AWJsonFormatter::convert(const QVariant &_value) const
     qCDebug(LOG_LIB) << "Convert value" << _value;
 
     // check if _value is string and parse first if required
-    QJsonDocument json = _value.type() == QVariant::String ? QJsonDocument::fromJson(_value.toString().toUtf8())
+    QJsonDocument json = _value.userType() == QMetaType::QString ? QJsonDocument::fromJson(_value.toString().toUtf8())
-                                                           : QJsonDocument::fromVariant(_value);
+                                                                 : QJsonDocument::fromVariant(_value);
     QVariant converted = json.toVariant();
     for (auto &element : m_splittedPath)
         converted = getFromJson(converted, element);
@@ -67,7 +55,7 @@ AWJsonFormatter *AWJsonFormatter::copy(const QString &_fileName, const int _numb
 {
     qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
 
-    auto *item = new AWJsonFormatter(dynamic_cast<QWidget *>(parent()), _fileName);
+    auto item = new AWJsonFormatter(parent(), _fileName);
     AWAbstractFormatter::copyDefaults(item);
     item->setNumber(_number);
     item->setPath(path());
@@ -105,25 +93,34 @@ void AWJsonFormatter::readConfiguration()
 }
 
 
-int AWJsonFormatter::showConfiguration(const QVariant &args)
+int AWJsonFormatter::showConfiguration(QWidget *_parent, const QVariant &args)
 {
     Q_UNUSED(args)
 
+    auto dialog = new QDialog(_parent);
+    auto ui = new Ui::AWJsonFormatter();
+    ui->setupUi(dialog);
+    translate(ui);
+
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
     ui->label_typeValue->setText("Json");
     ui->lineEdit_path->setText(path());
 
-    int ret = exec();
+    auto ret = dialog->exec();
-    if (ret != 1)
+    if (ret == 1) {
-        return ret;
+        setName(ui->lineEdit_name->text());
-    setName(ui->lineEdit_name->text());
+        setComment(ui->lineEdit_comment->text());
-    setComment(ui->lineEdit_comment->text());
+        setApiVersion(AW_FORMATTER_API);
-    setApiVersion(AW_FORMATTER_API);
+        setStrType(ui->label_typeValue->text());
-    setStrType(ui->label_typeValue->text());
+        setPath(ui->lineEdit_path->text());
-    setPath(ui->lineEdit_path->text());
+
+        writeConfiguration();
+    }
+
+    dialog->deleteLater();
+    delete ui;
 
-    writeConfiguration();
     return ret;
 }
 
@@ -147,9 +144,9 @@ QVariant AWJsonFormatter::getFromJson(const QVariant &_value, const QVariant &_e
 {
     qCDebug(LOG_LIB) << "Looking for element" << _element << "in" << _value;
 
-    if (_element.type() == QVariant::String) {
+    if (_element.userType() == QMetaType::QString) {
         return getFromMap(_value, _element.toString());
-    } else if (_element.type() == QVariant::Int) {
+    } else if (_element.userType() == QMetaType::Int) {
         return getFromList(_value, _element.toInt());
     } else {
         qCWarning(LOG_LIB) << "Unknown type" << _element.typeName();
@@ -187,8 +184,10 @@ void AWJsonFormatter::initPath()
 }
 
 
-void AWJsonFormatter::translate()
+void AWJsonFormatter::translate(void *_ui)
 {
+    auto ui = reinterpret_cast<Ui::AWJsonFormatter *>(_ui);
+
     ui->label_name->setText(i18n("Name"));
     ui->label_comment->setText(i18n("Comment"));
     ui->label_type->setText(i18n("Type"));

sources/awesomewidgets/awjsonformatter.h

@@ -21,19 +21,13 @@
 #include "awabstractformatter.h"
 
 
-namespace Ui
-{
-class AWJsonFormatter;
-}
-
 class AWJsonFormatter : public AWAbstractFormatter
 {
     Q_OBJECT
     Q_PROPERTY(QString path READ path WRITE setPath)
 
 public:
-    explicit AWJsonFormatter(QWidget *_parent = nullptr, const QString &_filePath = "");
+    explicit AWJsonFormatter(QObject *_parent = nullptr, const QString &_filePath = "");
-    ~AWJsonFormatter() override;
     [[nodiscard]] QString convert(const QVariant &_value) const override;
     AWJsonFormatter *copy(const QString &_fileName, int _number) override;
     // properties
@@ -42,16 +36,15 @@ public:
 
 public slots:
     void readConfiguration() override;
-    int showConfiguration(const QVariant &_args) override;
+    int showConfiguration(QWidget *_parent, const QVariant &_args) override;
     void writeConfiguration() const override;
 
 private:
-    Ui::AWJsonFormatter *ui = nullptr;
     static QVariant getFromJson(const QVariant &_value, const QVariant &_element);
     static QVariant getFromList(const QVariant &_value, int _index);
     static QVariant getFromMap(const QVariant &_value, const QString &_key);
     void initPath();
-    void translate() override;
+    void translate(void *_ui) override;
     // properties
     QString m_path;
     QVariantList m_splittedPath;

sources/awesomewidgets/awlistformatter.cpp

@@ -15,7 +15,6 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
 #include "awlistformatter.h"
 #include "ui_awlistformatter.h"
 
@@ -26,24 +25,13 @@
 #include "awdebug.h"
 
 
-AWListFormatter::AWListFormatter(QWidget *_parent, const QString &_filePath)
+AWListFormatter::AWListFormatter(QObject *_parent, const QString &_filePath)
     : AWAbstractFormatter(_parent, _filePath)
-    , ui(new Ui::AWListFormatter)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
     if (!_filePath.isEmpty())
         AWListFormatter::readConfiguration();
-    ui->setupUi(this);
-    AWListFormatter::translate();
-}
-
-
-AWListFormatter::~AWListFormatter()
-{
-    qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
-
-    delete ui;
 }
 
 
@@ -51,7 +39,7 @@ QString AWListFormatter::convert(const QVariant &_value) const
 {
     qCDebug(LOG_LIB) << "Convert value" << _value;
 
-    QStringList output = _value.toStringList();
+    auto output = _value.toStringList();
     if (isSorted())
         output.sort();
 
@@ -63,7 +51,7 @@ AWListFormatter *AWListFormatter::copy(const QString &_fileName, const int _numb
 {
     qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
 
-    auto *item = new AWListFormatter(dynamic_cast<QWidget *>(parent()), _fileName);
+    auto item = new AWListFormatter(parent(), _fileName);
     AWAbstractFormatter::copyDefaults(item);
     item->setFilter(filter());
     item->setSeparator(separator());
@@ -97,7 +85,7 @@ void AWListFormatter::setFilter(const QString &_filter)
     qCDebug(LOG_LIB) << "Filter" << _filter;
 
     m_filter = _filter;
-    m_regex = QRegExp(m_filter);
+    m_regex = QRegularExpression(m_filter);
 }
 
 
@@ -133,10 +121,15 @@ void AWListFormatter::readConfiguration()
 }
 
 
-int AWListFormatter::showConfiguration(const QVariant &_args)
+int AWListFormatter::showConfiguration(QWidget *_parent, const QVariant &_args)
 {
     Q_UNUSED(_args)
 
+    auto dialog = new QDialog(_parent);
+    auto ui = new Ui::AWListFormatter();
+    ui->setupUi(dialog);
+    translate(ui);
+
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
     ui->label_typeValue->setText("List");
@@ -144,18 +137,22 @@ int AWListFormatter::showConfiguration(const QVariant &_args)
     ui->lineEdit_separator->setText(separator());
     ui->checkBox_sorted->setCheckState(isSorted() ? Qt::Checked : Qt::Unchecked);
 
-    int ret = exec();
+    auto ret = dialog->exec();
-    if (ret != 1)
+    if (ret == 1) {
-        return ret;
+        setName(ui->lineEdit_name->text());
-    setName(ui->lineEdit_name->text());
+        setComment(ui->lineEdit_comment->text());
-    setComment(ui->lineEdit_comment->text());
+        setApiVersion(AW_FORMATTER_API);
-    setApiVersion(AW_FORMATTER_API);
+        setStrType(ui->label_typeValue->text());
-    setStrType(ui->label_typeValue->text());
+        setFilter(ui->lineEdit_filter->text());
-    setFilter(ui->lineEdit_filter->text());
+        setSeparator(ui->lineEdit_separator->text());
-    setSeparator(ui->lineEdit_separator->text());
+        setSorted(ui->checkBox_sorted->checkState() == Qt::Checked);
-    setSorted(ui->checkBox_sorted->checkState() == Qt::Checked);
+
+        writeConfiguration();
+    }
+
+    dialog->deleteLater();
+    delete ui;
 
-    writeConfiguration();
     return ret;
 }
 
@@ -177,8 +174,10 @@ void AWListFormatter::writeConfiguration() const
 }
 
 
-void AWListFormatter::translate()
+void AWListFormatter::translate(void *_ui)
 {
+    auto ui = reinterpret_cast<Ui::AWListFormatter *>(_ui);
+
     ui->label_name->setText(i18n("Name"));
     ui->label_comment->setText(i18n("Comment"));
     ui->label_type->setText(i18n("Type"));

sources/awesomewidgets/awlistformatter.h

@@ -21,11 +21,6 @@
 #include "awabstractformatter.h"
 
 
-namespace Ui
-{
-class AWListFormatter;
-}
-
 class AWListFormatter : public AWAbstractFormatter
 {
     Q_OBJECT
@@ -34,8 +29,7 @@ class AWListFormatter : public AWAbstractFormatter
     Q_PROPERTY(bool sorted READ isSorted WRITE setSorted)
 
 public:
-    explicit AWListFormatter(QWidget *_parent = nullptr, const QString &_filePath = "");
+    explicit AWListFormatter(QObject *_parent = nullptr, const QString &_filePath = "");
-    ~AWListFormatter() override;
     [[nodiscard]] QString convert(const QVariant &_value) const override;
     AWListFormatter *copy(const QString &_fileName, int _number) override;
     // properties
@@ -48,17 +42,16 @@ public:
 
 public slots:
     void readConfiguration() override;
-    int showConfiguration(const QVariant &_args) override;
+    int showConfiguration(QWidget *_parent, const QVariant &_args) override;
     void writeConfiguration() const override;
 
 private:
-    Ui::AWListFormatter *ui = nullptr;
+    void translate(void *_ui) override;
-    void translate() override;
     // properties
     QString m_filter = "";
     QString m_separator = "";
     bool m_sorted = false;
-    QRegExp m_regex;
+    QRegularExpression m_regex;
 };
 
 

sources/awesomewidgets/awnoformatter.cpp

@@ -15,7 +15,6 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
 #include "awnoformatter.h"
 #include "ui_awnoformatter.h"
 
@@ -24,24 +23,13 @@
 #include "awdebug.h"
 
 
-AWNoFormatter::AWNoFormatter(QWidget *_parent, const QString &_filePath)
+AWNoFormatter::AWNoFormatter(QObject *_parent, const QString &_filePath)
     : AWAbstractFormatter(_parent, _filePath)
-    , ui(new Ui::AWNoFormatter)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
     if (!_filePath.isEmpty())
         AWNoFormatter::readConfiguration();
-    ui->setupUi(this);
-    AWNoFormatter::translate();
-}
-
-
-AWNoFormatter::~AWNoFormatter()
-{
-    qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
-
-    delete ui;
 }
 
 
@@ -57,7 +45,7 @@ AWNoFormatter *AWNoFormatter::copy(const QString &_fileName, const int _number)
 {
     qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
 
-    auto *item = new AWNoFormatter(dynamic_cast<QWidget *>(parent()), _fileName);
+    auto item = new AWNoFormatter(parent(), _fileName);
     AWAbstractFormatter::copyDefaults(item);
     item->setNumber(_number);
 
@@ -65,29 +53,40 @@ AWNoFormatter *AWNoFormatter::copy(const QString &_fileName, const int _number)
 }
 
 
-int AWNoFormatter::showConfiguration(const QVariant &_args)
+int AWNoFormatter::showConfiguration(QWidget *_parent, const QVariant &_args)
 {
     Q_UNUSED(_args)
 
+    auto dialog = new QDialog(_parent);
+    auto ui = new Ui::AWNoFormatter();
+    ui->setupUi(dialog);
+    translate(ui);
+
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
     ui->label_typeValue->setText("NoFormat");
 
-    int ret = exec();
+    auto ret = dialog->exec();
-    if (ret != 1)
+    if (ret == 1) {
-        return ret;
+        setName(ui->lineEdit_name->text());
-    setName(ui->lineEdit_name->text());
+        setComment(ui->lineEdit_comment->text());
-    setComment(ui->lineEdit_comment->text());
+        setApiVersion(AW_FORMATTER_API);
-    setApiVersion(AW_FORMATTER_API);
+        setStrType(ui->label_typeValue->text());
-    setStrType(ui->label_typeValue->text());
+
+        writeConfiguration();
+    }
+
+    dialog->deleteLater();
+    delete ui;
 
-    writeConfiguration();
     return ret;
 }
 
 
-void AWNoFormatter::translate()
+void AWNoFormatter::translate(void *_ui)
 {
+    auto ui = reinterpret_cast<Ui::AWNoFormatter *>(_ui);
+
     ui->label_name->setText(i18n("Name"));
     ui->label_comment->setText(i18n("Comment"));
     ui->label_type->setText(i18n("Type"));

sources/awesomewidgets/awnoformatter.h

@@ -21,27 +21,20 @@
 #include "awabstractformatter.h"
 
 
-namespace Ui
-{
-class AWNoFormatter;
-}
-
 class AWNoFormatter : public AWAbstractFormatter
 {
     Q_OBJECT
 
 public:
-    explicit AWNoFormatter(QWidget *_parent = nullptr, const QString &_filePath = "");
+    explicit AWNoFormatter(QObject *_parent = nullptr, const QString &_filePath = "");
-    ~AWNoFormatter() override;
     [[nodiscard]] QString convert(const QVariant &_value) const override;
     AWNoFormatter *copy(const QString &_fileName, int _number) override;
 
 public slots:
-    int showConfiguration(const QVariant &_args) override;
+    int showConfiguration(QWidget *_parent, const QVariant &_args) override;
 
 private:
-    Ui::AWNoFormatter *ui = nullptr;
+    void translate(void *_ui) override;
-    void translate() override;
     // properties
 };
 

sources/awesomewidgets/awscriptformatter.cpp

@@ -15,7 +15,6 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
 #include "awscriptformatter.h"
 #include "ui_awscriptformatter.h"
 
@@ -27,24 +26,13 @@
 #include "awdebug.h"
 
 
-AWScriptFormatter::AWScriptFormatter(QWidget *_parent, const QString &_filePath)
+AWScriptFormatter::AWScriptFormatter(QObject *_parent, const QString &_filePath)
     : AWAbstractFormatter(_parent, _filePath)
-    , ui(new Ui::AWScriptFormatter)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
     if (!_filePath.isEmpty())
         AWScriptFormatter::readConfiguration();
-    ui->setupUi(this);
-    AWScriptFormatter::translate();
-}
-
-
-AWScriptFormatter::~AWScriptFormatter()
-{
-    qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
-
-    delete ui;
 }
 
 
@@ -54,9 +42,8 @@ QString AWScriptFormatter::convert(const QVariant &_value) const
 
     // init engine
     QJSEngine engine;
-    QJSValue fn = engine.evaluate(m_program);
+    auto fn = engine.evaluate(m_program);
-    QJSValueList args = QJSValueList() << _value.toString();
+    auto result = fn.call({_value.toString()});
-    QJSValue result = fn.call(args);
 
     if (result.isError()) {
         qCWarning(LOG_LIB) << "Uncaught exception at line" << result.property("lineNumber").toInt() << ":"
@@ -72,7 +59,7 @@ AWScriptFormatter *AWScriptFormatter::copy(const QString &_fileName, const int _
 {
     qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
 
-    auto *item = new AWScriptFormatter(dynamic_cast<QWidget *>(parent()), _fileName);
+    auto item = new AWScriptFormatter(parent(), _fileName);
     AWAbstractFormatter::copyDefaults(item);
     item->setAppendCode(appendCode());
     item->setCode(code());
@@ -150,10 +137,15 @@ void AWScriptFormatter::readConfiguration()
 }
 
 
-int AWScriptFormatter::showConfiguration(const QVariant &_args)
+int AWScriptFormatter::showConfiguration(QWidget *_parent, const QVariant &_args)
 {
     Q_UNUSED(_args)
 
+    auto dialog = new QDialog(_parent);
+    auto ui = new Ui::AWScriptFormatter();
+    ui->setupUi(dialog);
+    translate(ui);
+
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
     ui->label_typeValue->setText("Script");
@@ -161,19 +153,23 @@ int AWScriptFormatter::showConfiguration(const QVariant &_args)
     ui->checkBox_hasReturn->setCheckState(hasReturn() ? Qt::Checked : Qt::Unchecked);
     ui->textEdit_code->setPlainText(code());
 
-    int ret = exec();
+    int ret = dialog->exec();
-    if (ret != 1)
+    if (ret == 1) {
-        return ret;
+        setName(ui->lineEdit_name->text());
-    setName(ui->lineEdit_name->text());
+        setComment(ui->lineEdit_comment->text());
-    setComment(ui->lineEdit_comment->text());
+        setApiVersion(AW_FORMATTER_API);
-    setApiVersion(AW_FORMATTER_API);
+        setStrType(ui->label_typeValue->text());
-    setStrType(ui->label_typeValue->text());
+        setAppendCode(ui->checkBox_appendCode->checkState() == Qt::Checked);
-    setAppendCode(ui->checkBox_appendCode->checkState() == Qt::Checked);
+        setHasReturn(ui->checkBox_hasReturn->checkState() == Qt::Checked);
-    setHasReturn(ui->checkBox_hasReturn->checkState() == Qt::Checked);
+        setCode(ui->textEdit_code->toPlainText());
-    setCode(ui->textEdit_code->toPlainText());
+        initProgram();
-    initProgram();
+
+        writeConfiguration();
+    }
+
+    dialog->deleteLater();
+    delete ui;
 
-    writeConfiguration();
     return ret;
 }
 
@@ -199,7 +195,7 @@ void AWScriptFormatter::initProgram()
 {
     // init JS code
     if (appendCode())
-        m_program = QString("(function(value) { %1%2 })").arg(code()).arg(hasReturn() ? "" : "; return output;");
+        m_program = QString("(function(value) { %1%2 })").arg(code(), hasReturn() ? "" : "; return output;");
     else
         m_program = code();
 
@@ -207,8 +203,10 @@ void AWScriptFormatter::initProgram()
 }
 
 
-void AWScriptFormatter::translate()
+void AWScriptFormatter::translate(void *_ui)
 {
+    auto ui = reinterpret_cast<Ui::AWScriptFormatter *>(_ui);
+
     ui->label_name->setText(i18n("Name"));
     ui->label_comment->setText(i18n("Comment"));
     ui->label_type->setText(i18n("Type"));

sources/awesomewidgets/awscriptformatter.h

@@ -21,11 +21,6 @@
 #include "awabstractformatter.h"
 
 
-namespace Ui
-{
-class AWScriptFormatter;
-}
-
 class AWScriptFormatter : public AWAbstractFormatter
 {
     Q_OBJECT
@@ -35,8 +30,7 @@ class AWScriptFormatter : public AWAbstractFormatter
     Q_PROPERTY(QString program READ program)
 
 public:
-    explicit AWScriptFormatter(QWidget *_parent = nullptr, const QString &_filePath = "");
+    explicit AWScriptFormatter(QObject *_parent = nullptr, const QString &_filePath = "");
-    ~AWScriptFormatter() override;
     [[nodiscard]] QString convert(const QVariant &_value) const override;
     AWScriptFormatter *copy(const QString &_fileName, int _number) override;
     // properties
@@ -50,13 +44,12 @@ public:
 
 public slots:
     void readConfiguration() override;
-    int showConfiguration(const QVariant &_args) override;
+    int showConfiguration(QWidget *_parent, const QVariant &_args) override;
     void writeConfiguration() const override;
 
 private:
-    Ui::AWScriptFormatter *ui = nullptr;
     void initProgram();
-    void translate() override;
+    void translate(void *_ui) override;
     // properties
     bool m_appendCode = true;
     QString m_code = "";

sources/awesomewidgets/awstringformatter.cpp

@@ -15,7 +15,6 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
 #include "awstringformatter.h"
 #include "ui_awstringformatter.h"
 
@@ -26,24 +25,13 @@
 #include "awdebug.h"
 
 
-AWStringFormatter::AWStringFormatter(QWidget *_parent, const QString &_filePath)
+AWStringFormatter::AWStringFormatter(QObject *_parent, const QString &_filePath)
     : AWAbstractFormatter(_parent, _filePath)
-    , ui(new Ui::AWStringFormatter)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
     if (!_filePath.isEmpty())
         AWStringFormatter::readConfiguration();
-    ui->setupUi(this);
-    AWStringFormatter::translate();
-}
-
-
-AWStringFormatter::~AWStringFormatter()
-{
-    qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
-
-    delete ui;
 }
 
 
@@ -51,7 +39,7 @@ QString AWStringFormatter::convert(const QVariant &_value) const
 {
     qCDebug(LOG_LIB) << "Convert value" << _value;
 
-    QString output = QString("%1").arg(_value.toString(), count(), fillChar());
+    auto output = QString("%1").arg(_value.toString(), count(), fillChar());
     if (forceWidth())
         output = output.left(count());
 
@@ -63,7 +51,7 @@ AWStringFormatter *AWStringFormatter::copy(const QString &_fileName, const int _
 {
     qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
 
-    auto *item = new AWStringFormatter(dynamic_cast<QWidget *>(parent()), _fileName);
+    auto item = new AWStringFormatter(parent(), _fileName);
     AWAbstractFormatter::copyDefaults(item);
     item->setCount(count());
     item->setFillChar(fillChar());
@@ -132,10 +120,15 @@ void AWStringFormatter::readConfiguration()
 }
 
 
-int AWStringFormatter::showConfiguration(const QVariant &_args)
+int AWStringFormatter::showConfiguration(QWidget *_parent, const QVariant &_args)
 {
     Q_UNUSED(_args)
 
+    auto dialog = new QDialog(_parent);
+    auto ui = new Ui::AWStringFormatter();
+    ui->setupUi(dialog);
+    translate(ui);
+
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
     ui->label_typeValue->setText("String");
@@ -143,18 +136,22 @@ int AWStringFormatter::showConfiguration(const QVariant &_args)
     ui->lineEdit_fill->setText(QString(fillChar()));
     ui->checkBox_forceWidth->setCheckState(forceWidth() ? Qt::Checked : Qt::Unchecked);
 
-    int ret = exec();
+    auto ret = dialog->exec();
-    if (ret != 1)
+    if (ret == 1) {
-        return ret;
+        setName(ui->lineEdit_name->text());
-    setName(ui->lineEdit_name->text());
+        setComment(ui->lineEdit_comment->text());
-    setComment(ui->lineEdit_comment->text());
+        setApiVersion(AW_FORMATTER_API);
-    setApiVersion(AW_FORMATTER_API);
+        setStrType(ui->label_typeValue->text());
-    setStrType(ui->label_typeValue->text());
+        setCount(ui->spinBox_width->value());
-    setCount(ui->spinBox_width->value());
+        setFillChar(ui->lineEdit_fill->text().at(0));
-    setFillChar(ui->lineEdit_fill->text().at(0));
+        setForceWidth(ui->checkBox_forceWidth->checkState() == Qt::Checked);
-    setForceWidth(ui->checkBox_forceWidth->checkState() == Qt::Checked);
+
+        writeConfiguration();
+    }
+
+    dialog->deleteLater();
+    delete ui;
 
-    writeConfiguration();
     return ret;
 }
 
@@ -176,8 +173,10 @@ void AWStringFormatter::writeConfiguration() const
 }
 
 
-void AWStringFormatter::translate()
+void AWStringFormatter::translate(void *_ui)
 {
+    auto ui = reinterpret_cast<Ui::AWStringFormatter *>(_ui);
+
     ui->label_name->setText(i18n("Name"));
     ui->label_comment->setText(i18n("Comment"));
     ui->label_type->setText(i18n("Type"));

sources/awesomewidgets/awstringformatter.h

@@ -21,11 +21,6 @@
 #include "awabstractformatter.h"
 
 
-namespace Ui
-{
-class AWStringFormatter;
-}
-
 class AWStringFormatter : public AWAbstractFormatter
 {
     Q_OBJECT
@@ -34,8 +29,7 @@ class AWStringFormatter : public AWAbstractFormatter
     Q_PROPERTY(bool forceWidth READ forceWidth WRITE setForceWidth)
 
 public:
-    explicit AWStringFormatter(QWidget *_parent = nullptr, const QString &_filePath = "");
+    explicit AWStringFormatter(QObject *_parent = nullptr, const QString &_filePath = "");
-    ~AWStringFormatter() override;
     [[nodiscard]] QString convert(const QVariant &_value) const override;
     AWStringFormatter *copy(const QString &_fileName, int _number) override;
     // properties
@@ -48,12 +42,11 @@ public:
 
 public slots:
     void readConfiguration() override;
-    int showConfiguration(const QVariant &_args) override;
+    int showConfiguration(QWidget *_parent, const QVariant &_args) override;
     void writeConfiguration() const override;
 
 private:
-    Ui::AWStringFormatter *ui = nullptr;
+    void translate(void *_ui) override;
-    void translate() override;
     // properties
     int m_count = 0;
     QChar m_fillChar = QChar();

sources/awesomewidgets/extitemaggregator.h

@@ -31,7 +31,7 @@
 template <class T> class ExtItemAggregator : public AbstractExtItemAggregator
 {
 public:
-    explicit ExtItemAggregator(QWidget *_parent, const QString &_type)
+    explicit ExtItemAggregator(QObject *_parent, const QString &_type)
         : AbstractExtItemAggregator(_parent, _type)
     {
         qSetMessagePattern(AWDebug::LOG_FORMAT);
@@ -56,8 +56,7 @@ public:
 
     void editItems()
     {
-        repaintList();
+        auto ret = exec();
-        int ret = exec();
         qCInfo(LOG_LIB) << "Dialog returns" << ret;
     };
 
@@ -123,7 +122,7 @@ private:
     QList<AbstractExtItem *> m_items;
     QList<T *> m_activeItems;
 
-    void doCreateItem() override { return createItem<T>(); }
+    void doCreateItem(QListWidget *_widget) override { return createItem<T>(_widget); }
 
     QList<AbstractExtItem *> getItems()
     {
@@ -137,7 +136,7 @@ private:
                 if (!file.endsWith(".desktop"))
                     continue;
                 qCInfo(LOG_LIB) << "Found file" << file << "in" << dir;
-                QString filePath = QString("%1/%2").arg(dir).arg(file);
+                auto filePath = QString("%1/%2").arg(dir, file);
                 // check if already exists
                 if (std::any_of(items.cbegin(), items.cend(),
                                 [&filePath](AbstractExtItem *item) { return (item->fileName() == filePath); }))
@@ -147,8 +146,7 @@ private:
         }
 
         // sort items
-        std::sort(items.begin(), items.end(),
+        std::sort(items.begin(), items.end(), [](auto *lhs, auto *rhs) { return lhs->number() < rhs->number(); });
-                  [](const AbstractExtItem *lhs, const AbstractExtItem *rhs) { return lhs->number() < rhs->number(); });
         return items;
     };
 };

sources/awesomewidgets/extnetworkrequest.cpp

@@ -20,25 +20,20 @@
 
 #include <KI18n/KLocalizedString>
 
-#include <QDir>
 #include <QSettings>
-#include <QTextCodec>
 
 #include <qreplytimeout/qreplytimeout.h>
 
 #include "awdebug.h"
 
 
-ExtNetworkRequest::ExtNetworkRequest(QWidget *_parent, const QString &_filePath)
+ExtNetworkRequest::ExtNetworkRequest(QObject *_parent, const QString &_filePath)
     : AbstractExtItem(_parent, _filePath)
-    , ui(new Ui::ExtNetworkRequest)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
     if (!_filePath.isEmpty())
         ExtNetworkRequest::readConfiguration();
-    ui->setupUi(this);
-    ExtNetworkRequest::translate();
 
     m_values[tag("response")] = "";
 
@@ -59,7 +54,6 @@ ExtNetworkRequest::~ExtNetworkRequest()
     disconnect(this, SIGNAL(requestDataUpdate()), this, SLOT(sendRequest()));
 
     m_manager->deleteLater();
-    delete ui;
 }
 
 
@@ -67,7 +61,7 @@ ExtNetworkRequest *ExtNetworkRequest::copy(const QString &_fileName, const int _
 {
     qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
 
-    auto *item = new ExtNetworkRequest(dynamic_cast<QWidget *>(parent()), _fileName);
+    auto item = new ExtNetworkRequest(parent(), _fileName);
     copyDefaults(item);
     item->setNumber(_number);
     item->setStringUrl(stringUrl());
@@ -121,10 +115,15 @@ QVariantHash ExtNetworkRequest::run()
 }
 
 
-int ExtNetworkRequest::showConfiguration(const QVariant &_args)
+int ExtNetworkRequest::showConfiguration(QWidget *_parent, const QVariant &_args)
 {
     Q_UNUSED(_args)
 
+    auto dialog = new QDialog(_parent);
+    auto ui = new Ui::ExtNetworkRequest();
+    ui->setupUi(dialog);
+    translate(ui);
+
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
     ui->label_numberValue->setText(QString("%1").arg(number()));
@@ -134,20 +133,24 @@ int ExtNetworkRequest::showConfiguration(const QVariant &_args)
     ui->lineEdit_socket->setText(socket());
     ui->spinBox_interval->setValue(interval());
 
-    int ret = exec();
+    auto ret = dialog->exec();
-    if (ret != 1)
+    if (ret == 1) {
-        return ret;
+        setName(ui->lineEdit_name->text());
-    setName(ui->lineEdit_name->text());
+        setComment(ui->lineEdit_comment->text());
-    setComment(ui->lineEdit_comment->text());
+        setNumber(ui->label_numberValue->text().toInt());
-    setNumber(ui->label_numberValue->text().toInt());
+        setApiVersion(AW_EXTNETREQUEST_API);
-    setApiVersion(AW_EXTNETREQUEST_API);
+        setStringUrl(ui->lineEdit_url->text());
-    setStringUrl(ui->lineEdit_url->text());
+        setActive(ui->checkBox_active->checkState() == Qt::Checked);
-    setActive(ui->checkBox_active->checkState() == Qt::Checked);
+        setCron(ui->lineEdit_schedule->text());
-    setCron(ui->lineEdit_schedule->text());
+        setSocket(ui->lineEdit_socket->text());
-    setSocket(ui->lineEdit_socket->text());
+        setInterval(ui->spinBox_interval->value());
-    setInterval(ui->spinBox_interval->value());
+
+        writeConfiguration();
+    }
+
+    dialog->deleteLater();
+    delete ui;
 
-    writeConfiguration();
     return ret;
 }
 
@@ -174,7 +177,7 @@ void ExtNetworkRequest::networkReplyReceived(QNetworkReply *_reply)
     }
 
     m_isRunning = false;
-    m_values[tag("response")] = QTextCodec::codecForMib(106)->toUnicode(_reply->readAll()).trimmed();
+    m_values[tag("response")] = QString::fromUtf8(_reply->readAll()).trimmed();
 
     emit(dataReceived(m_values));
 }
@@ -183,7 +186,7 @@ void ExtNetworkRequest::networkReplyReceived(QNetworkReply *_reply)
 void ExtNetworkRequest::sendRequest()
 {
     m_isRunning = true;
-    QNetworkReply *reply = m_manager->get(QNetworkRequest(m_url));
+    auto reply = m_manager->get(QNetworkRequest(m_url));
     new QReplyTimeout(reply, REQUEST_TIMEOUT);
 }
 
@@ -194,8 +197,10 @@ void ExtNetworkRequest::initUrl()
 }
 
 
-void ExtNetworkRequest::translate()
+void ExtNetworkRequest::translate(void *_ui)
 {
+    auto ui = reinterpret_cast<Ui::ExtNetworkRequest *>(_ui);
+
     ui->label_name->setText(i18n("Name"));
     ui->label_comment->setText(i18n("Comment"));
     ui->label_number->setText(i18n("Tag"));

sources/awesomewidgets/extnetworkrequest.h

@@ -23,18 +23,13 @@
 #include "abstractextitem.h"
 
 
-namespace Ui
-{
-class ExtNetworkRequest;
-}
-
 class ExtNetworkRequest : public AbstractExtItem
 {
     Q_OBJECT
     Q_PROPERTY(QString stringUrl READ stringUrl WRITE setStringUrl)
 
 public:
-    explicit ExtNetworkRequest(QWidget *_parent = nullptr, const QString &_filePath = "");
+    explicit ExtNetworkRequest(QObject *_parent = nullptr, const QString &_filePath = "");
     ~ExtNetworkRequest() override;
     ExtNetworkRequest *copy(const QString &_fileName, int _number) override;
     // get methods
@@ -46,7 +41,7 @@ public:
 public slots:
     void readConfiguration() override;
     QVariantHash run() override;
-    int showConfiguration(const QVariant &_args) override;
+    int showConfiguration(QWidget *_parent, const QVariant &_args) override;
     void writeConfiguration() const override;
 
 private slots:
@@ -57,9 +52,8 @@ private:
     QNetworkAccessManager *m_manager = nullptr;
     QUrl m_url;
     bool m_isRunning = false;
-    Ui::ExtNetworkRequest *ui = nullptr;
     void initUrl();
-    void translate() override;
+    void translate(void *_ui) override;
     // properties
     QString m_stringUrl = "https://httpbin.org/get";
     // values

sources/awesomewidgets/extquotes.cpp

@@ -20,7 +20,6 @@
 
 #include <KI18n/KLocalizedString>
 
-#include <QDir>
 #include <QSettings>
 
 #include <qreplytimeout/qreplytimeout.h>
@@ -29,16 +28,13 @@
 #include "stooqquotesprovider.h"
 
 
-ExtQuotes::ExtQuotes(QWidget *_parent, const QString &_filePath)
+ExtQuotes::ExtQuotes(QObject *_parent, const QString &_filePath)
     : AbstractExtItem(_parent, _filePath)
-    , ui(new Ui::ExtQuotes)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
     if (!_filePath.isEmpty())
         ExtQuotes::readConfiguration();
-    ui->setupUi(this);
-    ExtQuotes::translate();
 
     m_values[tag("price")] = 0.0;
     m_values[tag("pricechg")] = 0.0;
@@ -64,7 +60,6 @@ ExtQuotes::~ExtQuotes()
     disconnect(this, SIGNAL(requestDataUpdate()), this, SLOT(sendRequest()));
 
     m_manager->deleteLater();
-    delete ui;
 }
 
 
@@ -72,7 +67,7 @@ ExtQuotes *ExtQuotes::copy(const QString &_fileName, const int _number)
 {
     qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
 
-    auto *item = new ExtQuotes(dynamic_cast<QWidget *>(parent()), _fileName);
+    auto item = new ExtQuotes(parent(), _fileName);
     copyDefaults(item);
     item->setNumber(_number);
     item->setTicker(ticker());
@@ -126,10 +121,15 @@ QVariantHash ExtQuotes::run()
 }
 
 
-int ExtQuotes::showConfiguration(const QVariant &_args)
+int ExtQuotes::showConfiguration(QWidget *_parent, const QVariant &_args)
 {
     Q_UNUSED(_args)
 
+    auto dialog = new QDialog(_parent);
+    auto ui = new Ui::ExtQuotes();
+    ui->setupUi(dialog);
+    translate(ui);
+
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
     ui->label_numberValue->setText(QString("%1").arg(number()));
@@ -139,20 +139,24 @@ int ExtQuotes::showConfiguration(const QVariant &_args)
     ui->lineEdit_socket->setText(socket());
     ui->spinBox_interval->setValue(interval());
 
-    int ret = exec();
+    auto ret = dialog->exec();
-    if (ret != 1)
+    if (ret == 1) {
-        return ret;
+        setName(ui->lineEdit_name->text());
-    setName(ui->lineEdit_name->text());
+        setComment(ui->lineEdit_comment->text());
-    setComment(ui->lineEdit_comment->text());
+        setNumber(ui->label_numberValue->text().toInt());
-    setNumber(ui->label_numberValue->text().toInt());
+        setApiVersion(AW_EXTQUOTES_API);
-    setApiVersion(AW_EXTQUOTES_API);
+        setTicker(ui->lineEdit_ticker->text());
-    setTicker(ui->lineEdit_ticker->text());
+        setActive(ui->checkBox_active->checkState() == Qt::Checked);
-    setActive(ui->checkBox_active->checkState() == Qt::Checked);
+        setCron(ui->lineEdit_schedule->text());
-    setCron(ui->lineEdit_schedule->text());
+        setSocket(ui->lineEdit_socket->text());
-    setSocket(ui->lineEdit_socket->text());
+        setInterval(ui->spinBox_interval->value());
-    setInterval(ui->spinBox_interval->value());
+
+        writeConfiguration();
+    }
+
+    dialog->deleteLater();
+    delete ui;
 
-    writeConfiguration();
     return ret;
 }
 
@@ -182,7 +186,7 @@ void ExtQuotes::quotesReplyReceived(QNetworkReply *_reply)
     auto text = _reply->readAll();
     _reply->deleteLater();
 
-    QVariantHash data = m_providerObject->parse(text, m_values);
+    auto data = m_providerObject->parse(text, m_values);
     if (data.isEmpty())
         return;
     m_values = data;
@@ -194,7 +198,7 @@ void ExtQuotes::quotesReplyReceived(QNetworkReply *_reply)
 void ExtQuotes::sendRequest()
 {
     m_isRunning = true;
-    QNetworkReply *reply = m_manager->get(QNetworkRequest(m_providerObject->url()));
+    auto reply = m_manager->get(QNetworkRequest(m_providerObject->url()));
     new QReplyTimeout(reply, REQUEST_TIMEOUT);
 }
 
@@ -210,8 +214,10 @@ void ExtQuotes::initProvider()
 }
 
 
-void ExtQuotes::translate()
+void ExtQuotes::translate(void *_ui)
 {
+    auto ui = reinterpret_cast<Ui::ExtQuotes *>(_ui);
+
     ui->label_name->setText(i18n("Name"));
     ui->label_comment->setText(i18n("Comment"));
     ui->label_number->setText(i18n("Tag"));

sources/awesomewidgets/extquotes.h

@@ -24,10 +24,6 @@
 
 
 class AbstractQuotesProvider;
-namespace Ui
-{
-class ExtQuotes;
-}
 
 class ExtQuotes : public AbstractExtItem
 {
@@ -35,7 +31,7 @@ class ExtQuotes : public AbstractExtItem
     Q_PROPERTY(QString ticker READ ticker WRITE setTicker)
 
 public:
-    explicit ExtQuotes(QWidget *_parent = nullptr, const QString &_filePath = "");
+    explicit ExtQuotes(QObject *_parent = nullptr, const QString &_filePath = "");
     ~ExtQuotes() override;
     ExtQuotes *copy(const QString &_fileName, int _number) override;
     // get methods
@@ -47,7 +43,7 @@ public:
 public slots:
     void readConfiguration() override;
     QVariantHash run() override;
-    int showConfiguration(const QVariant &_args) override;
+    int showConfiguration(QWidget *_parent, const QVariant &_args) override;
     void writeConfiguration() const override;
 
 private slots:
@@ -58,9 +54,8 @@ private:
     AbstractQuotesProvider *m_providerObject = nullptr;
     QNetworkAccessManager *m_manager = nullptr;
     bool m_isRunning = false;
-    Ui::ExtQuotes *ui = nullptr;
     void initProvider();
-    void translate() override;
+    void translate(void *_ui) override;
     // properties
     QString m_ticker = "EURUSD=X";
     // values

sources/awesomewidgets/extscript.cpp

@@ -24,22 +24,18 @@
 #include <QJsonDocument>
 #include <QSettings>
 #include <QStandardPaths>
-#include <QTextCodec>
 
 #include "awdebug.h"
 
 
-ExtScript::ExtScript(QWidget *_parent, const QString &_filePath)
+ExtScript::ExtScript(QObject *_parent, const QString &_filePath)
     : AbstractExtItem(_parent, _filePath)
-    , ui(new Ui::ExtScript)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
     if (!_filePath.isEmpty())
         ExtScript::readConfiguration();
     readJsonFilters();
-    ui->setupUi(this);
-    ExtScript::translate();
 
     m_values[tag("custom")] = "";
 
@@ -59,7 +55,6 @@ ExtScript::~ExtScript()
     m_process->kill();
     m_process->deleteLater();
     disconnect(this, SIGNAL(requestDataUpdate()), this, SLOT(startProcess()));
-    delete ui;
 }
 
 
@@ -67,7 +62,7 @@ ExtScript *ExtScript::copy(const QString &_fileName, const int _number)
 {
     qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
 
-    auto *item = new ExtScript(dynamic_cast<QWidget *>(parent()), _fileName);
+    auto item = new ExtScript(parent(), _fileName);
     copyDefaults(item);
     item->setExecutable(executable());
     item->setNumber(_number);
@@ -180,7 +175,7 @@ QString ExtScript::applyFilters(QString _value) const
 
     for (auto &filt : filters()) {
         qCInfo(LOG_LIB) << "Found filter" << filt;
-        QVariantMap filter = m_jsonFilters[filt].toMap();
+        auto filter = m_jsonFilters[filt].toMap();
         if (filter.isEmpty()) {
             qCWarning(LOG_LIB) << "Could not find filter" << _value << "in the json";
             continue;
@@ -226,7 +221,7 @@ void ExtScript::readConfiguration()
 
 void ExtScript::readJsonFilters()
 {
-    QString fileName = jsonFiltersFile();
+    auto fileName = jsonFiltersFile();
     QFile jsonFile(fileName);
     if (!jsonFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
         qCWarning(LOG_LIB) << "Could not open" << fileName;
@@ -236,7 +231,7 @@ void ExtScript::readJsonFilters()
     jsonFile.close();
 
     QJsonParseError error{};
-    QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonText.toUtf8(), &error);
+    auto jsonDoc = QJsonDocument::fromJson(jsonText.toUtf8(), &error);
     if (error.error != QJsonParseError::NoError) {
         qCWarning(LOG_LIB) << "Parse error" << error.errorString();
         return;
@@ -257,10 +252,15 @@ QVariantHash ExtScript::run()
 }
 
 
-int ExtScript::showConfiguration(const QVariant &_args)
+int ExtScript::showConfiguration(QWidget *_parent, const QVariant &_args)
 {
     Q_UNUSED(_args)
 
+    auto dialog = new QDialog(_parent);
+    auto ui = new Ui::ExtScript();
+    ui->setupUi(dialog);
+    translate(ui);
+
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
     ui->label_numberValue->setText(QString("%1").arg(number()));
@@ -275,25 +275,29 @@ int ExtScript::showConfiguration(const QVariant &_args)
     ui->checkBox_linesFilter->setCheckState(filters().contains("newline") ? Qt::Checked : Qt::Unchecked);
     ui->checkBox_spaceFilter->setCheckState(filters().contains("space") ? Qt::Checked : Qt::Unchecked);
 
-    int ret = exec();
+    int ret = dialog->exec();
-    if (ret != 1)
+    if (ret == 1) {
-        return ret;
+        setName(ui->lineEdit_name->text());
-    setName(ui->lineEdit_name->text());
+        setComment(ui->lineEdit_comment->text());
-    setComment(ui->lineEdit_comment->text());
+        setNumber(ui->label_numberValue->text().toInt());
-    setNumber(ui->label_numberValue->text().toInt());
+        setApiVersion(AW_EXTSCRIPT_API);
-    setApiVersion(AW_EXTSCRIPT_API);
+        setExecutable(ui->lineEdit_command->text());
-    setExecutable(ui->lineEdit_command->text());
+        setActive(ui->checkBox_active->checkState() == Qt::Checked);
-    setActive(ui->checkBox_active->checkState() == Qt::Checked);
+        setRedirect(static_cast<Redirect>(ui->comboBox_redirect->currentIndex()));
-    setRedirect(static_cast<Redirect>(ui->comboBox_redirect->currentIndex()));
+        setCron(ui->lineEdit_schedule->text());
-    setCron(ui->lineEdit_schedule->text());
+        setSocket(ui->lineEdit_socket->text());
-    setSocket(ui->lineEdit_socket->text());
+        setInterval(ui->spinBox_interval->value());
-    setInterval(ui->spinBox_interval->value());
+        // filters
-    // filters
+        updateFilter("color", ui->checkBox_colorFilter->checkState() == Qt::Checked);
-    updateFilter("color", ui->checkBox_colorFilter->checkState() == Qt::Checked);
+        updateFilter("newline", ui->checkBox_linesFilter->checkState() == Qt::Checked);
-    updateFilter("newline", ui->checkBox_linesFilter->checkState() == Qt::Checked);
+        updateFilter("space", ui->checkBox_spaceFilter->checkState() == Qt::Checked);
-    updateFilter("space", ui->checkBox_spaceFilter->checkState() == Qt::Checked);
+
+        writeConfiguration();
+    }
+
+    dialog->deleteLater();
+    delete ui;
 
-    writeConfiguration();
     return ret;
 }
 
@@ -325,9 +329,9 @@ void ExtScript::startProcess()
 void ExtScript::updateValue()
 {
     qCInfo(LOG_LIB) << "Cmd returns" << m_process->exitCode();
-    QString qdebug = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed();
+    auto qdebug = QString::fromUtf8(m_process->readAllStandardError()).trimmed();
     qCInfo(LOG_LIB) << "Error" << qdebug;
-    QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
+    auto qoutput = QString::fromUtf8(m_process->readAllStandardOutput()).trimmed();
     qCInfo(LOG_LIB) << "Output" << qoutput;
     QString strValue;
 
@@ -351,8 +355,10 @@ void ExtScript::updateValue()
 }
 
 
-void ExtScript::translate()
+void ExtScript::translate(void *_ui)
 {
+    auto ui = reinterpret_cast<Ui::ExtScript *>(_ui);
+
     ui->label_name->setText(i18n("Name"));
     ui->label_comment->setText(i18n("Comment"));
     ui->label_number->setText(i18n("Tag"));

sources/awesomewidgets/extscript.h

@@ -23,11 +23,6 @@
 #include "abstractextitem.h"
 
 
-namespace Ui
-{
-class ExtScript;
-}
-
 class ExtScript : public AbstractExtItem
 {
     Q_OBJECT
@@ -38,7 +33,7 @@ class ExtScript : public AbstractExtItem
 public:
     enum class Redirect { stdout2stderr = 0, nothing = 1, stderr2stdout = 2, swap = 3 };
 
-    explicit ExtScript(QWidget *_parent = nullptr, const QString &_filePath = "");
+    explicit ExtScript(QObject *_parent = nullptr, const QString &_filePath = "");
     ~ExtScript() override;
     ExtScript *copy(const QString &_fileName, int _number) override;
     static QString jsonFiltersFile();
@@ -62,7 +57,7 @@ public slots:
     void readConfiguration() override;
     void readJsonFilters();
     QVariantHash run() override;
-    int showConfiguration(const QVariant &_args) override;
+    int showConfiguration(QWidget *_parent, const QVariant &_args) override;
     void writeConfiguration() const override;
 
 private slots:
@@ -71,8 +66,7 @@ private slots:
 
 private:
     QProcess *m_process = nullptr;
-    Ui::ExtScript *ui = nullptr;
+    void translate(void *_ui) override;
-    void translate() override;
     // properties
     QString m_executable = "/usr/bin/true";
     QStringList m_filters = QStringList();

sources/awesomewidgets/extupgrade.cpp

@@ -21,21 +21,17 @@
 #include <KI18n/KLocalizedString>
 
 #include <QSettings>
-#include <QTextCodec>
 
 #include "awdebug.h"
 
 
-ExtUpgrade::ExtUpgrade(QWidget *_parent, const QString &_filePath)
+ExtUpgrade::ExtUpgrade(QObject *_parent, const QString &_filePath)
     : AbstractExtItem(_parent, _filePath)
-    , ui(new Ui::ExtUpgrade)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
     if (!_filePath.isEmpty())
         ExtUpgrade::readConfiguration();
-    ui->setupUi(this);
-    ExtUpgrade::translate();
 
     m_values[tag("pkgcount")] = 0;
 
@@ -54,7 +50,6 @@ ExtUpgrade::~ExtUpgrade()
     m_process->kill();
     m_process->deleteLater();
     disconnect(this, SIGNAL(requestDataUpdate()), this, SLOT(startProcess()));
-    delete ui;
 }
 
 
@@ -62,7 +57,7 @@ ExtUpgrade *ExtUpgrade::copy(const QString &_fileName, const int _number)
 {
     qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
 
-    auto *item = new ExtUpgrade(dynamic_cast<QWidget *>(parent()), _fileName);
+    auto item = new ExtUpgrade(parent(), _fileName);
     copyDefaults(item);
     item->setExecutable(executable());
     item->setFilter(filter());
@@ -150,10 +145,15 @@ QVariantHash ExtUpgrade::run()
 }
 
 
-int ExtUpgrade::showConfiguration(const QVariant &_args)
+int ExtUpgrade::showConfiguration(QWidget *_parent, const QVariant &_args)
 {
     Q_UNUSED(_args)
 
+    auto dialog = new QDialog(_parent);
+    auto ui = new Ui::ExtUpgrade();
+    ui->setupUi(dialog);
+    translate(ui);
+
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
     ui->label_numberValue->setText(QString("%1").arg(number()));
@@ -165,22 +165,26 @@ int ExtUpgrade::showConfiguration(const QVariant &_args)
     ui->lineEdit_socket->setText(socket());
     ui->spinBox_interval->setValue(interval());
 
-    int ret = exec();
+    auto ret = dialog->exec();
-    if (ret != 1)
+    if (ret == 1) {
-        return ret;
+        setName(ui->lineEdit_name->text());
-    setName(ui->lineEdit_name->text());
+        setComment(ui->lineEdit_comment->text());
-    setComment(ui->lineEdit_comment->text());
+        setNumber(ui->label_numberValue->text().toInt());
-    setNumber(ui->label_numberValue->text().toInt());
+        setApiVersion(AW_EXTUPGRADE_API);
-    setApiVersion(AW_EXTUPGRADE_API);
+        setExecutable(ui->lineEdit_command->text());
-    setExecutable(ui->lineEdit_command->text());
+        setFilter(ui->lineEdit_filter->text());
-    setFilter(ui->lineEdit_filter->text());
+        setActive(ui->checkBox_active->checkState() == Qt::Checked);
-    setActive(ui->checkBox_active->checkState() == Qt::Checked);
+        setNull(ui->spinBox_null->value());
-    setNull(ui->spinBox_null->value());
+        setCron(ui->lineEdit_schedule->text());
-    setCron(ui->lineEdit_schedule->text());
+        setSocket(ui->lineEdit_socket->text());
-    setSocket(ui->lineEdit_socket->text());
+        setInterval(ui->spinBox_interval->value());
-    setInterval(ui->spinBox_interval->value());
+
+        writeConfiguration();
+    }
+
+    dialog->deleteLater();
+    delete ui;
 
-    writeConfiguration();
     return ret;
 }
 
@@ -214,18 +218,20 @@ void ExtUpgrade::updateValue()
     qCInfo(LOG_LIB) << "Cmd returns" << m_process->exitCode();
     qCInfo(LOG_LIB) << "Error" << m_process->readAllStandardError();
 
-    QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
+    auto qoutput = QString::fromUtf8(m_process->readAllStandardOutput()).trimmed();
     m_values[tag("pkgcount")] = [this](const QString &output) {
         return filter().isEmpty() ? output.split('\n', Qt::SkipEmptyParts).count() - null()
-                                  : output.split('\n', Qt::SkipEmptyParts).filter(QRegExp(filter())).count();
+                                  : output.split('\n', Qt::SkipEmptyParts).filter(QRegularExpression(filter())).count();
     }(qoutput);
 
     emit(dataReceived(m_values));
 }
 
 
-void ExtUpgrade::translate()
+void ExtUpgrade::translate(void *_ui)
 {
+    auto ui = reinterpret_cast<Ui::ExtUpgrade *>(_ui);
+
     ui->label_name->setText(i18n("Name"));
     ui->label_comment->setText(i18n("Comment"));
     ui->label_number->setText(i18n("Tag"));

sources/awesomewidgets/extupgrade.h

@@ -23,11 +23,6 @@
 #include "abstractextitem.h"
 
 
-namespace Ui
-{
-class ExtUpgrade;
-}
-
 class ExtUpgrade : public AbstractExtItem
 {
     Q_OBJECT
@@ -36,7 +31,7 @@ class ExtUpgrade : public AbstractExtItem
     Q_PROPERTY(int null READ null WRITE setNull)
 
 public:
-    explicit ExtUpgrade(QWidget *_parent = nullptr, const QString &_filePath = "");
+    explicit ExtUpgrade(QObject *_parent = nullptr, const QString &_filePath = "");
     ~ExtUpgrade() override;
     ExtUpgrade *copy(const QString &_fileName, int _number) override;
     // get methods
@@ -52,7 +47,7 @@ public:
 public slots:
     void readConfiguration() override;
     QVariantHash run() override;
-    int showConfiguration(const QVariant &_args) override;
+    int showConfiguration(QWidget *_parent, const QVariant &_args) override;
     void writeConfiguration() const override;
 
 private slots:
@@ -61,8 +56,7 @@ private slots:
 
 private:
     QProcess *m_process = nullptr;
-    Ui::ExtUpgrade *ui = nullptr;
+    void translate(void *_ui) override;
-    void translate() override;
     // properties
     QString m_executable = "/usr/bin/true";
     QString m_filter = "";

sources/awesomewidgets/extweather.cpp

@@ -29,20 +29,16 @@
 
 #include "awdebug.h"
 #include "owmweatherprovider.h"
-#include "yahooweatherprovider.h"
 
 
-ExtWeather::ExtWeather(QWidget *_parent, const QString &_filePath)
+ExtWeather::ExtWeather(QObject *_parent, const QString &_filePath)
     : AbstractExtItem(_parent, _filePath)
-    , ui(new Ui::ExtWeather)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
     if (!_filePath.isEmpty())
         ExtWeather::readConfiguration();
     readJsonMap();
-    ui->setupUi(this);
-    ExtWeather::translate();
 
     m_values[tag("weatherId")] = 0;
     m_values[tag("weather")] = "";
@@ -67,7 +63,6 @@ ExtWeather::~ExtWeather()
     disconnect(this, SIGNAL(requestDataUpdate()), this, SLOT(sendRequest()));
 
     m_manager->deleteLater();
-    delete ui;
 }
 
 
@@ -75,7 +70,7 @@ ExtWeather *ExtWeather::copy(const QString &_fileName, const int _number)
 {
     qCDebug(LOG_LIB) << "File" << _fileName << "number" << _number;
 
-    auto *item = new ExtWeather(dynamic_cast<QWidget *>(parent()), _fileName);
+    auto item = new ExtWeather(parent(), _fileName);
     copyDefaults(item);
     item->setCity(city());
     item->setCountry(country());
@@ -102,7 +97,7 @@ QString ExtWeather::weatherFromInt(const int _id) const
 {
     qCDebug(LOG_LIB) << "Weather ID" << _id;
 
-    QVariantMap map = m_jsonMap[m_image ? "image" : "text"].toMap();
+    auto map = m_jsonMap[m_image ? "image" : "text"].toMap();
     return map.value(QString::number(_id), map["default"]).toString();
 }
 
@@ -236,7 +231,7 @@ void ExtWeather::readConfiguration()
 
 void ExtWeather::readJsonMap()
 {
-    QString fileName = jsonMapFile();
+    auto fileName = jsonMapFile();
     QFile jsonFile(fileName);
     if (!jsonFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
         qCWarning(LOG_LIB) << "Could not open" << fileName;
@@ -246,7 +241,7 @@ void ExtWeather::readJsonMap()
     jsonFile.close();
 
     QJsonParseError error{};
-    QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonText.toUtf8(), &error);
+    auto jsonDoc = QJsonDocument::fromJson(jsonText.toUtf8(), &error);
     if (error.error != QJsonParseError::NoError) {
         qCWarning(LOG_LIB) << "Parse error" << error.errorString();
         return;
@@ -267,10 +262,15 @@ QVariantHash ExtWeather::run()
 }
 
 
-int ExtWeather::showConfiguration(const QVariant &_args)
+int ExtWeather::showConfiguration(QWidget *_parent, const QVariant &_args)
 {
     Q_UNUSED(_args)
 
+    auto dialog = new QDialog(_parent);
+    auto ui = new Ui::ExtWeather();
+    ui->setupUi(dialog);
+    translate(ui);
+
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
     ui->label_numberValue->setText(QString("%1").arg(number()));
@@ -284,24 +284,28 @@ int ExtWeather::showConfiguration(const QVariant &_args)
     ui->lineEdit_socket->setText(socket());
     ui->spinBox_interval->setValue(interval());
 
-    int ret = exec();
+    int ret = dialog->exec();
-    if (ret != 1)
+    if (ret == 1) {
-        return ret;
+        setName(ui->lineEdit_name->text());
-    setName(ui->lineEdit_name->text());
+        setComment(ui->lineEdit_comment->text());
-    setComment(ui->lineEdit_comment->text());
+        setNumber(ui->label_numberValue->text().toInt());
-    setNumber(ui->label_numberValue->text().toInt());
+        setApiVersion(AW_EXTWEATHER_API);
-    setApiVersion(AW_EXTWEATHER_API);
+        setCity(ui->lineEdit_city->text());
-    setCity(ui->lineEdit_city->text());
+        setCountry(ui->lineEdit_country->text());
-    setCountry(ui->lineEdit_country->text());
+        setProvider(static_cast<Provider>(ui->comboBox_provider->currentIndex()));
-    setProvider(static_cast<Provider>(ui->comboBox_provider->currentIndex()));
+        setTs(ui->spinBox_timestamp->value());
-    setTs(ui->spinBox_timestamp->value());
+        setImage(ui->checkBox_image->checkState() == Qt::Checked);
-    setImage(ui->checkBox_image->checkState() == Qt::Checked);
+        setActive(ui->checkBox_active->checkState() == Qt::Checked);
-    setActive(ui->checkBox_active->checkState() == Qt::Checked);
+        setCron(ui->lineEdit_schedule->text());
-    setCron(ui->lineEdit_schedule->text());
+        setSocket(ui->lineEdit_socket->text());
-    setSocket(ui->lineEdit_socket->text());
+        setInterval(ui->spinBox_interval->value());
-    setInterval(ui->spinBox_interval->value());
+
+        writeConfiguration();
+    }
+
+    dialog->deleteLater();
+    delete ui;
 
-    writeConfiguration();
     return ret;
 }
 
@@ -328,7 +332,7 @@ void ExtWeather::writeConfiguration() const
 void ExtWeather::sendRequest()
 {
     m_isRunning = true;
-    QNetworkReply *reply = m_manager->get(QNetworkRequest(m_providerObject->url()));
+    auto reply = m_manager->get(QNetworkRequest(m_providerObject->url()));
     new QReplyTimeout(reply, REQUEST_TIMEOUT);
 }
 
@@ -342,14 +346,14 @@ void ExtWeather::weatherReplyReceived(QNetworkReply *_reply)
 
     m_isRunning = false;
     QJsonParseError error{};
-    QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
+    auto jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
     _reply->deleteLater();
     if (error.error != QJsonParseError::NoError) {
         qCWarning(LOG_LIB) << "Parse error" << error.errorString();
         return;
     }
 
-    QVariantHash data = m_providerObject->parse(jsonDoc.toVariant().toMap());
+    auto data = m_providerObject->parse(jsonDoc.toVariant().toMap());
     if (data.isEmpty())
         return;
     m_values = data;
@@ -370,8 +374,10 @@ void ExtWeather::initProvider()
 }
 
 
-void ExtWeather::translate()
+void ExtWeather::translate(void *_ui)
 {
+    auto ui = reinterpret_cast<Ui::ExtWeather *>(_ui);
+
     ui->label_name->setText(i18n("Name"));
     ui->label_comment->setText(i18n("Comment"));
     ui->label_number->setText(i18n("Tag"));

sources/awesomewidgets/extweather.h

@@ -42,7 +42,7 @@ class ExtWeather : public AbstractExtItem
 public:
     enum class Provider { OWM = 0, Yahoo = 1 };
 
-    explicit ExtWeather(QWidget *_parent = nullptr, const QString &_filePath = "");
+    explicit ExtWeather(QObject *_parent = nullptr, const QString &_filePath = "");
     ~ExtWeather() override;
     ExtWeather *copy(const QString &_fileName, int _number) override;
     static QString jsonMapFile();
@@ -67,7 +67,7 @@ public slots:
     void readConfiguration() override;
     void readJsonMap();
     QVariantHash run() override;
-    int showConfiguration(const QVariant &_args) override;
+    int showConfiguration(QWidget *_parent, const QVariant &_args) override;
     void writeConfiguration() const override;
 
 private slots:
@@ -78,9 +78,8 @@ private:
     AbstractWeatherProvider *m_providerObject = nullptr;
     QNetworkAccessManager *m_manager = nullptr;
     bool m_isRunning = false;
-    Ui::ExtWeather *ui = nullptr;
     void initProvider();
-    void translate() override;
+    void translate(void *_ui) override;
     // properties
     QString m_city = "London";
     QString m_country = "uk";

sources/awesomewidgets/graphicalitem.cpp

@@ -32,9 +32,8 @@
 #include "graphicalitemhelper.h"
 
 
-GraphicalItem::GraphicalItem(QWidget *_parent, const QString &_filePath)
+GraphicalItem::GraphicalItem(QObject *_parent, const QString &_filePath)
     : AbstractExtItem(_parent, _filePath)
-    , ui(new Ui::GraphicalItem)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
@@ -53,21 +52,6 @@ GraphicalItem::GraphicalItem(QWidget *_parent, const QString &_filePath)
 
     if (!_filePath.isEmpty())
         GraphicalItem::readConfiguration();
-    ui->setupUi(this);
-    GraphicalItem::translate();
-
-    connect(ui->checkBox_custom, SIGNAL(stateChanged(int)), this, SLOT(changeValue(int)));
-    connect(ui->comboBox_type, SIGNAL(currentIndexChanged(int)), this, SLOT(changeCountState(int)));
-    connect(ui->toolButton_activeColor, SIGNAL(clicked()), this, SLOT(changeColor()));
-    connect(ui->toolButton_inactiveColor, SIGNAL(clicked()), this, SLOT(changeColor()));
-}
-
-
-GraphicalItem::~GraphicalItem()
-{
-    qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
-
-    delete ui;
 }
 
 
@@ -75,7 +59,7 @@ GraphicalItem *GraphicalItem::copy(const QString &_fileName, const int _number)
 {
     qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
 
-    auto *item = new GraphicalItem(dynamic_cast<QWidget *>(parent()), _fileName);
+    auto item = new GraphicalItem(parent(), _fileName);
     copyDefaults(item);
     item->setActiveColor(activeColor());
     item->setBar(bar());
@@ -100,7 +84,7 @@ QString GraphicalItem::image(const QVariant &value)
 
     m_scene->clear();
     int scale[2] = {1, 1};
-    float converted = GraphicalItemHelper::getPercents(value.toFloat(), minValue(), maxValue());
+    auto converted = GraphicalItemHelper::getPercents(value.toFloat(), minValue(), maxValue());
 
     // paint
     switch (m_type) {
@@ -132,11 +116,11 @@ QString GraphicalItem::image(const QVariant &value)
     }
 
     // convert
-    QPixmap pixmap = m_view->grab().transformed(QTransform().scale(scale[0], scale[1]));
+    auto pixmap = m_view->grab().transformed(QTransform().scale(scale[0], scale[1]));
     QByteArray byteArray;
     QBuffer buffer(&byteArray);
     pixmap.save(&buffer, "PNG");
-    QString url = QString("<img src=\"data:image/png;base64,%1\"/>").arg(QString(byteArray.toBase64()));
+    auto url = QString("<img src=\"data:image/png;base64,%1\"/>").arg(QString(byteArray.toBase64()));
 
     return url;
 }
@@ -438,10 +422,21 @@ void GraphicalItem::readConfiguration()
 }
 
 
-int GraphicalItem::showConfiguration(const QVariant &_args)
+int GraphicalItem::showConfiguration(QWidget *_parent, const QVariant &_args)
 {
     qCDebug(LOG_LIB) << "Combobox arguments" << _args;
-    QStringList tags = _args.toStringList();
+    auto tags = _args.toStringList();
+
+    auto dialog = new QDialog(_parent);
+    auto ui = new Ui::GraphicalItem();
+    ui->setupUi(dialog);
+    translate(ui);
+
+    connect(ui->checkBox_custom, &QCheckBox::stateChanged, [this, ui](const int state) { changeValue(ui, state); });
+    connect(ui->comboBox_type, &QComboBox::currentIndexChanged,
+            [this, ui](const int state) { changeCountState(ui, state); });
+    connect(ui->toolButton_activeColor, &QToolButton::clicked, [this, ui]() { changeColor(ui); });
+    connect(ui->toolButton_inactiveColor, &QToolButton::clicked, [this, ui]() { changeColor(ui); });
 
     ui->lineEdit_name->setText(name());
     ui->lineEdit_comment->setText(comment());
@@ -476,25 +471,29 @@ int GraphicalItem::showConfiguration(const QVariant &_args)
     emit(ui->comboBox_type->currentIndexChanged(ui->comboBox_type->currentIndex()));
     emit(ui->checkBox_custom->stateChanged(ui->checkBox_custom->checkState()));
 
-    int ret = exec();
+    int ret = dialog->exec();
-    if (ret != 1)
+    if (ret == 1) {
-        return ret;
+        setName(ui->lineEdit_name->text());
-    setName(ui->lineEdit_name->text());
+        setComment(ui->lineEdit_comment->text());
-    setComment(ui->lineEdit_comment->text());
+        setApiVersion(AW_GRAPHITEM_API);
-    setApiVersion(AW_GRAPHITEM_API);
+        setCount(ui->spinBox_count->value());
-    setCount(ui->spinBox_count->value());
+        setCustom(ui->checkBox_custom->isChecked());
-    setCustom(ui->checkBox_custom->isChecked());
+        setBar(m_custom ? ui->lineEdit_customValue->text() : ui->comboBox_value->currentText());
-    setBar(m_custom ? ui->lineEdit_customValue->text() : ui->comboBox_value->currentText());
+        setMaxValue(static_cast<float>(ui->doubleSpinBox_max->value()));
-    setMaxValue(static_cast<float>(ui->doubleSpinBox_max->value()));
+        setMinValue(static_cast<float>(ui->doubleSpinBox_min->value()));
-    setMinValue(static_cast<float>(ui->doubleSpinBox_min->value()));
+        setActiveColor(ui->lineEdit_activeColor->text());
-    setActiveColor(ui->lineEdit_activeColor->text());
+        setInactiveColor(ui->lineEdit_inactiveColor->text());
-    setInactiveColor(ui->lineEdit_inactiveColor->text());
+        setType(static_cast<Type>(ui->comboBox_type->currentIndex()));
-    setType(static_cast<Type>(ui->comboBox_type->currentIndex()));
+        setDirection(static_cast<Direction>(ui->comboBox_direction->currentIndex()));
-    setDirection(static_cast<Direction>(ui->comboBox_direction->currentIndex()));
+        setItemHeight(ui->spinBox_height->value());
-    setItemHeight(ui->spinBox_height->value());
+        setItemWidth(ui->spinBox_width->value());
-    setItemWidth(ui->spinBox_width->value());
+
+        writeConfiguration();
+    }
+
+    dialog->deleteLater();
+    delete ui;
 
-    writeConfiguration();
     return ret;
 }
 
@@ -524,23 +523,23 @@ void GraphicalItem::writeConfiguration() const
 }
 
 
-void GraphicalItem::changeColor()
+void GraphicalItem::changeColor(Ui::GraphicalItem *_ui)
 {
     QLineEdit *lineEdit;
     int state;
-    if (sender() == ui->toolButton_activeColor) {
+    if (sender() == _ui->toolButton_activeColor) {
-        lineEdit = ui->lineEdit_activeColor;
+        lineEdit = _ui->lineEdit_activeColor;
-        state = ui->comboBox_activeImageType->currentIndex();
+        state = _ui->comboBox_activeImageType->currentIndex();
     } else {
-        lineEdit = ui->lineEdit_inactiveColor;
+        lineEdit = _ui->lineEdit_inactiveColor;
-        state = ui->comboBox_inactiveImageType->currentIndex();
+        state = _ui->comboBox_inactiveImageType->currentIndex();
     }
     qCInfo(LOG_LIB) << "Using state" << state << "and lineEdit" << lineEdit;
 
     QString outputColor;
     if (state == 0) {
-        QColor color = GraphicalItemHelper::stringToColor(lineEdit->text());
+        auto color = GraphicalItemHelper::stringToColor(lineEdit->text());
-        QColor newColor = QColorDialog::getColor(color, this, i18n("Select color"), QColorDialog::ShowAlphaChannel);
+        auto newColor = QColorDialog::getColor(color, nullptr, i18n("Select color"), QColorDialog::ShowAlphaChannel);
         if (!newColor.isValid())
             return;
         qCInfo(LOG_LIB) << "Selected color" << newColor;
@@ -553,9 +552,9 @@ void GraphicalItem::changeColor()
 
         outputColor = QString("color://%1").arg(colorText.join(','));
     } else if (state == 1) {
-        QString path = lineEdit->text();
+        auto path = lineEdit->text();
-        QString directory = QFileInfo(path).absolutePath();
+        auto directory = QFileInfo(path).absolutePath();
-        outputColor = QFileDialog::getOpenFileUrl(this, i18n("Select path"), directory,
+        outputColor = QFileDialog::getOpenFileUrl(nullptr, i18n("Select path"), directory,
                                                   i18n("Images (*.png *.bpm *.jpg);;All files (*.*)"))
                           .toString();
 
@@ -570,26 +569,28 @@ void GraphicalItem::changeColor()
 }
 
 
-void GraphicalItem::changeCountState(const int _state)
+void GraphicalItem::changeCountState(Ui::GraphicalItem *_ui, const int _state)
 {
     qCDebug(LOG_LIB) << "Current state is" << _state;
 
     // 3 is magic number. Actually 3 is Graph mode
-    ui->widget_count->setHidden(_state != 3);
+    _ui->widget_count->setHidden(_state != 3);
 }
 
 
-void GraphicalItem::changeValue(const int _state)
+void GraphicalItem::changeValue(Ui::GraphicalItem *_ui, const int _state)
 {
     qCDebug(LOG_LIB) << "Current state is" << _state;
 
-    ui->widget_value->setHidden(_state != Qt::Unchecked);
+    _ui->widget_value->setHidden(_state != Qt::Unchecked);
-    ui->widget_customValue->setHidden(_state == Qt::Unchecked);
+    _ui->widget_customValue->setHidden(_state == Qt::Unchecked);
 }
 
 
-void GraphicalItem::translate()
+void GraphicalItem::translate(void *_ui)
 {
+    auto ui = reinterpret_cast<Ui::GraphicalItem *>(_ui);
+
     ui->label_name->setText(i18n("Name"));
     ui->label_comment->setText(i18n("Comment"));
     ui->label_number->setText(i18n("Tag"));

sources/awesomewidgets/graphicalitem.h

@@ -52,8 +52,7 @@ public:
     enum class Direction { LeftToRight = 0, RightToLeft = 1 };
     enum class Type { Horizontal = 0, Vertical = 1, Circle = 2, Graph = 3, Bars = 4 };
 
-    explicit GraphicalItem(QWidget *_parent = nullptr, const QString &_filePath = "");
+    explicit GraphicalItem(QObject *_parent = nullptr, const QString &_filePath = "");
-    ~GraphicalItem() override;
     GraphicalItem *copy(const QString &_fileName, int _number) override;
     QString image(const QVariant &value);
     void initScene();
@@ -92,20 +91,19 @@ public:
 public slots:
     void readConfiguration() override;
     QVariantHash run() override { return {}; };
-    int showConfiguration(const QVariant &_args) override;
+    int showConfiguration(QWidget *_parent, const QVariant &_args) override;
     void writeConfiguration() const override;
 
 private slots:
-    void changeColor();
+    void changeColor(Ui::GraphicalItem *_ui);
-    void changeCountState(int _state);
+    void changeCountState(Ui::GraphicalItem *_ui, int _state);
-    void changeValue(int _state);
+    void changeValue(Ui::GraphicalItem *_ui, int _state);
 
 private:
     GraphicalItemHelper *m_helper = nullptr;
     QGraphicsScene *m_scene = nullptr;
     QGraphicsView *m_view = nullptr;
-    Ui::GraphicalItem *ui = nullptr;
+    void translate(void *_ui) override;
-    void translate() override;
     // properties
     QString m_bar = "cpu";
     int m_count = 100;

sources/awesomewidgets/owmweatherprovider.cpp

@@ -99,7 +99,7 @@ QVariantHash OWMWeatherProvider::parseSingleJson(const QVariantMap &_json) const
     }
 
     // timestamp
-    output[tag("timestamp")] = QDateTime::fromTime_t(_json["dt"].toUInt()).toUTC();
+    output[tag("timestamp")] = QDateTime::fromSecsSinceEpoch(_json["dt"].toUInt()).toUTC();
 
     return output;
 }

sources/awesomewidgets/stooqquotesprovider.cpp

@@ -17,7 +17,6 @@
 
 #include "stooqquotesprovider.h"
 
-#include <QTextCodec>
 #include <QUrlQuery>
 
 #include "awdebug.h"
@@ -55,7 +54,7 @@ QVariantHash StooqQuotesProvider::parse(const QByteArray &_source, const QVarian
 
     QVariantHash values;
 
-    QStringList sourceValues = QTextCodec::codecForMib(106)->toUnicode(_source).trimmed().split(',');
+    QStringList sourceValues = QString::fromUtf8(_source).trimmed().split(',');
     if (sourceValues.count() != 2) {
         qCWarning(LOG_LIB) << "Parse error" << sourceValues;
         return values;

sources/desktop-panel/metadata.json

@@ -0,0 +1,29 @@
+{
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "esalexeev@gmail.com",
+                "Name": "Evgeniy Alekseev aka arcanis"
+            }
+        ],
+        "Category": "System Information",
+        "Description": "A minimalistic Plasmoid",
+        "Description[en]": "A minimalistic Plasmoid",
+        "Description[es]": "Un script Plasmoïde minimaliste",
+        "Description[pt_BR]": "Um script Plasmoid",
+        "Description[ru]": "Минималистичный плазмоид",
+        "Description[uk]": "Мінімалістичний плазмоїд",
+        "EnabledByDefault": true,
+        "Icon": "utilities-system-monitor",
+        "Id": "org.kde.plasma.desktoppanel",
+        "License": "GPLv3",
+        "Name": "Desktop Panel",
+        "ServiceTypes": [
+            "Plasma/Applet"
+        ],
+        "Version": "@PROJECT_VERSION@",
+        "Website": "https://arcanis.me/projects/awesome-widgets/"
+    },
+    "X-Plasma-API": "declarativeappletscript",
+    "X-Plasma-MainScript": "ui/main.qml"
+}

sources/desktop-panel/plugin/CMakeLists.txt

@@ -6,15 +6,15 @@ include_directories(
         ${CMAKE_BINARY_DIR}
         ${PROJECT_TRDPARTY_DIR}
         ${Qt_INCLUDE}
-        ${Kf5_INCLUDE}
+        ${Kf6_INCLUDE}
 )
 
 file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
 file(GLOB SUBPROJECT_NOTIFY *.notifyrc)
 
 add_library(${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE})
-target_link_libraries(${PLUGIN_NAME} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
+target_link_libraries(${PLUGIN_NAME} ${Qt_LIBRARIES} ${Kf6_LIBRARIES})
 
 install(TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/desktoppanel)
 install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/desktoppanel)
-install(FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KNOTIFYRC_INSTALL_DIR})
+install(FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})

sources/desktop-panel/plugin/dpadds.cpp

@@ -92,7 +92,7 @@ QStringList DPAdds::dictKeys(const bool _sorted, const QString &_regexp)
     if (_sorted)
         allKeys.sort();
 
-    return allKeys.filter(QRegExp(_regexp));
+    return allKeys.filter(QRegularExpression(_regexp));
 }
 
 

sources/extsysmon/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(SUBPROJECT plasma_dataengine_extsysmon)
+set(SUBPROJECT ksystemstats_plugin_extsysmon)
 message(STATUS "Subproject ${SUBPROJECT}")
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidget\")
 
@@ -9,27 +9,19 @@ include_directories(
         ${CMAKE_CURRENT_SOURCE_DIR}/../${PROJECT_MONITORSOURCES}/
         ${PROJECT_TRDPARTY_DIR}
         ${Qt_INCLUDE}
-        ${Kf5_INCLUDE}
+        ${Kf6_INCLUDE}
 )
 
-file(GLOB SUBPROJECT_DESKTOP_IN *.desktop)
-file(RELATIVE_PATH SUBPROJECT_DESKTOP ${CMAKE_SOURCE_DIR} ${SUBPROJECT_DESKTOP_IN})
 file(GLOB SUBPROJECT_SOURCE *.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
 file(GLOB SUBPROJECT_HEADER *.h)
 file(GLOB SUBPROJECT_CONF *.conf)
 
-# prepare
-configure_file(${SUBPROJECT_DESKTOP_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP})
-
 # make
 add_library(${SUBPROJECT} MODULE ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER})
 target_link_libraries(${SUBPROJECT} 
         ${PROJECT_LIBRARY} ${PROJECT_MONITORSOURCES} 
-        ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
+        ${Qt_LIBRARIES} ${Kf6_LIBRARIES})
-kcoreaddons_desktop_to_json(${SUBPROJECT} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP}
-                            SERVICE_TYPES plasma-dataengine.desktop)
 
 # install
-install(TARGETS ${SUBPROJECT} DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine)
+install(TARGETS ${SUBPROJECT} DESTINATION ${KDE_INSTALL_PLUGINDIR}/ksystemstats)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_DESKTOP} DESTINATION ${SERVICES_INSTALL_DIR})
+install(FILES ${SUBPROJECT_CONF} DESTINATION ${KDE_INSTALL_CONFDIR})
-install(FILES ${SUBPROJECT_CONF} DESTINATION ${CONFIG_INSTALL_DIR})

sources/extsysmon/extsysmon.cpp

@@ -17,7 +17,11 @@
 
 #include "extsysmon.h"
 
+#include <KPluginFactory>
+
+#include <QDBusMetaType>
 #include <QFile>
+#include <QRegularExpression>
 #include <QSettings>
 #include <QStandardPaths>
 
@@ -28,65 +32,21 @@
 
 
 ExtendedSysMon::ExtendedSysMon(QObject *_parent, const QVariantList &_args)
-    : Plasma::DataEngine(_parent, _args)
+    : KSysGuard::SensorPlugin(_parent, _args)
 {
-    Q_UNUSED(_args)
     qSetMessagePattern(AWDebug::LOG_FORMAT);
     qCDebug(LOG_ESM) << __PRETTY_FUNCTION__;
     for (auto &metadata : AWDebug::getBuildData())
         qCDebug(LOG_ESM) << metadata;
 
-    setMinimumPollingInterval(333);
     readConfiguration();
-
+    addContainer(new ExtSysMonAggregator("extsysmon", "Extended system monitor", this, m_configuration));
-    // init aggregator
-    m_aggregator = new ExtSysMonAggregator(this, m_configuration);
-    for (auto &source : m_aggregator->sources())
-        setData(source, m_aggregator->initialData(source));
-}
-
-
-ExtendedSysMon::~ExtendedSysMon()
-{
-    qCDebug(LOG_ESM) << __PRETTY_FUNCTION__;
-}
-
-
-QStringList ExtendedSysMon::sources() const
-{
-    return m_aggregator->sources();
-}
-
-
-bool ExtendedSysMon::sourceRequestEvent(const QString &_source)
-{
-    qCDebug(LOG_ESM) << "Source" << _source;
-
-    return updateSourceEvent(_source);
-}
-
-
-bool ExtendedSysMon::updateSourceEvent(const QString &_source)
-{
-    qCDebug(LOG_ESM) << "Source" << _source;
-
-    if (m_aggregator->hasSource(_source)) {
-        QVariant data = m_aggregator->data(_source);
-        if (data.isNull())
-            return false;
-        setData(_source, "value", data);
-    } else {
-        qCWarning(LOG_ESM) << "Unknown source" << _source;
-        return false;
-    }
-
-    return true;
 }
 
 
 void ExtendedSysMon::readConfiguration()
 {
-    QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation, "plasma-dataengine-extsysmon.conf");
+    auto fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation, "plasma-dataengine-extsysmon.conf");
     qCInfo(LOG_ESM) << "Configuration file" << fileName;
     QSettings settings(fileName, QSettings::IniFormat);
     QHash<QString, QString> rawConfig;
@@ -119,15 +79,15 @@ QHash<QString, QString> ExtendedSysMon::updateConfiguration(QHash<QString, QStri
     else if ((_rawConfig["GPUDEV"] != "ati") && (_rawConfig["GPUDEV"] != "nvidia"))
         _rawConfig["GPUDEV"] = GPULoadSource::autoGpu();
     // hdddev
-    QStringList allHddDevices = HDDTemperatureSource::allHdd();
+    auto allHddDevices = HDDTemperatureSource::allHdd();
     if (_rawConfig["HDDDEV"] == "all") {
         _rawConfig["HDDDEV"] = allHddDevices.join(',');
     } else if (_rawConfig["HDDDEV"] == "disable") {
         _rawConfig["HDDDEV"] = "";
     } else {
-        QStringList deviceList = _rawConfig["HDDDEV"].split(',', Qt::SkipEmptyParts);
+        auto deviceList = _rawConfig["HDDDEV"].split(',', Qt::SkipEmptyParts);
         QStringList devices;
-        QRegExp diskRegexp = QRegExp("^/dev/[hms]d[a-z]$");
+        auto diskRegexp = QRegularExpression("^/dev/[hms]d[a-z]$");
         for (auto &device : deviceList)
             if ((QFile::exists(device)) && (device.contains(diskRegexp)))
                 devices.append(device);
@@ -149,6 +109,6 @@ QHash<QString, QString> ExtendedSysMon::updateConfiguration(QHash<QString, QStri
 }
 
 
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(extsysmon, ExtendedSysMon, "plasma-dataengine-extsysmon.json")
+K_PLUGIN_CLASS_WITH_JSON(ExtendedSysMon, "metadata.json")
 
 #include "extsysmon.moc"

sources/extsysmon/extsysmon.h

@@ -18,27 +18,19 @@
 #ifndef EXTSYSMON_H
 #define EXTSYSMON_H
 
-#include <Plasma/DataEngine>
+#include <ksysguard/systemstats/SensorPlugin.h>
 
 
-class ExtSysMonAggregator;
+class ExtendedSysMon : public KSysGuard::SensorPlugin
-
-class ExtendedSysMon : public Plasma::DataEngine
 {
     Q_OBJECT
 
 public:
     explicit ExtendedSysMon(QObject *_parent, const QVariantList &_args);
-    ~ExtendedSysMon() override;
+    [[nodiscard]] QString providerName() const override { return QStringLiteral("extsysmon"); }
-
-protected:
-    [[nodiscard]] QStringList sources() const override;
-    bool sourceRequestEvent(const QString &_source) override;
-    bool updateSourceEvent(const QString &_source) override;
 
 private:
     // configuration
-    ExtSysMonAggregator *m_aggregator = nullptr;
     QHash<QString, QString> m_configuration;
     // methods
     void readConfiguration();

sources/extsysmon/extsysmonaggregator.cpp

@@ -21,6 +21,7 @@
 #include "batterysource.h"
 #include "customsource.h"
 #include "desktopsource.h"
+#include "extsysmonsensor.h"
 #include "gpuloadsource.h"
 #include "gputempsource.h"
 #include "hddtempsource.h"
@@ -35,8 +36,9 @@
 #include "weathersource.h"
 
 
-ExtSysMonAggregator::ExtSysMonAggregator(QObject *_parent, const QHash<QString, QString> &_config)
+ExtSysMonAggregator::ExtSysMonAggregator(const QString &_id, const QString &_name, KSysGuard::SensorPlugin *_parent,
-    : QObject(_parent)
+                                         const QHash<QString, QString> &_config)
+    : KSysGuard::SensorContainer(_id, _name, _parent)
 {
     qCDebug(LOG_ESM) << __PRETTY_FUNCTION__;
 
@@ -44,41 +46,11 @@ ExtSysMonAggregator::ExtSysMonAggregator(QObject *_parent, const QHash<QString,
 }
 
 
-ExtSysMonAggregator::~ExtSysMonAggregator()
+void ExtSysMonAggregator::createSensor(const QString &_id, const QString &_name, AbstractExtSysMonSource *_source)
 {
-    qCDebug(LOG_ESM) << __PRETTY_FUNCTION__;
+    qCDebug(LOG_ESM) << "Register sensor" << _name << "with id" << _id;
 
-    m_map.clear();
+    addObject(new ExtSysMonSensor(this, _id, _name, _source));
-}
-
-
-QVariant ExtSysMonAggregator::data(const QString &_source) const
-{
-    qCDebug(LOG_ESM) << "Source" << _source;
-
-    return m_map[_source]->data(_source);
-}
-
-
-bool ExtSysMonAggregator::hasSource(const QString &_source) const
-{
-    qCDebug(LOG_ESM) << "Source" << _source;
-
-    return m_map.contains(_source);
-}
-
-
-QVariantMap ExtSysMonAggregator::initialData(const QString &_source) const
-{
-    qCDebug(LOG_ESM) << "Source" << _source;
-
-    return hasSource(_source) ? m_map[_source]->initialData(_source) : QVariantMap();
-}
-
-
-QStringList ExtSysMonAggregator::sources() const
-{
-    return m_map.keys();
 }
 
 
@@ -87,68 +59,39 @@ void ExtSysMonAggregator::init(const QHash<QString, QString> &_config)
     qCDebug(LOG_ESM) << "Configuration" << _config;
 
     // battery
-    AbstractExtSysMonSource *batteryItem = new BatterySource(this, QStringList() << _config["ACPIPATH"]);
+    createSensor("battery", i18n("Battery"), new BatterySource(this, {_config["ACPIPATH"]}));
-    for (auto &source : batteryItem->sources())
-        m_map[source] = batteryItem;
     // custom
-    AbstractExtSysMonSource *customItem = new CustomSource(this, QStringList());
+    createSensor("custom", i18n("Scripts"), new CustomSource(this, {}));
-    for (auto &source : customItem->sources())
-        m_map[source] = customItem;
     // desktop
-    AbstractExtSysMonSource *desktopItem = new DesktopSource(this, QStringList());
+    // FIXME causes segfault
-    for (auto &source : desktopItem->sources())
+    createSensor("desktop", i18n("Desktop"), new DesktopSource(this, {}));
-        m_map[source] = desktopItem;
     // gpu load
-    AbstractExtSysMonSource *gpuLoadItem = new GPULoadSource(this, QStringList({_config["GPUDEV"]}));
+    createSensor("gpuload", i18n("GPU load"), new GPULoadSource(this, {_config["GPUDEV"]}));
-    for (auto &source : gpuLoadItem->sources())
-        m_map[source] = gpuLoadItem;
     // gpu temperature
-    AbstractExtSysMonSource *gpuTempItem = new GPUTemperatureSource(this, QStringList({_config["GPUDEV"]}));
+    createSensor("gputemp", i18n("GPU temperature"), new GPUTemperatureSource(this, {_config["GPUDEV"]}));
-    for (auto &source : gpuTempItem->sources())
-        m_map[source] = gpuTempItem;
     // hdd temperature
-    AbstractExtSysMonSource *hddTempItem
+    createSensor("hdd", i18n("HDD temperature"),
-        = new HDDTemperatureSource(this, QStringList({_config["HDDDEV"], _config["HDDTEMPCMD"]}));
+                 new HDDTemperatureSource(this, {_config["HDDDEV"], _config["HDDTEMPCMD"]}));
-    for (auto &source : hddTempItem->sources())
-        m_map[source] = hddTempItem;
     // network
-    AbstractExtSysMonSource *networkItem = new NetworkSource(this, QStringList());
+    createSensor("network", i18n("Network"), new NetworkSource(this, {}));
-    for (auto &source : networkItem->sources())
-        m_map[source] = networkItem;
     // player
-    AbstractExtSysMonSource *playerItem
+    createSensor("player", i18n("Music player"),
-        = new PlayerSource(this, QStringList({_config["PLAYER"], _config["MPDADDRESS"], _config["MPDPORT"],
+                 new PlayerSource(this, {_config["PLAYER"], _config["MPDADDRESS"], _config["MPDPORT"], _config["MPRIS"],
-                                              _config["MPRIS"], _config["PLAYERSYMBOLS"]}));
+                                         _config["PLAYERSYMBOLS"]}));
-    for (auto &source : playerItem->sources())
-        m_map[source] = playerItem;
     // processes
-    AbstractExtSysMonSource *processesItem = new ProcessesSource(this, QStringList());
+    createSensor("ps", i18n("Processes"), new ProcessesSource(this, {}));
-    for (auto &source : processesItem->sources())
-        m_map[source] = processesItem;
     // network request
-    AbstractExtSysMonSource *requestItem = new RequestSource(this, QStringList());
+    createSensor("requests", i18n("Network requests"), new RequestSource(this, {}));
-    for (auto &source : requestItem->sources())
-        m_map[source] = requestItem;
     // quotes
-    AbstractExtSysMonSource *quotesItem = new QuotesSource(this, QStringList());
+    createSensor("quotes", i18n("Quotes"), new QuotesSource(this, {}));
-    for (auto &source : quotesItem->sources())
-        m_map[source] = quotesItem;
     // system
-    AbstractExtSysMonSource *systemItem = new SystemInfoSource(this, QStringList());
+    createSensor("system", i18n("System"), new SystemInfoSource(this, {}));
-    for (auto &source : systemItem->sources())
-        m_map[source] = systemItem;
     // upgrade
-    AbstractExtSysMonSource *upgradeItem = new UpgradeSource(this, QStringList());
+    createSensor("upgrade", i18n("Upgrades"), new UpgradeSource(this, {}));
-    for (auto &source : upgradeItem->sources())
-        m_map[source] = upgradeItem;
     // weather
-    AbstractExtSysMonSource *weatherItem = new WeatherSource(this, QStringList());
+    createSensor("weather", i18n("Weather"), new WeatherSource(this, {}));
-    for (auto &source : weatherItem->sources())
-        m_map[source] = weatherItem;
 #ifdef BUILD_LOAD
     // additional load source
-    AbstractExtSysMonSource *loadItem = new LoadSource(this, QStringList());
+    createSensor("load", i18n("Load"), new LoadSource(this, {}));
-    for (auto &source : loadItem->sources())
-        m_map[source] = loadItem;
 #endif /* BUILD_LOAD */
 }

sources/extsysmon/extsysmonaggregator.h

@@ -19,25 +19,25 @@
 #define EXTSYSMONAGGREGATOR_H
 
 #include <QObject>
+#include <ksysguard/systemstats/SensorContainer.h>
 
 #include "abstractextsysmonsource.h"
 
 
-class ExtSysMonAggregator : public QObject
+class AbstractExtSysMonSource;
+class ExtSysMonSensor;
+
+class ExtSysMonAggregator : public KSysGuard::SensorContainer
 {
     Q_OBJECT
 
 public:
-    explicit ExtSysMonAggregator(QObject *_parent, const QHash<QString, QString> &_config);
+    explicit ExtSysMonAggregator(const QString &_id, const QString &_name, KSysGuard::SensorPlugin *_parent,
-    ~ExtSysMonAggregator() override;
+                                 const QHash<QString, QString> &_config);
-    [[nodiscard]] QVariant data(const QString &_source) const;
-    [[nodiscard]] bool hasSource(const QString &_source) const;
-    [[nodiscard]] QVariantMap initialData(const QString &_source) const;
-    [[nodiscard]] QStringList sources() const;
 
 private:
+    void createSensor(const QString &_id, const QString &_name, AbstractExtSysMonSource *_source);
     void init(const QHash<QString, QString> &_config);
-    QHash<QString, AbstractExtSysMonSource *> m_map;
 };
 
 

sources/extsysmon/metadata.json

@@ -0,0 +1,3 @@
+{
+    "providerName": "extsysmon"
+}

sources/extsysmon/plasma-dataengine-extsysmon.desktop

@@ -1,16 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Extended SystemMonitor
-Comment=Adds some additional functions to System DataEngine
-ServiceTypes=Plasma/DataEngine
-Type=Service
-Icon=utilities-system-monitor
-
-X-KDE-Library=plasma_dataengine_extsysmon
-
-X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
-X-KDE-PluginInfo-Email=esalexeev@gmail.com
-X-KDE-PluginInfo-Name=extsysmon
-X-KDE-PluginInfo-Version=@PROJECT_VERSION@
-X-KDE-PluginInfo-Category=System Information
-X-KDE-PluginInfo-License=GPL3

sources/extsysmonsources/CMakeLists.txt

@@ -8,11 +8,11 @@ include_directories(
         ${CMAKE_CURRENT_SOURCE_DIR}/../${PROJECT_LIBRARY}/
         ${PROJECT_TRDPARTY_DIR}
         ${Qt_INCLUDE}
-        ${Kf5_INCLUDE}
+        ${Kf6_INCLUDE}
 )
 
 file(GLOB SUBPROJECT_SOURCE *.cpp)
 file(GLOB SUBPROJECT_HEADER *.h)
 
 add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER})
-target_link_libraries(${SUBPROJECT} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
+target_link_libraries(${SUBPROJECT} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf6_LIBRARIES})

sources/extsysmonsources/abstractextsysmonsource.h

@@ -19,10 +19,15 @@
 #define ABSTRACTEXTSYSMONSOURCE_H
 
 #include <QObject>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QVariant>
 
 
+namespace KSysGuard
+{
+class SensorInfo;
+}
+
 class AbstractExtSysMonSource : public QObject
 {
     Q_OBJECT
@@ -32,15 +37,14 @@ public:
         : QObject(_parent){};
     ~AbstractExtSysMonSource() override = default;
     virtual QVariant data(const QString &_source) = 0;
-    [[nodiscard]] virtual QVariantMap initialData(const QString &_source) const = 0;
+    [[nodiscard]] virtual KSysGuard::SensorInfo *initialData(const QString &_source) const = 0;
     virtual void run() = 0;
     [[nodiscard]] virtual QStringList sources() const = 0;
     // used by extensions
     static int index(const QString &_source)
     {
-        QRegExp rx("\\d+");
+        QRegularExpression rx("\\d+");
-        rx.indexIn(_source);
+        return rx.match(_source).captured().toInt();
-        return rx.cap().toInt();
     }
 
 signals:

sources/extsysmonsources/batterysource.cpp

@@ -18,6 +18,9 @@
 
 #include "batterysource.h"
 
+#include <ksysguard/formatter/Unit.h>
+#include <ksysguard/systemstats/SensorInfo.h>
+
 #include <QDir>
 
 #include <cmath>
@@ -45,12 +48,12 @@ BatterySource::~BatterySource()
 QStringList BatterySource::getSources()
 {
     QStringList sources;
-    sources.append("battery/ac");
+    sources.append("ac");
-    sources.append("battery/bat");
+    sources.append("bat");
-    sources.append("battery/batleft");
+    sources.append("batleft");
-    sources.append("battery/batnow");
+    sources.append("batnow");
-    sources.append("battery/batrate");
+    sources.append("batrate");
-    sources.append("battery/battotal");
+    sources.append("battotal");
 
     auto directory = QDir(m_acpiPath);
 
@@ -60,11 +63,11 @@ QStringList BatterySource::getSources()
         qCInfo(LOG_ESS) << "Init batteries count as" << m_batteriesCount;
 
         for (int i = 0; i < m_batteriesCount; i++) {
-            sources.append(QString("battery/bat%1").arg(i));
+            sources.append(QString("bat%1").arg(i));
-            sources.append(QString("battery/batleft%1").arg(i));
+            sources.append(QString("batleft%1").arg(i));
-            sources.append(QString("battery/batnow%1").arg(i));
+            sources.append(QString("batnow%1").arg(i));
-            sources.append(QString("battery/batrate%1").arg(i));
+            sources.append(QString("batrate%1").arg(i));
-            sources.append(QString("battery/battotal%1").arg(i));
+            sources.append(QString("battotal%1").arg(i));
         }
     }
 
@@ -79,82 +82,79 @@ QVariant BatterySource::data(const QString &_source)
 
     if (!m_values.contains(_source))
         run();
-    QVariant value = m_values.take(_source);
+    return m_values.take(_source);
-    return value;
 }
 
 
-QVariantMap BatterySource::initialData(const QString &_source) const
+KSysGuard::SensorInfo *BatterySource::initialData(const QString &_source) const
 {
     qCDebug(LOG_ESS) << "Source" << _source;
 
-    QVariantMap data;
+    auto data = new KSysGuard::SensorInfo();
-    if (_source == "battery/ac") {
+    if (_source == "ac") {
-        data["min"] = false;
+        data->name = "Is AC online or not";
-        data["max"] = true;
+        data->variantType = QVariant::Bool;
-        data["name"] = "Is AC online or not";
+        data->unit = KSysGuard::UnitNone;
-        data["type"] = "bool";
+    } else if (_source == "bat") {
-        data["units"] = "";
+        data->min = 0;
-    } else if (_source == "battery/bat") {
+        data->max = 100;
-        data["min"] = 0;
+        data->name = "Average battery usage";
-        data["max"] = 100;
+        data->variantType = QVariant::Int;
-        data["name"] = "Average battery usage";
+        data->unit = KSysGuard::UnitPercent;
-        data["type"] = "integer";
+    } else if (_source == "batleft") {
-        data["units"] = "%";
+        data->min = 0;
-    } else if (_source == "battery/batleft") {
+        data->max = 0;
-        data["min"] = 0;
+        data->name = "Battery discharge time";
-        data["max"] = 0;
+        data->variantType = QVariant::Int;
-        data["name"] = "Battery discharge time";
+        data->unit = KSysGuard::UnitSecond;
-        data["type"] = "integer";
+    } else if (_source == "batnow") {
-        data["units"] = "s";
+        data->min = 0;
-    } else if (_source == "battery/batnow") {
+        data->max = 0;
-        data["min"] = 0;
+        data->name = "Current battery capacity";
-        data["max"] = 0;
+        data->variantType = QVariant::Int;
-        data["name"] = "Current battery capacity";
+        data->unit = KSysGuard::UnitNone;
-        data["type"] = "integer";
+    } else if (_source == "batrate") {
-        data["units"] = "";
+        data->min = 0;
-    } else if (_source == "battery/batrate") {
+        data->max = 0;
-        data["min"] = 0;
+        data->name = "Average battery discharge rate";
-        data["max"] = 0;
+        data->variantType = QVariant::Double;
-        data["name"] = "Average battery discharge rate";
+        data->unit = KSysGuard::UnitRate;
-        data["type"] = "float";
+    } else if (_source == "battotal") {
-        data["units"] = "1/s";
+        data->min = 0;
-    } else if (_source == "battery/battotal") {
+        data->max = 0;
-        data["min"] = 0;
+        data->name = "Full battery capacity";
-        data["max"] = 0;
+        data->variantType = QVariant::Int;
-        data["name"] = "Full battery capacity";
+        data->unit = KSysGuard::UnitNone;
-        data["type"] = "integer";
+    } else if (_source.startsWith("batleft")) {
-        data["units"] = "";
+        data->min = 0;
-    } else if (_source.startsWith("battery/batleft")) {
+        data->max = 0;
-        data["min"] = 0;
+        data->name = QString("Battery %1 discharge time").arg(index(_source));
-        data["max"] = 0;
+        data->variantType = QVariant::Int;
-        data["name"] = QString("Battery %1 discharge time").arg(index(_source));
+        data->unit = KSysGuard::UnitSecond;
-        data["type"] = "integer";
+    } else if (_source.startsWith("batnow")) {
-        data["units"] = "s";
+        data->min = 0;
-    } else if (_source.startsWith("battery/batnow")) {
+        data->max = 0;
-        data["min"] = 0;
+        data->name = QString("Battery %1 capacity").arg(index(_source));
-        data["max"] = 0;
+        data->variantType = QVariant::Int;
-        data["name"] = QString("Battery %1 capacity").arg(index(_source));
+        data->unit = KSysGuard::UnitNone;
-        data["type"] = "integer";
+    } else if (_source.startsWith("battotal")) {
-        data["units"] = "";
+        data->min = 0;
-    } else if (_source.startsWith("battery/battotal")) {
+        data->max = 0;
-        data["min"] = 0;
+        data->name = QString("Battery %1 full capacity").arg(index(_source));
-        data["max"] = 0;
+        data->variantType = QVariant::Int;
-        data["name"] = QString("Battery %1 full capacity").arg(index(_source));
+        data->unit = KSysGuard::UnitNone;
-        data["type"] = "integer";
+    } else if (_source.startsWith("batrate")) {
-        data["units"] = "";
+        data->min = 0;
-    } else if (_source.startsWith("battery/batrate")) {
+        data->max = 0;
-        data["min"] = 0;
+        data->name = QString("Battery %1 discharge rate").arg(index(_source));
-        data["max"] = 0;
+        data->variantType = QVariant::Double;
-        data["name"] = QString("Battery %1 discharge rate").arg(index(_source));
+        data->unit = KSysGuard::UnitRate;
-        data["type"] = "float";
+    } else if (_source.startsWith("bat")) {
-        data["units"] = "1/s";
+        data->min = 0;
-    } else if (_source.startsWith("battery/bat")) {
+        data->max = 100;
-        data["min"] = 0;
+        data->name = QString("Battery %1 usage").arg(index(_source));
-        data["max"] = 100;
+        data->variantType = QVariant::Int;
-        data["name"] = QString("Battery %1 usage").arg(index(_source));
+        data->unit = KSysGuard::UnitPercent;
-        data["type"] = "integer";
-        data["units"] = "%";
     }
 
     return data;
@@ -166,7 +166,7 @@ void BatterySource::run()
     // adaptor
     QFile acFile(QString("%1/AC/online").arg(m_acpiPath));
     if (acFile.open(QIODevice::ReadOnly | QIODevice::Text))
-        m_values["battery/ac"] = (QString(acFile.readLine()).trimmed().toInt() == 1);
+        m_values["ac"] = (QString(acFile.readLine()).trimmed().toInt() == 1);
     acFile.close();
 
     // batteries
@@ -177,28 +177,27 @@ void BatterySource::run()
         if (currentLevelFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
             auto value = QString(currentLevelFile.readLine()).toInt();
             m_trend[i + 1].append(value);
-            m_values[QString("battery/batnow%1").arg(i)] = value;
+            m_values[QString("batnow%1").arg(i)] = value;
         }
         currentLevelFile.close();
         // total
         QFile fullLevelFile(QString("%1/BAT%2/energy_full").arg(m_acpiPath).arg(i));
         if (fullLevelFile.open(QIODevice::ReadOnly | QIODevice::Text))
-            m_values[QString("battery/battotal%1").arg(i)] = QString(fullLevelFile.readLine()).toInt();
+            m_values[QString("battotal%1").arg(i)] = QString(fullLevelFile.readLine()).toInt();
         fullLevelFile.close();
 
-        m_values[QString("battery/bat%1").arg(i)]
+        m_values[QString("bat%1").arg(i)] = static_cast<int>(100 * m_values[QString("batnow%1").arg(i)].toFloat()
-            = static_cast<int>(100 * m_values[QString("battery/batnow%1").arg(i)].toFloat()
+                                                             / m_values[QString("battotal%1").arg(i)].toFloat());
-                               / m_values[QString("battery/battotal%1").arg(i)].toFloat());
         // accumulate
-        currentLevel += m_values[QString("battery/batnow%1").arg(i)].toFloat();
+        currentLevel += m_values[QString("batnow%1").arg(i)].toFloat();
-        fullLevel += m_values[QString("battery/battotal%1").arg(i)].toFloat();
+        fullLevel += m_values[QString("battotal%1").arg(i)].toFloat();
     }
 
     // total
     m_trend[0].append(static_cast<int>(currentLevel));
-    m_values["battery/batnow"] = static_cast<int>(currentLevel);
+    m_values["batnow"] = static_cast<int>(currentLevel);
-    m_values["battery/battotal"] = static_cast<int>(fullLevel);
+    m_values["battotal"] = static_cast<int>(fullLevel);
-    m_values["battery/bat"] = static_cast<int>(100 * currentLevel / fullLevel);
+    m_values["bat"] = static_cast<int>(100 * currentLevel / fullLevel);
 
     calculateRates();
 }
@@ -244,15 +243,14 @@ void BatterySource::calculateRates()
 
     for (int i = 0; i < m_batteriesCount; i++) {
         auto approx = approximate(m_trend[i + 1]);
-        m_values[QString("battery/batrate%1").arg(i)] = approx / interval;
+        m_values[QString("batrate%1").arg(i)] = approx / interval;
-        m_values[QString("battery/batleft%1").arg(i)]
+        m_values[QString("batleft%1").arg(i)] = interval * m_values[QString("batnow%1").arg(i)].toFloat() / approx;
-            = interval * m_values[QString("battery/batnow%1").arg(i)].toFloat() / approx;
     }
 
     // total
     auto approx = approximate(m_trend[0]);
-    m_values["battery/batrate"] = approx / interval;
+    m_values["batrate"] = approx / interval;
-    m_values["battery/batleft"] = interval * m_values["battery/batnow"].toFloat() / approx;
+    m_values["batleft"] = interval * m_values["batnow"].toFloat() / approx;
 
     // old data cleanup
     for (auto &trend : m_trend.keys()) {

sources/extsysmonsources/batterysource.h

@@ -35,7 +35,7 @@ public:
     ~BatterySource() override;
     QStringList getSources();
     QVariant data(const QString &_source) override;
-    [[nodiscard]] QVariantMap initialData(const QString &_source) const override;
+    [[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
     void run() override;
     [[nodiscard]] QStringList sources() const override;
 

sources/extsysmonsources/customsource.cpp

@@ -15,9 +15,11 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
 #include "customsource.h"
 
+#include <ksysguard/formatter/Unit.h>
+#include <ksysguard/systemstats/SensorInfo.h>
+
 #include "awdebug.h"
 #include "extscript.h"
 
@@ -49,16 +51,14 @@ QVariant CustomSource::data(const QString &_source)
 }
 
 
-QVariantMap CustomSource::initialData(const QString &_source) const
+KSysGuard::SensorInfo *CustomSource::initialData(const QString &_source) const
 {
     qCDebug(LOG_ESS) << "Source" << _source;
 
-    QVariantMap data;
+    auto data = new KSysGuard::SensorInfo();
-    data["min"] = "";
+    data->name = QString("Custom command '%1' output").arg(m_extScripts->itemByTagNumber(index(_source))->uniq());
-    data["max"] = "";
+    data->variantType = QVariant::String;
-    data["name"] = QString("Custom command '%1' output").arg(m_extScripts->itemByTagNumber(index(_source))->uniq());
+    data->unit = KSysGuard::UnitNone;
-    data["type"] = "QString";
-    data["units"] = "";
 
     return data;
 }
@@ -74,7 +74,7 @@ QStringList CustomSource::getSources()
 {
     QStringList sources;
     for (auto &item : m_extScripts->activeItems())
-        sources.append(QString("custom/%1").arg(item->tag("custom")));
+        sources.append(item->tag("custom"));
 
     return sources;
 }

sources/extsysmonsources/customsource.h

@@ -34,7 +34,7 @@ public:
     explicit CustomSource(QObject *_parent, const QStringList &_args);
     ~CustomSource() override;
     QVariant data(const QString &_source) override;
-    [[nodiscard]] QVariantMap initialData(const QString &_source) const override;
+    [[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
     void run() override{};
     [[nodiscard]] QStringList sources() const override;
 

sources/extsysmonsources/desktopsource.cpp

@@ -15,10 +15,11 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
 #include "desktopsource.h"
 
 #include <KWindowSystem/KWindowSystem>
+#include <ksysguard/formatter/Unit.h>
+#include <ksysguard/systemstats/SensorInfo.h>
 #include <taskmanager/virtualdesktopinfo.h>
 
 #include "awdebug.h"
@@ -50,13 +51,13 @@ QVariant DesktopSource::data(const QString &_source)
     auto decrement = KWindowSystem::isPlatformX11() ? 1 : 0;
     auto current = nativeIndex - decrement;
 
-    if (_source == "desktop/current/name") {
+    if (_source == "current/name") {
         return m_vdi->desktopNames().at(current);
-    } else if (_source == "desktop/current/number") {
+    } else if (_source == "current/number") {
         return current + 1;
-    } else if (_source == "desktop/total/name") {
+    } else if (_source == "total/name") {
         return m_vdi->desktopNames();
-    } else if (_source == "desktop/total/number") {
+    } else if (_source == "total/number") {
         return m_vdi->numberOfDesktops();
     }
 
@@ -64,35 +65,29 @@ QVariant DesktopSource::data(const QString &_source)
 }
 
 
-QVariantMap DesktopSource::initialData(const QString &_source) const
+KSysGuard::SensorInfo *DesktopSource::initialData(const QString &_source) const
 {
     qCDebug(LOG_ESS) << "Source" << _source;
 
-    QVariantMap data;
+    auto data = new KSysGuard::SensorInfo();
-    if (_source == "desktop/current/name") {
+    if (_source == "current/name") {
-        data["min"] = "";
+        data->name = "Current desktop name";
-        data["max"] = "";
+        data->variantType = QVariant::String;
-        data["name"] = "Current desktop name";
+        data->unit = KSysGuard::UnitNone;
-        data["type"] = "QString";
+    } else if (_source == "current/number") {
-        data["units"] = "";
+        data->min = 0;
-    } else if (_source == "desktop/current/number") {
+        data->name = "Current desktop number";
-        data["min"] = 0;
+        data->variantType = QVariant::Int;
-        data["max"] = 0;
+        data->unit = KSysGuard::UnitNone;
-        data["name"] = "Current desktop number";
+    } else if (_source == "total/name") {
-        data["type"] = "integer";
+        data->name = "All desktops by name";
-        data["units"] = "";
+        data->variantType = QVariant::StringList;
-    } else if (_source == "desktop/total/name") {
+        data->unit = KSysGuard::UnitNone;
-        data["min"] = QStringList();
+    } else if (_source == "total/number") {
-        data["max"] = QStringList();
+        data->min = 0;
-        data["name"] = "All desktops by name";
+        data->name = "Desktops count";
-        data["type"] = "QStringList";
+        data->variantType = QVariant::Int;
-        data["units"] = "";
+        data->unit = KSysGuard::UnitNone;
-    } else if (_source == "desktop/total/number") {
-        data["min"] = 0;
-        data["max"] = 0;
-        data["name"] = "Desktops count";
-        data["type"] = "integer";
-        data["units"] = "";
     }
 
     return data;
@@ -102,10 +97,10 @@ QVariantMap DesktopSource::initialData(const QString &_source) const
 QStringList DesktopSource::sources() const
 {
     QStringList sources;
-    sources.append("desktop/current/name");
+    sources.append("current/name");
-    sources.append("desktop/current/number");
+    sources.append("current/number");
-    sources.append("desktop/total/name");
+    sources.append("total/name");
-    sources.append("desktop/total/number");
+    sources.append("total/number");
 
     return sources;
 }

sources/extsysmonsources/desktopsource.h

@@ -35,7 +35,7 @@ public:
     explicit DesktopSource(QObject *_parent, const QStringList &_args);
     ~DesktopSource() override;
     QVariant data(const QString &_source) override;
-    [[nodiscard]] QVariantMap initialData(const QString &_source) const override;
+    [[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
     void run() override{};
     [[nodiscard]] QStringList sources() const override;
 

sources/extsysmonsources/extsysmonsensor.cpp

@@ -0,0 +1,90 @@
+/***************************************************************************
+ *   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/  *
+ ***************************************************************************/
+
+#include "extsysmonsensor.h"
+
+#include <QTimer>
+
+#include "abstractextsysmonsource.h"
+#include "awdebug.h"
+
+
+ExtSysMonSensor::ExtSysMonSensor(KSysGuard::SensorContainer *_parent, const QString &_id, const QString &_name,
+                                 AbstractExtSysMonSource *_source)
+    : KSysGuard::SensorObject(_id, _name, _parent)
+    , m_source(_source)
+    , m_timer(new QTimer(this))
+{
+    qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
+
+    loadProperties();
+
+    connect(this, &SensorObject::subscribedChanged, [this](bool _state) { changeSubscription(_state); });
+    connect(m_timer, &QTimer::timeout, [this]() { update(); });
+}
+
+
+ExtSysMonSensor::~ExtSysMonSensor()
+{
+    qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
+
+    m_timer->stop();
+    m_timer->deleteLater();
+}
+
+
+void ExtSysMonSensor::changeSubscription(bool _subscribed)
+{
+    qCDebug(LOG_ESS) << "Subscription changed to" << _subscribed;
+
+    if (_subscribed) {
+        m_timer->start(1000);
+    } else {
+        m_timer->stop();
+    }
+}
+
+
+void ExtSysMonSensor::update()
+{
+    for (auto &source : m_source->sources()) {
+        auto property = sensor(source);
+        if (!property->isSubscribed())
+            continue; // skip properties which are not explicitly subscribed
+
+        auto value = m_source->data(source);
+        qCWarning(LOG_ESS) << source << value;
+        property->setValue(value);
+    }
+}
+
+
+void ExtSysMonSensor::loadProperties()
+{
+    for (auto &source : m_source->sources()) {
+        auto info = m_source->initialData(source);
+        auto property = new KSysGuard::SensorProperty(source, info->name, this);
+
+        property->setUnit(info->unit);
+        property->setVariantType(info->variantType);
+
+        property->setMin(info->min);
+        property->setMax(info->max);
+
+        addProperty(property);
+    }
+}

sources/extsysmonsources/extsysmonsensor.h

@@ -0,0 +1,45 @@
+/***************************************************************************
+ *   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/  *
+ ***************************************************************************/
+
+#ifndef EXTSYSMONSENSOR_H
+#define EXTSYSMONSENSOR_H
+
+#include <ksysguard/systemstats/SensorObject.h>
+
+
+class AbstractExtSysMonSource;
+class QTimer;
+
+class ExtSysMonSensor : public KSysGuard::SensorObject
+{
+    Q_OBJECT
+
+public:
+    explicit ExtSysMonSensor(KSysGuard::SensorContainer *_parent, const QString &_id, const QString &_name,
+                             AbstractExtSysMonSource *_source);
+    ~ExtSysMonSensor() override;
+    void changeSubscription(bool _subscribed);
+    void update();
+
+private:
+    void loadProperties();
+    AbstractExtSysMonSource *m_source = nullptr;
+    QTimer *m_timer = nullptr;
+};
+
+
+#endif /* EXTSYSMONSENSOR_H */

sources/extsysmonsources/gpuloadsource.cpp

@@ -14,13 +14,13 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
-
-
 #include "gpuloadsource.h"
 
+#include <ksysguard/formatter/Unit.h>
+#include <ksysguard/systemstats/SensorInfo.h>
+
 #include <QFile>
 #include <QProcess>
-#include <QTextCodec>
 
 #include "awdebug.h"
 
@@ -75,24 +75,24 @@ QVariant GPULoadSource::data(const QString &_source)
 {
     qCDebug(LOG_ESS) << "Source" << _source;
 
-    if (_source == "gpu/load")
+    if (_source == "load")
         run();
 
     return m_values[_source];
 }
 
 
-QVariantMap GPULoadSource::initialData(const QString &_source) const
+KSysGuard::SensorInfo *GPULoadSource::initialData(const QString &_source) const
 {
     qCDebug(LOG_ESS) << "Source" << _source;
 
-    QVariantMap data;
+    auto data = new KSysGuard::SensorInfo();
-    if (_source == "gpu/load") {
+    if (_source == "load") {
-        data["min"] = 0.0;
+        data->min = 0.0;
-        data["max"] = 100.0;
+        data->max = 100.0;
-        data["name"] = "GPU usage";
+        data->name = "GPU usage";
-        data["type"] = "float";
+        data->variantType = QVariant::Double;
-        data["units"] = "%";
+        data->unit = KSysGuard::UnitPercent;
     }
 
     return data;
@@ -115,7 +115,7 @@ void GPULoadSource::run()
 QStringList GPULoadSource::sources() const
 {
     QStringList sources;
-    sources.append("gpu/load");
+    sources.append("load");
 
     return sources;
 }
@@ -124,9 +124,9 @@ QStringList GPULoadSource::sources() const
 void GPULoadSource::updateValue()
 {
     qCInfo(LOG_ESS) << "Cmd returns" << m_process->exitCode();
-    QString qdebug = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed();
+    QString qdebug = QString::fromUtf8(m_process->readAllStandardError()).trimmed();
     qCInfo(LOG_ESS) << "Error" << qdebug;
-    QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
+    QString qoutput = QString::fromUtf8(m_process->readAllStandardOutput()).trimmed();
     qCInfo(LOG_ESS) << "Output" << qoutput;
 
     if (m_device == "nvidia") {
@@ -134,7 +134,7 @@ void GPULoadSource::updateValue()
             if (!str.contains("<gpu_util>"))
                 continue;
             auto load = str.remove("<gpu_util>").remove("</gpu_util>").remove('%');
-            m_values["gpu/load"] = load.toFloat();
+            m_values["load"] = load.toFloat();
             break;
         }
     } else if (m_device == "ati") {
@@ -142,7 +142,7 @@ void GPULoadSource::updateValue()
             if (!str.contains("load"))
                 continue;
             QString load = str.split(' ', Qt::SkipEmptyParts)[3].remove('%');
-            m_values["gpu/load"] = load.toFloat();
+            m_values["load"] = load.toFloat();
             break;
         }
     }

sources/extsysmonsources/gpuloadsource.h

@@ -34,7 +34,7 @@ public:
     ~GPULoadSource() override;
     static QString autoGpu();
     QVariant data(const QString &_source) override;
-    [[nodiscard]] QVariantMap initialData(const QString &_source) const override;
+    [[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
     void run() override;
     [[nodiscard]] QStringList sources() const override;
 

sources/extsysmonsources/gputempsource.cpp

@@ -15,12 +15,13 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
 #include "gputempsource.h"
 
+#include <ksysguard/formatter/Unit.h>
+#include <ksysguard/systemstats/SensorInfo.h>
+
 #include <QFile>
 #include <QProcess>
-#include <QTextCodec>
 
 #include "awdebug.h"
 
@@ -54,24 +55,24 @@ QVariant GPUTemperatureSource::data(const QString &_source)
 {
     qCDebug(LOG_ESS) << "Source" << _source;
 
-    if (_source == "gpu/temperature")
+    if (_source == "temperature")
         run();
 
     return m_values[_source];
 }
 
 
-QVariantMap GPUTemperatureSource::initialData(const QString &_source) const
+KSysGuard::SensorInfo *GPUTemperatureSource::initialData(const QString &_source) const
 {
     qCDebug(LOG_ESS) << "Source" << _source;
 
-    QVariantMap data;
+    auto data = new KSysGuard::SensorInfo();
-    if (_source == "gpu/temperature") {
+    if (_source == "temperature") {
-        data["min"] = 0.0;
+        data->min = 0.0;
-        data["max"] = 0.0;
+        data->max = 0.0;
-        data["name"] = "GPU temperature";
+        data->name = "GPU temperature";
-        data["type"] = "float";
+        data->variantType = QVariant::Double;
-        data["units"] = "°C";
+        data->unit = KSysGuard::UnitCelsius;
     }
 
     return data;
@@ -94,7 +95,7 @@ void GPUTemperatureSource::run()
 QStringList GPUTemperatureSource::sources() const
 {
     QStringList sources;
-    sources.append("gpu/temperature");
+    sources.append("temperature");
 
     return sources;
 }
@@ -103,9 +104,9 @@ QStringList GPUTemperatureSource::sources() const
 void GPUTemperatureSource::updateValue()
 {
     qCInfo(LOG_ESS) << "Cmd returns" << m_process->exitCode();
-    QString qdebug = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed();
+    QString qdebug = QString::fromUtf8(m_process->readAllStandardError()).trimmed();
     qCInfo(LOG_ESS) << "Error" << qdebug;
-    QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
+    QString qoutput = QString::fromUtf8(m_process->readAllStandardOutput()).trimmed();
     qCInfo(LOG_ESS) << "Output" << qoutput;
 
     if (m_device == "nvidia") {
@@ -113,7 +114,7 @@ void GPUTemperatureSource::updateValue()
             if (!str.contains("<gpu_temp>"))
                 continue;
             QString temp = str.remove("<gpu_temp>").remove("C</gpu_temp>");
-            m_values["gpu/temperature"] = temp.toFloat();
+            m_values["temperature"] = temp.toFloat();
             break;
         }
     } else if (m_device == "ati") {
@@ -121,7 +122,7 @@ void GPUTemperatureSource::updateValue()
             if (!str.contains("Temperature"))
                 continue;
             QString temp = str.split(' ', Qt::SkipEmptyParts).at(4);
-            m_values["gpu/temperature"] = temp.toFloat();
+            m_values["temperature"] = temp.toFloat();
             break;
         }
     }

sources/extsysmonsources/gputempsource.h

@@ -33,7 +33,7 @@ public:
     explicit GPUTemperatureSource(QObject *_parent, const QStringList &_args);
     ~GPUTemperatureSource() override;
     QVariant data(const QString &_source) override;
-    [[nodiscard]] QVariantMap initialData(const QString &_source) const override;
+    [[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
     void run() override;
     [[nodiscard]] QStringList sources() const override;
 

sources/extsysmonsources/hddtempsource.cpp

@@ -18,9 +18,11 @@
 
 #include "hddtempsource.h"
 
+#include <ksysguard/formatter/Unit.h>
+#include <ksysguard/systemstats/SensorInfo.h>
+
 #include <QDir>
 #include <QProcess>
-#include <QTextCodec>
 
 #include "awdebug.h"
 
@@ -61,7 +63,7 @@ HDDTemperatureSource::~HDDTemperatureSource()
 QStringList HDDTemperatureSource::allHdd()
 {
     QStringList allDevices = QDir("/dev").entryList(QDir::System, QDir::Name);
-    QStringList devices = allDevices.filter(QRegExp("^[hms]d[a-z]$"));
+    QStringList devices = allDevices.filter(QRegularExpression("^[hms]d[a-z]$"));
     for (int i = 0; i < devices.count(); i++)
         devices[i] = QString("/dev/%1").arg(devices.at(i));
 
@@ -75,7 +77,7 @@ QVariant HDDTemperatureSource::data(const QString &_source)
     qCDebug(LOG_ESS) << "Source" << _source;
 
     QString device = _source;
-    device.remove("hdd/temperature");
+    device.remove("temperature");
     // run cmd
     if (m_processes[device]->state() == QProcess::NotRunning) {
         auto cmd = m_cmd.first();
@@ -88,18 +90,19 @@ QVariant HDDTemperatureSource::data(const QString &_source)
 }
 
 
-QVariantMap HDDTemperatureSource::initialData(const QString &_source) const
+KSysGuard::SensorInfo *HDDTemperatureSource::initialData(const QString &_source) const
 {
     qCDebug(LOG_ESS) << "Source" << _source;
 
-    QString device = _source;
+    auto device = _source;
-    device.remove("hdd/temperature");
+    device.remove("temperature");
-    QVariantMap data;
+
-    data["min"] = 0.0;
+    auto data = new KSysGuard::SensorInfo();
-    data["max"] = 0.0;
+    data->min = 0.0;
-    data["name"] = QString("HDD '%1' temperature").arg(device);
+    data->max = 0.0;
-    data["type"] = "float";
+    data->name = QString("HDD '%1' temperature").arg(device);
-    data["units"] = "°C";
+    data->variantType = QVariant::Double;
+    data->unit = KSysGuard::UnitCelsius;
 
     return data;
 }
@@ -109,7 +112,7 @@ QStringList HDDTemperatureSource::sources() const
 {
     QStringList sources;
     for (auto &device : m_devices)
-        sources.append(QString("hdd/temperature%1").arg(device));
+        sources.append(QString("temperature%1").arg(device));
 
     return sources;
 }
@@ -120,9 +123,9 @@ void HDDTemperatureSource::updateValue(const QString &_device)
     qCDebug(LOG_ESS) << "Called with device" << _device;
 
     qCInfo(LOG_ESS) << "Cmd returns" << m_processes[_device]->exitCode();
-    QString qdebug = QTextCodec::codecForMib(106)->toUnicode(m_processes[_device]->readAllStandardError()).trimmed();
+    QString qdebug = QString::fromUtf8(m_processes[_device]->readAllStandardError()).trimmed();
     qCInfo(LOG_ESS) << "Error" << qdebug;
-    QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_processes[_device]->readAllStandardOutput()).trimmed();
+    QString qoutput = QString::fromUtf8(m_processes[_device]->readAllStandardOutput()).trimmed();
     qCInfo(LOG_ESS) << "Output" << qoutput;
 
     // parse

sources/extsysmonsources/hddtempsource.h

@@ -34,7 +34,7 @@ public:
     ~HDDTemperatureSource() override;
     static QStringList allHdd();
     QVariant data(const QString &_source) override;
-    [[nodiscard]] QVariantMap initialData(const QString &_source) const override;
+    [[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
     void run() override{};
     [[nodiscard]] QStringList sources() const override;
 

sources/extsysmonsources/loadsource.cpp

@@ -18,6 +18,9 @@
 
 #include "loadsource.h"
 
+#include <ksysguard/formatter/Unit.h>
+#include <ksysguard/systemstats/SensorInfo.h>
+
 #include <QRandomGenerator>
 
 #include "awdebug.h"
@@ -45,17 +48,17 @@ QVariant LoadSource::data(const QString &_source)
 }
 
 
-QVariantMap LoadSource::initialData(const QString &_source) const
+KSysGuard::SensorInfo *LoadSource::initialData(const QString &_source) const
 {
     qCDebug(LOG_ESS) << "Source" << _source;
 
-    QVariantMap data;
+    auto data = new KSysGuard::SensorInfo();
-    if (_source.startsWith("load/load")) {
+    if (_source.startsWith("load")) {
-        data["min"] = 0;
+        data->min = 0;
-        data["max"] = 0;
+        data->max = 0;
-        data["name"] = "Simple sources for load tests";
+        data->name = "Simple sources for load tests";
-        data["type"] = "int";
+        data->variantType = QVariant::Int;
-        data["units"] = "";
+        data->unit = KSysGuard::UnitNone;
     }
 
     return data;
@@ -66,7 +69,7 @@ QStringList LoadSource::sources() const
 {
     QStringList sources;
     for (int i = 0; i < 1000; i++)
-        sources.append(QString("load/load%1").arg(i));
+        sources.append(QString("load%1").arg(i));
 
     return sources;
 }

sources/extsysmonsources/loadsource.h

@@ -31,7 +31,7 @@ public:
     explicit LoadSource(QObject *_parent, const QStringList &_args);
     ~LoadSource() override;
     QVariant data(const QString &_source) override;
-    [[nodiscard]] QVariantMap initialData(const QString &_source) const override;
+    [[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
     void run() override{};
     [[nodiscard]] QStringList sources() const override;
 };

sources/extsysmonsources/networksource.cpp

@@ -18,9 +18,11 @@
 
 #include "networksource.h"
 
+#include <ksysguard/formatter/Unit.h>
+#include <ksysguard/systemstats/SensorInfo.h>
+
 #include <QNetworkInterface>
 #include <QProcess>
-#include <QTextCodec>
 
 #include "awdebug.h"
 
@@ -50,7 +52,7 @@ NetworkSource::~NetworkSource()
 
 QVariant NetworkSource::data(const QString &_source)
 {
-    qCDebug(LOG_ESS) << "Source" << _source;
+    qCWarning(LOG_ESS) << "Source" << _source;
 
     if (!m_values.contains(_source))
         run();
@@ -58,23 +60,19 @@ QVariant NetworkSource::data(const QString &_source)
 }
 
 
-QVariantMap NetworkSource::initialData(const QString &_source) const
+KSysGuard::SensorInfo *NetworkSource::initialData(const QString &_source) const
 {
     qCDebug(LOG_ESS) << "Source" << _source;
 
-    QVariantMap data;
+    auto data = new KSysGuard::SensorInfo();
-    if (_source == "network/current/name") {
+    if (_source == "device") {
-        data["min"] = "";
+        data->name = "Current network device name";
-        data["max"] = "";
+        data->variantType = QVariant::String;
-        data["name"] = "Current network device name";
+        data->unit = KSysGuard::UnitNone;
-        data["type"] = "QString";
+    } else if (_source == "ssid") {
-        data["units"] = "";
+        data->name = "Current SSID name";
-    } else if (_source == "network/current/ssid") {
+        data->variantType = QVariant::String;
-        data["min"] = "";
+        data->unit = KSysGuard::UnitNone;
-        data["max"] = "";
-        data["name"] = "Current SSID name";
-        data["type"] = "QString";
-        data["units"] = "";
     }
 
     return data;
@@ -83,16 +81,16 @@ QVariantMap NetworkSource::initialData(const QString &_source) const
 
 void NetworkSource::run()
 {
-    m_values["network/current/name"] = NetworkSource::getCurrentDevice();
+    m_values["device"] = NetworkSource::getCurrentDevice();
-    m_process->start("iwgetid", QStringList() << "-r");
+    m_process->start("iwgetid", {"-r"});
 }
 
 
 QStringList NetworkSource::sources() const
 {
     QStringList sources;
-    sources.append("network/current/name");
+    sources.append("device");
-    sources.append("network/current/ssid");
+    sources.append("ssid");
 
     return sources;
 }
@@ -101,12 +99,12 @@ QStringList NetworkSource::sources() const
 void NetworkSource::updateSsid()
 {
     qCInfo(LOG_ESS) << "Cmd returns" << m_process->exitCode();
-    QString qdebug = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed();
+    QString qdebug = QString::fromUtf8(m_process->readAllStandardError()).trimmed();
     qCInfo(LOG_ESS) << "Error" << qdebug;
-    QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
+    QString qoutput = QString::fromUtf8(m_process->readAllStandardOutput()).trimmed();
     qCInfo(LOG_ESS) << "Output" << qoutput;
 
-    m_values["network/current/ssid"] = qoutput;
+    m_values["ssid"] = qoutput;
 }
 
 

sources/extsysmonsources/networksource.h

@@ -33,7 +33,7 @@ public:
     explicit NetworkSource(QObject *_parent, const QStringList &_args);
     ~NetworkSource() override;
     QVariant data(const QString &_source) override;
-    [[nodiscard]] QVariantMap initialData(const QString &_source) const override;
+    [[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
     void run() override;
     [[nodiscard]] QStringList sources() const override;
 

sources/extsysmonsources/playersource.cpp

@@ -18,12 +18,14 @@
 
 #include "playersource.h"
 
+#include <ksysguard/formatter/Unit.h>
+#include <ksysguard/systemstats/SensorInfo.h>
+
 #include <QDBusArgument>
 #include <QDBusConnection>
 #include <QDBusConnectionInterface>
 #include <QDBusMessage>
 #include <QProcess>
-#include <QTextCodec>
 
 #include "awdebug.h"
 
@@ -88,77 +90,59 @@ QString PlayerSource::getAutoMpris()
 }
 
 
-QVariantMap PlayerSource::initialData(const QString &_source) const
+KSysGuard::SensorInfo *PlayerSource::initialData(const QString &_source) const
 {
     qCDebug(LOG_ESS) << "Source" << _source;
 
-    QVariantMap data;
+    auto data = new KSysGuard::SensorInfo();
-    if (_source == "player/album") {
+    if (_source == "album") {
-        data["min"] = "";
+        data->name = "Current song album";
-        data["max"] = "";
+        data->variantType = QVariant::String;
-        data["name"] = "Current song album";
+        data->unit = KSysGuard::UnitNone;
-        data["type"] = "QString";
+    } else if (_source == "salbum") {
-        data["units"] = "";
+        data->name = QString("Current song album (%1 symbols)").arg(m_symbols);
-    } else if (_source == "player/salbum") {
+        data->variantType = QVariant::String;
-        data["min"] = "";
+        data->unit = KSysGuard::UnitNone;
-        data["max"] = "";
+    } else if (_source == "dalbum") {
-        data["name"] = QString("Current song album (%1 symbols)").arg(m_symbols);
+        data->name = QString("Current song album (%1 symbols, dynamic)").arg(m_symbols);
-        data["type"] = "QString";
+        data->variantType = QVariant::String;
-        data["units"] = "";
+        data->unit = KSysGuard::UnitNone;
-    } else if (_source == "player/dalbum") {
+    } else if (_source == "artist") {
-        data["min"] = "";
+        data->name = "Current song artist";
-        data["max"] = "";
+        data->variantType = QVariant::String;
-        data["name"] = QString("Current song album (%1 symbols, dynamic)").arg(m_symbols);
+        data->unit = KSysGuard::UnitNone;
-        data["type"] = "QString";
+    } else if (_source == "sartist") {
-        data["units"] = "";
+        data->name = QString("Current song artist (%1 symbols)").arg(m_symbols);
-    } else if (_source == "player/artist") {
+        data->variantType = QVariant::String;
-        data["min"] = "";
+        data->unit = KSysGuard::UnitNone;
-        data["max"] = "";
+    } else if (_source == "dartist") {
-        data["name"] = "Current song artist";
+        data->name = QString("Current song artist (%1 symbols, dynamic)").arg(m_symbols);
-        data["type"] = "QString";
+        data->variantType = QVariant::String;
-        data["units"] = "";
+        data->unit = KSysGuard::UnitNone;
-    } else if (_source == "player/sartist") {
+    } else if (_source == "duration") {
-        data["min"] = "";
+        data->min = 0;
-        data["max"] = "";
+        data->max = 0;
-        data["name"] = QString("Current song artist (%1 symbols)").arg(m_symbols);
+        data->name = "Current song duration";
-        data["type"] = "QString";
+        data->variantType = QVariant::Int;
-        data["units"] = "";
+        data->unit = KSysGuard::UnitSecond;
-    } else if (_source == "player/dartist") {
+    } else if (_source == "progress") {
-        data["min"] = "";
+        data->min = 0;
-        data["max"] = "";
+        data->max = 0;
-        data["name"] = QString("Current song artist (%1 symbols, dynamic)").arg(m_symbols);
+        data->name = "Current song progress";
-        data["type"] = "QString";
+        data->variantType = QVariant::Int;
-        data["units"] = "";
+        data->unit = KSysGuard::UnitSecond;
-    } else if (_source == "player/duration") {
+    } else if (_source == "title") {
-        data["min"] = 0;
+        data->name = "Current song title";
-        data["max"] = 0;
+        data->variantType = QVariant::String;
-        data["name"] = "Current song duration";
+        data->unit = KSysGuard::UnitNone;
-        data["type"] = "integer";
+    } else if (_source == "stitle") {
-        data["units"] = "s";
+        data->name = QString("Current song title (%1 symbols)").arg(m_symbols);
-    } else if (_source == "player/progress") {
+        data->variantType = QVariant::String;
-        data["min"] = 0;
+        data->unit = KSysGuard::UnitNone;
-        data["max"] = 0;
+    } else if (_source == "dtitle") {
-        data["name"] = "Current song progress";
+        data->name = QString("Current song title (%1 symbols, dynamic)").arg(m_symbols);
-        data["type"] = "integer";
+        data->variantType = QVariant::String;
-        data["units"] = "s";
+        data->unit = KSysGuard::UnitNone;
-    } else if (_source == "player/title") {
-        data["min"] = "";
-        data["max"] = "";
-        data["name"] = "Current song title";
-        data["type"] = "QString";
-        data["units"] = "";
-    } else if (_source == "player/stitle") {
-        data["min"] = "";
-        data["max"] = "";
-        data["name"] = QString("Current song title (%1 symbols)").arg(m_symbols);
-        data["type"] = "QString";
-        data["units"] = "";
-    } else if (_source == "player/dtitle") {
-        data["min"] = "";
-        data["max"] = "";
-        data["name"] = QString("Current song title (%1 symbols, dynamic)").arg(m_symbols);
-        data["type"] = "QString";
-        data["units"] = "";
     }
 
     return data;
@@ -182,33 +166,30 @@ void PlayerSource::run()
 
     // dymanic properties
     // solid
-    m_values["player/salbum"] = stripString(m_values["player/album"].toString(), m_symbols);
+    m_values["salbum"] = stripString(m_values["album"].toString(), m_symbols);
-    m_values["player/sartist"] = stripString(m_values["player/artist"].toString(), m_symbols);
+    m_values["sartist"] = stripString(m_values["artist"].toString(), m_symbols);
-    m_values["player/stitle"] = stripString(m_values["player/title"].toString(), m_symbols);
+    m_values["stitle"] = stripString(m_values["title"].toString(), m_symbols);
     // dynamic
-    m_values["player/dalbum"]
+    m_values["dalbum"] = buildString(m_values["dalbum"].toString(), m_values["album"].toString(), m_symbols);
-        = buildString(m_values["player/dalbum"].toString(), m_values["player/album"].toString(), m_symbols);
+    m_values["dartist"] = buildString(m_values["dartist"].toString(), m_values["artist"].toString(), m_symbols);
-    m_values["player/dartist"]
+    m_values["dtitle"] = buildString(m_values["dtitle"].toString(), m_values["title"].toString(), m_symbols);
-        = buildString(m_values["player/dartist"].toString(), m_values["player/artist"].toString(), m_symbols);
-    m_values["player/dtitle"]
-        = buildString(m_values["player/dtitle"].toString(), m_values["player/title"].toString(), m_symbols);
 }
 
 
 QStringList PlayerSource::sources() const
 {
     QStringList sources;
-    sources.append("player/album");
+    sources.append("album");
-    sources.append("player/dalbum");
+    sources.append("dalbum");
-    sources.append("player/salbum");
+    sources.append("salbum");
-    sources.append("player/artist");
+    sources.append("artist");
-    sources.append("player/dartist");
+    sources.append("dartist");
-    sources.append("player/sartist");
+    sources.append("sartist");
-    sources.append("player/duration");
+    sources.append("duration");
-    sources.append("player/progress");
+    sources.append("progress");
-    sources.append("player/title");
+    sources.append("title");
-    sources.append("player/dtitle");
+    sources.append("dtitle");
-    sources.append("player/stitle");
+    sources.append("stitle");
 
     return sources;
 }
@@ -219,7 +200,7 @@ QString PlayerSource::buildString(const QString &_current, const QString &_value
     qCDebug(LOG_ESS) << "Current value" << _current << "received" << _value << "will be stripped after" << _s;
 
     int index = _value.indexOf(_current);
-    if ((_current.isEmpty()) || ((index + _s + 1) > _value.count()))
+    if ((_current.isEmpty()) || ((index + _s + 1) > _value.length()))
         return QString("%1").arg(_value.left(_s), -_s, QLatin1Char(' '));
     else
         return QString("%1").arg(_value.mid(index + 1, _s), -_s, QLatin1Char(' '));
@@ -230,8 +211,8 @@ QString PlayerSource::stripString(const QString &_value, const int _s)
 {
     qCDebug(LOG_ESS) << "New value" << _value << "will be stripped after" << _s;
 
-    return _value.count() > _s ? QString("%1\u2026").arg(_value.left(_s - 1))
+    return _value.length() > _s ? QString("%1\u2026").arg(_value.left(_s - 1))
-                               : _value.leftJustified(_s, QLatin1Char(' '));
+                                : _value.leftJustified(_s, QLatin1Char(' '));
 }
 
 
@@ -249,7 +230,7 @@ void PlayerSource::mpdSocketConnected()
 
 void PlayerSource::mpdSocketReadyRead()
 {
-    QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_mpdSocket.readAll()).trimmed();
+    QString qoutput = QString::fromUtf8(m_mpdSocket.readAll()).trimmed();
     qCInfo(LOG_ESS) << "Output" << qoutput;
 
     // parse
@@ -261,10 +242,10 @@ void PlayerSource::mpdSocketReadyRead()
             // there are one more time...
             if ((metadata == "time") && (data.contains(':'))) {
                 QStringList times = data.split(':');
-                m_mpdCached["player/duration"] = times.at(0).toInt();
+                m_mpdCached["duration"] = times.at(0).toInt();
-                m_mpdCached["player/progress"] = times.at(1).toInt();
+                m_mpdCached["progress"] = times.at(1).toInt();
             } else if (m_metadata.contains(metadata)) {
-                m_mpdCached[QString("player/%1").arg(metadata)] = data;
+                m_mpdCached[metadata] = data;
             }
         }
     }
@@ -282,11 +263,11 @@ void PlayerSource::mpdSocketWritten(const qint64 _bytes)
 QVariantHash PlayerSource::defaultInfo()
 {
     QVariantHash info;
-    info["player/album"] = "unknown";
+    info["album"] = "unknown";
-    info["player/artist"] = "unknown";
+    info["artist"] = "unknown";
-    info["player/duration"] = 0;
+    info["duration"] = 0;
-    info["player/progress"] = 0;
+    info["progress"] = 0;
-    info["player/title"] = "unknown";
+    info["title"] = "unknown";
 
     return info;
 }
@@ -337,11 +318,11 @@ QVariantHash PlayerSource::getPlayerMprisInfo(const QString &_mpris)
         // another portion of dirty magic
         auto map = qdbus_cast<QVariantHash>(
             response.arguments().first().value<QDBusVariant>().variant().value<QDBusArgument>());
-        info["player/album"] = map.value("xesam:album", "unknown");
+        info["album"] = map.value("xesam:album", "unknown");
         // artist is array
-        info["player/artist"] = map.value("xesam:artist", "unknown").toString();
+        info["artist"] = map.value("xesam:artist", "unknown").toString();
-        info["player/duration"] = map.value("mpris:length", 0).toInt() / (1000 * 1000);
+        info["duration"] = map.value("mpris:length", 0).toInt() / (1000 * 1000);
-        info["player/title"] = map.value("xesam:title", "unknown");
+        info["title"] = map.value("xesam:title", "unknown");
     }
 
     // position
@@ -352,8 +333,7 @@ QVariantHash PlayerSource::getPlayerMprisInfo(const QString &_mpris)
         qCWarning(LOG_ESS) << "Error message" << response.errorMessage();
     } else {
         // this cast is simpler than the previous one ;)
-        info["player/progress"]
+        info["progress"] = response.arguments().first().value<QDBusVariant>().variant().toLongLong() / (1000 * 1000);
-            = response.arguments().first().value<QDBusVariant>().variant().toLongLong() / (1000 * 1000);
     }
 
     return info;