Merge pull request #146 from arcan1s/development

Release 3.4.2

.docker/Dockerfile-arch

@@ -0,0 +1,12 @@
+FROM archlinux
+
+RUN pacman -Sy
+
+# toolchain
+RUN echo -e 'y\ny' | pacman -S util-linux-libs
+RUN pacman -S --noconfirm base-devel cmake extra-cmake-modules python util-linux-libs
+# kf5 and qt5 libraries
+RUN pacman -S --noconfirm plasma-framework
+
+# required by tests
+RUN pacman -S --noconfirm xorg-server-xvfb

.docker/Dockerfile-ubuntu-amd64

@@ -0,0 +1,12 @@
+FROM ubuntu:bionic
+
+RUN apt-get update
+# toolchain
+RUN apt-get install -y cmake extra-cmake-modules g++ git gettext
+# kf5 and qt5 libraries
+RUN apt-get install -y libkf5i18n-dev libkf5notifications-dev libkf5service-dev \
+      libkf5windowsystem-dev plasma-framework-dev qtbase5-dev qtdeclarative5-dev \
+      plasma-framework
+
+# required by tests
+RUN apt-get install -y xvfb

.docker/Dockerfile-ubuntu-i386

@@ -0,0 +1,12 @@
+FROM multiarch/ubuntu-core:i386-bionic
+
+RUN apt-get update
+# toolchain
+RUN apt-get install -y cmake extra-cmake-modules g++ git gettext
+# kf5 and qt5 libraries
+RUN apt-get install -y libkf5i18n-dev libkf5notifications-dev libkf5service-dev \
+      libkf5windowsystem-dev plasma-framework-dev qtbase5-dev qtdeclarative5-dev \
+      plasma-framework
+
+# required by tests
+RUN apt-get install -y xvfb

.docker/build-arch.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+rm -rf build-arch
+mkdir build-arch
+
+# build
+cd build-arch
+cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_BUILD_TYPE=Optimization -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_FUTURE=ON -DBUILD_TESTING=ON ../sources
+make
+
+# tests
+xvfb-run -a make test

.docker/build-ubuntu-package.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+rm -rf build-ubuntu
+mkdir build-ubuntu
+
+# patches
+#git apply patches/qt5.6-qversionnumber.patch
+#git apply patches/qt5.5-qstringlist-and-qinfo.patch
+
+# build
+cd build-ubuntu
+cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_BUILD_TYPE=Optimization -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_FUTURE=ON -DBUILD_DEB_PACKAGE=ON ../sources
+make package
+

.docker/build-ubuntu.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+rm -rf build-ubuntu
+mkdir build-ubuntu
+
+# patches
+git apply patches/qt5.6-qversionnumber.patch
+git apply patches/qt5.5-qstringlist-and-qinfo.patch
+
+# build
+cd build-ubuntu
+cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_BUILD_TYPE=Optimization -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_FUTURE=ON -DBUILD_TESTING=ON ../sources
+make
+
+# tests
+xvfb-run -a make test

.github/workflows/build.yml

@@ -1,43 +0,0 @@
-name: build & tests
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-env:
-  BUILD_TYPE: Release
-
-jobs:
-  run-tests:
-    
-    runs-on: ubuntu-latest
-    
-    container:
-      image: archlinux:latest
-      volumes:
-        - ${{ github.workspace }}:/repo
-      options: -w /repo
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: create build environment
-      run: pacman -Syu --noconfirm base-devel cmake extra-cmake-modules python util-linux-libs xorg-server-xvfb
-    
-    - name: install dependencies
-      run: pacman -S --noconfirm plasma-workspace
-    
-    - name: configure cmake
-      run: cmake -B build -S sources -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_FUTURE=ON -DBUILD_TESTING=ON
-    
-    - name: build
-      working-directory: /repo/build
-      run: make
-    
-    - name: test
-      working-directory: /repo/build
-      run: xvfb-run -a make test

.github/workflows/release.yml

@@ -1,51 +0,0 @@
-name: release
-
-on:
-  push:
-    tags:
-      - '*'
-
-jobs:
-  make-release:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: create changelog
-        id: changelog
-        uses: jaywcjlove/changelog-generator@main
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          filter: 'Release \d+\.\d+\.\d+'
-
-      - name: create archive
-        run: bash create_archive.sh
-        env:
-          VERSION: ${{ steps.version.outputs.VERSION }}
-
-#      - name: build debian package
-#        run: |
-#          sudo apt update && \
-#          sudo apt install -yq cmake extra-cmake-modules g++ git gettext make && \
-#          sudo apt install -yq libkf5i18n-dev libkf5notifications-dev libkf5service-dev \
-#            libkf5windowsystem-dev libkf5plasma-dev qtbase5-dev qtdeclarative5-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 && \
-#          cd build-deb && \
-#          make package && \
-#          cd ..
-
-      - name: release
-        uses: softprops/action-gh-release@v1
-        with:
-          body: |
-            ${{ steps.changelog.outputs.compareurl }}
-            ${{ steps.changelog.outputs.changelog }}
-          files: |
-            awesome-widgets-*-src.tar.xz
-#            build-deb/plasma-widget-awesome-widgets-*.deb
-          fail_on_unmatched_files: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "sources/3rdparty/fontdialog"]
+	path = sources/3rdparty/fontdialog
+	url = https://github.com/arcan1s/qtadds-fontdialog.git

.travis.yml

@@ -0,0 +1,14 @@
+sudo: required
+language: generic
+
+env:
+  - DOCKER_TAG_ARCH="arcan1s/awesome-widgets-arch"
+
+services:
+  - docker
+
+before_install:
+  - docker build --tag="${DOCKER_TAG_ARCH}" -f ".docker/Dockerfile-arch" ".docker"
+
+script:
+  - docker run --rm -v "$(pwd):/opt/build" -w /opt/build "${DOCKER_TAG_ARCH}" sh -c ".docker/build-arch.sh"

CHANGELOG

