release alpha2

.github/workflows/build.yml

@@ -27,10 +27,10 @@ jobs:
       run: pacman -Sy --noconfirm base-devel cmake extra-cmake-modules python util-linux-libs xorg-server-xvfb
     
     - name: install dependencies
-      run: pacman -S --noconfirm plasma-workspace ksysguard
+      run: pacman -S --noconfirm plasma-workspace
     
     - name: configure cmake
-      run: cmake -B build -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_FUTURE=ON -DBUILD_TESTING=ON sources
+      run: cmake -B build -S sources -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_FUTURE=ON -DBUILD_TESTING=ON
     
     - name: build
       working-directory: /repo/build

.github/workflows/release.yml

@@ -25,17 +25,17 @@ jobs:
         env:
           VERSION: ${{ steps.version.outputs.VERSION }}
 
-      - name: build debian package
+#      - name: build debian package
-        run: |
+#        run: |
-          sudo apt update && \
+#          sudo apt update && \
-          sudo apt install -yq cmake extra-cmake-modules g++ git gettext make && \
+#          sudo apt install -yq cmake extra-cmake-modules g++ git gettext make && \
-          sudo apt install -yq libkf5i18n-dev libkf5notifications-dev libkf5service-dev \
+#          sudo apt install -yq libkf5i18n-dev libkf5notifications-dev libkf5service-dev \
-            libkf5windowsystem-dev libkf5plasma-dev qtbase5-dev qtdeclarative5-dev \
+#            libkf5windowsystem-dev libkf5plasma-dev qtbase5-dev qtdeclarative5-dev \
-            plasma-workspace-dev && \
+#            plasma-workspace-dev && \
-          cmake -B build-deb -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Optimization -DBUILD_FUTURE=ON -DBUILD_DEB_PACKAGE=ON sources && \
+#          cmake -B build-deb -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Optimization -DBUILD_FUTURE=ON -DBUILD_DEB_PACKAGE=ON sources && \
-          cd build-deb && \
+#          cd build-deb && \
-          make package && \
+#          make package && \
-          cd ..
+#          cd ..
 
       - name: release
         uses: softprops/action-gh-release@v1
@@ -45,7 +45,7 @@ jobs:
             ${{ steps.changelog.outputs.changelog }}
           files: |
             awesome-widgets-*-src.tar.xz
-            build-deb/plasma-widget-awesome-widgets-*.deb
+#            build-deb/plasma-widget-awesome-widgets-*.deb
           fail_on_unmatched_files: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG

@@ -1,3 +1,6 @@
+Ver.4.0.0:
+* migration to plasma 6
+
 Ver.3.5.0:
 + wayland support
 * update code to latest standards
