ci: get rid of development branch

Closes #157

.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.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,73 @@
+Ver.4.0.0:
+* migration to plasma 6
+
+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)
++ add ability to load historical configuration (#106)
++ add ability to upload configuration to remote server (#106)
++ add stylish (#112)
++ add DBus intergration (#115)
++ add cron-like extenstion triggers (`X-AW-Socket` option) (#117)
++ add ability to trigger extensions by calling socket (`X-AW-Schedule` option) (#118)
++ add source for network requests
++ add Json formatter
+- drop patches provided support for Qt 5.4
+* use custom signal slot connection for dataengine (`BUILD_FUTURE` flag required)
+* update UI
+* refactoring
+
+Ver.3.2.1:
++ add X-AW-Translate option to DateTime formatter
++ add formatters to configuration export and import
++ add macro fuction to selector
++ add default formatters
+- add translation reinit (fix #102)
+- fix invalid float formatter saving
+- fix missing ApiVersion for formatters
+* use sockets for MPD data
+* translation update
+
+Ver.3.2.0:
++ custom formatters (#91)
++ add backend tests (#95)
++ add OWM weather provider for ExtWeather. It can be switched by using X-AW-Provider (ApiVer 3)
++ add DBus timeout for calls (#96)
++ add macros support (`$aw_macro` and `$aw_macro_*` for calls)
+- fix vertical alignment (#94)
+- fix bug with invalid updates on `X-AW-Interval=1` for ExtScript and ExtUpgrade
+- fix bug with missing derivate vaules in ExtQuotes
+- fix possible plasma crash (#96)
+- fix possible undefined behaviour if no extensions was found by name
+* split dataengine sources to own library
+* allow to use screened double brakets inside functions
+
 Ver.3.1.2:
 + add standalone widget configuration example
 + new tag tstime

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

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
-* panel which shows active desktop status
-* clear Conky-like configuration with html tags support
+* easy and fully configurable native Plasma widget which may be used as desktop or panel widget
+* additionnal widget which shows active desktop status
+* 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 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../
-        make && sudo make install
+      cmake -B build -S sources -DCMAKE_BUILD_TYPE=Release
+      cmake --build build
 
-  **NOTE** on Plasma 5 it very likely requires `-DKDE_INSTALL_USE_QT_SYS_PATHS=ON` flag
+* install package 
+
+      cmake --install build
 
 Additional information
 ======================

create_archive.sh

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

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.1.2
+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')
-optdepends=("catalyst: for GPU monitor"
-            "hddtemp: for HDD temperature monitor"
-            "smartmontools: for HDD temperature monitor"
-            "mpd: for music player monitor"
-            "nvidia-utils: for GPU monitor")
+depends=('plasma-workspace')
+optdepends=("mpd: for music player monitor"
+            "wireless_tools: wifi information")
 makedepends=('cmake' 'extra-cmake-modules' 'python')
-source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
-install=${pkgname}.install
-md5sums=('99514bf6d1a5ca8660dd0210ee58af28')
+source=(https://github.com/arcan1s/awesome-widgets/releases/download/${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
+install="$pkgname.install"
 backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
 
-prepare() {
-  rm -rf "${srcdir}/build"
-  mkdir "${srcdir}/build"
-}
-
 build () {
-  cd "${srcdir}/build"
-  cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+    cmake -B build -S "${_pkgname}" \
           -DCMAKE_BUILD_TYPE=Optimization \
-        -DCMAKE_INSTALL_PREFIX=/usr \
           -DBUILD_FUTURE=ON \
-        "../${_pkgname}"
-  make
+          -DBUILD_TESTING=OFF
+    cmake --build build
 }
 
 package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
+      DESTDIR="$pkgdir" cmake --install build
 }
+
+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.4-qml-dialogs-qtconcurrent-and-qloggingcategory.patch

@@ -1,399 +0,0 @@
-diff --git a/sources/awesome-widget/package/contents/ui/advanced.qml b/sources/awesome-widget/package/contents/ui/advanced.qml
-index 01bcd58..1ec7ba6 100644
---- a/sources/awesome-widget/package/contents/ui/advanced.qml
-+++ b/sources/awesome-widget/package/contents/ui/advanced.qml
-@@ -17,7 +17,6 @@
- 
- import QtQuick 2.0
- import QtQuick.Controls 1.3 as QtControls
--import QtQuick.Dialogs 1.2 as QtDialogs
- 
- import org.kde.plasma.private.awesomewidget 1.0
- 
-@@ -372,32 +371,7 @@ Item {
-             QtControls.Button {
-                 width: parent.width * 3 / 5
-                 text: i18n("Export configuration")
--                onClicked: saveConfigAs.open()
--            }
--
--            QtDialogs.FileDialog {
--                id: saveConfigAs
--                selectExisting: false
--                title: i18n("Export")
--                folder: awConfig.configurationDirectory()
--                onAccepted: {
--                    var status = awConfig.exportConfiguration(
--                        plasmoid.configuration,
--                        saveConfigAs.fileUrl.toString().replace("file://", ""))
--                    if (status) {
--                        messageDialog.title = i18n("Success")
--                        messageDialog.text = i18n("Please note that binary files were not copied")
--                    } else {
--                        messageDialog.title = i18n("Ooops...")
--                        messageDialog.text = i18n("Could not save configuration file")
--                    }
--                    messageDialog.open()
--                }
--            }
--
--            QtDialogs.MessageDialog {
--                id: messageDialog
--                standardButtons: QtDialogs.StandardButton.Ok
-+                onClicked: awConfig.exportConfiguration(plasmoid.configuration)
-             }
-         }
- 
-@@ -410,42 +385,9 @@ Item {
-             QtControls.Button {
-                 width: parent.width * 3 / 5
-                 text: i18n("Import configuration")
--                onClicked: openConfig.open()
--            }
--
--            QtDialogs.FileDialog {
--                id: openConfig
--                title: i18n("Import")
--                folder: awConfig.configurationDirectory()
--                onAccepted: importSelection.open()
--            }
--
--            QtDialogs.Dialog {
--                id: importSelection
--
--                Column {
--                    QtControls.CheckBox {
--                        id: importPlasmoid
--                        text: i18n("Import plasmoid settings")
--                    }
--
--                    QtControls.CheckBox {
--                        id: importExtensions
--                        text: i18n("Import extensions")
--                    }
--
--                    QtControls.CheckBox {
--                        id: importAdds
--                        text: i18n("Import additional files")
--                    }
--                }
--
--                onAccepted: {
-+                onClicked: {
-                     if (debug) console.debug()
--                    var importConfig = awConfig.importConfiguration(
--                        openConfig.fileUrl.toString().replace("file://", ""),
--                        importPlasmoid.checked, importExtensions.checked,
--                        importAdds.checked)
-+                    var importConfig = awConfig.importConfiguration()
-                     for (var key in importConfig)
-                         plasmoid.configuration[key] = importConfig[key]
-                 }
-diff --git a/sources/awesome-widget/package/contents/ui/main.qml b/sources/awesome-widget/package/contents/ui/main.qml
-index 23e9690..ec83b91 100644
---- a/sources/awesome-widget/package/contents/ui/main.qml
-+++ b/sources/awesome-widget/package/contents/ui/main.qml
-@@ -17,7 +17,6 @@
- 
- import QtQuick 2.4
- import QtQuick.Controls 1.3 as QtControls
--import QtQuick.Dialogs 1.2 as QtDialogs
- import QtQuick.Layouts 1.1
- import org.kde.plasma.plasmoid 2.0
- import org.kde.plasma.core 2.0 as PlasmaCore
-@@ -110,27 +109,6 @@ Item {
-         }
-     }
- 
--    QtDialogs.Dialog {
--        id: tagSelector
--        title: i18n("Select tag")
--
--        QtControls.ComboBox {
--            id: tagSelectorBox
--            width: parent.width
--            editable: 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()
-@@ -216,7 +194,12 @@ Item {
-     function action_requestKey() {
-         if (debug) console.debug()
- 
--        tagSelectorBox.model = awKeys.dictKeys(true)
--        return tagSelector.open()
-+        var tag = awKeys.graphicalKey()
-+        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)
-     }
- }
-diff --git a/sources/awesome-widget/plugin/awconfighelper.cpp b/sources/awesome-widget/plugin/awconfighelper.cpp
-index 6263b30..5f61d2a 100644
---- a/sources/awesome-widget/plugin/awconfighelper.cpp
-+++ b/sources/awesome-widget/plugin/awconfighelper.cpp
-@@ -19,10 +19,15 @@
- 
- #include <KI18n/KLocalizedString>
- 
-+#include <QCheckBox>
-+#include <QDialogButtonBox>
- #include <QDir>
-+#include <QFileDialog>
-+#include <QMessageBox>
- #include <QQmlPropertyMap>
- #include <QSettings>
- #include <QTextCodec>
-+#include <QVBoxLayout>
- 
- #include "awdebug.h"
- 
-@@ -50,11 +55,13 @@ bool AWConfigHelper::dropCache() const
- }
- 
- 
--bool AWConfigHelper::exportConfiguration(QObject *nativeConfig,
--                                         const QString fileName) const
-+void AWConfigHelper::exportConfiguration(QObject *nativeConfig) const
- {
--    qCDebug(LOG_AW) << "Selected filename" << fileName;
--
-+    // get file path and init settings object
-+    QString fileName = QFileDialog::getSaveFileName(nullptr, i18n("Export"));
-+    if (fileName.isEmpty())
-+        return;
-+    qCInfo(LOG_AW) << "Selected filename" << fileName;
-     QSettings settings(fileName, QSettings::IniFormat);
- 
-     // plasmoid configuration
-@@ -96,22 +103,33 @@ bool AWConfigHelper::exportConfiguration(QObject *nativeConfig,
-     // sync settings
-     settings.sync();
-     // show additional message
--    return settings.status() == QSettings::NoError;
-+    switch (settings.status()) {
-+    case QSettings::NoError:
-+        QMessageBox::information(
-+            nullptr, i18n("Success"),
-+            i18n("Please note that binary files were not copied"));
-+        break;
-+    default:
-+        QMessageBox::critical(nullptr, i18n("Ooops..."),
-+                              i18n("Could not save configuration file"));
-+        break;
-+    }
- }
- 
- 
--QVariantMap AWConfigHelper::importConfiguration(const QString fileName,
--                                                const bool importPlasmoid,
--                                                const bool importExtensions,
--                                                const bool importAdds) const
-+QVariantMap AWConfigHelper::importConfiguration() const
- {
--    qCDebug(LOG_AW) << "Selected filename" << fileName;
--
-     QVariantMap configuration;
-+    // get file path and init settings object
-+    QString fileName = QFileDialog::getOpenFileName(nullptr, i18n("Import"));
-+    if (fileName.isEmpty())
-+        return configuration;
-+    qCInfo(LOG_AW) << "Selected filename" << fileName;
-     QSettings settings(fileName, QSettings::IniFormat);
-+    QHash<QString, bool> selection = selectImport();
- 
-     // extensions
--    if (importExtensions) {
-+    if (selection[QString("extensions")]) {
-         for (auto item : m_dirs) {
-             settings.beginGroup(item);
-             for (auto it : settings.childGroups())
-@@ -121,7 +139,7 @@ QVariantMap AWConfigHelper::importConfiguration(const QString fileName,
-     }
- 
-     // additional files
--    if (importAdds) {
-+    if (selection[QString("adds")]) {
-         settings.beginGroup(QString("json"));
-         // script filters
-         writeFile(settings, QString("filters"),
-@@ -135,7 +153,7 @@ QVariantMap AWConfigHelper::importConfiguration(const QString fileName,
-     }
- 
-     // plasmoid configuration
--    if (importPlasmoid) {
-+    if (selection[QString("plasmoid")]) {
-         settings.beginGroup(QString("plasmoid"));
-         for (auto key : settings.childKeys())
-             configuration[key] = settings.value(key);
-@@ -261,6 +279,50 @@ void AWConfigHelper::readFile(QSettings &settings, const QString key,
- }
- 
- 
-+QHash<QString, bool> AWConfigHelper::selectImport() const
-+{
-+    QDialog *dialog = new QDialog(nullptr);
-+    QCheckBox *importPlasmoidSettings
-+        = new QCheckBox(i18n("Import plasmoid settings"), dialog);
-+    importPlasmoidSettings->setChecked(true);
-+    QCheckBox *importExtensionsSettings
-+        = new QCheckBox(i18n("Import extensions"), dialog);
-+    importExtensionsSettings->setChecked(true);
-+    QCheckBox *importAddsSettings
-+        = new QCheckBox(i18n("Import additional files"), dialog);
-+    importAddsSettings->setChecked(true);
-+    QDialogButtonBox *dialogButtons
-+        = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
-+                               Qt::Horizontal, dialog);
-+    QVBoxLayout *layout = new QVBoxLayout(dialog);
-+    layout->addWidget(importPlasmoidSettings);
-+    layout->addWidget(importExtensionsSettings);
-+    layout->addWidget(importAddsSettings);
-+    layout->addWidget(dialogButtons);
-+    connect(dialogButtons, SIGNAL(accepted()), dialog, SLOT(accept()));
-+    connect(dialogButtons, SIGNAL(rejected()), dialog, SLOT(reject()));
-+
-+    // get parameters
-+    QHash<QString, bool> import;
-+    import[QString("plasmoid")] = false;
-+    import[QString("extensions")] = false;
-+    import[QString("adds")] = false;
-+    switch (dialog->exec()) {
-+    case QDialog::Accepted:
-+        import[QString("plasmoid")] = importPlasmoidSettings->isChecked();
-+        import[QString("extensions")] = importExtensionsSettings->isChecked();
-+        import[QString("adds")] = importAddsSettings->isChecked();
-+        break;
-+    case QDialog::Rejected:
-+    default:
-+        break;
-+    }
-+    dialog->deleteLater();
-+
-+    return import;
-+}
-+
-+
- void AWConfigHelper::writeFile(QSettings &settings, const QString key,
-                                const QString fileName) const
- {
-diff --git a/sources/awesome-widget/plugin/awconfighelper.h b/sources/awesome-widget/plugin/awconfighelper.h
-index 912ac3d..dc51dfb 100644
---- a/sources/awesome-widget/plugin/awconfighelper.h
-+++ b/sources/awesome-widget/plugin/awconfighelper.h
-@@ -33,13 +33,9 @@ public:
-     explicit AWConfigHelper(QObject *parent = nullptr);
-     virtual ~AWConfigHelper();
-     Q_INVOKABLE QString configurationDirectory() const;
-     Q_INVOKABLE bool dropCache() const;
--    Q_INVOKABLE bool exportConfiguration(QObject *nativeConfig,
--                                         const QString fileName) const;
--    Q_INVOKABLE QVariantMap importConfiguration(const QString fileName,
--                                                const bool importPlasmoid,
--                                                const bool importExtensions,
--                                                const bool importAdds) const;
-+    Q_INVOKABLE void exportConfiguration(QObject *nativeConfig) const;
-+    Q_INVOKABLE QVariantMap importConfiguration() const;
-     // dataengine
-     Q_INVOKABLE QVariantMap readDataEngineConfiguration() const;
-     Q_INVOKABLE void
-@@ -51,6 +47,7 @@ private:
-     void copySettings(QSettings &from, QSettings &to) const;
-     void readFile(QSettings &settings, const QString key,
-                   const QString fileName) const;
-+    QHash<QString, bool> selectImport() const;
-     void writeFile(QSettings &settings, const QString key,
-                    const QString fileName) const;
-     // properties
-diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp
-index e5b9861..039d24e 100644
---- a/sources/awesome-widget/plugin/awkeys.cpp
-+++ b/sources/awesome-widget/plugin/awkeys.cpp
-@@ -324,6 +324,14 @@ QStringList AWKeys::getHddDevices() const
- }
- 
- 
-+#include <QInputDialog>
-+QString AWKeys::graphicalKey() const
-+{
-+    return QInputDialog::getItem(nullptr, i18n("Select tag"), QString(),
-+                                 dictKeys(true), 0, true);
-+}
-+
-+
- QString AWKeys::infoByKey(QString key) const
- {
-     qCDebug(LOG_AW) << "Requested info for key" << key;
-diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h
-index a8300f1..8edc3bd 100644
---- a/sources/awesome-widget/plugin/awkeys.h
-+++ b/sources/awesome-widget/plugin/awkeys.h
-@@ -55,6 +55,7 @@ public:
-     Q_INVOKABLE QStringList dictKeys(const bool sorted = false,
-                                      const QString regexp = QString()) const;
-     Q_INVOKABLE QStringList getHddDevices() const;
-+    Q_INVOKABLE QString graphicalKey() const;
-     // values
-     Q_INVOKABLE QString infoByKey(QString key) const;
-     Q_INVOKABLE QString valueByKey(QString key) const;
-diff --git a/sources/awdebug.cpp b/sources/awdebug.cpp
-index eee61e1..9da8dad 100644
---- a/sources/awdebug.cpp
-+++ b/sources/awdebug.cpp
-@@ -20,13 +20,10 @@
- #include "awdebug.h"
- 
- 
--Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget",
--                   QtMsgType::QtWarningMsg)
--Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel",
--                   QtMsgType::QtWarningMsg)
--Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon", QtMsgType::QtWarningMsg)
--Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets",
--                   QtMsgType::QtWarningMsg)
-+Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget")
-+Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel")
-+Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon")
-+Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets")
- 
- 
- const QStringList getBuildData()
-diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp
-index e5b9861..eb73073 100644
---- a/sources/awesome-widget/plugin/awkeys.cpp
-+++ b/sources/awesome-widget/plugin/awkeys.cpp
-@@ -439,4 +439,4 @@ void AWKeys::dataUpdated(const QString &sourceName,
- {
-     // run concurrent data update
--    QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, sourceName,
-+    QtConcurrent::run(this, &AWKeys::setDataBySource, sourceName,
-                       data);
-diff --git a/sources/libraries.cmake b/sources/libraries.cmake
-index 33192f7..46e2b1e 100644
---- a/sources/libraries.cmake
-+++ b/sources/libraries.cmake
-@@ -2,7 +2,7 @@
- find_package(Gettext REQUIRED)
- 
- # main qt libraries
--find_package(Qt5 5.4.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
-+find_package(Qt5 5.3.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
- add_definitions(
-         ${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
-         ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}

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

@@ -1,31 +0,0 @@
-diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h
-index f808d03..a056b3f 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"
- 
-diff --git a/sources/awdebug.h b/sources/awdebug.h
-index 43944ce..c679281 100644
---- a/sources/awdebug.h
-+++ b/sources/awdebug.h
-@@ -21,9 +21,13 @@
- 
- #include "version.h"
- 
-+#ifndef qCInfo
-+#define qCInfo qCDebug
-+#endif
-+
- #ifndef LOG_FORMAT
- #define LOG_FORMAT                                                             \
--    "[%{time process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%{if-"         \
-+    "[%{time process}][%{if-debug}DD%{endif}%{if-"         \
-     "warning}WW%{endif}%{if-critical}CC%{endif}%{if-fatal}FF%{endif}][%{"      \
-     "category}][%{function}] %{message}"
- #endif /* LOG_FORMAT */

patches/qt5.6-qversionnumber.patch

@@ -1,148 +0,0 @@
-diff --git a/sources/awesome-widget/plugin/awupdatehelper.cpp b/sources/awesome-widget/plugin/awupdatehelper.cpp
-index 3698602..42871c8 100644
---- a/sources/awesome-widget/plugin/awupdatehelper.cpp
-+++ b/sources/awesome-widget/plugin/awupdatehelper.cpp
-@@ -37,7 +37,7 @@ AWUpdateHelper::AWUpdateHelper(QObject *parent)
- {
-     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
- 
--    m_foundVersion = QVersionNumber::fromString(VERSION);
-+    m_foundVersion = QString(VERSION);
-     m_genericConfig = QString("%1/awesomewidgets/general.ini")
-                           .arg(QStandardPaths::writableLocation(
-                               QStandardPaths::GenericDataLocation));
-@@ -69,15 +69,15 @@ void AWUpdateHelper::checkUpdates(const bool showAnyway)
- bool AWUpdateHelper::checkVersion()
- {
-     QSettings settings(m_genericConfig, QSettings::IniFormat);
--    QVersionNumber version = QVersionNumber::fromString(
--        settings.value(QString("Version"), QString(VERSION)).toString());
-+    QString version
-+        = settings.value(QString("Version"), QString(VERSION)).toString();
-     // update version
-     settings.setValue(QString("Version"), QString(VERSION));
-     settings.sync();
-     qCInfo(LOG_AW) << "Found version" << version << "actual one is"
-                    << m_foundVersion;
- 
--    if ((version != m_foundVersion) && (!QString(CHANGELOG).isEmpty())) {
-+    if ((version != QString(VERSION)) && (!QString(CHANGELOG).isEmpty())) {
-         genMessageBox(i18n("Changelog of %1", QString(VERSION)),
-                       QString(CHANGELOG).replace(QChar('@'), QChar('\n')),
-                       QMessageBox::Ok)
-@@ -90,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)
-@@ -103,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;
- 
-@@ -112,7 +111,7 @@ void AWUpdateHelper::showUpdates(const QVersionNumber version)
-     text += QString(COMMIT_SHA).isEmpty()
-                 ? QString("\n")
-                 : QString(" (%1)\n").arg(QString(COMMIT_SHA));
--    text += i18n("New version : %1", version.toString()) + QString("\n\n");
-+    text += i18n("New version : %1", version) + QString("\n\n");
-     text += i18n("Click \"Ok\" to download");
- 
-     genMessageBox(i18n("There are updates"), text,
-@@ -128,8 +127,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:
-@@ -157,14 +155,23 @@ void AWUpdateHelper::versionReplyRecieved(QNetworkReply *reply,
-     QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
-     QString version = firstRelease[QString("tag_name")].toString();
-     version.remove(QString("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 359cdb2..9c6a42d 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 33192f7..339bb58 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 Widgets)
-+find_package(Qt5 5.4.0 REQUIRED COMPONENTS Core DBus Network Qml 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
-AlignConsecutiveAssignments: false
-AlignEscapedNewlinesLeft: false
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: None
 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,21 +1,25 @@
-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_MINOR "1")
-set(PROJECT_VERSION_PATCH "2")
+set(PROJECT_VERSION_MAJOR "4")
+set(PROJECT_VERSION_MINOR "0")
+set(PROJECT_VERSION_PATCH "0")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 # append git version if any
 set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "")
@@ -34,51 +38,42 @@ option(BUILD_DEB_PACKAGE "Build deb package" OFF)
 option(BUILD_RPM_PACKAGE "Build rpm package" OFF)
 # build details
 option(BUILD_FUTURE "Build with the features which will be marked as stable later" OFF)
+option(BUILD_LOAD "Build with additional load" OFF)
 option(BUILD_TESTING "Build with additional test abilities" OFF)
 
 # generate changelog
 set(PROJECT_CHANGELOG "Changelog" CACHE INTERNAL "")
 include(changelog.cmake)
 
-# flags
-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 -stdlib=libc++")
-    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
-    set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
-    set(CMAKE_CXX_FLAGS_OPTIMIZATION "-Ofast -DNDEBUG")
-    # linker flags
-    set(CMAKE_EXE_LINKER_FLAGS "-lc++abi")
-    set(CMAKE_MODULE_LINKER_FLAGS "-lc++abi")
-    set(CMAKE_SHARED_LINKER_FLAGS "-lc++abi")
-else ()
-    message(FATAL_ERROR "Unknown compiler")
-endif ()
-if (CMAKE_BUILD_TYPE MATCHES Debug)
-    set(CMAKE_VERBOSE_MAKEFILE ON)
-endif ()
-
+# directories
 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)
 if (BUILD_PLASMOIDS)
+    add_subdirectory(qml)
     add_subdirectory(awesome-widget)
     add_subdirectory(desktop-panel)
     add_subdirectory(translations)
 endif ()
+if (BUILD_TESTING)
+    enable_testing()
+    add_subdirectory(test)
+endif ()
 
 include(packages-recipe.cmake)

sources/awdebug.cpp

@@ -16,77 +16,111 @@
  ***************************************************************************/
 
 
+#include <KI18n/KLocalizedString>
+
 #include "awdebug.h"
 
 
-Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget",
-                   QtMsgType::QtWarningMsg)
-Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel",
-                   QtMsgType::QtWarningMsg)
+Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget", QtMsgType::QtWarningMsg)
+Q_LOGGING_CATEGORY(LOG_DBUS, "org.kde.plasma.awdbus", QtMsgType::QtWarningMsg)
+Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel", QtMsgType::QtWarningMsg)
 Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon", QtMsgType::QtWarningMsg)
-Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets",
-                   QtMsgType::QtWarningMsg)
+Q_LOGGING_CATEGORY(LOG_ESS, "org.kde.plasma.extsysmonsources", QtMsgType::QtWarningMsg)
+Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets", QtMsgType::QtWarningMsg)
 
 
-const QStringList getBuildData()
+QString AWDebug::getAboutText(const QString &_type)
+{
+    QString text;
+    if (_type == "header") {
+        text = NAME;
+    } else if (_type == "version") {
+        text = i18n("Version %1 (build date %2)", VERSION, BUILD_DATE);
+        if (!QString(COMMIT_SHA).isEmpty())
+            text += QString(" (%1)").arg(COMMIT_SHA);
+    } else if (_type == "description") {
+        text = i18n("A set of minimalistic plasmoid widgets");
+    } else if (_type == "links") {
+        text = i18n("Links:") + "<ul>" + QString("<li><a href=\"%1\">%2</a></li>").arg(HOMEPAGE, i18n("Homepage"))
+               + QString("<li><a href=\"%1\">%2</a></li>").arg(REPOSITORY, i18n("Repository"))
+               + QString("<li><a href=\"%1\">%2</a></li>").arg(BUGTRACKER, i18n("Bugtracker"))
+               + QString("<li><a href=\"%1\">%2</a></li>").arg(TRANSLATION, i18n("Translation issue"))
+               + QString("<li><a href=\"%1\">%2</a></li>").arg(AUR_PACKAGES, i18n("AUR packages"))
+               + QString("<li><a href=\"%1\">%2</a></li>").arg(OPENSUSE_PACKAGES, i18n("openSUSE packages")) + "</ul>";
+    } else if (_type == "copy") {
+        text = QString("<small>&copy; %1 <a href=\"mailto:%2\">%3</a><br>").arg(DATE, EMAIL, AUTHOR)
+               + i18n("This software is licensed under %1", LICENSE) + "</small>";
+    } else if (_type == "translators") {
+        auto translatorList = QString(TRANSLATORS).split(',');
+        for (auto &translator : translatorList)
+            translator = QString("<li>%1</li>").arg(translator);
+        text = i18n("Translators:") + "<ul>" + translatorList.join("") + "</ul>";
+    } else if (_type == "3rdparty") {
+        auto trdPartyList = QString(TRDPARTY_LICENSE).split(';', Qt::SkipEmptyParts);
+        for (auto i = 0; i < trdPartyList.count(); ++i)
+            trdPartyList[i] = QString("<li><a href=\"%3\">%1</a> (%2 license)</li>")
+                                  .arg(trdPartyList.at(i).split(',')[0], trdPartyList.at(i).split(',')[1],
+                                       trdPartyList.at(i).split(',')[2]);
+        text = i18n("This software uses:") + "<ul>" + trdPartyList.join("") + "</ul>";
+    } else if (_type == "thanks") {
+        auto thanks = QString(SPECIAL_THANKS).split(';', Qt::SkipEmptyParts);
+        for (auto i = 0; i < thanks.count(); ++i)
+            thanks[i]
+                = QString("<li><a href=\"%2\">%1</a></li>").arg(thanks.at(i).split(',')[0], thanks.at(i).split(',')[1]);
+        text = i18n("Special thanks to:") + "<ul>" + thanks.join("") + "</ul>";
+    }
+
+    return text;
+}
+
+
+QStringList AWDebug::getBuildData()
 {
     QStringList metadata;
-    metadata.append(QString("=== Awesome Widgets configuration details ==="));
+    metadata.append("=== Awesome Widgets configuration details ===");
     // build information
-    metadata.append(QString("Build details:"));
+    metadata.append("Build details:");
     metadata.append(QString("    VERSION: %1").arg(VERSION));
     metadata.append(QString("    COMMIT_SHA: %1").arg(COMMIT_SHA));
     metadata.append(QString("    BUILD_DATE: %1").arg(BUILD_DATE));
     // configuration
-    metadata.append(QString("API details:"));
-    metadata.append(QString("    AWGIAPI: %1").arg(AWGIAPI));
-    metadata.append(QString("    AWEQAPI: %1").arg(AWEQAPI));
-    metadata.append(QString("    AWESAPI: %1").arg(AWESAPI));
-    metadata.append(QString("    AWEUAPI: %1").arg(AWEUAPI));
-    metadata.append(QString("    AWEWAPI: %1").arg(AWEWAPI));
+    metadata.append("API details:");
+    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(QString("    AW_EXTUPGRADE_API: %1").arg(AW_EXTUPGRADE_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));
     metadata.append(QString("    STATIC_KEYS: %1").arg(STATIC_KEYS));
     // cmake properties
-    metadata.append(QString("cmake properties:"));
+    metadata.append("cmake properties:");
     metadata.append(QString("    CMAKE_BUILD_TYPE: %1").arg(CMAKE_BUILD_TYPE));
-    metadata.append(
-        QString("    CMAKE_CXX_COMPILER: %1").arg(CMAKE_CXX_COMPILER));
+    metadata.append(QString("    CMAKE_CXX_COMPILER: %1").arg(CMAKE_CXX_COMPILER));
     metadata.append(QString("    CMAKE_CXX_FLAGS: %1").arg(CMAKE_CXX_FLAGS));
-    metadata.append(
-        QString("    CMAKE_CXX_FLAGS_DEBUG: %1").arg(CMAKE_CXX_FLAGS_DEBUG));
-    metadata.append(QString("    CMAKE_CXX_FLAGS_RELEASE: %1")
-                        .arg(CMAKE_CXX_FLAGS_RELEASE));
-    metadata.append(QString("    CMAKE_CXX_FLAGS_OPTIMIZATION: %1")
-                        .arg(CMAKE_CXX_FLAGS_OPTIMIZATION));
-    metadata.append(
-        QString("    CMAKE_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));
+    metadata.append(QString("    CMAKE_CXX_FLAGS_DEBUG: %1").arg(CMAKE_CXX_FLAGS_DEBUG));
+    metadata.append(QString("    CMAKE_CXX_FLAGS_RELEASE: %1").arg(CMAKE_CXX_FLAGS_RELEASE));
+    metadata.append(QString("    CMAKE_CXX_FLAGS_OPTIMIZATION: %1").arg(CMAKE_CXX_FLAGS_OPTIMIZATION));
+    metadata.append(QString("    CMAKE_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(QString("Components data:"));
-    metadata.append(QString("    BUILD_COVERAGE: %1").arg(BUILD_COVERAGE));
+    metadata.append("Components data:");
     metadata.append(QString("    BUILD_PLASMOIDS: %1").arg(BUILD_PLASMOIDS));
-    metadata.append(
-        QString("    BUILD_DEB_PACKAGE: %1").arg(BUILD_DEB_PACKAGE));
-    metadata.append(
-        QString("    BUILD_RPM_PACKAGE: %1").arg(BUILD_RPM_PACKAGE));
-    metadata.append(
-        QString("    CLANGFORMAT_EXECUTABLE: %1").arg(CLANGFORMAT_EXECUTABLE));
+    metadata.append(QString("    BUILD_DEB_PACKAGE: %1").arg(BUILD_DEB_PACKAGE));
+    metadata.append(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(
-        QString("    COVERITY_DIRECTORY: %1").arg(COVERITY_DIRECTORY));
+    metadata.append(QString("    COVERITY_DIRECTORY: %1").arg(COVERITY_DIRECTORY));
     metadata.append(QString("    COVERITY_EMAIL: %1").arg(COVERITY_EMAIL));
-    metadata.append(
-        QString("    COVERITY_EXECUTABLE: %1").arg(COVERITY_EXECUTABLE));
+    metadata.append(QString("    COVERITY_EXECUTABLE: %1").arg(COVERITY_EXECUTABLE));
     metadata.append(QString("    COVERITY_URL: %1").arg(COVERITY_URL));
-    metadata.append(
-        QString("    CPPCHECK_EXECUTABLE: %1").arg(CPPCHECK_EXECUTABLE));
+    metadata.append(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));
     metadata.append(QString("    PROP_TEST: %1").arg(PROP_TEST));
 
     return metadata;

sources/awdebug.h

@@ -15,28 +15,28 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
-#ifndef AWDEBUG_H
-#define AWDEBUG_H
+#pragma once
 
 #include <QLoggingCategory>
 
 #include "version.h"
 
-#ifndef LOG_FORMAT
-#define LOG_FORMAT                                                             \
-    "[%{time process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%{if-"         \
-    "warning}WW%{endif}%{if-critical}CC%{endif}%{if-fatal}FF%{endif}][%{"      \
-    "category}][%{function}] %{message}"
-#endif /* LOG_FORMAT */
+namespace AWDebug
+{
+const char LOG_FORMAT[] = "[%{time "
+                          "process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%"
+                          "{if-warning}WW%{endif}%{if-critical}CC%{endif}%{if-"
+                          "fatal}FF%{endif}][%{category}][%{function}] "
+                          "%{message}";
+
+QString getAboutText(const QString &_type);
+QStringList getBuildData();
+} // namespace AWDebug
 
 
 Q_DECLARE_LOGGING_CATEGORY(LOG_AW)
+Q_DECLARE_LOGGING_CATEGORY(LOG_DBUS)
 Q_DECLARE_LOGGING_CATEGORY(LOG_DP)
 Q_DECLARE_LOGGING_CATEGORY(LOG_ESM)
+Q_DECLARE_LOGGING_CATEGORY(LOG_ESS)
 Q_DECLARE_LOGGING_CATEGORY(LOG_LIB)
-
-const QStringList getBuildData();
-
-
-#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,137 +7,143 @@
 
     <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">
-            <default>0</default>
-        </entry>
-        <entry name="tempUnits" type="string">
+        <entry name="tempUnits" type="String">
             <default>Celsius</default>
         </entry>
-        <entry name="customTime" type="string">
+        <entry name="customTime" type="String">
             <default>$hh:$mm</default>
         </entry>
-        <entry name="customUptime" type="string">
+        <entry name="customUptime" type="String">
             <default>$dd,$hh,$mm</default>
         </entry>
-        <entry name="acOnline" type="string">
+        <entry name="acOnline" type="String">
             <default>(*)</default>
         </entry>
-        <entry name="acOffline" type="string">
+        <entry name="acOffline" type="String">
             <default>( )</default>
         </entry>
+        <entry name="historyCount" type="Int">
+            <default>100</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">
+            <default>normal</default>
+        </entry>
+        <entry name="textStyleColor" type="String">
+            <default>#000000</default>
+        </entry>
     </group>
 
 </kcfg>

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

@@ -15,114 +15,22 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Controls 1.3 as QtControls
-import QtQuick.Layouts 1.0 as QtLayouts
+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
-    implicitWidth: pageColumn.implicitWidth
-    implicitHeight: pageColumn.implicitHeight
-
-    property bool debug: awActions.isDebugEnabled()
-
-
-    Column {
-        id: pageColumn
-        anchors.fill: parent
-        QtControls.TabView {
-            height: parent.height
-            width: parent.width
-            QtControls.Tab {
-                anchors.margins: 10.0
-                title: i18n("About")
-
-                QtLayouts.ColumnLayout {
-                    QtControls.Label {
-                        QtLayouts.Layout.fillWidth: true
-                        horizontalAlignment: Text.AlignHCenter
-                        text: awActions.getAboutText("header")
-                    }
-
-                    QtControls.Label {
-                        QtLayouts.Layout.fillWidth: true
-                        horizontalAlignment: Text.AlignHCenter
-                        text: awActions.getAboutText("version")
-                    }
-
-                    QtControls.Label {
-                        QtLayouts.Layout.fillWidth: true
-                        horizontalAlignment: Text.AlignJustify
-                        text: awActions.getAboutText("description")
-                    }
-
-                    QtControls.Label {
-                        QtLayouts.Layout.fillWidth: true
-                        horizontalAlignment: Text.AlignLeft
-                        textFormat: Text.RichText
-                        text: awActions.getAboutText("links")
-                        onLinkActivated: Qt.openUrlExternally(link);
-                    }
-
-                    QtControls.Label {
-                        QtLayouts.Layout.fillHeight: true
-                        QtLayouts.Layout.fillWidth: true
-                        font.capitalization: Font.SmallCaps
-                        horizontalAlignment: Text.AlignHCenter
-                        verticalAlignment: Text.AlignBottom
-                        textFormat: Text.RichText
-                        text: awActions.getAboutText("copy")
-                    }
-                }
-            }
-
-            QtControls.Tab {
-                anchors.margins: 10.0
-                title: i18n("Acknowledgment")
-
-                QtLayouts.ColumnLayout {
-                    QtControls.Label {
-                        QtLayouts.Layout.fillWidth: true
-                        wrapMode: Text.WordWrap
-                        horizontalAlignment: Text.AlignJustify
-                        text: awActions.getAboutText("translators")
-                    }
-
-                    QtControls.Label {
-                        QtLayouts.Layout.fillWidth: true
-                        wrapMode: Text.WordWrap
-                        horizontalAlignment: Text.AlignJustify
-                        textFormat: Text.RichText
-                        text: awActions.getAboutText("3rdparty")
-                        onLinkActivated: Qt.openUrlExternally(link);
-                    }
-
-                    QtControls.Label {
-                        QtLayouts.Layout.fillHeight: true
-                        QtLayouts.Layout.fillWidth: true
-                        wrapMode: Text.WordWrap
-                        horizontalAlignment: Text.AlignJustify
-                        verticalAlignment: Text.AlignTop
-                        textFormat: Text.RichText
-                        text: awActions.getAboutText("thanks")
-                        onLinkActivated: Qt.openUrlExternally(link);
-                    }
-                }
-            }
-        }
-    }
-
-
-    Component.onCompleted: {
-        if (debug) console.debug()
+    AboutTab {
+        textProvider: awActions
     }
 }

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

@@ -15,30 +15,22 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Controls 1.3 as QtControls
-import QtQuick.Dialogs 1.2 as QtDialogs
+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 org.kde.plasma.private.awesomewidget
 
 
-Item {
+KCM.SimpleKCM {
     id: advancedPage
+
     // backend
-    AWActions {
-        id: awActions
-    }
     AWConfigHelper {
         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
@@ -49,428 +41,194 @@ 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.currentText
-    property alias cfg_customTime: customTime.text
-    property alias cfg_customUptime: customUptime.text
-    property alias cfg_acOnline: acOnline.text
-    property alias cfg_acOffline: acOffline.text
-
+    property string cfg_tempUnits: tempUnits.value
+    property alias cfg_customTime: customTime.value
+    property alias cfg_customUptime: customUptime.value
+    property alias cfg_acOnline: acOnline.value
+    property alias cfg_acOffline: acOffline.value
+    property alias cfg_historyCount: historyCount.value
 
     Column {
-        id: pageColumn
         anchors.fill: parent
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.heigth
-                width: parent.width * 2 / 5
-            }
-            QtControls.CheckBox {
+
+        CheckBoxSelector {
             id: background
-                width: parent.width * 3 / 5
             text: i18n("Enable background")
         }
-        }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.heigth
-                width: parent.width * 2 / 5
-            }
-            QtControls.CheckBox {
+        CheckBoxSelector {
             id: translate
-                width: parent.width * 3 / 5
             text: i18n("Translate strings")
         }
-        }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.heigth
-                width: parent.width * 2 / 5
-            }
-            QtControls.CheckBox {
+        CheckBoxSelector {
             id: wrapNewLines
-                width: parent.width * 3 / 5
             text: i18n("Wrap new lines")
         }
-        }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.heigth
-                width: parent.width * 2 / 5
-            }
-            QtControls.CheckBox {
+        CheckBoxSelector {
             id: wordWrap
-                width: parent.width * 3 / 5
             text: i18n("Enable word wrap")
         }
-        }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.heigth
-                width: parent.width * 2 / 5
-            }
-            QtControls.CheckBox {
+        CheckBoxSelector {
             id: notify
-                width: parent.width * 3 / 5
             text: i18n("Enable notifications")
         }
-        }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.heigth
-                width: parent.width * 2 / 5
-            }
-            QtControls.CheckBox {
+        CheckBoxSelector {
             id: updates
-                width: parent.width * 3 / 5
             text: i18n("Check updates on startup")
         }
-        }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.heigth
-                width: parent.width * 2 / 5
-            }
-            QtControls.CheckBox {
+        CheckBoxSelector {
             id: optimize
-                width: parent.width * 3 / 5
             text: i18n("Optimize subscription")
         }
-        }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Widget height, px")
-            }
-            QtControls.SpinBox {
+        IntegerSelector {
             id: widgetHeight
-                width: parent.width * 3 / 5
-                minimumValue: 0
             maximumValue: 4096
+            minimumValue: 0
             stepSize: 50
+            text: i18n("Widget height, px")
             value: plasmoid.configuration.height
         }
-        }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Widget width, px")
-            }
-            QtControls.SpinBox {
+        IntegerSelector {
             id: widgetWidth
-                width: parent.width * 3 / 5
-                minimumValue: 0
             maximumValue: 4096
+            minimumValue: 0
             stepSize: 50
+            text: i18n("Widget width, px")
             value: plasmoid.configuration.width
         }
-        }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Time interval")
-            }
-            QtControls.SpinBox {
+        IntegerSelector {
             id: update
-                width: parent.width * 3 / 5
-                minimumValue: 1000
             maximumValue: 10000
+            minimumValue: 1000
             stepSize: 500
+            text: i18n("Time interval")
             value: plasmoid.configuration.interval
         }
-        }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Messages queue limit")
-            }
-            QtControls.SpinBox {
-                id: queueLimit
-                width: parent.width * 3 / 5
-                minimumValue: 0
-                maximumValue: 99
-                stepSize: 1
-                value: plasmoid.configuration.queueLimit
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Temperature units")
-            }
-            QtControls.ComboBox {
+        ComboBoxSelector {
             id: tempUnits
-                width: parent.width * 3 / 5
-                textRole: "label"
             model: [
                 {
-                        'label': i18n("Celsius"),
-                        'name': "Celsius"
+                    "label": i18n("Celsius"),
+                    "name": "Celsius"
                 },
                 {
-                        'label': i18n("Fahrenheit"),
-                        'name': "Fahrenheit"
+                    "label": i18n("Fahrenheit"),
+                    "name": "Fahrenheit"
                 },
                 {
-                        'label': i18n("Kelvin"),
-                        'name': "Kelvin"
+                    "label": i18n("Kelvin"),
+                    "name": "Kelvin"
                 },
                 {
-                        'label': i18n("Reaumur"),
-                        'name': "Reaumur"
+                    "label": i18n("Reaumur"),
+                    "name": "Reaumur"
                 },
                 {
-                        'label': i18n("cm^-1"),
-                        'name': "cm^-1"
+                    "label": i18n("cm^-1"),
+                    "name": "cm^-1"
                 },
                 {
-                        'label': i18n("kJ/mol"),
-                        'name': "kJ/mol"
+                    "label": i18n("kJ/mol"),
+                    "name": "kJ/mol"
                 },
                 {
-                        'label': i18n("kcal/mol"),
-                        'name': "kcal/mol"
+                    "label": i18n("kcal/mol"),
+                    "name": "kcal/mol"
                 }
             ]
-                onCurrentIndexChanged: cfg_tempUnits = model[currentIndex]["name"]
-                Component.onCompleted: {
-                    if (debug) console.debug()
-                    for (var i = 0; i < model.length; i++) {
-                        if (model[i]["name"] == plasmoid.configuration.tempUnits) {
-                            if (debug) console.info("Found", model[i]["name"], "on", i)
-                            tempUnits.currentIndex = i;
-                        }
-                    }
-                }
-            }
+            text: i18n("Temperature units")
+            value: plasmoid.configuration.tempUnits
+            onValueEdited: newValue => cfg_tempUnits = newValue
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Custom time format")
-            }
-            QtControls.TextField {
+        LineSelector {
             id: customTime
-                width: parent.width * 3 / 5
-                text: plasmoid.configuration.customTime
-            }
+            text: i18n("Custom time format")
+            value: plasmoid.configuration.customTime
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Custom uptime format")
-            }
-            QtControls.TextField {
+        LineSelector {
             id: customUptime
-                width: parent.width * 3 / 5
-                text: plasmoid.configuration.customUptime
-            }
+            text: i18n("Custom uptime format")
+            value: plasmoid.configuration.customUptime
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("AC online tag")
-            }
-            QtControls.TextField {
+        LineSelector {
             id: acOnline
-                width: parent.width * 3 / 5
-                text: plasmoid.configuration.acOnline
-            }
+            text: i18n("AC online tag")
+            value: plasmoid.configuration.acOnline
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("AC offline tag")
-            }
-            QtControls.TextField {
+        LineSelector {
             id: acOffline
-                width: parent.width * 3 / 5
-                text: plasmoid.configuration.acOffline
-            }
+            text: i18n("AC offline tag")
+            value: plasmoid.configuration.acOffline
         }
 
-        Row {
-            height: implicitHeight
+        GroupBox {
             width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-            }
-            QtControls.Button {
-                width: parent.width * 3 / 5
-                text: i18n("Drop key cache")
-                onClicked: awActions.dropCache()
-            }
-        }
-
-        Row {
             height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-            }
-            QtControls.Button {
-                width: parent.width * 3 / 5
-                text: i18n("Export configuration")
-                onClicked: saveConfigAs.open()
-            }
-
-            QtDialogs.FileDialog {
-                id: saveConfigAs
-                selectExisting: false
-                title: i18n("Export")
-                folder: awConfig.configurationDirectory()
-                onAccepted: {
-                    var status = awConfig.exportConfiguration(
-                        plasmoid.configuration,
-                        saveConfigAs.fileUrl.toString().replace("file://", ""))
-                    if (status) {
-                        messageDialog.title = i18n("Success")
-                        messageDialog.text = i18n("Please note that binary files were not copied")
-                    } else {
-                        messageDialog.title = i18n("Ooops...")
-                        messageDialog.text = i18n("Could not save configuration file")
-                    }
-                    messageDialog.open()
-                }
-            }
-
-            QtDialogs.MessageDialog {
-                id: messageDialog
-                standardButtons: QtDialogs.StandardButton.Ok
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-            }
-            QtControls.Button {
-                width: parent.width * 3 / 5
-                text: i18n("Import configuration")
-                onClicked: openConfig.open()
-            }
-
-            QtDialogs.FileDialog {
-                id: openConfig
-                title: i18n("Import")
-                folder: awConfig.configurationDirectory()
-                onAccepted: importSelection.open()
-            }
-
-            QtDialogs.Dialog {
-                id: importSelection
+            title: i18n("Actions")
 
             Column {
-                    QtControls.CheckBox {
-                        id: importPlasmoid
-                        text: i18n("Import plasmoid settings")
+                height: implicitHeight
+                width: parent.width
+
+                ButtonSelector {
+                    value: i18n("Drop key cache")
+                    onButtonActivated: awConfig.dropCache()
                 }
 
-                    QtControls.CheckBox {
-                        id: importExtensions
-                        text: i18n("Import extensions")
+                ButtonSelector {
+                    ExportDialog {
+                        id: saveConfigAs
+                        configuration: plasmoid.configuration
+                    }
+                    value: i18n("Export configuration")
+                    onButtonActivated: saveConfigAs.open()
                 }
 
-                    QtControls.CheckBox {
-                        id: importAdds
-                        text: i18n("Import additional files")
+                ButtonSelector {
+                    ImportDialog {
+                        id: loadConfigFrom
+                        onConfigurationReceived: {
+                            for (const key in configuration)
+                                plasmoid.configuration[key] = configuration[key]
                         }
                     }
-
-                onAccepted: {
-                    if (debug) console.debug()
-                    var importConfig = awConfig.importConfiguration(
-                        openConfig.fileUrl.toString().replace("file://", ""),
-                        importPlasmoid.checked, importExtensions.checked,
-                        importAdds.checked)
-                    for (var key in importConfig)
-                        plasmoid.configuration[key] = importConfig[key]
-                }
+                    value: i18n("Import configuration")
+                    onButtonActivated: loadConfigFrom.open()
                 }
             }
         }
 
+        GroupBox {
+            height: implicitHeight
+            width: parent.width
+            title: i18n("History")
 
-    Component.onCompleted: {
-        if (debug) console.debug()
+            Column {
+                height: implicitHeight
+                width: parent.width
+
+                IntegerSelector {
+                    id: historyCount
+                    maximumValue: 10000
+                    minimumValue: 0
+                    stepSize: 50
+                    text: i18n("History count")
+                    value: plasmoid.configuration.historyCount
+                }
+            }
+        }
     }
 }

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

@@ -15,229 +15,84 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Controls 1.3 as QtControls
-import QtQuick.Controls.Styles 1.3 as QtStyles
-import QtQuick.Dialogs 1.1 as QtDialogs
+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: 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: selectFont.text
+    property alias cfg_fontFamily: font.value
     property alias cfg_fontSize: fontSize.value
-    property string cfg_fontWeight: fontWeight.currentText
-    property string cfg_fontStyle: fontStyle.currentText
-    property alias cfg_fontColor: selectColor.text
-
+    property string cfg_fontWeight: fontWeight.value
+    property string cfg_fontStyle: fontStyle.value
+    property alias cfg_fontColor: selectColor.value
+    property alias cfg_textStyleColor: selectStyleColor.value
+    property string cfg_textStyle: textStyle.value
 
     Column {
-        id: pageColumn
         anchors.fill: parent
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width / 3
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
+
+        FontSelector {
+            id: font
             text: i18n("Font")
-            }
-            QtControls.Button {
-                id: selectFont
-                width: parent.width * 2 / 3
-                text: plasmoid.configuration.fontFamily
-                onClicked: {
-                    if (debug) console.debug()
-                    fontDialog.setFont()
-                    fontDialog.visible = true
-                }
-            }
+            value: plasmoid.configuration.fontFamily
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width / 3
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Font size")
-            }
-            QtControls.SpinBox {
+        IntegerSelector {
             id: fontSize
-                width: parent.width * 2 / 3
-                minimumValue: 8
             maximumValue: 32
+            minimumValue: 8
             stepSize: 1
+            text: i18n("Font size")
             value: plasmoid.configuration.fontSize
         }
-        }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width / 3
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Font weight")
-            }
-            QtControls.ComboBox {
+        ComboBoxSelector {
             id: fontWeight
-                width: parent.width * 2 / 3
-                textRole: "label"
-                model: [
-                    {
-                        'label': i18n("light"),
-                        'name': "light"
-                    },
-                    {
-                        'label': i18n("normal"),
-                        'name': "normal"
-                    },
-                    {
-                        'label': i18n("demi bold"),
-                        'name': "demibold"
-                    },
-                    {
-                        'label': i18n("bold"),
-                        'name': "bold"
-                    },
-                    {
-                        'label': i18n("black"),
-                        'name': "black"
-                    }
-                ]
-                onCurrentIndexChanged: cfg_fontWeight = model[currentIndex]["name"]
-                Component.onCompleted: {
-                    if (debug) console.debug()
-                    for (var i = 0; i < model.length; i++) {
-                        if (model[i]["name"] == plasmoid.configuration.fontWeight) {
-                            if (debug) console.info("Found", model[i]["name"], "on", i)
-                            fontWeight.currentIndex = i;
-                        }
-                    }
-                }
-            }
+            model: General.fontWeightModel
+            text: i18n("Font weight")
+            value: plasmoid.configuration.fontWeight
+            onValueEdited: newValue => cfg_fontWeight = newValue
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width / 3
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Font style")
-            }
-            QtControls.ComboBox {
+        ComboBoxSelector {
             id: fontStyle
-                width: parent.width * 2 / 3
-                textRole: "label"
-                model: [
-                    {
-                        'label': i18n("normal"),
-                        'name': "normal"
-                    },
-                    {
-                        'label': i18n("italic"),
-                        'name': "italic"
-                    }
-                ]
-                onCurrentIndexChanged: cfg_fontStyle = model[currentIndex]["name"]
-                Component.onCompleted: {
-                    if (debug) console.debug()
-                    for (var i = 0; i < model.length; i++) {
-                        if (model[i]["name"] == plasmoid.configuration.fontStyle) {
-                            if (debug) console.info("Found", model[i]["name"], "on", i)
-                            fontStyle.currentIndex = i;
-                        }
-                    }
-                }
-            }
+            model: General.fontStyleModel
+            text: i18n("Font style")
+            value: plasmoid.configuration.fontStyle
+            onValueEdited: newValue => cfg_fontStyle = newValue
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width / 3
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Font color")
-            }
-            QtControls.Button {
+        ColorSelector {
             id: selectColor
-                width: parent.width * 2 / 3
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.fontColor
-                    }
-                }
-                text: plasmoid.configuration.fontColor
-                onClicked: colorDialog.visible = true
-            }
-        }
+            text: i18n("Font color")
+            value: plasmoid.configuration.fontColor
         }
 
-    QtDialogs.ColorDialog {
-        id: colorDialog
-        title: i18n("Select a color")
-        color: selectColor.text
-        onAccepted: selectColor.text = colorDialog.color
+        ComboBoxSelector {
+            id: textStyle
+            model: General.textStyleModel
+            text: i18n("Style")
+            value: plasmoid.configuration.textStyle
+            onValueEdited: newValue => cfg_textStyle = newValue
         }
 
-    QtDialogs.FontDialog {
-        id: fontDialog
-        title: i18n("Select a font")
-        signal setFont
-
-        onAccepted: {
-            if (debug) console.debug()
-            selectFont.text = fontDialog.font.family
-            fontSize.value = fontDialog.font.pointSize
-            fontStyle.currentIndex = fontDialog.font.italic ? 1 : 0
-            fontWeight.currentIndex = weight[fontDialog.font.weight]
-        }
-        onSetFont: {
-            if (debug) console.debug()
-            fontDialog.font = Qt.font({
-                family: selectFont.text,
-                pointSize: fontSize.value > 0 ? fontSize.value : 12,
-                italic: fontStyle.currentIndex == 1,
-                weight: Font.Normal,
-            })
+        ColorSelector {
+            id: selectStyleColor
+            text: i18n("Style color")
+            value: plasmoid.configuration.textStyleColor
         }
     }
-
-
-    Component.onCompleted: {
-        if (debug) console.debug()
-    }
 }

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

@@ -0,0 +1,159 @@
+/***************************************************************************
+ *   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/  *
+ ***************************************************************************/
+
+import QtQuick 2.15
+import QtQuick.Controls
+import QtQuick.Dialogs
+import QtQuick.Layouts
+import org.kde.kcmutils as KCM
+
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget
+
+
+KCM.SimpleKCM {
+    id: bugPage
+
+    AWActions {
+        id: awActions
+    }
+    AWBugReporter {
+        id: awBugReporter
+    }
+
+    ColumnLayout {
+        anchors.fill: parent
+
+        TextField {
+            id: title
+            Layout.fillWidth: true
+            placeholderText: i18n("Report subject")
+        }
+
+        ColumnLayout {
+            Layout.fillWidth: true
+
+            GroupBox {
+                Layout.fillWidth: true
+                title: i18n("Description")
+
+                TextArea {
+                    id: description
+                    anchors.fill: parent
+                    textFormat: TextEdit.PlainText
+                }
+            }
+
+            GroupBox {
+                Layout.fillWidth: true
+                title: i18n("Steps to reproduce")
+
+                TextArea {
+                    id: reproduce
+                    anchors.fill: parent
+                    textFormat: TextEdit.PlainText
+                }
+            }
+
+            GroupBox {
+                Layout.fillWidth: true
+                title: i18n("Expected result")
+
+                TextArea {
+                    id: expected
+                    anchors.fill: parent
+                    textFormat: TextEdit.PlainText
+                }
+            }
+
+            GroupBox {
+                Layout.fillWidth: true
+                Layout.alignment: Qt.AlignBottom
+                title: i18n("Logs")
+
+                ColumnLayout {
+                    anchors.fill: parent
+                    Layout.fillWidth: true
+
+                    Row {
+                        Layout.fillWidth: true
+
+                        Label {
+                            width: parent.width * 2 / 5
+                            horizontalAlignment: Text.AlignJustify
+                            verticalAlignment: Text.AlignVCenter
+                            wrapMode: Text.WordWrap
+                            text: i18n("Use command")
+                        }
+
+                        TextField {
+                            width: parent.width * 3 / 5
+                            readOnly: true
+                            text: "QT_LOGGING_RULES=*=true plasmawindowed org.kde.plasma.awesomewidget"
+                        }
+                    }
+
+                    Button {
+                        Layout.fillWidth: true
+                        text: i18n("Load log file")
+                        onClicked: logPath.open()
+                    }
+
+                    TextArea {
+                        id: logBody
+                        Layout.fillWidth: true
+                        Layout.alignment: Qt.AlignBottom
+                        textFormat: TextEdit.PlainText
+                    }
+                }
+
+                FileDialog {
+                    id: logPath
+                    title: i18n("Open log file")
+                    onAccepted: logBody.text = awActions.getFileContent(logPath.selectedFile.toString().replace("file://", ""))
+                }
+            }
+
+            DialogButtonBox {
+                Layout.fillWidth: true
+
+                standardButtons: DialogButtonBox.Ok | DialogButtonBox.Reset
+                alignment: Qt.AlignRight
+                onAccepted: sendBugReport()
+                onReset: resetDialog()
+            }
+        }
+    }
+
+    function sendBugReport() {
+        const text = awBugReporter.generateText(description.text, reproduce.text, expected.text, logBody.text)
+        awBugReporter.sendBugReport(title.text, text)
+    }
+
+    function resetDialog() {
+        title.text = ""
+        description.text = ""
+        reproduce.text = ""
+        expected.text = ""
+        logBody.text = ""
+    }
+
+    Component.onCompleted: {
+        resetDialog()
+        awBugReporter.doConnect()
+    }
+}

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

@@ -15,319 +15,172 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Controls 1.3 as QtControls
-import QtQuick.Dialogs 1.1 as QtDialogs
+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 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")
-            Row {
-                height: implicitHeight
-                width: parent.width
-                QtControls.Label {
-                    height: parent.height
-                    width: parent.width * 2 / 5
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
+            LineSelector {
                 text: i18n("ACPI path")
-                }
-                QtControls.TextField {
-                    width: parent.width * 3 / 5
-                    text: cfg_dataengine["ACPIPATH"]
-                    onEditingFinished: cfg_dataengine["ACPIPATH"] = text
-                }
-            }
-        }
-
-        QtControls.GroupBox {
-            height: implicitHeight
-            width: parent.width
-            title: i18n("GPU")
-            Row {
-                height: implicitHeight
-                width: parent.width
-                QtControls.Label {
-                    height: parent.height
-                    width: parent.width * 2 / 5
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
-                    text: i18n("GPU device")
-                }
-                QtControls.ComboBox {
-                    id: gpuDev
-                    width: parent.width * 3 / 5
-                    model: ["auto", "disable", "ati", "nvidia"]
-                    Component.onCompleted: {
-                        if (debug) console.debug()
-                        for (var i=0; i<model.length; i++) {
-                            if (model[i] == cfg_dataengine["GPUDEV"]) {
-                                if (debug) console.info("Found", model[i], "on", i)
-                                currentIndex = i;
-                            }
-                        }
-                    }
-                }
+                value: cfg_dataengine["ACPIPATH"]
+                onValueEdited: newValue => cfg_dataengine["ACPIPATH"] = newValue
             }
         }
 
-        QtControls.GroupBox {
-            height: implicitHeight
-            width: parent.width
-            title: i18n("HDD temperature")
-            Column {
-                height: implicitHeight
-                width: parent.width
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("HDD")
-                    }
-                    QtControls.ComboBox {
-                        id: hdd
-                        width: parent.width * 3 / 5
-                    }
-                }
-
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("hddtemp cmd")
-                    }
-                    QtControls.TextField {
-                        width: parent.width * 3 / 5
-                        text: cfg_dataengine["HDDTEMPCMD"]
-                        onEditingFinished: cfg_dataengine["HDDTEMPCMD"] = text
-                    }
-                }
-            }
-        }
-
-        QtControls.GroupBox {
+        GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("Player")
+
             Column {
                 height: implicitHeight
                 width: parent.width
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Player data symbols")
-                    }
-                    QtControls.SpinBox {
-                        width: parent.width * 3 / 5
-                        minimumValue: 1
+                IntegerSelector {
                     maximumValue: 100
+                    minimumValue: 1
                     stepSize: 1
+                    text: i18n("Player data symbols")
                     value: cfg_dataengine["PLAYERSYMBOLS"]
-                        onEditingFinished: cfg_dataengine["PLAYERSYMBOLS"] = value
-                    }
+                    onValueEdited: newValue => cfg_dataengine["PLAYERSYMBOLS"] = newValue
                 }
 
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
+                ComboBoxSelector {
+                    model: [
+                        {
+                            "label": "disable",
+                            "name": "disable"
+                        },
+                        {
+                            "label": "mpris",
+                            "name": "mpris"
+                        },
+                        {
+                            "label": "mpd",
+                            "name": "mpd"
+                        }
+                    ]
                     text: i18n("Music player")
-                    }
-                    QtControls.ComboBox {
-                        id: player
-                        width: parent.width * 3 / 5
-                        model: ["disable", "mpris", "mpd"]
-                        Component.onCompleted: {
-                            if (debug) console.debug()
-                            for (var i=0; i<model.length; i++) {
-                                if (model[i] == cfg_dataengine["PLAYER"]) {
-                                    if (debug) console.info("Found", model[i], "on", i)
-                                    player.currentIndex = i;
-                                }
-                            }
-                        }
-                    }
+                    value: cfg_dataengine["PLAYER"]
+                    onValueEdited: newValue => cfg_dataengine["PLAYER"] = newValue
                 }
 
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("MPRIS player name")
-                    }
-                    QtControls.ComboBox {
+                ComboBoxSelector {
                     id: mpris
-                        width: parent.width * 3 / 5
                     editable: true
-                        model: ["auto", "amarok", "audacious", "clementine", "deadbeef",
-                                "vlc", "qmmp", "xmms2", cfg_dataengine["MPRIS"]]
+                    model: [
+                        {
+                            "label": "auto",
+                            "name": "auto"
+                        },
+                        {
+                            "label": "amarok",
+                            "name": "amarok"
+                        },
+                        {
+                            "label": "audacious",
+                            "name": "audacious"
+                        },
+                        {
+                            "label": "clementine",
+                            "name": "clementine"
+                        },
+                        {
+                            "label": "DeaDBeeF",
+                            "name": "DeaDBeeF"
+                        },
+                        {
+                            "label": "vlc",
+                            "name": "vlc"
+                        },
+                        {
+                            "label": "qmmp",
+                            "name": "qmmp"
+                        },
+                        {
+                            "label": "xmms2",
+                            "name": "xmms2"
+                        },
+                        {
+                            "label": cfg_dataengine["MPRIS"],
+                            "name": cfg_dataengine["MPRIS"]
+                        }
+                    ]
+                    text: i18n("MPRIS player name")
                     currentIndex: model.length - 1
                 }
-                }
 
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
+                LineSelector {
                     text: i18n("MPD address")
-                    }
-                    QtControls.TextField {
-                        width: parent.width * 3 / 5
-                        text: cfg_dataengine["MPDADDRESS"]
-                        onEditingFinished: cfg_dataengine["MPDADDRESS"] = text
-                    }
+                    value: cfg_dataengine["MPDADDRESS"]
+                    onValueEdited: newValue => cfg_dataengine["MPDADDRESS"] = newValue
                 }
 
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("MPD port")
-                    }
-                    QtControls.SpinBox {
-                        width: parent.width * 3 / 5
-                        minimumValue: 1000
+                IntegerSelector {
                     maximumValue: 65535
+                    minimumValue: 1000
                     stepSize: 1
+                    text: i18n("MPD port")
                     value: cfg_dataengine["MPDPORT"]
-                        onEditingFinished: cfg_dataengine["MPDPORT"] = value
-                    }
+                    onValueEdited: newValue => cfg_dataengine["MPDPORT"] = newValue
                 }
             }
         }
 
-        QtControls.GroupBox {
+        GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("Extensions")
+
             Column {
                 height: implicitHeight
                 width: parent.width
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Custom scripts")
-                    }
-                    QtControls.Button {
-                        width: parent.width * 3 / 5
-                        text: i18n("Edit scripts")
-                        onClicked: awKeys.editItem("extscript")
-                    }
+
+                ButtonSelector {
+                    value: i18n("Custom scripts")
+                    onButtonActivated: awKeys.editItem("extscript")
                 }
 
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Quotes monitor")
-                    }
-                    QtControls.Button {
-                        width: parent.width * 3 / 5
-                        text: i18n("Edit tickers")
-                        onClicked: awKeys.editItem("extquotes")
-                    }
+                ButtonSelector {
+                    value: i18n("Network requests")
+                    onButtonActivated: awKeys.editItem("extnetworkrequest")
                 }
 
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Package manager")
-                    }
-                    QtControls.Button {
-                        width: parent.width * 3 / 5
-                        text: i18n("Edit command")
-                        onClicked: awKeys.editItem("extupgrade")
-                    }
+                ButtonSelector {
+                    value: i18n("Package manager")
+                    onButtonActivated: awKeys.editItem("extupgrade")
                 }
 
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Weather")
-                    }
-                    QtControls.Button {
-                        width: parent.width * 3 / 5
-                        text: i18n("Edit weather")
-                        onClicked: awKeys.editItem("extweather")
+                ButtonSelector {
+                    value: i18n("Quotes monitor")
+                    onButtonActivated: awKeys.editItem("extquotes")
                 }
+
+                ButtonSelector {
+                    value: i18n("Weather")
+                    onButtonActivated: awKeys.editItem("extweather")
                 }
             }
         }
@@ -335,28 +188,12 @@ Item {
 
 
     Component.onCompleted: {
-        if (debug) console.debug()
-
         // init submodule
         awKeys.updateCache()
-
-        // update hdd model
-        hdd.model = awKeys.getHddDevices()
-        for (var i=0; i<hdd.model.length; i++) {
-            if (hdd.model[i] == cfg_dataengine["HDDDEV"]) {
-                if (debug) console.info("Found", hdd.model[i], "on", i)
-                hdd.currentIndex = i;
-            }
-        }
     }
 
     Component.onDestruction: {
-        if (debug) console.debug()
-
-        cfg_dataengine["GPUDEV"] = gpuDev.currentText
-        cfg_dataengine["HDDDEV"] = hdd.currentText
-        cfg_dataengine["PLAYER"] = player.currentText
-        cfg_dataengine["MPRIS"] = mpris.currentText
+        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.Controls 1.3 as QtControls
-import QtQuick.Dialogs 1.2 as QtDialogs
-import QtQuick.Layouts 1.1
+import QtQuick 2.15
+import QtQuick.Layouts
+import org.kde.plasma.core as PlasmaCore
 import org.kde.plasma.plasmoid 2.0
-import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
 
-import org.kde.plasma.private.awesomewidget 1.0
-import "."
+import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget
 
 
-Item {
+PlasmoidItem {
     id: main
+
     // backend
     AWKeys {
         id: awKeys
@@ -36,8 +34,10 @@ Item {
     AWActions {
         id: awActions
     }
+    AWTelemetryHandler {
+        id: awTelemetryHandler
+    }
 
-    property bool debug: awActions.isDebugEnabled()
     property variant tooltipSettings: {
         "tooltipNumber": plasmoid.configuration.tooltipNumber,
         "useTooltipBackground": plasmoid.configuration.useTooltipBackground,
@@ -67,36 +67,32 @@ Item {
     signal needToolTipUpdate(string newText)
     signal sizeUpdate
 
-
-    // init
-    Plasmoid.preferredRepresentation: Plasmoid.fullRepresentation
-    Plasmoid.compactRepresentation: Plasmoid.fullRepresentation
-
-    Layout.fillWidth: plasmoid.formFactor != PlasmaCore.Planar
-    Layout.fillHeight: plasmoid.formFactor != PlasmaCore.Planar
+    Layout.fillWidth: PlasmoidItem.formFactor !== PlasmaCore.Planar
+    Layout.fillHeight: PlasmoidItem.formFactor !== PlasmaCore.Planar
     Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
     Plasmoid.icon: "utilities-system-monitor"
     Plasmoid.backgroundHints: plasmoid.configuration.background ? "DefaultBackground" : "NoBackground"
-    Plasmoid.associatedApplication: "ksysguard"
-
 
     // ui
     Text {
         id: text
-        anchors.fill: Plasmoid.Layout
+        anchors.fill: parent
         renderType: Text.NativeRendering
         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]
+        styleColor: plasmoid.configuration.textStyleColor
 
         PlasmaCore.ToolTipArea {
             height: tooltip.height
@@ -110,37 +106,26 @@ Item {
         }
     }
 
-    QtDialogs.Dialog {
-        id: tagSelector
-        title: i18n("Select tag")
-
-        QtControls.ComboBox {
-            id: tagSelectorBox
-            width: parent.width
-            editable: 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)
-        }
+    Plasmoid.contextualActions: [
+        PlasmaCore.Action {
+            text: i18n("Run monitor")
+            icon.name: "utilities-system-monitor"
+            onTriggered: awActions.runCmd("plasma-systemmonitor", [])
+        },
+        PlasmaCore.Action {
+            text: i18n("Show README")
+            icon.name: "text-x-readme"
+            onTriggered: awActions.showReadme()
+        },
+        PlasmaCore.Action {
+            text: i18n("Check updates")
+            icon.name: "system-software-update"
+            onTriggered: awActions.checkUpdates(true)
         }
+    ]
 
 
     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")
         // init submodule
         Plasmoid.userConfiguringChanged(false)
         // connect data
@@ -150,32 +135,26 @@ Item {
         if (plasmoid.configuration.checkUpdates) return awActions.checkUpdates(false)
     }
 
-    onNeedTextUpdate: {
-        if (debug) console.debug()
-
+    onNeedTextUpdate: newText => {
         text.text = newText
         sizeUpdate()
     }
 
-    onNeedToolTipUpdate: {
-        if (debug) console.debug()
-
+    onNeedToolTipUpdate: newText => {
         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 {
@@ -186,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,
-                        plasmoid.configuration.queueLimit, plasmoid.configuration.optimize)
+        awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.interval, plasmoid.configuration.optimize)
         awKeys.setWrapNewLines(plasmoid.configuration.wrapNewLines)
         // configure aggregator
         awKeys.setAggregatorProperty("acOffline", plasmoid.configuration.acOffline)
@@ -200,25 +177,8 @@ Item {
         awKeys.setAggregatorProperty("customUptime", plasmoid.configuration.customUptime)
         awKeys.setAggregatorProperty("tempUnits", plasmoid.configuration.tempUnits)
         awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings)
-    }
-
-
-    function action_checkUpdates() {
-        if (debug) console.debug()
-
-        return awActions.checkUpdates(true)
-    }
-
-    function action_showReadme() {
-        if (debug) console.debug()
-
-        return awActions.showReadme()
-    }
-
-    function action_requestKey() {
-        if (debug) console.debug()
-
-        tagSelectorBox.model = awKeys.dictKeys(true)
-        return tagSelector.open()
+        // save telemetry
+        awTelemetryHandler.init(plasmoid.configuration.historyCount)
+        awTelemetryHandler.put("awwidgetconfig", plasmoid.configuration.text)
     }
 }

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

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

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

@@ -15,51 +15,39 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Controls 1.3 as QtControls
-import QtQuick.Controls.Styles 1.3 as QtStyles
-import QtQuick.Dialogs 1.1 as QtDialogs
+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 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
-    property alias cfg_tooltipBackground: tooltipBackground.text
+    property alias cfg_tooltipBackground: tooltipBackground.value
     property alias cfg_cpuTooltip: cpuTooltip.checked
-    property alias cfg_cpuTooltipColor: cpuTooltipColor.text
+    property alias cfg_cpuTooltipColor: cpuTooltipColor.value
     property alias cfg_cpuclTooltip: cpuclTooltip.checked
-    property alias cfg_cpuclTooltipColor: cpuclTooltipColor.text
+    property alias cfg_cpuclTooltipColor: cpuclTooltipColor.value
     property alias cfg_memTooltip: memTooltip.checked
-    property alias cfg_memTooltipColor: memTooltipColor.text
+    property alias cfg_memTooltipColor: memTooltipColor.value
     property alias cfg_swapTooltip: swapTooltip.checked
-    property alias cfg_swapTooltipColor: swapTooltipColor.text
-    property alias cfg_downkbTooltip: downkbTooltip.checked
-    property alias cfg_downkbTooltipColor: downkbTooltipColor.text
-    property alias cfg_upkbTooltipColor: upkbTooltipColor.text
+    property alias cfg_swapTooltipColor: swapTooltipColor.value
+    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.text
-    property alias cfg_batInTooltipColor: batInTooltipColor.text
-
+    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
@@ -67,354 +55,159 @@ Item {
           text: i18n("CPU, CPU clock, memory, swap and network labels support graphical tooltip. To enable them just make needed checkbox checked.")
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Number of values for tooltips")
-            }
-            QtControls.SpinBox {
+        IntegerSelector {
             id: tooltipNumber
-                width: parent.width * 3 / 5
-                minimumValue: 50
             maximumValue: 1000
+            minimumValue: 50
             stepSize: 25
+            text: i18n("Number of values for tooltips")
             value: plasmoid.configuration.tooltipNumber
         }
-        }
 
-        QtControls.GroupBox {
+        GroupBox {
             id: useTooltipBackground
-            height: implicitHeight
             width: parent.width
-            checkable: true
-            title: i18n("Background")
-            Row {
-                height: implicitHeight
-                width: parent.width
-                QtControls.Label {
-                    height: parent.height
-                    width: parent.width * 2 / 5
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
-                    text: i18n("Background color")
+
+            property alias checked: useTooltipBackgroundLabel.checked
+            label: CheckBox {
+                id: useTooltipBackgroundLabel
+                text: i18n("Background")
             }
-                QtControls.Button {
+
+            ColorSelector {
                 id: tooltipBackground
-                    width: parent.width * 3 / 5
-                    style: QtStyles.ButtonStyle {
-                        background: Rectangle {
-                            color: plasmoid.configuration.tooltipBackground
-                        }
-                    }
-                    text: plasmoid.configuration.tooltipBackground
-                    onClicked: tooltipBackgroundDialog.visible = true
-                }
-
-                QtDialogs.ColorDialog {
-                    id: tooltipBackgroundDialog
-                    title: i18n("Select a color")
-                    color: tooltipBackground.text
-                    onAccepted: tooltipBackground.text = tooltipBackgroundDialog.color
-                }
+                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")
-            Row {
-                height: implicitHeight
-                width: parent.width
-                QtControls.Label {
-                    height: parent.height
-                    width: parent.width * 2 / 5
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
-                    text: i18n("CPU color")
+
+            property alias checked: cpuTooltipLabel.checked
+            label: CheckBox {
+                id: cpuTooltipLabel
+                text: i18n("CPU")
             }
-                QtControls.Button {
+
+            ColorSelector {
                 id: cpuTooltipColor
-                    width: parent.width * 3 / 5
-                    style: QtStyles.ButtonStyle {
-                        background: Rectangle {
-                            color: plasmoid.configuration.cpuTooltipColor
-                        }
-                    }
-                    text: plasmoid.configuration.cpuTooltipColor
-                    onClicked: cpuTooltipColorDialog.visible = true
-                }
-
-                QtDialogs.ColorDialog {
-                    id: cpuTooltipColorDialog
-                    title: i18n("Select a color")
-                    color: cpuTooltipColor.text
-                    onAccepted: cpuTooltipColor.text = cpuTooltipColorDialog.color
-                }
+                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")
-            Row {
-                height: implicitHeight
-                width: parent.width
-                QtControls.Label {
-                    height: parent.height
-                    width: parent.width * 2 / 5
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
-                    text: i18n("CPU clock color")
+
+            property alias checked: cpuclTooltipLabel.checked
+            label: CheckBox {
+                id: cpuclTooltipLabel
+                text: i18n("CPU clock")
             }
-                QtControls.Button {
+
+            ColorSelector {
                 id: cpuclTooltipColor
-                    width: parent.width * 3 / 5
-                    style: QtStyles.ButtonStyle {
-                        background: Rectangle {
-                            color: plasmoid.configuration.cpuclTooltipColor
-                        }
-                    }
-                    text: plasmoid.configuration.cpuclTooltipColor
-                    onClicked: cpuclTooltipColorDialog.visible = true
-                }
-
-                QtDialogs.ColorDialog {
-                    id: cpuclTooltipColorDialog
-                    title: i18n("Select a color")
-                    color: cpuclTooltipColor.text
-                    onAccepted: cpuclTooltipColor.text = cpuclTooltipColorDialog.color
-                }
+                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")
-            Row {
-                height: implicitHeight
-                width: parent.width
-                QtControls.Label {
-                    height: parent.height
-                    width: parent.width * 2 / 5
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
-                    text: i18n("Memory color")
+
+            property alias checked: memTooltipLabel.checked
+            label: CheckBox {
+                id: memTooltipLabel
+                text: i18n("Memory")
             }
-                QtControls.Button {
+
+            ColorSelector {
                 id: memTooltipColor
-                    width: parent.width * 3 / 5
-                    style: QtStyles.ButtonStyle {
-                        background: Rectangle {
-                            color: plasmoid.configuration.memTooltipColor
-                        }
-                    }
-                    text: plasmoid.configuration.memTooltipColor
-                    onClicked: memTooltipColorDialog.visible = true
-                }
-
-                QtDialogs.ColorDialog {
-                    id: memTooltipColorDialog
-                    title: i18n("Select a color")
-                    color: memTooltipColor.text
-                    onAccepted: memTooltipColor.text = memTooltipColorDialog.color
-                }
+                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")
-            Row {
-                height: implicitHeight
-                width: parent.width
-                QtControls.Label {
-                    height: parent.height
-                    width: parent.width * 2 / 5
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
-                    text: i18n("Swap color")
+
+            property alias checked: swapTooltipLabel.checked
+            label: CheckBox {
+                id: swapTooltipLabel
+                text: i18n("Swap")
             }
-                QtControls.Button {
+
+            ColorSelector {
                 id: swapTooltipColor
-                    width: parent.width * 3 / 5
-                    style: QtStyles.ButtonStyle {
-                        background: Rectangle {
-                            color: plasmoid.configuration.swapTooltipColor
-                        }
-                    }
-                    text: plasmoid.configuration.swapTooltipColor
-                    onClicked: swapTooltipColorDialog.visible = true
-                }
-
-                QtDialogs.ColorDialog {
-                    id: swapTooltipColorDialog
-                    title: i18n("Select a color")
-                    color: swapTooltipColor.text
-                    onAccepted: swapTooltipColor.text = swapTooltipColorDialog.color
-                }
+                enabled: swapTooltipLabel.checked
+                text: i18n("Swap color")
+                value: plasmoid.configuration.swapTooltipColor
             }
         }
 
-        QtControls.GroupBox {
-            id: downkbTooltip
-            height: implicitHeight
+        GroupBox {
+            id: networkTooltip
             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
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Download speed color")
-                    }
-                    QtControls.Button {
+                enabled: networkTooltipLabel.checked
+
+                ColorSelector {
                     id: downkbTooltipColor
-                        width: parent.width * 3 / 5
-                        style: QtStyles.ButtonStyle {
-                            background: Rectangle {
-                                color: plasmoid.configuration.downkbTooltipColor
-                            }
-                        }
-                        text: plasmoid.configuration.downkbTooltipColor
-                        onClicked: downkbTooltipColorDialog.visible = true
+                    text: i18n("Download speed color")
+                    value: plasmoid.configuration.downkbTooltipColor
                 }
 
-                    QtDialogs.ColorDialog {
-                        id: downkbTooltipColorDialog
-                        title: i18n("Select a color")
-                        color: downkbTooltipColor.text
-                        onAccepted: downkbTooltipColor.text = downkbTooltipColorDialog.color
-                    }
-                }
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Upload speed color")
-                    }
-                    QtControls.Button {
+                ColorSelector {
                     id: upkbTooltipColor
-                        width: parent.width * 3 / 5
-                        style: QtStyles.ButtonStyle {
-                            background: Rectangle {
-                                color: plasmoid.configuration.upkbTooltipColor
-                            }
-                        }
-                        text: plasmoid.configuration.upkbTooltipColor
-                        onClicked: upkbTooltipColorDialog.visible = true
-                    }
-
-                    QtDialogs.ColorDialog {
-                        id: upkbTooltipColorDialog
-                        title: i18n("Select a color")
-                        color: upkbTooltipColor.text
-                        onAccepted: upkbTooltipColor.text = upkbTooltipColorDialog.color
-                    }
+                    text: i18n("Upload speed color")
+                    value: plasmoid.configuration.upkbTooltipColor
                 }
             }
         }
 
-        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
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Battery active color")
-                    }
-                    QtControls.Button {
+                enabled: batteryTooltipLabel.checked
+
+                ColorSelector {
                     id: batTooltipColor
-                        width: parent.width * 3 / 5
-                        style: QtStyles.ButtonStyle {
-                            background: Rectangle {
-                                color: plasmoid.configuration.batTooltipColor
-                            }
-                        }
-                        text: plasmoid.configuration.batTooltipColor
-                        onClicked: batTooltipColorDialog.visible = true
+                    text: i18n("Battery active color")
+                    value: plasmoid.configuration.batTooltipColor
                 }
 
-                    QtDialogs.ColorDialog {
-                        id: batTooltipColorDialog
-                        title: i18n("Select a color")
-                        color: batTooltipColor.text
-                        onAccepted: batTooltipColor.text = batTooltipColorDialog.color
-                    }
-                }
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Battery inactive color")
-                    }
-                    QtControls.Button {
+                ColorSelector {
                     id: batInTooltipColor
-                        width: parent.width * 3 / 5
-                        style: QtStyles.ButtonStyle {
-                            background: Rectangle {
-                                color: plasmoid.configuration.batInTooltipColor
-                            }
-                        }
-                        text: plasmoid.configuration.batInTooltipColor
-                        onClicked: batInTooltipColorDialog.visible = true
-                    }
-
-                    QtDialogs.ColorDialog {
-                        id: batInTooltipColorDialog
-                        title: i18n("Select a color")
-                        color: batInTooltipColor.text
-                        onAccepted: batInTooltipColor.text = batInTooltipColorDialog.color
+                    text: i18n("Battery inactive color")
+                    value: plasmoid.configuration.batInTooltipColor
                 }
             }
         }
     }
 }
-
-
-    Component.onCompleted: {
-        if (debug) console.debug()
-    }
-}

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

@@ -15,15 +15,17 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Controls 1.3 as QtControls
-import QtQuick.Dialogs 1.2 as QtDialogs
+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 org.kde.plasma.private.awesomewidget
 
 
-Item {
+KCM.SimpleKCM {
     id: widgetPage
+
     // backend
     AWKeys {
         id: awKeys
@@ -32,328 +34,41 @@ 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
-        QtControls.Label {
-          width: parent.width
-          horizontalAlignment: Text.AlignHCenter
-          verticalAlignment: Text.AlignVCenter
-          wrapMode: Text.WordWrap
-          text: i18n("Detailed information may be found on <a href=\"https://arcanis.me/projects/awesome-widgets/\">project homepage</a>")
-          onLinkActivated: Qt.openUrlExternally(link);
+
+        AWInfoLabel {}
+
+        HtmlDefaultFunctionsBar {
+            textArea: textPattern
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Button {
-                width: parent.width * 3 / 15
-                text: i18n("Bgcolor")
-
-                onClicked: backgroundDialog.visible = true
-
-                QtDialogs.ColorDialog {
-                    id: backgroundDialog
-                    title: i18n("Select a color")
-                    onAccepted: {
-                        var text = textPattern.text
-                        textPattern.text = "<body bgcolor=\"" +
-                                           backgroundDialog.color + "\">" +
-                                           text + "</body>"
-                    }
-                }
-            }
-            QtControls.Button {
-                width: parent.width * 3 / 15
-                text: i18n("Font")
-                iconName: "font"
-
-                onClicked: {
-                    if (debug) console.debug("Font button")
-                    var defaultFont = {
-                        "color": plasmoid.configuration.fontColor,
-                        "family": plasmoid.configuration.fontFamily,
-                        "size": plasmoid.configuration.fontSize
-                    }
-                    var font = awActions.getFont(defaultFont)
-                    if (font.applied != 1) {
-                        if (debug) console.debug("No font selected")
-                        return
+        AWTagSelector {
+            backend: awKeys
+            notifyBackend: awActions
+            textArea: textPattern
+            groups: General.awTagRegexp
         }
 
-                    var selected = textPattern.selectedText
-                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(textPattern.cursorPosition,
-                        "<span style=\"color:" + font.color +
-                        "; font-family:'" + font.family +
-                        "'; font-size:" + font.size + "pt;\">" +
-                        selected + "</span>")
-                }
-            }
-            QtControls.Button {
-                width: parent.width / 15
-                iconName: "format-indent-more"
-
-                onClicked: {
-                    if (debug) console.debug("Indent button")
-                    var selected = textPattern.selectedText
-                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(textPattern.cursorPosition, selected + "<br>\n")
-                }
+        AWExtensions {
+            id: extensions
+            backend: awKeys
+            textArea: textPattern
+            onUnlock: lock = false
         }
 
-            QtControls.Button {
-                width: parent.width / 15
-                iconName: "format-text-bold"
-
-                onClicked: {
-                    if (debug) console.debug("Bold button")
-                    var selected = textPattern.selectedText
-                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(textPattern.cursorPosition, "<b>" + selected + "</b>")
-                }
-            }
-            QtControls.Button {
-                width: parent.width / 15
-                iconName: "format-text-italic"
-
-                onClicked: {
-                    if (debug) console.debug("Italic button")
-                    var selected = textPattern.selectedText
-                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(textPattern.cursorPosition, "<i>" + selected + "</i>")
-                }
-            }
-            QtControls.Button {
-                width: parent.width / 15
-                iconName: "format-text-underline"
-
-                onClicked: {
-                    if (debug) console.debug("Underline button")
-                    var selected = textPattern.selectedText
-                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(textPattern.cursorPosition, "<u>" + selected + "</u>")
-                }
-            }
-            QtControls.Button {
-                width: parent.width / 15
-                iconName: "format-text-strikethrough"
-
-                onClicked: {
-                    if (debug) console.debug("Strike button")
-                    var selected = textPattern.selectedText
-                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(textPattern.cursorPosition, "<s>" + selected + "</s>")
-                }
-            }
-
-            QtControls.Button {
-                width: parent.width / 15
-                iconName: "format-justify-left"
-
-                onClicked: {
-                    if (debug) console.debug("Left button")
-                    var selected = textPattern.selectedText
-                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(textPattern.cursorPosition, "<p align=\"left\">" + selected + "</p>")
-                }
-            }
-            QtControls.Button {
-                width: parent.width / 15
-                iconName: "format-justify-center"
-
-                onClicked: {
-                    if (debug) console.debug("Center button")
-                    var selected = textPattern.selectedText
-                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(textPattern.cursorPosition, "<p align=\"center\">" + selected + "</p>")
-                }
-            }
-            QtControls.Button {
-                width: parent.width / 15
-                iconName: "format-justify-right"
-
-                onClicked: {
-                    if (debug) console.debug("Right button")
-                    var selected = textPattern.selectedText
-                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(textPattern.cursorPosition, "<p align=\"right\">" + selected + "</p>")
-                }
-            }
-            QtControls.Button {
-                width: parent.width / 15
-                iconName: "format-justify-fill"
-
-                onClicked: {
-                    if (debug) console.debug("Justify button")
-                    var selected = textPattern.selectedText
-                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(textPattern.cursorPosition, "<p align=\"justify\">" + selected + "</p>")
-                }
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.ComboBox {
-                width: parent.width * 2 / 5
-                textRole: "label"
-                model: [
-                    {
-                        'label': i18n("AC"),
-                        'regexp': "^(ac|bat).*"
-                    },
-                    {
-                        'label': i18n("Bars"),
-                        'regexp': "^bar.*"
-                    },
-                    {
-                        'label': i18n("CPU"),
-                        'regexp': "^(cpu|gpu|la|ps|temp(?!erature)).*"
-                    },
-                    {
-                        'label': i18n("Desktops"),
-                        'regexp': "^(n|t)?desktop(s)?"
-                    },
-                    {
-                        'label': i18n("HDD"),
-                        'regexp': "^hdd.*"
-                    },
-                    {
-                        'label': i18n("Memory"),
-                        'regexp': "^(mem|swap).*"
-                    },
-                    {
-                        'label': i18n("Network"),
-                        'regexp': "^(netdev|(down|up(?!time)).*)"
-                    },
-                    {
-                        'label': i18n("Music player"),
-                        'regexp': "(^|d|s)(album|artist|duration|progress|title)"
-                    },
-                    {
-                        'label': i18n("Scripts"),
-                        'regexp': "^custom.*"
-                    },
-                    {
-                        'label': i18n("Time"),
-                        'regexp': ".*time$"
-                    },
-                    {
-                        'label': i18n("Quotes"),
-                        'regexp': "^(perc)?(ask|bid|price)(chg)?.*"
-                    },
-                    {
-                        'label': i18n("Upgrades"),
-                        'regexp': "^pkgcount.*"
-                    },
-                    {
-                        'label': i18n("Weathers"),
-                        'regexp': "^(weather(Id)?|humidity|pressure|temperature|timestamp)"
-                    },
-                    {
-                        'label': i18n("Functions"),
-                        'regexp': "functions"
-                    }
-                ]
-                onCurrentIndexChanged: {
-                    if (debug) console.debug()
-                    if (model[currentIndex]["regexp"] == "functions")
-                        tags.model = ["{{\n\n}}", "template{{\n\n}}",
-                            "aw_all<>{{}}", "aw_count<>{{}}", "aw_keys<>{{}}",
-                            "aw_names<>{{}}"]
-                    else
-                        tags.model = awKeys.dictKeys(true, model[currentIndex]["regexp"])
-                    if (debug) console.info("Init model", tags.model, "for", model[currentIndex]["label"])
-                    tags.currentIndex = -1
-                }
-            }
-            QtControls.ComboBox {
-                id: tags
-                width: parent.width * 1 / 5
-            }
-            QtControls.Button {
-                width: parent.width * 1 / 5
-                text: i18n("Add")
-
-                onClicked: {
-                    if (!tags.currentText) return
-                    if (debug) console.debug("Add tag button")
-                    var selected = textPattern.selectedText
-                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(textPattern.cursorPosition, selected + "$" + tags.currentText)
-                }
-            }
-            QtControls.Button {
-                width: parent.width * 1 / 5
-                text: i18n("Show value")
-
-                onClicked: {
-                    if (!tags.currentText) return
-                    if (debug) console.debug("Show tag button")
-                    var message = i18n("Tag: %1", tags.currentText)
-                    message += "<br>"
-                    message += i18n("Value: %1", awKeys.valueByKey(tags.currentText))
-                    message += "<br>"
-                    message += i18n("Info: %1", awKeys.infoByKey(tags.currentText))
-                    awActions.sendNotification("tag", message)
-                }
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Button {
-                width: parent.width * 3 / 5
-                text: i18n("Edit bars")
-                onClicked: awKeys.editItem("graphicalitem")
-            }
-            QtControls.Button {
-                width: parent.width * 2 / 5
-                text: i18n("Preview")
-                onClicked: {
-                    lock = false
-                    awKeys.initKeys(textPattern.text, plasmoid.configuration.interval,
-                                    plasmoid.configuration.queueLimit, false)
-                }
-            }
-        }
-
-        QtControls.TextArea {
+        AWTextEditor {
             id: textPattern
-            width: parent.width
-            height: parent.height * 4 / 5
-            textFormat: TextEdit.PlainText
-            text: plasmoid.configuration.text
+            backend: awKeys
         }
     }
 
-    QtDialogs.MessageDialog {
-        id: compiledText
-        modality: Qt.NonModal
-        title: i18n("Preview")
-    }
-
-
     Component.onCompleted: {
-        if (debug) console.debug()
-
         awKeys.needTextToBeUpdated.connect(needTextUpdate)
         // init submodule
         awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.interval,
@@ -366,12 +81,10 @@ Item {
         awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings)
     }
 
-    onNeedTextUpdate: {
+    onNeedTextUpdate: newText => {
         if (lock) return
-        if (debug) console.debug()
 
-        compiledText.text = newText.replace(/&nbsp;/g, " ")
-        compiledText.open()
-        lock = true;
+        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.1.2
-X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
-X-KDE-PluginInfo-Category=System Information
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=GPLv3
-X-KDE-PluginInfo-EnabledByDefault=true

sources/awesome-widget/package/metadata.json

@@ -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.0",
+        "Website": "https://arcanis.me/projects/awesome-widgets/"
+    },
+    "X-Plasma-API-Minimum-Version": "6.0"
+}

sources/awesome-widget/plugin/CMakeLists.txt

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

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AWAbstractPairConfig</class>
+ <widget class="QDialog" name="AWAbstractPairConfig">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>384</width>
+        <height>249</height>
+       </rect>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>AWAbstractPairConfig</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>AWAbstractPairConfig</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

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

@@ -0,0 +1,75 @@
+/***************************************************************************
+ *   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 "awabstractselector.h"
+#include "ui_awabstractselector.h"
+
+#include "awdebug.h"
+
+
+AWAbstractSelector::AWAbstractSelector(QWidget *_parent, const QPair<bool, bool> &_editable)
+    : QWidget(_parent)
+    , ui(new Ui::AWAbstractSelector)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    ui->setupUi(this);
+    ui->comboBox_key->setEditable(_editable.first);
+    ui->comboBox_value->setEditable(_editable.second);
+
+    connect(ui->comboBox_key, &QComboBox::currentIndexChanged, this, &AWAbstractSelector::selectionChanged);
+    connect(ui->comboBox_value, &QComboBox::currentIndexChanged, this, &AWAbstractSelector::selectionChanged);
+}
+
+
+AWAbstractSelector::~AWAbstractSelector()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    delete ui;
+}
+
+
+QPair<QString, QString> AWAbstractSelector::current() const
+{
+    auto key = ui->comboBox_key->currentText();
+    auto value = ui->comboBox_value->currentText();
+
+    return {key, value};
+}
+
+
+void AWAbstractSelector::init(const QStringList &_keys, const QStringList &_values,
+                              const QPair<QString, QString> &_current)
+{
+    if ((!_keys.contains(_current.first)) || (!_values.contains(_current.second))) {
+        qCWarning(LOG_AW) << "Invalid current value" << _current << "not found in default ones";
+        return;
+    }
+    qCDebug(LOG_AW) << "Init selector with keys" << _keys << "and values" << _values << "and current ones are"
+                    << _current;
+
+    // set data
+    ui->comboBox_key->clear();
+    ui->comboBox_key->addItems(_keys);
+    ui->comboBox_value->clear();
+    ui->comboBox_value->addItems(_values);
+
+    // set current values
+    ui->comboBox_key->setCurrentText(_current.first);
+    ui->comboBox_value->setCurrentText(_current.second);
+}

sources/awesome-widget/plugin/awabstractselector.h

@@ -0,0 +1,43 @@
+/***************************************************************************
+ *   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 <QWidget>
+
+
+namespace Ui
+{
+class AWAbstractSelector;
+}
+
+class AWAbstractSelector : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit AWAbstractSelector(QWidget *_parent = nullptr, const QPair<bool, bool> &_editable = {false, false});
+    ~AWAbstractSelector() override;
+    [[nodiscard]] QPair<QString, QString> current() const;
+    void init(const QStringList &_keys, const QStringList &_values, const QPair<QString, QString> &_current);
+
+signals:
+    void selectionChanged();
+
+private:
+    Ui::AWAbstractSelector *ui = nullptr;
+};

sources/awesome-widget/plugin/awabstractselector.ui

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AWAbstractSelector</class>
+ <widget class="QWidget" name="AWAbstractSelector">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>25</height>
+   </rect>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QComboBox" name="comboBox_key"/>
+   </item>
+   <item>
+    <widget class="QComboBox" name="comboBox_value"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

sources/awesome-widget/plugin/awactions.cpp

@@ -21,6 +21,7 @@
 #include <KNotifications/KNotification>
 
 #include <QDesktopServices>
+#include <QFile>
 #include <QProcess>
 #include <QUrl>
 
@@ -30,8 +31,8 @@
 #include "awupdatehelper.h"
 
 
-AWActions::AWActions(QObject *parent)
-    : QObject(parent)
+AWActions::AWActions(QObject *_parent)
+    : QObject(_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
@@ -39,143 +40,81 @@ AWActions::AWActions(QObject *parent)
 }
 
 
-AWActions::~AWActions()
+void AWActions::checkUpdates(const bool _showAnyway)
 {
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    delete m_updateHelper;
-}
-
-
-void AWActions::checkUpdates(const bool showAnyway)
-{
-    qCDebug(LOG_AW) << "Show anyway" << showAnyway;
+    qCDebug(LOG_AW) << "Show anyway" << _showAnyway;
 
     if (!m_updateHelper->checkVersion())
-        m_updateHelper->checkUpdates(showAnyway);
+        m_updateHelper->checkUpdates(_showAnyway);
 }
 
 
-// HACK: since QML could not use QLoggingCategory I need this hack
-bool AWActions::isDebugEnabled() const
+QString AWActions::getFileContent(const QString &_path)
 {
-    return LOG_AW().isDebugEnabled();
+    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" << inputFile.fileName();
+        return "";
+    }
+
+    auto output = inputFile.readAll();
+    inputFile.close();
+    return output;
 }
 
 
-bool AWActions::runCmd(const QString cmd) const
+bool AWActions::runCmd(const QString &_cmd, const QStringList &_args)
 {
-    qCDebug(LOG_AW) << "Cmd" << cmd;
+    qCDebug(LOG_AW) << "Cmd" << _cmd << "args" << _args;
 
-    sendNotification(QString("Info"), i18n("Run %1", cmd));
+    sendNotification("system", i18n("Run %1", _cmd));
 
-    return QProcess::startDetached(cmd);
+    return QProcess::startDetached(_cmd, _args);
 }
 
 
 // HACK: this method uses variable from version.h
-void AWActions::showReadme() const
+void AWActions::showReadme()
 {
     QDesktopServices::openUrl(QUrl(HOMEPAGE));
 }
 
 
 // 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;
+    qCDebug(LOG_AW) << "Type" << _type;
 
-    QString text;
-    if (type == QString("header")) {
-        text = QString(NAME);
-    } else if (type == QString("version")) {
-        text = i18n("Version %1 (build date %2)", QString(VERSION),
-                    QString(BUILD_DATE));
-        if (!QString(COMMIT_SHA).isEmpty())
-            text += QString(" (%1)").arg(QString(COMMIT_SHA));
-    } else if (type == QString("description")) {
-        text = i18n("A set of minimalistic plasmoid widgets");
-    } else if (type == QString("links")) {
-        text = i18n("Links:") + QString("<br>")
-               + QString("<a href=\"%1\">%2</a><br>")
-                     .arg(QString(HOMEPAGE))
-                     .arg(i18n("Homepage"))
-               + QString("<a href=\"%1\">%2</a><br>")
-                     .arg(QString(REPOSITORY))
-                     .arg(i18n("Repository"))
-               + QString("<a href=\"%1\">%2</a><br>")
-                     .arg(QString(BUGTRACKER))
-                     .arg(i18n("Bugtracker"))
-               + QString("<a href=\"%1\">%2</a><br>")
-                     .arg(QString(TRANSLATION))
-                     .arg(i18n("Translation issue"))
-               + QString("<a href=\"%1\">%2</a><br>")
-                     .arg(QString(AUR_PACKAGES))
-                     .arg(i18n("AUR packages"))
-               + QString("<a href=\"%1\">%2</a>")
-                     .arg(QString(OPENSUSE_PACKAGES))
-                     .arg(i18n("openSUSE packages"));
-    } else if (type == QString("copy")) {
-        text = QString("<small>&copy; %1 <a href=\"mailto:%2\">%3</a><br>")
-                   .arg(QString(DATE))
-                   .arg(QString(EMAIL))
-                   .arg(QString(AUTHOR))
-               + i18n("This software is licensed under %1", QString(LICENSE))
-               + QString("</small>");
-    } else if (type == QString("translators")) {
-        text = i18n("Translators: %1", QString(TRANSLATORS));
-    } else if (type == QString("3rdparty")) {
-        QStringList trdPartyList
-            = QString(TRDPARTY_LICENSE)
-                  .split(QChar(';'), QString::SkipEmptyParts);
-        for (int i = 0; i < trdPartyList.count(); i++)
-            trdPartyList[i] = QString("<a href=\"%3\">%1</a> (%2 license)")
-                                  .arg(trdPartyList.at(i).split(QChar(','))[0])
-                                  .arg(trdPartyList.at(i).split(QChar(','))[1])
-                                  .arg(trdPartyList.at(i).split(QChar(','))[2]);
-        text = i18n("This software uses: %1", trdPartyList.join(QString(", ")));
-    } else if (type == QString("thanks")) {
-        QStringList thanks = QString(SPECIAL_THANKS)
-                                 .split(QChar(';'), QString::SkipEmptyParts);
-        for (int i = 0; i < thanks.count(); i++)
-            thanks[i] = QString("<a href=\"%2\">%1</a>")
-                            .arg(thanks.at(i).split(QChar(','))[0])
-                            .arg(thanks.at(i).split(QChar(','))[1]);
-        text = i18n("Special thanks to %1", thanks.join(QString(", ")));
-    }
-
-    return text;
+    return AWDebug::getAboutText(_type);
 }
 
 
-QVariantMap AWActions::getFont(const QVariantMap defaultFont) const
+QVariantMap AWActions::getFont(const QVariantMap &_defaultFont)
 {
-    qCDebug(LOG_AW) << "Default font is" << defaultFont;
+    qCDebug(LOG_AW) << "Default font is" << _defaultFont;
 
     QVariantMap fontMap;
-    int ret = 0;
-    CFont defaultCFont = CFont(defaultFont[QString("family")].toString(),
-                               defaultFont[QString("size")].toInt(), 400, false,
-                               defaultFont[QString("color")].toString());
-    CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false,
-                                      false, &ret);
+    auto ret = 0;
+    auto defaultCFont = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(), 400, false,
+                              _defaultFont["color"].toString());
+    auto font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, false, &ret);
 
-    fontMap[QString("applied")] = ret;
-    fontMap[QString("color")] = font.color().name();
-    fontMap[QString("family")] = font.family();
-    fontMap[QString("size")] = font.pointSize();
+    fontMap["applied"] = ret;
+    fontMap["color"] = font.color().name();
+    fontMap["family"] = font.family();
+    fontMap["size"] = font.pointSize();
 
     return fontMap;
 }
 
 
 // to avoid additional object definition this method is static
-void AWActions::sendNotification(const QString eventId, const QString message)
+void AWActions::sendNotification(const QString &_eventId, const QString &_message)
 {
-    qCDebug(LOG_AW) << "Event" << eventId << "with message" << message;
+    qCDebug(LOG_AW) << "Event" << _eventId << "with message" << _message;
 
-    KNotification *notification = KNotification::event(
-        eventId, QString("Awesome Widget ::: %1").arg(eventId), message);
-    notification->setComponentName(
-        QString("plasma-applet-org.kde.plasma.awesome-widget"));
+    auto event = KNotification::event(_eventId, QString("Awesome Widget ::: %1").arg(_eventId), _message);
+    event->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
 }

sources/awesome-widget/plugin/awactions.h

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

sources/awesome-widget/plugin/awbugreporter.cpp

@@ -0,0 +1,139 @@
+/***************************************************************************
+ *   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 "awbugreporter.h"
+
+#include <KI18n/KLocalizedString>
+#include <KNotifications/KNotification>
+
+#include <QDesktopServices>
+#include <QJsonDocument>
+#include <QMessageBox>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+
+#include "awdebug.h"
+
+
+AWBugReporter::AWBugReporter(QObject *_parent)
+    : QObject(_parent)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    m_manager = new QNetworkAccessManager(nullptr);
+    connect(m_manager, &QNetworkAccessManager::finished, this, &AWBugReporter::issueReplyReceived);
+}
+
+
+AWBugReporter::~AWBugReporter()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    m_manager->deleteLater();
+}
+
+
+void AWBugReporter::doConnect() const
+{
+    // additional method for testing needs
+    connect(this, &AWBugReporter::replyReceived, this, &AWBugReporter::showInformation);
+}
+
+
+QString AWBugReporter::generateText(const QString &_description, const QString &_reproduce, const QString &_expected,
+                                    const QString &_logs)
+{
+    // do not log _logs here, it may have quite large size
+    qCDebug(LOG_AW) << "Generate text with description" << _description << "steps" << _reproduce
+                    << "and expected result" << _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").arg(AWDebug::getBuildData().join(QString("\n")));
+    // append _logs
+    output += QString("**Logs**\n\n%1").arg(_logs);
+
+    return output;
+}
+
+
+void AWBugReporter::sendBugReport(const QString &_title, const QString &_body)
+{
+    qCDebug(LOG_AW) << "Send bug report with title" << _title << "and body" << _body;
+
+
+    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"});
+    // convert to QByteArray to send request
+    auto data = QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact);
+    qCInfo(LOG_AW) << "Send request with _body" << data.data() << "and size" << data.size();
+
+    m_manager->post(request, data);
+}
+
+
+void AWBugReporter::issueReplyReceived(QNetworkReply *_reply)
+{
+    if (_reply->error() != QNetworkReply::NoError) {
+        qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message" << _reply->errorString();
+        return emit(replyReceived(0, ""));
+    }
+
+    QJsonParseError error{};
+    auto jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
+    if (error.error != QJsonParseError::NoError) {
+        qCWarning(LOG_AW) << "Parse error" << error.errorString();
+        return emit(replyReceived(0, ""));
+    }
+    _reply->deleteLater();
+
+    // convert to map
+    auto response = jsonDoc.toVariant().toMap();
+    auto url = response["html_url"].toString();
+    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" << _url;
+
+    // cache url first
+    m_lastBugUrl = _url;
+
+    auto event = KNotification::event("system", i18n("Issue created"), i18n("Issue %1 has been created", _number));
+    event->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
+
+    auto action = event->addAction(i18n("Details"));
+    connect(action, &KNotificationAction::activated, this, &AWBugReporter::openBugReport);
+}

sources/awesome-widget/plugin/awbugreporter.h

@@ -0,0 +1,49 @@
+/***************************************************************************
+ *   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>
+
+
+class QNetworkAccessManager;
+class QNetworkReply;
+
+class AWBugReporter : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AWBugReporter(QObject *_parent = nullptr);
+    ~AWBugReporter() override;
+    Q_INVOKABLE void doConnect() const;
+    Q_INVOKABLE static QString generateText(const QString &_description, const QString &_reproduce,
+                                            const QString &_expected, const QString &_logs);
+    Q_INVOKABLE void sendBugReport(const QString &_title, const QString &_body);
+
+signals:
+    void replyReceived(int _number, const QString &_url);
+
+private slots:
+    void issueReplyReceived(QNetworkReply *_reply);
+    void openBugReport();
+    void showInformation(int _number, const QString &_url);
+
+private:
+    QString m_lastBugUrl;
+    QNetworkAccessManager *m_manager = nullptr;
+};

sources/awesome-widget/plugin/awconfighelper.cpp

@@ -17,40 +17,32 @@
 
 #include "awconfighelper.h"
 
-#include <KI18n/KLocalizedString>
-
 #include <QDir>
 #include <QQmlPropertyMap>
 #include <QSettings>
-#include <QTextCodec>
+#include <QStandardPaths>
 
 #include "awdebug.h"
 
 
-AWConfigHelper::AWConfigHelper(QObject *parent)
-    : QObject(parent)
+AWConfigHelper::AWConfigHelper(QObject *_parent)
+    : QObject(_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    m_baseDir = QString("%1/awesomewidgets").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
 }
 
 
-AWConfigHelper::~AWConfigHelper()
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-}
-
-
-QString AWConfigHelper::configurationDirectory() const
+QString AWConfigHelper::configurationDirectory()
 {
     // get readable directory
-    QString localDir = QString("%1/awesomewidgets/configs")
-                           .arg(QStandardPaths::writableLocation(
-                               QStandardPaths::GenericDataLocation));
+    auto localDir = QString("%1/awesomewidgets/configs")
+                        .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
 
     // create directory and copy files from default settings
     QDir localDirectory;
-    if ((!localDirectory.exists(localDir))
-        && (localDirectory.mkpath(localDir))) {
+    if ((!localDirectory.exists(localDir)) && (localDirectory.mkpath(localDir))) {
         qCInfo(LOG_AW) << "Created directory" << localDir;
         copyConfigs(localDir);
     }
@@ -59,29 +51,25 @@ QString AWConfigHelper::configurationDirectory() const
 }
 
 
-bool AWConfigHelper::dropCache() const
+bool AWConfigHelper::dropCache()
 {
-    QString fileName = QString("%1/awesomewidgets.ndx")
-                           .arg(QStandardPaths::writableLocation(
-                               QStandardPaths::GenericCacheLocation));
+    auto fileName
+        = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
 
     return QFile(fileName).remove();
 }
 
 
-bool AWConfigHelper::exportConfiguration(QObject *nativeConfig,
-                                         const QString fileName) const
+bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig, const QString &_fileName) const
 {
-    qCDebug(LOG_AW) << "Selected filename" << fileName;
-
-    QSettings settings(fileName, QSettings::IniFormat);
+    qCDebug(LOG_AW) << "Selected filename" << _fileName;
 
+    QSettings settings(_fileName, QSettings::IniFormat);
     // plasmoid configuration
-    QQmlPropertyMap *configuration
-        = static_cast<QQmlPropertyMap *>(nativeConfig);
-    settings.beginGroup(QString("plasmoid"));
-    for (auto key : configuration->keys()) {
-        QVariant value = configuration->value(key);
+    auto configuration = dynamic_cast<const QQmlPropertyMap *>(_nativeConfig);
+    settings.beginGroup("plasmoid");
+    for (auto &key : configuration->keys()) {
+        auto value = configuration->value(key);
         if (!value.isValid())
             continue;
         settings.setValue(key, value);
@@ -89,27 +77,27 @@ bool AWConfigHelper::exportConfiguration(QObject *nativeConfig,
     settings.endGroup();
 
     // extensions
-    for (auto item : m_dirs) {
-        QStringList items
-            = QDir(QString("%1/%2").arg(m_baseDir).arg(item))
-                  .entryList(QStringList() << QString("*.desktop"),
-                             QDir::Files);
+    for (auto &item : m_dirs) {
+        auto items = QDir(QString("%1/%2").arg(m_baseDir, item)).entryList({"*.desktop"}, QDir::Files);
         settings.beginGroup(item);
-        for (auto it : items)
+        for (auto &it : items)
             copyExtensions(it, item, settings, false);
         settings.endGroup();
     }
 
     // additional files
-    settings.beginGroup(QString("json"));
+    settings.beginGroup("json");
     // script filters
-    readFile(settings, QString("filters"),
-             QString("%1/scripts/awesomewidgets-extscripts-filters.json")
-                 .arg(m_baseDir));
+    readFile(settings, "filters", QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
     // weather icon settings
-    readFile(settings, QString("weathers"),
-             QString("%1/weather/awesomewidgets-extweather-ids.json")
-                 .arg(m_baseDir));
+    readFile(settings, "weathers", QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
+    settings.endGroup();
+
+    settings.beginGroup("ini");
+    // formatter settings
+    readFile(settings, "formatters", 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
@@ -119,44 +107,45 @@ bool AWConfigHelper::exportConfiguration(QObject *nativeConfig,
 }
 
 
-QVariantMap AWConfigHelper::importConfiguration(const QString fileName,
-                                                const bool importPlasmoid,
-                                                const bool importExtensions,
-                                                const bool importAdds) const
+QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName, const bool _importPlasmoid,
+                                                const bool _importExtensions, const bool _importAdds) const
 {
-    qCDebug(LOG_AW) << "Selected filename" << fileName;
+    qCDebug(LOG_AW) << "Selected filename" << _fileName;
 
     QVariantMap configuration;
-    QSettings settings(fileName, QSettings::IniFormat);
+    QSettings settings(_fileName, QSettings::IniFormat);
 
     // extensions
-    if (importExtensions) {
-        for (auto item : m_dirs) {
+    if (_importExtensions) {
+        for (auto &item : m_dirs) {
             settings.beginGroup(item);
-            for (auto it : settings.childGroups())
+            for (auto &it : settings.childGroups())
                 copyExtensions(it, item, settings, true);
             settings.endGroup();
         }
     }
 
     // additional files
-    if (importAdds) {
-        settings.beginGroup(QString("json"));
+    if (_importAdds) {
+        settings.beginGroup("json");
         // script filters
-        writeFile(settings, QString("filters"),
-                  QString("%1/scripts/awesomewidgets-extscripts-filters.json")
-                      .arg(m_baseDir));
+        writeFile(settings, "filters", QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
         // weather icon settings
-        writeFile(settings, QString("weathers"),
-                  QString("%1/weather/awesomewidgets-extweather-ids.json")
-                      .arg(m_baseDir));
+        writeFile(settings, "weathers", QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
+        settings.endGroup();
+
+        settings.beginGroup("ini");
+        // formatter settings
+        writeFile(settings, "formatters", QString("%1/formatters/formatters.ini").arg(m_baseDir));
+        // custom keys settings
+        writeFile(settings, "custom", QString("%1/custom.ini").arg(m_baseDir));
         settings.endGroup();
     }
 
     // plasmoid configuration
-    if (importPlasmoid) {
-        settings.beginGroup(QString("plasmoid"));
-        for (auto key : settings.childKeys())
+    if (_importPlasmoid) {
+        settings.beginGroup("plasmoid");
+        for (auto &key : settings.childKeys())
             configuration[key] = settings.value(key);
         settings.endGroup();
     }
@@ -165,34 +154,20 @@ QVariantMap AWConfigHelper::importConfiguration(const QString fileName,
 }
 
 
-QVariantMap AWConfigHelper::readDataEngineConfiguration() const
+QVariantMap AWConfigHelper::readDataEngineConfiguration()
 {
-    QString fileName
-        = QStandardPaths::locate(QStandardPaths::ConfigLocation,
-                                 QString("plasma-dataengine-extsysmon.conf"));
+    auto fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation, "plasma-dataengine-extsysmon.conf");
     qCInfo(LOG_AW) << "Configuration file" << fileName;
     QSettings settings(fileName, QSettings::IniFormat);
     QVariantMap configuration;
 
-    settings.beginGroup(QString("Configuration"));
-    configuration[QString("ACPIPATH")] = settings.value(
-        QString("ACPIPATH"), QString("/sys/class/power_supply/"));
-    configuration[QString("GPUDEV")]
-        = settings.value(QString("GPUDEV"), QString("auto"));
-    configuration[QString("HDDDEV")]
-        = settings.value(QString("HDDDEV"), QString("all"));
-    configuration[QString("HDDTEMPCMD")]
-        = settings.value(QString("HDDTEMPCMD"), QString("sudo smartctl -a"));
-    configuration[QString("MPDADDRESS")]
-        = settings.value(QString("MPDADDRESS"), QString("localhost"));
-    configuration[QString("MPDPORT")]
-        = settings.value(QString("MPDPORT"), QString("6600"));
-    configuration[QString("MPRIS")]
-        = settings.value(QString("MPRIS"), QString("auto"));
-    configuration[QString("PLAYER")]
-        = settings.value(QString("PLAYER"), QString("mpris"));
-    configuration[QString("PLAYERSYMBOLS")]
-        = settings.value(QString("PLAYERSYMBOLS"), QString("10"));
+    settings.beginGroup("Configuration");
+    configuration["ACPIPATH"] = settings.value("ACPIPATH", "/sys/class/power_supply/");
+    configuration["MPDADDRESS"] = settings.value("MPDADDRESS", "localhost");
+    configuration["MPDPORT"] = settings.value("MPDPORT", "6600");
+    configuration["MPRIS"] = settings.value("MPRIS", "auto");
+    configuration["PLAYER"] = settings.value("PLAYER", "mpris");
+    configuration["PLAYERSYMBOLS"] = settings.value("PLAYERSYMBOLS", "10");
     settings.endGroup();
 
     qCInfo(LOG_AW) << "Configuration" << configuration;
@@ -201,121 +176,105 @@ QVariantMap AWConfigHelper::readDataEngineConfiguration() const
 }
 
 
-void AWConfigHelper::writeDataEngineConfiguration(
-    const QVariantMap configuration) const
+bool AWConfigHelper::writeDataEngineConfiguration(const QVariantMap &_configuration)
 {
-    qCDebug(LOG_AW) << "Configuration" << configuration;
+    qCDebug(LOG_AW) << "Configuration" << _configuration;
 
-    QString fileName
-        = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)
-          + QString("/plasma-dataengine-extsysmon.conf");
+    auto fileName = QString("%1/plasma-dataengine-extsysmon.conf")
+                        .arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation));
     QSettings settings(fileName, QSettings::IniFormat);
     qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
 
-    settings.beginGroup(QString("Configuration"));
-    settings.setValue(QString("ACPIPATH"), configuration[QString("ACPIPATH")]);
-    settings.setValue(QString("GPUDEV"), configuration[QString("GPUDEV")]);
-    settings.setValue(QString("HDDDEV"), configuration[QString("HDDDEV")]);
-    settings.setValue(QString("HDDTEMPCMD"),
-                      configuration[QString("HDDTEMPCMD")]);
-    settings.setValue(QString("MPDADDRESS"),
-                      configuration[QString("MPDADDRESS")]);
-    settings.setValue(QString("MPDPORT"), configuration[QString("MPDPORT")]);
-    settings.setValue(QString("MPRIS"), configuration[QString("MPRIS")]);
-    settings.setValue(QString("PLAYER"), configuration[QString("PLAYER")]);
-    settings.setValue(QString("PLAYERSYMBOLS"),
-                      configuration[QString("PLAYERSYMBOLS")]);
+    settings.beginGroup("Configuration");
+    settings.setValue("ACPIPATH", _configuration["ACPIPATH"]);
+    settings.setValue("MPDADDRESS", _configuration["MPDADDRESS"]);
+    settings.setValue("MPDPORT", _configuration["MPDPORT"]);
+    settings.setValue("MPRIS", _configuration["MPRIS"]);
+    settings.setValue("PLAYER", _configuration["PLAYER"]);
+    settings.setValue("PLAYERSYMBOLS", _configuration["PLAYERSYMBOLS"]);
     settings.endGroup();
 
     settings.sync();
+
+    return (settings.status() == QSettings::NoError);
 }
 
 
-void AWConfigHelper::copyConfigs(const QString localDir) const
+void AWConfigHelper::copyConfigs(const QString &_localDir)
 {
-    qCDebug(LOG_AW) << "Local directory" << localDir;
+    qCDebug(LOG_AW) << "Local directory" << _localDir;
 
-    QStringList dirs = QStandardPaths::locateAll(
-        QStandardPaths::GenericDataLocation, QString("awesomewidgets/configs"),
+    auto dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "awesomewidgets/configs",
                                           QStandardPaths::LocateDirectory);
-    for (auto dir : dirs) {
-        if (dir == localDir)
+    for (auto &dir : dirs) {
+        if (dir == _localDir)
             continue;
-        QStringList files = QDir(dir).entryList(QDir::Files);
-        for (auto source : files) {
-            QString destination = QString("%1/%2").arg(localDir).arg(source);
-            bool status = QFile::copy(QString("%1/%2").arg(dir).arg(source),
-                                      destination);
-            qCInfo(LOG_AW) << "File" << source << "has been copied to"
-                           << destination << "with status" << status;
+        auto files = QDir(dir).entryList(QDir::Files);
+        for (auto &source : files) {
+            auto destination = QString("%1/%2").arg(_localDir, source);
+            auto status = QFile::copy(QString("%1/%2").arg(dir, source), destination);
+            qCInfo(LOG_AW) << "File" << source << "has been copied to" << destination << "with status" << status;
         }
     }
 }
 
 
-void AWConfigHelper::copyExtensions(const QString item, const QString type,
-                                    QSettings &settings,
-                                    const bool inverse) const
+void AWConfigHelper::copyExtensions(const QString &_item, const QString &_type, QSettings &_settings,
+                                    const bool _inverse) const
 {
-    qCDebug(LOG_AW) << "Extension" << item << "has type" << type
-                    << "inverse copying" << inverse;
+    qCDebug(LOG_AW) << "Extension" << _item << "has type" << _type << "inverse copying" << _inverse;
 
-    settings.beginGroup(item);
-    QSettings itemSettings(
-        QString("%1/%2/%3").arg(m_baseDir).arg(type).arg(item),
-        QSettings::IniFormat);
-    itemSettings.beginGroup(QString("Desktop Entry"));
-    if (inverse)
-        copySettings(settings, itemSettings);
+    _settings.beginGroup(_item);
+    QSettings itemSettings(QString("%1/%2/%3").arg(m_baseDir, _type, _item), QSettings::IniFormat);
+    itemSettings.beginGroup("Desktop Entry");
+    if (_inverse)
+        copySettings(_settings, itemSettings);
     else
-        copySettings(itemSettings, settings);
+        copySettings(itemSettings, _settings);
     itemSettings.endGroup();
-    settings.endGroup();
+    _settings.endGroup();
 
-    if (inverse)
+    if (_inverse)
         itemSettings.sync();
 }
 
 
-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));
+    for (auto &key : _from.childKeys())
+        _to.setValue(key, _from.value(key));
 }
 
 
-void AWConfigHelper::readFile(QSettings &settings, const QString key,
-                              const QString fileName) const
+void AWConfigHelper::readFile(QSettings &_settings, const QString &_key, const QString &_fileName)
 {
-    qCDebug(LOG_AW) << "Key" << key << "from file" << fileName;
+    qCDebug(LOG_AW) << "Key" << _key << "from file" << _fileName;
 
-    QFile 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);
+        _settings.setValue(_key, text);
     } else {
-        qCWarning(LOG_LIB) << "Could not open" << file.fileName();
+        qCWarning(LOG_AW) << "Could not open to read" << file.fileName();
     }
 }
 
 
-void AWConfigHelper::writeFile(QSettings &settings, const QString key,
-                               const QString fileName) const
+void AWConfigHelper::writeFile(QSettings &_settings, const QString &_key, const QString &_fileName)
 {
-    qCDebug(LOG_AW) << "Key" << key << "to file" << fileName;
+    qCDebug(LOG_AW) << "Key" << _key << "to file" << _fileName;
 
-    if (!settings.contains(key))
+    if (!_settings.contains(_key))
         return;
 
-    QFile file(fileName);
+    QFile file(_fileName);
     if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
         QTextStream out(&file);
-        out.setCodec("UTF-8");
-        out << settings.value(key).toString().toUtf8();
+        out << _settings.value(_key).toString().toUtf8();
         out.flush();
         file.close();
     } else {
-        qCWarning(LOG_LIB) << "Could not open" << file.fileName();
+        qCWarning(LOG_AW) << "Could not open to write" << file.fileName();
     }
 }

sources/awesome-widget/plugin/awconfighelper.h

@@ -15,12 +15,10 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
-#ifndef AWCONFIGHELPER_H
-#define AWCONFIGHELPER_H
+#pragma once
 
 #include <QObject>
-#include <QStandardPaths>
+#include <QVariant>
 
 
 class QSettings;
@@ -30,40 +28,25 @@ class AWConfigHelper : public QObject
     Q_OBJECT
 
 public:
-    explicit AWConfigHelper(QObject *parent = nullptr);
-    virtual ~AWConfigHelper();
-    Q_INVOKABLE QString configurationDirectory() const;
-    Q_INVOKABLE bool dropCache() const;
-    Q_INVOKABLE bool exportConfiguration(QObject *nativeConfig,
-                                         const QString fileName) const;
-    Q_INVOKABLE QVariantMap importConfiguration(const QString fileName,
-                                                const bool importPlasmoid,
-                                                const bool importExtensions,
-                                                const bool importAdds) const;
+    explicit AWConfigHelper(QObject *_parent = nullptr);
+    ~AWConfigHelper() override = default;
+    Q_INVOKABLE [[nodiscard]] static QString configurationDirectory();
+    Q_INVOKABLE static bool dropCache();
+    Q_INVOKABLE bool exportConfiguration(QObject *_nativeConfig, const QString &_fileName) const;
+    Q_INVOKABLE [[nodiscard]] QVariantMap importConfiguration(const QString &_fileName, bool _importPlasmoid,
+                                                              bool _importExtensions, bool _importAdds) const;
     // dataengine
-    Q_INVOKABLE QVariantMap readDataEngineConfiguration() const;
-    Q_INVOKABLE void
-    writeDataEngineConfiguration(const QVariantMap configuration) const;
+    Q_INVOKABLE static QVariantMap readDataEngineConfiguration();
+    Q_INVOKABLE static bool writeDataEngineConfiguration(const QVariantMap &_configuration);
 
 private:
     // methods
-    void copyConfigs(const QString localDir) const;
-    void copyExtensions(const QString item, const QString type,
-                        QSettings &settings, const bool inverse) const;
-    void copySettings(QSettings &from, QSettings &to) const;
-    void readFile(QSettings &settings, const QString key,
-                  const QString fileName) const;
-    void writeFile(QSettings &settings, const QString key,
-                   const QString fileName) const;
+    static void copyConfigs(const QString &_localDir);
+    void copyExtensions(const QString &_item, const QString &_type, QSettings &_settings, bool _inverse) const;
+    static void copySettings(QSettings &_from, QSettings &_to);
+    static void readFile(QSettings &_settings, const QString &_key, const QString &_fileName);
+    static void writeFile(QSettings &_settings, const QString &_key, const QString &_fileName);
     // properties
-    QString m_baseDir = QString("%1/awesomewidgets")
-                            .arg(QStandardPaths::writableLocation(
-                                QStandardPaths::GenericDataLocation));
-    QStringList m_dirs = QStringList()
-                         << QString("desktops") << QString("quotes")
-                         << QString("scripts") << QString("upgrade")
-                         << QString("weather");
+    QString m_baseDir;
+    QStringList m_dirs = {"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

@@ -0,0 +1,30 @@
+/***************************************************************************
+ *   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 "awabstractpairconfig.h"
+
+
+class AWCustomKeysConfig : public AWAbstractPairConfig
+{
+    Q_OBJECT
+
+public:
+    explicit AWCustomKeysConfig(QWidget *_parent = nullptr, const QStringList &_keys = QStringList());
+    ~AWCustomKeysConfig() override = default;
+};

sources/awesome-widget/plugin/awcustomkeyshelper.cpp

@@ -0,0 +1,72 @@
+/***************************************************************************
+ *   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 "awcustomkeyshelper.h"
+
+#include <QSet>
+
+#include "awdebug.h"
+
+
+AWCustomKeysHelper::AWCustomKeysHelper(QObject *_parent)
+    : QObject(_parent)
+    , AWAbstractPairHelper("awesomewidgets/custom.ini", "Custom")
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+QString AWCustomKeysHelper::source(const QString &_key) const
+{
+    qCDebug(LOG_AW) << "Get source by key" << _key;
+
+    return pairs()[_key];
+}
+
+
+QStringList AWCustomKeysHelper::sources() const
+{
+    return valuesSet().values();
+}
+
+
+QStringList AWCustomKeysHelper::refinedSources() const
+{
+    auto allSources = valuesSet();
+    QSet<QString> output;
+
+    while (output != allSources) {
+        output.clear();
+        for (auto &src : allSources)
+            output.insert(pairs().contains(src) ? source(src) : src);
+        allSources = output;
+    }
+
+    return output.values();
+}
+
+
+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

@@ -19,11 +19,9 @@
 
 #include <KI18n/KLocalizedString>
 
-#include <QtConcurrent/QtConcurrent>
 #include <QBuffer>
 #include <QGraphicsScene>
 #include <QGraphicsView>
-#include <QPixmap>
 
 #include <cmath>
 
@@ -31,22 +29,20 @@
 #include "awdebug.h"
 
 
-AWDataAggregator::AWDataAggregator(QObject *parent)
-    : QObject(parent)
+AWDataAggregator::AWDataAggregator(QObject *_parent)
+    : QObject(_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    boundaries[QString("cpuTooltip")] = 100.0;
-    boundaries[QString("cpuclTooltip")] = 4000.0;
-    boundaries[QString("memTooltip")] = 100.0;
-    boundaries[QString("swapTooltip")] = 100.0;
-    boundaries[QString("downkbTooltip")] = 1.0;
-    boundaries[QString("upkbTooltip")] = 1.0;
-    boundaries[QString("batTooltip")] = 100.0;
+    m_boundaries["cpuTooltip"] = 100.0;
+    m_boundaries["cpuclTooltip"] = 4000.0;
+    m_boundaries["memTooltip"] = 100.0;
+    m_boundaries["swapTooltip"] = 100.0;
+    m_boundaries["downkbTooltip"] = 1.0;
+    m_boundaries["upkbTooltip"] = 1.0;
+    m_boundaries["batTooltip"] = 100.0;
 
     initScene();
-    connect(this, SIGNAL(updateData(const QVariantHash &)), this,
-            SLOT(dataUpdate(const QVariantHash &)));
 }
 
 
@@ -54,269 +50,246 @@ AWDataAggregator::~AWDataAggregator()
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    delete toolTipScene;
+    m_toolTipView->deleteLater();
+    m_toolTipScene->deleteLater();
 }
 
 
-QList<float> AWDataAggregator::getData(const QString key) const
-{
-    qCDebug(LOG_AW) << "Key" << key;
-
-    return data[QString("%1Tooltip").arg(key)];
-}
-
-
-QString AWDataAggregator::htmlImage(const QPixmap &source) const
+QString AWDataAggregator::htmlImage(const QPixmap &_source)
 {
     QByteArray byteArray;
     QBuffer buffer(&byteArray);
-    source.save(&buffer, "PNG");
+    _source.save(&buffer, "PNG");
 
-    return byteArray.isEmpty()
-               ? QString()
-               : QString("<img src=\"data:image/png;base64,%1\"/>")
-                     .arg(QString(byteArray.toBase64()));
+    return byteArray.isEmpty() ? ""
+                               : QString("<img src=\"data:image/png;base64,%1\"/>").arg(QString(byteArray.toBase64()));
 }
 
 
-void AWDataAggregator::setParameters(QVariantMap settings)
+void AWDataAggregator::setParameters(const QVariantMap &_settings)
 {
-    qCDebug(LOG_AW) << "Settings" << settings;
+    qCDebug(LOG_AW) << "Settings" << _settings;
 
     // cast from QVariantMap to QVariantHash without data lost
-    configuration = qvariant_cast<QVariantHash>(settings);
+    m_configuration = qvariant_cast<QVariantHash>(_settings);
 
-    m_enablePopup = configuration[QString("notify")].toBool();
+    m_enablePopup = m_configuration["notify"].toBool();
 
-    counts = 0;
-    counts += configuration[QString("cpuTooltip")].toInt();
-    counts += configuration[QString("cpuclTooltip")].toInt();
-    counts += configuration[QString("memTooltip")].toInt();
-    counts += configuration[QString("swapTooltip")].toInt();
-    counts += configuration[QString("downkbTooltip")].toInt();
-    counts += configuration[QString("batTooltip")].toInt();
+    m_counts = 0;
+    m_counts += m_configuration["cpuTooltip"].toInt();
+    m_counts += m_configuration["cpuclTooltip"].toInt();
+    m_counts += m_configuration["memTooltip"].toInt();
+    m_counts += m_configuration["swapTooltip"].toInt();
+    m_counts += m_configuration["downkbTooltip"].toInt();
+    m_counts += m_configuration["batTooltip"].toInt();
     // resize tooltip image
-    toolTipView->resize(100 * counts, 105);
+    m_toolTipView->resize(100 * m_counts, 105);
 
-    requiredKeys.clear();
-    if (configuration[QString("cpuTooltip")].toBool())
-        requiredKeys.append(QString("cpuTooltip"));
-    if (configuration[QString("cpuclTooltip")].toBool())
-        requiredKeys.append(QString("cpuclTooltip"));
-    if (configuration[QString("memTooltip")].toBool())
-        requiredKeys.append(QString("memTooltip"));
-    if (configuration[QString("swapTooltip")].toBool())
-        requiredKeys.append(QString("swapTooltip"));
-    if (configuration[QString("downkbTooltip")].toBool())
-        requiredKeys.append(QString("downkbTooltip"));
-    if (configuration[QString("upkbTooltip")].toBool())
-        requiredKeys.append(QString("upkbTooltip"));
-    if (configuration[QString("batTooltip")].toBool())
-        requiredKeys.append(QString("batTooltip"));
+    m_requiredKeys.clear();
+    if (m_configuration["cpuTooltip"].toBool())
+        m_requiredKeys.append("cpuTooltip");
+    if (m_configuration["cpuclTooltip"].toBool())
+        m_requiredKeys.append("cpuclTooltip");
+    if (m_configuration["memTooltip"].toBool())
+        m_requiredKeys.append("memTooltip");
+    if (m_configuration["swapTooltip"].toBool())
+        m_requiredKeys.append("swapTooltip");
+    if (m_configuration["downkbTooltip"].toBool())
+        m_requiredKeys.append("downkbTooltip");
+    if (m_configuration["upkbTooltip"].toBool())
+        m_requiredKeys.append("upkbTooltip");
+    if (m_configuration["batTooltip"].toBool())
+        m_requiredKeys.append("batTooltip");
 
     // background
-    toolTipScene->setBackgroundBrush(
-        configuration[QString("useTooltipBackground")].toBool()
-            ? QBrush(QColor(
-                  configuration[QString("tooltipBackground")].toString()))
-            : QBrush(Qt::NoBrush));
+    m_toolTipScene->setBackgroundBrush(m_configuration["useTooltipBackground"].toBool()
+                                           ? QColor(m_configuration["tooltipBackground"].toString())
+                                           : Qt::NoBrush);
 }
 
 
 QPixmap AWDataAggregator::tooltipImage()
 {
     // create image
-    toolTipScene->clear();
+    m_toolTipScene->clear();
     QPen pen;
-    bool down = false;
-    for (auto key : requiredKeys) {
+    auto shift = 0.0;
+
+    for (auto i = 0; i < m_requiredKeys.count(); ++i) {
+        auto key = m_requiredKeys[i];
+
         // create frame
-        float normX = 100.0f / static_cast<float>(data[key].count());
-        float normY = 100.0f / (1.5f * boundaries[key]);
-        float shift = requiredKeys.indexOf(key) * 100.0f;
-        if (down)
-            shift -= 100.0;
+        auto normX = 100.0 / static_cast<float>(m_values[key].count());
+        auto normY = 100.0 / (1.5 * m_boundaries[key]);
+
         // apply pen color
-        if (key != QString("batTooltip"))
-            pen.setColor(
-                QColor(configuration[QString("%1Color").arg(key)].toString()));
+        if (key != "batTooltip")
+            pen.setColor(m_configuration[QString("%1Color").arg(key)].toString());
+
         // paint data inside frame
-        for (int j = 0; j < data[key].count() - 1; j++) {
+        for (int j = 0; j < m_values[key].count() - 1; j++) {
             // some magic here
-            float x1 = j * normX + shift;
-            float y1 = -fabs(data[key].at(j)) * normY + 5.0f;
-            float x2 = (j + 1) * normX + shift;
-            float y2 = -fabs(data[key].at(j + 1)) * normY + 5.0f;
-            if (key == QString("batTooltip")) {
-                if (data[key].at(j + 1) > 0)
-                    pen.setColor(QColor(
-                        configuration[QString("batTooltipColor")].toString()));
+            auto x1 = j * normX + shift;
+            auto y1 = -std::fabs(m_values[key].at(j)) * normY + 5.0;
+            auto x2 = (j + 1) * normX + shift;
+            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(QColor(m_configuration["batTooltipColor"].toString()));
                 else
-                    pen.setColor(
-                        QColor(configuration[QString("batInTooltipColor")]
-                                   .toString()));
-            }
-            toolTipScene->addLine(x1, y1, x2, y2, pen);
-        }
-        if (key == QString("downkbTooltip"))
-            down = true;
+                    pen.setColor(QColor(m_configuration["batInTooltipColor"].toString()));
             }
 
-    return toolTipView->grab();
+            m_toolTipScene->addLine(x1, y1, x2, y2, pen);
+        }
+
+        // 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();
 }
 
 
-void AWDataAggregator::dataUpdate(const QVariantHash &values)
+void AWDataAggregator::dataUpdate(const QVariantHash &_values)
 {
     // do not log these arguments
-    setData(values);
+    setData(_values);
     emit(toolTipPainted(htmlImage(tooltipImage())));
 }
 
 
-void AWDataAggregator::checkValue(const QString source, const float value,
-                                  const float extremum) const
+void AWDataAggregator::checkValue(const QString &_source, const double _value, const double _extremum) const
 {
-    qCDebug(LOG_AW) << "Notification source" << source << "with value" << value
-                    << "called with extremum" << extremum;
+    qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value << "called with extremum"
+                    << _extremum;
 
-    if (value >= 0.0) {
-        if ((m_enablePopup) && (value > extremum)
-            && (data[source].last() < extremum))
-            return AWActions::sendNotification(QString("event"),
-                                               notificationText(source, value));
+    if (_value >= 0.0) {
+        if ((m_enablePopup) && (_value > _extremum) && (m_values[_source].last() < _extremum))
+            return AWActions::sendNotification("event", notificationText(_source, _value));
     } else {
-        if ((m_enablePopup) && (value < extremum)
-            && (data[source].last() > extremum))
-            return AWActions::sendNotification(QString("event"),
-                                               notificationText(source, value));
+        if ((m_enablePopup) && (_value < _extremum) && (m_values[_source].last() > _extremum))
+            return AWActions::sendNotification("event", notificationText(_source, _value));
     }
 }
 
 
-void AWDataAggregator::checkValue(const QString source, const QString current,
-                                  const QString received) const
+void AWDataAggregator::checkValue(const QString &_source, const QString &_current, const QString &_received) const
 {
-    qCDebug(LOG_AW) << "Notification source" << source << "with current value"
-                    << current << "and received one" << received;
+    qCDebug(LOG_AW) << "Notification source" << _source << "with current value" << _current << "and received one"
+                    << _received;
 
-    if ((m_enablePopup) && (current != received) && (!received.isEmpty()))
-        return AWActions::sendNotification(QString("event"),
-                                           notificationText(source, received));
+    if ((m_enablePopup) && (_current != _received) && (!_received.isEmpty()))
+        return AWActions::sendNotification("event", notificationText(_source, _received));
 }
 
 
 void AWDataAggregator::initScene()
 {
-    toolTipScene = new QGraphicsScene(nullptr);
-    toolTipView = new QGraphicsView(toolTipScene);
-    toolTipView->setStyleSheet(QString("background: transparent"));
-    toolTipView->setContentsMargins(0, 0, 0, 0);
-    toolTipView->setFrameShape(QFrame::NoFrame);
-    toolTipView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    toolTipView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    m_toolTipScene = new QGraphicsScene(nullptr);
+    m_toolTipView = new QGraphicsView(m_toolTipScene);
+    m_toolTipView->setStyleSheet("background: transparent");
+    m_toolTipView->setContentsMargins(0, 0, 0, 0);
+    m_toolTipView->setFrameShape(QFrame::NoFrame);
+    m_toolTipView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    m_toolTipView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 }
 
 
-QString AWDataAggregator::notificationText(const QString source,
-                                           const float value) const
+QString AWDataAggregator::notificationText(const QString &_source, const float _value)
 {
-    qCDebug(LOG_AW) << "Notification source" << source << "with value" << value;
+    qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value;
 
     QString output;
-    if (source == QString("batTooltip"))
-        output = value > 0.0 ? i18n("AC online") : i18n("AC offline");
-    else if (source == QString("cpuTooltip"))
+    if (_source == "batTooltip")
+        output = _value > 0.0 ? i18n("AC online") : i18n("AC offline");
+    else if (_source == "cpuTooltip")
         output = i18n("High CPU load");
-    else if (source == QString("memTooltip"))
+    else if (_source == "memTooltip")
         output = i18n("High memory usage");
-    else if (source == QString("swapTooltip"))
+    else if (_source == "swapTooltip")
         output = i18n("Swap is used");
-    else if (source == QString("gpu"))
+    else if (_source == "gpu")
         output = i18n("High GPU load");
 
     return output;
 }
 
 
-QString AWDataAggregator::notificationText(const QString source,
-                                           const QString value) const
+QString AWDataAggregator::notificationText(const QString &_source, const QString &_value)
 {
-    qCDebug(LOG_AW) << "Notification source" << source << "with value" << value;
+    qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value;
 
     QString output;
-    if (source == QString("netdev"))
-        output = i18n("Network device has been changed to %1", value);
+    if (_source == "netdev")
+        output = i18n("Network device has been changed to %1", _value);
 
     return output;
 }
 
 
-void AWDataAggregator::setData(const QVariantHash &values)
+void AWDataAggregator::setData(const QVariantHash &_values)
 {
     // do not log these arguments
     // battery update requires info is AC online or not
-    setData(values[QString("ac")].toString()
-                == configuration[QString("acOnline")],
-            QString("batTooltip"), values[QString("bat")].toFloat());
+    setData(_values["ac"].toString() == m_configuration["acOnline"], "batTooltip", _values["bat"].toDouble());
+
     // usual case
-    setData(QString("cpuTooltip"), values[QString("cpu")].toFloat(), 90.0);
-    setData(QString("cpuclTooltip"), values[QString("cpucl")].toFloat());
-    setData(QString("memTooltip"), values[QString("mem")].toFloat(), 80.0);
-    setData(QString("swapTooltip"), values[QString("swap")].toFloat(), 0.0);
-    setData(QString("downkbTooltip"), values[QString("downkb")].toFloat());
-    setData(QString("upkbTooltip"), values[QString("upkb")].toFloat());
+    setData("cpuTooltip", _values["cpu"].toDouble(), 90.0);
+    setData("cpuclTooltip", _values["cpucl"].toDouble());
+    setData("memTooltip", _values["mem"].toDouble(), 80.0);
+    setData("swapTooltip", _values["swap"].toDouble(), 0.0);
+    setData("downkbTooltip", _values["downkb"].toDouble());
+    setData("upkbTooltip", _values["upkb"].toDouble());
+
     // additional check for network device
-    [this](const QString value) {
-        checkValue(QString("netdev"), currentNetworkDevice, value);
-        currentNetworkDevice = value;
-    }(values[QString("netdev")].toString());
+    auto currentNetworkDevice = _values["netdev"].toString();
+    checkValue("netdev", m_currentNetworkDevice, currentNetworkDevice);
+    m_currentNetworkDevice = currentNetworkDevice;
+
     // additional check for GPU load
-    [this](const float value) {
-        checkValue(QString("gpu"), value, 90.0);
-        currentGPULoad = value;
-    }(values[QString("gpu")].toFloat());
+    checkValue("gpu", _values["gpu"].toDouble(), 90.0);
 }
 
 
-void AWDataAggregator::setData(const QString &source, float value,
-                               const float extremum)
+void AWDataAggregator::setData(const QString &_source, double _value, const double _extremum)
 {
-    qCDebug(LOG_AW) << "Source" << source << "to value" << value
-                    << "with extremum" << extremum;
+    qCDebug(LOG_AW) << "Source" << _source << "to value" << _value << "with extremum" << _extremum;
 
-    if (data[source].count() == 0)
-        data[source].append(0.0);
-    else if (data[source].count()
-             > configuration[QString("tooltipNumber")].toInt())
-        data[source].removeFirst();
-    if (std::isnan(value))
-        value = 0.0;
+    if (m_values[_source].count() == 0)
+        m_values[_source].append(0.0);
+    else if (m_values[_source].count() > m_configuration["tooltipNumber"].toInt())
+        m_values[_source].removeFirst();
+    if (std::isnan(_value))
+        _value = 0.0;
 
     // notifications
-    checkValue(source, value, extremum);
+    checkValue(_source, _value, _extremum);
 
-    data[source].append(value);
-    if (source == QString("downkbTooltip")) {
-        QList<float> netValues
-            = data[QString("downkbTooltip")] + data[QString("upkbTooltip")];
-        // to avoid inf value of normY
-        netValues << 1.0;
-        boundaries[QString("downkbTooltip")]
-            = 1.2f * *std::max_element(netValues.cbegin(), netValues.cend());
-        boundaries[QString("upkbTooltip")]
-            = boundaries[QString("downkbTooltip")];
+    m_values[_source].append(_value);
+    if (_source == "downkbTooltip") {
+        // to avoid copying of objects to another list we find max elements in each sequence and compare them
+        auto downMax = m_values["downkbTooltip"].empty()
+                           ? 1.0
+                           : *std::max_element(m_values["downkbTooltip"].cbegin(), m_values["downkbTooltip"].cend());
+        auto upMax = m_values["upkbTooltip"].empty()
+                         ? 1.0
+                         : *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,
-                               float value)
+void AWDataAggregator::setData(const bool _dontInvert, const QString &_source, double _value)
 {
-    qCDebug(LOG_AW) << "Do not invert" << dontInvert << "value" << value
-                    << "for source" << source;
+    qCDebug(LOG_AW) << "Do not invert" << _dontInvert << "value" << _value << "for source" << _source;
 
     // invert values for different battery colours
-    value = dontInvert ? value : -value;
-    return setData(source, value, 0.0);
+    _value = _dontInvert ? _value : -_value;
+    return setData(_source, _value, 0.0);
 }

sources/awesome-widget/plugin/awdataaggregator.h

@@ -15,9 +15,7 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
-#ifndef AWTOOLTIP_H
-#define AWTOOLTIP_H
+#pragma once
 
 #include <QObject>
 #include <QVariant>
@@ -26,54 +24,44 @@
 class QGraphicsScene;
 class QGraphicsView;
 class QPixmap;
-class QThreadPool;
 
 class AWDataAggregator : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit AWDataAggregator(QObject *parent = nullptr);
-    virtual ~AWDataAggregator();
-    QList<float> getData(const QString key) const;
-    QString htmlImage(const QPixmap &source) const;
-    void setParameters(QVariantMap settings);
+    explicit AWDataAggregator(QObject *_parent = nullptr);
+    ~AWDataAggregator() override;
+    static QString htmlImage(const QPixmap &_source);
+    void setParameters(const QVariantMap &_settings);
     QPixmap tooltipImage();
 
-signals:
-    void updateData(const QVariantHash &values);
-    void toolTipPainted(const QString image) const;
+public slots:
+    void dataUpdate(const QVariantHash &_values);
 
-private slots:
-    void dataUpdate(const QVariantHash &values);
+signals:
+    void toolTipPainted(const QString &_image) const;
 
 private:
     // ui
-    QGraphicsScene *toolTipScene = nullptr;
-    QGraphicsView *toolTipView = nullptr;
-    void checkValue(const QString source, const float value,
-                    const float extremum) const;
-    void checkValue(const QString source, const QString current,
-                    const QString received) const;
+    QGraphicsScene *m_toolTipScene = nullptr;
+    QGraphicsView *m_toolTipView = nullptr;
+    void checkValue(const QString &_source, double _value, double _extremum) const;
+    void checkValue(const QString &_source, const QString &_current, const QString &_received) const;
     void initScene();
-    QString notificationText(const QString source, const float value) const;
-    QString notificationText(const QString source, const QString value) const;
+    static QString notificationText(const QString &_source, float _value);
+    static QString notificationText(const QString &_source, const QString &_value);
     // main method
-    void setData(const QVariantHash &values);
-    void setData(const QString &source, float value,
-                 const float extremum = -1.0f);
+    void setData(const QVariantHash &_values);
+    void setData(const QString &_source, double _value, double _extremum = -1.0);
     // 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 counts = 0;
-    QVariantHash configuration;
-    float currentGPULoad = 0.0;
-    QString currentNetworkDevice = QString("lo");
-    QHash<QString, float> boundaries;
-    QHash<QString, QList<float>> data;
+    int m_counts = 0;
+    QVariantHash m_configuration;
+    QString m_currentNetworkDevice = "lo";
+    QHash<QString, double> m_boundaries;
+    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,14 +17,35 @@
 
 #include "awdataengineaggregator.h"
 
+#include <ksysguard/formatter/Unit.h>
+#include <ksysguard/systemstats/DBusInterface.h>
+
+#include <QDBusConnection>
+
 #include "awdebug.h"
-#include "awkeys.h"
 
 
-AWDataEngineAggregator::AWDataEngineAggregator(QObject *parent)
-    : QObject(parent)
+AWDataEngineAggregator::AWDataEngineAggregator(QObject *_parent)
+    : QObject(_parent)
+    , m_interface(new KSysGuard::SystemStats::DBusInterface())
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    qDBusRegisterMetaType<KSysGuard::SensorData>();
+    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();
 }
 
 
@@ -32,71 +53,103 @@ AWDataEngineAggregator::~AWDataEngineAggregator()
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    clear();
+    disconnectSources();
+    m_interface->deleteLater();
 }
 
 
-void AWDataEngineAggregator::clear()
+void AWDataEngineAggregator::connectSources()
 {
-    // disconnect sources first
-    disconnectSources();
-    m_dataEngines.clear();
-    delete m_consumer;
-    m_consumer = nullptr;
+    auto keys = m_sensors.keys();
+    auto newKeys = QSet(keys.cbegin(), keys.cend()) - m_subscribed;
+
+    m_interface->subscribe(newKeys.values()).waitForFinished();
+    m_subscribed.unite(newKeys);
 }
 
 
 void AWDataEngineAggregator::disconnectSources()
 {
-    for (auto dataengine : m_dataEngines.values())
-        for (auto source : dataengine->sources())
-            dataengine->disconnectSource(source, parent());
+    m_interface->unsubscribe(m_subscribed.values()).waitForFinished();
+    m_subscribed.clear();
 }
 
 
-void AWDataEngineAggregator::initDataEngines(const int interval)
+bool AWDataEngineAggregator::isValidSensor(const KSysGuard::SensorInfo &_sensor)
 {
-    qCDebug(LOG_AW) << "Init dataengines with interval" << interval;
-
-    m_consumer = new Plasma::DataEngineConsumer();
-    m_dataEngines[QString("systemmonitor")]
-        = m_consumer->dataEngine(QString("systemmonitor"));
-    m_dataEngines[QString("extsysmon")]
-        = m_consumer->dataEngine(QString("extsysmon"));
-    m_dataEngines[QString("time")] = m_consumer->dataEngine(QString("time"));
-
-    // additional method required by systemmonitor structure
-    connect(m_dataEngines[QString("systemmonitor")],
-            &Plasma::DataEngine::sourceAdded,
-            [this, interval](const QString source) {
-                emit(deviceAdded(source));
-                m_dataEngines[QString("systemmonitor")]->connectSource(
-                    source, parent(), interval);
-            });
-
-    return reconnectSources(interval);
+    return _sensor.unit != KSysGuard::UnitInvalid;
 }
 
 
-void AWDataEngineAggregator::dropSource(const QString source)
+void AWDataEngineAggregator::loadSources()
 {
-    qCDebug(LOG_AW) << "Source" << source;
+    auto response = m_interface->allSensors();
+    response.waitForFinished();
 
-    // FIXME there is no possibility to check to which dataengine source
-    // connected we will try to disconnect it from systemmonitor and extsysmon
-    m_dataEngines[QString("systemmonitor")]->disconnectSource(source, parent());
-    m_dataEngines[QString("extsysmon")]->disconnectSource(source, parent());
-    m_dataEngines[QString("time")]->disconnectSource(source, parent());
+    auto sensors = response.value();
+    updateSensors(sensors);
+    connectSources();
+
+    for (auto &sensor : m_sensors.keys())
+        emit(deviceAdded(sensor));
 }
 
 
-void AWDataEngineAggregator::reconnectSources(const int interval)
+void AWDataEngineAggregator::dropSource(const QString &_source)
 {
-    qCDebug(LOG_AW) << "Reconnect sources with interval" << interval;
+    qCDebug(LOG_AW) << "Disconnect sensor" << _source;
 
-    m_dataEngines[QString("systemmonitor")]->connectAllSources(parent(),
-                                                               interval);
-    m_dataEngines[QString("extsysmon")]->connectAllSources(parent(), interval);
-    m_dataEngines[QString("time")]->connectSource(QString("Local"), parent(),
-                                                  1000);
+    if (m_subscribed.contains(_source)) {
+        m_interface->unsubscribe({_source}).waitForFinished();
+        m_subscribed.remove(_source);
+    }
+}
+
+
+void AWDataEngineAggregator::sensorAdded(const QString &_sensor)
+{
+    qCDebug(LOG_AW) << "New sensor added" << _sensor;
+
+    // check if sensor is actually valid
+    auto response = m_interface->sensors({_sensor});
+    response.waitForFinished();
+
+    auto info = response.value().value(_sensor);
+    if (!isValidSensor(info))
+        return;
+
+    m_sensors[_sensor] = info;
+    dropSource(_sensor); // force reconnect
+    if (!m_subscribed.contains(_sensor)) {
+        m_interface->subscribe({_sensor}).waitForFinished();
+        m_subscribed.insert(_sensor);
+    }
+
+    // notify about new device
+    emit(deviceAdded(_sensor));
+}
+
+
+void AWDataEngineAggregator::sensorRemoved(const QString &_sensor)
+{
+    qCDebug(LOG_AW) << "Sensor" << _sensor << "has been removed";
+
+    m_sensors.remove(_sensor);
+    dropSource(_sensor);
+}
+
+
+void AWDataEngineAggregator::updateData(const KSysGuard::SensorDataList &_data)
+{
+    emit(dataUpdated(m_sensors, _data));
+}
+
+
+void AWDataEngineAggregator::updateSensors(const QHash<QString, KSysGuard::SensorInfo> &_sensors)
+{
+    for (auto [source, sensor] : _sensors.asKeyValueRange()) {
+        if (!isValidSensor(sensor))
+            continue;
+        m_sensors.insert(source, sensor);
+    }
 }

sources/awesome-widget/plugin/awdataengineaggregator.h

@@ -15,38 +15,45 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
+#pragma once
 
-#ifndef AWDATAENGINEAGGREGATOR_H
-#define AWDATAENGINEAGGREGATOR_H
-
-#include <Plasma/DataEngine>
-#include <Plasma/DataEngineConsumer>
+#include <ksysguard/systemstats/SensorInfo.h>
 
+#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();
-    void clear();
+    explicit AWDataEngineAggregator(QObject *_parent = nullptr);
+    ~AWDataEngineAggregator() override;
+    void connectSources();
     void disconnectSources();
-    void initDataEngines(const int interval);
+    [[nodiscard]] static bool isValidSensor(const KSysGuard::SensorInfo &_sensor);
+    void loadSources();
 
 signals:
-    void deviceAdded(const QString &source);
+    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 dropSource(const QString &_source);
+    void sensorAdded(const QString &_sensor);
+    void sensorRemoved(const QString &_sensor);
+    void updateData(const KSysGuard::SensorDataList &_data);
+    void updateSensors(const QHash<QString, KSysGuard::SensorInfo> &_sensors);
 
 private:
-    Plasma::DataEngineConsumer *m_consumer = nullptr;
-    QHash<QString, Plasma::DataEngine *> m_dataEngines;
+    KSysGuard::SystemStats::DBusInterface *m_interface = nullptr;
+    QHash<QString, KSysGuard::SensorInfo> m_sensors;
+    QSet<QString> m_subscribed;
 };
-
-
-#endif /* AWDATAENGINEAGGREGATOR_H */

sources/awesome-widget/plugin/awdataenginemapper.cpp

@@ -0,0 +1,450 @@
+/***************************************************************************
+ *   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"
+
+
+AWDataEngineMapper::AWDataEngineMapper(QObject *_parent, AWFormatterHelper *_custom)
+    : QObject(_parent)
+    , m_customFormatters(_custom)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    // default formatters
+    // memory
+    m_formatter["mem"] = AWKeysAggregator::FormatterType::Float;
+    m_formatter["memtotmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+    m_formatter["memtotgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    // network
+    m_formatter["down"] = AWKeysAggregator::FormatterType::NetSmartFormat;
+    m_formatter["downkb"] = AWKeysAggregator::FormatterType::Integer;
+    m_formatter["downtot"] = AWKeysAggregator::FormatterType::MemMBFormat;
+    m_formatter["downtotkb"] = AWKeysAggregator::FormatterType::Integer;
+    m_formatter["downunits"] = AWKeysAggregator::FormatterType::NetSmartUnits;
+    m_formatter["up"] = AWKeysAggregator::FormatterType::NetSmartFormat;
+    m_formatter["upkb"] = AWKeysAggregator::FormatterType::Integer;
+    m_formatter["uptot"] = AWKeysAggregator::FormatterType::MemMBFormat;
+    m_formatter["uptotkb"] = AWKeysAggregator::FormatterType::Integer;
+    m_formatter["upunits"] = AWKeysAggregator::FormatterType::NetSmartUnits;
+    // swap
+    m_formatter["swap"] = AWKeysAggregator::FormatterType::Float;
+    m_formatter["swaptotmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+    m_formatter["swaptotgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+}
+
+
+AWKeysAggregator::FormatterType AWDataEngineMapper::formatter(const QString &_key) const
+{
+    qCDebug(LOG_AW) << "Get formatter for key" << _key;
+
+    return m_formatter.value(_key, AWKeysAggregator::FormatterType::NoFormat);
+}
+
+
+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;
+
+    // regular expressions
+    static auto cpuRegExp = QRegularExpression("^cpu/cpu.*/usage$");
+    static auto cpuclRegExp = QRegularExpression("^cpu/cpu.*/frequency$");
+    static auto cpuTempRegExp = QRegularExpression("^cpu/cpu.*/temperature$");
+    static auto gpuRegExp = QRegularExpression("^gpu/gpu.*/usage$");
+    static auto gpuTempRegExp = QRegularExpression("^gpu/gpu.*/temperature$");
+    static auto hddrRegExp = QRegularExpression("^disk/.*/read$");
+    static auto hddwRegExp = QRegularExpression("^disk/.*/write$");
+    static auto mountFillRegExp = QRegularExpression("^disk/.*/usedPercent$");
+    static auto mountFreeRegExp = QRegularExpression("^disk/.*/free$");
+    static auto mountUsedRegExp = QRegularExpression("^disk/.*/used$");
+    static auto netRegExp = QRegularExpression("^network/.*/(download|upload)$");
+    static auto netTotalRegExp = QRegularExpression("^network/.*/(totalDownload|totalUpload)$");
+
+    if (_source == "extsysmon/battery/ac") {
+        // AC
+        m_map.insert(_source, "ac");
+        m_formatter["ac"] = AWKeysAggregator::FormatterType::ACFormat;
+    } else if (_source.startsWith("extsysmon/battery/")) {
+        // battery stats
+        auto key = _source;
+        key.remove("extsysmon/battery/");
+        m_map.insert(_source, key);
+        m_formatter[key] = _source.contains("rate") ? AWKeysAggregator::FormatterType::Float
+                                                    : AWKeysAggregator::FormatterType::IntegerThree;
+    } else if (_source == "cpu/all/usage") {
+        // cpu
+        m_map.insert(_source, "cpu");
+        m_formatter["cpu"] = AWKeysAggregator::FormatterType::Float;
+    } else if (_source.contains(cpuRegExp)) {
+        // cpus
+        auto key = _source;
+        key.remove("cpu/").remove("/usage");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::Float;
+    } else if (_source == "cpu/all/averageFrequency") {
+        // cpucl
+        m_map.insert(_source, "cpucl");
+        m_formatter["cpucl"] = AWKeysAggregator::FormatterType::Integer;
+    } else if (_source.contains(cpuclRegExp)) {
+        // cpucls
+        auto key = _source;
+        key.remove("cpu/cpu").remove("/frequency");
+        key = QString("cpucl%1").arg(key);
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
+    } else if (_source.startsWith("extsysmon/custom")) {
+        // custom
+        auto key = _source;
+        key.remove("extsysmon/custom/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "extsysmon/desktop/name") {
+        // current desktop name
+        m_map.insert(_source, "desktop");
+        m_formatter["desktop"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "extsysmon/desktop/number") {
+        // current desktop number
+        m_map.insert(_source, "ndesktop");
+        m_formatter["ndesktop"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "extsysmon/desktop/count") {
+        // desktop count
+        m_map.insert(_source, "tdesktops");
+        m_formatter["tdesktops"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.contains(hddrRegExp)) {
+        // read speed
+        auto device = _source;
+        device.remove("disk/").remove("/read");
+        auto index = m_devices["disk"].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hddr%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemKBFormat;
+        }
+    } else if (_source.contains(hddwRegExp)) {
+        // write speed
+        auto device = _source;
+        device.remove("disk/").remove("/write");
+        auto index = m_devices["disk"].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hddw%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemKBFormat;
+        }
+    } else if (_source == "gpu/all/usage") {
+        // gpu load
+        m_map.insert(_source, "gpu");
+        m_formatter["gpu"] = AWKeysAggregator::FormatterType::Float;
+    } else if (_source.contains(gpuRegExp)) {
+        // gpus
+        auto device = _source;
+        device.remove("gpu/").remove("/usage");
+        auto index = m_devices["gpu"].indexOf(device);
+        if (index > -1) {
+            auto key = QString("gpu%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Float;
+        }
+    } else if (_source.contains(gpuTempRegExp)) {
+        // gpus temps
+        auto device = _source;
+        device.remove("gpu/").remove("/temperature");
+        auto index = m_devices["gpu"].indexOf(device);
+        if (index > -1) {
+            auto key = QString("gputemp%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
+        }
+    } else if (_source.contains(mountFillRegExp)) {
+        // fill level
+        auto device = _source;
+        device.remove("disk/").remove("/usedPercent");
+        auto index = m_devices["mount"].indexOf(device);
+        if (index > -1) {
+            auto key = QString("hdd%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Float;
+            // additional keys
+            m_formatter[QString("hddtotmb%1").arg(index)] = AWKeysAggregator::FormatterType::MemMBFormat;
+            m_formatter[QString("hddtotgb%1").arg(index)] = AWKeysAggregator::FormatterType::MemGBFormat;
+        }
+    } else if (_source.contains(mountFreeRegExp)) {
+        // free space
+        auto device = _source;
+        device.remove("disk/").remove("/free");
+        auto index = m_devices["mount"].indexOf(device);
+        if (index > -1) {
+            // mb
+            auto key = QString("hddfreemb%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
+            // gb
+            key = QString("hddfreegb%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemGBFormat;
+        }
+    } else if (_source.contains(mountUsedRegExp)) {
+        // used
+        auto device = _source;
+        device.remove("disk/").remove("/used");
+        auto index = m_devices["mount"].indexOf(device);
+        if (index > -1) {
+            // mb
+            auto key = QString("hddmb%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
+            // gb
+            key = QString("hddgb%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemGBFormat;
+        }
+    } else if (_source.startsWith("cpu/loadaverages/loadaverage")) {
+        // load average
+        auto time = _source;
+        time.remove("cpu/loadaverages/loadaverage");
+        auto key = QString("la%1").arg(time);
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::FloatTwoSymbols;
+    } else if (_source == "memory/physical/application") {
+        // app memory
+        // mb
+        m_map.insert(_source, "memmb");
+        m_formatter["memmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insert(_source, "memgb");
+        m_formatter["memgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source == "memory/physical/free") {
+        // free memory
+        // mb
+        m_map.insert(_source, "memfreemb");
+        m_formatter["memfreemb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insert(_source, "memfreegb");
+        m_formatter["memfreegb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source == "memory/physical/used") {
+        // used memory
+        // mb
+        m_map.insert(_source, "memusedmb");
+        m_formatter["memusedmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insert(_source, "memusedgb");
+        m_formatter["memusedgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source == "extsysmon/network/device") {
+        // network device
+        m_map.insert(_source, "netdev");
+        m_formatter["netdev"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "extsysmon/network/ssid") {
+        // current ssid
+        m_map.insert(_source, "ssid");
+        m_formatter["ssid"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.startsWith("extsysmon/requests/response")) {
+        // network response
+        auto key = _source;
+        key.remove("extsysmon/requests/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.contains(netRegExp)) {
+        // network speed
+        auto type = _source.endsWith("download") ? "down" : "up";
+        auto index = m_devices["net"].indexOf(_source.split('/')[1]);
+        if (index > -1) {
+            // kb
+            auto key = QString("%1kb%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemKBFormat;
+            // smart
+            key = QString("%1%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::NetSmartFormat;
+            // units
+            key = QString("%1units%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::NetSmartUnits;
+        }
+    } else if (_source.contains(netTotalRegExp)) {
+        // network data total
+        auto type = _source.endsWith("Download") ? "down" : "up";
+        auto index = m_devices["net"].indexOf(_source.split('/')[1]);
+        if (index > -1) {
+            // kb
+            auto key = QString("%1totkb%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemKBFormat;
+            // mb
+            key = QString("%1tot%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
+        }
+    } else if (_source.startsWith("extsysmon/upgrade")) {
+        // package manager
+        auto key = _source;
+        key.remove("extsysmon/upgrade/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::IntegerThree;
+    } else if (_source.startsWith("extsysmon/player")) {
+        // player
+        auto key = _source;
+        key.remove("extsysmon/player/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "extsysmon/ps/running") {
+        // running processes count
+        m_map.insert(_source, "pscount");
+        m_formatter["pscount"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "extsysmon/ps/list") {
+        // list of running processes
+        m_map.insert(_source, "ps");
+        m_formatter["ps"] = AWKeysAggregator::FormatterType::List;
+    } else if (_source == "extsysmon/ps/count") {
+        // total processes count
+        m_map.insert(_source, "pstot");
+        m_formatter["pstot"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.startsWith("extsysmon/quotes")) {
+        // quotes
+        auto key = _source;
+        key.remove("extsysmon/quotes/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::Quotes;
+    } else if (_source == "memory/swap/free") {
+        // free swap
+        // mb
+        m_map.insert(_source, "swapfreemb");
+        m_formatter["swapfreemb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insert(_source, "swapfreegb");
+        m_formatter["swapfreegb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source == "memory/swap/used") {
+        // used swap
+        // mb
+        m_map.insert(_source, "swapmb");
+        m_formatter["swapmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insert(_source, "swapgb");
+        m_formatter["swapgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source.startsWith("lmsensors/") || _source.contains(cpuTempRegExp)
+               || _source == "cpu/all/averageTemperature") {
+        // temperature
+        auto index = m_devices["temp"].indexOf(_source);
+        // HACK on DE initialization there are no units key
+        if (_units == KSysGuard::UnitInvalid)
+            return QStringList({QString("temp%1").arg(index)});
+        if (index > -1) {
+            auto key = QString("temp%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = _units == KSysGuard::UnitCelsius ? AWKeysAggregator::FormatterType::Temperature
+                                                                : AWKeysAggregator::FormatterType::Integer;
+        }
+    } else if (_source == "extsysmon/time/now") {
+        // time
+        m_map.insert(_source, "time");
+        m_formatter["time"] = AWKeysAggregator::FormatterType::Time;
+        // custom time
+        m_map.insert(_source, "ctime");
+        m_formatter["ctime"] = AWKeysAggregator::FormatterType::TimeCustom;
+        // ISO time
+        m_map.insert(_source, "isotime");
+        m_formatter["isotime"] = AWKeysAggregator::FormatterType::TimeISO;
+        // long time
+        m_map.insert(_source, "longtime");
+        m_formatter["longtime"] = AWKeysAggregator::FormatterType::TimeLong;
+        // short time
+        m_map.insert(_source, "shorttime");
+        m_formatter["shorttime"] = AWKeysAggregator::FormatterType::TimeShort;
+        // timestamp
+        m_map.insert(_source, "tstime");
+        m_formatter["tstime"] = AWKeysAggregator::FormatterType::Timestamp;
+    } else if (_source == "extsysmon/system/brightness") {
+        m_map.insert(_source, "brightness");
+        m_formatter["brightness"] = AWKeysAggregator::FormatterType::IntegerThree;
+    } else if (_source == "extsysmon/system/volume") {
+        m_map.insert(_source, "volume");
+        m_formatter["volume"] = AWKeysAggregator::FormatterType::IntegerThree;
+    } else if (_source == "os/system/uptime") {
+        // uptime
+        m_map.insert(_source, "uptime");
+        m_formatter["uptime"] = AWKeysAggregator::FormatterType::Uptime;
+        // custom uptime
+        m_map.insert(_source, "cuptime");
+        m_formatter["cuptime"] = AWKeysAggregator::FormatterType::UptimeCustom;
+    } else if (_source.startsWith("extsysmon/weather/temperature")) {
+        // temperature
+        auto key = _source;
+        key.remove("extsysmon/weather/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
+    } else if (_source.startsWith("extsysmon/weather/")) {
+        // other weather
+        auto key = _source;
+        key.remove("extsysmon/weather/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.startsWith("extsysmon/load/load")) {
+        // load source
+        auto key = _source;
+        key.remove("extsysmon/load/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
+    }
+
+    auto foundKeys = keysFromSource(_source);
+
+    // rewrite formatters for custom ones
+    QStringList customFormattersKeys;
+    if (m_customFormatters)
+        customFormattersKeys = m_customFormatters->definedFormatters();
+    qCInfo(LOG_AW) << "Looking for formatters" << foundKeys << "in" << customFormattersKeys;
+    for (auto &key : foundKeys) {
+        if (!customFormattersKeys.contains(key))
+            continue;
+        m_formatter[key] = AWKeysAggregator::FormatterType::Custom;
+    }
+
+    // drop key from dictionary if no one user requested key required it
+    qCInfo(LOG_AW) << "Looking for keys" << foundKeys << "in" << _keys;
+    auto required = _keys.isEmpty() || std::any_of(foundKeys.cbegin(), foundKeys.cend(), [&_keys](auto &key) {
+                        return _keys.contains(key);
+                    });
+    if (!required) {
+        m_map.remove(_source);
+        for (auto &key : foundKeys)
+            m_formatter.remove(key);
+    }
+
+    return keysFromSource(_source);
+}
+
+
+void AWDataEngineMapper::setDevices(const QHash<QString, QStringList> &_devices)
+{
+    qCDebug(LOG_AW) << "Devices" << _devices;
+
+    m_devices = _devices;
+}

sources/awesome-widget/plugin/awdataenginemapper.h

@@ -0,0 +1,50 @@
+/***************************************************************************
+ *   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 "awkeysaggregator.h"
+
+
+class AWFormatterHelper;
+
+class AWDataEngineMapper : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AWDataEngineMapper(QObject *_parent = nullptr, AWFormatterHelper *_custom = nullptr);
+    ~AWDataEngineMapper() override = default;
+    // get methods
+    [[nodiscard]] AWKeysAggregator::FormatterType formatter(const QString &_key) const;
+    [[nodiscard]] QStringList keysFromSource(const QString &_source) const;
+    // set methods
+    QStringList registerSource(const QString &_source, KSysGuard::Unit _units, const QStringList &_keys);
+    void setDevices(const QHash<QString, QStringList> &_devices);
+
+private:
+    AWFormatterHelper *m_customFormatters = nullptr;
+    // variables
+    QHash<QString, QStringList> m_devices;
+    QHash<QString, AWKeysAggregator::FormatterType> m_formatter;
+    QMultiHash<QString, QString> m_map;
+};

sources/awesome-widget/plugin/awdatetimeformatter.cpp

@@ -1,84 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-
-#include "awdatetimeformatter.h"
-
-#include <QDateTime>
-#include <QSettings>
-
-#include "awdebug.h"
-
-
-AWDateTimeFormatter::AWDateTimeFormatter(QObject *parent,
-                                         const QString filename,
-                                         const QString section)
-    : AWAbstractFormatter(parent, filename, section)
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    init(filename, section);
-}
-
-
-AWDateTimeFormatter::AWDateTimeFormatter(QObject *parent, const QString format)
-    : AWAbstractFormatter(parent)
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    setFormat(format);
-}
-
-
-AWDateTimeFormatter::~AWDateTimeFormatter()
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-}
-
-
-QString AWDateTimeFormatter::convert(const QVariant &value) const
-{
-    qCDebug(LOG_AW) << "Convert value" << value;
-
-    return value.toDateTime().toString(m_format);
-}
-
-
-QString AWDateTimeFormatter::format() const
-{
-    return m_format;
-}
-
-
-void AWDateTimeFormatter::setFormat(const QString _format)
-{
-    qCDebug(LOG_AW) << "Set format" << _format;
-
-    m_format = _format;
-}
-
-
-void AWDateTimeFormatter::init(const QString filename, const QString section)
-{
-    qCDebug(LOG_AW) << "Looking for section" << section << "in" << filename;
-
-    QSettings settings(filename, QSettings::IniFormat);
-
-    settings.beginGroup(section);
-    setFormat(settings.value(QString("Format"), QString()).toString());
-    settings.endGroup();
-}

sources/awesome-widget/plugin/awdbusadaptor.cpp

@@ -0,0 +1,101 @@
+/***************************************************************************
+ *   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 "awdbusadaptor.h"
+
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+
+#include "awdebug.h"
+#include "awkeys.h"
+
+
+AWDBusAdaptor::AWDBusAdaptor(AWKeys *_parent)
+    : QDBusAbstractAdaptor(_parent)
+    , m_plugin(_parent)
+{
+    qCDebug(LOG_DBUS) << __PRETTY_FUNCTION__;
+}
+
+
+QStringList AWDBusAdaptor::ActiveServices()
+{
+    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;
+    });
+}
+
+
+QString AWDBusAdaptor::Info(const QString &key) const
+{
+    return m_plugin->infoByKey(key);
+}
+
+
+QStringList AWDBusAdaptor::Keys(const QString &regexp) const
+{
+    return m_plugin->dictKeys(true, regexp);
+}
+
+
+QString AWDBusAdaptor::Value(const QString &key) const
+{
+    return m_plugin->valueByKey(key);
+}
+
+
+qlonglong AWDBusAdaptor::WhoAmI() const
+{
+    return reinterpret_cast<qlonglong>(m_plugin);
+}
+
+
+void AWDBusAdaptor::SetLogLevel(const QString &what, const int level)
+{
+    qCDebug(LOG_DBUS) << "Set log level" << level << "for" << what;
+
+    if (level >= m_logLevels.count()) {
+        qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be less than" << m_logLevels.count();
+        return;
+    }
+
+    for (auto &lev : m_logLevels)
+        SetLogLevel(what, lev, m_logLevels.indexOf(lev) >= level);
+}
+
+
+void AWDBusAdaptor::SetLogLevel(const QString &what, const QString &level, const bool enabled)
+{
+    qCDebug(LOG_DBUS) << "Set log level" << level << "enabled" << enabled << "for" << what;
+
+    if (!m_logLevels.contains(level)) {
+        qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be in" << m_logLevels;
+        return;
+    }
+
+    auto state = enabled ? "true" : "false";
+    QLoggingCategory::setFilterRules(QString("%1.%2=%3").arg(what, level, state));
+}

sources/awesome-widget/plugin/awdbusadaptor.h

@@ -0,0 +1,50 @@
+/***************************************************************************
+ *   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 <QDBusAbstractAdaptor>
+
+#include "version.h"
+
+
+class AWKeys;
+
+class AWDBusAdaptor : public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", AWDBUS_SERVICE_NAME)
+
+public:
+    explicit AWDBusAdaptor(AWKeys *_parent = nullptr);
+    ~AWDBusAdaptor() override = default;
+
+public slots:
+    // get methods
+    [[nodiscard]] static QStringList ActiveServices();
+    [[nodiscard]] QString Info(const QString &key) const;
+    [[nodiscard]] QStringList Keys(const QString &regexp) const;
+    [[nodiscard]] QString Value(const QString &key) const;
+    [[nodiscard]] qlonglong WhoAmI() const;
+    // set methods
+    void SetLogLevel(const QString &what, int level);
+    void SetLogLevel(const QString &what, const QString &level, bool enabled);
+
+private:
+    AWKeys *m_plugin = nullptr;
+    QStringList m_logLevels = {"debug", "info", "warning", "critical"};
+};

sources/awesome-widget/plugin/awesomewidget.cpp

@@ -20,9 +20,11 @@
 #include <QtQml>
 
 #include "awactions.h"
+#include "awbugreporter.h"
 #include "awconfighelper.h"
-#include "awdataengineaggregator.h"
 #include "awkeys.h"
+#include "awpairconfigfactory.h"
+#include "awtelemetryhandler.h"
 
 
 void AWPlugin::registerTypes(const char *uri)
@@ -30,6 +32,9 @@ void AWPlugin::registerTypes(const char *uri)
     Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.awesomewidget"));
 
     qmlRegisterType<AWActions>(uri, 1, 0, "AWActions");
+    qmlRegisterType<AWBugReporter>(uri, 1, 0, "AWBugReporter");
     qmlRegisterType<AWConfigHelper>(uri, 1, 0, "AWConfigHelper");
+    qmlRegisterType<AWPairConfigFactory>(uri, 1, 0, "AWPairConfigFactory");
     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/  *
  ***************************************************************************/
 
-
-#ifndef AWPLUGIN_H
-#define AWPLUGIN_H
+#pragma once
 
 #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/awfloatformatter.cpp

@@ -1,176 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-
-#include "awfloatformatter.h"
-
-#include <QSettings>
-
-#include "awdebug.h"
-
-
-AWFloatFormatter::AWFloatFormatter(QObject *parent, const QString filename,
-                                   const QString section)
-    : AWAbstractFormatter(parent, filename, section)
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    init(filename, section);
-}
-
-
-AWFloatFormatter::AWFloatFormatter(QObject *parent, const QChar fillChar,
-                                   const char format, const double multiplier,
-                                   const int precision, const double summand,
-                                   const int width)
-    : AWAbstractFormatter(parent)
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    setFillChar(fillChar);
-    setFormat(format);
-    setMultiplier(multiplier);
-    setPrecision(precision);
-    setSummand(summand);
-    setWidth(width);
-}
-
-
-AWFloatFormatter::~AWFloatFormatter()
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-}
-
-
-QString AWFloatFormatter::convert(const QVariant &value) const
-{
-    qCDebug(LOG_AW) << "Convert value" << value;
-
-    return QString("%1").arg(value.toDouble() * m_multiplier + m_summand,
-                             m_width, m_format, m_precision, m_fillChar);
-}
-
-
-QChar AWFloatFormatter::fillChar() const
-{
-    return m_fillChar;
-}
-
-
-char AWFloatFormatter::format() const
-{
-    return m_format;
-}
-
-
-double AWFloatFormatter::multiplier() const
-{
-    return m_multiplier;
-}
-
-
-int AWFloatFormatter::precision() const
-{
-    return m_precision;
-}
-
-
-double AWFloatFormatter::summand() const
-{
-    return m_summand;
-}
-
-
-int AWFloatFormatter::width() const
-{
-    return m_width;
-}
-
-
-void AWFloatFormatter::setFillChar(const QChar _fillChar)
-{
-    qCDebug(LOG_AW) << "Set char" << _fillChar;
-
-    m_fillChar = _fillChar;
-}
-
-
-void AWFloatFormatter::setFormat(char _format)
-{
-    qCDebug(LOG_AW) << "Set format" << _format;
-    // http://doc.qt.io/qt-5/qstring.html#argument-formats
-    if ((_format != 'e') && (_format != 'E') && (_format != 'f')
-        && (_format != 'g') && (_format != 'G')) {
-        qCWarning(LOG_AW) << "Invalid format" << _format;
-        _format = 'f';
-    }
-
-    m_format = _format;
-}
-
-
-void AWFloatFormatter::setMultiplier(const double _multiplier)
-{
-    qCDebug(LOG_AW) << "Set multiplier" << _multiplier;
-
-    m_multiplier = _multiplier;
-}
-
-
-void AWFloatFormatter::setPrecision(const int _precision)
-{
-    qCDebug(LOG_AW) << "Set precision" << _precision;
-
-    m_precision = _precision;
-}
-
-
-void AWFloatFormatter::setSummand(const double _summand)
-{
-    qCDebug(LOG_AW) << "Set summand" << _summand;
-
-    m_summand = _summand;
-}
-
-
-void AWFloatFormatter::setWidth(const int _width)
-{
-    qCDebug(LOG_AW) << "Set width" << _width;
-
-    m_width = _width;
-}
-
-
-void AWFloatFormatter::init(const QString filename, const QString section)
-{
-    qCDebug(LOG_AW) << "Looking for section" << section << "in" << filename;
-
-    QSettings settings(filename, QSettings::IniFormat);
-
-    settings.beginGroup(section);
-    setFillChar(
-        settings.value(QString("FillChar"), QString()).toString().at(0));
-    setFormat(settings.value(QString("Format"), QString("f"))
-                  .toString()
-                  .at(0)
-                  .toLatin1());
-    setMultiplier(settings.value(QString("Multiplier"), 1.0).toDouble());
-    setPrecision(settings.value(QString("Precision"), -1).toInt());
-    setSummand(settings.value(QString("Summand"), 0.0).toDouble());
-    setWidth(settings.value(QString("Width"), 0).toInt());
-    settings.endGroup();
-}

sources/awesome-widget/plugin/awformatterconfig.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 "awformatterconfig.h"
+
+#include "awdebug.h"
+#include "awformatterhelper.h"
+
+
+AWFormatterConfig::AWFormatterConfig(QWidget *_parent, const QStringList &_keys)
+    : AWAbstractPairConfig(_parent, true, _keys)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    setEditable(false, false);
+    setHelper(std::make_unique<AWFormatterHelper>());
+}

sources/awesome-widget/plugin/awformatterconfig.h

@@ -0,0 +1,30 @@
+/***************************************************************************
+ *   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 "awabstractpairconfig.h"
+
+
+class AWFormatterConfig : public AWAbstractPairConfig
+{
+    Q_OBJECT
+
+public:
+    explicit AWFormatterConfig(QWidget *_parent = nullptr, const QStringList &_keys = QStringList());
+    ~AWFormatterConfig() override = default;
+};

sources/awesome-widget/plugin/awformatterhelper.cpp

@@ -17,27 +17,29 @@
 
 #include "awformatterhelper.h"
 
-#include <QSettings>
-#include <QStandardPaths>
+#include <KI18n/KLocalizedString>
+
+#include <QDir>
+#include <QInputDialog>
+#include <QSettings>
 
-#include "awdebug.h"
 #include "awdatetimeformatter.h"
+#include "awdebug.h"
 #include "awfloatformatter.h"
+#include "awjsonformatter.h"
+#include "awlistformatter.h"
 #include "awnoformatter.h"
 #include "awscriptformatter.h"
+#include "awstringformatter.h"
 
 
-AWFormatterHelper::AWFormatterHelper(QObject *parent)
-    : QObject(parent)
+AWFormatterHelper::AWFormatterHelper(QObject *_parent)
+    : AbstractExtItemAggregator(_parent, "formatters")
+    , AWAbstractPairHelper("awesomewidgets/formatters/formatters.ini", "Formatters")
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    m_genericConfig = QString("%1/awesomewidgets/general.ini")
-                          .arg(QStandardPaths::writableLocation(
-                              QStandardPaths::GenericDataLocation));
-#ifdef BUILD_FUTURE
-    init();
-#endif /* BUILD_FUTURE */
+    AWFormatterHelper::initItems();
 }
 
 
@@ -46,16 +48,32 @@ AWFormatterHelper::~AWFormatterHelper()
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
     m_formatters.clear();
+    m_formattersClasses.clear();
 }
 
 
-QString AWFormatterHelper::convert(const QVariant &value,
-                                   const QString name) const
+void AWFormatterHelper::initItems()
 {
-    qCDebug(LOG_AW) << "Convert value" << value << "for" << name;
+    initFormatters();
 
-    return m_formatters.contains(name) ? m_formatters[name]->convert(value)
-                                       : value.toString();
+    // 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) : _value.toString();
 }
 
 
@@ -65,61 +83,157 @@ QStringList AWFormatterHelper::definedFormatters() const
 }
 
 
-AWFormatterHelper::FormatterClass
-AWFormatterHelper::defineFormatterClass(const QString name) const
+QList<AbstractExtItem *> AWFormatterHelper::items() const
 {
-    qCDebug(LOG_AW) << "Define formatter class for" << name;
+    QList<AbstractExtItem *> converted;
+    for (auto item : m_formattersClasses.values())
+        converted.append(item);
 
-    QSettings settings(m_genericConfig, QSettings::IniFormat);
+    return converted;
+}
 
-    settings.beginGroup(name);
-    QString stringType
-        = settings.value(QString("Type"), QString("NoFormat")).toString();
-    settings.endGroup();
 
-    FormatterClass formatter = FormatterClass::NoFormat;
-    if (stringType == QString("DateTime"))
-        formatter = FormatterClass::DateTime;
-    else if (stringType == QString("Float"))
-        formatter = FormatterClass::Float;
-    else if (stringType == QString("Script"))
-        formatter = FormatterClass::Script;
+void AWFormatterHelper::editPairs()
+{
+    return editItems();
+}
+
+
+QStringList AWFormatterHelper::leftKeys()
+{
+    return {};
+}
+
+
+QStringList AWFormatterHelper::rightKeys()
+{
+    return m_formattersClasses.keys();
+}
+
+
+void AWFormatterHelper::editItems()
+{
+    auto ret = exec();
+    qCInfo(LOG_AW) << "Dialog returns" << ret;
+}
+
+
+AWAbstractFormatter::FormatterClass AWFormatterHelper::defineFormatterClass(const QString &_stringType)
+{
+    qCDebug(LOG_AW) << "Define formatter class for" << _stringType;
+
+    auto formatter = AWAbstractFormatter::FormatterClass::NoFormat;
+    if (_stringType == "DateTime")
+        formatter = AWAbstractFormatter::FormatterClass::DateTime;
+    else if (_stringType == "Float")
+        formatter = AWAbstractFormatter::FormatterClass::Float;
+    else if (_stringType == "List")
+        formatter = AWAbstractFormatter::FormatterClass::List;
+    else if (_stringType == "NoFormat")
+        ;
+    else if (_stringType == "Script")
+        formatter = AWAbstractFormatter::FormatterClass::Script;
+    else if (_stringType == "String")
+        formatter = AWAbstractFormatter::FormatterClass::String;
+    else if (_stringType == "Json")
+        formatter = AWAbstractFormatter::FormatterClass::Json;
     else
-        qCWarning(LOG_AW) << "Unknown formatter" << stringType;
+        qCWarning(LOG_AW) << "Unknown formatter" << _stringType;
 
     return formatter;
 }
 
 
-void AWFormatterHelper::init()
+void AWFormatterHelper::initFormatters()
 {
-    QSettings settings(m_genericConfig, QSettings::IniFormat);
+    m_formattersClasses.clear();
 
-    settings.beginGroup(QString("Formatters"));
-    QStringList keys = settings.childKeys();
-    for (auto key : keys) {
-        QString name = settings.value(key).toString();
-        FormatterClass formatter = defineFormatterClass(name);
-        qCInfo(LOG_AW) << "Found formatter" << name << "for key" << key
-                       << "defined as" << static_cast<int>(formatter);
+    auto dirs = directories();
+    for (auto &dir : dirs) {
+        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" << dir;
+            auto filePath = QString("%1/%2").arg(dir, file);
+            // check if already exists
+            auto values = m_formattersClasses.values();
+            if (std::any_of(values.cbegin(), values.cend(),
+                            [&filePath](auto item) { return (item->filePath() == filePath); }))
+                continue;
 
-        switch (formatter) {
-        case FormatterClass::DateTime:
-            m_formatters[key]
-                = new AWDateTimeFormatter(this, m_genericConfig, name);
+            auto metadata = readMetadata(filePath);
+            switch (metadata.second) {
+            case AWAbstractFormatter::FormatterClass::DateTime:
+                m_formattersClasses[metadata.first] = new AWDateTimeFormatter(this, filePath);
                 break;
-        case FormatterClass::Float:
-            m_formatters[key]
-                = new AWFloatFormatter(this, m_genericConfig, name);
+            case AWAbstractFormatter::FormatterClass::Float:
+                m_formattersClasses[metadata.first] = new AWFloatFormatter(this, filePath);
                 break;
-        case FormatterClass::Script:
-            m_formatters[key]
-                = new AWScriptFormatter(this, m_genericConfig, name);
+            case AWAbstractFormatter::FormatterClass::List:
+                m_formattersClasses[metadata.first] = new AWListFormatter(this, filePath);
                 break;
-        case FormatterClass::NoFormat:
-            m_formatters[key] = new AWNoFormatter(this, m_genericConfig, name);
+            case AWAbstractFormatter::FormatterClass::Script:
+                m_formattersClasses[metadata.first] = new AWScriptFormatter(this, filePath);
+                break;
+            case AWAbstractFormatter::FormatterClass::String:
+                m_formattersClasses[metadata.first] = new AWStringFormatter(this, filePath);
+                break;
+            case AWAbstractFormatter::FormatterClass::Json:
+                m_formattersClasses[metadata.first] = new AWJsonFormatter(this, filePath);
+                break;
+            case AWAbstractFormatter::FormatterClass::NoFormat:
+                m_formattersClasses[metadata.first] = new AWNoFormatter(this, filePath);
                 break;
             }
         }
+    }
+}
+
+
+QPair<QString, AWAbstractFormatter::FormatterClass> AWFormatterHelper::readMetadata(const QString &_filePath)
+{
+    qCDebug(LOG_AW) << "Read initial parameters from" << _filePath;
+
+    QSettings settings(_filePath, QSettings::IniFormat);
+
+    settings.beginGroup("Desktop Entry");
+    auto name = settings.value("Name", _filePath).toString();
+    auto type = settings.value("X-AW-Type", "NoFormat").toString();
+    auto formatter = defineFormatterClass(type);
     settings.endGroup();
+
+    return {name, formatter};
+}
+
+
+void AWFormatterHelper::doCreateItem(QListWidget *_widget)
+{
+    QStringList selection = {"NoFormat", "DateTime", "Float", "List", "Script", "String", "Json"};
+    bool ok;
+    auto select = QInputDialog::getItem(nullptr, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok);
+    if (!ok) {
+        qCWarning(LOG_AW) << "No type selected";
+        return;
+    }
+
+    qCInfo(LOG_AW) << "Selected type" << select;
+    auto formatter = defineFormatterClass(select);
+    switch (formatter) {
+    case AWAbstractFormatter::FormatterClass::DateTime:
+        return createItem<AWDateTimeFormatter>(_widget);
+    case AWAbstractFormatter::FormatterClass::Float:
+        return createItem<AWFloatFormatter>(_widget);
+    case AWAbstractFormatter::FormatterClass::List:
+        return createItem<AWListFormatter>(_widget);
+    case AWAbstractFormatter::FormatterClass::Script:
+        return createItem<AWScriptFormatter>(_widget);
+    case AWAbstractFormatter::FormatterClass::String:
+        return createItem<AWStringFormatter>(_widget);
+    case AWAbstractFormatter::FormatterClass::Json:
+        return createItem<AWJsonFormatter>(_widget);
+    case AWAbstractFormatter::FormatterClass::NoFormat:
+        return createItem<AWNoFormatter>(_widget);
+    }
 }

sources/awesome-widget/plugin/awformatterhelper.h

@@ -15,35 +15,42 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
+#pragma once
 
-#ifndef AWFORMATTERHELPER_H
-#define AWFORMATTERHELPER_H
-
-#include <QObject>
-
+#include "abstractextitemaggregator.h"
 #include "awabstractformatter.h"
+#include "awabstractpairhelper.h"
 
 
-class AWFormatterHelper : public QObject
+class AWFormatterHelper : public AbstractExtItemAggregator, public AWAbstractPairHelper
 {
     Q_OBJECT
 
 public:
-    enum class FormatterClass { DateTime, Float, Script, NoFormat };
+    explicit AWFormatterHelper(QObject *_parent = nullptr);
+    ~AWFormatterHelper() override;
+    // read-write methods
+    void initItems() override;
+    // methods
+    [[nodiscard]] QString convert(const QVariant &_value, const QString &_name) const;
+    [[nodiscard]] QStringList definedFormatters() const;
+    [[nodiscard]] QList<AbstractExtItem *> items() const override;
+    // configuration related
+    void editPairs() override;
+    QStringList leftKeys() override;
+    QStringList rightKeys() override;
 
-    explicit AWFormatterHelper(QObject *parent = nullptr);
-    virtual ~AWFormatterHelper();
-    QString convert(const QVariant &value, const QString name) const;
-    QStringList definedFormatters() const;
+public slots:
+    void editItems();
 
 private:
-    AWFormatterHelper::FormatterClass
-    defineFormatterClass(const QString name) const;
-    void init();
+    // methods
+    static AWAbstractFormatter::FormatterClass defineFormatterClass(const QString &_stringType);
+    void initFormatters();
+    [[nodiscard]] static QPair<QString, AWAbstractFormatter::FormatterClass> readMetadata(const QString &_filePath);
+    // parent methods
+    void doCreateItem(QListWidget *_widget) override;
     // properties
-    QString m_genericConfig;
     QHash<QString, AWAbstractFormatter *> m_formatters;
+    QHash<QString, AWAbstractFormatter *> m_formattersClasses;
 };
-
-
-#endif /* AWFORMATTERHELPER_H */

sources/awesome-widget/plugin/awkeycache.cpp

@@ -15,64 +15,47 @@
  *   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>
 
 #include "awdebug.h"
 
 
-bool AWKeyCache::addKeyToCache(const QString type, const QString key)
+bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
 {
-    qCDebug(LOG_AW) << "Key" << key << "with type" << type;
+    qCDebug(LOG_AW) << "Key" << _key << "with type" << _type;
 
-    QString fileName = QString("%1/awesomewidgets.ndx")
-                           .arg(QStandardPaths::writableLocation(
-                               QStandardPaths::GenericCacheLocation));
+    auto fileName
+        = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
     qCInfo(LOG_AW) << "Cache file" << fileName;
     QSettings cache(fileName, QSettings::IniFormat);
 
-    cache.beginGroup(type);
+    cache.beginGroup(_type);
     QStringList cachedValues;
-    for (auto key : cache.allKeys())
-        cachedValues.append(cache.value(key).toString());
+    for (auto &number : cache.allKeys())
+        cachedValues.append(cache.value(number).toString());
 
-    if (type == QString("hdd")) {
-        QStringList allDevices
-            = QDir(QString("/dev")).entryList(QDir::System, QDir::Name);
-        QStringList devices
-            = allDevices.filter(QRegExp(QString("^[hms]d[a-z]$")));
-        for (auto dev : devices) {
-            QString device = QString("/dev/%1").arg(dev);
+    if (_type == "net") {
+        auto rawInterfaceList = QNetworkInterface::allInterfaces();
+        for (auto &interface : rawInterfaceList) {
+            auto device = interface.name();
             if (cachedValues.contains(device))
                 continue;
-            qCInfo(LOG_AW) << "Found new key" << device << "for type" << type;
-            cache.setValue(
-                QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')),
-                device);
-        }
-    } else if (type == QString("net")) {
-        QList<QNetworkInterface> rawInterfaceList
-            = QNetworkInterface::allInterfaces();
-        for (auto interface : rawInterfaceList) {
-            QString device = interface.name();
-            if (cachedValues.contains(device))
-                continue;
-            qCInfo(LOG_AW) << "Found new key" << device << "for type" << type;
-            cache.setValue(
-                QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')),
-                device);
+            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 (cachedValues.contains(key))
+        if (cachedValues.contains(_key))
             return false;
-        qCInfo(LOG_AW) << "Found new key" << key << "for type" << type;
-        cache.setValue(
-            QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), key);
+        qCInfo(LOG_AW) << "Found new key" << _key << "for type" << _type;
+        cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), _key);
     }
     cache.endGroup();
 
@@ -81,103 +64,99 @@ bool AWKeyCache::addKeyToCache(const QString type, const QString key)
 }
 
 
-QStringList AWKeyCache::getRequiredKeys(const QStringList &keys,
-                                        const QStringList &bars,
-                                        const QVariantMap &tooltip,
-                                        const QStringList &allKeys)
+QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringList &_bars, const QVariantMap &_tooltip,
+                                        const QStringList &_userKeys, const QStringList &_allKeys)
 {
-    qCDebug(LOG_AW) << "Looking for required keys in" << keys << bars
-                    << "using tooltip settings" << tooltip;
+    qCDebug(LOG_AW) << "Looking for required keys in" << _keys << _bars << "using tooltip settings" << _tooltip;
 
     // initial copy
-    QSet<QString> used = QSet<QString>::fromList(keys);
-    used.unite(QSet<QString>::fromList(bars));
+    QSet<QString> used(_keys.cbegin(), _keys.cend());
+    used.unite(QSet(_bars.cbegin(), _bars.cend()));
+    used.unite(QSet(_userKeys.cbegin(), _userKeys.cend()));
     // insert keys from tooltip
-    for (auto key : tooltip.keys()) {
-        if ((key.endsWith(QString("Tooltip"))) && (tooltip[key].toBool())) {
-            key.remove(QString("Tooltip"));
-            used << key;
+    for (auto [key, value] : _tooltip.asKeyValueRange()) {
+        if ((key.endsWith("Tooltip")) && value.toBool()) {
+            auto local = key;
+            local.remove("Tooltip");
+            used << local;
         }
     }
 
     // insert depending keys, refer to AWKeys::calculateValues()
     // hddtotmb*
-    for (auto key : allKeys.filter(QRegExp(QString("^hddtotmb")))) {
+    for (auto &key : _allKeys.filter(QRegularExpression("^hddtotmb"))) {
         if (!used.contains(key))
             continue;
-        key.remove(QString("hddtotmb"));
-        int index = key.toInt();
-        used << QString("hddfreemb%1").arg(index)
-             << QString("hddmb%1").arg(index);
+        key.remove("hddtotmb");
+        auto index = key.toInt();
+        used << QString("hddfreemb%1").arg(index) << QString("hddmb%1").arg(index);
     }
     // hddtotgb*
-    for (auto key : allKeys.filter(QRegExp(QString("^hddtotgb")))) {
+    for (auto &key : _allKeys.filter(QRegularExpression("^hddtotgb"))) {
         if (!used.contains(key))
             continue;
-        key.remove(QString("hddtotgb"));
-        int index = key.toInt();
-        used << QString("hddfreegb%1").arg(index)
-             << QString("hddgb%1").arg(index);
+        key.remove("hddtotgb");
+        auto index = key.toInt();
+        used << QString("hddfreegb%1").arg(index) << QString("hddgb%1").arg(index);
     }
     // mem
-    if (used.contains(QString("mem")))
-        used << QString("memmb") << QString("memtotmb");
+    if (used.contains("mem"))
+        used << "memmb"
+             << "memtotmb";
     // memtotmb
-    if (used.contains(QString("memtotmb")))
-        used << QString("memusedmb") << QString("memfreemb");
+    if (used.contains("memtotmb"))
+        used << "memusedmb"
+             << "memfreemb";
     // memtotgb
-    if (used.contains(QString("memtotgb")))
-        used << QString("memusedgb") << QString("memfreegb");
+    if (used.contains("memtotgb"))
+        used << "memusedgb"
+             << "memfreegb";
     // swap
-    if (used.contains(QString("swap")))
-        used << QString("swapmb") << QString("swaptotmb");
+    if (used.contains("swap"))
+        used << "swapmb"
+             << "swaptotmb";
     // swaptotmb
-    if (used.contains(QString("swaptotmb")))
-        used << QString("swapmb") << QString("swapfreemb");
+    if (used.contains("swaptotmb"))
+        used << "swapmb"
+             << "swapfreemb";
     // memtotgb
-    if (used.contains(QString("swaptotgb")))
-        used << QString("swapgb") << QString("swapfreegb");
+    if (used.contains("swaptotgb"))
+        used << "swapgb"
+             << "swapfreegb";
     // network keys
-    QStringList netKeys(QStringList()
-                        << QString("up") << QString("upkb")
-                        << QString("uptotal") << QString("uptotalkb")
-                        << QString("upunits") << QString("down")
-                        << QString("downkb") << QString("downtotal")
-                        << QString("downtotalkb") << QString("downunits"));
-    for (auto key : netKeys) {
+    QStringList netKeys(
+        {"up", "upkb", "uptot", "uptotkb", "upunits", "down", "downkb", "downtot", "downtotkb", "downunits"});
+    for (auto &key : netKeys) {
         if (!used.contains(key))
             continue;
-        QStringList filt
-            = allKeys.filter(QRegExp(QString("^%1[0-9]{1,}").arg(key)));
-        for (auto filtered : filt)
+        auto filt = _allKeys.filter(QRegularExpression(QString("^%1[0-9]{1,}").arg(key)));
+        for (auto &filtered : filt)
             used << filtered;
     }
     // netdev key
-    if (std::any_of(netKeys.cbegin(), netKeys.cend(),
-                    [&used](const QString &key) { return used.contains(key); }))
-        used << QString("netdev");
+    if (std::any_of(netKeys.cbegin(), netKeys.cend(), [&used](auto &key) { return used.contains(key); }))
+        used << "netdev";
 
     // HACK append dummy if there are no other keys. This hack is required
     // because empty list leads to the same behaviour as skip checking
     if (used.isEmpty())
-        used << QString("dummy");
+        used << "dummy";
 
-    return used.toList();
+    return used.values();
 }
 
 
 QHash<QString, QStringList> AWKeyCache::loadKeysFromCache()
 {
-    QString fileName = QString("%1/awesomewidgets.ndx")
-                           .arg(QStandardPaths::writableLocation(
-                               QStandardPaths::GenericCacheLocation));
+    auto fileName
+        = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
     qCInfo(LOG_AW) << "Cache file" << fileName;
     QSettings cache(fileName, QSettings::IniFormat);
 
     QHash<QString, QStringList> devices;
-    for (auto group : cache.childGroups()) {
+    for (auto &group : cache.childGroups()) {
         cache.beginGroup(group);
-        for (auto key : cache.allKeys())
+        for (auto &key : cache.allKeys())
             devices[group].append(cache.value(key).toString());
         cache.endGroup();
     }

sources/awesome-widget/plugin/awkeycache.h

@@ -15,9 +15,7 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-
-#ifndef AWKEYCACHE_H
-#define AWKEYCACHE_H
+#pragma once
 
 #include <QHash>
 #include <QString>
@@ -26,12 +24,8 @@
 
 namespace AWKeyCache
 {
-bool addKeyToCache(const QString type, const QString key = QString(""));
-QStringList getRequiredKeys(const QStringList &keys, const QStringList &bars,
-                            const QVariantMap &tooltip,
-                            const QStringList &allKeys);
+bool addKeyToCache(const QString &_type, const QString &_key = "");
+QStringList getRequiredKeys(const QStringList &_keys, const QStringList &_bars, const QVariantMap &_tooltip,
+                            const QStringList &_userKeys, const QStringList &_allKeys);
 QHash<QString, QStringList> loadKeysFromCache();
-};
-
-
-#endif /* AWKEYCACHE_H */
+} // namespace AWKeyCache

sources/awesome-widget/plugin/awkeyoperations.cpp

@@ -18,14 +18,15 @@
 #include "awkeyoperations.h"
 
 #include <QDir>
-#include <QJSEngine>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QThread>
 
+#include "awcustomkeyshelper.h"
 #include "awdebug.h"
 #include "awkeycache.h"
 #include "awpatternfunctions.h"
 // extensions
+#include "extnetworkrequest.h"
 #include "extquotes.h"
 #include "extscript.h"
 #include "extupgrade.h"
@@ -33,31 +34,26 @@
 #include "graphicalitem.h"
 
 
-AWKeyOperations::AWKeyOperations(QObject *parent)
-    : QObject(parent)
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-}
-
-
-AWKeyOperations::~AWKeyOperations()
+AWKeyOperations::AWKeyOperations(QObject *_parent)
+    : QObject(_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    // extensions
-    delete graphicalItems;
-    delete extQuotes;
-    delete extScripts;
-    delete extUpgrade;
-    delete extWeather;
+    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");
 }
 
 
-QStringList AWKeyOperations::devices(const QString type) const
+QStringList AWKeyOperations::devices(const QString &_type) const
 {
-    qCDebug(LOG_AW) << "Looking for type" << type;
+    qCDebug(LOG_AW) << "Looking for type" << _type;
 
-    return m_devices[type];
+    return m_devices[_type];
 }
 
 
@@ -70,8 +66,7 @@ QHash<QString, QStringList> AWKeyOperations::devices() const
 void AWKeyOperations::updateCache()
 {
     // update network and hdd list
-    addKeyToCache(QString("hdd"));
-    addKeyToCache(QString("net"));
+    addKeyToCache("net");
 }
 
 
@@ -79,30 +74,29 @@ QStringList AWKeyOperations::dictKeys() const
 {
     QStringList allKeys;
     // weather
-    for (int i = extWeather->activeItems().count() - 1; i >= 0; i--) {
-        allKeys.append(
-            extWeather->activeItems().at(i)->tag(QString("weatherId")));
-        allKeys.append(
-            extWeather->activeItems().at(i)->tag(QString("weather")));
-        allKeys.append(
-            extWeather->activeItems().at(i)->tag(QString("humidity")));
-        allKeys.append(
-            extWeather->activeItems().at(i)->tag(QString("pressure")));
-        allKeys.append(
-            extWeather->activeItems().at(i)->tag(QString("temperature")));
-        allKeys.append(
-            extWeather->activeItems().at(i)->tag(QString("timestamp")));
+    for (auto item : m_extWeather->activeItems()) {
+        allKeys.append(item->tag("weatherId"));
+        allKeys.append(item->tag("weather"));
+        allKeys.append(item->tag("humidity"));
+        allKeys.append(item->tag("pressure"));
+        allKeys.append(item->tag("temperature"));
+        allKeys.append(item->tag("timestamp"));
     }
     // cpuclock & cpu
-    for (int i = QThread::idealThreadCount() - 1; i >= 0; 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 = m_devices[QString("temp")].count() - 1; i >= 0; i--)
+    for (auto i = 0; i < m_devices["temp"].count(); ++i)
         allKeys.append(QString("temp%1").arg(i));
+    // gpu
+    for (auto i = 0; i < m_devices["gpu"].count(); ++i) {
+        allKeys.append(QString("gpu%1").arg(i));
+        allKeys.append(QString("gputemp%1").arg(i));
+    }
     // hdd
-    for (int i = m_devices[QString("mount")].count() - 1; i >= 0; 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));
@@ -112,64 +106,62 @@ QStringList AWKeyOperations::dictKeys() const
         allKeys.append(QString("hdd%1").arg(i));
     }
     // hdd speed
-    for (int i = m_devices[QString("disk")].count() - 1; i >= 0; 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 = m_devices[QString("hdd")].count() - 1; i >= 0; i--)
-        allKeys.append(QString("hddtemp%1").arg(i));
     // network
-    for (int i = m_devices[QString("net")].count() - 1; i >= 0; i--) {
+    for (auto i = 0; i < m_devices["net"].count(); ++i) {
         allKeys.append(QString("downunits%1").arg(i));
         allKeys.append(QString("upunits%1").arg(i));
-        allKeys.append(QString("downtotalkb%1").arg(i));
-        allKeys.append(QString("downtotal%1").arg(i));
+        allKeys.append(QString("downtotkb%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("uptotal%1").arg(i));
+        allKeys.append(QString("uptotkb%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
-        = QDir(QString("/sys/class/power_supply"))
-              .entryList(QStringList() << QString("BAT*"),
-                         QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
-    for (int i = allBatteryDevices.count() - 1; i >= 0; i--)
+    auto allBatteryDevices = QDir("/sys/class/power_supply")
+                                 .entryList(QStringList({"BAT*"}), QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
+    for (int i = 0; i < allBatteryDevices.count(); ++i) {
         allKeys.append(QString("bat%1").arg(i));
+        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 (int i = extUpgrade->activeItems().count() - 1; i >= 0; i--)
-        allKeys.append(
-            extUpgrade->activeItems().at(i)->tag(QString("pkgcount")));
+    for (auto item : m_extUpgrade->activeItems())
+        allKeys.append(item->tag("pkgcount"));
     // quotes
-    for (int i = extQuotes->activeItems().count() - 1; i >= 0; i--) {
-        allKeys.append(extQuotes->activeItems().at(i)->tag(QString("ask")));
-        allKeys.append(extQuotes->activeItems().at(i)->tag(QString("askchg")));
-        allKeys.append(
-            extQuotes->activeItems().at(i)->tag(QString("percaskchg")));
-        allKeys.append(extQuotes->activeItems().at(i)->tag(QString("bid")));
-        allKeys.append(extQuotes->activeItems().at(i)->tag(QString("bidchg")));
-        allKeys.append(
-            extQuotes->activeItems().at(i)->tag(QString("percbidchg")));
-        allKeys.append(extQuotes->activeItems().at(i)->tag(QString("price")));
-        allKeys.append(
-            extQuotes->activeItems().at(i)->tag(QString("pricechg")));
-        allKeys.append(
-            extQuotes->activeItems().at(i)->tag(QString("percpricechg")));
+    for (auto item : m_extQuotes->activeItems()) {
+        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 (int i = extScripts->activeItems().count() - 1; i >= 0; i--)
-        allKeys.append(extScripts->activeItems().at(i)->tag(QString("custom")));
+    for (auto item : m_extScripts->activeItems())
+        allKeys.append(item->tag("custom"));
+    // network requests
+    for (auto item : m_extNetRequest->activeItems())
+        allKeys.append(item->tag("response"));
     // bars
-    for (int i = graphicalItems->activeItems().count() - 1; i >= 0; i--)
-        allKeys.append(
-            graphicalItems->activeItems().at(i)->tag(QString("bar")));
+    for (auto item : m_graphicalItems->activeItems())
+        allKeys.append(item->tag("bar"));
+    // user defined keys
+    allKeys.append(m_customKeys->keys());
     // static keys
-    QStringList staticKeys = QString(STATIC_KEYS).split(QChar(','));
-    std::for_each(staticKeys.cbegin(), staticKeys.cend(),
-                  [&allKeys](const QString &key) { allKeys.append(key); });
+    allKeys.append(QString(STATIC_KEYS).split(','));
+
+    // sort in valid order
+    allKeys.sort();
+    std::reverse(allKeys.begin(), allKeys.end());
 
     return allKeys;
 }
@@ -177,50 +169,95 @@ QStringList AWKeyOperations::dictKeys() const
 
 // this method is required to provide GraphicalItem functions (e.g. paint()) to
 // parent classes
-GraphicalItem *AWKeyOperations::giByKey(const QString key) const
+GraphicalItem *AWKeyOperations::giByKey(const QString &_key) const
 {
-    qCDebug(LOG_AW) << "Looking for item" << key;
+    qCDebug(LOG_AW) << "Looking for item" << _key;
 
-    return graphicalItems->itemByTag(key, QString("bar"));
+    return m_graphicalItems->itemByTag(_key, "bar");
 }
 
 
-QString AWKeyOperations::infoByKey(QString key) const
+QStringList AWKeyOperations::requiredUserKeys() const
 {
-    qCDebug(LOG_AW) << "Requested key" << key;
+    return m_customKeys->refinedSources();
+}
 
-    if (key.startsWith(QString("bar")))
-        return graphicalItems->itemByTag(key, QString("bar"))->uniq();
-    else if (key.startsWith(QString("custom")))
-        return extScripts->itemByTag(key, QString("custom"))->uniq();
-    else if (key.contains(QRegExp(QString("^hdd[rw]"))))
-        return QString("%1").arg(m_devices[QString(
-            "disk")][key.remove(QRegExp(QString("hdd[rw]"))).toInt()]);
-    else if (key.contains(QRegExp(
-                 QString("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)"))))
-        return QString("%1").arg(m_devices[QString(
-            "mount")][key
-                          .remove(QRegExp(QString(
-                              "^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)")))
-                          .toInt()]);
-    else if (key.startsWith(QString("hddtemp")))
-        return QString("%1").arg(
-            m_devices[QString("hdd")][key.remove(QString("hddtemp")).toInt()]);
-    else if (key.contains(QRegExp(QString("^(down|up)[0-9]"))))
-        return QString("%1").arg(m_devices[QString(
-            "net")][key.remove(QRegExp(QString("^(down|up)"))).toInt()]);
-    else if (key.startsWith(QString("pkgcount")))
-        return extUpgrade->itemByTag(key, QString("pkgcount"))->uniq();
-    else if (key.contains(QRegExp(QString("(^|perc)(ask|bid|price)(chg|)"))))
-        return extQuotes->itemByTag(key, QString("ask"))->uniq();
-    else if (key.contains(QRegExp(
-                 QString("(weather|weatherId|humidity|pressure|temperature)"))))
-        return extWeather->itemByTag(key, QString("weather"))->uniq();
-    else if (key.startsWith(QString("temp")))
-        return QString("%1").arg(
-            m_devices[QString("temp")][key.remove(QString("temp")).toInt()]);
 
-    return QString("(none)");
+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;
+
+    static auto numberRegExp = QRegularExpression("\\d+");
+
+    auto stripped = _key;
+    stripped.remove(numberRegExp);
+    QString output;
+
+    static auto hddRegExp = QRegularExpression("^hdd(|mb|gb|freemb|freegb|totmb|totgb)");
+    static auto hddrwRegExp = QRegularExpression("^hdd[rw]");
+    static auto hddMatchRegExp = QRegularExpression("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)");
+    static auto netRegExp = QRegularExpression("^(down|up)");
+    static auto netMatchRegExp = QRegularExpression("^(down|up)[0-9]");
+    static auto quotesRegExp = QRegularExpression("^(|perc)(ask|bid|price)(chg|)");
+    static auto weatherRegExp = QRegularExpression("^(weather|weatherId|humidity|pressure|temperature)");
+
+    if (_key.startsWith("bar")) {
+        auto item = m_graphicalItems->itemByTag(_key, stripped);
+        if (item)
+            output = item->uniq();
+    } else if (_key.startsWith("custom")) {
+        auto item = m_extScripts->itemByTag(_key, stripped);
+        if (item)
+            output = item->uniq();
+    } else if (_key.contains(hddrwRegExp)) {
+        auto index = _key;
+        index.remove(hddrwRegExp);
+        output = m_devices["disk"][index.toInt()];
+    } else if (_key.contains(hddMatchRegExp)) {
+        auto index = _key;
+        index.remove(hddRegExp);
+        output = m_devices["mount"][index.toInt()];
+    } else if (_key.contains(netMatchRegExp)) {
+        auto index = _key;
+        index.remove(netRegExp);
+        output = m_devices["net"][index.toInt()];
+    } else if (_key.startsWith("pkgcount")) {
+        auto item = m_extUpgrade->itemByTag(_key, stripped);
+        if (item)
+            output = item->uniq();
+    } else if (_key.contains(quotesRegExp)) {
+        auto item = m_extQuotes->itemByTag(_key, stripped);
+        if (item)
+            output = item->uniq();
+    } else if (_key.contains(weatherRegExp)) {
+        auto item = m_extWeather->itemByTag(_key, stripped);
+        if (item)
+            output = item->uniq();
+    } else if (_key.startsWith("temp")) {
+        auto index = _key;
+        index.remove("temp");
+        output = m_devices["temp"][index.toInt()];
+    } else if (_key.startsWith("response")) {
+        auto item = m_extNetRequest->itemByTag(_key, stripped);
+        if (item)
+            output = item->uniq();
+    } else {
+        output = "(none)";
+    }
+
+    return output;
 }
 
 
@@ -230,63 +267,72 @@ QString AWKeyOperations::pattern() const
 }
 
 
-void AWKeyOperations::setPattern(const QString currentPattern)
+void AWKeyOperations::setPattern(const QString &_currentPattern)
 {
-    qCDebug(LOG_AW) << "Set pattern" << currentPattern;
+    qCDebug(LOG_AW) << "Set pattern" << _currentPattern;
 
-    m_pattern = currentPattern;
+    m_pattern = _currentPattern;
 }
 
 
-void AWKeyOperations::editItem(const QString type)
+void AWKeyOperations::editItem(const QString &_type)
 {
-    qCDebug(LOG_AW) << "Item type" << type;
+    qCDebug(LOG_AW) << "Item type" << _type;
 
-    if (type == QString("graphicalitem")) {
-        QStringList keys = dictKeys().filter(QRegExp(
-            QString("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)")));
+    static auto supportsGraphicalRegExp = QRegularExpression("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)");
+
+    if (_type == "graphicalitem") {
+        auto keys = dictKeys().filter(supportsGraphicalRegExp);
         keys.sort();
-        graphicalItems->setConfigArgs(keys);
-        return graphicalItems->editItems();
-    } else if (type == QString("extquotes")) {
-        return extQuotes->editItems();
-    } else if (type == QString("extscript")) {
-        return extScripts->editItems();
-    } else if (type == QString("extupgrade")) {
-        return extUpgrade->editItems();
-    } else if (type == QString("extweather")) {
-        return extWeather->editItems();
+        m_graphicalItems->setConfigArgs(keys);
+        return m_graphicalItems->editItems();
+    } else if (_type == "extnetworkrequest") {
+        return m_extNetRequest->editItems();
+    } else if (_type == "extquotes") {
+        return m_extQuotes->editItems();
+    } else if (_type == "extscript") {
+        return m_extScripts->editItems();
+    } else if (_type == "extupgrade") {
+        return m_extUpgrade->editItems();
+    } else if (_type == "extweather") {
+        return m_extWeather->editItems();
     }
 }
 
 
-void AWKeyOperations::addDevice(const QString &source)
+void AWKeyOperations::addDevice(const QString &_source)
 {
-    qCDebug(LOG_AW) << "Source" << source;
+    qCDebug(LOG_AW) << "Source" << _source;
 
-    QRegExp diskRegexp
-        = QRegExp(QString("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)"));
-    QRegExp mountRegexp = QRegExp(QString("partitions/.*/filllevel"));
+    static auto diskRegexp = QRegularExpression("^disk/.*/read$");
+    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;
-        device.remove(QString("/Rate/rblk"));
-        addKeyToCache(QString("disk"), device);
-    } else if (source.contains(mountRegexp)) {
-        QString device = source;
-        device.remove(QString("partitions")).remove(QString("/filllevel"));
-        addKeyToCache(QString("mount"), device);
-    } else if (source.startsWith(QString("lmsensors"))) {
-        addKeyToCache(QString("temp"), source);
+    if (_source.contains(diskRegexp)) {
+        auto device = _source;
+        device.remove("disk/").remove("/read");
+        addKeyToCache("disk", device);
+    } else if (_source.contains(mountRegexp)) {
+        auto device = _source;
+        device.remove("disk/").remove("/usedPercent");
+        addKeyToCache("mount", device);
+    } 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);
     }
 }
 
 
-void AWKeyOperations::addKeyToCache(const QString type, const QString key)
+void AWKeyOperations::addKeyToCache(const QString &_type, const QString &_key)
 {
-    qCDebug(LOG_AW) << "Key" << key << "with type" << type;
+    qCDebug(LOG_AW) << "Key" << _key << "with type" << _type;
 
-    if (AWKeyCache::addKeyToCache(type, key)) {
+    if (AWKeyCache::addKeyToCache(_type, _key)) {
         m_devices = AWKeyCache::loadKeysFromCache();
         reinitKeys();
     }
@@ -295,34 +341,23 @@ void AWKeyOperations::addKeyToCache(const QString type, const QString key)
 
 void AWKeyOperations::reinitKeys()
 {
-    // renew extensions
-    // delete them if any
-    delete graphicalItems;
-    graphicalItems = nullptr;
-    delete extQuotes;
-    extQuotes = nullptr;
-    delete extScripts;
-    extScripts = nullptr;
-    delete extUpgrade;
-    extUpgrade = nullptr;
-    delete extWeather;
-    extWeather = nullptr;
-    // create
-    graphicalItems
-        = new ExtItemAggregator<GraphicalItem>(nullptr, QString("desktops"));
-    extQuotes = new ExtItemAggregator<ExtQuotes>(nullptr, QString("quotes"));
-    extScripts = new ExtItemAggregator<ExtScript>(nullptr, QString("scripts"));
-    extUpgrade = new ExtItemAggregator<ExtUpgrade>(nullptr, QString("upgrade"));
-    extWeather = new ExtItemAggregator<ExtWeather>(nullptr, QString("weather"));
+    m_customKeys->initItems();
+    m_graphicalItems->initItems();
+    m_extNetRequest->initItems();
+    m_extQuotes->initItems();
+    m_extScripts->initItems();
+    m_extUpgrade->initItems();
+    m_extWeather->initItems();
 
     // init
-    QStringList allKeys = dictKeys();
+    auto allKeys = dictKeys();
 
     // apply aw_* functions
     m_pattern = AWPatternFunctions::insertAllKeys(m_pattern, allKeys);
     m_pattern = AWPatternFunctions::insertKeyCount(m_pattern, allKeys);
     m_pattern = AWPatternFunctions::insertKeyNames(m_pattern, allKeys);
     m_pattern = AWPatternFunctions::insertKeys(m_pattern, allKeys);
+    m_pattern = AWPatternFunctions::insertMacros(m_pattern);
     // wrap templates
     m_pattern = AWPatternFunctions::expandTemplates(m_pattern);
 

sources/awesome-widget/plugin/awkeyoperations.h

@@ -15,27 +15,20 @@
  *   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"
 
 
-class AWDataAggregator;
-class AWDataEngineAggregator;
-class AWKeysAggregator;
+class AWCustomKeysHelper;
+class ExtNetworkRequest;
 class ExtQuotes;
 class ExtScript;
 class ExtUpgrade;
 class ExtWeather;
 class GraphicalItem;
-class QThreadPool;
 
 class AWKeyOperations : public QObject
 {
@@ -43,41 +36,43 @@ class AWKeyOperations : public QObject
     Q_PROPERTY(QString pattern READ pattern WRITE setPattern)
 
 public:
-    explicit AWKeyOperations(QObject *parent = nullptr);
-    virtual ~AWKeyOperations();
-    QStringList devices(const QString type) const;
-    QHash<QString, QStringList> devices() const;
+    explicit AWKeyOperations(QObject *_parent = nullptr);
+    ~AWKeyOperations() override = default;
+    [[nodiscard]] QStringList devices(const QString &_type) const;
+    [[nodiscard]] QHash<QString, QStringList> devices() const;
     void updateCache();
     // keys
-    QStringList dictKeys() const;
-    GraphicalItem *giByKey(const QString key) const;
+    [[nodiscard]] QStringList dictKeys() 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(QString key) const;
-    QString pattern() const;
-    void setPattern(const QString currentPattern);
+    [[nodiscard]] QString infoByKey(const QString &_key) const;
+    [[nodiscard]] QString pattern() const;
+    void setPattern(const QString &_currentPattern);
     // configuration
-    void editItem(const QString type);
+    void editItem(const QString &_type);
 
 signals:
-    void updateKeys(const QStringList currentKeys);
+    void updateKeys(const QStringList &_currentKeys);
 
 public slots:
-    void addDevice(const QString &source);
+    void addDevice(const QString &_source);
 
 private:
     // methods
-    void addKeyToCache(const QString type, const QString key = QString(""));
+    void addKeyToCache(const QString &_type, const QString &_key = "");
     void reinitKeys();
     // objects
-    ExtItemAggregator<GraphicalItem> *graphicalItems = nullptr;
-    ExtItemAggregator<ExtQuotes> *extQuotes = nullptr;
-    ExtItemAggregator<ExtScript> *extScripts = nullptr;
-    ExtItemAggregator<ExtUpgrade> *extUpgrade = nullptr;
-    ExtItemAggregator<ExtWeather> *extWeather = nullptr;
+    AWCustomKeysHelper *m_customKeys = nullptr;
+    ExtItemAggregator<GraphicalItem> *m_graphicalItems = nullptr;
+    ExtItemAggregator<ExtNetworkRequest> *m_extNetRequest = nullptr;
+    ExtItemAggregator<ExtQuotes> *m_extQuotes = nullptr;
+    ExtItemAggregator<ExtScript> *m_extScripts = nullptr;
+    ExtItemAggregator<ExtUpgrade> *m_extUpgrade = nullptr;
+    ExtItemAggregator<ExtWeather> *m_extWeather = nullptr;
     // variables
     QHash<QString, QStringList> m_devices;
     QString m_pattern;
 };
-
-
-#endif /* AWKEYOPERATIONS_H */

sources/awesome-widget/plugin/awkeys.cpp

@@ -17,14 +17,14 @@
 
 #include "awkeys.h"
 
-#include <QtConcurrent/QtConcurrent>
-#include <QJSEngine>
-#include <QRegExp>
-#include <QThread>
+#include <QDBusConnection>
+#include <QDBusError>
+#include <QRegularExpression>
 #include <QTimer>
 
 #include "awdataaggregator.h"
 #include "awdataengineaggregator.h"
+#include "awdbusadaptor.h"
 #include "awdebug.h"
 #include "awkeycache.h"
 #include "awkeyoperations.h"
@@ -33,37 +33,36 @@
 #include "graphicalitem.h"
 
 
-AWKeys::AWKeys(QObject *parent)
-    : QObject(parent)
+AWKeys::AWKeys(QObject *_parent)
+    : QObject(_parent)
 {
-    qSetMessagePattern(LOG_FORMAT);
+    qSetMessagePattern(AWDebug::LOG_FORMAT);
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-    for (auto metadata : getBuildData())
+    for (auto &metadata : AWDebug::getBuildData())
         qCDebug(LOG_AW) << metadata;
 
-    // thread pool
-    m_threadPool = new QThreadPool(this);
-
-    aggregator = new AWKeysAggregator(this);
-    dataAggregator = new AWDataAggregator(this);
-    dataEngineAggregator = new AWDataEngineAggregator(this);
-    keyOperator = new AWKeyOperations(this);
+    m_aggregator = new AWKeysAggregator(this);
+    m_dataAggregator = new AWDataAggregator(this);
+    m_dataEngineAggregator = new AWDataEngineAggregator(this);
+    m_keyOperator = new AWKeyOperations(this);
 
     m_timer = new QTimer(this);
     m_timer->setSingleShot(false);
 
+    createDBusInterface();
+
     // update key data if required
-    connect(keyOperator, SIGNAL(updateKeys(QStringList)), this,
-            SLOT(reinitKeys(QStringList)));
-    connect(m_timer, SIGNAL(timeout()), this, SLOT(updateTextData()));
+    connect(m_keyOperator, &AWKeyOperations::updateKeys, this, &AWKeys::reinitKeys);
+    connect(m_timer, &QTimer::timeout, this, &AWKeys::updateTextData);
+
     // transfer signal from AWDataAggregator object to QML ui
-    connect(dataAggregator, SIGNAL(toolTipPainted(const QString)), this,
-            SIGNAL(needToolTipToBeUpdated(const QString)));
-    connect(this, SIGNAL(dropSourceFromDataengine(QString)),
-            dataEngineAggregator, SLOT(dropSource(QString)));
+    connect(m_dataAggregator, &AWDataAggregator::toolTipPainted,
+            [this](const QString &_tooltip) { emit(needToolTipToBeUpdated(_tooltip)); });
+
+    connect(this, &AWKeys::dropSourceFromDataengine, m_dataEngineAggregator, &AWDataEngineAggregator::dropSource);
+    connect(m_dataEngineAggregator, &AWDataEngineAggregator::dataUpdated, this, &AWKeys::dataUpdated);
     // transfer signal from dataengine to update source list
-    connect(dataEngineAggregator, SIGNAL(deviceAdded(const QString &)),
-            keyOperator, SLOT(addDevice(const QString &)));
+    connect(m_dataEngineAggregator, &AWDataEngineAggregator::deviceAdded, m_keyOperator, &AWKeyOperations::addDevice);
 }
 
 
@@ -72,162 +71,147 @@ AWKeys::~AWKeys()
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
     m_timer->stop();
-    delete m_timer;
-
-    // core
-    delete dataEngineAggregator;
-    delete m_threadPool;
-    delete aggregator;
-    delete dataAggregator;
-    delete keyOperator;
+    // delete dbus session
+    auto id = reinterpret_cast<qlonglong>(this);
+    QDBusConnection::sessionBus().unregisterObject(QString("/%1").arg(id));
 }
 
 
-void AWKeys::initDataAggregator(const QVariantMap tooltipParams)
+void AWKeys::initDataAggregator(const QVariantMap &_tooltipParams)
 {
-    qCDebug(LOG_AW) << "Tooltip parameters" << tooltipParams;
+    qCDebug(LOG_AW) << "Tooltip parameters" << _tooltipParams;
 
     // store parameters to generate m_requiredKeys
-    m_tooltipParams = tooltipParams;
-    dataAggregator->setParameters(m_tooltipParams);
+    m_tooltipParams = _tooltipParams;
+    m_dataAggregator->setParameters(m_tooltipParams);
 }
 
 
-void AWKeys::initKeys(const QString currentPattern, const int interval,
-                      const int limit, const bool optimize)
+void AWKeys::initKeys(const QString &_currentPattern, const int _interval, const bool _optimize)
 {
-    qCDebug(LOG_AW) << "Pattern" << currentPattern << "with interval"
-                    << interval << "and queue limit" << limit
-                    << "with optimization" << optimize;
+    qCDebug(LOG_AW) << "Pattern" << _currentPattern << "with interval" << _interval << "with optimization" << _optimize;
 
     // init
-    m_optimize = optimize;
-    m_threadPool->setMaxThreadCount(limit == 0 ? QThread::idealThreadCount()
-                                               : limit);
+    m_optimize = _optimize;
     // child objects
-    keyOperator->setPattern(currentPattern);
-    keyOperator->updateCache();
-    dataEngineAggregator->clear();
-
-    dataEngineAggregator->initDataEngines(interval);
+    m_aggregator->initFormatters();
+    m_keyOperator->setPattern(_currentPattern);
+    m_keyOperator->updateCache();
+    m_dataEngineAggregator->loadSources();
 
     // timer
-    m_timer->setInterval(interval);
+    m_timer->setInterval(_interval);
     m_timer->start();
 }
 
 
-void AWKeys::setAggregatorProperty(const QString key, const QVariant value)
+void AWKeys::setAggregatorProperty(const QString &_key, const QVariant &_value)
 {
-    qCDebug(LOG_AW) << "Key" << key << "with value" << value;
+    qCDebug(LOG_AW) << "Key" << _key << "with value" << _value;
 
-    aggregator->setProperty(key.toUtf8().constData(), value);
+    m_aggregator->setProperty(_key.toUtf8().constData(), _value);
 }
 
 
-void AWKeys::setWrapNewLines(const bool wrap)
+void AWKeys::setWrapNewLines(const bool _wrap)
 {
-    qCDebug(LOG_AW) << "Is wrapping enabled" << wrap;
+    qCDebug(LOG_AW) << "Is wrapping enabled" << _wrap;
 
-    m_wrapNewLines = wrap;
+    m_wrapNewLines = _wrap;
 }
 
 
 void AWKeys::updateCache()
 {
-    return keyOperator->updateCache();
+    return m_keyOperator->updateCache();
 }
 
 
-QStringList AWKeys::dictKeys(const bool sorted, const QString regexp) const
+QStringList AWKeys::dictKeys(const bool _sorted, const QString &_regexp) const
 {
-    qCDebug(LOG_AW) << "Should be sorted" << sorted << "and filter applied"
-                    << regexp;
+    qCDebug(LOG_AW) << "Should be sorted" << _sorted << "and filter applied" << _regexp;
 
-    QStringList allKeys = keyOperator->dictKeys();
+    // 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)
+    if (_sorted)
         allKeys.sort();
 
-    return allKeys.filter(QRegExp(regexp));
+    return allKeys.filter(QRegularExpression(_regexp));
 }
 
 
-QStringList AWKeys::getHddDevices() const
+QString AWKeys::infoByKey(const QString &_key) const
 {
-    QStringList devices = keyOperator->devices(QString("hdd"));
-    // required by selector in the UI
-    devices.insert(0, QString("disable"));
-    devices.insert(0, QString("auto"));
+    qCDebug(LOG_AW) << "Requested info for key" << _key;
 
-    return devices;
-}
-
-
-QString AWKeys::infoByKey(QString key) const
-{
-    qCDebug(LOG_AW) << "Requested info for key" << key;
-
-    return keyOperator->infoByKey(key);
+    return m_keyOperator->infoByKey(_key);
 }
 
 
 // HACK this method requires to define tag value from bar from UI interface
-QString AWKeys::valueByKey(QString key) const
+QString AWKeys::valueByKey(const QString &_key) const
 {
-    qCDebug(LOG_AW) << "Requested value for key" << key;
+    qCDebug(LOG_AW) << "Requested value for key" << _key;
 
-    key.remove(QRegExp(QString("^bar[0-9]{1,}")));
-    return aggregator->formatter(values[key], key);
+    auto realKey = _key.startsWith("bar") ? m_keyOperator->infoByKey(_key) : _key;
+
+    return m_aggregator->formatter(m_values[realKey], realKey, true);
 }
 
 
-void AWKeys::editItem(const QString type)
+void AWKeys::editItem(const QString &_type)
 {
-    qCDebug(LOG_AW) << "Item type" << type;
+    qCDebug(LOG_AW) << "Item type" << _type;
 
-    return keyOperator->editItem(type);
+    return m_keyOperator->editItem(_type);
 }
 
 
-void AWKeys::dataUpdated(const QString &sourceName,
-                         const Plasma::DataEngine::Data &data)
+void AWKeys::dataUpdated(const QHash<QString, KSysGuard::SensorInfo> &_sensors, const KSysGuard::SensorDataList &_data)
 {
-    // run concurrent data update
-    QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, sourceName,
-                      data);
+    qCDebug(LOG_AW) << "Update data for" << _data.count() << "items";
+
+    for (auto &data : _data) {
+        if (!_sensors.contains(data.sensorProperty))
+            continue;
+        auto sensor = _sensors[data.sensorProperty];
+        setDataBySource(data.sensorProperty, sensor, data.payload);
+    }
 }
 
 
-void AWKeys::reinitKeys(const QStringList currentKeys)
+void AWKeys::reinitKeys(const QStringList &_currentKeys)
 {
-    qCDebug(LOG_AW) << "Update found keys by using list" << currentKeys;
+    qCDebug(LOG_AW) << "Update found keys by using list" << _currentKeys;
 
     // append lists
-    m_foundBars
-        = AWPatternFunctions::findBars(keyOperator->pattern(), currentKeys);
-    m_foundKeys
-        = AWPatternFunctions::findKeys(keyOperator->pattern(), currentKeys);
-    m_foundLambdas = AWPatternFunctions::findLambdas(keyOperator->pattern());
+    m_foundBars = AWPatternFunctions::findKeys(m_keyOperator->pattern(), _currentKeys, true);
+    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 = keyOperator->giByKey(bar);
+    for (auto &bar : m_foundBars) {
+        auto item = m_keyOperator->giByKey(bar);
         if (item->isCustom())
-            item->setUsedKeys(
-                AWPatternFunctions::findKeys(item->bar(), currentKeys));
+            item->setUsedKeys(AWPatternFunctions::findKeys(item->bar(), _currentKeys, false));
         else
             item->setUsedKeys(QStringList() << item->bar());
         barKeys.append(item->usedKeys());
     }
     // get required keys
-    m_requiredKeys
-        = m_optimize ? AWKeyCache::getRequiredKeys(m_foundKeys, barKeys,
-                                                   m_tooltipParams, currentKeys)
+    m_requiredKeys = m_optimize ? AWKeyCache::getRequiredKeys(m_foundKeys, barKeys, m_tooltipParams,
+                                                              m_keyOperator->requiredUserKeys(), _currentKeys)
                                 : QStringList();
 
-    // set key data to aggregator
-    aggregator->setDevices(keyOperator->devices());
+    // set key data to m_aggregator
+    m_aggregator->setDevices(m_keyOperator->devices());
 }
 
 
@@ -235,10 +219,11 @@ void AWKeys::updateTextData()
 {
     // do not do it in parallel to avoid race condition
     calculateValues();
-    QString text = parsePattern(keyOperator->pattern());
+    auto text = parsePattern(m_keyOperator->pattern());
+    // update tooltip values under lock
+    m_dataAggregator->dataUpdate(m_values);
 
     emit(needTextToBeUpdated(text));
-    emit(dataAggregator->updateData(values));
 }
 
 
@@ -247,120 +232,118 @@ void AWKeys::updateTextData()
 void AWKeys::calculateValues()
 {
     // hddtot*
-    QStringList mountDevices = keyOperator->devices(QString("mount"));
-    for (auto device : mountDevices) {
-        int index = mountDevices.indexOf(device);
-        values[QString("hddtotmb%1").arg(index)]
-            = values[QString("hddfreemb%1").arg(index)].toFloat()
-              + values[QString("hddmb%1").arg(index)].toFloat();
-        values[QString("hddtotgb%1").arg(index)]
-            = values[QString("hddfreegb%1").arg(index)].toFloat()
-              + values[QString("hddgb%1").arg(index)].toFloat();
+    auto mountDevices = m_keyOperator->devices("mount");
+    for (auto &device : mountDevices) {
+        auto index = mountDevices.indexOf(device);
+        m_values[QString("hddtotmb%1").arg(index)] = m_values[QString("hddfreemb%1").arg(index)].toDouble()
+                                                     + m_values[QString("hddmb%1").arg(index)].toDouble();
+        m_values[QString("hddtotgb%1").arg(index)] = m_values[QString("hddfreegb%1").arg(index)].toDouble()
+                                                     + m_values[QString("hddgb%1").arg(index)].toDouble();
     }
 
     // memtot*
-    values[QString("memtotmb")] = values[QString("memusedmb")].toInt()
-                                  + values[QString("memfreemb")].toInt();
-    values[QString("memtotgb")] = values[QString("memusedgb")].toFloat()
-                                  + values[QString("memfreegb")].toFloat();
+    m_values["memtotmb"] = m_values["memusedmb"].toLongLong() + m_values["memfreemb"].toLongLong();
+    m_values["memtotgb"] = m_values["memusedgb"].toDouble() + m_values["memfreegb"].toDouble();
     // mem
-    values[QString("mem")] = 100.0f * values[QString("memmb")].toFloat()
-                             / values[QString("memtotmb")].toFloat();
+    m_values["mem"] = 100.0 * m_values["memmb"].toDouble() / m_values["memtotmb"].toDouble();
 
     // up, down, upkb, downkb, upunits, downunits
-    int netIndex = keyOperator->devices(QString("net"))
-                       .indexOf(values[QString("netdev")].toString());
-    values[QString("down")] = values[QString("down%1").arg(netIndex)];
-    values[QString("downkb")] = values[QString("downkb%1").arg(netIndex)];
-    values[QString("downtotal")] = values[QString("downtotal%1").arg(netIndex)];
-    values[QString("downtotalkb")]
-        = values[QString("downtotalkb%1").arg(netIndex)];
-    values[QString("downunits")] = values[QString("downunits%1").arg(netIndex)];
-    values[QString("up")] = values[QString("up%1").arg(netIndex)];
-    values[QString("upkb")] = values[QString("upkb%1").arg(netIndex)];
-    values[QString("uptotal")] = values[QString("uptotal%1").arg(netIndex)];
-    values[QString("uptotalkb")] = values[QString("uptotalkb%1").arg(netIndex)];
-    values[QString("upunits")] = values[QString("upunits%1").arg(netIndex)];
+    auto netIndex = m_keyOperator->devices("net").indexOf(m_values["netdev"].toString());
+    m_values["down"] = m_values[QString("down%1").arg(netIndex)];
+    m_values["downkb"] = m_values[QString("downkb%1").arg(netIndex)];
+    m_values["downtot"] = m_values[QString("downtot%1").arg(netIndex)];
+    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["uptot"] = m_values[QString("uptot%1").arg(netIndex)];
+    m_values["uptotkb"] = m_values[QString("uptotkb%1").arg(netIndex)];
+    m_values["upunits"] = m_values[QString("upunits%1").arg(netIndex)];
 
     // swaptot*
-    values[QString("swaptotmb")] = values[QString("swapmb")].toInt()
-                                   + values[QString("swapfreemb")].toInt();
-    values[QString("swaptotgb")] = values[QString("swapgb")].toFloat()
-                                   + values[QString("swapfreegb")].toFloat();
+    m_values["swaptotmb"] = m_values["swapmb"].toLongLong() + m_values["swapfreemb"].toLongLong();
+    m_values["swaptotgb"] = m_values["swapgb"].toDouble() + m_values["swapfreegb"].toDouble();
     // swap
-    values[QString("swap")] = 100.0f * values[QString("swapmb")].toFloat()
-                              / values[QString("swaptotmb")].toFloat();
+    m_values["swap"] = 100.0 * m_values["swapmb"].toDouble() / m_values["swaptotmb"].toDouble();
+
+    // user defined keys
+    for (auto &key : m_keyOperator->userKeys())
+        m_values[key] = m_values[m_keyOperator->userKeySource(key)];
 
     // lambdas
-    for (auto key : m_foundLambdas)
-        values[key] = AWPatternFunctions::expandLambdas(key, aggregator, values,
-                                                        m_foundKeys);
+    for (auto &key : m_foundLambdas)
+        m_values[key] = AWPatternFunctions::expandLambdas(key, m_aggregator, m_values, m_foundKeys);
 }
 
 
-QString AWKeys::parsePattern(QString pattern) const
+void AWKeys::createDBusInterface()
+{
+    // get this object id
+    auto id = reinterpret_cast<qlonglong>(this);
+
+    // create session
+    auto instanceBus = QDBusConnection::sessionBus();
+    // HACK we are going to use different services because it binds to
+    // application
+    if (instanceBus.registerService(QString("%1.i%2").arg(AWDBUS_SERVICE).arg(id))) {
+        if (!instanceBus.registerObject(AWDBUS_PATH, new AWDBusAdaptor(this), QDBusConnection::ExportAllContents))
+            qCWarning(LOG_AW) << "Could not register DBus object, last error" << instanceBus.lastError().message();
+    } else {
+        qCWarning(LOG_AW) << "Could not register DBus service, last error" << instanceBus.lastError().message();
+    }
+
+    // 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("$$"), QString(0x1d));
+    _pattern.replace("$$", QChar(0x1d));
 
     // lambdas
-    for (auto key : m_foundLambdas)
-        pattern.replace(QString("${{%1}}").arg(key), values[key].toString());
+    for (auto &key : m_foundLambdas)
+        _pattern.replace(QString("${{%1}}").arg(key), m_values[key].toString());
 
     // main keys
-    for (auto key : m_foundKeys)
-        pattern.replace(QString("$%1").arg(key), [this](const QString &tag,
-                                                        const QVariant &value) {
-            QString strValue = aggregator->formatter(value, tag);
-            if ((!tag.startsWith(QString("custom")))
-                && (!tag.startsWith(QString("weather"))))
-                strValue.replace(QString(" "), QString("&nbsp;"));
-            return strValue;
-        }(key, values[key]));
+    for (auto &key : m_foundKeys)
+        _pattern.replace(QString("$%1").arg(key), m_aggregator->formatter(m_values[key], key, true));
 
     // bars
-    for (auto bar : m_foundBars) {
-        GraphicalItem *item = keyOperator->giByKey(bar);
-        QString image
-            = item->isCustom()
-                  ? item->image(AWPatternFunctions::expandLambdas(
-                        item->bar(), aggregator, values, item->usedKeys()))
-                  : item->image(values[item->bar()]);
-        pattern.replace(QString("$%1").arg(bar), image);
+    for (auto &bar : m_foundBars) {
+        auto item = m_keyOperator->giByKey(bar);
+        auto image = item->isCustom() ? item->image(
+                         AWPatternFunctions::expandLambdas(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), QString("$"));
+    _pattern.replace(QChar(0x1d), "$");
     if (m_wrapNewLines)
-        pattern.replace(QString("\n"), QString("<br>"));
+        _pattern.replace("\n", "<br>");
 
-    return pattern;
+    return _pattern;
 }
 
 
-void AWKeys::setDataBySource(const QString &sourceName, const QVariantMap &data)
+void AWKeys::setDataBySource(const QString &_source, const KSysGuard::SensorInfo &_sensor, const QVariant &_value)
 {
-    qCDebug(LOG_AW) << "Source" << sourceName << "with data" << data;
+    qCDebug(LOG_AW) << "Source" << _source << _sensor.name << "with data" << _value;
 
     // first list init
-    QStringList tags = aggregator->keysFromSource(sourceName);
+    auto tags = m_aggregator->keysFromSource(_source);
     if (tags.isEmpty())
-        tags = aggregator->registerSource(
-            sourceName, data[QString("units")].toString(), m_requiredKeys);
+        tags = m_aggregator->registerSource(_source, _sensor.unit, m_requiredKeys);
 
     // update data or drop source if there are no matches and exit
     if (tags.isEmpty()) {
-        qCInfo(LOG_AW) << "Source" << sourceName << "not found";
-        return emit(dropSourceFromDataengine(sourceName));
+        qCInfo(LOG_AW) << "Sensor" << _source << "not found";
+        return emit(dropSourceFromDataengine(_source));
     }
 
-    m_mutex.lock();
-    // HACK workaround for time values which are stored in the different path
-    std::for_each(tags.cbegin(), tags.cend(),
-                  [this, &data, &sourceName](const QString &tag) {
-                      values[tag] = sourceName == QString("Local")
-                                        ? data[QString("DateTime")]
-                                        : data[QString("value")];
-                  });
-    m_mutex.unlock();
+    std::for_each(tags.cbegin(), tags.cend(), [this, _value](const QString &tag) { m_values[tag] = _value; });
 }

sources/awesome-widget/plugin/awkeys.h

@@ -15,21 +15,17 @@
  *   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
@@ -37,63 +33,49 @@ class AWKeys : public QObject
     Q_OBJECT
 
 public:
-    explicit AWKeys(QObject *parent = nullptr);
-    virtual ~AWKeys();
-    Q_INVOKABLE void initDataAggregator(const QVariantMap tooltipParams);
-    Q_INVOKABLE void initKeys(const QString currentPattern, const int interval,
-                              const int limit, const bool optimize);
-    Q_INVOKABLE void setAggregatorProperty(const QString key,
-                                           const QVariant value);
-    Q_INVOKABLE void setWrapNewLines(const bool wrap = false);
+    explicit AWKeys(QObject *_parent = nullptr);
+    ~AWKeys() override;
+    Q_INVOKABLE void initDataAggregator(const QVariantMap &_tooltipParams);
+    Q_INVOKABLE void initKeys(const QString &_currentPattern, int _interval, bool _optimize);
+    Q_INVOKABLE void setAggregatorProperty(const QString &_key, const QVariant &_value);
+    Q_INVOKABLE void setWrapNewLines(bool _wrap);
     // additional method to force load keys from Qml UI. Used in some
     // configuration pages
     Q_INVOKABLE void updateCache();
     // keys
-    Q_INVOKABLE QStringList dictKeys(const bool sorted = false,
-                                     const QString regexp = QString()) const;
-    Q_INVOKABLE QStringList getHddDevices() const;
+    Q_INVOKABLE [[nodiscard]] QStringList dictKeys(bool _sorted = false, const QString &_regexp = "") const;
     // values
-    Q_INVOKABLE QString infoByKey(QString key) const;
-    Q_INVOKABLE QString valueByKey(QString key) const;
+    Q_INVOKABLE [[nodiscard]] QString infoByKey(const QString &_key) const;
+    Q_INVOKABLE [[nodiscard]] QString valueByKey(const QString &_key) const;
     // configuration
-    Q_INVOKABLE void editItem(const QString type);
-
-public slots:
-    void dataUpdated(const QString &sourceName,
-                     const Plasma::DataEngine::Data &data);
-    // dummy method required by DataEngine connections
-    void modelChanged(QString, QAbstractItemModel *){};
+    Q_INVOKABLE void editItem(const QString &_type);
 
 signals:
-    void dropSourceFromDataengine(const QString source);
-    void needTextToBeUpdated(const QString newText) const;
-    void needToolTipToBeUpdated(const QString newText) const;
+    void dropSourceFromDataengine(const QString &_source);
+    void needTextToBeUpdated(const QString &_newText) const;
+    void needToolTipToBeUpdated(const QString &_newText) const;
 
 private slots:
-    void reinitKeys(const QStringList currentKeys);
+    void dataUpdated(const QHash<QString, KSysGuard::SensorInfo> &_sensors, const KSysGuard::SensorDataList &_data);
+    void reinitKeys(const QStringList &_currentKeys);
     void updateTextData();
 
 private:
     // methods
     void calculateValues();
-    QString parsePattern(QString pattern) const;
-    void setDataBySource(const QString &sourceName, const QVariantMap &data);
+    void createDBusInterface();
+    [[nodiscard]] QString parsePattern(QString _pattern) const;
+    void setDataBySource(const QString &_source, const KSysGuard::SensorInfo &_sensor, const QVariant &_value);
     // objects
-    AWDataAggregator *dataAggregator = nullptr;
-    AWDataEngineAggregator *dataEngineAggregator = nullptr;
-    AWKeysAggregator *aggregator = nullptr;
-    AWKeyOperations *keyOperator = nullptr;
+    AWDataAggregator *m_dataAggregator = nullptr;
+    AWDataEngineAggregator *m_dataEngineAggregator = nullptr;
+    AWKeysAggregator *m_aggregator = nullptr;
+    AWKeyOperations *m_keyOperator = nullptr;
     QTimer *m_timer = nullptr;
     // variables
     QVariantMap m_tooltipParams;
     QStringList m_foundBars, m_foundKeys, m_foundLambdas, m_requiredKeys;
-    QVariantHash values;
+    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

@@ -21,603 +21,245 @@
 
 #include <QDateTime>
 #include <QLocale>
-#include <QRegExp>
 
+#include "awdataenginemapper.h"
 #include "awdebug.h"
 #include "awformatterhelper.h"
+#include "version.h"
 
 
-AWKeysAggregator::AWKeysAggregator(QObject *parent)
-    : QObject(parent)
+AWKeysAggregator::AWKeysAggregator(QObject *_parent)
+    : QObject(_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    // default formatters
-    // memory
-    m_formatter[QString("mem")] = FormatterType::Float;
-    m_formatter[QString("memtotmb")] = FormatterType::MemMBFormat;
-    m_formatter[QString("memtotgb")] = FormatterType::MemGBFormat;
-    // network
-    m_formatter[QString("down")] = FormatterType::NetSmartFormat;
-    m_formatter[QString("downkb")] = FormatterType::Integer;
-    m_formatter[QString("downunits")] = FormatterType::NetSmartUnits;
-    m_formatter[QString("up")] = FormatterType::NetSmartFormat;
-    m_formatter[QString("upkb")] = FormatterType::Integer;
-    m_formatter[QString("upunits")] = FormatterType::NetSmartUnits;
-    // swap
-    m_formatter[QString("swap")] = FormatterType::Float;
-    m_formatter[QString("swaptotmb")] = FormatterType::MemMBFormat;
-    m_formatter[QString("swaptotgb")] = FormatterType::MemGBFormat;
-
     m_customFormatters = new AWFormatterHelper(this);
+    m_mapper = new AWDataEngineMapper(this, m_customFormatters);
+
+    // sort time keys
+    m_timeKeys = QString(TIME_KEYS).split(',');
+    m_timeKeys.sort();
+    std::reverse(m_timeKeys.begin(), m_timeKeys.end());
 }
 
 
-AWKeysAggregator::~AWKeysAggregator()
+void AWKeysAggregator::initFormatters()
 {
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    delete m_customFormatters;
+    m_customFormatters->initItems();
 }
 
 
-QString AWKeysAggregator::formatter(const QVariant &data,
-                                    const QString &key) const
+QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key, bool replaceSpace) const
 {
-    qCDebug(LOG_AW) << "Data" << data << "for key" << key;
+    qCDebug(LOG_AW) << "Data" << _data << "for key" << _key;
 
     QString output;
     QLocale loc = m_translate ? QLocale::system() : QLocale::c();
     // case block
-    switch (m_formatter[key]) {
+    switch (m_mapper->formatter(_key)) {
     case FormatterType::Float:
-        output = QString("%1").arg(data.toFloat(), 5, 'f', 1);
+        output = QString("%1").arg(_data.toDouble(), 5, 'f', 1);
         break;
     case FormatterType::FloatTwoSymbols:
-        output = QString("%1").arg(data.toFloat(), 5, 'f', 2);
+        output = QString("%1").arg(_data.toDouble(), 5, 'f', 2);
         break;
     case FormatterType::Integer:
-        output = QString("%1").arg(data.toFloat(), 4, 'f', 0);
+        output = QString("%1").arg(_data.toDouble(), 4, 'f', 0);
         break;
     case FormatterType::IntegerFive:
-        output = QString("%1").arg(data.toFloat(), 5, 'f', 0);
+        output = QString("%1").arg(_data.toDouble(), 5, 'f', 0);
         break;
     case FormatterType::IntegerThree:
-        output = QString("%1").arg(data.toFloat(), 3, 'f', 0);
+        output = QString("%1").arg(_data.toDouble(), 3, 'f', 0);
         break;
     case FormatterType::List:
-        output = data.toStringList().join(QChar(','));
+        output = _data.toStringList().join(',');
         break;
     case FormatterType::ACFormat:
-        output = data.toBool() ? m_acOnline : m_acOffline;
+        output = _data.toBool() ? m_acOnline : m_acOffline;
         break;
     case FormatterType::MemGBFormat:
-        output
-            = QString("%1").arg(data.toFloat() / (1024.0 * 1024.0), 5, 'f', 1);
+        output = QString("%1").arg(_data.toDouble() / GBinBytes, 5, 'f', 1);
         break;
     case FormatterType::MemMBFormat:
-        output = QString("%1").arg(data.toFloat() / 1024.0, 5, 'f', 0);
+        output = QString("%1").arg(_data.toDouble() / MBinBytes, 5, 'f', 0);
+        break;
+    case FormatterType::MemKBFormat:
+        output = QString("%1").arg(_data.toDouble() / KBinBytes, 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);
+        output = [](const double value) {
+            if (value > MBinBytes)
+                return QString("%1").arg(value / MBinBytes, 4, 'f', 1);
             else
-                return QString("%1").arg(value, 4, 'f', 0);
-        }(data.toFloat());
+                return QString("%1").arg(value / KBinBytes, 4, 'f', 0);
+        }(_data.toDouble());
         break;
     case FormatterType::NetSmartUnits:
-        if (data.toFloat() > 1024.0)
-            output = m_translate ? i18n("MB/s") : QString("MB/s");
+        if (_data.toDouble() > MBinBytes)
+            output = m_translate ? i18n("MB/s") : "MB/s";
         else
-            output = m_translate ? i18n("KB/s") : QString("KB/s");
+            output = m_translate ? i18n("KB/s") : "KB/s";
         break;
     case FormatterType::Quotes:
         // first cast
-        output = QString("%1").arg(data.toDouble(), 0, 'f');
+        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);
+        output = QString("%1").arg(temperature(_data.toDouble()), 5, 'f', 1);
         break;
     case FormatterType::Time:
-        output = data.toDateTime().toString();
+        output = QDateTime::fromSecsSinceEpoch(_data.toLongLong()).toString();
         break;
     case FormatterType::TimeCustom:
         output = m_customTime;
-        [&output, loc, this](const QDateTime dt) {
-            for (auto key : timeKeys)
+        [&output, loc, this](const QDateTime &dt) {
+            for (auto &key : m_timeKeys)
                 output.replace(QString("$%1").arg(key), loc.toString(dt, key));
-        }(data.toDateTime());
+        }(QDateTime::fromSecsSinceEpoch(_data.toLongLong()));
         break;
     case FormatterType::TimeISO:
-        output = data.toDateTime().toString(Qt::ISODate);
+        output = QDateTime::fromSecsSinceEpoch(_data.toLongLong()).toString(Qt::ISODate);
         break;
     case FormatterType::TimeLong:
-        output = loc.toString(data.toDateTime(), QLocale::LongFormat);
+        output = loc.toString(QDateTime::fromSecsSinceEpoch(_data.toLongLong()), QLocale::LongFormat);
         break;
     case FormatterType::TimeShort:
-        output = loc.toString(data.toDateTime(), QLocale::ShortFormat);
+        output = loc.toString(QDateTime::fromSecsSinceEpoch(_data.toLongLong()), QLocale::ShortFormat);
         break;
     case FormatterType::Timestamp:
-        output = QString("%1").arg(
-            data.toDateTime().toMSecsSinceEpoch() / 1000.0, 10, 'f', 0);
+        output = _data.toString();
         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(QString("$dd"),
-                               QString("%1").arg(days, 3, 10, QChar('0')));
-                source.replace(QString("$d"), QString("%1").arg(days));
-                source.replace(QString("$hh"),
-                               QString("%1").arg(hours, 2, 10, QChar('0')));
-                source.replace(QString("$h"), QString("%1").arg(hours));
-                source.replace(QString("$mm"),
-                               QString("%1").arg(minutes, 2, 10, QChar('0')));
-                source.replace(QString("$m"), QString("%1").arg(minutes));
+            [](auto source, auto uptime) {
+                auto seconds = uptime - uptime % 60;
+                auto minutes = seconds / 60 % 60;
+                auto hours = ((seconds / 60) - minutes) / 60 % 24;
+                auto 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
-                  ? QString("$ddd$hhh$mmm")
-                  : m_customUptime,
-              static_cast<int>(data.toFloat()));
+            }(m_mapper->formatter(_key) == FormatterType::Uptime ? "$ddd$hhh$mmm" : m_customUptime,
+              static_cast<int>(_data.toDouble()));
         break;
     case FormatterType::NoFormat:
-        output = data.toString();
+        output = _data.toString();
         break;
     case FormatterType::Custom:
-        output = m_customFormatters->convert(data, key);
+        if (m_customFormatters)
+            output = m_customFormatters->convert(_data, _key);
         break;
     }
 
+    // replace spaces to non-breakable ones
+    replaceSpace &= (!_key.startsWith("custom") && (!_key.startsWith("weather")));
+    if (replaceSpace)
+        output.replace(" ", "&nbsp;");
+
     return output;
 }
 
 
-QStringList AWKeysAggregator::keysFromSource(const QString &source) const
+QStringList AWKeysAggregator::keysFromSource(const QString &_source) const
 {
-    qCDebug(LOG_AW) << "Search for source" << source;
+    qCDebug(LOG_AW) << "Search for source" << _source;
 
-    return m_map.values(source);
+    return m_mapper->keysFromSource(_source);
 }
 
 
-void AWKeysAggregator::setAcOffline(const QString inactive)
+void AWKeysAggregator::setAcOffline(const QString &_inactive)
 {
-    qCDebug(LOG_AW) << "Inactive AC string" << inactive;
+    qCDebug(LOG_AW) << "Inactive AC string" << _inactive;
 
-    m_acOffline = inactive;
+    m_acOffline = _inactive;
 }
 
 
-void AWKeysAggregator::setAcOnline(const QString active)
+void AWKeysAggregator::setAcOnline(const QString &_active)
 {
-    qCDebug(LOG_AW) << "Active AC string" << active;
+    qCDebug(LOG_AW) << "Active AC string" << _active;
 
-    m_acOnline = active;
+    m_acOnline = _active;
 }
 
 
-void AWKeysAggregator::setCustomTime(const QString customTime)
+void AWKeysAggregator::setCustomTime(const QString &_customTime)
 {
-    qCDebug(LOG_AW) << "Format" << customTime;
+    qCDebug(LOG_AW) << "Format" << _customTime;
 
-    m_customTime = customTime;
+    m_customTime = _customTime;
 }
 
 
-void AWKeysAggregator::setCustomUptime(const QString customUptime)
+void AWKeysAggregator::setCustomUptime(const QString &_customUptime)
 {
-    qCDebug(LOG_AW) << "Format" << customUptime;
+    qCDebug(LOG_AW) << "Format" << _customUptime;
 
-    m_customUptime = customUptime;
+    m_customUptime = _customUptime;
 }
 
 
-void AWKeysAggregator::setDevices(const QHash<QString, QStringList> devices)
+void AWKeysAggregator::setDevices(const QHash<QString, QStringList> &_devices)
 {
-    qCDebug(LOG_AW) << "Devices" << devices;
+    qCDebug(LOG_AW) << "Devices" << _devices;
 
-    m_devices = devices;
+    m_mapper->setDevices(_devices);
 }
 
 
-void AWKeysAggregator::setTempUnits(const QString units)
+void AWKeysAggregator::setTempUnits(const QString &_units)
 {
-    qCDebug(LOG_AW) << "Units" << units;
+    qCDebug(LOG_AW) << "Units" << _units;
 
-    m_tempUnits = units;
+    m_tempUnits = _units;
 }
 
 
-void AWKeysAggregator::setTranslate(const bool translate)
+void AWKeysAggregator::setTranslate(const bool _translate)
 {
-    qCDebug(LOG_AW) << "Translate" << translate;
+    qCDebug(LOG_AW) << "Translate" << _translate;
 
-    m_translate = translate;
+    m_translate = _translate;
 }
 
 
-// HACK units required to define should the value be calculated as temperature
-// or fan data
-QStringList AWKeysAggregator::registerSource(const QString &source,
-                                             const QString &units,
-                                             const QStringList &keys)
+QStringList AWKeysAggregator::registerSource(const QString &_source, const KSysGuard::Unit _units,
+                                             const QStringList &_keys)
 {
-    qCDebug(LOG_AW) << "Source" << source << "with units" << units;
+    qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
 
-    // regular expressions
-    QRegExp cpuRegExp = QRegExp(QString("cpu/cpu.*/TotalLoad"));
-    QRegExp cpuclRegExp = QRegExp(QString("cpu/cpu.*/clock"));
-    QRegExp hddrRegExp = QRegExp(QString("disk/.*/Rate/rblk"));
-    QRegExp hddwRegExp = QRegExp(QString("disk/.*/Rate/wblk"));
-    QRegExp mountFillRegExp = QRegExp(QString("partitions/.*/filllevel"));
-    QRegExp mountFreeRegExp = QRegExp(QString("partitions/.*/freespace"));
-    QRegExp mountUsedRegExp = QRegExp(QString("partitions/.*/usedspace"));
-    QRegExp netRegExp = QRegExp(
-        QString("network/interfaces/.*/(receiver|transmitter)/data$"));
-    QRegExp netTotalRegExp = QRegExp(
-        QString("network/interfaces/.*/(receiver|transmitter)/dataTotal$"));
-
-    if (source == QString("battery/ac")) {
-        // AC
-        m_map[source] = QString("ac");
-        m_formatter[QString("ac")] = FormatterType::ACFormat;
-    } else if (source.startsWith(QString("battery/"))) {
-        // battery stats
-        QString key = source;
-        key.remove(QString("battery/"));
-        m_map[source] = key;
-        m_formatter[key] = FormatterType::IntegerThree;
-    } else if (source == QString("cpu/system/TotalLoad")) {
-        // cpu
-        m_map[source] = QString("cpu");
-        m_formatter[QString("cpu")] = FormatterType::Float;
-    } else if (source.contains(cpuRegExp)) {
-        // cpus
-        QString key = source;
-        key.remove(QString("cpu/")).remove(QString("/TotalLoad"));
-        m_map[source] = key;
-        m_formatter[key] = FormatterType::Float;
-    } else if (source == QString("cpu/system/AverageClock")) {
-        // cpucl
-        m_map[source] = QString("cpucl");
-        m_formatter[QString("cpucl")] = FormatterType::Integer;
-    } else if (source.contains(cpuclRegExp)) {
-        // cpucls
-        QString key = source;
-        key.remove(QString("cpu/cpu")).remove(QString("/clock"));
-        key = QString("cpucl%1").arg(key);
-        m_map[source] = key;
-        m_formatter[key] = FormatterType::Integer;
-    } else if (source.startsWith(QString("custom"))) {
-        // custom
-        QString key = source;
-        key.remove(QString("custom/"));
-        m_map[source] = key;
-        m_formatter[key] = FormatterType::NoFormat;
-    } else if (source == QString("desktop/current/name")) {
-        // current desktop name
-        m_map[source] = QString("desktop");
-        m_formatter[QString("desktop")] = FormatterType::NoFormat;
-    } else if (source == QString("desktop/current/number")) {
-        // current desktop number
-        m_map[source] = QString("ndesktop");
-        m_formatter[QString("ndesktop")] = FormatterType::NoFormat;
-    } else if (source == QString("desktop/total/number")) {
-        // desktop count
-        m_map[source] = QString("tdesktops");
-        m_formatter[QString("tdesktops")] = FormatterType::NoFormat;
-    } else if (source.contains(hddrRegExp)) {
-        // read speed
-        QString device = source;
-        device.remove(QString("/Rate/rblk"));
-        int index = m_devices[QString("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(QString("/Rate/wblk"));
-        int index = m_devices[QString("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 == QString("gpu/load")) {
-        // gpu load
-        m_map[source] = QString("gpu");
-        m_formatter[QString("gpu")] = FormatterType::Float;
-    } else if (source == QString("gpu/temperature")) {
-        // gpu temperature
-        m_map[source] = QString("gputemp");
-        m_formatter[QString("gputemp")] = FormatterType::Temperature;
-    } else if (source.contains(mountFillRegExp)) {
-        // fill level
-        QString device = source;
-        device.remove(QString("partitions")).remove(QString("/filllevel"));
-        int index = m_devices[QString("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(QString("partitions")).remove(QString("/freespace"));
-        int index = m_devices[QString("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(QString("partitions")).remove(QString("/usedspace"));
-        int index = m_devices[QString("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(QString("hdd/temperature"))) {
-        // hdd temperature
-        QString device = source;
-        device.remove(QString("hdd/temperature"));
-        int index = m_devices[QString("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(QString("cpu/system/loadavg"))) {
-        // load average
-        QString time = source;
-        time.remove(QString("cpu/system/loadavg"));
-        QString key = QString("la%1").arg(time);
-        m_map[source] = key;
-        m_formatter[key] = FormatterType::FloatTwoSymbols;
-    } else if (source == QString("mem/physical/application")) {
-        // app memory
-        // mb
-        m_map[source] = QString("memmb");
-        m_formatter[QString("memmb")] = FormatterType::MemMBFormat;
-        // gb
-        m_map.insertMulti(source, QString("memgb"));
-        m_formatter[QString("memgb")] = FormatterType::MemGBFormat;
-    } else if (source == QString("mem/physical/free")) {
-        // free memory
-        // mb
-        m_map[source] = QString("memfreemb");
-        m_formatter[QString("memfreemb")] = FormatterType::MemMBFormat;
-        // gb
-        m_map.insertMulti(source, QString("memfreegb"));
-        m_formatter[QString("memfreegb")] = FormatterType::MemGBFormat;
-    } else if (source == QString("mem/physical/used")) {
-        // used memory
-        // mb
-        m_map[source] = QString("memusedmb");
-        m_formatter[QString("memusedmb")] = FormatterType::MemMBFormat;
-        // gb
-        m_map.insertMulti(source, QString("memusedgb"));
-        m_formatter[QString("memusedgb")] = FormatterType::MemGBFormat;
-    } else if (source == QString("network/current/name")) {
-        // network device
-        m_map[source] = QString("netdev");
-        m_formatter[QString("netdev")] = FormatterType::NoFormat;
-    } else if (source.contains(netRegExp)) {
-        // network speed
-        QString type = source.contains(QString("receiver")) ? QString("down")
-                                                            : QString("up");
-        int index
-            = m_devices[QString("net")].indexOf(source.split(QChar('/'))[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(QString("receiver")) ? QString("down")
-                                                            : QString("up");
-        int index
-            = m_devices[QString("net")].indexOf(source.split(QChar('/'))[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(QString("upgrade"))) {
-        // package manager
-        QString key = source;
-        key.remove(QString("upgrade/"));
-        m_map[source] = key;
-        m_formatter[key] = FormatterType::IntegerThree;
-    } else if (source.startsWith(QString("player"))) {
-        // player
-        QString key = source;
-        key.remove(QString("player/"));
-        m_map[source] = key;
-        m_formatter[key] = FormatterType::NoFormat;
-    } else if (source == QString("ps/running/count")) {
-        // running processes count
-        m_map[source] = QString("pscount");
-        m_formatter[QString("pscount")] = FormatterType::NoFormat;
-    } else if (source == QString("ps/running/list")) {
-        // list of running processes
-        m_map[source] = QString("ps");
-        m_formatter[QString("ps")] = FormatterType::List;
-    } else if (source == QString("ps/total/count")) {
-        // total processes count
-        m_map[source] = QString("pstotal");
-        m_formatter[QString("pstotal")] = FormatterType::NoFormat;
-    } else if (source.startsWith(QString("quotes"))) {
-        // quotes
-        QString key = source;
-        key.remove(QString("quotes/"));
-        m_map[source] = key;
-        m_formatter[key] = FormatterType::Quotes;
-    } else if (source == QString("mem/swap/free")) {
-        // free swap
-        // mb
-        m_map[source] = QString("swapfreemb");
-        m_formatter[QString("swapfreemb")] = FormatterType::MemMBFormat;
-        // gb
-        m_map.insertMulti(source, QString("swapfreegb"));
-        m_formatter[QString("swapfreegb")] = FormatterType::MemGBFormat;
-    } else if (source == QString("mem/swap/used")) {
-        // used swap
-        // mb
-        m_map[source] = QString("swapmb");
-        m_formatter[QString("swapmb")] = FormatterType::MemMBFormat;
-        // gb
-        m_map.insertMulti(source, QString("swapgb"));
-        m_formatter[QString("swapgb")] = FormatterType::MemGBFormat;
-    } else if (source.startsWith(QString("lmsensors/"))) {
-        // temperature
-        int index = m_devices[QString("temp")].indexOf(source);
-        // FIXME 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 == QString("°C")
-                                   ? FormatterType::Temperature
-                                   : FormatterType::Integer;
-        }
-    } else if (source == QString("Local")) {
-        // time
-        m_map[source] = QString("time");
-        m_formatter[QString("time")] = FormatterType::Time;
-        // custom time
-        m_map.insertMulti(source, QString("ctime"));
-        m_formatter[QString("ctime")] = FormatterType::TimeCustom;
-        // ISO time
-        m_map.insertMulti(source, QString("isotime"));
-        m_formatter[QString("isotime")] = FormatterType::TimeISO;
-        // long time
-        m_map.insertMulti(source, QString("longtime"));
-        m_formatter[QString("longtime")] = FormatterType::TimeLong;
-        // short time
-        m_map.insertMulti(source, QString("shorttime"));
-        m_formatter[QString("shorttime")] = FormatterType::TimeShort;
-        // timestamp
-        m_map.insertMulti(source, QString("tstime"));
-        m_formatter[QString("tstime")] = FormatterType::Timestamp;
-    } else if (source == QString("system/uptime")) {
-        // uptime
-        m_map[source] = QString("uptime");
-        m_formatter[QString("uptime")] = FormatterType::Uptime;
-        // custom uptime
-        m_map.insertMulti(source, QString("cuptime"));
-        m_formatter[QString("cuptime")] = FormatterType::UptimeCustom;
-    } else if (source.startsWith(QString("weather/temperature"))) {
-        // temperature
-        QString key = source;
-        key.remove(QString("weather/"));
-        m_map[source] = key;
-        m_formatter[key] = FormatterType::Temperature;
-    } else if (source.startsWith(QString("weather/"))) {
-        // other weather
-        QString key = source;
-        key.remove(QString("weather/"));
-        m_map[source] = key;
-        m_formatter[key] = FormatterType::NoFormat;
-    } else if (source.startsWith(QString("load/load"))) {
-        // load source
-        QString key = source;
-        key.remove(QString("load/"));
-        m_map[source] = key;
-        m_formatter[key] = FormatterType::Temperature;
-    }
-
-    QStringList foundKeys = keysFromSource(source);
-
-    // rewrite formatters for custom ones
-    QStringList 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);
+    return m_mapper->registerSource(_source, _units, _keys);
 }
 
 
-float AWKeysAggregator::temperature(const float temp) const
+double AWKeysAggregator::temperature(const double temp) const
 {
     qCDebug(LOG_AW) << "Temperature value" << temp;
 
-    float converted = temp;
-    if (m_tempUnits == QString("Celsius")) {
-    } else if (m_tempUnits == QString("Fahrenheit")) {
-        converted = temp * 9.0f / 5.0f + 32.0f;
-    } else if (m_tempUnits == QString("Kelvin")) {
-        converted = temp + 273.15f;
-    } else if (m_tempUnits == QString("Reaumur")) {
-        converted = temp * 0.8f;
-    } else if (m_tempUnits == QString("cm^-1")) {
-        converted = (temp + 273.15f) * 0.695f;
-    } else if (m_tempUnits == QString("kJ/mol")) {
-        converted = (temp + 273.15f) * 8.31f;
-    } else if (m_tempUnits == QString("kcal/mol")) {
-        converted = (temp + 273.15f) * 1.98f;
+    auto converted = temp;
+    if (m_tempUnits == "Celsius") {
+    } else if (m_tempUnits == "Fahrenheit") {
+        converted = temp * 9.0f / 5.0 + 32.0;
+    } else if (m_tempUnits == "Kelvin") {
+        converted = temp + 273.15;
+    } else if (m_tempUnits == "Reaumur") {
+        converted = temp * 0.8;
+    } else if (m_tempUnits == "cm^-1") {
+        converted = (temp + 273.15) * 0.695;
+    } else if (m_tempUnits == "kJ/mol") {
+        converted = (temp + 273.15) * 8.31;
+    } else if (m_tempUnits == "kcal/mol") {
+        converted = (temp + 273.15) * 1.98;
     } else {
         qCWarning(LOG_AW) << "Invalid units" << m_tempUnits;
     }

sources/awesome-widget/plugin/awkeysaggregator.h

@@ -15,17 +15,16 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
+#pragma once
 
-#ifndef AWKEYSAGGREGATOR_H
-#define AWKEYSAGGREGATOR_H
+#include <ksysguard/formatter/Unit.h>
 
 #include <QHash>
 #include <QObject>
 
-#include "version.h"
-
 
 class AWFormatterHelper;
+class AWDataEngineMapper;
 
 class AWKeysAggregator : public QObject
 {
@@ -33,11 +32,11 @@ class AWKeysAggregator : public QObject
     Q_PROPERTY(QString acOffline MEMBER m_acOffline WRITE setAcOffline);
     Q_PROPERTY(QString acOnline MEMBER m_acOnline WRITE setAcOnline);
     Q_PROPERTY(QString customTime MEMBER m_customTime WRITE setCustomTime);
-    Q_PROPERTY(
-        QString customUptime MEMBER m_customUptime WRITE setCustomUptime);
+    Q_PROPERTY(QString customUptime MEMBER m_customUptime WRITE setCustomUptime);
     Q_PROPERTY(QString tempUnits MEMBER m_tempUnits WRITE setTempUnits);
     Q_PROPERTY(bool translate MEMBER m_translate WRITE setTranslate);
 
+public:
     enum class FormatterType {
         // general formatters
         Custom,
@@ -52,6 +51,7 @@ class AWKeysAggregator : public QObject
         ACFormat,
         MemGBFormat,
         MemMBFormat,
+        MemKBFormat,
         NetSmartFormat,
         NetSmartUnits,
         Quotes,
@@ -66,40 +66,38 @@ class AWKeysAggregator : public QObject
         UptimeCustom
     };
 
-public:
-    explicit AWKeysAggregator(QObject *parent = nullptr);
-    virtual ~AWKeysAggregator();
+    static constexpr double KBinBytes = 1024.0;
+    static constexpr double MBinBytes = 1024.0 * KBinBytes;
+    static constexpr double GBinBytes = 1024.0 * MBinBytes;
+
+    explicit AWKeysAggregator(QObject *_parent = nullptr);
+    ~AWKeysAggregator() override = default;
+    void initFormatters();
     // get methods
-    QString formatter(const QVariant &data, const QString &key) const;
-    QStringList keysFromSource(const QString &source) const;
+    [[nodiscard]] QString formatter(const QVariant &_data, const QString &_key, bool replaceSpace) const;
+    [[nodiscard]] QStringList keysFromSource(const QString &_source) 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 setTempUnits(const QString units);
-    void setTranslate(const bool translate);
+    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 setTempUnits(const QString &_units);
+    void setTranslate(bool _translate);
 
 public slots:
-    QStringList registerSource(const QString &source, const QString &units,
-                               const QStringList &keys);
+    QStringList registerSource(const QString &_source, KSysGuard::Unit _units, const QStringList &_keys);
 
 private:
-    float temperature(const float temp) const;
+    [[nodiscard]] double temperature(double temp) const;
     AWFormatterHelper *m_customFormatters = nullptr;
-    QStringList timeKeys = QString(TIME_KEYS).split(QChar(','));
+    AWDataEngineMapper *m_mapper = nullptr;
+    QStringList m_timeKeys;
     // 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

@@ -0,0 +1,45 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awpairconfigfactory.h"
+
+#include "awcustomkeysconfig.h"
+#include "awdebug.h"
+#include "awformatterconfig.h"
+
+
+AWPairConfigFactory::AWPairConfigFactory(QObject *_parent)
+    : QObject(_parent)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+void AWPairConfigFactory::showFormatterDialog(const QStringList &_keys)
+{
+    auto config = new AWFormatterConfig(nullptr, _keys);
+    config->showDialog();
+    config->deleteLater();
+}
+
+
+void AWPairConfigFactory::showKeysDialog(const QStringList &_keys)
+{
+    auto config = new AWCustomKeysConfig(nullptr, _keys);
+    config->showDialog();
+    config->deleteLater();
+}

sources/awesome-widget/plugin/awpairconfigfactory.h

@@ -0,0 +1,34 @@
+/***************************************************************************
+ *   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>
+
+
+class AWPairConfigFactory : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AWPairConfigFactory(QObject *_parent = nullptr);
+    ~AWPairConfigFactory() override = default;
+    Q_INVOKABLE static void showFormatterDialog(const QStringList &_keys);
+    Q_INVOKABLE static void showKeysDialog(const QStringList &_keys);
+
+private:
+};

sources/awesome-widget/plugin/awpatternfunctions.cpp

@@ -24,106 +24,98 @@
 #include "awkeysaggregator.h"
 
 
-QString AWPatternFunctions::expandLambdas(QString code,
-                                          AWKeysAggregator *aggregator,
-                                          const QVariantHash &metadata,
-                                          const QStringList &usedKeys)
+QString AWPatternFunctions::expandLambdas(QString _code, 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(QString("$this"), metadata[code].toString());
+    _code.replace("$this", _metadata[_code].toString());
     // parsed values
-    for (auto lambdaKey : usedKeys)
-        code.replace(QString("$%1").arg(lambdaKey),
-                     aggregator->formatter(metadata[lambdaKey], lambdaKey));
-    qCInfo(LOG_AW) << "Expression" << code;
-    QJSValue result = engine.evaluate(code);
+    for (auto &lambdaKey : _usedKeys)
+        _code.replace(QString("$%1").arg(lambdaKey), _aggregator->formatter(_metadata[lambdaKey], lambdaKey, false));
+    qCInfo(LOG_AW) << "Expression" << _code;
+    auto result = engine.evaluate(_code);
     if (result.isError()) {
-        qCWarning(LOG_AW) << "Uncaught exception at line"
-                          << result.property("lineNumber").toInt() << ":"
+        qCWarning(LOG_AW) << "Uncaught exception at line" << result.property("lineNumber").toInt() << ":"
                           << result.toString();
-        return QString();
+        return "";
     } else {
         return result.toString();
     }
 }
 
 
-QString AWPatternFunctions::expandTemplates(QString code)
+QString AWPatternFunctions::expandTemplates(QString _code)
 {
-    qCDebug(LOG_AW) << "Expand templates in" << code;
+    qCDebug(LOG_AW) << "Expand templates in" << _code;
 
     // match the following construction $template{{some code here}}
-    QRegularExpression templatesRegexp(
-        QString("\\$template\\{\\{(?<body>.*?)\\}\\}"));
-    templatesRegexp.setPatternOptions(
-        QRegularExpression::DotMatchesEverythingOption);
+    static QRegularExpression templatesRegexp(R"(\$template\{\{(?<body>.*?)\}\})");
+    templatesRegexp.setPatternOptions(QRegularExpression::DotMatchesEverythingOption);
 
-    QRegularExpressionMatchIterator it = templatesRegexp.globalMatch(code);
+    auto it = templatesRegexp.globalMatch(_code);
     while (it.hasNext()) {
-        QRegularExpressionMatch match = it.next();
-        QString body = match.captured(QString("body"));
+        auto match = it.next();
+        auto body = match.captured("body");
 
         QJSEngine engine;
         qCInfo(LOG_AW) << "Expression" << body;
-        QJSValue result = engine.evaluate(body);
-        QString templateResult = QString("");
+        auto result = engine.evaluate(body);
+        QString templateResult = "";
         if (result.isError()) {
-            qCWarning(LOG_AW) << "Uncaught exception at line"
-                              << result.property("lineNumber").toInt() << ":"
+            qCWarning(LOG_AW) << "Uncaught exception at line" << result.property("lineNumber").toInt() << ":"
                               << result.toString();
         } else {
             templateResult = result.toString();
         }
 
         // replace template
-        code.replace(match.captured(), templateResult);
+        _code.replace(match.captured(), templateResult);
     }
 
-    return code;
+    return _code;
 }
 
 
-QVariantList AWPatternFunctions::findFunctionCalls(const QString function,
-                                                   const QString code)
+QList<AWPatternFunctions::AWFunction> AWPatternFunctions::findFunctionCalls(const QString &_function,
+                                                                            const QString &_code)
 {
-    qCDebug(LOG_AW) << "Looking for function" << function << "in" << code;
+    qCDebug(LOG_AW) << "Looking for function" << _function << "in" << _code;
 
     // I suggest the following regex for the internal functions
     // $aw_function_name<some args here if any>{{function body}}
     // * args should be always comma separated (e.g. commas are not supported
     // in this field if they are not screened by $, i.e. '$,'
-    // * body depends on the function name, double brackets (i.e. {{ or }}) are
-    // not supported
-    QRegularExpression regex(
-        QString("\\$%1\\<(?<args>.*?)\\>\\{\\{(?<body>.*?)\\}\\}")
-            .arg(function));
+    // * body depends on the function name, double brackets should be screened
+    // by using $, e.g. ${
+    QRegularExpression regex(QString(R"(\$%1\<(?<args>.*?)\>\{\{(?<body>.*?)\}\})").arg(_function));
     regex.setPatternOptions(QRegularExpression::DotMatchesEverythingOption);
 
-    QVariantList foundFunctions;
-    QRegularExpressionMatchIterator it = regex.globalMatch(code);
+    QList<AWPatternFunctions::AWFunction> foundFunctions;
+    auto it = regex.globalMatch(_code);
     while (it.hasNext()) {
-        QRegularExpressionMatch match = it.next();
+        auto match = it.next();
 
-        QVariantHash metadata;
+        AWPatternFunctions::AWFunction metadata;
         // work with args
-        QString argsString = match.captured(QString("args"));
+        auto argsString = match.captured("args");
         if (argsString.isEmpty()) {
-            metadata[QString("args")] = QStringList();
+            metadata.args = QStringList();
         } else {
             // replace '$,' to 0x1d
-            argsString.replace(QString("$,"), QString(0x1d));
-            QStringList args = argsString.split(QChar(','));
-            std::for_each(args.begin(), args.end(), [](QString &arg) {
-                arg.replace(QString(0x1d), QString(","));
-            });
-            metadata[QString("args")] = args;
+            argsString.replace("$,", QChar(0x1d));
+            auto args = argsString.split(',');
+            std::for_each(args.begin(), args.end(), [](auto &arg) { arg.replace(QChar(0x1d), ","); });
+            metadata.args = args;
         }
         // other variables
-        metadata[QString("body")] = match.captured(QString("body"));
-        metadata[QString("what")] = match.captured();
+        metadata.body = match.captured("body");
+        metadata.what = match.captured();
+        // replace brackets
+        metadata.body.replace("${", "{");
+        metadata.body.replace("$}", "}");
         foundFunctions.append(metadata);
     }
 
@@ -131,136 +123,119 @@ QVariantList AWPatternFunctions::findFunctionCalls(const QString function,
 }
 
 
-QString AWPatternFunctions::insertAllKeys(QString code, const QStringList keys)
+QString AWPatternFunctions::insertAllKeys(QString _code, const QStringList &_keys)
 {
-    qCDebug(LOG_AW) << "Looking for keys in code" << code << "using list"
-                    << keys;
+    qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
 
-    QVariantList found
-        = AWPatternFunctions::findFunctionCalls(QString("aw_all"), code);
-    for (auto function : found) {
-        QVariantHash metadata = function.toHash();
-        QString separator
-            = metadata[QString("args")].toStringList().isEmpty()
-                  ? QString(",")
-                  : metadata[QString("args")].toStringList().at(0);
-        QStringList required
-            = keys.filter(QRegExp(metadata[QString("body")].toString()));
-        std::for_each(required.begin(), required.end(), [](QString &value) {
-            value = QString("%1: $%1").arg(value);
+    auto found = AWPatternFunctions::findFunctionCalls("aw_all", _code);
+    for (auto &function : found) {
+        auto separator = function.args.isEmpty() ? "," : function.args.at(0);
+        auto required = _keys.filter(QRegularExpression(function.body));
+        std::for_each(required.begin(), required.end(), [](auto &value) { value = QString("%1: $%1").arg(value); });
+
+        _code.replace(function.what, required.join(separator));
+    }
+
+    return _code;
+}
+
+
+QString AWPatternFunctions::insertKeyCount(QString _code, const QStringList &_keys)
+{
+    qCDebug(LOG_AW) << "Looking for count in code" << _code << "using list" << _keys;
+
+    auto found = AWPatternFunctions::findFunctionCalls("aw_count", _code);
+    for (auto &function : found) {
+        auto count = _keys.filter(QRegularExpression(function.body)).count();
+
+        _code.replace(function.what, QString::number(count));
+    }
+
+    return _code;
+}
+
+
+QString AWPatternFunctions::insertKeyNames(QString _code, const QStringList &_keys)
+{
+    qCDebug(LOG_AW) << "Looking for key names in code" << _code << "using list" << _keys;
+
+    auto found = AWPatternFunctions::findFunctionCalls("aw_names", _code);
+    for (auto &function : found) {
+        auto separator = function.args.isEmpty() ? "," : function.args.at(0);
+        auto required = _keys.filter(QRegularExpression(function.body));
+
+        _code.replace(function.what, required.join(separator));
+    }
+
+    return _code;
+}
+
+
+QString AWPatternFunctions::insertKeys(QString _code, const QStringList &_keys)
+{
+    qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
+
+    auto found = AWPatternFunctions::findFunctionCalls("aw_keys", _code);
+    for (auto &function : found) {
+        auto separator = function.args.isEmpty() ? "," : function.args.at(0);
+        auto required = _keys.filter(QRegularExpression(function.body));
+        std::for_each(required.begin(), required.end(), [](auto &value) { value = QString("$%1").arg(value); });
+
+        _code.replace(function.what, required.join(separator));
+    }
+
+    return _code;
+}
+
+
+QString AWPatternFunctions::insertMacros(QString _code)
+{
+    qCDebug(LOG_AW) << "Looking for macros in code" << _code;
+
+    auto found = AWPatternFunctions::findFunctionCalls("aw_macro", _code);
+    for (auto &macro : found) {
+        // get macro params
+        if (macro.args.isEmpty()) {
+            qCWarning(LOG_AW) << "No macro name found for" << macro.what;
+            continue;
+        }
+        auto name = macro.args.takeFirst();
+        // find macro usage
+        auto macroUsage = AWPatternFunctions::findFunctionCalls(QString("aw_macro_%1").arg(name), _code);
+        for (auto &function : macroUsage) {
+            if (function.args.count() != macro.args.count()) {
+                qCWarning(LOG_AW) << "Invalid args count found for call" << function.what << "with macro" << macro.what;
+                continue;
+            }
+            // generate body to replace
+            auto result = macro.body;
+            std::for_each(macro.args.cbegin(), macro.args.cend(), [&result, macro, function](auto &arg) {
+                auto index = macro.args.indexOf(arg);
+                result.replace(QString("$%1").arg(arg), function.args.at(index));
             });
-
-        code.replace(metadata[QString("what")].toString(),
-                     required.join(separator));
+            // do replace
+            _code.replace(function.what, result);
         }
 
-    return code;
+        // remove macro from source pattern
+        _code.remove(macro.what);
+    }
+
+    return _code;
 }
 
 
-QString AWPatternFunctions::insertKeyCount(QString code, const QStringList keys)
+QStringList AWPatternFunctions::findKeys(const QString &_code, const QStringList &_keys, const bool _isBars)
 {
-    qCDebug(LOG_AW) << "Looking for count in code" << code << "using list"
-                    << keys;
-
-    QVariantList found
-        = AWPatternFunctions::findFunctionCalls(QString("aw_count"), code);
-    for (auto function : found) {
-        QVariantHash metadata = function.toHash();
-        int count = keys.filter(QRegExp(metadata[QString("body")].toString()))
-                        .count();
-
-        code.replace(metadata[QString("what")].toString(),
-                     QString::number(count));
-    }
-
-    return code;
-}
-
-
-QString AWPatternFunctions::insertKeyNames(QString code, const QStringList keys)
-{
-    qCDebug(LOG_AW) << "Looking for key names in code" << code << "using list"
-                    << keys;
-
-    QVariantList found
-        = AWPatternFunctions::findFunctionCalls(QString("aw_names"), code);
-    for (auto function : found) {
-        QVariantHash metadata = function.toHash();
-        QString separator
-            = metadata[QString("args")].toStringList().isEmpty()
-                  ? QString(",")
-                  : metadata[QString("args")].toStringList().at(0);
-        QStringList required
-            = keys.filter(QRegExp(metadata[QString("body")].toString()));
-
-        code.replace(metadata[QString("what")].toString(),
-                     required.join(separator));
-    }
-
-    return code;
-}
-
-
-QString AWPatternFunctions::insertKeys(QString code, const QStringList keys)
-{
-    qCDebug(LOG_AW) << "Looking for keys in code" << code << "using list"
-                    << keys;
-
-    QVariantList found
-        = AWPatternFunctions::findFunctionCalls(QString("aw_keys"), code);
-    for (auto function : found) {
-        QVariantHash metadata = function.toHash();
-        QString separator
-            = metadata[QString("args")].toStringList().isEmpty()
-                  ? QString(",")
-                  : metadata[QString("args")].toStringList().at(0);
-        QStringList required
-            = keys.filter(QRegExp(metadata[QString("body")].toString()));
-        std::for_each(required.begin(), required.end(), [](QString &value) {
-            value = QString("$%1").arg(value);
-        });
-
-        code.replace(metadata[QString("what")].toString(),
-                     required.join(separator));
-    }
-
-    return code;
-}
-
-
-QStringList AWPatternFunctions::findBars(const QString code,
-                                         const QStringList keys)
-{
-    qCDebug(LOG_AW) << "Looking for bars in code" << code << "using list"
-                    << keys;
+    qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
 
     QStringList selectedKeys;
-    for (auto key : keys)
-        if ((key.startsWith(QString("bar")))
-            && (code.contains(QString("$%1").arg(key)))) {
-            qCInfo(LOG_AW) << "Found bar" << key;
-            selectedKeys.append(key);
-        }
-    if (selectedKeys.isEmpty())
-        qCWarning(LOG_AW) << "No bars found";
-
-    return selectedKeys;
-}
-
-
-QStringList AWPatternFunctions::findKeys(const QString code,
-                                         const QStringList keys)
-{
-    qCDebug(LOG_AW) << "Looking for keys in code" << code << "using list"
-                    << keys;
-
-    QStringList selectedKeys;
-    for (auto key : keys)
-        if ((!key.startsWith(QString("bar")))
-            && (code.contains(QString("$%1").arg(key)))) {
-            qCInfo(LOG_AW) << "Found key" << key;
+    auto replacedCode = _code;
+    for (auto &key : _keys)
+        if ((key.startsWith("bar") == _isBars) && (replacedCode.contains(QString("$%1").arg(key)))) {
+            qCInfo(LOG_AW) << "Found key" << key << "with bar enabled" << _isBars;
             selectedKeys.append(key);
+            replacedCode.replace(QString("$%1").arg(key), "");
         }
     if (selectedKeys.isEmpty())
         qCWarning(LOG_AW) << "No keys found";
@@ -269,20 +244,19 @@ QStringList AWPatternFunctions::findKeys(const QString code,
 }
 
 
-QStringList AWPatternFunctions::findLambdas(const QString code)
+QStringList AWPatternFunctions::findLambdas(const QString &_code)
 {
-    qCDebug(LOG_AW) << "Looking for lambdas in code" << code;
+    qCDebug(LOG_AW) << "Looking for lambdas in code" << _code;
 
     QStringList selectedKeys;
     // match the following construction ${{some code here}}
-    QRegularExpression lambdaRegexp(QString("\\$\\{\\{(?<body>.*?)\\}\\}"));
-    lambdaRegexp.setPatternOptions(
-        QRegularExpression::DotMatchesEverythingOption);
+    static QRegularExpression lambdaRegexp(R"(\$\{\{(?<body>.*?)\}\})");
+    lambdaRegexp.setPatternOptions(QRegularExpression::DotMatchesEverythingOption);
 
-    QRegularExpressionMatchIterator it = lambdaRegexp.globalMatch(code);
+    auto it = lambdaRegexp.globalMatch(_code);
     while (it.hasNext()) {
-        QRegularExpressionMatch match = it.next();
-        QString lambda = match.captured(QString("body"));
+        auto match = it.next();
+        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/  *
  ***************************************************************************/
 
-
-#ifndef AWPATTERNFUNCTIONS_H
-#define AWPATTERNFUNCTIONS_H
+#pragma once
 
 #include <QString>
 #include <QVariant>
@@ -27,21 +25,23 @@ class AWKeysAggregator;
 
 namespace AWPatternFunctions
 {
+typedef struct {
+    QStringList args;
+    QString body;
+    QString what;
+} AWFunction;
+
 // insert methods
-QString expandLambdas(QString code, AWKeysAggregator *aggregator,
-                      const QVariantHash &metadata,
-                      const QStringList &usedKeys);
-QString expandTemplates(QString code);
-QVariantList findFunctionCalls(const QString function, 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 expandLambdas(QString _code, AWKeysAggregator *_aggregator, const QVariantHash &_metadata,
+                      const QStringList &_usedKeys);
+QString expandTemplates(QString _code);
+QList<AWFunction> findFunctionCalls(const QString &_function, 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 findBars(const QString code, const QStringList keys);
-QStringList findKeys(const QString code, const QStringList keys);
-QStringList findLambdas(const QString code);
-};
-
-
-#endif /* AWPATTERNFUNCTIONS_H */
+QStringList findKeys(const QString &_code, const QStringList &_keys, bool _isBars);
+QStringList findLambdas(const QString &_code);
+} // namespace AWPatternFunctions

sources/awesome-widget/plugin/awscriptformatter.cpp

@@ -1,151 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-
-#include "awscriptformatter.h"
-
-#include <QJSEngine>
-#include <QSettings>
-
-#include "awdebug.h"
-
-
-AWScriptFormatter::AWScriptFormatter(QObject *parent, const QString filename,
-                                     const QString section)
-    : AWAbstractFormatter(parent, filename, section)
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    init(filename, section);
-    initProgram();
-}
-
-
-AWScriptFormatter::AWScriptFormatter(QObject *parent, const bool appendCode,
-                                     const QString code, const bool hasReturn)
-    : AWAbstractFormatter(parent)
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    setAppendCode(appendCode);
-    setCode(code);
-    setHasReturn(hasReturn);
-    initProgram();
-}
-
-
-AWScriptFormatter::~AWScriptFormatter()
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-}
-
-
-QString AWScriptFormatter::convert(const QVariant &value) const
-{
-    qCDebug(LOG_AW) << "Convert value" << value;
-
-    // init engine
-    QJSEngine engine;
-    QJSValue fn = engine.evaluate(m_program);
-    QJSValueList args = QJSValueList() << value.toString();
-    QJSValue result = fn.call(args);
-
-    if (result.isError()) {
-        qCWarning(LOG_AW) << "Uncaught exception at line"
-                          << result.property("lineNumber").toInt() << ":"
-                          << result.toString();
-        return QString();
-    } else {
-        return result.toString();
-    }
-}
-
-
-bool AWScriptFormatter::appendCode() const
-{
-    return m_appendCode;
-}
-
-
-QString AWScriptFormatter::code() const
-{
-    return m_code;
-}
-
-
-bool AWScriptFormatter::hasReturn() const
-{
-    return m_hasReturn;
-}
-
-
-QString AWScriptFormatter::program() const
-{
-    return m_program;
-}
-
-
-void AWScriptFormatter::setAppendCode(const bool _appendCode)
-{
-    qCDebug(LOG_AW) << "Set append code" << _appendCode;
-
-    m_appendCode = _appendCode;
-}
-
-
-void AWScriptFormatter::setCode(const QString _code)
-{
-    qCDebug(LOG_AW) << "Set code" << _code;
-
-    m_code = _code;
-}
-
-
-void AWScriptFormatter::setHasReturn(const bool _hasReturn)
-{
-    qCDebug(LOG_AW) << "Set has return" << _hasReturn;
-
-    m_hasReturn = _hasReturn;
-}
-
-
-void AWScriptFormatter::init(const QString filename, const QString section)
-{
-    qCDebug(LOG_AW) << "Looking for section" << section << "in" << filename;
-
-    QSettings settings(filename, QSettings::IniFormat);
-
-    settings.beginGroup(section);
-    setAppendCode(settings.value(QString("AppendCode"), true).toBool());
-    setCode(settings.value(QString("Code"), QString()).toString());
-    setHasReturn(settings.value(QString("HasReturn"), false).toBool());
-    settings.endGroup();
-}
-
-
-void AWScriptFormatter::initProgram()
-{
-    if (m_appendCode)
-        m_program
-            = QString("(function(value) { %1%2 })")
-                  .arg(m_code)
-                  .arg(m_hasReturn ? QString("") : QString("; return output;"));
-    else
-        m_program = m_code;
-
-    qCInfo(LOG_AW) << "Create JS engine with code" << m_program;
-}

sources/awesome-widget/plugin/awtelemetryhandler.cpp

@@ -0,0 +1,111 @@
+/***************************************************************************
+ *   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 "awtelemetryhandler.h"
+
+#include <QJsonDocument>
+#include <QSettings>
+#include <QStandardPaths>
+#include <QUuid>
+
+#include "awdebug.h"
+
+
+AWTelemetryHandler::AWTelemetryHandler(QObject *_parent)
+    : QObject(_parent)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    m_localFile = QString("%1/awesomewidgets/telemetry.ini")
+                      .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
+}
+
+
+QStringList AWTelemetryHandler::get(const QString &_group) const
+{
+    qCDebug(LOG_AW) << "Get stored data for group" << _group;
+
+    QStringList values;
+
+    QSettings settings(m_localFile, QSettings::IniFormat);
+    settings.beginGroup(_group);
+    for (auto &key : settings.childKeys())
+        values.append(settings.value(key).toString());
+    settings.endGroup();
+
+    return values;
+}
+
+
+QString AWTelemetryHandler::getLast(const QString &_group) const
+{
+    qCDebug(LOG_AW) << "Get last stored data for group" << _group;
+
+    return get(_group).last();
+}
+
+
+void AWTelemetryHandler::init(const int _count)
+{
+    qCDebug(LOG_AW) << "Init telemetry with count" << _count;
+
+    m_storeCount = _count;
+}
+
+
+bool AWTelemetryHandler::put(const QString &_group, const QString &_value) const
+{
+    qCDebug(LOG_AW) << "Store data with group" << _group << "and value" << _value;
+
+    QSettings settings(m_localFile, QSettings::IniFormat);
+    settings.beginGroup(_group);
+    // values will be stored as num=value inside specified group
+    // load all values to memory
+    QStringList saved;
+    for (auto &key : settings.childKeys())
+        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 << "is already saved";
+        return false;
+    }
+    saved.append(_value);
+    // remove old ones
+    while (saved.count() > m_storeCount)
+        saved.takeFirst();
+    // clear group
+    settings.remove("");
+    // and save now
+    for (auto &val : saved) {
+        auto key = getKey(settings.childKeys().count());
+        settings.setValue(key, val);
+    }
+
+    // sync settings
+    settings.endGroup();
+    settings.sync();
+    // return status
+    return (settings.status() == QSettings::NoError);
+}
+
+
+QString AWTelemetryHandler::getKey(const int _count)
+{
+    qCDebug(LOG_AW) << "Get key for keys count" << _count;
+
+    return QString("%1").arg(_count, 3, 10, QChar('0'));
+}

sources/awesome-widget/plugin/awtelemetryhandler.h

@@ -0,0 +1,39 @@
+/***************************************************************************
+ *   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>
+
+
+class AWTelemetryHandler : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AWTelemetryHandler(QObject *_parent = nullptr);
+    ~AWTelemetryHandler() override = default;
+    Q_INVOKABLE [[nodiscard]] QStringList get(const QString &_group) const;
+    Q_INVOKABLE [[nodiscard]] QString getLast(const QString &_group) const;
+    Q_INVOKABLE void init(int _count);
+    Q_INVOKABLE [[nodiscard]] bool put(const QString &_group, const QString &_value) const;
+
+private:
+    static QString getKey(int _count);
+    QString m_localFile;
+    int m_storeCount = 0;
+};

sources/awesome-widget/plugin/awupdatehelper.cpp

@@ -18,48 +18,38 @@
 #include "awupdatehelper.h"
 
 #include <KI18n/KLocalizedString>
+#include <KNotifications/KNotification>
 
-#include <QtConcurrent/QtConcurrent>
 #include <QDesktopServices>
 #include <QJsonDocument>
-#include <QJsonParseError>
 #include <QNetworkAccessManager>
-#include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QSettings>
+#include <QStandardPaths>
 
 #include "awdebug.h"
 
 
-AWUpdateHelper::AWUpdateHelper(QObject *parent)
-    : QObject(parent)
+AWUpdateHelper::AWUpdateHelper(QObject *_parent)
+    : QObject(_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
     m_foundVersion = QVersionNumber::fromString(VERSION);
     m_genericConfig = QString("%1/awesomewidgets/general.ini")
-                          .arg(QStandardPaths::writableLocation(
-                              QStandardPaths::GenericDataLocation));
+                          .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
 }
 
 
-AWUpdateHelper::~AWUpdateHelper()
+void AWUpdateHelper::checkUpdates(const bool _showAnyway)
 {
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-}
+    qCDebug(LOG_AW) << "Show anyway" << _showAnyway;
 
-
-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) {
-                return versionReplyRecieved(reply, showAnyway);
-            });
+            [_showAnyway, this](QNetworkReply *reply) { return versionReplyReceived(reply, _showAnyway); });
 
     manager->get(QNetworkRequest(QUrl(VERSION_API)));
 }
@@ -68,19 +58,14 @@ void AWUpdateHelper::checkUpdates(const bool showAnyway)
 bool AWUpdateHelper::checkVersion()
 {
     QSettings settings(m_genericConfig, QSettings::IniFormat);
-    QVersionNumber version = QVersionNumber::fromString(
-        settings.value(QString("Version"), QString(VERSION)).toString());
+    auto version = QVersionNumber::fromString(settings.value("Version", QString(VERSION)).toString());
     // update version
-    settings.setValue(QString("Version"), QString(VERSION));
+    settings.setValue("Version", QString(VERSION));
     settings.sync();
-    qCInfo(LOG_AW) << "Found version" << version << "actual one is"
-                   << m_foundVersion;
+    qCInfo(LOG_AW) << "Found version" << version << "actual one is" << m_foundVersion;
 
     if ((version != m_foundVersion) && (!QString(CHANGELOG).isEmpty())) {
-        genMessageBox(i18n("Changelog of %1", QString(VERSION)),
-                      QString(CHANGELOG).replace(QChar('@'), QChar('\n')),
-                      QMessageBox::Ok)
-            ->open();
+        sendNotification(i18n("Changelog of %1", VERSION), QString(CHANGELOG).replace('@', '\n'));
         return true;
     } else if (version != m_foundVersion) {
         qCWarning(LOG_AW) << "No changelog information provided";
@@ -93,100 +78,78 @@ bool AWUpdateHelper::checkVersion()
 }
 
 
-void AWUpdateHelper::showInfo(const QVersionNumber version)
+void AWUpdateHelper::openReleasesPage()
 {
-    qCDebug(LOG_AW) << "Version" << version;
+    QDesktopServices::openUrl(QString(RELEASES) + m_foundVersion.toString());
+}
 
-    QString text
-        = i18n("You are using the actual version %1", version.toString());
+
+void AWUpdateHelper::showInfo(const QVersionNumber &_version)
+{
+    qCDebug(LOG_AW) << "Version" << _version;
+
+    auto text = 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)
-        ->open();
+    sendNotification(i18n("No new version found"), text);
 }
 
 
-void AWUpdateHelper::showUpdates(const QVersionNumber version)
+void AWUpdateHelper::showUpdates(const QVersionNumber &_version) const
 {
-    qCDebug(LOG_AW) << "Version" << version;
+    qCDebug(LOG_AW) << "Version" << _version;
 
     QString text;
-    text += i18n("Current version : %1", QString(VERSION));
-    text += QString(COMMIT_SHA).isEmpty()
-                ? QString("\n")
-                : QString(" (%1)\n").arg(QString(COMMIT_SHA));
-    text += i18n("New version : %1", version.toString()) + QString("\n\n");
+    text += i18n("Current version : %1", VERSION);
+    text += QString(COMMIT_SHA).isEmpty() ? "\n" : QString(" (%1)\n").arg(QString(COMMIT_SHA));
+    text += i18n("New version : %1", _version.toString()) + "\n\n";
     text += i18n("Click \"Ok\" to download");
 
-    genMessageBox(i18n("There are updates"), text,
-                  QMessageBox::Ok | QMessageBox::Cancel)
-        ->open(this, SLOT(userReplyOnUpdates(QAbstractButton *)));
+    auto event = sendNotification(i18n("There are updates"), text);
+    auto action = event->addAction(i18n("Details"));
+    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;
-    }
+    qCDebug(LOG_AW) << "Show message anyway" << _showAnyway;
+    if (_reply->error() != QNetworkReply::NoError) {
+        qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message" << _reply->errorString();
+        return;
     }
 
-
-void AWUpdateHelper::versionReplyRecieved(QNetworkReply *reply,
-                                          const bool showAnyway)
-{
-    qCDebug(LOG_AW) << "Return code" << reply->error() << "with message"
-                    << reply->errorString() << "and show anyway" << showAnyway;
-
-    QJsonParseError error;
-    QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll(), &error);
-    if ((reply->error() != QNetworkReply::NoError)
-        || (error.error != QJsonParseError::NoError)) {
+    auto error = QJsonParseError();
+    auto jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
+    if (error.error != QJsonParseError::NoError) {
         qCWarning(LOG_AW) << "Parse error" << error.errorString();
         return;
     }
-    reply->deleteLater();
+    _reply->deleteLater();
+    _reply->manager()->deleteLater(); // remember to delete manager too
 
     // convert to map
-    QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
-    QString version = firstRelease[QString("tag_name")].toString();
-    version.remove(QString("V."));
+    auto firstRelease = jsonDoc.toVariant().toList().first().toMap();
+    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)
+    else if (_showAnyway)
         return showInfo(m_foundVersion);
 }
 
 
 // additional method which is used to show message box which does not block UI
-QMessageBox *
-AWUpdateHelper::genMessageBox(const QString title, const QString body,
-                              const QMessageBox::StandardButtons buttons)
+KNotification *AWUpdateHelper::sendNotification(const QString &_title, const QString &_body)
 {
-    qCDebug(LOG_AW) << "Construct message box with title" << title << "and body"
-                    << body;
+    qCDebug(LOG_AW) << "Construct message box with title" << _title << "and body" << _body;
 
-    QMessageBox *msgBox = new QMessageBox(nullptr);
-    msgBox->setAttribute(Qt::WA_DeleteOnClose);
-    msgBox->setModal(false);
-    msgBox->setWindowTitle(title);
-    msgBox->setText(body);
-    msgBox->setStandardButtons(buttons);
-    msgBox->setIcon(QMessageBox::Information);
+    auto event = KNotification::event("system", _title, _body);
+    event->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
 
-    return msgBox;
+    return event;
 }

sources/awesome-widget/plugin/awupdatehelper.h

@@ -15,15 +15,13 @@
  *   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
@@ -31,23 +29,19 @@ class AWUpdateHelper : public QObject
     Q_OBJECT
 
 public:
-    explicit AWUpdateHelper(QObject *parent = nullptr);
-    virtual ~AWUpdateHelper();
-    void checkUpdates(const bool showAnyway = false);
+    explicit AWUpdateHelper(QObject *_parent = nullptr);
+    ~AWUpdateHelper() override = default;
+    void checkUpdates(bool _showAnyway = false);
     bool checkVersion();
 
 private slots:
-    void showInfo(const QVersionNumber version);
-    void showUpdates(const QVersionNumber version);
-    void userReplyOnUpdates(QAbstractButton *button);
-    void versionReplyRecieved(QNetworkReply *reply, const bool showAnyway);
+    void openReleasesPage();
+    static void showInfo(const QVersionNumber &_version);
+    void showUpdates(const QVersionNumber &_version) const;
+    void versionReplyReceived(QNetworkReply *_reply, bool _showAnyway);
 
 private:
-    QMessageBox *genMessageBox(const QString title, const QString body,
-                               const QMessageBox::StandardButtons buttons);
+    static KNotification *sendNotification(const QString &_title, const QString &_body);
     QVersionNumber m_foundVersion;
     QString m_genericConfig;
 };
-
-
-#endif /* AWUPDATEHELPER_H */

sources/awesomewidgets/CMakeLists.txt

@@ -7,7 +7,7 @@ include_directories(
         ${CMAKE_BINARY_DIR}
         ${PROJECT_TRDPARTY_DIR}
         ${Qt_INCLUDE}
-        ${Kf5_INCLUDE}
+        ${Kf6_INCLUDE}
 )
 
 file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/qreplytimeout/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
@@ -15,9 +15,11 @@ file(GLOB SUBPROJECT_HEADER *.h ${PROJECT_TRDPARTY_DIR}/qreplytimeout/*.h)
 file(GLOB SUBPROJECT_UI *.ui)
 file(GLOB SUBPROJECT_INI *.ini)
 set(SUBPROJECT_CONFIGS ${CMAKE_CURRENT_SOURCE_DIR}/configs)
+set(SUBPROJECT_FORMATTERS ${CMAKE_CURRENT_SOURCE_DIR}/formatters)
 set(SUBPROJECT_GRAPHITEMS ${CMAKE_CURRENT_SOURCE_DIR}/desktops)
 set(SUBPROJECT_QUOTES ${CMAKE_CURRENT_SOURCE_DIR}/quotes)
 set(SUBPROJECT_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/scripts)
+set(SUBPROJECT_REQUESTS ${CMAKE_CURRENT_SOURCE_DIR}/requests)
 set(SUBPROJECT_UPGRADE ${CMAKE_CURRENT_SOURCE_DIR}/upgrade)
 set(SUBPROJECT_WEATHER ${CMAKE_CURRENT_SOURCE_DIR}/weather)
 file(GLOB SUBPROJECT_WEATHER_JSON_IN *.json)
@@ -26,16 +28,18 @@ file(RELATIVE_PATH SUBPROJECT_WEATHER_JSON ${CMAKE_SOURCE_DIR} ${SUBPROJECT_WEAT
 # prepare
 configure_file(${SUBPROJECT_WEATHER_JSON_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_WEATHER_JSON})
 
-qt5_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
+qt6_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
 add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER} ${SUBPROJECT_UI_HEADER})
-target_link_libraries(${SUBPROJECT} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
+target_link_libraries(${SUBPROJECT} ${Qt_LIBRARIES} ${Kf6_LIBRARIES})
 
 # install
-install(DIRECTORY ${SUBPROJECT_CONFIGS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
-install(DIRECTORY ${SUBPROJECT_GRAPHITEMS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
-install(DIRECTORY ${SUBPROJECT_QUOTES} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
-install(DIRECTORY ${SUBPROJECT_SCRIPTS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
-install(DIRECTORY ${SUBPROJECT_UPGRADE} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
-install(DIRECTORY ${SUBPROJECT_WEATHER} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
-install(FILES ${SUBPROJECT_INI} DESTINATION ${CONFIG_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_WEATHER_JSON} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/weather)
+install(DIRECTORY ${SUBPROJECT_CONFIGS} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_FORMATTERS} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_GRAPHITEMS} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_QUOTES} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_SCRIPTS} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_REQUESTS} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_UPGRADE} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_WEATHER} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME})
+install(FILES ${SUBPROJECT_INI} DESTINATION /${KDE_INSTALL_CONFDIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_WEATHER_JSON} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME}/weather)

sources/awesomewidgets/abstractextitem.cpp

@@ -18,42 +18,99 @@
 #include "abstractextitem.h"
 
 #include <QDir>
+#include <QLocalServer>
+#include <QRandomGenerator>
 #include <QSettings>
 #include <QStandardPaths>
-#include <QTime>
 
-#include "awdebug.h"
 #include "abstractextitemaggregator.h"
+#include "qcronscheduler.h"
 
 
-AbstractExtItem::AbstractExtItem(QWidget *parent, const QString desktopName,
-                                 const QStringList directories)
-    : QDialog(parent)
-    , m_fileName(desktopName)
-    , m_dirs(directories)
+AbstractExtItem::AbstractExtItem(QObject *_parent, const QString &_filePath)
+    : QObject(_parent)
+    , m_filePath(_filePath)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
-    qCDebug(LOG_LIB) << "Desktop name" << desktopName << "directories"
-                     << directories;
+    qCDebug(LOG_LIB) << "Desktop name" << _filePath;
 
-    m_name = m_fileName;
+    m_name = m_filePath;
+
+    m_scheduler = new QCronScheduler(this);
+    connect(m_scheduler, &QCronScheduler::activated, this, &AbstractExtItem::requestDataUpdate);
+
+    m_socket = new QLocalServer(this);
+    connect(m_socket, &QLocalServer::newConnection, this, &AbstractExtItem::requestDataUpdate);
 }
 
 
 AbstractExtItem::~AbstractExtItem()
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
+
+    m_scheduler->stop();
+    m_scheduler->deleteLater();
+
+    m_socket->close();
+    m_socket->deleteLater();
+}
+
+
+void AbstractExtItem::bumpApi(const int _newVer)
+{
+    qCDebug(LOG_LIB) << "Bump API using new version" << _newVer;
+
+    // update for current API
+    if ((apiVersion() > 0) && (apiVersion() < _newVer)) {
+        qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to" << _newVer;
+        setApiVersion(_newVer);
+        writeConfiguration();
+    }
 }
 
 
 void AbstractExtItem::copyDefaults(AbstractExtItem *_other) const
 {
-    _other->setActive(m_active);
-    _other->setApiVersion(m_apiVersion);
-    _other->setComment(m_comment);
-    _other->setInterval(m_interval);
-    _other->setName(m_name);
+    _other->setActive(isActive());
+    _other->setApiVersion(apiVersion());
+    _other->setComment(comment());
+    _other->setCron(cron());
+    _other->setInterval(interval());
+    _other->setName(name());
+    _other->setSocket(socket());
+}
+
+
+void AbstractExtItem::startTimer()
+{
+    if (!socket().isEmpty())
+        // check if there is active socket setup
+        return;
+    else if (!cron().isEmpty())
+        // check if there is active scheduler
+        return;
+    else if (m_times == 1)
+        // check if it is time to update
+        emit(requestDataUpdate());
+
+    // update counter value
+    if (m_times >= interval())
+        m_times = 0;
+    m_times++;
+}
+
+
+QString AbstractExtItem::writableConfig() const
+{
+    auto path = m_filePath;
+    auto name = fileName();
+    // extract subdirectory
+    path.remove(path.length() - name.length() - 1, name.length() + 1);
+    auto dir = QFileInfo(path).fileName();
+
+    return QString("%1/awesomewidgets/%2/%3")
+        .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation), dir, name);
 }
 
 
@@ -69,15 +126,21 @@ QString AbstractExtItem::comment() const
 }
 
 
-QStringList AbstractExtItem::directories() const
+QString AbstractExtItem::cron() const
 {
-    return m_dirs;
+    return m_cron;
 }
 
 
 QString AbstractExtItem::fileName() const
 {
-    return m_fileName;
+    return QFileInfo(filePath()).fileName();
+}
+
+
+QString AbstractExtItem::filePath() const
+{
+    return m_filePath;
 }
 
 
@@ -105,11 +168,17 @@ int AbstractExtItem::number() const
 }
 
 
-QString AbstractExtItem::tag(const QString _type) const
+QString AbstractExtItem::socket() const
+{
+    return m_socketFile;
+}
+
+
+QString AbstractExtItem::tag(const QString &_type) const
 {
     qCDebug(LOG_LIB) << "Tag type" << _type;
 
-    return QString("%1%2").arg(_type).arg(m_number);
+    return QString("%1%2").arg(_type).arg(number());
 }
 
 
@@ -129,7 +198,7 @@ void AbstractExtItem::setActive(const bool _state)
 }
 
 
-void AbstractExtItem::setComment(const QString _comment)
+void AbstractExtItem::setComment(const QString &_comment)
 {
     qCDebug(LOG_LIB) << "Comment" << _comment;
 
@@ -137,6 +206,20 @@ void AbstractExtItem::setComment(const QString _comment)
 }
 
 
+void AbstractExtItem::setCron(const QString &_cron)
+{
+    qCDebug(LOG_LIB) << "Cron string" << _cron;
+
+    m_cron = _cron;
+    if (m_cron.isEmpty()) { // disable cron timer
+        m_scheduler->stop();
+    } else {
+        m_scheduler->parse(m_cron);
+        m_scheduler->start();
+    }
+}
+
+
 void AbstractExtItem::setInterval(const int _interval)
 {
     qCDebug(LOG_LIB) << "Interval" << _interval;
@@ -147,7 +230,7 @@ void AbstractExtItem::setInterval(const int _interval)
 }
 
 
-void AbstractExtItem::setName(const QString _name)
+void AbstractExtItem::setName(const QString &_name)
 {
     qCDebug(LOG_LIB) << "Name" << _name;
 
@@ -158,73 +241,81 @@ void AbstractExtItem::setName(const QString _name)
 void AbstractExtItem::setNumber(int _number)
 {
     qCDebug(LOG_LIB) << "Number" << _number;
-    if (_number == -1)
+    auto generateNumber = (_number == -1);
+    if (generateNumber) {
         _number = []() {
             qCWarning(LOG_LIB) << "Number is empty, generate new one";
-            qsrand(QTime::currentTime().msec());
-            int n = qrand() % 1000;
+            auto n = QRandomGenerator::global()->bounded(1000);
             qCInfo(LOG_LIB) << "Generated number is" << n;
             return n;
         }();
+    }
 
     m_number = _number;
+    if (generateNumber)
+        writeConfiguration();
+}
+
+
+void AbstractExtItem::setSocket(const QString &_socket)
+{
+    qCDebug(LOG_LIB) << "Socket" << _socket;
+
+    m_socketFile = _socket;
+}
+
+
+void AbstractExtItem::initSocket()
+{
+    // reload local socket
+    m_socket->close();
+
+    auto listening = m_socket->listen(m_socketFile);
+    qCInfo(LOG_LIB) << "Server listening on" << m_socketFile << listening;
 }
 
 
 void AbstractExtItem::readConfiguration()
 {
-    for (int i = m_dirs.count() - 1; i >= 0; i--) {
-        if (!QDir(m_dirs.at(i)).entryList(QDir::Files).contains(m_fileName))
-            continue;
-        QSettings settings(QString("%1/%2").arg(m_dirs.at(i)).arg(m_fileName),
-                           QSettings::IniFormat);
+    QSettings settings(m_filePath, QSettings::IniFormat);
 
-        settings.beginGroup(QString("Desktop Entry"));
-        setName(settings.value(QString("Name"), m_name).toString());
-        setComment(settings.value(QString("Comment"), m_comment).toString());
-        setApiVersion(
-            settings.value(QString("X-AW-ApiVersion"), m_apiVersion).toInt());
-        setActive(settings.value(QString("X-AW-Active"), QVariant(m_active))
-                      .toString()
-                  == QString("true"));
-        setInterval(
-            settings.value(QString("X-AW-Interval"), m_interval).toInt());
-        setNumber(settings.value(QString("X-AW-Number"), m_number).toInt());
+    settings.beginGroup("Desktop Entry");
+    setName(settings.value("Name", name()).toString());
+    setComment(settings.value("Comment", comment()).toString());
+    setApiVersion(settings.value("X-AW-ApiVersion", apiVersion()).toInt());
+    setActive(settings.value("X-AW-Active", isActive()).toBool());
+    setInterval(settings.value("X-AW-Interval", interval()).toInt());
+    setNumber(settings.value("X-AW-Number", number()).toInt());
+    setCron(settings.value("X-AW-Schedule", cron()).toString());
+    setSocket(settings.value("X-AW-Socket", socket()).toString());
     settings.endGroup();
 }
-}
 
 
 bool AbstractExtItem::tryDelete() const
 {
-    for (auto dir : m_dirs) {
-        bool status = QFile::remove(QString("%1/%2").arg(dir).arg(m_fileName));
-        qCInfo(LOG_LIB) << "Remove file"
-                        << QString("%1/%2").arg(dir).arg(m_fileName) << status;
-    }
+    auto status = QFile::remove(m_filePath);
+    qCInfo(LOG_LIB) << "Remove file" << m_filePath << status;
 
-    // check if exists
-    for (auto dir : m_dirs)
-        if (QFile::exists(QString("%1/%2").arg(dir).arg(m_fileName)))
-            return false;
-    return true;
+    return status;
 }
 
 
 void AbstractExtItem::writeConfiguration() const
 {
-    QSettings settings(QString("%1/%2").arg(m_dirs.first()).arg(m_fileName),
-                       QSettings::IniFormat);
+    QSettings settings(writableConfig(), QSettings::IniFormat);
     qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
 
-    settings.beginGroup(QString("Desktop Entry"));
-    settings.setValue(QString("Encoding"), QString("UTF-8"));
-    settings.setValue(QString("Name"), m_name);
-    settings.setValue(QString("Comment"), m_comment);
-    settings.setValue(QString("X-AW-ApiVersion"), m_apiVersion);
-    settings.setValue(QString("X-AW-Active"), QVariant(m_active).toString());
-    settings.setValue(QString("X-AW-Interval"), m_interval);
-    settings.setValue(QString("X-AW-Number"), m_number);
+    settings.beginGroup("Desktop Entry");
+    settings.setValue("Encoding", "UTF-8");
+    settings.setValue("Name", name());
+    settings.setValue("Comment", comment());
+    settings.setValue("X-AW-ApiVersion", apiVersion());
+    settings.setValue("X-AW-Active", isActive());
+    settings.setValue("X-AW-Interval", interval());
+    settings.setValue("X-AW-Number", number());
+    settings.setValue("X-AW-Schedule", cron());
+    settings.setValue("X-AW-Socket", socket());
     settings.endGroup();
 
     settings.sync();

sources/awesomewidgets/abstractextitem.h

@@ -15,72 +15,87 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#ifndef ABSTRACTEXTITEM_H
-#define ABSTRACTEXTITEM_H
+#pragma once
 
-#include <QDialog>
 #include <QVariant>
 
 
-class AbstractExtItem : public QDialog
+class QCronScheduler;
+class QLocalServer;
+class QWidget;
+
+class AbstractExtItem : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool active READ isActive WRITE setActive)
     Q_PROPERTY(int apiVersion READ apiVersion WRITE setApiVersion)
     Q_PROPERTY(QString comment READ comment WRITE setComment)
-    Q_PROPERTY(QStringList directories READ directories)
+    Q_PROPERTY(QString cron READ cron WRITE setCron)
     Q_PROPERTY(QString fileName READ fileName)
+    Q_PROPERTY(QString filePath READ filePath)
     Q_PROPERTY(int interval READ interval WRITE setInterval)
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(int number READ number WRITE setNumber)
+    Q_PROPERTY(QString socket READ socket WRITE setSocket)
     Q_PROPERTY(QString uniq READ uniq)
 
 public:
-    explicit AbstractExtItem(QWidget *parent = nullptr,
-                             const QString desktopName = QString(),
-                             const QStringList directories = QStringList());
-    virtual ~AbstractExtItem();
-    virtual AbstractExtItem *copy(const QString _fileName, const int _number)
-        = 0;
-    void copyDefaults(AbstractExtItem *_other) const;
+    explicit AbstractExtItem(QObject *_parent = nullptr, const QString &_filePath = "");
+    ~AbstractExtItem() override;
+    virtual void bumpApi(int _newVer);
+    virtual AbstractExtItem *copy(const QString &_fileName, int _number) = 0;
+    virtual void copyDefaults(AbstractExtItem *_other) const;
+    virtual void startTimer();
+    [[nodiscard]] QString writableConfig() const;
     // get methods
-    int apiVersion() const;
-    QString comment() const;
-    QStringList directories() const;
-    QString fileName() const;
-    int interval() const;
-    bool isActive() const;
-    QString name() const;
-    int number() const;
-    QString tag(const QString _type) const;
-    virtual QString uniq() const = 0;
+    [[nodiscard]] int apiVersion() const;
+    [[nodiscard]] QString comment() const;
+    [[nodiscard]] QString cron() const;
+    [[nodiscard]] QString fileName() const;
+    [[nodiscard]] QString filePath() const;
+    [[nodiscard]] int interval() const;
+    [[nodiscard]] bool isActive() const;
+    [[nodiscard]] QString name() const;
+    [[nodiscard]] int number() const;
+    [[nodiscard]] QString socket() const;
+    [[nodiscard]] QString tag(const QString &_type) const;
+    [[nodiscard]] virtual QString uniq() const = 0;
     // set methods
-    void setApiVersion(const int _apiVersion = 0);
-    void setActive(const bool _state = true);
-    void setComment(const QString _comment = QString("empty"));
-    void setInterval(const int _interval = 1);
-    void setName(const QString _name = QString("none"));
-    void setNumber(int _number = -1);
+    void setApiVersion(int _apiVersion);
+    void setActive(bool _state);
+    void setComment(const QString &_comment);
+    void setCron(const QString &_cron);
+    void setInterval(int _interval);
+    void setName(const QString &_name);
+    void setNumber(int _number);
+    void setSocket(const QString &_socket);
+
+signals:
+    void dataReceived(const QVariantHash &_data);
+    void requestDataUpdate();
 
 public slots:
+    virtual void initSocket();
     virtual void readConfiguration();
     virtual QVariantHash run() = 0;
-    virtual int showConfiguration(const QVariant args = QVariant()) = 0;
-    bool tryDelete() const;
+    virtual int showConfiguration(QWidget *_parent, const QVariant &_args) = 0;
+    [[nodiscard]] virtual bool tryDelete() const;
     virtual void writeConfiguration() const;
 
 private:
-    QString m_fileName;
-    QStringList m_dirs;
-    virtual void translate() = 0;
+    QCronScheduler *m_scheduler = nullptr;
+    QString m_filePath = "";
+    int m_times = 0;
+    // FIXME find a better way to do it
+    virtual void translate(void *_ui) = 0;
     // properties
     int m_apiVersion = 0;
     bool m_active = true;
-    QString m_comment = QString("empty");
+    QString m_comment = "empty";
+    QString m_cron = "";
     int m_interval = 1;
-    QString m_name = QString("none");
+    QString m_name = "none";
     int m_number = -1;
+    QLocalServer *m_socket = nullptr;
+    QString m_socketFile = "";
 };
-
-
-#endif /* ABSTRACTEXTITEM_H */