docs: update README.md (#169)

png rendering in qt

.github/workflows/build.yml

@@ -0,0 +1,43 @@
+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

@@ -0,0 +1,51 @@
+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 }}

.gitignore

@@ -47,3 +47,4 @@ pkg
 
 # clion settings
 .idea
+cmake-build*

.gitmodules

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

.travis.yml

@@ -1,28 +0,0 @@
-sudo: required
-
-arch:
-    packages:
-        - plasma-framework
-        # build deps
-        - cmake
-        - extra-cmake-modules
-        - python
-        # test
-        - xorg-server-xvfb
-        # additional targets
-        - clang
-        - cppcheck
-    script:
-        - export DISPLAY=:99.0
-        - git clone https://github.com/arcan1s/awesome-widgets/
-        - cd awesome-widgets; git submodule update --init --recursive
-        - mkdir awesome-widgets/build
-        - cd awesome-widgets/build; cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_BUILD_TYPE=Optimization -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_FUTURE=ON -DBUILD_TESTING=ON ../sources
-        - cd awesome-widgets/build; make
-        - cd awesome-widgets/build; make cppcheck
-        - cd awesome-widgets/build; make clangformat && ( [ `git status -s | wc -l` -eq 0 ] || exit 1 )
-        - cd awesome-widgets/build; xvfb-run make test
-        - sleep 3
-
-script:
-    - "curl -s https://raw.githubusercontent.com/mikkeloscar/arch-travis/master/arch-travis.sh | bash"

.travis.yml.bckp

@@ -1,20 +0,0 @@
-sudo: required
-dist: trusty
-
-language: cpp
-os:
-  - linux
-
-before_script:
-  - sudo apt-add-repository -y ppa:kubuntu-ppa/backports
-  - sudo sed -i 's/trusty/wily/g' /etc/apt/sources.list
-  - sudo sed -i 's/trusty/wily/g' /etc/apt/sources.list.d/kubuntu-ppa-backports-trusty.list
-  - sudo apt-get -qq update
-  - sudo apt-get -y -qq -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew install libkf5i18n-dev libkf5notifications-dev libkf5service-dev libkf5windowsystem-dev plasma-framework-dev qtbase5-dev qtdeclarative5-dev extra-cmake-modules cmake g++
-  - rm -rf build
-  - mkdir build
-
-script:
-  - cd build
-  - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_USE_QT_SYS_PATHS=ON ../sources
-  - make

AUTHORS

@@ -11,3 +11,5 @@ Ernesto Avilés Vzqz (Spanish)
 Виктор Слободян (Ukrainian)
 Steve Lemuel (Chinese)
 Mariusz Kocoń (Polish)
+Ibnu Daru Aji (Indonesian)
+Antonio Vivace (Italian)

CHANGELOG

