Merge pull request #146 from arcan1s/development

Release 3.4.2

.docker/Dockerfile-arch

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

.docker/Dockerfile-ubuntu-amd64

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

.docker/Dockerfile-ubuntu-i386

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

.docker/build-arch.sh

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

.docker/build-ubuntu-package.sh

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

.docker/build-ubuntu.sh

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

.github/workflows/build.yml

@@ -1,41 +0,0 @@
-name: build & tests
-
-on:
-  push:
-    branches: [ development, master ]
-  pull_request:
-    branches: [ development, 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 -Sy --noconfirm base-devel cmake extra-cmake-modules python util-linux-libs xorg-server-xvfb
-    
-    - name: install dependencies
-      run: pacman -S --noconfirm plasma-workspace
-    
-    - name: configure cmake
-      run: cmake -B build -S sources -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_FUTURE=ON -DBUILD_TESTING=ON
-    
-    - name: build
-      working-directory: /repo/build
-      run: make
-    
-    - name: test
-      working-directory: /repo/build
-      run: xvfb-run -a make test

.github/workflows/release.yml

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

.gitmodules

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

.travis.yml

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

CHANGELOG

@@ -1,11 +1,3 @@
-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)
@@ -15,6 +7,7 @@ Ver.3.4.2:
 * update to new qt api
 - fix non printable spaces (#142, #143)
 
+
 Ver.3.3.3:
 + add custom keys support (#101)
 * DBus interface improvements

README.md

@@ -1,7 +1,7 @@
 awesome-widgets (ex-pytextmonitor)
 ==================================
 
-[![build & tests](https://github.com/arcan1s/awesome-widgets/actions/workflows/build.yml/badge.svg)](https://github.com/arcan1s/awesome-widgets/actions/workflows/build.yml)
+[![Build Status](https://travis-ci.org/arcan1s/awesome-widgets.svg?branch=development)](https://travis-ci.org/arcan1s/awesome-widgets)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/8254/badge.svg)](https://scan.coverity.com/projects/awesome-widgets)
 
 Information
@@ -31,7 +31,6 @@ Dependencies
 ------------
 
 * plasma-framework
-* ksysguard (since plasma 5.22)
 
 Optional dependencies
 ---------------------
@@ -62,6 +61,10 @@ Installation
 
   **NOTE** on Plasma 5 it very likely requires `-DKDE_INSTALL_USE_QT_SYS_PATHS=ON` flag
 
+  **NOTE** if you are going to build from git, you need to init submodules first, e.g.:
+
+        git submodule update --init --recursive
+
 Additional information
 ======================
 

create_archive.sh

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

packages/PKGBUILD

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

packages/build-requirements.deb.txt

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

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

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

patches/qt5.6-qversionnumber.patch

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

sources/.clang-format

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

sources/3rdparty/fontdialog/COPYING

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

sources/3rdparty/fontdialog/README.md

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

sources/3rdparty/fontdialog/fontdialog.cpp

@@ -1,140 +0,0 @@
-/***************************************************************************
- *  Copyright (C) 2014  Evgeniy Alekseev                                      *
- *                                                                         *
- *  This library is free software; you can redistribute it and/or          *
- *  modify it under the terms of the GNU Lesser General Public             *
- *  License as published by the Free Software Foundation; either           *
- *  version 3.0 of the License, or (at your option) any later version.     *
- *                                                                         *
- *  This library is distributed in the hope that it will be useful,        *
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU       *
- *  Lesser General Public License for more details.                        *
- *                                                                         *
- *  You should have received a copy of the GNU Lesser General Public       *
- *  License along with this library.                                       *
- ***************************************************************************/
-
-#include "fontdialog.h"
-
-#include <QGridLayout>
-
-
-CFont::CFont(const QString family, int pointSize, int weight, bool italic, QColor color)
-    : QFont(family, pointSize, weight, italic)
-{
-    setCurrentColor(color);
-}
-
-
-QColor CFont::color()
-{
-    return currentColor;
-}
-
-
-void CFont::setCurrentColor(const QColor color)
-{
-    currentColor = color;
-}
-
-
-CFont CFont::fromQFont(const QFont font, const QColor color)
-{
-    return CFont(font.family(), font.pointSize(), font.weight(), font.italic(), color);
-}
-
-
-QFont CFont::toQFont()
-{
-    return QFont(family(), pointSize(), weight(), italic());
-}
-
-
-CFontDialog::CFontDialog(QWidget *parent, bool needWeight, bool needItalic)
-    : QDialog(parent)
-{
-    QGridLayout *mainGrid = new QGridLayout(this);
-    setLayout(mainGrid);
-
-    colorBox = new QComboBox(this);
-    connect(colorBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(updateColor(QString)));
-    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, SIGNAL(accepted()), this, SLOT(accept()));
-    QObject::connect(buttons, SIGNAL(rejected()), this, SLOT(reject()));
-    mainGrid->addWidget(buttons, 1, 0, 1, 5);
-
-    italicBox->setHidden(!needItalic);
-    weightBox->setHidden(!needWeight);
-}
-
-
-CFontDialog::~CFontDialog()
-{
-    delete colorBox;
-    delete buttons;
-    delete fontBox;
-    delete italicBox;
-    delete sizeBox;
-    delete weightBox;
-}
-
-
-void CFontDialog::updateColor(const QString color)
-{
-    colorBox->setStyleSheet(QString("background:%1").arg(QColor(color).name()));
-}
-
-
-CFont CFontDialog::getFont(const QString title, CFont defaultFont, bool needWeight, bool needItalic, int *status)
-{
-    CFontDialog dlg(0, needWeight, needItalic);
-
-    dlg.setWindowTitle(title);
-    QStringList colorNames = QColor::colorNames();
-    for (int i=0; i<colorNames.count(); i++)
-        if (QColor(colorNames[i]) == defaultFont.color()) {
-            dlg.colorBox->setCurrentIndex(i);
-            break;
-        }
-    dlg.fontBox->setCurrentFont(defaultFont);
-    dlg.sizeBox->setValue(defaultFont.pointSize());
-    dlg.weightBox->setValue(defaultFont.weight());
-    if (defaultFont.italic())
-        dlg.italicBox->setCurrentIndex(1);
-    else
-        dlg.italicBox->setCurrentIndex(0);
-
-    CFont font = CFont(defaultFont);
-    int ret = dlg.exec();
-    if (ret == 1)
-        font = CFont(dlg.fontBox->currentFont().family(),
-                     dlg.sizeBox->value(),
-                     dlg.weightBox->value(),
-                     dlg.italicBox->currentIndex() == 1,
-                     QColor(dlg.colorBox->currentText()));
-    if (status != nullptr)
-        *status = ret;
-    return font;
-}

sources/3rdparty/fontdialog/fontdialog.h

@@ -1,77 +0,0 @@
-/***************************************************************************
- *  Copyright (C) 2014  Evgeniy Alekseev                                      *
- *                                                                         *
- *  This library is free software; you can redistribute it and/or          *
- *  modify it under the terms of the GNU Lesser General Public             *
- *  License as published by the Free Software Foundation; either           *
- *  version 3.0 of the License, or (at your option) any later version.     *
- *                                                                         *
- *  This library is distributed in the hope that it will be useful,        *
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU       *
- *  Lesser General Public License for more details.                        *
- *                                                                         *
- *  You should have received a copy of the GNU Lesser General Public       *
- *  License along with this library.                                       *
- ***************************************************************************/
-
-#ifndef FONTDIALOG_H
-#define FONTDIALOG_H
-
-#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;
-};
-
-
-#endif /* FONTDIALOG_H */

sources/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16.0)
+cmake_minimum_required(VERSION 2.8.12)
 
 # some fucking magic
 cmake_policy(SET CMP0011 NEW)
@@ -14,9 +14,9 @@ project(awesomewidgets)
 set(PROJECT_AUTHOR "Evgeniy Alekseev")
 set(PROJECT_CONTACT "esalexeev@gmail.com")
 set(PROJECT_LICENSE "GPL3")
-set(PROJECT_VERSION_MAJOR "4")
+set(PROJECT_VERSION_MAJOR "3")
-set(PROJECT_VERSION_MINOR "0")
+set(PROJECT_VERSION_MINOR "4")
-set(PROJECT_VERSION_PATCH "0")
+set(PROJECT_VERSION_PATCH "2")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 # append git version if any
 set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "")

sources/awdebug.cpp

@@ -41,15 +41,25 @@ QString AWDebug::getAboutText(const QString &_type)
     } else if (_type == "description") {
         text = i18n("A set of minimalistic plasmoid widgets");
     } else if (_type == "links") {
-        text = i18n("Links:") + "<ul>" + QString("<li><a href=\"%1\">%2</a></li>").arg(HOMEPAGE).arg(i18n("Homepage"))
+        text = i18n("Links:") + "<ul>"
+               + QString("<li><a href=\"%1\">%2</a></li>").arg(HOMEPAGE).arg(i18n("Homepage"))
                + QString("<li><a href=\"%1\">%2</a></li>").arg(REPOSITORY).arg(i18n("Repository"))
                + QString("<li><a href=\"%1\">%2</a></li>").arg(BUGTRACKER).arg(i18n("Bugtracker"))
-               + QString("<li><a href=\"%1\">%2</a></li>").arg(TRANSLATION).arg(i18n("Translation issue"))
+               + QString("<li><a href=\"%1\">%2</a></li>")
-               + QString("<li><a href=\"%1\">%2</a></li>").arg(AUR_PACKAGES).arg(i18n("AUR packages"))
+                     .arg(TRANSLATION)
-               + QString("<li><a href=\"%1\">%2</a></li>").arg(OPENSUSE_PACKAGES).arg(i18n("openSUSE packages"))
+                     .arg(i18n("Translation issue"))
+               + QString("<li><a href=\"%1\">%2</a></li>")
+                     .arg(AUR_PACKAGES)
+                     .arg(i18n("AUR packages"))
+               + QString("<li><a href=\"%1\">%2</a></li>")
+                     .arg(OPENSUSE_PACKAGES)
+                     .arg(i18n("openSUSE packages"))
                + "</ul>";
     } else if (_type == "copy") {
-        text = QString("<small>&copy; %1 <a href=\"mailto:%2\">%3</a><br>").arg(DATE).arg(EMAIL).arg(AUTHOR)
+        text = QString("<small>&copy; %1 <a href=\"mailto:%2\">%3</a><br>")
+                   .arg(DATE)
+                   .arg(EMAIL)
+                   .arg(AUTHOR)
                + i18nc("This software is licensed under %1", LICENSE) + "</small>";
     } else if (_type == "translators") {
         QStringList translatorList = QString(TRANSLATORS).split(',');
@@ -104,7 +114,8 @@ QStringList AWDebug::getBuildData()
     metadata.append(QString("    CMAKE_CXX_FLAGS: %1").arg(CMAKE_CXX_FLAGS));
     metadata.append(QString("    CMAKE_CXX_FLAGS_DEBUG: %1").arg(CMAKE_CXX_FLAGS_DEBUG));
     metadata.append(QString("    CMAKE_CXX_FLAGS_RELEASE: %1").arg(CMAKE_CXX_FLAGS_RELEASE));
-    metadata.append(QString("    CMAKE_CXX_FLAGS_OPTIMIZATION: %1").arg(CMAKE_CXX_FLAGS_OPTIMIZATION));
+    metadata.append(
+        QString("    CMAKE_CXX_FLAGS_OPTIMIZATION: %1").arg(CMAKE_CXX_FLAGS_OPTIMIZATION));
     metadata.append(QString("    CMAKE_DEFINITIONS: %1").arg(CMAKE_DEFINITIONS));
     metadata.append(QString("    CMAKE_INSTALL_PREFIX: %1").arg(CMAKE_INSTALL_PREFIX));
     metadata.append(QString("    CMAKE_MODULE_LINKER_FLAGS: %1").arg(CMAKE_MODULE_LINKER_FLAGS));

sources/awesome-widget/CMakeLists.txt

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

sources/awesome-widget/metadata.desktop

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

sources/awesome-widget/metadata.json

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

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

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

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

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

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

@@ -15,21 +15,28 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.0
-import org.kde.kcmutils as KCM
 
 import org.kde.plasma.private.awesomewidget 1.0
 
 
-KCM.SimpleKCM {
+Item {
     id: aboutPage
-
     // backend
     AWActions {
         id: awActions
     }
 
+    width: childrenRect.width
+    height: childrenRect.height
+
+    property bool debug: awActions.isDebugEnabled()
+
     AboutTab {
         textProvider: awActions
     }
+
+    Component.onCompleted: {
+        if (debug) console.debug()
+    }
 }

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

@@ -15,21 +15,26 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.0
-import QtQuick.Controls
+import QtQuick.Controls 1.3 as QtControls
-import org.kde.kcmutils as KCM
 
 import org.kde.plasma.private.awesomewidget 1.0
 
 
-KCM.SimpleKCM {
+Item {
     id: advancedPage
-
     // backend
     AWActions {
         id: awActions
     }
 
+    width: childrenRect.width
+    height: childrenRect.height
+    implicitWidth: pageColumn.implicitWidth
+    implicitHeight: pageColumn.implicitHeight
+
+    property bool debug: awActions.isDebugEnabled()
+
     property alias cfg_background: background.checked
     property alias cfg_translateStrings: translate.checked
     property alias cfg_wrapNewLines: wrapNewLines.checked
@@ -50,6 +55,7 @@ KCM.SimpleKCM {
     property alias cfg_telemetryRemote: telemetryRemote.checked
     property alias cfg_telemetryId: telemetryId.value
 
+
     Column {
         id: pageColumn
         anchors.fill: parent
@@ -129,37 +135,37 @@ KCM.SimpleKCM {
             id: tempUnits
             model: [
                 {
-                    "label": i18n("Celsius"),
+                    'label': i18n("Celsius"),
-                    "name": "Celsius"
+                    'name': "Celsius"
                 },
                 {
-                    "label": i18n("Fahrenheit"),
+                    'label': i18n("Fahrenheit"),
-                    "name": "Fahrenheit"
+                    'name': "Fahrenheit"
                 },
                 {
-                    "label": i18n("Kelvin"),
+                    'label': i18n("Kelvin"),
-                    "name": "Kelvin"
+                    'name': "Kelvin"
                 },
                 {
-                    "label": i18n("Reaumur"),
+                    'label': i18n("Reaumur"),
-                    "name": "Reaumur"
+                    'name': "Reaumur"
                 },
                 {
-                    "label": i18n("cm^-1"),
+                    'label': i18n("cm^-1"),
-                    "name": "cm^-1"
+                    'name': "cm^-1"
                 },
                 {
-                    "label": i18n("kJ/mol"),
+                    'label': i18n("kJ/mol"),
-                    "name": "kJ/mol"
+                    'name': "kJ/mol"
                 },
                 {
-                    "label": i18n("kcal/mol"),
+                    'label': i18n("kcal/mol"),
-                    "name": "kcal/mol"
+                    'name': "kcal/mol"
                 }
             ]
             text: i18n("Temperature units")
             value: plasmoid.configuration.tempUnits
-            onValueEdited: newValue => cfg_tempUnits = newValue
+            onValueEdited: cfg_tempUnits = newValue
         }
 
         LineSelector {
@@ -186,20 +192,18 @@ KCM.SimpleKCM {
             value: plasmoid.configuration.acOffline
         }
 
-        GroupBox {
+        QtControls.GroupBox {
-            width: parent.width
             height: implicitHeight
+            width: parent.width
             title: i18n("Actions")
 
             Column {
                 height: implicitHeight
                 width: parent.width
-
                 ButtonSelector {
                     value: i18n("Drop key cache")
                     onButtonActivated: awActions.dropCache()
                 }
-
                 ButtonSelector {
                     ExportDialog {
                         id: saveConfigAs
@@ -208,12 +212,11 @@ KCM.SimpleKCM {
                     value: i18n("Export configuration")
                     onButtonActivated: saveConfigAs.open()
                 }
-
                 ButtonSelector {
                     ImportDialog {
                         id: loadConfigFrom
                         onConfigurationReceived: {
-                            for (const key in configuration)
+                            for (var key in configuration)
                                 plasmoid.configuration[key] = configuration[key]
                         }
                     }
@@ -223,7 +226,7 @@ KCM.SimpleKCM {
             }
         }
 
-        GroupBox {
+        QtControls.GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("Telemetry")
@@ -231,12 +234,10 @@ KCM.SimpleKCM {
             Column {
                 height: implicitHeight
                 width: parent.width
-
                 CheckBoxSelector {
                     id: telemetryRemote
                     text: i18n("Enable remote telemetry")
                 }
-
                 IntegerSelector {
                     id: telemetryCount
                     maximumValue: 10000
@@ -245,7 +246,6 @@ KCM.SimpleKCM {
                     text: i18n("History count")
                     value: plasmoid.configuration.telemetryCount
                 }
-
                 LineSelector {
                     id: telemetryId
                     text: i18n("Telemetry ID")
@@ -254,4 +254,9 @@ KCM.SimpleKCM {
             }
         }
     }
+
+
+    Component.onCompleted: {
+        if (debug) console.debug()
+    }
 }

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

@@ -15,22 +15,31 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.0
-import org.kde.kcmutils as KCM
 
 import org.kde.plasma.private.awesomewidget 1.0
 import "."
 
 
-KCM.SimpleKCM {
+Item {
     id: appearancePage
+    // backend
+    AWActions {
+        id: awActions
+    }
 
+    width: childrenRect.width
+    height: childrenRect.height
+    implicitWidth: pageColumn.implicitWidth
+    implicitHeight: pageColumn.implicitHeight
+
+    property bool debug: awActions.isDebugEnabled()
     property variant weight: {
         25: 0,
         50: 1,
         63: 3,
         75: 4,
-        87: 5,
+        87: 5
     }
 
     property alias cfg_fontFamily: font.value
@@ -41,6 +50,7 @@ KCM.SimpleKCM {
     property alias cfg_textStyleColor: selectStyleColor.value
     property string cfg_textStyle: textStyle.value
 
+
     Column {
         id: pageColumn
         anchors.fill: parent
@@ -65,7 +75,7 @@ KCM.SimpleKCM {
             model: General.fontWeightModel
             text: i18n("Font weight")
             value: plasmoid.configuration.fontWeight
-            onValueEdited: newValue => cfg_fontWeight = newValue
+            onValueEdited: cfg_fontWeight = newValue
         }
 
         ComboBoxSelector {
@@ -73,7 +83,7 @@ KCM.SimpleKCM {
             model: General.fontStyleModel
             text: i18n("Font style")
             value: plasmoid.configuration.fontStyle
-            onValueEdited: newValue => cfg_fontStyle = newValue
+            onValueEdited: cfg_fontStyle = newValue
         }
 
         ColorSelector {
@@ -87,7 +97,7 @@ KCM.SimpleKCM {
             model: General.textStyleModel
             text: i18n("Style")
             value: plasmoid.configuration.textStyle
-            onValueEdited: newValue => cfg_textStyle = newValue
+            onValueEdited: cfg_textStyle = newValue
         }
 
         ColorSelector {
@@ -96,4 +106,9 @@ KCM.SimpleKCM {
             value: plasmoid.configuration.textStyleColor
         }
     }
+
+
+    Component.onCompleted: {
+        if (debug) console.debug()
+    }
 }

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

@@ -15,46 +15,105 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.0
-import QtQuick.Controls
+import QtQuick.Controls 1.3 as QtControls
-import org.kde.kcmutils as KCM
+import QtQuick.Dialogs 1.1 as QtDialogs
 
 import org.kde.plasma.private.awesomewidget 1.0
 
 
-KCM.SimpleKCM {
+Item {
     id: dataenginePage
-
     // backend
     AWKeys {
         id: awKeys
     }
+    AWActions {
+        id: awActions
+    }
     AWConfigHelper {
         id: awConfig
     }
 
+    width: childrenRect.width
+    height: childrenRect.height
+    implicitWidth: pageColumn.implicitWidth
+    implicitHeight: pageColumn.implicitHeight
+
+    property bool debug: awActions.isDebugEnabled()
+
     property variant cfg_dataengine: awConfig.readDataEngineConfiguration()
 
+
     Column {
         id: pageColumn
         anchors.fill: parent
-
+        QtControls.GroupBox {
-        GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("ACPI")
             LineSelector {
                 text: i18n("ACPI path")
                 value: cfg_dataengine["ACPIPATH"]
-                onValueEdited: newValue => cfg_dataengine["ACPIPATH"] = newValue
+                onValueEdited: cfg_dataengine["ACPIPATH"] = newValue
             }
         }
 
-        GroupBox {
+        QtControls.GroupBox {
+            height: implicitHeight
+            width: parent.width
+            title: i18n("GPU")
+            ComboBoxSelector {
+                model: [
+                    {
+                        'label': "auto",
+                        'name': "auto"
+                    },
+                    {
+                        'label': "disable",
+                        'name': "disable"
+                    },
+                    {
+                        'label': "ati",
+                        'name': "ati"
+                    },
+                    {
+                        'label': "nvidia",
+                        'name': "nvidia"
+                    }
+                ]
+                text: i18n("GPU device")
+                value: cfg_dataengine["GPUDEV"]
+                onValueEdited: cfg_dataengine["GPUDEV"] = newValue
+            }
+        }
+
+        QtControls.GroupBox {
+            height: implicitHeight
+            width: parent.width
+            title: i18n("HDD temperature")
+            Column {
+                height: implicitHeight
+                width: parent.width
+                ComboBoxSelector {
+                    id: hdd
+                    text: i18n("HDD")
+                    value: cfg_dataengine["HDDDEV"]
+                    onValueEdited: cfg_dataengine["HDDDEV"] = newValue
+                }
+
+                LineSelector {
+                    text: i18n("hddtemp cmd")
+                    value: cfg_dataengine["HDDTEMPCMD"]
+                    onValueEdited: cfg_dataengine["HDDTEMPCMD"] = newValue
+                }
+            }
+        }
+
+        QtControls.GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("Player")
-
             Column {
                 height: implicitHeight
                 width: parent.width
@@ -64,27 +123,27 @@ KCM.SimpleKCM {
                     stepSize: 1
                     text: i18n("Player data symbols")
                     value: cfg_dataengine["PLAYERSYMBOLS"]
-                    onValueEdited: newValue => cfg_dataengine["PLAYERSYMBOLS"] = newValue
+                    onValueEdited: cfg_dataengine["PLAYERSYMBOLS"] = newValue
                 }
 
                 ComboBoxSelector {
                     model: [
                         {
-                            "label": "disable",
+                            'label': "disable",
-                            "name": "disable"
+                            'name': "disable"
                         },
                         {
-                            "label": "mpris",
+                            'label': "mpris",
-                            "name": "mpris"
+                            'name': "mpris"
                         },
                         {
-                            "label": "mpd",
+                            'label': "mpd",
-                            "name": "mpd"
+                            'name': "mpd"
                         }
                     ]
                     text: i18n("Music player")
                     value: cfg_dataengine["PLAYER"]
-                    onValueEdited: newValue => cfg_dataengine["PLAYER"] = newValue
+                    onValueEdited: cfg_dataengine["PLAYER"] = newValue
                 }
 
                 ComboBoxSelector {
@@ -92,40 +151,40 @@ KCM.SimpleKCM {
                     editable: true
                     model: [
                         {
-                            "label": "auto",
+                            'label': 'auto',
-                            "name": "auto"
+                            'name': 'auto'
                         },
                         {
-                            "label": "amarok",
+                            'label': 'amarok',
-                            "name": "amarok"
+                            'name': 'amarok'
                         },
                         {
-                            "label": "audacious",
+                            'label': 'audacious',
-                            "name": "audacious"
+                            'name': 'audacious'
                         },
                         {
-                            "label": "clementine",
+                            'label': 'clementine',
-                            "name": "clementine"
+                            'name': 'clementine'
                         },
                         {
-                            "label": "DeaDBeeF",
+                            'label': 'DeaDBeeF',
-                            "name": "DeaDBeeF"
+                            'name': 'DeaDBeeF'
                         },
                         {
-                            "label": "vlc",
+                            'label': 'vlc',
-                            "name": "vlc"
+                            'name': 'vlc'
                         },
                         {
-                            "label": "qmmp",
+                            'label': 'qmmp',
-                            "name": "qmmp"
+                            'name': 'qmmp'
                         },
                         {
-                            "label": "xmms2",
+                            'label': 'xmms2',
-                            "name": "xmms2"
+                            'name': 'xmms2'
                         },
                         {
-                            "label": cfg_dataengine["MPRIS"],
+                            'label': cfg_dataengine["MPRIS"],
-                            "name": cfg_dataengine["MPRIS"]
+                            'name': cfg_dataengine["MPRIS"]
                         }
                     ]
                     text: i18n("MPRIS player name")
@@ -135,7 +194,7 @@ KCM.SimpleKCM {
                 LineSelector {
                     text: i18n("MPD address")
                     value: cfg_dataengine["MPDADDRESS"]
-                    onValueEdited: newValue => cfg_dataengine["MPDADDRESS"] = newValue
+                    onValueEdited: cfg_dataengine["MPDADDRESS"] = newValue
                 }
 
                 IntegerSelector {
@@ -144,20 +203,18 @@ KCM.SimpleKCM {
                     stepSize: 1
                     text: i18n("MPD port")
                     value: cfg_dataengine["MPDPORT"]
-                    onValueEdited: newValue => cfg_dataengine["MPDPORT"] = newValue
+                    onValueEdited: cfg_dataengine["MPDPORT"] = newValue
                 }
             }
         }
 
-        GroupBox {
+        QtControls.GroupBox {
             height: implicitHeight
             width: parent.width
             title: i18n("Extensions")
-
             Column {
                 height: implicitHeight
                 width: parent.width
-
                 ButtonSelector {
                     value: i18n("Custom scripts")
                     onButtonActivated: awKeys.editItem("extscript")
@@ -188,6 +245,8 @@ KCM.SimpleKCM {
 
 
     Component.onCompleted: {
+        if (debug) console.debug()
+
         // init submodule
         awKeys.updateCache()
 
@@ -197,6 +256,8 @@ KCM.SimpleKCM {
     }
 
     Component.onDestruction: {
+        if (debug) console.debug()
+
         cfg_dataengine["MPRIS"] = mpris.editText
         awConfig.writeDataEngineConfiguration(cfg_dataengine)
     }

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

@@ -15,20 +15,20 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.4
-import QtQuick.Controls
+import QtQuick.Controls 1.3 as QtControls
-import QtQuick.Dialogs
+import QtQuick.Dialogs 1.2 as QtDialogs
-import QtQuick.Layouts
+import QtQuick.Layouts 1.1
-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 "."
 
 
-PlasmoidItem {
+Item {
     id: main
-
     // backend
     AWKeys {
         id: awKeys
@@ -43,6 +43,7 @@ PlasmoidItem {
         id: bugReport
     }
 
+    property bool debug: awActions.isDebugEnabled()
     property variant tooltipSettings: {
         "tooltipNumber": plasmoid.configuration.tooltipNumber,
         "useTooltipBackground": plasmoid.configuration.useTooltipBackground,
@@ -72,12 +73,19 @@ PlasmoidItem {
     signal needToolTipUpdate(string newText)
     signal sizeUpdate
 
-    Layout.fillWidth: PlasmoidItem.formFactor !== PlasmaCore.Planar
+
-    Layout.fillHeight: PlasmoidItem.formFactor !== PlasmaCore.Planar
+    // init
+    Plasmoid.preferredRepresentation: Plasmoid.fullRepresentation
+    Plasmoid.compactRepresentation: Plasmoid.fullRepresentation
+
+    Layout.fillWidth: plasmoid.formFactor != PlasmaCore.Planar
+    Layout.fillHeight: plasmoid.formFactor != PlasmaCore.Planar
     Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
     Plasmoid.icon: "utilities-system-monitor"
     Plasmoid.backgroundHints: plasmoid.configuration.background ? "DefaultBackground" : "NoBackground"
+    Plasmoid.associatedApplication: "ksysguard"
+
 
     // ui
     Text {
@@ -92,7 +100,7 @@ PlasmoidItem {
 
         color: plasmoid.configuration.fontColor
         font.family: plasmoid.configuration.fontFamily
-        font.italic: plasmoid.configuration.fontStyle === "italic" ? true : false
+        font.italic: plasmoid.configuration.fontStyle == "italic" ? true : false
         font.pointSize: plasmoid.configuration.fontSize
         font.weight: General.fontWeight[plasmoid.configuration.fontWeight]
 
@@ -111,19 +119,19 @@ PlasmoidItem {
         }
     }
 
-    Dialog {
+    QtDialogs.Dialog {
         id: tagSelector
         title: i18n("Select tag")
 
-        ComboBox {
+        QtControls.ComboBox {
             id: tagSelectorBox
             width: parent.width
             editable: true
         }
 
         onAccepted: {
-            const tag = tagSelectorBox.editText
+            var tag = tagSelectorBox.editText
-            let message = i18n("Tag: %1", tag)
+            var message = i18n("Tag: %1", tag)
             message += "<br>"
             message += i18n("Value: %1", awKeys.valueByKey(tag))
             message += "<br>"
@@ -132,37 +140,17 @@ PlasmoidItem {
         }
     }
 
-    Plasmoid.contextualActions: [
-        PlasmaCore.Action {
-            text: i18n("Request key")
-            icon.name: "utilities-system-monitor"
-            onTriggered: {
-                tagSelectorBox.model = awKeys.dictKeys(true)
-                tagSelector.open()
-            }
-        },
-        PlasmaCore.Action {
-            text: i18n("Show README")
-            icon.name: "text-x-readme"
-            onTriggered: awActions.showReadme()
-        },
-        PlasmaCore.Action {
-            text: i18n("Check updates")
-            icon.name: "system-software-update"
-            onTriggered: awActions.checkUpdates(true)
-        },
-        PlasmaCore.Action {
-            text: i18n("Report bug")
-            icon.name: "tools-report-bug"
-            onTriggered: {
-                bugReport.reset()
-                bugReport.open()
-            }
-        }
-    ]
-
 
     Component.onCompleted: {
+        if (debug) console.debug()
+
+        // actions
+        // it makes no sense to use this field with optimization enable
+        if (!plasmoid.configuration.optimize)
+            plasmoid.setAction("requestKey", i18n("Request key"), "utilities-system-monitor")
+        plasmoid.setAction("showReadme", i18n("Show README"), "text-x-readme")
+        plasmoid.setAction("checkUpdates", i18n("Check updates"), "system-software-update")
+        plasmoid.setAction("reportBug", i18n("Report bug"), "tools-report-bug")
         // init submodule
         Plasmoid.userConfiguringChanged(false)
         // connect data
@@ -172,26 +160,32 @@ PlasmoidItem {
         if (plasmoid.configuration.checkUpdates) return awActions.checkUpdates(false)
     }
 
-    onNeedTextUpdate: newText => {
+    onNeedTextUpdate: {
+        if (debug) console.debug()
+
         text.text = newText
         sizeUpdate()
     }
 
-    onNeedToolTipUpdate: newText => {
+    onNeedToolTipUpdate: {
+        if (debug) console.debug()
+
         tooltip.text = newText
     }
 
     onSizeUpdate: {
+        if (debug) console.debug()
         // 16 is a magic number
         // in other case plasmoid will increase own size on each update
-        if (plasmoid.configuration.height === 0) {
+
+        if (plasmoid.configuration.height == 0) {
             Layout.minimumHeight = text.contentHeight - 16
             Layout.maximumHeight = -1
         } else {
             Layout.minimumHeight = plasmoid.configuration.height
             Layout.maximumHeight = plasmoid.configuration.height
         }
-        if (plasmoid.configuration.width === 0) {
+        if (plasmoid.configuration.width == 0) {
             Layout.minimumWidth = text.contentWidth - 16
             Layout.maximumWidth = -1
         } else {
@@ -202,6 +196,7 @@ PlasmoidItem {
 
     Plasmoid.onUserConfiguringChanged: {
         if (plasmoid.userConfiguring) return
+        if (debug) console.debug()
 
         // init submodule
         awKeys.initDataAggregator(tooltipSettings)
@@ -216,7 +211,7 @@ PlasmoidItem {
         awKeys.setAggregatorProperty("tempUnits", plasmoid.configuration.tempUnits)
         awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings)
         // update telemetry ID
-        if (plasmoid.configuration.telemetryId.length === 0)
+        if (plasmoid.configuration.telemetryId.length == 0)
             plasmoid.configuration.telemetryId = generateUuid()
         // save telemetry
         awTelemetryHandler.init(plasmoid.configuration.telemetryCount,
@@ -226,10 +221,37 @@ PlasmoidItem {
             awTelemetryHandler.uploadTelemetry("awwidgetconfig", plasmoid.configuration.text)
     }
 
+
+    function action_checkUpdates() {
+        if (debug) console.debug()
+
+        return awActions.checkUpdates(true)
+    }
+
+    function action_showReadme() {
+        if (debug) console.debug()
+
+        return awActions.showReadme()
+    }
+
+    function action_reportBug() {
+        if (debug) console.debug()
+
+        bugReport.reset()
+        bugReport.open()
+    }
+
+    function action_requestKey() {
+        if (debug) console.debug()
+
+        tagSelectorBox.model = awKeys.dictKeys(true)
+        return tagSelector.open()
+    }
+
     // code from http://stackoverflow.com/questions/105034/create-guid-uuid-in-javascript
     function generateUuid() {
-        return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-            let r = Math.random() * 16 | 0, v = c === "x" ? r : (r & 0x3 | 0x8);
+            var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
             return v.toString(16);
         });
     }

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

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

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

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

sources/awesome-widget/package/metadata.desktop

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

sources/awesome-widget/package/metadata.json

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

sources/awesome-widget/plugin/CMakeLists.txt

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

sources/awesome-widget/plugin/awabstractpairconfig.cpp

@@ -107,7 +107,8 @@ void AWAbstractPairConfig::updateUi()
 void AWAbstractPairConfig::addSelector(const QStringList &_keys, const QStringList &_values,
                                        const QPair<QString, QString> &_current)
 {
-    qCDebug(LOG_AW) << "Add selector with keys" << _keys << "values" << _values << "and current ones" << _current;
+    qCDebug(LOG_AW) << "Add selector with keys" << _keys << "values" << _values
+                    << "and current ones" << _current;
 
     auto *selector = new AWAbstractSelector(ui->scrollAreaWidgetContents, m_editable);
     selector->init(_keys, _values, _current);

sources/awesome-widget/plugin/awabstractpairconfig.h

@@ -35,7 +35,8 @@ class AWAbstractPairConfig : public QDialog
     Q_OBJECT
 
 public:
-    explicit AWAbstractPairConfig(QWidget *_parent = nullptr, bool _hasEdit = false, QStringList _keys = QStringList());
+    explicit AWAbstractPairConfig(QWidget *_parent = nullptr, bool _hasEdit = false,
+                                  QStringList _keys = QStringList());
     ~AWAbstractPairConfig() override;
     template <class T> void initHelper()
     {
@@ -61,7 +62,8 @@ private:
     bool m_hasEdit = false;
     QStringList m_keys;
     // methods
-    void addSelector(const QStringList &_keys, const QStringList &_values, const QPair<QString, QString> &_current);
+    void addSelector(const QStringList &_keys, const QStringList &_values,
+                     const QPair<QString, QString> &_current);
     void clearSelectors();
     void execDialog();
     [[nodiscard]] QPair<QStringList, QStringList> initKeys() const;

sources/awesome-widget/plugin/awabstractpairhelper.cpp

@@ -61,7 +61,7 @@ QStringList AWAbstractPairHelper::values() const
 QSet<QString> AWAbstractPairHelper::valuesSet() const
 {
     auto values = m_pairs.values();
-    return {values.cbegin(), values.cend()};
+    return QSet(values.cbegin(), values.cend());
 }
 
 
@@ -69,7 +69,8 @@ void AWAbstractPairHelper::initItems()
 {
     m_pairs.clear();
 
-    QStringList configs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_filePath);
+    QStringList configs
+        = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_filePath);
 
     for (auto &fileName : configs) {
         QSettings settings(fileName, QSettings::IniFormat);
@@ -79,7 +80,8 @@ void AWAbstractPairHelper::initItems()
         QStringList keys = settings.childKeys();
         for (auto &key : keys) {
             QString value = settings.value(key).toString();
-            qCInfo(LOG_AW) << "Found key" << key << "for value" << value << "in" << settings.fileName();
+            qCInfo(LOG_AW) << "Found key" << key << "for value" << value << "in"
+                           << settings.fileName();
             if (value.isEmpty()) {
                 qCInfo(LOG_AW) << "Skip empty value for" << key;
                 continue;
@@ -96,7 +98,9 @@ bool AWAbstractPairHelper::writeItems(const QHash<QString, QString> &_configurat
     qCDebug(LOG_AW) << "Write configuration" << _configuration;
 
     QString fileName
-        = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)).arg(m_filePath);
+        = QString("%1/%2")
+              .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
+              .arg(m_filePath);
     QSettings settings(fileName, QSettings::IniFormat);
     qCInfo(LOG_AW) << "Configuration file" << fileName;
 
@@ -116,7 +120,9 @@ bool AWAbstractPairHelper::removeUnusedKeys(const QStringList &_keys) const
     qCDebug(LOG_AW) << "Remove keys" << _keys;
 
     QString fileName
-        = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)).arg(m_filePath);
+        = QString("%1/%2")
+              .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
+              .arg(m_filePath);
     QSettings settings(fileName, QSettings::IniFormat);
     qCInfo(LOG_AW) << "Configuration file" << fileName;
 

sources/awesome-widget/plugin/awabstractselector.cpp

@@ -60,8 +60,8 @@ void AWAbstractSelector::init(const QStringList &_keys, const QStringList &_valu
         qCWarning(LOG_AW) << "Invalid current value" << _current << "not found in default ones";
         return;
     }
-    qCDebug(LOG_AW) << "Init selector with keys" << _keys << "and values" << _values << "and current ones are"
+    qCDebug(LOG_AW) << "Init selector with keys" << _keys << "and values" << _values
-                    << _current;
+                    << "and current ones are" << _current;
 
     // set data
     ui->comboBox_key->clear();

sources/awesome-widget/plugin/awabstractselector.h

@@ -32,10 +32,12 @@ class AWAbstractSelector : public QWidget
     Q_OBJECT
 
 public:
-    explicit AWAbstractSelector(QWidget *_parent = nullptr, const QPair<bool, bool> &_editable = {false, false});
+    explicit AWAbstractSelector(QWidget *_parent = nullptr,
+                                const QPair<bool, bool> &_editable = {false, false});
     ~AWAbstractSelector() override;
     [[nodiscard]] QPair<QString, QString> current() const;
-    void init(const QStringList &_keys, const QStringList &_values, const QPair<QString, QString> &_current);
+    void init(const QStringList &_keys, const QStringList &_values,
+              const QPair<QString, QString> &_current);
 
 signals:
     void selectionChanged();

sources/awesome-widget/plugin/awactions.cpp

@@ -71,6 +71,13 @@ QString AWActions::getFileContent(const QString &_path)
 }
 
 
+// HACK: since QML could not use QLoggingCategory I need this hack
+bool AWActions::isDebugEnabled()
+{
+    return LOG_AW().isDebugEnabled();
+}
+
+
 bool AWActions::runCmd(const QString &_cmd, const QStringList &_args)
 {
     qCDebug(LOG_AW) << "Cmd" << _cmd << "args" << _args;
@@ -117,8 +124,8 @@ QVariantMap AWActions::getFont(const QVariantMap &_defaultFont)
 
     QVariantMap fontMap;
     int ret = 0;
-    CFont defaultCFont = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(), 400, false,
+    CFont defaultCFont = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(), 400,
-                               _defaultFont["color"].toString());
+                               false, _defaultFont["color"].toString());
     CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, false, &ret);
 
     fontMap["applied"] = ret;

sources/awesome-widget/plugin/awactions.h

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

sources/awesome-widget/plugin/awbugreporter.cpp

@@ -44,12 +44,13 @@ AWBugReporter::~AWBugReporter()
 void AWBugReporter::doConnect()
 {
     // additional method for testing needs
-    connect(this, SIGNAL(replyReceived(const int, const QString &)), this, SLOT(showInformation(int, const QString &)));
+    connect(this, SIGNAL(replyReceived(const int, const QString &)), this,
+            SLOT(showInformation(int, const QString &)));
 }
 
 
-QString AWBugReporter::generateText(const QString &_description, const QString &_reproduce, const QString &_expected,
+QString AWBugReporter::generateText(const QString &_description, const QString &_reproduce,
-                                    const QString &_logs)
+                                    const QString &_expected, const QString &_logs)
 {
     // do not log _logs here, it may have quite large size
     qCDebug(LOG_AW) << "Generate text with description" << _description << "steps" << _reproduce
@@ -72,7 +73,8 @@ void AWBugReporter::sendBugReport(const QString &_title, const QString &_body)
     qCDebug(LOG_AW) << "Send bug report with title" << _title << "and body" << _body;
 
     auto *manager = new QNetworkAccessManager(nullptr);
-    connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(issueReplyRecieved(QNetworkReply *)));
+    connect(manager, SIGNAL(finished(QNetworkReply *)), this,
+            SLOT(issueReplyRecieved(QNetworkReply *)));
 
     QNetworkRequest request = QNetworkRequest(QUrl(BUGTRACKER_API));
     request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
@@ -93,7 +95,8 @@ void AWBugReporter::sendBugReport(const QString &_title, const QString &_body)
 void AWBugReporter::issueReplyRecieved(QNetworkReply *_reply)
 {
     if (_reply->error() != QNetworkReply::NoError) {
-        qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message" << _reply->errorString();
+        qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
+                          << _reply->errorString();
         return emit(replyReceived(0, ""));
     }
 

sources/awesome-widget/plugin/awbugreporter.h

@@ -38,7 +38,7 @@ public:
     Q_INVOKABLE void sendBugReport(const QString &_title, const QString &_body);
 
 signals:
-    void replyReceived(int _number, const QString &_url);
+    void replyReceived(const int _number, const QString &_url);
 
 private slots:
     void issueReplyRecieved(QNetworkReply *_reply);

sources/awesome-widget/plugin/awconfighelper.cpp

@@ -21,6 +21,7 @@
 #include <QQmlPropertyMap>
 #include <QSettings>
 #include <QStandardPaths>
+#include <QTextCodec>
 
 #include "awdebug.h"
 
@@ -30,7 +31,8 @@ AWConfigHelper::AWConfigHelper(QObject *_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    m_baseDir = QString("%1/awesomewidgets").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
+    m_baseDir = QString("%1/awesomewidgets")
+                    .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
 }
 
 
@@ -43,8 +45,9 @@ AWConfigHelper::~AWConfigHelper()
 QString AWConfigHelper::configurationDirectory()
 {
     // get readable directory
-    QString localDir = QString("%1/awesomewidgets/configs")
+    QString localDir
-                           .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
+        = QString("%1/awesomewidgets/configs")
+              .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
 
     // create directory and copy files from default settings
     QDir localDirectory;
@@ -60,7 +63,8 @@ QString AWConfigHelper::configurationDirectory()
 bool AWConfigHelper::dropCache()
 {
     QString fileName
-        = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
+        = QString("%1/awesomewidgets.ndx")
+              .arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
 
     return QFile(fileName).remove();
 }
@@ -84,8 +88,8 @@ bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig, const QString &
 
     // extensions
     for (auto &item : m_dirs) {
-        QStringList items
+        QStringList items = QDir(QString("%1/%2").arg(m_baseDir).arg(item))
-            = QDir(QString("%1/%2").arg(m_baseDir).arg(item)).entryList(QStringList() << "*.desktop", QDir::Files);
+                                .entryList(QStringList() << "*.desktop", QDir::Files);
         settings.beginGroup(item);
         for (auto &it : items)
             copyExtensions(it, item, settings, false);
@@ -95,9 +99,11 @@ bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig, const QString &
     // additional files
     settings.beginGroup("json");
     // script filters
-    readFile(settings, "filters", QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
+    readFile(settings, "filters",
+             QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
     // weather icon settings
-    readFile(settings, "weathers", QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
+    readFile(settings, "weathers",
+             QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
     settings.endGroup();
 
     settings.beginGroup("ini");
@@ -114,8 +120,10 @@ bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig, const QString &
 }
 
 
-QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName, const bool _importPlasmoid,
+QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName,
-                                                const bool _importExtensions, const bool _importAdds) const
+                                                const bool _importPlasmoid,
+                                                const bool _importExtensions,
+                                                const bool _importAdds) const
 {
     qCDebug(LOG_AW) << "Selected filename" << _fileName;
 
@@ -136,9 +144,11 @@ QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName, const
     if (_importAdds) {
         settings.beginGroup("json");
         // script filters
-        writeFile(settings, "filters", QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
+        writeFile(settings, "filters",
+                  QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
         // weather icon settings
-        writeFile(settings, "weathers", QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
+        writeFile(settings, "weathers",
+                  QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
         settings.endGroup();
 
         settings.beginGroup("ini");
@@ -163,13 +173,17 @@ QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName, const
 
 QVariantMap AWConfigHelper::readDataEngineConfiguration()
 {
-    QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation, "plasma-dataengine-extsysmon.conf");
+    QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation,
+                                              "plasma-dataengine-extsysmon.conf");
     qCInfo(LOG_AW) << "Configuration file" << fileName;
     QSettings settings(fileName, QSettings::IniFormat);
     QVariantMap configuration;
 
     settings.beginGroup("Configuration");
     configuration["ACPIPATH"] = settings.value("ACPIPATH", "/sys/class/power_supply/");
+    configuration["GPUDEV"] = settings.value("GPUDEV", "auto");
+    configuration["HDDDEV"] = settings.value("HDDDEV", "all");
+    configuration["HDDTEMPCMD"] = settings.value("HDDTEMPCMD", "sudo smartctl -a");
     configuration["MPDADDRESS"] = settings.value("MPDADDRESS", "localhost");
     configuration["MPDPORT"] = settings.value("MPDPORT", "6600");
     configuration["MPRIS"] = settings.value("MPRIS", "auto");
@@ -194,6 +208,9 @@ bool AWConfigHelper::writeDataEngineConfiguration(const QVariantMap &_configurat
 
     settings.beginGroup("Configuration");
     settings.setValue("ACPIPATH", _configuration["ACPIPATH"]);
+    settings.setValue("GPUDEV", _configuration["GPUDEV"]);
+    settings.setValue("HDDDEV", _configuration["HDDDEV"]);
+    settings.setValue("HDDTEMPCMD", _configuration["HDDTEMPCMD"]);
     settings.setValue("MPDADDRESS", _configuration["MPDADDRESS"]);
     settings.setValue("MPDPORT", _configuration["MPDPORT"]);
     settings.setValue("MPRIS", _configuration["MPRIS"]);
@@ -211,8 +228,9 @@ void AWConfigHelper::copyConfigs(const QString &_localDir)
 {
     qCDebug(LOG_AW) << "Local directory" << _localDir;
 
-    QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "awesomewidgets/configs",
+    QStringList dirs
-                                                 QStandardPaths::LocateDirectory);
+        = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "awesomewidgets/configs",
+                                    QStandardPaths::LocateDirectory);
     for (auto &dir : dirs) {
         if (dir == _localDir)
             continue;
@@ -220,19 +238,21 @@ void AWConfigHelper::copyConfigs(const QString &_localDir)
         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;
+            qCInfo(LOG_AW) << "File" << source << "has been copied to" << destination
+                           << "with status" << status;
         }
     }
 }
 
 
-void AWConfigHelper::copyExtensions(const QString &_item, const QString &_type, QSettings &_settings,
+void AWConfigHelper::copyExtensions(const QString &_item, const QString &_type,
-                                    const bool _inverse) const
+                                    QSettings &_settings, const bool _inverse) const
 {
     qCDebug(LOG_AW) << "Extension" << _item << "has type" << _type << "inverse copying" << _inverse;
 
     _settings.beginGroup(_item);
-    QSettings itemSettings(QString("%1/%2/%3").arg(m_baseDir).arg(_type).arg(_item), QSettings::IniFormat);
+    QSettings itemSettings(QString("%1/%2/%3").arg(m_baseDir).arg(_type).arg(_item),
+                           QSettings::IniFormat);
     itemSettings.beginGroup("Desktop Entry");
     if (_inverse)
         copySettings(_settings, itemSettings);
@@ -278,6 +298,7 @@ void AWConfigHelper::writeFile(QSettings &_settings, const QString &_key, const
     QFile file(_fileName);
     if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
         QTextStream out(&file);
+        out.setCodec("UTF-8");
         out << _settings.value(_key).toString().toUtf8();
         out.flush();
         file.close();

sources/awesome-widget/plugin/awconfighelper.h

@@ -35,8 +35,10 @@ public:
     Q_INVOKABLE [[nodiscard]] static QString configurationDirectory();
     Q_INVOKABLE static bool dropCache();
     Q_INVOKABLE bool exportConfiguration(QObject *_nativeConfig, const QString &_fileName) const;
-    Q_INVOKABLE [[nodiscard]] QVariantMap importConfiguration(const QString &_fileName, bool _importPlasmoid,
+    Q_INVOKABLE [[nodiscard]] QVariantMap importConfiguration(const QString &_fileName,
-                                                              bool _importExtensions, bool _importAdds) const;
+                                                              bool _importPlasmoid,
+                                                              bool _importExtensions,
+                                                              bool _importAdds) const;
     // dataengine
     Q_INVOKABLE static QVariantMap readDataEngineConfiguration();
     Q_INVOKABLE static bool writeDataEngineConfiguration(const QVariantMap &_configuration);
@@ -44,7 +46,8 @@ public:
 private:
     // methods
     static void copyConfigs(const QString &_localDir);
-    void copyExtensions(const QString &_item, const QString &_type, QSettings &_settings, bool _inverse) const;
+    void copyExtensions(const QString &_item, const QString &_type, QSettings &_settings,
+                        bool _inverse) const;
     static void copySettings(QSettings &_from, QSettings &_to);
     static void readFile(QSettings &_settings, const QString &_key, const QString &_fileName);
     static void writeFile(QSettings &_settings, const QString &_key, const QString &_fileName);

sources/awesome-widget/plugin/awcustomkeysconfig.h

@@ -27,7 +27,8 @@ class AWCustomKeysConfig : public AWAbstractPairConfig
     Q_OBJECT
 
 public:
-    explicit AWCustomKeysConfig(QWidget *_parent = nullptr, const QStringList &_keys = QStringList());
+    explicit AWCustomKeysConfig(QWidget *_parent = nullptr,
+                                const QStringList &_keys = QStringList());
     ~AWCustomKeysConfig() override;
 };
 

sources/awesome-widget/plugin/awcustomkeyshelper.cpp

@@ -74,5 +74,5 @@ QStringList AWCustomKeysHelper::leftKeys()
 
 QStringList AWCustomKeysHelper::rightKeys()
 {
-    return {};
+    return QStringList();
 }

sources/awesome-widget/plugin/awdataaggregator.cpp

@@ -61,7 +61,8 @@ QString AWDataAggregator::htmlImage(const QPixmap &_source)
     _source.save(&buffer, "PNG");
 
     return byteArray.isEmpty() ? ""
-                               : QString("<img src=\"data:image/png;base64,%1\"/>").arg(QString(byteArray.toBase64()));
+                               : QString("<img src=\"data:image/png;base64,%1\"/>")
+                                     .arg(QString(byteArray.toBase64()));
 }
 
 
@@ -101,9 +102,10 @@ void AWDataAggregator::setParameters(const QVariantMap &_settings)
         requiredKeys.append("batTooltip");
 
     // background
-    m_toolTipScene->setBackgroundBrush(m_configuration["useTooltipBackground"].toBool()
+    m_toolTipScene->setBackgroundBrush(
-                                           ? QBrush(QColor(m_configuration["tooltipBackground"].toString()))
+        m_configuration["useTooltipBackground"].toBool()
-                                           : QBrush(Qt::NoBrush));
+            ? QBrush(QColor(m_configuration["tooltipBackground"].toString()))
+            : QBrush(Qt::NoBrush));
 }
 
 
@@ -154,10 +156,11 @@ void AWDataAggregator::dataUpdate(const QVariantHash &_values)
 }
 
 
-void AWDataAggregator::checkValue(const QString &_source, const float _value, const float _extremum) const
+void AWDataAggregator::checkValue(const QString &_source, const float _value,
+                                  const float _extremum) const
 {
-    qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value << "called with extremum"
+    qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value
-                    << _extremum;
+                    << "called with extremum" << _extremum;
 
     if (_value >= 0.0) {
         if ((m_enablePopup) && (_value > _extremum) && (m_values[_source].last() < _extremum))
@@ -169,10 +172,11 @@ void AWDataAggregator::checkValue(const QString &_source, const float _value, co
 }
 
 
-void AWDataAggregator::checkValue(const QString &_source, const QString &_current, const QString &_received) const
+void AWDataAggregator::checkValue(const QString &_source, const QString &_current,
+                                  const QString &_received) const
 {
-    qCDebug(LOG_AW) << "Notification source" << _source << "with current value" << _current << "and received one"
+    qCDebug(LOG_AW) << "Notification source" << _source << "with current value" << _current
-                    << _received;
+                    << "and received one" << _received;
 
     if ((m_enablePopup) && (_current != _received) && (!_received.isEmpty()))
         return AWActions::sendNotification("event", notificationText(_source, _received));
@@ -227,7 +231,8 @@ void AWDataAggregator::setData(const QVariantHash &_values)
 {
     // do not log these arguments
     // battery update requires info is AC online or not
-    setData(_values["ac"].toString() == m_configuration["acOnline"], "batTooltip", _values["bat"].toFloat());
+    setData(_values["ac"].toString() == m_configuration["acOnline"], "batTooltip",
+            _values["bat"].toFloat());
     // usual case
     setData("cpuTooltip", _values["cpu"].toFloat(), 90.0);
     setData("cpuclTooltip", _values["cpucl"].toFloat());
@@ -264,7 +269,8 @@ void AWDataAggregator::setData(const QString &_source, float _value, const float
         QList<float> netValues = m_values["downkbTooltip"] + m_values["upkbTooltip"];
         // to avoid inf value of normY
         netValues << 1.0;
-        m_boundaries["downkbTooltip"] = 1.2f * *std::max_element(netValues.cbegin(), netValues.cend());
+        m_boundaries["downkbTooltip"]
+            = 1.2f * *std::max_element(netValues.cbegin(), netValues.cend());
         m_boundaries["upkbTooltip"] = m_boundaries["downkbTooltip"];
     }
 }
@@ -272,7 +278,8 @@ void AWDataAggregator::setData(const QString &_source, float _value, const float
 
 void AWDataAggregator::setData(const bool _dontInvert, const QString &_source, float _value)
 {
-    qCDebug(LOG_AW) << "Do not invert" << _dontInvert << "value" << _value << "for source" << _source;
+    qCDebug(LOG_AW) << "Do not invert" << _dontInvert << "value" << _value << "for source"
+                    << _source;
 
     // invert values for different battery colours
     _value = _dontInvert ? _value : -_value;

sources/awesome-widget/plugin/awdataaggregator.h

@@ -50,7 +50,8 @@ private:
     QGraphicsScene *m_toolTipScene = nullptr;
     QGraphicsView *m_toolTipView = nullptr;
     void checkValue(const QString &_source, float _value, float _extremum) const;
-    void checkValue(const QString &_source, const QString &_current, const QString &_received) const;
+    void checkValue(const QString &_source, const QString &_current,
+                    const QString &_received) const;
     void initScene();
     static QString notificationText(const QString &_source, float _value);
     static QString notificationText(const QString &_source, const QString &_value);

sources/awesome-widget/plugin/awdataengineaggregator.cpp

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

sources/awesome-widget/plugin/awdataengineaggregator.h

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

sources/awesome-widget/plugin/awdataenginemapper.cpp

@@ -17,7 +17,7 @@
 
 #include "awdataenginemapper.h"
 
-#include <QRegularExpression>
+#include <QRegExp>
 
 #include "awdebug.h"
 #include "awformatterhelper.h"
@@ -76,80 +76,77 @@ QStringList AWDataEngineMapper::keysFromSource(const QString &_source) const
 
 // HACK units required to define should the value be calculated as temperature
 // or fan data
-QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSysGuard::Unit _units,
+QStringList AWDataEngineMapper::registerSource(const QString &_source, const QString &_units,
                                                const QStringList &_keys)
 {
     qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
 
     // regular expressions
-    auto cpuRegExp = QRegularExpression("^cpu/cpu.*/usage$");
+    QRegExp cpuRegExp = QRegExp("cpu/cpu.*/TotalLoad");
-    auto cpuclRegExp = QRegularExpression("^cpu/cpu.*/frequency$");
+    QRegExp cpuclRegExp = QRegExp("cpu/cpu.*/clock");
-    auto cpuTempRegExp = QRegularExpression("^cpu/cpu.*/temperature$");
+    QRegExp hddrRegExp = QRegExp("disk/.*/Rate/rblk");
-    auto gpuRegExp = QRegularExpression("^gpu/gpu.*/usage$");
+    QRegExp hddwRegExp = QRegExp("disk/.*/Rate/wblk");
-    auto gpuTempRegExp = QRegularExpression("^gpu/gpu.*/temperature$");
+    QRegExp mountFillRegExp = QRegExp("partitions/.*/filllevel");
-    auto hddrRegExp = QRegularExpression("^disk/.*/read$");
+    QRegExp mountFreeRegExp = QRegExp("partitions/.*/freespace");
-    auto hddwRegExp = QRegularExpression("^disk/.*/write$");
+    QRegExp mountUsedRegExp = QRegExp("partitions/.*/usedspace");
-    auto mountFillRegExp = QRegularExpression("^disk/.*/usedPercent$");
+    QRegExp netRegExp = QRegExp("network/interfaces/.*/(receiver|transmitter)/data$");
-    auto mountFreeRegExp = QRegularExpression("^disk/.*/free$");
+    QRegExp netTotalRegExp = QRegExp("network/interfaces/.*/(receiver|transmitter)/dataTotal$");
-    auto mountUsedRegExp = QRegularExpression("^disk/.*/used$");
-    auto netRegExp = QRegularExpression("^network/.*/(download|upload)$");
-    auto netTotalRegExp = QRegularExpression("^network/.*/(totalDownload|totalUpload)$");
 
-    if (_source == "extsysmon/battery/ac") {
+    if (_source == "battery/ac") {
         // AC
         m_map.insert(_source, "ac");
         m_formatter["ac"] = AWKeysAggregator::FormatterType::ACFormat;
-    } else if (_source.startsWith("extsysmon/battery/")) {
+    } else if (_source.startsWith("battery/")) {
         // battery stats
-        auto key = _source;
+        QString key = _source;
-        key.remove("extsysmon/battery/");
+        key.remove("battery/");
         m_map.insert(_source, key);
         m_formatter[key] = _source.contains("rate") ? AWKeysAggregator::FormatterType::Float
                                                     : AWKeysAggregator::FormatterType::IntegerThree;
-    } else if (_source == "cpu/all/usage") {
+    } else if (_source == "cpu/system/TotalLoad") {
         // cpu
         m_map.insert(_source, "cpu");
         m_formatter["cpu"] = AWKeysAggregator::FormatterType::Float;
     } else if (_source.contains(cpuRegExp)) {
         // cpus
-        auto key = _source;
+        QString key = _source;
-        key.remove("cpu/").remove("/usage");
+        key.remove("cpu/").remove("/TotalLoad");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::Float;
-    } else if (_source == "cpu/all/averageFrequency") {
+    } else if (_source == "cpu/system/AverageClock") {
         // cpucl
         m_map.insert(_source, "cpucl");
         m_formatter["cpucl"] = AWKeysAggregator::FormatterType::Integer;
     } else if (_source.contains(cpuclRegExp)) {
         // cpucls
-        auto key = _source;
+        QString key = _source;
-        key.remove("cpu/cpu").remove("/frequency");
+        key.remove("cpu/cpu").remove("/clock");
         key = QString("cpucl%1").arg(key);
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
-    } else if (_source.startsWith("extsysmon/custom")) {
+    } else if (_source.startsWith("custom")) {
         // custom
-        auto key = _source;
+        QString key = _source;
-        key.remove("extsysmon/custom/");
+        key.remove("custom/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "extsysmon/desktop/name") {
+    } else if (_source == "desktop/current/name") {
         // current desktop name
         m_map.insert(_source, "desktop");
         m_formatter["desktop"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "extsysmon/desktop/number") {
+    } else if (_source == "desktop/current/number") {
         // current desktop number
         m_map.insert(_source, "ndesktop");
         m_formatter["ndesktop"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "extsysmon/desktop/count") {
+    } else if (_source == "desktop/total/number") {
         // desktop count
         m_map.insert(_source, "tdesktops");
         m_formatter["tdesktops"] = AWKeysAggregator::FormatterType::NoFormat;
     } else if (_source.contains(hddrRegExp)) {
         // read speed
-        auto device = _source;
+        QString device = _source;
-        device.remove("disk/").remove("/read");
+        device.remove("/Rate/rblk");
-        auto index = m_devices["disk"].indexOf(device);
+        int index = m_devices["disk"].indexOf(device);
         if (index > -1) {
             QString key = QString("hddr%1").arg(index);
             m_map.insert(_source, key);
@@ -157,56 +154,42 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         }
     } else if (_source.contains(hddwRegExp)) {
         // write speed
-        auto device = _source;
+        QString device = _source;
-        device.remove("disk/").remove("/write");
+        device.remove("/Rate/wblk");
-        auto index = m_devices["disk"].indexOf(device);
+        int index = m_devices["disk"].indexOf(device);
         if (index > -1) {
             QString key = QString("hddw%1").arg(index);
             m_map.insert(_source, key);
             m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
         }
-    } else if (_source == "gpu/all/usage") {
+    } else if (_source == "gpu/load") {
         // gpu load
         m_map.insert(_source, "gpu");
         m_formatter["gpu"] = AWKeysAggregator::FormatterType::Float;
-    } else if (_source.contains(gpuRegExp)) {
+    } else if (_source == "gpu/temperature") {
-        // gpus
+        // gpu temperature
-        auto device = _source;
+        m_map.insert(_source, "gputemp");
-        device.remove("gpu/").remove("/usage");
+        m_formatter["gputemp"] = AWKeysAggregator::FormatterType::Temperature;
-        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;
+        QString device = _source;
-        device.remove("disk/").remove("/usedPercent");
+        device.remove("partitions").remove("/filllevel");
-        auto index = m_devices["mount"].indexOf(device);
+        int index = m_devices["mount"].indexOf(device);
         if (index > -1) {
-            auto key = QString("hdd%1").arg(index);
+            QString key = QString("hdd%1").arg(index);
             m_map.insert(_source, key);
             m_formatter[key] = AWKeysAggregator::FormatterType::Float;
             // additional keys
-            m_formatter[QString("hddtotmb%1").arg(index)] = AWKeysAggregator::FormatterType::MemMBFormat;
+            m_formatter[QString("hddtotmb%1").arg(index)]
-            m_formatter[QString("hddtotgb%1").arg(index)] = AWKeysAggregator::FormatterType::MemGBFormat;
+                = AWKeysAggregator::FormatterType::MemMBFormat;
+            m_formatter[QString("hddtotgb%1").arg(index)]
+                = AWKeysAggregator::FormatterType::MemGBFormat;
         }
     } else if (_source.contains(mountFreeRegExp)) {
         // free space
-        auto device = _source;
+        QString device = _source;
-        device.remove("disk/").remove("/free");
+        device.remove("partitions").remove("/freespace");
-        auto index = m_devices["mount"].indexOf(device);
+        int index = m_devices["mount"].indexOf(device);
         if (index > -1) {
             // mb
             QString key = QString("hddfreemb%1").arg(index);
@@ -219,9 +202,9 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         }
     } else if (_source.contains(mountUsedRegExp)) {
         // used
-        auto device = _source;
+        QString device = _source;
-        device.remove("disk/").remove("/used");
+        device.remove("partitions").remove("/usedspace");
-        auto index = m_devices["mount"].indexOf(device);
+        int index = m_devices["mount"].indexOf(device);
         if (index > -1) {
             // mb
             QString key = QString("hddmb%1").arg(index);
@@ -232,14 +215,24 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
             m_map.insert(_source, key);
             m_formatter[key] = AWKeysAggregator::FormatterType::MemGBFormat;
         }
-    } else if (_source.startsWith("cpu/loadaverages/loadaverage")) {
+    } else if (_source.startsWith("hdd/temperature")) {
+        // hdd temperature
+        QString device = _source;
+        device.remove("hdd/temperature");
+        int index = m_devices["hdd"].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hddtemp%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
+        }
+    } else if (_source.startsWith("cpu/system/loadavg")) {
         // load average
-        auto time = _source;
+        QString time = _source;
-        time.remove("cpu/loadaverages/loadaverage");
+        time.remove("cpu/system/loadavg");
-        auto key = QString("la%1").arg(time);
+        QString key = QString("la%1").arg(time);
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::FloatTwoSymbols;
-    } else if (_source == "memory/physical/application") {
+    } else if (_source == "mem/physical/application") {
         // app memory
         // mb
         m_map.insert(_source, "memmb");
@@ -247,7 +240,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         // gb
         m_map.insert(_source, "memgb");
         m_formatter["memgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
-    } else if (_source == "memory/physical/free") {
+    } else if (_source == "mem/physical/free") {
         // free memory
         // mb
         m_map.insert(_source, "memfreemb");
@@ -255,7 +248,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         // gb
         m_map.insert(_source, "memfreegb");
         m_formatter["memfreegb"] = AWKeysAggregator::FormatterType::MemGBFormat;
-    } else if (_source == "memory/physical/used") {
+    } else if (_source == "mem/physical/used") {
         // used memory
         // mb
         m_map.insert(_source, "memusedmb");
@@ -263,27 +256,27 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         // gb
         m_map.insert(_source, "memusedgb");
         m_formatter["memusedgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
-    } else if (_source == "extsysmon/network/device") {
+    } else if (_source == "network/current/name") {
         // network device
         m_map.insert(_source, "netdev");
         m_formatter["netdev"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "extsysmon/network/ssid") {
+    } else if (_source == "network/current/ssid") {
         // current ssid
         m_map.insert(_source, "ssid");
         m_formatter["ssid"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source.startsWith("extsysmon/requests/response")) {
+    } else if (_source.startsWith("network/response")) {
         // network response
-        auto key = _source;
+        QString key = _source;
-        key.remove("extsysmon/requests/");
+        key.remove("network/");
         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";
+        QString type = _source.contains("receiver") ? "down" : "up";
-        auto index = m_devices["net"].indexOf(_source.split('/')[1]);
+        int index = m_devices["net"].indexOf(_source.split('/')[2]);
         if (index > -1) {
             // kb
-            auto key = QString("%1kb%2").arg(type).arg(index);
+            QString key = QString("%1kb%2").arg(type).arg(index);
             m_map.insert(_source, key);
             m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
             // smart
@@ -297,11 +290,11 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         }
     } else if (_source.contains(netTotalRegExp)) {
         // network data total
-        auto type = _source.endsWith("Download") ? "down" : "up";
+        QString type = _source.contains("receiver") ? "down" : "up";
-        auto index = m_devices["net"].indexOf(_source.split('/')[1]);
+        int index = m_devices["net"].indexOf(_source.split('/')[2]);
         if (index > -1) {
             // kb
-            auto key = QString("%1totkb%2").arg(type).arg(index);
+            QString key = QString("%1totkb%2").arg(type).arg(index);
             m_map.insert(_source, key);
             m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
             // mb
@@ -309,37 +302,37 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
             m_map.insert(_source, key);
             m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
         }
-    } else if (_source.startsWith("extsysmon/upgrade")) {
+    } else if (_source.startsWith("upgrade")) {
         // package manager
-        auto key = _source;
+        QString key = _source;
-        key.remove("extsysmon/upgrade/");
+        key.remove("upgrade/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::IntegerThree;
-    } else if (_source.startsWith("extsysmon/player")) {
+    } else if (_source.startsWith("player")) {
         // player
-        auto key = _source;
+        QString key = _source;
-        key.remove("extsysmon/player/");
+        key.remove("player/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "extsysmon/ps/running") {
+    } else if (_source == "ps/running/count") {
         // running processes count
         m_map.insert(_source, "pscount");
         m_formatter["pscount"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "extsysmon/ps/list") {
+    } else if (_source == "ps/running/list") {
         // list of running processes
         m_map.insert(_source, "ps");
         m_formatter["ps"] = AWKeysAggregator::FormatterType::List;
-    } else if (_source == "extsysmon/ps/count") {
+    } else if (_source == "ps/total/count") {
         // total processes count
         m_map.insert(_source, "pstot");
         m_formatter["pstot"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source.startsWith("extsysmon/quotes")) {
+    } else if (_source.startsWith("quotes")) {
         // quotes
-        auto key = _source;
+        QString key = _source;
-        key.remove("extsysmon/quotes/");
+        key.remove("quotes/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::Quotes;
-    } else if (_source == "memory/swap/free") {
+    } else if (_source == "mem/swap/free") {
         // free swap
         // mb
         m_map.insert(_source, "swapfreemb");
@@ -347,7 +340,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         // gb
         m_map.insert(_source, "swapfreegb");
         m_formatter["swapfreegb"] = AWKeysAggregator::FormatterType::MemGBFormat;
-    } else if (_source == "memory/swap/used") {
+    } else if (_source == "mem/swap/used") {
         // used swap
         // mb
         m_map.insert(_source, "swapmb");
@@ -355,20 +348,19 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         // gb
         m_map.insert(_source, "swapgb");
         m_formatter["swapgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
-    } else if (_source.startsWith("lmsensors/") || _source.contains(cpuTempRegExp)
+    } else if (_source.startsWith("lmsensors/")) {
-               || _source == "cpu/all/averageTemperature") {
         // temperature
-        auto index = m_devices["temp"].indexOf(_source);
+        int index = m_devices["temp"].indexOf(_source);
         // HACK on DE initialization there are no units key
-        if (_units == KSysGuard::UnitInvalid)
+        if (_units.isEmpty())
             return QStringList({QString("temp%1").arg(index)});
         if (index > -1) {
-            auto key = QString("temp%1").arg(index);
+            QString key = QString("temp%1").arg(index);
             m_map.insert(_source, key);
-            m_formatter[key] = _units == KSysGuard::UnitCelsius ? AWKeysAggregator::FormatterType::Temperature
+            m_formatter[key] = _units == "°C" ? AWKeysAggregator::FormatterType::Temperature
-                                                                : AWKeysAggregator::FormatterType::Integer;
+                                              : AWKeysAggregator::FormatterType::Integer;
         }
-    } else if (_source == "extsysmon/time/now") {
+    } else if (_source == "Local") {
         // time
         m_map.insert(_source, "time");
         m_formatter["time"] = AWKeysAggregator::FormatterType::Time;
@@ -387,40 +379,40 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         // timestamp
         m_map.insert(_source, "tstime");
         m_formatter["tstime"] = AWKeysAggregator::FormatterType::Timestamp;
-    } else if (_source == "extsysmon/system/brightness") {
+    } else if (_source == "system/brightness") {
         m_map.insert(_source, "brightness");
         m_formatter["brightness"] = AWKeysAggregator::FormatterType::IntegerThree;
-    } else if (_source == "extsysmon/system/volume") {
+    } else if (_source == "system/volume") {
         m_map.insert(_source, "volume");
         m_formatter["volume"] = AWKeysAggregator::FormatterType::IntegerThree;
-    } else if (_source == "os/system/uptime") {
+    } else if (_source == "system/uptime") {
         // uptime
         m_map.insert(_source, "uptime");
         m_formatter["uptime"] = AWKeysAggregator::FormatterType::Uptime;
         // custom uptime
         m_map.insert(_source, "cuptime");
         m_formatter["cuptime"] = AWKeysAggregator::FormatterType::UptimeCustom;
-    } else if (_source.startsWith("extsysmon/weather/temperature")) {
+    } else if (_source.startsWith("weather/temperature")) {
         // temperature
-        auto key = _source;
+        QString key = _source;
-        key.remove("extsysmon/weather/");
+        key.remove("weather/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
-    } else if (_source.startsWith("extsysmon/weather/")) {
+    } else if (_source.startsWith("weather/")) {
         // other weather
-        auto key = _source;
+        QString key = _source;
-        key.remove("extsysmon/weather/");
+        key.remove("weather/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source.startsWith("extsysmon/load/load")) {
+    } else if (_source.startsWith("load/load")) {
         // load source
-        auto key = _source;
+        QString key = _source;
-        key.remove("extsysmon/load/");
+        key.remove("load/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
     }
 
-    auto foundKeys = keysFromSource(_source);
+    QStringList foundKeys = keysFromSource(_source);
 
     // rewrite formatters for custom ones
     QStringList customFormattersKeys;
@@ -435,9 +427,9 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
 
     // 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](const QString &key) {
+    bool required = _keys.isEmpty()
-                        return _keys.contains(key);
+                    || 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)

sources/awesome-widget/plugin/awdataenginemapper.h

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

sources/awesome-widget/plugin/awdbusadaptor.cpp

@@ -38,9 +38,10 @@ AWDBusAdaptor::~AWDBusAdaptor()
 }
 
 
-QStringList AWDBusAdaptor::ActiveServices()
+QStringList AWDBusAdaptor::ActiveServices() const
 {
-    QDBusMessage listServices = QDBusConnection::sessionBus().interface()->call(QDBus::BlockWithGui, "ListNames");
+    QDBusMessage listServices
+        = QDBusConnection::sessionBus().interface()->call(QDBus::BlockWithGui, "ListNames");
     if (listServices.arguments().isEmpty()) {
         qCWarning(LOG_DBUS) << "Could not find any DBus service";
         return {};
@@ -48,7 +49,7 @@ QStringList AWDBusAdaptor::ActiveServices()
     QStringList arguments = listServices.arguments().first().toStringList();
 
     return std::accumulate(arguments.cbegin(), arguments.cend(), QStringList(),
-                           [](QStringList source, const QString &service) {
+                           [](QStringList &source, const QString &service) {
                                if (service.startsWith(AWDBUS_SERVICE))
                                    source.append(service);
                                return source;
@@ -85,7 +86,8 @@ void AWDBusAdaptor::SetLogLevel(const QString &what, const int level)
     qCDebug(LOG_DBUS) << "Set log level" << level << "for" << what;
 
     if (level >= m_logLevels.count()) {
-        qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be less than" << m_logLevels.count();
+        qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be less than"
+                          << m_logLevels.count();
         return;
     }
 

sources/awesome-widget/plugin/awdbusadaptor.h

@@ -37,7 +37,7 @@ public:
 
 public slots:
     // get methods
-    [[nodiscard]] static QStringList ActiveServices();
+    [[nodiscard]] QStringList ActiveServices() const;
     [[nodiscard]] QString Info(const QString &key) const;
     [[nodiscard]] QStringList Keys(const QString &regexp) const;
     [[nodiscard]] QString Value(const QString &key) const;

sources/awesome-widget/plugin/awformatterconfig.h

@@ -27,7 +27,8 @@ class AWFormatterConfig : public AWAbstractPairConfig
     Q_OBJECT
 
 public:
-    explicit AWFormatterConfig(QWidget *_parent = nullptr, const QStringList &_keys = QStringList());
+    explicit AWFormatterConfig(QWidget *_parent = nullptr,
+                               const QStringList &_keys = QStringList());
     ~AWFormatterConfig() override;
 };
 

sources/awesome-widget/plugin/awformatterhelper.cpp

@@ -102,7 +102,7 @@ void AWFormatterHelper::editPairs()
 
 QStringList AWFormatterHelper::leftKeys()
 {
-    return {};
+    return QStringList();
 }
 
 
@@ -114,12 +114,14 @@ QStringList AWFormatterHelper::rightKeys()
 
 void AWFormatterHelper::editItems()
 {
-    auto ret = exec();
+    repaintList();
+    int ret = exec();
     qCInfo(LOG_AW) << "Dialog returns" << ret;
 }
 
 
-AWAbstractFormatter::FormatterClass AWFormatterHelper::defineFormatterClass(const QString &_stringType)
+AWAbstractFormatter::FormatterClass
+AWFormatterHelper::defineFormatterClass(const QString &_stringType)
 {
     qCDebug(LOG_AW) << "Define formatter class for" << _stringType;
 
@@ -161,7 +163,9 @@ void AWFormatterHelper::initFormatters()
             // check if already exists
             auto values = m_formattersClasses.values();
             if (std::any_of(values.cbegin(), values.cend(),
-                            [&filePath](const AWAbstractFormatter *item) { return (item->fileName() == filePath); }))
+                            [&filePath](const AWAbstractFormatter *item) {
+                                return (item->fileName() == filePath);
+                            }))
                 continue;
 
             auto metadata = readMetadata(filePath);
@@ -193,26 +197,28 @@ void AWFormatterHelper::initFormatters()
 }
 
 
-QPair<QString, AWAbstractFormatter::FormatterClass> AWFormatterHelper::readMetadata(const QString &_filePath)
+QPair<QString, AWAbstractFormatter::FormatterClass>
+AWFormatterHelper::readMetadata(const QString &_filePath)
 {
     qCDebug(LOG_AW) << "Read initial parameters from" << _filePath;
 
     QSettings settings(_filePath, QSettings::IniFormat);
     settings.beginGroup("Desktop Entry");
-    auto name = settings.value("Name", _filePath).toString();
+    QString name = settings.value("Name", _filePath).toString();
-    auto type = settings.value("X-AW-Type", "NoFormat").toString();
+    QString type = settings.value("X-AW-Type", "NoFormat").toString();
-    auto formatter = defineFormatterClass(type);
+    AWAbstractFormatter::FormatterClass formatter = defineFormatterClass(type);
     settings.endGroup();
 
     return QPair<QString, AWAbstractFormatter::FormatterClass>(name, formatter);
 }
 
 
-void AWFormatterHelper::doCreateItem(QListWidget *_widget)
+void AWFormatterHelper::doCreateItem()
 {
     QStringList selection = {"NoFormat", "DateTime", "Float", "List", "Script", "String", "Json"};
     bool ok;
-    auto select = QInputDialog::getItem(nullptr, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok);
+    QString select
+        = QInputDialog::getItem(this, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok);
     if (!ok) {
         qCWarning(LOG_AW) << "No type selected";
         return;
@@ -222,18 +228,18 @@ void AWFormatterHelper::doCreateItem(QListWidget *_widget)
     AWAbstractFormatter::FormatterClass formatter = defineFormatterClass(select);
     switch (formatter) {
     case AWAbstractFormatter::FormatterClass::DateTime:
-        return createItem<AWDateTimeFormatter>(_widget);
+        return createItem<AWDateTimeFormatter>();
     case AWAbstractFormatter::FormatterClass::Float:
-        return createItem<AWFloatFormatter>(_widget);
+        return createItem<AWFloatFormatter>();
     case AWAbstractFormatter::FormatterClass::List:
-        return createItem<AWListFormatter>(_widget);
+        return createItem<AWListFormatter>();
     case AWAbstractFormatter::FormatterClass::Script:
-        return createItem<AWScriptFormatter>(_widget);
+        return createItem<AWScriptFormatter>();
     case AWAbstractFormatter::FormatterClass::String:
-        return createItem<AWStringFormatter>(_widget);
+        return createItem<AWStringFormatter>();
     case AWAbstractFormatter::FormatterClass::Json:
-        return createItem<AWJsonFormatter>(_widget);
+        return createItem<AWJsonFormatter>();
     case AWAbstractFormatter::FormatterClass::NoFormat:
-        return createItem<AWNoFormatter>(_widget);
+        return createItem<AWNoFormatter>();
     }
 }

sources/awesome-widget/plugin/awformatterhelper.h

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

sources/awesome-widget/plugin/awkeycache.cpp

@@ -20,7 +20,6 @@
 
 #include <QDir>
 #include <QNetworkInterface>
-#include <QRegularExpression>
 #include <QSettings>
 #include <QStandardPaths>
 
@@ -31,8 +30,9 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
 {
     qCDebug(LOG_AW) << "Key" << _key << "with type" << _type;
 
-    auto fileName
+    QString fileName
-        = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
+        = QString("%1/awesomewidgets.ndx")
+              .arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
     qCInfo(LOG_AW) << "Cache file" << fileName;
     QSettings cache(fileName, QSettings::IniFormat);
 
@@ -41,8 +41,19 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
     for (auto &number : cache.allKeys())
         cachedValues.append(cache.value(number).toString());
 
-    if (_type == "net") {
+    if (_type == "hdd") {
-        auto rawInterfaceList = QNetworkInterface::allInterfaces();
+        QStringList allDevices = QDir("/dev").entryList(QDir::System, QDir::Name);
+        QStringList devices = allDevices.filter(QRegExp("^[hms]d[a-z]$"));
+        for (auto &dev : devices) {
+            QString device = QString("/dev/%1").arg(dev);
+            if (cachedValues.contains(device))
+                continue;
+            qCInfo(LOG_AW) << "Found new key" << device << "for type" << _type;
+            cachedValues.append(device);
+            cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), device);
+        }
+    } else if (_type == "net") {
+        QList<QNetworkInterface> rawInterfaceList = QNetworkInterface::allInterfaces();
         for (auto &interface : rawInterfaceList) {
             QString device = interface.name();
             if (cachedValues.contains(device))
@@ -64,10 +75,12 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
 }
 
 
-QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringList &_bars, const QVariantMap &_tooltip,
+QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringList &_bars,
-                                        const QStringList &_userKeys, const QStringList &_allKeys)
+                                        const QVariantMap &_tooltip, const QStringList &_userKeys,
+                                        const QStringList &_allKeys)
 {
-    qCDebug(LOG_AW) << "Looking for required keys in" << _keys << _bars << "using tooltip settings" << _tooltip;
+    qCDebug(LOG_AW) << "Looking for required keys in" << _keys << _bars << "using tooltip settings"
+                    << _tooltip;
 
     // initial copy
     QSet<QString> used(_keys.cbegin(), _keys.cend());
@@ -83,19 +96,19 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
 
     // insert depending keys, refer to AWKeys::calculateValues()
     // hddtotmb*
-    for (auto &key : _allKeys.filter(QRegularExpression("^hddtotmb"))) {
+    for (auto &key : _allKeys.filter(QRegExp("^hddtotmb"))) {
         if (!used.contains(key))
             continue;
         key.remove("hddtotmb");
-        auto index = key.toInt();
+        int index = key.toInt();
         used << QString("hddfreemb%1").arg(index) << QString("hddmb%1").arg(index);
     }
     // hddtotgb*
-    for (auto &key : _allKeys.filter(QRegularExpression("^hddtotgb"))) {
+    for (auto &key : _allKeys.filter(QRegExp("^hddtotgb"))) {
         if (!used.contains(key))
             continue;
         key.remove("hddtotgb");
-        auto index = key.toInt();
+        int index = key.toInt();
         used << QString("hddfreegb%1").arg(index) << QString("hddgb%1").arg(index);
     }
     // mem
@@ -123,17 +136,18 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
         used << "swapgb"
              << "swapfreegb";
     // network keys
-    QStringList netKeys(
+    QStringList netKeys({"up", "upkb", "uptot", "uptotkb", "upunits", "down", "downkb", "downtot",
-        {"up", "upkb", "uptot", "uptotkb", "upunits", "down", "downkb", "downtot", "downtotkb", "downunits"});
+                         "downtotkb", "downunits"});
     for (auto &key : netKeys) {
         if (!used.contains(key))
             continue;
-        auto filt = _allKeys.filter(QRegularExpression(QString("^%1[0-9]{1,}").arg(key)));
+        QStringList filt = _allKeys.filter(QRegExp(QString("^%1[0-9]{1,}").arg(key)));
         for (auto &filtered : filt)
             used << filtered;
     }
     // netdev key
-    if (std::any_of(netKeys.cbegin(), netKeys.cend(), [&used](const QString &key) { return used.contains(key); }))
+    if (std::any_of(netKeys.cbegin(), netKeys.cend(),
+                    [&used](const QString &key) { return used.contains(key); }))
         used << "netdev";
 
     // HACK append dummy if there are no other keys. This hack is required
@@ -147,8 +161,9 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
 
 QHash<QString, QStringList> AWKeyCache::loadKeysFromCache()
 {
-    auto fileName
+    QString fileName
-        = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
+        = QString("%1/awesomewidgets.ndx")
+              .arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
     qCInfo(LOG_AW) << "Cache file" << fileName;
     QSettings cache(fileName, QSettings::IniFormat);
 

sources/awesome-widget/plugin/awkeycache.h

@@ -27,8 +27,9 @@
 namespace AWKeyCache
 {
 bool addKeyToCache(const QString &_type, const QString &_key = "");
-QStringList getRequiredKeys(const QStringList &_keys, const QStringList &_bars, const QVariantMap &_tooltip,
+QStringList getRequiredKeys(const QStringList &_keys, const QStringList &_bars,
-                            const QStringList &_userKeys, const QStringList &_allKeys);
+                            const QVariantMap &_tooltip, const QStringList &_userKeys,
+                            const QStringList &_allKeys);
 QHash<QString, QStringList> loadKeysFromCache();
 } // namespace AWKeyCache
 

sources/awesome-widget/plugin/awkeyoperations.cpp

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

sources/awesome-widget/plugin/awkeys.cpp

@@ -56,17 +56,17 @@ AWKeys::AWKeys(QObject *_parent)
     createDBusInterface();
 
     // update key data if required
-    connect(m_keyOperator, &AWKeyOperations::updateKeys, this, &AWKeys::reinitKeys);
+    connect(m_keyOperator, SIGNAL(updateKeys(const QStringList &)), this,
-    connect(m_timer, &QTimer::timeout, this, &AWKeys::updateTextData);
+            SLOT(reinitKeys(const QStringList &)));
-
+    connect(m_timer, SIGNAL(timeout()), this, SLOT(updateTextData()));
     // transfer signal from AWDataAggregator object to QML ui
-    connect(m_dataAggregator, &AWDataAggregator::toolTipPainted,
+    connect(m_dataAggregator, SIGNAL(toolTipPainted(const QString &)), this,
-            [this](const QString &_tooltip) { emit(needToolTipToBeUpdated(_tooltip)); });
+            SIGNAL(needToolTipToBeUpdated(const QString &)));
-
+    connect(this, SIGNAL(dropSourceFromDataengine(const QString &)), m_dataEngineAggregator,
-    connect(this, &AWKeys::dropSourceFromDataengine, m_dataEngineAggregator, &AWDataEngineAggregator::dropSource);
+            SLOT(dropSource(const QString &)));
-    connect(m_dataEngineAggregator, &AWDataEngineAggregator::dataUpdated, this, &AWKeys::dataUpdated);
     // transfer signal from dataengine to update source list
-    connect(m_dataEngineAggregator, &AWDataEngineAggregator::deviceAdded, m_keyOperator, &AWKeyOperations::addDevice);
+    connect(m_dataEngineAggregator, SIGNAL(deviceAdded(const QString &)), m_keyOperator,
+            SLOT(addDevice(const QString &)));
 }
 
 
@@ -91,10 +91,11 @@ void AWKeys::initDataAggregator(const QVariantMap &_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 int _limit,
+                      const bool _optimize)
 {
-    qCDebug(LOG_AW) << "Pattern" << _currentPattern << "with interval" << _interval << "and queue limit" << _limit
+    qCDebug(LOG_AW) << "Pattern" << _currentPattern << "with interval" << _interval
-                    << "with optimization" << _optimize;
+                    << "and queue limit" << _limit << "with optimization" << _optimize;
 
     // init
     m_optimize = _optimize;
@@ -103,7 +104,7 @@ void AWKeys::initKeys(const QString &_currentPattern, const int _interval, const
     m_aggregator->initFormatters();
     m_keyOperator->setPattern(_currentPattern);
     m_keyOperator->updateCache();
-    m_dataEngineAggregator->loadSources();
+    m_dataEngineAggregator->reconnectSources(_interval);
 
     // timer
     m_timer->setInterval(_interval);
@@ -149,7 +150,7 @@ QStringList AWKeys::dictKeys(const bool _sorted, const QString &_regexp) const
     if (_sorted)
         allKeys.sort();
 
-    return allKeys.filter(QRegularExpression(_regexp));
+    return allKeys.filter(QRegExp(_regexp));
 }
 
 
@@ -186,9 +187,9 @@ QString AWKeys::valueByKey(const QString &_key) const
 {
     qCDebug(LOG_AW) << "Requested value for key" << _key;
 
-    auto realKey = _key.startsWith("bar") ? m_keyOperator->infoByKey(_key) : _key;
+    QString trueKey = _key.startsWith("bar") ? m_keyOperator->infoByKey(_key) : _key;
 
-    return m_aggregator->formatter(m_values[realKey], realKey, true);
+    return m_aggregator->formatter(m_values[trueKey], trueKey, true);
 }
 
 
@@ -200,15 +201,10 @@ void AWKeys::editItem(const QString &_type)
 }
 
 
-void AWKeys::dataUpdated(const QHash<QString, KSysGuard::SensorInfo> &_sensors, const KSysGuard::SensorDataList &_data)
+void AWKeys::dataUpdated(const QString &_sourceName, const Plasma::DataEngine::Data &_data)
 {
-    for (auto &single : _data) {
+    // run concurrent data update
-        if (_sensors.contains(single.sensorProperty)) {
+    QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, _sourceName, _data);
-            setDataBySource(single.sensorProperty, _sensors.value(single.sensorProperty), single);
-        }
-        // TODO use QtConcurrent::map or something like that
-        //        QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, "ss", sensor);
-    }
 }
 
 
@@ -231,9 +227,10 @@ void AWKeys::reinitKeys(const QStringList &_currentKeys)
         barKeys.append(item->usedKeys());
     }
     // get required keys
-    m_requiredKeys = m_optimize ? AWKeyCache::getRequiredKeys(m_foundKeys, barKeys, m_tooltipParams,
+    m_requiredKeys
-                                                              m_keyOperator->requiredUserKeys(), _currentKeys)
+        = m_optimize ? AWKeyCache::getRequiredKeys(m_foundKeys, barKeys, m_tooltipParams,
-                                : QStringList();
+                                                   m_keyOperator->requiredUserKeys(), _currentKeys)
+                     : QStringList();
 
     // set key data to m_aggregator
     m_aggregator->setDevices(m_keyOperator->devices());
@@ -245,7 +242,7 @@ void AWKeys::updateTextData()
     // do not do it in parallel to avoid race condition
     m_mutex.lock();
     calculateValues();
-    auto text = parsePattern(m_keyOperator->pattern());
+    QString text = parsePattern(m_keyOperator->pattern());
     // update tooltip values under lock
     m_dataAggregator->dataUpdate(m_values);
     m_mutex.unlock();
@@ -262,17 +259,19 @@ void AWKeys::calculateValues()
     QStringList mountDevices = m_keyOperator->devices("mount");
     for (auto &device : mountDevices) {
         int index = mountDevices.indexOf(device);
-        m_values[QString("hddtotmb%1").arg(index)] = m_values[QString("hddfreemb%1").arg(index)].toDouble()
+        m_values[QString("hddtotmb%1").arg(index)]
-                                                     + m_values[QString("hddmb%1").arg(index)].toDouble();
+            = m_values[QString("hddfreemb%1").arg(index)].toFloat()
-        m_values[QString("hddtotgb%1").arg(index)] = m_values[QString("hddfreegb%1").arg(index)].toDouble()
+              + m_values[QString("hddmb%1").arg(index)].toFloat();
-                                                     + m_values[QString("hddgb%1").arg(index)].toDouble();
+        m_values[QString("hddtotgb%1").arg(index)]
+            = m_values[QString("hddfreegb%1").arg(index)].toFloat()
+              + m_values[QString("hddgb%1").arg(index)].toFloat();
     }
 
     // memtot*
-    m_values["memtotmb"] = m_values["memusedmb"].toLongLong() + m_values["memfreemb"].toLongLong();
+    m_values["memtotmb"] = m_values["memusedmb"].toInt() + m_values["memfreemb"].toInt();
-    m_values["memtotgb"] = m_values["memusedgb"].toDouble() + m_values["memfreegb"].toDouble();
+    m_values["memtotgb"] = m_values["memusedgb"].toFloat() + m_values["memfreegb"].toFloat();
     // mem
-    m_values["mem"] = 100.0f * m_values["memmb"].toDouble() / m_values["memtotmb"].toDouble();
+    m_values["mem"] = 100.0f * m_values["memmb"].toFloat() / m_values["memtotmb"].toFloat();
 
     // up, down, upkb, downkb, upunits, downunits
     int netIndex = m_keyOperator->devices("net").indexOf(m_values["netdev"].toString());
@@ -288,10 +287,10 @@ void AWKeys::calculateValues()
     m_values["upunits"] = m_values[QString("upunits%1").arg(netIndex)];
 
     // swaptot*
-    m_values["swaptotmb"] = m_values["swapmb"].toLongLong() + m_values["swapfreemb"].toLongLong();
+    m_values["swaptotmb"] = m_values["swapmb"].toInt() + m_values["swapfreemb"].toInt();
-    m_values["swaptotgb"] = m_values["swapgb"].toDouble() + m_values["swapfreegb"].toDouble();
+    m_values["swaptotgb"] = m_values["swapgb"].toFloat() + m_values["swapfreegb"].toFloat();
     // swap
-    m_values["swap"] = 100.0f * m_values["swapmb"].toDouble() / m_values["swaptotmb"].toDouble();
+    m_values["swap"] = 100.0f * m_values["swapmb"].toFloat() / m_values["swaptotmb"].toFloat();
 
     // user defined keys
     for (auto &key : m_keyOperator->userKeys())
@@ -313,23 +312,27 @@ void AWKeys::createDBusInterface()
     // HACK we are going to use different services because it binds to
     // application
     if (instanceBus.registerService(QString("%1.i%2").arg(AWDBUS_SERVICE).arg(id))) {
-        if (!instanceBus.registerObject(AWDBUS_PATH, new AWDBusAdaptor(this), QDBusConnection::ExportAllContents))
+        if (!instanceBus.registerObject(AWDBUS_PATH, new AWDBusAdaptor(this),
-            qCWarning(LOG_AW) << "Could not register DBus object, last error" << instanceBus.lastError().message();
+                                        QDBusConnection::ExportAllContents))
+            qCWarning(LOG_AW) << "Could not register DBus object, last error"
+                              << instanceBus.lastError().message();
     } else {
-        qCWarning(LOG_AW) << "Could not register DBus service, last error" << instanceBus.lastError().message();
+        qCWarning(LOG_AW) << "Could not register DBus service, last error"
+                          << instanceBus.lastError().message();
     }
 
     // and same instance but for id independent service
     QDBusConnection commonBus = QDBusConnection::sessionBus();
     if (commonBus.registerService(AWDBUS_SERVICE))
-        commonBus.registerObject(AWDBUS_PATH, new AWDBusAdaptor(this), QDBusConnection::ExportAllContents);
+        commonBus.registerObject(AWDBUS_PATH, new AWDBusAdaptor(this),
+                                 QDBusConnection::ExportAllContents);
 }
 
 
 QString AWKeys::parsePattern(QString _pattern) const
 {
     // screen sign
-    _pattern.replace("$$", QChar(0x1d));
+    _pattern.replace("$$", QString(0x1d));
 
     // lambdas
     for (auto &key : m_foundLambdas)
@@ -337,19 +340,20 @@ QString AWKeys::parsePattern(QString _pattern) const
 
     // main keys
     for (auto &key : m_foundKeys)
-        _pattern.replace(QString("$%1").arg(key), m_aggregator->formatter(m_values[key], key, true));
+        _pattern.replace(QString("$%1").arg(key),
+                         m_aggregator->formatter(m_values[key], key, true));
 
     // bars
     for (auto &bar : m_foundBars) {
         GraphicalItem *item = m_keyOperator->giByKey(bar);
-        QString image = item->isCustom() ? item->image(
+        QString image = item->isCustom() ? item->image(AWPatternFunctions::expandLambdas(
-                            AWPatternFunctions::expandLambdas(item->bar(), m_aggregator, m_values, item->usedKeys()))
+                            item->bar(), m_aggregator, m_values, item->usedKeys()))
                                          : item->image(m_values[item->bar()]);
         _pattern.replace(QString("$%1").arg(bar), image);
     }
 
     // prepare strings
-    _pattern.replace(QChar(0x1d), "$");
+    _pattern.replace(QString(0x1d), "$");
     if (m_wrapNewLines)
         _pattern.replace("\n", "<br>");
 
@@ -357,23 +361,25 @@ QString AWKeys::parsePattern(QString _pattern) const
 }
 
 
-void AWKeys::setDataBySource(const QString &_source, const KSysGuard::SensorInfo &_sensor,
+void AWKeys::setDataBySource(const QString &_sourceName, const QVariantMap &_data)
-                             const KSysGuard::SensorData &_data)
 {
-    qCDebug(LOG_AW) << "Source" << _source << _sensor.name << "with data" << _data.payload;
+    qCDebug(LOG_AW) << "Source" << _sourceName << "with data" << _data;
 
     // first list init
-    auto tags = m_aggregator->keysFromSource(_source);
+    QStringList tags = m_aggregator->keysFromSource(_sourceName);
     if (tags.isEmpty())
-        tags = m_aggregator->registerSource(_source, _sensor.unit, m_requiredKeys);
+        tags = m_aggregator->registerSource(_sourceName, _data["units"].toString(), m_requiredKeys);
 
     // update data or drop source if there are no matches and exit
     if (tags.isEmpty()) {
-        qCInfo(LOG_AW) << "Sensor" << _source << "not found";
+        qCInfo(LOG_AW) << "Source" << _sourceName << "not found";
-        return emit(dropSourceFromDataengine(_source));
+        return emit(dropSourceFromDataengine(_sourceName));
     }
 
     m_mutex.lock();
-    std::for_each(tags.cbegin(), tags.cend(), [this, &_data](const QString &tag) { m_values[tag] = _data.payload; });
+    // HACK workaround for time values which are stored in the different path
+    std::for_each(tags.cbegin(), tags.cend(), [this, &_data, &_sourceName](const QString &tag) {
+        m_values[tag] = _sourceName == "Local" ? _data["DateTime"] : _data["value"];
+    });
     m_mutex.unlock();
 }

sources/awesome-widget/plugin/awkeys.h

@@ -19,11 +19,11 @@
 #ifndef AWKEYS_H
 #define AWKEYS_H
 
+#include <Plasma/DataEngine>
+
 #include <QMutex>
 #include <QObject>
 
-#include <ksysguard/systemstats/SensorInfo.h>
-
 
 class AWDataAggregator;
 class AWDataEngineAggregator;
@@ -40,14 +40,16 @@ public:
     explicit AWKeys(QObject *_parent = nullptr);
     ~AWKeys() override;
     Q_INVOKABLE void initDataAggregator(const QVariantMap &_tooltipParams);
-    Q_INVOKABLE void initKeys(const QString &_currentPattern, int _interval, int _limit, bool _optimize);
+    Q_INVOKABLE void initKeys(const QString &_currentPattern, int _interval, int _limit,
+                              bool _optimize);
     Q_INVOKABLE void setAggregatorProperty(const QString &_key, const QVariant &_value);
     Q_INVOKABLE void setWrapNewLines(bool _wrap);
     // additional method to force load keys from Qml UI. Used in some
     // configuration pages
     Q_INVOKABLE void updateCache();
     // keys
-    Q_INVOKABLE [[nodiscard]] QStringList dictKeys(bool _sorted = false, const QString &_regexp = "") const;
+    Q_INVOKABLE [[nodiscard]] QStringList dictKeys(bool _sorted = false,
+                                                   const QString &_regexp = "") const;
     Q_INVOKABLE [[nodiscard]] QVariantList getHddDevices() const;
     // values
     Q_INVOKABLE [[nodiscard]] QString infoByKey(const QString &_key) const;
@@ -56,7 +58,9 @@ public:
     Q_INVOKABLE void editItem(const QString &_type);
 
 public slots:
-    void dataUpdated(const QHash<QString, KSysGuard::SensorInfo> &_sensors, const KSysGuard::SensorDataList &_data);
+    void dataUpdated(const QString &_sourceName, const Plasma::DataEngine::Data &_data);
+    // dummy method required by DataEngine connections
+    static void modelChanged(QString, QAbstractItemModel *){};
 
 signals:
     void dropSourceFromDataengine(const QString &_source);
@@ -72,8 +76,7 @@ private:
     void calculateValues();
     void createDBusInterface();
     [[nodiscard]] QString parsePattern(QString _pattern) const;
-    void setDataBySource(const QString &_source, const KSysGuard::SensorInfo &_sensor,
+    void setDataBySource(const QString &_sourceName, const QVariantMap &_data);
-                         const KSysGuard::SensorData &_data);
     // objects
     AWDataAggregator *m_dataAggregator = nullptr;
     AWDataEngineAggregator *m_dataEngineAggregator = nullptr;

sources/awesome-widget/plugin/awkeysaggregator.cpp

@@ -55,7 +55,8 @@ void AWKeysAggregator::initFormatters()
 }
 
 
-QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key, bool replaceSpace) const
+QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key,
+                                    bool replaceSpace) const
 {
     qCDebug(LOG_AW) << "Data" << _data << "for key" << _key;
 
@@ -64,19 +65,19 @@ QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key,
     // case block
     switch (m_mapper->formatter(_key)) {
     case FormatterType::Float:
-        output = QString("%1").arg(_data.toDouble(), 5, 'f', 1);
+        output = QString("%1").arg(_data.toFloat(), 5, 'f', 1);
         break;
     case FormatterType::FloatTwoSymbols:
-        output = QString("%1").arg(_data.toDouble(), 5, 'f', 2);
+        output = QString("%1").arg(_data.toFloat(), 5, 'f', 2);
         break;
     case FormatterType::Integer:
-        output = QString("%1").arg(_data.toDouble(), 4, 'f', 0);
+        output = QString("%1").arg(_data.toFloat(), 4, 'f', 0);
         break;
     case FormatterType::IntegerFive:
-        output = QString("%1").arg(_data.toDouble(), 5, 'f', 0);
+        output = QString("%1").arg(_data.toFloat(), 5, 'f', 0);
         break;
     case FormatterType::IntegerThree:
-        output = QString("%1").arg(_data.toDouble(), 3, 'f', 0);
+        output = QString("%1").arg(_data.toFloat(), 3, 'f', 0);
         break;
     case FormatterType::List:
         output = _data.toStringList().join(',');
@@ -85,10 +86,10 @@ QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key,
         output = _data.toBool() ? m_acOnline : m_acOffline;
         break;
     case FormatterType::MemGBFormat:
-        output = QString("%1").arg(_data.toDouble() / (1024.0 * 1024.0), 5, 'f', 1);
+        output = QString("%1").arg(_data.toFloat() / (1024.0 * 1024.0), 5, 'f', 1);
         break;
     case FormatterType::MemMBFormat:
-        output = QString("%1").arg(_data.toDouble() / 1024.0, 5, 'f', 0);
+        output = QString("%1").arg(_data.toFloat() / 1024.0, 5, 'f', 0);
         break;
     case FormatterType::NetSmartFormat:
         output = [](const float value) {
@@ -96,10 +97,10 @@ QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key,
                 return QString("%1").arg(value / 1024.0, 4, 'f', 1);
             else
                 return QString("%1").arg(value, 4, 'f', 0);
-        }(_data.toDouble());
+        }(_data.toFloat());
         break;
     case FormatterType::NetSmartUnits:
-        if (_data.toDouble() > 1024.0)
+        if (_data.toFloat() > 1024.0)
             output = m_translate ? i18n("MB/s") : "MB/s";
         else
             output = m_translate ? i18n("KB/s") : "KB/s";
@@ -110,29 +111,29 @@ QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key,
         output = output.rightJustified(8, QLatin1Char(' '), true);
         break;
     case FormatterType::Temperature:
-        output = QString("%1").arg(temperature(_data.toDouble()), 5, 'f', 1);
+        output = QString("%1").arg(temperature(_data.toFloat()), 5, 'f', 1);
         break;
     case FormatterType::Time:
-        output = QDateTime::fromSecsSinceEpoch(_data.toLongLong()).toString();
+        output = _data.toDateTime().toString();
         break;
     case FormatterType::TimeCustom:
         output = m_customTime;
         [&output, loc, this](const QDateTime &dt) {
             for (auto &key : m_timeKeys)
                 output.replace(QString("$%1").arg(key), loc.toString(dt, key));
-        }(QDateTime::fromSecsSinceEpoch(_data.toLongLong()));
+        }(_data.toDateTime());
         break;
     case FormatterType::TimeISO:
-        output = QDateTime::fromSecsSinceEpoch(_data.toLongLong()).toString(Qt::ISODate);
+        output = _data.toDateTime().toString(Qt::ISODate);
         break;
     case FormatterType::TimeLong:
-        output = loc.toString(QDateTime::fromSecsSinceEpoch(_data.toLongLong()), QLocale::LongFormat);
+        output = loc.toString(_data.toDateTime(), QLocale::LongFormat);
         break;
     case FormatterType::TimeShort:
-        output = loc.toString(QDateTime::fromSecsSinceEpoch(_data.toLongLong()), QLocale::ShortFormat);
+        output = loc.toString(_data.toDateTime(), QLocale::ShortFormat);
         break;
     case FormatterType::Timestamp:
-        output = _data.toString();
+        output = QString("%1").arg(_data.toDateTime().toMSecsSinceEpoch() / 1000.0, 10, 'f', 0);
         break;
     case FormatterType::Uptime:
     case FormatterType::UptimeCustom:
@@ -150,7 +151,7 @@ QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key,
                 source.replace("$m", QString("%1").arg(minutes));
                 return source;
             }(m_mapper->formatter(_key) == FormatterType::Uptime ? "$ddd$hhh$mmm" : m_customUptime,
-              static_cast<int>(_data.toDouble()));
+              static_cast<int>(_data.toFloat()));
         break;
     case FormatterType::NoFormat:
         output = _data.toString();
@@ -234,7 +235,7 @@ void AWKeysAggregator::setTranslate(const bool _translate)
 }
 
 
-QStringList AWKeysAggregator::registerSource(const QString &_source, const KSysGuard::Unit &_units,
+QStringList AWKeysAggregator::registerSource(const QString &_source, const QString &_units,
                                              const QStringList &_keys)
 {
     qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;

sources/awesome-widget/plugin/awkeysaggregator.h

@@ -19,8 +19,6 @@
 #ifndef AWKEYSAGGREGATOR_H
 #define AWKEYSAGGREGATOR_H
 
-#include <ksysguard/formatter/Unit.h>
-
 #include <QHash>
 #include <QObject>
 
@@ -71,7 +69,8 @@ public:
     ~AWKeysAggregator() override;
     void initFormatters();
     // get methods
-    [[nodiscard]] QString formatter(const QVariant &_data, const QString &_key, bool replaceSpace) 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);
@@ -83,7 +82,8 @@ public:
     void setTranslate(bool _translate);
 
 public slots:
-    QStringList registerSource(const QString &_source, const KSysGuard::Unit &_units, const QStringList &_keys);
+    QStringList registerSource(const QString &_source, const QString &_units,
+                               const QStringList &_keys);
 
 private:
     [[nodiscard]] float temperature(float temp) const;

sources/awesome-widget/plugin/awpatternfunctions.cpp

@@ -24,7 +24,8 @@
 #include "awkeysaggregator.h"
 
 
-QString AWPatternFunctions::expandLambdas(QString _code, AWKeysAggregator *_aggregator, const QVariantHash &_metadata,
+QString AWPatternFunctions::expandLambdas(QString _code, AWKeysAggregator *_aggregator,
+                                          const QVariantHash &_metadata,
                                           const QStringList &_usedKeys)
 {
     qCDebug(LOG_AW) << "Expand lambdas in" << _code;
@@ -34,12 +35,13 @@ QString AWPatternFunctions::expandLambdas(QString _code, AWKeysAggregator *_aggr
     _code.replace("$this", _metadata[_code].toString());
     // parsed values
     for (auto &lambdaKey : _usedKeys)
-        _code.replace(QString("$%1").arg(lambdaKey), _aggregator->formatter(_metadata[lambdaKey], lambdaKey, false));
+        _code.replace(QString("$%1").arg(lambdaKey),
+                      _aggregator->formatter(_metadata[lambdaKey], lambdaKey, false));
     qCInfo(LOG_AW) << "Expression" << _code;
     QJSValue result = engine.evaluate(_code);
     if (result.isError()) {
-        qCWarning(LOG_AW) << "Uncaught exception at line" << result.property("lineNumber").toInt() << ":"
+        qCWarning(LOG_AW) << "Uncaught exception at line" << result.property("lineNumber").toInt()
-                          << result.toString();
+                          << ":" << result.toString();
         return "";
     } else {
         return result.toString();
@@ -65,8 +67,8 @@ QString AWPatternFunctions::expandTemplates(QString _code)
         QJSValue result = engine.evaluate(body);
         QString templateResult = "";
         if (result.isError()) {
-            qCWarning(LOG_AW) << "Uncaught exception at line" << result.property("lineNumber").toInt() << ":"
+            qCWarning(LOG_AW) << "Uncaught exception at line"
-                              << result.toString();
+                              << result.property("lineNumber").toInt() << ":" << result.toString();
         } else {
             templateResult = result.toString();
         }
@@ -79,8 +81,8 @@ QString AWPatternFunctions::expandTemplates(QString _code)
 }
 
 
-QList<AWPatternFunctions::AWFunction> AWPatternFunctions::findFunctionCalls(const QString &_function,
+QList<AWPatternFunctions::AWFunction>
-                                                                            const QString &_code)
+AWPatternFunctions::findFunctionCalls(const QString &_function, const QString &_code)
 {
     qCDebug(LOG_AW) << "Looking for function" << _function << "in" << _code;
 
@@ -105,9 +107,10 @@ QList<AWPatternFunctions::AWFunction> AWPatternFunctions::findFunctionCalls(cons
             metadata.args = QStringList();
         } else {
             // replace '$,' to 0x1d
-            argsString.replace("$,", QChar(0x1d));
+            argsString.replace("$,", QString(0x1d));
             QStringList args = argsString.split(',');
-            std::for_each(args.begin(), args.end(), [](QString &arg) { arg.replace(QChar(0x1d), ","); });
+            std::for_each(args.begin(), args.end(),
+                          [](QString &arg) { arg.replace(QString(0x1d), ","); });
             metadata.args = args;
         }
         // other variables
@@ -127,11 +130,13 @@ QString AWPatternFunctions::insertAllKeys(QString _code, const QStringList &_key
 {
     qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
 
-    QList<AWPatternFunctions::AWFunction> found = AWPatternFunctions::findFunctionCalls("aw_all", _code);
+    QList<AWPatternFunctions::AWFunction> found
+        = AWPatternFunctions::findFunctionCalls("aw_all", _code);
     for (auto &function : found) {
         QString separator = function.args.isEmpty() ? "," : function.args.at(0);
-        QStringList required = _keys.filter(QRegularExpression(function.body));
+        QStringList required = _keys.filter(QRegExp(function.body));
-        std::for_each(required.begin(), required.end(), [](QString &value) { value = QString("%1: $%1").arg(value); });
+        std::for_each(required.begin(), required.end(),
+                      [](QString &value) { value = QString("%1: $%1").arg(value); });
 
         _code.replace(function.what, required.join(separator));
     }
@@ -144,9 +149,10 @@ QString AWPatternFunctions::insertKeyCount(QString _code, const QStringList &_ke
 {
     qCDebug(LOG_AW) << "Looking for count in code" << _code << "using list" << _keys;
 
-    QList<AWPatternFunctions::AWFunction> found = AWPatternFunctions::findFunctionCalls("aw_count", _code);
+    QList<AWPatternFunctions::AWFunction> found
+        = AWPatternFunctions::findFunctionCalls("aw_count", _code);
     for (auto &function : found) {
-        int count = _keys.filter(QRegularExpression(function.body)).count();
+        int count = _keys.filter(QRegExp(function.body)).count();
 
         _code.replace(function.what, QString::number(count));
     }
@@ -159,10 +165,11 @@ QString AWPatternFunctions::insertKeyNames(QString _code, const QStringList &_ke
 {
     qCDebug(LOG_AW) << "Looking for key names in code" << _code << "using list" << _keys;
 
-    QList<AWPatternFunctions::AWFunction> found = AWPatternFunctions::findFunctionCalls("aw_names", _code);
+    QList<AWPatternFunctions::AWFunction> found
+        = AWPatternFunctions::findFunctionCalls("aw_names", _code);
     for (auto &function : found) {
         QString separator = function.args.isEmpty() ? "," : function.args.at(0);
-        QStringList required = _keys.filter(QRegularExpression(function.body));
+        QStringList required = _keys.filter(QRegExp(function.body));
 
         _code.replace(function.what, required.join(separator));
     }
@@ -175,11 +182,13 @@ QString AWPatternFunctions::insertKeys(QString _code, const QStringList &_keys)
 {
     qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
 
-    QList<AWPatternFunctions::AWFunction> found = AWPatternFunctions::findFunctionCalls("aw_keys", _code);
+    QList<AWPatternFunctions::AWFunction> found
+        = AWPatternFunctions::findFunctionCalls("aw_keys", _code);
     for (auto &function : found) {
         QString separator = function.args.isEmpty() ? "," : function.args.at(0);
-        QStringList required = _keys.filter(QRegularExpression(function.body));
+        QStringList required = _keys.filter(QRegExp(function.body));
-        std::for_each(required.begin(), required.end(), [](QString &value) { value = QString("$%1").arg(value); });
+        std::for_each(required.begin(), required.end(),
+                      [](QString &value) { value = QString("$%1").arg(value); });
 
         _code.replace(function.what, required.join(separator));
     }
@@ -192,7 +201,8 @@ QString AWPatternFunctions::insertMacros(QString _code)
 {
     qCDebug(LOG_AW) << "Looking for macros in code" << _code;
 
-    QList<AWPatternFunctions::AWFunction> found = AWPatternFunctions::findFunctionCalls("aw_macro", _code);
+    QList<AWPatternFunctions::AWFunction> found
+        = AWPatternFunctions::findFunctionCalls("aw_macro", _code);
     for (auto &macro : found) {
         // get macro params
         if (macro.args.isEmpty()) {
@@ -205,15 +215,17 @@ QString AWPatternFunctions::insertMacros(QString _code)
             = AWPatternFunctions::findFunctionCalls(QString("aw_macro_%1").arg(name), _code);
         for (auto &function : macroUsage) {
             if (function.args.count() != macro.args.count()) {
-                qCWarning(LOG_AW) << "Invalid args count found for call" << function.what << "with macro" << macro.what;
+                qCWarning(LOG_AW) << "Invalid args count found for call" << function.what
+                                  << "with macro" << macro.what;
                 continue;
             }
             // generate body to replace
             QString result = macro.body;
-            std::for_each(macro.args.cbegin(), macro.args.cend(), [&result, macro, function](const QString &arg) {
+            std::for_each(macro.args.cbegin(), macro.args.cend(),
-                int index = macro.args.indexOf(arg);
+                          [&result, macro, function](const QString &arg) {
-                result.replace(QString("$%1").arg(arg), function.args.at(index));
+                              int index = macro.args.indexOf(arg);
-            });
+                              result.replace(QString("$%1").arg(arg), function.args.at(index));
+                          });
             // do replace
             _code.replace(function.what, result);
         }
@@ -226,14 +238,16 @@ QString AWPatternFunctions::insertMacros(QString _code)
 }
 
 
-QStringList AWPatternFunctions::findKeys(const QString &_code, const QStringList &_keys, const bool _isBars)
+QStringList AWPatternFunctions::findKeys(const QString &_code, const QStringList &_keys,
+                                         const bool _isBars)
 {
     qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
 
     QStringList selectedKeys;
     QString replacedCode = _code;
     for (auto &key : _keys)
-        if ((key.startsWith("bar") == _isBars) && (replacedCode.contains(QString("$%1").arg(key)))) {
+        if ((key.startsWith("bar") == _isBars)
+            && (replacedCode.contains(QString("$%1").arg(key)))) {
             qCInfo(LOG_AW) << "Found key" << key << "with bar enabled" << _isBars;
             selectedKeys.append(key);
             replacedCode.replace(QString("$%1").arg(key), "");

sources/awesome-widget/plugin/awtelemetryhandler.cpp

@@ -73,8 +73,8 @@ QString AWTelemetryHandler::getLast(const QString &_group) const
 
 void AWTelemetryHandler::init(const int _count, const bool _enableRemote, const QString &_clientId)
 {
-    qCDebug(LOG_AW) << "Init telemetry with count" << _count << "enable remote" << _enableRemote << "client ID"
+    qCDebug(LOG_AW) << "Init telemetry with count" << _count << "enable remote" << _enableRemote
-                    << _clientId;
+                    << "client ID" << _clientId;
 
     m_storeCount = _count;
     m_uploadEnabled = _enableRemote;
@@ -127,7 +127,8 @@ void AWTelemetryHandler::uploadTelemetry(const QString &_group, const QString &_
     }
 
     auto *manager = new QNetworkAccessManager(nullptr);
-    connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(telemetryReplyRecieved(QNetworkReply *)));
+    connect(manager, SIGNAL(finished(QNetworkReply *)), this,
+            SLOT(telemetryReplyRecieved(QNetworkReply *)));
 
     QUrl url(REMOTE_TELEMETRY_URL);
     QNetworkRequest request(url);
@@ -150,7 +151,8 @@ void AWTelemetryHandler::uploadTelemetry(const QString &_group, const QString &_
 void AWTelemetryHandler::telemetryReplyRecieved(QNetworkReply *_reply)
 {
     if (_reply->error() != QNetworkReply::NoError) {
-        qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message" << _reply->errorString();
+        qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
+                          << _reply->errorString();
         return;
     }
 

sources/awesome-widget/plugin/awupdatehelper.cpp

@@ -24,7 +24,6 @@
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QSettings>
-#include <QStandardPaths>
 
 #include "awdebug.h"
 
@@ -35,8 +34,9 @@ AWUpdateHelper::AWUpdateHelper(QObject *_parent)
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
     m_foundVersion = QVersionNumber::fromString(VERSION);
-    m_genericConfig = QString("%1/awesomewidgets/general.ini")
+    m_genericConfig
-                          .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
+        = QString("%1/awesomewidgets/general.ini")
+              .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
 }
 
 
@@ -53,8 +53,9 @@ void AWUpdateHelper::checkUpdates(const bool _showAnyway)
     // showAnyway options requires to show message if no updates found on direct
     // request. In case of automatic check no message will be shown
     auto *manager = new QNetworkAccessManager(nullptr);
-    connect(manager, &QNetworkAccessManager::finished,
+    connect(manager, &QNetworkAccessManager::finished, [_showAnyway, this](QNetworkReply *reply) {
-            [_showAnyway, this](QNetworkReply *reply) { return versionReplyRecieved(reply, _showAnyway); });
+        return versionReplyRecieved(reply, _showAnyway);
+    });
 
     manager->get(QNetworkRequest(QUrl(VERSION_API)));
 }
@@ -63,14 +64,16 @@ void AWUpdateHelper::checkUpdates(const bool _showAnyway)
 bool AWUpdateHelper::checkVersion()
 {
     QSettings settings(m_genericConfig, QSettings::IniFormat);
-    QVersionNumber version = QVersionNumber::fromString(settings.value("Version", QString(VERSION)).toString());
+    QVersionNumber version
+        = QVersionNumber::fromString(settings.value("Version", QString(VERSION)).toString());
     // update version
     settings.setValue("Version", QString(VERSION));
     settings.sync();
     qCInfo(LOG_AW) << "Found version" << version << "actual one is" << m_foundVersion;
 
     if ((version != m_foundVersion) && (!QString(CHANGELOG).isEmpty())) {
-        genMessageBox(i18nc("Changelog of %1", VERSION), QString(CHANGELOG).replace('@', '\n'), QMessageBox::Ok)
+        genMessageBox(i18nc("Changelog of %1", VERSION), QString(CHANGELOG).replace('@', '\n'),
+                      QMessageBox::Ok)
             ->open();
         return true;
     } else if (version != m_foundVersion) {
@@ -130,7 +133,8 @@ void AWUpdateHelper::versionReplyRecieved(QNetworkReply *_reply, const bool _sho
 {
     qCDebug(LOG_AW) << "Show message anyway" << _showAnyway;
     if (_reply->error() != QNetworkReply::NoError) {
-        qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message" << _reply->errorString();
+        qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
+                          << _reply->errorString();
         return;
     }
 

sources/awesomewidgets/CMakeLists.txt

@@ -7,7 +7,7 @@ include_directories(
         ${CMAKE_BINARY_DIR}
         ${PROJECT_TRDPARTY_DIR}
         ${Qt_INCLUDE}
-        ${Kf6_INCLUDE}
+        ${Kf5_INCLUDE}
 )
 
 file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/qreplytimeout/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
@@ -28,18 +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})
 
-qt6_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
+qt5_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
 add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER} ${SUBPROJECT_UI_HEADER})
-target_link_libraries(${SUBPROJECT} ${Qt_LIBRARIES} ${Kf6_LIBRARIES})
+target_link_libraries(${SUBPROJECT} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
 
 # install
-install(DIRECTORY ${SUBPROJECT_CONFIGS} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_CONFIGS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
-install(DIRECTORY ${SUBPROJECT_FORMATTERS} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_FORMATTERS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
-install(DIRECTORY ${SUBPROJECT_GRAPHITEMS} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_GRAPHITEMS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
-install(DIRECTORY ${SUBPROJECT_QUOTES} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_QUOTES} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
-install(DIRECTORY ${SUBPROJECT_SCRIPTS} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_SCRIPTS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
-install(DIRECTORY ${SUBPROJECT_REQUESTS} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_REQUESTS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
-install(DIRECTORY ${SUBPROJECT_UPGRADE} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_UPGRADE} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
-install(DIRECTORY ${SUBPROJECT_WEATHER} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_WEATHER} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
-install(FILES ${SUBPROJECT_INI} DESTINATION /${KDE_INSTALL_CONFDIR})
+install(FILES ${SUBPROJECT_INI} DESTINATION ${CONFIG_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_WEATHER_JSON} DESTINATION ${KDE_INSTALL_DATADIR}/${PROJECT_NAME}/weather)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_WEATHER_JSON} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/weather)

sources/awesomewidgets/abstractextitem.cpp

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

sources/awesomewidgets/abstractextitem.h

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

sources/awesomewidgets/abstractextitemaggregator.cpp

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

sources/awesomewidgets/abstractextitemaggregator.h

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

sources/awesomewidgets/abstractquotesprovider.h

@@ -33,7 +33,8 @@ public:
         : QObject(_parent){};
     ~AbstractQuotesProvider() override = default;
     virtual void initUrl(const QString &_asset) = 0;
-    [[nodiscard]] virtual QVariantHash parse(const QByteArray &_source, const QVariantHash &_oldValues) const = 0;
+    [[nodiscard]] virtual QVariantHash parse(const QByteArray &_source,
+                                             const QVariantHash &_oldValues) const = 0;
     [[nodiscard]] QString tag(const QString &_type) const
     {
         return dynamic_cast<AbstractExtItem *>(parent())->tag(_type);

sources/awesomewidgets/abstractweatherprovider.h

@@ -38,7 +38,7 @@ public:
     {
         return dynamic_cast<AbstractExtItem *>(parent())->tag(_type);
     };
-    [[nodiscard]] virtual QUrl url() const = 0;
+    virtual QUrl url() const = 0;
 };
 
 

sources/awesomewidgets/awabstractformatter.cpp

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

sources/awesomewidgets/awabstractformatter.h

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

sources/awesomewidgets/awdatetimeformatter.cpp

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

sources/awesomewidgets/awdatetimeformatter.h

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

sources/awesomewidgets/awesomewidgets-extweather-ids.json

@@ -5,120 +5,120 @@
     "image": {
         "__comment": "should be described as html image with full path inside",
 
-        "default": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/3200.gif\">",
+        "default": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/3200.gif\">",
 
-        "800": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/01d.png\">",
+        "800": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/01d.png\">",
 
-        "801": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/02d.png\">",
+        "801": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/02d.png\">",
 
-        "802": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/03d.png\">",
+        "802": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/03d.png\">",
-        "803": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/03d.png\">",
+        "803": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/03d.png\">",
 
-                "804": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/04d.png\">",
+        "804": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/04d.png\">",
 
-        "300": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/09d.png\">",
+        "300": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/09d.png\">",
-        "301": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/09d.png\">",
+        "301": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/09d.png\">",
-        "302": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/09d.png\">",
+        "302": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/09d.png\">",
-        "310": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/09d.png\">",
+        "310": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/09d.png\">",
-        "311": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/09d.png\">",
+        "311": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/09d.png\">",
-        "312": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/09d.png\">",
+        "312": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/09d.png\">",
-        "313": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/09d.png\">",
+        "313": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/09d.png\">",
-        "314": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/09d.png\">",
+        "314": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/09d.png\">",
-        "321": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/09d.png\">",
+        "321": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/09d.png\">",
-        "520": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/09d.png\">",
+        "520": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/09d.png\">",
-        "521": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/09d.png\">",
+        "521": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/09d.png\">",
-        "522": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/09d.png\">",
+        "522": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/09d.png\">",
-        "531": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/09d.png\">",
+        "531": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/09d.png\">",
 
-        "500": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/10d.png\">",
+        "500": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/10d.png\">",
-        "501": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/10d.png\">",
+        "501": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/10d.png\">",
-        "502": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/10d.png\">",
+        "502": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/10d.png\">",
-        "503": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/10d.png\">",
+        "503": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/10d.png\">",
-        "504": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/10d.png\">",
+        "504": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/10d.png\">",
 
-        "200": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/11d.png\">",
+        "200": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/11d.png\">",
-        "201": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/11d.png\">",
+        "201": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/11d.png\">",
-        "202": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/11d.png\">",
+        "202": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/11d.png\">",
-        "210": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/11d.png\">",
+        "210": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/11d.png\">",
-        "211": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/11d.png\">",
+        "211": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/11d.png\">",
-        "212": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/11d.png\">",
+        "212": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/11d.png\">",
-        "221": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/11d.png\">",
+        "221": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/11d.png\">",
-        "230": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/11d.png\">",
+        "230": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/11d.png\">",
-        "231": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/11d.png\">",
+        "231": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/11d.png\">",
-        "232": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/11d.png\">",
+        "232": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/11d.png\">",
 
-        "511": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/13d.png\">",
+        "511": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/13d.png\">",
-        "600": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/13d.png\">",
+        "600": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/13d.png\">",
-        "601": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/13d.png\">",
+        "601": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/13d.png\">",
-        "602": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/13d.png\">",
+        "602": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/13d.png\">",
-        "611": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/13d.png\">",
+        "611": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/13d.png\">",
-        "612": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/13d.png\">",
+        "612": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/13d.png\">",
-        "615": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/13d.png\">",
+        "615": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/13d.png\">",
-        "616": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/13d.png\">",
+        "616": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/13d.png\">",
-        "620": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/13d.png\">",
+        "620": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/13d.png\">",
-        "621": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/13d.png\">",
+        "621": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/13d.png\">",
-        "622": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/13d.png\">",
+        "622": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/13d.png\">",
 
-        "701": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/50d.png\">",
+        "701": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/50d.png\">",
-        "711": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/50d.png\">",
+        "711": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/50d.png\">",
-        "721": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/50d.png\">",
+        "721": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/50d.png\">",
-        "731": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/50d.png\">",
+        "731": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/50d.png\">",
-        "741": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/50d.png\">",
+        "741": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/50d.png\">",
-        "751": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/50d.png\">",
+        "751": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/50d.png\">",
-        "761": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/50d.png\">",
+        "761": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/50d.png\">",
-        "762": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/50d.png\">",
+        "762": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/50d.png\">",
-        "771": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/50d.png\">",
+        "771": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/50d.png\">",
-        "781": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/50d.png\">",
+        "781": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/50d.png\">",
 
-        "0": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/0.gif\">",
+        "0": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/0.gif\">",
-        "1": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/1.gif\">",
+        "1": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/1.gif\">",
-        "2": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/2.gif\">",
+        "2": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/2.gif\">",
-        "3": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/3.gif\">",
+        "3": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/3.gif\">",
-        "4": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/4.gif\">",
+        "4": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/4.gif\">",
-        "5": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/5.gif\">",
+        "5": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/5.gif\">",
-        "6": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/6.gif\">",
+        "6": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/6.gif\">",
-        "7": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/7.gif\">",
+        "7": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/7.gif\">",
-        "8": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/8.gif\">",
+        "8": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/8.gif\">",
-        "9": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/9.gif\">",
+        "9": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/9.gif\">",
-        "10": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/10.gif\">",
+        "10": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/10.gif\">",
-        "11": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/11.gif\">",
+        "11": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/11.gif\">",
-        "12": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/12.gif\">",
+        "12": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/12.gif\">",
-        "13": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/13.gif\">",
+        "13": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/13.gif\">",
-        "14": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/14.gif\">",
+        "14": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/14.gif\">",
-        "15": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/15.gif\">",
+        "15": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/15.gif\">",
-        "16": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/16.gif\">",
+        "16": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/16.gif\">",
-        "17": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/17.gif\">",
+        "17": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/17.gif\">",
-        "18": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/18.gif\">",
+        "18": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/18.gif\">",
-        "19": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/19.gif\">",
+        "19": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/19.gif\">",
-        "20": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/20.gif\">",
+        "20": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/20.gif\">",
-        "21": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/21.gif\">",
+        "21": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/21.gif\">",
-        "22": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/22.gif\">",
+        "22": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/22.gif\">",
-        "23": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/23.gif\">",
+        "23": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/23.gif\">",
-        "24": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/24.gif\">",
+        "24": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/24.gif\">",
-        "25": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/25.gif\">",
+        "25": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/25.gif\">",
-        "26": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/26.gif\">",
+        "26": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/26.gif\">",
-        "27": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/27.gif\">",
+        "27": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/27.gif\">",
-        "28": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/28.gif\">",
+        "28": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/28.gif\">",
-        "29": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/29.gif\">",
+        "29": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/29.gif\">",
-        "30": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/30.gif\">",
+        "30": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/30.gif\">",
-        "31": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/31.gif\">",
+        "31": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/31.gif\">",
-        "32": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/32.gif\">",
+        "32": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/32.gif\">",
-        "33": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/33.gif\">",
+        "33": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/33.gif\">",
-        "34": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/34.gif\">",
+        "34": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/34.gif\">",
-        "35": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/35.gif\">",
+        "35": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/35.gif\">",
-        "36": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/36.gif\">",
+        "36": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/36.gif\">",
-        "37": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/37.gif\">",
+        "37": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/37.gif\">",
-        "38": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/38.gif\">",
+        "38": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/38.gif\">",
-        "39": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/39.gif\">",
+        "39": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/39.gif\">",
-        "40": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/40.gif\">",
+        "40": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/40.gif\">",
-        "41": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/41.gif\">",
+        "41": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/41.gif\">",
-        "42": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/42.gif\">",
+        "42": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/42.gif\">",
-        "43": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/43.gif\">",
+        "43": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/43.gif\">",
-        "44": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/44.gif\">",
+        "44": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/44.gif\">",
-        "45": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/45.gif\">",
+        "45": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/45.gif\">",
-        "46": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/46.gif\">",
+        "46": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/46.gif\">",
-        "47": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/47.gif\">",
+        "47": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/47.gif\">",
-        "3200": "<img src=\"@KDE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/weather/3200.gif\">"
+        "3200": "<img src=\"@CMAKE_INSTALL_PREFIX@/@DATA_INSTALL_DIR@/@PROJECT_NAME@/weather/3200.gif\">"
     },
 
     "text": {

sources/awesomewidgets/awfloatformatter.cpp

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

sources/awesomewidgets/awfloatformatter.h

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

sources/awesomewidgets/awjsonformatter.cpp

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

sources/awesomewidgets/awjsonformatter.h

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

sources/awesomewidgets/awlistformatter.cpp

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

sources/awesomewidgets/awlistformatter.h

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

sources/awesomewidgets/awnoformatter.cpp

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

sources/awesomewidgets/awnoformatter.h

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

sources/awesomewidgets/awscriptformatter.cpp

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

sources/awesomewidgets/awscriptformatter.h

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

sources/awesomewidgets/awstringformatter.cpp

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

sources/awesomewidgets/awstringformatter.h

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