release 3.3.3

Also dbus adaptor has been renamed, because it does not allow to
register one service for several applications (like plasmashell and
    plasmawindowed)

.docker/Dockerfile-arch

@@ -0,0 +1,11 @@
+FROM base/archlinux
+
+RUN pacman -Sy
+
+# toolchain
+RUN pacman -S --noconfirm base-devel cmake extra-cmake-modules python
+# 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 multiarch/ubuntu-core:amd64-xenial
+
+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-xenial
+
+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 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 make test

.gitignore

@@ -43,6 +43,7 @@ build
 *pkg.tar.[gx]z
 src
 pkg
+*.deb
 
 # clion settings
 .idea

.gitmodules

@@ -1,9 +1,3 @@
-[submodule "sources/3rdparty/task"]
-	path = sources/3rdparty/task
-	url = https://github.com/arcan1s/qtadds-taskadds-qprocess.git
-[submodule "sources/3rdparty/tasks"]
-	path = sources/3rdparty/tasks
-	url = https://github.com/mhogomchungu/tasks.git
 [submodule "sources/3rdparty/fontdialog"]
 	path = sources/3rdparty/fontdialog
 	url = https://github.com/arcan1s/qtadds-fontdialog.git

.travis.yml

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

.travis.yml.bckp

@@ -1,11 +1,13 @@
-install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y cmake extra-cmake-modules g++ git libkf5i18n-dev libkf5notifications-dev libkf5service-dev libkf5windowsystem-dev plasma-framework-dev qtbase5-dev qtdeclarative5-dev
-  - git submobule update --init
-  - rm -rf build
-  - mkdir build
+sudo: required
 
-script:
-  - cd build
-  - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_USE_QT_SYS_PATHS=ON ../sources
-  - make
+env:
+  - DOCKER_TAG="arcan1s/awesome-widgets"
+
+services:
+  - docker
+
+before_install:
+  - docker build --tag="${DOCKER_TAG}" .docker
+
+scirpt:
+  - docker run "${DOCKER_TAG}" .docker/build.sh

.tx/config

@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[awesome-widgets.awesome-widgetspot]
+source_file = sources/translations/awesome-widgets.pot
+source_lang = en
+type = PO
+file_filter = sources/translations/<lang>.po

AUTHORS

@@ -1,9 +1,13 @@
 Current developers:
 Evgeniy Alekseev aka arcanis <esalexeev (at) gmail (dot) com>
 
+Packagers:
+Konstantin Voinov (openSuSe)
+
 Translators:
-@Mermouy (French translation)
-Ernesto Avilés Vzqz (Spanish translation)
-@underr (Brazillian Portuguese translation)
-Виктор Слободян (Ukrainian translation)
-Steve Lemuel (Chinese translation)
+@Mermouy (French)
+Ernesto Avilés Vzqz (Spanish)
+@underr (Brazillian Portuguese)
+Виктор Слободян (Ukrainian)
+Steve Lemuel (Chinese)
+Mariusz Kocoń (Polish)

CHANGELOG