@@ -12,7 +15,6 @@ Ver.3.4.2:
 * update to new qt api
 - fix non printable spaces (#142, #143)
 
-
 Ver.3.3.3:
 + add custom keys support (#101)
 * DBus interface improvements

packages/PKGBUILD

@@ -1,22 +1,18 @@
 # Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
 
-pkgname=plasma5-applet-awesome-widgets
+pkgname=plasma6-applet-awesome-widgets
 _pkgname=awesome-widgets
-pkgver=3.4.3
+pkgver=4.0.0alpha2
 pkgrel=1
 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="https://arcanis.me/projects/awesome-widgets"
 license=('GPL3')
-depends=('ksysguard' 'plasma-framework')
+depends=('plasma-workspace')
-optdepends=("hddtemp: for HDD temperature monitor"
+optdepends=("mpd: for music player monitor")
-            "smartmontools: for HDD temperature monitor"
-            "mpd: for music player monitor"
-            "nvidia-utils: for GPU monitor")
 makedepends=('cmake' 'extra-cmake-modules' 'python')
-source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
+source=(https://github.com/arcan1s/awesome-widgets/releases/download/${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
-install=${pkgname}.install
+install="$pkgname.install"
-md5sums=('5953ba518191bb6fff83cdb8633c735c')
 backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
 
 build () {
@@ -30,3 +26,5 @@ build () {
 package() {
       DESTDIR="$pkgdir" cmake --install build
 }
+
+sha256sums=('b2a7b07a1df6f710f4e0d6e5898933f4ddb131818b922dc4b8e48afe3e98a664')

sensors

@@ -1,284 +0,0 @@
-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/CMakeLists.txt

@@ -14,9 +14,9 @@ project(awesomewidgets)
 set(PROJECT_AUTHOR "Evgeniy Alekseev")
 set(PROJECT_CONTACT "esalexeev@gmail.com")
 set(PROJECT_LICENSE "GPL3")
-set(PROJECT_VERSION_MAJOR "3")
+set(PROJECT_VERSION_MAJOR "4")
-set(PROJECT_VERSION_MINOR "5")
+set(PROJECT_VERSION_MINOR "0")
-set(PROJECT_VERSION_PATCH "1")
+set(PROJECT_VERSION_PATCH "0")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 # append git version if any
 set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "")

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

@@ -16,27 +16,20 @@
  ***************************************************************************/
 
 import QtQuick 2.15
+import org.kde.kcmutils as KCM
 
 import org.kde.plasma.private.awesomewidget 1.0
 
 
-Item {
+KCM.SimpleKCM {
     id: aboutPage
+
     // backend
     AWActions {
         id: awActions
     }
 
-    width: childrenRect.width
-    height: childrenRect.height
-
-    property bool debug: awActions.isDebugEnabled()
-
     AboutTab {
         textProvider: awActions
     }
-
-    Component.onCompleted: {
-        if (debug) console.debug()
-    }
 }

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

@@ -17,24 +17,19 @@
 
 import QtQuick 2.15
 import QtQuick.Controls
+import org.kde.kcmutils as KCM
 
 import org.kde.plasma.private.awesomewidget 1.0
 
 
-Item {
+KCM.SimpleKCM {
     id: advancedPage
+
     // backend
     AWActions {
         id: awActions
     }
 
-    width: childrenRect.width
-    height: childrenRect.height
-    implicitWidth: pageColumn.implicitWidth
-    implicitHeight: pageColumn.implicitHeight
-
-    property bool debug: awActions.isDebugEnabled()
-
     property alias cfg_background: background.checked
     property alias cfg_translateStrings: translate.checked
     property alias cfg_wrapNewLines: wrapNewLines.checked
@@ -55,7 +50,6 @@ Item {
     property alias cfg_telemetryRemote: telemetryRemote.checked
     property alias cfg_telemetryId: telemetryId.value
 
-
     Column {
         id: pageColumn
         anchors.fill: parent
@@ -135,32 +129,32 @@ Item {
             id: tempUnits
             model: [
                 {
-                    'label': i18n("Celsius"),
+                    "label": i18n("Celsius"),
-                    'name': "Celsius"
+                    "name": "Celsius"
                 },
                 {
-                    'label': i18n("Fahrenheit"),
+                    "label": i18n("Fahrenheit"),
-                    'name': "Fahrenheit"
+                    "name": "Fahrenheit"
                 },
                 {
-                    'label': i18n("Kelvin"),
+                    "label": i18n("Kelvin"),
-                    'name': "Kelvin"
+                    "name": "Kelvin"
                 },
                 {
-                    'label': i18n("Reaumur"),
+                    "label": i18n("Reaumur"),
-                    'name': "Reaumur"
+                    "name": "Reaumur"
                 },
                 {
-                    'label': i18n("cm^-1"),
+                    "label": i18n("cm^-1"),
-                    'name': "cm^-1"
+                    "name": "cm^-1"
                 },
                 {
-                    'label': i18n("kJ/mol"),
+                    "label": i18n("kJ/mol"),
-                    'name': "kJ/mol"
+                    "name": "kJ/mol"
                 },
                 {
-                    'label': i18n("kcal/mol"),
+                    "label": i18n("kcal/mol"),
-                    'name': "kcal/mol"
+                    "name": "kcal/mol"
                 }
             ]
             text: i18n("Temperature units")
@@ -194,14 +188,18 @@ Item {
 
         GroupBox {
             width: parent.width
+            height: implicitHeight
             title: i18n("Actions")
 
             Column {
+                height: implicitHeight
                 width: parent.width
+
                 ButtonSelector {
                     value: i18n("Drop key cache")
                     onButtonActivated: awActions.dropCache()
                 }
+
                 ButtonSelector {
                     ExportDialog {
                         id: saveConfigAs
@@ -210,11 +208,12 @@ Item {
                     value: i18n("Export configuration")
                     onButtonActivated: saveConfigAs.open()
                 }
+
                 ButtonSelector {
                     ImportDialog {
                         id: loadConfigFrom
                         onConfigurationReceived: {
-                            for (var key in configuration)
+                            for (const key in configuration)
                                 plasmoid.configuration[key] = configuration[key]
                         }
                     }
@@ -225,15 +224,19 @@ Item {
         }
 
         GroupBox {
+            height: implicitHeight
             width: parent.width
             title: i18n("Telemetry")
 
             Column {
+                height: implicitHeight
                 width: parent.width
+
                 CheckBoxSelector {
                     id: telemetryRemote
                     text: i18n("Enable remote telemetry")
                 }
+
                 IntegerSelector {
                     id: telemetryCount
                     maximumValue: 10000
@@ -242,6 +245,7 @@ Item {
                     text: i18n("History count")
                     value: plasmoid.configuration.telemetryCount
                 }
+
                 LineSelector {
                     id: telemetryId
                     text: i18n("Telemetry ID")
@@ -250,9 +254,4 @@ Item {
             }
         }
     }
-
-
-    Component.onCompleted: {
-        if (debug) console.debug()
-    }
 }

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

@@ -16,30 +16,21 @@
  ***************************************************************************/
 
 import QtQuick 2.15
+import org.kde.kcmutils as KCM
 
 import org.kde.plasma.private.awesomewidget 1.0
 import "."
 
 
-Item {
+KCM.SimpleKCM {
     id: appearancePage
-    // backend
-    AWActions {
-        id: awActions
-    }
 
-    width: childrenRect.width
-    height: childrenRect.height
-    implicitWidth: pageColumn.implicitWidth
-    implicitHeight: pageColumn.implicitHeight
-
-    property bool debug: awActions.isDebugEnabled()
     property variant weight: {
         25: 0,
         50: 1,
         63: 3,
         75: 4,
-        87: 5
+        87: 5,
     }
 
     property alias cfg_fontFamily: font.value
@@ -50,7 +41,6 @@ Item {
     property alias cfg_textStyleColor: selectStyleColor.value
     property string cfg_textStyle: textStyle.value
 
-
     Column {
         id: pageColumn
         anchors.fill: parent
@@ -106,9 +96,4 @@ Item {
             value: plasmoid.configuration.textStyleColor
         }
     }
-
-
-    Component.onCompleted: {
-        if (debug) console.debug()
-    }
 }

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

@@ -17,36 +17,28 @@
 
 import QtQuick 2.15
 import QtQuick.Controls
+import org.kde.kcmutils as KCM
 
 import org.kde.plasma.private.awesomewidget 1.0
 
 
-Item {
+KCM.SimpleKCM {
     id: dataenginePage
+
     // backend
     AWKeys {
         id: awKeys
     }
-    AWActions {
-        id: awActions
-    }
     AWConfigHelper {
         id: awConfig
     }
 
-    width: childrenRect.width
-    height: childrenRect.height
-    implicitWidth: pageColumn.implicitWidth
-    implicitHeight: pageColumn.implicitHeight
-
-    property bool debug: awActions.isDebugEnabled()
-
     property variant cfg_dataengine: awConfig.readDataEngineConfiguration()
 
-
     Column {
         id: pageColumn
         anchors.fill: parent
+
         GroupBox {
             height: implicitHeight
             width: parent.width
@@ -58,61 +50,11 @@ Item {
             }
         }
 
-        GroupBox {
-            height: implicitHeight
-            width: parent.width
-            title: i18n("GPU")
-            ComboBoxSelector {
-                model: [
-                    {
-                        'label': "auto",
-                        'name': "auto"
-                    },
-                    {
-                        'label': "disable",
-                        'name': "disable"
-                    },
-                    {
-                        'label': "ati",
-                        'name': "ati"
-                    },
-                    {
-                        'label': "nvidia",
-                        'name': "nvidia"
-                    }
-                ]
-                text: i18n("GPU device")
-                value: cfg_dataengine["GPUDEV"]
-                onValueEdited: newValue => cfg_dataengine["GPUDEV"] = newValue
-            }
-        }
-
-        GroupBox {
-            height: implicitHeight
-            width: parent.width
-            title: i18n("HDD temperature")
-            Column {
-                height: implicitHeight
-                width: parent.width
-                ComboBoxSelector {
-                    id: hdd
-                    text: i18n("HDD")
-                    value: cfg_dataengine["HDDDEV"]
-                    onValueEdited: newValue => cfg_dataengine["HDDDEV"] = newValue
-                }
-
-                LineSelector {
-                    text: i18n("hddtemp cmd")
-                    value: cfg_dataengine["HDDTEMPCMD"]
-                    onValueEdited: newValue => cfg_dataengine["HDDTEMPCMD"] = newValue
-                }
-            }
-        }
-
         GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("Player")
+
             Column {
                 height: implicitHeight
                 width: parent.width
@@ -128,16 +70,16 @@ Item {
                 ComboBoxSelector {
                     model: [
                         {
-                            'label': "disable",
+                            "label": "disable",
-                            'name': "disable"
+                            "name": "disable"
                         },
                         {
-                            'label': "mpris",
+                            "label": "mpris",
-                            'name': "mpris"
+                            "name": "mpris"
                         },
                         {
-                            'label': "mpd",
+                            "label": "mpd",
-                            'name': "mpd"
+                            "name": "mpd"
                         }
                     ]
                     text: i18n("Music player")
@@ -150,40 +92,40 @@ Item {
                     editable: true
                     model: [
                         {
-                            'label': 'auto',
+                            "label": "auto",
-                            'name': 'auto'
+                            "name": "auto"
                         },
                         {
-                            'label': 'amarok',
+                            "label": "amarok",
-                            'name': 'amarok'
+                            "name": "amarok"
                         },
                         {
-                            'label': 'audacious',
+                            "label": "audacious",
-                            'name': 'audacious'
+                            "name": "audacious"
                         },
                         {
-                            'label': 'clementine',
+                            "label": "clementine",
-                            'name': 'clementine'
+                            "name": "clementine"
                         },
                         {
-                            'label': 'DeaDBeeF',
+                            "label": "DeaDBeeF",
-                            'name': 'DeaDBeeF'
+                            "name": "DeaDBeeF"
                         },
                         {
-                            'label': 'vlc',
+                            "label": "vlc",
-                            'name': 'vlc'
+                            "name": "vlc"
                         },
                         {
-                            'label': 'qmmp',
+                            "label": "qmmp",
-                            'name': 'qmmp'
+                            "name": "qmmp"
                         },
                         {
-                            'label': 'xmms2',
+                            "label": "xmms2",
-                            'name': 'xmms2'
+                            "name": "xmms2"
                         },
                         {
-                            'label': cfg_dataengine["MPRIS"],
+                            "label": cfg_dataengine["MPRIS"],
-                            'name': cfg_dataengine["MPRIS"]
+                            "name": cfg_dataengine["MPRIS"]
                         }
                     ]
                     text: i18n("MPRIS player name")
@@ -211,9 +153,11 @@ Item {
             height: implicitHeight
             width: parent.width
             title: i18n("Extensions")
+
             Column {
                 height: implicitHeight
                 width: parent.width
+
                 ButtonSelector {
                     value: i18n("Custom scripts")
                     onButtonActivated: awKeys.editItem("extscript")
@@ -244,8 +188,6 @@ Item {
 
 
     Component.onCompleted: {
-        if (debug) console.debug()
-
         // init submodule
         awKeys.updateCache()
 
@@ -255,8 +197,6 @@ Item {
     }
 
     Component.onDestruction: {
-        if (debug) console.debug()
-
         cfg_dataengine["MPRIS"] = mpris.editText
         awConfig.writeDataEngineConfiguration(cfg_dataengine)
     }

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

@@ -28,6 +28,7 @@ import "."
 
 PlasmoidItem {
     id: main
+
     // backend
     AWKeys {
         id: awKeys
@@ -42,7 +43,6 @@ PlasmoidItem {
         id: bugReport
     }
 
-    property bool debug: awActions.isDebugEnabled()
     property variant tooltipSettings: {
         "tooltipNumber": plasmoid.configuration.tooltipNumber,
         "useTooltipBackground": plasmoid.configuration.useTooltipBackground,
@@ -72,15 +72,13 @@ PlasmoidItem {
     signal needToolTipUpdate(string newText)
     signal sizeUpdate
 
-
+    Layout.fillWidth: PlasmoidItem.formFactor !== PlasmaCore.Planar
-    Layout.fillWidth: PlasmoidItem.formFactor != PlasmaCore.Planar
+    Layout.fillHeight: PlasmoidItem.formFactor !== PlasmaCore.Planar
-    Layout.fillHeight: PlasmoidItem.formFactor != PlasmaCore.Planar
     Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
     Plasmoid.icon: "utilities-system-monitor"
     Plasmoid.backgroundHints: plasmoid.configuration.background ? "DefaultBackground" : "NoBackground"
 
-
     // ui
     Text {
         id: text
@@ -94,7 +92,7 @@ PlasmoidItem {
 
         color: plasmoid.configuration.fontColor
         font.family: plasmoid.configuration.fontFamily
-        font.italic: plasmoid.configuration.fontStyle == "italic" ? true : false
+        font.italic: plasmoid.configuration.fontStyle === "italic" ? true : false
         font.pointSize: plasmoid.configuration.fontSize
         font.weight: General.fontWeight[plasmoid.configuration.fontWeight]
 
@@ -124,8 +122,8 @@ PlasmoidItem {
         }
 
         onAccepted: {
-            var tag = tagSelectorBox.editText
+            const tag = tagSelectorBox.editText
-            var message = i18n("Tag: %1", tag)
+            let message = i18n("Tag: %1", tag)
             message += "<br>"
             message += i18n("Value: %1", awKeys.valueByKey(tag))
             message += "<br>"
@@ -138,25 +136,33 @@ PlasmoidItem {
         PlasmaCore.Action {
             text: i18n("Request key")
             icon.name: "utilities-system-monitor"
+            onTriggered: {
+                tagSelectorBox.model = awKeys.dictKeys(true)
+                tagSelector.open()
+            }
         },
         PlasmaCore.Action {
             text: i18n("Show README")
             icon.name: "text-x-readme"
+            onTriggered: awActions.showReadme()
         },
         PlasmaCore.Action {
             text: i18n("Check updates")
             icon.name: "system-software-update"
+            onTriggered: awActions.checkUpdates(true)
         },
         PlasmaCore.Action {
             text: i18n("Report bug")
             icon.name: "tools-report-bug"
+            onTriggered: {
+                bugReport.reset()
+                bugReport.open()
+            }
         }
     ]
 
 
     Component.onCompleted: {
-        if (debug) console.debug()
-
         // init submodule
         Plasmoid.userConfiguringChanged(false)
         // connect data
@@ -167,31 +173,25 @@ PlasmoidItem {
     }
 
     onNeedTextUpdate: newText => {
-        if (debug) console.debug()
-
         text.text = newText
         sizeUpdate()
     }
 
     onNeedToolTipUpdate: newText => {
-        if (debug) console.debug()
-
         tooltip.text = newText
     }
 
     onSizeUpdate: {
-        if (debug) console.debug()
         // 16 is a magic number
         // in other case plasmoid will increase own size on each update
-
+        if (plasmoid.configuration.height === 0) {
-        if (plasmoid.configuration.height == 0) {
             Layout.minimumHeight = text.contentHeight - 16
             Layout.maximumHeight = -1
         } else {
             Layout.minimumHeight = plasmoid.configuration.height
             Layout.maximumHeight = plasmoid.configuration.height
         }
-        if (plasmoid.configuration.width == 0) {
+        if (plasmoid.configuration.width === 0) {
             Layout.minimumWidth = text.contentWidth - 16
             Layout.maximumWidth = -1
         } else {
@@ -202,7 +202,6 @@ PlasmoidItem {
 
     Plasmoid.onUserConfiguringChanged: {
         if (plasmoid.userConfiguring) return
-        if (debug) console.debug()
 
         // init submodule
         awKeys.initDataAggregator(tooltipSettings)
@@ -217,7 +216,7 @@ PlasmoidItem {
         awKeys.setAggregatorProperty("tempUnits", plasmoid.configuration.tempUnits)
         awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings)
         // update telemetry ID
-        if (plasmoid.configuration.telemetryId.length == 0)
+        if (plasmoid.configuration.telemetryId.length === 0)
             plasmoid.configuration.telemetryId = generateUuid()
         // save telemetry
         awTelemetryHandler.init(plasmoid.configuration.telemetryCount,
@@ -227,37 +226,10 @@ PlasmoidItem {
             awTelemetryHandler.uploadTelemetry("awwidgetconfig", plasmoid.configuration.text)
     }
 
-
-    function action_checkUpdates() {
-        if (debug) console.debug()
-
-        return awActions.checkUpdates(true)
-    }
-
-    function action_showReadme() {
-        if (debug) console.debug()
-
-        return awActions.showReadme()
-    }
-
-    function action_reportBug() {
-        if (debug) console.debug()
-
-        bugReport.reset()
-        bugReport.open()
-    }
-
-    function action_requestKey() {
-        if (debug) console.debug()
-
-        tagSelectorBox.model = awKeys.dictKeys(true)
-        return tagSelector.open()
-    }
-
     // code from http://stackoverflow.com/questions/105034/create-guid-uuid-in-javascript
     function generateUuid() {
-        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+        return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
-            var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
+            let r = Math.random() * 16 | 0, v = c === "x" ? r : (r & 0x3 | 0x8);
             return v.toString(16);
         });
     }

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

@@ -17,23 +17,13 @@
 
 import QtQuick 2.15
 import QtQuick.Controls
+import org.kde.kcmutils as KCM
 
 import org.kde.plasma.private.awesomewidget 1.0
 
 
-Item {
+KCM.SimpleKCM {
     id: tooltipPage
-    // backend
-    AWActions {
-        id: awActions
-    }
-
-    width: childrenRect.width
-    height: childrenRect.height
-    implicitWidth: pageColumn.implicitWidth
-    implicitHeight: pageColumn.implicitHeight
-
-    property bool debug: awActions.isDebugEnabled()
 
     property alias cfg_tooltipNumber: tooltipNumber.value
     property alias cfg_useTooltipBackground: useTooltipBackground.checked
@@ -53,7 +43,6 @@ Item {
     property alias cfg_batTooltipColor: batTooltipColor.value
     property alias cfg_batInTooltipColor: batInTooltipColor.value
 
-
     Column {
         id: pageColumn
         anchors.fill: parent
@@ -178,11 +167,13 @@ Item {
             Column {
                 width: parent.width
                 enabled: networkTooltipLabel.checked
+
                 ColorSelector {
                     id: downkbTooltipColor
                     text: i18n("Download speed color")
                     value: plasmoid.configuration.downkbTooltipColor
                 }
+
                 ColorSelector {
                     id: upkbTooltipColor
                     text: i18n("Upload speed color")
@@ -204,11 +195,13 @@ Item {
             Column {
                 width: parent.width
                 enabled: batteryTooltipLabel.checked
+
                 ColorSelector {
                     id: batTooltipColor
                     text: i18n("Battery active color")
                     value: plasmoid.configuration.batTooltipColor
                 }
+
                 ColorSelector {
                     id: batInTooltipColor
                     text: i18n("Battery inactive color")
@@ -217,9 +210,4 @@ Item {
             }
         }
     }
-
-
-    Component.onCompleted: {
-        if (debug) console.debug()
-    }
 }

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

@@ -16,13 +16,16 @@
  ***************************************************************************/
 
 import QtQuick 2.15
+import QtQuick.Controls
+import org.kde.kcmutils as KCM
 
 import org.kde.plasma.private.awesomewidget 1.0
 import "."
 
 
-Item {
+KCM.SimpleKCM {
     id: widgetPage
+
     // backend
     AWKeys {
         id: awKeys
@@ -31,19 +34,11 @@ Item {
         id: awActions
     }
 
-    width: childrenRect.width
-    height: childrenRect.height
-    implicitWidth: pageColumn.implicitWidth
-    implicitHeight: pageColumn.implicitHeight
-
-    property bool debug: awActions.isDebugEnabled()
-
     property alias cfg_text: textPattern.text
     property bool lock: true
 
     signal needTextUpdate(string newText)
 
-
     Column {
         id: pageColumn
         anchors.fill: parent
@@ -74,10 +69,7 @@ Item {
         }
     }
 
-
     Component.onCompleted: {
-        if (debug) console.debug()
-
         awKeys.needTextToBeUpdated.connect(needTextUpdate)
         // init submodule
         awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.interval,
@@ -92,7 +84,6 @@ Item {
 
     onNeedTextUpdate: newText => {
         if (lock) return
-        if (debug) console.debug()
 
         extensions.showMessage(newText)
         lock = true

sources/awesome-widget/package/metadata.json

@@ -19,7 +19,7 @@
         "Id": "org.kde.plasma.awesomewidget",
         "License": "GPLv3",
         "Name": "Awesome Widget",
-        "Version": "3.5.1",
+        "Version": "4.0.0",
         "Website": "https://arcanis.me/projects/awesome-widgets/"
     },
     "X-Plasma-API-Minimum-Version": "6.0"

sources/awesome-widget/plugin/awactions.cpp

@@ -71,13 +71,6 @@ QString AWActions::getFileContent(const QString &_path)
 }
 
 
-// HACK: since QML could not use QLoggingCategory I need this hack
-bool AWActions::isDebugEnabled()
-{
-    return LOG_AW().isDebugEnabled();
-}
-
-
 bool AWActions::runCmd(const QString &_cmd, const QStringList &_args)
 {
     qCDebug(LOG_AW) << "Cmd" << _cmd << "args" << _args;

sources/awesome-widget/plugin/awactions.h

@@ -34,7 +34,6 @@ public:
     ~AWActions() override;
     Q_INVOKABLE void checkUpdates(bool _showAnyway = false);
     Q_INVOKABLE static QString getFileContent(const QString &_path);
-    Q_INVOKABLE static bool isDebugEnabled();
     Q_INVOKABLE static bool runCmd(const QString &_cmd, const QStringList &_args);
     Q_INVOKABLE static void showLegacyInfo();
     Q_INVOKABLE static void showReadme();

sources/awesome-widget/plugin/awconfighelper.cpp

@@ -170,9 +170,6 @@ QVariantMap AWConfigHelper::readDataEngineConfiguration()
 
     settings.beginGroup("Configuration");
     configuration["ACPIPATH"] = settings.value("ACPIPATH", "/sys/class/power_supply/");
-    configuration["GPUDEV"] = settings.value("GPUDEV", "auto");
-    configuration["HDDDEV"] = settings.value("HDDDEV", "all");
-    configuration["HDDTEMPCMD"] = settings.value("HDDTEMPCMD", "sudo smartctl -a");
     configuration["MPDADDRESS"] = settings.value("MPDADDRESS", "localhost");
     configuration["MPDPORT"] = settings.value("MPDPORT", "6600");
     configuration["MPRIS"] = settings.value("MPRIS", "auto");
@@ -197,9 +194,6 @@ bool AWConfigHelper::writeDataEngineConfiguration(const QVariantMap &_configurat
 
     settings.beginGroup("Configuration");
     settings.setValue("ACPIPATH", _configuration["ACPIPATH"]);
-    settings.setValue("GPUDEV", _configuration["GPUDEV"]);
-    settings.setValue("HDDDEV", _configuration["HDDDEV"]);
-    settings.setValue("HDDTEMPCMD", _configuration["HDDTEMPCMD"]);
     settings.setValue("MPDADDRESS", _configuration["MPDADDRESS"]);
     settings.setValue("MPDPORT", _configuration["MPDPORT"]);
     settings.setValue("MPRIS", _configuration["MPRIS"]);

sources/awesome-widget/plugin/awdataengineaggregator.cpp

@@ -17,15 +17,17 @@
 
 #include "awdataengineaggregator.h"
 
-#include <QDBusConnection>
 #include <ksysguard/formatter/Unit.h>
 #include <ksysguard/systemstats/DBusInterface.h>
 
+#include <QDBusConnection>
+
 #include "awdebug.h"
 
 
 AWDataEngineAggregator::AWDataEngineAggregator(QObject *_parent)
     : QObject(_parent)
+    , m_interface(new KSysGuard::SystemStats::DBusInterface())
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
@@ -34,12 +36,14 @@ AWDataEngineAggregator::AWDataEngineAggregator(QObject *_parent)
     qDBusRegisterMetaType<KSysGuard::SensorDataList>();
     qDBusRegisterMetaType<QHash<QString, KSysGuard::SensorInfo>>();
 
-    m_interface = new KSysGuard::SystemStats::DBusInterface();
+    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::newSensorData, this,
-
+            &AWDataEngineAggregator::updateData);
-    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::newSensorData, this, &AWDataEngineAggregator::updateData);
+    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::sensorMetaDataChanged, this,
-    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::sensorMetaDataChanged, this, &AWDataEngineAggregator::updateSensors);
+            &AWDataEngineAggregator::updateSensors);
-    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::sensorAdded, this, &AWDataEngineAggregator::sensorAdded);
+    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::sensorAdded, this,
-    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::sensorRemoved, this, &AWDataEngineAggregator::sensorRemoved);
+            &AWDataEngineAggregator::sensorAdded);
+    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::sensorRemoved, this,
+            &AWDataEngineAggregator::sensorRemoved);
 
     loadSources();
 }
@@ -54,9 +58,20 @@ AWDataEngineAggregator::~AWDataEngineAggregator()
 }
 
 
+void AWDataEngineAggregator::connectSources()
+{
+    auto keys = m_sensors.keys();
+    auto newKeys = QSet(keys.cbegin(), keys.cend()) - m_subscribed;
+
+    m_interface->subscribe(newKeys.values()).waitForFinished();
+    m_subscribed.unite(newKeys);
+}
+
+
 void AWDataEngineAggregator::disconnectSources()
 {
-    m_interface->unsubscribe(m_sensors.keys());
+    m_interface->unsubscribe(m_subscribed.values()).waitForFinished();
+    m_subscribed.clear();
 }
 
 
@@ -73,15 +88,10 @@ void AWDataEngineAggregator::loadSources()
 
     auto sensors = response.value();
     updateSensors(sensors);
-}
+    connectSources();
 
-
+    for (auto &sensor : m_sensors.keys())
-void AWDataEngineAggregator::reconnectSources(const int interval)
+        emit(deviceAdded(sensor));
-{
-    qCDebug(LOG_AW) << "Reconnect all sensors with update interval" << interval;
-
-    disconnectSources();
-    m_interface->subscribe(m_sensors.keys());
 }
 
 
@@ -89,7 +99,10 @@ void AWDataEngineAggregator::dropSource(const QString &_source)
 {
     qCDebug(LOG_AW) << "Disconnect sensor" << _source;
 
-    m_interface->unsubscribe({_source});
+    if (m_subscribed.contains(_source)) {
+        m_interface->unsubscribe({_source}).waitForFinished();
+        m_subscribed.remove(_source);
+    }
 }
 
 
@@ -100,13 +113,20 @@ void AWDataEngineAggregator::sensorAdded(const QString &_sensor)
     // check if sensor is actually valid
     auto response = m_interface->sensors({_sensor});
     response.waitForFinished();
-    auto info = response.value();
+
-    if (info.count() != 1)
+    auto info = response.value().value(_sensor);
+    if (!isValidSensor(info))
         return;
 
-    qCWarning(LOG_AW) << info.keys();
+    m_sensors[_sensor] = info;
+    dropSource(_sensor); // force reconnect
+    if (!m_subscribed.contains(_sensor)) {
+        m_interface->subscribe({_sensor}).waitForFinished();
+        m_subscribed.insert(_sensor);
+    }
 
-    m_interface->subscribe({_sensor});
+    // notify about new device
+    emit(deviceAdded(_sensor));
 }
 
 
@@ -115,9 +135,10 @@ void AWDataEngineAggregator::sensorRemoved(const QString &_sensor)
     qCDebug(LOG_AW) << "Sensor" << _sensor << "has been removed";
 
     m_sensors.remove(_sensor);
-    m_interface->unsubscribe({_sensor});
+    dropSource(_sensor);
 }
 
+
 void AWDataEngineAggregator::updateData(KSysGuard::SensorDataList _data)
 {
     emit(dataUpdated(m_sensors, _data));

sources/awesome-widget/plugin/awdataengineaggregator.h

@@ -15,9 +15,7 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
+#pragma once
-#ifndef AWDATAENGINEAGGREGATOR_H
-#define AWDATAENGINEAGGREGATOR_H
 
 #include <ksysguard/systemstats/SensorInfo.h>
 
@@ -31,7 +29,6 @@ namespace KSysGuard::SystemStats
 class DBusInterface;
 }
 
-
 class AWDataEngineAggregator : public QObject
 {
     Q_OBJECT
@@ -39,10 +36,10 @@ class AWDataEngineAggregator : public QObject
 public:
     explicit AWDataEngineAggregator(QObject *_parent = nullptr);
     ~AWDataEngineAggregator() override;
+    void connectSources();
     void disconnectSources();
-    [[nodiscard]] bool isValidSensor(const KSysGuard::SensorInfo &_sensor);
+    [[nodiscard]] static 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);
@@ -58,7 +55,5 @@ public slots:
 private:
     KSysGuard::SystemStats::DBusInterface *m_interface = nullptr;
     QHash<QString, KSysGuard::SensorInfo> m_sensors;
+    QSet<QString> m_subscribed;
 };
-
-
-#endif /* AWDATAENGINEAGGREGATOR_H */

sources/awesome-widget/plugin/awdataenginemapper.cpp

@@ -85,6 +85,8 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
     auto cpuRegExp = QRegularExpression("^cpu/cpu.*/usage$");
     auto cpuclRegExp = QRegularExpression("^cpu/cpu.*/frequency$");
     auto cpuTempRegExp = QRegularExpression("^cpu/cpu.*/temperature$");
+    auto gpuRegExp = QRegularExpression("^gpu/gpu.*/usage$");
+    auto gpuTempRegExp = QRegularExpression("^gpu/gpu.*/temperature$");
     auto hddrRegExp = QRegularExpression("^disk/.*/read$");
     auto hddwRegExp = QRegularExpression("^disk/.*/write$");
     auto mountFillRegExp = QRegularExpression("^disk/.*/usedPercent$");
@@ -99,7 +101,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         m_formatter["ac"] = AWKeysAggregator::FormatterType::ACFormat;
     } else if (_source.startsWith("extsysmon/battery/")) {
         // battery stats
-        QString key = _source;
+        auto key = _source;
         key.remove("extsysmon/battery/");
         m_map.insert(_source, key);
         m_formatter[key] = _source.contains("rate") ? AWKeysAggregator::FormatterType::Float
@@ -110,7 +112,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         m_formatter["cpu"] = AWKeysAggregator::FormatterType::Float;
     } else if (_source.contains(cpuRegExp)) {
         // cpus
-        QString key = _source;
+        auto key = _source;
         key.remove("cpu/").remove("/usage");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::Float;
@@ -120,34 +122,34 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         m_formatter["cpucl"] = AWKeysAggregator::FormatterType::Integer;
     } else if (_source.contains(cpuclRegExp)) {
         // cpucls
-        QString key = _source;
+        auto key = _source;
         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("extsysmon/custom")) {
         // custom
-        QString key = _source;
+        auto key = _source;
         key.remove("extsysmon/custom/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "extsysmon/desktop/current/name") {
+    } else if (_source == "extsysmon/desktop/name") {
         // current desktop name
         m_map.insert(_source, "desktop");
         m_formatter["desktop"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "extsysmon/desktop/current/number") {
+    } else if (_source == "extsysmon/desktop/number") {
         // current desktop number
         m_map.insert(_source, "ndesktop");
         m_formatter["ndesktop"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "extsysmon/desktop/total/number") {
+    } else if (_source == "extsysmon/desktop/count") {
         // desktop count
         m_map.insert(_source, "tdesktops");
         m_formatter["tdesktops"] = AWKeysAggregator::FormatterType::NoFormat;
     } else if (_source.contains(hddrRegExp)) {
         // read speed
-        QString device = _source;
+        auto device = _source;
         device.remove("disk/").remove("/read");
-        int index = m_devices["disk"].indexOf(device);
+        auto index = m_devices["disk"].indexOf(device);
         if (index > -1) {
             QString key = QString("hddr%1").arg(index);
             m_map.insert(_source, key);
@@ -155,29 +157,45 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         }
     } else if (_source.contains(hddwRegExp)) {
         // write speed
-        QString device = _source;
+        auto device = _source;
         device.remove("disk/").remove("/write");
-        int index = m_devices["disk"].indexOf(device);
+        auto 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 == "extsysmon/gpuload/load") {
+    } else if (_source == "gpu/all/usage") {
         // gpu load
         m_map.insert(_source, "gpu");
         m_formatter["gpu"] = AWKeysAggregator::FormatterType::Float;
-    } else if (_source == "extsysmon/gputemp/temperature") {
+    } else if (_source.contains(gpuRegExp)) {
-        // gpu temperature
+        // gpus
-        m_map.insert(_source, "gputemp");
+        auto device = _source;
-        m_formatter["gputemp"] = AWKeysAggregator::FormatterType::Temperature;
+        device.remove("gpu/").remove("/usage");
+        auto index = m_devices["gpu"].indexOf(device);
+        if (index > -1) {
+            auto key = QString("gpu%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Float;
+        }
+    } else if (_source.contains(gpuTempRegExp)) {
+        // gpus temps
+        auto device = _source;
+        device.remove("gpu/").remove("/temperature");
+        auto index = m_devices["gpu"].indexOf(device);
+        if (index > -1) {
+            auto key = QString("gputemp%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
+        }
     } else if (_source.contains(mountFillRegExp)) {
         // fill level
-        QString device = _source;
+        auto device = _source;
         device.remove("disk/").remove("/usedPercent");
-        int index = m_devices["mount"].indexOf(device);
+        auto index = m_devices["mount"].indexOf(device);
         if (index > -1) {
-            QString key = QString("hdd%1").arg(index);
+            auto key = QString("hdd%1").arg(index);
             m_map.insert(_source, key);
             m_formatter[key] = AWKeysAggregator::FormatterType::Float;
             // additional keys
@@ -186,9 +204,9 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         }
     } else if (_source.contains(mountFreeRegExp)) {
         // free space
-        QString device = _source;
+        auto device = _source;
         device.remove("disk/").remove("/free");
-        int index = m_devices["mount"].indexOf(device);
+        auto index = m_devices["mount"].indexOf(device);
         if (index > -1) {
             // mb
             QString key = QString("hddfreemb%1").arg(index);
@@ -201,9 +219,9 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         }
     } else if (_source.contains(mountUsedRegExp)) {
         // used
-        QString device = _source;
+        auto device = _source;
         device.remove("disk/").remove("/used");
-        int index = m_devices["mount"].indexOf(device);
+        auto index = m_devices["mount"].indexOf(device);
         if (index > -1) {
             // mb
             QString key = QString("hddmb%1").arg(index);
@@ -214,21 +232,11 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
             m_map.insert(_source, key);
             m_formatter[key] = AWKeysAggregator::FormatterType::MemGBFormat;
         }
-    } else if (_source.startsWith("extsysmon/hdd/temperature")) {
-        // hdd temperature
-        QString device = _source;
-        device.remove("hdd/temperature");
-        int index = m_devices["hdd"].indexOf(device);
-        if (index > -1) {
-            QString key = QString("hddtemp%1").arg(index);
-            m_map.insert(_source, key);
-            m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
-        }
     } else if (_source.startsWith("cpu/loadaverages/loadaverage")) {
         // load average
-        QString time = _source;
+        auto time = _source;
         time.remove("cpu/loadaverages/loadaverage");
-        QString key = QString("la%1").arg(time);
+        auto key = QString("la%1").arg(time);
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::FloatTwoSymbols;
     } else if (_source == "memory/physical/application") {
@@ -265,17 +273,17 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         m_formatter["ssid"] = AWKeysAggregator::FormatterType::NoFormat;
     } else if (_source.startsWith("extsysmon/requests/response")) {
         // network response
-        QString key = _source;
+        auto key = _source;
         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("download") ? "down" : "up";
+        auto type = _source.endsWith("download") ? "down" : "up";
-        int index = m_devices["net"].indexOf(_source.split('/')[2]);
+        auto index = m_devices["net"].indexOf(_source.split('/')[1]);
         if (index > -1) {
             // kb
-            QString key = QString("%1kb%2").arg(type).arg(index);
+            auto key = QString("%1kb%2").arg(type).arg(index);
             m_map.insert(_source, key);
             m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
             // smart
@@ -289,11 +297,11 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         }
     } else if (_source.contains(netTotalRegExp)) {
         // network data total
-        QString type = _source.contains("download") ? "down" : "up";
+        auto type = _source.endsWith("Download") ? "down" : "up";
-        int index = m_devices["net"].indexOf(_source.split('/')[2]);
+        auto index = m_devices["net"].indexOf(_source.split('/')[1]);
         if (index > -1) {
             // kb
-            QString key = QString("%1totkb%2").arg(type).arg(index);
+            auto key = QString("%1totkb%2").arg(type).arg(index);
             m_map.insert(_source, key);
             m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
             // mb
@@ -303,31 +311,31 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         }
     } else if (_source.startsWith("extsysmon/upgrade")) {
         // package manager
-        QString key = _source;
+        auto key = _source;
         key.remove("extsysmon/upgrade/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::IntegerThree;
     } else if (_source.startsWith("extsysmon/player")) {
         // player
-        QString key = _source;
+        auto key = _source;
         key.remove("extsysmon/player/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "extsysmon/ps/running/count") {
+    } else if (_source == "extsysmon/ps/running") {
         // running processes count
         m_map.insert(_source, "pscount");
         m_formatter["pscount"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "extsysmon/ps/running/list") {
+    } else if (_source == "extsysmon/ps/list") {
         // list of running processes
         m_map.insert(_source, "ps");
         m_formatter["ps"] = AWKeysAggregator::FormatterType::List;
-    } else if (_source == "extsysmon/ps/total/count") {
+    } else if (_source == "extsysmon/ps/count") {
         // total processes count
         m_map.insert(_source, "pstot");
         m_formatter["pstot"] = AWKeysAggregator::FormatterType::NoFormat;
     } else if (_source.startsWith("extsysmon/quotes")) {
         // quotes
-        QString key = _source;
+        auto key = _source;
         key.remove("extsysmon/quotes/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::Quotes;
@@ -347,14 +355,15 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         // gb
         m_map.insert(_source, "swapgb");
         m_formatter["swapgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
-    } else if (_source.startsWith("lmsensors/") || _source.contains(cpuTempRegExp) || _source == "cpu/all/averageTemperature") {
+    } else if (_source.startsWith("lmsensors/") || _source.contains(cpuTempRegExp)
+               || _source == "cpu/all/averageTemperature") {
         // temperature
         auto index = m_devices["temp"].indexOf(_source);
         // HACK on DE initialization there are no units key
         if (_units == KSysGuard::UnitInvalid)
             return QStringList({QString("temp%1").arg(index)});
         if (index > -1) {
-            QString key = QString("temp%1").arg(index);
+            auto key = QString("temp%1").arg(index);
             m_map.insert(_source, key);
             m_formatter[key] = _units == KSysGuard::UnitCelsius ? AWKeysAggregator::FormatterType::Temperature
                                                                 : AWKeysAggregator::FormatterType::Integer;
@@ -393,19 +402,19 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         m_formatter["cuptime"] = AWKeysAggregator::FormatterType::UptimeCustom;
     } else if (_source.startsWith("extsysmon/weather/temperature")) {
         // temperature
-        QString key = _source;
+        auto key = _source;
         key.remove("extsysmon/weather/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
     } else if (_source.startsWith("extsysmon/weather/")) {
         // other weather
-        QString key = _source;
+        auto key = _source;
         key.remove("extsysmon/weather/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
     } else if (_source.startsWith("extsysmon/load/load")) {
         // load source
-        QString key = _source;
+        auto key = _source;
         key.remove("extsysmon/load/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;

sources/awesome-widget/plugin/awkeycache.cpp

@@ -31,7 +31,7 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
 {
     qCDebug(LOG_AW) << "Key" << _key << "with type" << _type;
 
-    QString fileName
+    auto fileName
         = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
     qCInfo(LOG_AW) << "Cache file" << fileName;
     QSettings cache(fileName, QSettings::IniFormat);
@@ -41,19 +41,8 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
     for (auto &number : cache.allKeys())
         cachedValues.append(cache.value(number).toString());
 
-    if (_type == "hdd") {
+    if (_type == "net") {
-        QStringList allDevices = QDir("/dev").entryList(QDir::System, QDir::Name);
+        auto rawInterfaceList = QNetworkInterface::allInterfaces();
-        QStringList devices = allDevices.filter(QRegularExpression("^[hms]d[a-z]$"));
-        for (auto &dev : devices) {
-            QString device = QString("/dev/%1").arg(dev);
-            if (cachedValues.contains(device))
-                continue;
-            qCInfo(LOG_AW) << "Found new key" << device << "for type" << _type;
-            cachedValues.append(device);
-            cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), device);
-        }
-    } else if (_type == "net") {
-        QList<QNetworkInterface> rawInterfaceList = QNetworkInterface::allInterfaces();
         for (auto &interface : rawInterfaceList) {
             QString device = interface.name();
             if (cachedValues.contains(device))
@@ -98,7 +87,7 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
         if (!used.contains(key))
             continue;
         key.remove("hddtotmb");
-        int index = key.toInt();
+        auto index = key.toInt();
         used << QString("hddfreemb%1").arg(index) << QString("hddmb%1").arg(index);
     }
     // hddtotgb*
@@ -106,7 +95,7 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
         if (!used.contains(key))
             continue;
         key.remove("hddtotgb");
-        int index = key.toInt();
+        auto index = key.toInt();
         used << QString("hddfreegb%1").arg(index) << QString("hddgb%1").arg(index);
     }
     // mem
@@ -139,7 +128,7 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
     for (auto &key : netKeys) {
         if (!used.contains(key))
             continue;
-        QStringList filt = _allKeys.filter(QRegularExpression(QString("^%1[0-9]{1,}").arg(key)));
+        auto filt = _allKeys.filter(QRegularExpression(QString("^%1[0-9]{1,}").arg(key)));
         for (auto &filtered : filt)
             used << filtered;
     }
@@ -158,7 +147,7 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
 
 QHash<QString, QStringList> AWKeyCache::loadKeysFromCache()
 {
-    QString fileName
+    auto fileName
         = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
     qCInfo(LOG_AW) << "Cache file" << fileName;
     QSettings cache(fileName, QSettings::IniFormat);

sources/awesome-widget/plugin/awkeyoperations.cpp

@@ -72,7 +72,6 @@ QHash<QString, QStringList> AWKeyOperations::devices() const
 void AWKeyOperations::updateCache()
 {
     // update network and hdd list
-    addKeyToCache("hdd");
     addKeyToCache("net");
 }
 
@@ -90,15 +89,20 @@ QStringList AWKeyOperations::dictKeys() const
         allKeys.append(item->tag("timestamp"));
     }
     // cpuclock & cpu
-    for (int i = 0; i < QThread::idealThreadCount(); i++) {
+    for (auto i = 0; i < QThread::idealThreadCount(); i++) {
         allKeys.append(QString("cpucl%1").arg(i));
         allKeys.append(QString("cpu%1").arg(i));
     }
     // temperature
-    for (int i = 0; i < m_devices["temp"].count(); i++)
+    for (auto i = 0; i < m_devices["temp"].count(); i++)
         allKeys.append(QString("temp%1").arg(i));
+    // gpu
+    for (auto i = 0; i < m_devices["gpu"].count(); i++) {
+        allKeys.append(QString("gpu%1").arg(i));
+        allKeys.append(QString("gputemp%1").arg(i));
+    }
     // hdd
-    for (int i = 0; i < m_devices["mount"].count(); i++) {
+    for (auto i = 0; i < m_devices["mount"].count(); i++) {
         allKeys.append(QString("hddmb%1").arg(i));
         allKeys.append(QString("hddgb%1").arg(i));
         allKeys.append(QString("hddfreemb%1").arg(i));
@@ -108,15 +112,12 @@ QStringList AWKeyOperations::dictKeys() const
         allKeys.append(QString("hdd%1").arg(i));
     }
     // hdd speed
-    for (int i = 0; i < m_devices["disk"].count(); i++) {
+    for (auto i = 0; i < m_devices["disk"].count(); i++) {
         allKeys.append(QString("hddr%1").arg(i));
         allKeys.append(QString("hddw%1").arg(i));
     }
-    // hdd temp
-    for (int i = 0; i < m_devices["hdd"].count(); i++)
-        allKeys.append(QString("hddtemp%1").arg(i));
     // network
-    for (int i = 0; i < m_devices["net"].count(); i++) {
+    for (auto i = 0; i < m_devices["net"].count(); i++) {
         allKeys.append(QString("downunits%1").arg(i));
         allKeys.append(QString("upunits%1").arg(i));
         allKeys.append(QString("downtotkb%1").arg(i));
@@ -129,8 +130,7 @@ QStringList AWKeyOperations::dictKeys() const
         allKeys.append(QString("up%1").arg(i));
     }
     // battery
-    QStringList allBatteryDevices
+    auto allBatteryDevices = QDir("/sys/class/power_supply")
-        = QDir("/sys/class/power_supply")
                                  .entryList(QStringList({"BAT*"}), QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
     for (int i = 0; i < allBatteryDevices.count(); i++) {
         allKeys.append(QString("bat%1").arg(i));
@@ -205,52 +205,48 @@ QString AWKeyOperations::infoByKey(const QString &_key) const
 {
     qCDebug(LOG_AW) << "Requested key" << _key;
 
-    QString stripped = _key;
+    auto stripped = _key;
     stripped.remove(QRegularExpression("\\d+"));
     QString output;
 
     if (_key.startsWith("bar")) {
-        AbstractExtItem *item = m_graphicalItems->itemByTag(_key, stripped);
+        auto *item = m_graphicalItems->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
     } else if (_key.startsWith("custom")) {
-        AbstractExtItem *item = m_extScripts->itemByTag(_key, stripped);
+        auto *item = m_extScripts->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
     } else if (_key.contains(QRegularExpression("^hdd[rw]"))) {
-        QString index = _key;
+        auto index = _key;
         index.remove(QRegularExpression("hdd[rw]"));
         output = m_devices["disk"][index.toInt()];
     } else if (_key.contains(QRegularExpression("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)"))) {
-        QString index = _key;
+        auto index = _key;
         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(QRegularExpression("^(down|up)[0-9]"))) {
-        QString index = _key;
+        auto index = _key;
         index.remove(QRegularExpression("^(down|up)"));
         output = m_devices["net"][index.toInt()];
     } else if (_key.startsWith("pkgcount")) {
-        AbstractExtItem *item = m_extUpgrade->itemByTag(_key, stripped);
+        auto *item = m_extUpgrade->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
     } else if (_key.contains(QRegularExpression("(^|perc)(ask|bid|price)(chg|)"))) {
-        AbstractExtItem *item = m_extQuotes->itemByTag(_key, stripped);
+        auto *item = m_extQuotes->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
     } else if (_key.contains(QRegularExpression("(weather|weatherId|humidity|pressure|temperature)"))) {
-        AbstractExtItem *item = m_extWeather->itemByTag(_key, stripped);
+        auto *item = m_extWeather->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
     } else if (_key.startsWith("temp")) {
-        QString index = _key;
+        auto index = _key;
         index.remove("temp");
         output = m_devices["temp"][index.toInt()];
     } else if (_key.startsWith("response")) {
-        AbstractExtItem *item = m_extNetRequest->itemByTag(_key, stripped);
+        auto *item = m_extNetRequest->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
     } else {
@@ -302,20 +298,26 @@ void AWKeyOperations::addDevice(const QString &_source)
 {
     qCDebug(LOG_AW) << "Source" << _source;
 
-    auto diskRegexp = QRegularExpression("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)");
+    auto diskRegexp = QRegularExpression("^disk/.*/read$");
-    auto mountRegexp = QRegularExpression("partitions/.*/filllevel");
+    auto mountRegexp = QRegularExpression("^disk/.*/usedPercent$");
     auto cpuTempRegExp = QRegularExpression("^cpu/cpu.*/temperature$");
+    auto gpuRegExp = QRegularExpression("^gpu/gpu.*/usage$");
 
     if (_source.contains(diskRegexp)) {
-        QString device = _source;
+        auto device = _source;
-        device.remove("/Rate/rblk");
+        device.remove("disk/").remove("/read");
         addKeyToCache("disk", device);
     } else if (_source.contains(mountRegexp)) {
-        QString device = _source;
+        auto device = _source;
-        device.remove("partitions").remove("/filllevel");
+        device.remove("disk/").remove("/usedPercent");
         addKeyToCache("mount", device);
-    } else if (_source.startsWith("lmsensors") || _source.contains(cpuTempRegExp) || _source == "cpu/all/averageTemperature") {
+    } else if (_source.startsWith("lmsensors") || _source.contains(cpuTempRegExp)
+               || _source == "cpu/all/averageTemperature") {
         addKeyToCache("temp", _source);
+    } else if (_source.contains(gpuRegExp)) {
+        auto device = _source;
+        device.remove("gpu/").remove("/usage");
+        addKeyToCache("gpu", device);
     }
 }
 

sources/awesome-widget/plugin/awkeys.cpp

@@ -60,7 +60,8 @@ AWKeys::AWKeys(QObject *_parent)
     connect(m_timer, &QTimer::timeout, this, &AWKeys::updateTextData);
 
     // transfer signal from AWDataAggregator object to QML ui
-    connect(m_dataAggregator, &AWDataAggregator::toolTipPainted, [this](const QString &_tooltip) { emit(needToolTipToBeUpdated(_tooltip)); });
+    connect(m_dataAggregator, &AWDataAggregator::toolTipPainted,
+            [this](const QString &_tooltip) { emit(needToolTipToBeUpdated(_tooltip)); });
 
     connect(this, &AWKeys::dropSourceFromDataengine, m_dataEngineAggregator, &AWDataEngineAggregator::dropSource);
     connect(m_dataEngineAggregator, &AWDataEngineAggregator::dataUpdated, this, &AWKeys::dataUpdated);
@@ -102,7 +103,7 @@ void AWKeys::initKeys(const QString &_currentPattern, const int _interval, const
     m_aggregator->initFormatters();
     m_keyOperator->setPattern(_currentPattern);
     m_keyOperator->updateCache();
-    m_dataEngineAggregator->reconnectSources(_interval);
+    m_dataEngineAggregator->loadSources();
 
     // timer
     m_timer->setInterval(_interval);

sources/awesomewidgets/extquotes.cpp

@@ -46,9 +46,8 @@ ExtQuotes::ExtQuotes(QObject *_parent, const QString &_filePath)
     // HACK declare as child of nullptr to avoid crash with plasmawindowed
     // in the destructor
     m_manager = new QNetworkAccessManager(nullptr);
-    connect(m_manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(quotesReplyReceived(QNetworkReply *)));
+    connect(m_manager, &QNetworkAccessManager::finished, this, &ExtQuotes::quotesReplyReceived);
-
+    connect(this, &ExtQuotes::requestDataUpdate, this, &ExtQuotes::sendRequest);
-    connect(this, SIGNAL(requestDataUpdate()), this, SLOT(sendRequest()));
 }
 
 
@@ -56,8 +55,8 @@ ExtQuotes::~ExtQuotes()
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
-    disconnect(m_manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(quotesReplyReceived(QNetworkReply *)));
+    disconnect(m_manager, &QNetworkAccessManager::finished, this, &ExtQuotes::quotesReplyReceived);
-    disconnect(this, SIGNAL(requestDataUpdate()), this, SLOT(sendRequest()));
+    disconnect(this, &ExtQuotes::requestDataUpdate, this, &ExtQuotes::sendRequest);
 
     m_manager->deleteLater();
 }

sources/awesomewidgets/quotes/aapl.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=AAPL.NASDAQ
+Name=AAPL
 Comment=Apple Inc
-X-AW-Ticker="AAPL"
+X-AW-Ticker="AAPL.US"
 X-AW-Active=false
 X-AW-ApiVersion=5
 X-AW-Interval=60

sources/awesomewidgets/quotes/goog.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=GOOG.NASDAQ
+Name=GOOG
 Comment=Google Inc
-X-AW-Ticker="GOOG"
+X-AW-Ticker="GOOG.US"
 X-AW-Active=false
 X-AW-ApiVersion=5
 X-AW-Interval=60

sources/awesomewidgets/quotes/msft.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=MSFT.NASDAQ
+Name=MSFT
 Comment=Microsoft Corp
-X-AW-Ticker="MSFT"
+X-AW-Ticker="MSFT.US"
 X-AW-Active=false
 X-AW-ApiVersion=5
 X-AW-Interval=60

sources/awesomewidgets/stooqquotesprovider.cpp

@@ -54,7 +54,7 @@ QVariantHash StooqQuotesProvider::parse(const QByteArray &_source, const QVarian
 
     QVariantHash values;
 
-    QStringList sourceValues = QString::fromUtf8(_source).trimmed().split(',');
+    auto sourceValues = QString::fromUtf8(_source).trimmed().split(',');
     if (sourceValues.count() != 2) {
         qCWarning(LOG_LIB) << "Parse error" << sourceValues;
         return values;
@@ -67,12 +67,12 @@ QVariantHash StooqQuotesProvider::parse(const QByteArray &_source, const QVarian
     // last trade
     auto price = sourceValues.at(0).toDouble();
     values[tag("pricechg")] = oldPrice == 0.0 ? 0.0 : price - oldPrice;
-    values[tag("percpricechg")] = 100.0 * values[tag("pricechg")].toDouble() / price;
+    values[tag("percpricechg")] = 100.0 * values[tag("pricechg")].toDouble() / oldPrice;
     values[tag("price")] = price;
     // volume
     auto volume = sourceValues.at(1).toInt();
     values[tag("volumechg")] = oldVolume == 0 ? 0 : volume - oldVolume;
-    values[tag("percvolumechg")] = 100.0 * values[tag("volumechg")].toDouble() / volume;
+    values[tag("percvolumechg")] = 100.0 * values[tag("volumechg")].toDouble() / oldVolume;
     values[tag("volume")] = volume;
 
     return values;

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

@@ -16,27 +16,20 @@
  ***************************************************************************/
 
 import QtQuick 2.15
+import org.kde.kcmutils as KCM
 
 import org.kde.plasma.private.desktoppanel 1.0
 
 
-Item {
+KCM.SimpleKCM {
     id: aboutPage
+
     // backend
     DPAdds {
         id: dpAdds
     }
 
-    width: childrenRect.width
-    height: childrenRect.height
-
-    property bool debug: awActions.isDebugEnabled()
-
     AboutTab {
         textProvider: dpAdds
     }
-
-    Component.onCompleted: {
-        if (debug) console.debug()
-    }
 }

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

@@ -16,24 +16,14 @@
  ***************************************************************************/
 
 import QtQuick 2.15
+import org.kde.kcmutils as KCM
 
 import org.kde.plasma.private.desktoppanel 1.0
 import "."
 
 
-Item {
+KCM.SimpleKCM {
     id: activeAppearancePage
-    // backend
-    DPAdds {
-        id: dpAdds
-    }
-
-    width: childrenRect.width
-    height: childrenRect.height
-    implicitWidth: pageColumn.implicitWidth
-    implicitHeight: pageColumn.implicitHeight
-
-    property bool debug: dpAdds.isDebugEnabled()
 
     property alias cfg_currentFontFamily: font.value
     property alias cfg_currentFontSize: fontSize.value
@@ -43,7 +33,6 @@ Item {
     property alias cfg_currentTextStyleColor: selectStyleColor.value
     property string cfg_currentTextStyle: textStyle.value
 
-
     Column {
         id: pageColumn
         anchors.fill: parent
@@ -99,9 +88,4 @@ Item {
             value: plasmoid.configuration.currentTextStyleColor
         }
     }
-
-
-    Component.onCompleted: {
-        if (debug) console.debug()
-    }
 }

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

@@ -17,23 +17,13 @@
 
 import QtQuick 2.15
 import QtQuick.Controls
+import org.kde.kcmutils as KCM
 
 import org.kde.plasma.private.desktoppanel 1.0
 
 
-Item {
+KCM.SimpleKCM {
     id: advancedPage
-    // backend
-    DPAdds {
-        id: dpAdds
-    }
-
-    width: childrenRect.width
-    height: childrenRect.height
-    implicitWidth: pageColumn.implicitWidth
-    implicitHeight: pageColumn.implicitHeight
-
-    property bool debug: dpAdds.isDebugEnabled()
 
     property alias cfg_background: background.checked
     property alias cfg_verticalLayout: verticalLayout.checked
@@ -44,7 +34,6 @@ Item {
     property alias cfg_tooltipWidth: tooltipWidth.value
     property alias cfg_tooltipColor: tooltipColor.value
 
-
     Column {
         id: pageColumn
         anchors.fill: parent
@@ -82,48 +71,48 @@ Item {
             editable: true
             model: [
                 {
-                    'label': '#',
+                    "label": "#",
-                    'name': '#'
+                    "name": "#"
                 },
                 {
-                    'label': '$',
+                    "label": "$",
-                    'name': '$'
+                    "name": "$"
                 },
                 {
-                    'label': '%',
+                    "label": "%",
-                    'name': '%'
+                    "name": "%"
                 },
                 {
-                    'label': '&',
+                    "label": "&",
-                    'name': '&'
+                    "name": "&"
                 },
                 {
-                    'label': '*',
+                    "label": "*",
-                    'name': '*'
+                    "name": "*"
                 },
                 {
-                    'label': '@',
+                    "label": "@",
-                    'name': '@'
+                    "name": "@"
                 },
                 {
-                    'label': '¤',
+                    "label": "¤",
-                    'name': '¤'
+                    "name": "¤"
                 },
                 {
-                    'label': '¶',
+                    "label": "¶",
-                    'name': '¶'
+                    "name": "¶"
                 },
                 {
-                    'label': '·',
+                    "label": "·",
-                    'name': '·'
+                    "name": "·"
                 },
                 {
-                    'label': 'º',
+                    "label": "º",
-                    'name': 'º'
+                    "name": "º"
                 },
                 {
-                    'label': plasmoid.configuration.mark,
+                    "label": plasmoid.configuration.mark,
-                    'name': plasmoid.configuration.mark
+                    "name": plasmoid.configuration.mark
                 }
             ]
             text: i18n("Mark")
@@ -144,16 +133,16 @@ Item {
                     id: tooltipType
                     model: [
                         {
-                            'label': i18n("contours"),
+                            "label": i18n("contours"),
-                            'name': "contours"
+                            "name": "contours"
                         },
                         {
-                            'label': i18n("names"),
+                            "label": i18n("names"),
-                            'name': "names"
+                            "name": "names"
                         },
                         {
-                            'label': i18n("none"),
+                            "label": i18n("none"),
-                            'name': "none"
+                            "name": "none"
                         }
                     ]
                     text: i18n("Tooltip type")
@@ -178,8 +167,4 @@ Item {
             }
         }
     }
-
-    Component.onCompleted: {
-        if (debug) console.debug()
-    }
 }

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

@@ -16,24 +16,14 @@
  ***************************************************************************/
 
 import QtQuick 2.15
+import org.kde.kcmutils as KCM
 
 import org.kde.plasma.private.desktoppanel 1.0
 import "."
 
 
-Item {
+KCM.SimpleKCM {
     id: inactiveAppearancePage
-    // backend
-    DPAdds {
-        id: dpAdds
-    }
-
-    width: childrenRect.width
-    height: childrenRect.height
-    implicitWidth: pageColumn.implicitWidth
-    implicitHeight: pageColumn.implicitHeight
-
-    property bool debug: dpAdds.isDebugEnabled()
 
     property alias cfg_fontFamily: font.value
     property alias cfg_fontSize: fontSize.value
@@ -43,7 +33,6 @@ Item {
     property alias cfg_textStyleColor: selectStyleColor.value
     property string cfg_textStyle: textStyle.value
 
-
     Column {
         id: pageColumn
         anchors.fill: parent
@@ -99,9 +88,4 @@ Item {
             value: plasmoid.configuration.textStyleColor
         }
     }
-
-
-    Component.onCompleted: {
-        if (debug) console.debug()
-    }
 }

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

@@ -32,7 +32,6 @@ PlasmoidItem {
         id: dpAdds
     }
 
-    property bool debug: dpAdds.isDebugEnabled()
     property variant tooltipSettings: {
         "tooltipColor": plasmoid.configuration.tooltipColor,
         "tooltipType": plasmoid.configuration.tooltipType,
@@ -43,14 +42,12 @@ PlasmoidItem {
     signal needTooltipUpdate
     signal sizeUpdate
 
-
     // init
     Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
     Plasmoid.icon: "utilities-system-monitor"
     Plasmoid.backgroundHints: plasmoid.configuration.background ? "DefaultBackground" : "NoBackground"
 
-
     // ui
     GridLayout {
         anchors.fill: parent
@@ -97,7 +94,6 @@ PlasmoidItem {
         }
     }
 
-
     Timer {
         id: timer
         interval: 1000
@@ -105,19 +101,16 @@ PlasmoidItem {
     }
 
     onNeedUpdate: {
-        if (debug) console.debug()
+        for (let i = 0; i < repeater.count; i++) {
-
-        for (var i=0; i<repeater.count; i++) {
             if (!repeater.itemAt(i)) {
-                if (debug) console.info("Nothing to do here yet", i)
                 timer.start()
                 return
             }
             repeater.itemAt(i).text = dpAdds.parsePattern(plasmoid.configuration.text, i)
-            if (dpAdds.currentDesktop() == i) {
+            if (dpAdds.currentDesktop() === i) {
                 repeater.itemAt(i).color = plasmoid.configuration.currentFontColor
                 repeater.itemAt(i).font.family = plasmoid.configuration.currentFontFamily
-                repeater.itemAt(i).font.italic = plasmoid.configuration.currentFontStyle == "italic"
+                repeater.itemAt(i).font.italic = plasmoid.configuration.currentFontStyle === "italic"
                 repeater.itemAt(i).font.pointSize = plasmoid.configuration.currentFontSize
                 repeater.itemAt(i).font.weight = General.fontWeight[plasmoid.configuration.currentFontWeight]
                 repeater.itemAt(i).style = General.textStyle[plasmoid.configuration.currentTextStyle]
@@ -125,7 +118,7 @@ PlasmoidItem {
             } else {
                 repeater.itemAt(i).color = plasmoid.configuration.fontColor
                 repeater.itemAt(i).font.family = plasmoid.configuration.fontFamily
-                repeater.itemAt(i).font.italic = plasmoid.configuration.fontStyle == "italic"
+                repeater.itemAt(i).font.italic = plasmoid.configuration.fontStyle === "italic"
                 repeater.itemAt(i).font.pointSize = plasmoid.configuration.fontSize
                 repeater.itemAt(i).font.weight = General.fontWeight[plasmoid.configuration.fontWeight]
                 repeater.itemAt(i).style = General.textStyle[plasmoid.configuration.textStyle]
@@ -139,13 +132,11 @@ PlasmoidItem {
     }
 
     onNeedTooltipUpdate: {
-        if (debug) console.debug()
+        for (let i = 0; i < repeater.count; i++) {
-
-        for (var i=0; i<repeater.count; i++) {
             repeater.itemAt(i).tooltip.text = dpAdds.toolTipImage(i)
             // resize text tooltip to content size
             // this hack does not work for images-based tooltips
-            if (tooltipSettings.tooltipType == "names") {
+            if (tooltipSettings.tooltipType === "names") {
                 repeater.itemAt(i).tooltip.height = repeater.itemAt(i).tooltip.implicitHeight
                 repeater.itemAt(i).tooltip.width = repeater.itemAt(i).tooltip.implicitWidth
             }
@@ -153,11 +144,9 @@ PlasmoidItem {
     }
 
     onSizeUpdate: {
-        if (debug) console.debug()
+        if (plasmoid.configuration.height === 0) {
-
+            let newHeight = 0
-        if (plasmoid.configuration.height == 0) {
+            for (let i = 0; i < repeater.count; i++)
-            var newHeight = 0
-            for (var i=0; i<repeater.count; i++)
                 newHeight += repeater.itemAt(i).contentHeight
             Layout.minimumHeight = newHeight
             Layout.maximumHeight = -1
@@ -165,9 +154,9 @@ PlasmoidItem {
             Layout.minimumHeight = plasmoid.configuration.height
             Layout.maximumHeight = plasmoid.configuration.height
         }
-        if (plasmoid.configuration.width == 0) {
+        if (plasmoid.configuration.width === 0) {
-            var newWidth = 0
+            let newWidth = 0
-            for (var i=0; i<repeater.count; i++)
+            for (let i = 0; i < repeater.count; i++)
                 newWidth += repeater.itemAt(i).contentWidth
             Layout.minimumWidth = newWidth
             Layout.maximumWidth = -1
@@ -179,7 +168,6 @@ PlasmoidItem {
 
     Plasmoid.onUserConfiguringChanged: {
         if (plasmoid.userConfiguring) return
-        if (debug) console.debug()
 
         dpAdds.setMark(plasmoid.configuration.mark)
         dpAdds.setToolTipData(tooltipSettings)
@@ -188,8 +176,6 @@ PlasmoidItem {
     }
 
     Component.onCompleted: {
-        if (debug) console.debug()
-
         // init submodule
         Plasmoid.userConfiguringChanged(false)
         dpAdds.desktopChanged.connect(needUpdate)

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

@@ -16,28 +16,21 @@
  ***************************************************************************/
 
 import QtQuick 2.15
+import org.kde.kcmutils as KCM
 
 import org.kde.plasma.private.desktoppanel 1.0
 import "."
 
 
-Item {
+KCM.SimpleKCM {
     id: widgetPage
     // backend
     DPAdds {
         id: dpAdds
     }
 
-    width: childrenRect.width
-    height: childrenRect.height
-    implicitWidth: pageColumn.implicitWidth
-    implicitHeight: pageColumn.implicitHeight
-
-    property bool debug: dpAdds.isDebugEnabled()
-
     property alias cfg_text: textPattern.text
 
-
     Column {
         id: pageColumn
         anchors.fill: parent
@@ -60,9 +53,4 @@ Item {
             backend: dpAdds
         }
     }
-
-
-    Component.onCompleted: {
-        if (debug) console.debug()
-    }
 }

sources/desktop-panel/package/metadata.json

@@ -19,7 +19,7 @@
         "Id": "org.kde.plasma.desktoppanel",
         "License": "GPLv3",
         "Name": "Desktop Panel",
-        "Version": "3.5.1",
+        "Version": "4.0.0",
         "Website": "https://arcanis.me/projects/awesome-widgets/"
     },
     "X-Plasma-API-Minimum-Version": "6.0"

sources/desktop-panel/plugin/dpadds.cpp

@@ -49,9 +49,7 @@ DPAdds::DPAdds(QObject *_parent)
     m_vdi = new TaskManager::VirtualDesktopInfo(this);
     m_taskModel = new TaskManager::WindowTasksModel(this);
 
-    connect(m_vdi, SIGNAL(currentDesktopChanged()), this, SIGNAL(desktopChanged()));
+    connect(m_vdi, &TaskManager::VirtualDesktopInfo::currentDesktopChanged, this, &DPAdds::desktopChanged);
-    connect(KWindowSystem::self(), SIGNAL(windowAdded(WId)), this, SIGNAL(windowListChanged()));
-    connect(KWindowSystem::self(), SIGNAL(windowRemoved(WId)), this, SIGNAL(windowListChanged()));
 }
 
 
@@ -64,13 +62,6 @@ DPAdds::~DPAdds()
 }
 
 
-// HACK: since QML could not use QLoggingCategory I need this hack
-bool DPAdds::isDebugEnabled()
-{
-    return LOG_DP().isDebugEnabled();
-}
-
-
 int DPAdds::currentDesktop() const
 {
     auto current = m_vdi->currentDesktop();

sources/desktop-panel/plugin/dpadds.h

@@ -46,7 +46,6 @@ class DPAdds : public QObject
 public:
     explicit DPAdds(QObject *_parent = nullptr);
     ~DPAdds() override;
-    Q_INVOKABLE static bool isDebugEnabled();
     Q_INVOKABLE [[nodiscard]] int currentDesktop() const;
     Q_INVOKABLE static QStringList dictKeys(bool _sorted = true, const QString &_regexp = "");
     Q_INVOKABLE [[nodiscard]] int numberOfDesktops() const;

sources/extsysmon/extsysmon.cpp

@@ -27,8 +27,6 @@
 
 #include "awdebug.h"
 #include "extsysmonaggregator.h"
-#include "gpuloadsource.h"
-#include "hddtempsource.h"
 
 
 ExtendedSysMon::ExtendedSysMon(QObject *_parent, const QVariantList &_args)
@@ -53,9 +51,6 @@ void ExtendedSysMon::readConfiguration()
 
     settings.beginGroup("Configuration");
     rawConfig["ACPIPATH"] = settings.value("ACPIPATH", "/sys/class/power_supply/").toString();
-    rawConfig["GPUDEV"] = settings.value("GPUDEV", "auto").toString();
-    rawConfig["HDDDEV"] = settings.value("HDDDEV", "all").toString();
-    rawConfig["HDDTEMPCMD"] = settings.value("HDDTEMPCMD", "sudo smartctl -a").toString();
     rawConfig["MPDADDRESS"] = settings.value("MPDADDRESS", "localhost").toString();
     rawConfig["MPDPORT"] = settings.value("MPDPORT", "6600").toString();
     rawConfig["MPRIS"] = settings.value("MPRIS", "auto").toString();
@@ -71,31 +66,6 @@ QHash<QString, QString> ExtendedSysMon::updateConfiguration(QHash<QString, QStri
 {
     qCDebug(LOG_ESM) << "Raw configuration" << _rawConfig;
 
-    // gpudev
-    if (_rawConfig["GPUDEV"] == "disable")
-        ;
-    else if (_rawConfig["GPUDEV"] == "auto")
-        _rawConfig["GPUDEV"] = GPULoadSource::autoGpu();
-    else if ((_rawConfig["GPUDEV"] != "ati") && (_rawConfig["GPUDEV"] != "nvidia"))
-        _rawConfig["GPUDEV"] = GPULoadSource::autoGpu();
-    // hdddev
-    auto allHddDevices = HDDTemperatureSource::allHdd();
-    if (_rawConfig["HDDDEV"] == "all") {
-        _rawConfig["HDDDEV"] = allHddDevices.join(',');
-    } else if (_rawConfig["HDDDEV"] == "disable") {
-        _rawConfig["HDDDEV"] = "";
-    } else {
-        auto deviceList = _rawConfig["HDDDEV"].split(',', Qt::SkipEmptyParts);
-        QStringList devices;
-        auto diskRegexp = QRegularExpression("^/dev/[hms]d[a-z]$");
-        for (auto &device : deviceList)
-            if ((QFile::exists(device)) && (device.contains(diskRegexp)))
-                devices.append(device);
-        if (devices.isEmpty())
-            _rawConfig["HDDDEV"] = allHddDevices.join(',');
-        else
-            _rawConfig["HDDDEV"] = devices.join(',');
-    }
     // player
     if ((_rawConfig["PLAYER"] != "mpd") && (_rawConfig["PLAYER"] != "mpris") && (_rawConfig["PLAYER"] != "disable"))
         _rawConfig["PLAYER"] = "mpris";

sources/extsysmon/extsysmonaggregator.cpp

@@ -22,9 +22,6 @@
 #include "customsource.h"
 #include "desktopsource.h"
 #include "extsysmonsensor.h"
-#include "gpuloadsource.h"
-#include "gputempsource.h"
-#include "hddtempsource.h"
 #include "loadsource.h"
 #include "networksource.h"
 #include "playersource.h"
@@ -64,15 +61,8 @@ void ExtSysMonAggregator::init(const QHash<QString, QString> &_config)
     // custom
     createSensor("custom", i18n("Scripts"), new CustomSource(this, {}));
     // desktop
-    // FIXME causes segfault
+    // FIXME causes segfault in kde libs
-    createSensor("desktop", i18n("Desktop"), new DesktopSource(this, {}));
+    //    createSensor("desktop", i18n("Desktop"), new DesktopSource(this, {}));
-    // gpu load
-    createSensor("gpuload", i18n("GPU load"), new GPULoadSource(this, {_config["GPUDEV"]}));
-    // gpu temperature
-    createSensor("gputemp", i18n("GPU temperature"), new GPUTemperatureSource(this, {_config["GPUDEV"]}));
-    // hdd temperature
-    createSensor("hdd", i18n("HDD temperature"),
-                 new HDDTemperatureSource(this, {_config["HDDDEV"], _config["HDDTEMPCMD"]}));
     // network
     createSensor("network", i18n("Network"), new NetworkSource(this, {}));
     // player

sources/extsysmon/plasma-dataengine-extsysmon.conf

@@ -1,13 +1,6 @@
 [Configuration]
 # ACPI devices
 ACPIPATH=/sys/class/power_supply/
-# May be 'nvidia' (for nvidia), 'ati' (for ATI RADEON), 'disable' or 'auto'
-GPUDEV=auto
-# HDD temperature
-## Set block device for hddtemp comma separated or use 'all' or 'disable'
-HDDDEV=all
-# cmd
-HDDTEMPCMD=sudo smartctl -a
 # mpd server settings
 MPDADDRESS=localhost
 MPDPORT=6600

sources/extsysmonsources/desktopsource.cpp

@@ -51,13 +51,13 @@ QVariant DesktopSource::data(const QString &_source)
     auto decrement = KWindowSystem::isPlatformX11() ? 1 : 0;
     auto current = nativeIndex - decrement;
 
-    if (_source == "current/name") {
+    if (_source == "name") {
         return m_vdi->desktopNames().at(current);
-    } else if (_source == "current/number") {
+    } else if (_source == "number") {
         return current + 1;
-    } else if (_source == "total/name") {
+    } else if (_source == "names") {
         return m_vdi->desktopNames();
-    } else if (_source == "total/number") {
+    } else if (_source == "count") {
         return m_vdi->numberOfDesktops();
     }
 
@@ -70,20 +70,20 @@ KSysGuard::SensorInfo *DesktopSource::initialData(const QString &_source) const
     qCDebug(LOG_ESS) << "Source" << _source;
 
     auto data = new KSysGuard::SensorInfo();
-    if (_source == "current/name") {
+    if (_source == "name") {
         data->name = "Current desktop name";
         data->variantType = QVariant::String;
         data->unit = KSysGuard::UnitNone;
-    } else if (_source == "current/number") {
+    } else if (_source == "number") {
         data->min = 0;
         data->name = "Current desktop number";
         data->variantType = QVariant::Int;
         data->unit = KSysGuard::UnitNone;
-    } else if (_source == "total/name") {
+    } else if (_source == "names") {
         data->name = "All desktops by name";
         data->variantType = QVariant::StringList;
         data->unit = KSysGuard::UnitNone;
-    } else if (_source == "total/number") {
+    } else if (_source == "count") {
         data->min = 0;
         data->name = "Desktops count";
         data->variantType = QVariant::Int;
@@ -97,10 +97,10 @@ KSysGuard::SensorInfo *DesktopSource::initialData(const QString &_source) const
 QStringList DesktopSource::sources() const
 {
     QStringList sources;
-    sources.append("current/name");
+    sources.append("name");
-    sources.append("current/number");
+    sources.append("number");
-    sources.append("total/name");
+    sources.append("names");
-    sources.append("total/number");
+    sources.append("count");
 
     return sources;
 }

sources/extsysmonsources/extsysmonsensor.cpp

@@ -67,7 +67,6 @@ void ExtSysMonSensor::update()
             continue; // skip properties which are not explicitly subscribed
 
         auto value = m_source->data(source);
-        qCWarning(LOG_ESS) << source << value;
         property->setValue(value);
     }
 }

sources/extsysmonsources/gpuloadsource.cpp

@@ -1,151 +0,0 @@
-/***************************************************************************
- *   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 "gpuloadsource.h"
-
-#include <ksysguard/formatter/Unit.h>
-#include <ksysguard/systemstats/SensorInfo.h>
-
-#include <QFile>
-#include <QProcess>
-
-#include "awdebug.h"
-
-
-GPULoadSource::GPULoadSource(QObject *_parent, const QStringList &_args)
-    : AbstractExtSysMonSource(_parent, _args)
-{
-    Q_ASSERT(_args.count() == 1);
-    qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
-
-    m_device = _args.at(0);
-
-    m_process = new QProcess(nullptr);
-    // fucking magic from http://doc.qt.io/qt-5/qprocess.html#finished
-    connect(m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
-            [this](int, QProcess::ExitStatus) { return updateValue(); });
-    m_process->waitForFinished(0);
-}
-
-
-GPULoadSource::~GPULoadSource()
-{
-    qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
-
-    m_process->kill();
-    m_process->deleteLater();
-}
-
-
-QString GPULoadSource::autoGpu()
-{
-    QString gpu = "disable";
-    QFile moduleFile("/proc/modules");
-    if (!moduleFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        qCWarning(LOG_AW) << "Could not open file as text" << moduleFile.fileName();
-        return gpu;
-    }
-
-    QString output = moduleFile.readAll();
-    moduleFile.close();
-    if (output.contains("fglrx"))
-        gpu = "ati";
-    else if (output.contains("nvidia"))
-        gpu = "nvidia";
-
-    qCInfo(LOG_ESM) << "Device" << gpu;
-    return gpu;
-}
-
-
-QVariant GPULoadSource::data(const QString &_source)
-{
-    qCDebug(LOG_ESS) << "Source" << _source;
-
-    if (_source == "load")
-        run();
-
-    return m_values[_source];
-}
-
-
-KSysGuard::SensorInfo *GPULoadSource::initialData(const QString &_source) const
-{
-    qCDebug(LOG_ESS) << "Source" << _source;
-
-    auto data = new KSysGuard::SensorInfo();
-    if (_source == "load") {
-        data->min = 0.0;
-        data->max = 100.0;
-        data->name = "GPU usage";
-        data->variantType = QVariant::Double;
-        data->unit = KSysGuard::UnitPercent;
-    }
-
-    return data;
-}
-
-
-void GPULoadSource::run()
-{
-    if ((m_device != "nvidia") && (m_device != "ati"))
-        return;
-    // build cmd
-    QString cmd = m_device == "nvidia" ? "nvidia-smi" : "aticonfig";
-    auto args = m_device == "nvidia" ? QStringList({"-q", "-x"}) : QStringList({"--od-getclocks"});
-    qCInfo(LOG_ESS) << "cmd" << cmd;
-
-    m_process->start(cmd, args);
-}
-
-
-QStringList GPULoadSource::sources() const
-{
-    QStringList sources;
-    sources.append("load");
-
-    return sources;
-}
-
-
-void GPULoadSource::updateValue()
-{
-    qCInfo(LOG_ESS) << "Cmd returns" << m_process->exitCode();
-    QString qdebug = QString::fromUtf8(m_process->readAllStandardError()).trimmed();
-    qCInfo(LOG_ESS) << "Error" << qdebug;
-    QString qoutput = QString::fromUtf8(m_process->readAllStandardOutput()).trimmed();
-    qCInfo(LOG_ESS) << "Output" << qoutput;
-
-    if (m_device == "nvidia") {
-        for (auto &str : qoutput.split('\n', Qt::SkipEmptyParts)) {
-            if (!str.contains("<gpu_util>"))
-                continue;
-            auto load = str.remove("<gpu_util>").remove("</gpu_util>").remove('%');
-            m_values["load"] = load.toFloat();
-            break;
-        }
-    } else if (m_device == "ati") {
-        for (auto &str : qoutput.split('\n', Qt::SkipEmptyParts)) {
-            if (!str.contains("load"))
-                continue;
-            QString load = str.split(' ', Qt::SkipEmptyParts)[3].remove('%');
-            m_values["load"] = load.toFloat();
-            break;
-        }
-    }
-
-    emit(dataReceived(m_values));
-}

sources/extsysmonsources/gpuloadsource.h

@@ -1,52 +0,0 @@
-/***************************************************************************
- *   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 GPULOADSOURCE_H
-#define GPULOADSOURCE_H
-
-#include <QObject>
-
-#include "abstractextsysmonsource.h"
-
-
-class QProcess;
-
-class GPULoadSource : public AbstractExtSysMonSource
-{
-    Q_OBJECT
-
-public:
-    explicit GPULoadSource(QObject *_parent, const QStringList &_args);
-    ~GPULoadSource() override;
-    static QString autoGpu();
-    QVariant data(const QString &_source) override;
-    [[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
-    void run() override;
-    [[nodiscard]] QStringList sources() const override;
-
-private slots:
-    void updateValue();
-
-private:
-    // configuration and values
-    QString m_device;
-    QProcess *m_process = nullptr;
-    QVariantHash m_values;
-};
-
-
-#endif /* GPULOADSOURCE_H */

sources/extsysmonsources/gputempsource.cpp

@@ -1,131 +0,0 @@
-/***************************************************************************
- *   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 "gputempsource.h"
-
-#include <ksysguard/formatter/Unit.h>
-#include <ksysguard/systemstats/SensorInfo.h>
-
-#include <QFile>
-#include <QProcess>
-
-#include "awdebug.h"
-
-
-GPUTemperatureSource::GPUTemperatureSource(QObject *_parent, const QStringList &_args)
-    : AbstractExtSysMonSource(_parent, _args)
-{
-    Q_ASSERT(_args.count() == 1);
-    qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
-
-    m_device = _args.at(0);
-
-    m_process = new QProcess(nullptr);
-    // fucking magic from http://doc.qt.io/qt-5/qprocess.html#finished
-    connect(m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
-            [this](int, QProcess::ExitStatus) { return updateValue(); });
-    m_process->waitForFinished(0);
-}
-
-
-GPUTemperatureSource::~GPUTemperatureSource()
-{
-    qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
-
-    m_process->kill();
-    m_process->deleteLater();
-}
-
-
-QVariant GPUTemperatureSource::data(const QString &_source)
-{
-    qCDebug(LOG_ESS) << "Source" << _source;
-
-    if (_source == "temperature")
-        run();
-
-    return m_values[_source];
-}
-
-
-KSysGuard::SensorInfo *GPUTemperatureSource::initialData(const QString &_source) const
-{
-    qCDebug(LOG_ESS) << "Source" << _source;
-
-    auto data = new KSysGuard::SensorInfo();
-    if (_source == "temperature") {
-        data->min = 0.0;
-        data->max = 0.0;
-        data->name = "GPU temperature";
-        data->variantType = QVariant::Double;
-        data->unit = KSysGuard::UnitCelsius;
-    }
-
-    return data;
-}
-
-
-void GPUTemperatureSource::run()
-{
-    if ((m_device != "nvidia") && (m_device != "ati"))
-        return;
-    // build cmd
-    QString cmd = m_device == "nvidia" ? "nvidia-smi" : "aticonfig";
-    auto args = m_device == "nvidia" ? QStringList({"-q", "-x"}) : QStringList({"--od-gettemperature"});
-    qCInfo(LOG_ESS) << "cmd" << cmd;
-
-    m_process->start(cmd, args);
-}
-
-
-QStringList GPUTemperatureSource::sources() const
-{
-    QStringList sources;
-    sources.append("temperature");
-
-    return sources;
-}
-
-
-void GPUTemperatureSource::updateValue()
-{
-    qCInfo(LOG_ESS) << "Cmd returns" << m_process->exitCode();
-    QString qdebug = QString::fromUtf8(m_process->readAllStandardError()).trimmed();
-    qCInfo(LOG_ESS) << "Error" << qdebug;
-    QString qoutput = QString::fromUtf8(m_process->readAllStandardOutput()).trimmed();
-    qCInfo(LOG_ESS) << "Output" << qoutput;
-
-    if (m_device == "nvidia") {
-        for (auto &str : qoutput.split('\n', Qt::SkipEmptyParts)) {
-            if (!str.contains("<gpu_temp>"))
-                continue;
-            QString temp = str.remove("<gpu_temp>").remove("C</gpu_temp>");
-            m_values["temperature"] = temp.toFloat();
-            break;
-        }
-    } else if (m_device == "ati") {
-        for (auto &str : qoutput.split('\n', Qt::SkipEmptyParts)) {
-            if (!str.contains("Temperature"))
-                continue;
-            QString temp = str.split(' ', Qt::SkipEmptyParts).at(4);
-            m_values["temperature"] = temp.toFloat();
-            break;
-        }
-    }
-
-    emit(dataReceived(m_values));
-}

sources/extsysmonsources/gputempsource.h

@@ -1,51 +0,0 @@
-/***************************************************************************
- *   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 GPUTEMPSOURCE_H
-#define GPUTEMPSOURCE_H
-
-#include <QObject>
-
-#include "abstractextsysmonsource.h"
-
-
-class QProcess;
-
-class GPUTemperatureSource : public AbstractExtSysMonSource
-{
-    Q_OBJECT
-
-public:
-    explicit GPUTemperatureSource(QObject *_parent, const QStringList &_args);
-    ~GPUTemperatureSource() override;
-    QVariant data(const QString &_source) override;
-    [[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
-    void run() override;
-    [[nodiscard]] QStringList sources() const override;
-
-private slots:
-    void updateValue();
-
-private:
-    // configuration and values
-    QString m_device;
-    QProcess *m_process = nullptr;
-    QVariantHash m_values;
-};
-
-
-#endif /* GPUTEMPSOURCE_H */

sources/extsysmonsources/hddtempsource.cpp

@@ -1,152 +0,0 @@
-/***************************************************************************
- *   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 "hddtempsource.h"
-
-#include <ksysguard/formatter/Unit.h>
-#include <ksysguard/systemstats/SensorInfo.h>
-
-#include <QDir>
-#include <QProcess>
-
-#include "awdebug.h"
-
-
-HDDTemperatureSource::HDDTemperatureSource(QObject *_parent, const QStringList &_args)
-    : AbstractExtSysMonSource(_parent, _args)
-{
-    Q_ASSERT(_args.count() == 2);
-    qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
-
-    m_devices = _args.at(0).split(',', Qt::SkipEmptyParts);
-    m_cmd = _args.at(1).split(' '); // lets hope no one put cmd with spaces here lol
-
-    m_smartctl = m_cmd.contains("smartctl");
-    qCInfo(LOG_ESS) << "Parse as smartctl" << m_smartctl;
-
-    for (auto &device : m_devices) {
-        m_processes[device] = new QProcess(nullptr);
-        // fucking magic from http://doc.qt.io/qt-5/qprocess.html#finished
-        connect(m_processes[device], QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
-                [this, &device](int, QProcess::ExitStatus) { return updateValue(device); });
-        m_processes[device]->waitForFinished(0);
-    }
-}
-
-
-HDDTemperatureSource::~HDDTemperatureSource()
-{
-    qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
-
-    for (auto &device : m_devices) {
-        m_processes[device]->kill();
-        m_processes[device]->deleteLater();
-    }
-}
-
-
-QStringList HDDTemperatureSource::allHdd()
-{
-    QStringList allDevices = QDir("/dev").entryList(QDir::System, QDir::Name);
-    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));
-
-    qCInfo(LOG_ESS) << "Device list" << devices;
-    return devices;
-}
-
-
-QVariant HDDTemperatureSource::data(const QString &_source)
-{
-    qCDebug(LOG_ESS) << "Source" << _source;
-
-    QString device = _source;
-    device.remove("temperature");
-    // run cmd
-    if (m_processes[device]->state() == QProcess::NotRunning) {
-        auto cmd = m_cmd.first();
-        auto args = m_cmd.mid(1);
-        args.append(device);
-        m_processes[device]->start(cmd, args);
-    }
-
-    return m_values[device];
-}
-
-
-KSysGuard::SensorInfo *HDDTemperatureSource::initialData(const QString &_source) const
-{
-    qCDebug(LOG_ESS) << "Source" << _source;
-
-    auto device = _source;
-    device.remove("temperature");
-
-    auto data = new KSysGuard::SensorInfo();
-    data->min = 0.0;
-    data->max = 0.0;
-    data->name = QString("HDD '%1' temperature").arg(device);
-    data->variantType = QVariant::Double;
-    data->unit = KSysGuard::UnitCelsius;
-
-    return data;
-}
-
-
-QStringList HDDTemperatureSource::sources() const
-{
-    QStringList sources;
-    for (auto &device : m_devices)
-        sources.append(QString("temperature%1").arg(device));
-
-    return sources;
-}
-
-
-void HDDTemperatureSource::updateValue(const QString &_device)
-{
-    qCDebug(LOG_ESS) << "Called with device" << _device;
-
-    qCInfo(LOG_ESS) << "Cmd returns" << m_processes[_device]->exitCode();
-    QString qdebug = QString::fromUtf8(m_processes[_device]->readAllStandardError()).trimmed();
-    qCInfo(LOG_ESS) << "Error" << qdebug;
-    QString qoutput = QString::fromUtf8(m_processes[_device]->readAllStandardOutput()).trimmed();
-    qCInfo(LOG_ESS) << "Output" << qoutput;
-
-    // parse
-    if (m_smartctl) {
-        QStringList lines = qoutput.split('\n', Qt::SkipEmptyParts);
-        for (auto &str : lines) {
-            if (!str.startsWith("194"))
-                continue;
-            if (str.split(' ', Qt::SkipEmptyParts).count() < 9)
-                continue;
-            m_values[_device] = str.split(' ', Qt::SkipEmptyParts).at(9).toFloat();
-            break;
-        }
-    } else {
-        QStringList lines = qoutput.split(':', Qt::SkipEmptyParts);
-        if (lines.count() >= 3) {
-            QString temp = lines.at(2);
-            temp.remove(QChar(0260)).remove('C');
-            m_values[_device] = temp.toFloat();
-        }
-    }
-
-    emit(dataReceived(m_values));
-}

sources/extsysmonsources/hddtempsource.h

@@ -1,55 +0,0 @@
-/***************************************************************************
- *   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 HDDTEMPSOURCE_H
-#define HDDTEMPSOURCE_H
-
-#include <QObject>
-
-#include "abstractextsysmonsource.h"
-
-
-class QProcess;
-
-class HDDTemperatureSource : public AbstractExtSysMonSource
-{
-    Q_OBJECT
-
-public:
-    explicit HDDTemperatureSource(QObject *_parent, const QStringList &_args);
-    ~HDDTemperatureSource() override;
-    static QStringList allHdd();
-    QVariant data(const QString &_source) override;
-    [[nodiscard]] KSysGuard::SensorInfo *initialData(const QString &_source) const override;
-    void run() override{};
-    [[nodiscard]] QStringList sources() const override;
-
-private slots:
-    void updateValue(const QString &_device);
-
-private:
-    // properties
-    QHash<QString, QProcess *> m_processes;
-    // configuration and values
-    QStringList m_cmd;
-    QStringList m_devices;
-    bool m_smartctl;
-    QHash<QString, QVariant> m_values;
-};
-
-
-#endif /* HDDTEMPSOURCE_H */

sources/extsysmonsources/networksource.cpp

@@ -52,7 +52,7 @@ NetworkSource::~NetworkSource()
 
 QVariant NetworkSource::data(const QString &_source)
 {
-    qCWarning(LOG_ESS) << "Source" << _source;
+    qCDebug(LOG_ESS) << "Source" << _source;
 
     if (!m_values.contains(_source))
         run();
@@ -82,7 +82,9 @@ KSysGuard::SensorInfo *NetworkSource::initialData(const QString &_source) const
 void NetworkSource::run()
 {
     m_values["device"] = NetworkSource::getCurrentDevice();
+    if (m_process->state() == QProcess::ProcessState::NotRunning) {
         m_process->start("iwgetid", {"-r"});
+    }
 }
 
 

sources/extsysmonsources/processessource.cpp

@@ -56,17 +56,17 @@ KSysGuard::SensorInfo *ProcessesSource::initialData(const QString &_source) cons
     qCDebug(LOG_ESS) << "Source" << _source;
 
     auto data = new KSysGuard::SensorInfo();
-    if (_source == "running/count") {
+    if (_source == "running") {
         data->min = 0;
         data->max = 0;
         data->name = "Count of running processes";
         data->variantType = QVariant::Int;
         data->unit = KSysGuard::UnitNone;
-    } else if (_source == "running/list") {
+    } else if (_source == "list") {
         data->name = "All running processes list";
         data->variantType = QVariant::StringList;
         data->unit = KSysGuard::UnitNone;
-    } else if (_source == "total/count") {
+    } else if (_source == "count") {
         data->min = 0;
         data->max = 0;
         data->name = "Total count of processes";
@@ -99,18 +99,18 @@ void ProcessesSource::run()
         cmdFile.close();
     }
 
-    m_values["running/count"] = running.count();
+    m_values["running"] = running.count();
-    m_values["running/list"] = running;
+    m_values["list"] = running;
-    m_values["total/count"] = directories.count();
+    m_values["count"] = directories.count();
 }
 
 
 QStringList ProcessesSource::sources() const
 {
     QStringList sources;
-    sources.append("running/count");
+    sources.append("running");
-    sources.append("running/list");
+    sources.append("list");
-    sources.append("total/count");
+    sources.append("count");
 
     return sources;
 }

sources/extsysmonsources/weathersource.cpp

@@ -49,12 +49,10 @@ QVariant WeatherSource::data(const QString &_source)
 
     int ind = index(_source);
     if (!m_values.contains(_source)) {
-        QVariantHash data = m_extWeather->itemByTagNumber(ind)->run();
+        auto data = m_extWeather->itemByTagNumber(ind)->run();
-        for (auto &key : data.keys())
+        m_values.insert(data);
-            m_values[key] = data[key];
     }
-    QVariant value = m_values.take(_source);
+    return m_values.take(_source);
-    return value;
 }
 
 
@@ -94,7 +92,7 @@ KSysGuard::SensorInfo *WeatherSource::initialData(const QString &_source) const
         data->unit = KSysGuard::UnitCelsius;
     } else if (_source.startsWith("timestamp")) {
         data->name = QString("Timestamp for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
-        data->variantType = QVariant::String;
+        data->variantType = QVariant::DateTime;
         data->unit = KSysGuard::UnitNone;
     }
 

sources/qml/AWExtensions.qml

@@ -68,23 +68,27 @@ Row {
         }
     }
 
-    // TODO migrate history
+    Button {
-    // Button {
+        width: parent.width / 15
-    //     width: parent.width / 15
+        icon.name: "view-history"
-    //     iconName: "view-history"
+
-    //     menu: Menu {
+        onClicked: historyConfig.open()
-    //         id: historyConfig
+
-    //         Instantiator {
+        Menu {
-    //             model: awTelemetryHandler.get("awwidgetconfig")
+            id: historyConfig
-    //             MenuItem {
+
-    //                 text: modelData
+            Instantiator {
-    //                 onTriggered: textArea.text = modelData
+                model: awTelemetryHandler.get("awwidgetconfig")
-    //             }
+                delegate: MenuItem {
-    //             onObjectAdded: historyConfig.insertItem(index, object)
+                    text: modelData
-    //             onObjectRemoved: historyConfig.removeItem(object)
+                    onTriggered: textArea.text = modelData
-    //         }
+                }
-    //     }
+
-    // }
+                onObjectAdded: (index, object) => historyConfig.insertItem(index, object)
+                onObjectRemoved: (index, object) => historyConfig.removeItem(object)
+            }
+        }
+    }
 
     MessageDialog {
         id: compiledText

sources/qml/AWInfoLabel.qml

@@ -23,7 +23,9 @@ Label {
     width: parent.width
     horizontalAlignment: Text.AlignHCenter
     verticalAlignment: Text.AlignVCenter
+
     wrapMode: Text.WordWrap
     text: i18n("Detailed information may be found on <a href=\"https://arcanis.me/projects/awesome-widgets/\">project homepage</a>")
+
     onLinkActivated: Qt.openUrlExternally(link)
 }

sources/qml/AWTextEditor.qml

@@ -19,7 +19,7 @@ import QtQuick 2.15
 import QtQuick.Controls
 
 
-Item {
+ScrollView {
     width: parent.width
     height: parent.height * 4 / 5
 
@@ -28,7 +28,6 @@ Item {
 
     TextArea {
         id: textArea
-        anchors.fill: parent
         textFormat: TextEdit.PlainText
 
         Column {
@@ -50,9 +49,9 @@ Item {
         }
 
         onTextChanged: {
-            var currentTag = getLastTag()
+            let currentTag = getLastTag()
             // exit if there are spaces or empty
-            if ((currentTag.indexOf(" ") != -1) || (currentTag.length == 0)) {
+            if ((currentTag.indexOf(" ") !== -1) || (currentTag.length === 0)) {
                 tooltip.visible = false
                 return
             }
@@ -63,7 +62,7 @@ Item {
             // show tooltip if found more than 1 or current text does not match
             // tag found
             tooltip.visible = ((tags.count > 1)
-                               || ((tags.count == 1) && (tags.model[0] != tooltip.substring)))
+                               || ((tags.count === 1) && (tags.model[0] !== tooltip.substring)))
         }
     }
 
@@ -78,10 +77,10 @@ Item {
 
     function getLastTag() {
         // get substring to analyze
-        var substring = textArea.getText(0, textArea.cursorPosition)
+        const substring = textArea.getText(0, textArea.cursorPosition)
         // find last position of index in the given substring
-        var signIndex = substring.lastIndexOf('$') + 1
+        const signIndex = substring.lastIndexOf("$") + 1
-        if ((signIndex == 0) || (signIndex == textArea.cursorPosition))
+        if ((signIndex === 0) || (signIndex === textArea.cursorPosition))
             return ""
         // get current tag text
         return substring.substr(signIndex)

sources/qml/BugReport.qml

@@ -34,8 +34,6 @@ Dialog {
 
     width: 640
     height: 480
-    property bool debug: awActions.isDebugEnabled()
-
 
     title: i18n("Report a bug")
     standardButtons: DialogButtonBox.Ok | DialogButtonBox.Cancel | DialogButtonBox.Reset
@@ -48,6 +46,7 @@ Dialog {
             Layout.fillWidth: true
             placeholderText: i18n("Report subject")
         }
+
         ColumnLayout {
             Layout.fillWidth: true
 
@@ -55,41 +54,50 @@ Dialog {
                 Layout.fillWidth: true
                 height: parent.height / 5
                 title: i18n("Description")
+
                 TextArea {
                     id: description
                     anchors.fill: parent
                     textFormat: TextEdit.PlainText
                 }
             }
+
             GroupBox {
                 Layout.fillWidth: true
                 height: parent.height / 5
                 title: i18n("Steps to reproduce")
+
                 TextArea {
                     id: reproduce
                     anchors.fill: parent
                     textFormat: TextEdit.PlainText
                 }
             }
+
             GroupBox {
                 Layout.fillWidth: true
                 height: parent.height / 5
                 title: i18n("Expected result")
+
                 TextArea {
                     id: expected
                     anchors.fill: parent
                     textFormat: TextEdit.PlainText
                 }
             }
+
             GroupBox {
                 Layout.fillWidth: true
                 Layout.alignment: Qt.AlignBottom
                 title: i18n("Logs")
+
                 ColumnLayout {
                     anchors.fill: parent
                     Layout.fillWidth: true
+
                     Row {
                         Layout.fillWidth: true
+
                         Label {
                             width: parent.width * 2 / 5
                             horizontalAlignment: Text.AlignJustify
@@ -97,17 +105,20 @@ Dialog {
                             wrapMode: Text.WordWrap
                             text: i18n("Use command")
                         }
+
                         TextField {
                             width: parent.width * 3 / 5
                             readOnly: true
                             text: "QT_LOGGING_RULES=*=true plasmawindowed org.kde.plasma.awesomewidget"
                         }
                     }
+
                     Button {
                         Layout.fillWidth: true
                         text: i18n("Load log file")
                         onClicked: logPath.open()
                     }
+
                     TextArea {
                         id: logBody
                         Layout.fillWidth: true
@@ -127,16 +138,11 @@ Dialog {
     }
 
     onAccepted: {
-        if (debug) console.debug()
+        const text = awBugReporter.generateText(description.text, reproduce.text, expected.text, logBody.text)
-
-        var text = awBugReporter.generateText(description.text, reproduce.text,
-                                              expected.text, logBody.text)
         awBugReporter.sendBugReport(title.text, text)
     }
 
     onReset: {
-        if (debug) console.debug()
-
         title.text = ""
         description.text = ""
         reproduce.text = ""
@@ -144,8 +150,6 @@ Dialog {
     }
 
     Component.onCompleted: {
-        if (debug) console.debug()
-
         awBugReporter.doConnect()
     }
 }

sources/qml/ButtonSelector.qml

@@ -32,9 +32,11 @@ Row {
         id: label
         height: parent.height
         width: parent.width * 2 / 5
+
         horizontalAlignment: Text.AlignRight
         verticalAlignment: Text.AlignVCenter
     }
+
     Button {
         id: button
         width: parent.width * 3 / 5

sources/qml/CheckBoxSelector.qml

@@ -30,6 +30,7 @@ Row {
         height: parent.heigth
         width: parent.width * 2 / 5
     }
+
     CheckBox {
         id: checkBox
         width: parent.width * 3 / 5

sources/qml/ColorSelector.qml

@@ -20,10 +20,11 @@ import QtQuick.Dialogs
 
 
 ButtonSelector {
-    // TODO somehow doesn't work
+    background: Rectangle {
-    // background: Rectangle {
+        implicitWidth: 100
-    //     color: value
+        implicitHeight: 25
-    // }
+        color: value
+    }
 
     onButtonActivated: colorDialog.visible = true
 

sources/qml/ComboBoxSelector.qml

@@ -39,14 +39,16 @@ Row {
         horizontalAlignment: Text.AlignRight
         verticalAlignment: Text.AlignVCenter
     }
+
     ComboBox {
         id: comboBox
         width: parent.width * 3 / 5
-        textRole: 'label'
+        textRole: "label"
-        onCurrentIndexChanged: valueEdited(comboBox.model[comboBox.currentIndex]['name'])
+        onCurrentIndexChanged: valueEdited(comboBox.model[comboBox.currentIndex]["name"])
+
         Component.onCompleted: {
-            var total = comboBox.model.length
+            const total = comboBox.model.length
-            for (var i = 0; i < total; i++) {
+            for (let i = 0; i < total; i++) {
                 if (comboBox.model[i]["name"] === value)
                     comboBox.currentIndex = i
             }

sources/qml/ExportDialog.qml

@@ -37,8 +37,9 @@ Item {
         fileMode: FileDialog.SaveFile
         title: i18n("Export")
         currentFolder: awConfig.configurationDirectory()
+
         onAccepted: {
-            var status = awConfig.exportConfiguration(
+            const status = awConfig.exportConfiguration(
                 configuration,
                 fileDialog.fileUrl.toString().replace("file://", ""))
             if (status) {
@@ -51,7 +52,6 @@ Item {
             messageDialog.open()
         }
     }
-
     function open() {
         return fileDialog.open()
     }

sources/qml/General.qml

@@ -21,6 +21,7 @@ import QtQuick 2.15
 // required by i18n functions
 import org.kde.plasma.core as PlasmaCore
 
+
 QtObject {
     property variant fontWeight: {
         "light": Font.Light,

sources/qml/HtmlDefaultFunctionsBar.qml

@@ -30,6 +30,7 @@ Row {
         text: i18n("Bgcolor")
         textField: textArea
     }
+
     HtmlEditorFont {
         width: parent.width * 3 / 15
         textField: textArea
@@ -45,6 +46,7 @@ Row {
         textField: textArea
         end: "<br>\n"
     }
+
     // font properties
     HtmlEditorButton {
         width: parent.width / 15
@@ -53,6 +55,7 @@ Row {
         start: "<b>"
         end: "</b>"
     }
+
     HtmlEditorButton {
         width: parent.width / 15
         icon.name: "format-text-italic"
@@ -60,6 +63,7 @@ Row {
         start: "<i>"
         end: "</i>"
     }
+
     HtmlEditorButton {
         width: parent.width / 15
         icon.name: "format-text-underline"
@@ -67,6 +71,7 @@ Row {
         start: "<u>"
         end: "</u>"
     }
+
     HtmlEditorButton {
         width: parent.width / 15
         icon.name: "format-text-strikethrough"
@@ -83,6 +88,7 @@ Row {
         start: "<p align=\"left\">"
         end: "</p>"
     }
+
     HtmlEditorButton {
         width: parent.width / 15
         icon.name: "format-justify-center"
@@ -90,6 +96,7 @@ Row {
         start: "<p align=\"center\">"
         end: "</p>"
     }
+
     HtmlEditorButton {
         width: parent.width / 15
         icon.name: "format-justify-right"
@@ -97,6 +104,7 @@ Row {
         start: "<p align=\"right\">"
         end: "</p>"
     }
+
     HtmlEditorButton {
         width: parent.width / 15
         icon.name: "format-justify-fill"

sources/qml/HtmlEditorButton.qml

@@ -31,7 +31,7 @@ Button {
 
     function updateText() {
         // get selected text
-        var selected = textField.selectedText()
+        const selected = textField.selectedText()
         // remove it from widget
         textField.removeSelection()
         // insert edited text

sources/qml/HtmlEditorFont.qml

@@ -36,13 +36,13 @@ HtmlEditorButton {
 
     clickedEvent: function() {
         // get new font
-        var defaultFont = {
+        const defaultFont = {
             "color": defaultFontColor,
             "family": defaultFontFamily,
             "size": defaultFontSize
         }
         // we are using custom selector as soon as we need to select color as well
-        var font = awActions.getFont(defaultFont)
+        const font = awActions.getFont(defaultFont)
 
         // check status
         if (!font.applied)

sources/qml/ImportDialog.qml

@@ -57,14 +57,13 @@ Item {
         }
 
         onAccepted: {
-            var importConfig = awConfig.importConfiguration(
+            const importConfig = awConfig.importConfiguration(
                 fileDialog.fileUrl.toString().replace("file://", ""),
                 importPlasmoid.checked, importExtensions.checked,
                 importAdds.checked)
             configurationReceived(importConfig)
         }
     }
-
     function open() {
         return fileDialog.open()
     }

sources/qml/IntegerSelector.qml

@@ -39,6 +39,7 @@ Row {
         horizontalAlignment: Text.AlignRight
         verticalAlignment: Text.AlignVCenter
     }
+
     SpinBox {
         id: spinBox
         width: parent.width * 3 / 5

sources/qml/LineSelector.qml

@@ -35,6 +35,7 @@ Row {
         horizontalAlignment: Text.AlignRight
         verticalAlignment: Text.AlignVCenter
     }
+
     TextField {
         id: textField
         width: parent.width * 3 / 5

sources/test/CMakeLists.txt

@@ -20,16 +20,16 @@ include_directories(
 set(AWTESTLIBRARY_HEADERS awtestlibrary.h)
 set(AWTESTLIBRARY_SOURCES awtestlibrary.cpp)
 add_library(${SUBPROJECT}-awtest STATIC ${AWTESTLIBRARY_SOURCES} ${AWTESTLIBRARY_HEADERS})
-target_link_libraries(${SUBPROJECT}-awtest ${Qt_LIBRARIES} ${Qt5Test_LIBRARIES} ${Kf6_LIBRARIES})
+target_link_libraries(${SUBPROJECT}-awtest ${Qt_LIBRARIES} ${Qt6Test_LIBRARIES} ${Kf6_LIBRARIES})
 set(LIBRARY_TEST_SET ${SUBPROJECT}-awtest ${PROJECT_LIBRARY} ${PROJECT_MONITORSOURCES}
-        ${Qt_LIBRARIES} ${Kf6_LIBRARIES} ${Qt5Test_LIBRARIES})
+        ${Qt_LIBRARIES} ${Kf6_LIBRARIES} ${Qt6Test_LIBRARIES})
 
 # modules
 set(TEST_MODULES
         abstractextitem extquotes extscript extupgrade extweather
         abstractformatter datetimeformatter floatformatter jsonformatter listformatter noformatter scriptformatter stringformatter
         extitemaggregator
-        batterysource desktopsource gpuloadsource gputempsource hddtempsource networksource playersource processessource
+        batterysource desktopsource networksource playersource processessource
         awbugreporter awconfighelper awkeycache awkeys awpatternfunctions awtelemetryhandler awupdatehelper
         dpplugin)
 foreach (TEST_MODULE ${TEST_MODULES})

sources/test/testdatetimeformatter.cpp

@@ -49,15 +49,15 @@ void TestAWDateTimeFormatter::test_values()
 
 void TestAWDateTimeFormatter::test_conversion()
 {
-    QDateTime now = QDateTime::currentDateTime();
+    auto now = QDateTime::currentDateTime();
-    QCOMPARE(formatter->convert(now), now.toString(format));
+    QCOMPARE(formatter->convert(now), QLocale::system().toString(now, format));
 }
 
 
 void TestAWDateTimeFormatter::test_copy()
 {
     formatter->setTranslateString(false);
-    AWDateTimeFormatter *newFormatter = formatter->copy("/dev/null", 1);
+    auto *newFormatter = formatter->copy("/dev/null", 1);
 
     QCOMPARE(newFormatter->format(), formatter->format());
     QCOMPARE(newFormatter->translateString(), formatter->translateString());

sources/test/testgpuloadsource.cpp

@@ -1,66 +0,0 @@
-/***************************************************************************
- *   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 "testgpuloadsource.h"
-
-#include <QtTest>
-
-#include "awtestlibrary.h"
-#include "gpuloadsource.h"
-
-
-void TestGPULoadSource::initTestCase()
-{
-    AWTestLibrary::init();
-    device = GPULoadSource::autoGpu();
-    QVERIFY(!device.isEmpty());
-
-    source = new GPULoadSource(this, QStringList() << device);
-}
-
-
-void TestGPULoadSource::cleanupTestCase()
-{
-    delete source;
-}
-
-
-void TestGPULoadSource::test_sources()
-{
-    QCOMPARE(source->sources(), QStringList() << src);
-}
-
-
-void TestGPULoadSource::test_gpuload()
-{
-    if (device == "disable")
-        QSKIP("Not supported device, test will be skipped");
-
-    QSignalSpy spy(source, SIGNAL(dataReceived(const QVariantHash &)));
-    float firstValue = source->data(src).toFloat();
-
-    QVERIFY(spy.wait(5000));
-    QVariantHash arguments = spy.takeFirst().at(0).toHash();
-    float secondValue = arguments[src].toFloat();
-
-    QCOMPARE(firstValue, 0.0f);
-    QVERIFY((secondValue >= load.first) && (secondValue <= load.second));
-}
-
-
-QTEST_MAIN(TestGPULoadSource);

sources/test/testgpuloadsource.h

@@ -1,48 +0,0 @@
-/***************************************************************************
- *   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 TESTGPULOADSOURCE_H
-#define TESTGPULOADSOURCE_H
-
-#include <QObject>
-#include <QPair>
-
-
-class GPULoadSource;
-
-class TestGPULoadSource : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    // initialization
-    void initTestCase();
-    void cleanupTestCase();
-    // test
-    void test_sources();
-    void test_gpuload();
-
-private:
-    GPULoadSource *source = nullptr;
-    QString device;
-    QString src = "gpu/load";
-    QPair<float, float> load = QPair<float, float>(0.0f, 100.0f);
-};
-
-
-#endif /* TESTGPULOADSOURCE_H */

sources/test/testgputempsource.cpp

@@ -1,67 +0,0 @@
-/***************************************************************************
- *   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 "testgputempsource.h"
-
-#include <QtTest>
-
-#include "awtestlibrary.h"
-#include "gpuloadsource.h"
-#include "gputempsource.h"
-
-
-void TestGPUTemperatureSource::initTestCase()
-{
-    AWTestLibrary::init();
-    device = GPULoadSource::autoGpu();
-    QVERIFY(!device.isEmpty());
-
-    source = new GPUTemperatureSource(this, QStringList() << device);
-}
-
-
-void TestGPUTemperatureSource::cleanupTestCase()
-{
-    delete source;
-}
-
-
-void TestGPUTemperatureSource::test_sources()
-{
-    QCOMPARE(source->sources(), QStringList() << src);
-}
-
-
-void TestGPUTemperatureSource::test_gputemp()
-{
-    if (device == "disable")
-        QSKIP("Not supported device, test will be skipped");
-
-    QSignalSpy spy(source, SIGNAL(dataReceived(const QVariantHash &)));
-    float firstValue = source->data(src).toFloat();
-
-    QVERIFY(spy.wait(5000));
-    QVariantHash arguments = spy.takeFirst().at(0).toHash();
-    float secondValue = arguments[src].toFloat();
-
-    QCOMPARE(firstValue, 0.0f);
-    QVERIFY((secondValue >= temp.first) && (secondValue <= temp.second));
-}
-
-
-QTEST_MAIN(TestGPUTemperatureSource);

sources/test/testgputempsource.h

@@ -1,48 +0,0 @@
-/***************************************************************************
- *   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 TESTGPUTEMPSOURCE_H
-#define TESTGPUTEMPSOURCE_H
-
-#include <QObject>
-#include <QPair>
-
-
-class GPUTemperatureSource;
-
-class TestGPUTemperatureSource : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    // initialization
-    void initTestCase();
-    void cleanupTestCase();
-    // test
-    void test_sources();
-    void test_gputemp();
-
-private:
-    GPUTemperatureSource *source = nullptr;
-    QString device;
-    QString src = "gpu/temperature";
-    QPair<float, float> temp = QPair<float, float>(0.0f, 120.0f);
-};
-
-
-#endif /* TESTGPUTEMPSOURCE_H */

sources/test/testhddtempsource.cpp

@@ -1,96 +0,0 @@
-/***************************************************************************
- *   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 "testhddtempsource.h"
-
-#include <QtTest>
-
-#include "awtestlibrary.h"
-#include "hddtempsource.h"
-
-
-void TestHDDTemperatureSource::initTestCase()
-{
-    AWTestLibrary::init();
-    devices = HDDTemperatureSource::allHdd();
-
-    hddtempSource = new HDDTemperatureSource(this, QStringList() << devices.join(',') << hddtempCmd);
-    smartctlSource = new HDDTemperatureSource(this, QStringList() << devices.join(',') << smartctlCmd);
-}
-
-
-void TestHDDTemperatureSource::cleanupTestCase()
-{
-    delete hddtempSource;
-    delete smartctlSource;
-}
-
-
-void TestHDDTemperatureSource::test_sources()
-{
-    if (devices.isEmpty())
-        QSKIP("No hdd devices found, test will be skipped");
-
-    std::for_each(devices.begin(), devices.end(), [](QString &device) { device.prepend("hdd/temperature"); });
-
-    QCOMPARE(hddtempSource->sources(), devices);
-    QCOMPARE(smartctlSource->sources(), devices);
-}
-
-
-void TestHDDTemperatureSource::test_hddtemp()
-{
-    if (devices.isEmpty())
-        QSKIP("No hdd devices found, test will be skipped");
-
-    std::for_each(devices.begin(), devices.end(), [this](QString device) {
-        QSignalSpy spy(hddtempSource, SIGNAL(dataReceived(const QVariantHash &)));
-        float firstValue = hddtempSource->data(device).toFloat();
-
-        QVERIFY(spy.wait(5000));
-        QVariantHash arguments = spy.takeFirst().at(0).toHash();
-        device.remove("hdd/temperature");
-        float secondValue = arguments[device].toFloat();
-
-        QCOMPARE(firstValue, 0.0f);
-        QVERIFY((secondValue >= temp.first) && (secondValue <= temp.second));
-    });
-}
-
-
-void TestHDDTemperatureSource::test_smartctl()
-{
-    if (devices.isEmpty())
-        QSKIP("No hdd devices found, test will be skipped");
-
-    std::for_each(devices.begin(), devices.end(), [this](QString &device) {
-        QSignalSpy spy(smartctlSource, SIGNAL(dataReceived(const QVariantHash &)));
-        float firstValue = smartctlSource->data(device).toFloat();
-
-        QVERIFY(spy.wait(5000));
-        QVariantHash arguments = spy.takeFirst().at(0).toHash();
-        device.remove("hdd/temperature");
-        float secondValue = arguments[device].toFloat();
-
-        QCOMPARE(firstValue, 0.0f);
-        QVERIFY((secondValue >= temp.first) && (secondValue <= temp.second));
-    });
-}
-
-
-QTEST_MAIN(TestHDDTemperatureSource);

sources/test/testhddtempsource.h

@@ -1,51 +0,0 @@
-/***************************************************************************
- *   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 TESTHDDTEMPSOURCE_H
-#define TESTHDDTEMPSOURCE_H
-
-#include <QObject>
-#include <QPair>
-
-
-class HDDTemperatureSource;
-
-class TestHDDTemperatureSource : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    // initialization
-    void initTestCase();
-    void cleanupTestCase();
-    // test
-    void test_sources();
-    void test_hddtemp();
-    void test_smartctl();
-
-private:
-    HDDTemperatureSource *hddtempSource = nullptr;
-    HDDTemperatureSource *smartctlSource = nullptr;
-    QStringList devices;
-    QString hddtempCmd = "sudo hddtemp";
-    QString smartctlCmd = "sudo smartctl -a";
-    QPair<float, float> temp = QPair<float, float>(0.0f, 120.0f);
-};
-
-
-#endif /* TESTHDDTEMPSOURCE_H */

sources/test/testnetworksource.cpp

@@ -39,13 +39,13 @@ void TestNetworkSource::cleanupTestCase()
 
 void TestNetworkSource::test_sources()
 {
-    QCOMPARE(source->sources(), QStringList() << src << "network/current/ssid");
+    QCOMPARE(source->sources(), QStringList({"device", "ssid"}));
 }
 
 
 void TestNetworkSource::test_values()
 {
-    QVERIFY(source->data(src).toString().count() > 0);
+    QVERIFY(source->data("device").toString().length() > 0);
 }
 
 

sources/test/testnetworksource.h

@@ -38,7 +38,6 @@ private slots:
 
 private:
     NetworkSource *source = nullptr;
-    QString src = "network/current/name";
 };
 
 

sources/test/testplayersource.cpp

@@ -43,23 +43,23 @@ void TestPlayerSource::test_buildString()
 {
     QString randomString = AWTestLibrary::randomString(1, 40);
     QString str = PlayerSource::buildString("", randomString, 20);
-    QCOMPARE(str.count(), 20);
+    QCOMPARE(str.length(), 20);
 
     str = PlayerSource::buildString(str, randomString, 20);
-    QCOMPARE(str.count(), 20);
+    QCOMPARE(str.length(), 20);
 
     str = PlayerSource::buildString("", AWTestLibrary::randomString(1, 10), 20);
-    QCOMPARE(str.count(), 20);
+    QCOMPARE(str.length(), 20);
 }
 
 
 void TestPlayerSource::test_stripString()
 {
     QString str = PlayerSource::buildString("", AWTestLibrary::randomString(1, 40), 20);
-    QCOMPARE(str.count(), 20);
+    QCOMPARE(str.length(), 20);
 
     str = PlayerSource::buildString("", AWTestLibrary::randomString(1, 10), 20);
-    QCOMPARE(str.count(), 20);
+    QCOMPARE(str.length(), 20);
 }
 
 
@@ -85,7 +85,7 @@ void TestPlayerSource::test_mpd()
 
     // init spy
     QSignalSpy spy(source, SIGNAL(dataReceived(const QVariantHash &)));
-    QVariant firstValue = source->data("player/title");
+    QVariant firstValue = source->data("title");
     if (!source->isMpdSocketConnected())
         QSKIP("No mpd found");
 
@@ -95,10 +95,10 @@ void TestPlayerSource::test_mpd()
     QVariantHash secondValue = arguments.at(0).toHash();
 
     // actually nothing to test here just print warning if no information found
-    if (secondValue["player/title"].toString() == "unknown")
+    if (secondValue["title"].toString() == "unknown")
         QSKIP("No mpd found");
 
-    QVERIFY(secondValue["player/progress"].toInt() < secondValue["player/duration"].toInt());
+    QVERIFY(secondValue["progress"].toInt() < secondValue["duration"].toInt());
 }
 
 
@@ -109,9 +109,9 @@ void TestPlayerSource::test_mpris()
     PlayerSource *source = new PlayerSource(this, args);
     _test_sources(source);
 
-    QString value = source->data("player/title").toString();
+    QString value = source->data("title").toString();
-    int progress = source->data("player/progress").toInt();
+    int progress = source->data("progress").toInt();
-    int duration = source->data("player/duration").toInt();
+    int duration = source->data("duration").toInt();
 
     // actually nothing to test here just print warning if no information found
     if (value == "unknown")

sources/test/testprocessessource.cpp

@@ -45,9 +45,9 @@ void TestProcessesSource::test_sources()
 
 void TestProcessesSource::test_values()
 {
-    QVERIFY(source->data("ps/running/count").toInt() > 0);
+    QVERIFY(source->data("running").toInt() > 0);
-    QVERIFY(source->data("ps/running/list").toStringList().count() > 0);
+    QVERIFY(source->data("list").toStringList().count() > 0);
-    QVERIFY(source->data("ps/total/count").toInt() > 0);
+    QVERIFY(source->data("count").toInt() > 0);
 }
 
 

sources/version.h.in

@@ -54,7 +54,7 @@ const char STATIC_FUNCTIONS[] = "{{\n\n}},template{{\n\n}},aw_all<>{{}},aw_"
                                 "count<>{{}},aw_keys<>{{}},aw_macro<>{{}},aw_"
                                 "names<>{{}}";
 const char STATIC_KEYS[] = "time,isotime,shorttime,longtime,tstime,ctime,uptime,cuptime,cpucl,cpu,"
-                           "gputemp,gpu,memmb,memgb,memfreemb,memfreegb,memtotmb,memtotgb,memusedmb,"
+                           "gpu,memmb,memgb,memfreemb,memfreegb,memtotmb,memtotgb,memusedmb,"
                            "memusedgb,mem,swapmb,swapgb,swapfreemb,swapfreegb,swaptotmb,swaptotgb,"
                            "swap,downunits,upunits,downkb,downtotkb,downtot,down,uptotkb,uptot,upkb,"
                            "up,netdev,ac,bat,batleft,batnow,batrate,battotal,album,artist,duration,"