@@ -1,3 +1,40 @@
+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)
++ Indonesian translation (#132, thanks to @ibnuda)
++ new keys - $batleftN, $batnowN, $batrateN, $battotalN, $brightness, $volume
+* fix compiler warnings
+* update to new qt api
+- fix non printable spaces (#142, #143)
+
+Ver.3.3.3:
++ add custom keys support (#101)
+* DBus interface improvements
+* rename tags (up|down|ps)total.* to (up|down|ps)tot.*
+- fix issue with invalid (up|down)total($|kb) calculation (#127)
+- fix issue with wrong applet identation (#125)
+
+Ver.3.3.2:
+- fix bug with invalid DP colour configuration
+- fix bug with invalid HTML tags operation
+* update to newest Qt and plasma
+
 Ver.3.3.1:
 + add ability to direct issue report (#104)
 + add key completion (#105)

CONTRIBUTING.md

@@ -6,27 +6,20 @@ 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
+* Any private variable should start with `m_` prefix (`m_foo`). The only one exception is `Ui` object which should be named as `ui`.
-  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
+* In other hand Qt specific variables types (`qint`, `qfloat`, etc) are not recommended.
-  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
+    * Include only those headers which are strictly necessary inside headers. Use forward class declaration instead. Exception is base class header declaration.
-      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:
-    * 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 [include guard](https://en.wikipedia.org/wiki/Include_guard)
+    * Any header should have `#pragma once`.
-      named as `CLASSNAMECAPS_H`
 * If any `#if` directive is used condition should be mentioned in `#endif`:
 
   ```
@@ -36,80 +29,60 @@ 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
+* 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.
-`Q_FOREACH` (`foreach`) is not allowed use `for (auto &foo : bar)` instead.
+* Current project standard is **C++23**.
-* Current project standard is **C++11**.
 * Do not use C-like code:
-    * C-like style iteration if possible. Use `for (auto &foo : bar)` and
+    * 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.
-      `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 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 `const vartype foo = bar` definition instead.
+    * C-like constant definition, use `static 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
+* Templates are allowed and recommended. Templates usually should be described inside header not source code file.
-  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.
-* 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
+* Do not hesitate use `const` modifier. In other hand `volatile` modifier is not recommended.
-  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
+    * Two lines after header declaration and before declaration at the end of a file.
-      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
+* Class constructor should have default arguments. Use `QObject *_parent` property for QObject based classes.
-  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 assign to `nullptr` after deletion and before
+* Any global pointer should be assigned to `nullptr` after deletion and before initialization. Exception: if object is deleted into class destructor.
-  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
+Please do not hesitate to use comments inside source code (especially in non-obvious blocks). Comments also may use the following keywords:
-blocks). Comments also may use the following keywords:
 
-* **TODO** - indicates that some new code should be implemented here later. Please
+* **TODO** - indicates that some new code should be implemented here later. Please note that usually these methods should be implemented before the next release.
-  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
+* **HACK** - hacks inside code which requires to avoid some restrictions and/or which adds additional non-obvious optimizations.
-  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
+* 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.
-  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
+* Try to minimize message in Release build with logging disabled. It is highly recommended to fix KDE/Qt specific warning if possible
-  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.
-* 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 **development**. Changes in this branch may be merged to the
+* The main branch is **master**.
-  master one only if it is a 'stable' build.
+* For experimental features development new branch `feature/foo` creation is allowed and recommended.
-* For experimental features development new branch `feature-foo` creation is allowed
-  and recommended.
 * Experimental features should be added inside `BUILD_FUTURE` definition:
 
   ```
@@ -118,54 +91,41 @@ Development
   #endif /* BUILD_FUTURE */
   ```
 
-* Any project specific build variable should be mentioned inside `version.h` as
+* Any project specific build variable should be mentioned inside `version.h` as well.
-  well.
 * Recommended compiler is `clang`.
 
 HIG
 ---
 
-The recommended HIG is [KDE one](https://techbase.kde.org/Projects/Usability/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.
-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
+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.
-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).
+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:
-Available categories should be declared in `awdebug.*` files. The following log
-levels should be used:
 
-* **debug** (`qCDebug()`) - method arguments information. Please note that it
+* **debug** (`qCDebug()`) - method arguments information. Please note that it is recommended to logging all arguments in the one line.
-  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
+* **warning** (`qCWarning()`) - not critical information, which may be caused by mistakes in configuration for example.
-  mistakes in configuration for example.
+* **critical** (`qCCritical()`) - a critical error. After this error program may be terminated.
-* **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
+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.
-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.
+* Any changes should be tested by using `plasmawindowed` and `plasmashell` applications. (It is also possible to use `plasmaengineexplorer` and `plasmoidviewer` in addition.)
-  (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`
+* Additional test functions should be declated and used only inside `BUILD_TESTING` definition.
-  definition.
 
 Tools
 -----
@@ -222,7 +182,6 @@ Tools
         // declare with default value
         bool m_prop = false;
   ```
-* Use `cppcheck` to avoid common errors in the code. To start application just
+* Use `cppcheck` to avoid common errors in the code. To start application just run `make cppcheck`.
-  run `make cppcheck`.
+* Use `clang-format` to apply valid code format. To start application just run `make clangformat`.
-* Use `clang-format` to apply valid code format. To start application just run
+* use `-DCMAKE_CXX_COMPILER=clang++` in order to enable clang-tidy checks.
-  `make clangformat`.

README.md

@@ -1,7 +1,7 @@
 awesome-widgets (ex-pytextmonitor)
 ==================================
 
-[![Build Status](https://travis-ci.org/arcan1s/awesome-widgets.svg?branch=development)](https://travis-ci.org/arcan1s/awesome-widgets)
+[![build & tests](https://github.com/arcan1s/awesome-widgets/actions/workflows/build.yml/badge.svg)](https://github.com/arcan1s/awesome-widgets/actions/workflows/build.yml)
 [![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 Conky widget or as Awesome-like information panel
+* easy and fully configurable native Plasma widget which may be used as desktop or panel widget
-* panel which shows active desktop status
+* additionnal widget which shows active desktop status
-* clear Conky-like configuration with html tags support
+* clear text configuration with html tags support
 * custom command support (it may be simple action as well as special custom tag)
-* graphical item support - tooltips, bars
+* graphical widgets support - tooltips, bars
 
 See [links](#Links) for more details.
 
@@ -30,15 +30,13 @@ Instruction
 Dependencies
 ------------
 
-* plasma-framework
+* plasma-workspace
 
 Optional dependencies
 ---------------------
 
-* proprietary video driver
-* hddtemp
-* smartmontools
 * music player (mpd or MPRIS supported)
+* wireless_tools
 
 Make dependencies
 -----------------
@@ -46,17 +44,20 @@ 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).
+
 Installation
 ------------
 
 * download sources
-* install
+* build package
 
-        mkdir build && cd build
+      cmake -B build -S sources -DCMAKE_BUILD_TYPE=Release
-        cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../
+      cmake --build build
-        make && sudo make install
 
-  **NOTE** on Plasma 5 it very likely requires `-DKDE_INSTALL_USE_QT_SYS_PATHS=ON` flag
+* install package 
+
+      cmake --install build
 
 Additional information
 ======================
@@ -74,5 +75,5 @@ Links
 * [Scripts and bars](https://arcanis.me/en/2014/12/19/aw-v21-bells-and-whistles/)
 * Plasmoid on [kde-look](http://kde-look.org/content/show.php/Awesome+Widgets?content=157124)
 * DataEngine on [kde-look](http://kde-look.org/content/show.php/Extended+Systemmonitor+DataEngine?content=158773)
-* Archlinux [AUR](https://aur.archlinux.org/packages/plasma5-applet-awesome-widgets/) package
+* Archlinux [AUR](https://aur.archlinux.org/packages/plasma6-applets-awesome-widgets) package
 * [OpenSuse](http://software.opensuse.org/search?q=awesome-widgets) packages, [KF5 OpenSuse](http://software.opensuse.org/package/plasma5-awesome-widgets) package

create_archive.sh

@@ -1,13 +1,7 @@
 #!/bin/bash
 
 SRCDIR="sources"
-MAJOR=$(grep -m1 PROJECT_VERSION_MAJOR sources/CMakeLists.txt | awk '{print $2}' | sed 's/^.\(.*\)..$/\1/')
+VERSION="$(git describe --tags --abbrev=0)"
-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"
@@ -16,17 +10,11 @@ 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
+tar cJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}"
-MD5SUMS=$(md5sum ${ARCHIVE}-${VERSION}-src.tar.xz | awk '{print $1}')
+
-sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" packages/PKGBUILD
+rm -rf "${ARCHIVE}"
-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,41 +1,31 @@
 # Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
 
-pkgname=plasma5-applet-awesome-widgets
+pkgname=plasma6-applet-awesome-widgets
 _pkgname=awesome-widgets
-pkgver=3.3.1
+pkgver=4.0.0alpha2
 pkgrel=1
 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="https://arcanis.me/projects/awesome-widgets"
 license=('GPL3')
-depends=('plasma-framework')
+depends=('plasma-workspace')
-optdepends=("catalyst: for GPU monitor"
+optdepends=("mpd: for music player monitor"
-            "hddtemp: for HDD temperature monitor"
+            "wireless_tools: wifi information")
-            "smartmontools: for HDD temperature monitor"
-            "mpd: for music player monitor"
-            "nvidia-utils: for GPU monitor")
 makedepends=('cmake' 'extra-cmake-modules' 'python')
-source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
+source=(https://github.com/arcan1s/awesome-widgets/releases/download/${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
-install=${pkgname}.install
+install="$pkgname.install"
-md5sums=('306027b017f940c9c5eaffb65ff82a7f')
 backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
 
-prepare() {
-  rm -rf "${srcdir}/build"
-  mkdir "${srcdir}/build"
-}
-
 build () {
-  cd "${srcdir}/build"
+    cmake -B build -S "${_pkgname}" \
-  cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+          -DCMAKE_BUILD_TYPE=Optimization \
-        -DCMAKE_BUILD_TYPE=Optimization \
+          -DBUILD_FUTURE=ON \
-        -DCMAKE_INSTALL_PREFIX=/usr \
+          -DBUILD_TESTING=OFF
-        -DBUILD_FUTURE=ON \
+    cmake --build build
-        "../${_pkgname}"
-  make
 }
 
 package() {
-  cd "${srcdir}/build"
+      DESTDIR="$pkgdir" cmake --install build
-  make DESTDIR="${pkgdir}" install
 }
+
+sha256sums=('b2a7b07a1df6f710f4e0d6e5898933f4ddb131818b922dc4b8e48afe3e98a664')

packages/build-requirements.deb.txt

@@ -1,11 +0,0 @@
-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

@@ -1,32 +0,0 @@
-diff --git a/sources/awdebug.h b/sources/awdebug.h
-index 8447c65..9f8e298 100644
---- a/sources/awdebug.h
-+++ b/sources/awdebug.h
-@@ -23,10 +23,14 @@
- 
- #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 d29672e..f15a729 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>
- 
- #include "version.h"
- 

patches/qt5.6-qversionnumber.patch

@@ -1,139 +0,0 @@
-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

@@ -1,27 +1,26 @@
 ---
 Language:        Cpp
 AccessModifierOffset: -4
-AlignAfterOpenBracket: true
+AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
+AlignConsecutiveAssignments: None
-AlignEscapedNewlinesLeft: false
 AlignOperands:   true
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: Inline
-AllowShortIfStatementsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: false
+AlwaysBreakTemplateDeclarations: No
 BinPackArguments: true
 BinPackParameters: true
 BreakBeforeBinaryOperators: All
 BreakBeforeBraces: Linux
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: true
-ColumnLimit:     80
+ColumnLimit:     120
 CommentPragmas:  '^ IWYU pragma:'
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
@@ -59,7 +58,7 @@ SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
-Standard:        Cpp11
+Standard:        Latest
 TabWidth:        8
 UseTab:          Never
 ...

sources/.kdev4/awesomewidgets.kdev4

@@ -1,26 +0,0 @@
-[Buildset]
-BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x1e\x00a\x00w\x00e\x00s\x00o\x00m\x00e\x00-\x00w\x00i\x00d\x00g\x00e\x00t\x00s)
-
-[CMake]
-Build Directory Count=1
-Current Build Directory Index=0
-ProjectRootRelative=./
-
-[CMake][CMake Build Directory 0]
-Build Directory Path=file:///home/arcanis/Documents/github/awesome-widgets/build
-Build Type=Optimization
-CMake Binary=file:///usr/bin/cmake
-Environment Profile=
-Extra Arguments=
-Install Directory=file:///usr
-
-[Defines And Includes][Compiler]
-Name=GCC
-Path=gcc
-Type=GCC
-
-[Launch]
-Launch Configurations=
-
-[Project]
-VersionControlSupport=kdevgit

sources/.kdev4/sources.kdev4

@@ -1,23 +0,0 @@
-[Buildset]
-BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x1e\x00a\x00w\x00e\x00s\x00o\x00m\x00e\x00-\x00w\x00i\x00d\x00g\x00e\x00t\x00s)
-
-[CMake]
-Build Directory Count=1
-Current Build Directory Index=0
-ProjectRootRelative=./
-
-[CMake][CMake Build Directory 0]
-Build Directory Path=file:///home/arcanis/Documents/github/awesome-widgets/build
-Build Type=Release
-CMake Binary=file:///usr/bin/cmake
-Environment Profile=
-Extra Arguments=
-Install Directory=file:///usr
-
-[Defines And Includes][Compiler]
-Name=GCC
-Path=gcc
-Type=GCC
-
-[Project]
-VersionControlSupport=kdevgit

sources/3rdparty/fontdialog/COPYING

@@ -0,0 +1,165 @@
+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

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

sources/3rdparty/fontdialog/fontdialog.cpp

@@ -0,0 +1,140 @@
+/***************************************************************************
+ *  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

@@ -0,0 +1,73 @@
+/***************************************************************************
+ *  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()
 {
-    QNetworkReply *reply = static_cast<QNetworkReply *>(parent());
+    auto reply = dynamic_cast<QNetworkReply *>(parent());
     if (reply->isRunning())
         reply->close();
 }

sources/CMakeLists.txt

@@ -1,20 +1,24 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.16.0)
 
 # some fucking magic
-cmake_policy(SET CMP0003 OLD)
-cmake_policy(SET CMP0002 OLD)
 cmake_policy(SET CMP0011 NEW)
 cmake_policy(SET CMP0015 NEW)
 if (POLICY CMP0063)
-    cmake_policy(SET CMP0063 OLD)
+    cmake_policy(SET CMP0063 NEW)
+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 "3")
+set(PROJECT_VERSION_MAJOR "4")
-set(PROJECT_VERSION_MINOR "3")
+set(PROJECT_VERSION_MINOR "0")
 set(PROJECT_VERSION_PATCH "1")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 # append git version if any
@@ -41,40 +45,23 @@ option(BUILD_TESTING "Build with additional test abilities" OFF)
 set(PROJECT_CHANGELOG "Changelog" CACHE INTERNAL "")
 include(changelog.cmake)
 
-# flags
+# directories
-if (CMAKE_COMPILER_IS_GNUCXX)
-    set(CMAKE_CXX_FLAGS "-Wall -Wno-cpp -std=c++11")
-    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
-    set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
-    set(CMAKE_CXX_FLAGS_OPTIMIZATION "-Ofast -DNDEBUG")
-    # avoid newer gcc warnings
-    add_definitions(-D_DEFAULT_SOURCE)
-elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-Wall -std=c++11")
-    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
-    set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
-    set(CMAKE_CXX_FLAGS_OPTIMIZATION "-Ofast -DNDEBUG")
-    # linker flags
-else ()
-    message(FATAL_ERROR "Unknown compiler")
-endif ()
-if (CMAKE_BUILD_TYPE MATCHES Debug)
-    set(CMAKE_VERBOSE_MAKEFILE ON)
-endif ()
-
-# required by successfully coverity and cppcheck build
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
 set(PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
 set(PROJECT_LIBRARY awesomewidgets)
 set(PROJECT_MONITORSOURCES extsysmonsources)
+
+# modules
+include(compiler.cmake)
 include(libraries.cmake)
 include(clang-format.cmake)
 include(cppcheck.cmake)
 include(coverity.cmake)
 
+# pre-configure
 get_directory_property(CMAKE_DEFINITIONS COMPILE_DEFINITIONS)
 configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+
+# build components
 add_subdirectory(awesomewidgets)
 add_subdirectory(extsysmonsources)
 add_subdirectory(extsysmon)
@@ -90,4 +77,3 @@ if (BUILD_TESTING)
 endif ()
 
 include(packages-recipe.cmake)
-

sources/awdebug.cpp

@@ -15,22 +15,20 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
+#ifndef NDEBUG
+#define NDEBUG
+#endif /* NDEBUG */
 #include <KI18n/KLocalizedString>
 
 #include "awdebug.h"
 
 
-Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget",
+Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget", QtMsgType::QtWarningMsg)
-                   QtMsgType::QtWarningMsg)
 Q_LOGGING_CATEGORY(LOG_DBUS, "org.kde.plasma.awdbus", QtMsgType::QtWarningMsg)
-Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel",
+Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel", QtMsgType::QtWarningMsg)
-                   QtMsgType::QtWarningMsg)
 Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon", QtMsgType::QtWarningMsg)
-Q_LOGGING_CATEGORY(LOG_ESS, "org.kde.plasma.extsysmonsources",
+Q_LOGGING_CATEGORY(LOG_ESS, "org.kde.plasma.extsysmonsources", QtMsgType::QtWarningMsg)
-                   QtMsgType::QtWarningMsg)
+Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets", QtMsgType::QtWarningMsg)
-Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets",
-                   QtMsgType::QtWarningMsg)
 
 
 QString AWDebug::getAboutText(const QString &_type)
@@ -45,57 +43,32 @@ 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>"
+        text = i18n("Links:") + "<ul>" + QString("<li><a href=\"%1\">%2</a></li>").arg(HOMEPAGE, i18n("Homepage"))
-               + QString("<li><a href=\"%1\">%2</a></li>")
+               + QString("<li><a href=\"%1\">%2</a></li>").arg(REPOSITORY, i18n("Repository"))
-                     .arg(HOMEPAGE)
+               + QString("<li><a href=\"%1\">%2</a></li>").arg(BUGTRACKER, i18n("Bugtracker"))
-                     .arg(i18n("Homepage"))
+               + QString("<li><a href=\"%1\">%2</a></li>").arg(TRANSLATION, i18n("Translation issue"))
-               + QString("<li><a href=\"%1\">%2</a></li>")
+               + QString("<li><a href=\"%1\">%2</a></li>").arg(AUR_PACKAGES, i18n("AUR packages"))
-                     .arg(REPOSITORY)
+               + QString("<li><a href=\"%1\">%2</a></li>").arg(OPENSUSE_PACKAGES, i18n("openSUSE packages")) + "</ul>";
-                     .arg(i18n("Repository"))
-               + QString("<li><a href=\"%1\">%2</a></li>")
-                     .arg(BUGTRACKER)
-                     .arg(i18n("Bugtracker"))
-               + QString("<li><a href=\"%1\">%2</a></li>")
-                     .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>")
+        text = QString("<small>&copy; %1 <a href=\"mailto:%2\">%3</a><br>").arg(DATE, EMAIL, AUTHOR)
-                   .arg(DATE)
+               + i18n("This software is licensed under %1", LICENSE) + "</small>";
-                   .arg(EMAIL)
-                   .arg(AUTHOR)
-               + i18n("This software is licensed under %1", LICENSE)
-               + "</small>";
     } else if (_type == "translators") {
-        QStringList translatorList = QString(TRANSLATORS).split(',');
+        auto translatorList = QString(TRANSLATORS).split(',');
         for (auto &translator : translatorList)
             translator = QString("<li>%1</li>").arg(translator);
-        text
+        text = i18n("Translators:") + "<ul>" + translatorList.join("") + "</ul>";
-            = i18n("Translators:") + "<ul>" + translatorList.join("") + "</ul>";
     } else if (_type == "3rdparty") {
-        QStringList trdPartyList
+        auto trdPartyList = QString(TRDPARTY_LICENSE).split(';', Qt::SkipEmptyParts);
-            = QString(TRDPARTY_LICENSE).split(';', QString::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>")
-            trdPartyList[i]
+                                  .arg(trdPartyList.at(i).split(',')[0], trdPartyList.at(i).split(',')[1],
-                = QString("<li><a href=\"%3\">%1</a> (%2 license)</li>")
+                                       trdPartyList.at(i).split(',')[2]);
-                      .arg(trdPartyList.at(i).split(',')[0])
+        text = i18n("This software uses:") + "<ul>" + trdPartyList.join("") + "</ul>";
-                      .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") {
-        QStringList thanks
+        auto thanks = QString(SPECIAL_THANKS).split(';', Qt::SkipEmptyParts);
-            = QString(SPECIAL_THANKS).split(';', QString::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>";
     }
 
@@ -117,10 +90,8 @@ QStringList AWDebug::getBuildData()
     metadata.append(QString("    AW_GRAPHITEM_API: %1").arg(AW_GRAPHITEM_API));
     metadata.append(QString("    AW_EXTQUOTES_API: %1").arg(AW_EXTQUOTES_API));
     metadata.append(QString("    AW_EXTSCRIPT_API: %1").arg(AW_EXTSCRIPT_API));
-    metadata.append(
+    metadata.append(QString("    AW_EXTUPGRADE_API: %1").arg(AW_EXTUPGRADE_API));
-        QString("    AW_EXTUPGRADE_API: %1").arg(AW_EXTUPGRADE_API));
+    metadata.append(QString("    AW_EXTWEATHER_API: %1").arg(AW_EXTWEATHER_API));
-    metadata.append(
-        QString("    AW_EXTWEATHER_API: %1").arg(AW_EXTWEATHER_API));
     metadata.append(QString("    AW_FORMATTER_API: %1").arg(AW_FORMATTER_API));
     metadata.append(QString("    REQUEST_TIMEOUT: %1").arg(REQUEST_TIMEOUT));
     metadata.append(QString("    TIME_KEYS: %1").arg(TIME_KEYS));
@@ -128,41 +99,27 @@ QStringList AWDebug::getBuildData()
     // cmake properties
     metadata.append("cmake properties:");
     metadata.append(QString("    CMAKE_BUILD_TYPE: %1").arg(CMAKE_BUILD_TYPE));
-    metadata.append(
+    metadata.append(QString("    CMAKE_CXX_COMPILER: %1").arg(CMAKE_CXX_COMPILER));
-        QString("    CMAKE_CXX_COMPILER: %1").arg(CMAKE_CXX_COMPILER));
     metadata.append(QString("    CMAKE_CXX_FLAGS: %1").arg(CMAKE_CXX_FLAGS));
-    metadata.append(
+    metadata.append(QString("    CMAKE_CXX_FLAGS_DEBUG: %1").arg(CMAKE_CXX_FLAGS_DEBUG));
-        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_RELEASE: %1")
+    metadata.append(QString("    CMAKE_CXX_FLAGS_OPTIMIZATION: %1").arg(CMAKE_CXX_FLAGS_OPTIMIZATION));
-                        .arg(CMAKE_CXX_FLAGS_RELEASE));
+    metadata.append(QString("    CMAKE_DEFINITIONS: %1").arg(CMAKE_DEFINITIONS));
-    metadata.append(QString("    CMAKE_CXX_FLAGS_OPTIMIZATION: %1")
+    metadata.append(QString("    CMAKE_INSTALL_PREFIX: %1").arg(CMAKE_INSTALL_PREFIX));
-                        .arg(CMAKE_CXX_FLAGS_OPTIMIZATION));
+    metadata.append(QString("    CMAKE_MODULE_LINKER_FLAGS: %1").arg(CMAKE_MODULE_LINKER_FLAGS));
-    metadata.append(
+    metadata.append(QString("    CMAKE_SHARED_LINKER_FLAGS: %1").arg(CMAKE_SHARED_LINKER_FLAGS));
-        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));
-    metadata.append(QString("    CMAKE_SHARED_LINKER_FLAGS: %1")
-                        .arg(CMAKE_SHARED_LINKER_FLAGS));
     // components
     metadata.append("Components data:");
     metadata.append(QString("    BUILD_PLASMOIDS: %1").arg(BUILD_PLASMOIDS));
-    metadata.append(
+    metadata.append(QString("    BUILD_DEB_PACKAGE: %1").arg(BUILD_DEB_PACKAGE));
-        QString("    BUILD_DEB_PACKAGE: %1").arg(BUILD_DEB_PACKAGE));
+    metadata.append(QString("    BUILD_RPM_PACKAGE: %1").arg(BUILD_RPM_PACKAGE));
-    metadata.append(
+    metadata.append(QString("    CLANGFORMAT_EXECUTABLE: %1").arg(CLANGFORMAT_EXECUTABLE));
-        QString("    BUILD_RPM_PACKAGE: %1").arg(BUILD_RPM_PACKAGE));
-    metadata.append(
-        QString("    CLANGFORMAT_EXECUTABLE: %1").arg(CLANGFORMAT_EXECUTABLE));
     metadata.append(QString("    COVERITY_COMMENT: %1").arg(COVERITY_COMMENT));
-    metadata.append(
+    metadata.append(QString("    COVERITY_DIRECTORY: %1").arg(COVERITY_DIRECTORY));
-        QString("    COVERITY_DIRECTORY: %1").arg(COVERITY_DIRECTORY));
     metadata.append(QString("    COVERITY_EMAIL: %1").arg(COVERITY_EMAIL));
-    metadata.append(
+    metadata.append(QString("    COVERITY_EXECUTABLE: %1").arg(COVERITY_EXECUTABLE));
-        QString("    COVERITY_EXECUTABLE: %1").arg(COVERITY_EXECUTABLE));
     metadata.append(QString("    COVERITY_URL: %1").arg(COVERITY_URL));
-    metadata.append(
+    metadata.append(QString("    CPPCHECK_EXECUTABLE: %1").arg(CPPCHECK_EXECUTABLE));
-        QString("    CPPCHECK_EXECUTABLE: %1").arg(CPPCHECK_EXECUTABLE));
     // additional functions
     metadata.append(QString("    PROP_FUTURE: %1").arg(PROP_FUTURE));
     metadata.append(QString("    PROP_LOAD: %1").arg(PROP_LOAD));

sources/awdebug.h

@@ -15,9 +15,7 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
+#pragma once
-#ifndef AWDEBUG_H
-#define AWDEBUG_H
 
 #include <QLoggingCategory>
 
@@ -33,7 +31,7 @@ const char LOG_FORMAT[] = "[%{time "
 
 QString getAboutText(const QString &_type);
 QStringList getBuildData();
-}
+} // namespace AWDebug
 
 
 Q_DECLARE_LOGGING_CATEGORY(LOG_AW)
@@ -42,6 +40,3 @@ 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.desktop ${CMAKE_CURRENT_SOURCE_DIR}/package/metadata.desktop)
+configure_file(metadata.json ${CMAKE_CURRENT_SOURCE_DIR}/package/metadata.json)
 
 add_subdirectory(plugin)
 plasma_install_package(package org.kde.plasma.awesomewidget)

sources/awesome-widget/metadata.desktop

@@ -1,28 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Awesome Widget
-Comment=A minimalistic Plasmoid
-Comment[en]=A minimalistic Plasmoid
-Comment[es]=Un plasmoide minimalista
-Comment[es]=Un script Plasmoïde minimaliste
-Comment[pt_BR]=Um script Plasmoid
-Comment[ru]=Минималистичный плазмоид
-Comment[uk]=Мінімалістичний плазмоїд
-X-KDE-ServiceTypes=Plasma/Applet
-Type=Service
-Icon=utilities-system-monitor
-
-X-KDE-ServiceTypes=Plasma/Applet
-X-Plasma-API=declarativeappletscript
-X-Plasma-MainScript=ui/main.qml
-X-Plasma-RemoteLocation=
-
-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

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

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

@@ -15,7 +15,7 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.15
 
 import org.kde.plasma.configuration 2.0
 
@@ -51,6 +51,12 @@ 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,150 +7,141 @@
 
     <group name="Widget">
         <!--   widget -->
-        <entry name="text" type="string">
+        <entry name="text" type="String">
             <default>[cpu: $cpu%] [mem: $mem%] [swap: $swap%] [$netdev: $down/$upKB/s]</default>
         </entry>
     </group>
 
     <group name="Advanced">
         <!--   advanced -->
-        <entry name="background" type="bool">
+        <entry name="background" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="translateStrings" type="bool">
+        <entry name="translateStrings" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="wrapNewLines" type="bool">
+        <entry name="wrapNewLines" type="Bool">
             <default>false</default>
         </entry>
-        <entry name="wrapText" type="bool">
+        <entry name="wrapText" type="Bool">
             <default>false</default>
         </entry>
-        <entry name="notify" type="bool">
+        <entry name="notify" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="checkUpdates" type="bool">
+        <entry name="checkUpdates" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="optimize" type="bool">
+        <entry name="optimize" type="Bool">
             <default>true</default>
         </entry>
-        <entry name="height" type="int">
+        <entry name="height" type="Int">
             <default>0</default>
         </entry>
-        <entry name="width" type="int">
+        <entry name="width" type="Int">
             <default>0</default>
         </entry>
-        <entry name="interval" type="int">
+        <entry name="interval" type="Int">
             <default>1000</default>
         </entry>
-        <entry name="queueLimit" type="int">
+        <entry name="tempUnits" type="String">
-            <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="telemetryCount" type="int">
+        <entry name="historyCount" 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,26 +15,22 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.15
+import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.awesomewidget 1.0
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget
 
 
-Item {
+KCM.SimpleKCM {
     id: aboutPage
+
     // backend
     AWActions {
         id: awActions
     }
 
-    width: childrenRect.width
-    height: childrenRect.height
-
     AboutTab {
         textProvider: awActions
     }
-
-    Component.onCompleted: {
-        if (debug) console.debug()
-    }
 }

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

@@ -15,26 +15,22 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.15
-import QtQuick.Controls 1.3 as QtControls
+import QtQuick.Controls
+import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.awesomewidget 1.0
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget
 
 
-Item {
+KCM.SimpleKCM {
     id: advancedPage
+
     // backend
-    AWActions {
+    AWConfigHelper {
-        id: awActions
+        id: awConfig
     }
 
-    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
@@ -45,19 +41,14 @@ Item {
     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_telemetryCount: telemetryCount.value
+    property alias cfg_historyCount: historyCount.value
-    property alias cfg_telemetryRemote: telemetryRemote.checked
-    property alias cfg_telemetryId: telemetryId.value
-
 
     Column {
-        id: pageColumn
         anchors.fill: parent
 
         CheckBoxSelector {
@@ -122,50 +113,41 @@ Item {
             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: cfg_tempUnits = newValue
+            onValueEdited: newValue => cfg_tempUnits = newValue
         }
 
         LineSelector {
@@ -192,18 +174,20 @@ Item {
             value: plasmoid.configuration.acOffline
         }
 
-        QtControls.GroupBox {
+        GroupBox {
-            height: implicitHeight
             width: parent.width
+            height: implicitHeight
             title: i18n("Actions")
 
             Column {
                 height: implicitHeight
                 width: parent.width
+
                 ButtonSelector {
                     value: i18n("Drop key cache")
-                    onButtonActivated: awActions.dropCache()
+                    onButtonActivated: awConfig.dropCache()
                 }
+
                 ButtonSelector {
                     ExportDialog {
                         id: saveConfigAs
@@ -212,11 +196,12 @@ Item {
                     value: i18n("Export configuration")
                     onButtonActivated: saveConfigAs.open()
                 }
+
                 ButtonSelector {
                     ImportDialog {
                         id: loadConfigFrom
                         onConfigurationReceived: {
-                            for (var key in configuration)
+                            for (const key in configuration)
                                 plasmoid.configuration[key] = configuration[key]
                         }
                     }
@@ -226,37 +211,24 @@ Item {
             }
         }
 
-        QtControls.GroupBox {
+        GroupBox {
             height: implicitHeight
             width: parent.width
-            title: i18n("Telemetry")
+            title: i18n("History")
 
             Column {
                 height: implicitHeight
                 width: parent.width
-                CheckBoxSelector {
+
-                    id: telemetryRemote
-                    text: i18n("Enable remote telemetry")
-                }
                 IntegerSelector {
-                    id: telemetryCount
+                    id: historyCount
                     maximumValue: 10000
                     minimumValue: 0
                     stepSize: 50
                     text: i18n("History count")
-                    value: plasmoid.configuration.telemetryCount
+                    value: plasmoid.configuration.historyCount
-                }
-                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,31 +15,22 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.15
+import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.awesomewidget 1.0
+import org.kde.plasma.awesomewidgets
-import "."
+import org.kde.plasma.private.awesomewidget
 
 
-Item {
+KCM.SimpleKCM {
     id: appearancePage
-    // backend
-    AWActions {
-        id: awActions
-    }
 
-    width: childrenRect.width
-    height: childrenRect.height
-    implicitWidth: pageColumn.implicitWidth
-    implicitHeight: pageColumn.implicitHeight
-
-    property bool debug: awActions.isDebugEnabled()
     property variant weight: {
         25: 0,
         50: 1,
         63: 3,
         75: 4,
-        87: 5
+        87: 5,
     }
 
     property alias cfg_fontFamily: font.value
@@ -50,9 +41,7 @@ Item {
     property alias cfg_textStyleColor: selectStyleColor.value
     property string cfg_textStyle: textStyle.value
 
-
     Column {
-        id: pageColumn
         anchors.fill: parent
 
         FontSelector {
@@ -72,18 +61,18 @@ Item {
 
         ComboBoxSelector {
             id: fontWeight
-            model: general.fontWeightModel
+            model: General.fontWeightModel
             text: i18n("Font weight")
             value: plasmoid.configuration.fontWeight
-            onValueEdited: cfg_fontWeight = newValue
+            onValueEdited: newValue => cfg_fontWeight = newValue
         }
 
         ComboBoxSelector {
             id: fontStyle
-            model: general.fontStyleModel
+            model: General.fontStyleModel
             text: i18n("Font style")
             value: plasmoid.configuration.fontStyle
-            onValueEdited: cfg_fontStyle = newValue
+            onValueEdited: newValue => cfg_fontStyle = newValue
         }
 
         ColorSelector {
@@ -94,10 +83,10 @@ Item {
 
         ComboBoxSelector {
             id: textStyle
-            model: general.textStyleModel
+            model: General.textStyleModel
             text: i18n("Style")
             value: plasmoid.configuration.textStyle
-            onValueEdited: cfg_textStyle = newValue
+            onValueEdited: newValue => cfg_textStyle = newValue
         }
 
         ColorSelector {
@@ -106,9 +95,4 @@ Item {
             value: plasmoid.configuration.textStyleColor
         }
     }
-
-
-    Component.onCompleted: {
-        if (debug) console.debug()
-    }
 }

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

@@ -15,16 +15,19 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.15
-import QtQuick.Controls 1.3 as QtControls
+import QtQuick.Controls
-import QtQuick.Dialogs 1.2 as QtDialogs
+import QtQuick.Dialogs
-import QtQuick.Layouts 1.2 as QtLayouts
+import QtQuick.Layouts
+import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.awesomewidget 1.0
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget
 
 
-QtDialogs.Dialog {
+KCM.SimpleKCM {
-    id: reportDialog
+    id: bugPage
+
     AWActions {
         id: awActions
     }
@@ -32,129 +35,125 @@ QtDialogs.Dialog {
         id: awBugReporter
     }
 
-    width: 640
+    ColumnLayout {
-    height: 480
-    property bool debug: awActions.isDebugEnabled()
-
-
-    title: i18n("Report a bug")
-    standardButtons: QtDialogs.StandardButton.Ok | QtDialogs.StandardButton.Cancel | QtDialogs.StandardButton.Reset
-
-    QtLayouts.ColumnLayout {
         anchors.fill: parent
 
-        QtControls.TextField {
+        TextField {
             id: title
-            anchors.left: parent.left
+            Layout.fillWidth: true
-            anchors.right: parent.right
             placeholderText: i18n("Report subject")
         }
-        QtLayouts.ColumnLayout {
-            anchors.left: parent.left
-            anchors.right: parent.right
 
-            QtControls.GroupBox {
+        ColumnLayout {
-                anchors.left: parent.left
+            Layout.fillWidth: true
-                anchors.right: parent.right
+
-                height: parent.height / 5
+            GroupBox {
+                Layout.fillWidth: true
                 title: i18n("Description")
-                QtControls.TextArea {
+
+                TextArea {
                     id: description
                     anchors.fill: parent
                     textFormat: TextEdit.PlainText
                 }
             }
-            QtControls.GroupBox {
+
-                anchors.left: parent.left
+            GroupBox {
-                anchors.right: parent.right
+                Layout.fillWidth: true
-                height: parent.height / 5
                 title: i18n("Steps to reproduce")
-                QtControls.TextArea {
+
+                TextArea {
                     id: reproduce
                     anchors.fill: parent
                     textFormat: TextEdit.PlainText
                 }
             }
-            QtControls.GroupBox {
+
-                anchors.left: parent.left
+            GroupBox {
-                anchors.right: parent.right
+                Layout.fillWidth: true
-                height: parent.height / 5
                 title: i18n("Expected result")
-                QtControls.TextArea {
+
+                TextArea {
                     id: expected
                     anchors.fill: parent
                     textFormat: TextEdit.PlainText
                 }
             }
-            QtControls.GroupBox {
+
-                anchors.left: parent.left
+            GroupBox {
-                anchors.right: parent.right
+                Layout.fillWidth: true
-                anchors.bottom: parent.bottom
+                Layout.alignment: Qt.AlignBottom
                 title: i18n("Logs")
-                QtLayouts.ColumnLayout {
+
+                ColumnLayout {
                     anchors.fill: parent
+                    Layout.fillWidth: true
+
                     Row {
-                        anchors.left: parent.left
+                        Layout.fillWidth: true
-                        anchors.right: parent.right
+
-                        QtControls.Label {
+                        Label {
                             width: parent.width * 2 / 5
                             horizontalAlignment: Text.AlignJustify
                             verticalAlignment: Text.AlignVCenter
                             wrapMode: Text.WordWrap
                             text: i18n("Use command")
                         }
-                        QtControls.TextField {
+
+                        TextField {
                             width: parent.width * 3 / 5
                             readOnly: true
                             text: "QT_LOGGING_RULES=*=true plasmawindowed org.kde.plasma.awesomewidget"
                         }
                     }
-                    QtControls.Button {
+
-                        anchors.left: parent.left
+                    Button {
-                        anchors.right: parent.right
+                        Layout.fillWidth: true
                         text: i18n("Load log file")
                         onClicked: logPath.open()
                     }
-                    QtControls.TextArea {
+
+                    TextArea {
                         id: logBody
-                        anchors.left: parent.left
+                        Layout.fillWidth: true
-                        anchors.right: parent.right
+                        Layout.alignment: Qt.AlignBottom
-                        anchors.bottom: parent.bottom
                         textFormat: TextEdit.PlainText
                     }
                 }
 
-                QtDialogs.FileDialog {
+                FileDialog {
                     id: logPath
                     title: i18n("Open log file")
-                    onAccepted:
+                    onAccepted: logBody.text = awActions.getFileContent(logPath.selectedFile.toString().replace("file://", ""))
-                    logBody.text = awActions.getFileContent(logPath.fileUrl.toString().replace("file://", ""))
                 }
             }
+
+            DialogButtonBox {
+                Layout.fillWidth: true
+
+                standardButtons: DialogButtonBox.Ok | DialogButtonBox.Reset
+                alignment: Qt.AlignRight
+                onAccepted: sendBugReport()
+                onReset: resetDialog()
+            }
         }
     }
 
-    onAccepted: {
+    function sendBugReport() {
-        if (debug) console.debug()
+        const text = awBugReporter.generateText(description.text, reproduce.text, expected.text, logBody.text)
-
-        var text = awBugReporter.generateText(description.text, reproduce.text,
-                                              expected.text, logBody.text)
         awBugReporter.sendBugReport(title.text, text)
     }
 
-    onReset: {
+    function resetDialog() {
-        if (debug) console.debug()
-
         title.text = ""
         description.text = ""
         reproduce.text = ""
         expected.text = ""
+        logBody.text = ""
     }
 
     Component.onCompleted: {
-        if (debug) console.debug()
+        resetDialog()
-
         awBugReporter.doConnect()
     }
 }
-

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

@@ -15,105 +15,46 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
+import QtQuick 2.15
-import QtQuick.Controls 1.3 as QtControls
+import QtQuick.Controls
-import QtQuick.Dialogs 1.1 as QtDialogs
+import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.awesomewidget 1.0
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget
 
 
-Item {
+KCM.SimpleKCM {
     id: dataenginePage
+
     // backend
     AWKeys {
         id: awKeys
     }
-    AWActions {
-        id: awActions
-    }
     AWConfigHelper {
         id: awConfig
     }
 
-    width: childrenRect.width
-    height: childrenRect.height
-    implicitWidth: pageColumn.implicitWidth
-    implicitHeight: pageColumn.implicitHeight
-
-    property bool debug: awActions.isDebugEnabled()
-
     property variant cfg_dataengine: awConfig.readDataEngineConfiguration()
 
-
     Column {
-        id: pageColumn
         anchors.fill: parent
-        QtControls.GroupBox {
+
+        GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("ACPI")
             LineSelector {
                 text: i18n("ACPI path")
                 value: cfg_dataengine["ACPIPATH"]
-                onValueEdited: cfg_dataengine["ACPIPATH"] = newValue
+                onValueEdited: newValue => cfg_dataengine["ACPIPATH"] = newValue
             }
         }
 
-        QtControls.GroupBox {
+        GroupBox {
-            height: implicitHeight
-            width: parent.width
-            title: i18n("GPU")
-            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
@@ -123,27 +64,27 @@ Item {
                     stepSize: 1
                     text: i18n("Player data symbols")
                     value: cfg_dataengine["PLAYERSYMBOLS"]
-                    onValueEdited: cfg_dataengine["PLAYERSYMBOLS"] = newValue
+                    onValueEdited: newValue => 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: cfg_dataengine["PLAYER"] = newValue
+                    onValueEdited: newValue => cfg_dataengine["PLAYER"] = newValue
                 }
 
                 ComboBoxSelector {
@@ -151,40 +92,40 @@ Item {
                     editable: true
                     model: [
                         {
-                            'label': 'auto',
+                            "label": "auto",
-                            'name': 'auto'
+                            "name": "auto"
                         },
                         {
-                            'label': 'amarok',
+                            "label": "amarok",
-                            'name': 'amarok'
+                            "name": "amarok"
                         },
                         {
-                            'label': 'audacious',
+                            "label": "audacious",
-                            'name': 'audacious'
+                            "name": "audacious"
                         },
                         {
-                            'label': 'clementine',
+                            "label": "clementine",
-                            'name': 'clementine'
+                            "name": "clementine"
                         },
                         {
-                            'label': 'deadbeef',
+                            "label": "DeaDBeeF",
-                            'name': 'deadbeef'
+                            "name": "DeaDBeeF"
                         },
                         {
-                            'label': 'vlc',
+                            "label": "vlc",
-                            'name': 'vlc'
+                            "name": "vlc"
                         },
                         {
-                            'label': 'qmmp',
+                            "label": "qmmp",
-                            'name': 'qmmp'
+                            "name": "qmmp"
                         },
                         {
-                            'label': 'xmms2',
+                            "label": "xmms2",
-                            'name': 'xmms2'
+                            "name": "xmms2"
                         },
                         {
-                            'label': cfg_dataengine["MPRIS"],
+                            "label": cfg_dataengine["MPRIS"],
-                            'name': cfg_dataengine["MPRIS"]
+                            "name": cfg_dataengine["MPRIS"]
                         }
                     ]
                     text: i18n("MPRIS player name")
@@ -194,7 +135,7 @@ Item {
                 LineSelector {
                     text: i18n("MPD address")
                     value: cfg_dataengine["MPDADDRESS"]
-                    onValueEdited: cfg_dataengine["MPDADDRESS"] = newValue
+                    onValueEdited: newValue => cfg_dataengine["MPDADDRESS"] = newValue
                 }
 
                 IntegerSelector {
@@ -203,18 +144,20 @@ Item {
                     stepSize: 1
                     text: i18n("MPD port")
                     value: cfg_dataengine["MPDPORT"]
-                    onValueEdited: cfg_dataengine["MPDPORT"] = newValue
+                    onValueEdited: newValue => cfg_dataengine["MPDPORT"] = newValue
                 }
             }
         }
 
-        QtControls.GroupBox {
+        GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("Extensions")
+
             Column {
                 height: implicitHeight
                 width: parent.width
+
                 ButtonSelector {
                     value: i18n("Custom scripts")
                     onButtonActivated: awKeys.editItem("extscript")
@@ -245,19 +188,11 @@ Item {
 
 
     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,20 +15,18 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.4
+import QtQuick 2.15
-import QtQuick.Controls 1.3 as QtControls
+import QtQuick.Layouts
-import QtQuick.Dialogs 1.2 as QtDialogs
+import org.kde.plasma.core as PlasmaCore
-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.private.awesomewidget 1.0
+import org.kde.plasma.awesomewidgets
-import "."
+import org.kde.plasma.private.awesomewidget
 
 
-Item {
+PlasmoidItem {
     id: main
+
     // backend
     AWKeys {
         id: awKeys
@@ -39,11 +37,7 @@ Item {
     AWTelemetryHandler {
         id: awTelemetryHandler
     }
-    BugReport {
-        id: bugReport
-    }
 
-    property bool debug: awActions.isDebugEnabled()
     property variant tooltipSettings: {
         "tooltipNumber": plasmoid.configuration.tooltipNumber,
         "useTooltipBackground": plasmoid.configuration.useTooltipBackground,
@@ -73,19 +67,12 @@ Item {
     signal needToolTipUpdate(string newText)
     signal sizeUpdate
 
-
+    Layout.fillWidth: PlasmoidItem.formFactor !== PlasmaCore.Planar
-    // init
+    Layout.fillHeight: PlasmoidItem.formFactor !== PlasmaCore.Planar
-    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 {
@@ -95,16 +82,16 @@ Item {
         textFormat: Text.RichText
         wrapMode: plasmoid.configuration.wrapText ? Text.WordWrap : Text.NoWrap
 
-        horizontalAlignment: general.align[plasmoid.configuration.textAlign]
+        horizontalAlignment: General.align[plasmoid.configuration.textAlign]
         verticalAlignment: Text.AlignVCenter
 
         color: plasmoid.configuration.fontColor
         font.family: plasmoid.configuration.fontFamily
-        font.italic: plasmoid.configuration.fontStyle == "italic" ? true : false
+        font.italic: plasmoid.configuration.fontStyle === "italic"
         font.pointSize: plasmoid.configuration.fontSize
-        font.weight: general.fontWeight[plasmoid.configuration.fontWeight]
+        font.weight: General.fontWeight[plasmoid.configuration.fontWeight]
 
-        style: general.textStyle[plasmoid.configuration.textStyle]
+        style: General.textStyle[plasmoid.configuration.textStyle]
         styleColor: plasmoid.configuration.textStyleColor
 
         PlasmaCore.ToolTipArea {
@@ -119,73 +106,55 @@ Item {
         }
     }
 
-    QtDialogs.Dialog {
+    Plasmoid.contextualActions: [
-        id: tagSelector
+        PlasmaCore.Action {
-        title: i18n("Select tag")
+            text: i18n("Run monitor")
-
+            icon.name: "utilities-system-monitor"
-        QtControls.ComboBox {
+            onTriggered: awActions.runCmd("plasma-systemmonitor", [])
-            id: tagSelectorBox
+        },
-            width: parent.width
+        PlasmaCore.Action {
-            editable: true
+            text: i18n("Show README")
+            icon.name: "text-x-readme"
+            onTriggered: awActions.showReadme()
+        },
+        PlasmaCore.Action {
+            text: i18n("Check updates")
+            icon.name: "system-software-update"
+            onTriggered: awActions.checkUpdates(true)
         }
-
+    ]
-        onAccepted: {
-            var tag = tagSelectorBox.editText
-            var message = i18n("Tag: %1", tag)
-            message += "<br>"
-            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: {
+    onNeedTextUpdate: newText => {
-        if (debug) console.debug()
-
         text.text = newText
         sizeUpdate()
     }
 
-    onNeedToolTipUpdate: {
+    onNeedToolTipUpdate: newText => {
-        if (debug) console.debug()
-
         tooltip.text = newText
     }
 
     onSizeUpdate: {
-        if (debug) console.debug()
         // 16 is a magic number
         // in other case plasmoid will increase own size on each update
-
+        if (plasmoid.configuration.height === 0) {
-        if (plasmoid.configuration.height == 0) {
             Layout.minimumHeight = text.contentHeight - 16
             Layout.maximumHeight = -1
         } else {
             Layout.minimumHeight = plasmoid.configuration.height
             Layout.maximumHeight = plasmoid.configuration.height
         }
-        if (plasmoid.configuration.width == 0) {
+        if (plasmoid.configuration.width === 0) {
             Layout.minimumWidth = text.contentWidth - 16
             Layout.maximumWidth = -1
         } else {
@@ -196,12 +165,10 @@ Item {
 
     Plasmoid.onUserConfiguringChanged: {
         if (plasmoid.userConfiguring) return
-        if (debug) console.debug()
 
         // init submodule
         awKeys.initDataAggregator(tooltipSettings)
-        awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.interval,
+        awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.interval, plasmoid.configuration.optimize)
-                        plasmoid.configuration.queueLimit, plasmoid.configuration.optimize)
         awKeys.setWrapNewLines(plasmoid.configuration.wrapNewLines)
         // configure aggregator
         awKeys.setAggregatorProperty("acOffline", plasmoid.configuration.acOffline)
@@ -210,49 +177,8 @@ Item {
         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.telemetryCount,
+        awTelemetryHandler.init(plasmoid.configuration.historyCount)
-                                plasmoid.configuration.telemetryRemote,
+        awTelemetryHandler.put("awwidgetconfig", plasmoid.configuration.text)
-                                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

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

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

@@ -15,14 +15,17 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.2
+import QtQuick 2.15
+import QtQuick.Controls
+import org.kde.kcmutils as KCM
 
-import org.kde.plasma.private.awesomewidget 1.0
+import org.kde.plasma.awesomewidgets
-import "."
+import org.kde.plasma.private.awesomewidget
 
 
-Item {
+KCM.SimpleKCM {
     id: widgetPage
+
     // backend
     AWKeys {
         id: awKeys
@@ -31,21 +34,12 @@ Item {
         id: awActions
     }
 
-    width: childrenRect.width
-    height: childrenRect.height
-    implicitWidth: pageColumn.implicitWidth
-    implicitHeight: pageColumn.implicitHeight
-
-    property bool debug: awActions.isDebugEnabled()
-
     property alias cfg_text: textPattern.text
     property bool lock: true
 
     signal needTextUpdate(string newText)
 
-
     Column {
-        id: pageColumn
         anchors.fill: parent
 
         AWInfoLabel {}
@@ -58,7 +52,7 @@ Item {
             backend: awKeys
             notifyBackend: awActions
             textArea: textPattern
-            groups: general.awTagRegexp
+            groups: General.awTagRegexp
         }
 
         AWExtensions {
@@ -74,10 +68,7 @@ Item {
         }
     }
 
-
     Component.onCompleted: {
-        if (debug) console.debug()
-
         awKeys.needTextToBeUpdated.connect(needTextUpdate)
         // init submodule
         awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.interval,
@@ -90,9 +81,8 @@ Item {
         awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings)
     }
 
-    onNeedTextUpdate: {
+    onNeedTextUpdate: newText => {
         if (lock) return
-        if (debug) console.debug()
 
         extensions.showMessage(newText)
         lock = true

sources/awesome-widget/package/metadata.desktop

@@ -1,28 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Awesome Widget
-Comment=A minimalistic Plasmoid
-Comment[en]=A minimalistic Plasmoid
-Comment[es]=Un plasmoide minimalista
-Comment[es]=Un script Plasmoïde minimaliste
-Comment[pt_BR]=Um script Plasmoid
-Comment[ru]=Минималистичный плазмоид
-Comment[uk]=Мінімалістичний плазмоїд
-X-KDE-ServiceTypes=Plasma/Applet
-Type=Service
-Icon=utilities-system-monitor
-
-X-KDE-ServiceTypes=Plasma/Applet
-X-Plasma-API=declarativeappletscript
-X-Plasma-MainScript=ui/main.qml
-X-Plasma-RemoteLocation=
-
-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.3.1
-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

@@ -0,0 +1,26 @@
+{
+    "KPackageStructure": "Plasma/Applet",
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "esalexeev@gmail.com",
+                "Name": "Evgeniy Alekseev aka arcanis"
+            }
+        ],
+        "Category": "System Information",
+        "Description": "A minimalistic Plasmoid",
+        "Description[en]": "A minimalistic Plasmoid",
+        "Description[es]": "Un script Plasmoïde minimaliste",
+        "Description[pt_BR]": "Um script Plasmoid",
+        "Description[ru]": "Минималистичный плазмоид",
+        "Description[uk]": "Мінімалістичний плазмоїд",
+        "EnabledByDefault": true,
+        "Icon": "utilities-system-monitor",
+        "Id": "org.kde.plasma.awesomewidget",
+        "License": "GPLv3",
+        "Name": "Awesome Widget",
+        "Version": "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}
-        ${Kf5_INCLUDE}
+        ${Kf6_INCLUDE}
 )
 
-file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
+file(GLOB SUBPROJECT_SOURCE *.cpp formatters/*.cpp matchers/*.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
 file(GLOB SUBPROJECT_UI *.ui)
 file(GLOB SUBPROJECT_NOTIFY *.notifyrc)
 
-qt5_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
+qt6_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI} OPTIONS --translate ui_i18n)
 add_library(${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE} ${SUBPROJECT_UI_HEADER})
-target_link_libraries(${PLUGIN_NAME} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
+target_link_libraries(${PLUGIN_NAME} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf6_LIBRARIES})
 
-install(TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget)
+install(TARGETS ${PLUGIN_NAME} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/awesomewidget)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget)
+install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/awesomewidget)
-install(FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KNOTIFYRC_INSTALL_DIR})
+install(FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})

sources/awesome-widget/plugin/awabstractpairconfig.cpp

@@ -0,0 +1,188 @@
+/***************************************************************************
+ *   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 "awabstractpairconfig.h"
+#include "ui_awabstractpairconfig.h"
+
+#include <KI18n/KLocalizedString>
+
+#include <QPushButton>
+#include <utility>
+
+#include "awabstractselector.h"
+#include "awdebug.h"
+
+
+AWAbstractPairConfig::AWAbstractPairConfig(QWidget *_parent, const bool _hasEdit, QStringList _keys)
+    : QDialog(_parent)
+    , ui(new Ui::AWAbstractPairConfig)
+    , m_hasEdit(_hasEdit)
+    , m_keys(std::move(_keys))
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    ui->setupUi(this);
+
+    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &AWAbstractPairConfig::accept);
+    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &AWAbstractPairConfig::reject);
+
+    // edit feature
+    if (m_hasEdit) {
+        m_editButton = ui->buttonBox->addButton(i18n("Edit"), QDialogButtonBox::ActionRole);
+        connect(m_editButton, &QPushButton::clicked, [this]() { return edit(); });
+    }
+}
+
+
+AWAbstractPairConfig::~AWAbstractPairConfig()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    clearSelectors();
+
+    delete ui;
+}
+
+
+void AWAbstractPairConfig::setHelper(std::unique_ptr<AWAbstractPairHelper> _helper)
+{
+    m_helper = std::move(_helper);
+}
+
+
+void AWAbstractPairConfig::showDialog()
+{
+    // update dialog
+    updateDialog();
+    // exec dialog
+    return execDialog();
+}
+
+
+void AWAbstractPairConfig::setEditable(const bool _first, const bool _second)
+{
+    qCDebug(LOG_AW) << "Set editable" << _first << _second;
+
+    m_editable = {_first, _second};
+}
+
+
+void AWAbstractPairConfig::edit()
+{
+    m_helper->editPairs();
+    updateDialog();
+}
+
+
+void AWAbstractPairConfig::updateUi()
+{
+    auto current = dynamic_cast<AWAbstractSelector *>(sender())->current();
+    auto 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);
+        ui->verticalLayout->removeWidget(selector);
+        selector->deleteLater();
+    } else {
+        // add new selector if something changed
+        if (sender() != m_selectors.last())
+            return;
+        auto keys = initKeys();
+        addSelector(keys.first, keys.second, QPair<QString, QString>());
+    }
+}
+
+
+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;
+
+    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);
+    m_selectors.append(selector);
+}
+
+
+void AWAbstractPairConfig::clearSelectors()
+{
+    for (auto selector : m_selectors) {
+        disconnect(selector, &AWAbstractSelector::selectionChanged, this, &AWAbstractPairConfig::updateUi);
+        ui->verticalLayout->removeWidget(selector);
+        selector->deleteLater();
+    }
+    m_selectors.clear();
+}
+
+
+void AWAbstractPairConfig::execDialog()
+{
+    auto ret = exec();
+    QHash<QString, QString> data;
+    for (auto selector : m_selectors) {
+        auto select = selector->current();
+        if (select.first.isEmpty())
+            continue;
+        data[select.first] = select.second;
+    }
+
+    // save configuration if required
+    auto status = true;
+    switch (ret) {
+    case 0:
+        break;
+    case 1:
+    default:
+        status &= m_helper->writeItems(data);
+        status &= m_helper->removeUnusedKeys(data.keys());
+        break;
+    }
+    qCDebug(LOG_AW) << "Configuration save status" << status;
+}
+
+
+QPair<QStringList, QStringList> AWAbstractPairConfig::initKeys() const
+{
+    // we are adding empty string at the start
+    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};
+}
+
+
+void AWAbstractPairConfig::updateDialog()
+{
+    clearSelectors();
+    auto pairs = m_helper->pairs();
+    auto keys = initKeys();
+
+    for (auto &key : m_helper->keys())
+        addSelector(keys.first, keys.second, {key, pairs[key]});
+    // empty one
+    addSelector(keys.first, keys.second, {});
+}

sources/awesome-widget/plugin/awabstractpairconfig.h

@@ -0,0 +1,62 @@
+/***************************************************************************
+ *   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 <QDialog>
+
+#include "awabstractpairhelper.h"
+
+
+class AWAbstractSelector;
+namespace Ui
+{
+class AWAbstractPairConfig;
+}
+
+class AWAbstractPairConfig : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit AWAbstractPairConfig(QWidget *_parent = nullptr, bool _hasEdit = false, QStringList _keys = {});
+    ~AWAbstractPairConfig() override;
+    void setHelper(std::unique_ptr<AWAbstractPairHelper> _helper);
+    void showDialog();
+    // properties
+    void setEditable(bool _first, bool _second);
+
+private slots:
+    void edit();
+    void updateUi();
+
+private:
+    QPushButton *m_editButton = nullptr;
+    Ui::AWAbstractPairConfig *ui = nullptr;
+    std::unique_ptr<AWAbstractPairHelper> m_helper;
+    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 clearSelectors();
+    void execDialog();
+    [[nodiscard]] QPair<QStringList, QStringList> initKeys() const;
+    void updateDialog();
+};

sources/awesome-widget/plugin/awabstractpairconfig.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>AWFormatterConfig</class>
+ <class>AWAbstractPairConfig</class>
- <widget class="QDialog" name="AWFormatterConfig">
+ <widget class="QDialog" name="AWAbstractPairConfig">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -60,7 +60,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>AWFormatterConfig</receiver>
+   <receiver>AWAbstractPairConfig</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -76,7 +76,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>AWFormatterConfig</receiver>
+   <receiver>AWAbstractPairConfig</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">

sources/awesome-widget/plugin/awabstractpairhelper.cpp

@@ -0,0 +1,128 @@
+/***************************************************************************
+ *   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 "awabstractpairhelper.h"
+
+#include <QSettings>
+#include <QStandardPaths>
+#include <utility>
+
+#include "awdebug.h"
+
+
+AWAbstractPairHelper::AWAbstractPairHelper(QString _filePath, QString _section)
+    : m_filePath(std::move(_filePath))
+    , m_section(std::move(_section))
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    AWAbstractPairHelper::initItems();
+}
+
+
+QStringList AWAbstractPairHelper::keys() const
+{
+    return m_pairs.keys();
+}
+
+
+QHash<QString, QString> AWAbstractPairHelper::pairs() const
+{
+    return m_pairs;
+}
+
+
+QStringList AWAbstractPairHelper::values() const
+{
+    return m_pairs.values();
+}
+
+
+QSet<QString> AWAbstractPairHelper::valuesSet() const
+{
+    auto values = m_pairs.values();
+    return {values.cbegin(), values.cend()};
+}
+
+
+void AWAbstractPairHelper::initItems()
+{
+    m_pairs.clear();
+
+    auto 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();
+        for (auto &key : keys) {
+            auto value = settings.value(key).toString();
+            qCInfo(LOG_AW) << "Found key" << key << "for value" << value << "in" << settings.fileName();
+            if (value.isEmpty()) {
+                qCInfo(LOG_AW) << "Skip empty value for" << key;
+                continue;
+            }
+            m_pairs[key] = value;
+        }
+        settings.endGroup();
+    }
+}
+
+
+bool AWAbstractPairHelper::writeItems(const QHash<QString, QString> &_configuration) const
+{
+    qCDebug(LOG_AW) << "Write configuration" << _configuration;
+
+    auto fileName
+        = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation), m_filePath);
+    QSettings settings(fileName, QSettings::IniFormat);
+    qCInfo(LOG_AW) << "Configuration file" << fileName;
+
+    settings.beginGroup(m_section);
+    for (auto &key : _configuration.keys())
+        settings.setValue(key, _configuration[key]);
+    settings.endGroup();
+
+    settings.sync();
+
+    return settings.status() == QSettings::NoError;
+}
+
+
+bool AWAbstractPairHelper::removeUnusedKeys(const QStringList &_keys) const
+{
+    qCDebug(LOG_AW) << "Remove keys" << _keys;
+
+    auto fileName
+        = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation), m_filePath);
+    QSettings settings(fileName, QSettings::IniFormat);
+    qCInfo(LOG_AW) << "Configuration file" << fileName;
+
+    settings.beginGroup(m_section);
+    for (auto &key : settings.childKeys()) {
+        if (_keys.contains(key))
+            continue;
+        settings.remove(key);
+    }
+    settings.endGroup();
+
+    settings.sync();
+
+    return settings.status() == QSettings::NoError;
+}

sources/awesome-widget/plugin/awabstractpairhelper.h

@@ -0,0 +1,46 @@
+/***************************************************************************
+ *   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 <QHash>
+
+
+class AWAbstractPairHelper
+{
+public:
+    explicit AWAbstractPairHelper(QString _filePath = "", QString _section = "");
+    virtual ~AWAbstractPairHelper() = default;
+    [[nodiscard]] QStringList keys() const;
+    [[nodiscard]] QHash<QString, QString> pairs() const;
+    [[nodiscard]] QStringList values() const;
+    [[nodiscard]] QSet<QString> valuesSet() const;
+    // read-write methods
+    virtual void initItems();
+    [[nodiscard]] virtual bool writeItems(const QHash<QString, QString> &_configuration) const;
+    [[nodiscard]] virtual bool removeUnusedKeys(const QStringList &_keys) const;
+    // configuration related
+    virtual void editPairs() = 0;
+    virtual QStringList leftKeys() = 0;
+    virtual QStringList rightKeys() = 0;
+
+private:
+    // properties
+    QHash<QString, QString> m_pairs;
+    QString m_filePath;
+    QString m_section;
+};

sources/awesome-widget/plugin/awabstractselector.cpp

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

sources/awesome-widget/plugin/awabstractselector.h

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

sources/awesome-widget/plugin/awactions.cpp

@@ -40,14 +40,6 @@ AWActions::AWActions(QObject *_parent)
 }
 
 
-AWActions::~AWActions()
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    delete m_updateHelper;
-}
-
-
 void AWActions::checkUpdates(const bool _showAnyway)
 {
     qCDebug(LOG_AW) << "Show anyway" << _showAnyway;
@@ -57,64 +49,41 @@ void AWActions::checkUpdates(const bool _showAnyway)
 }
 
 
-QString AWActions::getFileContent(const QString &_path) const
+QString AWActions::getFileContent(const QString &_path)
 {
     qCDebug(LOG_AW) << "Get content from file" << _path;
 
     QFile inputFile(_path);
     if (!inputFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        qCWarning(LOG_AW) << "Could not open file as text"
+        qCWarning(LOG_AW) << "Could not open file as text" << inputFile.fileName();
-                          << inputFile.fileName();
         return "";
     }
 
-    QString output = inputFile.readAll();
+    auto output = inputFile.readAll();
     inputFile.close();
     return output;
 }
 
 
-// HACK: since QML could not use QLoggingCategory I need this hack
+bool AWActions::runCmd(const QString &_cmd, const QStringList &_args)
-bool AWActions::isDebugEnabled() const
 {
-    return LOG_AW().isDebugEnabled();
+    qCDebug(LOG_AW) << "Cmd" << _cmd << "args" << _args;
-}
 
+    sendNotification("system", i18n("Run %1", _cmd));
 
-bool AWActions::runCmd(const QString &_cmd) const
+    return QProcess::startDetached(_cmd, _args);
-{
-    qCDebug(LOG_AW) << "Cmd" << _cmd;
-
-    sendNotification(QString("Info"), i18n("Run %1", _cmd));
-
-    return QProcess::startDetached(_cmd);
 }
 
 
 // HACK: this method uses variable from version.h
-void AWActions::showReadme() const
+void AWActions::showReadme()
 {
     QDesktopServices::openUrl(QUrl(HOMEPAGE));
 }
 
 
-void AWActions::showLegacyInfo() const
-{
-    QMessageBox *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) const
+QString AWActions::getAboutText(const QString &_type)
 {
     qCDebug(LOG_AW) << "Type" << _type;
 
@@ -122,17 +91,15 @@ QString AWActions::getAboutText(const QString &_type) const
 }
 
 
-QVariantMap AWActions::getFont(const QVariantMap &_defaultFont) const
+QVariantMap AWActions::getFont(const QVariantMap &_defaultFont)
 {
     qCDebug(LOG_AW) << "Default font is" << _defaultFont;
 
     QVariantMap fontMap;
-    int ret = 0;
+    auto ret = 0;
-    CFont defaultCFont
+    auto defaultCFont = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(), 400, false,
-        = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(),
+                              _defaultFont["color"].toString());
-                400, 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();
@@ -144,13 +111,10 @@ QVariantMap AWActions::getFont(const QVariantMap &_defaultFont) const
 
 
 // to avoid additional object definition this method is static
-void AWActions::sendNotification(const QString &_eventId,
+void AWActions::sendNotification(const QString &_eventId, const QString &_message)
-                                 const QString &_message)
 {
     qCDebug(LOG_AW) << "Event" << _eventId << "with message" << _message;
 
-    KNotification *notification = KNotification::event(
+    auto event = KNotification::event(_eventId, QString("Awesome Widget ::: %1").arg(_eventId), _message);
-        _eventId, QString("Awesome Widget ::: %1").arg(_eventId), _message);
+    event->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
-    notification->setComponentName(
-        "plasma-applet-org.kde.plasma.awesome-widget");
 }

sources/awesome-widget/plugin/awactions.h

@@ -15,9 +15,7 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
+#pragma once
-#ifndef AWACTIONS_H
-#define AWACTIONS_H
 
 #include <QMap>
 #include <QObject>
@@ -31,24 +29,18 @@ class AWActions : public QObject
 
 public:
     explicit AWActions(QObject *_parent = nullptr);
-    virtual ~AWActions();
+    ~AWActions() override = default;
-    Q_INVOKABLE void checkUpdates(const bool _showAnyway = false);
+    Q_INVOKABLE void checkUpdates(bool _showAnyway = false);
-    Q_INVOKABLE QString getFileContent(const QString &_path) const;
+    Q_INVOKABLE static QString getFileContent(const QString &_path);
-    Q_INVOKABLE bool isDebugEnabled() const;
+    Q_INVOKABLE static bool runCmd(const QString &_cmd, const QStringList &_args);
-    Q_INVOKABLE bool runCmd(const QString &_cmd) const;
+    Q_INVOKABLE static void showReadme();
-    Q_INVOKABLE void showLegacyInfo() const;
-    Q_INVOKABLE void showReadme() const;
     // configuration slots
-    Q_INVOKABLE QString getAboutText(const QString &_type) const;
+    Q_INVOKABLE static QString getAboutText(const QString &_type);
-    Q_INVOKABLE QVariantMap getFont(const QVariantMap &_defaultFont) const;
+    Q_INVOKABLE static QVariantMap getFont(const QVariantMap &_defaultFont);
 
 public slots:
-    Q_INVOKABLE static void sendNotification(const QString &_eventId,
+    Q_INVOKABLE static void sendNotification(const QString &_eventId, const QString &_message);
-                                             const QString &_message);
 
 private:
     AWUpdateHelper *m_updateHelper = nullptr;
 };
-
-
-#endif /* AWACTIONS_H */

sources/awesome-widget/plugin/awbugreporter.cpp

@@ -18,14 +18,13 @@
 #include "awbugreporter.h"
 
 #include <KI18n/KLocalizedString>
+#include <KNotifications/KNotification>
 
 #include <QDesktopServices>
 #include <QJsonDocument>
-#include <QJsonParseError>
 #include <QMessageBox>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QNetworkRequest>
 
 #include "awdebug.h"
 
@@ -34,39 +33,39 @@ 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()
+void AWBugReporter::doConnect() const
 {
     // additional method for testing needs
-    connect(this, SIGNAL(replyReceived(const int, const QString &)), this,
+    connect(this, &AWBugReporter::replyReceived, this, &AWBugReporter::showInformation);
-            SLOT(showInformation(const int, const QString &)));
 }
 
 
-QString AWBugReporter::generateText(const QString &_description,
+QString AWBugReporter::generateText(const QString &_description, const QString &_reproduce, const QString &_expected,
-                                    const QString &_reproduce,
+                                    const QString &_logs)
-                                    const QString &_expected,
-                                    const QString &_logs) const
 {
     // do not log _logs here, it may have quite large size
-    qCDebug(LOG_AW) << "Generate text with description" << _description
+    qCDebug(LOG_AW) << "Generate text with description" << _description << "steps" << _reproduce
-                    << "steps" << _reproduce << "and expected result"
+                    << "and expected result" << _expected;
-                    << _expected;
 
     QString output;
     output += QString("**Description**\n\n%1\n\n").arg(_description);
     output += QString("**Step to _reproduce**\n\n%1\n\n").arg(_reproduce);
     output += QString("**Expected result**\n\n%1\n\n").arg(_expected);
-    output += QString("**Version**\n\n%1\n\n")
+    output += QString("**Version**\n\n%1\n\n").arg(AWDebug::getBuildData().join(QString("\n")));
-                  .arg(AWDebug::getBuildData().join(QString("\n")));
     // append _logs
     output += QString("**Logs**\n\n%1").arg(_logs);
 
@@ -76,41 +75,34 @@ QString AWBugReporter::generateText(const QString &_description,
 
 void AWBugReporter::sendBugReport(const QString &_title, const QString &_body)
 {
-    qCDebug(LOG_AW) << "Send bug report with title" << _title << "and body"
+    qCDebug(LOG_AW) << "Send bug report with title" << _title << "and body" << _body;
-                    << _body;
 
-    QNetworkAccessManager *manager = new QNetworkAccessManager(nullptr);
-    connect(manager, SIGNAL(finished(QNetworkReply *)), this,
-            SLOT(issueReplyRecieved(QNetworkReply *)));
 
-    QNetworkRequest request = QNetworkRequest(QUrl(BUGTRACKER_API));
+    auto 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
-    QByteArray data
+    auto data = QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact);
-        = QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact);
+    qCInfo(LOG_AW) << "Send request with _body" << data.data() << "and size" << data.size();
-    qCInfo(LOG_AW) << "Send request with _body" << data.data() << "and size"
-                   << data.size();
 
-    manager->post(request, data);
+    m_manager->post(request, data);
 }
 
 
-void AWBugReporter::issueReplyRecieved(QNetworkReply *_reply)
+void AWBugReporter::issueReplyReceived(QNetworkReply *_reply)
 {
     if (_reply->error() != QNetworkReply::NoError) {
-        qCWarning(LOG_AW) << "An error occurs" << _reply->error()
+        qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message" << _reply->errorString();
-                          << "with message" << _reply->errorString();
         return emit(replyReceived(0, ""));
     }
 
-    QJsonParseError error;
+    QJsonParseError error{};
-    QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
+    auto jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
     if (error.error != QJsonParseError::NoError) {
         qCWarning(LOG_AW) << "Parse error" << error.errorString();
         return emit(replyReceived(0, ""));
@@ -118,46 +110,30 @@ void AWBugReporter::issueReplyRecieved(QNetworkReply *_reply)
     _reply->deleteLater();
 
     // convert to map
-    QVariantMap response = jsonDoc.toVariant().toMap();
+    auto response = jsonDoc.toVariant().toMap();
-    QString url = response["html_url"].toString();
+    auto url = response["html_url"].toString();
-    int number = response["number"].toInt();
+    auto 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"
+    qCDebug(LOG_AW) << "Created issue with number" << _number << "and url" << _url;
-                    << _url;
 
     // cache url first
     m_lastBugUrl = _url;
 
-    QMessageBox *msgBox = new QMessageBox(nullptr);
+    auto event = KNotification::event("system", i18n("Issue created"), i18n("Issue %1 has been created", _number));
-    msgBox->setAttribute(Qt::WA_DeleteOnClose);
+    event->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
-    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);
 
-    msgBox->open(this, SLOT(userReplyOnBugReport(QAbstractButton *)));
+    auto action = event->addAction(i18n("Details"));
-}
+    connect(action, &KNotificationAction::activated, this, &AWBugReporter::openBugReport);
-
-
-void AWBugReporter::userReplyOnBugReport(QAbstractButton *_button)
-{
-    QMessageBox::ButtonRole ret
-        = static_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,41 +15,35 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
+#pragma once
-#ifndef AWBUGREPORTER_H
-#define AWBUGREPORTER_H
 
 #include <QObject>
 
 
-class QAbstractButton;
+class QNetworkAccessManager;
 class QNetworkReply;
 
-class AWBugReporter : public QObject
+class __attribute__((visibility("default"))) AWBugReporter : public QObject
 {
     Q_OBJECT
 
 public:
     explicit AWBugReporter(QObject *_parent = nullptr);
-    virtual ~AWBugReporter();
+    ~AWBugReporter() override;
-    Q_INVOKABLE void doConnect();
+    Q_INVOKABLE void doConnect() const;
-    Q_INVOKABLE QString generateText(const QString &_description,
+    Q_INVOKABLE static QString generateText(const QString &_description, const QString &_reproduce,
-                                     const QString &_reproduce,
+                                            const QString &_expected, const QString &_logs);
-                                     const QString &_expected,
-                                     const QString &_logs) const;
     Q_INVOKABLE void sendBugReport(const QString &_title, const QString &_body);
 
 signals:
-    void replyReceived(const int _number, const QString &_url);
+    void replyReceived(int _number, const QString &_url);
 
 private slots:
-    void issueReplyRecieved(QNetworkReply *_reply);
+    void issueReplyReceived(QNetworkReply *_reply);
-    void showInformation(const int _number, const QString &_url);
+    void openBugReport();
-    void userReplyOnBugReport(QAbstractButton *_button);
+    void showInformation(int _number, const QString &_url);
 
 private:
     QString m_lastBugUrl;
+    QNetworkAccessManager *m_manager = nullptr;
 };
-
-
-#endif /* AWBUGREPORTER_H */

sources/awesome-widget/plugin/awconfighelper.cpp

@@ -17,12 +17,10 @@
 
 #include "awconfighelper.h"
 
-#include <KI18n/KLocalizedString>
-
 #include <QDir>
 #include <QQmlPropertyMap>
 #include <QSettings>
-#include <QTextCodec>
+#include <QStandardPaths>
 
 #include "awdebug.h"
 
@@ -31,26 +29,20 @@ AWConfigHelper::AWConfigHelper(QObject *_parent)
     : QObject(_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    m_baseDir = QString("%1/awesomewidgets").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
 }
 
 
-AWConfigHelper::~AWConfigHelper()
+QString AWConfigHelper::configurationDirectory()
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-}
-
-
-QString AWConfigHelper::configurationDirectory() const
 {
     // get readable directory
-    QString localDir = QString("%1/awesomewidgets/configs")
+    auto localDir = QString("%1/awesomewidgets/configs")
-                           .arg(QStandardPaths::writableLocation(
+                        .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
-                               QStandardPaths::GenericDataLocation));
 
     // create directory and copy files from default settings
     QDir localDirectory;
-    if ((!localDirectory.exists(localDir))
+    if ((!localDirectory.exists(localDir)) && (localDirectory.mkpath(localDir))) {
-        && (localDirectory.mkpath(localDir))) {
         qCInfo(LOG_AW) << "Created directory" << localDir;
         copyConfigs(localDir);
     }
@@ -59,28 +51,25 @@ QString AWConfigHelper::configurationDirectory() const
 }
 
 
-bool AWConfigHelper::dropCache() const
+bool AWConfigHelper::dropCache()
 {
-    QString fileName = QString("%1/awesomewidgets.ndx")
+    auto fileName
-                           .arg(QStandardPaths::writableLocation(
+        = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
-                               QStandardPaths::GenericCacheLocation));
 
     return QFile(fileName).remove();
 }
 
 
-bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig,
+bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig, const QString &_fileName) const
-                                         const QString &_fileName) const
 {
     qCDebug(LOG_AW) << "Selected filename" << _fileName;
 
     QSettings settings(_fileName, QSettings::IniFormat);
     // plasmoid configuration
-    const QQmlPropertyMap *configuration
+    auto configuration = dynamic_cast<const QQmlPropertyMap *>(_nativeConfig);
-        = static_cast<const QQmlPropertyMap *>(_nativeConfig);
     settings.beginGroup("plasmoid");
     for (auto &key : configuration->keys()) {
-        QVariant value = configuration->value(key);
+        auto value = configuration->value(key);
         if (!value.isValid())
             continue;
         settings.setValue(key, value);
@@ -89,9 +78,7 @@ bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig,
 
     // extensions
     for (auto &item : m_dirs) {
-        QStringList items
+        auto items = QDir(QString("%1/%2").arg(m_baseDir, item)).entryList({"*.desktop"}, QDir::Files);
-            = 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);
@@ -101,16 +88,16 @@ bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig,
     // additional files
     settings.beginGroup("json");
     // script filters
-    readFile(settings, "filters",
+    readFile(settings, "filters", QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
-             QString("%1/scripts/awesomewidgets-extscripts-filters.json")
-                 .arg(m_baseDir));
     // weather icon settings
-    readFile(settings, "weathers",
+    readFile(settings, "weathers", QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
-             QString("%1/weather/awesomewidgets-extweather-ids.json")
+    settings.endGroup();
-                 .arg(m_baseDir));
+
+    settings.beginGroup("ini");
     // formatter settings
-    readFile(settings, "formatters",
+    readFile(settings, "formatters", QString("%1/formatters/formatters.ini").arg(m_baseDir));
-             QString("%1/formatters/formatters.ini").arg(m_baseDir));
+    // custom keys settings
+    readFile(settings, "custom", QString("%1/custom.ini").arg(m_baseDir));
     settings.endGroup();
 
     // sync settings
@@ -120,10 +107,8 @@ bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig,
 }
 
 
-QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName,
+QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName, const bool _importPlasmoid,
-                                                const bool _importPlasmoid,
+                                                const bool _importExtensions, const bool _importAdds) const
-                                                const bool _importExtensions,
-                                                const bool _importAdds) const
 {
     qCDebug(LOG_AW) << "Selected filename" << _fileName;
 
@@ -144,16 +129,16 @@ QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName,
     if (_importAdds) {
         settings.beginGroup("json");
         // script filters
-        writeFile(settings, "filters",
+        writeFile(settings, "filters", QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
-                  QString("%1/scripts/awesomewidgets-extscripts-filters.json")
-                      .arg(m_baseDir));
         // weather icon settings
-        writeFile(settings, "weathers",
+        writeFile(settings, "weathers", QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
-                  QString("%1/weather/awesomewidgets-extweather-ids.json")
+        settings.endGroup();
-                      .arg(m_baseDir));
+
+        settings.beginGroup("ini");
         // formatter settings
-        writeFile(settings, "formatters",
+        writeFile(settings, "formatters", QString("%1/formatters/formatters.ini").arg(m_baseDir));
-                  QString("%1/formatters/formatters.ini").arg(m_baseDir));
+        // custom keys settings
+        writeFile(settings, "custom", QString("%1/custom.ini").arg(m_baseDir));
         settings.endGroup();
     }
 
@@ -169,21 +154,15 @@ QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName,
 }
 
 
-QVariantMap AWConfigHelper::readDataEngineConfiguration() const
+QVariantMap AWConfigHelper::readDataEngineConfiguration()
 {
-    QString fileName = QStandardPaths::locate(
+    auto fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation, "plasma-dataengine-extsysmon.conf");
-        QStandardPaths::ConfigLocation, "plasma-dataengine-extsysmon.conf");
     qCInfo(LOG_AW) << "Configuration file" << fileName;
     QSettings settings(fileName, QSettings::IniFormat);
     QVariantMap configuration;
 
     settings.beginGroup("Configuration");
-    configuration["ACPIPATH"]
+    configuration["ACPIPATH"] = settings.value("ACPIPATH", "/sys/class/power_supply/");
-        = settings.value("ACPIPATH", "/sys/class/power_supply/");
-    configuration["GPUDEV"] = settings.value("GPUDEV", "auto");
-    configuration["HDDDEV"] = settings.value("HDDDEV", "all");
-    configuration["HDDTEMPCMD"]
-        = settings.value("HDDTEMPCMD", "sudo smartctl -a");
     configuration["MPDADDRESS"] = settings.value("MPDADDRESS", "localhost");
     configuration["MPDPORT"] = settings.value("MPDPORT", "6600");
     configuration["MPRIS"] = settings.value("MPRIS", "auto");
@@ -197,22 +176,17 @@ QVariantMap AWConfigHelper::readDataEngineConfiguration() const
 }
 
 
-bool AWConfigHelper::writeDataEngineConfiguration(
+bool AWConfigHelper::writeDataEngineConfiguration(const QVariantMap &_configuration)
-    const QVariantMap &_configuration) const
 {
     qCDebug(LOG_AW) << "Configuration" << _configuration;
 
-    QString fileName = QString("%1/plasma-dataengine-extsysmon.conf")
+    auto fileName = QString("%1/plasma-dataengine-extsysmon.conf")
-                           .arg(QStandardPaths::writableLocation(
+                        .arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation));
-                               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"]);
@@ -226,39 +200,32 @@ bool AWConfigHelper::writeDataEngineConfiguration(
 }
 
 
-void AWConfigHelper::copyConfigs(const QString &_localDir) const
+void AWConfigHelper::copyConfigs(const QString &_localDir)
 {
     qCDebug(LOG_AW) << "Local directory" << _localDir;
 
-    QStringList dirs = QStandardPaths::locateAll(
+    auto dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "awesomewidgets/configs",
-        QStandardPaths::GenericDataLocation, "awesomewidgets/configs",
+                                          QStandardPaths::LocateDirectory);
-        QStandardPaths::LocateDirectory);
     for (auto &dir : dirs) {
         if (dir == _localDir)
             continue;
-        QStringList files = QDir(dir).entryList(QDir::Files);
+        auto files = QDir(dir).entryList(QDir::Files);
         for (auto &source : files) {
-            QString destination = QString("%1/%2").arg(_localDir).arg(source);
+            auto destination = QString("%1/%2").arg(_localDir, source);
-            bool status = QFile::copy(QString("%1/%2").arg(dir).arg(source),
+            auto status = QFile::copy(QString("%1/%2").arg(dir, source), destination);
-                                      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,
+void AWConfigHelper::copyExtensions(const QString &_item, const QString &_type, QSettings &_settings,
-                                    QSettings &_settings,
                                     const bool _inverse) const
 {
-    qCDebug(LOG_AW) << "Extension" << _item << "has type" << _type
+    qCDebug(LOG_AW) << "Extension" << _item << "has type" << _type << "inverse copying" << _inverse;
-                    << "inverse copying" << _inverse;
 
     _settings.beginGroup(_item);
-    QSettings itemSettings(
+    QSettings itemSettings(QString("%1/%2/%3").arg(m_baseDir, _type, _item), QSettings::IniFormat);
-        QString("%1/%2/%3").arg(m_baseDir).arg(_type).arg(_item),
-        QSettings::IniFormat);
     itemSettings.beginGroup("Desktop Entry");
     if (_inverse)
         copySettings(_settings, itemSettings);
@@ -272,31 +239,29 @@ void AWConfigHelper::copyExtensions(const QString &_item, const QString &_type,
 }
 
 
-void AWConfigHelper::copySettings(QSettings &_from, QSettings &_to) const
+void AWConfigHelper::copySettings(QSettings &_from, QSettings &_to)
 {
     for (auto &key : _from.childKeys())
         _to.setValue(key, _from.value(key));
 }
 
 
-void AWConfigHelper::readFile(QSettings &_settings, const QString &_key,
+void AWConfigHelper::readFile(QSettings &_settings, const QString &_key, const QString &_fileName)
-                              const QString &_fileName) const
 {
     qCDebug(LOG_AW) << "Key" << _key << "from file" << _fileName;
 
     QFile file(_fileName);
     if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        QString text = QString::fromUtf8(file.readAll());
+        auto text = QString::fromUtf8(file.readAll());
         file.close();
         _settings.setValue(_key, text);
     } else {
-        qCWarning(LOG_AW) << "Could not open" << file.fileName();
+        qCWarning(LOG_AW) << "Could not open to read" << file.fileName();
     }
 }
 
 
-void AWConfigHelper::writeFile(QSettings &_settings, const QString &_key,
+void AWConfigHelper::writeFile(QSettings &_settings, const QString &_key, const QString &_fileName)
-                               const QString &_fileName) const
 {
     qCDebug(LOG_AW) << "Key" << _key << "to file" << _fileName;
 
@@ -306,11 +271,10 @@ void AWConfigHelper::writeFile(QSettings &_settings, const QString &_key,
     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();
     } else {
-        qCWarning(LOG_AW) << "Could not open" << file.fileName();
+        qCWarning(LOG_AW) << "Could not open to write" << file.fileName();
     }
 }

sources/awesome-widget/plugin/awconfighelper.h

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

sources/awesome-widget/plugin/awcustomkeysconfig.cpp

@@ -0,0 +1,31 @@
+/***************************************************************************
+ *   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 "awcustomkeysconfig.h"
+
+#include "awcustomkeyshelper.h"
+#include "awdebug.h"
+
+
+AWCustomKeysConfig::AWCustomKeysConfig(QWidget *_parent, const QStringList &_keys)
+    : AWAbstractPairConfig(_parent, false, _keys)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    setEditable(true, false);
+    setHelper(std::make_unique<AWCustomKeysHelper>());
+}

sources/awesome-widget/plugin/awcustomkeysconfig.h

@@ -15,34 +15,16 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
+#pragma once
 
-#ifndef TESTGPUTEMPSOURCE_H
+#include "awabstractpairconfig.h"
-#define TESTGPUTEMPSOURCE_H
-
-#include <QObject>
-#include <QPair>
 
 
-class GPUTemperatureSource;
+class AWCustomKeysConfig : public AWAbstractPairConfig
-
-class TestGPUTemperatureSource : public QObject
 {
     Q_OBJECT
 
-private slots:
+public:
-    // initialization
+    explicit AWCustomKeysConfig(QWidget *_parent = nullptr, const QStringList &_keys = QStringList());
-    void initTestCase();
+    ~AWCustomKeysConfig() override = default;
-    void cleanupTestCase();
-    // test
-    void test_sources();
-    void test_gputemp();
-
-private:
-    GPUTemperatureSource *source = nullptr;
-    QString device;
-    QString src = "gpu/temperature";
-    QPair<float, float> temp = QPair<float, float>(0.0f, 120.0f);
 };
-
-
-#endif /* TESTGPUTEMPSOURCE_H */

sources/awesome-widget/plugin/awcustomkeyshelper.cpp

@@ -15,52 +15,58 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
+#include "awcustomkeyshelper.h"
 
-#include "testgpuloadsource.h"
+#include <QSet>
 
-#include <QtTest>
+#include "awdebug.h"
-
-#include "awtestlibrary.h"
-#include "gpuloadsource.h"
 
 
-void TestGPULoadSource::initTestCase()
+AWCustomKeysHelper::AWCustomKeysHelper(QObject *_parent)
+    : QObject(_parent)
+    , AWAbstractPairHelper("awesomewidgets/custom.ini", "Custom")
 {
-    AWTestLibrary::init();
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-    device = GPULoadSource::autoGpu();
-    QVERIFY(!device.isEmpty());
-
-    source = new GPULoadSource(this, QStringList() << device);
 }
 
 
-void TestGPULoadSource::cleanupTestCase()
+QString AWCustomKeysHelper::source(const QString &_key) const
 {
-    delete source;
+    qCDebug(LOG_AW) << "Get source by key" << _key;
+
+    return pairs()[_key];
 }
 
 
-void TestGPULoadSource::test_sources()
+QStringList AWCustomKeysHelper::sources() const
 {
-    QCOMPARE(source->sources(), QStringList() << src);
+    return valuesSet().values();
 }
 
 
-void TestGPULoadSource::test_gpuload()
+QStringList AWCustomKeysHelper::refinedSources() const
 {
-    if (device == "disable")
+    auto allSources = valuesSet();
-        QSKIP("Not supported device, test will be skipped");
+    QSet<QString> output;
 
-    QSignalSpy spy(source, SIGNAL(dataReceived(const QVariantHash &)));
+    while (output != allSources) {
-    float firstValue = source->data(src).toFloat();
+        output.clear();
+        for (auto &src : allSources)
+            output.insert(pairs().contains(src) ? source(src) : src);
+        allSources = output;
+    }
 
-    QVERIFY(spy.wait(5000));
+    return output.values();
-    QVariantHash arguments = spy.takeFirst().at(0).toHash();
-    float secondValue = arguments[src].toFloat();
-
-    QCOMPARE(firstValue, 0.0f);
-    QVERIFY((secondValue >= load.first) && (secondValue <= load.second));
 }
 
 
-QTEST_MAIN(TestGPULoadSource);
+QStringList AWCustomKeysHelper::leftKeys()
+{
+    return keys();
+}
+
+
+QStringList AWCustomKeysHelper::rightKeys()
+{
+    return {};
+}

sources/awesome-widget/plugin/awcustomkeyshelper.h

@@ -0,0 +1,40 @@
+/***************************************************************************
+ *   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 <QObject>
+
+#include "awabstractpairhelper.h"
+
+
+class AWCustomKeysHelper : public QObject, public AWAbstractPairHelper
+{
+    Q_OBJECT
+
+public:
+    explicit AWCustomKeysHelper(QObject *_parent = nullptr);
+    ~AWCustomKeysHelper() override = default;
+    // get
+    [[nodiscard]] QString source(const QString &_key) const;
+    [[nodiscard]] QStringList sources() const;
+    [[nodiscard]] QStringList refinedSources() const;
+    // configuration related
+    void editPairs() override{};
+    QStringList leftKeys() override;
+    QStringList rightKeys() override;
+};

sources/awesome-widget/plugin/awdataaggregator.cpp

@@ -22,7 +22,6 @@
 #include <QBuffer>
 #include <QGraphicsScene>
 #include <QGraphicsView>
-#include <QPixmap>
 
 #include <cmath>
 
@@ -44,8 +43,6 @@ AWDataAggregator::AWDataAggregator(QObject *_parent)
     m_boundaries["batTooltip"] = 100.0;
 
     initScene();
-    connect(this, SIGNAL(updateData(const QVariantHash &)), this,
-            SLOT(dataUpdate(const QVariantHash &)));
 }
 
 
@@ -53,28 +50,19 @@ AWDataAggregator::~AWDataAggregator()
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    delete m_toolTipScene;
+    m_toolTipView->deleteLater();
+    m_toolTipScene->deleteLater();
 }
 
 
-QList<float> AWDataAggregator::getData(const QString &_key) const
+QString AWDataAggregator::htmlImage(const QPixmap &_source)
-{
-    qCDebug(LOG_AW) << "Key" << _key;
-
-    return m_values[QString("%1Tooltip").arg(_key)];
-}
-
-
-QString AWDataAggregator::htmlImage(const QPixmap &_source) const
 {
     QByteArray byteArray;
     QBuffer buffer(&byteArray);
     _source.save(&buffer, "PNG");
 
-    return byteArray.isEmpty()
+    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()));
 }
 
 
@@ -97,27 +85,26 @@ void AWDataAggregator::setParameters(const QVariantMap &_settings)
     // resize tooltip image
     m_toolTipView->resize(100 * m_counts, 105);
 
-    requiredKeys.clear();
+    m_requiredKeys.clear();
     if (m_configuration["cpuTooltip"].toBool())
-        requiredKeys.append("cpuTooltip");
+        m_requiredKeys.append("cpuTooltip");
     if (m_configuration["cpuclTooltip"].toBool())
-        requiredKeys.append("cpuclTooltip");
+        m_requiredKeys.append("cpuclTooltip");
     if (m_configuration["memTooltip"].toBool())
-        requiredKeys.append("memTooltip");
+        m_requiredKeys.append("memTooltip");
     if (m_configuration["swapTooltip"].toBool())
-        requiredKeys.append("swapTooltip");
+        m_requiredKeys.append("swapTooltip");
     if (m_configuration["downkbTooltip"].toBool())
-        requiredKeys.append("downkbTooltip");
+        m_requiredKeys.append("downkbTooltip");
     if (m_configuration["upkbTooltip"].toBool())
-        requiredKeys.append("upkbTooltip");
+        m_requiredKeys.append("upkbTooltip");
     if (m_configuration["batTooltip"].toBool())
-        requiredKeys.append("batTooltip");
+        m_requiredKeys.append("batTooltip");
 
     // background
-    m_toolTipScene->setBackgroundBrush(
+    m_toolTipScene->setBackgroundBrush(m_configuration["useTooltipBackground"].toBool()
-        m_configuration["useTooltipBackground"].toBool()
+                                           ? QColor(m_configuration["tooltipBackground"].toString())
-            ? QBrush(QColor(m_configuration["tooltipBackground"].toString()))
+                                           : Qt::NoBrush);
-            : QBrush(Qt::NoBrush));
 }
 
 
@@ -126,37 +113,42 @@ QPixmap AWDataAggregator::tooltipImage()
     // create image
     m_toolTipScene->clear();
     QPen pen;
-    bool down = false;
+    auto shift = 0.0;
-    for (auto &key : requiredKeys) {
+
+    for (auto i = 0; i < m_requiredKeys.count(); ++i) {
+        auto key = m_requiredKeys[i];
+
         // create frame
-        float normX = 100.0f / static_cast<float>(m_values[key].count());
+        auto normX = 100.0 / static_cast<float>(m_values[key].count());
-        float normY = 100.0f / (1.5f * m_boundaries[key]);
+        auto normY = 100.0 / (1.5 * m_boundaries[key]);
-        float shift = requiredKeys.indexOf(key) * 100.0f;
+
-        if (down)
-            shift -= 100.0;
         // apply pen color
         if (key != "batTooltip")
-            pen.setColor(QColor(
+            pen.setColor(m_configuration[QString("%1Color").arg(key)].toString());
-                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
-            float x1 = j * normX + shift;
+            auto x1 = j * normX + shift;
-            float y1 = -std::fabs(m_values[key].at(j)) * normY + 5.0f;
+            auto y1 = -std::fabs(m_values[key].at(j)) * normY + 5.0;
-            float x2 = (j + 1) * normX + shift;
+            auto x2 = (j + 1) * normX + shift;
-            float y2 = -std::fabs(m_values[key].at(j + 1)) * normY + 5.0f;
+            auto y2 = -std::fabs(m_values[key].at(j + 1)) * normY + 5.0;
+            // apply color for the battery tooltip based on charge/discharge
             if (key == "batTooltip") {
                 if (m_values[key].at(j + 1) > 0)
-                    pen.setColor(
+                    pen.setColor(QColor(m_configuration["batTooltipColor"].toString()));
-                        QColor(m_configuration["batTooltipColor"].toString()));
                 else
-                    pen.setColor(QColor(
+                    pen.setColor(QColor(m_configuration["batInTooltipColor"].toString()));
-                        m_configuration["batInTooltipColor"].toString()));
             }
+
             m_toolTipScene->addLine(x1, y1, x2, y2, pen);
         }
-        if (key == "downkbTooltip")
+
-            down = true;
+        // increase frame shift if not downkbtooltip
+        // 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();
@@ -171,36 +163,28 @@ void AWDataAggregator::dataUpdate(const QVariantHash &_values)
 }
 
 
-void AWDataAggregator::checkValue(const QString &_source, const float _value,
+void AWDataAggregator::checkValue(const QString &_source, const double _value, const double _extremum) const
-                                  const float _extremum) const
 {
-    qCDebug(LOG_AW) << "Notification source" << _source << "with value"
+    qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value << "called with extremum"
-                    << _value << "called with extremum" << _extremum;
+                    << _extremum;
 
     if (_value >= 0.0) {
-        if ((m_enablePopup) && (_value > _extremum)
+        if ((m_enablePopup) && (_value > _extremum) && (m_values[_source].last() < _extremum))
-            && (m_values[_source].last() < _extremum))
+            return AWActions::sendNotification("event", notificationText(_source, _value));
-            return AWActions::sendNotification(
-                "event", notificationText(_source, _value));
     } else {
-        if ((m_enablePopup) && (_value < _extremum)
+        if ((m_enablePopup) && (_value < _extremum) && (m_values[_source].last() > _extremum))
-            && (m_values[_source].last() > _extremum))
+            return AWActions::sendNotification("event", notificationText(_source, _value));
-            return AWActions::sendNotification(
-                "event", notificationText(_source, _value));
     }
 }
 
 
-void AWDataAggregator::checkValue(const QString &_source,
+void AWDataAggregator::checkValue(const QString &_source, const QString &_current, const QString &_received) const
-                                  const QString &_current,
-                                  const QString &_received) const
 {
-    qCDebug(LOG_AW) << "Notification source" << _source << "with current value"
+    qCDebug(LOG_AW) << "Notification source" << _source << "with current value" << _current << "and received one"
-                    << _current << "and received one" << _received;
+                    << _received;
 
     if ((m_enablePopup) && (_current != _received) && (!_received.isEmpty()))
-        return AWActions::sendNotification(
+        return AWActions::sendNotification("event", notificationText(_source, _received));
-            "event", notificationText(_source, _received));
 }
 
 
@@ -216,11 +200,9 @@ void AWDataAggregator::initScene()
 }
 
 
-QString AWDataAggregator::notificationText(const QString &_source,
+QString AWDataAggregator::notificationText(const QString &_source, const float _value)
-                                           const float _value) const
 {
-    qCDebug(LOG_AW) << "Notification source" << _source << "with value"
+    qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value;
-                    << _value;
 
     QString output;
     if (_source == "batTooltip")
@@ -238,11 +220,9 @@ QString AWDataAggregator::notificationText(const QString &_source,
 }
 
 
-QString AWDataAggregator::notificationText(const QString &_source,
+QString AWDataAggregator::notificationText(const QString &_source, const QString &_value)
-                                           const QString &_value) const
 {
-    qCDebug(LOG_AW) << "Notification source" << _source << "with value"
+    qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value;
-                    << _value;
 
     QString output;
     if (_source == "netdev")
@@ -256,38 +236,33 @@ 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"],
+    setData(_values["ac"].toString() == m_configuration["acOnline"], "batTooltip", _values["bat"].toDouble());
-            "batTooltip", _values["bat"].toFloat());
+
     // usual case
-    setData("cpuTooltip", _values["cpu"].toFloat(), 90.0);
+    setData("cpuTooltip", _values["cpu"].toDouble(), 90.0);
-    setData("cpuclTooltip", _values["cpucl"].toFloat());
+    setData("cpuclTooltip", _values["cpucl"].toDouble());
-    setData("memTooltip", _values["mem"].toFloat(), 80.0);
+    setData("memTooltip", _values["mem"].toDouble(), 80.0);
-    setData("swapTooltip", _values["swap"].toFloat(), 0.0);
+    setData("swapTooltip", _values["swap"].toDouble(), 0.0);
-    setData("downkbTooltip", _values["downkb"].toFloat());
+    setData("downkbTooltip", _values["downkb"].toDouble());
-    setData("upkbTooltip", _values["upkb"].toFloat());
+    setData("upkbTooltip", _values["upkb"].toDouble());
+
     // additional check for network device
-    [this](const QString &value) {
+    auto currentNetworkDevice = _values["netdev"].toString();
-        checkValue("netdev", m_currentNetworkDevice, value);
+    checkValue("netdev", m_currentNetworkDevice, currentNetworkDevice);
-        m_currentNetworkDevice = value;
+    m_currentNetworkDevice = currentNetworkDevice;
-    }(_values["netdev"].toString());
+
     // additional check for GPU load
-    [this](const float value) {
+    checkValue("gpu", _values["gpu"].toDouble(), 90.0);
-        checkValue("gpu", value, 90.0);
-        m_currentGPULoad = value;
-    }(_values["gpu"].toFloat());
 }
 
 
-void AWDataAggregator::setData(const QString &_source, float _value,
+void AWDataAggregator::setData(const QString &_source, double _value, const double _extremum)
-                               const float _extremum)
 {
-    qCDebug(LOG_AW) << "Source" << _source << "to value" << _value
+    qCDebug(LOG_AW) << "Source" << _source << "to value" << _value << "with extremum" << _extremum;
-                    << "with extremum" << _extremum;
 
     if (m_values[_source].count() == 0)
         m_values[_source].append(0.0);
-    else if (m_values[_source].count()
+    else if (m_values[_source].count() > m_configuration["tooltipNumber"].toInt())
-             > m_configuration["tooltipNumber"].toInt())
         m_values[_source].removeFirst();
     if (std::isnan(_value))
         _value = 0.0;
@@ -297,22 +272,22 @@ void AWDataAggregator::setData(const QString &_source, float _value,
 
     m_values[_source].append(_value);
     if (_source == "downkbTooltip") {
-        QList<float> netValues
+        // to avoid copying of objects to another list we find max elements in each sequence and compare them
-            = 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,
+void AWDataAggregator::setData(const bool _dontInvert, const QString &_source, double _value)
-                               float _value)
 {
-    qCDebug(LOG_AW) << "Do not invert" << _dontInvert << "value" << _value
+    qCDebug(LOG_AW) << "Do not invert" << _dontInvert << "value" << _value << "for source" << _source;
-                    << "for source" << _source;
 
     // invert values for different battery colours
     _value = _dontInvert ? _value : -_value;

sources/awesome-widget/plugin/awdataaggregator.h

@@ -15,18 +15,14 @@
  *   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
 {
@@ -34,47 +30,37 @@ class AWDataAggregator : public QObject
 
 public:
     explicit AWDataAggregator(QObject *_parent = nullptr);
-    virtual ~AWDataAggregator();
+    ~AWDataAggregator() override;
-    QList<float> getData(const QString &_key) const;
+    static QString htmlImage(const QPixmap &_source);
-    QString htmlImage(const QPixmap &_source) const;
     void setParameters(const QVariantMap &_settings);
     QPixmap tooltipImage();
 
-signals:
+public slots:
-    void updateData(const QVariantHash &_values);
-    void toolTipPainted(const QString &_image) const;
-
-private slots:
     void dataUpdate(const QVariantHash &_values);
 
+signals:
+    void toolTipPainted(const QString &_image) const;
+
 private:
     // ui
     QGraphicsScene *m_toolTipScene = nullptr;
     QGraphicsView *m_toolTipView = nullptr;
-    void checkValue(const QString &_source, const float _value,
+    void checkValue(const QString &_source, double _value, double _extremum) const;
-                    const 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();
-    QString notificationText(const QString &_source, const float _value) const;
+    static QString notificationText(const QString &_source, float _value);
-    QString notificationText(const QString &_source,
+    static QString notificationText(const QString &_source, const QString &_value);
-                             const QString &_value) const;
     // main method
     void setData(const QVariantHash &_values);
-    void setData(const QString &_source, float _value,
+    void setData(const QString &_source, double _value, double _extremum = -1.0);
-                 const float _extremum = -1.0f);
     // different signature for battery device
-    void setData(const bool _dontInvert, const QString &_source, float _value);
+    void setData(bool _dontInvert, const QString &_source, double _value);
     // variables
     int m_counts = 0;
     QVariantHash m_configuration;
-    float m_currentGPULoad = 0.0f;
     QString m_currentNetworkDevice = "lo";
-    QHash<QString, float> m_boundaries;
+    QHash<QString, double> m_boundaries;
-    QHash<QString, QList<float>> m_values;
+    QHash<QString, QList<double>> m_values;
     bool m_enablePopup = false;
-    QStringList requiredKeys;
+    QStringList m_requiredKeys;
 };
-
-
-#endif /* AWTOOLTIP_H */

sources/awesome-widget/plugin/awdataengineaggregator.cpp

@@ -17,19 +17,35 @@
 
 #include "awdataengineaggregator.h"
 
-#include <Plasma/DataContainer>
+#include <ksysguard/formatter/Unit.h>
+#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__;
 
-    // required to define Qt::QueuedConnection for signal-slot connection
+    qDBusRegisterMetaType<KSysGuard::SensorData>();
-    qRegisterMetaType<Plasma::DataEngine::Data>("Plasma::DataEngine::Data");
+    qDBusRegisterMetaType<KSysGuard::SensorInfo>();
+    qDBusRegisterMetaType<KSysGuard::SensorDataList>();
+    qDBusRegisterMetaType<QHash<QString, KSysGuard::SensorInfo>>();
+
+    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::newSensorData, this,
+            &AWDataEngineAggregator::updateData);
+    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::sensorMetaDataChanged, this,
+            &AWDataEngineAggregator::updateSensors);
+    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::sensorAdded, this,
+            &AWDataEngineAggregator::sensorAdded);
+    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::sensorRemoved, this,
+            &AWDataEngineAggregator::sensorRemoved);
+
+    loadSources();
 }
 
 
@@ -37,97 +53,103 @@ AWDataEngineAggregator::~AWDataEngineAggregator()
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    clear();
+    disconnectSources();
+    m_interface->deleteLater();
 }
 
 
-void AWDataEngineAggregator::clear()
+void AWDataEngineAggregator::connectSources()
 {
-    // disconnect sources first
+    auto keys = m_sensors.keys();
-    disconnectSources();
+    auto newKeys = QSet(keys.cbegin(), keys.cend()) - m_subscribed;
-    m_dataEngines.clear();
+
-    delete m_consumer;
+    m_interface->subscribe(newKeys.values()).waitForFinished();
+    m_subscribed.unite(newKeys);
 }
 
 
 void AWDataEngineAggregator::disconnectSources()
 {
-    for (auto dataengine : m_dataEngines.values())
+    m_interface->unsubscribe(m_subscribed.values()).waitForFinished();
-        for (auto &source : dataengine->sources())
+    m_subscribed.clear();
-            dataengine->disconnectSource(source, parent());
 }
 
 
-void AWDataEngineAggregator::initDataEngines(const int _interval)
+bool AWDataEngineAggregator::isValidSensor(const KSysGuard::SensorInfo &_sensor)
 {
-    qCDebug(LOG_AW) << "Init dataengines with interval" << _interval;
+    return _sensor.unit != KSysGuard::UnitInvalid;
+}
 
-    m_consumer = new Plasma::DataEngineConsumer();
-    m_dataEngines["systemmonitor"] = m_consumer->dataEngine("systemmonitor");
-    m_dataEngines["extsysmon"] = m_consumer->dataEngine("extsysmon");
-    m_dataEngines["time"] = m_consumer->dataEngine("time");
 
-    // additional method required by systemmonitor structure
+void AWDataEngineAggregator::loadSources()
-    connect(m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded,
+{
-            [this, _interval](const QString source) {
+    auto response = m_interface->allSensors();
-                emit(deviceAdded(source));
+    response.waitForFinished();
-                m_dataEngines["systemmonitor"]->connectSource(source, parent(),
-                                                              _interval);
-            });
 
-    return reconnectSources(_interval);
+    auto sensors = response.value();
+    updateSensors(sensors);
+    connectSources();
+
+    for (auto &sensor : m_sensors.keys())
+        emit(deviceAdded(sensor));
 }
 
 
 void AWDataEngineAggregator::dropSource(const QString &_source)
 {
-    qCDebug(LOG_AW) << "Source" << _source;
+    qCDebug(LOG_AW) << "Disconnect sensor" << _source;
 
-    // HACK there is no possibility to check to which dataengine source
+    if (m_subscribed.contains(_source)) {
-    // connected we will try to disconnect it from systemmonitor and extsysmon
+        m_interface->unsubscribe({_source}).waitForFinished();
-    for (auto dataengine : m_dataEngines.values())
+        m_subscribed.remove(_source);
-        dataengine->disconnectSource(_source, parent());
+    }
-}
+}
-
+
-
+
-void AWDataEngineAggregator::reconnectSources(const int _interval)
+void AWDataEngineAggregator::sensorAdded(const QString &_sensor)
-{
+{
-    qCDebug(LOG_AW) << "Reconnect sources with interval" << _interval;
+    qCDebug(LOG_AW) << "New sensor added" << _sensor;
-
+
-    m_dataEngines["systemmonitor"]->connectAllSources(parent(), _interval);
+    // check if sensor is actually valid
-    m_dataEngines["extsysmon"]->connectAllSources(parent(), _interval);
+    auto response = m_interface->sensors({_sensor});
-    m_dataEngines["time"]->connectSource("Local", parent(), 1000);
+    response.waitForFinished();
-
+
-#ifdef BUILD_FUTURE
+    auto info = response.value().value(_sensor);
-    createQueuedConnection();
+    if (!isValidSensor(info))
-#endif /* BUILD_FUTURE */
+        return;
-}
+
-
+    m_sensors[_sensor] = info;
-
+    dropSource(_sensor); // force reconnect
-void AWDataEngineAggregator::createQueuedConnection()
+    if (!m_subscribed.contains(_sensor)) {
-{
+        m_interface->subscribe({_sensor}).waitForFinished();
-    // HACK additional method which forces QueuedConnection instead of Auto one
+        m_subscribed.insert(_sensor);
-    // for more details refer to plasma-framework source code
+    }
-    for (auto &dataEngine : m_dataEngines.keys()) {
+
-        // different source set for different engines
+    // notify about new device
-        QStringList sources = dataEngine == "time"
+    emit(deviceAdded(_sensor));
-                                  ? QStringList() << "Local"
+}
-                                  : m_dataEngines[dataEngine]->sources();
+
-        // reconnect sources
+
-        for (auto &source : sources) {
+void AWDataEngineAggregator::sensorRemoved(const QString &_sensor)
-            Plasma::DataContainer *container
+{
-                = m_dataEngines[dataEngine]->containerForSource(source);
+    qCDebug(LOG_AW) << "Sensor" << _sensor << "has been removed";
-            // disconnect old connections first
+
-            disconnect(container,
+    m_sensors.remove(_sensor);
-                       SIGNAL(dataUpdated(QString, Plasma::DataEngine::Data)),
+    dropSource(_sensor);
-                       parent(),
+}
-                       SLOT(dataUpdated(QString, Plasma::DataEngine::Data)));
+
-            // and now reconnect with Qt::QueuedConnection type
+
-            connect(container,
+void AWDataEngineAggregator::updateData(const KSysGuard::SensorDataList &_data)
-                    SIGNAL(dataUpdated(QString, Plasma::DataEngine::Data)),
+{
-                    parent(),
+    emit(dataUpdated(m_sensors, _data));
-                    SLOT(dataUpdated(QString, Plasma::DataEngine::Data)),
+}
-                    Qt::QueuedConnection);
+
-        }
+
+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,39 +15,45 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
+#pragma once
 
-#ifndef AWDATAENGINEAGGREGATOR_H
+#include <ksysguard/systemstats/SensorInfo.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
 
 public:
     explicit AWDataEngineAggregator(QObject *_parent = nullptr);
-    virtual ~AWDataEngineAggregator();
+    ~AWDataEngineAggregator() override;
-    void clear();
+    void connectSources();
     void disconnectSources();
-    void initDataEngines(const int _interval);
+    [[nodiscard]] static bool isValidSensor(const KSysGuard::SensorInfo &_sensor);
+    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 reconnectSources(const int _interval);
+    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:
-    void createQueuedConnection();
+    KSysGuard::SystemStats::DBusInterface *m_interface = nullptr;
-    Plasma::DataEngineConsumer *m_consumer = nullptr;
+    QHash<QString, KSysGuard::SensorInfo> m_sensors;
-    QHash<QString, Plasma::DataEngine *> m_dataEngines;
+    QSet<QString> m_subscribed;
 };
-
-
-#endif /* AWDATAENGINEAGGREGATOR_H */

sources/awesome-widget/plugin/awdataenginemapper.cpp

@@ -0,0 +1,112 @@
+/***************************************************************************
+ *   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 "awdataenginemapper.h"
+
+#include <QRegularExpression>
+
+#include "awdebug.h"
+#include "awformatterhelper.h"
+#include "formatters/formatters.h"
+#include "matchers/matchers.h"
+
+
+AWDataEngineMapper::AWDataEngineMapper(QObject *_parent, AWFormatterHelper *_custom)
+    : QObject(_parent)
+    , m_customFormatters(_custom)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    // default formatters
+    // network
+    m_formatter["down"] = AWPluginFormatterNet::instance();
+    m_formatter["downkb"] = AWPluginFormatterMemory::instance();
+    m_formatter["downtot"] = AWPluginFormatterMemoryMB::instance();
+    m_formatter["downtotkb"] = AWPluginFormatterMemory::instance();
+    m_formatter["downunits"] = AWPluginFormatterNetUnits::instance();
+    m_formatter["up"] = AWPluginFormatterNet::instance();
+    m_formatter["upkb"] = AWPluginFormatterMemory::instance();
+    m_formatter["uptot"] = AWPluginFormatterMemoryMB::instance();
+    m_formatter["uptotkb"] = AWPluginFormatterMemory::instance();
+    m_formatter["upunits"] = AWPluginFormatterNetUnits::instance();
+}
+
+
+AWPluginFormaterInterface *AWDataEngineMapper::formatter(const QString &_key) const
+{
+    qCDebug(LOG_AW) << "Get formatter for key" << _key;
+
+    return m_formatter.value(_key, AWPluginFormatterNoFormat::instance());
+}
+
+
+QStringList AWDataEngineMapper::keysFromSource(const QString &_source) const
+{
+    qCDebug(LOG_AW) << "Search for source" << _source;
+
+    return m_map.values(_source);
+}
+
+
+// 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,
+                                               const QStringList &_keys)
+{
+    qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
+
+    auto matchers = AWPluginMatchers::matchers;
+    auto matcher = std::find_if(matchers.cbegin(), matchers.cend(),
+                                [&_source](auto matcher) { return matcher->matches(_source); });
+    if (matcher == matchers.cend())
+        return {};
+
+    auto foundKeys = (*matcher)->keys(_source, _units, m_settings);
+    auto keys = foundKeys.keys(); // speedup a little bit
+
+    // rewrite formatters for custom ones
+    QStringList customFormattersKeys;
+    if (m_customFormatters)
+        customFormattersKeys = m_customFormatters->definedFormatters();
+    qCInfo(LOG_AW) << "Looking for formatters" << keys << "in" << customFormattersKeys;
+    for (auto &key : keys) {
+        if (!customFormattersKeys.contains(key))
+            continue;
+        foundKeys[key] = AWPluginFormatterCustom::instance();
+    }
+
+    // check if keys were actually requested
+    qCInfo(LOG_AW) << "Looking for keys" << keys << "in" << _keys;
+    auto required = _keys.isEmpty()
+                    || std::any_of(keys.cbegin(), keys.cend(), [&_keys](auto &key) { return _keys.contains(key); });
+    if (!required)
+        return {};
+
+    // insert keys into memory
+    for (auto [key, formatter] : foundKeys.asKeyValueRange()) {
+        m_map.insert(_source, key);
+        m_formatter[key] = formatter;
+    }
+
+    return keys;
+}
+
+
+void AWDataEngineMapper::setDevices(const AWPluginMatcherSettings &_settings)
+{
+    m_settings = _settings;
+}

sources/awesome-widget/plugin/awdataenginemapper.h

@@ -0,0 +1,52 @@
+/***************************************************************************
+ *   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 <ksysguard/formatter/Unit.h>
+
+#include <QMultiHash>
+#include <QObject>
+
+#include "formatters/awpluginformatter.h"
+#include "matchers/awpluginmatchersettings.h"
+
+
+class AWFormatterHelper;
+
+class AWDataEngineMapper : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AWDataEngineMapper(QObject *_parent = nullptr, AWFormatterHelper *_custom = nullptr);
+    ~AWDataEngineMapper() override = default;
+    // get methods
+    [[nodiscard]] AWPluginFormaterInterface *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);
+    void setDevices(const AWPluginMatcherSettings &_settings);
+
+private:
+    AWFormatterHelper *m_customFormatters = nullptr;
+    AWPluginMatcherSettings m_settings;
+    // variables
+    QHash<QString, QStringList> m_devices;
+    QHash<QString, AWPluginFormaterInterface *> m_formatter;
+    QMultiHash<QString, QString> m_map;
+};

sources/awesome-widget/plugin/awdbusadaptor.cpp

@@ -17,6 +17,9 @@
 
 #include "awdbusadaptor.h"
 
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+
 #include "awdebug.h"
 #include "awkeys.h"
 
@@ -29,9 +32,20 @@ AWDBusAdaptor::AWDBusAdaptor(AWKeys *_parent)
 }
 
 
-AWDBusAdaptor::~AWDBusAdaptor()
+QStringList AWDBusAdaptor::ActiveServices()
 {
-    qCDebug(LOG_DBUS) << __PRETTY_FUNCTION__;
+    auto 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();
+
+    return std::accumulate(arguments.cbegin(), arguments.cend(), QStringList(), [](auto source, auto &service) {
+        if (service.startsWith(AWDBUS_SERVICE))
+            source.append(service);
+        return source;
+    });
 }
 
 
@@ -64,8 +78,7 @@ 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
+        qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be less than" << m_logLevels.count();
-                          << "should be less than" << m_logLevels.count();
         return;
     }
 
@@ -74,19 +87,15 @@ void AWDBusAdaptor::SetLogLevel(const QString &what, const int level)
 }
 
 
-void AWDBusAdaptor::SetLogLevel(const QString &what, const QString &level,
+void AWDBusAdaptor::SetLogLevel(const QString &what, const QString &level, const bool enabled)
-                                const bool enabled)
 {
-    qCDebug(LOG_DBUS) << "Set log level" << level << "enabled" << enabled
+    qCDebug(LOG_DBUS) << "Set log level" << level << "enabled" << enabled << "for" << what;
-                      << "for" << what;
 
     if (!m_logLevels.contains(level)) {
-        qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be in"
+        qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be in" << m_logLevels;
-                          << m_logLevels;
         return;
     }
 
-    QString state = enabled ? "true" : "false";
+    auto state = enabled ? "true" : "false";
-    QLoggingCategory::setFilterRules(
+    QLoggingCategory::setFilterRules(QString("%1.%2=%3").arg(what, level, state));
-        QString("%1.%2=%3").arg(what).arg(level).arg(state));
 }

sources/awesome-widget/plugin/awdbusadaptor.h

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

sources/awesome-widget/plugin/awesomewidget.cpp

@@ -22,8 +22,8 @@
 #include "awactions.h"
 #include "awbugreporter.h"
 #include "awconfighelper.h"
-#include "awformatterconfigfactory.h"
 #include "awkeys.h"
+#include "awpairconfigfactory.h"
 #include "awtelemetryhandler.h"
 
 
@@ -34,8 +34,7 @@ void AWPlugin::registerTypes(const char *uri)
     qmlRegisterType<AWActions>(uri, 1, 0, "AWActions");
     qmlRegisterType<AWBugReporter>(uri, 1, 0, "AWBugReporter");
     qmlRegisterType<AWConfigHelper>(uri, 1, 0, "AWConfigHelper");
-    qmlRegisterType<AWFormatterConfigFactory>(uri, 1, 0,
+    qmlRegisterType<AWPairConfigFactory>(uri, 1, 0, "AWPairConfigFactory");
-                                              "AWFormatterConfigFactory");
     qmlRegisterType<AWKeys>(uri, 1, 0, "AWKeys");
     qmlRegisterType<AWTelemetryHandler>(uri, 1, 0, "AWTelemetryHandler");
 }

sources/awesome-widget/plugin/awesomewidget.h

@@ -15,9 +15,7 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
+#pragma once
-#ifndef AWPLUGIN_H
-#define AWPLUGIN_H
 
 #include <QQmlExtensionPlugin>
 
@@ -28,8 +26,5 @@ class AWPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
-
-
-#endif /* AWPLUGIN_H */

sources/awesome-widget/plugin/awformatterconfig.cpp

@@ -16,168 +16,16 @@
  ***************************************************************************/
 
 #include "awformatterconfig.h"
-#include "ui_awformatterconfig.h"
 
-#include <KI18n/KLocalizedString>
-
-#include <QPushButton>
-
-#include "awabstractselector.h"
 #include "awdebug.h"
 #include "awformatterhelper.h"
 
 
 AWFormatterConfig::AWFormatterConfig(QWidget *_parent, const QStringList &_keys)
-    : QDialog(_parent)
+    : AWAbstractPairConfig(_parent, true, _keys)
-    , ui(new Ui::AWFormatterConfig)
-    , m_keys(_keys)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    ui->setupUi(this);
+    setEditable(false, false);
-    m_editButton
+    setHelper(std::make_unique<AWFormatterHelper>());
-        = ui->buttonBox->addButton(i18n("Edit"), QDialogButtonBox::ActionRole);
-    init();
-
-    connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-    connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-    connect(m_editButton, SIGNAL(clicked(bool)), this, SLOT(editFormatters()));
-}
-
-
-AWFormatterConfig::~AWFormatterConfig()
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    clearSelectors();
-
-    delete m_helper;
-    delete ui;
-}
-
-
-void AWFormatterConfig::showDialog()
-{
-    // update dialog
-    updateDialog();
-    // exec dialog
-    return execDialog();
-}
-
-
-void AWFormatterConfig::editFormatters()
-{
-    m_helper->editItems();
-    updateDialog();
-}
-
-
-void AWFormatterConfig::updateUi()
-{
-    QPair<QString, QString> current
-        = static_cast<AWAbstractSelector *>(sender())->current();
-    int index
-        = m_selectors.indexOf(static_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;
-        AWAbstractSelector *selector = m_selectors.takeAt(index);
-        ui->verticalLayout->removeWidget(selector);
-        selector->deleteLater();
-    } else {
-        // add new selector if something changed
-        if (sender() != m_selectors.last())
-            return;
-        auto keys = initKeys();
-        addSelector(keys.first, keys.second, QPair<QString, QString>());
-    }
-}
-
-
-void AWFormatterConfig::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;
-
-    AWAbstractSelector *selector
-        = new AWAbstractSelector(ui->scrollAreaWidgetContents);
-    selector->init(_keys, _values, _current);
-    ui->verticalLayout->insertWidget(ui->verticalLayout->count() - 1, selector);
-    connect(selector, SIGNAL(selectionChanged()), this, SLOT(updateUi()));
-    m_selectors.append(selector);
-}
-
-
-void AWFormatterConfig::clearSelectors()
-{
-    for (auto &selector : m_selectors) {
-        disconnect(selector, SIGNAL(selectionChanged()), this,
-                   SLOT(updateUi()));
-        ui->verticalLayout->removeWidget(selector);
-        selector->deleteLater();
-    }
-    m_selectors.clear();
-}
-
-
-void AWFormatterConfig::execDialog()
-{
-    int ret = exec();
-    QHash<QString, QString> data;
-    for (auto &selector : m_selectors) {
-        QPair<QString, QString> select = selector->current();
-        if (select.first.isEmpty())
-            continue;
-        data[select.first] = select.second;
-    }
-
-    // save configuration if required
-    switch (ret) {
-    case 0:
-        break;
-    case 1:
-    default:
-        m_helper->writeFormatters(data);
-        m_helper->removeUnusedFormatters(data.keys());
-        break;
-    }
-}
-
-
-void AWFormatterConfig::init()
-{
-    delete m_helper;
-    m_helper = new AWFormatterHelper(this);
-}
-
-
-QPair<QStringList, QStringList> AWFormatterConfig::initKeys() const
-{
-    // we are adding empty string at the start
-    QStringList keys = QStringList() << "";
-    keys.append(m_keys);
-    keys.sort();
-    QStringList knownFormatters = QStringList() << "";
-    knownFormatters.append(m_helper->knownFormatters());
-    knownFormatters.sort();
-
-    return QPair<QStringList, QStringList>(keys, knownFormatters);
-}
-
-
-void AWFormatterConfig::updateDialog()
-{
-    clearSelectors();
-    QHash<QString, QString> appliedFormatters = m_helper->getFormatters();
-    auto keys = initKeys();
-
-    for (auto &key : appliedFormatters.keys())
-        addSelector(keys.first, keys.second,
-                    QPair<QString, QString>(key, appliedFormatters[key]));
-    // empty one
-    addSelector(keys.first, keys.second, QPair<QString, QString>());
 }

sources/awesome-widget/plugin/awformatterconfig.h

@@ -15,50 +15,16 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
+#pragma once
 
-#ifndef AWFORMATTERCONFIG_H
+#include "awabstractpairconfig.h"
-#define AWFORMATTERCONFIG_H
-
-#include <QDialog>
 
 
-class AWAbstractSelector;
+class AWFormatterConfig : public AWAbstractPairConfig
-class AWFormatterHelper;
-namespace Ui
-{
-class AWFormatterConfig;
-}
-
-class AWFormatterConfig : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit AWFormatterConfig(QWidget *_parent = nullptr,
+    explicit AWFormatterConfig(QWidget *_parent = nullptr, const QStringList &_keys = QStringList());
-                               const QStringList &_keys = QStringList());
+    ~AWFormatterConfig() override = default;
-    virtual ~AWFormatterConfig();
-    Q_INVOKABLE void showDialog();
-
-private slots:
-    void editFormatters();
-    void updateUi();
-
-private:
-    QPushButton *m_editButton = nullptr;
-    Ui::AWFormatterConfig *ui = nullptr;
-    AWFormatterHelper *m_helper = nullptr;
-    QList<AWAbstractSelector *> m_selectors;
-    // properties
-    QStringList m_keys;
-    // methods
-    void addSelector(const QStringList &_keys, const QStringList &_values,
-                     const QPair<QString, QString> &_current);
-    void clearSelectors();
-    void execDialog();
-    void init();
-    QPair<QStringList, QStringList> initKeys() const;
-    void updateDialog();
 };
-
-
-#endif /* AWFORMATTERCONFIG_H */

sources/awesome-widget/plugin/awformatterhelper.cpp

@@ -33,13 +33,13 @@
 #include "awstringformatter.h"
 
 
-AWFormatterHelper::AWFormatterHelper(QWidget *_parent)
+AWFormatterHelper::AWFormatterHelper(QObject *_parent)
     : AbstractExtItemAggregator(_parent, "formatters")
+    , AWAbstractPairHelper("awesomewidgets/formatters/formatters.ini", "Formatters")
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    m_filePath = "awesomewidgets/formatters/formatters.ini";
+    AWFormatterHelper::initItems();
-    initItems();
 }
 
 
@@ -52,13 +52,28 @@ AWFormatterHelper::~AWFormatterHelper()
 }
 
 
-QString AWFormatterHelper::convert(const QVariant &_value,
+void AWFormatterHelper::initItems()
-                                   const QString &_name) const
+{
+    initFormatters();
+
+    // assign internal storage
+    m_formatters.clear();
+    for (auto [key, name] : pairs().asKeyValueRange()) {
+        if (!m_formattersClasses.contains(name)) {
+            qCWarning(LOG_AW) << "Invalid formatter" << name << "found in" << key;
+            continue;
+        }
+
+        m_formatters[key] = m_formattersClasses[name];
+    }
+}
+
+
+QString AWFormatterHelper::convert(const QVariant &_value, const QString &_name) const
 {
     qCDebug(LOG_AW) << "Convert value" << _value << "for" << _name;
 
-    return m_formatters.contains(_name) ? m_formatters[_name]->convert(_value)
+    return m_formatters.contains(_name) ? m_formatters[_name]->convert(_value) : _value.toString();
-                                        : _value.toString();
 }
 
 
@@ -68,96 +83,46 @@ QStringList AWFormatterHelper::definedFormatters() const
 }
 
 
-QHash<QString, QString> AWFormatterHelper::getFormatters() const
-{
-    QHash<QString, QString> map;
-    for (auto &tag : m_formatters.keys())
-        map[tag] = m_formatters[tag]->name();
-
-    return map;
-}
-
-
 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;
 }
 
 
-QStringList AWFormatterHelper::knownFormatters() const
+void AWFormatterHelper::editPairs()
+{
+    return editItems();
+}
+
+
+QStringList AWFormatterHelper::leftKeys()
+{
+    return {};
+}
+
+
+QStringList AWFormatterHelper::rightKeys()
 {
     return m_formattersClasses.keys();
 }
 
 
-bool AWFormatterHelper::removeUnusedFormatters(const QStringList &_keys) const
-{
-    qCDebug(LOG_AW) << "Remove formatters" << _keys;
-
-    QString fileName = QString("%1/%2")
-                           .arg(QStandardPaths::writableLocation(
-                               QStandardPaths::GenericDataLocation))
-                           .arg(m_filePath);
-    QSettings settings(fileName, QSettings::IniFormat);
-    qCInfo(LOG_AW) << "Configuration file" << fileName;
-
-    settings.beginGroup("Formatters");
-    QStringList foundKeys = settings.childKeys();
-    for (auto &key : foundKeys) {
-        if (_keys.contains(key))
-            continue;
-        settings.remove(key);
-    }
-    settings.endGroup();
-
-    settings.sync();
-
-    return (settings.status() == QSettings::NoError);
-}
-
-
-bool AWFormatterHelper::writeFormatters(
-    const QHash<QString, QString> &_configuration) const
-{
-    qCDebug(LOG_AW) << "Write configuration" << _configuration;
-
-    QString fileName = QString("%1/%2")
-                           .arg(QStandardPaths::writableLocation(
-                               QStandardPaths::GenericDataLocation))
-                           .arg(m_filePath);
-    QSettings settings(fileName, QSettings::IniFormat);
-    qCInfo(LOG_AW) << "Configuration file" << fileName;
-
-    settings.beginGroup("Formatters");
-    for (auto &key : _configuration.keys())
-        settings.setValue(key, _configuration[key]);
-    settings.endGroup();
-
-    settings.sync();
-
-    return (settings.status() == QSettings::NoError);
-}
-
-
 void AWFormatterHelper::editItems()
 {
-    repaintList();
+    auto ret = exec();
-    int ret = exec();
     qCInfo(LOG_AW) << "Dialog returns" << ret;
 }
 
 
-AWAbstractFormatter::FormatterClass
+AWAbstractFormatter::FormatterClass AWFormatterHelper::defineFormatterClass(const QString &_stringType)
-AWFormatterHelper::defineFormatterClass(const QString &_stringType) const
 {
     qCDebug(LOG_AW) << "Define formatter class for" << _stringType;
 
-    AWAbstractFormatter::FormatterClass formatter
+    auto formatter = AWAbstractFormatter::FormatterClass::NoFormat;
-        = AWAbstractFormatter::FormatterClass::NoFormat;
     if (_stringType == "DateTime")
         formatter = AWAbstractFormatter::FormatterClass::DateTime;
     else if (_stringType == "Float")
@@ -183,47 +148,43 @@ void AWFormatterHelper::initFormatters()
 {
     m_formattersClasses.clear();
 
-    for (int i = m_directories.count() - 1; i >= 0; i--) {
+    auto dirs = directories();
-        QStringList files
+    for (auto &dir : dirs) {
-            = QDir(m_directories.at(i)).entryList(QDir::Files, QDir::Name);
+        auto 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"
+            qCInfo(LOG_AW) << "Found file" << file << "in" << dir;
-                           << m_directories.at(i);
+            auto filePath = QString("%1/%2").arg(dir, file);
-            QString filePath
+            // check if already exists
-                = QString("%1/%2").arg(m_directories.at(i)).arg(file);
+            auto values = m_formattersClasses.values();
-            auto metadata = readMetadata(filePath);
+            if (std::any_of(values.cbegin(), values.cend(),
-            QString name = metadata.first;
+                            [&filePath](auto item) { return (item->filePath() == filePath); }))
-            if (m_formattersClasses.contains(name))
                 continue;
 
-
+            auto metadata = readMetadata(filePath);
             switch (metadata.second) {
             case AWAbstractFormatter::FormatterClass::DateTime:
-                m_formattersClasses[name]
+                m_formattersClasses[metadata.first] = new AWDateTimeFormatter(this, filePath);
-                    = new AWDateTimeFormatter(this, filePath);
                 break;
             case AWAbstractFormatter::FormatterClass::Float:
-                m_formattersClasses[name]
+                m_formattersClasses[metadata.first] = new AWFloatFormatter(this, filePath);
-                    = new AWFloatFormatter(this, filePath);
                 break;
             case AWAbstractFormatter::FormatterClass::List:
-                m_formattersClasses[name] = new AWListFormatter(this, filePath);
+                m_formattersClasses[metadata.first] = new AWListFormatter(this, filePath);
                 break;
             case AWAbstractFormatter::FormatterClass::Script:
-                m_formattersClasses[name]
+                m_formattersClasses[metadata.first] = new AWScriptFormatter(this, filePath);
-                    = new AWScriptFormatter(this, filePath);
                 break;
             case AWAbstractFormatter::FormatterClass::String:
-                m_formattersClasses[name]
+                m_formattersClasses[metadata.first] = new AWStringFormatter(this, filePath);
-                    = new AWStringFormatter(this, filePath);
                 break;
             case AWAbstractFormatter::FormatterClass::Json:
-                m_formattersClasses[name] = new AWJsonFormatter(this, filePath);
+                m_formattersClasses[metadata.first] = new AWJsonFormatter(this, filePath);
                 break;
             case AWAbstractFormatter::FormatterClass::NoFormat:
-                m_formattersClasses[name] = new AWNoFormatter(this, filePath);
+                m_formattersClasses[metadata.first] = new AWNoFormatter(this, filePath);
                 break;
             }
         }
@@ -231,113 +192,48 @@ void AWFormatterHelper::initFormatters()
 }
 
 
-void AWFormatterHelper::initKeys()
+QPair<QString, AWAbstractFormatter::FormatterClass> AWFormatterHelper::readMetadata(const QString &_filePath)
-{
-    m_formatters.clear();
-
-    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("Formatters");
-        QStringList keys = settings.childKeys();
-        for (auto &key : keys) {
-            QString name = settings.value(key).toString();
-            qCInfo(LOG_AW) << "Found formatter" << name << "for key" << key
-                           << "in" << settings.fileName();
-            if (name.isEmpty()) {
-                qCInfo(LOG_AW) << "Skip empty formatter for" << key;
-                continue;
-            }
-            if (!m_formattersClasses.contains(name)) {
-                qCWarning(LOG_AW)
-                    << "Invalid formatter" << name << "found in" << key;
-                continue;
-            }
-            m_formatters[key] = m_formattersClasses[name];
-        }
-        settings.endGroup();
-    }
-}
-
-
-void AWFormatterHelper::installDirectories()
-{
-    // create directory at $HOME
-    QString localDir = QString("%1/awesomewidgets/formatters")
-                           .arg(QStandardPaths::writableLocation(
-                               QStandardPaths::GenericDataLocation));
-    QDir localDirectory;
-    if (localDirectory.mkpath(localDir))
-        qCInfo(LOG_AW) << "Created directory" << localDir;
-
-    m_directories = QStandardPaths::locateAll(
-        QStandardPaths::GenericDataLocation, "awesomewidgets/formatters",
-        QStandardPaths::LocateDirectory);
-}
-
-
-QPair<QString, AWAbstractFormatter::FormatterClass>
-AWFormatterHelper::readMetadata(const QString &_filePath) const
 {
     qCDebug(LOG_AW) << "Read initial parameters from" << _filePath;
 
     QSettings settings(_filePath, QSettings::IniFormat);
+
     settings.beginGroup("Desktop Entry");
-    QString name = settings.value("Name", _filePath).toString();
+    auto name = settings.value("Name", _filePath).toString();
-    QString type = settings.value("X-AW-Type", "NoFormat").toString();
+    auto type = settings.value("X-AW-Type", "NoFormat").toString();
-    AWAbstractFormatter::FormatterClass formatter = defineFormatterClass(type);
+    auto formatter = defineFormatterClass(type);
     settings.endGroup();
 
-    return QPair<QString, AWAbstractFormatter::FormatterClass>(name, formatter);
+    return {name, formatter};
 }
 
 
-void AWFormatterHelper::doCreateItem()
+void AWFormatterHelper::doCreateItem(QListWidget *_widget)
 {
-    QStringList selection = QStringList() << "NoFormat"
+    QStringList selection = {"NoFormat", "DateTime", "Float", "List", "Script", "String", "Json"};
-                                          << "DateTime"
-                                          << "Float"
-                                          << "List"
-                                          << "Script"
-                                          << "String"
-                                          << "Json";
     bool ok;
-    QString select = QInputDialog::getItem(
+    auto select = QInputDialog::getItem(nullptr, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok);
-        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;
-    AWAbstractFormatter::FormatterClass formatter
+    auto formatter = defineFormatterClass(select);
-        = defineFormatterClass(select);
     switch (formatter) {
     case AWAbstractFormatter::FormatterClass::DateTime:
-        return createItem<AWDateTimeFormatter>();
+        return createItem<AWDateTimeFormatter>(_widget);
     case AWAbstractFormatter::FormatterClass::Float:
-        return createItem<AWFloatFormatter>();
+        return createItem<AWFloatFormatter>(_widget);
     case AWAbstractFormatter::FormatterClass::List:
-        return createItem<AWListFormatter>();
+        return createItem<AWListFormatter>(_widget);
     case AWAbstractFormatter::FormatterClass::Script:
-        return createItem<AWScriptFormatter>();
+        return createItem<AWScriptFormatter>(_widget);
     case AWAbstractFormatter::FormatterClass::String:
-        return createItem<AWStringFormatter>();
+        return createItem<AWStringFormatter>(_widget);
     case AWAbstractFormatter::FormatterClass::Json:
-        return createItem<AWJsonFormatter>();
+        return createItem<AWJsonFormatter>(_widget);
     case AWAbstractFormatter::FormatterClass::NoFormat:
-        return createItem<AWNoFormatter>();
+        return createItem<AWNoFormatter>(_widget);
     }
 }
-
-
-void AWFormatterHelper::initItems()
-{
-    installDirectories();
-    initFormatters();
-    initKeys();
-}

sources/awesome-widget/plugin/awformatterhelper.h

@@ -15,53 +15,42 @@
  *   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"
+#include "awabstractpairhelper.h"
 
 
-class AWAbstractFormatter;
+class AWFormatterHelper : public AbstractExtItemAggregator, public AWAbstractPairHelper
-
-class AWFormatterHelper : public AbstractExtItemAggregator
 {
     Q_OBJECT
 
 public:
-    explicit AWFormatterHelper(QWidget *_parent = nullptr);
+    explicit AWFormatterHelper(QObject *_parent = nullptr);
-    virtual ~AWFormatterHelper();
+    ~AWFormatterHelper() override;
-    QString convert(const QVariant &_value, const QString &_name) const;
+    // read-write methods
-    QStringList definedFormatters() const;
+    void initItems() override;
-    QHash<QString, QString> getFormatters() const;
+    // methods
-    QList<AbstractExtItem *> items() const;
+    [[nodiscard]] QString convert(const QVariant &_value, const QString &_name) const;
-    QStringList knownFormatters() const;
+    [[nodiscard]] QStringList definedFormatters() const;
-    bool removeUnusedFormatters(const QStringList &_keys) const;
+    [[nodiscard]] QList<AbstractExtItem *> items() const override;
-    bool writeFormatters(const QHash<QString, QString> &_configuration) const;
+    // configuration related
+    void editPairs() override;
+    QStringList leftKeys() override;
+    QStringList rightKeys() override;
 
 public slots:
     void editItems();
 
 private:
     // methods
-    AWAbstractFormatter::FormatterClass
+    static AWAbstractFormatter::FormatterClass defineFormatterClass(const QString &_stringType);
-    defineFormatterClass(const QString &_stringType) const;
     void initFormatters();
-    void initKeys();
+    [[nodiscard]] static QPair<QString, AWAbstractFormatter::FormatterClass> readMetadata(const QString &_filePath);
-    void installDirectories();
-    QPair<QString, AWAbstractFormatter::FormatterClass>
-    readMetadata(const QString &_filePath) const;
     // parent methods
-    void doCreateItem();
+    void doCreateItem(QListWidget *_widget) override;
-    void initItems();
     // properties
-    QStringList m_directories;
-    QString m_filePath;
     QHash<QString, AWAbstractFormatter *> m_formatters;
     QHash<QString, AWAbstractFormatter *> m_formattersClasses;
 };
-
-
-#endif /* AWFORMATTERHELPER_H */

sources/awesome-widget/plugin/awkeycache.cpp

@@ -15,11 +15,12 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
+
 #include "awkeycache.h"
 
 #include <QDir>
 #include <QNetworkInterface>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QSettings>
 #include <QStandardPaths>
 
@@ -30,9 +31,8 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
 {
     qCDebug(LOG_AW) << "Key" << _key << "with type" << _type;
 
-    QString fileName = QString("%1/awesomewidgets.ndx")
+    auto fileName
-                           .arg(QStandardPaths::writableLocation(
+        = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
-                               QStandardPaths::GenericCacheLocation));
     qCInfo(LOG_AW) << "Cache file" << fileName;
     QSettings cache(fileName, QSettings::IniFormat);
 
@@ -41,40 +41,21 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
     for (auto &number : cache.allKeys())
         cachedValues.append(cache.value(number).toString());
 
-    if (_type == "hdd") {
+    if (_type == "net") {
-        QStringList allDevices
+        auto rawInterfaceList = QNetworkInterface::allInterfaces();
-            = 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) {
-            QString device = interface.name();
+            auto device = interface.name();
             if (cachedValues.contains(device))
                 continue;
             qCInfo(LOG_AW) << "Found new key" << device << "for type" << _type;
             cachedValues.append(device);
-            cache.setValue(
+            cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), device);
-                QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')),
-                device);
         }
     } else {
         if (cachedValues.contains(_key))
             return false;
         qCInfo(LOG_AW) << "Found new key" << _key << "for type" << _type;
-        cache.setValue(
+        cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), _key);
-            QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')),
-            _key);
     }
     cache.endGroup();
 
@@ -83,83 +64,37 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
 }
 
 
-QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys,
+QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringList &_bars, const QVariantMap &_tooltip,
-                                        const QStringList &_bars,
+                                        const QStringList &_userKeys, const QStringList &_allKeys)
-                                        const QVariantMap &_tooltip,
-                                        const QStringList &_allKeys)
 {
-    qCDebug(LOG_AW) << "Looking for required keys in" << _keys << _bars
+    qCDebug(LOG_AW) << "Looking for required keys in" << _keys << _bars << "using tooltip settings" << _tooltip;
-                    << "using tooltip settings" << _tooltip;
 
     // initial copy
-    QSet<QString> used = QSet<QString>::fromList(_keys);
+    QSet<QString> used(_keys.cbegin(), _keys.cend());
-    used.unite(QSet<QString>::fromList(_bars));
+    used.unite(QSet(_bars.cbegin(), _bars.cend()));
+    used.unite(QSet(_userKeys.cbegin(), _userKeys.cend()));
     // insert keys from tooltip
-    for (auto &key : _tooltip.keys()) {
+    for (auto [key, value] : _tooltip.asKeyValueRange()) {
-        if ((key.endsWith("Tooltip")) && (_tooltip[key].toBool())) {
+        if ((key.endsWith("Tooltip")) && value.toBool()) {
-            key.remove("Tooltip");
+            auto local = key;
-            used << key;
+            local.remove("Tooltip");
+            used << local;
         }
     }
 
-    // insert depending keys, refer to AWKeys::calculateValues()
+    // insert keys which depend on others, 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({"up", "upkb", "uptotal", "uptotalkb", "upunits",
+    QStringList netKeys(
-                         "down", "downkb", "downtotal", "downtotalkb",
+        {"up", "upkb", "uptot", "uptotkb", "upunits", "down", "downkb", "downtot", "downtotkb", "downunits"});
-                         "downunits"});
     for (auto &key : netKeys) {
         if (!used.contains(key))
             continue;
-        QStringList filt
+        auto filt = _allKeys.filter(QRegularExpression(QString("^%1[0-9]{1,}").arg(key)));
-            = _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(),
+    if (std::any_of(netKeys.cbegin(), netKeys.cend(), [&used](auto &key) { return used.contains(key); }))
-                    [&used](const QString &key) { return used.contains(key); }))
         used << "netdev";
 
     // HACK append dummy if there are no other keys. This hack is required
@@ -167,23 +102,27 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys,
     if (used.isEmpty())
         used << "dummy";
 
-    return used.toList();
+    return used.values();
 }
 
 
-QHash<QString, QStringList> AWKeyCache::loadKeysFromCache()
+AWPluginMatcherSettings AWKeyCache::loadKeysFromCache()
 {
-    QString fileName = QString("%1/awesomewidgets.ndx")
+    auto fileName
-                           .arg(QStandardPaths::writableLocation(
+        = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
-                               QStandardPaths::GenericCacheLocation));
     qCInfo(LOG_AW) << "Cache file" << fileName;
     QSettings cache(fileName, QSettings::IniFormat);
 
-    QHash<QString, QStringList> devices;
+    AWPluginMatcherSettings devices;
-    for (auto &group : cache.childGroups()) {
+    QHash<QString, QStringList *> groups = {
+        {"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())
-            devices[group].append(cache.value(key).toString());
+            list->append(cache.value(key).toString());
         cache.endGroup();
     }
 

sources/awesome-widget/plugin/awkeycache.h

@@ -15,23 +15,18 @@
  *   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,
+QStringList getRequiredKeys(const QStringList &_keys, const QStringList &_bars, const QVariantMap &_tooltip,
-                            const QVariantMap &_tooltip,
+                            const QStringList &_userKeys, const QStringList &_allKeys);
-                            const QStringList &_allKeys);
+AWPluginMatcherSettings loadKeysFromCache();
-QHash<QString, QStringList> loadKeysFromCache();
+} // namespace AWKeyCache
-};
-
-
-#endif /* AWKEYCACHE_H */

sources/awesome-widget/plugin/awkeyoperations.cpp

@@ -18,10 +18,10 @@
 #include "awkeyoperations.h"
 
 #include <QDir>
-#include <QJSEngine>
+#include <QRegularExpression>
-#include <QRegExp>
 #include <QThread>
 
+#include "awcustomkeyshelper.h"
 #include "awdebug.h"
 #include "awkeycache.h"
 #include "awpatternfunctions.h"
@@ -38,32 +38,18 @@ AWKeyOperations::AWKeyOperations(QObject *_parent)
     : QObject(_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    m_customKeys = new AWCustomKeysHelper(this);
+    m_graphicalItems = new ExtItemAggregator<GraphicalItem>(this, "desktops");
+    m_extNetRequest = new ExtItemAggregator<ExtNetworkRequest>(this, "requests");
+    m_extQuotes = new ExtItemAggregator<ExtQuotes>(this, "quotes");
+    m_extScripts = new ExtItemAggregator<ExtScript>(this, "scripts");
+    m_extUpgrade = new ExtItemAggregator<ExtUpgrade>(this, "upgrade");
+    m_extWeather = new ExtItemAggregator<ExtWeather>(this, "weather");
 }
 
 
-AWKeyOperations::~AWKeyOperations()
+AWPluginMatcherSettings AWKeyOperations::devices() const
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    // extensions
-    delete m_graphicalItems;
-    delete m_extNetRequest;
-    delete m_extQuotes;
-    delete m_extScripts;
-    delete m_extUpgrade;
-    delete m_extWeather;
-}
-
-
-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;
 }
@@ -72,7 +58,6 @@ QHash<QString, QStringList> AWKeyOperations::devices() const
 void AWKeyOperations::updateCache()
 {
     // update network and hdd list
-    addKeyToCache("hdd");
     addKeyToCache("net");
 }
 
@@ -81,7 +66,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"));
@@ -90,15 +75,20 @@ QStringList AWKeyOperations::dictKeys() const
         allKeys.append(item->tag("timestamp"));
     }
     // cpuclock & cpu
-    for (int i = 0; i < QThread::idealThreadCount(); i++) {
+    for (auto i = 0; i < QThread::idealThreadCount(); ++i) {
         allKeys.append(QString("cpucl%1").arg(i));
         allKeys.append(QString("cpu%1").arg(i));
     }
     // temperature
-    for (int i = 0; i < m_devices["temp"].count(); i++)
+    for (auto i = 0; i < m_devices.sensors.count(); ++i)
         allKeys.append(QString("temp%1").arg(i));
+    // gpu
+    for (auto i = 0; i < m_devices.gpu.count(); ++i) {
+        allKeys.append(QString("gpu%1").arg(i));
+        allKeys.append(QString("gputemp%1").arg(i));
+    }
     // hdd
-    for (int i = 0; i < m_devices["mount"].count(); i++) {
+    for (auto i = 0; i < m_devices.mount.count(); ++i) {
         allKeys.append(QString("hddmb%1").arg(i));
         allKeys.append(QString("hddgb%1").arg(i));
         allKeys.append(QString("hddfreemb%1").arg(i));
@@ -108,57 +98,56 @@ QStringList AWKeyOperations::dictKeys() const
         allKeys.append(QString("hdd%1").arg(i));
     }
     // hdd speed
-    for (int i = 0; i < m_devices["disk"].count(); i++) {
+    for (auto i = 0; i < m_devices.disk.count(); ++i) {
         allKeys.append(QString("hddr%1").arg(i));
         allKeys.append(QString("hddw%1").arg(i));
     }
-    // hdd temp
-    for (int i = 0; i < m_devices["hdd"].count(); i++)
-        allKeys.append(QString("hddtemp%1").arg(i));
     // network
-    for (int i = 0; i < m_devices["net"].count(); i++) {
+    for (auto i = 0; i < m_devices.network.count(); ++i) {
         allKeys.append(QString("downunits%1").arg(i));
         allKeys.append(QString("upunits%1").arg(i));
-        allKeys.append(QString("downtotalkb%1").arg(i));
+        allKeys.append(QString("downtotkb%1").arg(i));
-        allKeys.append(QString("downtotal%1").arg(i));
+        allKeys.append(QString("downtot%1").arg(i));
         allKeys.append(QString("downkb%1").arg(i));
         allKeys.append(QString("down%1").arg(i));
-        allKeys.append(QString("uptotalkb%1").arg(i));
+        allKeys.append(QString("uptotkb%1").arg(i));
-        allKeys.append(QString("uptotal%1").arg(i));
+        allKeys.append(QString("uptot%1").arg(i));
         allKeys.append(QString("upkb%1").arg(i));
         allKeys.append(QString("up%1").arg(i));
     }
     // battery
-    QStringList allBatteryDevices
+    auto allBatteryDevices = QDir("/sys/class/power_supply")
-        = QDir("/sys/class/power_supply")
+                                 .entryList(QStringList({"BAT*"}), QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
-              .entryList(QStringList({"BAT*"}),
+    for (int i = 0; i < allBatteryDevices.count(); ++i) {
-                         QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
-    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));
+        allKeys.append(QString("batrate%1").arg(i));
+        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("ask"));
-        allKeys.append(item->tag("askchg"));
-        allKeys.append(item->tag("percaskchg"));
-        allKeys.append(item->tag("bid"));
-        allKeys.append(item->tag("bidchg"));
-        allKeys.append(item->tag("percbidchg"));
         allKeys.append(item->tag("price"));
         allKeys.append(item->tag("pricechg"));
         allKeys.append(item->tag("percpricechg"));
+        allKeys.append(item->tag("volume"));
+        allKeys.append(item->tag("volumechg"));
+        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());
     // static keys
     allKeys.append(QString(STATIC_KEYS).split(','));
 
@@ -180,58 +169,80 @@ GraphicalItem *AWKeyOperations::giByKey(const QString &_key) const
 }
 
 
+QStringList AWKeyOperations::requiredUserKeys() const
+{
+    return m_customKeys->refinedSources();
+}
+
+
+QStringList AWKeyOperations::userKeys() const
+{
+    return m_customKeys->keys();
+}
+
+
+QString AWKeyOperations::userKeySource(const QString &_key) const
+{
+    return m_customKeys->source(_key);
+}
+
+
 QString AWKeyOperations::infoByKey(const QString &_key) const
 {
     qCDebug(LOG_AW) << "Requested key" << _key;
 
-    QString stripped = _key;
+    static auto numberRegExp = QRegularExpression("\\d+");
-    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")) {
-        AbstractExtItem *item = m_graphicalItems->itemByTag(_key, stripped);
+        auto item = m_graphicalItems->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
     } else if (_key.startsWith("custom")) {
-        AbstractExtItem *item = m_extScripts->itemByTag(_key, stripped);
+        auto item = m_extScripts->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
-    } else if (_key.contains(QRegExp("^hdd[rw]"))) {
+    } else if (_key.contains(hddrwRegExp)) {
-        QString index = _key;
+        auto index = _key;
-        index.remove(QRegExp("hdd[rw]"));
+        index.remove(hddrwRegExp);
-        output = m_devices["disk"][index.toInt()];
+        output = m_devices.disk[index.toInt()];
-    } else if (_key.contains(
+    } else if (_key.contains(hddMatchRegExp)) {
-                   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")) {
-        AbstractExtItem *item = m_extUpgrade->itemByTag(_key, stripped);
+        auto item = m_extUpgrade->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
-    } else if (_key.contains(QRegExp("(^|perc)(ask|bid|price)(chg|)"))) {
+    } else if (_key.contains(quotesRegExp)) {
-        AbstractExtItem *item = m_extQuotes->itemByTag(_key, stripped);
+        auto item = m_extQuotes->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
-    } else if (_key.contains(QRegExp(
+    } else if (_key.contains(weatherRegExp)) {
-                   "(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")) {
-        QString index = _key;
+        auto index = _key;
         index.remove("temp");
-        output = m_devices["temp"][index.toInt()];
+        output = m_devices.sensors[index.toInt()];
     } else if (_key.startsWith("response")) {
-        AbstractExtItem *item = m_extNetRequest->itemByTag(_key, stripped);
+        auto item = m_extNetRequest->itemByTag(_key, stripped);
         if (item)
             output = item->uniq();
     } else {
@@ -260,9 +271,10 @@ 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") {
-        QStringList keys = dictKeys().filter(
+        auto keys = dictKeys().filter(supportsGraphicalRegExp);
-            QRegExp("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)"));
         keys.sort();
         m_graphicalItems->setConfigArgs(keys);
         return m_graphicalItems->editItems();
@@ -284,19 +296,26 @@ void AWKeyOperations::addDevice(const QString &_source)
 {
     qCDebug(LOG_AW) << "Source" << _source;
 
-    QRegExp diskRegexp = QRegExp("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)");
+    static auto diskRegexp = QRegularExpression("^disk/.*/read$");
-    QRegExp mountRegexp = QRegExp("partitions/.*/filllevel");
+    static auto mountRegexp = QRegularExpression("^disk/.*/usedPercent$");
+    static auto cpuTempRegExp = QRegularExpression("^cpu/cpu.*/temperature$");
+    static auto gpuRegExp = QRegularExpression("^gpu/gpu.*/usage$");
 
     if (_source.contains(diskRegexp)) {
-        QString device = _source;
+        auto device = _source;
-        device.remove("/Rate/rblk");
+        device.remove("disk/").remove("/read");
         addKeyToCache("disk", device);
     } else if (_source.contains(mountRegexp)) {
-        QString device = _source;
+        auto device = _source;
-        device.remove("partitions").remove("/filllevel");
+        device.remove("disk/").remove("/usedPercent");
         addKeyToCache("mount", device);
-    } else if (_source.startsWith("lmsensors")) {
+    } else if (_source.startsWith("lmsensors") || _source.contains(cpuTempRegExp)
+               || _source == "cpu/all/averageTemperature") {
         addKeyToCache("temp", _source);
+    } else if (_source.contains(gpuRegExp)) {
+        auto device = _source;
+        device.remove("gpu/").remove("/usage");
+        addKeyToCache("gpu", device);
     }
 }
 
@@ -314,32 +333,16 @@ void AWKeyOperations::addKeyToCache(const QString &_type, const QString &_key)
 
 void AWKeyOperations::reinitKeys()
 {
-    // renew extensions
+    m_customKeys->initItems();
-    // delete them if any
+    m_graphicalItems->initItems();
-    delete m_graphicalItems;
+    m_extNetRequest->initItems();
-    m_graphicalItems = nullptr;
+    m_extQuotes->initItems();
-    delete m_extNetRequest;
+    m_extScripts->initItems();
-    m_extNetRequest = nullptr;
+    m_extUpgrade->initItems();
-    delete m_extQuotes;
+    m_extWeather->initItems();
-    m_extQuotes = nullptr;
-    delete m_extScripts;
-    m_extScripts = nullptr;
-    delete m_extUpgrade;
-    m_extUpgrade = nullptr;
-    delete m_extWeather;
-    m_extWeather = nullptr;
-    // create
-    m_graphicalItems
-        = new ExtItemAggregator<GraphicalItem>(nullptr, "desktops");
-    m_extNetRequest
-        = new ExtItemAggregator<ExtNetworkRequest>(nullptr, "requests");
-    m_extQuotes = new ExtItemAggregator<ExtQuotes>(nullptr, "quotes");
-    m_extScripts = new ExtItemAggregator<ExtScript>(nullptr, "scripts");
-    m_extUpgrade = new ExtItemAggregator<ExtUpgrade>(nullptr, "upgrade");
-    m_extWeather = new ExtItemAggregator<ExtWeather>(nullptr, "weather");
 
     // init
-    QStringList allKeys = dictKeys();
+    auto allKeys = dictKeys();
 
     // apply aw_* functions
     m_pattern = AWPatternFunctions::insertAllKeys(m_pattern, allKeys);

sources/awesome-widget/plugin/awkeyoperations.h

@@ -15,28 +15,21 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
+#pragma once
 
-#ifndef AWKEYOPERATIONS_H
-#define AWKEYOPERATIONS_H
-
-#include <Plasma/DataEngine>
-
-#include <QMutex>
 #include <QObject>
 
 #include "extitemaggregator.h"
+#include "matchers/awpluginmatchersettings.h"
 
 
-class AWDataAggregator;
+class AWCustomKeysHelper;
-class AWDataEngineAggregator;
-class AWKeysAggregator;
 class ExtNetworkRequest;
 class ExtQuotes;
 class ExtScript;
 class ExtUpgrade;
 class ExtWeather;
 class GraphicalItem;
-class QThreadPool;
 
 class AWKeyOperations : public QObject
 {
@@ -45,16 +38,18 @@ class AWKeyOperations : public QObject
 
 public:
     explicit AWKeyOperations(QObject *_parent = nullptr);
-    virtual ~AWKeyOperations();
+    ~AWKeyOperations() override = default;
-    QStringList devices(const QString &_type) const;
+    [[nodiscard]] AWPluginMatcherSettings devices() const;
-    QHash<QString, QStringList> devices() const;
     void updateCache();
     // keys
-    QStringList dictKeys() const;
+    [[nodiscard]] QStringList dictKeys() const;
-    GraphicalItem *giByKey(const QString &_key) const;
+    [[nodiscard]] GraphicalItem *giByKey(const QString &_key) const;
+    [[nodiscard]] QStringList requiredUserKeys() const;
+    [[nodiscard]] QStringList userKeys() const;
+    [[nodiscard]] QString userKeySource(const QString &_key) const;
     // values
-    QString infoByKey(const QString &_key) const;
+    [[nodiscard]] QString infoByKey(const QString &_key) const;
-    QString pattern() const;
+    [[nodiscard]] QString pattern() const;
     void setPattern(const QString &_currentPattern);
     // configuration
     void editItem(const QString &_type);
@@ -70,6 +65,7 @@ private:
     void addKeyToCache(const QString &_type, const QString &_key = "");
     void reinitKeys();
     // objects
+    AWCustomKeysHelper *m_customKeys = nullptr;
     ExtItemAggregator<GraphicalItem> *m_graphicalItems = nullptr;
     ExtItemAggregator<ExtNetworkRequest> *m_extNetRequest = nullptr;
     ExtItemAggregator<ExtQuotes> *m_extQuotes = nullptr;
@@ -77,9 +73,6 @@ private:
     ExtItemAggregator<ExtUpgrade> *m_extUpgrade = nullptr;
     ExtItemAggregator<ExtWeather> *m_extWeather = nullptr;
     // variables
-    QHash<QString, QStringList> m_devices;
+    AWPluginMatcherSettings m_devices;
     QString m_pattern;
 };
-
-
-#endif /* AWKEYOPERATIONS_H */

sources/awesome-widget/plugin/awkeys.cpp

@@ -19,10 +19,8 @@
 
 #include <QDBusConnection>
 #include <QDBusError>
-#include <QRegExp>
+#include <QRegularExpression>
-#include <QThread>
 #include <QTimer>
-#include <QtConcurrent/QtConcurrent>
 
 #include "awdataaggregator.h"
 #include "awdataengineaggregator.h"
@@ -43,9 +41,6 @@ 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);
@@ -57,17 +52,17 @@ AWKeys::AWKeys(QObject *_parent)
     createDBusInterface();
 
     // update key data if required
-    connect(m_keyOperator, SIGNAL(updateKeys(const QStringList &)), this,
+    connect(m_keyOperator, &AWKeyOperations::updateKeys, this, &AWKeys::reinitKeys);
-            SLOT(reinitKeys(const QStringList &)));
+    connect(m_timer, &QTimer::timeout, this, &AWKeys::updateTextData);
-    connect(m_timer, SIGNAL(timeout()), this, SLOT(updateTextData()));
+
     // transfer signal from AWDataAggregator object to QML ui
-    connect(m_dataAggregator, SIGNAL(toolTipPainted(const QString &)), this,
+    connect(m_dataAggregator, &AWDataAggregator::toolTipPainted,
-            SIGNAL(needToolTipToBeUpdated(const QString &)));
+            [this](const QString &_tooltip) { emit(needToolTipToBeUpdated(_tooltip)); });
-    connect(this, SIGNAL(dropSourceFromDataengine(const QString &)),
+
-            m_dataEngineAggregator, SLOT(dropSource(const QString &)));
+    connect(this, &AWKeys::dropSourceFromDataengine, m_dataEngineAggregator, &AWDataEngineAggregator::dropSource);
+    connect(m_dataEngineAggregator, &AWDataEngineAggregator::dataUpdated, this, &AWKeys::dataUpdated);
     // transfer signal from dataengine to update source list
-    connect(m_dataEngineAggregator, SIGNAL(deviceAdded(const QString &)),
+    connect(m_dataEngineAggregator, &AWDataEngineAggregator::deviceAdded, m_keyOperator, &AWKeyOperations::addDevice);
-            m_keyOperator, SLOT(addDevice(const QString &)));
 }
 
 
@@ -76,24 +71,9 @@ AWKeys::~AWKeys()
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
     m_timer->stop();
-    delete m_timer;
-
     // delete dbus session
-    qlonglong id = reinterpret_cast<qlonglong>(this);
+    auto id = reinterpret_cast<qlonglong>(this);
     QDBusConnection::sessionBus().unregisterObject(QString("/%1").arg(id));
-
-    // core
-    delete m_dataEngineAggregator;
-    delete m_threadPool;
-    delete m_aggregator;
-    delete m_dataAggregator;
-    delete m_keyOperator;
-}
-
-
-bool AWKeys::isDBusActive() const
-{
-    return m_dbusActive;
 }
 
 
@@ -107,23 +87,17 @@ void AWKeys::initDataAggregator(const QVariantMap &_tooltipParams)
 }
 
 
-void AWKeys::initKeys(const QString &_currentPattern, const int _interval,
+void AWKeys::initKeys(const QString &_currentPattern, const int _interval, const bool _optimize)
-                      const int _limit, const bool _optimize)
 {
-    qCDebug(LOG_AW) << "Pattern" << _currentPattern << "with interval"
+    qCDebug(LOG_AW) << "Pattern" << _currentPattern << "with interval" << _interval << "with optimization" << _optimize;
-                    << _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->clear();
+    m_dataEngineAggregator->loadSources();
-    m_dataEngineAggregator->initDataEngines(_interval);
 
     // timer
     m_timer->setInterval(_interval);
@@ -155,39 +129,21 @@ void AWKeys::updateCache()
 
 QStringList AWKeys::dictKeys(const bool _sorted, const QString &_regexp) const
 {
-    qCDebug(LOG_AW) << "Should be sorted" << _sorted << "and filter applied"
+    qCDebug(LOG_AW) << "Should be sorted" << _sorted << "and filter applied" << _regexp;
-                    << _regexp;
 
     // check if functions asked
     if (_regexp == "functions")
         return QString(STATIC_FUNCTIONS).split(',');
+    // check if user defined keys asked
+    if (_regexp == "userdefined")
+        return m_keyOperator->userKeys();
 
     QStringList allKeys = m_keyOperator->dictKeys();
     // sort if required
     if (_sorted)
         allKeys.sort();
 
-    return allKeys.filter(QRegExp(_regexp));
+    return allKeys.filter(QRegularExpression(_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;
 }
 
 
@@ -204,10 +160,9 @@ QString AWKeys::valueByKey(const QString &_key) const
 {
     qCDebug(LOG_AW) << "Requested value for key" << _key;
 
-    QString trueKey
+    auto realKey = _key.startsWith("bar") ? m_keyOperator->infoByKey(_key) : _key;
-        = _key.startsWith("bar") ? m_keyOperator->infoByKey(_key) : _key;
 
-    return m_aggregator->formatter(m_values[trueKey], trueKey);
+    return m_aggregator->formatter(m_values[realKey], realKey, true);
 }
 
 
@@ -219,12 +174,16 @@ void AWKeys::editItem(const QString &_type)
 }
 
 
-void AWKeys::dataUpdated(const QString &_sourceName,
+void AWKeys::dataUpdated(const QHash<QString, KSysGuard::SensorInfo> &_sensors, const KSysGuard::SensorDataList &_data)
-                         const Plasma::DataEngine::Data &_data)
 {
-    // run concurrent data update
+    qCDebug(LOG_AW) << "Update data for" << _data.count() << "items";
-    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);
+    }
 }
 
 
@@ -233,27 +192,23 @@ void AWKeys::reinitKeys(const QStringList &_currentKeys)
     qCDebug(LOG_AW) << "Update found keys by using list" << _currentKeys;
 
     // append lists
-    m_foundBars = AWPatternFunctions::findKeys(m_keyOperator->pattern(),
+    m_foundBars = AWPatternFunctions::findKeys(m_keyOperator->pattern(), _currentKeys, true);
-                                               _currentKeys, true);
+    m_foundKeys = AWPatternFunctions::findKeys(m_keyOperator->pattern(), _currentKeys, false);
-    m_foundKeys = AWPatternFunctions::findKeys(m_keyOperator->pattern(),
-                                               _currentKeys, false);
     m_foundLambdas = AWPatternFunctions::findLambdas(m_keyOperator->pattern());
     // generate list of required keys for bars
     QStringList barKeys;
     for (auto &bar : m_foundBars) {
-        GraphicalItem *item = m_keyOperator->giByKey(bar);
+        auto item = m_keyOperator->giByKey(bar);
         if (item->isCustom())
-            item->setUsedKeys(
+            item->setUsedKeys(AWPatternFunctions::findKeys(item->bar(), _currentKeys, false));
-                AWPatternFunctions::findKeys(item->bar(), _currentKeys, false));
         else
             item->setUsedKeys(QStringList() << item->bar());
         barKeys.append(item->usedKeys());
     }
     // get required keys
-    m_requiredKeys
+    m_requiredKeys = m_optimize ? AWKeyCache::getRequiredKeys(m_foundKeys, barKeys, m_tooltipParams,
-        = m_optimize ? AWKeyCache::getRequiredKeys(
+                                                              m_keyOperator->requiredUserKeys(), _currentKeys)
-                           m_foundKeys, barKeys, m_tooltipParams, _currentKeys)
+                                : QStringList();
-                     : QStringList();
 
     // set key data to m_aggregator
     m_aggregator->setDevices(m_keyOperator->devices());
@@ -263,13 +218,12 @@ void AWKeys::reinitKeys(const QStringList &_currentKeys)
 void AWKeys::updateTextData()
 {
     // do not do it in parallel to avoid race condition
-    m_mutex.lock();
     calculateValues();
-    QString text = parsePattern(m_keyOperator->pattern());
+    auto text = parsePattern(m_keyOperator->pattern());
-    m_mutex.unlock();
+    // update tooltip values under lock
+    m_dataAggregator->dataUpdate(m_values);
 
     emit(needTextToBeUpdated(text));
-    emit(m_dataAggregator->updateData(m_values));
 }
 
 
@@ -277,82 +231,58 @@ void AWKeys::updateTextData()
 // specified pattern. Usually they are values which depend on several others
 void AWKeys::calculateValues()
 {
-    // hddtot*
+    auto devices = m_keyOperator->devices();
-    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
-    int netIndex
+    auto netIndex = devices.network.indexOf(m_values["netdev"].toString());
-        = 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["downtotal"] = m_values[QString("downtotal%1").arg(netIndex)];
+    m_values["downtot"] = m_values[QString("downtot%1").arg(netIndex)];
-    m_values["downtotalkb"] = m_values[QString("downtotalkb%1").arg(netIndex)];
+    m_values["downtotkb"] = m_values[QString("downtotkb%1").arg(netIndex)];
     m_values["downunits"] = m_values[QString("downunits%1").arg(netIndex)];
     m_values["up"] = m_values[QString("up%1").arg(netIndex)];
     m_values["upkb"] = m_values[QString("upkb%1").arg(netIndex)];
-    m_values["uptotal"] = m_values[QString("uptotal%1").arg(netIndex)];
+    m_values["uptot"] = m_values[QString("uptot%1").arg(netIndex)];
-    m_values["uptotalkb"] = m_values[QString("uptotalkb%1").arg(netIndex)];
+    m_values["uptotkb"] = m_values[QString("uptotkb%1").arg(netIndex)];
     m_values["upunits"] = m_values[QString("upunits%1").arg(netIndex)];
 
-    // swaptot*
+    // user defined keys
-    m_values["swaptotmb"]
+    for (auto &key : m_keyOperator->userKeys())
-        = m_values["swapmb"].toInt() + m_values["swapfreemb"].toInt();
+        m_values[key] = m_values[m_keyOperator->userKeySource(key)];
-    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();
 
     // lambdas
     for (auto &key : m_foundLambdas)
-        m_values[key] = AWPatternFunctions::expandLambdas(
+        m_values[key] = AWPatternFunctions::expandLambdas(key, m_aggregator, m_values, m_foundKeys);
-            key, m_aggregator, m_values, m_foundKeys);
 }
 
 
 void AWKeys::createDBusInterface()
 {
     // get this object id
-    qlonglong id = reinterpret_cast<qlonglong>(this);
+    auto id = reinterpret_cast<qlonglong>(this);
 
     // create session
-    QDBusConnection bus = QDBusConnection::sessionBus();
+    auto instanceBus = QDBusConnection::sessionBus();
-    if (!bus.registerService(AWDBUS_SERVICE))
+    // HACK we are going to use different services because it binds to
-        qCWarning(LOG_AW) << "Could not register DBus service, last error"
+    // application
-                          << bus.lastError().message();
+    if (instanceBus.registerService(QString("%1.i%2").arg(AWDBUS_SERVICE).arg(id))) {
-    if (!bus.registerObject(QString("/%1").arg(id), new AWDBusAdaptor(this),
+        if (!instanceBus.registerObject(AWDBUS_PATH, new AWDBusAdaptor(this), QDBusConnection::ExportAllContents))
-                            QDBusConnection::ExportAllContents)) {
+            qCWarning(LOG_AW) << "Could not register DBus object, last error" << instanceBus.lastError().message();
-        qCWarning(LOG_AW) << "Could not register DBus object, last error"
-                          << bus.lastError().message();
-        m_dbusActive = false;
     } else {
-        m_dbusActive = true;
+        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();
+    if (commonBus.registerService(AWDBUS_SERVICE))
+        commonBus.registerObject(AWDBUS_PATH, new AWDBusAdaptor(this), QDBusConnection::ExportAllContents);
 }
 
 
 QString AWKeys::parsePattern(QString _pattern) const
 {
     // screen sign
-    _pattern.replace("$$", QString(0x1d));
+    _pattern.replace("$$", QChar(0x1d));
 
     // lambdas
     for (auto &key : m_foundLambdas)
@@ -360,28 +290,19 @@ QString AWKeys::parsePattern(QString _pattern) const
 
     // main keys
     for (auto &key : m_foundKeys)
-        _pattern.replace(
+        _pattern.replace(QString("$%1").arg(key), m_aggregator->formatter(m_values[key], key, true));
-            QString("$%1").arg(key),
-            [this](const QString &tag, const QVariant &value) {
-                QString strValue = m_aggregator->formatter(value, tag);
-                if ((!tag.startsWith("custom")) && (!tag.startsWith("weather")))
-                    strValue.replace(" ", "&nbsp;");
-                return strValue;
-            }(key, m_values[key]));
 
     // bars
     for (auto &bar : m_foundBars) {
-        GraphicalItem *item = m_keyOperator->giByKey(bar);
+        auto item = m_keyOperator->giByKey(bar);
-        QString image
+        auto image = item->isCustom() ? item->image(
-            = item->isCustom()
+                         AWPatternFunctions::expandLambdas(item->bar(), m_aggregator, m_values, item->usedKeys()))
-                  ? item->image(AWPatternFunctions::expandLambdas(
+                                      : item->image(m_values[item->bar()]);
-                        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(QString(0x1d), "$");
+    _pattern.replace(QChar(0x1d), "$");
     if (m_wrapNewLines)
         _pattern.replace("\n", "<br>");
 
@@ -389,29 +310,20 @@ QString AWKeys::parsePattern(QString _pattern) const
 }
 
 
-void AWKeys::setDataBySource(const QString &_sourceName,
+void AWKeys::setDataBySource(const QString &_source, const KSysGuard::SensorInfo &_sensor, const QVariant &_value)
-                             const QVariantMap &_data)
 {
-    qCDebug(LOG_AW) << "Source" << _sourceName << "with data" << _data;
+    qCDebug(LOG_AW) << "Source" << _source << _sensor.name << "with data" << _value;
 
     // first list init
-    QStringList tags = m_aggregator->keysFromSource(_sourceName);
+    auto tags = m_aggregator->keysFromSource(_source);
     if (tags.isEmpty())
-        tags = m_aggregator->registerSource(
+        tags = m_aggregator->registerSource(_source, _sensor.unit, m_requiredKeys);
-            _sourceName, _data["units"].toString(), m_requiredKeys);
 
     // update data or drop source if there are no matches and exit
     if (tags.isEmpty()) {
-        qCInfo(LOG_AW) << "Source" << _sourceName << "not found";
+        qCInfo(LOG_AW) << "Sensor" << _source << "not found";
-        return emit(dropSourceFromDataengine(_sourceName));
+        return emit(dropSourceFromDataengine(_source));
     }
 
-    m_mutex.lock();
+    std::for_each(tags.cbegin(), tags.cend(), [this, _value](const QString &tag) { m_values[tag] = _value; });
-    // 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,63 +15,48 @@
  *   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 AWKeys : public QObject
+class __attribute__((visibility("default"))) AWKeys : public QObject
 {
     Q_OBJECT
 
 public:
     explicit AWKeys(QObject *_parent = nullptr);
-    virtual ~AWKeys();
+    ~AWKeys() override;
-    bool isDBusActive() const;
     Q_INVOKABLE void initDataAggregator(const QVariantMap &_tooltipParams);
-    Q_INVOKABLE void initKeys(const QString &_currentPattern,
+    Q_INVOKABLE void initKeys(const QString &_currentPattern, int _interval, bool _optimize);
-                              const int _interval, const int _limit,
+    Q_INVOKABLE void setAggregatorProperty(const QString &_key, const QVariant &_value);
-                              const bool _optimize);
+    Q_INVOKABLE void setWrapNewLines(bool _wrap);
-    Q_INVOKABLE void setAggregatorProperty(const QString &_key,
-                                           const QVariant &_value);
-    Q_INVOKABLE void setWrapNewLines(const bool _wrap = false);
     // additional method to force load keys from Qml UI. Used in some
     // configuration pages
     Q_INVOKABLE void updateCache();
     // keys
-    Q_INVOKABLE QStringList dictKeys(const bool _sorted = false,
+    Q_INVOKABLE [[nodiscard]] QStringList dictKeys(bool _sorted = false, const QString &_regexp = "") const;
-                                     const QString &_regexp = "") const;
-    Q_INVOKABLE QVariantList getHddDevices() const;
     // values
-    Q_INVOKABLE QString infoByKey(const QString &_key) const;
+    Q_INVOKABLE [[nodiscard]] QString infoByKey(const QString &_key) const;
-    Q_INVOKABLE QString valueByKey(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
-    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();
 
@@ -79,8 +64,8 @@ private:
     // methods
     void calculateValues();
     void createDBusInterface();
-    QString parsePattern(QString _pattern) const;
+    [[nodiscard]] QString parsePattern(QString _pattern) const;
-    void setDataBySource(const QString &_sourceName, const QVariantMap &_data);
+    void setDataBySource(const QString &_source, const KSysGuard::SensorInfo &_sensor, const QVariant &_value);
     // objects
     AWDataAggregator *m_dataAggregator = nullptr;
     AWDataEngineAggregator *m_dataEngineAggregator = nullptr;
@@ -88,16 +73,9 @@ private:
     AWKeyOperations *m_keyOperator = nullptr;
     QTimer *m_timer = nullptr;
     // variables
-    bool m_dbusActive = false;
     QVariantMap m_tooltipParams;
     QStringList m_foundBars, m_foundKeys, m_foundLambdas, m_requiredKeys;
     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,12 +17,7 @@
 
 #include "awkeysaggregator.h"
 
-#include <KI18n/KLocalizedString>
+#include "awdataenginemapper.h"
-
-#include <QDateTime>
-#include <QLocale>
-#include <QRegExp>
-
 #include "awdebug.h"
 #include "awformatterhelper.h"
 
@@ -32,157 +27,50 @@ AWKeysAggregator::AWKeysAggregator(QObject *_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    // sort time keys
+    m_settings.customFormatters = new AWFormatterHelper(this);
-    m_timeKeys.sort();
+    m_mapper = new AWDataEngineMapper(this, m_settings.customFormatters);
-    std::reverse(m_timeKeys.begin(), m_timeKeys.end());
-
-    // default formatters
-    // memory
-    m_formatter["mem"] = FormatterType::Float;
-    m_formatter["memtotmb"] = FormatterType::MemMBFormat;
-    m_formatter["memtotgb"] = FormatterType::MemGBFormat;
-    // network
-    m_formatter["down"] = FormatterType::NetSmartFormat;
-    m_formatter["downkb"] = FormatterType::Integer;
-    m_formatter["downunits"] = FormatterType::NetSmartUnits;
-    m_formatter["up"] = FormatterType::NetSmartFormat;
-    m_formatter["upkb"] = FormatterType::Integer;
-    m_formatter["upunits"] = FormatterType::NetSmartUnits;
-    // swap
-    m_formatter["swap"] = FormatterType::Float;
-    m_formatter["swaptotmb"] = FormatterType::MemMBFormat;
-    m_formatter["swaptotgb"] = FormatterType::MemGBFormat;
-}
-
-
-AWKeysAggregator::~AWKeysAggregator()
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    delete m_customFormatters;
 }
 
 
 void AWKeysAggregator::initFormatters()
 {
-    if (m_customFormatters)
+    m_settings.customFormatters->initItems();
-        delete m_customFormatters;
-    m_customFormatters = new AWFormatterHelper(nullptr);
 }
 
 
-QString AWKeysAggregator::formatter(const QVariant &_data,
+QString AWKeysAggregator::acOffline() const
-                                    const QString &_key) 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;
 
-    QString output;
+    auto output = m_mapper->formatter(_key)->format(_data, _key, m_settings);
-    QLocale loc = m_translate ? QLocale::system() : QLocale::c();
+    // replace spaces to non-breakable ones
-    // case block
+    replaceSpace &= (!_key.startsWith("custom") && (!_key.startsWith("weather")));
-    switch (m_formatter[_key]) {
+    if (replaceSpace)
-    case FormatterType::Float:
+        output.replace(" ", "&nbsp;");
-        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_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;
-    }
 
     return output;
 }
@@ -192,7 +80,19 @@ QStringList AWKeysAggregator::keysFromSource(const QString &_source) const
 {
     qCDebug(LOG_AW) << "Search for source" << _source;
 
-    return m_map.values(_source);
+    return m_mapper->keysFromSource(_source);
+}
+
+
+QString AWKeysAggregator::tempUnits() const
+{
+    return m_settings.tempUnits;
+}
+
+
+bool AWKeysAggregator::translate() const
+{
+    return m_settings.translate;
 }
 
 
@@ -200,7 +100,7 @@ void AWKeysAggregator::setAcOffline(const QString &_inactive)
 {
     qCDebug(LOG_AW) << "Inactive AC string" << _inactive;
 
-    m_acOffline = _inactive;
+    m_settings.acOffline = _inactive;
 }
 
 
@@ -208,7 +108,7 @@ void AWKeysAggregator::setAcOnline(const QString &_active)
 {
     qCDebug(LOG_AW) << "Active AC string" << _active;
 
-    m_acOnline = _active;
+    m_settings.acOnline = _active;
 }
 
 
@@ -216,7 +116,7 @@ void AWKeysAggregator::setCustomTime(const QString &_customTime)
 {
     qCDebug(LOG_AW) << "Format" << _customTime;
 
-    m_customTime = _customTime;
+    m_settings.customTime = _customTime;
 }
 
 
@@ -224,15 +124,13 @@ void AWKeysAggregator::setCustomUptime(const QString &_customUptime)
 {
     qCDebug(LOG_AW) << "Format" << _customUptime;
 
-    m_customUptime = _customUptime;
+    m_settings.customUptime = _customUptime;
 }
 
 
-void AWKeysAggregator::setDevices(const QHash<QString, QStringList> &_devices)
+void AWKeysAggregator::setDevices(const AWPluginMatcherSettings &_settings)
 {
-    qCDebug(LOG_AW) << "Devices" << _devices;
+    m_mapper->setDevices(_settings);
-
-    m_devices = _devices;
 }
 
 
@@ -240,7 +138,7 @@ void AWKeysAggregator::setTempUnits(const QString &_units)
 {
     qCDebug(LOG_AW) << "Units" << _units;
 
-    m_tempUnits = _units;
+    m_settings.tempUnits = _units;
 }
 
 
@@ -248,392 +146,14 @@ void AWKeysAggregator::setTranslate(const bool _translate)
 {
     qCDebug(LOG_AW) << "Translate" << _translate;
 
-    m_translate = _translate;
+    m_settings.translate = _translate;
 }
 
 
-// HACK units required to define should the value be calculated as temperature
+QStringList AWKeysAggregator::registerSource(const QString &_source, const KSysGuard::Unit _units,
-// or fan data
-QStringList AWKeysAggregator::registerSource(const QString &_source,
-                                             const QString &_units,
                                              const QStringList &_keys)
 {
     qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
 
-    // regular expressions
+    return m_mapper->registerSource(_source, _units, _keys);
-    QRegExp cpuRegExp = QRegExp("cpu/cpu.*/TotalLoad");
-    QRegExp cpuclRegExp = QRegExp("cpu/cpu.*/clock");
-    QRegExp hddrRegExp = QRegExp("disk/.*/Rate/rblk");
-    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$");
-
-    if (_source == "battery/ac") {
-        // AC
-        m_map[_source] = "ac";
-        m_formatter["ac"] = FormatterType::ACFormat;
-    } else if (_source.startsWith("battery/")) {
-        // battery stats
-        QString key = _source;
-        key.remove("battery/");
-        m_map[_source] = key;
-        m_formatter[key] = FormatterType::IntegerThree;
-    } else if (_source == "cpu/system/TotalLoad") {
-        // cpu
-        m_map[_source] = "cpu";
-        m_formatter["cpu"] = FormatterType::Float;
-    } else if (_source.contains(cpuRegExp)) {
-        // cpus
-        QString key = _source;
-        key.remove("cpu/").remove("/TotalLoad");
-        m_map[_source] = key;
-        m_formatter[key] = FormatterType::Float;
-    } else if (_source == "cpu/system/AverageClock") {
-        // cpucl
-        m_map[_source] = "cpucl";
-        m_formatter["cpucl"] = 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[_source] = key;
-        m_formatter[key] = FormatterType::Integer;
-    } else if (_source.startsWith("custom")) {
-        // custom
-        QString key = _source;
-        key.remove("custom/");
-        m_map[_source] = key;
-        m_formatter[key] = FormatterType::NoFormat;
-    } else if (_source == "desktop/current/name") {
-        // current desktop name
-        m_map[_source] = "desktop";
-        m_formatter["desktop"] = FormatterType::NoFormat;
-    } else if (_source == "desktop/current/number") {
-        // current desktop number
-        m_map[_source] = "ndesktop";
-        m_formatter["ndesktop"] = FormatterType::NoFormat;
-    } else if (_source == "desktop/total/number") {
-        // desktop count
-        m_map[_source] = "tdesktops";
-        m_formatter["tdesktops"] = 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[_source] = key;
-            m_formatter[key] = 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[_source] = key;
-            m_formatter[key] = FormatterType::Integer;
-        }
-    } else if (_source == "gpu/load") {
-        // gpu load
-        m_map[_source] = "gpu";
-        m_formatter["gpu"] = FormatterType::Float;
-    } else if (_source == "gpu/temperature") {
-        // gpu temperature
-        m_map[_source] = "gputemp";
-        m_formatter["gputemp"] = 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[_source] = key;
-            m_formatter[key] = FormatterType::Float;
-            // additional keys
-            m_formatter[QString("hddtotmb%1").arg(index)]
-                = FormatterType::MemMBFormat;
-            m_formatter[QString("hddtotgb%1").arg(index)]
-                = 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[_source] = key;
-            m_formatter[key] = FormatterType::MemMBFormat;
-            // gb
-            key = QString("hddfreegb%1").arg(index);
-            m_map.insertMulti(_source, key);
-            m_formatter[key] = 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[_source] = key;
-            m_formatter[key] = FormatterType::MemMBFormat;
-            // gb
-            key = QString("hddgb%1").arg(index);
-            m_map.insertMulti(_source, key);
-            m_formatter[key] = 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[_source] = key;
-            m_formatter[key] = 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[_source] = key;
-        m_formatter[key] = FormatterType::FloatTwoSymbols;
-    } else if (_source == "mem/physical/application") {
-        // app memory
-        // mb
-        m_map[_source] = "memmb";
-        m_formatter["memmb"] = FormatterType::MemMBFormat;
-        // gb
-        m_map.insertMulti(_source, "memgb");
-        m_formatter["memgb"] = FormatterType::MemGBFormat;
-    } else if (_source == "mem/physical/free") {
-        // free memory
-        // mb
-        m_map[_source] = "memfreemb";
-        m_formatter["memfreemb"] = FormatterType::MemMBFormat;
-        // gb
-        m_map.insertMulti(_source, "memfreegb");
-        m_formatter["memfreegb"] = FormatterType::MemGBFormat;
-    } else if (_source == "mem/physical/used") {
-        // used memory
-        // mb
-        m_map[_source] = "memusedmb";
-        m_formatter["memusedmb"] = FormatterType::MemMBFormat;
-        // gb
-        m_map.insertMulti(_source, "memusedgb");
-        m_formatter["memusedgb"] = FormatterType::MemGBFormat;
-    } else if (_source == "network/current/name") {
-        // network device
-        m_map[_source] = "netdev";
-        m_formatter["netdev"] = FormatterType::NoFormat;
-    } else if (_source.startsWith("network/response")) {
-        // network response
-        QString key = _source;
-        key.remove("network/");
-        m_map[_source] = key;
-        m_formatter[key] = 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[_source] = key;
-            m_formatter[key] = FormatterType::Integer;
-            // smart
-            key = QString("%1%2").arg(type).arg(index);
-            m_map.insertMulti(_source, key);
-            m_formatter[key] = FormatterType::NetSmartFormat;
-            // units
-            key = QString("%1units%2").arg(type).arg(index);
-            m_map.insertMulti(_source, key);
-            m_formatter[key] = 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("%1totalkb%2").arg(type).arg(index);
-            m_map[_source] = key;
-            m_formatter[key] = FormatterType::Integer;
-            // mb
-            key = QString("%1total%2").arg(type).arg(index);
-            m_map.insertMulti(_source, key);
-            m_formatter[key] = FormatterType::MemMBFormat;
-        }
-    } else if (_source.startsWith("upgrade")) {
-        // package manager
-        QString key = _source;
-        key.remove("upgrade/");
-        m_map[_source] = key;
-        m_formatter[key] = FormatterType::IntegerThree;
-    } else if (_source.startsWith("player")) {
-        // player
-        QString key = _source;
-        key.remove("player/");
-        m_map[_source] = key;
-        m_formatter[key] = FormatterType::NoFormat;
-    } else if (_source == "ps/running/count") {
-        // running processes count
-        m_map[_source] = "pscount";
-        m_formatter["pscount"] = FormatterType::NoFormat;
-    } else if (_source == "ps/running/list") {
-        // list of running processes
-        m_map[_source] = "ps";
-        m_formatter["ps"] = FormatterType::List;
-    } else if (_source == "ps/total/count") {
-        // total processes count
-        m_map[_source] = "pstotal";
-        m_formatter["pstotal"] = FormatterType::NoFormat;
-    } else if (_source.startsWith("quotes")) {
-        // quotes
-        QString key = _source;
-        key.remove("quotes/");
-        m_map[_source] = key;
-        m_formatter[key] = FormatterType::Quotes;
-    } else if (_source == "mem/swap/free") {
-        // free swap
-        // mb
-        m_map[_source] = "swapfreemb";
-        m_formatter["swapfreemb"] = FormatterType::MemMBFormat;
-        // gb
-        m_map.insertMulti(_source, "swapfreegb");
-        m_formatter["swapfreegb"] = FormatterType::MemGBFormat;
-    } else if (_source == "mem/swap/used") {
-        // used swap
-        // mb
-        m_map[_source] = "swapmb";
-        m_formatter["swapmb"] = FormatterType::MemMBFormat;
-        // gb
-        m_map.insertMulti(_source, "swapgb");
-        m_formatter["swapgb"] = 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[_source] = key;
-            m_formatter[key] = _units == "°C" ? FormatterType::Temperature
-                                              : FormatterType::Integer;
-        }
-    } else if (_source == "Local") {
-        // time
-        m_map[_source] = "time";
-        m_formatter["time"] = FormatterType::Time;
-        // custom time
-        m_map.insertMulti(_source, "ctime");
-        m_formatter["ctime"] = FormatterType::TimeCustom;
-        // ISO time
-        m_map.insertMulti(_source, "isotime");
-        m_formatter["isotime"] = FormatterType::TimeISO;
-        // long time
-        m_map.insertMulti(_source, "longtime");
-        m_formatter["longtime"] = FormatterType::TimeLong;
-        // short time
-        m_map.insertMulti(_source, "shorttime");
-        m_formatter["shorttime"] = FormatterType::TimeShort;
-        // timestamp
-        m_map.insertMulti(_source, "tstime");
-        m_formatter["tstime"] = FormatterType::Timestamp;
-    } else if (_source == "system/uptime") {
-        // uptime
-        m_map[_source] = "uptime";
-        m_formatter["uptime"] = FormatterType::Uptime;
-        // custom uptime
-        m_map.insertMulti(_source, "cuptime");
-        m_formatter["cuptime"] = FormatterType::UptimeCustom;
-    } else if (_source.startsWith("weather/temperature")) {
-        // temperature
-        QString key = _source;
-        key.remove("weather/");
-        m_map[_source] = key;
-        m_formatter[key] = FormatterType::Temperature;
-    } else if (_source.startsWith("weather/")) {
-        // other weather
-        QString key = _source;
-        key.remove("weather/");
-        m_map[_source] = key;
-        m_formatter[key] = FormatterType::NoFormat;
-    } else if (_source.startsWith("load/load")) {
-        // load source
-        QString key = _source;
-        key.remove("load/");
-        m_map[_source] = key;
-        m_formatter[key] = 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 fprmatters" << foundKeys << "in"
-                   << customFormattersKeys;
-    for (auto &key : foundKeys) {
-        if (!customFormattersKeys.contains(key))
-            continue;
-        m_formatter[key] = FormatterType::Custom;
-    }
-
-    // drop key from dictionary if no one user requested key required it
-    qCInfo(LOG_AW) << "Looking for keys" << foundKeys << "in" << _keys;
-    bool required
-        = _keys.isEmpty() || std::any_of(foundKeys.cbegin(), foundKeys.cend(),
-                                         [&_keys](const QString &key) {
-                                             return _keys.contains(key);
-                                         });
-    if (!required) {
-        m_map.remove(_source);
-        for (auto &key : foundKeys)
-            m_formatter.remove(key);
-    }
-
-    return keysFromSource(_source);
-}
-
-
-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,92 +15,55 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
+#pragma once
 
-#ifndef AWKEYSAGGREGATOR_H
+#include <ksysguard/formatter/Unit.h>
-#define AWKEYSAGGREGATOR_H
 
 #include <QHash>
 #include <QObject>
 
-#include "version.h"
+#include "formatters/awpluginformatsettings.h"
+#include "matchers/awpluginmatchersettings.h"
 
 
-class AWFormatterHelper;
+class AWDataEngineMapper;
 
 class AWKeysAggregator : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QString acOffline MEMBER m_acOffline WRITE setAcOffline);
+    Q_PROPERTY(QString acOffline READ acOffline WRITE setAcOffline);
-    Q_PROPERTY(QString acOnline MEMBER m_acOnline WRITE setAcOnline);
+    Q_PROPERTY(QString acOnline READ acOnline WRITE setAcOnline);
-    Q_PROPERTY(QString customTime MEMBER m_customTime WRITE setCustomTime);
+    Q_PROPERTY(QString customTime READ customTime WRITE setCustomTime);
-    Q_PROPERTY(
+    Q_PROPERTY(QString customUptime READ customUptime WRITE setCustomUptime);
-        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);
-
-    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
-    };
 
 public:
     explicit AWKeysAggregator(QObject *_parent = nullptr);
-    virtual ~AWKeysAggregator();
+    ~AWKeysAggregator() override = default;
     void initFormatters();
     // get methods
-    QString formatter(const QVariant &_data, const QString &_key) const;
+    [[nodiscard]] QString acOffline() const;
-    QStringList keysFromSource(const QString &_source) const;
+    [[nodiscard]] QString acOnline() 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 QHash<QString, QStringList> &_devices);
+    void setDevices(const AWPluginMatcherSettings &_settings);
     void setTempUnits(const QString &_units);
-    void setTranslate(const bool _translate);
+    void setTranslate(bool _translate);
 
 public slots:
-    QStringList registerSource(const QString &_source, const QString &_units,
+    QStringList registerSource(const QString &_source, KSysGuard::Unit _units, const QStringList &_keys);
-                               const QStringList &_keys);
 
 private:
-    float temperature(const float temp) const;
+    AWPluginFormatSettings m_settings;
-    AWFormatterHelper *m_customFormatters = nullptr;
+    AWDataEngineMapper *m_mapper = nullptr;
-    QStringList m_timeKeys = QString(TIME_KEYS).split(',');
-    // variables
-    QString m_acOffline;
-    QString m_acOnline;
-    QString m_customTime;
-    QString m_customUptime;
-    QHash<QString, QStringList> m_devices;
-    QHash<QString, FormatterType> m_formatter;
-    QHash<QString, QString> m_map;
-    QString m_tempUnits;
-    bool m_translate = false;
 };
-
-
-#endif /* AWKEYSAGGREGATOR_H */

sources/awesome-widget/plugin/awpairconfigfactory.cpp

@@ -15,28 +15,31 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#include "awformatterconfigfactory.h"
+#include "awpairconfigfactory.h"
 
+#include "awcustomkeysconfig.h"
 #include "awdebug.h"
 #include "awformatterconfig.h"
 
 
-AWFormatterConfigFactory::AWFormatterConfigFactory(QObject *_parent)
+AWPairConfigFactory::AWPairConfigFactory(QObject *_parent)
     : QObject(_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 }
 
 
-AWFormatterConfigFactory::~AWFormatterConfigFactory()
+void AWPairConfigFactory::showFormatterDialog(const QStringList &_keys)
 {
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+    auto config = new AWFormatterConfig(nullptr, _keys);
-}
+    config->showDialog();
-
+    config->deleteLater();
-
+}
-void AWFormatterConfigFactory::showDialog(const QStringList &_keys)
+
-{
+
-    AWFormatterConfig *config = new AWFormatterConfig(nullptr, _keys);
+void AWPairConfigFactory::showKeysDialog(const QStringList &_keys)
+{
+    auto config = new AWCustomKeysConfig(nullptr, _keys);
     config->showDialog();
     config->deleteLater();
 }

sources/awesome-widget/plugin/awpairconfigfactory.h

@@ -15,34 +15,18 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
+#pragma once
-#ifndef TESTGPULOADSOURCE_H
-#define TESTGPULOADSOURCE_H
 
 #include <QObject>
-#include <QPair>
 
 
-class GPULoadSource;
+class AWPairConfigFactory : public QObject
-
-class TestGPULoadSource : public QObject
 {
     Q_OBJECT
 
-private slots:
+public:
-    // initialization
+    explicit AWPairConfigFactory(QObject *_parent = nullptr);
-    void initTestCase();
+    ~AWPairConfigFactory() override = default;
-    void cleanupTestCase();
+    Q_INVOKABLE static void showFormatterDialog(const QStringList &_keys);
-    // test
+    Q_INVOKABLE static void showKeysDialog(const QStringList &_keys);
-    void test_sources();
-    void test_gpuload();
-
-private:
-    GPULoadSource *source = nullptr;
-    QString device;
-    QString src = "gpu/load";
-    QPair<float, float> load = QPair<float, float>(0.0f, 100.0f);
 };
-
-
-#endif /* TESTGPULOADSOURCE_H */

sources/awesome-widget/plugin/awpatternfunctions.cpp

@@ -24,25 +24,21 @@
 #include "awkeysaggregator.h"
 
 
-QString AWPatternFunctions::expandLambdas(QString _code,
+QString AWPatternFunctions::expandLambdas(QString _code, AWKeysAggregator *_aggregator, const QVariantHash &_metadata,
-                                          AWKeysAggregator *_aggregator,
-                                          const QVariantHash &_metadata,
                                           const QStringList &_usedKeys)
 {
-    qCDebug(LOG_AW) << "Expand lamdas in" << _code;
+    qCDebug(LOG_AW) << "Expand lambdas in" << _code;
 
     QJSEngine engine;
     // apply $this values
     _code.replace("$this", _metadata[_code].toString());
     // parsed values
     for (auto &lambdaKey : _usedKeys)
-        _code.replace(QString("$%1").arg(lambdaKey),
+        _code.replace(QString("$%1").arg(lambdaKey), _aggregator->formatter(_metadata[lambdaKey], lambdaKey, false));
-                      _aggregator->formatter(_metadata[lambdaKey], lambdaKey));
     qCInfo(LOG_AW) << "Expression" << _code;
-    QJSValue result = engine.evaluate(_code);
+    auto result = engine.evaluate(_code);
     if (result.isError()) {
-        qCWarning(LOG_AW) << "Uncaught exception at line"
+        qCWarning(LOG_AW) << "Uncaught exception at line" << result.property("lineNumber").toInt() << ":"
-                          << result.property("lineNumber").toInt() << ":"
                           << result.toString();
         return "";
     } else {
@@ -56,22 +52,20 @@ QString AWPatternFunctions::expandTemplates(QString _code)
     qCDebug(LOG_AW) << "Expand templates in" << _code;
 
     // match the following construction $template{{some code here}}
-    QRegularExpression templatesRegexp("\\$template\\{\\{(?<body>.*?)\\}\\}");
+    static QRegularExpression templatesRegexp(R"(\$template\{\{(?<body>.*?)\}\})");
-    templatesRegexp.setPatternOptions(
+    templatesRegexp.setPatternOptions(QRegularExpression::DotMatchesEverythingOption);
-        QRegularExpression::DotMatchesEverythingOption);
 
-    QRegularExpressionMatchIterator it = templatesRegexp.globalMatch(_code);
+    auto it = templatesRegexp.globalMatch(_code);
     while (it.hasNext()) {
-        QRegularExpressionMatch match = it.next();
+        auto match = it.next();
-        QString body = match.captured("body");
+        auto body = match.captured("body");
 
         QJSEngine engine;
         qCInfo(LOG_AW) << "Expression" << body;
-        QJSValue result = engine.evaluate(body);
+        auto result = engine.evaluate(body);
         QString templateResult = "";
         if (result.isError()) {
-            qCWarning(LOG_AW) << "Uncaught exception at line"
+            qCWarning(LOG_AW) << "Uncaught exception at line" << result.property("lineNumber").toInt() << ":"
-                              << result.property("lineNumber").toInt() << ":"
                               << result.toString();
         } else {
             templateResult = result.toString();
@@ -85,9 +79,8 @@ QString AWPatternFunctions::expandTemplates(QString _code)
 }
 
 
-QList<AWPatternFunctions::AWFunction>
+QList<AWPatternFunctions::AWFunction> AWPatternFunctions::findFunctionCalls(const QString &_function,
-AWPatternFunctions::findFunctionCalls(const QString &_function,
+                                                                            const QString &_code)
-                                      const QString &_code)
 {
     qCDebug(LOG_AW) << "Looking for function" << _function << "in" << _code;
 
@@ -97,28 +90,24 @@ AWPatternFunctions::findFunctionCalls(const QString &_function,
     // in this field if they are not screened by $, i.e. '$,'
     // * body depends on the function name, double brackets should be screened
     // by using $, e.g. ${
-    QRegularExpression regex(
+    QRegularExpression regex(QString(R"(\$%1\<(?<args>.*?)\>\{\{(?<body>.*?)\}\})").arg(_function));
-        QString("\\$%1\\<(?<args>.*?)\\>\\{\\{(?<body>.*?)\\}\\}")
-            .arg(_function));
     regex.setPatternOptions(QRegularExpression::DotMatchesEverythingOption);
 
     QList<AWPatternFunctions::AWFunction> foundFunctions;
-    QRegularExpressionMatchIterator it = regex.globalMatch(_code);
+    auto it = regex.globalMatch(_code);
     while (it.hasNext()) {
-        QRegularExpressionMatch match = it.next();
+        auto match = it.next();
 
         AWPatternFunctions::AWFunction metadata;
         // work with args
-        QString argsString = match.captured("args");
+        auto argsString = match.captured("args");
         if (argsString.isEmpty()) {
             metadata.args = QStringList();
         } else {
             // replace '$,' to 0x1d
-            argsString.replace("$,", QString(0x1d));
+            argsString.replace("$,", QChar(0x1d));
-            QStringList args = argsString.split(',');
+            auto args = argsString.split(',');
-            std::for_each(args.begin(), args.end(), [](QString &arg) {
+            std::for_each(args.begin(), args.end(), [](auto &arg) { arg.replace(QChar(0x1d), ","); });
-                arg.replace(QString(0x1d), ",");
-            });
             metadata.args = args;
         }
         // other variables
@@ -134,20 +123,15 @@ AWPatternFunctions::findFunctionCalls(const QString &_function,
 }
 
 
-QString AWPatternFunctions::insertAllKeys(QString _code,
+QString AWPatternFunctions::insertAllKeys(QString _code, const QStringList &_keys)
-                                          const QStringList &_keys)
 {
-    qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list"
+    qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
-                    << _keys;
 
-    QList<AWPatternFunctions::AWFunction> found
+    auto found = AWPatternFunctions::findFunctionCalls("aw_all", _code);
-        = AWPatternFunctions::findFunctionCalls("aw_all", _code);
     for (auto &function : found) {
-        QString separator = function.args.isEmpty() ? "," : function.args.at(0);
+        auto separator = function.args.isEmpty() ? "," : function.args.at(0);
-        QStringList required = _keys.filter(QRegExp(function.body));
+        auto required = _keys.filter(QRegularExpression(function.body));
-        std::for_each(required.begin(), required.end(), [](QString &value) {
+        std::for_each(required.begin(), required.end(), [](auto &value) { value = QString("%1: $%1").arg(value); });
-            value = QString("%1: $%1").arg(value);
-        });
 
         _code.replace(function.what, required.join(separator));
     }
@@ -156,16 +140,13 @@ QString AWPatternFunctions::insertAllKeys(QString _code,
 }
 
 
-QString AWPatternFunctions::insertKeyCount(QString _code,
+QString AWPatternFunctions::insertKeyCount(QString _code, const QStringList &_keys)
-                                           const QStringList &_keys)
 {
-    qCDebug(LOG_AW) << "Looking for count in code" << _code << "using list"
+    qCDebug(LOG_AW) << "Looking for count in code" << _code << "using list" << _keys;
-                    << _keys;
 
-    QList<AWPatternFunctions::AWFunction> found
+    auto found = AWPatternFunctions::findFunctionCalls("aw_count", _code);
-        = AWPatternFunctions::findFunctionCalls("aw_count", _code);
     for (auto &function : found) {
-        int count = _keys.filter(QRegExp(function.body)).count();
+        auto count = _keys.filter(QRegularExpression(function.body)).count();
 
         _code.replace(function.what, QString::number(count));
     }
@@ -174,17 +155,14 @@ QString AWPatternFunctions::insertKeyCount(QString _code,
 }
 
 
-QString AWPatternFunctions::insertKeyNames(QString _code,
+QString AWPatternFunctions::insertKeyNames(QString _code, const QStringList &_keys)
-                                           const QStringList &_keys)
 {
-    qCDebug(LOG_AW) << "Looking for key names in code" << _code << "using list"
+    qCDebug(LOG_AW) << "Looking for key names in code" << _code << "using list" << _keys;
-                    << _keys;
 
-    QList<AWPatternFunctions::AWFunction> found
+    auto found = AWPatternFunctions::findFunctionCalls("aw_names", _code);
-        = AWPatternFunctions::findFunctionCalls("aw_names", _code);
     for (auto &function : found) {
-        QString separator = function.args.isEmpty() ? "," : function.args.at(0);
+        auto separator = function.args.isEmpty() ? "," : function.args.at(0);
-        QStringList required = _keys.filter(QRegExp(function.body));
+        auto required = _keys.filter(QRegularExpression(function.body));
 
         _code.replace(function.what, required.join(separator));
     }
@@ -195,17 +173,13 @@ QString AWPatternFunctions::insertKeyNames(QString _code,
 
 QString AWPatternFunctions::insertKeys(QString _code, const QStringList &_keys)
 {
-    qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list"
+    qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
-                    << _keys;
 
-    QList<AWPatternFunctions::AWFunction> found
+    auto found = AWPatternFunctions::findFunctionCalls("aw_keys", _code);
-        = AWPatternFunctions::findFunctionCalls("aw_keys", _code);
     for (auto &function : found) {
-        QString separator = function.args.isEmpty() ? "," : function.args.at(0);
+        auto separator = function.args.isEmpty() ? "," : function.args.at(0);
-        QStringList required = _keys.filter(QRegExp(function.body));
+        auto required = _keys.filter(QRegularExpression(function.body));
-        std::for_each(required.begin(), required.end(), [](QString &value) {
+        std::for_each(required.begin(), required.end(), [](auto &value) { value = QString("$%1").arg(value); });
-            value = QString("$%1").arg(value);
-        });
 
         _code.replace(function.what, required.join(separator));
     }
@@ -218,34 +192,27 @@ QString AWPatternFunctions::insertMacros(QString _code)
 {
     qCDebug(LOG_AW) << "Looking for macros in code" << _code;
 
-    QList<AWPatternFunctions::AWFunction> found
+    auto found = AWPatternFunctions::findFunctionCalls("aw_macro", _code);
-        = 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;
         }
-        QString name = macro.args.takeFirst();
+        auto name = macro.args.takeFirst();
         // find macro usage
-        QList<AWPatternFunctions::AWFunction> macroUsage
+        auto macroUsage = AWPatternFunctions::findFunctionCalls(QString("aw_macro_%1").arg(name), _code);
-            = AWPatternFunctions::findFunctionCalls(
-                QString("aw_macro_%1").arg(name), _code);
         for (auto &function : macroUsage) {
             if (function.args.count() != macro.args.count()) {
-                qCWarning(LOG_AW)
+                qCWarning(LOG_AW) << "Invalid args count found for call" << function.what << "with macro" << macro.what;
-                    << "Invalid args count found for call" << function.what
-                    << "with macro" << macro.what;
                 continue;
             }
             // generate body to replace
-            QString result = macro.body;
+            auto result = macro.body;
-            std::for_each(macro.args.cbegin(), macro.args.cend(),
+            std::for_each(macro.args.cbegin(), macro.args.cend(), [&result, macro, function](auto &arg) {
-                          [&result, macro, function](const QString &arg) {
+                auto index = macro.args.indexOf(arg);
-                              int index = macro.args.indexOf(arg);
+                result.replace(QString("$%1").arg(arg), function.args.at(index));
-                              result.replace(QString("$%1").arg(arg),
+            });
-                                             function.args.at(index));
-                          });
             // do replace
             _code.replace(function.what, result);
         }
@@ -258,20 +225,15 @@ QString AWPatternFunctions::insertMacros(QString _code)
 }
 
 
-QStringList AWPatternFunctions::findKeys(const QString &_code,
+QStringList AWPatternFunctions::findKeys(const QString &_code, const QStringList &_keys, const bool _isBars)
-                                         const QStringList &_keys,
-                                         const bool _isBars)
 {
-    qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list"
+    qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
-                    << _keys;
 
     QStringList selectedKeys;
-    QString replacedCode = _code;
+    auto replacedCode = _code;
     for (auto &key : _keys)
-        if ((key.startsWith("bar") == _isBars)
+        if ((key.startsWith("bar") == _isBars) && (replacedCode.contains(QString("$%1").arg(key)))) {
-            && (replacedCode.contains(QString("$%1").arg(key)))) {
+            qCInfo(LOG_AW) << "Found key" << key << "with bar enabled" << _isBars;
-            qCInfo(LOG_AW) << "Found key" << key << "with bar enabled"
-                           << _isBars;
             selectedKeys.append(key);
             replacedCode.replace(QString("$%1").arg(key), "");
         }
@@ -288,14 +250,13 @@ QStringList AWPatternFunctions::findLambdas(const QString &_code)
 
     QStringList selectedKeys;
     // match the following construction ${{some code here}}
-    QRegularExpression lambdaRegexp("\\$\\{\\{(?<body>.*?)\\}\\}");
+    static QRegularExpression lambdaRegexp(R"(\$\{\{(?<body>.*?)\}\})");
-    lambdaRegexp.setPatternOptions(
+    lambdaRegexp.setPatternOptions(QRegularExpression::DotMatchesEverythingOption);
-        QRegularExpression::DotMatchesEverythingOption);
 
-    QRegularExpressionMatchIterator it = lambdaRegexp.globalMatch(_code);
+    auto it = lambdaRegexp.globalMatch(_code);
     while (it.hasNext()) {
-        QRegularExpressionMatch match = it.next();
+        auto match = it.next();
-        QString lambda = match.captured("body");
+        auto lambda = match.captured("body");
 
         // append
         qCInfo(LOG_AW) << "Found lambda" << lambda;

sources/awesome-widget/plugin/awpatternfunctions.h

@@ -15,9 +15,7 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
+#pragma once
-#ifndef AWPATTERNFUNCTIONS_H
-#define AWPATTERNFUNCTIONS_H
 
 #include <QString>
 #include <QVariant>
@@ -25,7 +23,7 @@
 
 class AWKeysAggregator;
 
-namespace AWPatternFunctions
+namespace __attribute__((visibility("default"))) AWPatternFunctions
 {
 typedef struct {
     QStringList args;
@@ -34,22 +32,16 @@ typedef struct {
 } AWFunction;
 
 // insert methods
-QString expandLambdas(QString _code, AWKeysAggregator *_aggregator,
+QString expandLambdas(QString _code, AWKeysAggregator *_aggregator, const QVariantHash &_metadata,
-                      const QVariantHash &_metadata,
                       const QStringList &_usedKeys);
 QString expandTemplates(QString _code);
-QList<AWFunction> findFunctionCalls(const QString &_function,
+QList<AWFunction> findFunctionCalls(const QString &_function, const QString &_code);
-                                    const QString &_code);
 QString insertAllKeys(QString _code, const QStringList &_keys);
 QString insertKeyCount(QString _code, const QStringList &_keys);
 QString insertKeyNames(QString _code, const QStringList &_keys);
 QString insertKeys(QString _code, const QStringList &_keys);
 QString insertMacros(QString _code);
 // find methods
-QStringList findKeys(const QString &_code, const QStringList &_keys,
+QStringList findKeys(const QString &_code, const QStringList &_keys, bool _isBars);
-                     const bool _isBars);
 QStringList findLambdas(const QString &_code);
-};
+} // namespace AWPatternFunctions
-
-
-#endif /* AWPATTERNFUNCTIONS_H */

sources/awesome-widget/plugin/awtelemetryhandler.cpp

@@ -18,10 +18,6 @@
 #include "awtelemetryhandler.h"
 
 #include <QJsonDocument>
-#include <QJsonParseError>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
 #include <QSettings>
 #include <QStandardPaths>
 #include <QUuid>
@@ -29,25 +25,13 @@
 #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(
+                      .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
-                          QStandardPaths::GenericDataLocation));
-
-    // override client id if any
-    if (!_clientId.isEmpty())
-        m_clientId = _clientId;
-}
-
-
-AWTelemetryHandler::~AWTelemetryHandler()
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 }
 
 
@@ -75,22 +59,17 @@ QString AWTelemetryHandler::getLast(const QString &_group) const
 }
 
 
-void AWTelemetryHandler::init(const int _count, const bool _enableRemote,
+void AWTelemetryHandler::init(const int _count)
-                              const QString &_clientId)
 {
-    qCDebug(LOG_AW) << "Init telemetry with count" << _count << "enable remote"
+    qCDebug(LOG_AW) << "Init telemetry with count" << _count;
-                    << _enableRemote << "client ID" << _clientId;
 
     m_storeCount = _count;
-    m_uploadEnabled = _enableRemote;
-    m_clientId = _clientId;
 }
 
 
 bool AWTelemetryHandler::put(const QString &_group, const QString &_value) const
 {
-    qCDebug(LOG_AW) << "Store data with group" << _group << "and value"
+    qCDebug(LOG_AW) << "Store data with group" << _group << "and value" << _value;
-                    << _value;
 
     QSettings settings(m_localFile, QSettings::IniFormat);
     settings.beginGroup(_group);
@@ -101,8 +80,7 @@ bool AWTelemetryHandler::put(const QString &_group, const QString &_value) const
         saved.append(settings.value(key).toString());
     // check if this value is already saved
     if (saved.contains(_value)) {
-        qCInfo(LOG_AW) << "Configuration" << _value << "for group" << _group
+        qCInfo(LOG_AW) << "Configuration" << _value << "for group" << _group << "is already saved";
-                       << "is already saved";
         return false;
     }
     saved.append(_value);
@@ -113,7 +91,7 @@ bool AWTelemetryHandler::put(const QString &_group, const QString &_value) const
     settings.remove("");
     // and save now
     for (auto &val : saved) {
-        QString key = getKey(settings.childKeys().count());
+        auto key = getKey(settings.childKeys().count());
         settings.setValue(key, val);
     }
 
@@ -125,66 +103,7 @@ bool AWTelemetryHandler::put(const QString &_group, const QString &_value) const
 }
 
 
-void AWTelemetryHandler::uploadTelemetry(const QString &_group,
+QString AWTelemetryHandler::getKey(const int _count)
-                                         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;
-    }
-
-    QNetworkAccessManager *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) const
 {
     qCDebug(LOG_AW) << "Get key for keys count" << _count;
 

sources/awesome-widget/plugin/awtelemetryhandler.h

@@ -15,48 +15,25 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
+#pragma once
-#ifndef AWTELEMETRYHANDLER_H
-#define AWTELEMETRYHANDLER_H
 
 #include <QObject>
-#include <QtCore/QVariant>
 
 
-class QAbstractButton;
+class __attribute__((visibility("default"))) AWTelemetryHandler : public QObject
-class QNetworkReply;
-
-class AWTelemetryHandler : public QObject
 {
     Q_OBJECT
 
 public:
-    const char *REMOTE_TELEMETRY_URL = "https://arcanis.me/telemetry";
+    explicit AWTelemetryHandler(QObject *_parent = nullptr);
-
+    ~AWTelemetryHandler() override = default;
-    explicit AWTelemetryHandler(QObject *_parent = nullptr,
+    Q_INVOKABLE [[nodiscard]] QStringList get(const QString &_group) const;
-                                const QString &_clientId = "");
+    Q_INVOKABLE [[nodiscard]] QString getLast(const QString &_group) const;
-    virtual ~AWTelemetryHandler();
+    Q_INVOKABLE void init(int _count);
-    Q_INVOKABLE QStringList get(const QString &_group) const;
+    Q_INVOKABLE [[nodiscard]] bool put(const QString &_group, const QString &_value) const;
-    Q_INVOKABLE QString getLast(const QString &_group) const;
-    Q_INVOKABLE void init(const int _count, const bool _enableRemote,
-                          const QString &_clientId);
-    Q_INVOKABLE 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:
-    QString getKey(const int _count) const;
+    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,15 +17,18 @@
 
 #include "awupdatehelper.h"
 
+#ifndef NDEBUG
+#define NDEBUG
+#endif /* NDEBUG */
 #include <KI18n/KLocalizedString>
+#include <KNotifications/KNotification>
 
 #include <QDesktopServices>
 #include <QJsonDocument>
-#include <QJsonParseError>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
-#include <QNetworkRequest>
 #include <QSettings>
+#include <QStandardPaths>
 
 #include "awdebug.h"
 
@@ -37,14 +40,7 @@ AWUpdateHelper::AWUpdateHelper(QObject *_parent)
 
     m_foundVersion = QVersionNumber::fromString(VERSION);
     m_genericConfig = QString("%1/awesomewidgets/general.ini")
-                          .arg(QStandardPaths::writableLocation(
+                          .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
-                              QStandardPaths::GenericDataLocation));
-}
-
-
-AWUpdateHelper::~AWUpdateHelper()
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 }
 
 
@@ -52,13 +48,11 @@ void AWUpdateHelper::checkUpdates(const bool _showAnyway)
 {
     qCDebug(LOG_AW) << "Show anyway" << _showAnyway;
 
-    // showAnyway options requires to show message if no updates found on direct
+    // showAnyway options required to show message if no updates found on direct
     // request. In case of automatic check no message will be shown
-    QNetworkAccessManager *manager = new QNetworkAccessManager(nullptr);
+    auto manager = new QNetworkAccessManager(nullptr);
     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)));
 }
@@ -67,18 +61,14 @@ void AWUpdateHelper::checkUpdates(const bool _showAnyway)
 bool AWUpdateHelper::checkVersion()
 {
     QSettings settings(m_genericConfig, QSettings::IniFormat);
-    QVersionNumber version = QVersionNumber::fromString(
+    auto version = QVersionNumber::fromString(settings.value("Version", QString(VERSION)).toString());
-        settings.value("Version", QString(VERSION)).toString());
     // update version
     settings.setValue("Version", QString(VERSION));
     settings.sync();
-    qCInfo(LOG_AW) << "Found version" << version << "actual one is"
+    qCInfo(LOG_AW) << "Found version" << version << "actual one is" << m_foundVersion;
-                   << m_foundVersion;
 
     if ((version != m_foundVersion) && (!QString(CHANGELOG).isEmpty())) {
-        genMessageBox(i18n("Changelog of %1", VERSION),
+        sendNotification(i18n("Changelog of %1", VERSION), QString(CHANGELOG).replace('@', '\n'));
-                      QString(CHANGELOG).replace('@', '\n'), QMessageBox::Ok)
-            ->open();
         return true;
     } else if (version != m_foundVersion) {
         qCWarning(LOG_AW) << "No changelog information provided";
@@ -91,81 +81,64 @@ bool AWUpdateHelper::checkVersion()
 }
 
 
+void AWUpdateHelper::openReleasesPage()
+{
+    QDesktopServices::openUrl(QString(RELEASES) + m_foundVersion.toString());
+}
+
+
 void AWUpdateHelper::showInfo(const QVersionNumber &_version)
 {
     qCDebug(LOG_AW) << "Version" << _version;
 
-    QString text
+    auto text = i18n("You are using the actual version %1", _version.toString());
-        = i18n("You are using the actual version %1", _version.toString());
     if (!QString(COMMIT_SHA).isEmpty())
         text += QString(" (%1)").arg(QString(COMMIT_SHA));
-    return genMessageBox(i18n("No new version found"), text, QMessageBox::Ok)
+    sendNotification(i18n("No new version found"), text);
-        ->open();
 }
 
 
-void AWUpdateHelper::showUpdates(const QVersionNumber &_version)
+void AWUpdateHelper::showUpdates(const QVersionNumber &_version) const
 {
     qCDebug(LOG_AW) << "Version" << _version;
 
     QString text;
     text += i18n("Current version : %1", VERSION);
-    text += QString(COMMIT_SHA).isEmpty()
+    text += QString(COMMIT_SHA).isEmpty() ? "\n" : QString(" (%1)\n").arg(QString(COMMIT_SHA));
-                ? "\n"
-                : QString(" (%1)\n").arg(QString(COMMIT_SHA));
     text += i18n("New version : %1", _version.toString()) + "\n\n";
     text += i18n("Click \"Ok\" to download");
 
-    genMessageBox(i18n("There are updates"), text,
+    auto event = sendNotification(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::userReplyOnUpdates(QAbstractButton *_button)
+void AWUpdateHelper::versionReplyReceived(QNetworkReply *_reply, const bool _showAnyway)
-{
-    QMessageBox::ButtonRole ret
-        = static_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()
+        qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message" << _reply->errorString();
-                          << "with message" << _reply->errorString();
         return;
     }
 
-    QJsonParseError error;
+    auto error = QJsonParseError();
-    QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
+    auto 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
-    QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
+    auto firstRelease = jsonDoc.toVariant().toList().first().toMap();
-    QString version = firstRelease["tag_name"].toString();
+    auto version = firstRelease["tag_name"].toString();
     version.remove("V.");
     m_foundVersion = QVersionNumber::fromString(version);
     qCInfo(LOG_AW) << "Update found version to" << m_foundVersion;
 
-    QVersionNumber oldVersion = QVersionNumber::fromString(VERSION);
+    auto oldVersion = QVersionNumber::fromString(VERSION);
     if (oldVersion < m_foundVersion)
         return showUpdates(m_foundVersion);
     else if (_showAnyway)
@@ -174,20 +147,12 @@ void AWUpdateHelper::versionReplyRecieved(QNetworkReply *_reply,
 
 
 // additional method which is used to show message box which does not block UI
-QMessageBox *
+KNotification *AWUpdateHelper::sendNotification(const QString &_title, const QString &_body)
-AWUpdateHelper::genMessageBox(const QString &_title, const QString &_body,
-                              const QMessageBox::StandardButtons _buttons)
 {
-    qCDebug(LOG_AW) << "Construct message box with title" << _title
+    qCDebug(LOG_AW) << "Construct message box with title" << _title << "and body" << _body;
-                    << "and body" << _body;
 
-    QMessageBox *msgBox = new QMessageBox(nullptr);
+    auto event = KNotification::event("system", _title, _body);
-    msgBox->setAttribute(Qt::WA_DeleteOnClose);
+    event->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
-    msgBox->setModal(false);
-    msgBox->setWindowTitle(_title);
-    msgBox->setText(_body);
-    msgBox->setStandardButtons(_buttons);
-    msgBox->setIcon(QMessageBox::Information);
 
-    return msgBox;
+    return event;
 }

sources/awesome-widget/plugin/awupdatehelper.h

@@ -15,39 +15,33 @@
  *   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 AWUpdateHelper : public QObject
+class __attribute__((visibility("default"))) AWUpdateHelper : public QObject
 {
     Q_OBJECT
 
 public:
     explicit AWUpdateHelper(QObject *_parent = nullptr);
-    virtual ~AWUpdateHelper();
+    ~AWUpdateHelper() override = default;
-    void checkUpdates(const bool _showAnyway = false);
+    void checkUpdates(bool _showAnyway = false);
     bool checkVersion();
 
 private slots:
-    void showInfo(const QVersionNumber &_version);
+    void openReleasesPage();
-    void showUpdates(const QVersionNumber &_version);
+    static void showInfo(const QVersionNumber &_version);
-    void userReplyOnUpdates(QAbstractButton *_button);
+    void showUpdates(const QVersionNumber &_version) const;
-    void versionReplyRecieved(QNetworkReply *_reply, const bool _showAnyway);
+    void versionReplyReceived(QNetworkReply *_reply, bool _showAnyway);
 
 private:
-    QMessageBox *genMessageBox(const QString &_title, const QString &_body,
+    static KNotification *sendNotification(const QString &_title, const QString &_body);
-                               const QMessageBox::StandardButtons _buttons);
     QVersionNumber m_foundVersion;
     QString m_genericConfig;
 };
-
-
-#endif /* AWUPDATEHELPER_H */

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

@@ -0,0 +1,37 @@
+/***************************************************************************
+ *   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

@@ -0,0 +1,69 @@
+/***************************************************************************
+ *   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

@@ -0,0 +1,25 @@
+/***************************************************************************
+ *   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

@@ -0,0 +1,28 @@
+/***************************************************************************
+ *   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

@@ -0,0 +1,29 @@
+/***************************************************************************
+ *   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

@@ -0,0 +1,28 @@
+/***************************************************************************
+ *   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

@@ -0,0 +1,25 @@
+/***************************************************************************
+ *   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);
+}