@@ -1,3 +1,103 @@
+Ver.3.3.3:
++ add custom keys support (#101)
+* DBus interface improvements
+* rename tags (up|down|ps)total.* to (up|down|ps)tot.*
+- fix issue with invalid (up|down)total($|kb) calculation (#127)
+- fix issue with wrong applet identation (#125)
+
+Ver.3.3.2:
+- fix bug with invalid DP colour configuration
+- fix bug with invalid HTML tags operation
+* update to newest Qt and plasma
+
+Ver.3.3.1:
++ add ability to direct issue report (#104)
++ add key completion (#105)
++ add ability to load historical configuration (#106)
++ add ability to upload configuration to remote server (#106)
++ add stylish (#112)
++ add DBus intergration (#115)
++ add cron-like extenstion triggers (`X-AW-Socket` option) (#117)
++ add ability to trigger extensions by calling socket (`X-AW-Schedule` option) (#118)
++ add source for network requests
++ add Json formatter
+- drop patches provided support for Qt 5.4
+* use custom signal slot connection for dataengine (`BUILD_FUTURE` flag required)
+* update UI
+* refactoring
+
+Ver.3.2.1:
++ add X-AW-Translate option to DateTime formatter
++ add formatters to configuration export and import
++ add macro fuction to selector
++ add default formatters
+- add translation reinit (fix #102)
+- fix invalid float formatter saving
+- fix missing ApiVersion for formatters
+* use sockets for MPD data
+* translation update
+
+Ver.3.2.0:
++ custom formatters (#91)
++ add backend tests (#95)
++ add OWM weather provider for ExtWeather. It can be switched by using X-AW-Provider (ApiVer 3)
++ add DBus timeout for calls (#96)
++ add macros support (`$aw_macro` and `$aw_macro_*` for calls)
+- fix vertical alignment (#94)
+- fix bug with invalid updates on `X-AW-Interval=1` for ExtScript and ExtUpgrade
+- fix bug with missing derivate vaules in ExtQuotes
+- fix possible plasma crash (#96)
+- fix possible undefined behaviour if no extensions was found by name
+* split dataengine sources to own library
+* allow to use screened double brakets inside functions
+
+Ver.3.1.2:
++ add standalone widget configuration example
++ new tag tstime
++ new tags uptotal* and downtotal*
++ add background configuration button
++ allow X-AW-Direction property works with graphs and bars (graphical items)
++ add bars support to Graphical Items
++ add integration with transifex
++ add integration with coverity
+- drop update source (breaking changes if you are using it as developer)
+- fix pen generation from file image (graphical items)
+- fix bug with which font html parameters will be pasted even if there cancel clicked
+- fix bug with invalid total memory formating
+- fix bug in configuration UI with which there is no selected text pasted
+- fixes in graphical item configuration UI and behaviour
+- fix changelog building
+- fix invalid cast (found by coverity)
+* change text update mechanism
+* grahical item improvements
+* code improvements
+* translation update
+
+Ver.3.1.1:
+- fix broken gcc build (#87)
+* translation update
+
+Ver.3.1.0:
++ implement templates support (#71)
++ implement special functions (#71)
++ special directory for configs (#72)
++ custom bar images (#80)
++ custom bar values (#80)
++ show changelog after updates
++ add Polish translation (thanks to Mariusz Kocoń)
++ use Qt-5.6 features
+- fix invalid tooltip resize in desktop panel (#74)
+- fix graphical items blinking (#81)
+- drop tasks and move to native QProcess to avoid crash (#83)
+- the newest Qt (5.6) fixes
+- the newest Plasma fixes
+* move from OWM to Yahoo! Weather (#73)
+* improve performance by using optimized subscriptions (#75)
+* improve performance by storing QVariant instead of frequent casting (#75)
+* change bar names semantic to the simplest one (#80, breaking changes)
+* high memory usage notifications have been changed from 90 to 80 perc
+* a large part of refactoring
+
 Ver.3.0.1:
 + add patches for old Qt versions
 - drop `nullptr` checking

CHANGELOG-RU

@@ -1,383 +0,0 @@
-Вер.3.0.1:
-+ добавлены патчи для старых версий Qt
-- убрана проверка на nullptr
-* диалоги перемещены в QML
-
-Вер.3.0.0:
-+ добавлены теги upunits, downunits, upkb, downkb
-+ добавлены теги dalbum, dartist, dtitle, salbum, sartist, stitle
-+ добавлена поддержка лямбда функций
-+ добавлен голландский перевод (спасибо Heimen Stoffels)
-+ добавлена опциональная проверка обновлений на старте
-+ добавлена возможность отключить перевод строковых тегов
-+ добавлена фильтрация в ExtUpgrade (ApiVer == 3)
-+ добавлена возможность смены иконки погоды (ApiVer == 2)
-+ показ сообщений, если не найдено обновлений, при прямом запросе
-+ добавлено перенаправление swap в ExtScript (ApiVer == 4)
-+ добавлена возможность переноса слов
-+ добавлена поддержка графиков в GraphicalItems (ApiVer == 3)
-+ добавлена возможность показать превью из настроек
-+ добавлены импорт и экспорт конфигурации
-- исправлен ворнинг для пустых тултипов
-- исправлен баг, приводящий к увеличению виджета
-- исправлен баг с отсутствием сохранения настроек DE
-- исправлен баг с большим размером на старте
-- исправлен баг с невозможностью использования более, чем 10 расширений
-- убраны уведомления о свободном месте на диске
-- убран ключ X-AW-Output в ExtScript (ApiVer == 4)
-- исправлен возможное падение при вызове деструктора web-источников
-* более удобный интерфейс настройки
-* улучшено логирование, применен стиль логирования Qt5
-* переключено на конкурентное обновление (-DBUILD_FUTURE=ON)
-* немного оптимизаций
-* лучшее определение активного сетевого устройства
-* значение котировок типа double (ApiVer == 3)
-* лучший показ котировок
-* больше комментариев в коде
-* большее следование стилю кода Qt
-* настройки интервала перемещены в другую группу
-* работа с DataEngine была перемещена в плагин
-* изменен формат данных внутри DataEngine (ломает совместимость)
-
-Вер.2.4.0:
-+ добавлена поддержка погоды
-+ добавлена поддержка LA (теги la1, la5, la15)
-+ добавлена кнопка "Сбросить кеш"
-+ добавлена поддержка сборки с clang
-+ добавлен ExtItem агрегатор
-+ добавлено время в дебаг вывод
-+ добавлена возможность отключить монитор плеера
-- исправлен баг с неправильным расчетам скорости сети
-- исправлен баг с неправильной инициализацией диалога шрифтов
-- исправлен баг с отсутствием удаления объектов (#60)
-* переписаны ExtItems для использования собственного абстрактного класса
-* улучшена работа с обновлениями виджета (#57)
-* рисование интерфейса переписано на модель сигнал-слот
-* плагин опять стал приватным
-* исправлен каст плагина с синглтона (#57)
-* изменена логика показа данных в DataEngine
-* изменена сборка пакета и прекращена поддержка отдельного пакета с DataEngine
-* замена QMap на QHash, если возможно
-* замена циклов на итераторы, если возможно
-* список рабочий столов сейчас представлен, как QStringList
-* рефакторинг
-
-Вер.2.3.3:
-* изменен рендеринг с Qt на нативный
-
-Вер.2.3.2:
-+ добавлено изменение скорости интернета с KB/s на MB/s, если величина более 1000 KB/s
-- пофикшен баг с отсутствием действия при активации ссылки (спасибо infans)
-* улучшена поддержка котировок, например пофикшен возможный сегфолт плазмы
-* переписать основной виджет к модели сигнал-слот
-* улучшена поддержка расчета заряда батареи для нескольких батарей
-
-Вер.2.3.1:
-- пофикшен баг с отсутствием обновлений значений из настроек
-- убрана поддержка фильтра `\t`
-* обновлены переводы
-* теги fan были объединены с temp, улучшена поддержка тегов lmsensors
-
-Вер.2.3.0:
-+ добавлена поддержка фильтров в ExtScript (ApiVer = 3) (#53)
-+ добавлена возможность отображать `\n`, как перенос строки (#53)
-+ добавлена сортировка ключей в комбобоксах
-+ добавлена поддержка тегов (perc)(bid|ask|price)chg (ApiVer = 2)
-+ добавлены таймауты запросов котировок (#54)
-- исправлен баг с неправильным парсингом html
-* ExtQuotes теперь использует JSON вместо XML (ApiVer = 2)
-* более красивый UI настроек
-* некоторый рефакторинг
-
-Вер.2.2.2:
-+ добавлена поддержка котировок (#46)
-+ добавлена поддержка свойств height и width (#47)
-+ добавлена поддержка перевода в плагины (#50)
-+ добавлено кеширование ключей
-+ добавлена поддержка X-AW-Number в ExtScript, ExtUpgrade (ApiVer=2)
-+ добавлено переподключение DataEngine (в некоторых случаях отдельные значения не обновляются)
-+ добавлено обновление ширины и высоты виджета
-- исправлен баг при обновлении Ext* (#49)
-- исправлен баг с сохранением настроек GPUDEV, HDDDEV из графического интерфейса
-- исправлены настройки Desktop Panel
-- исправлен баг с добавлением настроек параграфа
-* дропнута поддержка KDE4 версии (отдельная ветка разработки)
-* увеличены лимиты для интервалов (#48)
-* hddtemp был заменен на smartctl по умолчанию
-* плагины были перемещены из private
-* более корректное рисование интерфейса
-
-Вер.2.2.1:
-+ добавлен ключ X-AW-Interval в ExtUpgrade (ApiVer = 1, default = 3600)
-+ добавлено кеширование значений в ExtScript и ExtUpgrade
-+ добавлена поддержка isActive в ExtUpgrade
-* изменена проверка версий cmake
-* улучшена логика работы ExtScript и ExtUpgrade
-
-Вер.2.2.0:
-* портирование на Plasma 5
-+ добавлена поддержка списка окон в тултипе
-+ добавлены уведомления на системные события
-+ добавлена возможность показать выбранный тег
-+ добавлены теги $downN, $upN
-+ добавлен инструмент netdev
-+ добавлена поддержка smartctl
-- убрана возможность сокрытия панелей
-* незначительно изменена логика работы виджета
-* исправлена отрисовка превью окон
-* обновление кодовой базы KDE4 под новый ABI
-* оптимизация работы DataEngine
-* PKGCMD были заменены на ExtUpgrade
-
-Вер.2.1.0:
-+ добавлена функция автообновления
-+ добавлена поддерка кастомных скриптов
-+ добавлена поддержка превью рабочего стола для DP
-+ добавлена поддержка баров
-- удалена поддержка кастомных команд
-- фикс #34
-* исправлены уведомления
-* переписан UI в соответствии со стандартами KDE
-* исправлены границы для графических объектов
-* переписан DP и DE на использование библиотечных функций
-* изменено определение свойств GPU
-* изменен поиск регулярных выражений
-
-Вер.2.0.5:
-+ добавлен нижний край к тултипу (#30)
-* исправлен баг с обновлением сетевого интерфейса
-* исправлен баг с тултипом батареи
-* отредактирована разметка DP (#31)
-
-Вер.2.0.4:
-* более корректная работа с батареями
-
-Вер.2.0.3:
-+ добавлена поддержка нескольких тегов $bat
-* отредактирована разметка
-
-Вер.2.0.2:
-+ добавлены теги $fan*
-+ добавлен китайский перевод (спасибо @Lemueler)
-+ добавлена проверка сетевых устройств на p2p
-- удалено ps stats из уведомлений
-* еще один фикс тегов cpu* и cpucl
-* переписан конфигурационный интерфейс DP
-* исправлены нестандартные единицы температуры
-
-Вер.2.0.1:
-+ добавлена поддержка кастомных интерфейсов
-* фикс затенения краев поля
-* фикс тегов cpu*, cpucl*, gpu*, ps*
-
-Вер.2.0.0:
-+ добавлен виджет awesome widget
-+ новые теги $hddfreemb, $hddfreegb, $memusedmb, $memusedgb, $memfreemb $memfreegb, $swapfreemb, $swapfreegb
-+ новый DataEngine - battery
-+ новый тултип - battery
-+ новые температурные единицы см^-1, ккал/моль, кДж/моль, Реамюр
-+ добавлена возможность скрывать панели по хоткею
-- удален виджет pytextmonitor
-- убраны отдельные поля
-- удалены README
-* проект переименован в Awesome Widgets
-* тег $custom (время) переименован в $ctime
-* тег $custom (время работы) переименован в $cuptime
-* тег $time (плеер) переименован в $duration
-* тег $number переименован в $ndesktop
-* тег $name переименован в $desktop
-* тег $total переименован в $tdesktops
-* дебаг флаг теперь DEBUG
-* проект полностью переписан на C++
-* тултип независит теперь от самого виджета
-* настройка выравнивания текста теперь осуществляется только HTML тегами
-* настройки батареи и адаптора питания вынесены в DataEngine
-* изменения в конфигурационном интерфейсе
-
-Вер.1.11.0:
-+ добавлена возможность отключения фона
-+ добавлен desktop DataEngine
-+ добавлен виджет PTM desktop panel
-+ добавлено поле текущий рабочий стол (теги $name, $number, $total)
-+ добавлена возможность взаимодействия с плеерами через mpris
-* добавлено использование сабмодулей
-* DataEngine переписан с использованием tasks
-* фикс чтения температуры nvidia
-
-Вер.1.10.2:
-- фикс ошибки с tempUnits в поле hddtemp
-
-Вер.1.10.1:
-- пофикшена ошибка с форматами чисел в поле ps
-- пофикшена инициализация значений в DataEngine
-- пофикшена проверка qmmp
-
-Вер.1.10.0:
-+ добавлены теги $hddtotmb, $hddtotgb
-+ добавлены теги $memtotmb, $memtotgb, $swaptotmb, $swaptotgb
-+ добавлена возможность форсированного обновления
-+ добавлена поддержка clementine
-+ добавлена поддержка команды hddtemp
-+ добавлены поддержка disable для HDDDEV и GPUDEV
-+ добавлена многопоточность в DataEngine
-+ добавлена проверка ошибок для переменных DataEngine
-+ добавлена возможность отключения всплывающих сообщений
-+ добавлена возможность использовать вертикальную разметку
-+ добавлена возможность добавить пустое пространство
-+ добавлена возможность вывода отладочной информации (установите переменную окружения 'PTM_DEBUG' в 'yes')
-+ добавлен перевод Brazillian Portuguese (@underr)
-+ добавлена украинская локализация (Виктор Слободян)
-- удален util.py
-- удалены функции createNotifyrc, поскольку они больше не нужны
-* рефакторинг конфигурационного интерфейса
-* настройки плеера были перенесены из виджета в DataEngine
-* исправлен вызов readme под четырехсимвольное обозначение
-* перенос readme с md на html
-
-Вер.1.9.0:
-+ добавлена поддержка нескольких кастомных команд ($customN)
-+ добавлено поле скорости hdd ($hddrN, $hddwN)
-+ добавлены действия в контекстное меню (открыть readme и запустить ksysguard)
-* исправлен парсинг поля pkg
-- убрано событие по двойному клику
-
-Вер.1.8.3:
-+ добавлен испанский перевод (Ernesto Avilés Vzqz)
-+ добавлены файлы readme
-
-Вер.1.8.2:
-+ добавлены различные температурные единицы (Farenheit и Kelvin)
-
-Вер.1.8.1:
-* поле pkg теперь обновляется раз в час
-
-Вер.1.8.0:
-+ добавлены скроллбары в конфигурационный интерфейс
-+ добавлена настройка значений AC
-+ добавлены теги $hddmbN, $hddgbN
-+ добавлена поддержка ps (теги $ps, $pscount, $pstotal)
-+ добавлена поддержка пакетных менеджеров (теги $pkgcountN)
-* рефакторинг DataEngine
-
-Вер.1.7.4:
-+ добавлена поддержка более чем 10 тэгов в полях cpu, cpuclock, hdd, hddtemp, temp
-- фиксы в форматах
-* изменения в кастомном формате аптайма
-
-Вер.1.7.3:
-+ добавлены тэги $memgb, $swapgb
-+ добавлена директория readme
-+ добавлен французский перевод (@Mermouy)
-- фикс подсказки для кастомного формата аптайма
-- фикс #12
-* больше рефакторинга богу рефакторинга
-* интервал обновления сетевого интерфейса теперь 30*interval
-* тэги $swap, $swapmb и $swapgb теперь работают одновременно (тэги $mem* тоже)
-* player_name теперь имеет тип str
-
-Вер.1.7.2:
-+ добавлены тэги $dd, $d, $hh, $h, $mm, $m в кастомный формат аптайма
-+ добавлено масштабирование в тултипы
-+ добавлена конфигурация DE из виджета
-+ добавлена кастомная команда в DE
-- удалена кастомная команда из виджета
-- удалены тэги $ds, $hs, $ms
-
-Вер.1.7.1:
-- удалено поле с ошибкой
-* пофикшен баг с нулевым значением в тултипе
-
-Вер.1.7.0:
-+ добавлена поддержка нескольких тэгов в поле температуры
-+ добавлены тэги $cpuN, $cpuclN, $hddN, $tempN, $hddtempN, $up, $down
-+ добавлено поле с кастомной командой
-+ добавлены тултипы для полей CPU, частоты CPU, памяти, swap и сеть
-- удалены тэги @@...@@, $temp, $ccpu, $ccpucl, $net
-* изменения в настройках
-* виджет не требует больше net-tools
-* рефакторинг
-
-Вер.1.6.1:
-+ добавлена поддержка нескольких девайсов в поле hddtemp
-- фикс #6
-
-Вер.1.6.0:
-+ добавлен тэг $custom в поля time и uptime (#8)
-+ русский перевод
-- фикс #6, #10
-* лицензия изменена на GPLv3
-* изменения в сборке проекта
-
-Вер.1.5.3:
-+ добавлены тэги $album, $progress и $time tags в поле плеера (#7)
-- фикс бага с нулевым свопом
-
-Вер.1.5.2:
-+ добавлены тэги $isotime, $shorttime и $longtime в поле time
-
-Вер.1.5.1:
-+ добавлено поле time
-
-Вер.1.5.0:
-+ добавлено поле player
-
-Вер.1.4.0:
-+ добавлены уведомления
-
-Вер.1.3.6:
-- фикс #1, #2
-
-Вер.1.3.5:
-- фикс бага с определением сетевого устройства
-
-Вер.1.3.4:
-+ добавлено событие по двойному щелчку
-+ добавлен автовыбор сетевого устройства
-- фикс еще одного падения Плазмы
-
-Вер.1.3.3:
-* редактирование чтения температурного устройства
-
-Вер.1.3.2b:
-- фикс падения Плазмы
-
-Вер.1.3.2:
-+ добавлены поля GPU, GPU temp, HDD и HDD temp
-+ добавлены тэги $ccpu и $ccpucl
-- фикс некоторых багов
-* оптимизация и рефакторинг
-
-Вер.1.2.2:
-+ добавлен тултип в строки
-
-Вер.1.2.1:
-* если батарея не существует, возвращает off
-* если AC не существует, возвращает '(?)'
-
-Вер.1.2.0:
-+ добавлен тэг $ac в поле battery
-+ добавлена настройка устройств батареи и AC
-+ добавлена проверка ошибок
-* тэг $bat теперь читается из /sys/*
-
-Вер.1.1.4:
-* изменения в парсинге acpi (поле battery)
-
-Вер.1.1.3:
-+ добавлена настройка ширины шрифта
-- небольшие фиксы
-* отредактирована настройка шрифта. Теперь настройки для шрифта работают нормально
-
-Вер.1.1.2:
-+ добавлено поле CPU clock
-+ добавлена функция для обновления сетевого интерфейса (100*time_interval)
-* изменено обновление слайдеров
-
-Вер.1.1.1:
-+ добавлены тэги $swapmb, $memmb, $netdev, @@netdev=...@@
-- небольшие фиксы
-* виджет теперь состоит из нескольких полей
-* отредактирован конфигурационный интерфейс
-
-Вер.1.0:
-Первый релиз

CONTRIBUTING.md

@@ -6,8 +6,8 @@ for more details. To avoid manual labor there is automatic cmake target named
 `clangformat` (see below). Some additional detail see below.
 
 * Indent is only spaces. 4 spaces.
-* It is highly recommended to name private variables with `m_` prefix (`m_foo`).
-  There is no exceptions for properties.
+* Any private variable should start with `m_` prefix (`m_foo`). The only one
+  exception is `Ui` object which should be named as `ui`.
 * Avoid to create a large methods. Exception: if method contains lambda functions.
 * If some method is called only once, it is recommended to use lambda functions.
   Exception is `Q_INVOKABLE` methods.
@@ -36,24 +36,18 @@ for more details. To avoid manual labor there is automatic cmake target named
   ```
 
 * `Q_PROPERTY` macro is allowed and recommended for QObject based classes.
-* Qt macros (e.g. `signals`, `slots`, `Q_OBJECT`, etc) are allowed.
+* Qt macros (e.g. `signals`, `slots`, `Q_OBJECT`, etc) are allowed. In other hand
+`Q_FOREACH` (`foreach`) is not allowed use `for (auto &foo : bar)` instead.
 * Current project standard is **C++11**.
 * Do not use C-like code:
-    * C-like style iteration if possible. Use `Q_FOREACH` (`foreach`) and
+    * C-like style iteration if possible. Use `for (auto &foo : bar)` and
       `std::for_each` instead if possible. It is also recommended to use iterators.
     * C-like casts, use `const_cast`, `static_cast`, `dymanic_Cast` instead. Using
       of `reinterpret_cast` is not recommended. It is highly recommended to use
-      `dynamic_Cast` with the exception catching. It is also possible to use
-      `qvariant_cast` if required. Exception is class constructors, e.g.:
-
-      ```
-      char c = 'c';
-      std::string s = "string";
-      qDebug() << QString("some string") << QChar(c) << QString(s);
-      ```
-
+      `dynamic_cast` with the exception catching. It is also possible to use
+      `qvariant_cast` if required.
     * C-like `NULL`, use `nullptr` instead.
-* It is highly recommended to avoid implicit casts.
+    * C-like constant definition, use `const vartype foo = bar` definition instead.
 * Abstract classes (which have at least one pure virtual method) are allowed.
 * Templates are allowed and recommended. Templates usually should be described
   inside header not source code file.
@@ -81,8 +75,10 @@ for more details. To avoid manual labor there is automatic cmake target named
 * Create one file (source and header) per class.
 * `else if` construction is allowed and recommended.
 * 'true ? foo : bar' construction is allowed and recommended for one-line assignment.
-* any global pointer should be assign to `nullptr` after deletion and before
+* Any global pointer should be assign to `nullptr` after deletion and before
   initialization. Exception: if object is deleted into class destructor.
+* Do not use semicolon in qml files unless it is required.
+* Any method argument including class constructors should start with `_`.
 
 Comments
 --------
@@ -146,13 +142,12 @@ For logging please use [QLoggingCategory](http://doc.qt.io/qt-5/qloggingcategory
 Available categories should be declared in `awdebug.*` files. The following log
 levels should be used:
 
-* **debug** (`qCDebug()`) - method arguments information.
+* **debug** (`qCDebug()`) - method arguments information. Please note that it
+  is recommended to logging all arguments in the one line.
 * **info** (`qCInfo()`) - additional information inside methods.
 * **warning** (`qCWarning()`) - not critical information, which may be caused by
   mistakes in configuration for example.
-* **error** (`qCError()`) - an error which has been captured in runtime. All errors
-  should have own callback methods.
-* **critical** (`qCCritical()`) - a critical error. After this error program will
+* **critical** (`qCCritical()`) - a critical error. After this error program may
   be terminated.
 
 The empty log string (e.g. `qCDebug();`) is not allowed because the method names
@@ -169,8 +164,7 @@ Testing
     1. `-DCMAKE_BUILD_TYPE=Debug`.
     2. `-DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON`.
     3. `-DCMAKE_BUILD_TYPE=Release`.
-* It is recommended to create addition test if possible.
-* Addition test functions should be declated and used only inside `BUILD_TESTING`
+* Additional test functions should be declated and used only inside `BUILD_TESTING`
   definition.
 
 Tools
@@ -201,9 +195,9 @@ Tools
 * Recommended class constructor for QObject based classes:
 
   ```
-  FooClass::FooClass(QObject *parent, const QVariant var)
-      : QObject(parent)
-      , m_var(var)
+  FooClass::FooClass(QObject *_parent, const QVariant _var)
+      : QObject(_parent)
+      , m_var(_var)
   {
       qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
       // some code below if any

README.md

@@ -1,6 +1,9 @@
 awesome-widgets (ex-pytextmonitor)
 ==================================
 
+[![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
 -----------
 
@@ -66,9 +69,9 @@ See [milestones](https://github.com/arcan1s/awesome-widgets/milestones) for more
 Links
 -----
 
-* [Homepage](http://arcanis.name/projects/awesome-widgets/)
-* [Migration to 2.*](http://arcanis.name/en/2014/09/04/migration-to-v2/)
-* [Scripts and bars](http://arcanis.name/en/2014/12/19/aw-v21-bells-and-whistles/)
+* [Homepage](https://arcanis.me/projects/awesome-widgets/)
+* [Migration to 2.*](https://arcanis.me/en/2014/09/04/migration-to-v2/)
+* [Scripts and bars](https://arcanis.me/en/2014/12/19/aw-v21-bells-and-whistles/)
 * Plasmoid on [kde-look](http://kde-look.org/content/show.php/Awesome+Widgets?content=157124)
 * DataEngine on [kde-look](http://kde-look.org/content/show.php/Extended+Systemmonitor+DataEngine?content=158773)
 * Archlinux [AUR](https://aur.archlinux.org/packages/plasma5-applet-awesome-widgets/) package

create_archive.sh

@@ -11,8 +11,8 @@ git submodule update --init --recursive
 
 # build widget
 ARCHIVE="awesome-widgets"
-FILES="AUTHORS CHANGELOG CHANGELOG-RU COPYING"
-IGNORELIST="build usr .kdev4 *.kdev4 .idea"
+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}"

packages/PKGBUILD

@@ -2,11 +2,11 @@
 
 pkgname=plasma5-applet-awesome-widgets
 _pkgname=awesome-widgets
-pkgver=3.0.1
+pkgver=3.3.3
 pkgrel=1
 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
 arch=('i686' 'x86_64')
-url="http://arcanis.name/projects/awesome-widgets"
+url="https://arcanis.me/projects/awesome-widgets"
 license=('GPL3')
 depends=('plasma-framework')
 optdepends=("catalyst: for GPU monitor"
@@ -14,10 +14,10 @@ optdepends=("catalyst: for GPU monitor"
             "smartmontools: for HDD temperature monitor"
             "mpd: for music player monitor"
             "nvidia-utils: for GPU monitor")
-makedepends=('cmake' 'extra-cmake-modules')
+makedepends=('cmake' 'extra-cmake-modules' 'python')
 source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
 install=${pkgname}.install
-md5sums=('71f5b358d443075540377284ee868a93')
+md5sums=('ce2413868cbb230e358e75a15975a1e5')
 backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
 
 prepare() {

packages/PKGBUILD-git

@@ -6,7 +6,7 @@ pkgver=2.2.1.r15.g78931b3
 pkgrel=1
 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor). Git version"
 arch=('i686' 'x86_64')
-url="http://arcanis.name/projects/awesome-widgets"
+url="https://arcanis.me/projects/awesome-widgets"
 license=('GPL3')
 depends=('plasma-framework')
 optdepends=("amarok: for music player monitor"

packages/qt5.3-qtconcurrent-and-qlogging-category.patch

@@ -1,57 +0,0 @@
-diff --git a/sources/awdebug.cpp b/sources/awdebug.cpp
-index eee61e1..9da8dad 100644
---- a/sources/awdebug.cpp
-+++ b/sources/awdebug.cpp
-@@ -20,13 +20,10 @@
- #include "version.h"
- 
- 
--Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget",
--                   QtMsgType::QtWarningMsg)
--Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel",
--                   QtMsgType::QtWarningMsg)
--Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon", QtMsgType::QtWarningMsg)
--Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets",
--                   QtMsgType::QtWarningMsg)
-+Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget")
-+Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel")
-+Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon")
-+Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets")
- 
- 
- const QStringList getBuildData()
-diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp
-index e5b9861..eb73073 100644
---- a/sources/awesome-widget/plugin/awkeys.cpp
-+++ b/sources/awesome-widget/plugin/awkeys.cpp
-@@ -439,7 +439,7 @@ void AWKeys::dataUpdated(const QString &sourceName,
- 
- #ifdef BUILD_FUTURE
-     // run concurrent data update
--    QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, sourceName,
-+    QtConcurrent::run(this, &AWKeys::setDataBySource, sourceName,
-                       data);
- #else  /* BUILD_FUTURE */
-     return setDataBySource(sourceName, data);
-@@ -564,7 +564,7 @@ void AWKeys::reinitKeys()
- void AWKeys::updateTextData()
- {
- #ifdef BUILD_FUTURE
--    QFuture<QString> text = QtConcurrent::run(m_threadPool, [this]() {
-+    QFuture<QString> text = QtConcurrent::run([this]() {
-         calculateValues();
-         return parsePattern(m_pattern);
-     });
-diff --git a/sources/libraries.cmake b/sources/libraries.cmake
-index 33192f7..46e2b1e 100644
---- a/sources/libraries.cmake
-+++ b/sources/libraries.cmake
-@@ -2,7 +2,7 @@
- find_package(Gettext REQUIRED)
- 
- # main qt libraries
--find_package(Qt5 5.4.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
-+find_package(Qt5 5.3.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
- add_definitions(
-         ${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
-         ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}

packages/qt5.4-replace-qml-dialogs.patch

@@ -1,350 +0,0 @@
-diff --git a/sources/awesome-widget/package/contents/ui/advanced.qml b/sources/awesome-widget/package/contents/ui/advanced.qml
-index 01bcd58..1ec7ba6 100644
---- a/sources/awesome-widget/package/contents/ui/advanced.qml
-+++ b/sources/awesome-widget/package/contents/ui/advanced.qml
-@@ -17,7 +17,6 @@
- 
- import QtQuick 2.0
- import QtQuick.Controls 1.3 as QtControls
--import QtQuick.Dialogs 1.2 as QtDialogs
- 
- import org.kde.plasma.private.awesomewidget 1.0
- 
-@@ -372,31 +371,7 @@ Item {
-             QtControls.Button {
-                 width: parent.width * 3 / 5
-                 text: i18n("Export configuration")
--                onClicked: saveConfigAs.open()
--            }
--
--            QtDialogs.FileDialog {
--                id: saveConfigAs
--                selectExisting: false
--                title: i18n("Export")
--                onAccepted: {
--                    var status = awConfig.exportConfiguration(
--                        plasmoid.configuration,
--                        saveConfigAs.fileUrl.toString().replace("file://", ""))
--                    if (status) {
--                        messageDialog.title = i18n("Success")
--                        messageDialog.text = i18n("Please note that binary files were not copied")
--                    } else {
--                        messageDialog.title = i18n("Ooops...")
--                        messageDialog.text = i18n("Could not save configuration file")
--                    }
--                    messageDialog.open()
--                }
--            }
--
--            QtDialogs.MessageDialog {
--                id: messageDialog
--                standardButtons: QtDialogs.StandardButton.Ok
-+                onClicked: awConfig.exportConfiguration(plasmoid.configuration)
-             }
-         }
- 
-@@ -410,41 +385,9 @@ Item {
-             QtControls.Button {
-                 width: parent.width * 3 / 5
-                 text: i18n("Import configuration")
--                onClicked: openConfig.open()
--            }
--
--            QtDialogs.FileDialog {
--                id: openConfig
--                title: i18n("Import")
--                onAccepted: importSelection.open()
--            }
--
--            QtDialogs.Dialog {
--                id: importSelection
--
--                Column {
--                    QtControls.CheckBox {
--                        id: importPlasmoid
--                        text: i18n("Import plasmoid settings")
--                    }
--
--                    QtControls.CheckBox {
--                        id: importExtensions
--                        text: i18n("Import extensions")
--                    }
--
--                    QtControls.CheckBox {
--                        id: importAdds
--                        text: i18n("Import additional files")
--                    }
--                }
--
--                onAccepted: {
-+                onClicked: {
-                     if (debug) console.debug()
--                    var importConfig = awConfig.importConfiguration(
--                        openConfig.fileUrl.toString().replace("file://", ""),
--                        importPlasmoid.checked, importExtensions.checked,
--                        importAdds.checked)
-+                    var importConfig = awConfig.importConfiguration()
-                     for (var key in importConfig)
-                         plasmoid.configuration[key] = importConfig[key]
-                 }
-diff --git a/sources/awesome-widget/package/contents/ui/main.qml b/sources/awesome-widget/package/contents/ui/main.qml
-index 23e9690..ec83b91 100644
---- a/sources/awesome-widget/package/contents/ui/main.qml
-+++ b/sources/awesome-widget/package/contents/ui/main.qml
-@@ -17,7 +17,6 @@
- 
- import QtQuick 2.4
- import QtQuick.Controls 1.3 as QtControls
--import QtQuick.Dialogs 1.2 as QtDialogs
- import QtQuick.Layouts 1.1
- import org.kde.plasma.plasmoid 2.0
- import org.kde.plasma.core 2.0 as PlasmaCore
-@@ -110,27 +109,6 @@ Item {
-         }
-     }
- 
--    QtDialogs.Dialog {
--        id: tagSelector
--        title: i18n("Select tag")
--
--        QtControls.ComboBox {
--            id: tagSelectorBox
--            width: parent.width
--            editable: true
--        }
--
--        onAccepted: {
--            var tag = tagSelectorBox.editText
--            var message = i18n("Tag: %1", tag)
--            message += "<br>"
--            message += i18n("Value: %1", awKeys.valueByKey(tag))
--            message += "<br>"
--            message += i18n("Info: %1", awKeys.infoByKey(tag))
--            awActions.sendNotification("tag", message)
--        }
--    }
--
- 
-     Component.onCompleted: {
-         if (debug) console.debug()
-@@ -216,7 +194,12 @@ Item {
-     function action_requestKey() {
-         if (debug) console.debug()
- 
--        tagSelectorBox.model = awKeys.dictKeys(true)
--        return tagSelector.open()
-+        var tag = awKeys.graphicalKey()
-+        var message = i18n("Tag: %1", tag)
-+        message += "<br>"
-+        message += i18n("Value: %1", awKeys.valueByKey(tag))
-+        message += "<br>"
-+        message += i18n("Info: %1", awKeys.infoByKey(tag))
-+        awActions.sendNotification("tag", message)
-     }
- }
-diff --git a/sources/awesome-widget/plugin/awconfighelper.cpp b/sources/awesome-widget/plugin/awconfighelper.cpp
-index 6263b30..5f61d2a 100644
---- a/sources/awesome-widget/plugin/awconfighelper.cpp
-+++ b/sources/awesome-widget/plugin/awconfighelper.cpp
-@@ -19,10 +19,15 @@
- 
- #include <KI18n/KLocalizedString>
- 
-+#include <QCheckBox>
-+#include <QDialogButtonBox>
- #include <QDir>
-+#include <QFileDialog>
-+#include <QMessageBox>
- #include <QQmlPropertyMap>
- #include <QSettings>
- #include <QTextCodec>
-+#include <QVBoxLayout>
- 
- #include "awdebug.h"
- 
-@@ -50,11 +55,13 @@ bool AWConfigHelper::dropCache() const
- }
- 
- 
--bool AWConfigHelper::exportConfiguration(QObject *nativeConfig,
--                                         const QString fileName) const
-+void AWConfigHelper::exportConfiguration(QObject *nativeConfig) const
- {
--    qCDebug(LOG_AW) << "Selected filename" << fileName;
--
-+    // get file path and init settings object
-+    QString fileName = QFileDialog::getSaveFileName(nullptr, i18n("Export"));
-+    if (fileName.isEmpty())
-+        return;
-+    qCInfo(LOG_AW) << "Selected filename" << fileName;
-     QSettings settings(fileName, QSettings::IniFormat);
- 
-     // plasmoid configuration
-@@ -96,22 +103,33 @@ bool AWConfigHelper::exportConfiguration(QObject *nativeConfig,
-     // sync settings
-     settings.sync();
-     // show additional message
--    return settings.status() == QSettings::NoError;
-+    switch (settings.status()) {
-+    case QSettings::NoError:
-+        QMessageBox::information(
-+            nullptr, i18n("Success"),
-+            i18n("Please note that binary files were not copied"));
-+        break;
-+    default:
-+        QMessageBox::critical(nullptr, i18n("Ooops..."),
-+                              i18n("Could not save configuration file"));
-+        break;
-+    }
- }
- 
- 
--QVariantMap AWConfigHelper::importConfiguration(const QString fileName,
--                                                const bool importPlasmoid,
--                                                const bool importExtensions,
--                                                const bool importAdds) const
-+QVariantMap AWConfigHelper::importConfiguration() const
- {
--    qCDebug(LOG_AW) << "Selected filename" << fileName;
--
-     QVariantMap configuration;
-+    // get file path and init settings object
-+    QString fileName = QFileDialog::getOpenFileName(nullptr, i18n("Import"));
-+    if (fileName.isEmpty())
-+        return configuration;
-+    qCInfo(LOG_AW) << "Selected filename" << fileName;
-     QSettings settings(fileName, QSettings::IniFormat);
-+    QHash<QString, bool> selection = selectImport();
- 
-     // extensions
--    if (importExtensions) {
-+    if (selection[QString("extensions")]) {
-         foreach (QString item, m_dirs) {
-             settings.beginGroup(item);
-             foreach (QString it, settings.childGroups())
-@@ -121,7 +139,7 @@ QVariantMap AWConfigHelper::importConfiguration(const QString fileName,
-     }
- 
-     // additional files
--    if (importAdds) {
-+    if (selection[QString("adds")]) {
-         settings.beginGroup(QString("json"));
-         // script filters
-         writeFile(settings, QString("filters"),
-@@ -135,7 +153,7 @@ QVariantMap AWConfigHelper::importConfiguration(const QString fileName,
-     }
- 
-     // plasmoid configuration
--    if (importPlasmoid) {
-+    if (selection[QString("plasmoid")]) {
-         settings.beginGroup(QString("plasmoid"));
-         foreach (QString key, settings.childKeys())
-             configuration[key] = settings.value(key);
-@@ -261,6 +279,50 @@ void AWConfigHelper::readFile(QSettings &settings, const QString key,
- }
- 
- 
-+QHash<QString, bool> AWConfigHelper::selectImport() const
-+{
-+    QDialog *dialog = new QDialog(nullptr);
-+    QCheckBox *importPlasmoidSettings
-+        = new QCheckBox(i18n("Import plasmoid settings"), dialog);
-+    importPlasmoidSettings->setChecked(true);
-+    QCheckBox *importExtensionsSettings
-+        = new QCheckBox(i18n("Import extensions"), dialog);
-+    importExtensionsSettings->setChecked(true);
-+    QCheckBox *importAddsSettings
-+        = new QCheckBox(i18n("Import additional files"), dialog);
-+    importAddsSettings->setChecked(true);
-+    QDialogButtonBox *dialogButtons
-+        = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
-+                               Qt::Horizontal, dialog);
-+    QVBoxLayout *layout = new QVBoxLayout(dialog);
-+    layout->addWidget(importPlasmoidSettings);
-+    layout->addWidget(importExtensionsSettings);
-+    layout->addWidget(importAddsSettings);
-+    layout->addWidget(dialogButtons);
-+    connect(dialogButtons, SIGNAL(accepted()), dialog, SLOT(accept()));
-+    connect(dialogButtons, SIGNAL(rejected()), dialog, SLOT(reject()));
-+
-+    // get parameters
-+    QHash<QString, bool> import;
-+    import[QString("plasmoid")] = false;
-+    import[QString("extensions")] = false;
-+    import[QString("adds")] = false;
-+    switch (dialog->exec()) {
-+    case QDialog::Accepted:
-+        import[QString("plasmoid")] = importPlasmoidSettings->isChecked();
-+        import[QString("extensions")] = importExtensionsSettings->isChecked();
-+        import[QString("adds")] = importAddsSettings->isChecked();
-+        break;
-+    case QDialog::Rejected:
-+    default:
-+        break;
-+    }
-+    dialog->deleteLater();
-+
-+    return import;
-+}
-+
-+
- void AWConfigHelper::writeFile(QSettings &settings, const QString key,
-                                const QString fileName) const
- {
-diff --git a/sources/awesome-widget/plugin/awconfighelper.h b/sources/awesome-widget/plugin/awconfighelper.h
-index 912ac3d..dc51dfb 100644
---- a/sources/awesome-widget/plugin/awconfighelper.h
-+++ b/sources/awesome-widget/plugin/awconfighelper.h
-@@ -33,12 +33,8 @@ public:
-     explicit AWConfigHelper(QObject *parent = nullptr);
-     virtual ~AWConfigHelper();
-     Q_INVOKABLE bool dropCache() const;
--    Q_INVOKABLE bool exportConfiguration(QObject *nativeConfig,
--                                         const QString fileName) const;
--    Q_INVOKABLE QVariantMap importConfiguration(const QString fileName,
--                                                const bool importPlasmoid,
--                                                const bool importExtensions,
--                                                const bool importAdds) const;
-+    Q_INVOKABLE void exportConfiguration(QObject *nativeConfig) const;
-+    Q_INVOKABLE QVariantMap importConfiguration() const;
-     // dataengine
-     Q_INVOKABLE QVariantMap readDataEngineConfiguration() const;
-     Q_INVOKABLE void
-@@ -51,6 +47,7 @@ private:
-     void copySettings(QSettings &from, QSettings &to) const;
-     void readFile(QSettings &settings, const QString key,
-                   const QString fileName) const;
-+    QHash<QString, bool> selectImport() const;
-     void writeFile(QSettings &settings, const QString key,
-                    const QString fileName) const;
-     // properties
-diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp
-index e5b9861..039d24e 100644
---- a/sources/awesome-widget/plugin/awkeys.cpp
-+++ b/sources/awesome-widget/plugin/awkeys.cpp
-@@ -324,6 +324,13 @@ QStringList AWKeys::getHddDevices() const
- }
- 
- 
-+QString AWKeys::graphicalKey() const
-+{
-+    return QInputDialog::getItem(nullptr, i18n("Select tag"), QString(),
-+                                 dictKeys(true), 0, true);
-+}
-+
-+
- QString AWKeys::infoByKey(QString key) const
- {
-     qCDebug(LOG_AW) << "Requested key" << key;
-diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h
-index a8300f1..8edc3bd 100644
---- a/sources/awesome-widget/plugin/awkeys.h
-+++ b/sources/awesome-widget/plugin/awkeys.h
-@@ -55,6 +55,7 @@ public:
-     Q_INVOKABLE QStringList dictKeys(const bool sorted = false,
-                                      const QString regexp = QString()) const;
-     Q_INVOKABLE QStringList getHddDevices() const;
-+    Q_INVOKABLE QString graphicalKey() const;
-     // values
-     Q_INVOKABLE QString infoByKey(QString key) const;
-     Q_INVOKABLE QString valueByKey(QString key) const;

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

@@ -1,29 +0,0 @@
-diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h
-index f808d03..a056b3f 100644
---- a/sources/awesome-widget/plugin/awkeysaggregator.h
-+++ b/sources/awesome-widget/plugin/awkeysaggregator.h
-@@ -21,6 +21,7 @@
- 
- #include <QHash>
- #include <QObject>
-+#include <QStringList>
- 
- #include "version.h"
- 
-diff --git a/sources/awdebug.h b/sources/awdebug.h
-index 48dc580..530c0d6 100644
---- a/sources/awdebug.h
-+++ b/sources/awdebug.h
-@@ -23,9 +23,9 @@
- 
- #ifndef LOG_FORMAT
- #define LOG_FORMAT                                                             \
--    "[%{time process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%{if-"         \
--    "warning}WW%{endif}%{if-critical}CC%{endif}%{if-fatal}FF%{endif}][%{"      \
--    "category}][%{function}] %{message}"
-+    "[%{time process}][%{if-debug}DD%{endif}%{if-warning}WW%{endif}%{if-"      \
-+    "critical}CC%{endif}%{if-fatal}FF%{endif}][%{category}][%{function}] "     \
-+    "%{message}"
- #endif /* LOG_FORMAT */
- 
- // redefine info because it doesn't log properly

patches/PATCHING.md

@@ -0,0 +1,7 @@
+* Using git tree from root git directory:
+
+        git apply path/to/patch
+
+* Using release tarball from root directory:
+
+        patch -p2 -i path/to/patch

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/CMakeLists.txt

@@ -14,8 +14,8 @@ set(PROJECT_AUTHOR "Evgeniy Alekseev")
 set(PROJECT_CONTACT "esalexeev@gmail.com")
 set(PROJECT_LICENSE "GPL3")
 set(PROJECT_VERSION_MAJOR "3")
-set(PROJECT_VERSION_MINOR "0")
-set(PROJECT_VERSION_PATCH "1")
+set(PROJECT_VERSION_MINOR "3")
+set(PROJECT_VERSION_PATCH "3")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 # append git version if any
 set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "")
@@ -34,10 +34,12 @@ option(BUILD_DEB_PACKAGE "Build deb package" OFF)
 option(BUILD_RPM_PACKAGE "Build rpm package" OFF)
 # build details
 option(BUILD_FUTURE "Build with the features which will be marked as stable later" OFF)
+option(BUILD_LOAD "Build with additional load" OFF)
 option(BUILD_TESTING "Build with additional test abilities" OFF)
-# some additional targets
-set(CLANGFORMAT_EXECUTABLE "/usr/bin/clang-format" CACHE STRING "Path to clang-format executable")
-set(CPPCHECK_EXECUTABLE "/usr/bin/cppcheck" CACHE STRING "Path to cppcheck executable")
+
+# generate changelog
+set(PROJECT_CHANGELOG "Changelog" CACHE INTERNAL "")
+include(changelog.cmake)
 
 # flags
 if (CMAKE_COMPILER_IS_GNUCXX)
@@ -48,14 +50,11 @@ if (CMAKE_COMPILER_IS_GNUCXX)
     # avoid newer gcc warnings
     add_definitions(-D_DEFAULT_SOURCE)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-Wall -std=c++11 -stdlib=libc++")
+    set(CMAKE_CXX_FLAGS "-Wall -std=c++11")
     set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
     set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
     set(CMAKE_CXX_FLAGS_OPTIMIZATION "-Ofast -DNDEBUG")
     # linker flags
-    set(CMAKE_EXE_LINKER_FLAGS "-lc++abi")
-    set(CMAKE_MODULE_LINKER_FLAGS "-lc++abi")
-    set(CMAKE_SHARED_LINKER_FLAGS "-lc++abi")
 else ()
     message(FATAL_ERROR "Unknown compiler")
 endif ()
@@ -63,20 +62,32 @@ if (CMAKE_BUILD_TYPE MATCHES Debug)
     set(CMAKE_VERBOSE_MAKEFILE ON)
 endif ()
 
+# required by successfully coverity and cppcheck build
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 set(PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
 set(PROJECT_LIBRARY awesomewidgets)
+set(PROJECT_MONITORSOURCES extsysmonsources)
 include(libraries.cmake)
 include(clang-format.cmake)
 include(cppcheck.cmake)
+include(coverity.cmake)
 
 get_directory_property(CMAKE_DEFINITIONS COMPILE_DEFINITIONS)
 configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 add_subdirectory(awesomewidgets)
+add_subdirectory(extsysmonsources)
 add_subdirectory(extsysmon)
 if (BUILD_PLASMOIDS)
+    add_subdirectory(qml)
     add_subdirectory(awesome-widget)
     add_subdirectory(desktop-panel)
     add_subdirectory(translations)
 endif ()
+if (BUILD_TESTING)
+    enable_testing()
+    add_subdirectory(test)
+endif ()
 
 include(packages-recipe.cmake)
+

sources/awdebug.cpp

@@ -16,38 +16,117 @@
  ***************************************************************************/
 
 
+#include <KI18n/KLocalizedString>
+
 #include "awdebug.h"
-#include "version.h"
 
 
 Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget",
                    QtMsgType::QtWarningMsg)
+Q_LOGGING_CATEGORY(LOG_DBUS, "org.kde.plasma.awdbus", QtMsgType::QtWarningMsg)
 Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel",
                    QtMsgType::QtWarningMsg)
 Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon", QtMsgType::QtWarningMsg)
+Q_LOGGING_CATEGORY(LOG_ESS, "org.kde.plasma.extsysmonsources",
+                   QtMsgType::QtWarningMsg)
 Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets",
                    QtMsgType::QtWarningMsg)
 
 
-const QStringList getBuildData()
+QString AWDebug::getAboutText(const QString &_type)
+{
+    QString text;
+    if (_type == "header") {
+        text = NAME;
+    } else if (_type == "version") {
+        text = i18n("Version %1 (build date %2)", VERSION, BUILD_DATE);
+        if (!QString(COMMIT_SHA).isEmpty())
+            text += QString(" (%1)").arg(COMMIT_SHA);
+    } else if (_type == "description") {
+        text = i18n("A set of minimalistic plasmoid widgets");
+    } else if (_type == "links") {
+        text = i18n("Links:") + "<ul>"
+               + QString("<li><a href=\"%1\">%2</a></li>")
+                     .arg(HOMEPAGE)
+                     .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>")
+                     .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)
+               + i18n("This software is licensed under %1", LICENSE)
+               + "</small>";
+    } else if (_type == "translators") {
+        QStringList translatorList = QString(TRANSLATORS).split(',');
+        for (auto &translator : translatorList)
+            translator = QString("<li>%1</li>").arg(translator);
+        text
+            = i18n("Translators:") + "<ul>" + translatorList.join("") + "</ul>";
+    } else if (_type == "3rdparty") {
+        QStringList trdPartyList
+            = QString(TRDPARTY_LICENSE).split(';', QString::SkipEmptyParts);
+        for (int i = 0; i < trdPartyList.count(); i++)
+            trdPartyList[i]
+                = QString("<li><a href=\"%3\">%1</a> (%2 license)</li>")
+                      .arg(trdPartyList.at(i).split(',')[0])
+                      .arg(trdPartyList.at(i).split(',')[1])
+                      .arg(trdPartyList.at(i).split(',')[2]);
+        text = i18n("This software uses:") + "<ul>" + trdPartyList.join("")
+               + "</ul>";
+    } else if (_type == "thanks") {
+        QStringList thanks
+            = QString(SPECIAL_THANKS).split(';', QString::SkipEmptyParts);
+        for (int i = 0; i < thanks.count(); i++)
+            thanks[i] = QString("<li><a href=\"%2\">%1</a></li>")
+                            .arg(thanks.at(i).split(',')[0])
+                            .arg(thanks.at(i).split(',')[1]);
+        text = i18n("Special thanks to:") + "<ul>" + thanks.join("") + "</ul>";
+    }
+
+    return text;
+}
+
+
+QStringList AWDebug::getBuildData()
 {
     QStringList metadata;
-    metadata.append(QString("=== Awesome Widgets configuration details ==="));
+    metadata.append("=== Awesome Widgets configuration details ===");
     // build information
-    metadata.append(QString("Build details:"));
+    metadata.append("Build details:");
     metadata.append(QString("    VERSION: %1").arg(VERSION));
     metadata.append(QString("    COMMIT_SHA: %1").arg(COMMIT_SHA));
     metadata.append(QString("    BUILD_DATE: %1").arg(BUILD_DATE));
     // configuration
-    metadata.append(QString("API details:"));
-    metadata.append(QString("    AWGIAPI: %1").arg(AWGIAPI));
-    metadata.append(QString("    AWEQAPI: %1").arg(AWEQAPI));
-    metadata.append(QString("    AWESAPI: %1").arg(AWESAPI));
-    metadata.append(QString("    AWEUAPI: %1").arg(AWEUAPI));
-    metadata.append(QString("    AWEWAPI: %1").arg(AWEWAPI));
+    metadata.append("API details:");
+    metadata.append(QString("    AW_GRAPHITEM_API: %1").arg(AW_GRAPHITEM_API));
+    metadata.append(QString("    AW_EXTQUOTES_API: %1").arg(AW_EXTQUOTES_API));
+    metadata.append(QString("    AW_EXTSCRIPT_API: %1").arg(AW_EXTSCRIPT_API));
+    metadata.append(
+        QString("    AW_EXTUPGRADE_API: %1").arg(AW_EXTUPGRADE_API));
+    metadata.append(
+        QString("    AW_EXTWEATHER_API: %1").arg(AW_EXTWEATHER_API));
+    metadata.append(QString("    AW_FORMATTER_API: %1").arg(AW_FORMATTER_API));
+    metadata.append(QString("    REQUEST_TIMEOUT: %1").arg(REQUEST_TIMEOUT));
     metadata.append(QString("    TIME_KEYS: %1").arg(TIME_KEYS));
+    metadata.append(QString("    STATIC_KEYS: %1").arg(STATIC_KEYS));
     // cmake properties
-    metadata.append(QString("cmake properties:"));
+    metadata.append("cmake properties:");
     metadata.append(QString("    CMAKE_BUILD_TYPE: %1").arg(CMAKE_BUILD_TYPE));
     metadata.append(
         QString("    CMAKE_CXX_COMPILER: %1").arg(CMAKE_CXX_COMPILER));
@@ -67,7 +146,7 @@ const QStringList getBuildData()
     metadata.append(QString("    CMAKE_SHARED_LINKER_FLAGS: %1")
                         .arg(CMAKE_SHARED_LINKER_FLAGS));
     // components
-    metadata.append(QString("Components data:"));
+    metadata.append("Components data:");
     metadata.append(QString("    BUILD_PLASMOIDS: %1").arg(BUILD_PLASMOIDS));
     metadata.append(
         QString("    BUILD_DEB_PACKAGE: %1").arg(BUILD_DEB_PACKAGE));
@@ -75,10 +154,19 @@ const QStringList getBuildData()
         QString("    BUILD_RPM_PACKAGE: %1").arg(BUILD_RPM_PACKAGE));
     metadata.append(
         QString("    CLANGFORMAT_EXECUTABLE: %1").arg(CLANGFORMAT_EXECUTABLE));
+    metadata.append(QString("    COVERITY_COMMENT: %1").arg(COVERITY_COMMENT));
+    metadata.append(
+        QString("    COVERITY_DIRECTORY: %1").arg(COVERITY_DIRECTORY));
+    metadata.append(QString("    COVERITY_EMAIL: %1").arg(COVERITY_EMAIL));
+    metadata.append(
+        QString("    COVERITY_EXECUTABLE: %1").arg(COVERITY_EXECUTABLE));
+    metadata.append(QString("    COVERITY_URL: %1").arg(COVERITY_URL));
     metadata.append(
         QString("    CPPCHECK_EXECUTABLE: %1").arg(CPPCHECK_EXECUTABLE));
+    // additional functions
     metadata.append(QString("    PROP_FUTURE: %1").arg(PROP_FUTURE));
-    metadata.append(QString("    PROP_FUTURE: %1").arg(PROP_FUTURE));
+    metadata.append(QString("    PROP_LOAD: %1").arg(PROP_LOAD));
+    metadata.append(QString("    PROP_TEST: %1").arg(PROP_TEST));
 
     return metadata;
 }

sources/awdebug.h

@@ -21,26 +21,27 @@
 
 #include <QLoggingCategory>
 
-#ifndef LOG_FORMAT
-#define LOG_FORMAT                                                             \
-    "[%{time process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%{if-"         \
-    "warning}WW%{endif}%{if-critical}CC%{endif}%{if-fatal}FF%{endif}][%{"      \
-    "category}][%{function}] %{message}"
-#endif /* LOG_FORMAT */
+#include "version.h"
 
-// redefine info because it doesn't log properly
-#ifdef qCInfo
-#undef qCInfo
-#endif /* qCInfo */
-#define qCInfo qCDebug
+namespace AWDebug
+{
+const char LOG_FORMAT[] = "[%{time "
+                          "process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%"
+                          "{if-warning}WW%{endif}%{if-critical}CC%{endif}%{if-"
+                          "fatal}FF%{endif}][%{category}][%{function}] "
+                          "%{message}";
+
+QString getAboutText(const QString &_type);
+QStringList getBuildData();
+}
 
 
 Q_DECLARE_LOGGING_CATEGORY(LOG_AW)
+Q_DECLARE_LOGGING_CATEGORY(LOG_DBUS)
 Q_DECLARE_LOGGING_CATEGORY(LOG_DP)
 Q_DECLARE_LOGGING_CATEGORY(LOG_ESM)
+Q_DECLARE_LOGGING_CATEGORY(LOG_ESS)
 Q_DECLARE_LOGGING_CATEGORY(LOG_LIB)
 
-const QStringList getBuildData();
-
 
 #endif /* AWDEBUG_H */

sources/awesome-widget/metadata.desktop

@@ -21,7 +21,7 @@ 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=http://arcanis.name/projects/awesome-widgets/
+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

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

@@ -32,6 +32,9 @@
         <entry name="checkUpdates" type="bool">
             <default>true</default>
         </entry>
+        <entry name="optimize" type="bool">
+            <default>true</default>
+        </entry>
         <entry name="height" type="int">
             <default>0</default>
         </entry>
@@ -59,6 +62,15 @@
         <entry name="acOffline" type="string">
             <default>( )</default>
         </entry>
+        <entry name="telemetryCount" type="int">
+            <default>100</default>
+        </entry>
+        <entry name="telemetryRemote" type="bool">
+            <default>false</default>
+        </entry>
+        <entry name="telemetryId" type="string">
+            <default></default>
+        </entry>
     </group>
 
     <group name="Tooltip">
@@ -95,13 +107,13 @@
         <entry name="swapTooltipColor" type="string">
             <default>#ffff00</default>
         </entry>
-        <entry name="downTooltip" type="bool">
+        <entry name="downkbTooltip" type="bool">
             <default>true</default>
         </entry>
-        <entry name="downTooltipColor" type="string">
+        <entry name="downkbTooltipColor" type="string">
             <default>#00ffff</default>
         </entry>
-        <entry name="upTooltipColor" type="string">
+        <entry name="upkbTooltipColor" type="string">
             <default>#ff00ff</default>
         </entry>
         <entry name="batTooltip" type="bool">
@@ -135,6 +147,12 @@
         <entry name="fontStyle" type="string">
             <default>normal</default>
         </entry>
+        <entry name="textStyle" type="string">
+            <default>normal</default>
+        </entry>
+        <entry name="textStyleColor" type="string">
+            <default>#000000</default>
+        </entry>
     </group>
 
 </kcfg>

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

@@ -16,103 +16,24 @@
  ***************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Controls 1.3 as QtControls
-import QtQuick.Layouts 1.0 as QtLayouts
 
 import org.kde.plasma.private.awesomewidget 1.0
 
 
 Item {
     id: aboutPage
+    // backend
     AWActions {
         id: awActions
     }
 
     width: childrenRect.width
     height: childrenRect.height
-    implicitWidth: pageColumn.implicitWidth
-    implicitHeight: pageColumn.implicitHeight
 
-    property bool debug: awActions.isDebugEnabled()
-
-
-    Column {
-        id: pageColumn
-        anchors.fill: parent
-        QtControls.TabView {
-            height: parent.height
-            width: parent.width
-            QtControls.Tab {
-                anchors.margins: 10.0
-                title: i18n("About")
-
-                QtLayouts.ColumnLayout {
-                    QtControls.Label {
-                        QtLayouts.Layout.fillWidth: true
-                        horizontalAlignment: Text.AlignHCenter
-                        text: awActions.getAboutText("header")
-                    }
-
-                    QtControls.Label {
-                        QtLayouts.Layout.fillWidth: true
-                        horizontalAlignment: Text.AlignHCenter
-                        text: awActions.getAboutText("version")
-                    }
-
-                    QtControls.Label {
-                        QtLayouts.Layout.fillWidth: true
-                        horizontalAlignment: Text.AlignJustify
-                        text: awActions.getAboutText("description")
-                    }
-
-                    QtControls.Label {
-                        QtLayouts.Layout.fillWidth: true
-                        horizontalAlignment: Text.AlignLeft
-                        textFormat: Text.RichText
-                        text: awActions.getAboutText("links")
-                        onLinkActivated: Qt.openUrlExternally(link);
-                    }
-
-                    QtControls.Label {
-                        QtLayouts.Layout.fillHeight: true
-                        QtLayouts.Layout.fillWidth: true
-                        font.capitalization: Font.SmallCaps
-                        horizontalAlignment: Text.AlignHCenter
-                        verticalAlignment: Text.AlignBottom
-                        textFormat: Text.RichText
-                        text: awActions.getAboutText("copy")
-                    }
-                }
-            }
-
-            QtControls.Tab {
-                anchors.margins: 10.0
-                title: i18n("Acknowledgment")
-
-                QtLayouts.ColumnLayout {
-                    QtControls.Label {
-                        QtLayouts.Layout.fillWidth: true
-                        wrapMode: Text.WordWrap
-                        horizontalAlignment: Text.AlignJustify
-                        text: awActions.getAboutText("translators")
-                    }
-
-                    QtControls.Label {
-                        QtLayouts.Layout.fillHeight: true
-                        QtLayouts.Layout.fillWidth: true
-                        wrapMode: Text.WordWrap
-                        horizontalAlignment: Text.AlignJustify
-                        verticalAlignment: Text.AlignTop
-                        textFormat: Text.RichText
-                        text: awActions.getAboutText("3rdparty")
-                        onLinkActivated: Qt.openUrlExternally(link);
-                    }
-                }
-            }
-        }
+    AboutTab {
+        textProvider: awActions
     }
 
-
     Component.onCompleted: {
         if (debug) console.debug()
     }

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

@@ -17,7 +17,6 @@
 
 import QtQuick 2.0
 import QtQuick.Controls 1.3 as QtControls
-import QtQuick.Dialogs 1.2 as QtDialogs
 
 import org.kde.plasma.private.awesomewidget 1.0
 
@@ -28,9 +27,6 @@ Item {
     AWActions {
         id: awActions
     }
-    AWConfigHelper {
-        id: awConfig
-    }
 
     width: childrenRect.width
     height: childrenRect.height
@@ -45,408 +41,215 @@ Item {
     property alias cfg_wrapText: wordWrap.checked
     property alias cfg_notify: notify.checked
     property alias cfg_checkUpdates: updates.checked
+    property alias cfg_optimize: optimize.checked
     property alias cfg_height: widgetHeight.value
     property alias cfg_width: widgetWidth.value
     property alias cfg_interval: update.value
     property alias cfg_queueLimit: queueLimit.value
-    property string cfg_tempUnits: tempUnits.currentText
-    property alias cfg_customTime: customTime.text
-    property alias cfg_customUptime: customUptime.text
-    property alias cfg_acOnline: acOnline.text
-    property alias cfg_acOffline: acOffline.text
+    property string cfg_tempUnits: tempUnits.value
+    property alias cfg_customTime: customTime.value
+    property alias cfg_customUptime: customUptime.value
+    property alias cfg_acOnline: acOnline.value
+    property alias cfg_acOffline: acOffline.value
+    property alias cfg_telemetryCount: telemetryCount.value
+    property alias cfg_telemetryRemote: telemetryRemote.checked
+    property alias cfg_telemetryId: telemetryId.value
 
 
     Column {
         id: pageColumn
         anchors.fill: parent
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.heigth
-                width: parent.width * 2 / 5
-            }
-            QtControls.CheckBox {
-                id: background
-                width: parent.width * 3 / 5
-                text: i18n("Enable background")
-            }
+
+        CheckBoxSelector {
+            id: background
+            text: i18n("Enable background")
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.heigth
-                width: parent.width * 2 / 5
-            }
-            QtControls.CheckBox {
-                id: translate
-                width: parent.width * 3 / 5
-                text: i18n("Translate strings")
-            }
+        CheckBoxSelector {
+            id: translate
+            text: i18n("Translate strings")
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.heigth
-                width: parent.width * 2 / 5
-            }
-            QtControls.CheckBox {
-                id: wrapNewLines
-                width: parent.width * 3 / 5
-                text: i18n("Wrap new lines")
-            }
+        CheckBoxSelector {
+            id: wrapNewLines
+            text: i18n("Wrap new lines")
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.heigth
-                width: parent.width * 2 / 5
-            }
-            QtControls.CheckBox {
-                id: wordWrap
-                width: parent.width * 3 / 5
-                text: i18n("Enable word wrap")
-            }
+        CheckBoxSelector {
+            id: wordWrap
+            text: i18n("Enable word wrap")
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.heigth
-                width: parent.width * 2 / 5
-            }
-            QtControls.CheckBox {
-                id: notify
-                width: parent.width * 3 / 5
-                text: i18n("Enable notifications")
-            }
+        CheckBoxSelector {
+            id: notify
+            text: i18n("Enable notifications")
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.heigth
-                width: parent.width * 2 / 5
-            }
-            QtControls.CheckBox {
-                id: updates
-                width: parent.width * 3 / 5
-                text: i18n("Check updates on startup")
-            }
+        CheckBoxSelector {
+            id: updates
+            text: i18n("Check updates on startup")
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Widget height, px")
-            }
-            QtControls.SpinBox {
-                id: widgetHeight
-                width: parent.width * 3 / 5
-                minimumValue: 0
-                maximumValue: 4096
-                stepSize: 50
-                value: plasmoid.configuration.height
-            }
+        CheckBoxSelector {
+            id: optimize
+            text: i18n("Optimize subscription")
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Widget width, px")
-            }
-            QtControls.SpinBox {
-                id: widgetWidth
-                width: parent.width * 3 / 5
-                minimumValue: 0
-                maximumValue: 4096
-                stepSize: 50
-                value: plasmoid.configuration.width
-            }
+        IntegerSelector {
+            id: widgetHeight
+            maximumValue: 4096
+            minimumValue: 0
+            stepSize: 50
+            text: i18n("Widget height, px")
+            value: plasmoid.configuration.height
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Time interval")
-            }
-            QtControls.SpinBox {
-                id: update
-                width: parent.width * 3 / 5
-                minimumValue: 1000
-                maximumValue: 10000
-                stepSize: 500
-                value: plasmoid.configuration.interval
-            }
+        IntegerSelector {
+            id: widgetWidth
+            maximumValue: 4096
+            minimumValue: 0
+            stepSize: 50
+            text: i18n("Widget width, px")
+            value: plasmoid.configuration.width
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Messages queue limit")
-            }
-            QtControls.SpinBox {
-                id: queueLimit
-                width: parent.width * 3 / 5
-                minimumValue: 0
-                maximumValue: 99
-                stepSize: 1
-                value: plasmoid.configuration.queueLimit
-            }
+        IntegerSelector {
+            id: update
+            maximumValue: 10000
+            minimumValue: 1000
+            stepSize: 500
+            text: i18n("Time interval")
+            value: plasmoid.configuration.interval
         }
 
-        Row {
+        IntegerSelector {
+            id: queueLimit
+            maximumValue: 99
+            minimumValue: 0
+            stepSize: 1
+            text: i18n("Messages queue limit")
+            value: plasmoid.configuration.queueLimit
+        }
+
+        ComboBoxSelector {
+            id: tempUnits
+            model: [
+                {
+                    'label': i18n("Celsius"),
+                    'name': "Celsius"
+                },
+                {
+                    'label': i18n("Fahrenheit"),
+                    'name': "Fahrenheit"
+                },
+                {
+                    'label': i18n("Kelvin"),
+                    'name': "Kelvin"
+                },
+                {
+                    'label': i18n("Reaumur"),
+                    'name': "Reaumur"
+                },
+                {
+                    'label': i18n("cm^-1"),
+                    'name': "cm^-1"
+                },
+                {
+                    'label': i18n("kJ/mol"),
+                    'name': "kJ/mol"
+                },
+                {
+                    'label': i18n("kcal/mol"),
+                    'name': "kcal/mol"
+                }
+            ]
+            text: i18n("Temperature units")
+            value: plasmoid.configuration.tempUnits
+            onValueEdited: cfg_tempUnits = newValue
+        }
+
+        LineSelector {
+            id: customTime
+            text: i18n("Custom time format")
+            value: plasmoid.configuration.customTime
+        }
+
+        LineSelector {
+            id: customUptime
+            text: i18n("Custom uptime format")
+            value: plasmoid.configuration.customUptime
+        }
+
+        LineSelector {
+            id: acOnline
+            text: i18n("AC online tag")
+            value: plasmoid.configuration.acOnline
+        }
+
+        LineSelector {
+            id: acOffline
+            text: i18n("AC offline tag")
+            value: plasmoid.configuration.acOffline
+        }
+
+        QtControls.GroupBox {
             height: implicitHeight
             width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Temperature units")
-            }
-            QtControls.ComboBox {
-                id: tempUnits
-                width: parent.width * 3 / 5
-                textRole: "label"
-                model: [
-                    {
-                        'label': i18n("Celsius"),
-                        'name': "Celsius"
-                    },
-                    {
-                        'label': i18n("Fahrenheit"),
-                        'name': "Fahrenheit"
-                    },
-                    {
-                        'label': i18n("Kelvin"),
-                        'name': "Kelvin"
-                    },
-                    {
-                        'label': i18n("Reaumur"),
-                        'name': "Reaumur"
-                    },
-                    {
-                        'label': i18n("cm^-1"),
-                        'name': "cm^-1"
-                    },
-                    {
-                        'label': i18n("kJ/mol"),
-                        'name': "kJ/mol"
-                    },
-                    {
-                        'label': i18n("kcal/mol"),
-                        'name': "kcal/mol"
+            title: i18n("Actions")
+
+            Column {
+                height: implicitHeight
+                width: parent.width
+                ButtonSelector {
+                    value: i18n("Drop key cache")
+                    onButtonActivated: awActions.dropCache()
+                }
+                ButtonSelector {
+                    ExportDialog {
+                        id: saveConfigAs
+                        configuration: plasmoid.configuration
                     }
-                ]
-                onCurrentIndexChanged: cfg_tempUnits = model[currentIndex]["name"]
-                Component.onCompleted: {
-                    if (debug) console.debug()
-                    for (var i = 0; i < model.length; i++) {
-                        if (model[i]["name"] == plasmoid.configuration.tempUnits) {
-                            if (debug) console.info("Found", model[i]["name"], "on", i)
-                            tempUnits.currentIndex = i;
+                    value: i18n("Export configuration")
+                    onButtonActivated: saveConfigAs.open()
+                }
+                ButtonSelector {
+                    ImportDialog {
+                        id: loadConfigFrom
+                        onConfigurationReceived: {
+                            for (var key in configuration)
+                                plasmoid.configuration[key] = configuration[key]
                         }
                     }
+                    value: i18n("Import configuration")
+                    onButtonActivated: loadConfigFrom.open()
                 }
             }
         }
 
-        Row {
+        QtControls.GroupBox {
             height: implicitHeight
             width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Custom time format")
-            }
-            QtControls.TextField {
-                id: customTime
-                width: parent.width * 3 / 5
-                text: plasmoid.configuration.customTime
-            }
-        }
+            title: i18n("Telemetry")
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Custom uptime format")
-            }
-            QtControls.TextField {
-                id: customUptime
-                width: parent.width * 3 / 5
-                text: plasmoid.configuration.customUptime
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("AC online tag")
-            }
-            QtControls.TextField {
-                id: acOnline
-                width: parent.width * 3 / 5
-                text: plasmoid.configuration.acOnline
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("AC offline tag")
-            }
-            QtControls.TextField {
-                id: acOffline
-                width: parent.width * 3 / 5
-                text: plasmoid.configuration.acOffline
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-            }
-            QtControls.Button {
-                width: parent.width * 3 / 5
-                text: i18n("Drop key cache")
-                onClicked: awActions.dropCache()
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-            }
-            QtControls.Button {
-                width: parent.width * 3 / 5
-                text: i18n("Export configuration")
-                onClicked: saveConfigAs.open()
-            }
-
-            QtDialogs.FileDialog {
-                id: saveConfigAs
-                selectExisting: false
-                title: i18n("Export")
-                onAccepted: {
-                    var status = awConfig.exportConfiguration(
-                        plasmoid.configuration,
-                        saveConfigAs.fileUrl.toString().replace("file://", ""))
-                    if (status) {
-                        messageDialog.title = i18n("Success")
-                        messageDialog.text = i18n("Please note that binary files were not copied")
-                    } else {
-                        messageDialog.title = i18n("Ooops...")
-                        messageDialog.text = i18n("Could not save configuration file")
-                    }
-                    messageDialog.open()
+            Column {
+                height: implicitHeight
+                width: parent.width
+                CheckBoxSelector {
+                    id: telemetryRemote
+                    text: i18n("Enable remote telemetry")
                 }
-            }
-
-            QtDialogs.MessageDialog {
-                id: messageDialog
-                standardButtons: QtDialogs.StandardButton.Ok
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-            }
-            QtControls.Button {
-                width: parent.width * 3 / 5
-                text: i18n("Import configuration")
-                onClicked: openConfig.open()
-            }
-
-            QtDialogs.FileDialog {
-                id: openConfig
-                title: i18n("Import")
-                onAccepted: importSelection.open()
-            }
-
-            QtDialogs.Dialog {
-                id: importSelection
-
-                Column {
-                    QtControls.CheckBox {
-                        id: importPlasmoid
-                        text: i18n("Import plasmoid settings")
-                    }
-
-                    QtControls.CheckBox {
-                        id: importExtensions
-                        text: i18n("Import extensions")
-                    }
-
-                    QtControls.CheckBox {
-                        id: importAdds
-                        text: i18n("Import additional files")
-                    }
+                IntegerSelector {
+                    id: telemetryCount
+                    maximumValue: 10000
+                    minimumValue: 0
+                    stepSize: 50
+                    text: i18n("History count")
+                    value: plasmoid.configuration.telemetryCount
                 }
-
-                onAccepted: {
-                    if (debug) console.debug()
-                    var importConfig = awConfig.importConfiguration(
-                        openConfig.fileUrl.toString().replace("file://", ""),
-                        importPlasmoid.checked, importExtensions.checked,
-                        importAdds.checked)
-                    for (var key in importConfig)
-                        plasmoid.configuration[key] = importConfig[key]
+                LineSelector {
+                    id: telemetryId
+                    text: i18n("Telemetry ID")
+                    value: plasmoid.configuration.telemetryId
                 }
             }
         }

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

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

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

@@ -52,21 +52,10 @@ Item {
             height: implicitHeight
             width: parent.width
             title: i18n("ACPI")
-            Row {
-                height: implicitHeight
-                width: parent.width
-                QtControls.Label {
-                    height: parent.height
-                    width: parent.width * 2 / 5
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
-                    text: i18n("ACPI path")
-                }
-                QtControls.TextField {
-                    width: parent.width * 3 / 5
-                    text: cfg_dataengine["ACPIPATH"]
-                    onEditingFinished: cfg_dataengine["ACPIPATH"] = text
-                }
+            LineSelector {
+                text: i18n("ACPI path")
+                value: cfg_dataengine["ACPIPATH"]
+                onValueEdited: cfg_dataengine["ACPIPATH"] = newValue
             }
         }
 
@@ -74,30 +63,28 @@ Item {
             height: implicitHeight
             width: parent.width
             title: i18n("GPU")
-            Row {
-                height: implicitHeight
-                width: parent.width
-                QtControls.Label {
-                    height: parent.height
-                    width: parent.width * 2 / 5
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
-                    text: i18n("GPU device")
-                }
-                QtControls.ComboBox {
-                    id: gpuDev
-                    width: parent.width * 3 / 5
-                    model: ["auto", "disable", "ati", "nvidia"]
-                    Component.onCompleted: {
-                        if (debug) console.debug()
-                        for (var i=0; i<model.length; i++) {
-                            if (model[i] == cfg_dataengine["GPUDEV"]) {
-                                if (debug) console.info("Found", model[i], "on", i)
-                                currentIndex = i;
-                            }
-                        }
+            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
             }
         }
 
@@ -108,37 +95,17 @@ Item {
             Column {
                 height: implicitHeight
                 width: parent.width
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("HDD")
-                    }
-                    QtControls.ComboBox {
-                        id: hdd
-                        width: parent.width * 3 / 5
-                    }
+                ComboBoxSelector {
+                    id: hdd
+                    text: i18n("HDD")
+                    value: cfg_dataengine["HDDDEV"]
+                    onValueEdited: cfg_dataengine["HDDDEV"] = newValue
                 }
 
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("hddtemp cmd")
-                    }
-                    QtControls.TextField {
-                        width: parent.width * 3 / 5
-                        text: cfg_dataengine["HDDTEMPCMD"]
-                        onEditingFinished: cfg_dataengine["HDDTEMPCMD"] = text
-                    }
+                LineSelector {
+                    text: i18n("hddtemp cmd")
+                    value: cfg_dataengine["HDDTEMPCMD"]
+                    onValueEdited: cfg_dataengine["HDDTEMPCMD"] = newValue
                 }
             }
         }
@@ -150,107 +117,93 @@ Item {
             Column {
                 height: implicitHeight
                 width: parent.width
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Player data symbols")
-                    }
-                    QtControls.SpinBox {
-                        width: parent.width * 3 / 5
-                        minimumValue: 1
-                        maximumValue: 100
-                        stepSize: 1
-                        value: cfg_dataengine["PLAYERSYMBOLS"]
-                        onEditingFinished: cfg_dataengine["PLAYERSYMBOLS"] = value
-                    }
+                IntegerSelector {
+                    maximumValue: 100
+                    minimumValue: 1
+                    stepSize: 1
+                    text: i18n("Player data symbols")
+                    value: cfg_dataengine["PLAYERSYMBOLS"]
+                    onValueEdited: cfg_dataengine["PLAYERSYMBOLS"] = newValue
                 }
 
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Music player")
-                    }
-                    QtControls.ComboBox {
-                        id: player
-                        width: parent.width * 3 / 5
-                        model: ["disable", "mpris", "mpd"]
-                        Component.onCompleted: {
-                            if (debug) console.debug()
-                            for (var i=0; i<model.length; i++) {
-                                if (model[i] == cfg_dataengine["PLAYER"]) {
-                                    if (debug) console.info("Found", model[i], "on", i)
-                                    player.currentIndex = i;
-                                }
-                            }
+                ComboBoxSelector {
+                    model: [
+                        {
+                            'label': "disable",
+                            'name': "disable"
+                        },
+                        {
+                            'label': "mpris",
+                            'name': "mpris"
+                        },
+                        {
+                            'label': "mpd",
+                            'name': "mpd"
                         }
-                    }
+                    ]
+                    text: i18n("Music player")
+                    value: cfg_dataengine["PLAYER"]
+                    onValueEdited: cfg_dataengine["PLAYER"] = newValue
                 }
 
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("MPRIS player name")
-                    }
-                    QtControls.ComboBox {
-                        id: mpris
-                        width: parent.width * 3 / 5
-                        editable: true
-                        model: ["auto", "amarok", "audacious", "clementine", "deadbeef",
-                                "vlc", "qmmp", "xmms2", cfg_dataengine["MPRIS"]]
-                        currentIndex: model.length - 1
-                    }
+                ComboBoxSelector {
+                    id: mpris
+                    editable: true
+                    model: [
+                        {
+                            'label': 'auto',
+                            'name': 'auto'
+                        },
+                        {
+                            'label': 'amarok',
+                            'name': 'amarok'
+                        },
+                        {
+                            'label': 'audacious',
+                            'name': 'audacious'
+                        },
+                        {
+                            'label': 'clementine',
+                            'name': 'clementine'
+                        },
+                        {
+                            'label': 'DeaDBeeF',
+                            'name': 'DeaDBeeF'
+                        },
+                        {
+                            'label': 'vlc',
+                            'name': 'vlc'
+                        },
+                        {
+                            'label': 'qmmp',
+                            'name': 'qmmp'
+                        },
+                        {
+                            'label': 'xmms2',
+                            'name': 'xmms2'
+                        },
+                        {
+                            'label': cfg_dataengine["MPRIS"],
+                            'name': cfg_dataengine["MPRIS"]
+                        }
+                    ]
+                    text: i18n("MPRIS player name")
+                    currentIndex: model.length - 1
                 }
 
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("MPD address")
-                    }
-                    QtControls.TextField {
-                        width: parent.width * 3 / 5
-                        text: cfg_dataengine["MPDADDRESS"]
-                        onEditingFinished: cfg_dataengine["MPDADDRESS"] = text
-                    }
+                LineSelector {
+                    text: i18n("MPD address")
+                    value: cfg_dataengine["MPDADDRESS"]
+                    onValueEdited: cfg_dataengine["MPDADDRESS"] = newValue
                 }
 
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("MPD port")
-                    }
-                    QtControls.SpinBox {
-                        width: parent.width * 3 / 5
-                        minimumValue: 1000
-                        maximumValue: 65535
-                        stepSize: 1
-                        value: cfg_dataengine["MPDPORT"]
-                        onEditingFinished: cfg_dataengine["MPDPORT"] = value
-                    }
+                IntegerSelector {
+                    maximumValue: 65535
+                    minimumValue: 1000
+                    stepSize: 1
+                    text: i18n("MPD port")
+                    value: cfg_dataengine["MPDPORT"]
+                    onValueEdited: cfg_dataengine["MPDPORT"] = newValue
                 }
             }
         }
@@ -262,72 +215,29 @@ Item {
             Column {
                 height: implicitHeight
                 width: parent.width
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Custom scripts")
-                    }
-                    QtControls.Button {
-                        width: parent.width * 3 / 5
-                        text: i18n("Edit scripts")
-                        onClicked: awKeys.editItem("extscript")
-                    }
+                ButtonSelector {
+                    value: i18n("Custom scripts")
+                    onButtonActivated: awKeys.editItem("extscript")
                 }
 
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Quotes monitor")
-                    }
-                    QtControls.Button {
-                        width: parent.width * 3 / 5
-                        text: i18n("Edit tickers")
-                        onClicked: awKeys.editItem("extquotes")
-                    }
+                ButtonSelector {
+                    value: i18n("Network requests")
+                    onButtonActivated: awKeys.editItem("extnetworkrequest")
                 }
 
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Package manager")
-                    }
-                    QtControls.Button {
-                        width: parent.width * 3 / 5
-                        text: i18n("Edit command")
-                        onClicked: awKeys.editItem("extupgrade")
-                    }
+                ButtonSelector {
+                    value: i18n("Package manager")
+                    onButtonActivated: awKeys.editItem("extupgrade")
                 }
 
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Weather")
-                    }
-                    QtControls.Button {
-                        width: parent.width * 3 / 5
-                        text: i18n("Edit weather")
-                        onClicked: awKeys.editItem("extweather")
-                    }
+                ButtonSelector {
+                    value: i18n("Quotes monitor")
+                    onButtonActivated: awKeys.editItem("extquotes")
+                }
+
+                ButtonSelector {
+                    value: i18n("Weather")
+                    onButtonActivated: awKeys.editItem("extweather")
                 }
             }
         }
@@ -342,21 +252,13 @@ Item {
 
         // update hdd model
         hdd.model = awKeys.getHddDevices()
-        for (var i=0; i<hdd.model.length; i++) {
-            if (hdd.model[i] == cfg_dataengine["HDDDEV"]) {
-                if (debug) console.info("Found", hdd.model[i], "on", i)
-                hdd.currentIndex = i;
-            }
-        }
+        hdd.onCompleted
     }
 
     Component.onDestruction: {
         if (debug) console.debug()
 
-        cfg_dataengine["GPUDEV"] = gpuDev.currentText
-        cfg_dataengine["HDDDEV"] = hdd.currentText
-        cfg_dataengine["PLAYER"] = player.currentText
-        cfg_dataengine["MPRIS"] = mpris.currentText
+        cfg_dataengine["MPRIS"] = mpris.editText
         awConfig.writeDataEngineConfiguration(cfg_dataengine)
     }
 }

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

@@ -36,6 +36,12 @@ Item {
     AWActions {
         id: awActions
     }
+    AWTelemetryHandler {
+        id: awTelemetryHandler
+    }
+    BugReport {
+        id: bugReport
+    }
 
     property bool debug: awActions.isDebugEnabled()
     property variant tooltipSettings: {
@@ -46,15 +52,15 @@ Item {
         "cpuclTooltip": plasmoid.configuration.cpuclTooltip,
         "memTooltip": plasmoid.configuration.memTooltip,
         "swapTooltip": plasmoid.configuration.swapTooltip,
-        "downTooltip": plasmoid.configuration.downTooltip,
-        "upTooltip": plasmoid.configuration.downTooltip,
+        "downkbTooltip": plasmoid.configuration.downkbTooltip,
+        "upkbTooltip": plasmoid.configuration.downkbTooltip,
         "batTooltip": plasmoid.configuration.batTooltip,
         "cpuTooltipColor": plasmoid.configuration.cpuTooltipColor,
         "cpuclTooltipColor": plasmoid.configuration.cpuclTooltipColor,
         "memTooltipColor": plasmoid.configuration.memTooltipColor,
         "swapTooltipColor": plasmoid.configuration.swapTooltipColor,
-        "downTooltipColor": plasmoid.configuration.downTooltipColor,
-        "upTooltipColor": plasmoid.configuration.upTooltipColor,
+        "downkbTooltipColor": plasmoid.configuration.downkbTooltipColor,
+        "upkbTooltipColor": plasmoid.configuration.upkbTooltipColor,
         "batTooltipColor": plasmoid.configuration.batTooltipColor,
         "batInTooltipColor": plasmoid.configuration.batInTooltipColor,
         // additional field to parse AC status
@@ -89,14 +95,17 @@ Item {
         textFormat: Text.RichText
         wrapMode: plasmoid.configuration.wrapText ? Text.WordWrap : Text.NoWrap
 
-        horizontalAlignment: general.align[plasmoid.configuration.textAlign]
+        horizontalAlignment: General.align[plasmoid.configuration.textAlign]
         verticalAlignment: Text.AlignVCenter
 
         color: plasmoid.configuration.fontColor
         font.family: plasmoid.configuration.fontFamily
         font.italic: plasmoid.configuration.fontStyle == "italic" ? true : false
         font.pointSize: plasmoid.configuration.fontSize
-        font.weight: general.fontWeight[plasmoid.configuration.fontWeight]
+        font.weight: General.fontWeight[plasmoid.configuration.fontWeight]
+
+        style: General.textStyle[plasmoid.configuration.textStyle]
+        styleColor: plasmoid.configuration.textStyleColor
 
         PlasmaCore.ToolTipArea {
             height: tooltip.height
@@ -136,9 +145,12 @@ Item {
         if (debug) console.debug()
 
         // actions
-        plasmoid.setAction("requestKey", i18n("Request key"), "utilities-system-monitor")
+        // 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
@@ -187,9 +199,9 @@ Item {
         if (debug) console.debug()
 
         // init submodule
-        awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.interval,
-                        plasmoid.configuration.queueLimit)
         awKeys.initDataAggregator(tooltipSettings)
+        awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.interval,
+                        plasmoid.configuration.queueLimit, plasmoid.configuration.optimize)
         awKeys.setWrapNewLines(plasmoid.configuration.wrapNewLines)
         // configure aggregator
         awKeys.setAggregatorProperty("acOffline", plasmoid.configuration.acOffline)
@@ -198,6 +210,15 @@ Item {
         awKeys.setAggregatorProperty("customUptime", plasmoid.configuration.customUptime)
         awKeys.setAggregatorProperty("tempUnits", plasmoid.configuration.tempUnits)
         awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings)
+        // update telemetry ID
+        if (plasmoid.configuration.telemetryId.length == 0)
+            plasmoid.configuration.telemetryId = generateUuid()
+        // save telemetry
+        awTelemetryHandler.init(plasmoid.configuration.telemetryCount,
+                                plasmoid.configuration.telemetryRemote,
+                                plasmoid.configuration.telemetryId)
+        if (awTelemetryHandler.put("awwidgetconfig", plasmoid.configuration.text))
+            awTelemetryHandler.uploadTelemetry("awwidgetconfig", plasmoid.configuration.text)
     }
 
 
@@ -213,10 +234,25 @@ Item {
         return awActions.showReadme()
     }
 
+    function action_reportBug() {
+        if (debug) console.debug()
+
+        bugReport.reset()
+        bugReport.open()
+    }
+
     function action_requestKey() {
         if (debug) console.debug()
 
         tagSelectorBox.model = awKeys.dictKeys(true)
         return tagSelector.open()
     }
+
+    // code from http://stackoverflow.com/questions/105034/create-guid-uuid-in-javascript
+    function generateUuid() {
+        return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+            var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
+            return v.toString(16);
+        });
+    }
 }

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

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

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

@@ -17,8 +17,6 @@
 
 import QtQuick 2.0
 import QtQuick.Controls 1.3 as QtControls
-import QtQuick.Controls.Styles 1.3 as QtStyles
-import QtQuick.Dialogs 1.1 as QtDialogs
 
 import org.kde.plasma.private.awesomewidget 1.0
 
@@ -39,21 +37,21 @@ Item {
 
     property alias cfg_tooltipNumber: tooltipNumber.value
     property alias cfg_useTooltipBackground: useTooltipBackground.checked
-    property alias cfg_tooltipBackground: tooltipBackground.text
+    property alias cfg_tooltipBackground: tooltipBackground.value
     property alias cfg_cpuTooltip: cpuTooltip.checked
-    property alias cfg_cpuTooltipColor: cpuTooltipColor.text
+    property alias cfg_cpuTooltipColor: cpuTooltipColor.value
     property alias cfg_cpuclTooltip: cpuclTooltip.checked
-    property alias cfg_cpuclTooltipColor: cpuclTooltipColor.text
+    property alias cfg_cpuclTooltipColor: cpuclTooltipColor.value
     property alias cfg_memTooltip: memTooltip.checked
-    property alias cfg_memTooltipColor: memTooltipColor.text
+    property alias cfg_memTooltipColor: memTooltipColor.value
     property alias cfg_swapTooltip: swapTooltip.checked
-    property alias cfg_swapTooltipColor: swapTooltipColor.text
-    property alias cfg_downTooltip: downTooltip.checked
-    property alias cfg_downTooltipColor: downTooltipColor.text
-    property alias cfg_upTooltipColor: upTooltipColor.text
+    property alias cfg_swapTooltipColor: swapTooltipColor.value
+    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.text
-    property alias cfg_batInTooltipColor: batInTooltipColor.text
+    property alias cfg_batTooltipColor: batTooltipColor.value
+    property alias cfg_batInTooltipColor: batInTooltipColor.value
 
 
     Column {
@@ -67,24 +65,13 @@ Item {
           text: i18n("CPU, CPU clock, memory, swap and network labels support graphical tooltip. To enable them just make needed checkbox checked.")
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Number of values for tooltips")
-            }
-            QtControls.SpinBox {
-                id: tooltipNumber
-                width: parent.width * 3 / 5
-                minimumValue: 50
-                maximumValue: 1000
-                stepSize: 25
-                value: plasmoid.configuration.tooltipNumber
-            }
+        IntegerSelector {
+            id: tooltipNumber
+            maximumValue: 1000
+            minimumValue: 50
+            stepSize: 25
+            text: i18n("Number of values for tooltips")
+            value: plasmoid.configuration.tooltipNumber
         }
 
         QtControls.GroupBox {
@@ -93,34 +80,10 @@ Item {
             width: parent.width
             checkable: true
             title: i18n("Background")
-            Row {
-                height: implicitHeight
-                width: parent.width
-                QtControls.Label {
-                    height: parent.height
-                    width: parent.width * 2 / 5
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
-                    text: i18n("Background color")
-                }
-                QtControls.Button {
-                    id: tooltipBackground
-                    width: parent.width * 3 / 5
-                    style: QtStyles.ButtonStyle {
-                        background: Rectangle {
-                            color: plasmoid.configuration.tooltipBackground
-                        }
-                    }
-                    text: plasmoid.configuration.tooltipBackground
-                    onClicked: tooltipBackgroundDialog.visible = true
-                }
-
-                QtDialogs.ColorDialog {
-                    id: tooltipBackgroundDialog
-                    title: i18n("Select a color")
-                    color: tooltipBackground.text
-                    onAccepted: tooltipBackground.text = tooltipBackgroundDialog.color
-                }
+            ColorSelector {
+                id: tooltipBackground
+                text: i18n("Background color")
+                value: plasmoid.configuration.tooltipBackground
             }
         }
 
@@ -130,34 +93,10 @@ Item {
             width: parent.width
             checkable: true
             title: i18n("CPU")
-            Row {
-                height: implicitHeight
-                width: parent.width
-                QtControls.Label {
-                    height: parent.height
-                    width: parent.width * 2 / 5
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
-                    text: i18n("CPU color")
-                }
-                QtControls.Button {
-                    id: cpuTooltipColor
-                    width: parent.width * 3 / 5
-                    style: QtStyles.ButtonStyle {
-                        background: Rectangle {
-                            color: plasmoid.configuration.cpuTooltipColor
-                        }
-                    }
-                    text: plasmoid.configuration.cpuTooltipColor
-                    onClicked: cpuTooltipColorDialog.visible = true
-                }
-
-                QtDialogs.ColorDialog {
-                    id: cpuTooltipColorDialog
-                    title: i18n("Select a color")
-                    color: cpuTooltipColor.text
-                    onAccepted: cpuTooltipColor.text = cpuTooltipColorDialog.color
-                }
+            ColorSelector {
+                id: cpuTooltipColor
+                text: i18n("CPU color")
+                value: plasmoid.configuration.cpuTooltipColor
             }
         }
 
@@ -167,34 +106,10 @@ Item {
             width: parent.width
             checkable: true
             title: i18n("CPU clock")
-            Row {
-                height: implicitHeight
-                width: parent.width
-                QtControls.Label {
-                    height: parent.height
-                    width: parent.width * 2 / 5
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
-                    text: i18n("CPU clock color")
-                }
-                QtControls.Button {
-                    id: cpuclTooltipColor
-                    width: parent.width * 3 / 5
-                    style: QtStyles.ButtonStyle {
-                        background: Rectangle {
-                            color: plasmoid.configuration.cpuclTooltipColor
-                        }
-                    }
-                    text: plasmoid.configuration.cpuclTooltipColor
-                    onClicked: cpuclTooltipColorDialog.visible = true
-                }
-
-                QtDialogs.ColorDialog {
-                    id: cpuclTooltipColorDialog
-                    title: i18n("Select a color")
-                    color: cpuclTooltipColor.text
-                    onAccepted: cpuclTooltipColor.text = cpuclTooltipColorDialog.color
-                }
+            ColorSelector {
+                id: cpuclTooltipColor
+                text: i18n("CPU clock color")
+                value: plasmoid.configuration.cpuclTooltipColor
             }
         }
 
@@ -204,34 +119,10 @@ Item {
             width: parent.width
             checkable: true
             title: i18n("Memory")
-            Row {
-                height: implicitHeight
-                width: parent.width
-                QtControls.Label {
-                    height: parent.height
-                    width: parent.width * 2 / 5
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
-                    text: i18n("Memory color")
-                }
-                QtControls.Button {
-                    id: memTooltipColor
-                    width: parent.width * 3 / 5
-                    style: QtStyles.ButtonStyle {
-                        background: Rectangle {
-                            color: plasmoid.configuration.memTooltipColor
-                        }
-                    }
-                    text: plasmoid.configuration.memTooltipColor
-                    onClicked: memTooltipColorDialog.visible = true
-                }
-
-                QtDialogs.ColorDialog {
-                    id: memTooltipColorDialog
-                    title: i18n("Select a color")
-                    color: memTooltipColor.text
-                    onAccepted: memTooltipColor.text = memTooltipColorDialog.color
-                }
+            ColorSelector {
+                id: memTooltipColor
+                text: i18n("Memory color")
+                value: plasmoid.configuration.memTooltipColor
             }
         }
 
@@ -241,39 +132,15 @@ Item {
             width: parent.width
             checkable: true
             title: i18n("Swap")
-            Row {
-                height: implicitHeight
-                width: parent.width
-                QtControls.Label {
-                    height: parent.height
-                    width: parent.width * 2 / 5
-                    horizontalAlignment: Text.AlignRight
-                    verticalAlignment: Text.AlignVCenter
-                    text: i18n("Swap color")
-                }
-                QtControls.Button {
-                    id: swapTooltipColor
-                    width: parent.width * 3 / 5
-                    style: QtStyles.ButtonStyle {
-                        background: Rectangle {
-                            color: plasmoid.configuration.swapTooltipColor
-                        }
-                    }
-                    text: plasmoid.configuration.swapTooltipColor
-                    onClicked: swapTooltipColorDialog.visible = true
-                }
-
-                QtDialogs.ColorDialog {
-                    id: swapTooltipColorDialog
-                    title: i18n("Select a color")
-                    color: swapTooltipColor.text
-                    onAccepted: swapTooltipColor.text = swapTooltipColorDialog.color
-                }
+            ColorSelector {
+                id: swapTooltipColor
+                text: i18n("Swap color")
+                value: plasmoid.configuration.swapTooltipColor
             }
         }
 
         QtControls.GroupBox {
-            id: downTooltip
+            id: downkbTooltip
             height: implicitHeight
             width: parent.width
             checkable: true
@@ -281,63 +148,15 @@ Item {
             Column {
                 height: implicitHeight
                 width: parent.width
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Download speed color")
-                    }
-                    QtControls.Button {
-                        id: downTooltipColor
-                        width: parent.width * 3 / 5
-                        style: QtStyles.ButtonStyle {
-                            background: Rectangle {
-                                color: plasmoid.configuration.downTooltipColor
-                            }
-                        }
-                        text: plasmoid.configuration.downTooltipColor
-                        onClicked: downTooltipColorDialog.visible = true
-                    }
-
-                    QtDialogs.ColorDialog {
-                        id: downTooltipColorDialog
-                        title: i18n("Select a color")
-                        color: downTooltipColor.text
-                        onAccepted: downTooltipColor.text = downTooltipColorDialog.color
-                    }
+                ColorSelector {
+                    id: downkbTooltipColor
+                    text: i18n("Download speed color")
+                    value: plasmoid.configuration.downkbTooltipColor
                 }
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Upload speed color")
-                    }
-                    QtControls.Button {
-                        id: upTooltipColor
-                        width: parent.width * 3 / 5
-                        style: QtStyles.ButtonStyle {
-                            background: Rectangle {
-                                color: plasmoid.configuration.upTooltipColor
-                            }
-                        }
-                        text: plasmoid.configuration.upTooltipColor
-                        onClicked: upTooltipColorDialog.visible = true
-                    }
-
-                    QtDialogs.ColorDialog {
-                        id: upTooltipColorDialog
-                        title: i18n("Select a color")
-                        color: upTooltipColor.text
-                        onAccepted: upTooltipColor.text = upTooltipColorDialog.color
-                    }
+                ColorSelector {
+                    id: upkbTooltipColor
+                    text: i18n("Upload speed color")
+                    value: plasmoid.configuration.upkbTooltipColor
                 }
             }
         }
@@ -351,63 +170,15 @@ Item {
             Column {
                 height: implicitHeight
                 width: parent.width
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Battery active color")
-                    }
-                    QtControls.Button {
-                        id: batTooltipColor
-                        width: parent.width * 3 / 5
-                        style: QtStyles.ButtonStyle {
-                            background: Rectangle {
-                                color: plasmoid.configuration.batTooltipColor
-                            }
-                        }
-                        text: plasmoid.configuration.batTooltipColor
-                        onClicked: batTooltipColorDialog.visible = true
-                    }
-
-                    QtDialogs.ColorDialog {
-                        id: batTooltipColorDialog
-                        title: i18n("Select a color")
-                        color: batTooltipColor.text
-                        onAccepted: batTooltipColor.text = batTooltipColorDialog.color
-                    }
+                ColorSelector {
+                    id: batTooltipColor
+                    text: i18n("Battery active color")
+                    value: plasmoid.configuration.batTooltipColor
                 }
-                Row {
-                    height: implicitHeight
-                    width: parent.width
-                    QtControls.Label {
-                        height: parent.height
-                        width: parent.width * 2 / 5
-                        horizontalAlignment: Text.AlignRight
-                        verticalAlignment: Text.AlignVCenter
-                        text: i18n("Battery inactive color")
-                    }
-                    QtControls.Button {
-                        id: batInTooltipColor
-                        width: parent.width * 3 / 5
-                        style: QtStyles.ButtonStyle {
-                            background: Rectangle {
-                                color: plasmoid.configuration.batInTooltipColor
-                            }
-                        }
-                        text: plasmoid.configuration.batInTooltipColor
-                        onClicked: batInTooltipColorDialog.visible = true
-                    }
-
-                    QtDialogs.ColorDialog {
-                        id: batInTooltipColorDialog
-                        title: i18n("Select a color")
-                        color: batInTooltipColor.text
-                        onAccepted: batInTooltipColor.text = batInTooltipColorDialog.color
-                    }
+                ColorSelector {
+                    id: batInTooltipColor
+                    text: i18n("Battery inactive color")
+                    value: plasmoid.configuration.batInTooltipColor
                 }
             }
         }

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

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

sources/awesome-widget/package/metadata.desktop

@@ -20,8 +20,8 @@ X-Plasma-RemoteLocation=
 X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
-X-KDE-PluginInfo-Version=3.0.1
-X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/
+X-KDE-PluginInfo-Version=3.3.3
+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

sources/awesome-widget/plugin/CMakeLists.txt

@@ -11,9 +11,11 @@ include_directories(
 )
 
 file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
+file(GLOB SUBPROJECT_UI *.ui)
 file(GLOB SUBPROJECT_NOTIFY *.notifyrc)
 
-add_library(${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE})
+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} ${Kf5_LIBRARIES})
 
 install(TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget)

sources/awesome-widget/plugin/awabstractpairconfig.cpp

@@ -0,0 +1,189 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awabstractpairconfig.h"
+#include "ui_awabstractpairconfig.h"
+
+#include <KI18n/KLocalizedString>
+
+#include <QPushButton>
+
+#include "awabstractselector.h"
+#include "awdebug.h"
+
+
+AWAbstractPairConfig::AWAbstractPairConfig(QWidget *_parent,
+                                           const bool _hasEdit,
+                                           const QStringList &_keys)
+    : QDialog(_parent)
+    , ui(new Ui::AWAbstractPairConfig)
+    , m_hasEdit(_hasEdit)
+    , m_keys(_keys)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    ui->setupUi(this);
+
+    connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
+    connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+
+    // edit feature
+    if (m_hasEdit) {
+        m_editButton = ui->buttonBox->addButton(i18n("Edit"),
+                                                QDialogButtonBox::ActionRole);
+        connect(m_editButton, SIGNAL(clicked(bool)), this, SLOT(edit()));
+    }
+}
+
+
+AWAbstractPairConfig::~AWAbstractPairConfig()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    clearSelectors();
+
+    delete ui;
+}
+
+
+void AWAbstractPairConfig::showDialog()
+{
+    // update dialog
+    updateDialog();
+    // exec dialog
+    return execDialog();
+}
+
+
+void AWAbstractPairConfig::setEditable(const bool _first, const bool _second)
+{
+    qCDebug(LOG_AW) << "Set editable" << _first << _second;
+
+    m_editable = {_first, _second};
+}
+
+
+void AWAbstractPairConfig::edit()
+{
+    m_helper->editPairs();
+    updateDialog();
+}
+
+
+void AWAbstractPairConfig::updateUi()
+{
+    QPair<QString, QString> current
+        = static_cast<AWAbstractSelector *>(sender())->current();
+    int index
+        = m_selectors.indexOf(static_cast<AWAbstractSelector *>(sender()));
+
+    if ((current.first.isEmpty()) && (current.second.isEmpty())) {
+        // remove current selector if it is empty and does not last
+        if (sender() == m_selectors.last())
+            return;
+        AWAbstractSelector *selector = m_selectors.takeAt(index);
+        ui->verticalLayout->removeWidget(selector);
+        selector->deleteLater();
+    } else {
+        // add new selector if something changed
+        if (sender() != m_selectors.last())
+            return;
+        auto keys = initKeys();
+        addSelector(keys.first, keys.second, QPair<QString, QString>());
+    }
+}
+
+
+void 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;
+
+    AWAbstractSelector *selector
+        = new AWAbstractSelector(ui->scrollAreaWidgetContents, m_editable);
+    selector->init(_keys, _values, _current);
+    ui->verticalLayout->insertWidget(ui->verticalLayout->count() - 1, selector);
+    connect(selector, SIGNAL(selectionChanged()), this, SLOT(updateUi()));
+    m_selectors.append(selector);
+}
+
+
+void AWAbstractPairConfig::clearSelectors()
+{
+    for (auto &selector : m_selectors) {
+        disconnect(selector, SIGNAL(selectionChanged()), this,
+                   SLOT(updateUi()));
+        ui->verticalLayout->removeWidget(selector);
+        selector->deleteLater();
+    }
+    m_selectors.clear();
+}
+
+
+void AWAbstractPairConfig::execDialog()
+{
+    int ret = exec();
+    QHash<QString, QString> data;
+    for (auto &selector : m_selectors) {
+        QPair<QString, QString> select = selector->current();
+        if (select.first.isEmpty())
+            continue;
+        data[select.first] = select.second;
+    }
+
+    // save configuration if required
+    switch (ret) {
+    case 0:
+        break;
+    case 1:
+    default:
+        m_helper->writeItems(data);
+        m_helper->removeUnusedKeys(data.keys());
+        break;
+    }
+}
+
+
+QPair<QStringList, QStringList> AWAbstractPairConfig::initKeys() const
+{
+    // we are adding empty string at the start
+    QStringList left = {""};
+    left.append(m_helper->leftKeys().isEmpty() ? m_keys : m_helper->leftKeys());
+    left.sort();
+    QStringList right = {""};
+    right.append(m_helper->rightKeys().isEmpty() ? m_keys
+                                                 : m_helper->rightKeys());
+    right.sort();
+
+    return QPair<QStringList, QStringList>(left, right);
+}
+
+
+void AWAbstractPairConfig::updateDialog()
+{
+    clearSelectors();
+    auto pairs = m_helper->pairs();
+    auto keys = initKeys();
+
+    for (auto &key : m_helper->keys())
+        addSelector(keys.first, keys.second,
+                    QPair<QString, QString>(key, m_helper->pairs()[key]));
+    // empty one
+    addSelector(keys.first, keys.second, QPair<QString, QString>());
+}

sources/awesome-widget/plugin/awabstractpairconfig.h

@@ -0,0 +1,75 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWABSTRACTPAIRCONFIG_H
+#define AWABSTRACTPAIRCONFIG_H
+
+#include <QDialog>
+
+#include "awabstractpairhelper.h"
+
+
+class AWAbstractSelector;
+namespace Ui
+{
+class AWAbstractPairConfig;
+}
+
+class AWAbstractPairConfig : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit AWAbstractPairConfig(QWidget *_parent = nullptr,
+                                  const bool _hasEdit = false,
+                                  const QStringList &_keys = QStringList());
+    virtual ~AWAbstractPairConfig();
+    template <class T> void initHelper()
+    {
+        if (m_helper)
+            delete m_helper;
+        m_helper = new T(this);
+    }
+    void showDialog();
+    // properties
+    void setEditable(const bool _first, const bool _second);
+
+private slots:
+    void edit();
+    void updateUi();
+
+private:
+    QPushButton *m_editButton = nullptr;
+    Ui::AWAbstractPairConfig *ui = nullptr;
+    AWAbstractPairHelper *m_helper = nullptr;
+    QList<AWAbstractSelector *> m_selectors;
+    // properties
+    QPair<bool, bool> m_editable = {false, false};
+    bool m_hasEdit = false;
+    QStringList m_keys;
+    // methods
+    void addSelector(const QStringList &_keys, const QStringList &_values,
+                     const QPair<QString, QString> &_current);
+    void clearSelectors();
+    void execDialog();
+    QPair<QStringList, QStringList> initKeys() const;
+    void updateDialog();
+};
+
+
+#endif /* AWABSTRACTPAIRCONFIG_H */

sources/awesome-widget/plugin/awabstractpairconfig.ui

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

sources/awesome-widget/plugin/awabstractpairhelper.cpp

@@ -0,0 +1,135 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awabstractpairhelper.h"
+
+#include <QSettings>
+#include <QStandardPaths>
+
+#include "awdebug.h"
+
+
+AWAbstractPairHelper::AWAbstractPairHelper(const QString &_filePath,
+                                           const QString &_section)
+    : m_filePath(_filePath)
+    , m_section(_section)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    initItems();
+}
+
+
+AWAbstractPairHelper::~AWAbstractPairHelper()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+QStringList AWAbstractPairHelper::keys() const
+{
+    return m_pairs.keys();
+}
+
+
+QHash<QString, QString> AWAbstractPairHelper::pairs() const
+{
+    return m_pairs;
+}
+
+
+QStringList AWAbstractPairHelper::values() const
+{
+    return m_pairs.values();
+}
+
+
+void AWAbstractPairHelper::initItems()
+{
+    m_pairs.clear();
+
+    QStringList configs = QStandardPaths::locateAll(
+        QStandardPaths::GenericDataLocation, m_filePath);
+
+    for (auto &fileName : configs) {
+        QSettings settings(fileName, QSettings::IniFormat);
+        qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
+
+        settings.beginGroup(m_section);
+        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();
+            if (value.isEmpty()) {
+                qCInfo(LOG_AW) << "Skip empty value for" << key;
+                continue;
+            }
+            m_pairs[key] = value;
+        }
+        settings.endGroup();
+    }
+}
+
+
+bool AWAbstractPairHelper::writeItems(
+    const QHash<QString, QString> &_configuration) const
+{
+    qCDebug(LOG_AW) << "Write configuration" << _configuration;
+
+    QString fileName = QString("%1/%2")
+                           .arg(QStandardPaths::writableLocation(
+                               QStandardPaths::GenericDataLocation))
+                           .arg(m_filePath);
+    QSettings settings(fileName, QSettings::IniFormat);
+    qCInfo(LOG_AW) << "Configuration file" << fileName;
+
+    settings.beginGroup(m_section);
+    for (auto &key : _configuration.keys())
+        settings.setValue(key, _configuration[key]);
+    settings.endGroup();
+
+    settings.sync();
+
+    return (settings.status() == QSettings::NoError);
+}
+
+
+bool AWAbstractPairHelper::removeUnusedKeys(const QStringList &_keys) const
+{
+    qCDebug(LOG_AW) << "Remove keys" << _keys;
+
+    QString fileName = QString("%1/%2")
+                           .arg(QStandardPaths::writableLocation(
+                               QStandardPaths::GenericDataLocation))
+                           .arg(m_filePath);
+    QSettings settings(fileName, QSettings::IniFormat);
+    qCInfo(LOG_AW) << "Configuration file" << fileName;
+
+    settings.beginGroup(m_section);
+    QStringList foundKeys = settings.childKeys();
+    for (auto &key : foundKeys) {
+        if (_keys.contains(key))
+            continue;
+        settings.remove(key);
+    }
+    settings.endGroup();
+
+    settings.sync();
+
+    return (settings.status() == QSettings::NoError);
+}

sources/awesome-widget/plugin/awabstractpairhelper.h

@@ -0,0 +1,52 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWABSTRACTPAIRHELPER_H
+#define AWABSTRACTPAIRHELPER_H
+
+#include <QHash>
+
+
+class AWAbstractPairHelper
+{
+public:
+    explicit AWAbstractPairHelper(const QString &_filePath = "",
+                                  const QString &_section = "");
+    virtual ~AWAbstractPairHelper();
+    QStringList keys() const;
+    QHash<QString, QString> pairs() const;
+    QStringList values() const;
+    // read-write methods
+    virtual void initItems();
+    virtual bool
+    writeItems(const QHash<QString, QString> &_configuration) const;
+    virtual bool removeUnusedKeys(const QStringList &_keys) const;
+    // configuration related
+    virtual void editPairs() = 0;
+    virtual QStringList leftKeys() = 0;
+    virtual QStringList rightKeys() = 0;
+
+private:
+    // properties
+    QHash<QString, QString> m_pairs;
+    QString m_filePath;
+    QString m_section;
+};
+
+
+#endif /* AWABSTRACTPAIRHELPER_H */

sources/awesome-widget/plugin/awabstractselector.cpp

@@ -0,0 +1,81 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awabstractselector.h"
+#include "ui_awabstractselector.h"
+
+#include "awdebug.h"
+
+
+AWAbstractSelector::AWAbstractSelector(QWidget *_parent,
+                                       const QPair<bool, bool> &_editable)
+    : QWidget(_parent)
+    , ui(new Ui::AWAbstractSelector)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    ui->setupUi(this);
+    ui->comboBox_key->setEditable(_editable.first);
+    ui->comboBox_value->setEditable(_editable.second);
+
+    connect(ui->comboBox_key, SIGNAL(currentIndexChanged(int)), this,
+            SIGNAL(selectionChanged()));
+    connect(ui->comboBox_value, SIGNAL(currentIndexChanged(int)), this,
+            SIGNAL(selectionChanged()));
+}
+
+
+AWAbstractSelector::~AWAbstractSelector()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    delete ui;
+}
+
+
+QPair<QString, QString> AWAbstractSelector::current() const
+{
+    QString key = ui->comboBox_key->currentText();
+    QString value = ui->comboBox_value->currentText();
+
+    return QPair<QString, QString>(key, value);
+}
+
+
+void AWAbstractSelector::init(const QStringList &_keys,
+                              const QStringList &_values,
+                              const QPair<QString, QString> &_current)
+{
+    if ((!_keys.contains(_current.first))
+        || (!_values.contains(_current.second))) {
+        qCWarning(LOG_AW) << "Invalid current value" << _current
+                          << "not found in default ones";
+        return;
+    }
+    qCDebug(LOG_AW) << "Init selector with keys" << _keys << "and values"
+                    << _values << "and current ones are" << _current;
+
+    // set data
+    ui->comboBox_key->clear();
+    ui->comboBox_key->addItems(_keys);
+    ui->comboBox_value->clear();
+    ui->comboBox_value->addItems(_values);
+
+    // set current values
+    ui->comboBox_key->setCurrentText(_current.first);
+    ui->comboBox_value->setCurrentText(_current.second);
+}

sources/awesome-widget/plugin/awabstractselector.h

@@ -0,0 +1,51 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWABSTRACTSELECTOR_H
+#define AWABSTRACTSELECTOR_H
+
+#include <QWidget>
+
+
+namespace Ui
+{
+class AWAbstractSelector;
+}
+
+class AWAbstractSelector : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit AWAbstractSelector(QWidget *_parent = nullptr,
+                                const QPair<bool, bool> &_editable
+                                = {false, false});
+    virtual ~AWAbstractSelector();
+    QPair<QString, QString> current() const;
+    void init(const QStringList &_keys, const QStringList &_values,
+              const QPair<QString, QString> &_current);
+
+signals:
+    void selectionChanged();
+
+private:
+    Ui::AWAbstractSelector *ui = nullptr;
+};
+
+
+#endif /* AWABSTRACTSELECTOR_H */

sources/awesome-widget/plugin/awabstractselector.ui

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

sources/awesome-widget/plugin/awactions.cpp

@@ -21,26 +21,22 @@
 #include <KNotifications/KNotification>
 
 #include <QDesktopServices>
-#include <QJsonDocument>
-#include <QJsonParseError>
-#include <QMessageBox>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
+#include <QFile>
 #include <QProcess>
-#include <QProcessEnvironment>
-#include <QStandardPaths>
+#include <QUrl>
 
 #include <fontdialog/fontdialog.h>
 
 #include "awdebug.h"
-#include "version.h"
+#include "awupdatehelper.h"
 
 
-AWActions::AWActions(QObject *parent)
-    : QObject(parent)
+AWActions::AWActions(QObject *_parent)
+    : QObject(_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    m_updateHelper = new AWUpdateHelper(this);
 }
 
 
@@ -50,19 +46,29 @@ AWActions::~AWActions()
 }
 
 
-void AWActions::checkUpdates(const bool showAnyway)
+void AWActions::checkUpdates(const bool _showAnyway)
 {
-    qCDebug(LOG_AW) << "Show anyway" << showAnyway;
+    qCDebug(LOG_AW) << "Show anyway" << _showAnyway;
 
-    // showAnyway options requires to show message if no updates found on direct
-    // request. In case of automatic check no message will be shown
-    QNetworkAccessManager *manager = new QNetworkAccessManager(nullptr);
-    connect(manager, &QNetworkAccessManager::finished,
-            [showAnyway, this](QNetworkReply *reply) {
-                return versionReplyRecieved(reply, showAnyway);
-            });
+    if (!m_updateHelper->checkVersion())
+        m_updateHelper->checkUpdates(_showAnyway);
+}
 
-    manager->get(QNetworkRequest(QUrl(VERSION_API)));
+
+QString AWActions::getFileContent(const QString &_path) const
+{
+    qCDebug(LOG_AW) << "Get content from file" << _path;
+
+    QFile inputFile(_path);
+    if (!inputFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        qCWarning(LOG_AW) << "Could not open file as text"
+                          << inputFile.fileName();
+        return "";
+    }
+
+    QString output = inputFile.readAll();
+    inputFile.close();
+    return output;
 }
 
 
@@ -73,185 +79,76 @@ bool AWActions::isDebugEnabled() const
 }
 
 
-bool AWActions::runCmd(const QString cmd) const
+bool AWActions::runCmd(const QString &_cmd) const
 {
-    qCDebug(LOG_AW) << "Cmd" << cmd;
+    qCDebug(LOG_AW) << "Cmd" << _cmd;
 
-    sendNotification(QString("Info"), i18n("Run %1", cmd));
+    sendNotification(QString("Info"), i18n("Run %1", _cmd));
 
-    return QProcess::startDetached(cmd);
+    return QProcess::startDetached(_cmd);
 }
 
 
 // HACK: this method uses variable from version.h
 void AWActions::showReadme() const
 {
-    QDesktopServices::openUrl(QString(HOMEPAGE));
+    QDesktopServices::openUrl(QUrl(HOMEPAGE));
+}
+
+
+void AWActions::showLegacyInfo() const
+{
+    QMessageBox *msgBox = new QMessageBox(nullptr);
+    msgBox->setAttribute(Qt::WA_DeleteOnClose);
+    msgBox->setModal(false);
+    msgBox->setWindowTitle(i18n("Not supported"));
+    msgBox->setText(
+        i18n("You are using mammoth's Qt version, try to update it first"));
+    msgBox->setStandardButtons(QMessageBox::Ok);
+    msgBox->setIcon(QMessageBox::Information);
+
+    msgBox->open();
 }
 
 
 // HACK: this method uses variables from version.h
-QString AWActions::getAboutText(const QString type) const
+QString AWActions::getAboutText(const QString &_type) const
 {
-    qCDebug(LOG_AW) << "Type" << type;
+    qCDebug(LOG_AW) << "Type" << _type;
 
-    QString text;
-    if (type == QString("header")) {
-        text = QString(NAME);
-    } else if (type == QString("version")) {
-        text = i18n("Version %1 (build date %2)", QString(VERSION),
-                    QString(BUILD_DATE));
-        if (!QString(COMMIT_SHA).isEmpty())
-            text += QString(" (%1)").arg(QString(COMMIT_SHA));
-    } else if (type == QString("description")) {
-        text = i18n("A set of minimalistic plasmoid widgets");
-    } else if (type == QString("links")) {
-        text = i18n("Links:") + QString("<br>")
-               + QString("<a href=\"%1\">%2</a><br>")
-                     .arg(QString(HOMEPAGE))
-                     .arg(i18n("Homepage"))
-               + QString("<a href=\"%1\">%2</a><br>")
-                     .arg(QString(REPOSITORY))
-                     .arg(i18n("Repository"))
-               + QString("<a href=\"%1\">%2</a><br>")
-                     .arg(QString(BUGTRACKER))
-                     .arg(i18n("Bugtracker"))
-               + QString("<a href=\"%1\">%2</a><br>")
-                     .arg(QString(TRANSLATION))
-                     .arg(i18n("Translation issue"))
-               + QString("<a href=\"%1\">%2</a><br>")
-                     .arg(QString(AUR_PACKAGES))
-                     .arg(i18n("AUR packages"))
-               + QString("<a href=\"%1\">%2</a>")
-                     .arg(QString(OPENSUSE_PACKAGES))
-                     .arg(i18n("openSUSE packages"));
-    } else if (type == QString("copy")) {
-        text = QString("<small>&copy; %1 <a href=\"mailto:%2\">%3</a><br>")
-                   .arg(QString(DATE))
-                   .arg(QString(EMAIL))
-                   .arg(QString(AUTHOR))
-               + i18n("This software is licensed under %1", QString(LICENSE))
-               + QString("</small>");
-    } else if (type == QString("translators")) {
-        text = i18n("Translators: %1", QString(TRANSLATORS));
-    } else if (type == QString("3rdparty")) {
-        QStringList trdPartyList
-            = QString(TRDPARTY_LICENSE)
-                  .split(QChar(';'), QString::SkipEmptyParts);
-        for (int i = 0; i < trdPartyList.count(); i++)
-            trdPartyList[i] = QString("<a href=\"%3\">%1</a> (%2 license)")
-                                  .arg(trdPartyList.at(i).split(QChar(','))[0])
-                                  .arg(trdPartyList.at(i).split(QChar(','))[1])
-                                  .arg(trdPartyList.at(i).split(QChar(','))[2]);
-        text = i18n("This software uses: %1", trdPartyList.join(QString(", ")));
-    }
-
-    return text;
+    return AWDebug::getAboutText(_type);
 }
 
 
-QVariantMap AWActions::getFont(const QVariantMap defaultFont) const
+QVariantMap AWActions::getFont(const QVariantMap &_defaultFont) const
 {
-    qCDebug(LOG_AW) << "Default font is" << defaultFont;
+    qCDebug(LOG_AW) << "Default font is" << _defaultFont;
 
     QVariantMap fontMap;
-    CFont defaultCFont = CFont(defaultFont[QString("family")].toString(),
-                               defaultFont[QString("size")].toInt(), 400, false,
-                               defaultFont[QString("color")].toString());
-    CFont font
-        = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, false);
-    fontMap[QString("color")] = font.color().name();
-    fontMap[QString("family")] = font.family();
-    fontMap[QString("size")] = font.pointSize();
+    int ret = 0;
+    CFont defaultCFont
+        = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(),
+                400, false, _defaultFont["color"].toString());
+    CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false,
+                                      false, &ret);
+
+    fontMap["applied"] = ret;
+    fontMap["color"] = font.color().name();
+    fontMap["family"] = font.family();
+    fontMap["size"] = font.pointSize();
 
     return fontMap;
 }
 
 
 // to avoid additional object definition this method is static
-void AWActions::sendNotification(const QString eventId, const QString message)
+void AWActions::sendNotification(const QString &_eventId,
+                                 const QString &_message)
 {
-    qCDebug(LOG_AW) << "Event" << eventId;
-    qCDebug(LOG_AW) << "Message" << message;
+    qCDebug(LOG_AW) << "Event" << _eventId << "with message" << _message;
 
     KNotification *notification = KNotification::event(
-        eventId, QString("Awesome Widget ::: %1").arg(eventId), message);
+        _eventId, QString("Awesome Widget ::: %1").arg(_eventId), _message);
     notification->setComponentName(
-        QString("plasma-applet-org.kde.plasma.awesome-widget"));
-}
-
-
-void AWActions::showInfo(const QString version) const
-{
-    qCDebug(LOG_AW) << "Version" << version;
-
-    QString text = i18n("You are using the actual version %1", version);
-    if (!QString(COMMIT_SHA).isEmpty())
-        text += QString(" (%1)").arg(QString(COMMIT_SHA));
-    QMessageBox::information(nullptr, i18n("No new version found"), text);
-}
-
-
-void AWActions::showUpdates(const QString version) const
-{
-    qCDebug(LOG_AW) << "Version" << version;
-
-    QString text;
-    text += i18n("Current version : %1", QString(VERSION));
-    text += QString(COMMIT_SHA).isEmpty()
-                ? QString("\n")
-                : QString(" (%1)\n").arg(QString(COMMIT_SHA));
-    text += i18n("New version : %1", version) + QString("\n\n");
-    text += i18n("Click \"Ok\" to download");
-
-    int select
-        = QMessageBox::information(nullptr, i18n("There are updates"), text,
-                                   QMessageBox::Ok | QMessageBox::Cancel);
-    switch (select) {
-    case QMessageBox::Ok:
-        QDesktopServices::openUrl(QString(RELEASES) + version);
-        break;
-    case QMessageBox::Cancel:
-    default:
-        break;
-    }
-}
-
-
-void AWActions::versionReplyRecieved(QNetworkReply *reply,
-                                     const bool showAnyway) const
-{
-    qCDebug(LOG_AW) << "Return code" << reply->error();
-    qCDebug(LOG_AW) << "Reply error message" << reply->errorString();
-    qCDebug(LOG_AW) << "Show anyway" << showAnyway;
-
-    QJsonParseError error;
-    QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll(), &error);
-    reply->deleteLater();
-    if ((reply->error() != QNetworkReply::NoError)
-        || (error.error != QJsonParseError::NoError)) {
-        qCWarning(LOG_AW) << "Parse error" << error.errorString();
-        return;
-    }
-
-    // convert to map
-    QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
-    QString version = firstRelease[QString("tag_name")].toString();
-    version.remove(QString("V."));
-    qCInfo(LOG_AW) << "Found version" << version;
-
-    // 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 = QString(version).split(QChar('.')).at(0).toInt();
-    int new_minor = QString(version).split(QChar('.')).at(1).toInt();
-    int new_patch = QString(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(version);
+        "plasma-applet-org.kde.plasma.awesome-widget");
 }

sources/awesome-widget/plugin/awactions.h

@@ -19,36 +19,35 @@
 #ifndef AWACTIONS_H
 #define AWACTIONS_H
 
+#include <QMap>
 #include <QObject>
 
 
-class QNetworkReply;
+class AWUpdateHelper;
 
 class AWActions : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit AWActions(QObject *parent = nullptr);
+    explicit AWActions(QObject *_parent = nullptr);
     virtual ~AWActions();
-    Q_INVOKABLE void checkUpdates(const bool showAnyway = false);
+    Q_INVOKABLE void checkUpdates(const bool _showAnyway = false);
+    Q_INVOKABLE QString getFileContent(const QString &_path) const;
     Q_INVOKABLE bool isDebugEnabled() const;
-    Q_INVOKABLE bool runCmd(const QString cmd = QString("/usr/bin/true")) const;
+    Q_INVOKABLE bool runCmd(const QString &_cmd) const;
+    Q_INVOKABLE void showLegacyInfo() const;
     Q_INVOKABLE void showReadme() const;
     // configuration slots
-    Q_INVOKABLE QString getAboutText(const QString type
-                                     = QString("header")) const;
-    Q_INVOKABLE QVariantMap getFont(const QVariantMap defaultFont) const;
+    Q_INVOKABLE QString getAboutText(const QString &_type) const;
+    Q_INVOKABLE QVariantMap getFont(const QVariantMap &_defaultFont) const;
 
 public slots:
-    Q_INVOKABLE static void sendNotification(const QString eventId,
-                                             const QString message);
+    Q_INVOKABLE static void sendNotification(const QString &_eventId,
+                                             const QString &_message);
 
-private slots:
-    void showInfo(const QString version) const;
-    void showUpdates(const QString version) const;
-    void versionReplyRecieved(QNetworkReply *reply,
-                              const bool showAnyway) const;
+private:
+    AWUpdateHelper *m_updateHelper = nullptr;
 };
 
 

sources/awesome-widget/plugin/awbugreporter.cpp

@@ -0,0 +1,161 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awbugreporter.h"
+
+#include <KI18n/KLocalizedString>
+
+#include <QDesktopServices>
+#include <QJsonDocument>
+#include <QMessageBox>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+
+#include "awdebug.h"
+
+
+AWBugReporter::AWBugReporter(QObject *_parent)
+    : QObject(_parent)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+AWBugReporter::~AWBugReporter()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+void AWBugReporter::doConnect()
+{
+    // additional method for testing needs
+    connect(this, SIGNAL(replyReceived(const int, const QString &)), this,
+            SLOT(showInformation(const int, const QString &)));
+}
+
+
+QString AWBugReporter::generateText(const QString &_description,
+                                    const QString &_reproduce,
+                                    const QString &_expected,
+                                    const QString &_logs) const
+{
+    // do not log _logs here, it may have quite large size
+    qCDebug(LOG_AW) << "Generate text with description" << _description
+                    << "steps" << _reproduce << "and expected result"
+                    << _expected;
+
+    QString output;
+    output += QString("**Description**\n\n%1\n\n").arg(_description);
+    output += QString("**Step to _reproduce**\n\n%1\n\n").arg(_reproduce);
+    output += QString("**Expected result**\n\n%1\n\n").arg(_expected);
+    output += QString("**Version**\n\n%1\n\n")
+                  .arg(AWDebug::getBuildData().join(QString("\n")));
+    // append _logs
+    output += QString("**Logs**\n\n%1").arg(_logs);
+
+    return output;
+}
+
+
+void AWBugReporter::sendBugReport(const QString &_title, const QString &_body)
+{
+    qCDebug(LOG_AW) << "Send bug report with title" << _title << "and body"
+                    << _body;
+
+    QNetworkAccessManager *manager = new QNetworkAccessManager(nullptr);
+    connect(manager, SIGNAL(finished(QNetworkReply *)), this,
+            SLOT(issueReplyRecieved(QNetworkReply *)));
+
+    QNetworkRequest request = QNetworkRequest(QUrl(BUGTRACKER_API));
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+
+    // generate payload
+    QVariantMap payload;
+    payload["title"] = _title;
+    payload["body"] = _body;
+    payload["labels"] = QStringList() << "from application";
+    // convert to QByteArray to send request
+    QByteArray data
+        = QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact);
+    qCInfo(LOG_AW) << "Send request with _body" << data.data() << "and size"
+                   << data.size();
+
+    manager->post(request, data);
+}
+
+
+void AWBugReporter::issueReplyRecieved(QNetworkReply *_reply)
+{
+    if (_reply->error() != QNetworkReply::NoError) {
+        qCWarning(LOG_AW) << "An error occurs" << _reply->error()
+                          << "with message" << _reply->errorString();
+        return emit(replyReceived(0, ""));
+    }
+
+    QJsonParseError error;
+    QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
+    if (error.error != QJsonParseError::NoError) {
+        qCWarning(LOG_AW) << "Parse error" << error.errorString();
+        return emit(replyReceived(0, ""));
+    }
+    _reply->deleteLater();
+
+    // convert to map
+    QVariantMap response = jsonDoc.toVariant().toMap();
+    QString url = response["html_url"].toString();
+    int number = response["number"].toInt();
+
+    return emit(replyReceived(number, url));
+}
+
+
+void AWBugReporter::showInformation(const int _number, const QString &_url)
+{
+    qCDebug(LOG_AW) << "Created issue with number" << _number << "and url"
+                    << _url;
+
+    // cache url first
+    m_lastBugUrl = _url;
+
+    QMessageBox *msgBox = new QMessageBox(nullptr);
+    msgBox->setAttribute(Qt::WA_DeleteOnClose);
+    msgBox->setModal(false);
+    msgBox->setWindowTitle(i18n("Issue created"));
+    msgBox->setText(i18n("Issue %1 has been created", _number));
+    msgBox->setStandardButtons(QMessageBox::Open | QMessageBox::Close);
+    msgBox->setIcon(QMessageBox::Information);
+
+    msgBox->open(this, SLOT(userReplyOnBugReport(QAbstractButton *)));
+}
+
+
+void AWBugReporter::userReplyOnBugReport(QAbstractButton *_button)
+{
+    QMessageBox::ButtonRole ret
+        = static_cast<QMessageBox *>(sender())->buttonRole(_button);
+    qCInfo(LOG_AW) << "User select" << ret;
+
+    switch (ret) {
+    case QMessageBox::AcceptRole:
+        QDesktopServices::openUrl(m_lastBugUrl);
+        break;
+    case QMessageBox::RejectRole:
+    default:
+        break;
+    }
+}

sources/awesome-widget/plugin/awbugreporter.h

@@ -0,0 +1,55 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWBUGREPORTER_H
+#define AWBUGREPORTER_H
+
+#include <QObject>
+
+
+class QAbstractButton;
+class QNetworkReply;
+
+class AWBugReporter : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AWBugReporter(QObject *_parent = nullptr);
+    virtual ~AWBugReporter();
+    Q_INVOKABLE void doConnect();
+    Q_INVOKABLE QString generateText(const QString &_description,
+                                     const QString &_reproduce,
+                                     const QString &_expected,
+                                     const QString &_logs) const;
+    Q_INVOKABLE void sendBugReport(const QString &_title, const QString &_body);
+
+signals:
+    void replyReceived(const int _number, const QString &_url);
+
+private slots:
+    void issueReplyRecieved(QNetworkReply *_reply);
+    void showInformation(const int _number, const QString &_url);
+    void userReplyOnBugReport(QAbstractButton *_button);
+
+private:
+    QString m_lastBugUrl;
+};
+
+
+#endif /* AWBUGREPORTER_H */

sources/awesome-widget/plugin/awconfighelper.cpp

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

sources/awesome-widget/plugin/awconfighelper.h

@@ -20,7 +20,7 @@
 #define AWCONFIGHELPER_H
 
 #include <QObject>
-#include <QStandardPaths>
+#include <QVariant>
 
 
 class QSettings;
@@ -30,37 +30,35 @@ class AWConfigHelper : public QObject
     Q_OBJECT
 
 public:
-    explicit AWConfigHelper(QObject *parent = nullptr);
+    explicit AWConfigHelper(QObject *_parent = nullptr);
     virtual ~AWConfigHelper();
+    Q_INVOKABLE QString configurationDirectory() const;
     Q_INVOKABLE bool dropCache() const;
-    Q_INVOKABLE bool exportConfiguration(QObject *nativeConfig,
-                                         const QString fileName) const;
-    Q_INVOKABLE QVariantMap importConfiguration(const QString fileName,
-                                                const bool importPlasmoid,
-                                                const bool importExtensions,
-                                                const bool importAdds) const;
+    Q_INVOKABLE bool exportConfiguration(QObject *_nativeConfig,
+                                         const QString &_fileName) const;
+    Q_INVOKABLE QVariantMap importConfiguration(const QString &_fileName,
+                                                const bool _importPlasmoid,
+                                                const bool _importExtensions,
+                                                const bool _importAdds) const;
     // dataengine
     Q_INVOKABLE QVariantMap readDataEngineConfiguration() const;
-    Q_INVOKABLE void
-    writeDataEngineConfiguration(const QVariantMap configuration) const;
+    Q_INVOKABLE bool
+    writeDataEngineConfiguration(const QVariantMap &_configuration) const;
 
 private:
     // methods
-    void copyExtensions(const QString item, const QString type,
-                        QSettings &settings, const bool inverse) const;
-    void copySettings(QSettings &from, QSettings &to) const;
-    void readFile(QSettings &settings, const QString key,
-                  const QString fileName) const;
-    void writeFile(QSettings &settings, const QString key,
-                   const QString fileName) const;
+    void copyConfigs(const QString &_localDir) const;
+    void copyExtensions(const QString &_item, const QString &_type,
+                        QSettings &_settings, const bool _inverse) const;
+    void copySettings(QSettings &_from, QSettings &_to) const;
+    void readFile(QSettings &_settings, const QString &_key,
+                  const QString &_fileName) const;
+    void writeFile(QSettings &_settings, const QString &_key,
+                   const QString &_fileName) const;
     // properties
-    QString m_baseDir = QString("%1/awesomewidgets")
-                            .arg(QStandardPaths::writableLocation(
-                                QStandardPaths::GenericDataLocation));
-    QStringList m_dirs = QStringList()
-                         << QString("desktops") << QString("quotes")
-                         << QString("scripts") << QString("upgrade")
-                         << QString("weather");
+    QString m_baseDir;
+    QStringList m_dirs
+        = {"desktops", "quotes", "scripts", "upgrade", "weather", "formatters"};
 };
 
 

sources/awesome-widget/plugin/awcustomkeysconfig.cpp

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

sources/awesome-widget/plugin/awcustomkeysconfig.h

@@ -0,0 +1,36 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWCUSTOMKEYSCONFIG_H
+#define AWCUSTOMKEYSCONFIG_H
+
+#include "awabstractpairconfig.h"
+
+
+class AWCustomKeysConfig : public AWAbstractPairConfig
+{
+    Q_OBJECT
+
+public:
+    explicit AWCustomKeysConfig(QWidget *_parent = nullptr,
+                                const QStringList &_keys = QStringList());
+    virtual ~AWCustomKeysConfig();
+};
+
+
+#endif /* AWCUSTOMKEYSCONFIG_H */

sources/awesome-widget/plugin/awcustomkeyshelper.cpp

@@ -0,0 +1,78 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awcustomkeyshelper.h"
+
+#include <QSet>
+
+#include "awdebug.h"
+
+
+AWCustomKeysHelper::AWCustomKeysHelper(QObject *_parent)
+    : QObject(_parent)
+    , AWAbstractPairHelper("awesomewidgets/custom.ini", "Custom")
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+AWCustomKeysHelper::~AWCustomKeysHelper()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+QString AWCustomKeysHelper::source(const QString &_key) const
+{
+    qCDebug(LOG_AW) << "Get source by key" << _key;
+
+    return pairs()[_key];
+}
+
+
+QStringList AWCustomKeysHelper::sources() const
+{
+    return QSet<QString>::fromList(values()).toList();
+}
+
+
+QStringList AWCustomKeysHelper::refinedSources() const
+{
+    auto allSources = QSet<QString>::fromList(pairs().values());
+    QSet<QString> output;
+
+    while (output != allSources) {
+        output.clear();
+        for (auto &src : allSources)
+            output.insert(pairs().contains(src) ? source(src) : src);
+        allSources = output;
+    }
+
+    return output.toList();
+}
+
+
+QStringList AWCustomKeysHelper::leftKeys()
+{
+    return keys();
+}
+
+
+QStringList AWCustomKeysHelper::rightKeys()
+{
+    return QStringList();
+}

sources/awesome-widget/plugin/awcustomkeyshelper.h

@@ -0,0 +1,47 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWCUSTOMKEYSHELPER_H
+#define AWCUSTOMKEYSHELPER_H
+
+#include <QObject>
+
+#include "awabstractpairhelper.h"
+
+
+class AWCustomKeysHelper : public QObject, public AWAbstractPairHelper
+{
+    Q_OBJECT
+
+public:
+    explicit AWCustomKeysHelper(QObject *_parent = nullptr);
+    virtual ~AWCustomKeysHelper();
+    // get
+    QString source(const QString &_key) const;
+    QStringList sources() const;
+    QStringList refinedSources() const;
+    // configuration related
+    virtual void editPairs(){};
+    virtual QStringList leftKeys();
+    virtual QStringList rightKeys();
+
+private:
+};
+
+
+#endif /* AWCUSTOMKEYSHELPER_H */

sources/awesome-widget/plugin/awdataaggregator.cpp

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

sources/awesome-widget/plugin/awdataaggregator.h

@@ -33,44 +33,43 @@ class AWDataAggregator : public QObject
     Q_OBJECT
 
 public:
-    explicit AWDataAggregator(QObject *parent = nullptr);
+    explicit AWDataAggregator(QObject *_parent = nullptr);
     virtual ~AWDataAggregator();
-    QList<float> getData(const QString key) const;
-    QString htmlImage(const QPixmap &source) const;
-    void setParameters(QVariantMap settings);
+    QString htmlImage(const QPixmap &_source) const;
+    void setParameters(const QVariantMap &_settings);
     QPixmap tooltipImage();
 
-signals:
-    void updateData(const QHash<QString, QString> &values);
-    void toolTipPainted(const QString image) const;
-
 public slots:
-    void dataUpdate(const QHash<QString, QString> &values);
+    void dataUpdate(const QVariantHash &_values);
+
+signals:
+    void toolTipPainted(const QString &_image) const;
 
 private:
     // ui
-    QGraphicsScene *toolTipScene = nullptr;
-    QGraphicsView *toolTipView = nullptr;
-    void checkValue(const QString source, const float value,
-                    const float extremum) const;
-    void checkValue(const QString source, const QString current,
-                    const QString received) const;
+    QGraphicsScene *m_toolTipScene = nullptr;
+    QGraphicsView *m_toolTipView = nullptr;
+    void checkValue(const QString &_source, const float _value,
+                    const float _extremum) const;
+    void checkValue(const QString &_source, const QString &_current,
+                    const QString &_received) const;
     void initScene();
-    QString notificationText(const QString source, const float value) const;
-    QString notificationText(const QString source, const QString value) const;
+    QString notificationText(const QString &_source, const float _value) const;
+    QString notificationText(const QString &_source,
+                             const QString &_value) const;
     // main method
-    void setData(const QHash<QString, QString> &values);
-    void setData(const QString &source, float value,
-                 const float extremum = -1.0);
+    void setData(const QVariantHash &_values);
+    void setData(const QString &_source, float _value,
+                 const float _extremum = -1.0f);
     // different signature for battery device
-    void setData(const bool dontInvert, const QString &source, float value);
+    void setData(const bool _dontInvert, const QString &_source, float _value);
     // variables
-    int counts = 0;
-    QVariantHash configuration;
-    float currentGPULoad = 0.0;
-    QString currentNetworkDevice = QString("lo");
-    QHash<QString, float> boundaries;
-    QHash<QString, QList<float>> data;
+    int m_counts = 0;
+    QVariantHash m_configuration;
+    float m_currentGPULoad = 0.0f;
+    QString m_currentNetworkDevice = "lo";
+    QHash<QString, float> m_boundaries;
+    QHash<QString, QList<float>> m_values;
     bool m_enablePopup = false;
     QStringList requiredKeys;
 };

sources/awesome-widget/plugin/awdataengineaggregator.cpp

@@ -17,20 +17,33 @@
 
 #include "awdataengineaggregator.h"
 
-#include <Plasma/DataEngineConsumer>
+#include <Plasma/DataContainer>
 
 #include "awdebug.h"
 #include "awkeys.h"
 
 
-AWDataEngineAggregator::AWDataEngineAggregator(QObject *parent,
-                                               const int interval)
-    : QObject(parent)
+AWDataEngineAggregator::AWDataEngineAggregator(QObject *_parent)
+    : QObject(_parent)
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    setInterval(interval);
-    initDataEngines();
+    m_consumer = new Plasma::DataEngineConsumer();
+    m_dataEngines["systemmonitor"] = m_consumer->dataEngine("systemmonitor");
+    m_dataEngines["extsysmon"] = m_consumer->dataEngine("extsysmon");
+    m_dataEngines["time"] = m_consumer->dataEngine("time");
+
+    // additional method required by systemmonitor structure
+    m_newSourceConnection = connect(
+        m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded,
+        [this](const QString source) {
+            emit(deviceAdded(source));
+            m_dataEngines["systemmonitor"]->connectSource(source, parent(),
+                                                          1000);
+        });
+
+    // required to define Qt::QueuedConnection for signal-slot connection
+    qRegisterMetaType<Plasma::DataEngine::Data>("Plasma::DataEngine::Data");
 }
 
 
@@ -38,64 +51,78 @@ AWDataEngineAggregator::~AWDataEngineAggregator()
 {
     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 
-    // disconnect sources first
     disconnectSources();
-    m_dataEngines.clear();
 }
 
 
 void AWDataEngineAggregator::disconnectSources()
 {
-    foreach (QString dataengine, m_dataEngines.keys())
-        foreach (QString source, m_dataEngines[dataengine]->sources())
-            m_dataEngines[dataengine]->disconnectSource(source, parent());
+    for (auto dataengine : m_dataEngines.values())
+        for (auto &source : dataengine->sources())
+            dataengine->disconnectSource(source, parent());
+    disconnect(m_newSourceConnection);
 }
 
 
-void AWDataEngineAggregator::setInterval(const int _interval)
+void AWDataEngineAggregator::reconnectSources(const int _interval)
 {
-    qCDebug(LOG_AW) << "Interval" << _interval;
+    qCDebug(LOG_AW) << "Reconnect sources with interval" << _interval;
 
-    m_interval = _interval;
+    disconnectSources();
+
+    m_dataEngines["systemmonitor"]->connectAllSources(parent(), _interval);
+    m_dataEngines["extsysmon"]->connectAllSources(parent(), _interval);
+    m_dataEngines["time"]->connectSource("Local", parent(), 1000);
+
+    m_newSourceConnection = connect(
+        m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded,
+        [this, _interval](const QString source) {
+            emit(deviceAdded(source));
+            m_dataEngines["systemmonitor"]->connectSource(source, parent(),
+                                                          _interval);
+        });
+
+#ifdef BUILD_FUTURE
+    createQueuedConnection();
+#endif /* BUILD_FUTURE */
 }
 
 
-void AWDataEngineAggregator::dropSource(const QString source)
+void AWDataEngineAggregator::dropSource(const QString &_source)
 {
-    qCDebug(LOG_AW) << "Source" << source;
+    qCDebug(LOG_AW) << "Source" << _source;
 
-    // FIXME there is no possibility to check to which dataengine source
-    // connected we will try to disconnect it from systemmonitor and extsysmon
-    m_dataEngines[QString("systemmonitor")]->disconnectSource(source, parent());
-    m_dataEngines[QString("extsysmon")]->disconnectSource(source, parent());
+    // HACK there is no possibility to check to which dataengine source
+    // connected we will try to disconnect it from all engines
+    for (auto dataengine : m_dataEngines.values())
+        dataengine->disconnectSource(_source, parent());
 }
 
 
-void AWDataEngineAggregator::reconnectSources()
+void AWDataEngineAggregator::createQueuedConnection()
 {
-    m_dataEngines[QString("systemmonitor")]->connectAllSources(parent(),
-                                                               m_interval);
-    m_dataEngines[QString("extsysmon")]->connectAllSources(parent(),
-                                                           m_interval);
-    m_dataEngines[QString("time")]->connectSource(QString("Local"), parent(),
-                                                  1000);
-}
-
-
-void AWDataEngineAggregator::initDataEngines()
-{
-    Plasma::DataEngineConsumer *deConsumer = new Plasma::DataEngineConsumer();
-    m_dataEngines[QString("systemmonitor")]
-        = deConsumer->dataEngine(QString("systemmonitor"));
-    m_dataEngines[QString("extsysmon")]
-        = deConsumer->dataEngine(QString("extsysmon"));
-    m_dataEngines[QString("time")] = deConsumer->dataEngine(QString("time"));
-
-    // additional method required by systemmonitor structure
-    connect(m_dataEngines[QString("systemmonitor")],
-            &Plasma::DataEngine::sourceAdded, [this](const QString source) {
-                static_cast<AWKeys *>(parent())->addDevice(source);
-                m_dataEngines[QString("systemmonitor")]->connectSource(
-                    source, parent(), m_interval);
-            });
+    // HACK additional method which forces QueuedConnection instead of Auto one
+    // for more details refer to plasma-framework source code
+    for (auto &dataEngine : m_dataEngines.keys()) {
+        // different source set for different engines
+        QStringList sources = dataEngine == "time"
+                                  ? QStringList() << "Local"
+                                  : m_dataEngines[dataEngine]->sources();
+        // reconnect sources
+        for (auto &source : sources) {
+            Plasma::DataContainer *container
+                = m_dataEngines[dataEngine]->containerForSource(source);
+            // disconnect old connections first
+            disconnect(container,
+                       SIGNAL(dataUpdated(QString, Plasma::DataEngine::Data)),
+                       parent(),
+                       SLOT(dataUpdated(QString, Plasma::DataEngine::Data)));
+            // and now reconnect with Qt::QueuedConnection type
+            connect(container,
+                    SIGNAL(dataUpdated(QString, Plasma::DataEngine::Data)),
+                    parent(),
+                    SLOT(dataUpdated(QString, Plasma::DataEngine::Data)),
+                    Qt::QueuedConnection);
+        }
+    }
 }

sources/awesome-widget/plugin/awdataengineaggregator.h

@@ -20,6 +20,7 @@
 #define AWDATAENGINEAGGREGATOR_H
 
 #include <Plasma/DataEngine>
+#include <Plasma/DataEngineConsumer>
 
 #include <QObject>
 
@@ -27,24 +28,24 @@
 class AWDataEngineAggregator : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(int interval MEMBER m_interval WRITE setInterval);
 
 public:
-    explicit AWDataEngineAggregator(QObject *parent = nullptr,
-                                    const int interval = 1000);
+    explicit AWDataEngineAggregator(QObject *_parent = nullptr);
     virtual ~AWDataEngineAggregator();
     void disconnectSources();
-    // properties
-    void setInterval(const int _interval);
+    void reconnectSources(const int _interval);
+
+signals:
+    void deviceAdded(const QString &_source);
 
 public slots:
-    void dropSource(const QString source);
-    void reconnectSources();
+    void dropSource(const QString &_source);
 
 private:
-    void initDataEngines();
+    void createQueuedConnection();
+    Plasma::DataEngineConsumer *m_consumer = nullptr;
     QHash<QString, Plasma::DataEngine *> m_dataEngines;
-    int m_interval;
+    QMetaObject::Connection m_newSourceConnection;
 };
 
 

sources/awesome-widget/plugin/awdataenginemapper.cpp

@@ -0,0 +1,448 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awdataenginemapper.h"
+
+#include <QRegExp>
+
+#include "awdebug.h"
+#include "awformatterhelper.h"
+
+
+AWDataEngineMapper::AWDataEngineMapper(QObject *_parent,
+                                       AWFormatterHelper *_custom)
+    : QObject(_parent)
+    , m_customFormatters(_custom)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    // default formatters
+    // memory
+    m_formatter["mem"] = AWKeysAggregator::FormatterType::Float;
+    m_formatter["memtotmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+    m_formatter["memtotgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    // network
+    m_formatter["down"] = AWKeysAggregator::FormatterType::NetSmartFormat;
+    m_formatter["downkb"] = AWKeysAggregator::FormatterType::Integer;
+    m_formatter["downtot"] = AWKeysAggregator::FormatterType::MemMBFormat;
+    m_formatter["downtotkb"] = AWKeysAggregator::FormatterType::Integer;
+    m_formatter["downunits"] = AWKeysAggregator::FormatterType::NetSmartUnits;
+    m_formatter["up"] = AWKeysAggregator::FormatterType::NetSmartFormat;
+    m_formatter["upkb"] = AWKeysAggregator::FormatterType::Integer;
+    m_formatter["uptot"] = AWKeysAggregator::FormatterType::MemMBFormat;
+    m_formatter["uptotkb"] = AWKeysAggregator::FormatterType::Integer;
+    m_formatter["upunits"] = AWKeysAggregator::FormatterType::NetSmartUnits;
+    // swap
+    m_formatter["swap"] = AWKeysAggregator::FormatterType::Float;
+    m_formatter["swaptotmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+    m_formatter["swaptotgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+}
+
+
+AWDataEngineMapper::~AWDataEngineMapper()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+AWKeysAggregator::FormatterType
+AWDataEngineMapper::formatter(const QString &_key) const
+{
+    qCDebug(LOG_AW) << "Get formatter for key" << _key;
+
+    return m_formatter.value(_key, AWKeysAggregator::FormatterType::NoFormat);
+}
+
+
+QStringList AWDataEngineMapper::keysFromSource(const QString &_source) const
+{
+    qCDebug(LOG_AW) << "Search for source" << _source;
+
+    return m_map.values(_source);
+}
+
+
+// HACK units required to define should the value be calculated as temperature
+// or fan data
+QStringList AWDataEngineMapper::registerSource(const QString &_source,
+                                               const QString &_units,
+                                               const QStringList &_keys)
+{
+    qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
+
+    // regular expressions
+    QRegExp cpuRegExp = QRegExp("cpu/cpu.*/TotalLoad");
+    QRegExp cpuclRegExp = QRegExp("cpu/cpu.*/clock");
+    QRegExp hddrRegExp = QRegExp("disk/.*/Rate/rblk");
+    QRegExp hddwRegExp = QRegExp("disk/.*/Rate/wblk");
+    QRegExp mountFillRegExp = QRegExp("partitions/.*/filllevel");
+    QRegExp mountFreeRegExp = QRegExp("partitions/.*/freespace");
+    QRegExp mountUsedRegExp = QRegExp("partitions/.*/usedspace");
+    QRegExp netRegExp
+        = QRegExp("network/interfaces/.*/(receiver|transmitter)/data$");
+    QRegExp netTotalRegExp
+        = QRegExp("network/interfaces/.*/(receiver|transmitter)/dataTotal$");
+
+    if (_source == "battery/ac") {
+        // AC
+        m_map[_source] = "ac";
+        m_formatter["ac"] = AWKeysAggregator::FormatterType::ACFormat;
+    } else if (_source.startsWith("battery/")) {
+        // battery stats
+        QString key = _source;
+        key.remove("battery/");
+        m_map[_source] = key;
+        m_formatter[key] = AWKeysAggregator::FormatterType::IntegerThree;
+    } else if (_source == "cpu/system/TotalLoad") {
+        // cpu
+        m_map[_source] = "cpu";
+        m_formatter["cpu"] = AWKeysAggregator::FormatterType::Float;
+    } else if (_source.contains(cpuRegExp)) {
+        // cpus
+        QString key = _source;
+        key.remove("cpu/").remove("/TotalLoad");
+        m_map[_source] = key;
+        m_formatter[key] = AWKeysAggregator::FormatterType::Float;
+    } else if (_source == "cpu/system/AverageClock") {
+        // cpucl
+        m_map[_source] = "cpucl";
+        m_formatter["cpucl"] = AWKeysAggregator::FormatterType::Integer;
+    } else if (_source.contains(cpuclRegExp)) {
+        // cpucls
+        QString key = _source;
+        key.remove("cpu/cpu").remove("/clock");
+        key = QString("cpucl%1").arg(key);
+        m_map[_source] = key;
+        m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
+    } else if (_source.startsWith("custom")) {
+        // custom
+        QString key = _source;
+        key.remove("custom/");
+        m_map[_source] = key;
+        m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "desktop/current/name") {
+        // current desktop name
+        m_map[_source] = "desktop";
+        m_formatter["desktop"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "desktop/current/number") {
+        // current desktop number
+        m_map[_source] = "ndesktop";
+        m_formatter["ndesktop"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "desktop/total/number") {
+        // desktop count
+        m_map[_source] = "tdesktops";
+        m_formatter["tdesktops"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.contains(hddrRegExp)) {
+        // read speed
+        QString device = _source;
+        device.remove("/Rate/rblk");
+        int index = m_devices["disk"].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hddr%1").arg(index);
+            m_map[_source] = key;
+            m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
+        }
+    } else if (_source.contains(hddwRegExp)) {
+        // write speed
+        QString device = _source;
+        device.remove("/Rate/wblk");
+        int index = m_devices["disk"].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hddw%1").arg(index);
+            m_map[_source] = key;
+            m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
+        }
+    } else if (_source == "gpu/load") {
+        // gpu load
+        m_map[_source] = "gpu";
+        m_formatter["gpu"] = AWKeysAggregator::FormatterType::Float;
+    } else if (_source == "gpu/temperature") {
+        // gpu temperature
+        m_map[_source] = "gputemp";
+        m_formatter["gputemp"] = AWKeysAggregator::FormatterType::Temperature;
+    } else if (_source.contains(mountFillRegExp)) {
+        // fill level
+        QString device = _source;
+        device.remove("partitions").remove("/filllevel");
+        int index = m_devices["mount"].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hdd%1").arg(index);
+            m_map[_source] = key;
+            m_formatter[key] = AWKeysAggregator::FormatterType::Float;
+            // additional keys
+            m_formatter[QString("hddtotmb%1").arg(index)]
+                = AWKeysAggregator::FormatterType::MemMBFormat;
+            m_formatter[QString("hddtotgb%1").arg(index)]
+                = AWKeysAggregator::FormatterType::MemGBFormat;
+        }
+    } else if (_source.contains(mountFreeRegExp)) {
+        // free space
+        QString device = _source;
+        device.remove("partitions").remove("/freespace");
+        int index = m_devices["mount"].indexOf(device);
+        if (index > -1) {
+            // mb
+            QString key = QString("hddfreemb%1").arg(index);
+            m_map[_source] = key;
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
+            // gb
+            key = QString("hddfreegb%1").arg(index);
+            m_map.insertMulti(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemGBFormat;
+        }
+    } else if (_source.contains(mountUsedRegExp)) {
+        // used
+        QString device = _source;
+        device.remove("partitions").remove("/usedspace");
+        int index = m_devices["mount"].indexOf(device);
+        if (index > -1) {
+            // mb
+            QString key = QString("hddmb%1").arg(index);
+            m_map[_source] = key;
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
+            // gb
+            key = QString("hddgb%1").arg(index);
+            m_map.insertMulti(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemGBFormat;
+        }
+    } else if (_source.startsWith("hdd/temperature")) {
+        // hdd temperature
+        QString device = _source;
+        device.remove("hdd/temperature");
+        int index = m_devices["hdd"].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hddtemp%1").arg(index);
+            m_map[_source] = key;
+            m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
+        }
+    } else if (_source.startsWith("cpu/system/loadavg")) {
+        // load average
+        QString time = _source;
+        time.remove("cpu/system/loadavg");
+        QString key = QString("la%1").arg(time);
+        m_map[_source] = key;
+        m_formatter[key] = AWKeysAggregator::FormatterType::FloatTwoSymbols;
+    } else if (_source == "mem/physical/application") {
+        // app memory
+        // mb
+        m_map[_source] = "memmb";
+        m_formatter["memmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insertMulti(_source, "memgb");
+        m_formatter["memgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source == "mem/physical/free") {
+        // free memory
+        // mb
+        m_map[_source] = "memfreemb";
+        m_formatter["memfreemb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insertMulti(_source, "memfreegb");
+        m_formatter["memfreegb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source == "mem/physical/used") {
+        // used memory
+        // mb
+        m_map[_source] = "memusedmb";
+        m_formatter["memusedmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insertMulti(_source, "memusedgb");
+        m_formatter["memusedgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source == "network/current/name") {
+        // network device
+        m_map[_source] = "netdev";
+        m_formatter["netdev"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.startsWith("network/response")) {
+        // network response
+        QString key = _source;
+        key.remove("network/");
+        m_map[_source] = key;
+        m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.contains(netRegExp)) {
+        // network speed
+        QString type = _source.contains("receiver") ? "down" : "up";
+        int index = m_devices["net"].indexOf(_source.split('/')[2]);
+        if (index > -1) {
+            // kb
+            QString key = QString("%1kb%2").arg(type).arg(index);
+            m_map[_source] = key;
+            m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
+            // smart
+            key = QString("%1%2").arg(type).arg(index);
+            m_map.insertMulti(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::NetSmartFormat;
+            // units
+            key = QString("%1units%2").arg(type).arg(index);
+            m_map.insertMulti(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::NetSmartUnits;
+        }
+    } else if (_source.contains(netTotalRegExp)) {
+        // network data total
+        QString type = _source.contains("receiver") ? "down" : "up";
+        int index = m_devices["net"].indexOf(_source.split('/')[2]);
+        if (index > -1) {
+            // kb
+            QString key = QString("%1totkb%2").arg(type).arg(index);
+            m_map[_source] = key;
+            m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
+            // mb
+            key = QString("%1tot%2").arg(type).arg(index);
+            m_map.insertMulti(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
+        }
+    } else if (_source.startsWith("upgrade")) {
+        // package manager
+        QString key = _source;
+        key.remove("upgrade/");
+        m_map[_source] = key;
+        m_formatter[key] = AWKeysAggregator::FormatterType::IntegerThree;
+    } else if (_source.startsWith("player")) {
+        // player
+        QString key = _source;
+        key.remove("player/");
+        m_map[_source] = key;
+        m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "ps/running/count") {
+        // running processes count
+        m_map[_source] = "pscount";
+        m_formatter["pscount"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "ps/running/list") {
+        // list of running processes
+        m_map[_source] = "ps";
+        m_formatter["ps"] = AWKeysAggregator::FormatterType::List;
+    } else if (_source == "ps/total/count") {
+        // total processes count
+        m_map[_source] = "pstot";
+        m_formatter["pstot"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.startsWith("quotes")) {
+        // quotes
+        QString key = _source;
+        key.remove("quotes/");
+        m_map[_source] = key;
+        m_formatter[key] = AWKeysAggregator::FormatterType::Quotes;
+    } else if (_source == "mem/swap/free") {
+        // free swap
+        // mb
+        m_map[_source] = "swapfreemb";
+        m_formatter["swapfreemb"]
+            = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insertMulti(_source, "swapfreegb");
+        m_formatter["swapfreegb"]
+            = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source == "mem/swap/used") {
+        // used swap
+        // mb
+        m_map[_source] = "swapmb";
+        m_formatter["swapmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insertMulti(_source, "swapgb");
+        m_formatter["swapgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source.startsWith("lmsensors/")) {
+        // temperature
+        int index = m_devices["temp"].indexOf(_source);
+        // HACK on DE initialization there are no units key
+        if (_units.isEmpty())
+            return QStringList({QString("temp%1").arg(index)});
+        if (index > -1) {
+            QString key = QString("temp%1").arg(index);
+            m_map[_source] = key;
+            m_formatter[key]
+                = _units == "°C" ? AWKeysAggregator::FormatterType::Temperature
+                                 : AWKeysAggregator::FormatterType::Integer;
+        }
+    } else if (_source == "Local") {
+        // time
+        m_map[_source] = "time";
+        m_formatter["time"] = AWKeysAggregator::FormatterType::Time;
+        // custom time
+        m_map.insertMulti(_source, "ctime");
+        m_formatter["ctime"] = AWKeysAggregator::FormatterType::TimeCustom;
+        // ISO time
+        m_map.insertMulti(_source, "isotime");
+        m_formatter["isotime"] = AWKeysAggregator::FormatterType::TimeISO;
+        // long time
+        m_map.insertMulti(_source, "longtime");
+        m_formatter["longtime"] = AWKeysAggregator::FormatterType::TimeLong;
+        // short time
+        m_map.insertMulti(_source, "shorttime");
+        m_formatter["shorttime"] = AWKeysAggregator::FormatterType::TimeShort;
+        // timestamp
+        m_map.insertMulti(_source, "tstime");
+        m_formatter["tstime"] = AWKeysAggregator::FormatterType::Timestamp;
+    } else if (_source == "system/uptime") {
+        // uptime
+        m_map[_source] = "uptime";
+        m_formatter["uptime"] = AWKeysAggregator::FormatterType::Uptime;
+        // custom uptime
+        m_map.insertMulti(_source, "cuptime");
+        m_formatter["cuptime"] = AWKeysAggregator::FormatterType::UptimeCustom;
+    } else if (_source.startsWith("weather/temperature")) {
+        // temperature
+        QString key = _source;
+        key.remove("weather/");
+        m_map[_source] = key;
+        m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
+    } else if (_source.startsWith("weather/")) {
+        // other weather
+        QString key = _source;
+        key.remove("weather/");
+        m_map[_source] = key;
+        m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.startsWith("load/load")) {
+        // load source
+        QString key = _source;
+        key.remove("load/");
+        m_map[_source] = key;
+        m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
+    }
+
+    QStringList foundKeys = keysFromSource(_source);
+
+    // rewrite formatters for custom ones
+    QStringList customFormattersKeys;
+    if (m_customFormatters)
+        customFormattersKeys = m_customFormatters->definedFormatters();
+    qCInfo(LOG_AW) << "Looking for formatters" << foundKeys << "in"
+                   << customFormattersKeys;
+    for (auto &key : foundKeys) {
+        if (!customFormattersKeys.contains(key))
+            continue;
+        m_formatter[key] = AWKeysAggregator::FormatterType::Custom;
+    }
+
+    // drop key from dictionary if no one user requested key required it
+    qCInfo(LOG_AW) << "Looking for keys" << foundKeys << "in" << _keys;
+    bool required
+        = _keys.isEmpty() || std::any_of(foundKeys.cbegin(), foundKeys.cend(),
+                                         [&_keys](const QString &key) {
+                                             return _keys.contains(key);
+                                         });
+    if (!required) {
+        m_map.remove(_source);
+        for (auto &key : foundKeys)
+            m_formatter.remove(key);
+    }
+
+    return keysFromSource(_source);
+}
+
+
+void AWDataEngineMapper::setDevices(const QHash<QString, QStringList> &_devices)
+{
+    qCDebug(LOG_AW) << "Devices" << _devices;
+
+    m_devices = _devices;
+}

sources/awesome-widget/plugin/awdataenginemapper.h

@@ -0,0 +1,55 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWDATAENGINEMAPPER_H
+#define AWDATAENGINEMAPPER_H
+
+#include <QHash>
+#include <QObject>
+
+#include "awkeysaggregator.h"
+
+
+class AWFormatterHelper;
+
+class AWDataEngineMapper : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AWDataEngineMapper(QObject *_parent = nullptr,
+                                AWFormatterHelper *_custom = nullptr);
+    virtual ~AWDataEngineMapper();
+    // get methods
+    AWKeysAggregator::FormatterType formatter(const QString &_key) const;
+    QStringList keysFromSource(const QString &_source) const;
+    // set methods
+    QStringList registerSource(const QString &_source, const QString &_units,
+                               const QStringList &_keys);
+    void setDevices(const QHash<QString, QStringList> &_devices);
+
+private:
+    AWFormatterHelper *m_customFormatters = nullptr;
+    // variables
+    QHash<QString, QStringList> m_devices;
+    QHash<QString, AWKeysAggregator::FormatterType> m_formatter;
+    QHash<QString, QString> m_map;
+};
+
+
+#endif /* AWDATAENGINEMAPPER_H */

sources/awesome-widget/plugin/awdbusadaptor.cpp

@@ -0,0 +1,114 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awdbusadaptor.h"
+
+#include <QDBusConnection>
+#include <QDBusConnectionInterface>
+
+#include "awdebug.h"
+#include "awkeys.h"
+
+
+AWDBusAdaptor::AWDBusAdaptor(AWKeys *_parent)
+    : QDBusAbstractAdaptor(_parent)
+    , m_plugin(_parent)
+{
+    qCDebug(LOG_DBUS) << __PRETTY_FUNCTION__;
+}
+
+
+AWDBusAdaptor::~AWDBusAdaptor()
+{
+    qCDebug(LOG_DBUS) << __PRETTY_FUNCTION__;
+}
+
+
+QStringList AWDBusAdaptor::ActiveServices() const
+{
+    QDBusMessage listServices = QDBusConnection::sessionBus().interface()->call(
+        QDBus::BlockWithGui, "ListNames");
+    if (listServices.arguments().isEmpty()) {
+        qCWarning(LOG_DBUS) << "Could not find any DBus service";
+        return {};
+    }
+    QStringList arguments = listServices.arguments().first().toStringList();
+
+    return std::accumulate(arguments.cbegin(), arguments.cend(), QStringList(),
+                           [](QStringList &source, QString service) {
+                               if (service.startsWith(AWDBUS_SERVICE))
+                                   source.append(service);
+                               return source;
+                           });
+}
+
+
+QString AWDBusAdaptor::Info(const QString &key) const
+{
+    return m_plugin->infoByKey(key);
+}
+
+
+QStringList AWDBusAdaptor::Keys(const QString &regexp) const
+{
+    return m_plugin->dictKeys(true, regexp);
+}
+
+
+QString AWDBusAdaptor::Value(const QString &key) const
+{
+    return m_plugin->valueByKey(key);
+}
+
+
+qlonglong AWDBusAdaptor::WhoAmI() const
+{
+    return reinterpret_cast<qlonglong>(m_plugin);
+}
+
+
+void AWDBusAdaptor::SetLogLevel(const QString &what, const int level)
+{
+    qCDebug(LOG_DBUS) << "Set log level" << level << "for" << what;
+
+    if (level >= m_logLevels.count()) {
+        qCDebug(LOG_DBUS) << "Invalid logging level" << level
+                          << "should be less than" << m_logLevels.count();
+        return;
+    }
+
+    for (auto &lev : m_logLevels)
+        SetLogLevel(what, lev, m_logLevels.indexOf(lev) >= level);
+}
+
+
+void AWDBusAdaptor::SetLogLevel(const QString &what, const QString &level,
+                                const bool enabled)
+{
+    qCDebug(LOG_DBUS) << "Set log level" << level << "enabled" << enabled
+                      << "for" << what;
+
+    if (!m_logLevels.contains(level)) {
+        qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be in"
+                          << m_logLevels;
+        return;
+    }
+
+    QString state = enabled ? "true" : "false";
+    QLoggingCategory::setFilterRules(
+        QString("%1.%2=%3").arg(what).arg(level).arg(state));
+}

sources/awesome-widget/plugin/awdbusadaptor.h

@@ -0,0 +1,56 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWDBUSADAPTOR_H
+#define AWDBUSADAPTOR_H
+
+#include <QDBusAbstractAdaptor>
+
+#include "version.h"
+
+
+class AWKeys;
+
+class AWDBusAdaptor : public QDBusAbstractAdaptor
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", AWDBUS_SERVICE_NAME)
+
+public:
+    explicit AWDBusAdaptor(AWKeys *_parent = nullptr);
+    virtual ~AWDBusAdaptor();
+
+public slots:
+    // get methods
+    QStringList ActiveServices() const;
+    QString Info(const QString &key) const;
+    QStringList Keys(const QString &regexp) const;
+    QString Value(const QString &key) const;
+    qlonglong WhoAmI() const;
+    // set methods
+    void SetLogLevel(const QString &what, const int level);
+    void SetLogLevel(const QString &what, const QString &level,
+                     const bool enabled);
+
+private:
+    AWKeys *m_plugin = nullptr;
+    QStringList m_logLevels = {"debug", "info", "warning", "critical"};
+};
+
+
+#endif /* AWDBUSADAPTOR_H */

sources/awesome-widget/plugin/awesomewidget.cpp

@@ -20,8 +20,11 @@
 #include <QtQml>
 
 #include "awactions.h"
+#include "awbugreporter.h"
 #include "awconfighelper.h"
 #include "awkeys.h"
+#include "awpairconfigfactory.h"
+#include "awtelemetryhandler.h"
 
 
 void AWPlugin::registerTypes(const char *uri)
@@ -29,6 +32,9 @@ void AWPlugin::registerTypes(const char *uri)
     Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.awesomewidget"));
 
     qmlRegisterType<AWActions>(uri, 1, 0, "AWActions");
+    qmlRegisterType<AWBugReporter>(uri, 1, 0, "AWBugReporter");
     qmlRegisterType<AWConfigHelper>(uri, 1, 0, "AWConfigHelper");
+    qmlRegisterType<AWPairConfigFactory>(uri, 1, 0, "AWPairConfigFactory");
     qmlRegisterType<AWKeys>(uri, 1, 0, "AWKeys");
+    qmlRegisterType<AWTelemetryHandler>(uri, 1, 0, "AWTelemetryHandler");
 }

sources/awesome-widget/plugin/awformatterconfig.cpp

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

sources/awesome-widget/plugin/awformatterconfig.h

@@ -0,0 +1,36 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWFORMATTERCONFIG_H
+#define AWFORMATTERCONFIG_H
+
+#include "awabstractpairconfig.h"
+
+
+class AWFormatterConfig : public AWAbstractPairConfig
+{
+    Q_OBJECT
+
+public:
+    explicit AWFormatterConfig(QWidget *_parent = nullptr,
+                               const QStringList &_keys = QStringList());
+    virtual ~AWFormatterConfig();
+};
+
+
+#endif /* AWFORMATTERCONFIG_H */

sources/awesome-widget/plugin/awformatterhelper.cpp

@@ -0,0 +1,260 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awformatterhelper.h"
+
+#include <KI18n/KLocalizedString>
+
+#include <QDir>
+#include <QInputDialog>
+#include <QSettings>
+
+#include "awdatetimeformatter.h"
+#include "awdebug.h"
+#include "awfloatformatter.h"
+#include "awjsonformatter.h"
+#include "awlistformatter.h"
+#include "awnoformatter.h"
+#include "awscriptformatter.h"
+#include "awstringformatter.h"
+
+
+AWFormatterHelper::AWFormatterHelper(QWidget *_parent)
+    : AbstractExtItemAggregator(_parent, "formatters")
+    , AWAbstractPairHelper("awesomewidgets/formatters/formatters.ini",
+                           "Formatters")
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    initItems();
+}
+
+
+AWFormatterHelper::~AWFormatterHelper()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    m_formatters.clear();
+    m_formattersClasses.clear();
+}
+
+
+void AWFormatterHelper::initItems()
+{
+    initFormatters();
+    AWAbstractPairHelper::initItems();
+
+    // assign internal storage
+    m_formatters.clear();
+    for (auto &key : pairs().keys()) {
+        auto name = pairs()[key];
+        if (!m_formattersClasses.contains(name)) {
+            qCWarning(LOG_AW)
+                << "Invalid formatter" << name << "found in" << key;
+            continue;
+        }
+
+        m_formatters[key] = m_formattersClasses[name];
+    }
+}
+
+
+QString AWFormatterHelper::convert(const QVariant &_value,
+                                   const QString &_name) const
+{
+    qCDebug(LOG_AW) << "Convert value" << _value << "for" << _name;
+
+    return m_formatters.contains(_name) ? m_formatters[_name]->convert(_value)
+                                        : _value.toString();
+}
+
+
+QStringList AWFormatterHelper::definedFormatters() const
+{
+    return m_formatters.keys();
+}
+
+
+QList<AbstractExtItem *> AWFormatterHelper::items() const
+{
+    QList<AbstractExtItem *> converted;
+    for (auto &item : m_formattersClasses.values())
+        converted.append(item);
+
+    return converted;
+}
+
+
+void AWFormatterHelper::editPairs()
+{
+    return editItems();
+}
+
+
+QStringList AWFormatterHelper::leftKeys()
+{
+    return QStringList();
+}
+
+
+QStringList AWFormatterHelper::rightKeys()
+{
+    return m_formattersClasses.keys();
+}
+
+
+void AWFormatterHelper::editItems()
+{
+    repaintList();
+    int ret = exec();
+    qCInfo(LOG_AW) << "Dialog returns" << ret;
+}
+
+
+AWAbstractFormatter::FormatterClass
+AWFormatterHelper::defineFormatterClass(const QString &_stringType) const
+{
+    qCDebug(LOG_AW) << "Define formatter class for" << _stringType;
+
+    AWAbstractFormatter::FormatterClass formatter
+        = AWAbstractFormatter::FormatterClass::NoFormat;
+    if (_stringType == "DateTime")
+        formatter = AWAbstractFormatter::FormatterClass::DateTime;
+    else if (_stringType == "Float")
+        formatter = AWAbstractFormatter::FormatterClass::Float;
+    else if (_stringType == "List")
+        formatter = AWAbstractFormatter::FormatterClass::List;
+    else if (_stringType == "NoFormat")
+        ;
+    else if (_stringType == "Script")
+        formatter = AWAbstractFormatter::FormatterClass::Script;
+    else if (_stringType == "String")
+        formatter = AWAbstractFormatter::FormatterClass::String;
+    else if (_stringType == "Json")
+        formatter = AWAbstractFormatter::FormatterClass::Json;
+    else
+        qCWarning(LOG_AW) << "Unknown formatter" << _stringType;
+
+    return formatter;
+}
+
+
+void AWFormatterHelper::initFormatters()
+{
+    m_formattersClasses.clear();
+
+    auto dirs = directories();
+    for (auto &dir : dirs) {
+        QStringList files = QDir(dir).entryList(QDir::Files, QDir::Name);
+        for (auto &file : files) {
+            // check filename
+            if (!file.endsWith(".desktop"))
+                continue;
+            qCInfo(LOG_AW) << "Found file" << file << "in" << dir;
+            QString filePath = QString("%1/%2").arg(dir).arg(file);
+            // check if already exists
+            auto values = m_formattersClasses.values();
+            if (std::any_of(values.cbegin(), values.cend(),
+                            [&filePath](const AWAbstractFormatter *item) {
+                                return (item->fileName() == filePath);
+                            }))
+                continue;
+
+            auto metadata = readMetadata(filePath);
+            switch (metadata.second) {
+            case AWAbstractFormatter::FormatterClass::DateTime:
+                m_formattersClasses[metadata.first]
+                    = new AWDateTimeFormatter(this, filePath);
+                break;
+            case AWAbstractFormatter::FormatterClass::Float:
+                m_formattersClasses[metadata.first]
+                    = new AWFloatFormatter(this, filePath);
+                break;
+            case AWAbstractFormatter::FormatterClass::List:
+                m_formattersClasses[metadata.first]
+                    = new AWListFormatter(this, filePath);
+                break;
+            case AWAbstractFormatter::FormatterClass::Script:
+                m_formattersClasses[metadata.first]
+                    = new AWScriptFormatter(this, filePath);
+                break;
+            case AWAbstractFormatter::FormatterClass::String:
+                m_formattersClasses[metadata.first]
+                    = new AWStringFormatter(this, filePath);
+                break;
+            case AWAbstractFormatter::FormatterClass::Json:
+                m_formattersClasses[metadata.first]
+                    = new AWJsonFormatter(this, filePath);
+                break;
+            case AWAbstractFormatter::FormatterClass::NoFormat:
+                m_formattersClasses[metadata.first]
+                    = new AWNoFormatter(this, filePath);
+                break;
+            }
+        }
+    }
+}
+
+
+QPair<QString, AWAbstractFormatter::FormatterClass>
+AWFormatterHelper::readMetadata(const QString &_filePath) const
+{
+    qCDebug(LOG_AW) << "Read initial parameters from" << _filePath;
+
+    QSettings settings(_filePath, QSettings::IniFormat);
+    settings.beginGroup("Desktop Entry");
+    QString name = settings.value("Name", _filePath).toString();
+    QString type = settings.value("X-AW-Type", "NoFormat").toString();
+    AWAbstractFormatter::FormatterClass formatter = defineFormatterClass(type);
+    settings.endGroup();
+
+    return QPair<QString, AWAbstractFormatter::FormatterClass>(name, formatter);
+}
+
+
+void AWFormatterHelper::doCreateItem()
+{
+    QStringList selection
+        = {"NoFormat", "DateTime", "Float", "List", "Script", "String", "Json"};
+    bool ok;
+    QString select = QInputDialog::getItem(
+        this, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok);
+    if (!ok) {
+        qCWarning(LOG_AW) << "No type selected";
+        return;
+    }
+
+    qCInfo(LOG_AW) << "Selected type" << select;
+    AWAbstractFormatter::FormatterClass formatter
+        = defineFormatterClass(select);
+    switch (formatter) {
+    case AWAbstractFormatter::FormatterClass::DateTime:
+        return createItem<AWDateTimeFormatter>();
+    case AWAbstractFormatter::FormatterClass::Float:
+        return createItem<AWFloatFormatter>();
+    case AWAbstractFormatter::FormatterClass::List:
+        return createItem<AWListFormatter>();
+    case AWAbstractFormatter::FormatterClass::Script:
+        return createItem<AWScriptFormatter>();
+    case AWAbstractFormatter::FormatterClass::String:
+        return createItem<AWStringFormatter>();
+    case AWAbstractFormatter::FormatterClass::Json:
+        return createItem<AWJsonFormatter>();
+    case AWAbstractFormatter::FormatterClass::NoFormat:
+        return createItem<AWNoFormatter>();
+    }
+}

sources/awesome-widget/plugin/awformatterhelper.h

@@ -0,0 +1,64 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWFORMATTERHELPER_H
+#define AWFORMATTERHELPER_H
+
+#include "abstractextitemaggregator.h"
+#include "awabstractformatter.h"
+#include "awabstractpairhelper.h"
+
+
+class AWFormatterHelper : public AbstractExtItemAggregator,
+                          public AWAbstractPairHelper
+{
+    Q_OBJECT
+
+public:
+    explicit AWFormatterHelper(QWidget *_parent = nullptr);
+    virtual ~AWFormatterHelper();
+    // read-write methods
+    void initItems();
+    // methods
+    QString convert(const QVariant &_value, const QString &_name) const;
+    QStringList definedFormatters() const;
+    QList<AbstractExtItem *> items() const;
+    // configuration related
+    virtual void editPairs();
+    virtual QStringList leftKeys();
+    virtual QStringList rightKeys();
+
+public slots:
+    void editItems();
+
+private:
+    // methods
+    AWAbstractFormatter::FormatterClass
+    defineFormatterClass(const QString &_stringType) const;
+    void initFormatters();
+    QPair<QString, AWAbstractFormatter::FormatterClass>
+    readMetadata(const QString &_filePath) const;
+    // parent methods
+    void doCreateItem();
+    // properties
+    QHash<QString, AWAbstractFormatter *> m_formatters;
+    QHash<QString, AWAbstractFormatter *> m_formattersClasses;
+};
+
+
+#endif /* AWFORMATTERHELPER_H */

sources/awesome-widget/plugin/awkeycache.cpp

@@ -0,0 +1,191 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awkeycache.h"
+
+#include <QDir>
+#include <QNetworkInterface>
+#include <QSettings>
+#include <QStandardPaths>
+
+#include "awdebug.h"
+
+
+bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
+{
+    qCDebug(LOG_AW) << "Key" << _key << "with type" << _type;
+
+    QString fileName = QString("%1/awesomewidgets.ndx")
+                           .arg(QStandardPaths::writableLocation(
+                               QStandardPaths::GenericCacheLocation));
+    qCInfo(LOG_AW) << "Cache file" << fileName;
+    QSettings cache(fileName, QSettings::IniFormat);
+
+    cache.beginGroup(_type);
+    QStringList cachedValues;
+    for (auto &number : cache.allKeys())
+        cachedValues.append(cache.value(number).toString());
+
+    if (_type == "hdd") {
+        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))
+                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 (cachedValues.contains(_key))
+            return false;
+        qCInfo(LOG_AW) << "Found new key" << _key << "for type" << _type;
+        cache.setValue(
+            QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')),
+            _key);
+    }
+    cache.endGroup();
+
+    cache.sync();
+    return true;
+}
+
+
+QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys,
+                                        const QStringList &_bars,
+                                        const QVariantMap &_tooltip,
+                                        const QStringList &_userKeys,
+                                        const QStringList &_allKeys)
+{
+    qCDebug(LOG_AW) << "Looking for required keys in" << _keys << _bars
+                    << "using tooltip settings" << _tooltip;
+
+    // initial copy
+    QSet<QString> used = QSet<QString>::fromList(_keys);
+    used.unite(QSet<QString>::fromList(_bars));
+    used.unite(QSet<QString>::fromList(_userKeys));
+    // insert keys from tooltip
+    for (auto &key : _tooltip.keys()) {
+        if ((key.endsWith("Tooltip")) && (_tooltip[key].toBool())) {
+            key.remove("Tooltip");
+            used << key;
+        }
+    }
+
+    // insert depending keys, refer to AWKeys::calculateValues()
+    // hddtotmb*
+    for (auto &key : _allKeys.filter(QRegExp("^hddtotmb"))) {
+        if (!used.contains(key))
+            continue;
+        key.remove("hddtotmb");
+        int index = key.toInt();
+        used << QString("hddfreemb%1").arg(index)
+             << QString("hddmb%1").arg(index);
+    }
+    // hddtotgb*
+    for (auto &key : _allKeys.filter(QRegExp("^hddtotgb"))) {
+        if (!used.contains(key))
+            continue;
+        key.remove("hddtotgb");
+        int index = key.toInt();
+        used << QString("hddfreegb%1").arg(index)
+             << QString("hddgb%1").arg(index);
+    }
+    // mem
+    if (used.contains("mem"))
+        used << "memmb"
+             << "memtotmb";
+    // memtotmb
+    if (used.contains("memtotmb"))
+        used << "memusedmb"
+             << "memfreemb";
+    // memtotgb
+    if (used.contains("memtotgb"))
+        used << "memusedgb"
+             << "memfreegb";
+    // swap
+    if (used.contains("swap"))
+        used << "swapmb"
+             << "swaptotmb";
+    // swaptotmb
+    if (used.contains("swaptotmb"))
+        used << "swapmb"
+             << "swapfreemb";
+    // memtotgb
+    if (used.contains("swaptotgb"))
+        used << "swapgb"
+             << "swapfreegb";
+    // network keys
+    QStringList netKeys({"up", "upkb", "uptot", "uptotkb", "upunits", "down",
+                         "downkb", "downtot", "downtotkb", "downunits"});
+    for (auto &key : netKeys) {
+        if (!used.contains(key))
+            continue;
+        QStringList filt
+            = _allKeys.filter(QRegExp(QString("^%1[0-9]{1,}").arg(key)));
+        for (auto &filtered : filt)
+            used << filtered;
+    }
+    // netdev 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
+    // because empty list leads to the same behaviour as skip checking
+    if (used.isEmpty())
+        used << "dummy";
+
+    return used.toList();
+}
+
+
+QHash<QString, QStringList> AWKeyCache::loadKeysFromCache()
+{
+    QString fileName = QString("%1/awesomewidgets.ndx")
+                           .arg(QStandardPaths::writableLocation(
+                               QStandardPaths::GenericCacheLocation));
+    qCInfo(LOG_AW) << "Cache file" << fileName;
+    QSettings cache(fileName, QSettings::IniFormat);
+
+    QHash<QString, QStringList> devices;
+    for (auto &group : cache.childGroups()) {
+        cache.beginGroup(group);
+        for (auto &key : cache.allKeys())
+            devices[group].append(cache.value(key).toString());
+        cache.endGroup();
+    }
+
+    return devices;
+}

sources/awesome-widget/plugin/awkeycache.h

@@ -0,0 +1,38 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWKEYCACHE_H
+#define AWKEYCACHE_H
+
+#include <QHash>
+#include <QString>
+#include <QVariant>
+
+
+namespace AWKeyCache
+{
+bool addKeyToCache(const QString &_type, const QString &_key = "");
+QStringList getRequiredKeys(const QStringList &_keys, const QStringList &_bars,
+                            const QVariantMap &_tooltip,
+                            const QStringList &_userKeys,
+                            const QStringList &_allKeys);
+QHash<QString, QStringList> loadKeysFromCache();
+};
+
+
+#endif /* AWKEYCACHE_H */

sources/awesome-widget/plugin/awkeyoperations.cpp

@@ -0,0 +1,361 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awkeyoperations.h"
+
+#include <QDir>
+#include <QJSEngine>
+#include <QRegExp>
+#include <QThread>
+
+#include "awcustomkeyshelper.h"
+#include "awdebug.h"
+#include "awkeycache.h"
+#include "awpatternfunctions.h"
+// extensions
+#include "extnetworkrequest.h"
+#include "extquotes.h"
+#include "extscript.h"
+#include "extupgrade.h"
+#include "extweather.h"
+#include "graphicalitem.h"
+
+
+AWKeyOperations::AWKeyOperations(QObject *_parent)
+    : QObject(_parent)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    m_customKeys = new AWCustomKeysHelper(this);
+    m_graphicalItems
+        = new ExtItemAggregator<GraphicalItem>(nullptr, "desktops");
+    m_extNetRequest
+        = new ExtItemAggregator<ExtNetworkRequest>(nullptr, "requests");
+    m_extQuotes = new ExtItemAggregator<ExtQuotes>(nullptr, "quotes");
+    m_extScripts = new ExtItemAggregator<ExtScript>(nullptr, "scripts");
+    m_extUpgrade = new ExtItemAggregator<ExtUpgrade>(nullptr, "upgrade");
+    m_extWeather = new ExtItemAggregator<ExtWeather>(nullptr, "weather");
+}
+
+
+AWKeyOperations::~AWKeyOperations()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+QStringList AWKeyOperations::devices(const QString &_type) const
+{
+    qCDebug(LOG_AW) << "Looking for type" << _type;
+
+    return m_devices[_type];
+}
+
+
+QHash<QString, QStringList> AWKeyOperations::devices() const
+{
+    return m_devices;
+}
+
+
+void AWKeyOperations::updateCache()
+{
+    // update network and hdd list
+    addKeyToCache("hdd");
+    addKeyToCache("net");
+}
+
+
+QStringList AWKeyOperations::dictKeys() const
+{
+    QStringList allKeys;
+    // weather
+    for (auto &item : m_extWeather->activeItems()) {
+        allKeys.append(item->tag("weatherId"));
+        allKeys.append(item->tag("weather"));
+        allKeys.append(item->tag("humidity"));
+        allKeys.append(item->tag("pressure"));
+        allKeys.append(item->tag("temperature"));
+        allKeys.append(item->tag("timestamp"));
+    }
+    // cpuclock & cpu
+    for (int i = 0; i < QThread::idealThreadCount(); i++) {
+        allKeys.append(QString("cpucl%1").arg(i));
+        allKeys.append(QString("cpu%1").arg(i));
+    }
+    // temperature
+    for (int i = 0; i < m_devices["temp"].count(); i++)
+        allKeys.append(QString("temp%1").arg(i));
+    // hdd
+    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));
+        allKeys.append(QString("hddfreegb%1").arg(i));
+        allKeys.append(QString("hddtotmb%1").arg(i));
+        allKeys.append(QString("hddtotgb%1").arg(i));
+        allKeys.append(QString("hdd%1").arg(i));
+    }
+    // hdd speed
+    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 (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));
+        allKeys.append(QString("downtot%1").arg(i));
+        allKeys.append(QString("downkb%1").arg(i));
+        allKeys.append(QString("down%1").arg(i));
+        allKeys.append(QString("uptotkb%1").arg(i));
+        allKeys.append(QString("uptot%1").arg(i));
+        allKeys.append(QString("upkb%1").arg(i));
+        allKeys.append(QString("up%1").arg(i));
+    }
+    // battery
+    QStringList allBatteryDevices
+        = QDir("/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));
+    // package manager
+    for (auto &item : m_extUpgrade->activeItems())
+        allKeys.append(item->tag("pkgcount"));
+    // quotes
+    for (auto &item : m_extQuotes->activeItems()) {
+        allKeys.append(item->tag("ask"));
+        allKeys.append(item->tag("askchg"));
+        allKeys.append(item->tag("percaskchg"));
+        allKeys.append(item->tag("bid"));
+        allKeys.append(item->tag("bidchg"));
+        allKeys.append(item->tag("percbidchg"));
+        allKeys.append(item->tag("price"));
+        allKeys.append(item->tag("pricechg"));
+        allKeys.append(item->tag("percpricechg"));
+    }
+    // custom
+    for (auto &item : m_extScripts->activeItems())
+        allKeys.append(item->tag("custom"));
+    // network requests
+    for (auto &item : m_extNetRequest->activeItems())
+        allKeys.append(item->tag("response"));
+    // bars
+    for (auto &item : m_graphicalItems->activeItems())
+        allKeys.append(item->tag("bar"));
+    // user defined keys
+    allKeys.append(m_customKeys->keys());
+    // static keys
+    allKeys.append(QString(STATIC_KEYS).split(','));
+
+    // sort in valid order
+    allKeys.sort();
+    std::reverse(allKeys.begin(), allKeys.end());
+
+    return allKeys;
+}
+
+
+// this method is required to provide GraphicalItem functions (e.g. paint()) to
+// parent classes
+GraphicalItem *AWKeyOperations::giByKey(const QString &_key) const
+{
+    qCDebug(LOG_AW) << "Looking for item" << _key;
+
+    return m_graphicalItems->itemByTag(_key, "bar");
+}
+
+
+QStringList AWKeyOperations::requiredUserKeys() const
+{
+    return m_customKeys->refinedSources();
+}
+
+
+QStringList AWKeyOperations::userKeys() const
+{
+    return m_customKeys->keys();
+}
+
+
+QString AWKeyOperations::userKeySource(const QString &_key) const
+{
+    return m_customKeys->source(_key);
+}
+
+
+QString AWKeyOperations::infoByKey(const QString &_key) const
+{
+    qCDebug(LOG_AW) << "Requested key" << _key;
+
+    QString stripped = _key;
+    stripped.remove(QRegExp("\\d+"));
+    QString output;
+
+    if (_key.startsWith("bar")) {
+        AbstractExtItem *item = m_graphicalItems->itemByTag(_key, stripped);
+        if (item)
+            output = item->uniq();
+    } else if (_key.startsWith("custom")) {
+        AbstractExtItem *item = m_extScripts->itemByTag(_key, stripped);
+        if (item)
+            output = item->uniq();
+    } else if (_key.contains(QRegExp("^hdd[rw]"))) {
+        QString index = _key;
+        index.remove(QRegExp("hdd[rw]"));
+        output = m_devices["disk"][index.toInt()];
+    } else if (_key.contains(
+                   QRegExp("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)"))) {
+        QString index = _key;
+        index.remove(QRegExp("^hdd(|mb|gb|freemb|freegb|totmb|totgb)"));
+        output = m_devices["mount"][index.toInt()];
+    } else if (_key.startsWith("hddtemp")) {
+        QString index = _key;
+        index.remove("hddtemp");
+        output = m_devices["hdd"][index.toInt()];
+    } else if (_key.contains(QRegExp("^(down|up)[0-9]"))) {
+        QString index = _key;
+        index.remove(QRegExp("^(down|up)"));
+        output = m_devices["net"][index.toInt()];
+    } else if (_key.startsWith("pkgcount")) {
+        AbstractExtItem *item = m_extUpgrade->itemByTag(_key, stripped);
+        if (item)
+            output = item->uniq();
+    } else if (_key.contains(QRegExp("(^|perc)(ask|bid|price)(chg|)"))) {
+        AbstractExtItem *item = m_extQuotes->itemByTag(_key, stripped);
+        if (item)
+            output = item->uniq();
+    } else if (_key.contains(QRegExp(
+                   "(weather|weatherId|humidity|pressure|temperature)"))) {
+        AbstractExtItem *item = m_extWeather->itemByTag(_key, stripped);
+        if (item)
+            output = item->uniq();
+    } else if (_key.startsWith("temp")) {
+        QString index = _key;
+        index.remove("temp");
+        output = m_devices["temp"][index.toInt()];
+    } else if (_key.startsWith("response")) {
+        AbstractExtItem *item = m_extNetRequest->itemByTag(_key, stripped);
+        if (item)
+            output = item->uniq();
+    } else {
+        output = "(none)";
+    }
+
+    return output;
+}
+
+
+QString AWKeyOperations::pattern() const
+{
+    return m_pattern;
+}
+
+
+void AWKeyOperations::setPattern(const QString &_currentPattern)
+{
+    qCDebug(LOG_AW) << "Set pattern" << _currentPattern;
+
+    m_pattern = _currentPattern;
+}
+
+
+void AWKeyOperations::editItem(const QString &_type)
+{
+    qCDebug(LOG_AW) << "Item type" << _type;
+
+    if (_type == "graphicalitem") {
+        QStringList keys = dictKeys().filter(
+            QRegExp("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)"));
+        keys.sort();
+        m_graphicalItems->setConfigArgs(keys);
+        return m_graphicalItems->editItems();
+    } else if (_type == "extnetworkrequest") {
+        return m_extNetRequest->editItems();
+    } else if (_type == "extquotes") {
+        return m_extQuotes->editItems();
+    } else if (_type == "extscript") {
+        return m_extScripts->editItems();
+    } else if (_type == "extupgrade") {
+        return m_extUpgrade->editItems();
+    } else if (_type == "extweather") {
+        return m_extWeather->editItems();
+    }
+}
+
+
+void AWKeyOperations::addDevice(const QString &_source)
+{
+    qCDebug(LOG_AW) << "Source" << _source;
+
+    QRegExp diskRegexp = QRegExp("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)");
+    QRegExp mountRegexp = QRegExp("partitions/.*/filllevel");
+
+    if (_source.contains(diskRegexp)) {
+        QString device = _source;
+        device.remove("/Rate/rblk");
+        addKeyToCache("disk", device);
+    } else if (_source.contains(mountRegexp)) {
+        QString device = _source;
+        device.remove("partitions").remove("/filllevel");
+        addKeyToCache("mount", device);
+    } else if (_source.startsWith("lmsensors")) {
+        addKeyToCache("temp", _source);
+    }
+}
+
+
+void AWKeyOperations::addKeyToCache(const QString &_type, const QString &_key)
+{
+    qCDebug(LOG_AW) << "Key" << _key << "with type" << _type;
+
+    if (AWKeyCache::addKeyToCache(_type, _key)) {
+        m_devices = AWKeyCache::loadKeysFromCache();
+        reinitKeys();
+    }
+}
+
+
+void AWKeyOperations::reinitKeys()
+{
+    m_customKeys->initItems();
+    m_graphicalItems->initItems();
+    m_extNetRequest->initItems();
+    m_extQuotes->initItems();
+    m_extScripts->initItems();
+    m_extUpgrade->initItems();
+    m_extWeather->initItems();
+
+    // init
+    QStringList allKeys = dictKeys();
+
+    // apply aw_* functions
+    m_pattern = AWPatternFunctions::insertAllKeys(m_pattern, allKeys);
+    m_pattern = AWPatternFunctions::insertKeyCount(m_pattern, allKeys);
+    m_pattern = AWPatternFunctions::insertKeyNames(m_pattern, allKeys);
+    m_pattern = AWPatternFunctions::insertKeys(m_pattern, allKeys);
+    m_pattern = AWPatternFunctions::insertMacros(m_pattern);
+    // wrap templates
+    m_pattern = AWPatternFunctions::expandTemplates(m_pattern);
+
+    emit(updateKeys(allKeys));
+}

sources/awesome-widget/plugin/awkeyoperations.h

@@ -0,0 +1,83 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWKEYOPERATIONS_H
+#define AWKEYOPERATIONS_H
+
+#include <QObject>
+
+#include "extitemaggregator.h"
+
+
+class AWCustomKeysHelper;
+class ExtNetworkRequest;
+class ExtQuotes;
+class ExtScript;
+class ExtUpgrade;
+class ExtWeather;
+class GraphicalItem;
+
+class AWKeyOperations : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString pattern READ pattern WRITE setPattern)
+
+public:
+    explicit AWKeyOperations(QObject *_parent = nullptr);
+    virtual ~AWKeyOperations();
+    QStringList devices(const QString &_type) const;
+    QHash<QString, QStringList> devices() const;
+    void updateCache();
+    // keys
+    QStringList dictKeys() const;
+    GraphicalItem *giByKey(const QString &_key) const;
+    QStringList requiredUserKeys() const;
+    QStringList userKeys() const;
+    QString userKeySource(const QString &_key) const;
+    // values
+    QString infoByKey(const QString &_key) const;
+    QString pattern() const;
+    void setPattern(const QString &_currentPattern);
+    // configuration
+    void editItem(const QString &_type);
+
+signals:
+    void updateKeys(const QStringList &_currentKeys);
+
+public slots:
+    void addDevice(const QString &_source);
+
+private:
+    // methods
+    void addKeyToCache(const QString &_type, const QString &_key = "");
+    void reinitKeys();
+    // objects
+    AWCustomKeysHelper *m_customKeys = nullptr;
+    ExtItemAggregator<GraphicalItem> *m_graphicalItems = nullptr;
+    ExtItemAggregator<ExtNetworkRequest> *m_extNetRequest = nullptr;
+    ExtItemAggregator<ExtQuotes> *m_extQuotes = nullptr;
+    ExtItemAggregator<ExtScript> *m_extScripts = nullptr;
+    ExtItemAggregator<ExtUpgrade> *m_extUpgrade = nullptr;
+    ExtItemAggregator<ExtWeather> *m_extWeather = nullptr;
+    // variables
+    QHash<QString, QStringList> m_devices;
+    QString m_pattern;
+};
+
+
+#endif /* AWKEYOPERATIONS_H */

sources/awesome-widget/plugin/awkeys.h

@@ -24,81 +24,73 @@
 #include <QMutex>
 #include <QObject>
 
-#include "extitemaggregator.h"
-
 
 class AWDataAggregator;
 class AWDataEngineAggregator;
+class AWKeyOperations;
 class AWKeysAggregator;
-class ExtQuotes;
-class ExtScript;
-class ExtUpgrade;
-class ExtWeather;
-class GraphicalItem;
 class QThreadPool;
+class QTimer;
 
 class AWKeys : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit AWKeys(QObject *parent = nullptr);
+    explicit AWKeys(QObject *_parent = nullptr);
     virtual ~AWKeys();
-    Q_INVOKABLE void initDataAggregator(const QVariantMap tooltipParams);
-    Q_INVOKABLE void initKeys(const QString currentPattern, const int interval,
-                              const int limit);
-    Q_INVOKABLE void setAggregatorProperty(const QString key,
-                                           const QVariant value);
-    Q_INVOKABLE void setWrapNewLines(const bool wrap = false);
+    Q_INVOKABLE void initDataAggregator(const QVariantMap &_tooltipParams);
+    Q_INVOKABLE void initKeys(const QString &_currentPattern,
+                              const int _interval, const int _limit,
+                              const bool _optimize);
+    Q_INVOKABLE void setAggregatorProperty(const QString &_key,
+                                           const QVariant &_value);
+    Q_INVOKABLE void setWrapNewLines(const bool _wrap);
+    // additional method to force load keys from Qml UI. Used in some
+    // configuration pages
     Q_INVOKABLE void updateCache();
     // keys
-    Q_INVOKABLE QStringList dictKeys(const bool sorted = false,
-                                     const QString regexp = QString()) const;
-    Q_INVOKABLE QStringList getHddDevices() const;
+    Q_INVOKABLE QStringList dictKeys(const bool _sorted = false,
+                                     const QString &_regexp = "") const;
+    Q_INVOKABLE QVariantList getHddDevices() const;
     // values
-    Q_INVOKABLE QString infoByKey(QString key) const;
-    Q_INVOKABLE QString valueByKey(QString key) const;
+    Q_INVOKABLE QString infoByKey(const QString &_key) const;
+    Q_INVOKABLE QString valueByKey(const QString &_key) const;
     // configuration
-    Q_INVOKABLE void editItem(const QString type);
+    Q_INVOKABLE void editItem(const QString &_type);
 
 public slots:
-    void addDevice(const QString source);
-    void dataUpdated(const QString &sourceName,
-                     const Plasma::DataEngine::Data &data);
+    void dataUpdated(const QString &_sourceName,
+                     const Plasma::DataEngine::Data &_data);
     // dummy method required by DataEngine connections
     void modelChanged(QString, QAbstractItemModel *){};
 
 signals:
-    void dropSourceFromDataengine(const QString source);
-    void needTextToBeUpdated(const QString newText) const;
-    void needToolTipToBeUpdated(const QString newText) const;
-    void needToBeUpdated();
+    void dropSourceFromDataengine(const QString &_source);
+    void needTextToBeUpdated(const QString &_newText) const;
+    void needToolTipToBeUpdated(const QString &_newText) const;
 
 private slots:
-    void loadKeysFromCache();
-    void reinitKeys();
+    void reinitKeys(const QStringList &_currentKeys);
     void updateTextData();
 
 private:
     // methods
-    void addKeyToCache(const QString type, const QString key = QString(""));
     void calculateValues();
-    QString parsePattern(QString pattern) const;
-    void setDataBySource(const QString &sourceName, const QVariantMap &data);
+    void createDBusInterface();
+    QString parsePattern(QString _pattern) const;
+    void setDataBySource(const QString &_sourceName, const QVariantMap &_data);
     // objects
-    AWDataAggregator *dataAggregator = nullptr;
-    AWDataEngineAggregator *dataEngineAggregator = nullptr;
-    AWKeysAggregator *aggregator = nullptr;
-    ExtItemAggregator<GraphicalItem> *graphicalItems = nullptr;
-    ExtItemAggregator<ExtQuotes> *extQuotes = nullptr;
-    ExtItemAggregator<ExtScript> *extScripts = nullptr;
-    ExtItemAggregator<ExtUpgrade> *extUpgrade = nullptr;
-    ExtItemAggregator<ExtWeather> *extWeather = nullptr;
+    AWDataAggregator *m_dataAggregator = nullptr;
+    AWDataEngineAggregator *m_dataEngineAggregator = nullptr;
+    AWKeysAggregator *m_aggregator = nullptr;
+    AWKeyOperations *m_keyOperator = nullptr;
+    QTimer *m_timer = nullptr;
     // variables
-    QHash<QString, QStringList> m_devices;
-    QStringList m_foundBars, m_foundKeys, m_foundLambdas;
-    QString m_pattern;
-    QHash<QString, QString> values;
+    QVariantMap m_tooltipParams;
+    QStringList m_foundBars, m_foundKeys, m_foundLambdas, m_requiredKeys;
+    QVariantHash m_values;
+    bool m_optimize = false;
     bool m_wrapNewLines = false;
     // multithread features
     QThreadPool *m_threadPool = nullptr;

sources/awesome-widget/plugin/awkeysaggregator.cpp

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

sources/awesome-widget/plugin/awkeysaggregator.h

@@ -22,8 +22,9 @@
 #include <QHash>
 #include <QObject>
 
-#include "version.h"
 
+class AWFormatterHelper;
+class AWDataEngineMapper;
 
 class AWKeysAggregator : public QObject
 {
@@ -36,15 +37,18 @@ class AWKeysAggregator : public QObject
     Q_PROPERTY(QString tempUnits MEMBER m_tempUnits WRITE setTempUnits);
     Q_PROPERTY(bool translate MEMBER m_translate WRITE setTranslate);
 
-    enum FormaterType {
-        // general formaters
-        NoFormat = 0,
+public:
+    enum class FormatterType {
+        // general formatters
+        Custom,
+        NoFormat,
         Float,
         FloatTwoSymbols,
         Integer,
+        IntegerFive,
         IntegerThree,
         List,
-        // unit specific formaters
+        // unit specific formatters
         ACFormat,
         MemGBFormat,
         MemMBFormat,
@@ -57,39 +61,40 @@ class AWKeysAggregator : public QObject
         TimeISO,
         TimeLong,
         TimeShort,
+        Timestamp,
         Uptime,
         UptimeCustom
     };
 
-public:
-    explicit AWKeysAggregator(QObject *parent = nullptr);
+    explicit AWKeysAggregator(QObject *_parent = nullptr);
     virtual ~AWKeysAggregator();
+    void initFormatters();
     // get methods
-    QString formater(const QVariant &data, const QString &key) const;
-    QStringList keysFromSource(const QString &source) const;
+    QString formatter(const QVariant &_data, const QString &_key) const;
+    QStringList keysFromSource(const QString &_source) const;
     // set methods
-    void setAcOffline(const QString inactive);
-    void setAcOnline(const QString active);
-    void setCustomTime(const QString customTime);
-    void setCustomUptime(const QString customUptime);
-    void setDevices(const QHash<QString, QStringList> devices);
-    void setTempUnits(const QString units);
-    void setTranslate(const bool translate);
+    void setAcOffline(const QString &_inactive);
+    void setAcOnline(const QString &_active);
+    void setCustomTime(const QString &_customTime);
+    void setCustomUptime(const QString &_customUptime);
+    void setDevices(const QHash<QString, QStringList> &_devices);
+    void setTempUnits(const QString &_units);
+    void setTranslate(const bool _translate);
 
 public slots:
-    QStringList registerSource(const QString &source, const QString &units);
+    QStringList registerSource(const QString &_source, const QString &_units,
+                               const QStringList &_keys);
 
 private:
     float temperature(const float temp) const;
-    QStringList timeKeys = QString(TIME_KEYS).split(QChar(','));
+    AWFormatterHelper *m_customFormatters = nullptr;
+    AWDataEngineMapper *m_mapper = nullptr;
+    QStringList m_timeKeys;
     // variables
     QString m_acOffline;
     QString m_acOnline;
     QString m_customTime;
     QString m_customUptime;
-    QHash<QString, QStringList> m_devices;
-    QHash<QString, FormaterType> m_formater;
-    QHash<QString, QString> m_map;
     QString m_tempUnits;
     bool m_translate = false;
 };

sources/awesome-widget/plugin/awpairconfigfactory.cpp

@@ -15,55 +15,37 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
+#include "awpairconfigfactory.h"
 
-#include "updatesource.h"
-
+#include "awcustomkeysconfig.h"
 #include "awdebug.h"
+#include "awformatterconfig.h"
 
 
-UpdateSource::UpdateSource(QObject *parent, const QStringList args)
-    : AbstractExtSysMonSource(parent, args)
+AWPairConfigFactory::AWPairConfigFactory(QObject *_parent)
+    : QObject(_parent)
 {
-    Q_ASSERT(args.count() == 0);
-    qCDebug(LOG_ESM) << __PRETTY_FUNCTION__;
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 }
 
 
-UpdateSource::~UpdateSource()
+AWPairConfigFactory::~AWPairConfigFactory()
 {
-    qCDebug(LOG_ESM) << __PRETTY_FUNCTION__;
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 }
 
 
-QVariant UpdateSource::data(QString source)
+void AWPairConfigFactory::showFormatterDialog(const QStringList &_keys)
 {
-    qCDebug(LOG_ESM) << "Source" << source;
-
-    return true;
+    AWFormatterConfig *config = new AWFormatterConfig(nullptr, _keys);
+    config->showDialog();
+    config->deleteLater();
 }
 
 
-QVariantMap UpdateSource::initialData(QString source) const
+void AWPairConfigFactory::showKeysDialog(const QStringList &_keys)
 {
-    qCDebug(LOG_ESM) << "Source" << source;
-
-    QVariantMap data;
-    if (source == QString("update")) {
-        data[QString("min")] = true;
-        data[QString("max")] = true;
-        data[QString("name")] = QString("Simple value which is always true");
-        data[QString("type")] = QString("bool");
-        data[QString("units")] = QString("");
-    }
-
-    return data;
-}
-
-
-QStringList UpdateSource::sources() const
-{
-    QStringList sources;
-    sources.append(QString("update"));
-
-    return sources;
+    AWCustomKeysConfig *config = new AWCustomKeysConfig(nullptr, _keys);
+    config->showDialog();
+    config->deleteLater();
 }

sources/awesome-widget/plugin/awpairconfigfactory.h

@@ -15,24 +15,25 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#ifndef UPDATESOURCE_H
-#define UPDATESOURCE_H
+
+#ifndef AWPAIRCONFIGFACTORY_H
+#define AWPAIRCONFIGFACTORY_H
 
 #include <QObject>
 
-#include "abstractextsysmonsource.h"
 
-
-class UpdateSource : public AbstractExtSysMonSource
+class AWPairConfigFactory : public QObject
 {
+    Q_OBJECT
+
 public:
-    explicit UpdateSource(QObject *parent, const QStringList args);
-    virtual ~UpdateSource();
-    QVariant data(QString source);
-    QVariantMap initialData(QString source) const;
-    void run(){};
-    QStringList sources() const;
+    explicit AWPairConfigFactory(QObject *_parent = nullptr);
+    virtual ~AWPairConfigFactory();
+    Q_INVOKABLE void showFormatterDialog(const QStringList &_keys);
+    Q_INVOKABLE void showKeysDialog(const QStringList &_keys);
+
+private:
 };
 
 
-#endif /* UPDATESOURCE_H */
+#endif /* AWPAIRCONFIGFACTORY_H */

sources/awesome-widget/plugin/awpatternfunctions.cpp

@@ -0,0 +1,308 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awpatternfunctions.h"
+
+#include <QJSEngine>
+#include <QRegularExpression>
+
+#include "awdebug.h"
+#include "awkeysaggregator.h"
+
+
+QString AWPatternFunctions::expandLambdas(QString _code,
+                                          AWKeysAggregator *_aggregator,
+                                          const QVariantHash &_metadata,
+                                          const QStringList &_usedKeys)
+{
+    qCDebug(LOG_AW) << "Expand lamdas in" << _code;
+
+    QJSEngine engine;
+    // apply $this values
+    _code.replace("$this", _metadata[_code].toString());
+    // parsed values
+    for (auto &lambdaKey : _usedKeys)
+        _code.replace(QString("$%1").arg(lambdaKey),
+                      _aggregator->formatter(_metadata[lambdaKey], lambdaKey));
+    qCInfo(LOG_AW) << "Expression" << _code;
+    QJSValue result = engine.evaluate(_code);
+    if (result.isError()) {
+        qCWarning(LOG_AW) << "Uncaught exception at line"
+                          << result.property("lineNumber").toInt() << ":"
+                          << result.toString();
+        return "";
+    } else {
+        return result.toString();
+    }
+}
+
+
+QString AWPatternFunctions::expandTemplates(QString _code)
+{
+    qCDebug(LOG_AW) << "Expand templates in" << _code;
+
+    // match the following construction $template{{some code here}}
+    QRegularExpression templatesRegexp("\\$template\\{\\{(?<body>.*?)\\}\\}");
+    templatesRegexp.setPatternOptions(
+        QRegularExpression::DotMatchesEverythingOption);
+
+    QRegularExpressionMatchIterator it = templatesRegexp.globalMatch(_code);
+    while (it.hasNext()) {
+        QRegularExpressionMatch match = it.next();
+        QString body = match.captured("body");
+
+        QJSEngine engine;
+        qCInfo(LOG_AW) << "Expression" << body;
+        QJSValue result = engine.evaluate(body);
+        QString templateResult = "";
+        if (result.isError()) {
+            qCWarning(LOG_AW) << "Uncaught exception at line"
+                              << result.property("lineNumber").toInt() << ":"
+                              << result.toString();
+        } else {
+            templateResult = result.toString();
+        }
+
+        // replace template
+        _code.replace(match.captured(), templateResult);
+    }
+
+    return _code;
+}
+
+
+QList<AWPatternFunctions::AWFunction>
+AWPatternFunctions::findFunctionCalls(const QString &_function,
+                                      const QString &_code)
+{
+    qCDebug(LOG_AW) << "Looking for function" << _function << "in" << _code;
+
+    // I suggest the following regex for the internal functions
+    // $aw_function_name<some args here if any>{{function body}}
+    // * args should be always comma separated (e.g. commas are not supported
+    // in this field if they are not screened by $, i.e. '$,'
+    // * body depends on the function name, double brackets should be screened
+    // by using $, e.g. ${
+    QRegularExpression regex(
+        QString("\\$%1\\<(?<args>.*?)\\>\\{\\{(?<body>.*?)\\}\\}")
+            .arg(_function));
+    regex.setPatternOptions(QRegularExpression::DotMatchesEverythingOption);
+
+    QList<AWPatternFunctions::AWFunction> foundFunctions;
+    QRegularExpressionMatchIterator it = regex.globalMatch(_code);
+    while (it.hasNext()) {
+        QRegularExpressionMatch match = it.next();
+
+        AWPatternFunctions::AWFunction metadata;
+        // work with args
+        QString argsString = match.captured("args");
+        if (argsString.isEmpty()) {
+            metadata.args = QStringList();
+        } else {
+            // replace '$,' to 0x1d
+            argsString.replace("$,", QString(0x1d));
+            QStringList args = argsString.split(',');
+            std::for_each(args.begin(), args.end(), [](QString &arg) {
+                arg.replace(QString(0x1d), ",");
+            });
+            metadata.args = args;
+        }
+        // other variables
+        metadata.body = match.captured("body");
+        metadata.what = match.captured();
+        // replace brackets
+        metadata.body.replace("${", "{");
+        metadata.body.replace("$}", "}");
+        foundFunctions.append(metadata);
+    }
+
+    return foundFunctions;
+}
+
+
+QString AWPatternFunctions::insertAllKeys(QString _code,
+                                          const QStringList &_keys)
+{
+    qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list"
+                    << _keys;
+
+    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(QRegExp(function.body));
+        std::for_each(required.begin(), required.end(), [](QString &value) {
+            value = QString("%1: $%1").arg(value);
+        });
+
+        _code.replace(function.what, required.join(separator));
+    }
+
+    return _code;
+}
+
+
+QString AWPatternFunctions::insertKeyCount(QString _code,
+                                           const QStringList &_keys)
+{
+    qCDebug(LOG_AW) << "Looking for count in code" << _code << "using list"
+                    << _keys;
+
+    QList<AWPatternFunctions::AWFunction> found
+        = AWPatternFunctions::findFunctionCalls("aw_count", _code);
+    for (auto &function : found) {
+        int count = _keys.filter(QRegExp(function.body)).count();
+
+        _code.replace(function.what, QString::number(count));
+    }
+
+    return _code;
+}
+
+
+QString AWPatternFunctions::insertKeyNames(QString _code,
+                                           const QStringList &_keys)
+{
+    qCDebug(LOG_AW) << "Looking for key names in code" << _code << "using list"
+                    << _keys;
+
+    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(QRegExp(function.body));
+
+        _code.replace(function.what, required.join(separator));
+    }
+
+    return _code;
+}
+
+
+QString AWPatternFunctions::insertKeys(QString _code, const QStringList &_keys)
+{
+    qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list"
+                    << _keys;
+
+    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(QRegExp(function.body));
+        std::for_each(required.begin(), required.end(), [](QString &value) {
+            value = QString("$%1").arg(value);
+        });
+
+        _code.replace(function.what, required.join(separator));
+    }
+
+    return _code;
+}
+
+
+QString AWPatternFunctions::insertMacros(QString _code)
+{
+    qCDebug(LOG_AW) << "Looking for macros in code" << _code;
+
+    QList<AWPatternFunctions::AWFunction> found
+        = AWPatternFunctions::findFunctionCalls("aw_macro", _code);
+    for (auto &macro : found) {
+        // get macro params
+        if (macro.args.isEmpty()) {
+            qCWarning(LOG_AW) << "No macro name found for" << macro.what;
+            continue;
+        }
+        QString name = macro.args.takeFirst();
+        // find macro usage
+        QList<AWPatternFunctions::AWFunction> macroUsage
+            = AWPatternFunctions::findFunctionCalls(
+                QString("aw_macro_%1").arg(name), _code);
+        for (auto &function : macroUsage) {
+            if (function.args.count() != macro.args.count()) {
+                qCWarning(LOG_AW)
+                    << "Invalid args count found for call" << function.what
+                    << "with macro" << macro.what;
+                continue;
+            }
+            // generate body to replace
+            QString result = macro.body;
+            std::for_each(macro.args.cbegin(), macro.args.cend(),
+                          [&result, macro, function](const QString &arg) {
+                              int index = macro.args.indexOf(arg);
+                              result.replace(QString("$%1").arg(arg),
+                                             function.args.at(index));
+                          });
+            // do replace
+            _code.replace(function.what, result);
+        }
+
+        // remove macro from source pattern
+        _code.remove(macro.what);
+    }
+
+    return _code;
+}
+
+
+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)))) {
+            qCInfo(LOG_AW) << "Found key" << key << "with bar enabled"
+                           << _isBars;
+            selectedKeys.append(key);
+            replacedCode.replace(QString("$%1").arg(key), "");
+        }
+    if (selectedKeys.isEmpty())
+        qCWarning(LOG_AW) << "No keys found";
+
+    return selectedKeys;
+}
+
+
+QStringList AWPatternFunctions::findLambdas(const QString &_code)
+{
+    qCDebug(LOG_AW) << "Looking for lambdas in code" << _code;
+
+    QStringList selectedKeys;
+    // match the following construction ${{some code here}}
+    QRegularExpression lambdaRegexp("\\$\\{\\{(?<body>.*?)\\}\\}");
+    lambdaRegexp.setPatternOptions(
+        QRegularExpression::DotMatchesEverythingOption);
+
+    QRegularExpressionMatchIterator it = lambdaRegexp.globalMatch(_code);
+    while (it.hasNext()) {
+        QRegularExpressionMatch match = it.next();
+        QString lambda = match.captured("body");
+
+        // append
+        qCInfo(LOG_AW) << "Found lambda" << lambda;
+        selectedKeys.append(lambda);
+    }
+    if (selectedKeys.isEmpty())
+        qCWarning(LOG_AW) << "No lambdas found";
+
+    return selectedKeys;
+}

sources/awesome-widget/plugin/awpatternfunctions.h

@@ -0,0 +1,55 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWPATTERNFUNCTIONS_H
+#define AWPATTERNFUNCTIONS_H
+
+#include <QString>
+#include <QVariant>
+
+
+class AWKeysAggregator;
+
+namespace AWPatternFunctions
+{
+typedef struct {
+    QStringList args;
+    QString body;
+    QString what;
+} AWFunction;
+
+// insert methods
+QString expandLambdas(QString _code, AWKeysAggregator *_aggregator,
+                      const QVariantHash &_metadata,
+                      const QStringList &_usedKeys);
+QString expandTemplates(QString _code);
+QList<AWFunction> findFunctionCalls(const QString &_function,
+                                    const QString &_code);
+QString insertAllKeys(QString _code, const QStringList &_keys);
+QString insertKeyCount(QString _code, const QStringList &_keys);
+QString insertKeyNames(QString _code, const QStringList &_keys);
+QString insertKeys(QString _code, const QStringList &_keys);
+QString insertMacros(QString _code);
+// find methods
+QStringList findKeys(const QString &_code, const QStringList &_keys,
+                     const bool _isBars);
+QStringList findLambdas(const QString &_code);
+};
+
+
+#endif /* AWPATTERNFUNCTIONS_H */

sources/awesome-widget/plugin/awtelemetryhandler.cpp

@@ -0,0 +1,190 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awtelemetryhandler.h"
+
+#include <QJsonDocument>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QSettings>
+#include <QStandardPaths>
+#include <QUuid>
+
+#include "awdebug.h"
+
+
+AWTelemetryHandler::AWTelemetryHandler(QObject *_parent,
+                                       const QString &_clientId)
+    : QObject(_parent)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    m_localFile = QString("%1/awesomewidgets/telemetry.ini")
+                      .arg(QStandardPaths::writableLocation(
+                          QStandardPaths::GenericDataLocation));
+
+    // override client id if any
+    if (!_clientId.isEmpty())
+        m_clientId = _clientId;
+}
+
+
+AWTelemetryHandler::~AWTelemetryHandler()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+QStringList AWTelemetryHandler::get(const QString &_group) const
+{
+    qCDebug(LOG_AW) << "Get stored data for group" << _group;
+
+    QStringList values;
+
+    QSettings settings(m_localFile, QSettings::IniFormat);
+    settings.beginGroup(_group);
+    for (auto &key : settings.childKeys())
+        values.append(settings.value(key).toString());
+    settings.endGroup();
+
+    return values;
+}
+
+
+QString AWTelemetryHandler::getLast(const QString &_group) const
+{
+    qCDebug(LOG_AW) << "Get last stored data for group" << _group;
+
+    return get(_group).last();
+}
+
+
+void AWTelemetryHandler::init(const int _count, const bool _enableRemote,
+                              const QString &_clientId)
+{
+    qCDebug(LOG_AW) << "Init telemetry with count" << _count << "enable remote"
+                    << _enableRemote << "client ID" << _clientId;
+
+    m_storeCount = _count;
+    m_uploadEnabled = _enableRemote;
+    m_clientId = _clientId;
+}
+
+
+bool AWTelemetryHandler::put(const QString &_group, const QString &_value) const
+{
+    qCDebug(LOG_AW) << "Store data with group" << _group << "and value"
+                    << _value;
+
+    QSettings settings(m_localFile, QSettings::IniFormat);
+    settings.beginGroup(_group);
+    // values will be stored as num=value inside specified group
+    // load all values to memory
+    QStringList saved;
+    for (auto &key : settings.childKeys())
+        saved.append(settings.value(key).toString());
+    // check if this value is already saved
+    if (saved.contains(_value)) {
+        qCInfo(LOG_AW) << "Configuration" << _value << "for group" << _group
+                       << "is already saved";
+        return false;
+    }
+    saved.append(_value);
+    // remove old ones
+    while (saved.count() > m_storeCount)
+        saved.takeFirst();
+    // clear group
+    settings.remove("");
+    // and save now
+    for (auto &val : saved) {
+        QString key = getKey(settings.childKeys().count());
+        settings.setValue(key, val);
+    }
+
+    // sync settings
+    settings.endGroup();
+    settings.sync();
+    // return status
+    return (settings.status() == QSettings::NoError);
+}
+
+
+void AWTelemetryHandler::uploadTelemetry(const QString &_group,
+                                         const QString &_value)
+{
+    qCDebug(LOG_AW) << "Upload data with group" << _group << "and value"
+                    << _value;
+    if (!m_uploadEnabled) {
+        qCInfo(LOG_AW) << "Upload disabled by configuration";
+        return;
+    }
+
+    QNetworkAccessManager *manager = new QNetworkAccessManager(nullptr);
+    connect(manager, SIGNAL(finished(QNetworkReply *)), this,
+            SLOT(telemetryReplyRecieved(QNetworkReply *)));
+
+    QUrl url(REMOTE_TELEMETRY_URL);
+    QNetworkRequest request(url);
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+
+    // generate payload
+    QVariantMap payload;
+    payload["api"] = AW_TELEMETRY_API;
+    payload["client_id"] = m_clientId;
+    payload["metadata"] = _value;
+    payload["type"] = _group;
+    // convert to QByteArray to send request
+    QByteArray data
+        = QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact);
+    qCInfo(LOG_AW) << "Send request with body" << data.data() << "and size"
+                   << data.size();
+
+    manager->post(request, data);
+}
+
+
+void AWTelemetryHandler::telemetryReplyRecieved(QNetworkReply *_reply)
+{
+    if (_reply->error() != QNetworkReply::NoError) {
+        qCWarning(LOG_AW) << "An error occurs" << _reply->error()
+                          << "with message" << _reply->errorString();
+        return;
+    }
+
+    QJsonParseError error;
+    QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
+    if (error.error != QJsonParseError::NoError) {
+        qCWarning(LOG_AW) << "Parse error" << error.errorString();
+        return;
+    }
+    _reply->deleteLater();
+
+    // convert to map
+    QVariantMap response = jsonDoc.toVariant().toMap();
+    QString message = response["message"].toString();
+    qCInfo(LOG_AW) << "Server reply on telemetry" << message;
+
+    return emit(replyReceived(message));
+}
+
+
+QString AWTelemetryHandler::getKey(const int _count) const
+{
+    qCDebug(LOG_AW) << "Get key for keys count" << _count;
+
+    return QString("%1").arg(_count, 3, 10, QChar('0'));
+}

sources/awesome-widget/plugin/awtelemetryhandler.h

@@ -0,0 +1,60 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWTELEMETRYHANDLER_H
+#define AWTELEMETRYHANDLER_H
+
+#include <QObject>
+
+
+class QNetworkReply;
+
+class AWTelemetryHandler : public QObject
+{
+    Q_OBJECT
+
+public:
+    const char *REMOTE_TELEMETRY_URL = "https://arcanis.me/telemetry";
+
+    explicit AWTelemetryHandler(QObject *_parent = nullptr,
+                                const QString &_clientId = "");
+    virtual ~AWTelemetryHandler();
+    Q_INVOKABLE QStringList get(const QString &_group) const;
+    Q_INVOKABLE QString getLast(const QString &_group) const;
+    Q_INVOKABLE void init(const int _count, const bool _enableRemote,
+                          const QString &_clientId);
+    Q_INVOKABLE bool put(const QString &_group, const QString &_value) const;
+    Q_INVOKABLE void uploadTelemetry(const QString &_group,
+                                     const QString &_value);
+
+signals:
+    void replyReceived(const QString &_message);
+
+private slots:
+    void telemetryReplyRecieved(QNetworkReply *_reply);
+
+private:
+    QString getKey(const int _count) const;
+    QString m_clientId;
+    QString m_localFile;
+    int m_storeCount = 0;
+    bool m_uploadEnabled = false;
+};
+
+
+#endif /* AWTELEMETRYHANDLER_H */

sources/awesome-widget/plugin/awupdatehelper.cpp

@@ -0,0 +1,191 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awupdatehelper.h"
+
+#include <KI18n/KLocalizedString>
+
+#include <QDesktopServices>
+#include <QJsonDocument>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QSettings>
+
+#include "awdebug.h"
+
+
+AWUpdateHelper::AWUpdateHelper(QObject *_parent)
+    : QObject(_parent)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    m_foundVersion = QVersionNumber::fromString(VERSION);
+    m_genericConfig = QString("%1/awesomewidgets/general.ini")
+                          .arg(QStandardPaths::writableLocation(
+                              QStandardPaths::GenericDataLocation));
+}
+
+
+AWUpdateHelper::~AWUpdateHelper()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+void AWUpdateHelper::checkUpdates(const bool _showAnyway)
+{
+    qCDebug(LOG_AW) << "Show anyway" << _showAnyway;
+
+    // showAnyway options requires to show message if no updates found on direct
+    // request. In case of automatic check no message will be shown
+    QNetworkAccessManager *manager = new QNetworkAccessManager(nullptr);
+    connect(manager, &QNetworkAccessManager::finished,
+            [_showAnyway, this](QNetworkReply *reply) {
+                return versionReplyRecieved(reply, _showAnyway);
+            });
+
+    manager->get(QNetworkRequest(QUrl(VERSION_API)));
+}
+
+
+bool AWUpdateHelper::checkVersion()
+{
+    QSettings settings(m_genericConfig, QSettings::IniFormat);
+    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(i18n("Changelog of %1", VERSION),
+                      QString(CHANGELOG).replace('@', '\n'), QMessageBox::Ok)
+            ->open();
+        return true;
+    } else if (version != m_foundVersion) {
+        qCWarning(LOG_AW) << "No changelog information provided";
+        return true;
+    } else {
+        qCInfo(LOG_AW) << "No need to update version";
+    }
+
+    return false;
+}
+
+
+void AWUpdateHelper::showInfo(const QVersionNumber &_version)
+{
+    qCDebug(LOG_AW) << "Version" << _version;
+
+    QString text
+        = i18n("You are using the actual version %1", _version.toString());
+    if (!QString(COMMIT_SHA).isEmpty())
+        text += QString(" (%1)").arg(QString(COMMIT_SHA));
+    return genMessageBox(i18n("No new version found"), text, QMessageBox::Ok)
+        ->open();
+}
+
+
+void AWUpdateHelper::showUpdates(const QVersionNumber &_version)
+{
+    qCDebug(LOG_AW) << "Version" << _version;
+
+    QString text;
+    text += i18n("Current version : %1", VERSION);
+    text += QString(COMMIT_SHA).isEmpty()
+                ? "\n"
+                : QString(" (%1)\n").arg(QString(COMMIT_SHA));
+    text += i18n("New version : %1", _version.toString()) + "\n\n";
+    text += i18n("Click \"Ok\" to download");
+
+    genMessageBox(i18n("There are updates"), text,
+                  QMessageBox::Ok | QMessageBox::Cancel)
+        ->open(this, SLOT(userReplyOnUpdates(QAbstractButton *)));
+}
+
+
+void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *_button)
+{
+    QMessageBox::ButtonRole ret
+        = static_cast<QMessageBox *>(sender())->buttonRole(_button);
+    qCInfo(LOG_AW) << "User select" << ret;
+
+    switch (ret) {
+    case QMessageBox::AcceptRole:
+        QDesktopServices::openUrl(QString(RELEASES)
+                                  + m_foundVersion.toString());
+        break;
+    case QMessageBox::RejectRole:
+    default:
+        break;
+    }
+}
+
+
+void AWUpdateHelper::versionReplyRecieved(QNetworkReply *_reply,
+                                          const bool _showAnyway)
+{
+    qCDebug(LOG_AW) << "Show message anyway" << _showAnyway;
+    if (_reply->error() != QNetworkReply::NoError) {
+        qCWarning(LOG_AW) << "An error occurs" << _reply->error()
+                          << "with message" << _reply->errorString();
+        return;
+    }
+
+    QJsonParseError error;
+    QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
+    if (error.error != QJsonParseError::NoError) {
+        qCWarning(LOG_AW) << "Parse error" << error.errorString();
+        return;
+    }
+    _reply->deleteLater();
+
+    // convert to map
+    QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
+    QString version = firstRelease["tag_name"].toString();
+    version.remove("V.");
+    m_foundVersion = QVersionNumber::fromString(version);
+    qCInfo(LOG_AW) << "Update found version to" << m_foundVersion;
+
+    QVersionNumber oldVersion = QVersionNumber::fromString(VERSION);
+    if (oldVersion < m_foundVersion)
+        return showUpdates(m_foundVersion);
+    else if (_showAnyway)
+        return showInfo(m_foundVersion);
+}
+
+
+// additional method which is used to show message box which does not block UI
+QMessageBox *
+AWUpdateHelper::genMessageBox(const QString &_title, const QString &_body,
+                              const QMessageBox::StandardButtons _buttons)
+{
+    qCDebug(LOG_AW) << "Construct message box with title" << _title
+                    << "and body" << _body;
+
+    QMessageBox *msgBox = new QMessageBox(nullptr);
+    msgBox->setAttribute(Qt::WA_DeleteOnClose);
+    msgBox->setModal(false);
+    msgBox->setWindowTitle(_title);
+    msgBox->setText(_body);
+    msgBox->setStandardButtons(_buttons);
+    msgBox->setIcon(QMessageBox::Information);
+
+    return msgBox;
+}

sources/awesome-widget/plugin/awupdatehelper.h

@@ -0,0 +1,53 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWUPDATEHELPER_H
+#define AWUPDATEHELPER_H
+
+#include <QMessageBox>
+#include <QObject>
+#include <QVersionNumber>
+
+
+class QNetworkReply;
+
+class AWUpdateHelper : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AWUpdateHelper(QObject *_parent = nullptr);
+    virtual ~AWUpdateHelper();
+    void checkUpdates(const bool _showAnyway = false);
+    bool checkVersion();
+
+private slots:
+    void showInfo(const QVersionNumber &_version);
+    void showUpdates(const QVersionNumber &_version);
+    void userReplyOnUpdates(QAbstractButton *_button);
+    void versionReplyRecieved(QNetworkReply *_reply, const bool _showAnyway);
+
+private:
+    QMessageBox *genMessageBox(const QString &_title, const QString &_body,
+                               const QMessageBox::StandardButtons _buttons);
+    QVersionNumber m_foundVersion;
+    QString m_genericConfig;
+};
+
+
+#endif /* AWUPDATEHELPER_H */

sources/awesomewidgets/CMakeLists.txt

@@ -13,9 +13,13 @@ include_directories(
 file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/qreplytimeout/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
 file(GLOB SUBPROJECT_HEADER *.h ${PROJECT_TRDPARTY_DIR}/qreplytimeout/*.h)
 file(GLOB SUBPROJECT_UI *.ui)
+file(GLOB SUBPROJECT_INI *.ini)
+set(SUBPROJECT_CONFIGS ${CMAKE_CURRENT_SOURCE_DIR}/configs)
+set(SUBPROJECT_FORMATTERS ${CMAKE_CURRENT_SOURCE_DIR}/formatters)
 set(SUBPROJECT_GRAPHITEMS ${CMAKE_CURRENT_SOURCE_DIR}/desktops)
 set(SUBPROJECT_QUOTES ${CMAKE_CURRENT_SOURCE_DIR}/quotes)
 set(SUBPROJECT_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/scripts)
+set(SUBPROJECT_REQUESTS ${CMAKE_CURRENT_SOURCE_DIR}/requests)
 set(SUBPROJECT_UPGRADE ${CMAKE_CURRENT_SOURCE_DIR}/upgrade)
 set(SUBPROJECT_WEATHER ${CMAKE_CURRENT_SOURCE_DIR}/weather)
 file(GLOB SUBPROJECT_WEATHER_JSON_IN *.json)
@@ -29,9 +33,13 @@ add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER} ${SUB
 target_link_libraries(${SUBPROJECT} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
 
 # install
+install(DIRECTORY ${SUBPROJECT_CONFIGS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_FORMATTERS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
 install(DIRECTORY ${SUBPROJECT_GRAPHITEMS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
 install(DIRECTORY ${SUBPROJECT_QUOTES} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
 install(DIRECTORY ${SUBPROJECT_SCRIPTS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_REQUESTS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
 install(DIRECTORY ${SUBPROJECT_UPGRADE} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
 install(DIRECTORY ${SUBPROJECT_WEATHER} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
+install(FILES ${SUBPROJECT_INI} DESTINATION ${CONFIG_INSTALL_DIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_WEATHER_JSON} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/weather)

sources/awesomewidgets/abstractextitem.cpp

@@ -18,23 +18,22 @@
 #include "abstractextitem.h"
 
 #include <QDir>
+#include <QLocalServer>
 #include <QSettings>
 #include <QStandardPaths>
 #include <QTime>
 
-#include "awdebug.h"
-#include "version.h"
+#include "abstractextitemaggregator.h"
+#include "qcronscheduler.h"
 
 
-AbstractExtItem::AbstractExtItem(QWidget *parent, const QString desktopName,
-                                 const QStringList directories)
-    : QDialog(parent)
-    , m_fileName(desktopName)
-    , m_dirs(directories)
+AbstractExtItem::AbstractExtItem(QWidget *_parent, const QString &_filePath)
+    : QDialog(_parent)
+    , m_fileName(_filePath)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
-    qCDebug(LOG_LIB) << "Desktop name" << desktopName;
-    qCDebug(LOG_LIB) << "Directories" << directories;
+
+    qCDebug(LOG_LIB) << "Desktop name" << _filePath;
 
     m_name = m_fileName;
 }
@@ -43,13 +42,72 @@ AbstractExtItem::AbstractExtItem(QWidget *parent, const QString desktopName,
 AbstractExtItem::~AbstractExtItem()
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
+
+    if (m_socket) {
+        m_socket->close();
+        m_socket->removeServer(socket());
+        m_socket->deleteLater();
+    }
 }
 
 
-template <class T> T *AbstractExtItem::copy(const QString, const int)
+void AbstractExtItem::bumpApi(const int _newVer)
 {
-    // an analog of pure virtual method
-    return new T();
+    qCDebug(LOG_LIB) << "Bump API using new version" << _newVer;
+
+    // update for current API
+    if ((apiVersion() > 0) && (apiVersion() < _newVer)) {
+        qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to"
+                           << _newVer;
+        setApiVersion(_newVer);
+        writeConfiguration();
+    }
+}
+
+
+void AbstractExtItem::copyDefaults(AbstractExtItem *_other) const
+{
+    _other->setActive(isActive());
+    _other->setApiVersion(apiVersion());
+    _other->setComment(comment());
+    _other->setCron(cron());
+    _other->setInterval(interval());
+    _other->setName(name());
+    _other->setSocket(socket());
+}
+
+
+void AbstractExtItem::startTimer()
+{
+    if (!socket().isEmpty())
+        // check if there is active socket setup
+        return;
+    else if (!cron().isEmpty())
+        // check if there is active scheduler
+        return;
+    else if (m_times == 1)
+        // check if it is time to update
+        emit(requestDataUpdate());
+
+    // update counter value
+    if (m_times >= interval())
+        m_times = 0;
+    m_times++;
+}
+
+
+QString AbstractExtItem::writtableConfig() const
+{
+    QString path = m_fileName;
+    QString name = QFileInfo(path).fileName();
+    path.remove(path.count() - name.count() - 1, name.count() + 1);
+    QString dir = QFileInfo(path).fileName();
+
+    return QString("%1/awesomewidgets/%2/%3")
+        .arg(QStandardPaths::writableLocation(
+            QStandardPaths::GenericDataLocation))
+        .arg(dir)
+        .arg(name);
 }
 
 
@@ -65,9 +123,9 @@ QString AbstractExtItem::comment() const
 }
 
 
-QStringList AbstractExtItem::directories() const
+QString AbstractExtItem::cron() const
 {
-    return m_dirs;
+    return m_cron;
 }
 
 
@@ -101,11 +159,17 @@ int AbstractExtItem::number() const
 }
 
 
-QString AbstractExtItem::tag(const QString _type) const
+QString AbstractExtItem::socket() const
+{
+    return m_socketFile;
+}
+
+
+QString AbstractExtItem::tag(const QString &_type) const
 {
     qCDebug(LOG_LIB) << "Tag type" << _type;
 
-    return QString("%1%2").arg(_type).arg(m_number);
+    return QString("%1%2").arg(_type).arg(number());
 }
 
 
@@ -125,7 +189,7 @@ void AbstractExtItem::setActive(const bool _state)
 }
 
 
-void AbstractExtItem::setComment(const QString _comment)
+void AbstractExtItem::setComment(const QString &_comment)
 {
     qCDebug(LOG_LIB) << "Comment" << _comment;
 
@@ -133,6 +197,28 @@ void AbstractExtItem::setComment(const QString _comment)
 }
 
 
+void AbstractExtItem::setCron(const QString &_cron)
+{
+    qCDebug(LOG_LIB) << "Cron string" << _cron;
+    // deinit module first
+    if (m_scheduler) {
+        disconnect(m_scheduler, SIGNAL(activated()), this,
+                   SIGNAL(requestDataUpdate()));
+        delete m_scheduler;
+    }
+
+    m_cron = _cron;
+    if (cron().isEmpty())
+        return;
+
+    // init scheduler
+    m_scheduler = new QCronScheduler(this);
+    m_scheduler->parse(cron());
+    connect(m_scheduler, SIGNAL(activated()), this,
+            SIGNAL(requestDataUpdate()));
+}
+
+
 void AbstractExtItem::setInterval(const int _interval)
 {
     qCDebug(LOG_LIB) << "Interval" << _interval;
@@ -143,7 +229,7 @@ void AbstractExtItem::setInterval(const int _interval)
 }
 
 
-void AbstractExtItem::setName(const QString _name)
+void AbstractExtItem::setName(const QString &_name)
 {
     qCDebug(LOG_LIB) << "Name" << _name;
 
@@ -154,74 +240,108 @@ void AbstractExtItem::setName(const QString _name)
 void AbstractExtItem::setNumber(int _number)
 {
     qCDebug(LOG_LIB) << "Number" << _number;
-    if (_number == -1)
+    bool generateNumber = (_number == -1);
+    if (generateNumber) {
         _number = []() {
             qCWarning(LOG_LIB) << "Number is empty, generate new one";
-            qsrand(QTime::currentTime().msec());
+            // we suppose that currentTIme().msec() is always valid time
+            qsrand(static_cast<uint>(QTime::currentTime().msec()));
             int n = qrand() % 1000;
             qCInfo(LOG_LIB) << "Generated number is" << n;
             return n;
         }();
+    }
 
     m_number = _number;
+    if (generateNumber)
+        writeConfiguration();
+}
+
+
+void AbstractExtItem::setSocket(const QString &_socket)
+{
+    qCDebug(LOG_LIB) << "Socket" << _socket;
+    // remove old socket first
+    deinitSocket();
+
+    m_socketFile = _socket;
+}
+
+
+void AbstractExtItem::deinitSocket()
+{
+    if (!m_socket)
+        return;
+
+    m_socket->close();
+    m_socket->removeServer(socket());
+    delete m_socket;
+    disconnect(m_socket, SIGNAL(newConnection()), this,
+               SLOT(newConnectionReceived()));
+}
+
+
+void AbstractExtItem::initSocket()
+{
+    // remove old socket first
+    deinitSocket();
+
+    m_socket = new QLocalServer(this);
+    bool listening = m_socket->listen(socket());
+    qCInfo(LOG_LIB) << "Server listening on" << socket() << listening;
+    connect(m_socket, SIGNAL(newConnection()), this,
+            SLOT(newConnectionReceived()));
 }
 
 
 void AbstractExtItem::readConfiguration()
 {
-    for (int i = m_dirs.count() - 1; i >= 0; i--) {
-        if (!QDir(m_dirs.at(i)).entryList(QDir::Files).contains(m_fileName))
-            continue;
-        QSettings settings(QString("%1/%2").arg(m_dirs.at(i)).arg(m_fileName),
-                           QSettings::IniFormat);
+    QSettings settings(m_fileName, QSettings::IniFormat);
 
-        settings.beginGroup(QString("Desktop Entry"));
-        setName(settings.value(QString("Name"), m_name).toString());
-        setComment(settings.value(QString("Comment"), m_comment).toString());
-        setApiVersion(
-            settings.value(QString("X-AW-ApiVersion"), m_apiVersion).toInt());
-        setActive(settings.value(QString("X-AW-Active"), QVariant(m_active))
-                      .toString()
-                  == QString("true"));
-        setInterval(
-            settings.value(QString("X-AW-Interval"), m_interval).toInt());
-        setNumber(settings.value(QString("X-AW-Number"), m_number).toInt());
-        settings.endGroup();
-    }
+    settings.beginGroup("Desktop Entry");
+    setName(settings.value("Name", name()).toString());
+    setComment(settings.value("Comment", comment()).toString());
+    setApiVersion(settings.value("X-AW-ApiVersion", apiVersion()).toInt());
+    setActive(settings.value("X-AW-Active", isActive()).toBool());
+    setInterval(settings.value("X-AW-Interval", interval()).toInt());
+    setNumber(settings.value("X-AW-Number", number()).toInt());
+    setCron(settings.value("X-AW-Schedule", cron()).toString());
+    setSocket(settings.value("X-AW-Socket", socket()).toString());
+    settings.endGroup();
 }
 
 
 bool AbstractExtItem::tryDelete() const
 {
-    foreach (QString dir, m_dirs) {
-        bool status = QFile::remove(QString("%1/%2").arg(dir).arg(m_fileName));
-        qCInfo(LOG_LIB) << "Remove file"
-                        << QString("%1/%2").arg(dir).arg(m_fileName) << status;
-    }
+    bool status = QFile::remove(m_fileName);
+    qCInfo(LOG_LIB) << "Remove file" << m_fileName << status;
 
-    // check if exists
-    foreach (QString dir, m_dirs)
-        if (QFile::exists(QString("%1/%2").arg(dir).arg(m_fileName)))
-            return false;
-    return true;
+    return status;
 }
 
 
 void AbstractExtItem::writeConfiguration() const
 {
-    QSettings settings(QString("%1/%2").arg(m_dirs.first()).arg(m_fileName),
-                       QSettings::IniFormat);
+    QSettings settings(writtableConfig(), QSettings::IniFormat);
     qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
 
-    settings.beginGroup(QString("Desktop Entry"));
-    settings.setValue(QString("Encoding"), QString("UTF-8"));
-    settings.setValue(QString("Name"), m_name);
-    settings.setValue(QString("Comment"), m_comment);
-    settings.setValue(QString("X-AW-ApiVersion"), m_apiVersion);
-    settings.setValue(QString("X-AW-Active"), QVariant(m_active).toString());
-    settings.setValue(QString("X-AW-Interval"), m_interval);
-    settings.setValue(QString("X-AW-Number"), m_number);
+    settings.beginGroup("Desktop Entry");
+    settings.setValue("Encoding", "UTF-8");
+    settings.setValue("Name", name());
+    settings.setValue("Comment", comment());
+    settings.setValue("X-AW-ApiVersion", apiVersion());
+    settings.setValue("X-AW-Active", isActive());
+    settings.setValue("X-AW-Interval", interval());
+    settings.setValue("X-AW-Number", number());
+    settings.setValue("X-AW-Schedule", cron());
+    settings.setValue("X-AW-Socket", socket());
     settings.endGroup();
 
     settings.sync();
 }
+
+
+void AbstractExtItem::newConnectionReceived()
+{
+    emit(requestDataUpdate());
+}

sources/awesomewidgets/abstractextitem.h

@@ -22,62 +22,86 @@
 #include <QVariant>
 
 
+class QCronScheduler;
+class QLocalServer;
+
 class AbstractExtItem : public QDialog
 {
     Q_OBJECT
     Q_PROPERTY(bool active READ isActive WRITE setActive)
     Q_PROPERTY(int apiVersion READ apiVersion WRITE setApiVersion)
     Q_PROPERTY(QString comment READ comment WRITE setComment)
-    Q_PROPERTY(QStringList directories READ directories)
+    Q_PROPERTY(QString cron READ cron WRITE setCron)
     Q_PROPERTY(QString fileName READ fileName)
     Q_PROPERTY(int interval READ interval WRITE setInterval)
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(int number READ number WRITE setNumber)
+    Q_PROPERTY(QString socket READ socket WRITE setSocket)
     Q_PROPERTY(QString uniq READ uniq)
 
 public:
-    explicit AbstractExtItem(QWidget *parent = nullptr,
-                             const QString desktopName = QString(),
-                             const QStringList directories = QStringList());
+    explicit AbstractExtItem(QWidget *_parent = nullptr,
+                             const QString &_filePath = "");
     virtual ~AbstractExtItem();
-    template <class T> T *copy(const QString, const int);
+    virtual void bumpApi(const int _newVer);
+    virtual AbstractExtItem *copy(const QString &_fileName, const int _number)
+        = 0;
+    virtual void copyDefaults(AbstractExtItem *_other) const;
+    virtual void startTimer();
+    QString writtableConfig() const;
     // get methods
     int apiVersion() const;
     QString comment() const;
-    QStringList directories() const;
+    QString cron() const;
     QString fileName() const;
     int interval() const;
     bool isActive() const;
     QString name() const;
     int number() const;
-    QString tag(const QString _type) const;
+    QString socket() const;
+    QString tag(const QString &_type) const;
     virtual QString uniq() const = 0;
     // set methods
-    void setApiVersion(const int _apiVersion = 0);
-    void setActive(const bool _state = true);
-    void setComment(const QString _comment = QString("empty"));
-    void setInterval(const int _interval = 1);
-    void setName(const QString _name = QString("none"));
-    void setNumber(int _number = -1);
+    void setApiVersion(const int _apiVersion);
+    void setActive(const bool _state);
+    void setComment(const QString &_comment);
+    void setCron(const QString &_cron);
+    void setInterval(const int _interval);
+    void setName(const QString &_name);
+    void setNumber(int _number);
+    void setSocket(const QString &_socket);
+
+signals:
+    void dataReceived(const QVariantHash &_data);
+    void requestDataUpdate();
 
 public slots:
+    virtual void deinitSocket();
+    virtual void initSocket();
     virtual void readConfiguration();
     virtual QVariantHash run() = 0;
-    virtual int showConfiguration(const QVariant args = QVariant()) = 0;
-    bool tryDelete() const;
+    virtual int showConfiguration(const QVariant &_args) = 0;
+    virtual bool tryDelete() const;
     virtual void writeConfiguration() const;
 
+private slots:
+    void newConnectionReceived();
+
 private:
-    QString m_fileName;
-    QStringList m_dirs;
+    QCronScheduler *m_scheduler = nullptr;
+    QString m_fileName = "/dev/null";
+    int m_times = 0;
     virtual void translate() = 0;
     // properties
     int m_apiVersion = 0;
     bool m_active = true;
-    QString m_comment = QString("empty");
+    QString m_comment = "empty";
+    QString m_cron = "";
     int m_interval = 1;
-    QString m_name = QString("none");
+    QString m_name = "none";
     int m_number = -1;
+    QLocalServer *m_socket = nullptr;
+    QString m_socketFile = "";
 };
 
 

sources/awesomewidgets/abstractextitemaggregator.cpp

@@ -16,40 +16,44 @@
  ***************************************************************************/
 
 #include "abstractextitemaggregator.h"
+#include "ui_abstractextitemaggregator.h"
 
 #include <KI18n/KLocalizedString>
 
-#include <QHBoxLayout>
+#include <QDir>
 #include <QInputDialog>
-#include <QLineEdit>
-
-#include "awdebug.h"
+#include <QPushButton>
 
 
-AbstractExtItemAggregator::AbstractExtItemAggregator(QWidget *parent)
-    : QWidget(parent)
+AbstractExtItemAggregator::AbstractExtItemAggregator(QWidget *_parent,
+                                                     const QString &_type)
+    : QDialog(_parent)
+    , ui(new Ui::AbstractExtItemAggregator)
+    , m_type(_type)
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
-    dialog = new QDialog(this);
-    widgetDialog = new QListWidget(dialog);
-    dialogButtons = new QDialogButtonBox(
-        QDialogButtonBox::Open | QDialogButtonBox::Close, Qt::Vertical, dialog);
-    copyButton
-        = dialogButtons->addButton(i18n("Copy"), QDialogButtonBox::ActionRole);
-    createButton = dialogButtons->addButton(i18n("Create"),
-                                            QDialogButtonBox::ActionRole);
-    deleteButton = dialogButtons->addButton(i18n("Remove"),
-                                            QDialogButtonBox::ActionRole);
-    QHBoxLayout *layout = new QHBoxLayout(dialog);
-    layout->addWidget(widgetDialog);
-    layout->addWidget(dialogButtons);
-    dialog->setLayout(layout);
+    // create directory at $HOME
+    QString localDir = QString("%1/awesomewidgets/%2")
+                           .arg(QStandardPaths::writableLocation(
+                               QStandardPaths::GenericDataLocation))
+                           .arg(type());
+    QDir localDirectory;
+    if (localDirectory.mkpath(localDir))
+        qCInfo(LOG_LIB) << "Created directory" << localDir;
 
-    connect(dialogButtons, SIGNAL(clicked(QAbstractButton *)), this,
+    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(dialogButtons, SIGNAL(rejected()), dialog, SLOT(reject()));
-    connect(widgetDialog, SIGNAL(itemActivated(QListWidgetItem *)), this,
+    connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(ui->listWidget, SIGNAL(itemActivated(QListWidgetItem *)), this,
             SLOT(editItemActivated(QListWidgetItem *)));
 }
 
@@ -58,32 +62,153 @@ AbstractExtItemAggregator::~AbstractExtItemAggregator()
 {
     qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
 
-    delete dialog;
+    delete ui;
+}
+
+
+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;
+    }
+    QString filePath = QString("%1/%2").arg(dir).arg(fileName);
+
+    AbstractExtItem *newItem = source->copy(filePath, number);
+    if (newItem->showConfiguration(configArgs()) == 1) {
+        initItems();
+        repaintList();
+    }
+}
+
+
+void AbstractExtItemAggregator::deleteItem()
+{
+    AbstractExtItem *source = itemFromWidget();
+    if (!source) {
+        qCWarning(LOG_LIB) << "Nothing to delete";
+        return;
+    };
+
+    if (source->tryDelete()) {
+        initItems();
+        repaintList();
+    }
+}
+
+
+void AbstractExtItemAggregator::editItem()
+{
+    AbstractExtItem *source = itemFromWidget();
+    if (!source) {
+        qCWarning(LOG_LIB) << "Nothing to edit";
+        return;
+    };
+
+    if (source->showConfiguration(configArgs()) == 1) {
+        initItems();
+        repaintList();
+    }
 }
 
 
 QString AbstractExtItemAggregator::getName()
 {
     bool ok;
-    QString name = QInputDialog::getText(this, i18n("Enter file name"),
-                                         i18n("File name"), QLineEdit::Normal,
-                                         QString(""), &ok);
+    QString name
+        = QInputDialog::getText(this, i18n("Enter file name"),
+                                i18n("File name"), QLineEdit::Normal, "", &ok);
     if ((!ok) || (name.isEmpty()))
-        return QString("");
-    if (!name.endsWith(QString(".desktop")))
-        name += QString(".desktop");
+        return "";
+    if (!name.endsWith(".desktop"))
+        name += ".desktop";
 
     return name;
 }
 
 
+AbstractExtItem *AbstractExtItemAggregator::itemFromWidget()
+{
+    QListWidgetItem *widgetItem = ui->listWidget->currentItem();
+    if (!widgetItem)
+        return nullptr;
+
+    AbstractExtItem *found = nullptr;
+    for (auto &item : items()) {
+        QString fileName = QFileInfo(item->fileName()).fileName();
+        if (fileName != widgetItem->text())
+            continue;
+        found = item;
+        break;
+    }
+    if (!found)
+        qCWarning(LOG_LIB) << "Could not find item by name"
+                           << widgetItem->text();
+
+    return found;
+}
+
+
+void AbstractExtItemAggregator::repaintList()
+{
+    ui->listWidget->clear();
+    for (auto &_item : items()) {
+        QString fileName = QFileInfo(_item->fileName()).fileName();
+        QListWidgetItem *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'));
+        ui->listWidget->addItem(item);
+    }
+}
+
+
+int AbstractExtItemAggregator::uniqNumber() const
+{
+    QList<int> tagList;
+    for (auto &item : items())
+        tagList.append(item->number());
+    int number = 0;
+    while (tagList.contains(number))
+        number++;
+
+    return number;
+}
+
+
 QVariant AbstractExtItemAggregator::configArgs() const
 {
     return m_configArgs;
 }
 
 
-void AbstractExtItemAggregator::setConfigArgs(const QVariant _configArgs)
+QStringList AbstractExtItemAggregator::directories() const
+{
+    auto dirs
+        = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
+                                    QString("awesomewidgets/%1").arg(type()),
+                                    QStandardPaths::LocateDirectory);
+
+    return dirs;
+}
+
+
+QString AbstractExtItemAggregator::type() const
+{
+    return m_type;
+}
+
+
+void AbstractExtItemAggregator::setConfigArgs(const QVariant &_configArgs)
 {
     qCDebug(LOG_LIB) << "Configuration arguments" << _configArgs;
 
@@ -91,22 +216,20 @@ void AbstractExtItemAggregator::setConfigArgs(const QVariant _configArgs)
 }
 
 
-void AbstractExtItemAggregator::editItemActivated(QListWidgetItem *item)
+void AbstractExtItemAggregator::editItemActivated(QListWidgetItem *)
 {
-    Q_UNUSED(item)
-
     return editItem();
 }
 
 
-void AbstractExtItemAggregator::editItemButtonPressed(QAbstractButton *button)
+void AbstractExtItemAggregator::editItemButtonPressed(QAbstractButton *_button)
 {
-    if (static_cast<QPushButton *>(button) == copyButton)
+    if (static_cast<QPushButton *>(_button) == copyButton)
         return copyItem();
-    else if (static_cast<QPushButton *>(button) == createButton)
-        return createItem();
-    else if (static_cast<QPushButton *>(button) == deleteButton)
+    else if (static_cast<QPushButton *>(_button) == createButton)
+        return doCreateItem();
+    else if (static_cast<QPushButton *>(_button) == deleteButton)
         return deleteItem();
-    else if (dialogButtons->buttonRole(button) == QDialogButtonBox::AcceptRole)
+    else if (ui->buttonBox->buttonRole(_button) == QDialogButtonBox::AcceptRole)
         return editItem();
 }

sources/awesomewidgets/abstractextitemaggregator.h

@@ -19,45 +19,81 @@
 #define ABSTRACTEXTITEMAGGREGATOR_H
 
 #include <QDialog>
-#include <QDialogButtonBox>
-#include <QListWidget>
-#include <QPushButton>
-#include <QWidget>
+#include <QStandardPaths>
+
+#include "abstractextitem.h"
+#include "awdebug.h"
 
 
-// additional class since QObject macro does not allow class templates
-class AbstractExtItemAggregator : public QWidget
+class QAbstractButton;
+class QListWidgetItem;
+namespace Ui
+{
+class AbstractExtItemAggregator;
+}
+
+class AbstractExtItemAggregator : public QDialog
 {
     Q_OBJECT
     Q_PROPERTY(QVariant configArgs READ configArgs WRITE setConfigArgs)
+    Q_PROPERTY(QVariant type READ type)
 
 public:
-    explicit AbstractExtItemAggregator(QWidget *parent = nullptr);
+    explicit AbstractExtItemAggregator(QWidget *_parent, const QString &_type);
     virtual ~AbstractExtItemAggregator();
+    // methods
+    void copyItem();
+    template <class T> void createItem()
+    {
+        QString fileName = getName();
+        int number = uniqNumber();
+        QString dir = QString("%1/awesomewidgets/%2")
+                          .arg(QStandardPaths::writableLocation(
+                              QStandardPaths::GenericDataLocation))
+                          .arg(m_type);
+        if (fileName.isEmpty()) {
+            qCWarning(LOG_LIB) << "Nothing to create";
+            return;
+        };
+        QString filePath = QString("%1/%2").arg(dir).arg(fileName);
+
+        T *newItem = new T(this, filePath);
+        newItem->setNumber(number);
+        if (newItem->showConfiguration(configArgs()) == 1) {
+            initItems();
+            repaintList();
+        };
+    };
+    void deleteItem();
+    void editItem();
     QString getName();
+    virtual void initItems() = 0;
+    AbstractExtItem *itemFromWidget();
+    void repaintList();
+    int uniqNumber() const;
+    // get methods
+    QVariant configArgs() const;
+    QStringList directories() const;
+    virtual QList<AbstractExtItem *> items() const = 0;
+    QString type() const;
+    // set methods
+    void setConfigArgs(const QVariant &_configArgs);
+
+private slots:
+    void editItemActivated(QListWidgetItem *);
+    void editItemButtonPressed(QAbstractButton *_button);
+
+private:
     // ui
-    QDialog *dialog = nullptr;
-    QListWidget *widgetDialog = nullptr;
-    QDialogButtonBox *dialogButtons = nullptr;
+    Ui::AbstractExtItemAggregator *ui = nullptr;
     QPushButton *copyButton = nullptr;
     QPushButton *createButton = nullptr;
     QPushButton *deleteButton = nullptr;
-    // get methods
-    QVariant configArgs() const;
-    // set methods
-    void setConfigArgs(const QVariant _configArgs);
-
-private slots:
-    void editItemActivated(QListWidgetItem *item);
-    void editItemButtonPressed(QAbstractButton *button);
-
-private:
+    // properties
     QVariant m_configArgs;
-    // methods
-    virtual void copyItem() = 0;
-    virtual void createItem() = 0;
-    virtual void deleteItem() = 0;
-    virtual void editItem() = 0;
+    QString m_type;
+    // ui methods
+    virtual void doCreateItem() = 0;
 };
 
 

sources/awesomewidgets/abstractextitemaggregator.ui

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AbstractExtItemAggregator</class>
+ <widget class="QDialog" name="AbstractExtItemAggregator">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QListWidget" name="listWidget"/>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Open</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>AbstractExtItemAggregator</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>AbstractExtItemAggregator</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

sources/awesomewidgets/abstractweatherprovider.h

@@ -0,0 +1,47 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#ifndef ABSTRACTWEATHERPROVIDER_H
+#define ABSTRACTWEATHERPROVIDER_H
+
+#include <QObject>
+#include <QUrl>
+
+
+class AbstractWeatherProvider : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int number READ number)
+
+public:
+    explicit AbstractWeatherProvider(QObject *_parent, const int _number)
+        : QObject(_parent)
+        , m_number(_number){};
+    virtual ~AbstractWeatherProvider(){};
+    virtual void initUrl(const QString &_city, const QString &_country,
+                         const int _ts)
+        = 0;
+    virtual QVariantHash parse(const QVariantMap &_json) const = 0;
+    virtual QUrl url() const = 0;
+    int number() const { return m_number; };
+
+private:
+    int m_number;
+};
+
+
+#endif /* ABSTRACTWEATHERPROVIDER_H */

sources/awesomewidgets/awabstractformatter.cpp

@@ -0,0 +1,144 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awabstractformatter.h"
+
+#include <QSettings>
+
+#include "awdebug.h"
+
+
+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);
+
+    static_cast<AWAbstractFormatter *>(_other)->setType(type());
+}
+
+
+QString AWAbstractFormatter::uniq() const
+{
+    return QString("%1(%2)").arg(name()).arg(strType());
+}
+
+
+QString AWAbstractFormatter::strType() const
+{
+    QString value;
+    switch (m_type) {
+    case FormatterClass::DateTime:
+        value = "DateTime";
+        break;
+    case FormatterClass::Float:
+        value = "Float";
+        break;
+    case FormatterClass::List:
+        value = "List";
+        break;
+    case FormatterClass::Script:
+        value = "Script";
+        break;
+    case FormatterClass::String:
+        value = "String";
+        break;
+    case FormatterClass::Json:
+        value = "Json";
+        break;
+    case FormatterClass::NoFormat:
+        value = "NoFormat";
+        break;
+    }
+
+    return value;
+}
+
+
+AWAbstractFormatter::FormatterClass AWAbstractFormatter::type() const
+{
+    return m_type;
+}
+
+
+void AWAbstractFormatter::setStrType(const QString &_type)
+{
+    qCDebug(LOG_LIB) << "Type" << _type;
+
+    if (_type == "DateTime")
+        m_type = FormatterClass::DateTime;
+    else if (_type == "Float")
+        m_type = FormatterClass::Float;
+    else if (_type == "List")
+        m_type = FormatterClass::List;
+    else if (_type == "Script")
+        m_type = FormatterClass::Script;
+    else if (_type == "String")
+        m_type = FormatterClass::String;
+    else if (_type == "Json")
+        m_type = FormatterClass::Json;
+    else
+        m_type = FormatterClass::NoFormat;
+}
+
+
+void AWAbstractFormatter::setType(
+    const AWAbstractFormatter::FormatterClass _type)
+{
+    qCDebug(LOG_LIB) << "Type" << static_cast<int>(_type);
+
+    m_type = _type;
+}
+
+
+void AWAbstractFormatter::readConfiguration()
+{
+    AbstractExtItem::readConfiguration();
+
+    QSettings settings(fileName(), QSettings::IniFormat);
+
+    settings.beginGroup("Desktop Entry");
+    setStrType(settings.value("X-AW-Type", strType()).toString());
+    settings.endGroup();
+}
+
+
+void AWAbstractFormatter::writeConfiguration() const
+{
+    AbstractExtItem::writeConfiguration();
+
+    QSettings settings(writtableConfig(), QSettings::IniFormat);
+    qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
+
+    settings.beginGroup("Desktop Entry");
+    settings.setValue("X-AW-Type", strType());
+    settings.endGroup();
+
+    settings.sync();
+}

sources/awesomewidgets/awabstractformatter.h

@@ -0,0 +1,64 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#ifndef AWABSTRACTFORMATTER_H
+#define AWABSTRACTFORMATTER_H
+
+#include "abstractextitem.h"
+
+
+class AWAbstractFormatter : public AbstractExtItem
+{
+    Q_OBJECT
+    Q_PROPERTY(FormatterClass type READ type WRITE setType)
+    Q_PROPERTY(QString strType READ strType WRITE setStrType)
+
+public:
+    enum class FormatterClass {
+        DateTime,
+        Float,
+        List,
+        Script,
+        String,
+        NoFormat,
+        Json
+    };
+
+    explicit AWAbstractFormatter(QWidget *_parent = nullptr,
+                                 const QString &_filePath = "");
+    virtual ~AWAbstractFormatter();
+    virtual QString convert(const QVariant &_value) const = 0;
+    void copyDefaults(AbstractExtItem *_other) const;
+    QString uniq() const;
+    // properties
+    QString strType() const;
+    FormatterClass type() const;
+    void setStrType(const QString &_type);
+    void setType(const FormatterClass _type);
+
+public slots:
+    virtual void readConfiguration();
+    QVariantHash run() { return QVariantHash(); };
+    virtual void writeConfiguration() const;
+
+private:
+    // properties
+    FormatterClass m_type = FormatterClass::NoFormat;
+};
+
+
+#endif /* AWABSTRACTFORMATTER_H */

sources/awesomewidgets/awdatetimeformatter.cpp

@@ -0,0 +1,176 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#include "awdatetimeformatter.h"
+#include "ui_awdatetimeformatter.h"
+
+#include <KI18n/KLocalizedString>
+
+#include <QDateTime>
+#include <QSettings>
+
+#include "awdebug.h"
+
+
+AWDateTimeFormatter::AWDateTimeFormatter(QWidget *_parent,
+                                         const QString &_filePath)
+    : AWAbstractFormatter(_parent, _filePath)
+    , ui(new Ui::AWDateTimeFormatter)
+{
+    qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
+
+    if (!_filePath.isEmpty())
+        readConfiguration();
+    ui->setupUi(this);
+    translate();
+}
+
+
+AWDateTimeFormatter::~AWDateTimeFormatter()
+{
+    qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
+
+    delete ui;
+}
+
+
+QString AWDateTimeFormatter::convert(const QVariant &_value) const
+{
+    qCDebug(LOG_LIB) << "Convert value" << _value;
+
+    return m_locale.toString(_value.toDateTime(), m_format);
+}
+
+
+AWDateTimeFormatter *AWDateTimeFormatter::copy(const QString &_fileName,
+                                               const int _number)
+{
+    qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
+
+    AWDateTimeFormatter *item
+        = new AWDateTimeFormatter(static_cast<QWidget *>(parent()), _fileName);
+    AWAbstractFormatter::copyDefaults(item);
+    item->setFormat(format());
+    item->setTranslateString(translateString());
+    item->setNumber(_number);
+
+    return item;
+}
+
+
+QString AWDateTimeFormatter::format() const
+{
+    return m_format;
+}
+
+
+bool AWDateTimeFormatter::translateString() const
+{
+    return m_translate;
+}
+
+
+void AWDateTimeFormatter::setFormat(const QString &_format)
+{
+    qCDebug(LOG_LIB) << "Set format" << _format;
+
+    m_format = _format;
+}
+
+
+void AWDateTimeFormatter::setTranslateString(const bool _translate)
+{
+    qCDebug(LOG_LIB) << "Set translate string" << _translate;
+
+    m_translate = _translate;
+    initLocale();
+}
+
+
+void AWDateTimeFormatter::readConfiguration()
+{
+    AWAbstractFormatter::readConfiguration();
+
+    QSettings settings(fileName(), QSettings::IniFormat);
+
+    settings.beginGroup("Desktop Entry");
+    setFormat(settings.value("X-AW-Format", format()).toString());
+    setTranslateString(
+        settings.value("X-AW-Translate", translateString()).toBool());
+    settings.endGroup();
+
+    bumpApi(AW_FORMATTER_API);
+}
+
+
+int AWDateTimeFormatter::showConfiguration(const QVariant &_args)
+{
+    Q_UNUSED(_args)
+
+    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);
+
+    int ret = exec();
+    if (ret != 1)
+        return ret;
+    setName(ui->lineEdit_name->text());
+    setComment(ui->lineEdit_comment->text());
+    setApiVersion(AW_FORMATTER_API);
+    setStrType(ui->label_typeValue->text());
+    setFormat(ui->lineEdit_format->text());
+    setTranslateString(ui->checkBox_translate->checkState() == Qt::Checked);
+
+    writeConfiguration();
+    return ret;
+}
+
+
+void AWDateTimeFormatter::writeConfiguration() const
+{
+    AWAbstractFormatter::writeConfiguration();
+
+    QSettings settings(writtableConfig(), QSettings::IniFormat);
+    qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
+
+    settings.beginGroup("Desktop Entry");
+    settings.setValue("X-AW-Format", format());
+    settings.setValue("X-AW-Translate", translateString());
+    settings.endGroup();
+
+    settings.sync();
+}
+
+
+void AWDateTimeFormatter::initLocale()
+{
+    m_locale = m_translate ? QLocale::system() : QLocale::c();
+}
+
+
+void AWDateTimeFormatter::translate()
+{
+    ui->label_name->setText(i18n("Name"));
+    ui->label_comment->setText(i18n("Comment"));
+    ui->label_type->setText(i18n("Type"));
+    ui->label_format->setText(i18n("Format"));
+    ui->checkBox_translate->setText(i18n("Translate strings"));
+}