@@ -1,19 +1,3 @@
-Ver.4.0.1:
-- temporary disable tooltip painting in main widget
-
-Ver.4.0.0:
-* migration to plasma 6
-* dialog windows have been replaced by notifications
-+ $gpuN keys have been added
-+ new key $ssid
-- $cuptime key has been removed in favour of $uptime
-- $gputemp key has been replaced by $gpuN
-
-Ver.3.5.0:
-+ wayland support
-* update code to latest standards
-- drop support of windows preview
-
 Ver.3.4.2:
 + Italian translation (#136, thanks to @avivace)
 + stooq quotes support (default) (#131)
@@ -23,6 +7,7 @@ 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

CONTRIBUTING.md

@@ -6,20 +6,27 @@ for more details. To avoid manual labor there is automatic cmake target named
 `clangformat` (see below). Some additional detail see below.
 
 * Indent is only spaces. 4 spaces.
-* Any private variable should start with `m_` prefix (`m_foo`). The only one exception is `Ui` object which should be named as `ui`.
+* Any private variable should start with `m_` prefix (`m_foo`). The only one
+  exception is `Ui` object which should be named as `ui`.
 * Avoid to create a large methods. Exception: if method contains lambda functions.
+* If some method is called only once, it is recommended to use lambda functions.
+  Exception is `Q_INVOKABLE` methods.
 * STL containers are not recommended, use Qt ones instead.
-* In other hand Qt specific variables types (`qint`, `qfloat`, etc) are not recommended.
+* In other hand Qt specific variables types (`qint`, `qfloat`, etc) are not
+  recommended.
 * Do not repeat yourself ([DRY](https://en.wikipedia.org/wiki/Don't_repeat_yourself)).
 * Headers declaration:
-    * Include only those headers which are strictly necessary inside headers. Use forward class declaration instead. Exception is base class header declaration.
+    * Include only those headers which are strictly necessary inside headers. Use
-    * In a`*.cpp` file header declaration should have the following order separated by a new line in the alphabet order:
+      forward class declaration instead. Exception is base class header declaration.
+    * In a`*.cpp` file header declaration should have the following order separated
+      by a new line in the alphabet order:
         1. Class header.
         2. KDE specific headers.
         3. Qt specific headers.
         4. Third party headers.
         5. Project headers.
-    * Any header should have `#pragma once`.
+    * Any header should have [include guard](https://en.wikipedia.org/wiki/Include_guard)
+      named as `CLASSNAMECAPS_H`
 * If any `#if` directive is used condition should be mentioned in `#endif`:
 
   ```
@@ -29,60 +36,80 @@ for more details. To avoid manual labor there is automatic cmake target named
   ```
 
 * `Q_PROPERTY` macro is allowed and recommended for QObject based classes.
-* Qt macros (e.g. `signals`, `slots`, `Q_OBJECT`, etc) are allowed. In other hand `Q_FOREACH` (`foreach`) is not allowed use `for (auto &foo : bar)` instead.
+* Qt macros (e.g. `signals`, `slots`, `Q_OBJECT`, etc) are allowed. In other hand
-* Current project standard is **C++23**.
+`Q_FOREACH` (`foreach`) is not allowed use `for (auto &foo : bar)` instead.
+* Current project standard is **C++17**.
 * Do not use C-like code:
-    * C-like style iteration if possible. Use `for (auto &foo : bar)` and `std::for_each` instead if possible. It is also recommended to use iterators.
+    * C-like style iteration if possible. Use `for (auto &foo : bar)` and
-    * C-like casts, use `const_cast`, `static_cast`, `dymanic_Cast` instead. Using of `reinterpret_cast` is not recommended. It is highly recommended to use `dynamic_cast` with the exception catching. It is also possible to use `qvariant_cast` if required.
+      `std::for_each` instead if possible. It is also recommended to use iterators.
+    * C-like casts, use `const_cast`, `static_cast`, `dymanic_Cast` instead. Using
+      of `reinterpret_cast` is not recommended. It is highly recommended to use
+      `dynamic_cast` with the exception catching. It is also possible to use
+      `qvariant_cast` if required.
     * C-like `NULL`, use `nullptr` instead.
-    * C-like constant definition, use `static const vartype foo = bar` definition instead.
+    * C-like constant definition, use `const vartype foo = bar` definition instead.
 * Abstract classes (which have at least one pure virtual method) are allowed.
-* Templates are allowed and recommended. Templates usually should be described inside header not source code file.
+* Templates are allowed and recommended. Templates usually should be described
-* Hardcode is not recommended. But it is possible to use cmake variables to configure some items during build time.
+  inside header not source code file.
+* Hardcode is not recommended. But it is possible to use cmake variables to
+  configure some items during build time.
 * Build should not require any additional system variable declaration/changing.
 * Any line should not end with space.
 * Do not hesitate move public methods to private one if possible.
-* Do not hesitate use `const` modifier. In other hand `volatile` modifier is not recommended.
+* Do not hesitate use `const` modifier. In other hand `volatile` modifier is not
+  recommended.
 * New lines rules:
     * One line after license header.
     * One line between header group declaration (see above).
-    * Two lines after header declaration and before declaration at the end of a file.
+    * Two lines after header declaration and before declaration at the end of a
+      file.
     * One line after class and types forward declarations in headers.
     * One line before each method modifiers (`public`, `public slots`, etc).
     * Two lines between methods inside source code (`*.cpp`).
     * One line after `qCDebug()` information (see below).
     * One line inside a method to improve code reading.
 * Each destructor should be virtual.
-* Class constructor should have default arguments. Use `QObject *_parent` property for QObject based classes.
+* Class constructor should have default arguments. Use `QObject *parent` property
+  for QObject based classes.
 * QObject based classes constructors should have explicit modifier.
 * Create one file (source and header) per class.
 * `else if` construction is allowed and recommended.
 * 'true ? foo : bar' construction is allowed and recommended for one-line assignment.
-* Any global pointer should be assigned to `nullptr` after deletion and before initialization. Exception: if object is deleted into class destructor.
+* Any global pointer should be assign to `nullptr` after deletion and before
+  initialization. Exception: if object is deleted into class destructor.
 * Do not use semicolon in qml files unless it is required.
 * Any method argument including class constructors should start with `_`.
 
 Comments
 --------
 
-Please do not hesitate to use comments inside source code (especially in non-obvious blocks). Comments also may use the following keywords:
+Please do not hesitate to use comments inside source code (especially in non-obvious
+blocks). Comments also may use the following keywords:
 
-* **TODO** - indicates that some new code should be implemented here later. Please note that usually these methods should be implemented before the next release.
+* **TODO** - indicates that some new code should be implemented here later. Please
+  note that usually these methods should be implemented before the next release.
 * **FIXME** - some dirty hacks and/or methods which should be done better.
-* **HACK** - hacks inside code which requires to avoid some restrictions and/or which adds additional non-obvious optimizations.
+* **HACK** - hacks inside code which requires to avoid some restrictions and/or
+  which adds additional non-obvious optimizations.
 
 Do not use dots at the end of the comment line.
 
 Development
 -----------
 
-* Officially the latest libraries versions should be used. In addition, it is possible to add workarounds for all versions (usually by using preprocessor directives); in this case patches should be placed to `packages` directory.
+* Officially the latest libraries versions should be used. In addition it is
+  possible to add workarounds for all versions (usually by using preprocessor
+  directives); in this case patches should be placed to `packages` directory.
 * Build should not contain any warning.
-* Try to minimize message in Release build with logging disabled. It is highly recommended to fix KDE/Qt specific warning if possible
+* Try to minimize message in Release build with logging disabled. It is highly
-* Do not use dependency to KDE libraries if there are no any strictly necessary. Exceptions are KNotification and KI18n libraries.
+  recommended to fix KDE/Qt specific warning if possible
+* Do not use dependency to KDE libraries if there are no any strictly necessary.
+  Exceptions are KNotification and KI18n libraries.
 * It is highly recommended to use submodules for third party libraries if possible.
-* The main branch is **master**.
+* The main branch is **development**. Changes in this branch may be merged to the
-* For experimental features development new branch `feature/foo` creation is allowed and recommended.
+  master one only if it is a 'stable' build.
+* For experimental features development new branch `feature-foo` creation is allowed
+  and recommended.
 * Experimental features should be added inside `BUILD_FUTURE` definition:
 
   ```
@@ -91,41 +118,54 @@ Development
   #endif /* BUILD_FUTURE */
   ```
 
-* Any project specific build variable should be mentioned inside `version.h` as well.
+* Any project specific build variable should be mentioned inside `version.h` as
+  well.
 * Recommended compiler is `clang`.
 
 HIG
 ---
 
-The recommended HIG is [KDE one](https://techbase.kde.org/Projects/Usability/HIG). Avoid to paint interfaces inside plugin because QML and C++ parts may have different theming.
+The recommended HIG is [KDE one](https://techbase.kde.org/Projects/Usability/HIG).
+Avoid to paint interfaces inside plugin because QML and C++ parts may have different
+theming.
 
 Licensing
 ---------
 
-All files should be licensed under GPLv3, the owner of the license should be the project (i.e. **awesome-widgets**). See **Tools** section for more details.
+All files should be licensed under GPLv3, the owner of the license should be the
+project (i.e. **awesome-widgets**). See **Tools** section for more details.
 
 Logging
 -------
 
-For logging please use [QLoggingCategory](http://doc.qt.io/qt-5/qloggingcategory.html). Available categories should be declared in `awdebug.*` files. The following log levels should be used:
+For logging please use [QLoggingCategory](http://doc.qt.io/qt-5/qloggingcategory.html).
+Available categories should be declared in `awdebug.*` files. The following log
+levels should be used:
 
-* **debug** (`qCDebug()`) - method arguments information. Please note that it is recommended to logging all arguments in the one line.
+* **debug** (`qCDebug()`) - method arguments information. Please note that it
+  is recommended to logging all arguments in the one line.
 * **info** (`qCInfo()`) - additional information inside methods.
-* **warning** (`qCWarning()`) - not critical information, which may be caused by mistakes in configuration for example.
+* **warning** (`qCWarning()`) - not critical information, which may be caused by
-* **critical** (`qCCritical()`) - a critical error. After this error program may be terminated.
+  mistakes in configuration for example.
+* **critical** (`qCCritical()`) - a critical error. After this error program may
+  be terminated.
 
-The empty log string (e.g. `qCDebug();`) is not allowed because the method names will be stripped by compiler with `Release` build type. To log class constructor and destructor use `__PRETTY_FUNCTION__` macro.
+The empty log string (e.g. `qCDebug();`) is not allowed because the method names
+will be stripped by compiler with `Release` build type. To log class constructor
+and destructor use `__PRETTY_FUNCTION__` macro.
 
 Testing
 -------
 
-* Any changes should be tested by using `plasmawindowed` and `plasmashell` applications. (It is also possible to use `plasmaengineexplorer` and `plasmoidviewer` in addition.)
+* Any changes should be tested by using `plasmawindowed` and `plasmashell` applications.
+  (It is also possible to use `plasmaengineexplorer` and `plasmoidviewer` in addition.)
 * Any test should be performed on real (not Virtual Machine) system.
 * Test builds should be:
     1. `-DCMAKE_BUILD_TYPE=Debug`.
     2. `-DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON`.
     3. `-DCMAKE_BUILD_TYPE=Release`.
-* Additional test functions should be declated and used only inside `BUILD_TESTING` definition.
+* Additional test functions should be declated and used only inside `BUILD_TESTING`
+  definition.
 
 Tools
 -----
@@ -182,6 +222,7 @@ Tools
         // declare with default value
         bool m_prop = false;
   ```
-* Use `cppcheck` to avoid common errors in the code. To start application just run `make cppcheck`.
+* Use `cppcheck` to avoid common errors in the code. To start application just
-* Use `clang-format` to apply valid code format. To start application just run `make clangformat`.
+  run `make cppcheck`.
-* use `-DCMAKE_CXX_COMPILER=clang++` in order to enable clang-tidy checks.
+* Use `clang-format` to apply valid code format. To start application just run
+  `make clangformat`.

README.md

@@ -1,7 +1,7 @@
 awesome-widgets (ex-pytextmonitor)
 ==================================
 
-[![build & tests](https://github.com/arcan1s/awesome-widgets/actions/workflows/build.yml/badge.svg)](https://github.com/arcan1s/awesome-widgets/actions/workflows/build.yml)
+[![Build Status](https://travis-ci.org/arcan1s/awesome-widgets.svg?branch=development)](https://travis-ci.org/arcan1s/awesome-widgets)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/8254/badge.svg)](https://scan.coverity.com/projects/awesome-widgets)
 
 Information
@@ -14,11 +14,11 @@ A collection of minimalistic widgets which looks like Awesome Window Manager wid
 Features
 ========
 
-* easy and fully configurable native Plasma widget which may be used as desktop or panel widget
+* easy and fully configurable native Plasma widget which may be used as Conky widget or as Awesome-like information panel
-* additionnal widget which shows active desktop status
+* panel which shows active desktop status
-* clear text configuration with html tags support
+* clear Conky-like configuration with html tags support
 * custom command support (it may be simple action as well as special custom tag)
-* graphical widgets support - tooltips, bars
+* graphical item support - tooltips, bars
 
 See [links](#Links) for more details.
 
@@ -30,11 +30,14 @@ Instruction
 Dependencies
 ------------
 
-* plasma-workspace
+* plasma-framework
 
 Optional dependencies
 ---------------------
 
+* proprietary video driver
+* hddtemp
+* smartmontools
 * music player (mpd or MPRIS supported)
 * wireless_tools
 
@@ -44,20 +47,23 @@ Make dependencies
 * cmake
 * extra-cmake-modules
 
-In addition, some distros might require to install some -dev packages, e.g. the list of required packages for deb-based distros can be found [here](https://github.com/arcan1s/awesome-widgets/blob/development/.docker/Dockerfile-ubuntu-amd64#L7).
+In addition some distros might require to install some -dev packages, e.g. the list of required packages for deb-based distros can be found [here](https://github.com/arcan1s/awesome-widgets/blob/development/.docker/Dockerfile-ubuntu-amd64#L7).
 
 Installation
 ------------
 
 * download sources
-* build package
+* install
 
-      cmake -B build -S sources -DCMAKE_BUILD_TYPE=Release
+        mkdir build && cd build
-      cmake --build build
+        cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../sources
+        make && sudo make install
 
-* install package 
+  **NOTE** on Plasma 5 it very likely requires `-DKDE_INSTALL_USE_QT_SYS_PATHS=ON` flag
 
-      cmake --install build
+  **NOTE** if you are going to build from git, you need to init submodules first, e.g.:
+
+        git submodule update --init --recursive
 
 Additional information
 ======================

create_archive.sh

@@ -1,7 +1,13 @@
 #!/bin/bash
 
 SRCDIR="sources"
-VERSION="$(git describe --tags --abbrev=0)"
+MAJOR=$(grep -m1 PROJECT_VERSION_MAJOR sources/CMakeLists.txt | awk '{print $2}' | sed 's/^.\(.*\)..$/\1/')
+MINOR=$(grep -m1 PROJECT_VERSION_MINOR sources/CMakeLists.txt | awk '{print $2}' | sed 's/^.\(.*\)..$/\1/')
+PATCH=$(grep -m1 PROJECT_VERSION_PATCH sources/CMakeLists.txt | awk '{print $2}' | sed 's/^.\(.*\)..$/\1/')
+VERSION="${MAJOR}.${MINOR}.${PATCH}"
+
+# update submodules
+git submodule update --init --recursive
 
 # build widget
 ARCHIVE="awesome-widgets"
@@ -10,11 +16,17 @@ IGNORELIST="build usr .kdev4 *.kdev4 .idea packages/*src.tar.xz"
 # create archive
 [[ -e ${ARCHIVE}-${VERSION}-src.tar.xz ]] && rm -f "${ARCHIVE}-${VERSION}-src.tar.xz"
 [[ -d ${ARCHIVE} ]] && rm -rf "${ARCHIVE}"
-
 cp -r "${SRCDIR}" "${ARCHIVE}"
 for FILE in ${FILES[*]}; do cp -r "$FILE" "${ARCHIVE}"; done
 for FILE in ${IGNORELIST[*]}; do rm -rf "${ARCHIVE}/${FILE}"; done
-
 tar cJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}"
-
+ln -sf "../${ARCHIVE}-${VERSION}-src.tar.xz" packages
 rm -rf "${ARCHIVE}"
+
+# update md5sum
+MD5SUMS=$(md5sum ${ARCHIVE}-${VERSION}-src.tar.xz | awk '{print $1}')
+sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" packages/PKGBUILD
+sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" packages/PKGBUILD
+# clear
+find . -type f -name '*src.tar.xz' -not -name "*${VERSION}-src.tar.xz" -exec rm -rf {} \;
+find packages -type l -xtype l -exec rm -rf {} \;

packages/PKGBUILD

@@ -1,31 +1,41 @@
 # Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
 
-pkgname=plasma6-applet-awesome-widgets
+pkgname=plasma5-applet-awesome-widgets
 _pkgname=awesome-widgets
-pkgver=4.0.0alpha2
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
-arch=('x86_64')
+arch=('i686' 'x86_64')
 url="https://arcanis.me/projects/awesome-widgets"
 license=('GPL3')
-depends=('plasma-workspace')
+depends=('plasma-framework')
-optdepends=("mpd: for music player monitor"
+optdepends=("catalyst: for GPU monitor"
-            "wireless_tools: wifi information")
+            "hddtemp: for HDD temperature 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/${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
+source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
-install="$pkgname.install"
+install=${pkgname}.install
+md5sums=('df3ad1c626fdc1893f0f6e0b0fe636c2')
 backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
 
+prepare() {
+  rm -rf "${srcdir}/build"
+  mkdir "${srcdir}/build"
+}
+
 build () {
-    cmake -B build -S "${_pkgname}" \
+  cd "${srcdir}/build"
+  cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
         -DCMAKE_BUILD_TYPE=Optimization \
+        -DCMAKE_INSTALL_PREFIX=/usr \
         -DBUILD_FUTURE=ON \
-          -DBUILD_TESTING=OFF
+        "../${_pkgname}"
-    cmake --build build
+  make
 }
 
 package() {
-      DESTDIR="$pkgdir" cmake --install build
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }
-
-sha256sums=('b2a7b07a1df6f710f4e0d6e5898933f4ddb131818b922dc4b8e48afe3e98a664')

packages/build-requirements.deb.txt

@@ -0,0 +1,11 @@
+cmake
+extra-cmake-modules
+g++
+git
+libkf5i18n-dev
+libkf5notifications-dev
+libkf5service-dev
+libkf5windowsystem-dev
+plasma-framework-dev
+qtbase5-dev
+qtdeclarative5-dev

patches/qt5.5-qstringlist-and-qinfo.patch

@@ -0,0 +1,33 @@
+diff --git a/sources/awdebug.h b/sources/awdebug.h
+index 8447c65..4eef49a 100644
+--- a/sources/awdebug.h
++++ b/sources/awdebug.h
+@@ -23,10 +23,15 @@
+ 
+ #include "version.h"
+ 
++#ifndef qCInfo
++#define qCInfo qCDebug
++#endif
++
++
+ namespace AWDebug
+ {
+ const char LOG_FORMAT[] = "[%{time "
+-                          "process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%"
++                          "process}][%{if-debug}DD%{endif}%"
+                           "{if-warning}WW%{endif}%{if-critical}CC%{endif}%{if-"
+                           "fatal}FF%{endif}][%{category}][%{function}] "
+                           "%{message}";
+diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h
+index d6d5d1a..ee301df 100644
+--- a/sources/awesome-widget/plugin/awkeysaggregator.h
++++ b/sources/awesome-widget/plugin/awkeysaggregator.h
+@@ -21,6 +21,7 @@
+ 
+ #include <QHash>
+ #include <QObject>
++#include <QStringList>
+ 
+ 
+ class AWFormatterHelper;

patches/qt5.6-qversionnumber.patch

@@ -0,0 +1,139 @@
+diff --git a/sources/awesome-widget/plugin/awupdatehelper.cpp b/sources/awesome-widget/plugin/awupdatehelper.cpp
+index f6b5338..b5a3163 100644
+--- a/sources/awesome-widget/plugin/awupdatehelper.cpp
++++ b/sources/awesome-widget/plugin/awupdatehelper.cpp
+@@ -35,7 +35,7 @@ AWUpdateHelper::AWUpdateHelper(QObject *_parent)
+ {
+     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+ 
+-    m_foundVersion = QVersionNumber::fromString(VERSION);
++    m_foundVersion = VERSION;
+     m_genericConfig = QString("%1/awesomewidgets/general.ini")
+                           .arg(QStandardPaths::writableLocation(
+                               QStandardPaths::GenericDataLocation));
+@@ -67,8 +67,7 @@ void AWUpdateHelper::checkUpdates(const bool _showAnyway)
+ bool AWUpdateHelper::checkVersion()
+ {
+     QSettings settings(m_genericConfig, QSettings::IniFormat);
+-    QVersionNumber version = QVersionNumber::fromString(
+-        settings.value("Version", QString(VERSION)).toString());
++    QString version = settings.value("Version", VERSION).toString();
+     // update version
+     settings.setValue("Version", QString(VERSION));
+     settings.sync();
+@@ -91,12 +90,11 @@ bool AWUpdateHelper::checkVersion()
+ }
+ 
+ 
+-void AWUpdateHelper::showInfo(const QVersionNumber &_version)
++void AWUpdateHelper::showInfo(const QString &_version)
+ {
+     qCDebug(LOG_AW) << "Version" << _version;
+ 
+-    QString text
+-        = i18n("You are using the actual version %1", _version.toString());
++    QString text = i18n("You are using the actual version %1", _version);
+     if (!QString(COMMIT_SHA).isEmpty())
+         text += QString(" (%1)").arg(QString(COMMIT_SHA));
+     return genMessageBox(i18n("No new version found"), text, QMessageBox::Ok)
+@@ -104,7 +102,7 @@ void AWUpdateHelper::showInfo(const QVersionNumber &_version)
+ }
+ 
+ 
+-void AWUpdateHelper::showUpdates(const QVersionNumber &_version)
++void AWUpdateHelper::showUpdates(const QString &_version)
+ {
+     qCDebug(LOG_AW) << "Version" << _version;
+ 
+@@ -113,7 +111,7 @@ void AWUpdateHelper::showUpdates(const QVersionNumber &_version)
+     text += QString(COMMIT_SHA).isEmpty()
+                 ? "\n"
+                 : QString(" (%1)\n").arg(QString(COMMIT_SHA));
+-    text += i18n("New version : %1", _version.toString()) + "\n\n";
++    text += i18n("New version : %1", _version) + "\n\n";
+     text += i18n("Click \"Ok\" to download");
+ 
+     genMessageBox(i18n("There are updates"), text,
+@@ -130,8 +128,7 @@ void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *_button)
+ 
+     switch (ret) {
+     case QMessageBox::AcceptRole:
+-        QDesktopServices::openUrl(QString(RELEASES)
+-                                  + m_foundVersion.toString());
++        QDesktopServices::openUrl(QString(RELEASES) + m_foundVersion);
+         break;
+     case QMessageBox::RejectRole:
+     default:
+@@ -162,14 +159,23 @@ void AWUpdateHelper::versionReplyRecieved(QNetworkReply *_reply,
+     QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
+     QString version = firstRelease["tag_name"].toString();
+     version.remove("V.");
+-    m_foundVersion = QVersionNumber::fromString(version);
++    m_foundVersion = version;
+     qCInfo(LOG_AW) << "Update found version to" << m_foundVersion;
+ 
+-    QVersionNumber oldVersion = QVersionNumber::fromString(VERSION);
+-    if (oldVersion < m_foundVersion)
+-        return showUpdates(m_foundVersion);
++    // FIXME: possible there is a better way to check versions
++    int old_major = QString(VERSION).split(QChar('.')).at(0).toInt();
++    int old_minor = QString(VERSION).split(QChar('.')).at(1).toInt();
++    int old_patch = QString(VERSION).split(QChar('.')).at(2).toInt();
++    int new_major = version.split(QChar('.')).at(0).toInt();
++    int new_minor = version.split(QChar('.')).at(1).toInt();
++    int new_patch = version.split(QChar('.')).at(2).toInt();
++    if ((old_major < new_major)
++        || ((old_major == new_major) && (old_minor < new_minor))
++        || ((old_major == new_major) && (old_minor == new_minor)
++            && (old_patch < new_patch)))
++        return showUpdates(version);
+     else if (_showAnyway)
+-        return showInfo(m_foundVersion);
++        return showInfo(version);
+ }
+ 
+ 
+diff --git a/sources/awesome-widget/plugin/awupdatehelper.h b/sources/awesome-widget/plugin/awupdatehelper.h
+index cfd26e7..b311be2 100644
+--- a/sources/awesome-widget/plugin/awupdatehelper.h
++++ b/sources/awesome-widget/plugin/awupdatehelper.h
+@@ -21,7 +21,6 @@
+ 
+ #include <QMessageBox>
+ #include <QObject>
+-#include <QVersionNumber>
+ 
+ 
+ class QNetworkReply;
+@@ -37,15 +36,15 @@ public:
+     bool checkVersion();
+ 
+ private slots:
+-    void showInfo(const QVersionNumber &_version);
+-    void showUpdates(const QVersionNumber &_version);
++    void showInfo(const QString &_version);
++    void showUpdates(const QString &_version);
+     void userReplyOnUpdates(QAbstractButton *_button);
+     void versionReplyRecieved(QNetworkReply *_reply, const bool _showAnyway);
+ 
+ private:
+     QMessageBox *genMessageBox(const QString &_title, const QString &_body,
+                                const QMessageBox::StandardButtons _buttons);
+-    QVersionNumber m_foundVersion;
++    QString m_foundVersion;
+     QString m_genericConfig;
+ };
+ 
+diff --git a/sources/libraries.cmake b/sources/libraries.cmake
+index 6f171a6..004b39f 100644
+--- a/sources/libraries.cmake
++++ b/sources/libraries.cmake
+@@ -2,7 +2,7 @@
+ find_package(Gettext REQUIRED)
+ 
+ # main qt libraries
+-find_package(Qt5 5.6.0 REQUIRED COMPONENTS Core DBus Network Qml Test Widgets)
++find_package(Qt5 5.5.0 REQUIRED COMPONENTS Core DBus Network Qml Test Widgets)
+ add_definitions(
+         ${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
+         ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}

sources/.clang-format

@@ -2,11 +2,11 @@
 Language:        Cpp
 AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: None
+AlignConsecutiveAssignments: false
 AlignOperands:   true
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: Never
+AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: Inline
 AllowShortIfStatementsOnASingleLine: Never
@@ -20,7 +20,7 @@ BreakBeforeBinaryOperators: All
 BreakBeforeBraces: Linux
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: true
-ColumnLimit:     120
+ColumnLimit:     100
 CommentPragmas:  '^ IWYU pragma:'
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
@@ -58,7 +58,7 @@ SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard:        Latest
+Standard:        Cpp11
 TabWidth:        8
 UseTab:          Never
 ...

sources/3rdparty/fontdialog/COPYING

@@ -1,165 +0,0 @@
-GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

sources/3rdparty/fontdialog/README.md

@@ -1,4 +0,0 @@
-qtadds-fontdialog
-=================
-
-Font dialog which provides a font color settings

sources/3rdparty/fontdialog/fontdialog.cpp

@@ -1,140 +0,0 @@
-/***************************************************************************
- *  Copyright (C) 2014  Evgeniy Alekseev                                      *
- *                                                                         *
- *  This library is free software; you can redistribute it and/or          *
- *  modify it under the terms of the GNU Lesser General Public             *
- *  License as published by the Free Software Foundation; either           *
- *  version 3.0 of the License, or (at your option) any later version.     *
- *                                                                         *
- *  This library 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       *
- *  Lesser General Public License for more details.                        *
- *                                                                         *
- *  You should have received a copy of the GNU Lesser General Public       *
- *  License along with this library.                                       *
- ***************************************************************************/
-
-#include "fontdialog.h"
-
-#include <QGridLayout>
-
-
-CFont::CFont(const QString family, int pointSize, int weight, bool italic, QColor color)
-    : QFont(family, pointSize, weight, italic)
-{
-    setCurrentColor(color);
-}
-
-
-QColor CFont::color()
-{
-    return currentColor;
-}
-
-
-void CFont::setCurrentColor(const QColor color)
-{
-    currentColor = color;
-}
-
-
-CFont CFont::fromQFont(const QFont font, const QColor color)
-{
-    return CFont(font.family(), font.pointSize(), font.weight(), font.italic(), color);
-}
-
-
-QFont CFont::toQFont()
-{
-    return QFont(family(), pointSize(), weight(), italic());
-}
-
-
-CFontDialog::CFontDialog(QWidget *parent, bool needWeight, bool needItalic)
-    : QDialog(parent)
-{
-    QGridLayout *mainGrid = new QGridLayout(this);
-    setLayout(mainGrid);
-
-    colorBox = new QComboBox(this);
-    connect(colorBox, &QComboBox::currentTextChanged, this, &CFontDialog::updateColor);
-    QStringList colorNames = QColor::colorNames();
-    int index = 0;
-    for (int i=0; i<colorNames.count(); i++) {
-        QColor color(colorNames[i]);
-        colorBox->addItem(colorNames[i], color);
-        QModelIndex idx = colorBox->model()->index(index++, 0);
-        colorBox->model()->setData(idx, color, Qt::BackgroundRole);
-    }
-    mainGrid->addWidget(colorBox, 0, 0);
-    fontBox = new QFontComboBox(this);
-    mainGrid->addWidget(fontBox, 0, 1);
-    sizeBox = new QSpinBox(this);
-    mainGrid->addWidget(sizeBox, 0, 2);
-    weightBox = new QSpinBox(this);
-    mainGrid->addWidget(weightBox, 0, 3);
-    italicBox = new QComboBox(this);
-    italicBox->addItem(tr("normal"));
-    italicBox->addItem(tr("italic"));
-    mainGrid->addWidget(italicBox, 0, 4);
-
-    buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
-                                   Qt::Horizontal, this);
-    QObject::connect(buttons, &QDialogButtonBox::accepted, this, &CFontDialog::accept);
-    QObject::connect(buttons, &QDialogButtonBox::rejected, this, &CFontDialog::reject);
-    mainGrid->addWidget(buttons, 1, 0, 1, 5);
-
-    italicBox->setHidden(!needItalic);
-    weightBox->setHidden(!needWeight);
-}
-
-
-CFontDialog::~CFontDialog()
-{
-    delete colorBox;
-    delete buttons;
-    delete fontBox;
-    delete italicBox;
-    delete sizeBox;
-    delete weightBox;
-}
-
-
-void CFontDialog::updateColor(const QString color)
-{
-    colorBox->setStyleSheet(QString("background:%1").arg(QColor(color).name()));
-}
-
-
-CFont CFontDialog::getFont(const QString title, CFont defaultFont, bool needWeight, bool needItalic, int *status)
-{
-    CFontDialog dlg(0, needWeight, needItalic);
-
-    dlg.setWindowTitle(title);
-    QStringList colorNames = QColor::colorNames();
-    for (int i=0; i<colorNames.count(); i++)
-        if (QColor(colorNames[i]) == defaultFont.color()) {
-            dlg.colorBox->setCurrentIndex(i);
-            break;
-        }
-    dlg.fontBox->setCurrentFont(defaultFont);
-    dlg.sizeBox->setValue(defaultFont.pointSize());
-    dlg.weightBox->setValue(defaultFont.weight());
-    if (defaultFont.italic())
-        dlg.italicBox->setCurrentIndex(1);
-    else
-        dlg.italicBox->setCurrentIndex(0);
-
-    CFont font = CFont(defaultFont);
-    int ret = dlg.exec();
-    if (ret == 1)
-        font = CFont(dlg.fontBox->currentFont().family(),
-                     dlg.sizeBox->value(),
-                     dlg.weightBox->value(),
-                     dlg.italicBox->currentIndex() == 1,
-                     QColor(dlg.colorBox->currentText()));
-    if (status != nullptr)
-        *status = ret;
-    return font;
-}

sources/3rdparty/fontdialog/fontdialog.h

@@ -1,73 +0,0 @@
-/***************************************************************************
- *  Copyright (C) 2014  Evgeniy Alekseev                                      *
- *                                                                         *
- *  This library is free software; you can redistribute it and/or          *
- *  modify it under the terms of the GNU Lesser General Public             *
- *  License as published by the Free Software Foundation; either           *
- *  version 3.0 of the License, or (at your option) any later version.     *
- *                                                                         *
- *  This library 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       *
- *  Lesser General Public License for more details.                        *
- *                                                                         *
- *  You should have received a copy of the GNU Lesser General Public       *
- *  License along with this library.                                       *
- ***************************************************************************/
-
-#pragma once
-
-#include <QComboBox>
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QFontComboBox>
-#include <QSpinBox>
-
-
-class CFont : public QFont
-{
-public:
-    explicit CFont(const QString family, int pointSize = -1,
-                   int weight = -1, bool italic = false,
-                   QColor color = QColor(QString("#000000")));
-    // color properties
-    QColor color();
-    void setCurrentColor(const QColor color);
-    // conversion to QFont
-    static CFont fromQFont(const QFont font,
-                           const QColor color = QColor(QString("#000000")));
-    QFont toQFont();
-
-private:
-    QColor currentColor;
-};
-
-
-class CFontDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit CFontDialog(QWidget *parent = 0,
-                         const bool needWeight = true,
-                         const bool needItalic = true);
-    ~CFontDialog();
-    static CFont getFont(const QString title = tr("Select font"),
-                         CFont defaultFont = CFont(QString("Arial"),
-                                                   12, 400, false,
-                                                   QColor(QString("#000000"))),
-                         const bool needWeight = true,
-                         const bool needItalic = true,
-                         int *status = nullptr);
-
-private slots:
-    void updateColor(const QString color);
-
-private:
-    QComboBox *colorBox;
-    QDialogButtonBox *buttons;
-    QFontComboBox *fontBox;
-    QComboBox *italicBox;
-    QSpinBox *sizeBox;
-    QSpinBox *weightBox;
-};

sources/3rdparty/qreplytimeout/qreplytimeout.cpp

@@ -12,7 +12,7 @@ QReplyTimeout::QReplyTimeout(QNetworkReply *reply, const int timeout)
 
 void QReplyTimeout::timeout()
 {
-    auto reply = dynamic_cast<QNetworkReply *>(parent());
+    auto *reply = dynamic_cast<QNetworkReply *>(parent());
     if (reply->isRunning())
         reply->close();
 }

sources/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16.0)
+cmake_minimum_required(VERSION 2.8.12)
 
 # some fucking magic
 cmake_policy(SET CMP0011 NEW)
@@ -9,17 +9,14 @@ endif ()
 if (POLICY CMP0071)
     cmake_policy(SET CMP0071 NEW)
 endif ()
-if (POLICY CMP0160)
-    cmake_policy(SET CMP0160 OLD)
-endif ()
 
 project(awesomewidgets)
 set(PROJECT_AUTHOR "Evgeniy Alekseev")
 set(PROJECT_CONTACT "esalexeev@gmail.com")
 set(PROJECT_LICENSE "GPL3")
-set(PROJECT_VERSION_MAJOR "4")
+set(PROJECT_VERSION_MAJOR "3")
-set(PROJECT_VERSION_MINOR "0")
+set(PROJECT_VERSION_MINOR "4")
-set(PROJECT_VERSION_PATCH "1")
+set(PROJECT_VERSION_PATCH "2")
 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/awdebug.cpp

@@ -15,9 +15,7 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#ifndef NDEBUG
+
-#define NDEBUG
-#endif /* NDEBUG */
 #include <KI18n/KLocalizedString>
 
 #include "awdebug.h"
@@ -43,32 +41,45 @@ QString AWDebug::getAboutText(const QString &_type)
     } else if (_type == "description") {
         text = i18n("A set of minimalistic plasmoid widgets");
     } else if (_type == "links") {
-        text = i18n("Links:") + "<ul>" + QString("<li><a href=\"%1\">%2</a></li>").arg(HOMEPAGE, i18n("Homepage"))
+        text = i18n("Links:") + "<ul>"
-               + QString("<li><a href=\"%1\">%2</a></li>").arg(REPOSITORY, i18n("Repository"))
+               + QString("<li><a href=\"%1\">%2</a></li>").arg(HOMEPAGE).arg(i18n("Homepage"))
-               + QString("<li><a href=\"%1\">%2</a></li>").arg(BUGTRACKER, i18n("Bugtracker"))
+               + QString("<li><a href=\"%1\">%2</a></li>").arg(REPOSITORY).arg(i18n("Repository"))
-               + QString("<li><a href=\"%1\">%2</a></li>").arg(TRANSLATION, i18n("Translation issue"))
+               + QString("<li><a href=\"%1\">%2</a></li>").arg(BUGTRACKER).arg(i18n("Bugtracker"))
-               + QString("<li><a href=\"%1\">%2</a></li>").arg(AUR_PACKAGES, i18n("AUR packages"))
+               + QString("<li><a href=\"%1\">%2</a></li>")
-               + QString("<li><a href=\"%1\">%2</a></li>").arg(OPENSUSE_PACKAGES, i18n("openSUSE packages")) + "</ul>";
+                     .arg(TRANSLATION)
+                     .arg(i18n("Translation issue"))
+               + QString("<li><a href=\"%1\">%2</a></li>")
+                     .arg(AUR_PACKAGES)
+                     .arg(i18n("AUR packages"))
+               + QString("<li><a href=\"%1\">%2</a></li>")
+                     .arg(OPENSUSE_PACKAGES)
+                     .arg(i18n("openSUSE packages"))
+               + "</ul>";
     } else if (_type == "copy") {
-        text = QString("<small>&copy; %1 <a href=\"mailto:%2\">%3</a><br>").arg(DATE, EMAIL, AUTHOR)
+        text = QString("<small>&copy; %1 <a href=\"mailto:%2\">%3</a><br>")
-               + i18n("This software is licensed under %1", LICENSE) + "</small>";
+                   .arg(DATE)
+                   .arg(EMAIL)
+                   .arg(AUTHOR)
+               + i18nc("This software is licensed under %1", LICENSE) + "</small>";
     } else if (_type == "translators") {
-        auto translatorList = QString(TRANSLATORS).split(',');
+        QStringList translatorList = QString(TRANSLATORS).split(',');
         for (auto &translator : translatorList)
             translator = QString("<li>%1</li>").arg(translator);
         text = i18n("Translators:") + "<ul>" + translatorList.join("") + "</ul>";
     } else if (_type == "3rdparty") {
-        auto trdPartyList = QString(TRDPARTY_LICENSE).split(';', Qt::SkipEmptyParts);
+        QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(';', Qt::SkipEmptyParts);
-        for (auto i = 0; i < trdPartyList.count(); ++i)
+        for (int i = 0; i < trdPartyList.count(); i++)
             trdPartyList[i] = QString("<li><a href=\"%3\">%1</a> (%2 license)</li>")
-                                  .arg(trdPartyList.at(i).split(',')[0], trdPartyList.at(i).split(',')[1],
+                                  .arg(trdPartyList.at(i).split(',')[0])
-                                       trdPartyList.at(i).split(',')[2]);
+                                  .arg(trdPartyList.at(i).split(',')[1])
+                                  .arg(trdPartyList.at(i).split(',')[2]);
         text = i18n("This software uses:") + "<ul>" + trdPartyList.join("") + "</ul>";
     } else if (_type == "thanks") {
-        auto thanks = QString(SPECIAL_THANKS).split(';', Qt::SkipEmptyParts);
+        QStringList thanks = QString(SPECIAL_THANKS).split(';', Qt::SkipEmptyParts);
-        for (auto i = 0; i < thanks.count(); ++i)
+        for (int i = 0; i < thanks.count(); i++)
-            thanks[i]
+            thanks[i] = QString("<li><a href=\"%2\">%1</a></li>")
-                = QString("<li><a href=\"%2\">%1</a></li>").arg(thanks.at(i).split(',')[0], thanks.at(i).split(',')[1]);
+                            .arg(thanks.at(i).split(',')[0])
+                            .arg(thanks.at(i).split(',')[1]);
         text = i18n("Special thanks to:") + "<ul>" + thanks.join("") + "</ul>";
     }
 
@@ -103,7 +114,8 @@ QStringList AWDebug::getBuildData()
     metadata.append(QString("    CMAKE_CXX_FLAGS: %1").arg(CMAKE_CXX_FLAGS));
     metadata.append(QString("    CMAKE_CXX_FLAGS_DEBUG: %1").arg(CMAKE_CXX_FLAGS_DEBUG));
     metadata.append(QString("    CMAKE_CXX_FLAGS_RELEASE: %1").arg(CMAKE_CXX_FLAGS_RELEASE));
-    metadata.append(QString("    CMAKE_CXX_FLAGS_OPTIMIZATION: %1").arg(CMAKE_CXX_FLAGS_OPTIMIZATION));
+    metadata.append(
+        QString("    CMAKE_CXX_FLAGS_OPTIMIZATION: %1").arg(CMAKE_CXX_FLAGS_OPTIMIZATION));
     metadata.append(QString("    CMAKE_DEFINITIONS: %1").arg(CMAKE_DEFINITIONS));
     metadata.append(QString("    CMAKE_INSTALL_PREFIX: %1").arg(CMAKE_INSTALL_PREFIX));
     metadata.append(QString("    CMAKE_MODULE_LINKER_FLAGS: %1").arg(CMAKE_MODULE_LINKER_FLAGS));

sources/awdebug.h

@@ -15,7 +15,9 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWDEBUG_H
+#define AWDEBUG_H
 
 #include <QLoggingCategory>
 
@@ -40,3 +42,6 @@ Q_DECLARE_LOGGING_CATEGORY(LOG_DP)
 Q_DECLARE_LOGGING_CATEGORY(LOG_ESM)
 Q_DECLARE_LOGGING_CATEGORY(LOG_ESS)
 Q_DECLARE_LOGGING_CATEGORY(LOG_LIB)
+
+
+#endif /* AWDEBUG_H */

sources/awesome-widget/CMakeLists.txt

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

sources/awesome-widget/metadata.desktop

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

sources/awesome-widget/metadata.json

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

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

@@ -15,7 +15,7 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.0
 
 import org.kde.plasma.configuration 2.0
 
@@ -51,12 +51,6 @@ ConfigModel {
         source: "dataengine.qml"
     }
 
-    ConfigCategory {
-        name: i18n("Report bug")
-        icon: "tools-report-bug"
-        source: "bug.qml"
-    }
-
     ConfigCategory {
         name: i18n("About")
         icon: "help-about"

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

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

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

@@ -15,22 +15,28 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.0
-import org.kde.kcmutils as KCM
 
-import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget 1.0
-import org.kde.plasma.private.awesomewidget
 
 
-KCM.SimpleKCM {
+Item {
     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

@@ -15,22 +15,26 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.0
-import QtQuick.Controls
+import QtQuick.Controls 1.3 as QtControls
-import org.kde.kcmutils as KCM
 
-import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget 1.0
-import org.kde.plasma.private.awesomewidget
 
 
-KCM.SimpleKCM {
+Item {
     id: advancedPage
-
     // backend
-    AWConfigHelper {
+    AWActions {
-        id: awConfig
+        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
@@ -41,14 +45,19 @@ KCM.SimpleKCM {
     property alias cfg_height: widgetHeight.value
     property alias cfg_width: widgetWidth.value
     property alias cfg_interval: update.value
+    property alias cfg_queueLimit: queueLimit.value
     property string cfg_tempUnits: tempUnits.value
     property alias cfg_customTime: customTime.value
     property alias cfg_customUptime: customUptime.value
     property alias cfg_acOnline: acOnline.value
     property alias cfg_acOffline: acOffline.value
-    property alias cfg_historyCount: historyCount.value
+    property alias cfg_telemetryCount: telemetryCount.value
+    property alias cfg_telemetryRemote: telemetryRemote.checked
+    property alias cfg_telemetryId: telemetryId.value
+
 
     Column {
+        id: pageColumn
         anchors.fill: parent
 
         CheckBoxSelector {
@@ -113,41 +122,50 @@ KCM.SimpleKCM {
             value: plasmoid.configuration.interval
         }
 
+        IntegerSelector {
+            id: queueLimit
+            maximumValue: 99
+            minimumValue: 0
+            stepSize: 1
+            text: i18n("Messages queue limit")
+            value: plasmoid.configuration.queueLimit
+        }
+
         ComboBoxSelector {
             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")
             value: plasmoid.configuration.tempUnits
-            onValueEdited: newValue => cfg_tempUnits = newValue
+            onValueEdited: cfg_tempUnits = newValue
         }
 
         LineSelector {
@@ -174,20 +192,18 @@ KCM.SimpleKCM {
             value: plasmoid.configuration.acOffline
         }
 
-        GroupBox {
+        QtControls.GroupBox {
-            width: parent.width
             height: implicitHeight
+            width: parent.width
             title: i18n("Actions")
 
             Column {
                 height: implicitHeight
                 width: parent.width
-
                 ButtonSelector {
                     value: i18n("Drop key cache")
-                    onButtonActivated: awConfig.dropCache()
+                    onButtonActivated: awActions.dropCache()
                 }
-
                 ButtonSelector {
                     ExportDialog {
                         id: saveConfigAs
@@ -196,12 +212,11 @@ KCM.SimpleKCM {
                     value: i18n("Export configuration")
                     onButtonActivated: saveConfigAs.open()
                 }
-
                 ButtonSelector {
                     ImportDialog {
                         id: loadConfigFrom
                         onConfigurationReceived: {
-                            for (const key in configuration)
+                            for (var key in configuration)
                                 plasmoid.configuration[key] = configuration[key]
                         }
                     }
@@ -211,24 +226,37 @@ KCM.SimpleKCM {
             }
         }
 
-        GroupBox {
+        QtControls.GroupBox {
             height: implicitHeight
             width: parent.width
-            title: i18n("History")
+            title: i18n("Telemetry")
 
             Column {
                 height: implicitHeight
                 width: parent.width
-
+                CheckBoxSelector {
+                    id: telemetryRemote
+                    text: i18n("Enable remote telemetry")
+                }
                 IntegerSelector {
-                    id: historyCount
+                    id: telemetryCount
                     maximumValue: 10000
                     minimumValue: 0
                     stepSize: 50
                     text: i18n("History count")
-                    value: plasmoid.configuration.historyCount
+                    value: plasmoid.configuration.telemetryCount
+                }
+                LineSelector {
+                    id: telemetryId
+                    text: i18n("Telemetry ID")
+                    value: plasmoid.configuration.telemetryId
                 }
             }
         }
     }
+
+
+    Component.onCompleted: {
+        if (debug) console.debug()
+    }
 }

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

@@ -15,22 +15,31 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.0
-import org.kde.kcmutils as KCM
 
-import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget 1.0
-import org.kde.plasma.private.awesomewidget
+import "."
 
 
-KCM.SimpleKCM {
+Item {
     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
@@ -41,7 +50,9 @@ KCM.SimpleKCM {
     property alias cfg_textStyleColor: selectStyleColor.value
     property string cfg_textStyle: textStyle.value
 
+
     Column {
+        id: pageColumn
         anchors.fill: parent
 
         FontSelector {
@@ -64,7 +75,7 @@ KCM.SimpleKCM {
             model: General.fontWeightModel
             text: i18n("Font weight")
             value: plasmoid.configuration.fontWeight
-            onValueEdited: newValue => cfg_fontWeight = newValue
+            onValueEdited: cfg_fontWeight = newValue
         }
 
         ComboBoxSelector {
@@ -72,7 +83,7 @@ KCM.SimpleKCM {
             model: General.fontStyleModel
             text: i18n("Font style")
             value: plasmoid.configuration.fontStyle
-            onValueEdited: newValue => cfg_fontStyle = newValue
+            onValueEdited: cfg_fontStyle = newValue
         }
 
         ColorSelector {
@@ -86,7 +97,7 @@ KCM.SimpleKCM {
             model: General.textStyleModel
             text: i18n("Style")
             value: plasmoid.configuration.textStyle
-            onValueEdited: newValue => cfg_textStyle = newValue
+            onValueEdited: cfg_textStyle = newValue
         }
 
         ColorSelector {
@@ -95,4 +106,9 @@ KCM.SimpleKCM {
             value: plasmoid.configuration.textStyleColor
         }
     }
+
+
+    Component.onCompleted: {
+        if (debug) console.debug()
+    }
 }

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

@@ -15,46 +15,105 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.0
-import QtQuick.Controls
+import QtQuick.Controls 1.3 as QtControls
-import org.kde.kcmutils as KCM
+import QtQuick.Dialogs 1.1 as QtDialogs
 
-import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget 1.0
-import org.kde.plasma.private.awesomewidget
 
 
-KCM.SimpleKCM {
+Item {
     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 {
-        anchors.fill: parent
 
-        GroupBox {
+    Column {
+        id: pageColumn
+        anchors.fill: parent
+        QtControls.GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("ACPI")
             LineSelector {
                 text: i18n("ACPI path")
                 value: cfg_dataengine["ACPIPATH"]
-                onValueEdited: newValue => cfg_dataengine["ACPIPATH"] = newValue
+                onValueEdited: cfg_dataengine["ACPIPATH"] = newValue
             }
         }
 
-        GroupBox {
+        QtControls.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: cfg_dataengine["GPUDEV"] = newValue
+            }
+        }
+
+        QtControls.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: cfg_dataengine["HDDDEV"] = newValue
+                }
+
+                LineSelector {
+                    text: i18n("hddtemp cmd")
+                    value: cfg_dataengine["HDDTEMPCMD"]
+                    onValueEdited: cfg_dataengine["HDDTEMPCMD"] = newValue
+                }
+            }
+        }
+
+        QtControls.GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("Player")
-
             Column {
                 height: implicitHeight
                 width: parent.width
@@ -64,27 +123,27 @@ KCM.SimpleKCM {
                     stepSize: 1
                     text: i18n("Player data symbols")
                     value: cfg_dataengine["PLAYERSYMBOLS"]
-                    onValueEdited: newValue => cfg_dataengine["PLAYERSYMBOLS"] = newValue
+                    onValueEdited: cfg_dataengine["PLAYERSYMBOLS"] = newValue
                 }
 
                 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")
                     value: cfg_dataengine["PLAYER"]
-                    onValueEdited: newValue => cfg_dataengine["PLAYER"] = newValue
+                    onValueEdited: cfg_dataengine["PLAYER"] = newValue
                 }
 
                 ComboBoxSelector {
@@ -92,40 +151,40 @@ KCM.SimpleKCM {
                     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")
@@ -135,7 +194,7 @@ KCM.SimpleKCM {
                 LineSelector {
                     text: i18n("MPD address")
                     value: cfg_dataengine["MPDADDRESS"]
-                    onValueEdited: newValue => cfg_dataengine["MPDADDRESS"] = newValue
+                    onValueEdited: cfg_dataengine["MPDADDRESS"] = newValue
                 }
 
                 IntegerSelector {
@@ -144,20 +203,18 @@ KCM.SimpleKCM {
                     stepSize: 1
                     text: i18n("MPD port")
                     value: cfg_dataengine["MPDPORT"]
-                    onValueEdited: newValue => cfg_dataengine["MPDPORT"] = newValue
+                    onValueEdited: cfg_dataengine["MPDPORT"] = newValue
                 }
             }
         }
 
-        GroupBox {
+        QtControls.GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("Extensions")
-
             Column {
                 height: implicitHeight
                 width: parent.width
-
                 ButtonSelector {
                     value: i18n("Custom scripts")
                     onButtonActivated: awKeys.editItem("extscript")
@@ -188,11 +245,19 @@ KCM.SimpleKCM {
 
 
     Component.onCompleted: {
+        if (debug) console.debug()
+
         // init submodule
         awKeys.updateCache()
+
+        // update hdd model
+        hdd.model = awKeys.getHddDevices()
+        hdd.onCompleted
     }
 
     Component.onDestruction: {
+        if (debug) console.debug()
+
         cfg_dataengine["MPRIS"] = mpris.editText
         awConfig.writeDataEngineConfiguration(cfg_dataengine)
     }

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

@@ -15,18 +15,20 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.4
-import QtQuick.Layouts
+import QtQuick.Controls 1.3 as QtControls
-import org.kde.plasma.core as PlasmaCore
+import QtQuick.Dialogs 1.2 as QtDialogs
+import QtQuick.Layouts 1.1
 import org.kde.plasma.plasmoid 2.0
+import org.kde.plasma.core 2.0 as PlasmaCore
+import org.kde.plasma.components 2.0 as PlasmaComponents
 
-import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget 1.0
-import org.kde.plasma.private.awesomewidget
+import "."
 
 
-PlasmoidItem {
+Item {
     id: main
-
     // backend
     AWKeys {
         id: awKeys
@@ -37,7 +39,11 @@ PlasmoidItem {
     AWTelemetryHandler {
         id: awTelemetryHandler
     }
+    BugReport {
+        id: bugReport
+    }
 
+    property bool debug: awActions.isDebugEnabled()
     property variant tooltipSettings: {
         "tooltipNumber": plasmoid.configuration.tooltipNumber,
         "useTooltipBackground": plasmoid.configuration.useTooltipBackground,
@@ -67,12 +73,19 @@ PlasmoidItem {
     signal needToolTipUpdate(string newText)
     signal sizeUpdate
 
-    Layout.fillWidth: PlasmoidItem.formFactor !== PlasmaCore.Planar
+
-    Layout.fillHeight: PlasmoidItem.formFactor !== PlasmaCore.Planar
+    // init
+    Plasmoid.preferredRepresentation: Plasmoid.fullRepresentation
+    Plasmoid.compactRepresentation: Plasmoid.fullRepresentation
+
+    Layout.fillWidth: plasmoid.formFactor != PlasmaCore.Planar
+    Layout.fillHeight: plasmoid.formFactor != PlasmaCore.Planar
     Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
     Plasmoid.icon: "utilities-system-monitor"
     Plasmoid.backgroundHints: plasmoid.configuration.background ? "DefaultBackground" : "NoBackground"
+    Plasmoid.associatedApplication: "ksysguard"
+
 
     // ui
     Text {
@@ -87,7 +100,7 @@ PlasmoidItem {
 
         color: plasmoid.configuration.fontColor
         font.family: plasmoid.configuration.fontFamily
-        font.italic: plasmoid.configuration.fontStyle === "italic"
+        font.italic: plasmoid.configuration.fontStyle == "italic" ? true : false
         font.pointSize: plasmoid.configuration.fontSize
         font.weight: General.fontWeight[plasmoid.configuration.fontWeight]
 
@@ -106,55 +119,73 @@ PlasmoidItem {
         }
     }
 
-    Plasmoid.contextualActions: [
+    QtDialogs.Dialog {
-        PlasmaCore.Action {
+        id: tagSelector
-            text: i18n("Run monitor")
+        title: i18n("Select tag")
-            icon.name: "utilities-system-monitor"
+
-            onTriggered: awActions.runCmd("plasma-systemmonitor", [])
+        QtControls.ComboBox {
-        },
+            id: tagSelectorBox
-        PlasmaCore.Action {
+            width: parent.width
-            text: i18n("Show README")
+            editable: true
-            icon.name: "text-x-readme"
+        }
-            onTriggered: awActions.showReadme()
+
-        },
+        onAccepted: {
-        PlasmaCore.Action {
+            var tag = tagSelectorBox.editText
-            text: i18n("Check updates")
+            var message = i18n("Tag: %1", tag)
-            icon.name: "system-software-update"
+            message += "<br>"
-            onTriggered: awActions.checkUpdates(true)
+            message += i18n("Value: %1", awKeys.valueByKey(tag))
+            message += "<br>"
+            message += i18n("Info: %1", awKeys.infoByKey(tag))
+            awActions.sendNotification("tag", message)
+        }
     }
-    ]
 
 
     Component.onCompleted: {
+        if (debug) console.debug()
+
+        // actions
+        // it makes no sense to use this field with optimization enable
+        if (!plasmoid.configuration.optimize)
+            plasmoid.setAction("requestKey", i18n("Request key"), "utilities-system-monitor")
+        plasmoid.setAction("showReadme", i18n("Show README"), "text-x-readme")
+        plasmoid.setAction("checkUpdates", i18n("Check updates"), "system-software-update")
+        plasmoid.setAction("reportBug", i18n("Report bug"), "tools-report-bug")
         // init submodule
         Plasmoid.userConfiguringChanged(false)
         // connect data
         awKeys.needTextToBeUpdated.connect(needTextUpdate)
-        //awKeys.needToolTipToBeUpdated.connect(needToolTipUpdate)
+        awKeys.needToolTipToBeUpdated.connect(needToolTipUpdate)
         // check updates if required
         if (plasmoid.configuration.checkUpdates) return awActions.checkUpdates(false)
     }
 
-    onNeedTextUpdate: newText => {
+    onNeedTextUpdate: {
+        if (debug) console.debug()
+
         text.text = newText
         sizeUpdate()
     }
 
-    onNeedToolTipUpdate: newText => {
+    onNeedToolTipUpdate: {
+        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 {
@@ -165,10 +196,12 @@ PlasmoidItem {
 
     Plasmoid.onUserConfiguringChanged: {
         if (plasmoid.userConfiguring) return
+        if (debug) console.debug()
 
         // init submodule
         awKeys.initDataAggregator(tooltipSettings)
-        awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.interval, plasmoid.configuration.optimize)
+        awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.interval,
+                        plasmoid.configuration.queueLimit, plasmoid.configuration.optimize)
         awKeys.setWrapNewLines(plasmoid.configuration.wrapNewLines)
         // configure aggregator
         awKeys.setAggregatorProperty("acOffline", plasmoid.configuration.acOffline)
@@ -177,8 +210,49 @@ PlasmoidItem {
         awKeys.setAggregatorProperty("customUptime", plasmoid.configuration.customUptime)
         awKeys.setAggregatorProperty("tempUnits", plasmoid.configuration.tempUnits)
         awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings)
+        // update telemetry ID
+        if (plasmoid.configuration.telemetryId.length == 0)
+            plasmoid.configuration.telemetryId = generateUuid()
         // save telemetry
-        awTelemetryHandler.init(plasmoid.configuration.historyCount)
+        awTelemetryHandler.init(plasmoid.configuration.telemetryCount,
-        awTelemetryHandler.put("awwidgetconfig", plasmoid.configuration.text)
+                                plasmoid.configuration.telemetryRemote,
+                                plasmoid.configuration.telemetryId)
+        if (awTelemetryHandler.put("awwidgetconfig", plasmoid.configuration.text))
+            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) {
+            var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
+            return v.toString(16);
+        });
     }
 }

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

@@ -0,0 +1,27 @@
+# Do not edit qmldir directly it will be overrided during compilation,
+# edit qml/qmldir.in file instead.
+
+
+# common QML constants
+singleton General 1.0 file:///usr/share/awesomewidgets/qml/General.qml
+
+# custom QML UI classes
+AboutTab file:///usr/share/awesomewidgets/qml/AboutTab.qml
+AWExtensions file:///usr/share/awesomewidgets/qml/AWExtensions.qml
+AWInfoLabel file:///usr/share/awesomewidgets/qml/AWInfoLabel.qml
+AWTagSelector file:///usr/share/awesomewidgets/qml/AWTagSelector.qml
+AWTextEditor file:///usr/share/awesomewidgets/qml/AWTextEditor.qml
+BugReport file:///usr/share/awesomewidgets/qml/BugReport.qml
+ButtonSelector file:///usr/share/awesomewidgets/qml/ButtonSelector.qml
+CheckBoxSelector file:///usr/share/awesomewidgets/qml/CheckBoxSelector.qml
+ColorSelector file:///usr/share/awesomewidgets/qml/ColorSelector.qml
+ComboBoxSelector file:///usr/share/awesomewidgets/qml/ComboBoxSelector.qml
+ExportDialog file:///usr/share/awesomewidgets/qml/ExportDialog.qml
+FontSelector file:///usr/share/awesomewidgets/qml/FontSelector.qml
+HtmlDefaultFunctionsBar file:///usr/share/awesomewidgets/qml/HtmlDefaultFunctionsBar.qml
+HtmlEditorButton file:///usr/share/awesomewidgets/qml/HtmlEditorButton.qml
+HtmlEditorColor file:///usr/share/awesomewidgets/qml/HtmlEditorColor.qml
+HtmlEditorFont file:///usr/share/awesomewidgets/qml/HtmlEditorFont.qml
+ImportDialog file:///usr/share/awesomewidgets/qml/ImportDialog.qml
+IntegerSelector file:///usr/share/awesomewidgets/qml/IntegerSelector.qml
+LineSelector file:///usr/share/awesomewidgets/qml/LineSelector.qml

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

@@ -15,16 +15,25 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.0
-import QtQuick.Controls
+import QtQuick.Controls 1.3 as QtControls
-import org.kde.kcmutils as KCM
 
-import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget 1.0
-import org.kde.plasma.private.awesomewidget
 
 
-KCM.SimpleKCM {
+Item {
     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
@@ -37,17 +46,18 @@ KCM.SimpleKCM {
     property alias cfg_memTooltipColor: memTooltipColor.value
     property alias cfg_swapTooltip: swapTooltip.checked
     property alias cfg_swapTooltipColor: swapTooltipColor.value
-    property alias cfg_downkbTooltip: networkTooltip.checked
+    property alias cfg_downkbTooltip: downkbTooltip.checked
     property alias cfg_downkbTooltipColor: downkbTooltipColor.value
     property alias cfg_upkbTooltipColor: upkbTooltipColor.value
     property alias cfg_batTooltip: batTooltip.checked
     property alias cfg_batTooltipColor: batTooltipColor.value
     property alias cfg_batInTooltipColor: batInTooltipColor.value
 
-    Column {
-        anchors.fill: parent
 
-        Label {
+    Column {
+        id: pageColumn
+        anchors.fill: parent
+        QtControls.Label {
           width: parent.width
           horizontalAlignment: Text.AlignHCenter
           verticalAlignment: Text.AlignVCenter
@@ -64,116 +74,85 @@ KCM.SimpleKCM {
             value: plasmoid.configuration.tooltipNumber
         }
 
-        GroupBox {
+        QtControls.GroupBox {
             id: useTooltipBackground
+            height: implicitHeight
             width: parent.width
-
+            checkable: true
-            property alias checked: useTooltipBackgroundLabel.checked
+            title: i18n("Background")
-            label: CheckBox {
-                id: useTooltipBackgroundLabel
-                text: i18n("Background")
-            }
-
             ColorSelector {
                 id: tooltipBackground
-                enabled: useTooltipBackgroundLabel.checked
                 text: i18n("Background color")
                 value: plasmoid.configuration.tooltipBackground
             }
         }
 
-        GroupBox {
+        QtControls.GroupBox {
             id: cpuTooltip
+            height: implicitHeight
             width: parent.width
-
+            checkable: true
-            property alias checked: cpuTooltipLabel.checked
+            title: i18n("CPU")
-            label: CheckBox {
-                id: cpuTooltipLabel
-                text: i18n("CPU")
-            }
-
             ColorSelector {
                 id: cpuTooltipColor
-                enabled: cpuTooltipLabel.checked
                 text: i18n("CPU color")
                 value: plasmoid.configuration.cpuTooltipColor
             }
         }
 
-        GroupBox {
+        QtControls.GroupBox {
             id: cpuclTooltip
+            height: implicitHeight
             width: parent.width
-
+            checkable: true
-            property alias checked: cpuclTooltipLabel.checked
+            title: i18n("CPU clock")
-            label: CheckBox {
-                id: cpuclTooltipLabel
-                text: i18n("CPU clock")
-            }
-
             ColorSelector {
                 id: cpuclTooltipColor
-                enabled: cpuclTooltipLabel.checked
                 text: i18n("CPU clock color")
                 value: plasmoid.configuration.cpuclTooltipColor
             }
         }
 
-        GroupBox {
+        QtControls.GroupBox {
             id: memTooltip
+            height: implicitHeight
             width: parent.width
-
+            checkable: true
-            property alias checked: memTooltipLabel.checked
+            title: i18n("Memory")
-            label: CheckBox {
-                id: memTooltipLabel
-                text: i18n("Memory")
-            }
-
             ColorSelector {
                 id: memTooltipColor
-                enabled: memTooltipLabel.checked
                 text: i18n("Memory color")
                 value: plasmoid.configuration.memTooltipColor
             }
         }
 
-        GroupBox {
+        QtControls.GroupBox {
             id: swapTooltip
+            height: implicitHeight
             width: parent.width
-
+            checkable: true
-            property alias checked: swapTooltipLabel.checked
+            title: i18n("Swap")
-            label: CheckBox {
-                id: swapTooltipLabel
-                text: i18n("Swap")
-            }
-
             ColorSelector {
                 id: swapTooltipColor
-                enabled: swapTooltipLabel.checked
                 text: i18n("Swap color")
                 value: plasmoid.configuration.swapTooltipColor
             }
         }
 
-        GroupBox {
+        QtControls.GroupBox {
-            id: networkTooltip
+            id: downkbTooltip
+            height: implicitHeight
             width: parent.width
-
+            checkable: true
-            property alias checked: networkTooltipLabel.checked
+            title: i18n("Network")
-            label: CheckBox {
-                id: networkTooltipLabel
-                text: i18n("Network")
-            }
-
             Column {
+                height: implicitHeight
                 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")
@@ -182,26 +161,20 @@ KCM.SimpleKCM {
             }
         }
 
-        GroupBox {
+        QtControls.GroupBox {
             id: batTooltip
+            height: implicitHeight
             width: parent.width
-
+            checkable: true
-            property alias checked: batteryTooltipLabel.checked
+            title: i18n("Battery")
-            label: CheckBox {
-                id: batteryTooltipLabel
-                text: i18n("Battery")
-            }
-
             Column {
+                height: implicitHeight
                 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")
@@ -210,4 +183,9 @@ KCM.SimpleKCM {
             }
         }
     }
+
+
+    Component.onCompleted: {
+        if (debug) console.debug()
+    }
 }

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

@@ -15,17 +15,14 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.2
-import QtQuick.Controls
-import org.kde.kcmutils as KCM
 
-import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget 1.0
-import org.kde.plasma.private.awesomewidget
+import "."
 
 
-KCM.SimpleKCM {
+Item {
     id: widgetPage
-
     // backend
     AWKeys {
         id: awKeys
@@ -34,12 +31,21 @@ KCM.SimpleKCM {
         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
 
         AWInfoLabel {}
@@ -68,7 +74,10 @@ KCM.SimpleKCM {
         }
     }
 
+
     Component.onCompleted: {
+        if (debug) console.debug()
+
         awKeys.needTextToBeUpdated.connect(needTextUpdate)
         // init submodule
         awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.interval,
@@ -81,8 +90,9 @@ KCM.SimpleKCM {
         awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings)
     }
 
-    onNeedTextUpdate: newText => {
+    onNeedTextUpdate: {
         if (lock) return
+        if (debug) console.debug()
 
         extensions.showMessage(newText)
         lock = true

sources/awesome-widget/package/metadata.desktop

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

sources/awesome-widget/package/metadata.json

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

sources/awesome-widget/plugin/CMakeLists.txt

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

sources/awesome-widget/plugin/awabstractpairconfig.cpp

@@ -37,13 +37,13 @@ AWAbstractPairConfig::AWAbstractPairConfig(QWidget *_parent, const bool _hasEdit
 
     ui->setupUi(this);
 
-    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &AWAbstractPairConfig::accept);
+    connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &AWAbstractPairConfig::reject);
+    connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
 
     // edit feature
     if (m_hasEdit) {
         m_editButton = ui->buttonBox->addButton(i18n("Edit"), QDialogButtonBox::ActionRole);
-        connect(m_editButton, &QPushButton::clicked, [this]() { return edit(); });
+        connect(m_editButton, SIGNAL(clicked(bool)), this, SLOT(edit()));
     }
 }
 
@@ -58,12 +58,6 @@ AWAbstractPairConfig::~AWAbstractPairConfig()
 }
 
 
-void AWAbstractPairConfig::setHelper(std::unique_ptr<AWAbstractPairHelper> _helper)
-{
-    m_helper = std::move(_helper);
-}
-
-
 void AWAbstractPairConfig::showDialog()
 {
     // update dialog
@@ -90,14 +84,14 @@ void AWAbstractPairConfig::edit()
 
 void AWAbstractPairConfig::updateUi()
 {
-    auto current = dynamic_cast<AWAbstractSelector *>(sender())->current();
+    QPair<QString, QString> current = dynamic_cast<AWAbstractSelector *>(sender())->current();
-    auto index = m_selectors.indexOf(dynamic_cast<AWAbstractSelector *>(sender()));
+    int index = m_selectors.indexOf(dynamic_cast<AWAbstractSelector *>(sender()));
 
     if ((current.first.isEmpty()) && (current.second.isEmpty())) {
         // remove current selector if it is empty and does not last
         if (sender() == m_selectors.last())
             return;
-        auto selector = m_selectors.takeAt(index);
+        AWAbstractSelector *selector = m_selectors.takeAt(index);
         ui->verticalLayout->removeWidget(selector);
         selector->deleteLater();
     } else {
@@ -113,20 +107,21 @@ void AWAbstractPairConfig::updateUi()
 void AWAbstractPairConfig::addSelector(const QStringList &_keys, const QStringList &_values,
                                        const QPair<QString, QString> &_current)
 {
-    qCDebug(LOG_AW) << "Add selector with keys" << _keys << "values" << _values << "and current ones" << _current;
+    qCDebug(LOG_AW) << "Add selector with keys" << _keys << "values" << _values
+                    << "and current ones" << _current;
 
-    auto selector = new AWAbstractSelector(ui->scrollAreaWidgetContents, m_editable);
+    auto *selector = new AWAbstractSelector(ui->scrollAreaWidgetContents, m_editable);
     selector->init(_keys, _values, _current);
     ui->verticalLayout->insertWidget(ui->verticalLayout->count() - 1, selector);
-    connect(selector, &AWAbstractSelector::selectionChanged, this, &AWAbstractPairConfig::updateUi);
+    connect(selector, SIGNAL(selectionChanged()), this, SLOT(updateUi()));
     m_selectors.append(selector);
 }
 
 
 void AWAbstractPairConfig::clearSelectors()
 {
-    for (auto selector : m_selectors) {
+    for (auto &selector : m_selectors) {
-        disconnect(selector, &AWAbstractSelector::selectionChanged, this, &AWAbstractPairConfig::updateUi);
+        disconnect(selector, SIGNAL(selectionChanged()), this, SLOT(updateUi()));
         ui->verticalLayout->removeWidget(selector);
         selector->deleteLater();
     }
@@ -136,10 +131,10 @@ void AWAbstractPairConfig::clearSelectors()
 
 void AWAbstractPairConfig::execDialog()
 {
-    auto ret = exec();
+    int ret = exec();
     QHash<QString, QString> data;
-    for (auto selector : m_selectors) {
+    for (auto &selector : m_selectors) {
-        auto select = selector->current();
+        QPair<QString, QString> select = selector->current();
         if (select.first.isEmpty())
             continue;
         data[select.first] = select.second;
@@ -166,12 +161,11 @@ QPair<QStringList, QStringList> AWAbstractPairConfig::initKeys() const
     QStringList left = {""};
     left.append(m_helper->leftKeys().isEmpty() ? m_keys : m_helper->leftKeys());
     left.sort();
-
     QStringList right = {""};
     right.append(m_helper->rightKeys().isEmpty() ? m_keys : m_helper->rightKeys());
     right.sort();
 
-    return {left, right};
+    return QPair<QStringList, QStringList>(left, right);
 }
 
 
@@ -182,7 +176,7 @@ void AWAbstractPairConfig::updateDialog()
     auto keys = initKeys();
 
     for (auto &key : m_helper->keys())
-        addSelector(keys.first, keys.second, {key, pairs[key]});
+        addSelector(keys.first, keys.second, QPair<QString, QString>(key, m_helper->pairs()[key]));
     // empty one
-    addSelector(keys.first, keys.second, {});
+    addSelector(keys.first, keys.second, QPair<QString, QString>());
 }

sources/awesome-widget/plugin/awabstractpairconfig.h

@@ -15,7 +15,9 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWABSTRACTPAIRCONFIG_H
+#define AWABSTRACTPAIRCONFIG_H
 
 #include <QDialog>
 
@@ -33,9 +35,15 @@ class AWAbstractPairConfig : public QDialog
     Q_OBJECT
 
 public:
-    explicit AWAbstractPairConfig(QWidget *_parent = nullptr, bool _hasEdit = false, QStringList _keys = {});
+    explicit AWAbstractPairConfig(QWidget *_parent = nullptr, bool _hasEdit = false,
+                                  QStringList _keys = QStringList());
     ~AWAbstractPairConfig() override;
-    void setHelper(std::unique_ptr<AWAbstractPairHelper> _helper);
+    template <class T> void initHelper()
+    {
+
+        delete m_helper;
+        m_helper = new T(this);
+    }
     void showDialog();
     // properties
     void setEditable(bool _first, bool _second);
@@ -47,16 +55,20 @@ private slots:
 private:
     QPushButton *m_editButton = nullptr;
     Ui::AWAbstractPairConfig *ui = nullptr;
-    std::unique_ptr<AWAbstractPairHelper> m_helper;
+    AWAbstractPairHelper *m_helper = nullptr;
     QList<AWAbstractSelector *> m_selectors;
     // properties
     QPair<bool, bool> m_editable = {false, false};
     bool m_hasEdit = false;
     QStringList m_keys;
     // methods
-    void addSelector(const QStringList &_keys, const QStringList &_values, const QPair<QString, QString> &_current);
+    void addSelector(const QStringList &_keys, const QStringList &_values,
+                     const QPair<QString, QString> &_current);
     void clearSelectors();
     void execDialog();
     [[nodiscard]] QPair<QStringList, QStringList> initKeys() const;
     void updateDialog();
 };
+
+
+#endif /* AWABSTRACTPAIRCONFIG_H */

sources/awesome-widget/plugin/awabstractpairhelper.cpp

@@ -34,6 +34,12 @@ AWAbstractPairHelper::AWAbstractPairHelper(QString _filePath, QString _section)
 }
 
 
+AWAbstractPairHelper::~AWAbstractPairHelper()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
 QStringList AWAbstractPairHelper::keys() const
 {
     return m_pairs.keys();
@@ -55,7 +61,7 @@ QStringList AWAbstractPairHelper::values() const
 QSet<QString> AWAbstractPairHelper::valuesSet() const
 {
     auto values = m_pairs.values();
-    return {values.cbegin(), values.cend()};
+    return QSet(values.cbegin(), values.cend());
 }
 
 
@@ -63,17 +69,19 @@ void AWAbstractPairHelper::initItems()
 {
     m_pairs.clear();
 
-    auto configs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_filePath);
+    QStringList configs
+        = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_filePath);
 
     for (auto &fileName : configs) {
         QSettings settings(fileName, QSettings::IniFormat);
         qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
 
         settings.beginGroup(m_section);
-        auto keys = settings.childKeys();
+        QStringList keys = settings.childKeys();
         for (auto &key : keys) {
-            auto value = settings.value(key).toString();
+            QString value = settings.value(key).toString();
-            qCInfo(LOG_AW) << "Found key" << key << "for value" << value << "in" << settings.fileName();
+            qCInfo(LOG_AW) << "Found key" << key << "for value" << value << "in"
+                           << settings.fileName();
             if (value.isEmpty()) {
                 qCInfo(LOG_AW) << "Skip empty value for" << key;
                 continue;
@@ -89,8 +97,10 @@ bool AWAbstractPairHelper::writeItems(const QHash<QString, QString> &_configurat
 {
     qCDebug(LOG_AW) << "Write configuration" << _configuration;
 
-    auto fileName
+    QString fileName
-        = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation), m_filePath);
+        = QString("%1/%2")
+              .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
+              .arg(m_filePath);
     QSettings settings(fileName, QSettings::IniFormat);
     qCInfo(LOG_AW) << "Configuration file" << fileName;
 
@@ -101,7 +111,7 @@ bool AWAbstractPairHelper::writeItems(const QHash<QString, QString> &_configurat
 
     settings.sync();
 
-    return settings.status() == QSettings::NoError;
+    return (settings.status() == QSettings::NoError);
 }
 
 
@@ -109,13 +119,16 @@ bool AWAbstractPairHelper::removeUnusedKeys(const QStringList &_keys) const
 {
     qCDebug(LOG_AW) << "Remove keys" << _keys;
 
-    auto fileName
+    QString fileName
-        = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation), m_filePath);
+        = QString("%1/%2")
+              .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
+              .arg(m_filePath);
     QSettings settings(fileName, QSettings::IniFormat);
     qCInfo(LOG_AW) << "Configuration file" << fileName;
 
     settings.beginGroup(m_section);
-    for (auto &key : settings.childKeys()) {
+    QStringList foundKeys = settings.childKeys();
+    for (auto &key : foundKeys) {
         if (_keys.contains(key))
             continue;
         settings.remove(key);
@@ -124,5 +137,5 @@ bool AWAbstractPairHelper::removeUnusedKeys(const QStringList &_keys) const
 
     settings.sync();
 
-    return settings.status() == QSettings::NoError;
+    return (settings.status() == QSettings::NoError);
 }

sources/awesome-widget/plugin/awabstractpairhelper.h

@@ -15,7 +15,9 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWABSTRACTPAIRHELPER_H
+#define AWABSTRACTPAIRHELPER_H
 
 #include <QHash>
 
@@ -24,7 +26,7 @@ class AWAbstractPairHelper
 {
 public:
     explicit AWAbstractPairHelper(QString _filePath = "", QString _section = "");
-    virtual ~AWAbstractPairHelper() = default;
+    virtual ~AWAbstractPairHelper();
     [[nodiscard]] QStringList keys() const;
     [[nodiscard]] QHash<QString, QString> pairs() const;
     [[nodiscard]] QStringList values() const;
@@ -44,3 +46,6 @@ private:
     QString m_filePath;
     QString m_section;
 };
+
+
+#endif /* AWABSTRACTPAIRHELPER_H */

sources/awesome-widget/plugin/awabstractselector.cpp

@@ -31,8 +31,8 @@ AWAbstractSelector::AWAbstractSelector(QWidget *_parent, const QPair<bool, bool>
     ui->comboBox_key->setEditable(_editable.first);
     ui->comboBox_value->setEditable(_editable.second);
 
-    connect(ui->comboBox_key, &QComboBox::currentIndexChanged, this, &AWAbstractSelector::selectionChanged);
+    connect(ui->comboBox_key, SIGNAL(currentIndexChanged(int)), this, SIGNAL(selectionChanged()));
-    connect(ui->comboBox_value, &QComboBox::currentIndexChanged, this, &AWAbstractSelector::selectionChanged);
+    connect(ui->comboBox_value, SIGNAL(currentIndexChanged(int)), this, SIGNAL(selectionChanged()));
 }
 
 
@@ -46,10 +46,10 @@ AWAbstractSelector::~AWAbstractSelector()
 
 QPair<QString, QString> AWAbstractSelector::current() const
 {
-    auto key = ui->comboBox_key->currentText();
+    QString key = ui->comboBox_key->currentText();
-    auto value = ui->comboBox_value->currentText();
+    QString value = ui->comboBox_value->currentText();
 
-    return {key, value};
+    return QPair<QString, QString>(key, value);
 }
 
 
@@ -60,8 +60,8 @@ void AWAbstractSelector::init(const QStringList &_keys, const QStringList &_valu
         qCWarning(LOG_AW) << "Invalid current value" << _current << "not found in default ones";
         return;
     }
-    qCDebug(LOG_AW) << "Init selector with keys" << _keys << "and values" << _values << "and current ones are"
+    qCDebug(LOG_AW) << "Init selector with keys" << _keys << "and values" << _values
-                    << _current;
+                    << "and current ones are" << _current;
 
     // set data
     ui->comboBox_key->clear();

sources/awesome-widget/plugin/awabstractselector.h

@@ -15,7 +15,9 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWABSTRACTSELECTOR_H
+#define AWABSTRACTSELECTOR_H
 
 #include <QWidget>
 
@@ -30,10 +32,12 @@ class AWAbstractSelector : public QWidget
     Q_OBJECT
 
 public:
-    explicit AWAbstractSelector(QWidget *_parent = nullptr, const QPair<bool, bool> &_editable = {false, false});
+    explicit AWAbstractSelector(QWidget *_parent = nullptr,
+                                const QPair<bool, bool> &_editable = {false, false});
     ~AWAbstractSelector() override;
     [[nodiscard]] QPair<QString, QString> current() const;
-    void init(const QStringList &_keys, const QStringList &_values, const QPair<QString, QString> &_current);
+    void init(const QStringList &_keys, const QStringList &_values,
+              const QPair<QString, QString> &_current);
 
 signals:
     void selectionChanged();
@@ -41,3 +45,6 @@ signals:
 private:
     Ui::AWAbstractSelector *ui = nullptr;
 };
+
+
+#endif /* AWABSTRACTSELECTOR_H */

sources/awesome-widget/plugin/awactions.cpp

@@ -40,6 +40,12 @@ AWActions::AWActions(QObject *_parent)
 }
 
 
+AWActions::~AWActions()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
 void AWActions::checkUpdates(const bool _showAnyway)
 {
     qCDebug(LOG_AW) << "Show anyway" << _showAnyway;
@@ -59,17 +65,24 @@ QString AWActions::getFileContent(const QString &_path)
         return "";
     }
 
-    auto output = inputFile.readAll();
+    QString output = inputFile.readAll();
     inputFile.close();
     return output;
 }
 
 
+// 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;
 
-    sendNotification("system", i18n("Run %1", _cmd));
+    sendNotification(QString("Info"), i18n("Run %1", _cmd));
 
     return QProcess::startDetached(_cmd, _args);
 }
@@ -82,6 +95,20 @@ void AWActions::showReadme()
 }
 
 
+void AWActions::showLegacyInfo()
+{
+    auto *msgBox = new QMessageBox(nullptr);
+    msgBox->setAttribute(Qt::WA_DeleteOnClose);
+    msgBox->setModal(false);
+    msgBox->setWindowTitle(i18n("Not supported"));
+    msgBox->setText(i18n("You are using mammoth's Qt version, try to update it first"));
+    msgBox->setStandardButtons(QMessageBox::Ok);
+    msgBox->setIcon(QMessageBox::Information);
+
+    msgBox->open();
+}
+
+
 // HACK: this method uses variables from version.h
 QString AWActions::getAboutText(const QString &_type)
 {
@@ -96,10 +123,10 @@ QVariantMap AWActions::getFont(const QVariantMap &_defaultFont)
     qCDebug(LOG_AW) << "Default font is" << _defaultFont;
 
     QVariantMap fontMap;
-    auto ret = 0;
+    int ret = 0;
-    auto defaultCFont = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(), 400, false,
+    CFont defaultCFont = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(), 400,
-                              _defaultFont["color"].toString());
+                               false, _defaultFont["color"].toString());
-    auto font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, false, &ret);
+    CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, false, &ret);
 
     fontMap["applied"] = ret;
     fontMap["color"] = font.color().name();
@@ -115,6 +142,7 @@ void AWActions::sendNotification(const QString &_eventId, const QString &_messag
 {
     qCDebug(LOG_AW) << "Event" << _eventId << "with message" << _message;
 
-    auto event = KNotification::event(_eventId, QString("Awesome Widget ::: %1").arg(_eventId), _message);
+    KNotification *notification
-    event->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
+        = KNotification::event(_eventId, QString("Awesome Widget ::: %1").arg(_eventId), _message);
+    notification->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
 }

sources/awesome-widget/plugin/awactions.h

@@ -15,7 +15,9 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWACTIONS_H
+#define AWACTIONS_H
 
 #include <QMap>
 #include <QObject>
@@ -29,10 +31,12 @@ class AWActions : public QObject
 
 public:
     explicit AWActions(QObject *_parent = nullptr);
-    ~AWActions() override = default;
+    ~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();
     // configuration slots
     Q_INVOKABLE static QString getAboutText(const QString &_type);
@@ -44,3 +48,6 @@ public slots:
 private:
     AWUpdateHelper *m_updateHelper = nullptr;
 };
+
+
+#endif /* AWACTIONS_H */

sources/awesome-widget/plugin/awbugreporter.cpp

@@ -18,7 +18,6 @@
 #include "awbugreporter.h"
 
 #include <KI18n/KLocalizedString>
-#include <KNotifications/KNotification>
 
 #include <QDesktopServices>
 #include <QJsonDocument>
@@ -33,29 +32,25 @@ AWBugReporter::AWBugReporter(QObject *_parent)
     : QObject(_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    m_manager = new QNetworkAccessManager(nullptr);
-    connect(m_manager, &QNetworkAccessManager::finished, this, &AWBugReporter::issueReplyReceived);
 }
 
 
 AWBugReporter::~AWBugReporter()
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    m_manager->deleteLater();
 }
 
 
-void AWBugReporter::doConnect() const
+void AWBugReporter::doConnect()
 {
     // additional method for testing needs
-    connect(this, &AWBugReporter::replyReceived, this, &AWBugReporter::showInformation);
+    connect(this, SIGNAL(replyReceived(const int, const QString &)), this,
+            SLOT(showInformation(int, const QString &)));
 }
 
 
-QString AWBugReporter::generateText(const QString &_description, const QString &_reproduce, const QString &_expected,
+QString AWBugReporter::generateText(const QString &_description, const QString &_reproduce,
-                                    const QString &_logs)
+                                    const QString &_expected, const QString &_logs)
 {
     // do not log _logs here, it may have quite large size
     qCDebug(LOG_AW) << "Generate text with description" << _description << "steps" << _reproduce
@@ -77,32 +72,36 @@ void AWBugReporter::sendBugReport(const QString &_title, const QString &_body)
 {
     qCDebug(LOG_AW) << "Send bug report with title" << _title << "and body" << _body;
 
+    auto *manager = new QNetworkAccessManager(nullptr);
+    connect(manager, SIGNAL(finished(QNetworkReply *)), this,
+            SLOT(issueReplyRecieved(QNetworkReply *)));
 
-    auto request = QNetworkRequest(QUrl(BUGTRACKER_API));
+    QNetworkRequest request = QNetworkRequest(QUrl(BUGTRACKER_API));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
 
     // generate payload
     QVariantMap payload;
     payload["title"] = _title;
     payload["body"] = _body;
-    payload["labels"] = QStringList({"from application"});
+    payload["labels"] = QStringList() << "from application";
     // convert to QByteArray to send request
-    auto data = QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact);
+    QByteArray data = QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact);
     qCInfo(LOG_AW) << "Send request with _body" << data.data() << "and size" << data.size();
 
-    m_manager->post(request, data);
+    manager->post(request, data);
 }
 
 
-void AWBugReporter::issueReplyReceived(QNetworkReply *_reply)
+void AWBugReporter::issueReplyRecieved(QNetworkReply *_reply)
 {
     if (_reply->error() != QNetworkReply::NoError) {
-        qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message" << _reply->errorString();
+        qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
+                          << _reply->errorString();
         return emit(replyReceived(0, ""));
     }
 
     QJsonParseError error{};
-    auto jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
+    QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
     if (error.error != QJsonParseError::NoError) {
         qCWarning(LOG_AW) << "Parse error" << error.errorString();
         return emit(replyReceived(0, ""));
@@ -110,20 +109,14 @@ void AWBugReporter::issueReplyReceived(QNetworkReply *_reply)
     _reply->deleteLater();
 
     // convert to map
-    auto response = jsonDoc.toVariant().toMap();
+    QVariantMap response = jsonDoc.toVariant().toMap();
-    auto url = response["html_url"].toString();
+    QString url = response["html_url"].toString();
-    auto number = response["number"].toInt();
+    int number = response["number"].toInt();
 
     return emit(replyReceived(number, url));
 }
 
 
-void AWBugReporter::openBugReport()
-{
-    QDesktopServices::openUrl(m_lastBugUrl);
-}
-
-
 void AWBugReporter::showInformation(const int _number, const QString &_url)
 {
     qCDebug(LOG_AW) << "Created issue with number" << _number << "and url" << _url;
@@ -131,9 +124,29 @@ void AWBugReporter::showInformation(const int _number, const QString &_url)
     // cache url first
     m_lastBugUrl = _url;
 
-    auto event = KNotification::event("system", i18n("Issue created"), i18n("Issue %1 has been created", _number));
+    auto *msgBox = new QMessageBox(nullptr);
-    event->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
+    msgBox->setAttribute(Qt::WA_DeleteOnClose);
+    msgBox->setModal(false);
+    msgBox->setWindowTitle(i18n("Issue created"));
+    msgBox->setText(i18n("Issue %1 has been created", _number));
+    msgBox->setStandardButtons(QMessageBox::Open | QMessageBox::Close);
+    msgBox->setIcon(QMessageBox::Information);
 
-    auto action = event->addAction(i18n("Details"));
+    msgBox->open(this, SLOT(userReplyOnBugReport(QAbstractButton *)));
-    connect(action, &KNotificationAction::activated, this, &AWBugReporter::openBugReport);
+}
+
+
+void AWBugReporter::userReplyOnBugReport(QAbstractButton *_button)
+{
+    QMessageBox::ButtonRole ret = dynamic_cast<QMessageBox *>(sender())->buttonRole(_button);
+    qCInfo(LOG_AW) << "User select" << ret;
+
+    switch (ret) {
+    case QMessageBox::AcceptRole:
+        QDesktopServices::openUrl(m_lastBugUrl);
+        break;
+    case QMessageBox::RejectRole:
+    default:
+        break;
+    }
 }

sources/awesome-widget/plugin/awbugreporter.h

@@ -15,35 +15,39 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWBUGREPORTER_H
+#define AWBUGREPORTER_H
 
 #include <QObject>
 
 
-class QNetworkAccessManager;
+class QAbstractButton;
 class QNetworkReply;
 
-class __attribute__((visibility("default"))) AWBugReporter : public QObject
+class AWBugReporter : public QObject
 {
     Q_OBJECT
 
 public:
     explicit AWBugReporter(QObject *_parent = nullptr);
     ~AWBugReporter() override;
-    Q_INVOKABLE void doConnect() const;
+    Q_INVOKABLE void doConnect();
     Q_INVOKABLE static QString generateText(const QString &_description, const QString &_reproduce,
                                             const QString &_expected, const QString &_logs);
     Q_INVOKABLE void sendBugReport(const QString &_title, const QString &_body);
 
 signals:
-    void replyReceived(int _number, const QString &_url);
+    void replyReceived(const int _number, const QString &_url);
 
 private slots:
-    void issueReplyReceived(QNetworkReply *_reply);
+    void issueReplyRecieved(QNetworkReply *_reply);
-    void openBugReport();
     void showInformation(int _number, const QString &_url);
+    void userReplyOnBugReport(QAbstractButton *_button);
 
 private:
     QString m_lastBugUrl;
-    QNetworkAccessManager *m_manager = nullptr;
 };
+
+
+#endif /* AWBUGREPORTER_H */

sources/awesome-widget/plugin/awconfighelper.cpp

@@ -21,6 +21,7 @@
 #include <QQmlPropertyMap>
 #include <QSettings>
 #include <QStandardPaths>
+#include <QTextCodec>
 
 #include "awdebug.h"
 
@@ -30,14 +31,22 @@ AWConfigHelper::AWConfigHelper(QObject *_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    m_baseDir = QString("%1/awesomewidgets").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
+    m_baseDir = QString("%1/awesomewidgets")
+                    .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
+}
+
+
+AWConfigHelper::~AWConfigHelper()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 }
 
 
 QString AWConfigHelper::configurationDirectory()
 {
     // get readable directory
-    auto localDir = QString("%1/awesomewidgets/configs")
+    QString localDir
+        = QString("%1/awesomewidgets/configs")
               .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
 
     // create directory and copy files from default settings
@@ -53,8 +62,9 @@ QString AWConfigHelper::configurationDirectory()
 
 bool AWConfigHelper::dropCache()
 {
-    auto fileName
+    QString fileName
-        = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
+        = QString("%1/awesomewidgets.ndx")
+              .arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
 
     return QFile(fileName).remove();
 }
@@ -66,10 +76,10 @@ bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig, const QString &
 
     QSettings settings(_fileName, QSettings::IniFormat);
     // plasmoid configuration
-    auto configuration = dynamic_cast<const QQmlPropertyMap *>(_nativeConfig);
+    const auto *configuration = dynamic_cast<const QQmlPropertyMap *>(_nativeConfig);
     settings.beginGroup("plasmoid");
     for (auto &key : configuration->keys()) {
-        auto value = configuration->value(key);
+        QVariant value = configuration->value(key);
         if (!value.isValid())
             continue;
         settings.setValue(key, value);
@@ -78,7 +88,8 @@ bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig, const QString &
 
     // extensions
     for (auto &item : m_dirs) {
-        auto items = QDir(QString("%1/%2").arg(m_baseDir, item)).entryList({"*.desktop"}, QDir::Files);
+        QStringList items = QDir(QString("%1/%2").arg(m_baseDir).arg(item))
+                                .entryList(QStringList() << "*.desktop", QDir::Files);
         settings.beginGroup(item);
         for (auto &it : items)
             copyExtensions(it, item, settings, false);
@@ -88,9 +99,11 @@ bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig, const QString &
     // additional files
     settings.beginGroup("json");
     // script filters
-    readFile(settings, "filters", QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
+    readFile(settings, "filters",
+             QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
     // weather icon settings
-    readFile(settings, "weathers", QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
+    readFile(settings, "weathers",
+             QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
     settings.endGroup();
 
     settings.beginGroup("ini");
@@ -107,8 +120,10 @@ bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig, const QString &
 }
 
 
-QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName, const bool _importPlasmoid,
+QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName,
-                                                const bool _importExtensions, const bool _importAdds) const
+                                                const bool _importPlasmoid,
+                                                const bool _importExtensions,
+                                                const bool _importAdds) const
 {
     qCDebug(LOG_AW) << "Selected filename" << _fileName;
 
@@ -129,9 +144,11 @@ QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName, const
     if (_importAdds) {
         settings.beginGroup("json");
         // script filters
-        writeFile(settings, "filters", QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
+        writeFile(settings, "filters",
+                  QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
         // weather icon settings
-        writeFile(settings, "weathers", QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
+        writeFile(settings, "weathers",
+                  QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
         settings.endGroup();
 
         settings.beginGroup("ini");
@@ -156,13 +173,17 @@ QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName, const
 
 QVariantMap AWConfigHelper::readDataEngineConfiguration()
 {
-    auto fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation, "plasma-dataengine-extsysmon.conf");
+    QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation,
+                                              "plasma-dataengine-extsysmon.conf");
     qCInfo(LOG_AW) << "Configuration file" << fileName;
     QSettings settings(fileName, QSettings::IniFormat);
     QVariantMap configuration;
 
     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");
@@ -180,13 +201,16 @@ bool AWConfigHelper::writeDataEngineConfiguration(const QVariantMap &_configurat
 {
     qCDebug(LOG_AW) << "Configuration" << _configuration;
 
-    auto fileName = QString("%1/plasma-dataengine-extsysmon.conf")
+    QString fileName = QString("%1/plasma-dataengine-extsysmon.conf")
                            .arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation));
     QSettings settings(fileName, QSettings::IniFormat);
     qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
 
     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"]);
@@ -204,28 +228,31 @@ void AWConfigHelper::copyConfigs(const QString &_localDir)
 {
     qCDebug(LOG_AW) << "Local directory" << _localDir;
 
-    auto dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "awesomewidgets/configs",
+    QStringList dirs
+        = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "awesomewidgets/configs",
                                     QStandardPaths::LocateDirectory);
     for (auto &dir : dirs) {
         if (dir == _localDir)
             continue;
-        auto files = QDir(dir).entryList(QDir::Files);
+        QStringList files = QDir(dir).entryList(QDir::Files);
         for (auto &source : files) {
-            auto destination = QString("%1/%2").arg(_localDir, source);
+            QString destination = QString("%1/%2").arg(_localDir).arg(source);
-            auto status = QFile::copy(QString("%1/%2").arg(dir, source), destination);
+            bool status = QFile::copy(QString("%1/%2").arg(dir).arg(source), destination);
-            qCInfo(LOG_AW) << "File" << source << "has been copied to" << destination << "with status" << status;
+            qCInfo(LOG_AW) << "File" << source << "has been copied to" << destination
+                           << "with status" << status;
         }
     }
 }
 
 
-void AWConfigHelper::copyExtensions(const QString &_item, const QString &_type, QSettings &_settings,
+void AWConfigHelper::copyExtensions(const QString &_item, const QString &_type,
-                                    const bool _inverse) const
+                                    QSettings &_settings, const bool _inverse) const
 {
     qCDebug(LOG_AW) << "Extension" << _item << "has type" << _type << "inverse copying" << _inverse;
 
     _settings.beginGroup(_item);
-    QSettings itemSettings(QString("%1/%2/%3").arg(m_baseDir, _type, _item), QSettings::IniFormat);
+    QSettings itemSettings(QString("%1/%2/%3").arg(m_baseDir).arg(_type).arg(_item),
+                           QSettings::IniFormat);
     itemSettings.beginGroup("Desktop Entry");
     if (_inverse)
         copySettings(_settings, itemSettings);
@@ -252,7 +279,7 @@ void AWConfigHelper::readFile(QSettings &_settings, const QString &_key, const Q
 
     QFile file(_fileName);
     if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        auto text = QString::fromUtf8(file.readAll());
+        QString text = QString::fromUtf8(file.readAll());
         file.close();
         _settings.setValue(_key, text);
     } else {
@@ -271,6 +298,7 @@ void AWConfigHelper::writeFile(QSettings &_settings, const QString &_key, const
     QFile file(_fileName);
     if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
         QTextStream out(&file);
+        out.setCodec("UTF-8");
         out << _settings.value(_key).toString().toUtf8();
         out.flush();
         file.close();

sources/awesome-widget/plugin/awconfighelper.h

@@ -15,7 +15,9 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWCONFIGHELPER_H
+#define AWCONFIGHELPER_H
 
 #include <QObject>
 #include <QVariant>
@@ -23,18 +25,20 @@
 
 class QSettings;
 
-class __attribute__((visibility("default"))) AWConfigHelper : public QObject
+class AWConfigHelper : public QObject
 {
     Q_OBJECT
 
 public:
     explicit AWConfigHelper(QObject *_parent = nullptr);
-    ~AWConfigHelper() override = default;
+    ~AWConfigHelper() override;
     Q_INVOKABLE [[nodiscard]] static QString configurationDirectory();
     Q_INVOKABLE static bool dropCache();
     Q_INVOKABLE bool exportConfiguration(QObject *_nativeConfig, const QString &_fileName) const;
-    Q_INVOKABLE [[nodiscard]] QVariantMap importConfiguration(const QString &_fileName, bool _importPlasmoid,
+    Q_INVOKABLE [[nodiscard]] QVariantMap importConfiguration(const QString &_fileName,
-                                                              bool _importExtensions, bool _importAdds) const;
+                                                              bool _importPlasmoid,
+                                                              bool _importExtensions,
+                                                              bool _importAdds) const;
     // dataengine
     Q_INVOKABLE static QVariantMap readDataEngineConfiguration();
     Q_INVOKABLE static bool writeDataEngineConfiguration(const QVariantMap &_configuration);
@@ -42,7 +46,8 @@ public:
 private:
     // methods
     static void copyConfigs(const QString &_localDir);
-    void copyExtensions(const QString &_item, const QString &_type, QSettings &_settings, bool _inverse) const;
+    void copyExtensions(const QString &_item, const QString &_type, QSettings &_settings,
+                        bool _inverse) const;
     static void copySettings(QSettings &_from, QSettings &_to);
     static void readFile(QSettings &_settings, const QString &_key, const QString &_fileName);
     static void writeFile(QSettings &_settings, const QString &_key, const QString &_fileName);
@@ -50,3 +55,6 @@ private:
     QString m_baseDir;
     QStringList m_dirs = {"desktops", "quotes", "scripts", "upgrade", "weather", "formatters"};
 };
+
+
+#endif /* AWCONFIGHELPER_H */

sources/awesome-widget/plugin/awcustomkeysconfig.cpp

@@ -27,5 +27,11 @@ AWCustomKeysConfig::AWCustomKeysConfig(QWidget *_parent, const QStringList &_key
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
     setEditable(true, false);
-    setHelper(std::make_unique<AWCustomKeysHelper>());
+    initHelper<AWCustomKeysHelper>();
+}
+
+
+AWCustomKeysConfig::~AWCustomKeysConfig()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 }

sources/awesome-widget/plugin/awcustomkeysconfig.h

@@ -15,7 +15,9 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWCUSTOMKEYSCONFIG_H
+#define AWCUSTOMKEYSCONFIG_H
 
 #include "awabstractpairconfig.h"
 
@@ -25,6 +27,10 @@ class AWCustomKeysConfig : public AWAbstractPairConfig
     Q_OBJECT
 
 public:
-    explicit AWCustomKeysConfig(QWidget *_parent = nullptr, const QStringList &_keys = QStringList());
+    explicit AWCustomKeysConfig(QWidget *_parent = nullptr,
-    ~AWCustomKeysConfig() override = default;
+                                const QStringList &_keys = QStringList());
+    ~AWCustomKeysConfig() override;
 };
+
+
+#endif /* AWCUSTOMKEYSCONFIG_H */

sources/awesome-widget/plugin/awcustomkeyshelper.cpp

@@ -30,6 +30,12 @@ AWCustomKeysHelper::AWCustomKeysHelper(QObject *_parent)
 }
 
 
+AWCustomKeysHelper::~AWCustomKeysHelper()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
 QString AWCustomKeysHelper::source(const QString &_key) const
 {
     qCDebug(LOG_AW) << "Get source by key" << _key;
@@ -68,5 +74,5 @@ QStringList AWCustomKeysHelper::leftKeys()
 
 QStringList AWCustomKeysHelper::rightKeys()
 {
-    return {};
+    return QStringList();
 }

sources/awesome-widget/plugin/awcustomkeyshelper.h

@@ -15,7 +15,9 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWCUSTOMKEYSHELPER_H
+#define AWCUSTOMKEYSHELPER_H
 
 #include <QObject>
 
@@ -28,7 +30,7 @@ class AWCustomKeysHelper : public QObject, public AWAbstractPairHelper
 
 public:
     explicit AWCustomKeysHelper(QObject *_parent = nullptr);
-    ~AWCustomKeysHelper() override = default;
+    ~AWCustomKeysHelper() override;
     // get
     [[nodiscard]] QString source(const QString &_key) const;
     [[nodiscard]] QStringList sources() const;
@@ -37,4 +39,9 @@ public:
     void editPairs() override{};
     QStringList leftKeys() override;
     QStringList rightKeys() override;
+
+private:
 };
+
+
+#endif /* AWCUSTOMKEYSHELPER_H */

sources/awesome-widget/plugin/awdataaggregator.cpp

@@ -50,8 +50,7 @@ AWDataAggregator::~AWDataAggregator()
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    m_toolTipView->deleteLater();
+    delete m_toolTipScene;
-    m_toolTipScene->deleteLater();
 }
 
 
@@ -62,7 +61,8 @@ QString AWDataAggregator::htmlImage(const QPixmap &_source)
     _source.save(&buffer, "PNG");
 
     return byteArray.isEmpty() ? ""
-                               : QString("<img src=\"data:image/png;base64,%1\"/>").arg(QString(byteArray.toBase64()));
+                               : QString("<img src=\"data:image/png;base64,%1\"/>")
+                                     .arg(QString(byteArray.toBase64()));
 }
 
 
@@ -85,26 +85,27 @@ void AWDataAggregator::setParameters(const QVariantMap &_settings)
     // resize tooltip image
     m_toolTipView->resize(100 * m_counts, 105);
 
-    m_requiredKeys.clear();
+    requiredKeys.clear();
     if (m_configuration["cpuTooltip"].toBool())
-        m_requiredKeys.append("cpuTooltip");
+        requiredKeys.append("cpuTooltip");
     if (m_configuration["cpuclTooltip"].toBool())
-        m_requiredKeys.append("cpuclTooltip");
+        requiredKeys.append("cpuclTooltip");
     if (m_configuration["memTooltip"].toBool())
-        m_requiredKeys.append("memTooltip");
+        requiredKeys.append("memTooltip");
     if (m_configuration["swapTooltip"].toBool())
-        m_requiredKeys.append("swapTooltip");
+        requiredKeys.append("swapTooltip");
     if (m_configuration["downkbTooltip"].toBool())
-        m_requiredKeys.append("downkbTooltip");
+        requiredKeys.append("downkbTooltip");
     if (m_configuration["upkbTooltip"].toBool())
-        m_requiredKeys.append("upkbTooltip");
+        requiredKeys.append("upkbTooltip");
     if (m_configuration["batTooltip"].toBool())
-        m_requiredKeys.append("batTooltip");
+        requiredKeys.append("batTooltip");
 
     // background
-    m_toolTipScene->setBackgroundBrush(m_configuration["useTooltipBackground"].toBool()
+    m_toolTipScene->setBackgroundBrush(
-                                           ? QColor(m_configuration["tooltipBackground"].toString())
+        m_configuration["useTooltipBackground"].toBool()
-                                           : Qt::NoBrush);
+            ? QBrush(QColor(m_configuration["tooltipBackground"].toString()))
+            : QBrush(Qt::NoBrush));
 }
 
 
@@ -113,42 +114,34 @@ QPixmap AWDataAggregator::tooltipImage()
     // create image
     m_toolTipScene->clear();
     QPen pen;
-    auto shift = 0.0;
+    bool down = false;
-
+    for (auto &key : requiredKeys) {
-    for (auto i = 0; i < m_requiredKeys.count(); ++i) {
-        auto key = m_requiredKeys[i];
-
         // create frame
-        auto normX = 100.0 / static_cast<float>(m_values[key].count());
+        float normX = 100.0f / static_cast<float>(m_values[key].count());
-        auto normY = 100.0 / (1.5 * m_boundaries[key]);
+        float normY = 100.0f / (1.5f * m_boundaries[key]);
-
+        float shift = static_cast<float>(requiredKeys.indexOf(key)) * 100.0f;
+        if (down)
+            shift -= 100.0;
         // apply pen color
         if (key != "batTooltip")
-            pen.setColor(m_configuration[QString("%1Color").arg(key)].toString());
+            pen.setColor(QColor(m_configuration[QString("%1Color").arg(key)].toString()));
-
         // paint data inside frame
         for (int j = 0; j < m_values[key].count() - 1; j++) {
             // some magic here
-            auto x1 = j * normX + shift;
+            float x1 = j * normX + shift;
-            auto y1 = -std::fabs(m_values[key].at(j)) * normY + 5.0;
+            float y1 = -std::fabs(m_values[key].at(j)) * normY + 5.0f;
-            auto x2 = (j + 1) * normX + shift;
+            float x2 = (j + 1) * normX + shift;
-            auto y2 = -std::fabs(m_values[key].at(j + 1)) * normY + 5.0;
+            float y2 = -std::fabs(m_values[key].at(j + 1)) * normY + 5.0f;
-            // apply color for the battery tooltip based on charge/discharge
             if (key == "batTooltip") {
                 if (m_values[key].at(j + 1) > 0)
                     pen.setColor(QColor(m_configuration["batTooltipColor"].toString()));
                 else
                     pen.setColor(QColor(m_configuration["batInTooltipColor"].toString()));
             }
-
             m_toolTipScene->addLine(x1, y1, x2, y2, pen);
         }
-
+        if (key == "downkbTooltip")
-        // increase frame shift if not downkbtooltip
+            down = true;
-        // Additional workaround is required because there is frame (uokb and downkb) which contains two charts
-        // with the same shift
-        if (key != "downkbTooltip")
-            shift += 100.0;
     }
 
     return m_toolTipView->grab();
@@ -163,10 +156,11 @@ void AWDataAggregator::dataUpdate(const QVariantHash &_values)
 }
 
 
-void AWDataAggregator::checkValue(const QString &_source, const double _value, const double _extremum) const
+void AWDataAggregator::checkValue(const QString &_source, const float _value,
+                                  const float _extremum) const
 {
-    qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value << "called with extremum"
+    qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value
-                    << _extremum;
+                    << "called with extremum" << _extremum;
 
     if (_value >= 0.0) {
         if ((m_enablePopup) && (_value > _extremum) && (m_values[_source].last() < _extremum))
@@ -178,10 +172,11 @@ void AWDataAggregator::checkValue(const QString &_source, const double _value, c
 }
 
 
-void AWDataAggregator::checkValue(const QString &_source, const QString &_current, const QString &_received) const
+void AWDataAggregator::checkValue(const QString &_source, const QString &_current,
+                                  const QString &_received) const
 {
-    qCDebug(LOG_AW) << "Notification source" << _source << "with current value" << _current << "and received one"
+    qCDebug(LOG_AW) << "Notification source" << _source << "with current value" << _current
-                    << _received;
+                    << "and received one" << _received;
 
     if ((m_enablePopup) && (_current != _received) && (!_received.isEmpty()))
         return AWActions::sendNotification("event", notificationText(_source, _received));
@@ -236,27 +231,26 @@ void AWDataAggregator::setData(const QVariantHash &_values)
 {
     // do not log these arguments
     // battery update requires info is AC online or not
-    setData(_values["ac"].toString() == m_configuration["acOnline"], "batTooltip", _values["bat"].toDouble());
+    setData(_values["ac"].toString() == m_configuration["acOnline"], "batTooltip",
-
+            _values["bat"].toFloat());
     // usual case
-    setData("cpuTooltip", _values["cpu"].toDouble(), 90.0);
+    setData("cpuTooltip", _values["cpu"].toFloat(), 90.0);
-    setData("cpuclTooltip", _values["cpucl"].toDouble());
+    setData("cpuclTooltip", _values["cpucl"].toFloat());
-    setData("memTooltip", _values["mem"].toDouble(), 80.0);
+    setData("memTooltip", _values["mem"].toFloat(), 80.0);
-    setData("swapTooltip", _values["swap"].toDouble(), 0.0);
+    setData("swapTooltip", _values["swap"].toFloat(), 0.0);
-    setData("downkbTooltip", _values["downkb"].toDouble());
+    setData("downkbTooltip", _values["downkb"].toFloat());
-    setData("upkbTooltip", _values["upkb"].toDouble());
+    setData("upkbTooltip", _values["upkb"].toFloat());
-
     // additional check for network device
-    auto currentNetworkDevice = _values["netdev"].toString();
+    [this](const QString &value) {
-    checkValue("netdev", m_currentNetworkDevice, currentNetworkDevice);
+        checkValue("netdev", m_currentNetworkDevice, value);
-    m_currentNetworkDevice = currentNetworkDevice;
+        m_currentNetworkDevice = value;
-
+    }(_values["netdev"].toString());
     // additional check for GPU load
-    checkValue("gpu", _values["gpu"].toDouble(), 90.0);
+    [this](const float value) { checkValue("gpu", value, 90.0); }(_values["gpu"].toFloat());
 }
 
 
-void AWDataAggregator::setData(const QString &_source, double _value, const double _extremum)
+void AWDataAggregator::setData(const QString &_source, float _value, const float _extremum)
 {
     qCDebug(LOG_AW) << "Source" << _source << "to value" << _value << "with extremum" << _extremum;
 
@@ -272,22 +266,20 @@ void AWDataAggregator::setData(const QString &_source, double _value, const doub
 
     m_values[_source].append(_value);
     if (_source == "downkbTooltip") {
-        // to avoid copying of objects to another list we find max elements in each sequence and compare them
+        QList<float> netValues = m_values["downkbTooltip"] + m_values["upkbTooltip"];
-        auto downMax = m_values["downkbTooltip"].empty()
+        // to avoid inf value of normY
-                           ? 1.0
+        netValues << 1.0;
-                           : *std::max_element(m_values["downkbTooltip"].cbegin(), m_values["downkbTooltip"].cend());
+        m_boundaries["downkbTooltip"]
-        auto upMax = m_values["upkbTooltip"].empty()
+            = 1.2f * *std::max_element(netValues.cbegin(), netValues.cend());
-                         ? 1.0
+        m_boundaries["upkbTooltip"] = m_boundaries["downkbTooltip"];
-                         : *std::max_element(m_values["upkbTooltip"].cbegin(), m_values["upkbTooltip"].cend());
-        // assign both
-        m_boundaries["upkbTooltip"] = m_boundaries["downkbTooltip"] = 1.2 * std::max(downMax, upMax);
     }
 }
 
 
-void AWDataAggregator::setData(const bool _dontInvert, const QString &_source, double _value)
+void AWDataAggregator::setData(const bool _dontInvert, const QString &_source, float _value)
 {
-    qCDebug(LOG_AW) << "Do not invert" << _dontInvert << "value" << _value << "for source" << _source;
+    qCDebug(LOG_AW) << "Do not invert" << _dontInvert << "value" << _value << "for source"
+                    << _source;
 
     // invert values for different battery colours
     _value = _dontInvert ? _value : -_value;

sources/awesome-widget/plugin/awdataaggregator.h

@@ -15,14 +15,18 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
 
+#ifndef AWTOOLTIP_H
+#define AWTOOLTIP_H
+
+#include <QObject>
 #include <QVariant>
 
 
 class QGraphicsScene;
 class QGraphicsView;
 class QPixmap;
+class QThreadPool;
 
 class AWDataAggregator : public QObject
 {
@@ -45,22 +49,26 @@ private:
     // ui
     QGraphicsScene *m_toolTipScene = nullptr;
     QGraphicsView *m_toolTipView = nullptr;
-    void checkValue(const QString &_source, double _value, double _extremum) const;
+    void checkValue(const QString &_source, float _value, float _extremum) const;
-    void checkValue(const QString &_source, const QString &_current, const QString &_received) const;
+    void checkValue(const QString &_source, const QString &_current,
+                    const QString &_received) const;
     void initScene();
     static QString notificationText(const QString &_source, float _value);
     static QString notificationText(const QString &_source, const QString &_value);
     // main method
     void setData(const QVariantHash &_values);
-    void setData(const QString &_source, double _value, double _extremum = -1.0);
+    void setData(const QString &_source, float _value, float _extremum = -1.0f);
     // different signature for battery device
-    void setData(bool _dontInvert, const QString &_source, double _value);
+    void setData(bool _dontInvert, const QString &_source, float _value);
     // variables
     int m_counts = 0;
     QVariantHash m_configuration;
     QString m_currentNetworkDevice = "lo";
-    QHash<QString, double> m_boundaries;
+    QHash<QString, float> m_boundaries;
-    QHash<QString, QList<double>> m_values;
+    QHash<QString, QList<float>> m_values;
     bool m_enablePopup = false;
-    QStringList m_requiredKeys;
+    QStringList requiredKeys;
 };
+
+
+#endif /* AWTOOLTIP_H */

sources/awesome-widget/plugin/awdataengineaggregator.cpp

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

sources/awesome-widget/plugin/awdataengineaggregator.h

@@ -15,20 +15,16 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
 
-#include <ksysguard/systemstats/SensorInfo.h>
+#ifndef AWDATAENGINEAGGREGATOR_H
+#define AWDATAENGINEAGGREGATOR_H
+
+#include <Plasma/DataEngine>
+#include <Plasma/DataEngineConsumer>
 
-#include <QHash>
 #include <QObject>
-#include <QSet>
 
 
-namespace KSysGuard::SystemStats
-{
-class DBusInterface;
-}
-
 class AWDataEngineAggregator : public QObject
 {
     Q_OBJECT
@@ -36,24 +32,21 @@ class AWDataEngineAggregator : public QObject
 public:
     explicit AWDataEngineAggregator(QObject *_parent = nullptr);
     ~AWDataEngineAggregator() override;
-    void connectSources();
     void disconnectSources();
-    [[nodiscard]] static bool isValidSensor(const KSysGuard::SensorInfo &_sensor);
+    void reconnectSources(int _interval);
-    void loadSources();
 
 signals:
-    void dataUpdated(const QHash<QString, KSysGuard::SensorInfo> &_sensors, const KSysGuard::SensorDataList &_data);
     void deviceAdded(const QString &_source);
 
 public slots:
     void dropSource(const QString &_source);
-    void sensorAdded(const QString &_sensor);
-    void sensorRemoved(const QString &_sensor);
-    void updateData(const KSysGuard::SensorDataList &_data);
-    void updateSensors(const QHash<QString, KSysGuard::SensorInfo> &_sensors);
 
 private:
-    KSysGuard::SystemStats::DBusInterface *m_interface = nullptr;
+    void createQueuedConnection();
-    QHash<QString, KSysGuard::SensorInfo> m_sensors;
+    Plasma::DataEngineConsumer *m_consumer = nullptr;
-    QSet<QString> m_subscribed;
+    QHash<QString, Plasma::DataEngine *> m_dataEngines;
+    QMetaObject::Connection m_newSourceConnection;
 };
+
+
+#endif /* AWDATAENGINEAGGREGATOR_H */

sources/awesome-widget/plugin/awdataenginemapper.cpp

@@ -17,12 +17,10 @@
 
 #include "awdataenginemapper.h"
 
-#include <QRegularExpression>
+#include <QRegExp>
 
 #include "awdebug.h"
 #include "awformatterhelper.h"
-#include "formatters/formatters.h"
-#include "matchers/matchers.h"
 
 
 AWDataEngineMapper::AWDataEngineMapper(QObject *_parent, AWFormatterHelper *_custom)
@@ -32,25 +30,39 @@ AWDataEngineMapper::AWDataEngineMapper(QObject *_parent, AWFormatterHelper *_cus
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
     // default formatters
+    // memory
+    m_formatter["mem"] = AWKeysAggregator::FormatterType::Float;
+    m_formatter["memtotmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+    m_formatter["memtotgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
     // network
-    m_formatter["down"] = AWPluginFormatterNet::instance();
+    m_formatter["down"] = AWKeysAggregator::FormatterType::NetSmartFormat;
-    m_formatter["downkb"] = AWPluginFormatterMemory::instance();
+    m_formatter["downkb"] = AWKeysAggregator::FormatterType::Integer;
-    m_formatter["downtot"] = AWPluginFormatterMemoryMB::instance();
+    m_formatter["downtot"] = AWKeysAggregator::FormatterType::MemMBFormat;
-    m_formatter["downtotkb"] = AWPluginFormatterMemory::instance();
+    m_formatter["downtotkb"] = AWKeysAggregator::FormatterType::Integer;
-    m_formatter["downunits"] = AWPluginFormatterNetUnits::instance();
+    m_formatter["downunits"] = AWKeysAggregator::FormatterType::NetSmartUnits;
-    m_formatter["up"] = AWPluginFormatterNet::instance();
+    m_formatter["up"] = AWKeysAggregator::FormatterType::NetSmartFormat;
-    m_formatter["upkb"] = AWPluginFormatterMemory::instance();
+    m_formatter["upkb"] = AWKeysAggregator::FormatterType::Integer;
-    m_formatter["uptot"] = AWPluginFormatterMemoryMB::instance();
+    m_formatter["uptot"] = AWKeysAggregator::FormatterType::MemMBFormat;
-    m_formatter["uptotkb"] = AWPluginFormatterMemory::instance();
+    m_formatter["uptotkb"] = AWKeysAggregator::FormatterType::Integer;
-    m_formatter["upunits"] = AWPluginFormatterNetUnits::instance();
+    m_formatter["upunits"] = AWKeysAggregator::FormatterType::NetSmartUnits;
+    // swap
+    m_formatter["swap"] = AWKeysAggregator::FormatterType::Float;
+    m_formatter["swaptotmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+    m_formatter["swaptotgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
 }
 
 
-AWPluginFormaterInterface *AWDataEngineMapper::formatter(const QString &_key) const
+AWDataEngineMapper::~AWDataEngineMapper()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+AWKeysAggregator::FormatterType AWDataEngineMapper::formatter(const QString &_key) const
 {
     qCDebug(LOG_AW) << "Get formatter for key" << _key;
 
-    return m_formatter.value(_key, AWPluginFormatterNoFormat::instance());
+    return m_formatter.value(_key, AWKeysAggregator::FormatterType::NoFormat);
 }
 
 
@@ -64,49 +76,373 @@ QStringList AWDataEngineMapper::keysFromSource(const QString &_source) const
 
 // HACK units required to define should the value be calculated as temperature
 // or fan data
-QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSysGuard::Unit _units,
+QStringList AWDataEngineMapper::registerSource(const QString &_source, const QString &_units,
                                                const QStringList &_keys)
 {
     qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
 
-    auto matchers = AWPluginMatchers::matchers;
+    // regular expressions
-    auto matcher = std::find_if(matchers.cbegin(), matchers.cend(),
+    QRegExp cpuRegExp = QRegExp("cpu/cpu.*/TotalLoad");
-                                [&_source](auto matcher) { return matcher->matches(_source); });
+    QRegExp cpuclRegExp = QRegExp("cpu/cpu.*/clock");
-    if (matcher == matchers.cend())
+    QRegExp hddrRegExp = QRegExp("disk/.*/Rate/rblk");
-        return {};
+    QRegExp hddwRegExp = QRegExp("disk/.*/Rate/wblk");
+    QRegExp mountFillRegExp = QRegExp("partitions/.*/filllevel");
+    QRegExp mountFreeRegExp = QRegExp("partitions/.*/freespace");
+    QRegExp mountUsedRegExp = QRegExp("partitions/.*/usedspace");
+    QRegExp netRegExp = QRegExp("network/interfaces/.*/(receiver|transmitter)/data$");
+    QRegExp netTotalRegExp = QRegExp("network/interfaces/.*/(receiver|transmitter)/dataTotal$");
 
-    auto foundKeys = (*matcher)->keys(_source, _units, m_settings);
+    if (_source == "battery/ac") {
-    auto keys = foundKeys.keys(); // speedup a little bit
+        // AC
+        m_map.insert(_source, "ac");
+        m_formatter["ac"] = AWKeysAggregator::FormatterType::ACFormat;
+    } else if (_source.startsWith("battery/")) {
+        // battery stats
+        QString key = _source;
+        key.remove("battery/");
+        m_map.insert(_source, key);
+        m_formatter[key] = _source.contains("rate") ? AWKeysAggregator::FormatterType::Float
+                                                    : AWKeysAggregator::FormatterType::IntegerThree;
+    } else if (_source == "cpu/system/TotalLoad") {
+        // cpu
+        m_map.insert(_source, "cpu");
+        m_formatter["cpu"] = AWKeysAggregator::FormatterType::Float;
+    } else if (_source.contains(cpuRegExp)) {
+        // cpus
+        QString key = _source;
+        key.remove("cpu/").remove("/TotalLoad");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::Float;
+    } else if (_source == "cpu/system/AverageClock") {
+        // cpucl
+        m_map.insert(_source, "cpucl");
+        m_formatter["cpucl"] = AWKeysAggregator::FormatterType::Integer;
+    } else if (_source.contains(cpuclRegExp)) {
+        // cpucls
+        QString key = _source;
+        key.remove("cpu/cpu").remove("/clock");
+        key = QString("cpucl%1").arg(key);
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
+    } else if (_source.startsWith("custom")) {
+        // custom
+        QString key = _source;
+        key.remove("custom/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "desktop/current/name") {
+        // current desktop name
+        m_map.insert(_source, "desktop");
+        m_formatter["desktop"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "desktop/current/number") {
+        // current desktop number
+        m_map.insert(_source, "ndesktop");
+        m_formatter["ndesktop"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "desktop/total/number") {
+        // desktop count
+        m_map.insert(_source, "tdesktops");
+        m_formatter["tdesktops"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.contains(hddrRegExp)) {
+        // read speed
+        QString device = _source;
+        device.remove("/Rate/rblk");
+        int index = m_devices["disk"].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hddr%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
+        }
+    } else if (_source.contains(hddwRegExp)) {
+        // write speed
+        QString device = _source;
+        device.remove("/Rate/wblk");
+        int index = m_devices["disk"].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hddw%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
+        }
+    } else if (_source == "gpu/load") {
+        // gpu load
+        m_map.insert(_source, "gpu");
+        m_formatter["gpu"] = AWKeysAggregator::FormatterType::Float;
+    } else if (_source == "gpu/temperature") {
+        // gpu temperature
+        m_map.insert(_source, "gputemp");
+        m_formatter["gputemp"] = AWKeysAggregator::FormatterType::Temperature;
+    } else if (_source.contains(mountFillRegExp)) {
+        // fill level
+        QString device = _source;
+        device.remove("partitions").remove("/filllevel");
+        int index = m_devices["mount"].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hdd%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Float;
+            // additional keys
+            m_formatter[QString("hddtotmb%1").arg(index)]
+                = AWKeysAggregator::FormatterType::MemMBFormat;
+            m_formatter[QString("hddtotgb%1").arg(index)]
+                = AWKeysAggregator::FormatterType::MemGBFormat;
+        }
+    } else if (_source.contains(mountFreeRegExp)) {
+        // free space
+        QString device = _source;
+        device.remove("partitions").remove("/freespace");
+        int index = m_devices["mount"].indexOf(device);
+        if (index > -1) {
+            // mb
+            QString key = QString("hddfreemb%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
+            // gb
+            key = QString("hddfreegb%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemGBFormat;
+        }
+    } else if (_source.contains(mountUsedRegExp)) {
+        // used
+        QString device = _source;
+        device.remove("partitions").remove("/usedspace");
+        int index = m_devices["mount"].indexOf(device);
+        if (index > -1) {
+            // mb
+            QString key = QString("hddmb%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
+            // gb
+            key = QString("hddgb%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemGBFormat;
+        }
+    } else if (_source.startsWith("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/system/loadavg")) {
+        // load average
+        QString time = _source;
+        time.remove("cpu/system/loadavg");
+        QString key = QString("la%1").arg(time);
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::FloatTwoSymbols;
+    } else if (_source == "mem/physical/application") {
+        // app memory
+        // mb
+        m_map.insert(_source, "memmb");
+        m_formatter["memmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insert(_source, "memgb");
+        m_formatter["memgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source == "mem/physical/free") {
+        // free memory
+        // mb
+        m_map.insert(_source, "memfreemb");
+        m_formatter["memfreemb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insert(_source, "memfreegb");
+        m_formatter["memfreegb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source == "mem/physical/used") {
+        // used memory
+        // mb
+        m_map.insert(_source, "memusedmb");
+        m_formatter["memusedmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insert(_source, "memusedgb");
+        m_formatter["memusedgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source == "network/current/name") {
+        // network device
+        m_map.insert(_source, "netdev");
+        m_formatter["netdev"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "network/current/ssid") {
+        // current ssid
+        m_map.insert(_source, "ssid");
+        m_formatter["ssid"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.startsWith("network/response")) {
+        // network response
+        QString key = _source;
+        key.remove("network/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.contains(netRegExp)) {
+        // network speed
+        QString type = _source.contains("receiver") ? "down" : "up";
+        int index = m_devices["net"].indexOf(_source.split('/')[2]);
+        if (index > -1) {
+            // kb
+            QString key = QString("%1kb%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
+            // smart
+            key = QString("%1%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::NetSmartFormat;
+            // units
+            key = QString("%1units%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::NetSmartUnits;
+        }
+    } else if (_source.contains(netTotalRegExp)) {
+        // network data total
+        QString type = _source.contains("receiver") ? "down" : "up";
+        int index = m_devices["net"].indexOf(_source.split('/')[2]);
+        if (index > -1) {
+            // kb
+            QString key = QString("%1totkb%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
+            // mb
+            key = QString("%1tot%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
+        }
+    } else if (_source.startsWith("upgrade")) {
+        // package manager
+        QString key = _source;
+        key.remove("upgrade/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::IntegerThree;
+    } else if (_source.startsWith("player")) {
+        // player
+        QString key = _source;
+        key.remove("player/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "ps/running/count") {
+        // running processes count
+        m_map.insert(_source, "pscount");
+        m_formatter["pscount"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "ps/running/list") {
+        // list of running processes
+        m_map.insert(_source, "ps");
+        m_formatter["ps"] = AWKeysAggregator::FormatterType::List;
+    } else if (_source == "ps/total/count") {
+        // total processes count
+        m_map.insert(_source, "pstot");
+        m_formatter["pstot"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.startsWith("quotes")) {
+        // quotes
+        QString key = _source;
+        key.remove("quotes/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::Quotes;
+    } else if (_source == "mem/swap/free") {
+        // free swap
+        // mb
+        m_map.insert(_source, "swapfreemb");
+        m_formatter["swapfreemb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insert(_source, "swapfreegb");
+        m_formatter["swapfreegb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source == "mem/swap/used") {
+        // used swap
+        // mb
+        m_map.insert(_source, "swapmb");
+        m_formatter["swapmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insert(_source, "swapgb");
+        m_formatter["swapgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source.startsWith("lmsensors/")) {
+        // temperature
+        int index = m_devices["temp"].indexOf(_source);
+        // HACK on DE initialization there are no units key
+        if (_units.isEmpty())
+            return QStringList({QString("temp%1").arg(index)});
+        if (index > -1) {
+            QString key = QString("temp%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = _units == "°C" ? AWKeysAggregator::FormatterType::Temperature
+                                              : AWKeysAggregator::FormatterType::Integer;
+        }
+    } else if (_source == "Local") {
+        // time
+        m_map.insert(_source, "time");
+        m_formatter["time"] = AWKeysAggregator::FormatterType::Time;
+        // custom time
+        m_map.insert(_source, "ctime");
+        m_formatter["ctime"] = AWKeysAggregator::FormatterType::TimeCustom;
+        // ISO time
+        m_map.insert(_source, "isotime");
+        m_formatter["isotime"] = AWKeysAggregator::FormatterType::TimeISO;
+        // long time
+        m_map.insert(_source, "longtime");
+        m_formatter["longtime"] = AWKeysAggregator::FormatterType::TimeLong;
+        // short time
+        m_map.insert(_source, "shorttime");
+        m_formatter["shorttime"] = AWKeysAggregator::FormatterType::TimeShort;
+        // timestamp
+        m_map.insert(_source, "tstime");
+        m_formatter["tstime"] = AWKeysAggregator::FormatterType::Timestamp;
+    } else if (_source == "system/brightness") {
+        m_map.insert(_source, "brightness");
+        m_formatter["brightness"] = AWKeysAggregator::FormatterType::IntegerThree;
+    } else if (_source == "system/volume") {
+        m_map.insert(_source, "volume");
+        m_formatter["volume"] = AWKeysAggregator::FormatterType::IntegerThree;
+    } else if (_source == "system/uptime") {
+        // uptime
+        m_map.insert(_source, "uptime");
+        m_formatter["uptime"] = AWKeysAggregator::FormatterType::Uptime;
+        // custom uptime
+        m_map.insert(_source, "cuptime");
+        m_formatter["cuptime"] = AWKeysAggregator::FormatterType::UptimeCustom;
+    } else if (_source.startsWith("weather/temperature")) {
+        // temperature
+        QString key = _source;
+        key.remove("weather/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
+    } else if (_source.startsWith("weather/")) {
+        // other weather
+        QString key = _source;
+        key.remove("weather/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.startsWith("load/load")) {
+        // load source
+        QString key = _source;
+        key.remove("load/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
+    }
+
+    QStringList foundKeys = keysFromSource(_source);
 
     // rewrite formatters for custom ones
     QStringList customFormattersKeys;
     if (m_customFormatters)
         customFormattersKeys = m_customFormatters->definedFormatters();
-    qCInfo(LOG_AW) << "Looking for formatters" << keys << "in" << customFormattersKeys;
+    qCInfo(LOG_AW) << "Looking for formatters" << foundKeys << "in" << customFormattersKeys;
-    for (auto &key : keys) {
+    for (auto &key : foundKeys) {
         if (!customFormattersKeys.contains(key))
             continue;
-        foundKeys[key] = AWPluginFormatterCustom::instance();
+        m_formatter[key] = AWKeysAggregator::FormatterType::Custom;
     }
 
-    // check if keys were actually requested
+    // drop key from dictionary if no one user requested key required it
-    qCInfo(LOG_AW) << "Looking for keys" << keys << "in" << _keys;
+    qCInfo(LOG_AW) << "Looking for keys" << foundKeys << "in" << _keys;
-    auto required = _keys.isEmpty()
+    bool required = _keys.isEmpty()
-                    || std::any_of(keys.cbegin(), keys.cend(), [&_keys](auto &key) { return _keys.contains(key); });
+                    || std::any_of(foundKeys.cbegin(), foundKeys.cend(),
-    if (!required)
+                                   [&_keys](const QString &key) { return _keys.contains(key); });
-        return {};
+    if (!required) {
-
+        m_map.remove(_source);
-    // insert keys into memory
+        for (auto &key : foundKeys)
-    for (auto [key, formatter] : foundKeys.asKeyValueRange()) {
+            m_formatter.remove(key);
-        m_map.insert(_source, key);
-        m_formatter[key] = formatter;
     }
 
-    return keys;
+    return keysFromSource(_source);
 }
 
 
-void AWDataEngineMapper::setDevices(const AWPluginMatcherSettings &_settings)
+void AWDataEngineMapper::setDevices(const QHash<QString, QStringList> &_devices)
 {
-    m_settings = _settings;
+    qCDebug(LOG_AW) << "Devices" << _devices;
+
+    m_devices = _devices;
 }

sources/awesome-widget/plugin/awdataenginemapper.h

@@ -15,15 +15,14 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
 
-#include <ksysguard/formatter/Unit.h>
+#ifndef AWDATAENGINEMAPPER_H
+#define AWDATAENGINEMAPPER_H
 
 #include <QMultiHash>
 #include <QObject>
 
-#include "formatters/awpluginformatter.h"
+#include "awkeysaggregator.h"
-#include "matchers/awpluginmatchersettings.h"
 
 
 class AWFormatterHelper;
@@ -34,19 +33,22 @@ class AWDataEngineMapper : public QObject
 
 public:
     explicit AWDataEngineMapper(QObject *_parent = nullptr, AWFormatterHelper *_custom = nullptr);
-    ~AWDataEngineMapper() override = default;
+    ~AWDataEngineMapper() override;
     // get methods
-    [[nodiscard]] AWPluginFormaterInterface *formatter(const QString &_key) const;
+    [[nodiscard]] AWKeysAggregator::FormatterType formatter(const QString &_key) const;
     [[nodiscard]] QStringList keysFromSource(const QString &_source) const;
     // set methods
-    QStringList registerSource(const QString &_source, KSysGuard::Unit _units, const QStringList &_keys);
+    QStringList registerSource(const QString &_source, const QString &_units,
-    void setDevices(const AWPluginMatcherSettings &_settings);
+                               const QStringList &_keys);
+    void setDevices(const QHash<QString, QStringList> &_devices);
 
 private:
     AWFormatterHelper *m_customFormatters = nullptr;
-    AWPluginMatcherSettings m_settings;
     // variables
     QHash<QString, QStringList> m_devices;
-    QHash<QString, AWPluginFormaterInterface *> m_formatter;
+    QHash<QString, AWKeysAggregator::FormatterType> m_formatter;
     QMultiHash<QString, QString> m_map;
 };
+
+
+#endif /* AWDATAENGINEMAPPER_H */

sources/awesome-widget/plugin/awdbusadaptor.cpp

@@ -32,16 +32,24 @@ AWDBusAdaptor::AWDBusAdaptor(AWKeys *_parent)
 }
 
 
-QStringList AWDBusAdaptor::ActiveServices()
+AWDBusAdaptor::~AWDBusAdaptor()
 {
-    auto listServices = QDBusConnection::sessionBus().interface()->call(QDBus::BlockWithGui, "ListNames");
+    qCDebug(LOG_DBUS) << __PRETTY_FUNCTION__;
+}
+
+
+QStringList AWDBusAdaptor::ActiveServices() const
+{
+    QDBusMessage listServices
+        = QDBusConnection::sessionBus().interface()->call(QDBus::BlockWithGui, "ListNames");
     if (listServices.arguments().isEmpty()) {
         qCWarning(LOG_DBUS) << "Could not find any DBus service";
         return {};
     }
-    auto arguments = listServices.arguments().first().toStringList();
+    QStringList arguments = listServices.arguments().first().toStringList();
 
-    return std::accumulate(arguments.cbegin(), arguments.cend(), QStringList(), [](auto source, auto &service) {
+    return std::accumulate(arguments.cbegin(), arguments.cend(), QStringList(),
+                           [](QStringList &source, const QString &service) {
                                if (service.startsWith(AWDBUS_SERVICE))
                                    source.append(service);
                                return source;
@@ -78,7 +86,8 @@ void AWDBusAdaptor::SetLogLevel(const QString &what, const int level)
     qCDebug(LOG_DBUS) << "Set log level" << level << "for" << what;
 
     if (level >= m_logLevels.count()) {
-        qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be less than" << m_logLevels.count();
+        qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be less than"
+                          << m_logLevels.count();
         return;
     }
 
@@ -96,6 +105,6 @@ void AWDBusAdaptor::SetLogLevel(const QString &what, const QString &level, const
         return;
     }
 
-    auto state = enabled ? "true" : "false";
+    QString state = enabled ? "true" : "false";
-    QLoggingCategory::setFilterRules(QString("%1.%2=%3").arg(what, level, state));
+    QLoggingCategory::setFilterRules(QString("%1.%2=%3").arg(what).arg(level).arg(state));
 }

sources/awesome-widget/plugin/awdbusadaptor.h

@@ -15,7 +15,9 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWDBUSADAPTOR_H
+#define AWDBUSADAPTOR_H
 
 #include <QDBusAbstractAdaptor>
 
@@ -31,11 +33,11 @@ class AWDBusAdaptor : public QDBusAbstractAdaptor
 
 public:
     explicit AWDBusAdaptor(AWKeys *_parent = nullptr);
-    ~AWDBusAdaptor() override = default;
+    ~AWDBusAdaptor() override;
 
 public slots:
     // get methods
-    [[nodiscard]] static QStringList ActiveServices();
+    [[nodiscard]] QStringList ActiveServices() const;
     [[nodiscard]] QString Info(const QString &key) const;
     [[nodiscard]] QStringList Keys(const QString &regexp) const;
     [[nodiscard]] QString Value(const QString &key) const;
@@ -48,3 +50,6 @@ private:
     AWKeys *m_plugin = nullptr;
     QStringList m_logLevels = {"debug", "info", "warning", "critical"};
 };
+
+
+#endif /* AWDBUSADAPTOR_H */

sources/awesome-widget/plugin/awesomewidget.h

@@ -15,7 +15,9 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWPLUGIN_H
+#define AWPLUGIN_H
 
 #include <QQmlExtensionPlugin>
 
@@ -28,3 +30,6 @@ class AWPlugin : public QQmlExtensionPlugin
 public:
     void registerTypes(const char *uri) override;
 };
+
+
+#endif /* AWPLUGIN_H */

sources/awesome-widget/plugin/awformatterconfig.cpp

@@ -27,5 +27,11 @@ AWFormatterConfig::AWFormatterConfig(QWidget *_parent, const QStringList &_keys)
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
     setEditable(false, false);
-    setHelper(std::make_unique<AWFormatterHelper>());
+    initHelper<AWFormatterHelper>();
+}
+
+
+AWFormatterConfig::~AWFormatterConfig()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 }

sources/awesome-widget/plugin/awformatterconfig.h

@@ -15,7 +15,9 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWFORMATTERCONFIG_H
+#define AWFORMATTERCONFIG_H
 
 #include "awabstractpairconfig.h"
 
@@ -25,6 +27,10 @@ class AWFormatterConfig : public AWAbstractPairConfig
     Q_OBJECT
 
 public:
-    explicit AWFormatterConfig(QWidget *_parent = nullptr, const QStringList &_keys = QStringList());
+    explicit AWFormatterConfig(QWidget *_parent = nullptr,
-    ~AWFormatterConfig() override = default;
+                               const QStringList &_keys = QStringList());
+    ~AWFormatterConfig() override;
 };
+
+
+#endif /* AWFORMATTERCONFIG_H */

sources/awesome-widget/plugin/awformatterhelper.cpp

@@ -33,7 +33,7 @@
 #include "awstringformatter.h"
 
 
-AWFormatterHelper::AWFormatterHelper(QObject *_parent)
+AWFormatterHelper::AWFormatterHelper(QWidget *_parent)
     : AbstractExtItemAggregator(_parent, "formatters")
     , AWAbstractPairHelper("awesomewidgets/formatters/formatters.ini", "Formatters")
 {
@@ -58,7 +58,8 @@ void AWFormatterHelper::initItems()
 
     // assign internal storage
     m_formatters.clear();
-    for (auto [key, name] : pairs().asKeyValueRange()) {
+    for (auto &key : pairs().keys()) {
+        auto name = pairs()[key];
         if (!m_formattersClasses.contains(name)) {
             qCWarning(LOG_AW) << "Invalid formatter" << name << "found in" << key;
             continue;
@@ -86,7 +87,7 @@ QStringList AWFormatterHelper::definedFormatters() const
 QList<AbstractExtItem *> AWFormatterHelper::items() const
 {
     QList<AbstractExtItem *> converted;
-    for (auto item : m_formattersClasses.values())
+    for (auto &item : m_formattersClasses.values())
         converted.append(item);
 
     return converted;
@@ -101,7 +102,7 @@ void AWFormatterHelper::editPairs()
 
 QStringList AWFormatterHelper::leftKeys()
 {
-    return {};
+    return QStringList();
 }
 
 
@@ -113,16 +114,18 @@ QStringList AWFormatterHelper::rightKeys()
 
 void AWFormatterHelper::editItems()
 {
-    auto ret = exec();
+    repaintList();
+    int ret = exec();
     qCInfo(LOG_AW) << "Dialog returns" << ret;
 }
 
 
-AWAbstractFormatter::FormatterClass AWFormatterHelper::defineFormatterClass(const QString &_stringType)
+AWAbstractFormatter::FormatterClass
+AWFormatterHelper::defineFormatterClass(const QString &_stringType)
 {
     qCDebug(LOG_AW) << "Define formatter class for" << _stringType;
 
-    auto formatter = AWAbstractFormatter::FormatterClass::NoFormat;
+    AWAbstractFormatter::FormatterClass formatter = AWAbstractFormatter::FormatterClass::NoFormat;
     if (_stringType == "DateTime")
         formatter = AWAbstractFormatter::FormatterClass::DateTime;
     else if (_stringType == "Float")
@@ -150,17 +153,19 @@ void AWFormatterHelper::initFormatters()
 
     auto dirs = directories();
     for (auto &dir : dirs) {
-        auto files = QDir(dir).entryList(QDir::Files, QDir::Name);
+        QStringList files = QDir(dir).entryList(QDir::Files, QDir::Name);
         for (auto &file : files) {
             // check filename
             if (!file.endsWith(".desktop"))
                 continue;
             qCInfo(LOG_AW) << "Found file" << file << "in" << dir;
-            auto filePath = QString("%1/%2").arg(dir, file);
+            QString filePath = QString("%1/%2").arg(dir).arg(file);
             // check if already exists
             auto values = m_formattersClasses.values();
             if (std::any_of(values.cbegin(), values.cend(),
-                            [&filePath](auto item) { return (item->filePath() == filePath); }))
+                            [&filePath](const AWAbstractFormatter *item) {
+                                return (item->fileName() == filePath);
+                            }))
                 continue;
 
             auto metadata = readMetadata(filePath);
@@ -192,48 +197,49 @@ void AWFormatterHelper::initFormatters()
 }
 
 
-QPair<QString, AWAbstractFormatter::FormatterClass> AWFormatterHelper::readMetadata(const QString &_filePath)
+QPair<QString, AWAbstractFormatter::FormatterClass>
+AWFormatterHelper::readMetadata(const QString &_filePath)
 {
     qCDebug(LOG_AW) << "Read initial parameters from" << _filePath;
 
     QSettings settings(_filePath, QSettings::IniFormat);
-
     settings.beginGroup("Desktop Entry");
-    auto name = settings.value("Name", _filePath).toString();
+    QString name = settings.value("Name", _filePath).toString();
-    auto type = settings.value("X-AW-Type", "NoFormat").toString();
+    QString type = settings.value("X-AW-Type", "NoFormat").toString();
-    auto formatter = defineFormatterClass(type);
+    AWAbstractFormatter::FormatterClass formatter = defineFormatterClass(type);
     settings.endGroup();
 
-    return {name, formatter};
+    return QPair<QString, AWAbstractFormatter::FormatterClass>(name, formatter);
 }
 
 
-void AWFormatterHelper::doCreateItem(QListWidget *_widget)
+void AWFormatterHelper::doCreateItem()
 {
     QStringList selection = {"NoFormat", "DateTime", "Float", "List", "Script", "String", "Json"};
     bool ok;
-    auto select = QInputDialog::getItem(nullptr, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok);
+    QString select
+        = QInputDialog::getItem(this, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok);
     if (!ok) {
         qCWarning(LOG_AW) << "No type selected";
         return;
     }
 
     qCInfo(LOG_AW) << "Selected type" << select;
-    auto formatter = defineFormatterClass(select);
+    AWAbstractFormatter::FormatterClass formatter = defineFormatterClass(select);
     switch (formatter) {
     case AWAbstractFormatter::FormatterClass::DateTime:
-        return createItem<AWDateTimeFormatter>(_widget);
+        return createItem<AWDateTimeFormatter>();
     case AWAbstractFormatter::FormatterClass::Float:
-        return createItem<AWFloatFormatter>(_widget);
+        return createItem<AWFloatFormatter>();
     case AWAbstractFormatter::FormatterClass::List:
-        return createItem<AWListFormatter>(_widget);
+        return createItem<AWListFormatter>();
     case AWAbstractFormatter::FormatterClass::Script:
-        return createItem<AWScriptFormatter>(_widget);
+        return createItem<AWScriptFormatter>();
     case AWAbstractFormatter::FormatterClass::String:
-        return createItem<AWStringFormatter>(_widget);
+        return createItem<AWStringFormatter>();
     case AWAbstractFormatter::FormatterClass::Json:
-        return createItem<AWJsonFormatter>(_widget);
+        return createItem<AWJsonFormatter>();
     case AWAbstractFormatter::FormatterClass::NoFormat:
-        return createItem<AWNoFormatter>(_widget);
+        return createItem<AWNoFormatter>();
     }
 }

sources/awesome-widget/plugin/awformatterhelper.h

@@ -15,7 +15,9 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWFORMATTERHELPER_H
+#define AWFORMATTERHELPER_H
 
 #include "abstractextitemaggregator.h"
 #include "awabstractformatter.h"
@@ -27,7 +29,7 @@ class AWFormatterHelper : public AbstractExtItemAggregator, public AWAbstractPai
     Q_OBJECT
 
 public:
-    explicit AWFormatterHelper(QObject *_parent = nullptr);
+    explicit AWFormatterHelper(QWidget *_parent = nullptr);
     ~AWFormatterHelper() override;
     // read-write methods
     void initItems() override;
@@ -47,10 +49,14 @@ private:
     // methods
     static AWAbstractFormatter::FormatterClass defineFormatterClass(const QString &_stringType);
     void initFormatters();
-    [[nodiscard]] static QPair<QString, AWAbstractFormatter::FormatterClass> readMetadata(const QString &_filePath);
+    [[nodiscard]] static QPair<QString, AWAbstractFormatter::FormatterClass>
+    readMetadata(const QString &_filePath);
     // parent methods
-    void doCreateItem(QListWidget *_widget) override;
+    void doCreateItem() override;
     // properties
     QHash<QString, AWAbstractFormatter *> m_formatters;
     QHash<QString, AWAbstractFormatter *> m_formattersClasses;
 };
+
+
+#endif /* AWFORMATTERHELPER_H */

sources/awesome-widget/plugin/awkeycache.cpp

@@ -20,7 +20,6 @@
 
 #include <QDir>
 #include <QNetworkInterface>
-#include <QRegularExpression>
 #include <QSettings>
 #include <QStandardPaths>
 
@@ -31,8 +30,9 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
 {
     qCDebug(LOG_AW) << "Key" << _key << "with type" << _type;
 
-    auto fileName
+    QString fileName
-        = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
+        = QString("%1/awesomewidgets.ndx")
+              .arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
     qCInfo(LOG_AW) << "Cache file" << fileName;
     QSettings cache(fileName, QSettings::IniFormat);
 
@@ -41,10 +41,21 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
     for (auto &number : cache.allKeys())
         cachedValues.append(cache.value(number).toString());
 
-    if (_type == "net") {
+    if (_type == "hdd") {
-        auto rawInterfaceList = QNetworkInterface::allInterfaces();
+        QStringList allDevices = QDir("/dev").entryList(QDir::System, QDir::Name);
+        QStringList devices = allDevices.filter(QRegExp("^[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) {
-            auto device = interface.name();
+            QString device = interface.name();
             if (cachedValues.contains(device))
                 continue;
             qCInfo(LOG_AW) << "Found new key" << device << "for type" << _type;
@@ -64,37 +75,79 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
 }
 
 
-QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringList &_bars, const QVariantMap &_tooltip,
+QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringList &_bars,
-                                        const QStringList &_userKeys, const QStringList &_allKeys)
+                                        const QVariantMap &_tooltip, const QStringList &_userKeys,
+                                        const QStringList &_allKeys)
 {
-    qCDebug(LOG_AW) << "Looking for required keys in" << _keys << _bars << "using tooltip settings" << _tooltip;
+    qCDebug(LOG_AW) << "Looking for required keys in" << _keys << _bars << "using tooltip settings"
+                    << _tooltip;
 
     // initial copy
     QSet<QString> used(_keys.cbegin(), _keys.cend());
     used.unite(QSet(_bars.cbegin(), _bars.cend()));
     used.unite(QSet(_userKeys.cbegin(), _userKeys.cend()));
     // insert keys from tooltip
-    for (auto [key, value] : _tooltip.asKeyValueRange()) {
+    for (auto &key : _tooltip.keys()) {
-        if ((key.endsWith("Tooltip")) && value.toBool()) {
+        if ((key.endsWith("Tooltip")) && (_tooltip[key].toBool())) {
-            auto local = key;
+            key.remove("Tooltip");
-            local.remove("Tooltip");
+            used << key;
-            used << local;
         }
     }
 
-    // insert keys which depend on others, refer to AWKeys::calculateValues()
+    // insert depending keys, refer to AWKeys::calculateValues()
+    // hddtotmb*
+    for (auto &key : _allKeys.filter(QRegExp("^hddtotmb"))) {
+        if (!used.contains(key))
+            continue;
+        key.remove("hddtotmb");
+        int index = key.toInt();
+        used << QString("hddfreemb%1").arg(index) << QString("hddmb%1").arg(index);
+    }
+    // hddtotgb*
+    for (auto &key : _allKeys.filter(QRegExp("^hddtotgb"))) {
+        if (!used.contains(key))
+            continue;
+        key.remove("hddtotgb");
+        int index = key.toInt();
+        used << QString("hddfreegb%1").arg(index) << QString("hddgb%1").arg(index);
+    }
+    // mem
+    if (used.contains("mem"))
+        used << "memmb"
+             << "memtotmb";
+    // memtotmb
+    if (used.contains("memtotmb"))
+        used << "memusedmb"
+             << "memfreemb";
+    // memtotgb
+    if (used.contains("memtotgb"))
+        used << "memusedgb"
+             << "memfreegb";
+    // swap
+    if (used.contains("swap"))
+        used << "swapmb"
+             << "swaptotmb";
+    // swaptotmb
+    if (used.contains("swaptotmb"))
+        used << "swapmb"
+             << "swapfreemb";
+    // memtotgb
+    if (used.contains("swaptotgb"))
+        used << "swapgb"
+             << "swapfreegb";
     // network keys
-    QStringList netKeys(
+    QStringList netKeys({"up", "upkb", "uptot", "uptotkb", "upunits", "down", "downkb", "downtot",
-        {"up", "upkb", "uptot", "uptotkb", "upunits", "down", "downkb", "downtot", "downtotkb", "downunits"});
+                         "downtotkb", "downunits"});
     for (auto &key : netKeys) {
         if (!used.contains(key))
             continue;
-        auto filt = _allKeys.filter(QRegularExpression(QString("^%1[0-9]{1,}").arg(key)));
+        QStringList filt = _allKeys.filter(QRegExp(QString("^%1[0-9]{1,}").arg(key)));
         for (auto &filtered : filt)
             used << filtered;
     }
     // netdev key
-    if (std::any_of(netKeys.cbegin(), netKeys.cend(), [&used](auto &key) { return used.contains(key); }))
+    if (std::any_of(netKeys.cbegin(), netKeys.cend(),
+                    [&used](const QString &key) { return used.contains(key); }))
         used << "netdev";
 
     // HACK append dummy if there are no other keys. This hack is required
@@ -106,23 +159,19 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
 }
 
 
-AWPluginMatcherSettings AWKeyCache::loadKeysFromCache()
+QHash<QString, QStringList> AWKeyCache::loadKeysFromCache()
 {
-    auto fileName
+    QString fileName
-        = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
+        = QString("%1/awesomewidgets.ndx")
+              .arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
     qCInfo(LOG_AW) << "Cache file" << fileName;
     QSettings cache(fileName, QSettings::IniFormat);
 
-    AWPluginMatcherSettings devices;
+    QHash<QString, QStringList> devices;
-    QHash<QString, QStringList *> groups = {
+    for (auto &group : cache.childGroups()) {
-        {"disk", &devices.disk},   {"gpu", &devices.gpu},      {"mount", &devices.mount},
-        {"net", &devices.network}, {"temp", &devices.sensors},
-    };
-
-    for (auto [group, list] : groups.asKeyValueRange()) {
         cache.beginGroup(group);
         for (auto &key : cache.allKeys())
-            list->append(cache.value(key).toString());
+            devices[group].append(cache.value(key).toString());
         cache.endGroup();
     }
 

sources/awesome-widget/plugin/awkeycache.h

@@ -15,18 +15,23 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
 
+#ifndef AWKEYCACHE_H
+#define AWKEYCACHE_H
+
+#include <QHash>
 #include <QString>
 #include <QVariant>
 
-#include <matchers/awpluginmatchersettings.h>
-
 
 namespace AWKeyCache
 {
 bool addKeyToCache(const QString &_type, const QString &_key = "");
-QStringList getRequiredKeys(const QStringList &_keys, const QStringList &_bars, const QVariantMap &_tooltip,
+QStringList getRequiredKeys(const QStringList &_keys, const QStringList &_bars,
-                            const QStringList &_userKeys, const QStringList &_allKeys);
+                            const QVariantMap &_tooltip, const QStringList &_userKeys,
-AWPluginMatcherSettings loadKeysFromCache();
+                            const QStringList &_allKeys);
+QHash<QString, QStringList> loadKeysFromCache();
 } // namespace AWKeyCache
+
+
+#endif /* AWKEYCACHE_H */

sources/awesome-widget/plugin/awkeyoperations.cpp

@@ -18,7 +18,8 @@
 #include "awkeyoperations.h"
 
 #include <QDir>
-#include <QRegularExpression>
+#include <QJSEngine>
+#include <QRegExp>
 #include <QThread>
 
 #include "awcustomkeyshelper.h"
@@ -40,16 +41,30 @@ AWKeyOperations::AWKeyOperations(QObject *_parent)
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
     m_customKeys = new AWCustomKeysHelper(this);
-    m_graphicalItems = new ExtItemAggregator<GraphicalItem>(this, "desktops");
+    m_graphicalItems = new ExtItemAggregator<GraphicalItem>(nullptr, "desktops");
-    m_extNetRequest = new ExtItemAggregator<ExtNetworkRequest>(this, "requests");
+    m_extNetRequest = new ExtItemAggregator<ExtNetworkRequest>(nullptr, "requests");
-    m_extQuotes = new ExtItemAggregator<ExtQuotes>(this, "quotes");
+    m_extQuotes = new ExtItemAggregator<ExtQuotes>(nullptr, "quotes");
-    m_extScripts = new ExtItemAggregator<ExtScript>(this, "scripts");
+    m_extScripts = new ExtItemAggregator<ExtScript>(nullptr, "scripts");
-    m_extUpgrade = new ExtItemAggregator<ExtUpgrade>(this, "upgrade");
+    m_extUpgrade = new ExtItemAggregator<ExtUpgrade>(nullptr, "upgrade");
-    m_extWeather = new ExtItemAggregator<ExtWeather>(this, "weather");
+    m_extWeather = new ExtItemAggregator<ExtWeather>(nullptr, "weather");
 }
 
 
-AWPluginMatcherSettings AWKeyOperations::devices() const
+AWKeyOperations::~AWKeyOperations()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+QStringList AWKeyOperations::devices(const QString &_type) const
+{
+    qCDebug(LOG_AW) << "Looking for type" << _type;
+
+    return m_devices[_type];
+}
+
+
+QHash<QString, QStringList> AWKeyOperations::devices() const
 {
     return m_devices;
 }
@@ -58,6 +73,7 @@ AWPluginMatcherSettings AWKeyOperations::devices() const
 void AWKeyOperations::updateCache()
 {
     // update network and hdd list
+    addKeyToCache("hdd");
     addKeyToCache("net");
 }
 
@@ -66,7 +82,7 @@ QStringList AWKeyOperations::dictKeys() const
 {
     QStringList allKeys;
     // weather
-    for (auto item : m_extWeather->activeItems()) {
+    for (auto &item : m_extWeather->activeItems()) {
         allKeys.append(item->tag("weatherId"));
         allKeys.append(item->tag("weather"));
         allKeys.append(item->tag("humidity"));
@@ -75,20 +91,15 @@ QStringList AWKeyOperations::dictKeys() const
         allKeys.append(item->tag("timestamp"));
     }
     // cpuclock & cpu
-    for (auto i = 0; i < QThread::idealThreadCount(); ++i) {
+    for (int i = 0; i < QThread::idealThreadCount(); i++) {
         allKeys.append(QString("cpucl%1").arg(i));
         allKeys.append(QString("cpu%1").arg(i));
     }
     // temperature
-    for (auto i = 0; i < m_devices.sensors.count(); ++i)
+    for (int 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 (auto i = 0; i < m_devices.mount.count(); ++i) {
+    for (int 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));
@@ -98,12 +109,15 @@ QStringList AWKeyOperations::dictKeys() const
         allKeys.append(QString("hdd%1").arg(i));
     }
     // hdd speed
-    for (auto i = 0; i < m_devices.disk.count(); ++i) {
+    for (int 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 (auto i = 0; i < m_devices.network.count(); ++i) {
+    for (int 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));
@@ -116,9 +130,10 @@ QStringList AWKeyOperations::dictKeys() const
         allKeys.append(QString("up%1").arg(i));
     }
     // battery
-    auto allBatteryDevices = QDir("/sys/class/power_supply")
+    QStringList allBatteryDevices
+        = QDir("/sys/class/power_supply")
               .entryList(QStringList({"BAT*"}), QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
-    for (int i = 0; i < allBatteryDevices.count(); ++i) {
+    for (int i = 0; i < allBatteryDevices.count(); i++) {
         allKeys.append(QString("bat%1").arg(i));
         allKeys.append(QString("batleft%1").arg(i));
         allKeys.append(QString("batnow%1").arg(i));
@@ -126,10 +141,10 @@ QStringList AWKeyOperations::dictKeys() const
         allKeys.append(QString("battotal%1").arg(i));
     }
     // package manager
-    for (auto item : m_extUpgrade->activeItems())
+    for (auto &item : m_extUpgrade->activeItems())
         allKeys.append(item->tag("pkgcount"));
     // quotes
-    for (auto item : m_extQuotes->activeItems()) {
+    for (auto &item : m_extQuotes->activeItems()) {
         allKeys.append(item->tag("price"));
         allKeys.append(item->tag("pricechg"));
         allKeys.append(item->tag("percpricechg"));
@@ -138,13 +153,13 @@ QStringList AWKeyOperations::dictKeys() const
         allKeys.append(item->tag("percvolumechg"));
     }
     // custom
-    for (auto item : m_extScripts->activeItems())
+    for (auto &item : m_extScripts->activeItems())
         allKeys.append(item->tag("custom"));
     // network requests
-    for (auto item : m_extNetRequest->activeItems())
+    for (auto &item : m_extNetRequest->activeItems())
         allKeys.append(item->tag("response"));
     // bars
-    for (auto item : m_graphicalItems->activeItems())
+    for (auto &item : m_graphicalItems->activeItems())
         allKeys.append(item->tag("bar"));
     // user defined keys
     allKeys.append(m_customKeys->keys());
@@ -191,58 +206,52 @@ QString AWKeyOperations::infoByKey(const QString &_key) const
 {
     qCDebug(LOG_AW) << "Requested key" << _key;
 
-    static auto numberRegExp = QRegularExpression("\\d+");
+    QString stripped = _key;
-
+    stripped.remove(QRegExp("\\d+"));
-    auto stripped = _key;
-    stripped.remove(numberRegExp);
     QString output;
 
-    static auto hddRegExp = QRegularExpression("^hdd(|mb|gb|freemb|freegb|totmb|totgb)");
-    static auto hddrwRegExp = QRegularExpression("^hdd[rw]");
-    static auto hddMatchRegExp = QRegularExpression("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)");
-    static auto netRegExp = QRegularExpression("^(down|up)");
-    static auto netMatchRegExp = QRegularExpression("^(down|up)[0-9]");
-    static auto quotesRegExp = QRegularExpression("^(|perc)(ask|bid|price)(chg|)");
-    static auto weatherRegExp = QRegularExpression("^(weather|weatherId|humidity|pressure|temperature)");
-
     if (_key.startsWith("bar")) {
-        auto item = m_graphicalItems->itemByTag(_key, stripped);
+        AbstractExtItem *item = m_graphicalItems->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
     } else if (_key.startsWith("custom")) {
-        auto item = m_extScripts->itemByTag(_key, stripped);
+        AbstractExtItem *item = m_extScripts->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
-    } else if (_key.contains(hddrwRegExp)) {
+    } else if (_key.contains(QRegExp("^hdd[rw]"))) {
-        auto index = _key;
+        QString index = _key;
-        index.remove(hddrwRegExp);
+        index.remove(QRegExp("hdd[rw]"));
-        output = m_devices.disk[index.toInt()];
+        output = m_devices["disk"][index.toInt()];
-    } else if (_key.contains(hddMatchRegExp)) {
+    } else if (_key.contains(QRegExp("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)"))) {
-        auto index = _key;
+        QString index = _key;
-        index.remove(hddRegExp);
+        index.remove(QRegExp("^hdd(|mb|gb|freemb|freegb|totmb|totgb)"));
-        output = m_devices.mount[index.toInt()];
+        output = m_devices["mount"][index.toInt()];
-    } else if (_key.contains(netMatchRegExp)) {
+    } else if (_key.startsWith("hddtemp")) {
-        auto index = _key;
+        QString index = _key;
-        index.remove(netRegExp);
+        index.remove("hddtemp");
-        output = m_devices.network[index.toInt()];
+        output = m_devices["hdd"][index.toInt()];
+    } else if (_key.contains(QRegExp("^(down|up)[0-9]"))) {
+        QString index = _key;
+        index.remove(QRegExp("^(down|up)"));
+        output = m_devices["net"][index.toInt()];
     } else if (_key.startsWith("pkgcount")) {
-        auto item = m_extUpgrade->itemByTag(_key, stripped);
+        AbstractExtItem *item = m_extUpgrade->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
-    } else if (_key.contains(quotesRegExp)) {
+    } else if (_key.contains(QRegExp("(^|perc)(ask|bid|price)(chg|)"))) {
-        auto item = m_extQuotes->itemByTag(_key, stripped);
+        AbstractExtItem *item = m_extQuotes->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
-    } else if (_key.contains(weatherRegExp)) {
+    } else if (_key.contains(QRegExp("(weather|weatherId|humidity|pressure|temperature)"))) {
-        auto item = m_extWeather->itemByTag(_key, stripped);
+        AbstractExtItem *item = m_extWeather->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
     } else if (_key.startsWith("temp")) {
-        auto index = _key;
+        QString index = _key;
         index.remove("temp");
-        output = m_devices.sensors[index.toInt()];
+        output = m_devices["temp"][index.toInt()];
     } else if (_key.startsWith("response")) {
-        auto item = m_extNetRequest->itemByTag(_key, stripped);
+        AbstractExtItem *item = m_extNetRequest->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
     } else {
@@ -271,10 +280,9 @@ void AWKeyOperations::editItem(const QString &_type)
 {
     qCDebug(LOG_AW) << "Item type" << _type;
 
-    static auto supportsGraphicalRegExp = QRegularExpression("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)");
-
     if (_type == "graphicalitem") {
-        auto keys = dictKeys().filter(supportsGraphicalRegExp);
+        QStringList keys
+            = dictKeys().filter(QRegExp("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)"));
         keys.sort();
         m_graphicalItems->setConfigArgs(keys);
         return m_graphicalItems->editItems();
@@ -296,26 +304,19 @@ void AWKeyOperations::addDevice(const QString &_source)
 {
     qCDebug(LOG_AW) << "Source" << _source;
 
-    static auto diskRegexp = QRegularExpression("^disk/.*/read$");
+    QRegExp diskRegexp = QRegExp("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)");
-    static auto mountRegexp = QRegularExpression("^disk/.*/usedPercent$");
+    QRegExp mountRegexp = QRegExp("partitions/.*/filllevel");
-    static auto cpuTempRegExp = QRegularExpression("^cpu/cpu.*/temperature$");
-    static auto gpuRegExp = QRegularExpression("^gpu/gpu.*/usage$");
 
     if (_source.contains(diskRegexp)) {
-        auto device = _source;
+        QString device = _source;
-        device.remove("disk/").remove("/read");
+        device.remove("/Rate/rblk");
         addKeyToCache("disk", device);
     } else if (_source.contains(mountRegexp)) {
-        auto device = _source;
+        QString device = _source;
-        device.remove("disk/").remove("/usedPercent");
+        device.remove("partitions").remove("/filllevel");
         addKeyToCache("mount", device);
-    } else if (_source.startsWith("lmsensors") || _source.contains(cpuTempRegExp)
+    } else if (_source.startsWith("lmsensors")) {
-               || _source == "cpu/all/averageTemperature") {
         addKeyToCache("temp", _source);
-    } else if (_source.contains(gpuRegExp)) {
-        auto device = _source;
-        device.remove("gpu/").remove("/usage");
-        addKeyToCache("gpu", device);
     }
 }
 
@@ -342,7 +343,7 @@ void AWKeyOperations::reinitKeys()
     m_extWeather->initItems();
 
     // init
-    auto allKeys = dictKeys();
+    QStringList allKeys = dictKeys();
 
     // apply aw_* functions
     m_pattern = AWPatternFunctions::insertAllKeys(m_pattern, allKeys);

sources/awesome-widget/plugin/awkeyoperations.h

@@ -15,12 +15,13 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWKEYOPERATIONS_H
+#define AWKEYOPERATIONS_H
 
 #include <QObject>
 
 #include "extitemaggregator.h"
-#include "matchers/awpluginmatchersettings.h"
 
 
 class AWCustomKeysHelper;
@@ -38,8 +39,9 @@ class AWKeyOperations : public QObject
 
 public:
     explicit AWKeyOperations(QObject *_parent = nullptr);
-    ~AWKeyOperations() override = default;
+    ~AWKeyOperations() override;
-    [[nodiscard]] AWPluginMatcherSettings devices() const;
+    [[nodiscard]] QStringList devices(const QString &_type) const;
+    [[nodiscard]] QHash<QString, QStringList> devices() const;
     void updateCache();
     // keys
     [[nodiscard]] QStringList dictKeys() const;
@@ -73,6 +75,9 @@ private:
     ExtItemAggregator<ExtUpgrade> *m_extUpgrade = nullptr;
     ExtItemAggregator<ExtWeather> *m_extWeather = nullptr;
     // variables
-    AWPluginMatcherSettings m_devices;
+    QHash<QString, QStringList> m_devices;
     QString m_pattern;
 };
+
+
+#endif /* AWKEYOPERATIONS_H */

sources/awesome-widget/plugin/awkeys.cpp

@@ -19,8 +19,9 @@
 
 #include <QDBusConnection>
 #include <QDBusError>
-#include <QRegularExpression>
+#include <QThread>
 #include <QTimer>
+#include <QtConcurrent/QtConcurrent>
 
 #include "awdataaggregator.h"
 #include "awdataengineaggregator.h"
@@ -41,6 +42,9 @@ AWKeys::AWKeys(QObject *_parent)
     for (auto &metadata : AWDebug::getBuildData())
         qCDebug(LOG_AW) << metadata;
 
+    // thread pool
+    m_threadPool = new QThreadPool(this);
+
     m_aggregator = new AWKeysAggregator(this);
     m_dataAggregator = new AWDataAggregator(this);
     m_dataEngineAggregator = new AWDataEngineAggregator(this);
@@ -52,17 +56,17 @@ AWKeys::AWKeys(QObject *_parent)
     createDBusInterface();
 
     // update key data if required
-    connect(m_keyOperator, &AWKeyOperations::updateKeys, this, &AWKeys::reinitKeys);
+    connect(m_keyOperator, SIGNAL(updateKeys(const QStringList &)), this,
-    connect(m_timer, &QTimer::timeout, this, &AWKeys::updateTextData);
+            SLOT(reinitKeys(const QStringList &)));
-
+    connect(m_timer, SIGNAL(timeout()), this, SLOT(updateTextData()));
     // transfer signal from AWDataAggregator object to QML ui
-    connect(m_dataAggregator, &AWDataAggregator::toolTipPainted,
+    connect(m_dataAggregator, SIGNAL(toolTipPainted(const QString &)), this,
-            [this](const QString &_tooltip) { emit(needToolTipToBeUpdated(_tooltip)); });
+            SIGNAL(needToolTipToBeUpdated(const QString &)));
-
+    connect(this, SIGNAL(dropSourceFromDataengine(const QString &)), m_dataEngineAggregator,
-    connect(this, &AWKeys::dropSourceFromDataengine, m_dataEngineAggregator, &AWDataEngineAggregator::dropSource);
+            SLOT(dropSource(const QString &)));
-    connect(m_dataEngineAggregator, &AWDataEngineAggregator::dataUpdated, this, &AWKeys::dataUpdated);
     // transfer signal from dataengine to update source list
-    connect(m_dataEngineAggregator, &AWDataEngineAggregator::deviceAdded, m_keyOperator, &AWKeyOperations::addDevice);
+    connect(m_dataEngineAggregator, SIGNAL(deviceAdded(const QString &)), m_keyOperator,
+            SLOT(addDevice(const QString &)));
 }
 
 
@@ -87,17 +91,20 @@ void AWKeys::initDataAggregator(const QVariantMap &_tooltipParams)
 }
 
 
-void AWKeys::initKeys(const QString &_currentPattern, const int _interval, const bool _optimize)
+void AWKeys::initKeys(const QString &_currentPattern, const int _interval, const int _limit,
+                      const bool _optimize)
 {
-    qCDebug(LOG_AW) << "Pattern" << _currentPattern << "with interval" << _interval << "with optimization" << _optimize;
+    qCDebug(LOG_AW) << "Pattern" << _currentPattern << "with interval" << _interval
+                    << "and queue limit" << _limit << "with optimization" << _optimize;
 
     // init
     m_optimize = _optimize;
+    m_threadPool->setMaxThreadCount(_limit == 0 ? QThread::idealThreadCount() : _limit);
     // child objects
     m_aggregator->initFormatters();
     m_keyOperator->setPattern(_currentPattern);
     m_keyOperator->updateCache();
-    m_dataEngineAggregator->loadSources();
+    m_dataEngineAggregator->reconnectSources(_interval);
 
     // timer
     m_timer->setInterval(_interval);
@@ -143,7 +150,27 @@ QStringList AWKeys::dictKeys(const bool _sorted, const QString &_regexp) const
     if (_sorted)
         allKeys.sort();
 
-    return allKeys.filter(QRegularExpression(_regexp));
+    return allKeys.filter(QRegExp(_regexp));
+}
+
+
+QVariantList AWKeys::getHddDevices() const
+{
+    QStringList hddDevices = m_keyOperator->devices("hdd");
+    // required by selector in the UI
+    hddDevices.insert(0, "disable");
+    hddDevices.insert(0, "auto");
+
+    // build model
+    QVariantList devices;
+    for (auto &device : hddDevices) {
+        QVariantMap model;
+        model["label"] = device;
+        model["name"] = device;
+        devices.append(model);
+    }
+
+    return devices;
 }
 
 
@@ -160,9 +187,9 @@ QString AWKeys::valueByKey(const QString &_key) const
 {
     qCDebug(LOG_AW) << "Requested value for key" << _key;
 
-    auto realKey = _key.startsWith("bar") ? m_keyOperator->infoByKey(_key) : _key;
+    QString trueKey = _key.startsWith("bar") ? m_keyOperator->infoByKey(_key) : _key;
 
-    return m_aggregator->formatter(m_values[realKey], realKey, true);
+    return m_aggregator->formatter(m_values[trueKey], trueKey, true);
 }
 
 
@@ -174,16 +201,10 @@ void AWKeys::editItem(const QString &_type)
 }
 
 
-void AWKeys::dataUpdated(const QHash<QString, KSysGuard::SensorInfo> &_sensors, const KSysGuard::SensorDataList &_data)
+void AWKeys::dataUpdated(const QString &_sourceName, const Plasma::DataEngine::Data &_data)
 {
-    qCDebug(LOG_AW) << "Update data for" << _data.count() << "items";
+    // run concurrent data update
-
+    QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, _sourceName, _data);
-    for (auto &data : _data) {
-        if (!_sensors.contains(data.sensorProperty))
-            continue;
-        auto sensor = _sensors[data.sensorProperty];
-        setDataBySource(data.sensorProperty, sensor, data.payload);
-    }
 }
 
 
@@ -198,7 +219,7 @@ void AWKeys::reinitKeys(const QStringList &_currentKeys)
     // generate list of required keys for bars
     QStringList barKeys;
     for (auto &bar : m_foundBars) {
-        auto item = m_keyOperator->giByKey(bar);
+        GraphicalItem *item = m_keyOperator->giByKey(bar);
         if (item->isCustom())
             item->setUsedKeys(AWPatternFunctions::findKeys(item->bar(), _currentKeys, false));
         else
@@ -206,7 +227,8 @@ void AWKeys::reinitKeys(const QStringList &_currentKeys)
         barKeys.append(item->usedKeys());
     }
     // get required keys
-    m_requiredKeys = m_optimize ? AWKeyCache::getRequiredKeys(m_foundKeys, barKeys, m_tooltipParams,
+    m_requiredKeys
+        = m_optimize ? AWKeyCache::getRequiredKeys(m_foundKeys, barKeys, m_tooltipParams,
                                                    m_keyOperator->requiredUserKeys(), _currentKeys)
                      : QStringList();
 
@@ -218,10 +240,12 @@ void AWKeys::reinitKeys(const QStringList &_currentKeys)
 void AWKeys::updateTextData()
 {
     // do not do it in parallel to avoid race condition
+    m_mutex.lock();
     calculateValues();
-    auto text = parsePattern(m_keyOperator->pattern());
+    QString text = parsePattern(m_keyOperator->pattern());
     // update tooltip values under lock
     m_dataAggregator->dataUpdate(m_values);
+    m_mutex.unlock();
 
     emit(needTextToBeUpdated(text));
 }
@@ -231,10 +255,26 @@ void AWKeys::updateTextData()
 // specified pattern. Usually they are values which depend on several others
 void AWKeys::calculateValues()
 {
-    auto devices = m_keyOperator->devices();
+    // hddtot*
+    QStringList mountDevices = m_keyOperator->devices("mount");
+    for (auto &device : mountDevices) {
+        int index = mountDevices.indexOf(device);
+        m_values[QString("hddtotmb%1").arg(index)]
+            = m_values[QString("hddfreemb%1").arg(index)].toFloat()
+              + m_values[QString("hddmb%1").arg(index)].toFloat();
+        m_values[QString("hddtotgb%1").arg(index)]
+            = m_values[QString("hddfreegb%1").arg(index)].toFloat()
+              + m_values[QString("hddgb%1").arg(index)].toFloat();
+    }
+
+    // memtot*
+    m_values["memtotmb"] = m_values["memusedmb"].toInt() + m_values["memfreemb"].toInt();
+    m_values["memtotgb"] = m_values["memusedgb"].toFloat() + m_values["memfreegb"].toFloat();
+    // mem
+    m_values["mem"] = 100.0f * m_values["memmb"].toFloat() / m_values["memtotmb"].toFloat();
 
     // up, down, upkb, downkb, upunits, downunits
-    auto netIndex = devices.network.indexOf(m_values["netdev"].toString());
+    int netIndex = m_keyOperator->devices("net").indexOf(m_values["netdev"].toString());
     m_values["down"] = m_values[QString("down%1").arg(netIndex)];
     m_values["downkb"] = m_values[QString("downkb%1").arg(netIndex)];
     m_values["downtot"] = m_values[QString("downtot%1").arg(netIndex)];
@@ -246,6 +286,12 @@ void AWKeys::calculateValues()
     m_values["uptotkb"] = m_values[QString("uptotkb%1").arg(netIndex)];
     m_values["upunits"] = m_values[QString("upunits%1").arg(netIndex)];
 
+    // swaptot*
+    m_values["swaptotmb"] = m_values["swapmb"].toInt() + m_values["swapfreemb"].toInt();
+    m_values["swaptotgb"] = m_values["swapgb"].toFloat() + m_values["swapfreegb"].toFloat();
+    // swap
+    m_values["swap"] = 100.0f * m_values["swapmb"].toFloat() / m_values["swaptotmb"].toFloat();
+
     // user defined keys
     for (auto &key : m_keyOperator->userKeys())
         m_values[key] = m_values[m_keyOperator->userKeySource(key)];
@@ -262,27 +308,31 @@ void AWKeys::createDBusInterface()
     auto id = reinterpret_cast<qlonglong>(this);
 
     // create session
-    auto instanceBus = QDBusConnection::sessionBus();
+    QDBusConnection instanceBus = QDBusConnection::sessionBus();
     // HACK we are going to use different services because it binds to
     // application
     if (instanceBus.registerService(QString("%1.i%2").arg(AWDBUS_SERVICE).arg(id))) {
-        if (!instanceBus.registerObject(AWDBUS_PATH, new AWDBusAdaptor(this), QDBusConnection::ExportAllContents))
+        if (!instanceBus.registerObject(AWDBUS_PATH, new AWDBusAdaptor(this),
-            qCWarning(LOG_AW) << "Could not register DBus object, last error" << instanceBus.lastError().message();
+                                        QDBusConnection::ExportAllContents))
+            qCWarning(LOG_AW) << "Could not register DBus object, last error"
+                              << instanceBus.lastError().message();
     } else {
-        qCWarning(LOG_AW) << "Could not register DBus service, last error" << instanceBus.lastError().message();
+        qCWarning(LOG_AW) << "Could not register DBus service, last error"
+                          << instanceBus.lastError().message();
     }
 
     // and same instance but for id independent service
-    auto commonBus = QDBusConnection::sessionBus();
+    QDBusConnection commonBus = QDBusConnection::sessionBus();
     if (commonBus.registerService(AWDBUS_SERVICE))
-        commonBus.registerObject(AWDBUS_PATH, new AWDBusAdaptor(this), QDBusConnection::ExportAllContents);
+        commonBus.registerObject(AWDBUS_PATH, new AWDBusAdaptor(this),
+                                 QDBusConnection::ExportAllContents);
 }
 
 
 QString AWKeys::parsePattern(QString _pattern) const
 {
     // screen sign
-    _pattern.replace("$$", QChar(0x1d));
+    _pattern.replace("$$", QString(0x1d));
 
     // lambdas
     for (auto &key : m_foundLambdas)
@@ -290,19 +340,20 @@ QString AWKeys::parsePattern(QString _pattern) const
 
     // main keys
     for (auto &key : m_foundKeys)
-        _pattern.replace(QString("$%1").arg(key), m_aggregator->formatter(m_values[key], key, true));
+        _pattern.replace(QString("$%1").arg(key),
+                         m_aggregator->formatter(m_values[key], key, true));
 
     // bars
     for (auto &bar : m_foundBars) {
-        auto item = m_keyOperator->giByKey(bar);
+        GraphicalItem *item = m_keyOperator->giByKey(bar);
-        auto image = item->isCustom() ? item->image(
+        QString image = item->isCustom() ? item->image(AWPatternFunctions::expandLambdas(
-                         AWPatternFunctions::expandLambdas(item->bar(), m_aggregator, m_values, item->usedKeys()))
+                            item->bar(), m_aggregator, m_values, item->usedKeys()))
                                          : item->image(m_values[item->bar()]);
         _pattern.replace(QString("$%1").arg(bar), image);
     }
 
     // prepare strings
-    _pattern.replace(QChar(0x1d), "$");
+    _pattern.replace(QString(0x1d), "$");
     if (m_wrapNewLines)
         _pattern.replace("\n", "<br>");
 
@@ -310,20 +361,25 @@ QString AWKeys::parsePattern(QString _pattern) const
 }
 
 
-void AWKeys::setDataBySource(const QString &_source, const KSysGuard::SensorInfo &_sensor, const QVariant &_value)
+void AWKeys::setDataBySource(const QString &_sourceName, const QVariantMap &_data)
 {
-    qCDebug(LOG_AW) << "Source" << _source << _sensor.name << "with data" << _value;
+    qCDebug(LOG_AW) << "Source" << _sourceName << "with data" << _data;
 
     // first list init
-    auto tags = m_aggregator->keysFromSource(_source);
+    QStringList tags = m_aggregator->keysFromSource(_sourceName);
     if (tags.isEmpty())
-        tags = m_aggregator->registerSource(_source, _sensor.unit, m_requiredKeys);
+        tags = m_aggregator->registerSource(_sourceName, _data["units"].toString(), m_requiredKeys);
 
     // update data or drop source if there are no matches and exit
     if (tags.isEmpty()) {
-        qCInfo(LOG_AW) << "Sensor" << _source << "not found";
+        qCInfo(LOG_AW) << "Source" << _sourceName << "not found";
-        return emit(dropSourceFromDataengine(_source));
+        return emit(dropSourceFromDataengine(_sourceName));
     }
 
-    std::for_each(tags.cbegin(), tags.cend(), [this, _value](const QString &tag) { m_values[tag] = _value; });
+    m_mutex.lock();
+    // HACK workaround for time values which are stored in the different path
+    std::for_each(tags.cbegin(), tags.cend(), [this, &_data, &_sourceName](const QString &tag) {
+        m_values[tag] = _sourceName == "Local" ? _data["DateTime"] : _data["value"];
+    });
+    m_mutex.unlock();
 }

sources/awesome-widget/plugin/awkeys.h

@@ -15,20 +15,24 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
 
+#ifndef AWKEYS_H
+#define AWKEYS_H
+
+#include <Plasma/DataEngine>
+
+#include <QMutex>
 #include <QObject>
 
-#include <ksysguard/systemstats/SensorInfo.h>
-
 
 class AWDataAggregator;
 class AWDataEngineAggregator;
 class AWKeyOperations;
 class AWKeysAggregator;
+class QThreadPool;
 class QTimer;
 
-class __attribute__((visibility("default"))) AWKeys : public QObject
+class AWKeys : public QObject
 {
     Q_OBJECT
 
@@ -36,27 +40,34 @@ public:
     explicit AWKeys(QObject *_parent = nullptr);
     ~AWKeys() override;
     Q_INVOKABLE void initDataAggregator(const QVariantMap &_tooltipParams);
-    Q_INVOKABLE void initKeys(const QString &_currentPattern, int _interval, bool _optimize);
+    Q_INVOKABLE void initKeys(const QString &_currentPattern, int _interval, int _limit,
+                              bool _optimize);
     Q_INVOKABLE void setAggregatorProperty(const QString &_key, const QVariant &_value);
     Q_INVOKABLE void setWrapNewLines(bool _wrap);
     // additional method to force load keys from Qml UI. Used in some
     // configuration pages
     Q_INVOKABLE void updateCache();
     // keys
-    Q_INVOKABLE [[nodiscard]] QStringList dictKeys(bool _sorted = false, const QString &_regexp = "") const;
+    Q_INVOKABLE [[nodiscard]] QStringList dictKeys(bool _sorted = false,
+                                                   const QString &_regexp = "") const;
+    Q_INVOKABLE [[nodiscard]] QVariantList getHddDevices() const;
     // values
     Q_INVOKABLE [[nodiscard]] QString infoByKey(const QString &_key) const;
     Q_INVOKABLE [[nodiscard]] QString valueByKey(const QString &_key) const;
     // configuration
     Q_INVOKABLE void editItem(const QString &_type);
 
+public slots:
+    void dataUpdated(const QString &_sourceName, const Plasma::DataEngine::Data &_data);
+    // dummy method required by DataEngine connections
+    static void modelChanged(QString, QAbstractItemModel *){};
+
 signals:
     void dropSourceFromDataengine(const QString &_source);
     void needTextToBeUpdated(const QString &_newText) const;
     void needToolTipToBeUpdated(const QString &_newText) const;
 
 private slots:
-    void dataUpdated(const QHash<QString, KSysGuard::SensorInfo> &_sensors, const KSysGuard::SensorDataList &_data);
     void reinitKeys(const QStringList &_currentKeys);
     void updateTextData();
 
@@ -65,7 +76,7 @@ private:
     void calculateValues();
     void createDBusInterface();
     [[nodiscard]] QString parsePattern(QString _pattern) const;
-    void setDataBySource(const QString &_source, const KSysGuard::SensorInfo &_sensor, const QVariant &_value);
+    void setDataBySource(const QString &_sourceName, const QVariantMap &_data);
     // objects
     AWDataAggregator *m_dataAggregator = nullptr;
     AWDataEngineAggregator *m_dataEngineAggregator = nullptr;
@@ -78,4 +89,10 @@ private:
     QVariantHash m_values;
     bool m_optimize = false;
     bool m_wrapNewLines = false;
+    // multithread features
+    QThreadPool *m_threadPool = nullptr;
+    QMutex m_mutex;
 };
+
+
+#endif /* AWKEYS_H */

sources/awesome-widget/plugin/awkeysaggregator.cpp

@@ -17,9 +17,15 @@
 
 #include "awkeysaggregator.h"
 
+#include <KI18n/KLocalizedString>
+
+#include <QDateTime>
+#include <QLocale>
+
 #include "awdataenginemapper.h"
 #include "awdebug.h"
 #include "awformatterhelper.h"
+#include "version.h"
 
 
 AWKeysAggregator::AWKeysAggregator(QObject *_parent)
@@ -27,46 +33,135 @@ AWKeysAggregator::AWKeysAggregator(QObject *_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    m_settings.customFormatters = new AWFormatterHelper(this);
+    m_customFormatters = new AWFormatterHelper(nullptr);
-    m_mapper = new AWDataEngineMapper(this, m_settings.customFormatters);
+    m_mapper = new AWDataEngineMapper(this, m_customFormatters);
+
+    // sort time keys
+    m_timeKeys = QString(TIME_KEYS).split(',');
+    m_timeKeys.sort();
+    std::reverse(m_timeKeys.begin(), m_timeKeys.end());
+}
+
+
+AWKeysAggregator::~AWKeysAggregator()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 }
 
 
 void AWKeysAggregator::initFormatters()
 {
-    m_settings.customFormatters->initItems();
+    m_customFormatters->initItems();
 }
 
 
-QString AWKeysAggregator::acOffline() const
+QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key,
-{
+                                    bool replaceSpace) const
-    return m_settings.acOffline;
-}
-
-
-QString AWKeysAggregator::acOnline() const
-{
-    return m_settings.acOnline;
-}
-
-
-QString AWKeysAggregator::customTime() const
-{
-    return m_settings.customTime;
-}
-
-
-QString AWKeysAggregator::customUptime() const
-{
-    return m_settings.customUptime;
-}
-
-
-QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key, bool replaceSpace) const
 {
     qCDebug(LOG_AW) << "Data" << _data << "for key" << _key;
 
-    auto output = m_mapper->formatter(_key)->format(_data, _key, m_settings);
+    QString output;
+    QLocale loc = m_translate ? QLocale::system() : QLocale::c();
+    // case block
+    switch (m_mapper->formatter(_key)) {
+    case FormatterType::Float:
+        output = QString("%1").arg(_data.toFloat(), 5, 'f', 1);
+        break;
+    case FormatterType::FloatTwoSymbols:
+        output = QString("%1").arg(_data.toFloat(), 5, 'f', 2);
+        break;
+    case FormatterType::Integer:
+        output = QString("%1").arg(_data.toFloat(), 4, 'f', 0);
+        break;
+    case FormatterType::IntegerFive:
+        output = QString("%1").arg(_data.toFloat(), 5, 'f', 0);
+        break;
+    case FormatterType::IntegerThree:
+        output = QString("%1").arg(_data.toFloat(), 3, 'f', 0);
+        break;
+    case FormatterType::List:
+        output = _data.toStringList().join(',');
+        break;
+    case FormatterType::ACFormat:
+        output = _data.toBool() ? m_acOnline : m_acOffline;
+        break;
+    case FormatterType::MemGBFormat:
+        output = QString("%1").arg(_data.toFloat() / (1024.0 * 1024.0), 5, 'f', 1);
+        break;
+    case FormatterType::MemMBFormat:
+        output = QString("%1").arg(_data.toFloat() / 1024.0, 5, 'f', 0);
+        break;
+    case FormatterType::NetSmartFormat:
+        output = [](const float value) {
+            if (value > 1024.0)
+                return QString("%1").arg(value / 1024.0, 4, 'f', 1);
+            else
+                return QString("%1").arg(value, 4, 'f', 0);
+        }(_data.toFloat());
+        break;
+    case FormatterType::NetSmartUnits:
+        if (_data.toFloat() > 1024.0)
+            output = m_translate ? i18n("MB/s") : "MB/s";
+        else
+            output = m_translate ? i18n("KB/s") : "KB/s";
+        break;
+    case FormatterType::Quotes:
+        // first cast
+        output = QString("%1").arg(_data.toDouble(), 0, 'f');
+        output = output.rightJustified(8, QLatin1Char(' '), true);
+        break;
+    case FormatterType::Temperature:
+        output = QString("%1").arg(temperature(_data.toFloat()), 5, 'f', 1);
+        break;
+    case FormatterType::Time:
+        output = _data.toDateTime().toString();
+        break;
+    case FormatterType::TimeCustom:
+        output = m_customTime;
+        [&output, loc, this](const QDateTime &dt) {
+            for (auto &key : m_timeKeys)
+                output.replace(QString("$%1").arg(key), loc.toString(dt, key));
+        }(_data.toDateTime());
+        break;
+    case FormatterType::TimeISO:
+        output = _data.toDateTime().toString(Qt::ISODate);
+        break;
+    case FormatterType::TimeLong:
+        output = loc.toString(_data.toDateTime(), QLocale::LongFormat);
+        break;
+    case FormatterType::TimeShort:
+        output = loc.toString(_data.toDateTime(), QLocale::ShortFormat);
+        break;
+    case FormatterType::Timestamp:
+        output = QString("%1").arg(_data.toDateTime().toMSecsSinceEpoch() / 1000.0, 10, 'f', 0);
+        break;
+    case FormatterType::Uptime:
+    case FormatterType::UptimeCustom:
+        output =
+            [](QString source, const int uptime) {
+                int seconds = uptime - uptime % 60;
+                int minutes = seconds / 60 % 60;
+                int hours = ((seconds / 60) - minutes) / 60 % 24;
+                int days = (((seconds / 60) - minutes) / 60 - hours) / 24;
+                source.replace("$dd", QString("%1").arg(days, 3, 10, QChar('0')));
+                source.replace("$d", QString("%1").arg(days));
+                source.replace("$hh", QString("%1").arg(hours, 2, 10, QChar('0')));
+                source.replace("$h", QString("%1").arg(hours));
+                source.replace("$mm", QString("%1").arg(minutes, 2, 10, QChar('0')));
+                source.replace("$m", QString("%1").arg(minutes));
+                return source;
+            }(m_mapper->formatter(_key) == FormatterType::Uptime ? "$ddd$hhh$mmm" : m_customUptime,
+              static_cast<int>(_data.toFloat()));
+        break;
+    case FormatterType::NoFormat:
+        output = _data.toString();
+        break;
+    case FormatterType::Custom:
+        if (m_customFormatters)
+            output = m_customFormatters->convert(_data, _key);
+        break;
+    }
+
     // replace spaces to non-breakable ones
     replaceSpace &= (!_key.startsWith("custom") && (!_key.startsWith("weather")));
     if (replaceSpace)
@@ -84,23 +179,11 @@ QStringList AWKeysAggregator::keysFromSource(const QString &_source) const
 }
 
 
-QString AWKeysAggregator::tempUnits() const
-{
-    return m_settings.tempUnits;
-}
-
-
-bool AWKeysAggregator::translate() const
-{
-    return m_settings.translate;
-}
-
-
 void AWKeysAggregator::setAcOffline(const QString &_inactive)
 {
     qCDebug(LOG_AW) << "Inactive AC string" << _inactive;
 
-    m_settings.acOffline = _inactive;
+    m_acOffline = _inactive;
 }
 
 
@@ -108,7 +191,7 @@ void AWKeysAggregator::setAcOnline(const QString &_active)
 {
     qCDebug(LOG_AW) << "Active AC string" << _active;
 
-    m_settings.acOnline = _active;
+    m_acOnline = _active;
 }
 
 
@@ -116,7 +199,7 @@ void AWKeysAggregator::setCustomTime(const QString &_customTime)
 {
     qCDebug(LOG_AW) << "Format" << _customTime;
 
-    m_settings.customTime = _customTime;
+    m_customTime = _customTime;
 }
 
 
@@ -124,13 +207,15 @@ void AWKeysAggregator::setCustomUptime(const QString &_customUptime)
 {
     qCDebug(LOG_AW) << "Format" << _customUptime;
 
-    m_settings.customUptime = _customUptime;
+    m_customUptime = _customUptime;
 }
 
 
-void AWKeysAggregator::setDevices(const AWPluginMatcherSettings &_settings)
+void AWKeysAggregator::setDevices(const QHash<QString, QStringList> &_devices)
 {
-    m_mapper->setDevices(_settings);
+    qCDebug(LOG_AW) << "Devices" << _devices;
+
+    m_mapper->setDevices(_devices);
 }
 
 
@@ -138,7 +223,7 @@ void AWKeysAggregator::setTempUnits(const QString &_units)
 {
     qCDebug(LOG_AW) << "Units" << _units;
 
-    m_settings.tempUnits = _units;
+    m_tempUnits = _units;
 }
 
 
@@ -146,14 +231,40 @@ void AWKeysAggregator::setTranslate(const bool _translate)
 {
     qCDebug(LOG_AW) << "Translate" << _translate;
 
-    m_settings.translate = _translate;
+    m_translate = _translate;
 }
 
 
-QStringList AWKeysAggregator::registerSource(const QString &_source, const KSysGuard::Unit _units,
+QStringList AWKeysAggregator::registerSource(const QString &_source, const QString &_units,
                                              const QStringList &_keys)
 {
     qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
 
     return m_mapper->registerSource(_source, _units, _keys);
 }
+
+
+float AWKeysAggregator::temperature(const float temp) const
+{
+    qCDebug(LOG_AW) << "Temperature value" << temp;
+
+    float converted = temp;
+    if (m_tempUnits == "Celsius") {
+    } else if (m_tempUnits == "Fahrenheit") {
+        converted = temp * 9.0f / 5.0f + 32.0f;
+    } else if (m_tempUnits == "Kelvin") {
+        converted = temp + 273.15f;
+    } else if (m_tempUnits == "Reaumur") {
+        converted = temp * 0.8f;
+    } else if (m_tempUnits == "cm^-1") {
+        converted = (temp + 273.15f) * 0.695f;
+    } else if (m_tempUnits == "kJ/mol") {
+        converted = (temp + 273.15f) * 8.31f;
+    } else if (m_tempUnits == "kcal/mol") {
+        converted = (temp + 273.15f) * 1.98f;
+    } else {
+        qCWarning(LOG_AW) << "Invalid units" << m_tempUnits;
+    }
+
+    return converted;
+}

sources/awesome-widget/plugin/awkeysaggregator.h

@@ -15,55 +15,89 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
 
-#include <ksysguard/formatter/Unit.h>
+#ifndef AWKEYSAGGREGATOR_H
+#define AWKEYSAGGREGATOR_H
 
 #include <QHash>
 #include <QObject>
 
-#include "formatters/awpluginformatsettings.h"
-#include "matchers/awpluginmatchersettings.h"
-
 
+class AWFormatterHelper;
 class AWDataEngineMapper;
 
 class AWKeysAggregator : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QString acOffline READ acOffline WRITE setAcOffline);
+    Q_PROPERTY(QString acOffline MEMBER m_acOffline WRITE setAcOffline);
-    Q_PROPERTY(QString acOnline READ acOnline WRITE setAcOnline);
+    Q_PROPERTY(QString acOnline MEMBER m_acOnline WRITE setAcOnline);
-    Q_PROPERTY(QString customTime READ customTime WRITE setCustomTime);
+    Q_PROPERTY(QString customTime MEMBER m_customTime WRITE setCustomTime);
-    Q_PROPERTY(QString customUptime READ customUptime WRITE setCustomUptime);
+    Q_PROPERTY(QString customUptime MEMBER m_customUptime WRITE setCustomUptime);
-    Q_PROPERTY(QString tempUnits READ tempUnits WRITE setTempUnits);
+    Q_PROPERTY(QString tempUnits MEMBER m_tempUnits WRITE setTempUnits);
-    Q_PROPERTY(bool translate READ translate WRITE setTranslate);
+    Q_PROPERTY(bool translate MEMBER m_translate WRITE setTranslate);
 
 public:
+    enum class FormatterType {
+        // general formatters
+        Custom,
+        NoFormat,
+        Float,
+        FloatTwoSymbols,
+        Integer,
+        IntegerFive,
+        IntegerThree,
+        List,
+        // unit specific formatters
+        ACFormat,
+        MemGBFormat,
+        MemMBFormat,
+        NetSmartFormat,
+        NetSmartUnits,
+        Quotes,
+        Temperature,
+        Time,
+        TimeCustom,
+        TimeISO,
+        TimeLong,
+        TimeShort,
+        Timestamp,
+        Uptime,
+        UptimeCustom
+    };
+
     explicit AWKeysAggregator(QObject *_parent = nullptr);
-    ~AWKeysAggregator() override = default;
+    ~AWKeysAggregator() override;
     void initFormatters();
     // get methods
-    [[nodiscard]] QString acOffline() const;
+    [[nodiscard]] QString formatter(const QVariant &_data, const QString &_key,
-    [[nodiscard]] QString acOnline() const;
+                                    bool replaceSpace) const;
-    [[nodiscard]] QString customTime() const;
-    [[nodiscard]] QString customUptime() const;
-    [[nodiscard]] QString formatter(const QVariant &_data, const QString &_key, bool replaceSpace) const;
     [[nodiscard]] QStringList keysFromSource(const QString &_source) const;
-    [[nodiscard]] QString tempUnits() const;
-    [[nodiscard]] bool translate() const;
     // set methods
     void setAcOffline(const QString &_inactive);
     void setAcOnline(const QString &_active);
     void setCustomTime(const QString &_customTime);
     void setCustomUptime(const QString &_customUptime);
-    void setDevices(const AWPluginMatcherSettings &_settings);
+    void setDevices(const QHash<QString, QStringList> &_devices);
     void setTempUnits(const QString &_units);
     void setTranslate(bool _translate);
 
 public slots:
-    QStringList registerSource(const QString &_source, KSysGuard::Unit _units, const QStringList &_keys);
+    QStringList registerSource(const QString &_source, const QString &_units,
+                               const QStringList &_keys);
 
 private:
-    AWPluginFormatSettings m_settings;
+    [[nodiscard]] float temperature(float temp) const;
+    AWFormatterHelper *m_customFormatters = nullptr;
     AWDataEngineMapper *m_mapper = nullptr;
+    QStringList m_timeKeys;
+    // variables
+    QString m_acOffline;
+    QString m_acOnline;
+    QString m_customTime;
+    QString m_customUptime;
+    QString m_tempUnits;
+    bool m_translate = false;
 };
+
+
+#endif /* AWKEYSAGGREGATOR_H */

sources/awesome-widget/plugin/awpairconfigfactory.cpp

@@ -29,9 +29,15 @@ AWPairConfigFactory::AWPairConfigFactory(QObject *_parent)
 }
 
 
+AWPairConfigFactory::~AWPairConfigFactory()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
 void AWPairConfigFactory::showFormatterDialog(const QStringList &_keys)
 {
-    auto config = new AWFormatterConfig(nullptr, _keys);
+    auto *config = new AWFormatterConfig(nullptr, _keys);
     config->showDialog();
     config->deleteLater();
 }
@@ -39,7 +45,7 @@ void AWPairConfigFactory::showFormatterDialog(const QStringList &_keys)
 
 void AWPairConfigFactory::showKeysDialog(const QStringList &_keys)
 {
-    auto config = new AWCustomKeysConfig(nullptr, _keys);
+    auto *config = new AWCustomKeysConfig(nullptr, _keys);
     config->showDialog();
     config->deleteLater();
 }

sources/awesome-widget/plugin/awpairconfigfactory.h

@@ -15,7 +15,9 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWPAIRCONFIGFACTORY_H
+#define AWPAIRCONFIGFACTORY_H
 
 #include <QObject>
 
@@ -26,7 +28,12 @@ class AWPairConfigFactory : public QObject
 
 public:
     explicit AWPairConfigFactory(QObject *_parent = nullptr);
-    ~AWPairConfigFactory() override = default;
+    ~AWPairConfigFactory() override;
     Q_INVOKABLE static void showFormatterDialog(const QStringList &_keys);
     Q_INVOKABLE static void showKeysDialog(const QStringList &_keys);
+
+private:
 };
+
+
+#endif /* AWPAIRCONFIGFACTORY_H */

sources/awesome-widget/plugin/awpatternfunctions.cpp

@@ -24,7 +24,8 @@
 #include "awkeysaggregator.h"
 
 
-QString AWPatternFunctions::expandLambdas(QString _code, AWKeysAggregator *_aggregator, const QVariantHash &_metadata,
+QString AWPatternFunctions::expandLambdas(QString _code, AWKeysAggregator *_aggregator,
+                                          const QVariantHash &_metadata,
                                           const QStringList &_usedKeys)
 {
     qCDebug(LOG_AW) << "Expand lambdas in" << _code;
@@ -34,12 +35,13 @@ QString AWPatternFunctions::expandLambdas(QString _code, AWKeysAggregator *_aggr
     _code.replace("$this", _metadata[_code].toString());
     // parsed values
     for (auto &lambdaKey : _usedKeys)
-        _code.replace(QString("$%1").arg(lambdaKey), _aggregator->formatter(_metadata[lambdaKey], lambdaKey, false));
+        _code.replace(QString("$%1").arg(lambdaKey),
+                      _aggregator->formatter(_metadata[lambdaKey], lambdaKey, false));
     qCInfo(LOG_AW) << "Expression" << _code;
-    auto result = engine.evaluate(_code);
+    QJSValue result = engine.evaluate(_code);
     if (result.isError()) {
-        qCWarning(LOG_AW) << "Uncaught exception at line" << result.property("lineNumber").toInt() << ":"
+        qCWarning(LOG_AW) << "Uncaught exception at line" << result.property("lineNumber").toInt()
-                          << result.toString();
+                          << ":" << result.toString();
         return "";
     } else {
         return result.toString();
@@ -52,21 +54,21 @@ QString AWPatternFunctions::expandTemplates(QString _code)
     qCDebug(LOG_AW) << "Expand templates in" << _code;
 
     // match the following construction $template{{some code here}}
-    static QRegularExpression templatesRegexp(R"(\$template\{\{(?<body>.*?)\}\})");
+    QRegularExpression templatesRegexp(R"(\$template\{\{(?<body>.*?)\}\})");
     templatesRegexp.setPatternOptions(QRegularExpression::DotMatchesEverythingOption);
 
-    auto it = templatesRegexp.globalMatch(_code);
+    QRegularExpressionMatchIterator it = templatesRegexp.globalMatch(_code);
     while (it.hasNext()) {
-        auto match = it.next();
+        QRegularExpressionMatch match = it.next();
-        auto body = match.captured("body");
+        QString body = match.captured("body");
 
         QJSEngine engine;
         qCInfo(LOG_AW) << "Expression" << body;
-        auto result = engine.evaluate(body);
+        QJSValue result = engine.evaluate(body);
         QString templateResult = "";
         if (result.isError()) {
-            qCWarning(LOG_AW) << "Uncaught exception at line" << result.property("lineNumber").toInt() << ":"
+            qCWarning(LOG_AW) << "Uncaught exception at line"
-                              << result.toString();
+                              << result.property("lineNumber").toInt() << ":" << result.toString();
         } else {
             templateResult = result.toString();
         }
@@ -79,8 +81,8 @@ QString AWPatternFunctions::expandTemplates(QString _code)
 }
 
 
-QList<AWPatternFunctions::AWFunction> AWPatternFunctions::findFunctionCalls(const QString &_function,
+QList<AWPatternFunctions::AWFunction>
-                                                                            const QString &_code)
+AWPatternFunctions::findFunctionCalls(const QString &_function, const QString &_code)
 {
     qCDebug(LOG_AW) << "Looking for function" << _function << "in" << _code;
 
@@ -94,20 +96,21 @@ QList<AWPatternFunctions::AWFunction> AWPatternFunctions::findFunctionCalls(cons
     regex.setPatternOptions(QRegularExpression::DotMatchesEverythingOption);
 
     QList<AWPatternFunctions::AWFunction> foundFunctions;
-    auto it = regex.globalMatch(_code);
+    QRegularExpressionMatchIterator it = regex.globalMatch(_code);
     while (it.hasNext()) {
-        auto match = it.next();
+        QRegularExpressionMatch match = it.next();
 
         AWPatternFunctions::AWFunction metadata;
         // work with args
-        auto argsString = match.captured("args");
+        QString argsString = match.captured("args");
         if (argsString.isEmpty()) {
             metadata.args = QStringList();
         } else {
             // replace '$,' to 0x1d
-            argsString.replace("$,", QChar(0x1d));
+            argsString.replace("$,", QString(0x1d));
-            auto args = argsString.split(',');
+            QStringList args = argsString.split(',');
-            std::for_each(args.begin(), args.end(), [](auto &arg) { arg.replace(QChar(0x1d), ","); });
+            std::for_each(args.begin(), args.end(),
+                          [](QString &arg) { arg.replace(QString(0x1d), ","); });
             metadata.args = args;
         }
         // other variables
@@ -127,11 +130,13 @@ QString AWPatternFunctions::insertAllKeys(QString _code, const QStringList &_key
 {
     qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
 
-    auto found = AWPatternFunctions::findFunctionCalls("aw_all", _code);
+    QList<AWPatternFunctions::AWFunction> found
+        = AWPatternFunctions::findFunctionCalls("aw_all", _code);
     for (auto &function : found) {
-        auto separator = function.args.isEmpty() ? "," : function.args.at(0);
+        QString separator = function.args.isEmpty() ? "," : function.args.at(0);
-        auto required = _keys.filter(QRegularExpression(function.body));
+        QStringList required = _keys.filter(QRegExp(function.body));
-        std::for_each(required.begin(), required.end(), [](auto &value) { value = QString("%1: $%1").arg(value); });
+        std::for_each(required.begin(), required.end(),
+                      [](QString &value) { value = QString("%1: $%1").arg(value); });
 
         _code.replace(function.what, required.join(separator));
     }
@@ -144,9 +149,10 @@ QString AWPatternFunctions::insertKeyCount(QString _code, const QStringList &_ke
 {
     qCDebug(LOG_AW) << "Looking for count in code" << _code << "using list" << _keys;
 
-    auto found = AWPatternFunctions::findFunctionCalls("aw_count", _code);
+    QList<AWPatternFunctions::AWFunction> found
+        = AWPatternFunctions::findFunctionCalls("aw_count", _code);
     for (auto &function : found) {
-        auto count = _keys.filter(QRegularExpression(function.body)).count();
+        int count = _keys.filter(QRegExp(function.body)).count();
 
         _code.replace(function.what, QString::number(count));
     }
@@ -159,10 +165,11 @@ QString AWPatternFunctions::insertKeyNames(QString _code, const QStringList &_ke
 {
     qCDebug(LOG_AW) << "Looking for key names in code" << _code << "using list" << _keys;
 
-    auto found = AWPatternFunctions::findFunctionCalls("aw_names", _code);
+    QList<AWPatternFunctions::AWFunction> found
+        = AWPatternFunctions::findFunctionCalls("aw_names", _code);
     for (auto &function : found) {
-        auto separator = function.args.isEmpty() ? "," : function.args.at(0);
+        QString separator = function.args.isEmpty() ? "," : function.args.at(0);
-        auto required = _keys.filter(QRegularExpression(function.body));
+        QStringList required = _keys.filter(QRegExp(function.body));
 
         _code.replace(function.what, required.join(separator));
     }
@@ -175,11 +182,13 @@ QString AWPatternFunctions::insertKeys(QString _code, const QStringList &_keys)
 {
     qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
 
-    auto found = AWPatternFunctions::findFunctionCalls("aw_keys", _code);
+    QList<AWPatternFunctions::AWFunction> found
+        = AWPatternFunctions::findFunctionCalls("aw_keys", _code);
     for (auto &function : found) {
-        auto separator = function.args.isEmpty() ? "," : function.args.at(0);
+        QString separator = function.args.isEmpty() ? "," : function.args.at(0);
-        auto required = _keys.filter(QRegularExpression(function.body));
+        QStringList required = _keys.filter(QRegExp(function.body));
-        std::for_each(required.begin(), required.end(), [](auto &value) { value = QString("$%1").arg(value); });
+        std::for_each(required.begin(), required.end(),
+                      [](QString &value) { value = QString("$%1").arg(value); });
 
         _code.replace(function.what, required.join(separator));
     }
@@ -192,25 +201,29 @@ QString AWPatternFunctions::insertMacros(QString _code)
 {
     qCDebug(LOG_AW) << "Looking for macros in code" << _code;
 
-    auto found = AWPatternFunctions::findFunctionCalls("aw_macro", _code);
+    QList<AWPatternFunctions::AWFunction> found
+        = AWPatternFunctions::findFunctionCalls("aw_macro", _code);
     for (auto &macro : found) {
         // get macro params
         if (macro.args.isEmpty()) {
             qCWarning(LOG_AW) << "No macro name found for" << macro.what;
             continue;
         }
-        auto name = macro.args.takeFirst();
+        QString name = macro.args.takeFirst();
         // find macro usage
-        auto macroUsage = AWPatternFunctions::findFunctionCalls(QString("aw_macro_%1").arg(name), _code);
+        QList<AWPatternFunctions::AWFunction> macroUsage
+            = AWPatternFunctions::findFunctionCalls(QString("aw_macro_%1").arg(name), _code);
         for (auto &function : macroUsage) {
             if (function.args.count() != macro.args.count()) {
-                qCWarning(LOG_AW) << "Invalid args count found for call" << function.what << "with macro" << macro.what;
+                qCWarning(LOG_AW) << "Invalid args count found for call" << function.what
+                                  << "with macro" << macro.what;
                 continue;
             }
             // generate body to replace
-            auto result = macro.body;
+            QString result = macro.body;
-            std::for_each(macro.args.cbegin(), macro.args.cend(), [&result, macro, function](auto &arg) {
+            std::for_each(macro.args.cbegin(), macro.args.cend(),
-                auto index = macro.args.indexOf(arg);
+                          [&result, macro, function](const QString &arg) {
+                              int index = macro.args.indexOf(arg);
                               result.replace(QString("$%1").arg(arg), function.args.at(index));
                           });
             // do replace
@@ -225,14 +238,16 @@ QString AWPatternFunctions::insertMacros(QString _code)
 }
 
 
-QStringList AWPatternFunctions::findKeys(const QString &_code, const QStringList &_keys, const bool _isBars)
+QStringList AWPatternFunctions::findKeys(const QString &_code, const QStringList &_keys,
+                                         const bool _isBars)
 {
     qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
 
     QStringList selectedKeys;
-    auto replacedCode = _code;
+    QString replacedCode = _code;
     for (auto &key : _keys)
-        if ((key.startsWith("bar") == _isBars) && (replacedCode.contains(QString("$%1").arg(key)))) {
+        if ((key.startsWith("bar") == _isBars)
+            && (replacedCode.contains(QString("$%1").arg(key)))) {
             qCInfo(LOG_AW) << "Found key" << key << "with bar enabled" << _isBars;
             selectedKeys.append(key);
             replacedCode.replace(QString("$%1").arg(key), "");
@@ -250,13 +265,13 @@ QStringList AWPatternFunctions::findLambdas(const QString &_code)
 
     QStringList selectedKeys;
     // match the following construction ${{some code here}}
-    static QRegularExpression lambdaRegexp(R"(\$\{\{(?<body>.*?)\}\})");
+    QRegularExpression lambdaRegexp(R"(\$\{\{(?<body>.*?)\}\})");
     lambdaRegexp.setPatternOptions(QRegularExpression::DotMatchesEverythingOption);
 
-    auto it = lambdaRegexp.globalMatch(_code);
+    QRegularExpressionMatchIterator it = lambdaRegexp.globalMatch(_code);
     while (it.hasNext()) {
-        auto match = it.next();
+        QRegularExpressionMatch match = it.next();
-        auto lambda = match.captured("body");
+        QString lambda = match.captured("body");
 
         // append
         qCInfo(LOG_AW) << "Found lambda" << lambda;

sources/awesome-widget/plugin/awpatternfunctions.h

@@ -15,7 +15,9 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWPATTERNFUNCTIONS_H
+#define AWPATTERNFUNCTIONS_H
 
 #include <QString>
 #include <QVariant>
@@ -23,7 +25,7 @@
 
 class AWKeysAggregator;
 
-namespace __attribute__((visibility("default"))) AWPatternFunctions
+namespace AWPatternFunctions
 {
 typedef struct {
     QStringList args;
@@ -45,3 +47,6 @@ QString insertMacros(QString _code);
 QStringList findKeys(const QString &_code, const QStringList &_keys, bool _isBars);
 QStringList findLambdas(const QString &_code);
 } // namespace AWPatternFunctions
+
+
+#endif /* AWPATTERNFUNCTIONS_H */

sources/awesome-widget/plugin/awtelemetryhandler.cpp

@@ -18,6 +18,8 @@
 #include "awtelemetryhandler.h"
 
 #include <QJsonDocument>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
 #include <QSettings>
 #include <QStandardPaths>
 #include <QUuid>
@@ -25,13 +27,23 @@
 #include "awdebug.h"
 
 
-AWTelemetryHandler::AWTelemetryHandler(QObject *_parent)
+AWTelemetryHandler::AWTelemetryHandler(QObject *_parent, const QString &_clientId)
     : QObject(_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
     m_localFile = QString("%1/awesomewidgets/telemetry.ini")
                       .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
+
+    // override client id if any
+    if (!_clientId.isEmpty())
+        m_clientId = _clientId;
+}
+
+
+AWTelemetryHandler::~AWTelemetryHandler()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 }
 
 
@@ -59,11 +71,14 @@ QString AWTelemetryHandler::getLast(const QString &_group) const
 }
 
 
-void AWTelemetryHandler::init(const int _count)
+void AWTelemetryHandler::init(const int _count, const bool _enableRemote, const QString &_clientId)
 {
-    qCDebug(LOG_AW) << "Init telemetry with count" << _count;
+    qCDebug(LOG_AW) << "Init telemetry with count" << _count << "enable remote" << _enableRemote
+                    << "client ID" << _clientId;
 
     m_storeCount = _count;
+    m_uploadEnabled = _enableRemote;
+    m_clientId = _clientId;
 }
 
 
@@ -91,7 +106,7 @@ bool AWTelemetryHandler::put(const QString &_group, const QString &_value) const
     settings.remove("");
     // and save now
     for (auto &val : saved) {
-        auto key = getKey(settings.childKeys().count());
+        QString key = getKey(settings.childKeys().count());
         settings.setValue(key, val);
     }
 
@@ -103,6 +118,61 @@ bool AWTelemetryHandler::put(const QString &_group, const QString &_value) const
 }
 
 
+void AWTelemetryHandler::uploadTelemetry(const QString &_group, const QString &_value)
+{
+    qCDebug(LOG_AW) << "Upload data with group" << _group << "and value" << _value;
+    if (!m_uploadEnabled) {
+        qCInfo(LOG_AW) << "Upload disabled by configuration";
+        return;
+    }
+
+    auto *manager = new QNetworkAccessManager(nullptr);
+    connect(manager, SIGNAL(finished(QNetworkReply *)), this,
+            SLOT(telemetryReplyRecieved(QNetworkReply *)));
+
+    QUrl url(REMOTE_TELEMETRY_URL);
+    QNetworkRequest request(url);
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+
+    // generate payload
+    QVariantMap payload;
+    payload["api"] = AW_TELEMETRY_API;
+    payload["client_id"] = m_clientId;
+    payload["metadata"] = _value;
+    payload["type"] = _group;
+    // convert to QByteArray to send request
+    QByteArray data = QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact);
+    qCInfo(LOG_AW) << "Send request with body" << data.data() << "and size" << data.size();
+
+    manager->post(request, data);
+}
+
+
+void AWTelemetryHandler::telemetryReplyRecieved(QNetworkReply *_reply)
+{
+    if (_reply->error() != QNetworkReply::NoError) {
+        qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
+                          << _reply->errorString();
+        return;
+    }
+
+    QJsonParseError error{};
+    QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
+    if (error.error != QJsonParseError::NoError) {
+        qCWarning(LOG_AW) << "Parse error" << error.errorString();
+        return;
+    }
+    _reply->deleteLater();
+
+    // convert to map
+    QVariantMap response = jsonDoc.toVariant().toMap();
+    QString message = response["message"].toString();
+    qCInfo(LOG_AW) << "Server reply on telemetry" << message;
+
+    return emit(replyReceived(message));
+}
+
+
 QString AWTelemetryHandler::getKey(const int _count)
 {
     qCDebug(LOG_AW) << "Get key for keys count" << _count;

sources/awesome-widget/plugin/awtelemetryhandler.h

@@ -15,25 +15,43 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWTELEMETRYHANDLER_H
+#define AWTELEMETRYHANDLER_H
 
 #include <QObject>
 
 
-class __attribute__((visibility("default"))) AWTelemetryHandler : public QObject
+class QNetworkReply;
+
+class AWTelemetryHandler : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit AWTelemetryHandler(QObject *_parent = nullptr);
+    const char *REMOTE_TELEMETRY_URL = "https://arcanis.me/telemetry";
-    ~AWTelemetryHandler() override = default;
+
+    explicit AWTelemetryHandler(QObject *_parent = nullptr, const QString &_clientId = "");
+    ~AWTelemetryHandler() override;
     Q_INVOKABLE [[nodiscard]] QStringList get(const QString &_group) const;
     Q_INVOKABLE [[nodiscard]] QString getLast(const QString &_group) const;
-    Q_INVOKABLE void init(int _count);
+    Q_INVOKABLE void init(int _count, bool _enableRemote, const QString &_clientId);
     Q_INVOKABLE [[nodiscard]] bool put(const QString &_group, const QString &_value) const;
+    Q_INVOKABLE void uploadTelemetry(const QString &_group, const QString &_value);
+
+signals:
+    void replyReceived(const QString &_message);
+
+private slots:
+    void telemetryReplyRecieved(QNetworkReply *_reply);
 
 private:
     static QString getKey(int _count);
+    QString m_clientId;
     QString m_localFile;
     int m_storeCount = 0;
+    bool m_uploadEnabled = false;
 };
+
+
+#endif /* AWTELEMETRYHANDLER_H */

sources/awesome-widget/plugin/awupdatehelper.cpp

@@ -17,18 +17,13 @@
 
 #include "awupdatehelper.h"
 
-#ifndef NDEBUG
-#define NDEBUG
-#endif /* NDEBUG */
 #include <KI18n/KLocalizedString>
-#include <KNotifications/KNotification>
 
 #include <QDesktopServices>
 #include <QJsonDocument>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QSettings>
-#include <QStandardPaths>
 
 #include "awdebug.h"
 
@@ -39,20 +34,28 @@ AWUpdateHelper::AWUpdateHelper(QObject *_parent)
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
     m_foundVersion = QVersionNumber::fromString(VERSION);
-    m_genericConfig = QString("%1/awesomewidgets/general.ini")
+    m_genericConfig
+        = QString("%1/awesomewidgets/general.ini")
               .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
 }
 
 
+AWUpdateHelper::~AWUpdateHelper()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
 void AWUpdateHelper::checkUpdates(const bool _showAnyway)
 {
     qCDebug(LOG_AW) << "Show anyway" << _showAnyway;
 
-    // showAnyway options required to show message if no updates found on direct
+    // showAnyway options requires to show message if no updates found on direct
     // request. In case of automatic check no message will be shown
-    auto manager = new QNetworkAccessManager(nullptr);
+    auto *manager = new QNetworkAccessManager(nullptr);
-    connect(manager, &QNetworkAccessManager::finished,
+    connect(manager, &QNetworkAccessManager::finished, [_showAnyway, this](QNetworkReply *reply) {
-            [_showAnyway, this](QNetworkReply *reply) { return versionReplyReceived(reply, _showAnyway); });
+        return versionReplyRecieved(reply, _showAnyway);
+    });
 
     manager->get(QNetworkRequest(QUrl(VERSION_API)));
 }
@@ -61,14 +64,17 @@ void AWUpdateHelper::checkUpdates(const bool _showAnyway)
 bool AWUpdateHelper::checkVersion()
 {
     QSettings settings(m_genericConfig, QSettings::IniFormat);
-    auto version = QVersionNumber::fromString(settings.value("Version", QString(VERSION)).toString());
+    QVersionNumber version
+        = QVersionNumber::fromString(settings.value("Version", QString(VERSION)).toString());
     // update version
     settings.setValue("Version", QString(VERSION));
     settings.sync();
     qCInfo(LOG_AW) << "Found version" << version << "actual one is" << m_foundVersion;
 
     if ((version != m_foundVersion) && (!QString(CHANGELOG).isEmpty())) {
-        sendNotification(i18n("Changelog of %1", VERSION), QString(CHANGELOG).replace('@', '\n'));
+        genMessageBox(i18nc("Changelog of %1", VERSION), QString(CHANGELOG).replace('@', '\n'),
+                      QMessageBox::Ok)
+            ->open();
         return true;
     } else if (version != m_foundVersion) {
         qCWarning(LOG_AW) << "No changelog information provided";
@@ -81,64 +87,73 @@ bool AWUpdateHelper::checkVersion()
 }
 
 
-void AWUpdateHelper::openReleasesPage()
-{
-    QDesktopServices::openUrl(QString(RELEASES) + m_foundVersion.toString());
-}
-
-
 void AWUpdateHelper::showInfo(const QVersionNumber &_version)
 {
     qCDebug(LOG_AW) << "Version" << _version;
 
-    auto text = i18n("You are using the actual version %1", _version.toString());
+    QString text = i18n("You are using the actual version %1", _version.toString());
     if (!QString(COMMIT_SHA).isEmpty())
         text += QString(" (%1)").arg(QString(COMMIT_SHA));
-    sendNotification(i18n("No new version found"), text);
+    return genMessageBox(i18n("No new version found"), text, QMessageBox::Ok)->open();
 }
 
 
-void AWUpdateHelper::showUpdates(const QVersionNumber &_version) const
+void AWUpdateHelper::showUpdates(const QVersionNumber &_version)
 {
     qCDebug(LOG_AW) << "Version" << _version;
 
     QString text;
-    text += i18n("Current version : %1", VERSION);
+    text += i18nc("Current version : %1", VERSION);
     text += QString(COMMIT_SHA).isEmpty() ? "\n" : QString(" (%1)\n").arg(QString(COMMIT_SHA));
     text += i18n("New version : %1", _version.toString()) + "\n\n";
     text += i18n("Click \"Ok\" to download");
 
-    auto event = sendNotification(i18n("There are updates"), text);
+    genMessageBox(i18n("There are updates"), text, QMessageBox::Ok | QMessageBox::Cancel)
-    auto action = event->addAction(i18n("Details"));
+        ->open(this, SLOT(userReplyOnUpdates(QAbstractButton *)));
-    connect(action, &KNotificationAction::activated, this, &AWUpdateHelper::openReleasesPage);
 }
 
 
-void AWUpdateHelper::versionReplyReceived(QNetworkReply *_reply, const bool _showAnyway)
+void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *_button)
+{
+    QMessageBox::ButtonRole ret = dynamic_cast<QMessageBox *>(sender())->buttonRole(_button);
+    qCInfo(LOG_AW) << "User select" << ret;
+
+    switch (ret) {
+    case QMessageBox::AcceptRole:
+        QDesktopServices::openUrl(QString(RELEASES) + m_foundVersion.toString());
+        break;
+    case QMessageBox::RejectRole:
+    default:
+        break;
+    }
+}
+
+
+void AWUpdateHelper::versionReplyRecieved(QNetworkReply *_reply, const bool _showAnyway)
 {
     qCDebug(LOG_AW) << "Show message anyway" << _showAnyway;
     if (_reply->error() != QNetworkReply::NoError) {
-        qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message" << _reply->errorString();
+        qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
+                          << _reply->errorString();
         return;
     }
 
-    auto error = QJsonParseError();
+    QJsonParseError error = QJsonParseError();
-    auto jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
+    QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
     if (error.error != QJsonParseError::NoError) {
         qCWarning(LOG_AW) << "Parse error" << error.errorString();
         return;
     }
     _reply->deleteLater();
-    _reply->manager()->deleteLater(); // remember to delete manager too
 
     // convert to map
-    auto firstRelease = jsonDoc.toVariant().toList().first().toMap();
+    QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
-    auto version = firstRelease["tag_name"].toString();
+    QString version = firstRelease["tag_name"].toString();
     version.remove("V.");
     m_foundVersion = QVersionNumber::fromString(version);
     qCInfo(LOG_AW) << "Update found version to" << m_foundVersion;
 
-    auto oldVersion = QVersionNumber::fromString(VERSION);
+    QVersionNumber oldVersion = QVersionNumber::fromString(VERSION);
     if (oldVersion < m_foundVersion)
         return showUpdates(m_foundVersion);
     else if (_showAnyway)
@@ -147,12 +162,18 @@ void AWUpdateHelper::versionReplyReceived(QNetworkReply *_reply, const bool _sho
 
 
 // additional method which is used to show message box which does not block UI
-KNotification *AWUpdateHelper::sendNotification(const QString &_title, const QString &_body)
+QMessageBox *AWUpdateHelper::genMessageBox(const QString &_title, const QString &_body,
+                                           const QMessageBox::StandardButtons _buttons)
 {
     qCDebug(LOG_AW) << "Construct message box with title" << _title << "and body" << _body;
 
-    auto event = KNotification::event("system", _title, _body);
+    auto *msgBox = new QMessageBox(nullptr);
-    event->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
+    msgBox->setAttribute(Qt::WA_DeleteOnClose);
+    msgBox->setModal(false);
+    msgBox->setWindowTitle(_title);
+    msgBox->setText(_body);
+    msgBox->setStandardButtons(_buttons);
+    msgBox->setIcon(QMessageBox::Information);
 
-    return event;
+    return msgBox;
 }

sources/awesome-widget/plugin/awupdatehelper.h

@@ -15,33 +15,39 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
 
+#ifndef AWUPDATEHELPER_H
+#define AWUPDATEHELPER_H
+
+#include <QMessageBox>
 #include <QObject>
 #include <QVersionNumber>
 
 
-class KNotification;
 class QNetworkReply;
 
-class __attribute__((visibility("default"))) AWUpdateHelper : public QObject
+class AWUpdateHelper : public QObject
 {
     Q_OBJECT
 
 public:
     explicit AWUpdateHelper(QObject *_parent = nullptr);
-    ~AWUpdateHelper() override = default;
+    ~AWUpdateHelper() override;
     void checkUpdates(bool _showAnyway = false);
     bool checkVersion();
 
 private slots:
-    void openReleasesPage();
     static void showInfo(const QVersionNumber &_version);
-    void showUpdates(const QVersionNumber &_version) const;
+    void showUpdates(const QVersionNumber &_version);
-    void versionReplyReceived(QNetworkReply *_reply, bool _showAnyway);
+    void userReplyOnUpdates(QAbstractButton *_button);
+    void versionReplyRecieved(QNetworkReply *_reply, bool _showAnyway);
 
 private:
-    static KNotification *sendNotification(const QString &_title, const QString &_body);
+    static QMessageBox *genMessageBox(const QString &_title, const QString &_body,
+                                      QMessageBox::StandardButtons _buttons);
     QVersionNumber m_foundVersion;
     QString m_genericConfig;
 };
+
+
+#endif /* AWUPDATEHELPER_H */

sources/awesome-widget/plugin/formatters/awpluginformatsettings.h

@@ -1,37 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include <QString>
-
-
-class AWFormatterHelper;
-
-struct AWPluginFormatSettings {
-    QString acOffline;
-    QString acOnline;
-
-    QString customTime;
-    QString customUptime;
-
-    QString tempUnits;
-
-    bool translate = false;
-
-    AWFormatterHelper *customFormatters = nullptr;
-};

sources/awesome-widget/plugin/formatters/awpluginformatter.h

@@ -1,69 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include <QLocale>
-#include <QVariant>
-
-#include <memory>
-
-#include "awpluginformatsettings.h"
-
-
-class AWPluginFormaterInterface
-{
-public:
-    virtual ~AWPluginFormaterInterface() = default;
-    [[nodiscard]] virtual QString format(const QVariant &_value, const QString &_key,
-                                         const AWPluginFormatSettings &_settings) const
-        = 0;
-    virtual void load(){};
-};
-
-
-template <typename Formatter> class AWPluginFormatter : public AWPluginFormaterInterface
-{
-public:
-    static constexpr double KBinBytes = 1024.0;
-    static constexpr double MBinBytes = 1024.0 * KBinBytes;
-    static constexpr double GBinBytes = 1024.0 * MBinBytes;
-
-    AWPluginFormatter(AWPluginFormatter &) = delete;
-    void operator=(const AWPluginFormatter &) = delete;
-
-    [[nodiscard]] static Formatter *instance()
-    {
-        static auto instance = loadInstance();
-        return instance.get();
-    };
-
-    [[nodiscard]] static QLocale locale(const AWPluginFormatSettings &_settings)
-    {
-        return _settings.translate ? QLocale::system() : QLocale::c();
-    };
-
-protected:
-    AWPluginFormatter() = default;
-
-    [[nodiscard]] static std::unique_ptr<Formatter> loadInstance()
-    {
-        auto instance = std::make_unique<Formatter>();
-        instance->load();
-        return instance;
-    };
-};

sources/awesome-widget/plugin/formatters/awpluginformatterac.cpp

@@ -1,25 +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 "awpluginformatterac.h"
-
-
-QString AWPluginFormatterAC::format(const QVariant &_value, const QString &,
-                                    const AWPluginFormatSettings &_settings) const
-{
-    return _value.toBool() ? _settings.acOnline : _settings.acOffline;
-}

sources/awesome-widget/plugin/formatters/awpluginformatterac.h

@@ -1,28 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include "awpluginformatter.h"
-
-
-class AWPluginFormatterAC : public AWPluginFormatter<AWPluginFormatterAC>
-{
-public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
-                                 const AWPluginFormatSettings &_settings) const override;
-};

sources/awesome-widget/plugin/formatters/awpluginformattercustom.cpp

@@ -1,29 +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 "awpluginformattercustom.h"
-
-#include "awformatterhelper.h"
-
-
-QString AWPluginFormatterCustom::format(const QVariant &_value, const QString &_key,
-                                        const AWPluginFormatSettings &_settings) const
-{
-    if (_settings.customFormatters)
-        return _settings.customFormatters->convert(_value, _key);
-    return _value.toString();
-}

sources/awesome-widget/plugin/formatters/awpluginformattercustom.h

@@ -1,28 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include "awpluginformatter.h"
-
-
-class AWPluginFormatterCustom : public AWPluginFormatter<AWPluginFormatterCustom>
-{
-public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &_key,
-                                 const AWPluginFormatSettings &_settings) const override;
-};

sources/awesome-widget/plugin/formatters/awpluginformatterdouble.cpp

@@ -1,25 +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 "awpluginformatterdouble.h"
-
-
-QString AWPluginFormatterDouble::format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const
-{
-    auto output = QString("%1").arg(_value.toDouble(), 0, 'f');
-    return output.rightJustified(8, QLatin1Char(' '), true);
-}

sources/awesome-widget/plugin/formatters/awpluginformatterdouble.h

@@ -1,28 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include "awpluginformatter.h"
-
-
-class AWPluginFormatterDouble : public AWPluginFormatter<AWPluginFormatterDouble>
-{
-public:
-    [[nodiscard]] QString format(const QVariant &_value, const QString &,
-                                 const AWPluginFormatSettings &) const override;
-};

sources/awesome-widget/plugin/formatters/awpluginformatterfloat.cpp

@@ -1,24 +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 "awpluginformatterfloat.h"
-
-
-QString AWPluginFormatterFloat::format(const QVariant &_value, const QString &, const AWPluginFormatSettings &) const
-{
-    return QString("%1").arg(_value.toDouble(), 5, 'f', 1);
-}