Release 3.5.1

wayland support

.github/workflows/build.yml

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

.github/workflows/release.yml

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

.gitignore

@@ -1,7 +1,50 @@
-sources/build
-sources/usr
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+# cmake
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Makefile
+cmake_install.cmake
+install_manifest.txt
+
+# build directory
+build
+
+# archives
 *src.tar.[gx]z
 *pkg.tar.[gx]z
-build
 src
 pkg
+*.deb
+
+# clion settings
+.idea
+cmake-build*

.gitmodules

@@ -1,12 +0,0 @@
-[submodule "sources/3rdparty/pdebug"]
-	path = sources/3rdparty/pdebug
-	url = https://github.com/arcan1s/qtadds-pdebug.git
-[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

.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,15 @@
 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)
+Ibnu Daru Aji (Indonesian)
+Antonio Vivace (Italian)

CHANGELOG

@@ -1,3 +1,182 @@
+Ver.3.5.0:
++ wayland support
+* update code to latest standards
+- drop support of windows preview
+
+Ver.3.4.2:
++ Italian translation (#136, thanks to @avivace)
++ stooq quotes support (default) (#131)
++ Indonesian translation (#132, thanks to @ibnuda)
++ new keys - $batleftN, $batnowN, $batrateN, $battotalN, $brightness, $volume
+* fix compiler warnings
+* update to new qt api
+- fix non printable spaces (#142, #143)
+
+
+Ver.3.3.3:
++ add custom keys support (#101)
+* DBus interface improvements
+* rename tags (up|down|ps)total.* to (up|down|ps)tot.*
+- fix issue with invalid (up|down)total($|kb) calculation (#127)
+- fix issue with wrong applet identation (#125)
+
+Ver.3.3.2:
+- fix bug with invalid DP colour configuration
+- fix bug with invalid HTML tags operation
+* update to newest Qt and plasma
+
+Ver.3.3.1:
++ add ability to direct issue report (#104)
++ add key completion (#105)
++ add ability to load historical configuration (#106)
++ add ability to upload configuration to remote server (#106)
++ add stylish (#112)
++ add DBus intergration (#115)
++ add cron-like extenstion triggers (`X-AW-Socket` option) (#117)
++ add ability to trigger extensions by calling socket (`X-AW-Schedule` option) (#118)
++ add source for network requests
++ add Json formatter
+- drop patches provided support for Qt 5.4
+* use custom signal slot connection for dataengine (`BUILD_FUTURE` flag required)
+* update UI
+* refactoring
+
+Ver.3.2.1:
++ add X-AW-Translate option to DateTime formatter
++ add formatters to configuration export and import
++ add macro fuction to selector
++ add default formatters
+- add translation reinit (fix #102)
+- fix invalid float formatter saving
+- fix missing ApiVersion for formatters
+* use sockets for MPD data
+* translation update
+
+Ver.3.2.0:
++ custom formatters (#91)
++ add backend tests (#95)
++ add OWM weather provider for ExtWeather. It can be switched by using X-AW-Provider (ApiVer 3)
++ add DBus timeout for calls (#96)
++ add macros support (`$aw_macro` and `$aw_macro_*` for calls)
+- fix vertical alignment (#94)
+- fix bug with invalid updates on `X-AW-Interval=1` for ExtScript and ExtUpgrade
+- fix bug with missing derivate vaules in ExtQuotes
+- fix possible plasma crash (#96)
+- fix possible undefined behaviour if no extensions was found by name
+* split dataengine sources to own library
+* allow to use screened double brakets inside functions
+
+Ver.3.1.2:
++ add standalone widget configuration example
++ new tag tstime
++ 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
+* move dialogs to QML part
+
+Ver.3.0.0:
++ add tags upunits, downunits, upkb, downkb
++ add tags dalbum, dartist, dtitle, salbum, sartist, stitle
++ add support of lambda functions
++ add Dutch translation (thanks to Heimen Stoffels)
++ add check for update function on startup (optional)
++ add ability to disable string tags translations
++ add filtering to ExtUpgrade (ApiVer == 3)
++ add ability to change weather icons (ApiVer == 2)
++ show message if no updates found on direct request
++ add swap redirect type to ExtScript (ApiVer == 4)
++ add ability to wrap words
++ add support of graphs to GraphicalItems (ApiVer == 3)
++ add ability to show preview from configuration
++ add configuration export and import functions
+- fix warning for empty tooltip image
+- fix bug with widget auto resizing
+- fix bug with no settings saving in DE
+- fix bug with large start size
+- fix bug with no possibility use more than 10 ext tags
+- drop HDD free space notifications
+- drop X-AW-Output key for ExtScript (ApiVer == 4)
+- fix possible crash on web sources destruction
+* more pretty configuration ui
+* improve logging, change format to Qt5 style
+* switch to concurrent data update
+* some more optimization
+* better network device definition
+* quotes values now have double type (ApiVer == 3)
+* better quotes output
+* more comments inside code
+* more Qt code style
+* move update interval to another group
+* move DataEnignes operations to plugin
+* change DataEngine data format (breaking changes)
+
+Ver.2.4.0:
++ add support of weather items
++ add support of load average (la1, la5, la15 tags)
++ add "drop key cache" button
++ add support of clang building
++ create ExtItems aggregator
++ add time to debug information
++ add ability to disable player monitor
+- fix bug with invalid network data calculation
+- fix warning with fond dialog init
+- fix bug with no object deletions (#60)
+* rewrite ExtItems to use own abstract class
+* improve work with data updating (#57)
+* move to signal-slot interface painting
+* move plugin part back to private
+* cast plugin as type, not signleton (#57)
+* change logic in data building inside DataEngine
+* edit build and drop different DataEngine packaging
+* rewrite QMap to QHash if possible
+* rewrite to use iterators if possible
+* list of desktops is now represented as QStringList
+* refactoring
+
 Ver.2.3.3:
 * change text rendering from Qt to native
 

CHANGELOG-RU

@@ -1,319 +0,0 @@
-Вер.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

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

COPYING

@@ -1,4 +1,4 @@
-GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    awesome-widgets
-    Copyright (C) 2013-2014 Evgeniy Alekseev
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    awesome-widgets  Copyright (C) 2013 Evgeniy Alekseev
+    {project}  Copyright (C) {year}  {fullname}
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

README.md

@@ -1,6 +1,9 @@
 awesome-widgets (ex-pytextmonitor)
 ==================================
 
+[![build & tests](https://github.com/arcan1s/awesome-widgets/actions/workflows/build.yml/badge.svg)](https://github.com/arcan1s/awesome-widgets/actions/workflows/build.yml)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/8254/badge.svg)](https://scan.coverity.com/projects/awesome-widgets)
+
 Information
 -----------
 
@@ -28,6 +31,7 @@ Dependencies
 ------------
 
 * plasma-framework
+* ksysguard (since plasma 5.22)
 
 Optional dependencies
 ---------------------
@@ -35,7 +39,8 @@ Optional dependencies
 * proprietary video driver
 * hddtemp
 * smartmontools
-* music player (mpd or supported MPRIS)
+* music player (mpd or MPRIS supported)
+* wireless_tools
 
 Make dependencies
 -----------------
@@ -43,6 +48,8 @@ Make dependencies
 * cmake
 * extra-cmake-modules
 
+In addition some distros might require to install some -dev packages, e.g. the list of required packages for deb-based distros can be found [here](https://github.com/arcan1s/awesome-widgets/blob/development/.docker/Dockerfile-ubuntu-amd64#L7).
+
 Installation
 ------------
 
@@ -50,10 +57,10 @@ Installation
 * install
 
         mkdir build && cd build
-        cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../
+        cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../sources
         make && sudo make install
 
-  **NOTE** on Plasma 5 it may require `-DKDE_INSTALL_USE_QT_SYS_PATHS=ON` flag
+  **NOTE** on Plasma 5 it very likely requires `-DKDE_INSTALL_USE_QT_SYS_PATHS=ON` flag
 
 Additional information
 ======================
@@ -66,9 +73,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

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

packages/PKGBUILD

@@ -2,22 +2,22 @@
 
 pkgname=plasma5-applet-awesome-widgets
 _pkgname=awesome-widgets
-pkgver=2.3.3
+pkgver=3.4.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')
+depends=('ksysguard' 'plasma-framework')
 optdepends=("catalyst: for GPU monitor"
             "hddtemp: for HDD temperature monitor"
             "smartmontools: for HDD temperature monitor"
             "mpd: for music player monitor"
             "nvidia-utils: for GPU monitor")
-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=('a40592d66d9b5149fc7d470dc3e355cb')
+md5sums=('5953ba518191bb6fff83cdb8633c735c')
 backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
 
 prepare() {
@@ -28,8 +28,9 @@ prepare() {
 build () {
   cd "${srcdir}/build"
   cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_BUILD_TYPE=Optimization \
         -DCMAKE_INSTALL_PREFIX=/usr \
+        -DBUILD_FUTURE=ON \
         "../${_pkgname}"
   make
 }

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"
@@ -17,7 +17,7 @@ optdepends=("amarok: for music player monitor"
             "mpd: for music player monitor"
             "nvidia-utils: for GPU monitor"
             "qmmp: for music player monitor")
-makedepends=('cmake' 'extra-cmake-modules')
+makedepends=('cmake' 'extra-cmake-modules' 'git')
 source=(${_pkgname}::git+https://github.com/arcan1s/awesome-widgets/)
 install=${pkgname}.install
 md5sums=('SKIP')

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

sources/.clang-format

@@ -0,0 +1,65 @@
+---
+Language:        Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: None
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: No
+BinPackArguments: true
+BinPackParameters: true
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: Linux
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: true
+ColumnLimit:     120
+CommentPragmas:  '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IndentCaseLabels: false
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Latest
+TabWidth:        8
+UseTab:          Never
+...
+

sources/.kdev4/awesomewidgets.kdev4

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

sources/.kdev4/sources.kdev4

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

sources/3rdparty/about/about.ui

@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>About</class>
- <widget class="QWidget" name="About">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>450</width>
-    <height>359</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tab_About">
-      <attribute name="title">
-       <string>About</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <item>
-        <widget class="QScrollArea" name="scrollArea_about">
-         <property name="widgetResizable">
-          <bool>true</bool>
-         </property>
-         <widget class="QWidget" name="scrollAreaWidgetContents_about">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>418</width>
-            <height>284</height>
-           </rect>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_2">
-           <item>
-            <widget class="QLabel" name="label_name">
-             <property name="text">
-              <string/>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
-             <property name="textInteractionFlags">
-              <set>Qt::TextBrowserInteraction</set>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="label_version">
-             <property name="text">
-              <string/>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
-             <property name="textInteractionFlags">
-              <set>Qt::TextBrowserInteraction</set>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="label_description">
-             <property name="text">
-              <string/>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignJustify|Qt::AlignVCenter</set>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
-             <property name="textInteractionFlags">
-              <set>Qt::TextBrowserInteraction</set>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="label_links">
-             <property name="text">
-              <string/>
-             </property>
-             <property name="textFormat">
-              <enum>Qt::RichText</enum>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
-             <property name="openExternalLinks">
-              <bool>true</bool>
-             </property>
-             <property name="textInteractionFlags">
-              <set>Qt::TextBrowserInteraction</set>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="spacer_about">
-             <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>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tab_ackn">
-      <attribute name="title">
-       <string>Acknowledgement</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_4">
-       <item>
-        <widget class="QScrollArea" name="scrollArea_ackn">
-         <property name="widgetResizable">
-          <bool>true</bool>
-         </property>
-         <widget class="QWidget" name="scrollAreaWidgetContents_ackn">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>418</width>
-            <height>284</height>
-           </rect>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_5">
-           <item>
-            <widget class="QLabel" name="label_translators">
-             <property name="text">
-              <string/>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
-             <property name="textInteractionFlags">
-              <set>Qt::TextBrowserInteraction</set>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="label_trdparty">
-             <property name="text">
-              <string/>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
-             <property name="textInteractionFlags">
-              <set>Qt::TextBrowserInteraction</set>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="spacer_ackn">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>229</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </widget>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="label_license">
-     <property name="text">
-      <string/>
-     </property>
-     <property name="textFormat">
-      <enum>Qt::RichText</enum>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-     <property name="openExternalLinks">
-      <bool>true</bool>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::TextBrowserInteraction</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

sources/3rdparty/fontdialog/COPYING

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

sources/3rdparty/fontdialog/README.md

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

sources/3rdparty/fontdialog/fontdialog.cpp

@@ -0,0 +1,215 @@
+/***************************************************************************
+ *  Copyright (C) 2014  Evgeniy Alekseev                                      *
+ *                                                                         *
+ *  This library is free software; you can redistribute it and/or          *
+ *  modify it under the terms of the GNU Lesser General Public             *
+ *  License as published by the Free Software Foundation; either           *
+ *  version 3.0 of the License, or (at your option) any later version.     *
+ *                                                                         *
+ *  This library is distributed in the hope that it will be useful,        *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU       *
+ *  Lesser General Public License for more details.                        *
+ *                                                                         *
+ *  You should have received a copy of the GNU Lesser General Public       *
+ *  License along with this library.                                       *
+ ***************************************************************************/
+
+#include "fontdialog.h"
+
+#include <QGridLayout>
+
+
+CFont::CFont(const QString family, int pointSize, int weight, bool italic, QColor color)
+    : QFont(family, pointSize, weight, italic)
+{
+    setCurrentColor(color);
+}
+
+
+QColor CFont::color()
+{
+    return currentColor;
+}
+
+
+void CFont::setCurrentColor(const QColor color)
+{
+    currentColor = color;
+}
+
+
+int CFont::html2QFont(const int htmlWeight)
+{
+    int weight = 16;
+    switch(htmlWeight) {
+    case 100:
+        weight = 16;
+        break;
+    case 200:
+    case 300:
+        weight = 25;
+        break;
+    case 400:
+        weight = 50;
+        break;
+    case 500:
+    case 600:
+        weight = 63;
+        break;
+    case 700:
+    case 800:
+        weight = 75;
+        break;
+    case 900:
+        weight = 87;
+        break;
+    default:
+        break;
+    }
+
+    return weight;
+}
+
+
+int CFont::qFont2html(const int weight)
+{
+    int htmlWeight = 400;
+    switch(weight) {
+    case 16:
+        htmlWeight = 100;
+        break;
+    case 25:
+        htmlWeight = 300;
+        break;
+    case 50:
+        htmlWeight = 400;
+        break;
+    case 63:
+        htmlWeight = 600;
+        break;
+    case 75:
+        htmlWeight = 800;
+        break;
+    case 87:
+        htmlWeight = 900;
+        break;
+    default:
+        break;
+    }
+
+    return htmlWeight;
+}
+
+
+int CFont::htmlWeight()
+{
+    return CFont::qFont2html(weight());
+}
+
+
+void CFont::setHtmlWeight(const int htmlWeight)
+{
+    setWeight(CFont::html2QFont(htmlWeight));
+}
+
+
+CFont CFont::fromQFont(const QFont font, const QColor color)
+{
+    return CFont(font.family(), font.pointSize(), font.weight(), font.italic(), color);
+}
+
+
+QFont CFont::toQFont()
+{
+    return QFont(family(), pointSize(), weight(), italic());
+}
+
+
+CFontDialog::CFontDialog(QWidget *parent, bool needWeight, bool needItalic)
+    : QDialog(parent)
+{
+    QGridLayout *mainGrid = new QGridLayout(this);
+    setLayout(mainGrid);
+
+    colorBox = new QComboBox(this);
+    connect(colorBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(updateColor(QString)));
+    QStringList colorNames = QColor::colorNames();
+    int index = 0;
+    for (int i=0; i<colorNames.count(); i++) {
+        QColor color(colorNames[i]);
+        colorBox->addItem(colorNames[i], color);
+        QModelIndex idx = colorBox->model()->index(index++, 0);
+        colorBox->model()->setData(idx, color, Qt::BackgroundRole);
+    }
+    mainGrid->addWidget(colorBox, 0, 0);
+    fontBox = new QFontComboBox(this);
+    mainGrid->addWidget(fontBox, 0, 1);
+    sizeBox = new QSpinBox(this);
+    mainGrid->addWidget(sizeBox, 0, 2);
+    weightBox = new QSpinBox(this);
+    mainGrid->addWidget(weightBox, 0, 3);
+    italicBox = new QComboBox(this);
+    italicBox->addItem(tr("normal"));
+    italicBox->addItem(tr("italic"));
+    mainGrid->addWidget(italicBox, 0, 4);
+
+    buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
+                                   Qt::Horizontal, this);
+    QObject::connect(buttons, SIGNAL(accepted()), this, SLOT(accept()));
+    QObject::connect(buttons, SIGNAL(rejected()), this, SLOT(reject()));
+    mainGrid->addWidget(buttons, 1, 0, 1, 5);
+
+    italicBox->setHidden(!needItalic);
+    weightBox->setHidden(!needWeight);
+}
+
+
+CFontDialog::~CFontDialog()
+{
+    delete colorBox;
+    delete buttons;
+    delete fontBox;
+    delete italicBox;
+    delete sizeBox;
+    delete weightBox;
+}
+
+
+void CFontDialog::updateColor(const QString color)
+{
+    colorBox->setStyleSheet(QString("background:%1").arg(QColor(color).name()));
+}
+
+
+CFont CFontDialog::getFont(const QString title, CFont defaultFont, bool needWeight, bool needItalic, int *status)
+{
+    CFontDialog dlg(0, needWeight, needItalic);
+
+    dlg.setWindowTitle(title);
+    QStringList colorNames = QColor::colorNames();
+    for (int i=0; i<colorNames.count(); i++)
+        if (QColor(colorNames[i]) == defaultFont.color()) {
+            dlg.colorBox->setCurrentIndex(i);
+            break;
+        }
+    dlg.fontBox->setCurrentFont(defaultFont);
+    dlg.sizeBox->setValue(defaultFont.pointSize());
+    dlg.weightBox->setValue(defaultFont.weight());
+    if (defaultFont.italic())
+        dlg.italicBox->setCurrentIndex(1);
+    else
+        dlg.italicBox->setCurrentIndex(0);
+
+    CFont font = CFont(defaultFont);
+    int ret = dlg.exec();
+    if (ret == 1)
+        font = CFont(dlg.fontBox->currentFont().family(),
+                     dlg.sizeBox->value(),
+                     dlg.weightBox->value(),
+                     dlg.italicBox->currentIndex() == 1,
+                     QColor(dlg.colorBox->currentText()));
+    if (status != nullptr)
+        *status = ret;
+    return font;
+}

sources/3rdparty/fontdialog/fontdialog.h

@@ -0,0 +1,82 @@
+/***************************************************************************
+ *  Copyright (C) 2014  Evgeniy Alekseev                                      *
+ *                                                                         *
+ *  This library is free software; you can redistribute it and/or          *
+ *  modify it under the terms of the GNU Lesser General Public             *
+ *  License as published by the Free Software Foundation; either           *
+ *  version 3.0 of the License, or (at your option) any later version.     *
+ *                                                                         *
+ *  This library is distributed in the hope that it will be useful,        *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU       *
+ *  Lesser General Public License for more details.                        *
+ *                                                                         *
+ *  You should have received a copy of the GNU Lesser General Public       *
+ *  License along with this library.                                       *
+ ***************************************************************************/
+
+#ifndef FONTDIALOG_H
+#define FONTDIALOG_H
+
+#include <QComboBox>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QFontComboBox>
+#include <QSpinBox>
+
+
+class CFont : public QFont
+{
+public:
+    explicit CFont(const QString family, int pointSize = -1,
+                   int weight = -1, bool italic = false,
+                   QColor color = QColor(QString("#000000")));
+    // color properties
+    QColor color();
+    void setCurrentColor(const QColor color);
+    // html weight properties
+    static int html2QFont(const int htmlWeight);
+    static int qFont2html(const int weight);
+    int htmlWeight();
+    void setHtmlWeight(const int htmlWeight);
+    // conversion to QFont
+    static CFont fromQFont(const QFont font,
+                           const QColor color = QColor(QString("#000000")));
+    QFont toQFont();
+
+private:
+    QColor currentColor;
+};
+
+
+class CFontDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit CFontDialog(QWidget *parent = 0,
+                         const bool needWeight = true,
+                         const bool needItalic = true);
+    ~CFontDialog();
+    static CFont getFont(const QString title = tr("Select font"),
+                         CFont defaultFont = CFont(QString("Arial"),
+                                                   12, 400, false,
+                                                   QColor(QString("#000000"))),
+                         const bool needWeight = true,
+                         const bool needItalic = true,
+                         int *status = nullptr);
+
+private slots:
+    void updateColor(const QString color);
+
+private:
+    QComboBox *colorBox;
+    QDialogButtonBox *buttons;
+    QFontComboBox *fontBox;
+    QComboBox *italicBox;
+    QSpinBox *sizeBox;
+    QSpinBox *weightBox;
+};
+
+
+#endif /* FONTDIALOG_H */

sources/3rdparty/qreplytimeout/qreplytimeout.cpp

@@ -0,0 +1,18 @@
+#include "qreplytimeout.h"
+
+#include <QTimer>
+
+
+QReplyTimeout::QReplyTimeout(QNetworkReply *reply, const int timeout)
+    : QObject(reply)
+{
+    QTimer::singleShot(timeout, this, SLOT(timeout()));
+}
+
+
+void QReplyTimeout::timeout()
+{
+    auto *reply = dynamic_cast<QNetworkReply *>(parent());
+    if (reply->isRunning())
+        reply->close();
+}

sources/3rdparty/qreplytimeout/qreplytimeout.h

@@ -0,0 +1,17 @@
+// from here http://codereview.stackexchange.com/questions/30031/qnetworkreply-network-reply-timeout-helper
+// no license provided
+
+#include <QNetworkReply>
+#include <QObject>
+
+
+class QReplyTimeout : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit QReplyTimeout(QNetworkReply *reply, const int timeout);
+
+public slots:
+    void timeout();
+};

sources/CMakeLists.txt

@@ -1,46 +1,76 @@
-cmake_minimum_required (VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.16.0)
 
-cmake_policy (SET CMP0003 OLD)
-cmake_policy (SET CMP0002 OLD)
-cmake_policy (SET CMP0011 NEW)
-cmake_policy (SET CMP0015 NEW)
-
-project (awesomewidgets)
-set (PROJECT_AUTHOR "Evgeniy Alekseev")
-set (PROJECT_CONTACT "esalexeev@gmail.com")
-set (PROJECT_LICENSE "GPLv3")
-set (PROJECT_VERSION_MAJOR 2)
-set (PROJECT_VERSION_MINOR 3)
-set (PROJECT_VERSION_PATCH 3)
-set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
-
-string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC)
-string (TIMESTAMP CURRENT_YEAR "%Y")
-
-message (STATUS "Project: ${PROJECT_NAME}")
-message (STATUS "Version: ${PROJECT_VERSION}")
-message (STATUS "Build date: ${CURRENT_DATE}")
-
-# flags
-if (CMAKE_COMPILER_IS_GNUCXX)
-  set (CMAKE_CXX_FLAGS "-Wall -Wno-cpp -std=c++11")
-  set (CMAKE_CXX_FLAGS_DEBUG "-g -O0")
-  set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
-  # avoid newer gcc warnings
-  add_definitions (-D_DEFAULT_SOURCE)
-else ()
-  message (STATUS "Unknown compiler")
+# some fucking magic
+cmake_policy(SET CMP0011 NEW)
+cmake_policy(SET CMP0015 NEW)
+if (POLICY CMP0063)
+    cmake_policy(SET CMP0063 NEW)
 endif ()
-if (CMAKE_BUILD_TYPE MATCHES Debug)
-  set (CMAKE_VERBOSE_MAKEFILE ON)
+if (POLICY CMP0071)
+    cmake_policy(SET CMP0071 NEW)
 endif ()
 
-configure_file (${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
-set (PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
+project(awesomewidgets)
+set(PROJECT_AUTHOR "Evgeniy Alekseev")
+set(PROJECT_CONTACT "esalexeev@gmail.com")
+set(PROJECT_LICENSE "GPL3")
+set(PROJECT_VERSION_MAJOR "3")
+set(PROJECT_VERSION_MINOR "5")
+set(PROJECT_VERSION_PATCH "1")
+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 "")
+include(checkgit.cmake)
 
-add_subdirectory (extsysmon)
-add_subdirectory (awesome-widget)
-add_subdirectory (desktop-panel)
+string(TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC)
+string(TIMESTAMP CURRENT_YEAR "%Y")
 
-# translations
-add_subdirectory (translations)
+message(STATUS "Project: ${PROJECT_NAME}")
+message(STATUS "Version: ${PROJECT_VERSION}")
+message(STATUS "Build date: ${CURRENT_DATE}")
+
+# components
+option(BUILD_PLASMOIDS "Build plasmoids" ON)
+option(BUILD_DEB_PACKAGE "Build deb package" OFF)
+option(BUILD_RPM_PACKAGE "Build rpm package" OFF)
+# build details
+option(BUILD_FUTURE "Build with the features which will be marked as stable later" OFF)
+option(BUILD_LOAD "Build with additional load" OFF)
+option(BUILD_TESTING "Build with additional test abilities" OFF)
+
+# generate changelog
+set(PROJECT_CHANGELOG "Changelog" CACHE INTERNAL "")
+include(changelog.cmake)
+
+# directories
+set(PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
+set(PROJECT_LIBRARY awesomewidgets)
+set(PROJECT_MONITORSOURCES extsysmonsources)
+
+# modules
+include(compiler.cmake)
+include(libraries.cmake)
+include(clang-format.cmake)
+include(cppcheck.cmake)
+include(coverity.cmake)
+
+# pre-configure
+get_directory_property(CMAKE_DEFINITIONS COMPILE_DEFINITIONS)
+configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+
+# build components
+add_subdirectory(awesomewidgets)
+add_subdirectory(extsysmonsources)
+add_subdirectory(extsysmon)
+if (BUILD_PLASMOIDS)
+    add_subdirectory(qml)
+    add_subdirectory(awesome-widget)
+    add_subdirectory(desktop-panel)
+    add_subdirectory(translations)
+endif ()
+if (BUILD_TESTING)
+    enable_testing()
+    add_subdirectory(test)
+endif ()
+
+include(packages-recipe.cmake)

sources/awdebug.cpp

@@ -0,0 +1,130 @@
+/***************************************************************************
+ *   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 <KI18n/KLocalizedString>
+
+#include "awdebug.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)
+
+
+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)
+               + i18nc("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(';', Qt::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(';', Qt::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("=== Awesome Widgets configuration details ===");
+    // build information
+    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("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("cmake properties:");
+    metadata.append(QString("    CMAKE_BUILD_TYPE: %1").arg(CMAKE_BUILD_TYPE));
+    metadata.append(QString("    CMAKE_CXX_COMPILER: %1").arg(CMAKE_CXX_COMPILER));
+    metadata.append(QString("    CMAKE_CXX_FLAGS: %1").arg(CMAKE_CXX_FLAGS));
+    metadata.append(QString("    CMAKE_CXX_FLAGS_DEBUG: %1").arg(CMAKE_CXX_FLAGS_DEBUG));
+    metadata.append(QString("    CMAKE_CXX_FLAGS_RELEASE: %1").arg(CMAKE_CXX_FLAGS_RELEASE));
+    metadata.append(QString("    CMAKE_CXX_FLAGS_OPTIMIZATION: %1").arg(CMAKE_CXX_FLAGS_OPTIMIZATION));
+    metadata.append(QString("    CMAKE_DEFINITIONS: %1").arg(CMAKE_DEFINITIONS));
+    metadata.append(QString("    CMAKE_INSTALL_PREFIX: %1").arg(CMAKE_INSTALL_PREFIX));
+    metadata.append(QString("    CMAKE_MODULE_LINKER_FLAGS: %1").arg(CMAKE_MODULE_LINKER_FLAGS));
+    metadata.append(QString("    CMAKE_SHARED_LINKER_FLAGS: %1").arg(CMAKE_SHARED_LINKER_FLAGS));
+    // components
+    metadata.append("Components data:");
+    metadata.append(QString("    BUILD_PLASMOIDS: %1").arg(BUILD_PLASMOIDS));
+    metadata.append(QString("    BUILD_DEB_PACKAGE: %1").arg(BUILD_DEB_PACKAGE));
+    metadata.append(QString("    BUILD_RPM_PACKAGE: %1").arg(BUILD_RPM_PACKAGE));
+    metadata.append(QString("    CLANGFORMAT_EXECUTABLE: %1").arg(CLANGFORMAT_EXECUTABLE));
+    metadata.append(QString("    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_LOAD: %1").arg(PROP_LOAD));
+    metadata.append(QString("    PROP_TEST: %1").arg(PROP_TEST));
+
+    return metadata;
+}

sources/awdebug.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 AWDEBUG_H
+#define AWDEBUG_H
+
+#include <QLoggingCategory>
+
+#include "version.h"
+
+namespace AWDebug
+{
+const char LOG_FORMAT[] = "[%{time "
+                          "process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%"
+                          "{if-warning}WW%{endif}%{if-critical}CC%{endif}%{if-"
+                          "fatal}FF%{endif}][%{category}][%{function}] "
+                          "%{message}";
+
+QString getAboutText(const QString &_type);
+QStringList getBuildData();
+} // namespace AWDebug
+
+
+Q_DECLARE_LOGGING_CATEGORY(LOG_AW)
+Q_DECLARE_LOGGING_CATEGORY(LOG_DBUS)
+Q_DECLARE_LOGGING_CATEGORY(LOG_DP)
+Q_DECLARE_LOGGING_CATEGORY(LOG_ESM)
+Q_DECLARE_LOGGING_CATEGORY(LOG_ESS)
+Q_DECLARE_LOGGING_CATEGORY(LOG_LIB)
+
+
+#endif /* AWDEBUG_H */

sources/awesome-widget/CMakeLists.txt

@@ -1,19 +1,7 @@
-# set project name
-set (SUBPROJECT plasma_applet_awesome-widget)
-message (STATUS "Subproject ${SUBPROJECT}")
+set(SUBPROJECT plasma_applet_awesome-widget)
+message(STATUS "Subproject ${SUBPROJECT}")
 
-# prepare
-configure_file (metadata.desktop ${CMAKE_CURRENT_SOURCE_DIR}/package/metadata.desktop)
+configure_file(metadata.desktop ${CMAKE_CURRENT_SOURCE_DIR}/package/metadata.desktop)
 
-find_package (ECM 0.0.12 REQUIRED NO_MODULE)
-set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
-
-find_package (Qt5 REQUIRED COMPONENTS Core Network Qml)
-find_package (KF5 REQUIRED COMPONENTS I18n Notifications Plasma)
-
-include (KDEInstallDirs)
-include (KDECMakeSettings)
-include (KDECompilerSettings)
-
-add_subdirectory (plugin)
-plasma_install_package (package org.kde.plasma.awesomewidget)
+add_subdirectory(plugin)
+plasma_install_package(package org.kde.plasma.awesomewidget)

sources/awesome-widget/metadata.desktop

@@ -15,14 +15,12 @@ Icon=utilities-system-monitor
 X-KDE-ServiceTypes=Plasma/Applet
 X-Plasma-API=declarativeappletscript
 X-Plasma-MainScript=ui/main.qml
-X-Plasma-RemoteLocation=
 
 X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
 X-KDE-PluginInfo-Version=@PROJECT_VERSION@
-X-KDE-PluginInfo-Website=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
 X-KDE-PluginInfo-EnabledByDefault=true

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

@@ -14,20 +14,41 @@
 
     <group name="Advanced">
         <!--   advanced -->
+        <entry name="background" type="bool">
+            <default>true</default>
+        </entry>
+        <entry name="translateStrings" type="bool">
+            <default>true</default>
+        </entry>
+        <entry name="wrapNewLines" type="bool">
+            <default>false</default>
+        </entry>
+        <entry name="wrapText" type="bool">
+            <default>false</default>
+        </entry>
+        <entry name="notify" type="bool">
+            <default>true</default>
+        </entry>
+        <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>
         <entry name="width" type="int">
             <default>0</default>
         </entry>
-    <entry name="notify" type="bool">
-      <default>true</default>
+        <entry name="interval" type="int">
+            <default>1000</default>
         </entry>
-    <entry name="wrapNewLines" type="bool">
-      <default>false</default>
+        <entry name="queueLimit" type="int">
+            <default>0</default>
         </entry>
-    <entry name="background" type="bool">
-      <default>true</default>
+        <entry name="tempUnits" type="string">
+            <default>Celsius</default>
         </entry>
         <entry name="customTime" type="string">
             <default>$hh:$mm</default>
@@ -35,17 +56,20 @@
         <entry name="customUptime" type="string">
             <default>$dd,$hh,$mm</default>
         </entry>
-    <entry name="tempUnits" type="string">
-      <default>Celsius</default>
-    </entry>
         <entry name="acOnline" type="string">
             <default>(*)</default>
         </entry>
         <entry name="acOffline" type="string">
             <default>( )</default>
         </entry>
-    <entry name="checkUpdates" type="bool">
-      <default>true</default>
+        <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>
 
@@ -83,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">
@@ -105,9 +129,6 @@
 
     <group name="Appearance">
         <!--   appearance -->
-    <entry name="interval" type="int">
-      <default>1000</default>
-    </entry>
         <entry name="textAlign" type="string">
             <default>center</default>
         </entry>
@@ -126,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,96 +16,27 @@
  ***************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Controls 1.3 as QtControls
-import QtQuick.Layouts 1.0 as QtLayouts
 
-import org.kde.plasma.awesomewidget 1.0
+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: AWKeys.isDebugEnabled()
+    property bool debug: awActions.isDebugEnabled()
 
-
-    Column {
-        id: pageColumn
-        anchors.fill: parent
-        QtControls.TabView {
-            height: parent.height
-            width: parent.width
-            QtControls.Tab {
-                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 {
-                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
-                        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.log("[about::onCompleted]")
+        if (debug) console.debug()
     }
 }

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

@@ -18,163 +18,121 @@
 import QtQuick 2.0
 import QtQuick.Controls 1.3 as QtControls
 
-import org.kde.plasma.awesomewidget 1.0
+import org.kde.plasma.private.awesomewidget 1.0
 
 
 Item {
     id: advancedPage
+    // backend
+    AWActions {
+        id: awActions
+    }
+
     width: childrenRect.width
     height: childrenRect.height
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    property bool debug: AWKeys.isDebugEnabled()
+    property bool debug: awActions.isDebugEnabled()
 
+    property alias cfg_background: background.checked
+    property alias cfg_translateStrings: translate.checked
+    property alias cfg_wrapNewLines: wrapNewLines.checked
+    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_notify: notify.checked
-    property alias cfg_wrapNewLines: wrapNewLines.checked
-    property alias cfg_background: background.checked
-    property alias cfg_customTime: customTime.text
-    property alias cfg_customUptime: customUptime.text
-    property string cfg_tempUnits: tempUnits.currentText
-    property alias cfg_acOnline: acOnline.text
-    property alias cfg_acOffline: acOffline.text
+    property alias cfg_interval: update.value
+    property alias cfg_queueLimit: queueLimit.value
+    property string cfg_tempUnits: tempUnits.value
+    property alias cfg_customTime: customTime.value
+    property alias cfg_customUptime: customUptime.value
+    property alias cfg_acOnline: acOnline.value
+    property alias cfg_acOffline: acOffline.value
+    property alias cfg_telemetryCount: telemetryCount.value
+    property alias cfg_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.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
-            }
-        }
 
-        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
-            }
-        }
-
-        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")
-            }
-        }
-
-        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")
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.heigth
-                width: parent.width * 2 / 5
-            }
-            QtControls.CheckBox {
+        CheckBoxSelector {
             id: background
-                width: parent.width * 3 / 5
             text: i18n("Enable background")
         }
+
+        CheckBoxSelector {
+            id: translate
+            text: i18n("Translate strings")
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Custom time format")
-            }
-            QtControls.TextField {
-                id: customTime
-                width: parent.width * 3 / 5
-                text: plasmoid.configuration.customTime
-            }
+        CheckBoxSelector {
+            id: wrapNewLines
+            text: i18n("Wrap new lines")
         }
 
-        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
-            }
+        CheckBoxSelector {
+            id: wordWrap
+            text: i18n("Enable word wrap")
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Temperature units")
+        CheckBoxSelector {
+            id: notify
+            text: i18n("Enable notifications")
         }
-            QtControls.ComboBox {
+
+        CheckBoxSelector {
+            id: updates
+            text: i18n("Check updates on startup")
+        }
+
+        CheckBoxSelector {
+            id: optimize
+            text: i18n("Optimize subscription")
+        }
+
+        IntegerSelector {
+            id: widgetHeight
+            maximumValue: 4096
+            minimumValue: 0
+            stepSize: 50
+            text: i18n("Widget height, px")
+            value: plasmoid.configuration.height
+        }
+
+        IntegerSelector {
+            id: widgetWidth
+            maximumValue: 4096
+            minimumValue: 0
+            stepSize: 50
+            text: i18n("Widget width, px")
+            value: plasmoid.configuration.width
+        }
+
+        IntegerSelector {
+            id: update
+            maximumValue: 10000
+            minimumValue: 1000
+            stepSize: 500
+            text: i18n("Time interval")
+            value: plasmoid.configuration.interval
+        }
+
+        IntegerSelector {
+            id: queueLimit
+            maximumValue: 99
+            minimumValue: 0
+            stepSize: 1
+            text: i18n("Messages queue limit")
+            value: plasmoid.configuration.queueLimit
+        }
+
+        ComboBoxSelector {
             id: tempUnits
-                width: parent.width * 3 / 5
-                textRole: "label"
             model: [
                 {
                     'label': i18n("Celsius"),
@@ -205,53 +163,100 @@ Item {
                     'name': "kcal/mol"
                 }
             ]
-                onCurrentIndexChanged: cfg_tempUnits = model[currentIndex]["name"]
-                Component.onCompleted: {
-                    for (var i = 0; i < model.length; i++) {
-                        if (model[i]["name"] == plasmoid.configuration.tempUnits) {
-                            tempUnits.currentIndex = i;
-                        }
-                    }
-                }
-            }
+            text: i18n("Temperature units")
+            value: plasmoid.configuration.tempUnits
+            onValueEdited: cfg_tempUnits = newValue
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("AC online tag")
+        LineSelector {
+            id: customTime
+            text: i18n("Custom time format")
+            value: plasmoid.configuration.customTime
         }
-            QtControls.TextField {
+
+        LineSelector {
+            id: customUptime
+            text: i18n("Custom uptime format")
+            value: plasmoid.configuration.customUptime
+        }
+
+        LineSelector {
             id: acOnline
-                width: parent.width * 3 / 5
-                text: plasmoid.configuration.acOnline
-            }
+            text: i18n("AC online tag")
+            value: plasmoid.configuration.acOnline
         }
 
-        Row {
+        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("AC offline tag")
+            title: i18n("Actions")
+
+            Column {
+                height: implicitHeight
+                width: parent.width
+                ButtonSelector {
+                    value: i18n("Drop key cache")
+                    onButtonActivated: awActions.dropCache()
                 }
-            QtControls.TextField {
-                id: acOffline
-                width: parent.width * 3 / 5
-                text: plasmoid.configuration.acOffline
+                ButtonSelector {
+                    ExportDialog {
+                        id: saveConfigAs
+                        configuration: plasmoid.configuration
+                    }
+                    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()
                 }
             }
         }
 
+        QtControls.GroupBox {
+            height: implicitHeight
+            width: parent.width
+            title: i18n("Telemetry")
+
+            Column {
+                height: implicitHeight
+                width: parent.width
+                CheckBoxSelector {
+                    id: telemetryRemote
+                    text: i18n("Enable remote telemetry")
+                }
+                IntegerSelector {
+                    id: telemetryCount
+                    maximumValue: 10000
+                    minimumValue: 0
+                    stepSize: 50
+                    text: i18n("History count")
+                    value: plasmoid.configuration.telemetryCount
+                }
+                LineSelector {
+                    id: telemetryId
+                    text: i18n("Telemetry ID")
+                    value: plasmoid.configuration.telemetryId
+                }
+            }
+        }
+    }
+
+
     Component.onCompleted: {
-        if (debug) console.log("[advanced::onCompleted]")
+        if (debug) console.debug()
     }
 }

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

@@ -16,21 +16,24 @@
  ***************************************************************************/
 
 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.awesomewidget 1.0
+import org.kde.plasma.private.awesomewidget 1.0
+import "."
 
 
 Item {
     id: appearancePage
+    // backend
+    AWActions {
+        id: awActions
+    }
+
     width: childrenRect.width
     height: childrenRect.height
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    property bool debug: AWKeys.isDebugEnabled()
+    property bool debug: awActions.isDebugEnabled()
     property variant weight: {
         25: 0,
         50: 1,
@@ -39,201 +42,73 @@ Item {
         87: 5
     }
 
-    property alias cfg_interval: update.value
-    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("Time interval")
-            }
-            QtControls.SpinBox {
-                id: update
-                width: parent.width * 2 / 3
-                minimumValue: 1000
-                maximumValue: 10000
-                stepSize: 500
-                value: plasmoid.configuration.interval
-            }
-        }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width / 3
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
+        FontSelector {
+            id: font
             text: i18n("Font")
-            }
-            QtControls.Button {
-                id: selectFont
-                width: parent.width * 2 / 3
-                text: plasmoid.configuration.fontFamily
-                onClicked: fontDialog.visible = true
-            }
+            value: plasmoid.configuration.fontFamily
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width / 3
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Font size")
-            }
-            QtControls.SpinBox {
+        IntegerSelector {
             id: fontSize
-                width: parent.width * 2 / 3
-                minimumValue: 8
             maximumValue: 32
+            minimumValue: 8
             stepSize: 1
+            text: i18n("Font size")
             value: plasmoid.configuration.fontSize
         }
-        }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width / 3
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Font weight")
-            }
-            QtControls.ComboBox {
+        ComboBoxSelector {
             id: fontWeight
-                width: parent.width * 2 / 3
-                textRole: "label"
-                model: [
-                    {
-                        'label': i18n("light"),
-                        'name': "light"
-                    },
-                    {
-                        'label': i18n("normal"),
-                        'name': "normal"
-                    },
-                    {
-                        'label': i18n("demi bold"),
-                        'name': "demibold"
-                    },
-                    {
-                        'label': i18n("bold"),
-                        'name': "bold"
-                    },
-                    {
-                        'label': i18n("black"),
-                        'name': "black"
-                    }
-                ]
-                onCurrentIndexChanged: cfg_fontWeight = model[currentIndex]["name"]
-                Component.onCompleted: {
-                    for (var i = 0; i < model.length; i++) {
-                        if (model[i]["name"] == plasmoid.configuration.fontWeight) {
-                            fontWeight.currentIndex = i;
-                        }
-                    }
-                }
-            }
+            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 {
+        ComboBoxSelector {
             id: fontStyle
-                width: parent.width * 2 / 3
-                textRole: "label"
-                model: [
-                    {
-                        'label': i18n("normal"),
-                        'name': "normal"
-                    },
-                    {
-                        'label': i18n("italic"),
-                        'name': "italic"
-                    }
-                ]
-                onCurrentIndexChanged: cfg_fontStyle = model[currentIndex]["name"]
-                Component.onCompleted: {
-                    for (var i = 0; i < model.length; i++) {
-                        if (model[i]["name"] == plasmoid.configuration.fontStyle) {
-                            fontStyle.currentIndex = i;
-                        }
-                    }
-                }
-            }
+            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 {
+        ColorSelector {
             id: selectColor
-                width: parent.width * 2 / 3
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.fontColor
+            text: i18n("Font color")
+            value: plasmoid.configuration.fontColor
         }
+
+        ComboBoxSelector {
+            id: textStyle
+            model: General.textStyleModel
+            text: i18n("Style")
+            value: plasmoid.configuration.textStyle
+            onValueEdited: cfg_textStyle = newValue
         }
-                text: plasmoid.configuration.fontColor
-                onClicked: colorDialog.visible = true
-            }
+
+        ColorSelector {
+            id: selectStyleColor
+            text: i18n("Style color")
+            value: plasmoid.configuration.textStyleColor
         }
     }
 
-    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")
-        font: Qt.font({ family: selectFont.text, pointSize: fontSize.value, weight: Font.Normal })
-        onAccepted: {
-            selectFont.text = fontDialog.font.family
-            fontSize.value = fontDialog.font.pointSize
-            fontStyle.currentIndex = fontDialog.font.italic ? 1 : 0
-            fontWeight.currentIndex = weight[fontDialog.font.weight]
-        }
-    }
 
     Component.onCompleted: {
-        if (debug) console.log("[appearance::onCompleted]")
+        if (debug) console.debug()
     }
 }

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

@@ -16,273 +16,249 @@
  ***************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Controls 1.0 as QtControls
+import QtQuick.Controls 1.3 as QtControls
 import QtQuick.Dialogs 1.1 as QtDialogs
-import QtQuick.Layouts 1.0 as QtLayouts
-import QtQuick.Controls.Styles 1.3 as QtStyles
 
-import org.kde.plasma.awesomewidget 1.0
+import org.kde.plasma.private.awesomewidget 1.0
 
 
 Item {
     id: dataenginePage
+    // backend
+    AWKeys {
+        id: awKeys
+    }
+    AWActions {
+        id: awActions
+    }
+    AWConfigHelper {
+        id: awConfig
+    }
+
     width: childrenRect.width
     height: childrenRect.height
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    property bool debug: AWKeys.isDebugEnabled()
-    property variant tooltipSettings: {
-        "tooltipNumber": plasmoid.configuration.tooltipNumber,
-        "useTooltipBackground": plasmoid.configuration.useTooltipBackground,
-        "tooltipBackgroung": plasmoid.configuration.tooltipBackgroung,
-        "cpuTooltip": plasmoid.configuration.cpuTooltip,
-        "cpuclTooltip": plasmoid.configuration.cpuclTooltip,
-        "memTooltip": plasmoid.configuration.memTooltip,
-        "swapTooltip": plasmoid.configuration.swapTooltip,
-        "downTooltip": plasmoid.configuration.downTooltip,
-        "upTooltip": plasmoid.configuration.downTooltip,
-        "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,
-        "batTooltipColor": plasmoid.configuration.batTooltipColor,
-        "batInTooltipColor": plasmoid.configuration.batInTooltipColor
-    }
+    property bool debug: awActions.isDebugEnabled()
+
+    property variant cfg_dataengine: awConfig.readDataEngineConfiguration()
 
-    property variant cfg_dataengine: AWActions.readDataEngineConfiguration()
 
     Column {
         id: pageColumn
         anchors.fill: parent
-        Row {
+        QtControls.GroupBox {
             height: implicitHeight
             width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
+            title: i18n("ACPI")
+            LineSelector {
                 text: i18n("ACPI path")
-            }
-            QtControls.TextField {
-                width: parent.width * 3 / 5
-                text: cfg_dataengine["ACPIPATH"]
+                value: cfg_dataengine["ACPIPATH"]
+                onValueEdited: cfg_dataengine["ACPIPATH"] = newValue
             }
         }
 
-        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 scripts")
+            title: i18n("GPU")
+            ComboBoxSelector {
+                model: [
+                    {
+                        'label': "auto",
+                        'name': "auto"
+                    },
+                    {
+                        'label': "disable",
+                        'name': "disable"
+                    },
+                    {
+                        'label': "ati",
+                        'name': "ati"
+                    },
+                    {
+                        'label': "nvidia",
+                        'name': "nvidia"
                     }
-            QtControls.Button {
-                width: parent.width * 3 / 5
-                text: i18n("Edit scripts")
-                onClicked: 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("GPU device")
-            }
-            QtControls.ComboBox {
-                id: gpuDev
-                width: parent.width * 3 / 5
-                model: ["auto", "disable", "ati", "nvidia"]
-                Component.onCompleted: {
-                    for (var i=0; i<model.length; i++) {
-                        if (model[i] == cfg_dataengine["GPUDEV"]) {
-                            currentIndex = i;
-                        }
-                    }
-                }
+                value: cfg_dataengine["GPUDEV"]
+                onValueEdited: cfg_dataengine["GPUDEV"] = newValue
             }
         }
 
-        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("HDD")
-            }
-            QtControls.ComboBox {
+            title: i18n("HDD temperature")
+            Column {
+                height: implicitHeight
+                width: parent.width
+                ComboBoxSelector {
                     id: hdd
-                width: parent.width * 3 / 5
-                model: AWKeys.getHddDevices(true)
-                Component.onCompleted: {
-                    for (var i=0; i<model.length; i++) {
-                        if (model[i] == cfg_dataengine["HDDDEV"]) {
-                            hdd.currentIndex = i;
-                        }
-                    }
-                }
-            }
+                    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
+                LineSelector {
                     text: i18n("hddtemp cmd")
+                    value: cfg_dataengine["HDDTEMPCMD"]
+                    onValueEdited: cfg_dataengine["HDDTEMPCMD"] = newValue
                 }
-            QtControls.TextField {
-                width: parent.width * 3 / 5
-                text: cfg_dataengine["HDDTEMPCMD"]
             }
         }
 
-        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("MPD address")
-            }
-            QtControls.TextField {
-                width: parent.width * 3 / 5
-                text: cfg_dataengine["MPDADDRESS"]
-            }
-        }
-
-        Row {
+            title: i18n("Player")
+            Column {
                 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
+                IntegerSelector {
+                    maximumValue: 100
+                    minimumValue: 1
                     stepSize: 1
-                value: cfg_dataengine["MPDPORT"]
-            }
+                    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("MPRIS player name")
+                ComboBoxSelector {
+                    model: [
+                        {
+                            'label': "disable",
+                            'name': "disable"
+                        },
+                        {
+                            'label': "mpris",
+                            'name': "mpris"
+                        },
+                        {
+                            'label': "mpd",
+                            'name': "mpd"
                         }
-            QtControls.ComboBox {
+                    ]
+                    text: i18n("Music player")
+                    value: cfg_dataengine["PLAYER"]
+                    onValueEdited: cfg_dataengine["PLAYER"] = newValue
+                }
+
+                ComboBoxSelector {
                     id: mpris
-                width: parent.width * 3 / 5
                     editable: true
-                model: ["auto", "amarok", "audacious", "clementine", "deadbeef",
-                        "vlc", "qmmp", "xmms2", cfg_dataengine["MPRIS"]]
+                    model: [
+                        {
+                            'label': 'auto',
+                            'name': 'auto'
+                        },
+                        {
+                            'label': 'amarok',
+                            'name': 'amarok'
+                        },
+                        {
+                            'label': 'audacious',
+                            'name': 'audacious'
+                        },
+                        {
+                            'label': 'clementine',
+                            'name': 'clementine'
+                        },
+                        {
+                            'label': 'DeaDBeeF',
+                            'name': 'DeaDBeeF'
+                        },
+                        {
+                            'label': 'vlc',
+                            'name': 'vlc'
+                        },
+                        {
+                            'label': 'qmmp',
+                            'name': 'qmmp'
+                        },
+                        {
+                            'label': 'xmms2',
+                            'name': 'xmms2'
+                        },
+                        {
+                            'label': cfg_dataengine["MPRIS"],
+                            'name': cfg_dataengine["MPRIS"]
+                        }
+                    ]
+                    text: i18n("MPRIS player name")
                     currentIndex: model.length - 1
                 }
+
+                LineSelector {
+                    text: i18n("MPD address")
+                    value: cfg_dataengine["MPDADDRESS"]
+                    onValueEdited: cfg_dataengine["MPDADDRESS"] = newValue
                 }
 
-        Row {
+                IntegerSelector {
+                    maximumValue: 65535
+                    minimumValue: 1000
+                    stepSize: 1
+                    text: i18n("MPD port")
+                    value: cfg_dataengine["MPDPORT"]
+                    onValueEdited: cfg_dataengine["MPDPORT"] = newValue
+                }
+            }
+        }
+
+        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("Music player")
+            title: i18n("Extensions")
+            Column {
+                height: implicitHeight
+                width: parent.width
+                ButtonSelector {
+                    value: i18n("Custom scripts")
+                    onButtonActivated: awKeys.editItem("extscript")
                 }
-            QtControls.ComboBox {
-                id: player
-                width: parent.width * 3 / 5
-                model: ["mpris", "mpd"]
-                Component.onCompleted: {
-                    for (var i=0; i<model.length; i++) {
-                        if (model[i] == cfg_dataengine["PLAYER"]) {
-                            player.currentIndex = i;
+
+                ButtonSelector {
+                    value: i18n("Network requests")
+                    onButtonActivated: awKeys.editItem("extnetworkrequest")
                 }
+
+                ButtonSelector {
+                    value: i18n("Package manager")
+                    onButtonActivated: awKeys.editItem("extupgrade")
+                }
+
+                ButtonSelector {
+                    value: i18n("Quotes monitor")
+                    onButtonActivated: awKeys.editItem("extquotes")
+                }
+
+                ButtonSelector {
+                    value: i18n("Weather")
+                    onButtonActivated: awKeys.editItem("extweather")
                 }
             }
         }
     }
 
-        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")
-            }
-        }
-
-        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")
-            }
-        }
-    }
 
     Component.onCompleted: {
-        if (debug) console.log("[dataengine::onCompleted]")
+        if (debug) console.debug()
 
         // init submodule
-        AWKeys.initKeys(plasmoid.configuration.text)
+        awKeys.updateCache()
+
+        // update hdd model
+        hdd.model = awKeys.getHddDevices()
+        hdd.onCompleted
     }
 
     Component.onDestruction: {
-        if (debug) console.log("[dataengine::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
-        AWActions.writeDataEngineConfiguration(cfg_dataengine)
+        cfg_dataengine["MPRIS"] = mpris.editText
+        awConfig.writeDataEngineConfiguration(cfg_dataengine)
     }
 }

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

@@ -17,26 +17,33 @@
 
 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
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
-import org.kde.plasma.awesomewidget 1.0
+import org.kde.plasma.private.awesomewidget 1.0
 import "."
 
 
 Item {
     id: main
-
-    property bool debug: AWKeys.isDebugEnabled()
-    property variant settings: {
-        "customTime": plasmoid.configuration.customTime,
-        "customUptime": plasmoid.configuration.customUptime,
-        "tempUnits": plasmoid.configuration.tempUnits,
-        "acOnline": plasmoid.configuration.acOnline,
-        "acOffline": plasmoid.configuration.acOffline
+    // backend
+    AWKeys {
+        id: awKeys
     }
+    AWActions {
+        id: awActions
+    }
+    AWTelemetryHandler {
+        id: awTelemetryHandler
+    }
+    BugReport {
+        id: bugReport
+    }
+
+    property bool debug: awActions.isDebugEnabled()
     property variant tooltipSettings: {
         "tooltipNumber": plasmoid.configuration.tooltipNumber,
         "useTooltipBackground": plasmoid.configuration.useTooltipBackground,
@@ -45,21 +52,25 @@ 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
+        "batInTooltipColor": plasmoid.configuration.batInTooltipColor,
+        // additional field to parse AC status
+        "acOnline": plasmoid.configuration.acOnline,
+        // additional field to send notifications
+        "notify": plasmoid.configuration.notify
     }
 
-    signal dropSource(string sourceName)
-    signal needUpdate
+    signal needTextUpdate(string newText)
+    signal needToolTipUpdate(string newText)
     signal sizeUpdate
 
 
@@ -75,55 +86,6 @@ Item {
     Plasmoid.backgroundHints: plasmoid.configuration.background ? "DefaultBackground" : "NoBackground"
     Plasmoid.associatedApplication: "ksysguard"
 
-    PlasmaCore.DataSource {
-        id: systemmonitorDE
-        engine: "systemmonitor"
-        connectedSources: systemmonitorDE.sources
-        interval: plasmoid.configuration.interval
-
-        onNewData: {
-            if (debug) console.log("[main::onNewData] : Update source " + sourceName)
-            // FIXME: ugly workaround to make some sources working
-            systemmonitorDE.interval = plasmoid.configuration.interval
-
-            AWKeys.setDataBySource(sourceName, data, settings)
-        }
-
-        onSourceAdded: {
-            if (debug) console.log("[main::onSourceAdded] : Source " + source)
-
-            AWKeys.addDevice(source)
-        }
-    }
-
-    PlasmaCore.DataSource {
-        id: extsysmonDE
-        engine: "extsysmon"
-        connectedSources: extsysmonDE.sources
-        interval: plasmoid.configuration.interval
-
-        onNewData: {
-            if (debug) console.log("[main::onNewData] : Update source " + sourceName)
-            // FIXME: ugly workaround to make some sources working
-            extsysmonDE.interval = plasmoid.configuration.interval
-
-            AWKeys.setDataBySource(sourceName, data, settings)
-        }
-    }
-
-    PlasmaCore.DataSource {
-        id: timeDE
-        engine: "time"
-        connectedSources: ["Local"]
-        interval: 1000
-
-        onNewData: {
-            if (debug) console.log("[main::onNewData] : Update source " + sourceName)
-
-            AWKeys.setDataBySource(sourceName, data, settings)
-        }
-    }
-
 
     // ui
     Text {
@@ -131,18 +93,19 @@ Item {
         anchors.fill: parent
         renderType: Text.NativeRendering
         textFormat: Text.RichText
-        wrapMode: Text.NoWrap
+        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]
 
-        text: plasmoid.configuration.text
+        style: General.textStyle[plasmoid.configuration.textStyle]
+        styleColor: plasmoid.configuration.textStyleColor
 
         PlasmaCore.ToolTipArea {
             height: tooltip.height
@@ -156,49 +119,74 @@ 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.log("[main::onCompleted]")
+        if (debug) console.debug()
 
         // actions
+        // it makes no sense to use this field with optimization enable
+        if (!plasmoid.configuration.optimize)
             plasmoid.setAction("requestKey", i18n("Request key"), "utilities-system-monitor")
         plasmoid.setAction("showReadme", i18n("Show README"), "text-x-readme")
         plasmoid.setAction("checkUpdates", i18n("Check updates"), "system-software-update")
-//         plasmoid.setAction("report", i18n("Mail to developers"), "email")
+        plasmoid.setAction("reportBug", i18n("Report bug"), "tools-report-bug")
         // init submodule
         Plasmoid.userConfiguringChanged(false)
         // connect data
-        AWKeys.dropSourceFromDataengine.connect(dropSource)
-        AWKeys.needToBeUpdated.connect(needUpdate)
+        awKeys.needTextToBeUpdated.connect(needTextUpdate)
+        awKeys.needToolTipToBeUpdated.connect(needToolTipUpdate)
+        // check updates if required
+        if (plasmoid.configuration.checkUpdates) return awActions.checkUpdates(false)
     }
 
-    onDropSource: {
-        if (debug) console.log("[main::onDropSource]")
-        if (debug) console.log("[main::onDropSource] : Source " + sourceName)
-
-        systemmonitorDE.disconnectSource(sourceName)
-    }
-
-    onNeedUpdate: {
-        if (debug) console.log("[main::onNeedUpdate]")
-
-        text.text = AWKeys.parsePattern()
-        tooltip.text = AWKeys.toolTipImage()
+    onNeedTextUpdate: {
+        if (debug) console.debug()
 
+        text.text = newText
         sizeUpdate()
     }
 
+    onNeedToolTipUpdate: {
+        if (debug) console.debug()
+
+        tooltip.text = newText
+    }
+
     onSizeUpdate: {
-        if (debug) console.log("[main::onSizeUpdate]")
+        if (debug) console.debug()
+        // 16 is a magic number
+        // in other case plasmoid will increase own size on each update
 
         if (plasmoid.configuration.height == 0) {
-            Layout.minimumHeight = text.contentHeight
+            Layout.minimumHeight = text.contentHeight - 16
             Layout.maximumHeight = -1
         } else {
             Layout.minimumHeight = plasmoid.configuration.height
             Layout.maximumHeight = plasmoid.configuration.height
         }
         if (plasmoid.configuration.width == 0) {
-            Layout.minimumWidth = text.contentWidth
+            Layout.minimumWidth = text.contentWidth - 16
             Layout.maximumWidth = -1
         } else {
             Layout.minimumWidth = plasmoid.configuration.width
@@ -208,38 +196,63 @@ Item {
 
     Plasmoid.onUserConfiguringChanged: {
         if (plasmoid.userConfiguring) return
-        if (debug) console.log("[main::onUserConfiguringChanged]")
+        if (debug) console.debug()
 
         // init submodule
-        AWKeys.initKeys(plasmoid.configuration.text)
-        AWKeys.initTooltip(tooltipSettings)
-        AWKeys.setPopupEnabled(plasmoid.configuration.notify)
-        AWKeys.setWrapNewLines(plasmoid.configuration.wrapNewLines)
-
-        needUpdate()
+        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)
+        awKeys.setAggregatorProperty("acOnline", plasmoid.configuration.acOnline)
+        awKeys.setAggregatorProperty("customTime", plasmoid.configuration.customTime)
+        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)
     }
 
-    function action_checkUpdates() {
-        if (debug) console.log("[main::action_checkUpdates]")
 
-        AWActions.checkUpdates()
+    function action_checkUpdates() {
+        if (debug) console.debug()
+
+        return awActions.checkUpdates(true)
     }
 
     function action_showReadme() {
-        if (debug) console.log("[main::action_showReadme]")
+        if (debug) console.debug()
 
-        AWActions.showReadme()
+        return awActions.showReadme()
     }
 
-    function action_report() {
-        if (debug) console.log("[main::action_report]")
+    function action_reportBug() {
+        if (debug) console.debug()
 
-        AWActions.sendEmail()
+        bugReport.reset()
+        bugReport.open()
     }
 
     function action_requestKey() {
-        if (debug) console.log("[main::action_requestKey]")
+        if (debug) console.debug()
 
-        AWKeys.graphicalValueByKey()
+        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 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,38 +17,41 @@
 
 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.awesomewidget 1.0
+import org.kde.plasma.private.awesomewidget 1.0
 
 
 Item {
     id: tooltipPage
+    // backend
+    AWActions {
+        id: awActions
+    }
+
     width: childrenRect.width
     height: childrenRect.height
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    property bool debug: AWKeys.isDebugEnabled()
+    property bool debug: awActions.isDebugEnabled()
 
     property alias cfg_tooltipNumber: tooltipNumber.value
     property alias cfg_useTooltipBackground: useTooltipBackground.checked
-    property alias cfg_tooltipBackground: tooltipBackground.text
+    property alias cfg_tooltipBackground: tooltipBackground.value
     property alias cfg_cpuTooltip: cpuTooltip.checked
-    property alias cfg_cpuTooltipColor: cpuTooltipColor.text
+    property alias cfg_cpuTooltipColor: cpuTooltipColor.value
     property alias cfg_cpuclTooltip: cpuclTooltip.checked
-    property alias cfg_cpuclTooltipColor: cpuclTooltipColor.text
+    property alias cfg_cpuclTooltipColor: cpuclTooltipColor.value
     property alias cfg_memTooltip: memTooltip.checked
-    property alias cfg_memTooltipColor: memTooltipColor.text
+    property alias cfg_memTooltipColor: memTooltipColor.value
     property alias cfg_swapTooltip: swapTooltip.checked
-    property alias cfg_swapTooltipColor: swapTooltipColor.text
-    property alias cfg_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 {
@@ -59,455 +62,130 @@ Item {
           horizontalAlignment: Text.AlignHCenter
           verticalAlignment: Text.AlignVCenter
           wrapMode: Text.WordWrap
-          text: i18n("CPU, CPU clock, memory, swap and network labels support graphical tooltip. To enable them just make needed checkbox fully checked.")
+          text: i18n("CPU, CPU clock, memory, swap and network labels support graphical tooltip. To enable them just make needed checkbox checked.")
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Number of values for tooltips")
-            }
-            QtControls.SpinBox {
+        IntegerSelector {
             id: tooltipNumber
-                width: parent.width * 3 / 5
-                minimumValue: 50
             maximumValue: 1000
+            minimumValue: 50
             stepSize: 25
+            text: i18n("Number of values for tooltips")
             value: plasmoid.configuration.tooltipNumber
         }
-        }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5 - useTooltipBackground.width
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Background")
-            }
-            QtControls.CheckBox {
+        QtControls.GroupBox {
             id: useTooltipBackground
-                height: parent.height
-                width: implicitWidth
-                style: QtStyles.CheckBoxStyle {
-                    indicator: Rectangle {
-                        implicitWidth: 16
-                        implicitHeight: 16
-                        radius: 3
-                        border.width: 1
-                        border.color: control.activeFocus ? "darkblue" : "gray"
-                        Rectangle {
-                            visible: control.checked
-                            radius: 1
-                            anchors.fill: parent
-                            anchors.margins: 4
-                            color: "#555555"
-                            border.color: "#333333"
-                        }
-                    }
-                }
-            }
-            QtControls.Button {
+            height: implicitHeight
+            width: parent.width
+            checkable: true
+            title: i18n("Background")
+            ColorSelector {
                 id: tooltipBackground
-                width: parent.width * 3 / 5
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.tooltipBackground
-                    }
-                }
-                text: plasmoid.configuration.tooltipBackground
-                onClicked: tooltipBackgroundDialog.visible = true
-            }
-
-            QtDialogs.ColorDialog {
-                id: tooltipBackgroundDialog
-                title: i18n("Select a color")
-                color: tooltipBackground.text
-                onAccepted: tooltipBackground.text = tooltipBackgroundDialog.color
+                text: i18n("Background color")
+                value: plasmoid.configuration.tooltipBackground
             }
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5 - cpuTooltip.width
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("CPU color")
-            }
-            QtControls.CheckBox {
+        QtControls.GroupBox {
             id: cpuTooltip
-                height: parent.height
-                width: implicitWidth
-                style: QtStyles.CheckBoxStyle {
-                    indicator: Rectangle {
-                        implicitWidth: 16
-                        implicitHeight: 16
-                        radius: 3
-                        border.width: 1
-                        border.color: control.activeFocus ? "darkblue" : "gray"
-                        Rectangle {
-                            visible: control.checked
-                            radius: 1
-                            anchors.fill: parent
-                            anchors.margins: 4
-                            color: "#555555"
-                            border.color: "#333333"
-                        }
-                    }
-                }
-            }
-            QtControls.Button {
+            height: implicitHeight
+            width: parent.width
+            checkable: true
+            title: i18n("CPU")
+            ColorSelector {
                 id: cpuTooltipColor
-                width: parent.width * 3 / 5
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.cpuTooltipColor
-                    }
-                }
-                text: plasmoid.configuration.cpuTooltipColor
-                onClicked: cpuTooltipColorDialog.visible = true
-            }
-
-            QtDialogs.ColorDialog {
-                id: cpuTooltipColorDialog
-                title: i18n("Select a color")
-                color: cpuTooltipColor.text
-                onAccepted: cpuTooltipColor.text = cpuTooltipColorDialog.color
+                text: i18n("CPU color")
+                value: plasmoid.configuration.cpuTooltipColor
             }
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5 - cpuclTooltip.width
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("CPU clock color")
-            }
-            QtControls.CheckBox {
+        QtControls.GroupBox {
             id: cpuclTooltip
-                height: parent.height
-                width: implicitWidth
-                style: QtStyles.CheckBoxStyle {
-                    indicator: Rectangle {
-                        implicitWidth: 16
-                        implicitHeight: 16
-                        radius: 3
-                        border.width: 1
-                        border.color: control.activeFocus ? "darkblue" : "gray"
-                        Rectangle {
-                            visible: control.checked
-                            radius: 1
-                            anchors.fill: parent
-                            anchors.margins: 4
-                            color: "#555555"
-                            border.color: "#333333"
-                        }
-                    }
-                }
-            }
-            QtControls.Button {
+            height: implicitHeight
+            width: parent.width
+            checkable: true
+            title: i18n("CPU clock")
+            ColorSelector {
                 id: cpuclTooltipColor
-                width: parent.width * 3 / 5
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.cpuclTooltipColor
-                    }
-                }
-                text: plasmoid.configuration.cpuclTooltipColor
-                onClicked: cpuclTooltipColorDialog.visible = true
-            }
-
-            QtDialogs.ColorDialog {
-                id: cpuclTooltipColorDialog
-                title: i18n("Select a color")
-                color: cpuclTooltipColor.text
-                onAccepted: cpuclTooltipColor.text = cpuclTooltipColorDialog.color
+                text: i18n("CPU clock color")
+                value: plasmoid.configuration.cpuclTooltipColor
             }
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5 - memTooltip.width
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Memory color")
-            }
-            QtControls.CheckBox {
+        QtControls.GroupBox {
             id: memTooltip
-                height: parent.height
-                width: implicitWidth
-                style: QtStyles.CheckBoxStyle {
-                    indicator: Rectangle {
-                        implicitWidth: 16
-                        implicitHeight: 16
-                        radius: 3
-                        border.width: 1
-                        border.color: control.activeFocus ? "darkblue" : "gray"
-                        Rectangle {
-                            visible: control.checked
-                            radius: 1
-                            anchors.fill: parent
-                            anchors.margins: 4
-                            color: "#555555"
-                            border.color: "#333333"
-                        }
-                    }
-                }
-            }
-            QtControls.Button {
+            height: implicitHeight
+            width: parent.width
+            checkable: true
+            title: i18n("Memory")
+            ColorSelector {
                 id: memTooltipColor
-                width: parent.width * 3 / 5
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.memTooltipColor
-                    }
-                }
-                text: plasmoid.configuration.memTooltipColor
-                onClicked: memTooltipColorDialog.visible = true
-            }
-
-            QtDialogs.ColorDialog {
-                id: memTooltipColorDialog
-                title: i18n("Select a color")
-                color: memTooltipColor.text
-                onAccepted: memTooltipColor.text = memTooltipColorDialog.color
+                text: i18n("Memory color")
+                value: plasmoid.configuration.memTooltipColor
             }
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5 - swapTooltip.width
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Swap color")
-            }
-            QtControls.CheckBox {
+        QtControls.GroupBox {
             id: swapTooltip
-                height: parent.height
-                width: implicitWidth
-                style: QtStyles.CheckBoxStyle {
-                    indicator: Rectangle {
-                        implicitWidth: 16
-                        implicitHeight: 16
-                        radius: 3
-                        border.width: 1
-                        border.color: control.activeFocus ? "darkblue" : "gray"
-                        Rectangle {
-                            visible: control.checked
-                            radius: 1
-                            anchors.fill: parent
-                            anchors.margins: 4
-                            color: "#555555"
-                            border.color: "#333333"
-                        }
-                    }
-                }
-            }
-            QtControls.Button {
+            height: implicitHeight
+            width: parent.width
+            checkable: true
+            title: i18n("Swap")
+            ColorSelector {
                 id: swapTooltipColor
-                width: parent.width * 3 / 5
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.swapTooltipColor
-                    }
-                }
-                text: plasmoid.configuration.swapTooltipColor
-                onClicked: swapTooltipColorDialog.visible = true
-            }
-
-            QtDialogs.ColorDialog {
-                id: swapTooltipColorDialog
-                title: i18n("Select a color")
-                color: swapTooltipColor.text
-                onAccepted: swapTooltipColor.text = swapTooltipColorDialog.color
+                text: i18n("Swap color")
+                value: plasmoid.configuration.swapTooltipColor
             }
         }
 
-        Row {
+        QtControls.GroupBox {
+            id: downkbTooltip
             height: implicitHeight
             width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5 - downTooltip.width
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
+            checkable: true
+            title: i18n("Network")
+            Column {
+                height: implicitHeight
+                width: parent.width
+                ColorSelector {
+                    id: downkbTooltipColor
                     text: i18n("Download speed color")
+                    value: plasmoid.configuration.downkbTooltipColor
                 }
-            QtControls.CheckBox {
-                id: downTooltip
-                height: parent.height
-                width: implicitWidth
-                style: QtStyles.CheckBoxStyle {
-                    indicator: Rectangle {
-                        implicitWidth: 16
-                        implicitHeight: 16
-                        radius: 3
-                        border.width: 1
-                        border.color: control.activeFocus ? "darkblue" : "gray"
-                        Rectangle {
-                            visible: control.checked
-                            radius: 1
-                            anchors.fill: parent
-                            anchors.margins: 4
-                            color: "#555555"
-                            border.color: "#333333"
-                        }
-                    }
-                }
-            }
-            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
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
+                ColorSelector {
+                    id: upkbTooltipColor
                     text: i18n("Upload speed color")
+                    value: plasmoid.configuration.upkbTooltipColor
                 }
-            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
             }
         }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5 - batTooltip.width
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Battery active color")
-            }
-            QtControls.CheckBox {
+        QtControls.GroupBox {
             id: batTooltip
-                height: parent.height
-                width: implicitWidth
-                style: QtStyles.CheckBoxStyle {
-                    indicator: Rectangle {
-                        implicitWidth: 16
-                        implicitHeight: 16
-                        radius: 3
-                        border.width: 1
-                        border.color: control.activeFocus ? "darkblue" : "gray"
-                        Rectangle {
-                            visible: control.checked
-                            radius: 1
-                            anchors.fill: parent
-                            anchors.margins: 4
-                            color: "#555555"
-                            border.color: "#333333"
-                        }
-                    }
-                }
-            }
-            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
-            }
-        }
-
-        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")
+            checkable: true
+            title: i18n("Battery")
+            Column {
+                height: implicitHeight
+                width: parent.width
+                ColorSelector {
+                    id: batTooltipColor
+                    text: i18n("Battery active color")
+                    value: plasmoid.configuration.batTooltipColor
                 }
-            QtControls.Button {
+                ColorSelector {
                     id: batInTooltipColor
-                width: parent.width * 3 / 5
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.batInTooltipColor
+                    text: i18n("Battery inactive color")
+                    value: 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
-            }
-        }
-    }
 
     Component.onCompleted: {
-        if (debug) console.log("[tooltip::onCompleted]")
+        if (debug) console.debug()
     }
 }

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

@@ -15,313 +15,86 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.0
-import QtQuick.Controls 1.3 as QtControls
-import org.kde.plasma.core 2.0 as PlasmaCore
+import QtQuick 2.2
 
-import org.kde.plasma.awesomewidget 1.0
+import org.kde.plasma.private.awesomewidget 1.0
+import "."
 
 
 Item {
     id: widgetPage
+    // backend
+    AWKeys {
+        id: awKeys
+    }
+    AWActions {
+        id: awActions
+    }
+
     width: childrenRect.width
     height: childrenRect.height
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    property bool debug: AWKeys.isDebugEnabled()
-    property variant settings: {
-        "customTime": plasmoid.configuration.customTime,
-        "customUptime": plasmoid.configuration.customUptime,
-        "tempUnits": plasmoid.configuration.tempUnits,
-        "acOnline": plasmoid.configuration.acOnline,
-        "acOffline": plasmoid.configuration.acOffline
-    }
-    property variant tooltipSettings: {
-        "tooltipNumber": plasmoid.configuration.tooltipNumber,
-        "useTooltipBackground": plasmoid.configuration.useTooltipBackground,
-        "tooltipBackgroung": plasmoid.configuration.tooltipBackgroung,
-        "cpuTooltip": plasmoid.configuration.cpuTooltip,
-        "cpuclTooltip": plasmoid.configuration.cpuclTooltip,
-        "memTooltip": plasmoid.configuration.memTooltip,
-        "swapTooltip": plasmoid.configuration.swapTooltip,
-        "downTooltip": plasmoid.configuration.downTooltip,
-        "upTooltip": plasmoid.configuration.downTooltip,
-        "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,
-        "batTooltipColor": plasmoid.configuration.batTooltipColor,
-        "batInTooltipColor": plasmoid.configuration.batInTooltipColor
-    }
+    property bool debug: awActions.isDebugEnabled()
 
     property alias cfg_text: textPattern.text
+    property bool lock: true
+
+    signal needTextUpdate(string newText)
 
 
     Column {
         id: pageColumn
         anchors.fill: parent
-        QtControls.Label {
-          width: parent.width
-          horizontalAlignment: Text.AlignHCenter
-          verticalAlignment: Text.AlignVCenter
-          wrapMode: Text.WordWrap
-          text: i18n("Detailed information may be found on <a href=\"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.log("[widget::onClicked] : 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.log("[widget::onClicked] : Indent button")
-
-                    var pos = textPattern.cursorPosition
-                    var selected = textPattern.selectedText
-                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(pos, selected + "<br>\n")
-                }
+        AWTagSelector {
+            backend: awKeys
+            notifyBackend: awActions
+            textArea: textPattern
+            groups: General.awTagRegexp
         }
 
-            QtControls.Button {
-                width: parent.width / 12
-                iconName: "format-text-bold"
-
-                onClicked: {
-                    if (debug) console.log("[widget::onClicked] : 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.log("[widget::onClicked] : 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.log("[widget::onClicked] : 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.log("[widget::onClicked] : Strike button")
-
-                    var pos = textPattern.cursorPosition
-                    var selected = textPattern.selectedText
-                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(pos, "<s>" + selected + "</s>")
-                }
+        AWExtensions {
+            id: extensions
+            backend: awKeys
+            textArea: textPattern
+            onUnlock: lock = false
         }
 
-            QtControls.Button {
-                width: parent.width / 12
-                iconName: "format-justify-left"
-
-                onClicked: {
-                    if (debug) console.log("[widget::onClicked] : 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.log("[widget::onClicked] : 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.log("[widget::onClicked] : 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.log("[widget::onClicked] : Justify button")
-
-                    var pos = textPattern.cursorPosition
-                    var selected = textPattern.selectedText
-                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(pos, "<p align=\"justify\">" + selected + "</p>")
-                }
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.ComboBox {
-                id: tags
-                width: parent.width - addTagButton.width - showValueButton.width
-            }
-            QtControls.Button {
-                id: addTagButton
-                text: i18n("Add")
-
-                onClicked: {
-                    if (debug) console.log("[widget::onClicked] : 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 {
-                id: showValueButton
-                text: i18n("Show value")
-
-                onClicked: {
-                    if (debug) console.log("[widget::onClicked] : Show tag button")
-
-                    var message = i18n("Tag: %1", tags.currentText)
-                    message += "<br>"
-                    message += i18n("Value: %1", AWKeys.valueByKey(tags.currentText))
-                    message += "<br>"
-                    message += i18n("Info: %1", AWKeys.infoByKey(tags.currentText))
-                    AWActions.sendNotification("tag", message)
-                }
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Button {
-                width: parent.width
-                text: i18n("Edit bars")
-                onClicked: AWKeys.editItem("graphicalitem")
-            }
-        }
-
-        QtControls.TextArea {
+        AWTextEditor {
             id: textPattern
-            width: parent.width
-            height: parent.height * 4 / 5
-            textFormat: TextEdit.PlainText
-            text: plasmoid.configuration.text
+            backend: awKeys
         }
     }
 
-    // we need to initializate DataEngines here too
-    // because we need to get keys and values
-    PlasmaCore.DataSource {
-        id: systemmonitorDE
-        engine: "systemmonitor"
-        connectedSources: systemmonitorDE.sources
-        interval: 5000
-
-        onNewData: {
-            if (debug) console.log("[widget::onNewData] : Update source " + sourceName)
-
-            AWKeys.setDataBySource(sourceName, data, settings)
-        }
-    }
-
-    PlasmaCore.DataSource {
-        id: extsysmonDE
-        engine: "extsysmon"
-        connectedSources: extsysmonDE.sources
-        interval: 5000
-
-        onNewData: {
-            if (debug) console.log("[widget::onNewData] : Update source " + sourceName)
-
-            AWKeys.setDataBySource(sourceName, data, settings)
-        }
-    }
-
-    PlasmaCore.DataSource {
-        id: timeDE
-        engine: "time"
-        connectedSources: ["Local"]
-        interval: 5000
-
-        onNewData: {
-            if (debug) console.log("[widget::onNewData] : Update source " + sourceName)
-
-            AWKeys.setDataBySource(sourceName, data, settings)
-        }
-    }
 
     Component.onCompleted: {
-        if (debug) console.log("[widget::onCompleted]")
+        if (debug) console.debug()
 
+        awKeys.needTextToBeUpdated.connect(needTextUpdate)
         // init submodule
-        AWKeys.initKeys(plasmoid.configuration.text)
-        tags.model = AWKeys.dictKeys(true)
+        awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.interval,
+                        plasmoid.configuration.queueLimit, false)
+        awKeys.setAggregatorProperty("acOffline", plasmoid.configuration.acOffline)
+        awKeys.setAggregatorProperty("acOnline", plasmoid.configuration.acOnline)
+        awKeys.setAggregatorProperty("customTime", plasmoid.configuration.customTime)
+        awKeys.setAggregatorProperty("customUptime", plasmoid.configuration.customUptime)
+        awKeys.setAggregatorProperty("tempUnits", plasmoid.configuration.tempUnits)
+        awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings)
+    }
+
+    onNeedTextUpdate: {
+        if (lock) return
+        if (debug) console.debug()
+
+        extensions.showMessage(newText)
+        lock = true
     }
 }

sources/awesome-widget/package/metadata.desktop

@@ -15,14 +15,12 @@ Icon=utilities-system-monitor
 X-KDE-ServiceTypes=Plasma/Applet
 X-Plasma-API=declarativeappletscript
 X-Plasma-MainScript=ui/main.qml
-X-Plasma-RemoteLocation=
 
 X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
-X-KDE-PluginInfo-Version=2.3.3
-X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/
+X-KDE-PluginInfo-Version=3.5.1
+X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
 X-KDE-PluginInfo-Category=System Information
-X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPLv3
 X-KDE-PluginInfo-EnabledByDefault=true

sources/awesome-widget/plugin/CMakeLists.txt

@@ -1,38 +1,23 @@
-set (PLUGIN_NAME awplugin)
+set(PLUGIN_NAME awplugin)
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidget\")
 
-add_definitions (${Qt5Core_DEFINITIONS} ${Qt5Network_DEFINITIONS})
-set (Qt_INCLUDE ${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Qml_INCLUDE_DIRS})
-set (Qt_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Qml_LIBRARIES})
-set (Kf5_INCLUDE ${I18n_INCLUDE_DIR}
-                 ${Notifications_INCLUDE_DIR})
-set (Kf5_LIBRARIES KF5::I18n
-                   KF5::Notifications)
-
-include_directories (${CMAKE_SOURCE_DIR}
+include_directories(
+        ${CMAKE_SOURCE_DIR}
         ${CMAKE_BINARY_DIR}
-                     ${CMAKE_CURRENT_BINARY_DIR}
-                     ${CMAKE_CURRENT_BINARY_DIR}/../
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../${PROJECT_LIBRARY}/
         ${PROJECT_TRDPARTY_DIR}
-                     ../../extsysmon
-                     ${CMAKE_CURRENT_BINARY_DIR}/../../extsysmon
         ${Qt_INCLUDE}
-                     ${Kf5_INCLUDE})
+        ${Kf5_INCLUDE}
+)
 
-# task source is required by extscripts
-file (GLOB_RECURSE SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp
-                                     ../../extsysmon/extquotes.cpp
-                                     ../../extsysmon/extscript.cpp
-                                     ../../extsysmon/extupgrade.cpp)
-file (GLOB SUBPROJECT_UI *.ui)
-file (GLOB SUBPROJECT_NOTIFY *.notifyrc)
-set (SUBPROJECT_DESKTOP ${CMAKE_CURRENT_SOURCE_DIR}/desktops)
+file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
+file(GLOB SUBPROJECT_UI *.ui)
+file(GLOB SUBPROJECT_NOTIFY *.notifyrc)
 
-qt5_wrap_ui (SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
-add_library (${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE} ${SUBPROJECT_UI_HEADER})
-target_link_libraries (${PLUGIN_NAME} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
+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/awesomewidget)
-install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/awesomewidget)
-install (FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KNOTIFYRC_INSTALL_DIR})
-install (DIRECTORY ${SUBPROJECT_DESKTOP} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
+install(TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget)
+install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget)
+install(FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KNOTIFYRC_INSTALL_DIR})

sources/awesome-widget/plugin/awabstractpairconfig.cpp

@@ -0,0 +1,181 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awabstractpairconfig.h"
+#include "ui_awabstractpairconfig.h"
+
+#include <KI18n/KLocalizedString>
+
+#include <QPushButton>
+#include <utility>
+
+#include "awabstractselector.h"
+#include "awdebug.h"
+
+
+AWAbstractPairConfig::AWAbstractPairConfig(QWidget *_parent, const bool _hasEdit, QStringList _keys)
+    : QDialog(_parent)
+    , ui(new Ui::AWAbstractPairConfig)
+    , m_hasEdit(_hasEdit)
+    , m_keys(std::move(_keys))
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    ui->setupUi(this);
+
+    connect(ui->buttonBox, 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 = dynamic_cast<AWAbstractSelector *>(sender())->current();
+    int index = m_selectors.indexOf(dynamic_cast<AWAbstractSelector *>(sender()));
+
+    if ((current.first.isEmpty()) && (current.second.isEmpty())) {
+        // remove current selector if it is empty and does not last
+        if (sender() == m_selectors.last())
+            return;
+        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;
+
+    auto *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
+    auto status = true;
+    switch (ret) {
+    case 0:
+        break;
+    case 1:
+    default:
+        status &= m_helper->writeItems(data);
+        status &= m_helper->removeUnusedKeys(data.keys());
+        break;
+    }
+    qCDebug(LOG_AW) << "Configuration save status" << status;
+}
+
+
+QPair<QStringList, QStringList> AWAbstractPairConfig::initKeys() const
+{
+    // we are adding empty string at the start
+    QStringList left = {""};
+    left.append(m_helper->leftKeys().isEmpty() ? m_keys : m_helper->leftKeys());
+    left.sort();
+    QStringList right = {""};
+    right.append(m_helper->rightKeys().isEmpty() ? m_keys : m_helper->rightKeys());
+    right.sort();
+
+    return 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,72 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#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, bool _hasEdit = false, QStringList _keys = QStringList());
+    ~AWAbstractPairConfig() override;
+    template <class T> void initHelper()
+    {
+
+        delete m_helper;
+        m_helper = new T(this);
+    }
+    void showDialog();
+    // properties
+    void setEditable(bool _first, 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();
+    [[nodiscard]] 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 <utility>
+
+#include "awdebug.h"
+
+
+AWAbstractPairHelper::AWAbstractPairHelper(QString _filePath, QString _section)
+    : m_filePath(std::move(_filePath))
+    , m_section(std::move(_section))
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    AWAbstractPairHelper::initItems();
+}
+
+
+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();
+}
+
+
+QSet<QString> AWAbstractPairHelper::valuesSet() const
+{
+    auto values = m_pairs.values();
+    return {values.cbegin(), values.cend()};
+}
+
+
+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,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 AWABSTRACTPAIRHELPER_H
+#define AWABSTRACTPAIRHELPER_H
+
+#include <QHash>
+
+
+class AWAbstractPairHelper
+{
+public:
+    explicit AWAbstractPairHelper(QString _filePath = "", QString _section = "");
+    virtual ~AWAbstractPairHelper();
+    [[nodiscard]] QStringList keys() const;
+    [[nodiscard]] QHash<QString, QString> pairs() const;
+    [[nodiscard]] QStringList values() const;
+    [[nodiscard]] QSet<QString> valuesSet() const;
+    // read-write methods
+    virtual void initItems();
+    [[nodiscard]] virtual bool writeItems(const QHash<QString, QString> &_configuration) const;
+    [[nodiscard]] virtual bool removeUnusedKeys(const QStringList &_keys) const;
+    // configuration related
+    virtual void editPairs() = 0;
+    virtual QStringList leftKeys() = 0;
+    virtual QStringList rightKeys() = 0;
+
+private:
+    // properties
+    QHash<QString, QString> m_pairs;
+    QString m_filePath;
+    QString m_section;
+};
+
+
+#endif /* AWABSTRACTPAIRHELPER_H */

sources/awesome-widget/plugin/awabstractselector.cpp

@@ -0,0 +1,75 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awabstractselector.h"
+#include "ui_awabstractselector.h"
+
+#include "awdebug.h"
+
+
+AWAbstractSelector::AWAbstractSelector(QWidget *_parent, const QPair<bool, bool> &_editable)
+    : QWidget(_parent)
+    , ui(new Ui::AWAbstractSelector)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    ui->setupUi(this);
+    ui->comboBox_key->setEditable(_editable.first);
+    ui->comboBox_value->setEditable(_editable.second);
+
+    connect(ui->comboBox_key, 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,48 @@
+/***************************************************************************
+ *   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});
+    ~AWAbstractSelector() override;
+    [[nodiscard]] QPair<QString, QString> current() const;
+    void init(const QStringList &_keys, const QStringList &_values, const QPair<QString, QString> &_current);
+
+signals:
+    void selectionChanged();
+
+private:
+    Ui::AWAbstractSelector *ui = nullptr;
+};
+
+
+#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

@@ -20,234 +20,129 @@
 #include <KI18n/KLocalizedString>
 #include <KNotifications/KNotification>
 
-#include <QDebug>
 #include <QDesktopServices>
-#include <QDir>
-#include <QMessageBox>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
+#include <QFile>
 #include <QProcess>
-#include <QProcessEnvironment>
-#include <QSettings>
-#include <QStandardPaths>
+#include <QUrl>
 
 #include <fontdialog/fontdialog.h>
-#include <pdebug/pdebug.h>
 
-#include "extscript.h"
-#include "graphicalitem.h"
-#include "version.h"
+#include "awdebug.h"
+#include "awupdatehelper.h"
 
 
-AWActions::AWActions(QObject *parent)
-    : QObject(parent)
+AWActions::AWActions(QObject *_parent)
+    : QObject(_parent)
 {
-    // debug
-    QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
-    QString debugEnv = environment.value(QString("DEBUG"), QString("no"));
-    debug = (debugEnv == QString("yes"));
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    m_updateHelper = new AWUpdateHelper(this);
 }
 
 
 AWActions::~AWActions()
 {
-    if (debug) qDebug() << PDEBUG;
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
 }
 
 
-void AWActions::checkUpdates()
+void AWActions::checkUpdates(const bool _showAnyway)
 {
-    if (debug) qDebug() << PDEBUG;
+    qCDebug(LOG_AW) << "Show anyway" << _showAnyway;
 
-    QNetworkAccessManager *manager = new QNetworkAccessManager(this);
-    connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(versionReplyRecieved(QNetworkReply *)));
-
-    manager->get(QNetworkRequest(QUrl(VERSION_API)));
+    if (!m_updateHelper->checkVersion())
+        m_updateHelper->checkUpdates(_showAnyway);
 }
 
 
-void AWActions::runCmd(const QString cmd)
+QString AWActions::getFileContent(const QString &_path)
 {
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Cmd" << cmd;
+    qCDebug(LOG_AW) << "Get content from file" << _path;
 
-    QProcess command;
-    sendNotification(QString("Info"), i18n("Run %1", cmd));
-
-    command.startDetached(cmd);
-}
-
-
-void AWActions::sendEmail()
-{
-    if (debug) qDebug() << PDEBUG;
-}
-
-
-void AWActions::showReadme()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    QDesktopServices::openUrl(QString(HOMEPAGE));
-}
-
-
-QString AWActions::getAboutText(const QString type)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "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));
-    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[i].split(QChar(','))[0])
-                    .arg(trdPartyList[i].split(QChar(','))[1])
-                    .arg(trdPartyList[i].split(QChar(','))[2]);
-        text = i18n("This software uses: %1", trdPartyList.join(QString(", ")));
+    QFile inputFile(_path);
+    if (!inputFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        qCWarning(LOG_AW) << "Could not open file as text" << inputFile.fileName();
+        return "";
     }
 
-    return text;
+    QString output = inputFile.readAll();
+    inputFile.close();
+    return output;
 }
 
 
-QVariantMap AWActions::getFont(const QVariantMap defaultFont)
+// HACK: since QML could not use QLoggingCategory I need this hack
+bool AWActions::isDebugEnabled()
 {
-    if (debug) qDebug() << PDEBUG;
+    return LOG_AW().isDebugEnabled();
+}
+
+
+bool AWActions::runCmd(const QString &_cmd, const QStringList &_args)
+{
+    qCDebug(LOG_AW) << "Cmd" << _cmd << "args" << _args;
+
+    sendNotification(QString("Info"), i18n("Run %1", _cmd));
+
+    return QProcess::startDetached(_cmd, _args);
+}
+
+
+// HACK: this method uses variable from version.h
+void AWActions::showReadme()
+{
+    QDesktopServices::openUrl(QUrl(HOMEPAGE));
+}
+
+
+void AWActions::showLegacyInfo()
+{
+    auto *msgBox = new QMessageBox(nullptr);
+    msgBox->setAttribute(Qt::WA_DeleteOnClose);
+    msgBox->setModal(false);
+    msgBox->setWindowTitle(i18n("Not supported"));
+    msgBox->setText(i18n("You are using mammoth's Qt version, try to update it first"));
+    msgBox->setStandardButtons(QMessageBox::Ok);
+    msgBox->setIcon(QMessageBox::Information);
+
+    msgBox->open();
+}
+
+
+// HACK: this method uses variables from version.h
+QString AWActions::getAboutText(const QString &_type)
+{
+    qCDebug(LOG_AW) << "Type" << _type;
+
+    return AWDebug::getAboutText(_type);
+}
+
+
+QVariantMap AWActions::getFont(const QVariantMap &_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;
 }
 
 
-QVariantMap AWActions::readDataEngineConfiguration()
+// to avoid additional object definition this method is static
+void AWActions::sendNotification(const QString &_eventId, const QString &_message)
 {
-    if (debug) qDebug() << PDEBUG;
+    qCDebug(LOG_AW) << "Event" << _eventId << "with message" << _message;
 
-    QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation, QString("plasma-dataengine-extsysmon.conf"));
-    if (debug) qDebug() << PDEBUG << ":" << "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"));
-    settings.endGroup();
-
-    return configuration;
-}
-
-
-void AWActions::writeDataEngineConfiguration(const QVariantMap configuration)
-{
-    if (debug) qDebug() << PDEBUG;
-
-    QString fileName = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + QString("/plasma-dataengine-extsysmon.conf");
-    QSettings settings(fileName, QSettings::IniFormat);
-    if (debug) qDebug() << PDEBUG << ":" << "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.endGroup();
-
-    settings.sync();
-}
-
-
-void AWActions::sendNotification(const QString eventId, const QString message, const bool enablePopup)
-{
-    if ((eventId == QString("event")) && (!enablePopup)) return;
-
-    KNotification *notification = KNotification::event(eventId, QString("Awesome Widget ::: %1").arg(eventId), message);
-    notification->setComponentName(QString("plasma-applet-org.kde.plasma.awesome-widget"));
-}
-
-
-void AWActions::showUpdates(QString version)
-{
-    if (debug) qDebug() << PDEBUG;
-
-    QString text;
-    text += i18n("Current version : %1", QString(VERSION)) + QString("\n");
-    text += i18n("New version : %1", version) + QString("\n\n");
-    text += i18n("Click \"Ok\" to download");
-
-    int select = QMessageBox::information(0, i18n("There are updates"), text, QMessageBox::Ok | QMessageBox::Cancel);
-    switch (select) {
-    case QMessageBox::Ok:
-        QDesktopServices::openUrl(QString(RELEASES) + version);
-        break;
-    }
-}
-
-
-void AWActions::versionReplyRecieved(QNetworkReply *reply)
-{
-    if (debug) qDebug() << PDEBUG;
-
-    QString answer = reply->readAll();
-    if (!answer.contains(QString("tag_name"))) return;
-    QString version = QString(VERSION);
-    if (debug) qDebug() << PDEBUG << answer;
-    for (int i=0; i<answer.split(QString("tag_name")).count(); i++) {
-        version = answer.split(QString("tag_name"))[1].split(QChar(','))[0];
-        version.remove(QChar('"'));
-        version.remove(QChar(':'));
-        version.remove(QString("V."));
-        break;
-    }
-
-    int old_major = QString(VERSION).split(QChar('.'))[0].toInt();
-    int old_minor = QString(VERSION).split(QChar('.'))[1].toInt();
-    int old_patch = QString(VERSION).split(QChar('.'))[2].toInt();
-    int new_major = QString(version).split(QChar('.'))[0].toInt();
-    int new_minor = QString(version).split(QChar('.'))[1].toInt();
-    int new_patch = QString(version).split(QChar('.'))[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)))
-        showUpdates(version);
+    KNotification *notification
+        = KNotification::event(_eventId, QString("Awesome Widget ::: %1").arg(_eventId), _message);
+    notification->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
 }

sources/awesome-widget/plugin/awactions.h

@@ -21,41 +21,32 @@
 
 #include <QMap>
 #include <QObject>
-#include <QVariant>
 
 
-class QNetworkReply;
+class AWUpdateHelper;
 
 class AWActions : public QObject
 {
     Q_OBJECT
 
 public:
-    AWActions(QObject *parent = nullptr);
-    ~AWActions();
-
-    Q_INVOKABLE void checkUpdates();
-    Q_INVOKABLE void runCmd(const QString cmd = QString("/usr/bin/true"));
-    Q_INVOKABLE void sendEmail();
-    Q_INVOKABLE void showReadme();
+    explicit AWActions(QObject *_parent = nullptr);
+    ~AWActions() override;
+    Q_INVOKABLE void checkUpdates(bool _showAnyway = false);
+    Q_INVOKABLE static QString getFileContent(const QString &_path);
+    Q_INVOKABLE static bool isDebugEnabled();
+    Q_INVOKABLE static bool runCmd(const QString &_cmd, const QStringList &_args);
+    Q_INVOKABLE static void showLegacyInfo();
+    Q_INVOKABLE static void showReadme();
     // configuration slots
-    Q_INVOKABLE QString getAboutText(const QString type = QString("header"));
-    Q_INVOKABLE QVariantMap getFont(const QVariantMap defaultFont);
-    // dataengine
-    Q_INVOKABLE QVariantMap readDataEngineConfiguration();
-    Q_INVOKABLE void writeDataEngineConfiguration(const QVariantMap configuration);
+    Q_INVOKABLE static QString getAboutText(const QString &_type);
+    Q_INVOKABLE static QVariantMap getFont(const QVariantMap &_defaultFont);
 
 public slots:
-    Q_INVOKABLE static void sendNotification(const QString eventId, const QString message,
-                                             const bool enablePopup = false);
-
-private slots:
-    void showUpdates(QString version);
-    void versionReplyRecieved(QNetworkReply *reply);
+    Q_INVOKABLE static void sendNotification(const QString &_eventId, const QString &_message);
 
 private:
-    // variables
-    bool debug = false;
+    AWUpdateHelper *m_updateHelper = nullptr;
 };
 
 

sources/awesome-widget/plugin/awbugreporter.cpp

@@ -0,0 +1,149 @@
+/***************************************************************************
+ *   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(int, const QString &)));
+}
+
+
+QString AWBugReporter::generateText(const QString &_description, const QString &_reproduce, const QString &_expected,
+                                    const QString &_logs)
+{
+    // do not log _logs here, it may have quite large size
+    qCDebug(LOG_AW) << "Generate text with description" << _description << "steps" << _reproduce
+                    << "and expected result" << _expected;
+
+    QString output;
+    output += QString("**Description**\n\n%1\n\n").arg(_description);
+    output += QString("**Step to _reproduce**\n\n%1\n\n").arg(_reproduce);
+    output += QString("**Expected result**\n\n%1\n\n").arg(_expected);
+    output += QString("**Version**\n\n%1\n\n").arg(AWDebug::getBuildData().join(QString("\n")));
+    // append _logs
+    output += QString("**Logs**\n\n%1").arg(_logs);
+
+    return output;
+}
+
+
+void AWBugReporter::sendBugReport(const QString &_title, const QString &_body)
+{
+    qCDebug(LOG_AW) << "Send bug report with title" << _title << "and body" << _body;
+
+    auto *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;
+
+    auto *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 = dynamic_cast<QMessageBox *>(sender())->buttonRole(_button);
+    qCInfo(LOG_AW) << "User select" << ret;
+
+    switch (ret) {
+    case QMessageBox::AcceptRole:
+        QDesktopServices::openUrl(m_lastBugUrl);
+        break;
+    case QMessageBox::RejectRole:
+    default:
+        break;
+    }
+}

sources/awesome-widget/plugin/awbugreporter.h

@@ -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 AWBUGREPORTER_H
+#define AWBUGREPORTER_H
+
+#include <QObject>
+
+
+class QAbstractButton;
+class QNetworkReply;
+
+class AWBugReporter : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AWBugReporter(QObject *_parent = nullptr);
+    ~AWBugReporter() override;
+    Q_INVOKABLE void doConnect();
+    Q_INVOKABLE static QString generateText(const QString &_description, const QString &_reproduce,
+                                            const QString &_expected, const QString &_logs);
+    Q_INVOKABLE void sendBugReport(const QString &_title, const QString &_body);
+
+signals:
+    void replyReceived(int _number, const QString &_url);
+
+private slots:
+    void issueReplyRecieved(QNetworkReply *_reply);
+    void showInformation(int _number, const QString &_url);
+    void userReplyOnBugReport(QAbstractButton *_button);
+
+private:
+    QString m_lastBugUrl;
+};
+
+
+#endif /* AWBUGREPORTER_H */

sources/awesome-widget/plugin/awconfighelper.cpp

@@ -0,0 +1,295 @@
+/***************************************************************************
+ *   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 "awconfighelper.h"
+
+#include <QDir>
+#include <QQmlPropertyMap>
+#include <QSettings>
+#include <QStandardPaths>
+#include <QTextCodec>
+
+#include "awdebug.h"
+
+
+AWConfigHelper::AWConfigHelper(QObject *_parent)
+    : QObject(_parent)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    m_baseDir = QString("%1/awesomewidgets").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
+}
+
+
+AWConfigHelper::~AWConfigHelper()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+QString AWConfigHelper::configurationDirectory()
+{
+    // 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()
+{
+    QString fileName
+        = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
+
+    return QFile(fileName).remove();
+}
+
+
+bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig, const QString &_fileName) const
+{
+    qCDebug(LOG_AW) << "Selected filename" << _fileName;
+
+    QSettings settings(_fileName, QSettings::IniFormat);
+    // plasmoid configuration
+    const auto *configuration = dynamic_cast<const QQmlPropertyMap *>(_nativeConfig);
+    settings.beginGroup("plasmoid");
+    for (auto &key : configuration->keys()) {
+        QVariant value = configuration->value(key);
+        if (!value.isValid())
+            continue;
+        settings.setValue(key, value);
+    }
+    settings.endGroup();
+
+    // extensions
+    for (auto &item : m_dirs) {
+        QStringList items
+            = QDir(QString("%1/%2").arg(m_baseDir).arg(item)).entryList(QStringList() << "*.desktop", QDir::Files);
+        settings.beginGroup(item);
+        for (auto &it : items)
+            copyExtensions(it, item, settings, false);
+        settings.endGroup();
+    }
+
+    // additional files
+    settings.beginGroup("json");
+    // script filters
+    readFile(settings, "filters", QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
+    // weather icon settings
+    readFile(settings, "weathers", QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
+    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
+    return settings.status() == QSettings::NoError;
+}
+
+
+QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName, const bool _importPlasmoid,
+                                                const bool _importExtensions, const bool _importAdds) const
+{
+    qCDebug(LOG_AW) << "Selected filename" << _fileName;
+
+    QVariantMap configuration;
+    QSettings settings(_fileName, QSettings::IniFormat);
+
+    // extensions
+    if (_importExtensions) {
+        for (auto &item : m_dirs) {
+            settings.beginGroup(item);
+            for (auto &it : settings.childGroups())
+                copyExtensions(it, item, settings, true);
+            settings.endGroup();
+        }
+    }
+
+    // additional files
+    if (_importAdds) {
+        settings.beginGroup("json");
+        // script filters
+        writeFile(settings, "filters", QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
+        // weather icon settings
+        writeFile(settings, "weathers", QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
+        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("plasmoid");
+        for (auto &key : settings.childKeys())
+            configuration[key] = settings.value(key);
+        settings.endGroup();
+    }
+
+    return configuration;
+}
+
+
+QVariantMap AWConfigHelper::readDataEngineConfiguration()
+{
+    QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation, "plasma-dataengine-extsysmon.conf");
+    qCInfo(LOG_AW) << "Configuration file" << fileName;
+    QSettings settings(fileName, QSettings::IniFormat);
+    QVariantMap configuration;
+
+    settings.beginGroup("Configuration");
+    configuration["ACPIPATH"] = settings.value("ACPIPATH", "/sys/class/power_supply/");
+    configuration["GPUDEV"] = settings.value("GPUDEV", "auto");
+    configuration["HDDDEV"] = settings.value("HDDDEV", "all");
+    configuration["HDDTEMPCMD"] = settings.value("HDDTEMPCMD", "sudo smartctl -a");
+    configuration["MPDADDRESS"] = settings.value("MPDADDRESS", "localhost");
+    configuration["MPDPORT"] = settings.value("MPDPORT", "6600");
+    configuration["MPRIS"] = settings.value("MPRIS", "auto");
+    configuration["PLAYER"] = settings.value("PLAYER", "mpris");
+    configuration["PLAYERSYMBOLS"] = settings.value("PLAYERSYMBOLS", "10");
+    settings.endGroup();
+
+    qCInfo(LOG_AW) << "Configuration" << configuration;
+
+    return configuration;
+}
+
+
+bool AWConfigHelper::writeDataEngineConfiguration(const QVariantMap &_configuration)
+{
+    qCDebug(LOG_AW) << "Configuration" << _configuration;
+
+    QString fileName = QString("%1/plasma-dataengine-extsysmon.conf")
+                           .arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation));
+    QSettings settings(fileName, QSettings::IniFormat);
+    qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
+
+    settings.beginGroup("Configuration");
+    settings.setValue("ACPIPATH", _configuration["ACPIPATH"]);
+    settings.setValue("GPUDEV", _configuration["GPUDEV"]);
+    settings.setValue("HDDDEV", _configuration["HDDDEV"]);
+    settings.setValue("HDDTEMPCMD", _configuration["HDDTEMPCMD"]);
+    settings.setValue("MPDADDRESS", _configuration["MPDADDRESS"]);
+    settings.setValue("MPDPORT", _configuration["MPDPORT"]);
+    settings.setValue("MPRIS", _configuration["MPRIS"]);
+    settings.setValue("PLAYER", _configuration["PLAYER"]);
+    settings.setValue("PLAYERSYMBOLS", _configuration["PLAYERSYMBOLS"]);
+    settings.endGroup();
+
+    settings.sync();
+
+    return (settings.status() == QSettings::NoError);
+}
+
+
+void AWConfigHelper::copyConfigs(const QString &_localDir)
+{
+    qCDebug(LOG_AW) << "Local directory" << _localDir;
+
+    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), QSettings::IniFormat);
+    itemSettings.beginGroup("Desktop Entry");
+    if (_inverse)
+        copySettings(_settings, itemSettings);
+    else
+        copySettings(itemSettings, _settings);
+    itemSettings.endGroup();
+    _settings.endGroup();
+
+    if (_inverse)
+        itemSettings.sync();
+}
+
+
+void AWConfigHelper::copySettings(QSettings &_from, QSettings &_to)
+{
+    for (auto &key : _from.childKeys())
+        _to.setValue(key, _from.value(key));
+}
+
+
+void AWConfigHelper::readFile(QSettings &_settings, const QString &_key, const QString &_fileName)
+{
+    qCDebug(LOG_AW) << "Key" << _key << "from file" << _fileName;
+
+    QFile file(_fileName);
+    if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        QString text = QString::fromUtf8(file.readAll());
+        file.close();
+        _settings.setValue(_key, text);
+    } else {
+        qCWarning(LOG_AW) << "Could not open to read" << file.fileName();
+    }
+}
+
+
+void AWConfigHelper::writeFile(QSettings &_settings, const QString &_key, const QString &_fileName)
+{
+    qCDebug(LOG_AW) << "Key" << _key << "to file" << _fileName;
+
+    if (!_settings.contains(_key))
+        return;
+
+    QFile file(_fileName);
+    if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        QTextStream out(&file);
+        out.setCodec("UTF-8");
+        out << _settings.value(_key).toString().toUtf8();
+        out.flush();
+        file.close();
+    } else {
+        qCWarning(LOG_AW) << "Could not open to write" << file.fileName();
+    }
+}

sources/awesome-widget/plugin/awconfighelper.h

@@ -0,0 +1,57 @@
+/***************************************************************************
+ *   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 AWCONFIGHELPER_H
+#define AWCONFIGHELPER_H
+
+#include <QObject>
+#include <QVariant>
+
+
+class QSettings;
+
+class AWConfigHelper : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AWConfigHelper(QObject *_parent = nullptr);
+    ~AWConfigHelper() override;
+    Q_INVOKABLE [[nodiscard]] static QString configurationDirectory();
+    Q_INVOKABLE static bool dropCache();
+    Q_INVOKABLE bool exportConfiguration(QObject *_nativeConfig, const QString &_fileName) const;
+    Q_INVOKABLE [[nodiscard]] QVariantMap importConfiguration(const QString &_fileName, bool _importPlasmoid,
+                                                              bool _importExtensions, bool _importAdds) const;
+    // dataengine
+    Q_INVOKABLE static QVariantMap readDataEngineConfiguration();
+    Q_INVOKABLE static bool writeDataEngineConfiguration(const QVariantMap &_configuration);
+
+private:
+    // methods
+    static void copyConfigs(const QString &_localDir);
+    void copyExtensions(const QString &_item, const QString &_type, QSettings &_settings, bool _inverse) const;
+    static void copySettings(QSettings &_from, QSettings &_to);
+    static void readFile(QSettings &_settings, const QString &_key, const QString &_fileName);
+    static void writeFile(QSettings &_settings, const QString &_key, const QString &_fileName);
+    // properties
+    QString m_baseDir;
+    QStringList m_dirs = {"desktops", "quotes", "scripts", "upgrade", "weather", "formatters"};
+};
+
+
+#endif /* AWCONFIGHELPER_H */

sources/awesome-widget/plugin/awcustomkeysconfig.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 "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,35 @@
+/***************************************************************************
+ *   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());
+    ~AWCustomKeysConfig() override;
+};
+
+
+#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 valuesSet().values();
+}
+
+
+QStringList AWCustomKeysHelper::refinedSources() const
+{
+    auto allSources = valuesSet();
+    QSet<QString> output;
+
+    while (output != allSources) {
+        output.clear();
+        for (auto &src : allSources)
+            output.insert(pairs().contains(src) ? source(src) : src);
+        allSources = output;
+    }
+
+    return output.values();
+}
+
+
+QStringList AWCustomKeysHelper::leftKeys()
+{
+    return keys();
+}
+
+
+QStringList AWCustomKeysHelper::rightKeys()
+{
+    return {};
+}

sources/awesome-widget/plugin/awcustomkeyshelper.h

@@ -0,0 +1,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);
+    ~AWCustomKeysHelper() override;
+    // get
+    [[nodiscard]] QString source(const QString &_key) const;
+    [[nodiscard]] QStringList sources() const;
+    [[nodiscard]] QStringList refinedSources() const;
+    // configuration related
+    void editPairs() override{};
+    QStringList leftKeys() override;
+    QStringList rightKeys() override;
+
+private:
+};
+
+
+#endif /* AWCUSTOMKEYSHELPER_H */

sources/awesome-widget/plugin/awdataaggregator.cpp

@@ -0,0 +1,280 @@
+/***************************************************************************
+ *   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 "awdataaggregator.h"
+
+#include <KI18n/KLocalizedString>
+
+#include <QBuffer>
+#include <QGraphicsScene>
+#include <QGraphicsView>
+
+#include <cmath>
+
+#include "awactions.h"
+#include "awdebug.h"
+
+
+AWDataAggregator::AWDataAggregator(QObject *_parent)
+    : QObject(_parent)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    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();
+}
+
+
+AWDataAggregator::~AWDataAggregator()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    delete m_toolTipScene;
+}
+
+
+QString AWDataAggregator::htmlImage(const QPixmap &_source)
+{
+    QByteArray byteArray;
+    QBuffer buffer(&byteArray);
+    _source.save(&buffer, "PNG");
+
+    return byteArray.isEmpty() ? ""
+                               : QString("<img src=\"data:image/png;base64,%1\"/>").arg(QString(byteArray.toBase64()));
+}
+
+
+void AWDataAggregator::setParameters(const QVariantMap &_settings)
+{
+    qCDebug(LOG_AW) << "Settings" << _settings;
+
+    // cast from QVariantMap to QVariantHash without data lost
+    m_configuration = qvariant_cast<QVariantHash>(_settings);
+
+    m_enablePopup = m_configuration["notify"].toBool();
+
+    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
+    m_toolTipView->resize(100 * m_counts, 105);
+
+    requiredKeys.clear();
+    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
+    m_toolTipScene->setBackgroundBrush(m_configuration["useTooltipBackground"].toBool()
+                                           ? QBrush(QColor(m_configuration["tooltipBackground"].toString()))
+                                           : QBrush(Qt::NoBrush));
+}
+
+
+QPixmap AWDataAggregator::tooltipImage()
+{
+    // create image
+    m_toolTipScene->clear();
+    QPen pen;
+    bool down = false;
+    for (auto &key : requiredKeys) {
+        // create frame
+        float normX = 100.0f / static_cast<float>(m_values[key].count());
+        float normY = 100.0f / (1.5f * m_boundaries[key]);
+        float shift = static_cast<float>(requiredKeys.indexOf(key)) * 100.0f;
+        if (down)
+            shift -= 100.0;
+        // apply pen color
+        if (key != "batTooltip")
+            pen.setColor(QColor(m_configuration[QString("%1Color").arg(key)].toString()));
+        // paint data inside frame
+        for (int j = 0; j < m_values[key].count() - 1; j++) {
+            // some magic here
+            float x1 = j * normX + shift;
+            float y1 = -std::fabs(m_values[key].at(j)) * normY + 5.0f;
+            float x2 = (j + 1) * normX + shift;
+            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(m_configuration["batTooltipColor"].toString()));
+                else
+                    pen.setColor(QColor(m_configuration["batInTooltipColor"].toString()));
+            }
+            m_toolTipScene->addLine(x1, y1, x2, y2, pen);
+        }
+        if (key == "downkbTooltip")
+            down = true;
+    }
+
+    return m_toolTipView->grab();
+}
+
+
+void AWDataAggregator::dataUpdate(const QVariantHash &_values)
+{
+    // do not log these arguments
+    setData(_values);
+    emit(toolTipPainted(htmlImage(tooltipImage())));
+}
+
+
+void AWDataAggregator::checkValue(const QString &_source, const float _value, const float _extremum) const
+{
+    qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value << "called with extremum"
+                    << _extremum;
+
+    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) && (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
+{
+    qCDebug(LOG_AW) << "Notification source" << _source << "with current value" << _current << "and received one"
+                    << _received;
+
+    if ((m_enablePopup) && (_current != _received) && (!_received.isEmpty()))
+        return AWActions::sendNotification("event", notificationText(_source, _received));
+}
+
+
+void AWDataAggregator::initScene()
+{
+    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)
+{
+    qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value;
+
+    QString output;
+    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 == "memTooltip")
+        output = i18n("High memory usage");
+    else if (_source == "swapTooltip")
+        output = i18n("Swap is used");
+    else if (_source == "gpu")
+        output = i18n("High GPU load");
+
+    return output;
+}
+
+
+QString AWDataAggregator::notificationText(const QString &_source, const QString &_value)
+{
+    qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value;
+
+    QString output;
+    if (_source == "netdev")
+        output = i18n("Network device has been changed to %1", _value);
+
+    return output;
+}
+
+
+void AWDataAggregator::setData(const QVariantHash &_values)
+{
+    // do not log these arguments
+    // battery update requires info is AC online or not
+    setData(_values["ac"].toString() == m_configuration["acOnline"], "batTooltip", _values["bat"].toFloat());
+    // usual case
+    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("netdev", m_currentNetworkDevice, value);
+        m_currentNetworkDevice = value;
+    }(_values["netdev"].toString());
+    // additional check for GPU load
+    [this](const float value) { checkValue("gpu", value, 90.0); }(_values["gpu"].toFloat());
+}
+
+
+void AWDataAggregator::setData(const QString &_source, float _value, const float _extremum)
+{
+    qCDebug(LOG_AW) << "Source" << _source << "to value" << _value << "with extremum" << _extremum;
+
+    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);
+
+    m_values[_source].append(_value);
+    if (_source == "downkbTooltip") {
+        QList<float> netValues = m_values["downkbTooltip"] + m_values["upkbTooltip"];
+        // to avoid inf value of normY
+        netValues << 1.0;
+        m_boundaries["downkbTooltip"] = 1.2f * *std::max_element(netValues.cbegin(), netValues.cend());
+        m_boundaries["upkbTooltip"] = m_boundaries["downkbTooltip"];
+    }
+}
+
+
+void AWDataAggregator::setData(const bool _dontInvert, const QString &_source, float _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);
+}

sources/awesome-widget/plugin/awdataaggregator.h

@@ -0,0 +1,73 @@
+/***************************************************************************
+ *   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 AWTOOLTIP_H
+#define AWTOOLTIP_H
+
+#include <QObject>
+#include <QVariant>
+
+
+class QGraphicsScene;
+class QGraphicsView;
+class QPixmap;
+class QThreadPool;
+
+class AWDataAggregator : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AWDataAggregator(QObject *_parent = nullptr);
+    ~AWDataAggregator() override;
+    static QString htmlImage(const QPixmap &_source);
+    void setParameters(const QVariantMap &_settings);
+    QPixmap tooltipImage();
+
+public slots:
+    void dataUpdate(const QVariantHash &_values);
+
+signals:
+    void toolTipPainted(const QString &_image) const;
+
+private:
+    // ui
+    QGraphicsScene *m_toolTipScene = nullptr;
+    QGraphicsView *m_toolTipView = nullptr;
+    void checkValue(const QString &_source, float _value, float _extremum) const;
+    void checkValue(const QString &_source, const QString &_current, const QString &_received) const;
+    void initScene();
+    static QString notificationText(const QString &_source, float _value);
+    static QString notificationText(const QString &_source, const QString &_value);
+    // main method
+    void setData(const QVariantHash &_values);
+    void setData(const QString &_source, float _value, float _extremum = -1.0f);
+    // different signature for battery device
+    void setData(bool _dontInvert, const QString &_source, float _value);
+    // variables
+    int m_counts = 0;
+    QVariantHash m_configuration;
+    QString m_currentNetworkDevice = "lo";
+    QHash<QString, float> m_boundaries;
+    QHash<QString, QList<float>> m_values;
+    bool m_enablePopup = false;
+    QStringList requiredKeys;
+};
+
+
+#endif /* AWTOOLTIP_H */

sources/awesome-widget/plugin/awdataengineaggregator.cpp

@@ -0,0 +1,115 @@
+/***************************************************************************
+ *   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 "awdataengineaggregator.h"
+
+#include <Plasma/DataContainer>
+
+#include "awdebug.h"
+
+
+AWDataEngineAggregator::AWDataEngineAggregator(QObject *_parent)
+    : QObject(_parent)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    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");
+}
+
+
+AWDataEngineAggregator::~AWDataEngineAggregator()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    disconnectSources();
+}
+
+
+void AWDataEngineAggregator::disconnectSources()
+{
+    for (auto dataEngine : m_dataEngines.values())
+        for (auto &source : dataEngine->sources())
+            dataEngine->disconnectSource(source, parent());
+    disconnect(m_newSourceConnection);
+}
+
+
+void AWDataEngineAggregator::reconnectSources(const int _interval)
+{
+    qCDebug(LOG_AW) << "Reconnect sources with interval" << _interval;
+
+    disconnectSources();
+
+    m_dataEngines["systemmonitor"]->connectAllSources(parent(), (uint)_interval);
+    m_dataEngines["extsysmon"]->connectAllSources(parent(), (uint)_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(), (uint)_interval);
+        });
+
+#ifdef BUILD_FUTURE
+    createQueuedConnection();
+#endif /* BUILD_FUTURE */
+}
+
+
+void AWDataEngineAggregator::dropSource(const QString &_source)
+{
+    qCDebug(LOG_AW) << "Source" << _source;
+
+    // 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::createQueuedConnection()
+{
+    // 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

@@ -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 AWDATAENGINEAGGREGATOR_H
+#define AWDATAENGINEAGGREGATOR_H
+
+#include <Plasma/DataEngine>
+#include <Plasma/DataEngineConsumer>
+
+#include <QObject>
+
+
+class AWDataEngineAggregator : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AWDataEngineAggregator(QObject *_parent = nullptr);
+    ~AWDataEngineAggregator() override;
+    void disconnectSources();
+    void reconnectSources(int _interval);
+
+signals:
+    void deviceAdded(const QString &_source);
+
+public slots:
+    void dropSource(const QString &_source);
+
+private:
+    void createQueuedConnection();
+    Plasma::DataEngineConsumer *m_consumer = nullptr;
+    QHash<QString, Plasma::DataEngine *> m_dataEngines;
+    QMetaObject::Connection m_newSourceConnection;
+};
+
+
+#endif /* AWDATAENGINEAGGREGATOR_H */

sources/awesome-widget/plugin/awdataenginemapper.cpp

@@ -0,0 +1,445 @@
+/***************************************************************************
+ *   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.insert(_source, "ac");
+        m_formatter["ac"] = AWKeysAggregator::FormatterType::ACFormat;
+    } else if (_source.startsWith("battery/")) {
+        // battery stats
+        QString key = _source;
+        key.remove("battery/");
+        m_map.insert(_source, key);
+        m_formatter[key] = _source.contains("rate") ? AWKeysAggregator::FormatterType::Float
+                                                    : AWKeysAggregator::FormatterType::IntegerThree;
+    } else if (_source == "cpu/system/TotalLoad") {
+        // cpu
+        m_map.insert(_source, "cpu");
+        m_formatter["cpu"] = AWKeysAggregator::FormatterType::Float;
+    } else if (_source.contains(cpuRegExp)) {
+        // cpus
+        QString key = _source;
+        key.remove("cpu/").remove("/TotalLoad");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::Float;
+    } else if (_source == "cpu/system/AverageClock") {
+        // cpucl
+        m_map.insert(_source, "cpucl");
+        m_formatter["cpucl"] = AWKeysAggregator::FormatterType::Integer;
+    } else if (_source.contains(cpuclRegExp)) {
+        // cpucls
+        QString key = _source;
+        key.remove("cpu/cpu").remove("/clock");
+        key = QString("cpucl%1").arg(key);
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
+    } else if (_source.startsWith("custom")) {
+        // custom
+        QString key = _source;
+        key.remove("custom/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "desktop/current/name") {
+        // current desktop name
+        m_map.insert(_source, "desktop");
+        m_formatter["desktop"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "desktop/current/number") {
+        // current desktop number
+        m_map.insert(_source, "ndesktop");
+        m_formatter["ndesktop"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "desktop/total/number") {
+        // desktop count
+        m_map.insert(_source, "tdesktops");
+        m_formatter["tdesktops"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.contains(hddrRegExp)) {
+        // read speed
+        QString device = _source;
+        device.remove("/Rate/rblk");
+        int index = m_devices["disk"].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hddr%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
+        }
+    } else if (_source.contains(hddwRegExp)) {
+        // write speed
+        QString device = _source;
+        device.remove("/Rate/wblk");
+        int index = m_devices["disk"].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hddw%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
+        }
+    } else if (_source == "gpu/load") {
+        // gpu load
+        m_map.insert(_source, "gpu");
+        m_formatter["gpu"] = AWKeysAggregator::FormatterType::Float;
+    } else if (_source == "gpu/temperature") {
+        // gpu temperature
+        m_map.insert(_source, "gputemp");
+        m_formatter["gputemp"] = AWKeysAggregator::FormatterType::Temperature;
+    } else if (_source.contains(mountFillRegExp)) {
+        // fill level
+        QString device = _source;
+        device.remove("partitions").remove("/filllevel");
+        int index = m_devices["mount"].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hdd%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Float;
+            // additional keys
+            m_formatter[QString("hddtotmb%1").arg(index)] = AWKeysAggregator::FormatterType::MemMBFormat;
+            m_formatter[QString("hddtotgb%1").arg(index)] = AWKeysAggregator::FormatterType::MemGBFormat;
+        }
+    } else if (_source.contains(mountFreeRegExp)) {
+        // free space
+        QString device = _source;
+        device.remove("partitions").remove("/freespace");
+        int index = m_devices["mount"].indexOf(device);
+        if (index > -1) {
+            // mb
+            QString key = QString("hddfreemb%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
+            // gb
+            key = QString("hddfreegb%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemGBFormat;
+        }
+    } else if (_source.contains(mountUsedRegExp)) {
+        // used
+        QString device = _source;
+        device.remove("partitions").remove("/usedspace");
+        int index = m_devices["mount"].indexOf(device);
+        if (index > -1) {
+            // mb
+            QString key = QString("hddmb%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
+            // gb
+            key = QString("hddgb%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemGBFormat;
+        }
+    } else if (_source.startsWith("hdd/temperature")) {
+        // hdd temperature
+        QString device = _source;
+        device.remove("hdd/temperature");
+        int index = m_devices["hdd"].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hddtemp%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
+        }
+    } else if (_source.startsWith("cpu/system/loadavg")) {
+        // load average
+        QString time = _source;
+        time.remove("cpu/system/loadavg");
+        QString key = QString("la%1").arg(time);
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::FloatTwoSymbols;
+    } else if (_source == "mem/physical/application") {
+        // app memory
+        // mb
+        m_map.insert(_source, "memmb");
+        m_formatter["memmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insert(_source, "memgb");
+        m_formatter["memgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source == "mem/physical/free") {
+        // free memory
+        // mb
+        m_map.insert(_source, "memfreemb");
+        m_formatter["memfreemb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insert(_source, "memfreegb");
+        m_formatter["memfreegb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source == "mem/physical/used") {
+        // used memory
+        // mb
+        m_map.insert(_source, "memusedmb");
+        m_formatter["memusedmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insert(_source, "memusedgb");
+        m_formatter["memusedgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source == "network/current/name") {
+        // network device
+        m_map.insert(_source, "netdev");
+        m_formatter["netdev"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "network/current/ssid") {
+        // current ssid
+        m_map.insert(_source, "ssid");
+        m_formatter["ssid"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.startsWith("network/response")) {
+        // network response
+        QString key = _source;
+        key.remove("network/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.contains(netRegExp)) {
+        // network speed
+        QString type = _source.contains("receiver") ? "down" : "up";
+        int index = m_devices["net"].indexOf(_source.split('/')[2]);
+        if (index > -1) {
+            // kb
+            QString key = QString("%1kb%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
+            // smart
+            key = QString("%1%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::NetSmartFormat;
+            // units
+            key = QString("%1units%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::NetSmartUnits;
+        }
+    } else if (_source.contains(netTotalRegExp)) {
+        // network data total
+        QString type = _source.contains("receiver") ? "down" : "up";
+        int index = m_devices["net"].indexOf(_source.split('/')[2]);
+        if (index > -1) {
+            // kb
+            QString key = QString("%1totkb%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::Integer;
+            // mb
+            key = QString("%1tot%2").arg(type).arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = AWKeysAggregator::FormatterType::MemMBFormat;
+        }
+    } else if (_source.startsWith("upgrade")) {
+        // package manager
+        QString key = _source;
+        key.remove("upgrade/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::IntegerThree;
+    } else if (_source.startsWith("player")) {
+        // player
+        QString key = _source;
+        key.remove("player/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "ps/running/count") {
+        // running processes count
+        m_map.insert(_source, "pscount");
+        m_formatter["pscount"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source == "ps/running/list") {
+        // list of running processes
+        m_map.insert(_source, "ps");
+        m_formatter["ps"] = AWKeysAggregator::FormatterType::List;
+    } else if (_source == "ps/total/count") {
+        // total processes count
+        m_map.insert(_source, "pstot");
+        m_formatter["pstot"] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.startsWith("quotes")) {
+        // quotes
+        QString key = _source;
+        key.remove("quotes/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::Quotes;
+    } else if (_source == "mem/swap/free") {
+        // free swap
+        // mb
+        m_map.insert(_source, "swapfreemb");
+        m_formatter["swapfreemb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insert(_source, "swapfreegb");
+        m_formatter["swapfreegb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source == "mem/swap/used") {
+        // used swap
+        // mb
+        m_map.insert(_source, "swapmb");
+        m_formatter["swapmb"] = AWKeysAggregator::FormatterType::MemMBFormat;
+        // gb
+        m_map.insert(_source, "swapgb");
+        m_formatter["swapgb"] = AWKeysAggregator::FormatterType::MemGBFormat;
+    } else if (_source.startsWith("lmsensors/")) {
+        // temperature
+        int index = m_devices["temp"].indexOf(_source);
+        // HACK on DE initialization there are no units key
+        if (_units.isEmpty())
+            return QStringList({QString("temp%1").arg(index)});
+        if (index > -1) {
+            QString key = QString("temp%1").arg(index);
+            m_map.insert(_source, key);
+            m_formatter[key] = _units == "°C" ? AWKeysAggregator::FormatterType::Temperature
+                                              : AWKeysAggregator::FormatterType::Integer;
+        }
+    } else if (_source == "Local") {
+        // time
+        m_map.insert(_source, "time");
+        m_formatter["time"] = AWKeysAggregator::FormatterType::Time;
+        // custom time
+        m_map.insert(_source, "ctime");
+        m_formatter["ctime"] = AWKeysAggregator::FormatterType::TimeCustom;
+        // ISO time
+        m_map.insert(_source, "isotime");
+        m_formatter["isotime"] = AWKeysAggregator::FormatterType::TimeISO;
+        // long time
+        m_map.insert(_source, "longtime");
+        m_formatter["longtime"] = AWKeysAggregator::FormatterType::TimeLong;
+        // short time
+        m_map.insert(_source, "shorttime");
+        m_formatter["shorttime"] = AWKeysAggregator::FormatterType::TimeShort;
+        // timestamp
+        m_map.insert(_source, "tstime");
+        m_formatter["tstime"] = AWKeysAggregator::FormatterType::Timestamp;
+    } else if (_source == "system/brightness") {
+        m_map.insert(_source, "brightness");
+        m_formatter["brightness"] = AWKeysAggregator::FormatterType::IntegerThree;
+    } else if (_source == "system/volume") {
+        m_map.insert(_source, "volume");
+        m_formatter["volume"] = AWKeysAggregator::FormatterType::IntegerThree;
+    } else if (_source == "system/uptime") {
+        // uptime
+        m_map.insert(_source, "uptime");
+        m_formatter["uptime"] = AWKeysAggregator::FormatterType::Uptime;
+        // custom uptime
+        m_map.insert(_source, "cuptime");
+        m_formatter["cuptime"] = AWKeysAggregator::FormatterType::UptimeCustom;
+    } else if (_source.startsWith("weather/temperature")) {
+        // temperature
+        QString key = _source;
+        key.remove("weather/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
+    } else if (_source.startsWith("weather/")) {
+        // other weather
+        QString key = _source;
+        key.remove("weather/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
+    } else if (_source.startsWith("load/load")) {
+        // load source
+        QString key = _source;
+        key.remove("load/");
+        m_map.insert(_source, key);
+        m_formatter[key] = AWKeysAggregator::FormatterType::Temperature;
+    }
+
+    QStringList foundKeys = keysFromSource(_source);
+
+    // rewrite formatters for custom ones
+    QStringList customFormattersKeys;
+    if (m_customFormatters)
+        customFormattersKeys = m_customFormatters->definedFormatters();
+    qCInfo(LOG_AW) << "Looking for formatters" << 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,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 AWDATAENGINEMAPPER_H
+#define AWDATAENGINEMAPPER_H
+
+#include <QMultiHash>
+#include <QObject>
+
+#include "awkeysaggregator.h"
+
+
+class AWFormatterHelper;
+
+class AWDataEngineMapper : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AWDataEngineMapper(QObject *_parent = nullptr, AWFormatterHelper *_custom = nullptr);
+    ~AWDataEngineMapper() override;
+    // get methods
+    [[nodiscard]] AWKeysAggregator::FormatterType formatter(const QString &_key) const;
+    [[nodiscard]] 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;
+    QMultiHash<QString, QString> m_map;
+};
+
+
+#endif /* AWDATAENGINEMAPPER_H */

sources/awesome-widget/plugin/awdbusadaptor.cpp

@@ -0,0 +1,108 @@
+/***************************************************************************
+ *   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()
+{
+    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, const 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,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 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);
+    ~AWDBusAdaptor() override;
+
+public slots:
+    // get methods
+    [[nodiscard]] static QStringList ActiveServices();
+    [[nodiscard]] QString Info(const QString &key) const;
+    [[nodiscard]] QStringList Keys(const QString &regexp) const;
+    [[nodiscard]] QString Value(const QString &key) const;
+    [[nodiscard]] qlonglong WhoAmI() const;
+    // set methods
+    void SetLogLevel(const QString &what, int level);
+    void SetLogLevel(const QString &what, const QString &level, bool enabled);
+
+private:
+    AWKeys *m_plugin = nullptr;
+    QStringList m_logLevels = {"debug", "info", "warning", "critical"};
+};
+
+
+#endif /* AWDBUSADAPTOR_H */

sources/awesome-widget/plugin/awesomewidget.cpp

@@ -20,31 +20,21 @@
 #include <QtQml>
 
 #include "awactions.h"
+#include "awbugreporter.h"
+#include "awconfighelper.h"
 #include "awkeys.h"
-
-
-static QObject *awactions_singletontype_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
-
-    return new AWActions();
-}
-
-
-static QObject *awkeys_singletontype_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
-
-    return new AWKeys();
-}
+#include "awpairconfigfactory.h"
+#include "awtelemetryhandler.h"
 
 
 void AWPlugin::registerTypes(const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("org.kde.plasma.awesomewidget"));
+    Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.awesomewidget"));
 
-    qmlRegisterSingletonType<AWActions>(uri, 1, 0, "AWActions", awactions_singletontype_provider);
-    qmlRegisterSingletonType<AWKeys>(uri, 1, 0, "AWKeys", awkeys_singletontype_provider);
+    qmlRegisterType<AWActions>(uri, 1, 0, "AWActions");
+    qmlRegisterType<AWBugReporter>(uri, 1, 0, "AWBugReporter");
+    qmlRegisterType<AWConfigHelper>(uri, 1, 0, "AWConfigHelper");
+    qmlRegisterType<AWPairConfigFactory>(uri, 1, 0, "AWPairConfigFactory");
+    qmlRegisterType<AWKeys>(uri, 1, 0, "AWKeys");
+    qmlRegisterType<AWTelemetryHandler>(uri, 1, 0, "AWTelemetryHandler");
 }

sources/awesome-widget/plugin/awesomewidget.h

@@ -28,7 +28,7 @@ class AWPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri);
+    void registerTypes(const char *uri) override;
 };
 
 

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,35 @@
+/***************************************************************************
+ *   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());
+    ~AWFormatterConfig() override;
+};
+
+
+#endif /* AWFORMATTERCONFIG_H */

sources/awesome-widget/plugin/awformatterhelper.cpp

@@ -0,0 +1,240 @@
+/***************************************************************************
+ *   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__;
+
+    AWFormatterHelper::initItems();
+}
+
+
+AWFormatterHelper::~AWFormatterHelper()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    m_formatters.clear();
+    m_formattersClasses.clear();
+}
+
+
+void AWFormatterHelper::initItems()
+{
+    initFormatters();
+
+    // 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 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)
+{
+    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)
+{
+    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,61 @@
+/***************************************************************************
+ *   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);
+    ~AWFormatterHelper() override;
+    // read-write methods
+    void initItems() override;
+    // methods
+    [[nodiscard]] QString convert(const QVariant &_value, const QString &_name) const;
+    [[nodiscard]] QStringList definedFormatters() const;
+    [[nodiscard]] QList<AbstractExtItem *> items() const override;
+    // configuration related
+    void editPairs() override;
+    QStringList leftKeys() override;
+    QStringList rightKeys() override;
+
+public slots:
+    void editItems();
+
+private:
+    // methods
+    static AWAbstractFormatter::FormatterClass defineFormatterClass(const QString &_stringType);
+    void initFormatters();
+    [[nodiscard]] static QPair<QString, AWAbstractFormatter::FormatterClass> readMetadata(const QString &_filePath);
+    // parent methods
+    void doCreateItem() override;
+    // properties
+    QHash<QString, AWAbstractFormatter *> m_formatters;
+    QHash<QString, AWAbstractFormatter *> m_formattersClasses;
+};
+
+
+#endif /* AWFORMATTERHELPER_H */

sources/awesome-widget/plugin/awkeycache.cpp

@@ -0,0 +1,174 @@
+/***************************************************************************
+ *   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(_keys.cbegin(), _keys.cend());
+    used.unite(QSet(_bars.cbegin(), _bars.cend()));
+    used.unite(QSet(_userKeys.cbegin(), _userKeys.cend()));
+    // insert keys from tooltip
+    for (auto &key : _tooltip.keys()) {
+        if ((key.endsWith("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.values();
+}
+
+
+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,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 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();
+} // namespace AWKeyCache
+
+
+#endif /* AWKEYCACHE_H */

sources/awesome-widget/plugin/awkeyoperations.cpp

@@ -0,0 +1,356 @@
+/***************************************************************************
+ *   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 <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));
+        allKeys.append(QString("batleft%1").arg(i));
+        allKeys.append(QString("batnow%1").arg(i));
+        allKeys.append(QString("batrate%1").arg(i));
+        allKeys.append(QString("battotal%1").arg(i));
+    }
+    // package manager
+    for (auto &item : m_extUpgrade->activeItems())
+        allKeys.append(item->tag("pkgcount"));
+    // quotes
+    for (auto &item : m_extQuotes->activeItems()) {
+        allKeys.append(item->tag("price"));
+        allKeys.append(item->tag("pricechg"));
+        allKeys.append(item->tag("percpricechg"));
+        allKeys.append(item->tag("volume"));
+        allKeys.append(item->tag("volumechg"));
+        allKeys.append(item->tag("percvolumechg"));
+    }
+    // custom
+    for (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);
+    ~AWKeyOperations() override;
+    [[nodiscard]] QStringList devices(const QString &_type) const;
+    [[nodiscard]] QHash<QString, QStringList> devices() const;
+    void updateCache();
+    // keys
+    [[nodiscard]] QStringList dictKeys() const;
+    [[nodiscard]] GraphicalItem *giByKey(const QString &_key) const;
+    [[nodiscard]] QStringList requiredUserKeys() const;
+    [[nodiscard]] QStringList userKeys() const;
+    [[nodiscard]] QString userKeySource(const QString &_key) const;
+    // values
+    [[nodiscard]] QString infoByKey(const QString &_key) const;
+    [[nodiscard]] 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

@@ -19,111 +19,77 @@
 #ifndef AWKEYS_H
 #define AWKEYS_H
 
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QListWidget>
-#include <QMap>
+#include <Plasma/DataEngine>
+
+#include <QMutex>
 #include <QObject>
-#include <QStringList>
-#include <QPushButton>
-#include <QVariant>
 
 
-class AWToolTip;
-class ExtQuotes;
-class ExtScript;
-class ExtUpgrade;
-class GraphicalItem;
+class AWDataAggregator;
+class AWDataEngineAggregator;
+class AWKeyOperations;
+class AWKeysAggregator;
+class QThreadPool;
+class QTimer;
 
 class AWKeys : public QObject
 {
     Q_OBJECT
 
-    enum RequestedItem {
-        Nothing,
-        RequestedGraphicalItem,
-        RequestedExtQuotes,
-        RequestedExtScript,
-        RequestedExtUpgrade
-    };
-
 public:
-    AWKeys(QObject *parent = nullptr);
-    ~AWKeys();
-
-    Q_INVOKABLE void initKeys(const QString currentPattern);
-    Q_INVOKABLE void initTooltip(const QVariantMap tooltipParams);
-    Q_INVOKABLE void setPopupEnabled(const bool popup = false);
-    Q_INVOKABLE void setWrapNewLines(const bool wrap = false);
-    Q_INVOKABLE bool isDebugEnabled();
-    Q_INVOKABLE QString parsePattern();
-    Q_INVOKABLE QString toolTipImage();
-    Q_INVOKABLE QSize toolTipSize();
+    explicit AWKeys(QObject *_parent = nullptr);
+    ~AWKeys() override;
+    Q_INVOKABLE void initDataAggregator(const QVariantMap &_tooltipParams);
+    Q_INVOKABLE void initKeys(const QString &_currentPattern, int _interval, int _limit, bool _optimize);
+    Q_INVOKABLE void setAggregatorProperty(const QString &_key, const QVariant &_value);
+    Q_INVOKABLE void setWrapNewLines(bool _wrap);
+    // additional method to force load keys from Qml UI. Used in some
+    // configuration pages
+    Q_INVOKABLE void updateCache();
     // keys
-    Q_INVOKABLE void addDevice(const QString source);
-    Q_INVOKABLE QStringList dictKeys(const bool sorted = false);
-    Q_INVOKABLE QStringList getHddDevices();
-    Q_INVOKABLE void setDataBySource(const QString sourceName, const QVariantMap data,
-                                     const QVariantMap params);
+    Q_INVOKABLE [[nodiscard]] QStringList dictKeys(bool _sorted = false, const QString &_regexp = "") const;
+    Q_INVOKABLE [[nodiscard]] QVariantList getHddDevices() const;
     // values
-    Q_INVOKABLE void graphicalValueByKey();
-    Q_INVOKABLE QString infoByKey(QString key);
-    Q_INVOKABLE QString valueByKey(QString key);
+    Q_INVOKABLE [[nodiscard]] QString infoByKey(const QString &_key) const;
+    Q_INVOKABLE [[nodiscard]] QString valueByKey(const QString &_key) const;
     // configuration
-    Q_INVOKABLE void editItem(const QString type);
+    Q_INVOKABLE void editItem(const QString &_type);
+
+public slots:
+    void dataUpdated(const QString &_sourceName, const Plasma::DataEngine::Data &_data);
+    // dummy method required by DataEngine connections
+    static void modelChanged(const QString &, QAbstractItemModel *){};
 
 signals:
-    void dropSourceFromDataengine(const QString source);
-    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();
-    // editor
-    void editItemButtonPressed(QAbstractButton *button);
-    void copyBar(const QString original);
-    void copyQuotes(const QString original);
-    void copyScript(const QString original);
-    void copyUpgrade(const QString original);
+    void reinitKeys(const QStringList &_currentKeys);
+    void updateTextData();
 
 private:
     // methods
-    void addKeyToCache(const QString type, const QString key = QString(""));
-    bool checkKeys(const QVariantMap data);
-    QString htmlValue(QString key);
-    int numberCpus();
-    float temperature(const float temp, const QString units);
-    // find methods
-    QStringList findGraphicalItems();
-    QStringList findKeys();
-    // get methods
-    QList<ExtQuotes *> getExtQuotes();
-    QList<ExtScript *> getExtScripts();
-    QList<ExtUpgrade *> getExtUpgrade();
-    QList<GraphicalItem *> getGraphicalItems();
-    GraphicalItem *getItemByTag(const QString tag);
-    QStringList getTimeKeys();
-    AWToolTip *toolTip = nullptr;
-    // graphical elements
-    QDialog *dialog = nullptr;
-    QListWidget *widgetDialog = nullptr;
-    QDialogButtonBox *dialogButtons = nullptr;
-    QPushButton *copyButton = nullptr;
-    QPushButton *createButton = nullptr;
-    QPushButton *deleteButton = nullptr;
-    RequestedItem requestedItem = Nothing;
+    void calculateValues();
+    void createDBusInterface();
+    [[nodiscard]] QString parsePattern(QString _pattern) const;
+    void setDataBySource(const QString &_sourceName, const QVariantMap &_data);
+    // objects
+    AWDataAggregator *m_dataAggregator = nullptr;
+    AWDataEngineAggregator *m_dataEngineAggregator = nullptr;
+    AWKeysAggregator *m_aggregator = nullptr;
+    AWKeyOperations *m_keyOperator = nullptr;
+    QTimer *m_timer = nullptr;
     // variables
-    bool debug = false;
-    bool enablePopup = false;
-    bool wrapNewLines = false;
-    QList<GraphicalItem *> graphicalItems;
-    QList<ExtQuotes *> extQuotes;
-    QList<ExtScript *> extScripts;
-    QList<ExtUpgrade *> extUpgrade;
-    QStringList foundBars, foundKeys, keys;
-    QString pattern;
-    QMap<QString, QString> values;
-    QStringList diskDevices, hddDevices, mountDevices, networkDevices, tempDevices;
+    QVariantMap m_tooltipParams;
+    QStringList m_foundBars, m_foundKeys, m_foundLambdas, m_requiredKeys;
+    QVariantHash m_values;
+    bool m_optimize = false;
+    bool m_wrapNewLines = false;
+    // multithread features
+    QThreadPool *m_threadPool = nullptr;
+    QMutex m_mutex;
 };
 
 

sources/awesome-widget/plugin/awkeysaggregator.cpp

@@ -0,0 +1,268 @@
+/***************************************************************************
+ *   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 "awkeysaggregator.h"
+
+#include <KI18n/KLocalizedString>
+
+#include <QDateTime>
+#include <QLocale>
+
+#include "awdataenginemapper.h"
+#include "awdebug.h"
+#include "awformatterhelper.h"
+#include "version.h"
+
+
+AWKeysAggregator::AWKeysAggregator(QObject *_parent)
+    : 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());
+}
+
+
+AWKeysAggregator::~AWKeysAggregator()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+void AWKeysAggregator::initFormatters()
+{
+    m_customFormatters->initItems();
+}
+
+
+QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key, bool replaceSpace) const
+{
+    qCDebug(LOG_AW) << "Data" << _data << "for key" << _key;
+
+    QString output;
+    QLocale loc = m_translate ? QLocale::system() : QLocale::c();
+    // case block
+    switch (m_mapper->formatter(_key)) {
+    case FormatterType::Float:
+        output = QString("%1").arg(_data.toFloat(), 5, 'f', 1);
+        break;
+    case FormatterType::FloatTwoSymbols:
+        output = QString("%1").arg(_data.toFloat(), 5, 'f', 2);
+        break;
+    case FormatterType::Integer:
+        output = QString("%1").arg(_data.toFloat(), 4, 'f', 0);
+        break;
+    case FormatterType::IntegerFive:
+        output = QString("%1").arg(_data.toFloat(), 5, 'f', 0);
+        break;
+    case FormatterType::IntegerThree:
+        output = QString("%1").arg(_data.toFloat(), 3, 'f', 0);
+        break;
+    case FormatterType::List:
+        output = _data.toStringList().join(',');
+        break;
+    case FormatterType::ACFormat:
+        output = _data.toBool() ? m_acOnline : m_acOffline;
+        break;
+    case FormatterType::MemGBFormat:
+        output = QString("%1").arg(_data.toFloat() / (1024.0 * 1024.0), 5, 'f', 1);
+        break;
+    case FormatterType::MemMBFormat:
+        output = QString("%1").arg(_data.toFloat() / 1024.0, 5, 'f', 0);
+        break;
+    case FormatterType::NetSmartFormat:
+        output = [](const float value) {
+            if (value > 1024.0)
+                return QString("%1").arg(value / 1024.0, 4, 'f', 1);
+            else
+                return QString("%1").arg(value, 4, 'f', 0);
+        }(_data.toFloat());
+        break;
+    case FormatterType::NetSmartUnits:
+        if (_data.toFloat() > 1024.0)
+            output = m_translate ? i18n("MB/s") : "MB/s";
+        else
+            output = m_translate ? i18n("KB/s") : "KB/s";
+        break;
+    case FormatterType::Quotes:
+        // first cast
+        output = QString("%1").arg(_data.toDouble(), 0, 'f');
+        output = output.rightJustified(8, QLatin1Char(' '), true);
+        break;
+    case FormatterType::Temperature:
+        output = QString("%1").arg(temperature(_data.toFloat()), 5, 'f', 1);
+        break;
+    case FormatterType::Time:
+        output = _data.toDateTime().toString();
+        break;
+    case FormatterType::TimeCustom:
+        output = m_customTime;
+        [&output, loc, this](const QDateTime &dt) {
+            for (auto &key : m_timeKeys)
+                output.replace(QString("$%1").arg(key), loc.toString(dt, key));
+        }(_data.toDateTime());
+        break;
+    case FormatterType::TimeISO:
+        output = _data.toDateTime().toString(Qt::ISODate);
+        break;
+    case FormatterType::TimeLong:
+        output = loc.toString(_data.toDateTime(), QLocale::LongFormat);
+        break;
+    case FormatterType::TimeShort:
+        output = loc.toString(_data.toDateTime(), QLocale::ShortFormat);
+        break;
+    case FormatterType::Timestamp:
+        output = QString("%1").arg(_data.toDateTime().toMSecsSinceEpoch() / 1000.0, 10, 'f', 0);
+        break;
+    case FormatterType::Uptime:
+    case FormatterType::UptimeCustom:
+        output =
+            [](QString source, const int uptime) {
+                int seconds = uptime - uptime % 60;
+                int minutes = seconds / 60 % 60;
+                int hours = ((seconds / 60) - minutes) / 60 % 24;
+                int days = (((seconds / 60) - minutes) / 60 - hours) / 24;
+                source.replace("$dd", QString("%1").arg(days, 3, 10, QChar('0')));
+                source.replace("$d", QString("%1").arg(days));
+                source.replace("$hh", QString("%1").arg(hours, 2, 10, QChar('0')));
+                source.replace("$h", QString("%1").arg(hours));
+                source.replace("$mm", QString("%1").arg(minutes, 2, 10, QChar('0')));
+                source.replace("$m", QString("%1").arg(minutes));
+                return source;
+            }(m_mapper->formatter(_key) == FormatterType::Uptime ? "$ddd$hhh$mmm" : m_customUptime,
+              static_cast<int>(_data.toFloat()));
+        break;
+    case FormatterType::NoFormat:
+        output = _data.toString();
+        break;
+    case FormatterType::Custom:
+        if (m_customFormatters)
+            output = m_customFormatters->convert(_data, _key);
+        break;
+    }
+
+    // replace spaces to non-breakable ones
+    replaceSpace &= (!_key.startsWith("custom") && (!_key.startsWith("weather")));
+    if (replaceSpace)
+        output.replace(" ", "&nbsp;");
+
+    return output;
+}
+
+
+QStringList AWKeysAggregator::keysFromSource(const QString &_source) const
+{
+    qCDebug(LOG_AW) << "Search for source" << _source;
+
+    return m_mapper->keysFromSource(_source);
+}
+
+
+void AWKeysAggregator::setAcOffline(const QString &_inactive)
+{
+    qCDebug(LOG_AW) << "Inactive AC string" << _inactive;
+
+    m_acOffline = _inactive;
+}
+
+
+void AWKeysAggregator::setAcOnline(const QString &_active)
+{
+    qCDebug(LOG_AW) << "Active AC string" << _active;
+
+    m_acOnline = _active;
+}
+
+
+void AWKeysAggregator::setCustomTime(const QString &_customTime)
+{
+    qCDebug(LOG_AW) << "Format" << _customTime;
+
+    m_customTime = _customTime;
+}
+
+
+void AWKeysAggregator::setCustomUptime(const QString &_customUptime)
+{
+    qCDebug(LOG_AW) << "Format" << _customUptime;
+
+    m_customUptime = _customUptime;
+}
+
+
+void AWKeysAggregator::setDevices(const QHash<QString, QStringList> &_devices)
+{
+    qCDebug(LOG_AW) << "Devices" << _devices;
+
+    m_mapper->setDevices(_devices);
+}
+
+
+void AWKeysAggregator::setTempUnits(const QString &_units)
+{
+    qCDebug(LOG_AW) << "Units" << _units;
+
+    m_tempUnits = _units;
+}
+
+
+void AWKeysAggregator::setTranslate(const bool _translate)
+{
+    qCDebug(LOG_AW) << "Translate" << _translate;
+
+    m_translate = _translate;
+}
+
+
+QStringList AWKeysAggregator::registerSource(const QString &_source, const QString &_units, const QStringList &_keys)
+{
+    qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
+
+    return m_mapper->registerSource(_source, _units, _keys);
+}
+
+
+float AWKeysAggregator::temperature(const float temp) const
+{
+    qCDebug(LOG_AW) << "Temperature value" << temp;
+
+    float converted = temp;
+    if (m_tempUnits == "Celsius") {
+    } else if (m_tempUnits == "Fahrenheit") {
+        converted = temp * 9.0f / 5.0f + 32.0f;
+    } else if (m_tempUnits == "Kelvin") {
+        converted = temp + 273.15f;
+    } else if (m_tempUnits == "Reaumur") {
+        converted = temp * 0.8f;
+    } else if (m_tempUnits == "cm^-1") {
+        converted = (temp + 273.15f) * 0.695f;
+    } else if (m_tempUnits == "kJ/mol") {
+        converted = (temp + 273.15f) * 8.31f;
+    } else if (m_tempUnits == "kcal/mol") {
+        converted = (temp + 273.15f) * 1.98f;
+    } else {
+        qCWarning(LOG_AW) << "Invalid units" << m_tempUnits;
+    }
+
+    return converted;
+}

sources/awesome-widget/plugin/awkeysaggregator.h

@@ -0,0 +1,101 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWKEYSAGGREGATOR_H
+#define AWKEYSAGGREGATOR_H
+
+#include <QHash>
+#include <QObject>
+
+
+class AWFormatterHelper;
+class AWDataEngineMapper;
+
+class AWKeysAggregator : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString acOffline MEMBER m_acOffline WRITE setAcOffline);
+    Q_PROPERTY(QString acOnline MEMBER m_acOnline WRITE setAcOnline);
+    Q_PROPERTY(QString customTime MEMBER m_customTime WRITE setCustomTime);
+    Q_PROPERTY(QString customUptime MEMBER m_customUptime WRITE setCustomUptime);
+    Q_PROPERTY(QString tempUnits MEMBER m_tempUnits WRITE setTempUnits);
+    Q_PROPERTY(bool translate MEMBER m_translate WRITE setTranslate);
+
+public:
+    enum class FormatterType {
+        // general formatters
+        Custom,
+        NoFormat,
+        Float,
+        FloatTwoSymbols,
+        Integer,
+        IntegerFive,
+        IntegerThree,
+        List,
+        // unit specific formatters
+        ACFormat,
+        MemGBFormat,
+        MemMBFormat,
+        NetSmartFormat,
+        NetSmartUnits,
+        Quotes,
+        Temperature,
+        Time,
+        TimeCustom,
+        TimeISO,
+        TimeLong,
+        TimeShort,
+        Timestamp,
+        Uptime,
+        UptimeCustom
+    };
+
+    explicit AWKeysAggregator(QObject *_parent = nullptr);
+    ~AWKeysAggregator() override;
+    void initFormatters();
+    // get methods
+    [[nodiscard]] QString formatter(const QVariant &_data, const QString &_key, bool replaceSpace) const;
+    [[nodiscard]] QStringList keysFromSource(const QString &_source) const;
+    // set methods
+    void setAcOffline(const QString &_inactive);
+    void setAcOnline(const QString &_active);
+    void setCustomTime(const QString &_customTime);
+    void setCustomUptime(const QString &_customUptime);
+    void setDevices(const QHash<QString, QStringList> &_devices);
+    void setTempUnits(const QString &_units);
+    void setTranslate(bool _translate);
+
+public slots:
+    QStringList registerSource(const QString &_source, const QString &_units, const QStringList &_keys);
+
+private:
+    [[nodiscard]] float temperature(float temp) const;
+    AWFormatterHelper *m_customFormatters = nullptr;
+    AWDataEngineMapper *m_mapper = nullptr;
+    QStringList m_timeKeys;
+    // variables
+    QString m_acOffline;
+    QString m_acOnline;
+    QString m_customTime;
+    QString m_customUptime;
+    QString m_tempUnits;
+    bool m_translate = false;
+};
+
+
+#endif /* AWKEYSAGGREGATOR_H */

sources/awesome-widget/plugin/awpairconfigfactory.cpp

@@ -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/  *
+ ***************************************************************************/
+
+#include "awpairconfigfactory.h"
+
+#include "awcustomkeysconfig.h"
+#include "awdebug.h"
+#include "awformatterconfig.h"
+
+
+AWPairConfigFactory::AWPairConfigFactory(QObject *_parent)
+    : QObject(_parent)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+AWPairConfigFactory::~AWPairConfigFactory()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+void AWPairConfigFactory::showFormatterDialog(const QStringList &_keys)
+{
+    auto *config = new AWFormatterConfig(nullptr, _keys);
+    config->showDialog();
+    config->deleteLater();
+}
+
+
+void AWPairConfigFactory::showKeysDialog(const QStringList &_keys)
+{
+    auto *config = new AWCustomKeysConfig(nullptr, _keys);
+    config->showDialog();
+    config->deleteLater();
+}

sources/awesome-widget/plugin/awpairconfigfactory.h

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

sources/awesome-widget/plugin/awpatternfunctions.cpp

@@ -0,0 +1,270 @@
+/***************************************************************************
+ *   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 lambdas in" << _code;
+
+    QJSEngine engine;
+    // apply $this values
+    _code.replace("$this", _metadata[_code].toString());
+    // parsed values
+    for (auto &lambdaKey : _usedKeys)
+        _code.replace(QString("$%1").arg(lambdaKey), _aggregator->formatter(_metadata[lambdaKey], lambdaKey, false));
+    qCInfo(LOG_AW) << "Expression" << _code;
+    QJSValue result = engine.evaluate(_code);
+    if (result.isError()) {
+        qCWarning(LOG_AW) << "Uncaught exception at line" << result.property("lineNumber").toInt() << ":"
+                          << 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(R"(\$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(R"(\$%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(R"(\$\{\{(?<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,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 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, bool _isBars);
+QStringList findLambdas(const QString &_code);
+} // namespace AWPatternFunctions
+
+
+#endif /* AWPATTERNFUNCTIONS_H */

sources/awesome-widget/plugin/awtelemetryhandler.cpp

@@ -0,0 +1,179 @@
+/***************************************************************************
+ *   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;
+    }
+
+    auto *manager = new QNetworkAccessManager(nullptr);
+    connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(telemetryReplyRecieved(QNetworkReply *)));
+
+    QUrl url(REMOTE_TELEMETRY_URL);
+    QNetworkRequest request(url);
+    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+
+    // generate payload
+    QVariantMap payload;
+    payload["api"] = AW_TELEMETRY_API;
+    payload["client_id"] = m_clientId;
+    payload["metadata"] = _value;
+    payload["type"] = _group;
+    // convert to QByteArray to send request
+    QByteArray data = QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact);
+    qCInfo(LOG_AW) << "Send request with body" << data.data() << "and size" << data.size();
+
+    manager->post(request, data);
+}
+
+
+void AWTelemetryHandler::telemetryReplyRecieved(QNetworkReply *_reply)
+{
+    if (_reply->error() != QNetworkReply::NoError) {
+        qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message" << _reply->errorString();
+        return;
+    }
+
+    QJsonParseError error{};
+    QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
+    if (error.error != QJsonParseError::NoError) {
+        qCWarning(LOG_AW) << "Parse error" << error.errorString();
+        return;
+    }
+    _reply->deleteLater();
+
+    // convert to map
+    QVariantMap response = jsonDoc.toVariant().toMap();
+    QString message = response["message"].toString();
+    qCInfo(LOG_AW) << "Server reply on telemetry" << message;
+
+    return emit(replyReceived(message));
+}
+
+
+QString AWTelemetryHandler::getKey(const int _count)
+{
+    qCDebug(LOG_AW) << "Get key for keys count" << _count;
+
+    return QString("%1").arg(_count, 3, 10, QChar('0'));
+}