Merge pull request #100 from arcan1s/development

Release 3.2

.gitignore

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

.gitmodules

@@ -1,12 +1,3 @@
-[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

.travis.yml.bckp

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

.tx/config

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

AUTHORS

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

CHANGELOG

@@ -1,3 +1,138 @@
+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
+
+Ver.2.3.2:
++ change network speed units from KB/s to MB/s if value is more than 1000 KB/s (metrics are the same)
+- fix bug with no actions on link activation (thanks to infans)
+* improve quotes support, e.g. fix plasma crash
+* rewrite main widget to signal-slot update model
+* improve battery calculation for system which has several batteries
+
 Ver.2.3.1:
 - fix bug with no updates from configuration UI
 - fix invalid vertical tab parsing

CHANGELOG-RU

@@ -1,309 +0,0 @@
-Вер.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,241 @@
+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.
+* It is highly recommended to name private variables with `m_` prefix (`m_foo`).
+  There is no exceptions for properties.
+* 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++11**.
+* Do not use C-like code:
+    * C-like style iteration if possible. Use `for (auto foo : bar)` and
+      `std::for_each` instead if possible. It is also recommended to use iterators.
+    * C-like casts, use `const_cast`, `static_cast`, `dymanic_Cast` instead. Using
+      of `reinterpret_cast` is not recommended. It is highly recommended to use
+      `dynamic_cast` with the exception catching. It is also possible to use
+      `qvariant_cast` if required. Exception is class constructors, e.g.:
+
+      ```
+      char c = 'c';
+      std::string s = "string";
+      qDebug() << QString("some string") << QChar(c) << QString(s);
+      ```
+
+    * C-like `NULL`, use `nullptr` instead.
+* It is highly recommended to avoid implicit casts. Exception `nullptr` casts to
+  boolean, e.g.:
+
+  ```
+  if (nullptr)
+      qDebug() << "nullptr is true, wtf";
+  ```
+
+* 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.
+
+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`.
+* It is recommended to create addition test if possible.
+* Addition 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 Status](https://travis-ci.org/arcan1s/awesome-widgets.svg?branch=development)](https://travis-ci.org/arcan1s/awesome-widgets)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/8254/badge.svg)](https://scan.coverity.com/projects/awesome-widgets)
+
 Information
 -----------
 
@@ -35,7 +38,7 @@ Optional dependencies
 * proprietary video driver
 * hddtemp
 * smartmontools
-* music player (mpd or supported MPRIS)
+* music player (mpd or MPRIS supported)
 
 Make dependencies
 -----------------
@@ -53,7 +56,7 @@ Installation
         cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../
         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,10 +69,10 @@ 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
-* [OpenSuse](http://software.opensuse.org/package/awesome-widgets) package
+* [OpenSuse](http://software.opensuse.org/search?q=awesome-widgets) packages, [KF5 OpenSuse](http://software.opensuse.org/package/plasma5-awesome-widgets) package

create_archive.sh

@@ -1,27 +1,18 @@
 #!/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')
+MAJOR=$(grep -m1 PROJECT_VERSION_MAJOR sources/CMakeLists.txt | awk '{print $2}' | sed 's/^.\(.*\)..$/\1/')
+MINOR=$(grep -m1 PROJECT_VERSION_MINOR sources/CMakeLists.txt | awk '{print $2}' | sed 's/^.\(.*\)..$/\1/')
+PATCH=$(grep -m1 PROJECT_VERSION_PATCH sources/CMakeLists.txt | awk '{print $2}' | sed 's/^.\(.*\)..$/\1/')
 VERSION="${MAJOR}.${MINOR}.${PATCH}"
 
 # update submodules
 git submodule update --init --recursive
 
-# build 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}"
-
 # build widget
 ARCHIVE="awesome-widgets"
-FILES="AUTHORS CHANGELOG CHANGELOG-RU COPYING"
-IGNORELIST="build usr .kdev4 *.kdev4"
+FILES="AUTHORS CHANGELOG COPYING packages patches"
+IGNORELIST="build usr .kdev4 *.kdev4 .idea packages/*src.tar.xz"
 # create archive
 [[ -e ${ARCHIVE}-${VERSION}-src.tar.xz ]] && rm -f "${ARCHIVE}-${VERSION}-src.tar.xz"
 [[ -d ${ARCHIVE} ]] && rm -rf "${ARCHIVE}"
@@ -29,13 +20,13 @@ 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
+ln -sf "../${ARCHIVE}-${VERSION}-src.tar.xz" packages
 rm -rf "${ARCHIVE}"
 
 # update md5sum
 MD5SUMS=$(md5sum ${ARCHIVE}-${VERSION}-src.tar.xz | awk '{print $1}')
-sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" arch/PKGBUILD
-sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" arch/PKGBUILD
+sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" packages/PKGBUILD
+sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" packages/PKGBUILD
 # clear
 find . -type f -name '*src.tar.xz' -not -name "*${VERSION}-src.tar.xz" -exec rm -rf {} \;
-find arch -type l -xtype l -exec rm -rf {} \;
+find packages -type l -xtype l -exec rm -rf {} \;

packages/PKGBUILD

@@ -2,11 +2,11 @@
 
 pkgname=plasma5-applet-awesome-widgets
 _pkgname=awesome-widgets
-pkgver=2.3.1
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
 arch=('i686' 'x86_64')
-url="http://arcanis.name/projects/awesome-widgets"
+url="https://arcanis.me/projects/awesome-widgets"
 license=('GPL3')
 depends=('plasma-framework')
 optdepends=("catalyst: for GPU monitor"
@@ -14,10 +14,10 @@ optdepends=("catalyst: for GPU monitor"
             "smartmontools: for HDD temperature monitor"
             "mpd: for music player monitor"
             "nvidia-utils: for GPU monitor")
-makedepends=('cmake' 'extra-cmake-modules')
+makedepends=('cmake' 'extra-cmake-modules' 'python')
 source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
 install=${pkgname}.install
-md5sums=('90e640b6679b4cf0f6f99cf6da2848f3')
+md5sums=('81a85890d519bd8c5791d0d99cffc9c1')
 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')

packages/build-requirements.deb.txt

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

patches/PATCHING.md

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

patches/qt5.4-qml-dialogs-qtconcurrent-and-qloggingcategory.patch

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

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

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

patches/qt5.6-qversionnumber.patch

@@ -0,0 +1,148 @@
+diff --git a/sources/awesome-widget/plugin/awupdatehelper.cpp b/sources/awesome-widget/plugin/awupdatehelper.cpp
+index 3698602..42871c8 100644
+--- a/sources/awesome-widget/plugin/awupdatehelper.cpp
++++ b/sources/awesome-widget/plugin/awupdatehelper.cpp
+@@ -37,7 +37,7 @@ AWUpdateHelper::AWUpdateHelper(QObject *parent)
+ {
+     qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+ 
+-    m_foundVersion = QVersionNumber::fromString(VERSION);
++    m_foundVersion = QString(VERSION);
+     m_genericConfig = QString("%1/awesomewidgets/general.ini")
+                           .arg(QStandardPaths::writableLocation(
+                               QStandardPaths::GenericDataLocation));
+@@ -69,15 +69,15 @@ void AWUpdateHelper::checkUpdates(const bool showAnyway)
+ bool AWUpdateHelper::checkVersion()
+ {
+     QSettings settings(m_genericConfig, QSettings::IniFormat);
+-    QVersionNumber version = QVersionNumber::fromString(
+-        settings.value(QString("Version"), QString(VERSION)).toString());
++    QString version
++        = settings.value(QString("Version"), QString(VERSION)).toString();
+     // update version
+     settings.setValue(QString("Version"), QString(VERSION));
+     settings.sync();
+     qCInfo(LOG_AW) << "Found version" << version << "actual one is"
+                    << m_foundVersion;
+ 
+-    if ((version != m_foundVersion) && (!QString(CHANGELOG).isEmpty())) {
++    if ((version != QString(VERSION)) && (!QString(CHANGELOG).isEmpty())) {
+         genMessageBox(i18n("Changelog of %1", QString(VERSION)),
+                       QString(CHANGELOG).replace(QChar('@'), QChar('\n')),
+                       QMessageBox::Ok)
+@@ -90,12 +90,11 @@ bool AWUpdateHelper::checkVersion()
+ }
+ 
+ 
+-void AWUpdateHelper::showInfo(const QVersionNumber version)
++void AWUpdateHelper::showInfo(const QString version)
+ {
+     qCDebug(LOG_AW) << "Version" << version;
+ 
+-    QString text
+-        = i18n("You are using the actual version %1", version.toString());
++    QString text = i18n("You are using the actual version %1", version);
+     if (!QString(COMMIT_SHA).isEmpty())
+         text += QString(" (%1)").arg(QString(COMMIT_SHA));
+     return genMessageBox(i18n("No new version found"), text, QMessageBox::Ok)
+@@ -103,7 +102,7 @@ void AWUpdateHelper::showInfo(const QVersionNumber version)
+ }
+ 
+ 
+-void AWUpdateHelper::showUpdates(const QVersionNumber version)
++void AWUpdateHelper::showUpdates(const QString version)
+ {
+     qCDebug(LOG_AW) << "Version" << version;
+ 
+@@ -112,7 +111,7 @@ void AWUpdateHelper::showUpdates(const QVersionNumber version)
+     text += QString(COMMIT_SHA).isEmpty()
+                 ? QString("\n")
+                 : QString(" (%1)\n").arg(QString(COMMIT_SHA));
+-    text += i18n("New version : %1", version.toString()) + QString("\n\n");
++    text += i18n("New version : %1", version) + QString("\n\n");
+     text += i18n("Click \"Ok\" to download");
+ 
+     genMessageBox(i18n("There are updates"), text,
+@@ -128,8 +127,7 @@ void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *button)
+ 
+     switch (ret) {
+     case QMessageBox::AcceptRole:
+-        QDesktopServices::openUrl(QString(RELEASES)
+-                                  + m_foundVersion.toString());
++        QDesktopServices::openUrl(QString(RELEASES) + m_foundVersion);
+         break;
+     case QMessageBox::RejectRole:
+     default:
+@@ -157,14 +155,23 @@ void AWUpdateHelper::versionReplyRecieved(QNetworkReply *reply,
+     QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
+     QString version = firstRelease[QString("tag_name")].toString();
+     version.remove(QString("V."));
+-    m_foundVersion = QVersionNumber::fromString(version);
++    m_foundVersion = version;
+     qCInfo(LOG_AW) << "Update found version to" << m_foundVersion;
+ 
+-    QVersionNumber oldVersion = QVersionNumber::fromString(VERSION);
+-    if (oldVersion < m_foundVersion)
+-        return showUpdates(m_foundVersion);
++    // FIXME: possible there is a better way to check versions
++    int old_major = QString(VERSION).split(QChar('.')).at(0).toInt();
++    int old_minor = QString(VERSION).split(QChar('.')).at(1).toInt();
++    int old_patch = QString(VERSION).split(QChar('.')).at(2).toInt();
++    int new_major = version.split(QChar('.')).at(0).toInt();
++    int new_minor = version.split(QChar('.')).at(1).toInt();
++    int new_patch = version.split(QChar('.')).at(2).toInt();
++    if ((old_major < new_major)
++        || ((old_major == new_major) && (old_minor < new_minor))
++        || ((old_major == new_major) && (old_minor == new_minor)
++            && (old_patch < new_patch)))
++        return showUpdates(version);
+     else if (showAnyway)
+-        return showInfo(m_foundVersion);
++        return showInfo(version);
+ }
+ 
+ 
+diff --git a/sources/awesome-widget/plugin/awupdatehelper.h b/sources/awesome-widget/plugin/awupdatehelper.h
+index 359cdb2..9c6a42d 100644
+--- a/sources/awesome-widget/plugin/awupdatehelper.h
++++ b/sources/awesome-widget/plugin/awupdatehelper.h
+@@ -21,7 +21,6 @@
+ 
+ #include <QMessageBox>
+ #include <QObject>
+-#include <QVersionNumber>
+ 
+ 
+ class QNetworkReply;
+@@ -37,15 +36,15 @@ public:
+     bool checkVersion();
+ 
+ private slots:
+-    void showInfo(const QVersionNumber version);
+-    void showUpdates(const QVersionNumber version);
++    void showInfo(const QString version);
++    void showUpdates(const QString version);
+     void userReplyOnUpdates(QAbstractButton *button);
+     void versionReplyRecieved(QNetworkReply *reply, const bool showAnyway);
+ 
+ private:
+     QMessageBox *genMessageBox(const QString title, const QString body,
+                                const QMessageBox::StandardButtons buttons);
+-    QVersionNumber m_foundVersion;
++    QString m_foundVersion;
+     QString m_genericConfig;
+ };
+ 
+diff --git a/sources/libraries.cmake b/sources/libraries.cmake
+index 33192f7..339bb58 100644
+--- a/sources/libraries.cmake
++++ b/sources/libraries.cmake
+@@ -2,7 +2,7 @@
+ find_package(Gettext REQUIRED)
+ 
+ # main qt libraries
+-find_package(Qt5 5.6.0 REQUIRED COMPONENTS Core DBus Network Qml Test Widgets)
++find_package(Qt5 5.4.0 REQUIRED COMPONENTS Core DBus Network Qml Test Widgets)
+ add_definitions(
+         ${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
+         ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}

sources/.clang-format

@@ -0,0 +1,66 @@
+---
+Language:        Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: true
+AlignConsecutiveAssignments: false
+AlignEscapedNewlinesLeft: false
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: true
+BinPackParameters: true
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: Linux
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: true
+ColumnLimit:     80
+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:        Cpp11
+TabWidth:        8
+UseTab:          Never
+...
+

sources/.kdev4/awesomewidgets.kdev4

@@ -8,7 +8,7 @@ ProjectRootRelative=./
 
 [CMake][CMake Build Directory 0]
 Build Directory Path=file:///home/arcanis/Documents/github/awesome-widgets/build
-Build Type=Release
+Build Type=Optimization
 CMake Binary=file:///usr/bin/cmake
 Environment Profile=
 Extra Arguments=
@@ -19,5 +19,8 @@ Name=GCC
 Path=gcc
 Type=GCC
 
+[Launch]
+Launch Configurations=
+
 [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/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()
+{
+    QNetworkReply *reply = static_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,91 @@
-cmake_minimum_required (VERSION 2.8.12)
+cmake_minimum_required(VERSION 2.8.12)
 
-cmake_policy (SET CMP0003 OLD)
-cmake_policy (SET CMP0002 OLD)
-cmake_policy (SET CMP0011 NEW)
-cmake_policy (SET CMP0015 NEW)
+# some fucking magic
+cmake_policy(SET CMP0003 OLD)
+cmake_policy(SET CMP0002 OLD)
+cmake_policy(SET CMP0011 NEW)
+cmake_policy(SET CMP0015 NEW)
+if (POLICY CMP0063)
+    cmake_policy(SET CMP0063 OLD)
+endif ()
 
-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 1)
-set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
+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 "2")
+set(PROJECT_VERSION_PATCH "0")
+set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+# append git version if any
+set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "")
+include(checkgit.cmake)
 
-string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC)
-string (TIMESTAMP CURRENT_YEAR "%Y")
+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}")
+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)
 
 # 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)
+    set(CMAKE_CXX_FLAGS "-Wall -Wno-cpp -std=c++11")
+    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+    set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+    set(CMAKE_CXX_FLAGS_OPTIMIZATION "-Ofast -DNDEBUG")
+    # avoid newer gcc warnings
+    add_definitions(-D_DEFAULT_SOURCE)
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-Wall -std=c++11 -stdlib=libc++")
+    set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+    set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+    set(CMAKE_CXX_FLAGS_OPTIMIZATION "-Ofast -DNDEBUG")
+    # linker flags
+    set(CMAKE_EXE_LINKER_FLAGS "-lc++abi")
+    set(CMAKE_MODULE_LINKER_FLAGS "-lc++abi")
+    set(CMAKE_SHARED_LINKER_FLAGS "-lc++abi")
 else ()
-  message (STATUS "Unknown compiler")
+    message(FATAL_ERROR "Unknown compiler")
 endif ()
 if (CMAKE_BUILD_TYPE MATCHES Debug)
-  set (CMAKE_VERBOSE_MAKEFILE ON)
+    set(CMAKE_VERBOSE_MAKEFILE ON)
 endif ()
 
-configure_file (${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
-set (PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
+set(PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty)
+set(PROJECT_LIBRARY awesomewidgets)
+set(PROJECT_MONITORSOURCES extsysmonsources)
+include(libraries.cmake)
+include(clang-format.cmake)
+include(cppcheck.cmake)
+include(coverity.cmake)
 
-add_subdirectory (extsysmon)
-add_subdirectory (awesome-widget)
-add_subdirectory (desktop-panel)
+get_directory_property(CMAKE_DEFINITIONS COMPILE_DEFINITIONS)
+configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
+add_subdirectory(awesomewidgets)
+add_subdirectory(extsysmonsources)
+add_subdirectory(extsysmon)
+if (BUILD_PLASMOIDS)
+    add_subdirectory(awesome-widget)
+    add_subdirectory(desktop-panel)
+    add_subdirectory(translations)
+endif ()
+if (BUILD_TESTING)
+    enable_testing()
+    add_subdirectory(test)
+endif ()
 
-# translations
-add_subdirectory (translations)
+include(packages-recipe.cmake)

sources/awdebug.cpp

@@ -0,0 +1,97 @@
+/***************************************************************************
+ *   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 "awdebug.h"
+
+
+Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget",
+                   QtMsgType::QtWarningMsg)
+Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel",
+                   QtMsgType::QtWarningMsg)
+Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon", QtMsgType::QtWarningMsg)
+Q_LOGGING_CATEGORY(LOG_ESS, "org.kde.plasma.extsysmonsources",
+                   QtMsgType::QtWarningMsg)
+Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets",
+                   QtMsgType::QtWarningMsg)
+
+
+const QStringList getBuildData()
+{
+    QStringList metadata;
+    metadata.append(QString("=== Awesome Widgets configuration details ==="));
+    // build information
+    metadata.append(QString("Build details:"));
+    metadata.append(QString("    VERSION: %1").arg(VERSION));
+    metadata.append(QString("    COMMIT_SHA: %1").arg(COMMIT_SHA));
+    metadata.append(QString("    BUILD_DATE: %1").arg(BUILD_DATE));
+    // configuration
+    metadata.append(QString("API details:"));
+    metadata.append(QString("    AWGIAPI: %1").arg(AWGIAPI));
+    metadata.append(QString("    AWEQAPI: %1").arg(AWEQAPI));
+    metadata.append(QString("    AWESAPI: %1").arg(AWESAPI));
+    metadata.append(QString("    AWEUAPI: %1").arg(AWEUAPI));
+    metadata.append(QString("    AWEWAPI: %1").arg(AWEWAPI));
+    metadata.append(QString("    AWEFAPI: %1").arg(AWEFAPI));
+    metadata.append(QString("    REQUEST_TIMEOUT: %1").arg(REQUEST_TIMEOUT));
+    metadata.append(QString("    TIME_KEYS: %1").arg(TIME_KEYS));
+    metadata.append(QString("    STATIC_KEYS: %1").arg(STATIC_KEYS));
+    // cmake properties
+    metadata.append(QString("cmake properties:"));
+    metadata.append(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(QString("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,43 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWDEBUG_H
+#define AWDEBUG_H
+
+#include <QLoggingCategory>
+
+#include "version.h"
+
+#ifndef LOG_FORMAT
+#define LOG_FORMAT                                                             \
+    "[%{time process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%{if-"         \
+    "warning}WW%{endif}%{if-critical}CC%{endif}%{if-fatal}FF%{endif}][%{"      \
+    "category}][%{function}] %{message}"
+#endif /* LOG_FORMAT */
+
+
+Q_DECLARE_LOGGING_CATEGORY(LOG_AW)
+Q_DECLARE_LOGGING_CATEGORY(LOG_DP)
+Q_DECLARE_LOGGING_CATEGORY(LOG_ESM)
+Q_DECLARE_LOGGING_CATEGORY(LOG_ESS)
+Q_DECLARE_LOGGING_CATEGORY(LOG_LIB)
+
+const QStringList getBuildData();
+
+
+#endif /* AWDEBUG_H */

sources/awesome-widget/CMakeLists.txt

@@ -1,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

@@ -21,7 +21,7 @@ X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
 X-KDE-PluginInfo-Version=@PROJECT_VERSION@
-X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/
+X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
 X-KDE-PluginInfo-Category=System Information
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPLv3

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

@@ -3,129 +3,141 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name=""/>
+    <kcfgfile name=""/>
 
-  <group name="Widget">
-    <!--   widget -->
-    <entry name="text" type="string">
-      <default>[cpu: $cpu%] [mem: $mem%] [swap: $swap%] [$netdev: $down/$upKB/s]</default>
-    </entry>
-  </group>
+    <group name="Widget">
+        <!--   widget -->
+        <entry name="text" type="string">
+            <default>[cpu: $cpu%] [mem: $mem%] [swap: $swap%] [$netdev: $down/$upKB/s]</default>
+        </entry>
+    </group>
 
-  <group name="Advanced">
-    <!--   advanced -->
-    <entry name="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>
-    <entry name="wrapNewLines" type="bool">
-      <default>false</default>
-    </entry>
-    <entry name="background" type="bool">
-      <default>true</default>
-    </entry>
-    <entry name="customTime" type="string">
-      <default>$hh:$mm</default>
-    </entry>
-    <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>
-  </group>
+    <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="interval" type="int">
+            <default>1000</default>
+        </entry>
+        <entry name="queueLimit" type="int">
+            <default>0</default>
+        </entry>
+        <entry name="tempUnits" type="string">
+            <default>Celsius</default>
+        </entry>
+        <entry name="customTime" type="string">
+            <default>$hh:$mm</default>
+        </entry>
+        <entry name="customUptime" type="string">
+            <default>$dd,$hh,$mm</default>
+        </entry>
+        <entry name="acOnline" type="string">
+            <default>(*)</default>
+        </entry>
+        <entry name="acOffline" type="string">
+            <default>( )</default>
+        </entry>
+    </group>
 
-  <group name="Tooltip">
-    <entry name="tooltipNumber" type="int">
-      <default>100</default>
-    </entry>
-    <entry name="useTooltipBackground" type="bool">
-      <default>true</default>
-    </entry>
-    <entry name="tooltipBackground" type="string">
-      <default>#ffffff</default>
-    </entry>
-    <entry name="cpuTooltip" type="bool">
-      <default>true</default>
-    </entry>
-    <entry name="cpuTooltipColor" type="string">
-      <default>#ff0000</default>
-    </entry>
-    <entry name="cpuclTooltip" type="bool">
-      <default>true</default>
-    </entry>
-    <entry name="cpuclTooltipColor" type="string">
-      <default>#00ff00</default>
-    </entry>
-    <entry name="memTooltip" type="bool">
-      <default>true</default>
-    </entry>
-    <entry name="memTooltipColor" type="string">
-      <default>#0000ff</default>
-    </entry>
-    <entry name="swapTooltip" type="bool">
-      <default>true</default>
-    </entry>
-    <entry name="swapTooltipColor" type="string">
-      <default>#ffff00</default>
-    </entry>
-    <entry name="downTooltip" type="bool">
-      <default>true</default>
-    </entry>
-    <entry name="downTooltipColor" type="string">
-      <default>#00ffff</default>
-    </entry>
-    <entry name="upTooltipColor" type="string">
-      <default>#ff00ff</default>
-    </entry>
-    <entry name="batTooltip" type="bool">
-      <default>true</default>
-    </entry>
-    <entry name="batTooltipColor" type="string">
-      <default>#008800</default>
-    </entry>
-    <entry name="batInTooltipColor" type="string">
-      <default>#880000</default>
-    </entry>
-  </group>
+    <group name="Tooltip">
+        <entry name="tooltipNumber" type="int">
+            <default>100</default>
+        </entry>
+        <entry name="useTooltipBackground" type="bool">
+            <default>true</default>
+        </entry>
+        <entry name="tooltipBackground" type="string">
+            <default>#ffffff</default>
+        </entry>
+        <entry name="cpuTooltip" type="bool">
+            <default>true</default>
+        </entry>
+        <entry name="cpuTooltipColor" type="string">
+            <default>#ff0000</default>
+        </entry>
+        <entry name="cpuclTooltip" type="bool">
+            <default>true</default>
+        </entry>
+        <entry name="cpuclTooltipColor" type="string">
+            <default>#00ff00</default>
+        </entry>
+        <entry name="memTooltip" type="bool">
+            <default>true</default>
+        </entry>
+        <entry name="memTooltipColor" type="string">
+            <default>#0000ff</default>
+        </entry>
+        <entry name="swapTooltip" type="bool">
+            <default>true</default>
+        </entry>
+        <entry name="swapTooltipColor" type="string">
+            <default>#ffff00</default>
+        </entry>
+        <entry name="downkbTooltip" type="bool">
+            <default>true</default>
+        </entry>
+        <entry name="downkbTooltipColor" type="string">
+            <default>#00ffff</default>
+        </entry>
+        <entry name="upkbTooltipColor" type="string">
+            <default>#ff00ff</default>
+        </entry>
+        <entry name="batTooltip" type="bool">
+            <default>true</default>
+        </entry>
+        <entry name="batTooltipColor" type="string">
+            <default>#008800</default>
+        </entry>
+        <entry name="batInTooltipColor" type="string">
+            <default>#880000</default>
+        </entry>
+    </group>
 
-  <group name="Appearance">
-    <!--   appearance -->
-    <entry name="interval" type="int">
-      <default>1000</default>
-    </entry>
-    <entry name="textAlign" type="string">
-      <default>center</default>
-    </entry>
-    <entry name="fontFamily" type="string">
-      <default>Terminus</default>
-    </entry>
-    <entry name="fontSize" type="int">
-      <default>12</default>
-    </entry>
-    <entry name="fontColor" type="string">
-      <default>#000000</default>
-    </entry>
-    <entry name="fontWeight" type="string">
-      <default>normal</default>
-    </entry>
-    <entry name="fontStyle" type="string">
-      <default>normal</default>
-    </entry>
-  </group>
+    <group name="Appearance">
+        <!--   appearance -->
+        <entry name="textAlign" type="string">
+            <default>center</default>
+        </entry>
+        <entry name="fontFamily" type="string">
+            <default>Terminus</default>
+        </entry>
+        <entry name="fontSize" type="int">
+            <default>12</default>
+        </entry>
+        <entry name="fontColor" type="string">
+            <default>#000000</default>
+        </entry>
+        <entry name="fontWeight" type="string">
+            <default>normal</default>
+        </entry>
+        <entry name="fontStyle" type="string">
+            <default>normal</default>
+        </entry>
+    </group>
 
 </kcfg>

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

@@ -19,17 +19,21 @@ 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
+    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 {
@@ -39,32 +43,34 @@ Item {
             height: parent.height
             width: parent.width
             QtControls.Tab {
+                anchors.margins: 10.0
                 title: i18n("About")
 
                 QtLayouts.ColumnLayout {
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignHCenter
-                        text: AWActions.getAboutText("header")
+                        text: awActions.getAboutText("header")
                     }
 
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignHCenter
-                        text: AWActions.getAboutText("version")
+                        text: awActions.getAboutText("version")
                     }
 
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignJustify
-                        text: AWActions.getAboutText("description")
+                        text: awActions.getAboutText("description")
                     }
 
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignLeft
                         textFormat: Text.RichText
-                        text: AWActions.getAboutText("links")
+                        text: awActions.getAboutText("links")
+                        onLinkActivated: Qt.openUrlExternally(link);
                     }
 
                     QtControls.Label {
@@ -74,12 +80,13 @@ Item {
                         horizontalAlignment: Text.AlignHCenter
                         verticalAlignment: Text.AlignBottom
                         textFormat: Text.RichText
-                        text: AWActions.getAboutText("copy")
+                        text: awActions.getAboutText("copy")
                     }
                 }
             }
 
             QtControls.Tab {
+                anchors.margins: 10.0
                 title: i18n("Acknowledgment")
 
                 QtLayouts.ColumnLayout {
@@ -87,23 +94,35 @@ Item {
                         QtLayouts.Layout.fillWidth: true
                         wrapMode: Text.WordWrap
                         horizontalAlignment: Text.AlignJustify
-                        text: AWActions.getAboutText("translators")
+                        text: awActions.getAboutText("translators")
+                    }
+
+                    QtControls.Label {
+                        QtLayouts.Layout.fillWidth: true
+                        wrapMode: Text.WordWrap
+                        horizontalAlignment: Text.AlignJustify
+                        textFormat: Text.RichText
+                        text: awActions.getAboutText("3rdparty")
+                        onLinkActivated: Qt.openUrlExternally(link);
                     }
 
                     QtControls.Label {
                         QtLayouts.Layout.fillHeight: true
                         QtLayouts.Layout.fillWidth: true
+                        wrapMode: Text.WordWrap
                         horizontalAlignment: Text.AlignJustify
                         verticalAlignment: Text.AlignTop
                         textFormat: Text.RichText
-                        text: AWActions.getAboutText("3rdparty")
+                        text: awActions.getAboutText("thanks")
+                        onLinkActivated: Qt.openUrlExternally(link);
                     }
                 }
             }
         }
     }
 
+
     Component.onCompleted: {
-        if (debug) console.log("[about::onCompleted]")
+        if (debug) console.debug()
     }
 }

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

@@ -17,27 +17,42 @@
 
 import QtQuick 2.0
 import QtQuick.Controls 1.3 as QtControls
+import QtQuick.Dialogs 1.2 as QtDialogs
 
-import org.kde.plasma.awesomewidget 1.0
+import org.kde.plasma.private.awesomewidget 1.0
 
 
 Item {
     id: advancedPage
+    // backend
+    AWActions {
+        id: awActions
+    }
+    AWConfigHelper {
+        id: awConfig
+    }
+
     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_interval: update.value
+    property alias cfg_queueLimit: queueLimit.value
+    property string cfg_tempUnits: tempUnits.currentText
     property alias cfg_customTime: customTime.text
     property alias cfg_customUptime: customUptime.text
-    property string cfg_tempUnits: tempUnits.currentText
     property alias cfg_acOnline: acOnline.text
     property alias cfg_acOffline: acOffline.text
 
@@ -45,6 +60,104 @@ Item {
     Column {
         id: pageColumn
         anchors.fill: parent
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: parent.heigth
+                width: parent.width * 2 / 5
+            }
+            QtControls.CheckBox {
+                id: background
+                width: parent.width * 3 / 5
+                text: i18n("Enable background")
+            }
+        }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: parent.heigth
+                width: parent.width * 2 / 5
+            }
+            QtControls.CheckBox {
+                id: translate
+                width: parent.width * 3 / 5
+                text: i18n("Translate strings")
+            }
+        }
+
+        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 {
+                id: wordWrap
+                width: parent.width * 3 / 5
+                text: i18n("Enable word wrap")
+            }
+        }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: parent.heigth
+                width: parent.width * 2 / 5
+            }
+            QtControls.CheckBox {
+                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: updates
+                width: parent.width * 3 / 5
+                text: i18n("Check updates on startup")
+            }
+        }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: parent.heigth
+                width: parent.width * 2 / 5
+            }
+            QtControls.CheckBox {
+                id: optimize
+                width: parent.width * 3 / 5
+                text: i18n("Optimize subscription")
+            }
+        }
+
         Row {
             height: implicitHeight
             width: parent.width
@@ -89,41 +202,19 @@ Item {
             height: implicitHeight
             width: parent.width
             QtControls.Label {
-                height: parent.heigth
+                height: parent.height
                 width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("Time interval")
             }
-            QtControls.CheckBox {
-                id: notify
+            QtControls.SpinBox {
+                id: update
                 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 {
-                id: background
-                width: parent.width * 3 / 5
-                text: i18n("Enable background")
+                minimumValue: 1000
+                maximumValue: 10000
+                stepSize: 500
+                value: plasmoid.configuration.interval
             }
         }
 
@@ -135,29 +226,15 @@ Item {
                 width: parent.width * 2 / 5
                 horizontalAlignment: Text.AlignRight
                 verticalAlignment: Text.AlignVCenter
-                text: i18n("Custom time format")
+                text: i18n("Messages queue limit")
             }
-            QtControls.TextField {
-                id: customTime
+            QtControls.SpinBox {
+                id: queueLimit
                 width: parent.width * 3 / 5
-                text: plasmoid.configuration.customTime
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Custom uptime format")
-            }
-            QtControls.TextField {
-                id: customUptime
-                width: parent.width * 3 / 5
-                text: plasmoid.configuration.customUptime
+                minimumValue: 0
+                maximumValue: 99
+                stepSize: 1
+                value: plasmoid.configuration.queueLimit
             }
         }
 
@@ -207,8 +284,10 @@ Item {
                 ]
                 onCurrentIndexChanged: cfg_tempUnits = model[currentIndex]["name"]
                 Component.onCompleted: {
+                    if (debug) console.debug()
                     for (var i = 0; i < model.length; i++) {
                         if (model[i]["name"] == plasmoid.configuration.tempUnits) {
+                            if (debug) console.info("Found", model[i]["name"], "on", i)
                             tempUnits.currentIndex = i;
                         }
                     }
@@ -216,6 +295,40 @@ Item {
             }
         }
 
+        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
+            }
+        }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: parent.height
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("Custom uptime format")
+            }
+            QtControls.TextField {
+                id: customUptime
+                width: parent.width * 3 / 5
+                text: plasmoid.configuration.customUptime
+            }
+        }
+
         Row {
             height: implicitHeight
             width: parent.width
@@ -249,9 +362,115 @@ Item {
                 text: plasmoid.configuration.acOffline
             }
         }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: parent.height
+                width: parent.width * 2 / 5
+            }
+            QtControls.Button {
+                width: parent.width * 3 / 5
+                text: i18n("Drop key cache")
+                onClicked: awActions.dropCache()
+            }
+        }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: parent.height
+                width: parent.width * 2 / 5
+            }
+            QtControls.Button {
+                width: parent.width * 3 / 5
+                text: i18n("Export configuration")
+                onClicked: saveConfigAs.open()
+            }
+
+            QtDialogs.FileDialog {
+                id: saveConfigAs
+                selectExisting: false
+                title: i18n("Export")
+                folder: awConfig.configurationDirectory()
+                onAccepted: {
+                    var status = awConfig.exportConfiguration(
+                        plasmoid.configuration,
+                        saveConfigAs.fileUrl.toString().replace("file://", ""))
+                    if (status) {
+                        messageDialog.title = i18n("Success")
+                        messageDialog.text = i18n("Please note that binary files were not copied")
+                    } else {
+                        messageDialog.title = i18n("Ooops...")
+                        messageDialog.text = i18n("Could not save configuration file")
+                    }
+                    messageDialog.open()
+                }
+            }
+
+            QtDialogs.MessageDialog {
+                id: messageDialog
+                standardButtons: QtDialogs.StandardButton.Ok
+            }
+        }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: parent.height
+                width: parent.width * 2 / 5
+            }
+            QtControls.Button {
+                width: parent.width * 3 / 5
+                text: i18n("Import configuration")
+                onClicked: openConfig.open()
+            }
+
+            QtDialogs.FileDialog {
+                id: openConfig
+                title: i18n("Import")
+                folder: awConfig.configurationDirectory()
+                onAccepted: importSelection.open()
+            }
+
+            QtDialogs.Dialog {
+                id: importSelection
+
+                Column {
+                    QtControls.CheckBox {
+                        id: importPlasmoid
+                        text: i18n("Import plasmoid settings")
+                    }
+
+                    QtControls.CheckBox {
+                        id: importExtensions
+                        text: i18n("Import extensions")
+                    }
+
+                    QtControls.CheckBox {
+                        id: importAdds
+                        text: i18n("Import additional files")
+                    }
+                }
+
+                onAccepted: {
+                    if (debug) console.debug()
+                    var importConfig = awConfig.importConfiguration(
+                        openConfig.fileUrl.toString().replace("file://", ""),
+                        importPlasmoid.checked, importExtensions.checked,
+                        importAdds.checked)
+                    for (var key in importConfig)
+                        plasmoid.configuration[key] = importConfig[key]
+                }
+            }
+        }
     }
 
+
     Component.onCompleted: {
-        if (debug) console.log("[advanced::onCompleted]")
+        if (debug) console.debug()
     }
 }

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

@@ -20,17 +20,22 @@ 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: 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,7 +44,6 @@ Item {
         87: 5
     }
 
-    property alias cfg_interval: update.value
     property alias cfg_fontFamily: selectFont.text
     property alias cfg_fontSize: fontSize.value
     property string cfg_fontWeight: fontWeight.currentText
@@ -50,26 +54,6 @@ Item {
     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
@@ -84,7 +68,11 @@ Item {
                 id: selectFont
                 width: parent.width * 2 / 3
                 text: plasmoid.configuration.fontFamily
-                onClicked: fontDialog.visible = true
+                onClicked: {
+                    if (debug) console.debug()
+                    fontDialog.setFont()
+                    fontDialog.visible = true
+                }
             }
         }
 
@@ -146,8 +134,10 @@ Item {
                 ]
                 onCurrentIndexChanged: cfg_fontWeight = model[currentIndex]["name"]
                 Component.onCompleted: {
+                    if (debug) console.debug()
                     for (var i = 0; i < model.length; i++) {
                         if (model[i]["name"] == plasmoid.configuration.fontWeight) {
+                            if (debug) console.info("Found", model[i]["name"], "on", i)
                             fontWeight.currentIndex = i;
                         }
                     }
@@ -181,8 +171,10 @@ Item {
                 ]
                 onCurrentIndexChanged: cfg_fontStyle = model[currentIndex]["name"]
                 Component.onCompleted: {
+                    if (debug) console.debug()
                     for (var i = 0; i < model.length; i++) {
                         if (model[i]["name"] == plasmoid.configuration.fontStyle) {
+                            if (debug) console.info("Found", model[i]["name"], "on", i)
                             fontStyle.currentIndex = i;
                         }
                     }
@@ -224,16 +216,28 @@ Item {
     QtDialogs.FontDialog {
         id: fontDialog
         title: i18n("Select a font")
-        font: Qt.font({ family: selectFont.text, pointSize: fontSize.value, weight: Font.Normal })
+        signal setFont
+
         onAccepted: {
+            if (debug) console.debug()
             selectFont.text = fontDialog.font.family
             fontSize.value = fontDialog.font.pointSize
             fontStyle.currentIndex = fontDialog.font.italic ? 1 : 0
             fontWeight.currentIndex = weight[fontDialog.font.weight]
         }
+        onSetFont: {
+            if (debug) console.debug()
+            fontDialog.font = Qt.font({
+                family: selectFont.text,
+                pointSize: fontSize.value > 0 ? fontSize.value : 12,
+                italic: fontStyle.currentIndex == 1,
+                weight: Font.Normal,
+            })
+        }
     }
 
+
     Component.onCompleted: {
-        if (debug) console.log("[appearance::onCompleted]")
+        if (debug) console.debug()
     }
 }

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

@@ -16,273 +16,347 @@
  ***************************************************************************/
 
 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
-                text: i18n("ACPI path")
-            }
-            QtControls.TextField {
-                width: parent.width * 3 / 5
-                text: cfg_dataengine["ACPIPATH"]
+            title: i18n("ACPI")
+            Row {
+                height: implicitHeight
+                width: parent.width
+                QtControls.Label {
+                    height: parent.height
+                    width: parent.width * 2 / 5
+                    horizontalAlignment: Text.AlignRight
+                    verticalAlignment: Text.AlignVCenter
+                    text: i18n("ACPI path")
+                }
+                QtControls.TextField {
+                    width: parent.width * 3 / 5
+                    text: cfg_dataengine["ACPIPATH"]
+                    onEditingFinished: cfg_dataengine["ACPIPATH"] = text
+                }
             }
         }
 
-        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")
-            }
-            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;
+            title: i18n("GPU")
+            Row {
+                height: implicitHeight
+                width: parent.width
+                QtControls.Label {
+                    height: parent.height
+                    width: parent.width * 2 / 5
+                    horizontalAlignment: Text.AlignRight
+                    verticalAlignment: Text.AlignVCenter
+                    text: i18n("GPU device")
+                }
+                QtControls.ComboBox {
+                    id: gpuDev
+                    width: parent.width * 3 / 5
+                    model: ["auto", "disable", "ati", "nvidia"]
+                    Component.onCompleted: {
+                        if (debug) console.debug()
+                        for (var i=0; i<model.length; i++) {
+                            if (model[i] == cfg_dataengine["GPUDEV"]) {
+                                if (debug) console.info("Found", model[i], "on", i)
+                                currentIndex = i;
+                            }
                         }
                     }
                 }
             }
         }
 
-        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 {
-                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;
-                        }
+            title: i18n("HDD temperature")
+            Column {
+                height: implicitHeight
+                width: parent.width
+                Row {
+                    height: implicitHeight
+                    width: parent.width
+                    QtControls.Label {
+                        height: parent.height
+                        width: parent.width * 2 / 5
+                        horizontalAlignment: Text.AlignRight
+                        verticalAlignment: Text.AlignVCenter
+                        text: i18n("HDD")
+                    }
+                    QtControls.ComboBox {
+                        id: hdd
+                        width: parent.width * 3 / 5
+                    }
+                }
+
+                Row {
+                    height: implicitHeight
+                    width: parent.width
+                    QtControls.Label {
+                        height: parent.height
+                        width: parent.width * 2 / 5
+                        horizontalAlignment: Text.AlignRight
+                        verticalAlignment: Text.AlignVCenter
+                        text: i18n("hddtemp cmd")
+                    }
+                    QtControls.TextField {
+                        width: parent.width * 3 / 5
+                        text: cfg_dataengine["HDDTEMPCMD"]
+                        onEditingFinished: cfg_dataengine["HDDTEMPCMD"] = text
                     }
                 }
             }
         }
 
-        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("hddtemp cmd")
-            }
-            QtControls.TextField {
-                width: parent.width * 3 / 5
-                text: cfg_dataengine["HDDTEMPCMD"]
-            }
-        }
+            title: i18n("Player")
+            Column {
+                height: implicitHeight
+                width: parent.width
+                Row {
+                    height: implicitHeight
+                    width: parent.width
+                    QtControls.Label {
+                        height: parent.height
+                        width: parent.width * 2 / 5
+                        horizontalAlignment: Text.AlignRight
+                        verticalAlignment: Text.AlignVCenter
+                        text: i18n("Player data symbols")
+                    }
+                    QtControls.SpinBox {
+                        width: parent.width * 3 / 5
+                        minimumValue: 1
+                        maximumValue: 100
+                        stepSize: 1
+                        value: cfg_dataengine["PLAYERSYMBOLS"]
+                        onEditingFinished: cfg_dataengine["PLAYERSYMBOLS"] = value
+                    }
+                }
 
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("MPD address")
-            }
-            QtControls.TextField {
-                width: parent.width * 3 / 5
-                text: cfg_dataengine["MPDADDRESS"]
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("MPD port")
-            }
-            QtControls.SpinBox {
-                width: parent.width * 3 / 5
-                minimumValue: 1000
-                maximumValue: 65535
-                stepSize: 1
-                value: cfg_dataengine["MPDPORT"]
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("MPRIS player name")
-            }
-            QtControls.ComboBox {
-                id: mpris
-                width: parent.width * 3 / 5
-                editable: true
-                model: ["auto", "amarok", "audacious", "clementine", "deadbeef",
-                        "vlc", "qmmp", "xmms2", cfg_dataengine["MPRIS"]]
-                currentIndex: model.length - 1
-            }
-        }
-
-        Row {
-            height: implicitHeight
-            width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Music player")
-            }
-            QtControls.ComboBox {
-                id: player
-                width: parent.width * 3 / 5
-                model: ["mpris", "mpd"]
-                Component.onCompleted: {
-                    for (var i=0; i<model.length; i++) {
-                        if (model[i] == cfg_dataengine["PLAYER"]) {
-                            player.currentIndex = i;
+                Row {
+                    height: implicitHeight
+                    width: parent.width
+                    QtControls.Label {
+                        height: parent.height
+                        width: parent.width * 2 / 5
+                        horizontalAlignment: Text.AlignRight
+                        verticalAlignment: Text.AlignVCenter
+                        text: i18n("Music player")
+                    }
+                    QtControls.ComboBox {
+                        id: player
+                        width: parent.width * 3 / 5
+                        model: ["disable", "mpris", "mpd"]
+                        Component.onCompleted: {
+                            if (debug) console.debug()
+                            for (var i=0; i<model.length; i++) {
+                                if (model[i] == cfg_dataengine["PLAYER"]) {
+                                    if (debug) console.info("Found", model[i], "on", i)
+                                    player.currentIndex = i;
+                                }
+                            }
                         }
                     }
                 }
+
+                Row {
+                    height: implicitHeight
+                    width: parent.width
+                    QtControls.Label {
+                        height: parent.height
+                        width: parent.width * 2 / 5
+                        horizontalAlignment: Text.AlignRight
+                        verticalAlignment: Text.AlignVCenter
+                        text: i18n("MPRIS player name")
+                    }
+                    QtControls.ComboBox {
+                        id: mpris
+                        width: parent.width * 3 / 5
+                        editable: true
+                        model: ["auto", "amarok", "audacious", "clementine", "deadbeef",
+                                "vlc", "qmmp", "xmms2", cfg_dataengine["MPRIS"]]
+                        currentIndex: model.length - 1
+                    }
+                }
+
+                Row {
+                    height: implicitHeight
+                    width: parent.width
+                    QtControls.Label {
+                        height: parent.height
+                        width: parent.width * 2 / 5
+                        horizontalAlignment: Text.AlignRight
+                        verticalAlignment: Text.AlignVCenter
+                        text: i18n("MPD address")
+                    }
+                    QtControls.TextField {
+                        width: parent.width * 3 / 5
+                        text: cfg_dataengine["MPDADDRESS"]
+                        onEditingFinished: cfg_dataengine["MPDADDRESS"] = text
+                    }
+                }
+
+                Row {
+                    height: implicitHeight
+                    width: parent.width
+                    QtControls.Label {
+                        height: parent.height
+                        width: parent.width * 2 / 5
+                        horizontalAlignment: Text.AlignRight
+                        verticalAlignment: Text.AlignVCenter
+                        text: i18n("MPD port")
+                    }
+                    QtControls.SpinBox {
+                        width: parent.width * 3 / 5
+                        minimumValue: 1000
+                        maximumValue: 65535
+                        stepSize: 1
+                        value: cfg_dataengine["MPDPORT"]
+                        onEditingFinished: cfg_dataengine["MPDPORT"] = value
+                    }
+                }
             }
         }
 
-        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("Quotes monitor")
-            }
-            QtControls.Button {
-                width: parent.width * 3 / 5
-                text: i18n("Edit tickers")
-                onClicked: AWKeys.editItem("extquotes")
-            }
-        }
+            title: i18n("Extensions")
+            Column {
+                height: implicitHeight
+                width: parent.width
+                Row {
+                    height: implicitHeight
+                    width: parent.width
+                    QtControls.Label {
+                        height: parent.height
+                        width: parent.width * 2 / 5
+                        horizontalAlignment: Text.AlignRight
+                        verticalAlignment: Text.AlignVCenter
+                        text: i18n("Custom scripts")
+                    }
+                    QtControls.Button {
+                        width: parent.width * 3 / 5
+                        text: i18n("Edit scripts")
+                        onClicked: awKeys.editItem("extscript")
+                    }
+                }
 
-        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")
+                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")
+                    }
+                }
+
+                Row {
+                    height: implicitHeight
+                    width: parent.width
+                    QtControls.Label {
+                        height: parent.height
+                        width: parent.width * 2 / 5
+                        horizontalAlignment: Text.AlignRight
+                        verticalAlignment: Text.AlignVCenter
+                        text: i18n("Weather")
+                    }
+                    QtControls.Button {
+                        width: parent.width * 3 / 5
+                        text: i18n("Edit weather")
+                        onClicked: awKeys.editItem("extweather")
+                    }
+                }
             }
         }
     }
 
+
     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()
+        for (var i=0; i<hdd.model.length; i++) {
+            if (hdd.model[i] == cfg_dataengine["HDDDEV"]) {
+                if (debug) console.info("Found", hdd.model[i], "on", i)
+                hdd.currentIndex = i;
+            }
+        }
     }
 
     Component.onDestruction: {
-        if (debug) console.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)
+        awConfig.writeDataEngineConfiguration(cfg_dataengine)
     }
 }

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

@@ -17,26 +17,27 @@
 
 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
+    }
+
+    property bool debug: awActions.isDebugEnabled()
     property variant tooltipSettings: {
         "tooltipNumber": plasmoid.configuration.tooltipNumber,
         "useTooltipBackground": plasmoid.configuration.useTooltipBackground,
@@ -45,20 +46,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 needUpdate
+    signal needTextUpdate(string newText)
+    signal needToolTipUpdate(string newText)
     signal sizeUpdate
 
 
@@ -74,62 +80,14 @@ 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
-
-            if (AWKeys.setDataBySource(sourceName, data, settings)) disconnectSource(sourceName)
-        }
-
-        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
-
-            if (AWKeys.setDataBySource(sourceName, data, settings)) needUpdate()
-        }
-    }
-
-    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 {
         id: text
         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]
         verticalAlignment: Text.AlignVCenter
@@ -140,8 +98,6 @@ Item {
         font.pointSize: plasmoid.configuration.fontSize
         font.weight: general.fontWeight[plasmoid.configuration.fontWeight]
 
-        text: plasmoid.configuration.text
-
         PlasmaCore.ToolTipArea {
             height: tooltip.height
             width: tooltip.width
@@ -154,39 +110,73 @@ Item {
         }
     }
 
-    Component.onCompleted: {
-        if (debug) console.log("[main::onCompleted]")
+    QtDialogs.Dialog {
+        id: tagSelector
+        title: i18n("Select tag")
 
-        // actions
-        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")
-        // init submodule
-        Plasmoid.userConfiguringChanged(false)
+        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)
+        }
     }
 
-    onNeedUpdate: {
-        if (debug) console.log("[main::onNeedUpdate]")
 
-        text.text = AWKeys.parsePattern()
-        tooltip.text = AWKeys.toolTipImage()
+    Component.onCompleted: {
+        if (debug) console.debug()
 
+        // actions
+        // it makes no sense to use this field with optimization enable
+        if (!plasmoid.configuration.optimize)
+            plasmoid.setAction("requestKey", i18n("Request key"), "utilities-system-monitor")
+        plasmoid.setAction("showReadme", i18n("Show README"), "text-x-readme")
+        plasmoid.setAction("checkUpdates", i18n("Check updates"), "system-software-update")
+        // init submodule
+        Plasmoid.userConfiguringChanged(false)
+        // connect data
+        awKeys.needTextToBeUpdated.connect(needTextUpdate)
+        awKeys.needToolTipToBeUpdated.connect(needToolTipUpdate)
+        // check updates if required
+        if (plasmoid.configuration.checkUpdates) return awActions.checkUpdates(false)
+    }
+
+    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
@@ -196,38 +186,39 @@ 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)
     }
 
-    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()
-    }
-
-    function action_report() {
-        if (debug) console.log("[main::action_report]")
-
-        AWActions.sendEmail()
+        return awActions.showReadme()
     }
 
     function action_requestKey() {
-        if (debug) console.log("[main::action_requestKey]")
+        if (debug) console.debug()
 
-        AWKeys.graphicalValueByKey()
+        tagSelectorBox.model = awKeys.dictKeys(true)
+        return tagSelector.open()
     }
 }

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

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

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

@@ -20,17 +20,22 @@ 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
@@ -43,9 +48,9 @@ Item {
     property alias cfg_memTooltipColor: memTooltipColor.text
     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_downkbTooltip: downkbTooltip.checked
+    property alias cfg_downkbTooltipColor: downkbTooltipColor.text
+    property alias cfg_upkbTooltipColor: upkbTooltipColor.text
     property alias cfg_batTooltip: batTooltip.checked
     property alias cfg_batTooltipColor: batTooltipColor.text
     property alias cfg_batInTooltipColor: batInTooltipColor.text
@@ -59,7 +64,7 @@ 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 {
@@ -82,432 +87,334 @@ Item {
             }
         }
 
-        Row {
+        QtControls.GroupBox {
+            id: useTooltipBackground
             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 {
-                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"
+            checkable: true
+            title: i18n("Background")
+            Row {
+                height: implicitHeight
+                width: parent.width
+                QtControls.Label {
+                    height: parent.height
+                    width: parent.width * 2 / 5
+                    horizontalAlignment: Text.AlignRight
+                    verticalAlignment: Text.AlignVCenter
+                    text: i18n("Background color")
+                }
+                QtControls.Button {
+                    id: tooltipBackground
+                    width: parent.width * 3 / 5
+                    style: QtStyles.ButtonStyle {
+                        background: Rectangle {
+                            color: plasmoid.configuration.tooltipBackground
                         }
                     }
+                    text: plasmoid.configuration.tooltipBackground
+                    onClicked: tooltipBackgroundDialog.visible = true
                 }
-            }
-            QtControls.Button {
-                id: tooltipBackground
-                width: parent.width * 3 / 5
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.tooltipBackground
-                    }
-                }
-                text: plasmoid.configuration.tooltipBackground
-                onClicked: tooltipBackgroundDialog.visible = true
-            }
 
-            QtDialogs.ColorDialog {
-                id: tooltipBackgroundDialog
-                title: i18n("Select a color")
-                color: tooltipBackground.text
-                onAccepted: tooltipBackground.text = tooltipBackgroundDialog.color
+                QtDialogs.ColorDialog {
+                    id: tooltipBackgroundDialog
+                    title: i18n("Select a color")
+                    color: tooltipBackground.text
+                    onAccepted: tooltipBackground.text = tooltipBackgroundDialog.color
+                }
             }
         }
 
-        Row {
+        QtControls.GroupBox {
+            id: cpuTooltip
             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 {
-                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"
+            checkable: true
+            title: i18n("CPU")
+            Row {
+                height: implicitHeight
+                width: parent.width
+                QtControls.Label {
+                    height: parent.height
+                    width: parent.width * 2 / 5
+                    horizontalAlignment: Text.AlignRight
+                    verticalAlignment: Text.AlignVCenter
+                    text: i18n("CPU color")
+                }
+                QtControls.Button {
+                    id: cpuTooltipColor
+                    width: parent.width * 3 / 5
+                    style: QtStyles.ButtonStyle {
+                        background: Rectangle {
+                            color: plasmoid.configuration.cpuTooltipColor
                         }
                     }
+                    text: plasmoid.configuration.cpuTooltipColor
+                    onClicked: cpuTooltipColorDialog.visible = true
                 }
-            }
-            QtControls.Button {
-                id: cpuTooltipColor
-                width: parent.width * 3 / 5
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.cpuTooltipColor
-                    }
-                }
-                text: plasmoid.configuration.cpuTooltipColor
-                onClicked: cpuTooltipColorDialog.visible = true
-            }
 
-            QtDialogs.ColorDialog {
-                id: cpuTooltipColorDialog
-                title: i18n("Select a color")
-                color: cpuTooltipColor.text
-                onAccepted: cpuTooltipColor.text = cpuTooltipColorDialog.color
+                QtDialogs.ColorDialog {
+                    id: cpuTooltipColorDialog
+                    title: i18n("Select a color")
+                    color: cpuTooltipColor.text
+                    onAccepted: cpuTooltipColor.text = cpuTooltipColorDialog.color
+                }
             }
         }
 
-        Row {
+        QtControls.GroupBox {
+            id: cpuclTooltip
             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 {
-                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"
+            checkable: true
+            title: i18n("CPU clock")
+            Row {
+                height: implicitHeight
+                width: parent.width
+                QtControls.Label {
+                    height: parent.height
+                    width: parent.width * 2 / 5
+                    horizontalAlignment: Text.AlignRight
+                    verticalAlignment: Text.AlignVCenter
+                    text: i18n("CPU clock color")
+                }
+                QtControls.Button {
+                    id: cpuclTooltipColor
+                    width: parent.width * 3 / 5
+                    style: QtStyles.ButtonStyle {
+                        background: Rectangle {
+                            color: plasmoid.configuration.cpuclTooltipColor
                         }
                     }
+                    text: plasmoid.configuration.cpuclTooltipColor
+                    onClicked: cpuclTooltipColorDialog.visible = true
                 }
-            }
-            QtControls.Button {
-                id: cpuclTooltipColor
-                width: parent.width * 3 / 5
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.cpuclTooltipColor
-                    }
-                }
-                text: plasmoid.configuration.cpuclTooltipColor
-                onClicked: cpuclTooltipColorDialog.visible = true
-            }
 
-            QtDialogs.ColorDialog {
-                id: cpuclTooltipColorDialog
-                title: i18n("Select a color")
-                color: cpuclTooltipColor.text
-                onAccepted: cpuclTooltipColor.text = cpuclTooltipColorDialog.color
+                QtDialogs.ColorDialog {
+                    id: cpuclTooltipColorDialog
+                    title: i18n("Select a color")
+                    color: cpuclTooltipColor.text
+                    onAccepted: cpuclTooltipColor.text = cpuclTooltipColorDialog.color
+                }
             }
         }
 
-        Row {
+        QtControls.GroupBox {
+            id: memTooltip
             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 {
-                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"
+            checkable: true
+            title: i18n("Memory")
+            Row {
+                height: implicitHeight
+                width: parent.width
+                QtControls.Label {
+                    height: parent.height
+                    width: parent.width * 2 / 5
+                    horizontalAlignment: Text.AlignRight
+                    verticalAlignment: Text.AlignVCenter
+                    text: i18n("Memory color")
+                }
+                QtControls.Button {
+                    id: memTooltipColor
+                    width: parent.width * 3 / 5
+                    style: QtStyles.ButtonStyle {
+                        background: Rectangle {
+                            color: plasmoid.configuration.memTooltipColor
                         }
                     }
+                    text: plasmoid.configuration.memTooltipColor
+                    onClicked: memTooltipColorDialog.visible = true
                 }
-            }
-            QtControls.Button {
-                id: memTooltipColor
-                width: parent.width * 3 / 5
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.memTooltipColor
-                    }
-                }
-                text: plasmoid.configuration.memTooltipColor
-                onClicked: memTooltipColorDialog.visible = true
-            }
 
-            QtDialogs.ColorDialog {
-                id: memTooltipColorDialog
-                title: i18n("Select a color")
-                color: memTooltipColor.text
-                onAccepted: memTooltipColor.text = memTooltipColorDialog.color
+                QtDialogs.ColorDialog {
+                    id: memTooltipColorDialog
+                    title: i18n("Select a color")
+                    color: memTooltipColor.text
+                    onAccepted: memTooltipColor.text = memTooltipColorDialog.color
+                }
             }
         }
 
-        Row {
+        QtControls.GroupBox {
+            id: swapTooltip
             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 {
-                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"
+            checkable: true
+            title: i18n("Swap")
+            Row {
+                height: implicitHeight
+                width: parent.width
+                QtControls.Label {
+                    height: parent.height
+                    width: parent.width * 2 / 5
+                    horizontalAlignment: Text.AlignRight
+                    verticalAlignment: Text.AlignVCenter
+                    text: i18n("Swap color")
+                }
+                QtControls.Button {
+                    id: swapTooltipColor
+                    width: parent.width * 3 / 5
+                    style: QtStyles.ButtonStyle {
+                        background: Rectangle {
+                            color: plasmoid.configuration.swapTooltipColor
                         }
                     }
+                    text: plasmoid.configuration.swapTooltipColor
+                    onClicked: swapTooltipColorDialog.visible = true
                 }
-            }
-            QtControls.Button {
-                id: swapTooltipColor
-                width: parent.width * 3 / 5
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.swapTooltipColor
-                    }
-                }
-                text: plasmoid.configuration.swapTooltipColor
-                onClicked: swapTooltipColorDialog.visible = true
-            }
 
-            QtDialogs.ColorDialog {
-                id: swapTooltipColorDialog
-                title: i18n("Select a color")
-                color: swapTooltipColor.text
-                onAccepted: swapTooltipColor.text = swapTooltipColorDialog.color
+                QtDialogs.ColorDialog {
+                    id: swapTooltipColorDialog
+                    title: i18n("Select a color")
+                    color: swapTooltipColor.text
+                    onAccepted: swapTooltipColor.text = swapTooltipColorDialog.color
+                }
             }
         }
 
-        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
-                text: i18n("Download speed color")
-            }
-            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"
+            checkable: true
+            title: i18n("Network")
+            Column {
+                height: implicitHeight
+                width: parent.width
+                Row {
+                    height: implicitHeight
+                    width: parent.width
+                    QtControls.Label {
+                        height: parent.height
+                        width: parent.width * 2 / 5
+                        horizontalAlignment: Text.AlignRight
+                        verticalAlignment: Text.AlignVCenter
+                        text: i18n("Download speed color")
+                    }
+                    QtControls.Button {
+                        id: downkbTooltipColor
+                        width: parent.width * 3 / 5
+                        style: QtStyles.ButtonStyle {
+                            background: Rectangle {
+                                color: plasmoid.configuration.downkbTooltipColor
+                            }
                         }
+                        text: plasmoid.configuration.downkbTooltipColor
+                        onClicked: downkbTooltipColorDialog.visible = true
+                    }
+
+                    QtDialogs.ColorDialog {
+                        id: downkbTooltipColorDialog
+                        title: i18n("Select a color")
+                        color: downkbTooltipColor.text
+                        onAccepted: downkbTooltipColor.text = downkbTooltipColorDialog.color
                     }
                 }
-            }
-            QtControls.Button {
-                id: downTooltipColor
-                width: parent.width * 3 / 5
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.downTooltipColor
+                Row {
+                    height: implicitHeight
+                    width: parent.width
+                    QtControls.Label {
+                        height: parent.height
+                        width: parent.width * 2 / 5
+                        horizontalAlignment: Text.AlignRight
+                        verticalAlignment: Text.AlignVCenter
+                        text: i18n("Upload speed color")
                     }
-                }
-                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
-                text: i18n("Upload speed color")
-            }
-            QtControls.Button {
-                id: upTooltipColor
-                width: parent.width * 3 / 5
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.upTooltipColor
-                    }
-                }
-                text: plasmoid.configuration.upTooltipColor
-                onClicked: upTooltipColorDialog.visible = true
-            }
-
-            QtDialogs.ColorDialog {
-                id: upTooltipColorDialog
-                title: i18n("Select a color")
-                color: upTooltipColor.text
-                onAccepted: upTooltipColor.text = upTooltipColorDialog.color
-            }
-        }
-
-        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 {
-                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: upkbTooltipColor
+                        width: parent.width * 3 / 5
+                        style: QtStyles.ButtonStyle {
+                            background: Rectangle {
+                                color: plasmoid.configuration.upkbTooltipColor
+                            }
                         }
+                        text: plasmoid.configuration.upkbTooltipColor
+                        onClicked: upkbTooltipColorDialog.visible = true
                     }
-                }
-            }
-            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
+                    QtDialogs.ColorDialog {
+                        id: upkbTooltipColorDialog
+                        title: i18n("Select a color")
+                        color: upkbTooltipColor.text
+                        onAccepted: upkbTooltipColor.text = upkbTooltipColorDialog.color
+                    }
+                }
             }
         }
 
-        Row {
+        QtControls.GroupBox {
+            id: batTooltip
             height: implicitHeight
             width: parent.width
-            QtControls.Label {
-                height: parent.height
-                width: parent.width * 2 / 5
-                horizontalAlignment: Text.AlignRight
-                verticalAlignment: Text.AlignVCenter
-                text: i18n("Battery inactive color")
-            }
-            QtControls.Button {
-                id: batInTooltipColor
-                width: parent.width * 3 / 5
-                style: QtStyles.ButtonStyle {
-                    background: Rectangle {
-                        color: plasmoid.configuration.batInTooltipColor
+            checkable: true
+            title: i18n("Battery")
+            Column {
+                height: implicitHeight
+                width: parent.width
+                Row {
+                    height: implicitHeight
+                    width: parent.width
+                    QtControls.Label {
+                        height: parent.height
+                        width: parent.width * 2 / 5
+                        horizontalAlignment: Text.AlignRight
+                        verticalAlignment: Text.AlignVCenter
+                        text: i18n("Battery active color")
+                    }
+                    QtControls.Button {
+                        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
                     }
                 }
-                text: plasmoid.configuration.batInTooltipColor
-                onClicked: batInTooltipColorDialog.visible = true
-            }
+                Row {
+                    height: implicitHeight
+                    width: parent.width
+                    QtControls.Label {
+                        height: parent.height
+                        width: parent.width * 2 / 5
+                        horizontalAlignment: Text.AlignRight
+                        verticalAlignment: Text.AlignVCenter
+                        text: i18n("Battery inactive color")
+                    }
+                    QtControls.Button {
+                        id: batInTooltipColor
+                        width: parent.width * 3 / 5
+                        style: QtStyles.ButtonStyle {
+                            background: Rectangle {
+                                color: plasmoid.configuration.batInTooltipColor
+                            }
+                        }
+                        text: plasmoid.configuration.batInTooltipColor
+                        onClicked: batInTooltipColorDialog.visible = true
+                    }
 
-            QtDialogs.ColorDialog {
-                id: batInTooltipColorDialog
-                title: i18n("Select a color")
-                color: batInTooltipColor.text
-                onAccepted: batInTooltipColor.text = batInTooltipColorDialog.color
+                    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

@@ -17,48 +17,35 @@
 
 import QtQuick 2.0
 import QtQuick.Controls 1.3 as QtControls
-import org.kde.plasma.core 2.0 as PlasmaCore
+import QtQuick.Dialogs 1.2 as QtDialogs
 
-import org.kde.plasma.awesomewidget 1.0
+import org.kde.plasma.private.awesomewidget 1.0
 
 
 Item {
     id: widgetPage
+    // backend
+    AWKeys {
+        id: awKeys
+    }
+    AWActions {
+        id: awActions
+    }
+    AWFormatterConfigFactory {
+        id: awFormatter
+    }
+
     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 {
@@ -69,152 +56,156 @@ Item {
           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>")
+          text: i18n("Detailed information may be found on <a href=\"https://arcanis.me/projects/awesome-widgets/\">project homepage</a>")
+          onLinkActivated: Qt.openUrlExternally(link);
         }
 
         Row {
             height: implicitHeight
             width: parent.width
             QtControls.Button {
-                width: parent.width * 3 / 12
+                width: parent.width * 3 / 15
+                text: i18n("Bgcolor")
+
+                onClicked: backgroundDialog.visible = true
+
+                QtDialogs.ColorDialog {
+                    id: backgroundDialog
+                    title: i18n("Select a color")
+                    onAccepted: {
+                        var text = textPattern.text
+                        textPattern.text = "<body bgcolor=\"" +
+                                           backgroundDialog.color + "\">" +
+                                           text + "</body>"
+                    }
+                }
+            }
+            QtControls.Button {
+                width: parent.width * 3 / 15
                 text: i18n("Font")
                 iconName: "font"
 
                 onClicked: {
-                    if (debug) console.log("[widget::onClicked] : Font button")
-
+                    if (debug) console.debug("Font button")
                     var defaultFont = {
                         "color": plasmoid.configuration.fontColor,
                         "family": plasmoid.configuration.fontFamily,
                         "size": plasmoid.configuration.fontSize
                     }
-                    var font = AWActions.getFont(defaultFont)
-                    var pos = textPattern.cursorPosition
+                    var font = awActions.getFont(defaultFont)
+                    if (font.applied != 1) {
+                        if (debug) console.debug("No font selected")
+                        return
+                    }
+
                     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>")
+                    textPattern.insert(textPattern.cursorPosition,
+                        "<span style=\"color:" + font.color +
+                        "; font-family:'" + font.family +
+                        "'; font-size:" + font.size + "pt;\">" +
+                        selected + "</span>")
                 }
             }
             QtControls.Button {
-                width: parent.width / 12
+                width: parent.width / 15
                 iconName: "format-indent-more"
 
                 onClicked: {
-                    if (debug) console.log("[widget::onClicked] : Indent button")
-
-                    var pos = textPattern.cursorPosition
+                    if (debug) console.debug("Indent button")
                     var selected = textPattern.selectedText
                     textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(pos, selected + "<br>\n")
+                    textPattern.insert(textPattern.cursorPosition, selected + "<br>\n")
                 }
             }
 
             QtControls.Button {
-                width: parent.width / 12
+                width: parent.width / 15
                 iconName: "format-text-bold"
 
                 onClicked: {
-                    if (debug) console.log("[widget::onClicked] : Bold button")
-
-                    var pos = textPattern.cursorPosition
+                    if (debug) console.debug("Bold button")
                     var selected = textPattern.selectedText
                     textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(pos, "<b>" + selected + "</b>")
+                    textPattern.insert(textPattern.cursorPosition, "<b>" + selected + "</b>")
                 }
             }
             QtControls.Button {
-                width: parent.width / 12
+                width: parent.width / 15
                 iconName: "format-text-italic"
 
                 onClicked: {
-                    if (debug) console.log("[widget::onClicked] : Italic button")
-
-                    var pos = textPattern.cursorPosition
+                    if (debug) console.debug("Italic button")
                     var selected = textPattern.selectedText
                     textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(pos, "<i>" + selected + "</i>")
+                    textPattern.insert(textPattern.cursorPosition, "<i>" + selected + "</i>")
                 }
             }
             QtControls.Button {
-                width: parent.width / 12
+                width: parent.width / 15
                 iconName: "format-text-underline"
 
                 onClicked: {
-                    if (debug) console.log("[widget::onClicked] : Underline button")
-
-                    var pos = textPattern.cursorPosition
+                    if (debug) console.debug("Underline button")
                     var selected = textPattern.selectedText
                     textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(pos, "<u>" + selected + "</u>")
+                    textPattern.insert(textPattern.cursorPosition, "<u>" + selected + "</u>")
                 }
             }
             QtControls.Button {
-                width: parent.width / 12
+                width: parent.width / 15
                 iconName: "format-text-strikethrough"
 
                 onClicked: {
-                    if (debug) console.log("[widget::onClicked] : Strike button")
-
-                    var pos = textPattern.cursorPosition
+                    if (debug) console.debug("Strike button")
                     var selected = textPattern.selectedText
                     textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(pos, "<s>" + selected + "</s>")
+                    textPattern.insert(textPattern.cursorPosition, "<s>" + selected + "</s>")
                 }
             }
 
             QtControls.Button {
-                width: parent.width / 12
+                width: parent.width / 15
                 iconName: "format-justify-left"
 
                 onClicked: {
-                    if (debug) console.log("[widget::onClicked] : Left button")
-
-                    var pos = textPattern.cursorPosition
+                    if (debug) console.debug("Left button")
                     var selected = textPattern.selectedText
                     textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(pos, "<p align=\"left\">" + selected + "</p>")
+                    textPattern.insert(textPattern.cursorPosition, "<p align=\"left\">" + selected + "</p>")
                 }
             }
             QtControls.Button {
-                width: parent.width / 12
+                width: parent.width / 15
                 iconName: "format-justify-center"
 
                 onClicked: {
-                    if (debug) console.log("[widget::onClicked] : Center button")
-
-                    var pos = textPattern.cursorPosition
+                    if (debug) console.debug("Center button")
                     var selected = textPattern.selectedText
                     textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(pos, "<p align=\"center\">" + selected + "</p>")
+                    textPattern.insert(textPattern.cursorPosition, "<p align=\"center\">" + selected + "</p>")
                 }
             }
             QtControls.Button {
-                width: parent.width / 12
+                width: parent.width / 15
                 iconName: "format-justify-right"
 
                 onClicked: {
-                    if (debug) console.log("[widget::onClicked] : Right button")
-
-                    var pos = textPattern.cursorPosition
+                    if (debug) console.debug("Right button")
                     var selected = textPattern.selectedText
                     textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(pos, "<p align=\"right\">" + selected + "</p>")
+                    textPattern.insert(textPattern.cursorPosition, "<p align=\"right\">" + selected + "</p>")
                 }
             }
             QtControls.Button {
-                width: parent.width / 12
+                width: parent.width / 15
                 iconName: "format-justify-fill"
 
                 onClicked: {
-                    if (debug) console.log("[widget::onClicked] : Justify button")
-
-                    var pos = textPattern.cursorPosition
+                    if (debug) console.debug("Justify button")
                     var selected = textPattern.selectedText
                     textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(pos, "<p align=\"justify\">" + selected + "</p>")
+                    textPattern.insert(textPattern.cursorPosition, "<p align=\"justify\">" + selected + "</p>")
                 }
             }
         }
@@ -222,36 +213,108 @@ Item {
         Row {
             height: implicitHeight
             width: parent.width
+            QtControls.ComboBox {
+                width: parent.width * 2 / 5
+                textRole: "label"
+                model: [
+                    {
+                        'label': i18n("AC"),
+                        'regexp': "^(ac|bat).*"
+                    },
+                    {
+                        'label': i18n("Bars"),
+                        'regexp': "^bar.*"
+                    },
+                    {
+                        'label': i18n("CPU"),
+                        'regexp': "^(cpu|gpu|la|ps|temp(?!erature)).*"
+                    },
+                    {
+                        'label': i18n("Desktops"),
+                        'regexp': "^(n|t)?desktop(s)?"
+                    },
+                    {
+                        'label': i18n("HDD"),
+                        'regexp': "^hdd.*"
+                    },
+                    {
+                        'label': i18n("Memory"),
+                        'regexp': "^(mem|swap).*"
+                    },
+                    {
+                        'label': i18n("Network"),
+                        'regexp': "^(netdev|(down|up(?!time)).*)"
+                    },
+                    {
+                        'label': i18n("Music player"),
+                        'regexp': "(^|d|s)(album|artist|duration|progress|title)"
+                    },
+                    {
+                        'label': i18n("Scripts"),
+                        'regexp': "^custom.*"
+                    },
+                    {
+                        'label': i18n("Time"),
+                        'regexp': ".*time$"
+                    },
+                    {
+                        'label': i18n("Quotes"),
+                        'regexp': "^(perc)?(ask|bid|price)(chg)?.*"
+                    },
+                    {
+                        'label': i18n("Upgrades"),
+                        'regexp': "^pkgcount.*"
+                    },
+                    {
+                        'label': i18n("Weathers"),
+                        'regexp': "^(weather(Id)?|humidity|pressure|temperature|timestamp)"
+                    },
+                    {
+                        'label': i18n("Functions"),
+                        'regexp': "functions"
+                    }
+                ]
+                onCurrentIndexChanged: {
+                    if (debug) console.debug()
+                    if (model[currentIndex]["regexp"] == "functions")
+                        tags.model = ["{{\n\n}}", "template{{\n\n}}",
+                            "aw_all<>{{}}", "aw_count<>{{}}", "aw_keys<>{{}}",
+                            "aw_names<>{{}}"]
+                    else
+                        tags.model = awKeys.dictKeys(true, model[currentIndex]["regexp"])
+                    if (debug) console.info("Init model", tags.model, "for", model[currentIndex]["label"])
+                    tags.currentIndex = -1
+                }
+            }
             QtControls.ComboBox {
                 id: tags
-                width: parent.width - addTagButton.width - showValueButton.width
+                width: parent.width * 1 / 5
             }
             QtControls.Button {
-                id: addTagButton
+                width: parent.width * 1 / 5
                 text: i18n("Add")
 
                 onClicked: {
-                    if (debug) console.log("[widget::onClicked] : Add tag button")
-
-                    var pos = textPattern.cursorPosition
+                    if (!tags.currentText) return
+                    if (debug) console.debug("Add tag button")
                     var selected = textPattern.selectedText
                     textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
-                    textPattern.insert(pos, selected + "$" + tags.currentText)
+                    textPattern.insert(textPattern.cursorPosition, selected + "$" + tags.currentText)
                 }
             }
             QtControls.Button {
-                id: showValueButton
+                width: parent.width * 1 / 5
                 text: i18n("Show value")
 
                 onClicked: {
-                    if (debug) console.log("[widget::onClicked] : Show tag button")
-
+                    if (!tags.currentText) return
+                    if (debug) console.debug("Show tag button")
                     var message = i18n("Tag: %1", tags.currentText)
                     message += "<br>"
-                    message += i18n("Value: %1", AWKeys.valueByKey(tags.currentText))
+                    message += i18n("Value: %1", awKeys.valueByKey(tags.currentText))
                     message += "<br>"
-                    message += i18n("Info: %1", AWKeys.infoByKey(tags.currentText))
-                    AWActions.sendNotification("tag", message)
+                    message += i18n("Info: %1", awKeys.infoByKey(tags.currentText))
+                    awActions.sendNotification("tag", message)
                 }
             }
         }
@@ -260,9 +323,23 @@ Item {
             height: implicitHeight
             width: parent.width
             QtControls.Button {
-                width: parent.width
+                width: parent.width * 3 / 10
                 text: i18n("Edit bars")
-                onClicked: AWKeys.editItem("graphicalitem")
+                onClicked: awKeys.editItem("graphicalitem")
+            }
+            QtControls.Button {
+                width: parent.width * 3 / 10
+                text: i18n("Formatters")
+                onClicked: awFormatter.showDialog(awKeys.dictKeys(true))
+            }
+            QtControls.Button {
+                width: parent.width * 2 / 5
+                text: i18n("Preview")
+                onClicked: {
+                    lock = false
+                    awKeys.initKeys(textPattern.text, plasmoid.configuration.interval,
+                                    plasmoid.configuration.queueLimit, false)
+                }
             }
         }
 
@@ -275,52 +352,34 @@ Item {
         }
     }
 
-    // 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)
-        }
+    QtDialogs.MessageDialog {
+        id: compiledText
+        modality: Qt.NonModal
+        title: i18n("Preview")
     }
 
-    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()
+
+        compiledText.text = newText.replace(/&nbsp;/g, " ")
+        compiledText.open()
+        lock = true;
     }
 }

sources/awesome-widget/package/metadata.desktop

@@ -20,8 +20,8 @@ X-Plasma-RemoteLocation=
 X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
-X-KDE-PluginInfo-Version=2.3.0
-X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/
+X-KDE-PluginInfo-Version=3.1.2
+X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
 X-KDE-PluginInfo-Category=System Information
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPLv3

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}
+        ${CMAKE_BINARY_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../${PROJECT_LIBRARY}/
+        ${PROJECT_TRDPARTY_DIR}
+        ${Qt_INCLUDE}
+        ${Kf5_INCLUDE}
+)
 
-include_directories (${CMAKE_SOURCE_DIR}
-                     ${CMAKE_BINARY_DIR}
-                     ${CMAKE_CURRENT_BINARY_DIR}
-                     ${CMAKE_CURRENT_BINARY_DIR}/../
-                     ${PROJECT_TRDPARTY_DIR}
-                     ../../extsysmon
-                     ${CMAKE_CURRENT_BINARY_DIR}/../../extsysmon
-                     ${Qt_INCLUDE}
-                     ${Kf5_INCLUDE})
+file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
+file(GLOB SUBPROJECT_UI *.ui)
+file(GLOB SUBPROJECT_NOTIFY *.notifyrc)
 
-# 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)
+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})
 
-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})
-
-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/awabstractselector.cpp

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

sources/awesome-widget/plugin/awabstractselector.ui

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

sources/awesome-widget/plugin/awactions.cpp

@@ -20,128 +20,147 @@
 #include <KI18n/KLocalizedString>
 #include <KNotifications/KNotification>
 
-#include <QDebug>
 #include <QDesktopServices>
-#include <QDir>
-#include <QMessageBox>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
 #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)
 {
-    // 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__;
+
+    delete m_updateHelper;
 }
 
 
-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)
+// HACK: since QML could not use QLoggingCategory I need this hack
+bool AWActions::isDebugEnabled() const
 {
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Cmd" << cmd;
+    return LOG_AW().isDebugEnabled();
+}
+
+
+bool AWActions::runCmd(const QString cmd) const
+{
+    qCDebug(LOG_AW) << "Cmd" << cmd;
 
-    QProcess command;
     sendNotification(QString("Info"), i18n("Run %1", cmd));
 
-    command.startDetached(cmd);
+    return QProcess::startDetached(cmd);
 }
 
 
-void AWActions::sendEmail()
+// HACK: this method uses variable from version.h
+void AWActions::showReadme() const
 {
-    if (debug) qDebug() << PDEBUG;
+    QDesktopServices::openUrl(QUrl(HOMEPAGE));
 }
 
 
-void AWActions::showReadme()
+// HACK: this method uses variables from version.h
+QString AWActions::getAboutText(const QString type) const
 {
-    if (debug) qDebug() << PDEBUG;
-
-    QDesktopServices::openUrl(QString(HOMEPAGE));
-}
-
-
-QString AWActions::getAboutText(const QString type)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Type" << type;
+    qCDebug(LOG_AW) << "Type" << type;
 
     QString text;
-    if (type == QString("header"))
+    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"))
+    } else if (type == QString("version")) {
+        text = i18n("Version %1 (build date %2)", QString(VERSION),
+                    QString(BUILD_DATE));
+        if (!QString(COMMIT_SHA).isEmpty())
+            text += QString(" (%1)").arg(QString(COMMIT_SHA));
+    } else if (type == QString("description")) {
         text = i18n("A set of minimalistic plasmoid widgets");
-    else if (type == QString("links"))
-        text = i18n("Links:") + QString("<br>") +
-               QString("<a href=\"%1\">%2</a><br>").arg(QString(HOMEPAGE)).arg(i18n("Homepage")) +
-               QString("<a href=\"%1\">%2</a><br>").arg(QString(REPOSITORY)).arg(i18n("Repository")) +
-               QString("<a href=\"%1\">%2</a><br>").arg(QString(BUGTRACKER)).arg(i18n("Bugtracker")) +
-               QString("<a href=\"%1\">%2</a><br>").arg(QString(TRANSLATION)).arg(i18n("Translation issue")) +
-               QString("<a href=\"%1\">%2</a><br>").arg(QString(AUR_PACKAGES)).arg(i18n("AUR packages")) +
-               QString("<a href=\"%1\">%2</a>").arg(QString(OPENSUSE_PACKAGES)).arg(i18n("openSUSE packages"));
-    else if (type == QString("copy"))
-        text = QString("<small>&copy; %1 <a href=\"mailto:%2\">%3</a><br>").arg(QString(DATE)).arg(QString(EMAIL)).arg(QString(AUTHOR)) +
-               i18n("This software is licensed under %1", QString(LICENSE)) + QString("</small>");
-    else if (type == QString("translators"))
+    } 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++)
+    } 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]);
+                                  .arg(trdPartyList.at(i).split(QChar(','))[0])
+                                  .arg(trdPartyList.at(i).split(QChar(','))[1])
+                                  .arg(trdPartyList.at(i).split(QChar(','))[2]);
         text = i18n("This software uses: %1", trdPartyList.join(QString(", ")));
+    } else if (type == QString("thanks")) {
+        QStringList thanks = QString(SPECIAL_THANKS)
+                                 .split(QChar(';'), QString::SkipEmptyParts);
+        for (int i = 0; i < thanks.count(); i++)
+            thanks[i] = QString("<a href=\"%2\">%1</a>")
+                            .arg(thanks.at(i).split(QChar(','))[0])
+                            .arg(thanks.at(i).split(QChar(','))[1]);
+        text = i18n("Special thanks to %1", thanks.join(QString(", ")));
     }
 
     return text;
 }
 
 
-QVariantMap AWActions::getFont(const QVariantMap defaultFont)
+QVariantMap AWActions::getFont(const QVariantMap defaultFont) const
 {
-    if (debug) qDebug() << PDEBUG;
+    qCDebug(LOG_AW) << "Default font is" << defaultFont;
 
     QVariantMap fontMap;
+    int ret = 0;
     CFont defaultCFont = CFont(defaultFont[QString("family")].toString(),
-                               defaultFont[QString("size")].toInt(),
-                               400, false, defaultFont[QString("color")].toString());
-    CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont,
-                                      false, false);
+                               defaultFont[QString("size")].toInt(), 400, false,
+                               defaultFont[QString("color")].toString());
+    CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false,
+                                      false, &ret);
+
+    fontMap[QString("applied")] = ret;
     fontMap[QString("color")] = font.color().name();
     fontMap[QString("family")] = font.family();
     fontMap[QString("size")] = font.pointSize();
@@ -150,104 +169,13 @@ QVariantMap AWActions::getFont(const QVariantMap defaultFont)
 }
 
 
-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(
+        QString("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);
+    virtual ~AWActions();
+    Q_INVOKABLE void checkUpdates(const bool showAnyway = false);
+    Q_INVOKABLE bool isDebugEnabled() const;
+    Q_INVOKABLE bool runCmd(const QString cmd = QString("/usr/bin/true")) const;
+    Q_INVOKABLE void showReadme() const;
     // 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 QString getAboutText(const QString type
+                                     = QString("header")) const;
+    Q_INVOKABLE QVariantMap getFont(const QVariantMap defaultFont) const;
 
 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/awconfighelper.cpp

@@ -0,0 +1,323 @@
+/***************************************************************************
+ *   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 <KI18n/KLocalizedString>
+
+#include <QDir>
+#include <QQmlPropertyMap>
+#include <QSettings>
+#include <QTextCodec>
+
+#include "awdebug.h"
+
+
+AWConfigHelper::AWConfigHelper(QObject *parent)
+    : QObject(parent)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+AWConfigHelper::~AWConfigHelper()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+QString AWConfigHelper::configurationDirectory() const
+{
+    // get readable directory
+    QString localDir = QString("%1/awesomewidgets/configs")
+                           .arg(QStandardPaths::writableLocation(
+                               QStandardPaths::GenericDataLocation));
+
+    // create directory and copy files from default settings
+    QDir localDirectory;
+    if ((!localDirectory.exists(localDir))
+        && (localDirectory.mkpath(localDir))) {
+        qCInfo(LOG_AW) << "Created directory" << localDir;
+        copyConfigs(localDir);
+    }
+
+    return localDir;
+}
+
+
+bool AWConfigHelper::dropCache() const
+{
+    QString fileName = QString("%1/awesomewidgets.ndx")
+                           .arg(QStandardPaths::writableLocation(
+                               QStandardPaths::GenericCacheLocation));
+
+    return QFile(fileName).remove();
+}
+
+
+bool AWConfigHelper::exportConfiguration(const QObject *nativeConfig,
+                                         const QString fileName) const
+{
+    qCDebug(LOG_AW) << "Selected filename" << fileName;
+
+    QSettings settings(fileName, QSettings::IniFormat);
+
+    // plasmoid configuration
+    const QQmlPropertyMap *configuration
+        = static_cast<const QQmlPropertyMap *>(nativeConfig);
+    settings.beginGroup(QString("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() << QString("*.desktop"),
+                             QDir::Files);
+        settings.beginGroup(item);
+        for (auto it : items)
+            copyExtensions(it, item, settings, false);
+        settings.endGroup();
+    }
+
+    // additional files
+    settings.beginGroup(QString("json"));
+    // script filters
+    readFile(settings, QString("filters"),
+             QString("%1/scripts/awesomewidgets-extscripts-filters.json")
+                 .arg(m_baseDir));
+    // weather icon settings
+    readFile(settings, QString("weathers"),
+             QString("%1/weather/awesomewidgets-extweather-ids.json")
+                 .arg(m_baseDir));
+    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(QString("json"));
+        // script filters
+        writeFile(settings, QString("filters"),
+                  QString("%1/scripts/awesomewidgets-extscripts-filters.json")
+                      .arg(m_baseDir));
+        // weather icon settings
+        writeFile(settings, QString("weathers"),
+                  QString("%1/weather/awesomewidgets-extweather-ids.json")
+                      .arg(m_baseDir));
+        settings.endGroup();
+    }
+
+    // plasmoid configuration
+    if (importPlasmoid) {
+        settings.beginGroup(QString("plasmoid"));
+        for (auto key : settings.childKeys())
+            configuration[key] = settings.value(key);
+        settings.endGroup();
+    }
+
+    return configuration;
+}
+
+
+QVariantMap AWConfigHelper::readDataEngineConfiguration() const
+{
+    QString fileName
+        = QStandardPaths::locate(QStandardPaths::ConfigLocation,
+                                 QString("plasma-dataengine-extsysmon.conf"));
+    qCInfo(LOG_AW) << "Configuration file" << fileName;
+    QSettings settings(fileName, QSettings::IniFormat);
+    QVariantMap configuration;
+
+    settings.beginGroup(QString("Configuration"));
+    configuration[QString("ACPIPATH")] = settings.value(
+        QString("ACPIPATH"), QString("/sys/class/power_supply/"));
+    configuration[QString("GPUDEV")]
+        = settings.value(QString("GPUDEV"), QString("auto"));
+    configuration[QString("HDDDEV")]
+        = settings.value(QString("HDDDEV"), QString("all"));
+    configuration[QString("HDDTEMPCMD")]
+        = settings.value(QString("HDDTEMPCMD"), QString("sudo smartctl -a"));
+    configuration[QString("MPDADDRESS")]
+        = settings.value(QString("MPDADDRESS"), QString("localhost"));
+    configuration[QString("MPDPORT")]
+        = settings.value(QString("MPDPORT"), QString("6600"));
+    configuration[QString("MPRIS")]
+        = settings.value(QString("MPRIS"), QString("auto"));
+    configuration[QString("PLAYER")]
+        = settings.value(QString("PLAYER"), QString("mpris"));
+    configuration[QString("PLAYERSYMBOLS")]
+        = settings.value(QString("PLAYERSYMBOLS"), QString("10"));
+    settings.endGroup();
+
+    qCInfo(LOG_AW) << "Configuration" << configuration;
+
+    return configuration;
+}
+
+
+bool AWConfigHelper::writeDataEngineConfiguration(
+    const QVariantMap configuration) const
+{
+    qCDebug(LOG_AW) << "Configuration" << configuration;
+
+    QString fileName
+        = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)
+          + QString("/plasma-dataengine-extsysmon.conf");
+    QSettings settings(fileName, QSettings::IniFormat);
+    qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
+
+    settings.beginGroup(QString("Configuration"));
+    settings.setValue(QString("ACPIPATH"), configuration[QString("ACPIPATH")]);
+    settings.setValue(QString("GPUDEV"), configuration[QString("GPUDEV")]);
+    settings.setValue(QString("HDDDEV"), configuration[QString("HDDDEV")]);
+    settings.setValue(QString("HDDTEMPCMD"),
+                      configuration[QString("HDDTEMPCMD")]);
+    settings.setValue(QString("MPDADDRESS"),
+                      configuration[QString("MPDADDRESS")]);
+    settings.setValue(QString("MPDPORT"), configuration[QString("MPDPORT")]);
+    settings.setValue(QString("MPRIS"), configuration[QString("MPRIS")]);
+    settings.setValue(QString("PLAYER"), configuration[QString("PLAYER")]);
+    settings.setValue(QString("PLAYERSYMBOLS"),
+                      configuration[QString("PLAYERSYMBOLS")]);
+    settings.endGroup();
+
+    settings.sync();
+
+    return (settings.status() == QSettings::NoError);
+}
+
+
+void AWConfigHelper::copyConfigs(const QString localDir) const
+{
+    qCDebug(LOG_AW) << "Local directory" << localDir;
+
+    QStringList dirs = QStandardPaths::locateAll(
+        QStandardPaths::GenericDataLocation, QString("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(QString("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) const
+{
+    for (auto key : from.childKeys())
+        to.setValue(key, from.value(key));
+}
+
+
+void AWConfigHelper::readFile(QSettings &settings, const QString key,
+                              const QString fileName) const
+{
+    qCDebug(LOG_AW) << "Key" << key << "from file" << fileName;
+
+    QFile file(fileName);
+    if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        QString text = QString::fromUtf8(file.readAll());
+        file.close();
+        settings.setValue(key, text);
+    } else {
+        qCWarning(LOG_AW) << "Could not open" << file.fileName();
+    }
+}
+
+
+void AWConfigHelper::writeFile(QSettings &settings, const QString key,
+                               const QString fileName) const
+{
+    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" << file.fileName();
+    }
+}

sources/awesome-widget/plugin/awconfighelper.h

@@ -0,0 +1,70 @@
+/***************************************************************************
+ *   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 <QStandardPaths>
+#include <QVariant>
+
+
+class QSettings;
+
+class AWConfigHelper : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit AWConfigHelper(QObject *parent = nullptr);
+    virtual ~AWConfigHelper();
+    Q_INVOKABLE QString configurationDirectory() const;
+    Q_INVOKABLE bool dropCache() const;
+    Q_INVOKABLE bool exportConfiguration(const QObject *nativeConfig,
+                                         const QString fileName) const;
+    Q_INVOKABLE QVariantMap importConfiguration(const QString fileName,
+                                                const bool importPlasmoid,
+                                                const bool importExtensions,
+                                                const bool importAdds) const;
+    // dataengine
+    Q_INVOKABLE QVariantMap readDataEngineConfiguration() const;
+    Q_INVOKABLE bool
+    writeDataEngineConfiguration(const QVariantMap configuration) const;
+
+private:
+    // methods
+    void copyConfigs(const QString localDir) const;
+    void copyExtensions(const QString item, const QString type,
+                        QSettings &settings, const bool inverse) const;
+    void copySettings(QSettings &from, QSettings &to) const;
+    void readFile(QSettings &settings, const QString key,
+                  const QString fileName) const;
+    void writeFile(QSettings &settings, const QString key,
+                   const QString fileName) const;
+    // properties
+    QString m_baseDir = QString("%1/awesomewidgets")
+                            .arg(QStandardPaths::writableLocation(
+                                QStandardPaths::GenericDataLocation));
+    QStringList m_dirs = QStringList()
+                         << QString("desktops") << QString("quotes")
+                         << QString("scripts") << QString("upgrade")
+                         << QString("weather");
+};
+
+
+#endif /* AWCONFIGHELPER_H */

sources/awesome-widget/plugin/awdataaggregator.cpp

@@ -0,0 +1,322 @@
+/***************************************************************************
+ *   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 <QPixmap>
+#include <QtConcurrent/QtConcurrent>
+
+#include <cmath>
+
+#include "awactions.h"
+#include "awdebug.h"
+
+
+AWDataAggregator::AWDataAggregator(QObject *parent)
+    : QObject(parent)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    boundaries[QString("cpuTooltip")] = 100.0;
+    boundaries[QString("cpuclTooltip")] = 4000.0;
+    boundaries[QString("memTooltip")] = 100.0;
+    boundaries[QString("swapTooltip")] = 100.0;
+    boundaries[QString("downkbTooltip")] = 1.0;
+    boundaries[QString("upkbTooltip")] = 1.0;
+    boundaries[QString("batTooltip")] = 100.0;
+
+    initScene();
+    connect(this, SIGNAL(updateData(const QVariantHash &)), this,
+            SLOT(dataUpdate(const QVariantHash &)));
+}
+
+
+AWDataAggregator::~AWDataAggregator()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    delete toolTipScene;
+}
+
+
+QList<float> AWDataAggregator::getData(const QString key) const
+{
+    qCDebug(LOG_AW) << "Key" << key;
+
+    return data[QString("%1Tooltip").arg(key)];
+}
+
+
+QString AWDataAggregator::htmlImage(const QPixmap &source) const
+{
+    QByteArray byteArray;
+    QBuffer buffer(&byteArray);
+    source.save(&buffer, "PNG");
+
+    return byteArray.isEmpty()
+               ? QString()
+               : QString("<img src=\"data:image/png;base64,%1\"/>")
+                     .arg(QString(byteArray.toBase64()));
+}
+
+
+void AWDataAggregator::setParameters(QVariantMap settings)
+{
+    qCDebug(LOG_AW) << "Settings" << settings;
+
+    // cast from QVariantMap to QVariantHash without data lost
+    configuration = qvariant_cast<QVariantHash>(settings);
+
+    m_enablePopup = configuration[QString("notify")].toBool();
+
+    counts = 0;
+    counts += configuration[QString("cpuTooltip")].toInt();
+    counts += configuration[QString("cpuclTooltip")].toInt();
+    counts += configuration[QString("memTooltip")].toInt();
+    counts += configuration[QString("swapTooltip")].toInt();
+    counts += configuration[QString("downkbTooltip")].toInt();
+    counts += configuration[QString("batTooltip")].toInt();
+    // resize tooltip image
+    toolTipView->resize(100 * counts, 105);
+
+    requiredKeys.clear();
+    if (configuration[QString("cpuTooltip")].toBool())
+        requiredKeys.append(QString("cpuTooltip"));
+    if (configuration[QString("cpuclTooltip")].toBool())
+        requiredKeys.append(QString("cpuclTooltip"));
+    if (configuration[QString("memTooltip")].toBool())
+        requiredKeys.append(QString("memTooltip"));
+    if (configuration[QString("swapTooltip")].toBool())
+        requiredKeys.append(QString("swapTooltip"));
+    if (configuration[QString("downkbTooltip")].toBool())
+        requiredKeys.append(QString("downkbTooltip"));
+    if (configuration[QString("upkbTooltip")].toBool())
+        requiredKeys.append(QString("upkbTooltip"));
+    if (configuration[QString("batTooltip")].toBool())
+        requiredKeys.append(QString("batTooltip"));
+
+    // background
+    toolTipScene->setBackgroundBrush(
+        configuration[QString("useTooltipBackground")].toBool()
+            ? QBrush(QColor(
+                  configuration[QString("tooltipBackground")].toString()))
+            : QBrush(Qt::NoBrush));
+}
+
+
+QPixmap AWDataAggregator::tooltipImage()
+{
+    // create image
+    toolTipScene->clear();
+    QPen pen;
+    bool down = false;
+    for (auto key : requiredKeys) {
+        // create frame
+        float normX = 100.0f / static_cast<float>(data[key].count());
+        float normY = 100.0f / (1.5f * boundaries[key]);
+        float shift = requiredKeys.indexOf(key) * 100.0f;
+        if (down)
+            shift -= 100.0;
+        // apply pen color
+        if (key != QString("batTooltip"))
+            pen.setColor(
+                QColor(configuration[QString("%1Color").arg(key)].toString()));
+        // paint data inside frame
+        for (int j = 0; j < data[key].count() - 1; j++) {
+            // some magic here
+            float x1 = j * normX + shift;
+            float y1 = -fabs(data[key].at(j)) * normY + 5.0f;
+            float x2 = (j + 1) * normX + shift;
+            float y2 = -fabs(data[key].at(j + 1)) * normY + 5.0f;
+            if (key == QString("batTooltip")) {
+                if (data[key].at(j + 1) > 0)
+                    pen.setColor(QColor(
+                        configuration[QString("batTooltipColor")].toString()));
+                else
+                    pen.setColor(
+                        QColor(configuration[QString("batInTooltipColor")]
+                                   .toString()));
+            }
+            toolTipScene->addLine(x1, y1, x2, y2, pen);
+        }
+        if (key == QString("downkbTooltip"))
+            down = true;
+    }
+
+    return 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)
+            && (data[source].last() < extremum))
+            return AWActions::sendNotification(QString("event"),
+                                               notificationText(source, value));
+    } else {
+        if ((m_enablePopup) && (value < extremum)
+            && (data[source].last() > extremum))
+            return AWActions::sendNotification(QString("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(QString("event"),
+                                           notificationText(source, received));
+}
+
+
+void AWDataAggregator::initScene()
+{
+    toolTipScene = new QGraphicsScene(nullptr);
+    toolTipView = new QGraphicsView(toolTipScene);
+    toolTipView->setStyleSheet(QString("background: transparent"));
+    toolTipView->setContentsMargins(0, 0, 0, 0);
+    toolTipView->setFrameShape(QFrame::NoFrame);
+    toolTipView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    toolTipView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+}
+
+
+QString AWDataAggregator::notificationText(const QString source,
+                                           const float value) const
+{
+    qCDebug(LOG_AW) << "Notification source" << source << "with value" << value;
+
+    QString output;
+    if (source == QString("batTooltip"))
+        output = value > 0.0 ? i18n("AC online") : i18n("AC offline");
+    else if (source == QString("cpuTooltip"))
+        output = i18n("High CPU load");
+    else if (source == QString("memTooltip"))
+        output = i18n("High memory usage");
+    else if (source == QString("swapTooltip"))
+        output = i18n("Swap is used");
+    else if (source == QString("gpu"))
+        output = i18n("High GPU load");
+
+    return output;
+}
+
+
+QString AWDataAggregator::notificationText(const QString source,
+                                           const QString value) const
+{
+    qCDebug(LOG_AW) << "Notification source" << source << "with value" << value;
+
+    QString output;
+    if (source == QString("netdev"))
+        output = i18n("Network device has been changed to %1", value);
+
+    return output;
+}
+
+
+void AWDataAggregator::setData(const QVariantHash &values)
+{
+    // do not log these arguments
+    // battery update requires info is AC online or not
+    setData(values[QString("ac")].toString()
+                == configuration[QString("acOnline")],
+            QString("batTooltip"), values[QString("bat")].toFloat());
+    // usual case
+    setData(QString("cpuTooltip"), values[QString("cpu")].toFloat(), 90.0);
+    setData(QString("cpuclTooltip"), values[QString("cpucl")].toFloat());
+    setData(QString("memTooltip"), values[QString("mem")].toFloat(), 80.0);
+    setData(QString("swapTooltip"), values[QString("swap")].toFloat(), 0.0);
+    setData(QString("downkbTooltip"), values[QString("downkb")].toFloat());
+    setData(QString("upkbTooltip"), values[QString("upkb")].toFloat());
+    // additional check for network device
+    [this](const QString value) {
+        checkValue(QString("netdev"), currentNetworkDevice, value);
+        currentNetworkDevice = value;
+    }(values[QString("netdev")].toString());
+    // additional check for GPU load
+    [this](const float value) {
+        checkValue(QString("gpu"), value, 90.0);
+        currentGPULoad = value;
+    }(values[QString("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 (data[source].count() == 0)
+        data[source].append(0.0);
+    else if (data[source].count()
+             > configuration[QString("tooltipNumber")].toInt())
+        data[source].removeFirst();
+    if (std::isnan(value))
+        value = 0.0;
+
+    // notifications
+    checkValue(source, value, extremum);
+
+    data[source].append(value);
+    if (source == QString("downkbTooltip")) {
+        QList<float> netValues
+            = data[QString("downkbTooltip")] + data[QString("upkbTooltip")];
+        // to avoid inf value of normY
+        netValues << 1.0;
+        boundaries[QString("downkbTooltip")]
+            = 1.2f * *std::max_element(netValues.cbegin(), netValues.cend());
+        boundaries[QString("upkbTooltip")]
+            = boundaries[QString("downkbTooltip")];
+    }
+}
+
+
+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,79 @@
+/***************************************************************************
+ *   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);
+    virtual ~AWDataAggregator();
+    QList<float> getData(const QString key) const;
+    QString htmlImage(const QPixmap &source) const;
+    void setParameters(QVariantMap settings);
+    QPixmap tooltipImage();
+
+signals:
+    void updateData(const QVariantHash &values);
+    void toolTipPainted(const QString image) const;
+
+private slots:
+    void dataUpdate(const QVariantHash &values);
+
+private:
+    // ui
+    QGraphicsScene *toolTipScene = nullptr;
+    QGraphicsView *toolTipView = nullptr;
+    void checkValue(const QString source, const float value,
+                    const float extremum) const;
+    void checkValue(const QString source, const QString current,
+                    const QString received) const;
+    void initScene();
+    QString notificationText(const QString source, const float value) const;
+    QString notificationText(const QString source, const QString value) const;
+    // main method
+    void setData(const QVariantHash &values);
+    void setData(const QString &source, float value,
+                 const float extremum = -1.0f);
+    // different signature for battery device
+    void setData(const bool dontInvert, const QString &source, float value);
+    // variables
+    int counts = 0;
+    QVariantHash configuration;
+    float currentGPULoad = 0.0;
+    QString currentNetworkDevice = QString("lo");
+    QHash<QString, float> boundaries;
+    QHash<QString, QList<float>> data;
+    bool m_enablePopup = false;
+    QStringList requiredKeys;
+};
+
+
+#endif /* AWTOOLTIP_H */

sources/awesome-widget/plugin/awdataengineaggregator.cpp

@@ -0,0 +1,101 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awdataengineaggregator.h"
+
+#include "awdebug.h"
+#include "awkeys.h"
+
+
+AWDataEngineAggregator::AWDataEngineAggregator(QObject *parent)
+    : QObject(parent)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+AWDataEngineAggregator::~AWDataEngineAggregator()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    clear();
+}
+
+
+void AWDataEngineAggregator::clear()
+{
+    // disconnect sources first
+    disconnectSources();
+    m_dataEngines.clear();
+    delete m_consumer;
+}
+
+
+void AWDataEngineAggregator::disconnectSources()
+{
+    for (auto dataengine : m_dataEngines.values())
+        for (auto source : dataengine->sources())
+            dataengine->disconnectSource(source, parent());
+}
+
+
+void AWDataEngineAggregator::initDataEngines(const int interval)
+{
+    qCDebug(LOG_AW) << "Init dataengines with interval" << interval;
+
+    m_consumer = new Plasma::DataEngineConsumer();
+    m_dataEngines[QString("systemmonitor")]
+        = m_consumer->dataEngine(QString("systemmonitor"));
+    m_dataEngines[QString("extsysmon")]
+        = m_consumer->dataEngine(QString("extsysmon"));
+    m_dataEngines[QString("time")] = m_consumer->dataEngine(QString("time"));
+
+    // additional method required by systemmonitor structure
+    connect(m_dataEngines[QString("systemmonitor")],
+            &Plasma::DataEngine::sourceAdded,
+            [this, interval](const QString source) {
+                emit(deviceAdded(source));
+                m_dataEngines[QString("systemmonitor")]->connectSource(
+                    source, parent(), interval);
+            });
+
+    return reconnectSources(interval);
+}
+
+
+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 systemmonitor and extsysmon
+    m_dataEngines[QString("systemmonitor")]->disconnectSource(source, parent());
+    m_dataEngines[QString("extsysmon")]->disconnectSource(source, parent());
+    m_dataEngines[QString("time")]->disconnectSource(source, parent());
+}
+
+
+void AWDataEngineAggregator::reconnectSources(const int interval)
+{
+    qCDebug(LOG_AW) << "Reconnect sources with interval" << interval;
+
+    m_dataEngines[QString("systemmonitor")]->connectAllSources(parent(),
+                                                               interval);
+    m_dataEngines[QString("extsysmon")]->connectAllSources(parent(), interval);
+    m_dataEngines[QString("time")]->connectSource(QString("Local"), parent(),
+                                                  1000);
+}

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);
+    virtual ~AWDataEngineAggregator();
+    void clear();
+    void disconnectSources();
+    void initDataEngines(const int interval);
+
+signals:
+    void deviceAdded(const QString &source);
+
+public slots:
+    void dropSource(const QString source);
+    void reconnectSources(const int interval);
+
+private:
+    Plasma::DataEngineConsumer *m_consumer = nullptr;
+    QHash<QString, Plasma::DataEngine *> m_dataEngines;
+};
+
+
+#endif /* AWDATAENGINEAGGREGATOR_H */

sources/awesome-widget/plugin/awesomewidget.cpp

@@ -20,31 +20,18 @@
 #include <QtQml>
 
 #include "awactions.h"
+#include "awconfighelper.h"
+#include "awformatterconfigfactory.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();
-}
-
-
 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<AWConfigHelper>(uri, 1, 0, "AWConfigHelper");
+    qmlRegisterType<AWFormatterConfigFactory>(uri, 1, 0,
+                                              "AWFormatterConfigFactory");
+    qmlRegisterType<AWKeys>(uri, 1, 0, "AWKeys");
 }

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

sources/awesome-widget/plugin/awformatterconfig.h

@@ -0,0 +1,64 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWFORMATTERCONFIG_H
+#define AWFORMATTERCONFIG_H
+
+#include <QDialog>
+
+
+class AWAbstractSelector;
+class AWFormatterHelper;
+namespace Ui
+{
+class AWFormatterConfig;
+}
+
+class AWFormatterConfig : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit AWFormatterConfig(QWidget *parent = nullptr,
+                               const QStringList keys = QStringList());
+    virtual ~AWFormatterConfig();
+    Q_INVOKABLE void showDialog();
+
+private slots:
+    void editFormatters();
+    void updateUi();
+
+private:
+    QPushButton *editButton = nullptr;
+    Ui::AWFormatterConfig *ui = nullptr;
+    AWFormatterHelper *m_helper = nullptr;
+    QList<AWAbstractSelector *> m_selectors;
+    // properties
+    QStringList m_keys;
+    // methods
+    void addSelector(const QStringList &keys, const QStringList &values,
+                     const QPair<QString, QString> &current);
+    void clearSelectors();
+    void execDialog();
+    void init();
+    QPair<QStringList, QStringList> initKeys() const;
+    void updateDialog();
+};
+
+
+#endif /* AWFORMATTERCONFIG_H */

sources/awesome-widget/plugin/awformatterconfig.ui

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AWFormatterConfig</class>
+ <widget class="QDialog" name="AWFormatterConfig">
+  <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>AWFormatterConfig</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>AWFormatterConfig</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/awformatterconfigfactory.cpp

@@ -0,0 +1,42 @@
+/***************************************************************************
+ *   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 "awformatterconfigfactory.h"
+
+#include "awdebug.h"
+#include "awformatterconfig.h"
+
+
+AWFormatterConfigFactory::AWFormatterConfigFactory(QObject *parent)
+    : QObject(parent)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+AWFormatterConfigFactory::~AWFormatterConfigFactory()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+}
+
+
+void AWFormatterConfigFactory::showDialog(const QStringList keys)
+{
+    AWFormatterConfig *config = new AWFormatterConfig(nullptr, keys);
+    config->showDialog();
+    config->deleteLater();
+}

sources/awesome-widget/plugin/awformatterconfigfactory.h

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

sources/awesome-widget/plugin/awformatterhelper.cpp

@@ -0,0 +1,331 @@
+/***************************************************************************
+ *   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 "awlistformatter.h"
+#include "awnoformatter.h"
+#include "awscriptformatter.h"
+#include "awstringformatter.h"
+
+
+AWFormatterHelper::AWFormatterHelper(QWidget *parent)
+    : AbstractExtItemAggregator(parent, QString("formatters"))
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    initItems();
+}
+
+
+AWFormatterHelper::~AWFormatterHelper()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    m_formatters.clear();
+    m_formattersClasses.clear();
+}
+
+
+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();
+}
+
+
+QHash<QString, QString> AWFormatterHelper::getFormatters() const
+{
+    QHash<QString, QString> map;
+    for (auto tag : m_formatters.keys())
+        map[tag] = m_formatters[tag]->name();
+
+    return map;
+}
+
+
+QList<AbstractExtItem *> AWFormatterHelper::items() const
+{
+    QList<AbstractExtItem *> converted;
+    for (auto item : m_formattersClasses.values())
+        converted.append(item);
+
+    return converted;
+}
+
+
+QStringList AWFormatterHelper::knownFormatters() const
+{
+    return m_formattersClasses.keys();
+}
+
+
+bool AWFormatterHelper::writeFormatters(const QStringList keys) const
+{
+    qCDebug(LOG_AW) << "Remove formatters" << keys;
+
+    QString fileName = QString("%1/awesomewidgets/formatters/formatters.ini")
+                           .arg(QStandardPaths::writableLocation(
+                               QStandardPaths::GenericDataLocation));
+    QSettings settings(fileName, QSettings::IniFormat);
+    qCInfo(LOG_AW) << "Configuration file" << fileName;
+
+    settings.beginGroup(QString("Formatters"));
+    QStringList foundKeys = settings.childKeys();
+    for (auto key : foundKeys) {
+        if (keys.contains(key))
+            continue;
+        settings.remove(key);
+    }
+    settings.endGroup();
+
+    settings.sync();
+
+    return (settings.status() == QSettings::NoError);
+}
+
+
+bool AWFormatterHelper::writeFormatters(
+    const QHash<QString, QString> configuration) const
+{
+    qCDebug(LOG_AW) << "Write configuration" << configuration;
+
+    QString fileName = QString("%1/awesomewidgets/formatters/formatters.ini")
+                           .arg(QStandardPaths::writableLocation(
+                               QStandardPaths::GenericDataLocation));
+    QSettings settings(fileName, QSettings::IniFormat);
+    qCInfo(LOG_AW) << "Configuration file" << fileName;
+
+    settings.beginGroup(QString("Formatters"));
+    for (auto key : configuration.keys())
+        settings.setValue(key, configuration[key]);
+    settings.endGroup();
+
+    settings.sync();
+
+    return (settings.status() == QSettings::NoError);
+}
+
+
+void AWFormatterHelper::editItems()
+{
+    repaintList();
+    int ret = exec();
+    qCInfo(LOG_AW) << "Dialog returns" << ret;
+}
+
+
+AWAbstractFormatter::FormatterClass
+AWFormatterHelper::defineFormatterClass(const QString stringType) const
+{
+    qCDebug(LOG_AW) << "Define formatter class for" << stringType;
+
+    AWAbstractFormatter::FormatterClass formatter
+        = AWAbstractFormatter::FormatterClass::NoFormat;
+    if (stringType == QString("DateTime"))
+        formatter = AWAbstractFormatter::FormatterClass::DateTime;
+    else if (stringType == QString("Float"))
+        formatter = AWAbstractFormatter::FormatterClass::Float;
+    else if (stringType == QString("List"))
+        formatter = AWAbstractFormatter::FormatterClass::List;
+    else if (stringType == QString("NoFormat"))
+        ;
+    else if (stringType == QString("Script"))
+        formatter = AWAbstractFormatter::FormatterClass::Script;
+    else if (stringType == QString("String"))
+        formatter = AWAbstractFormatter::FormatterClass::String;
+    else
+        qCWarning(LOG_AW) << "Unknown formatter" << stringType;
+
+    return formatter;
+}
+
+
+void AWFormatterHelper::initFormatters()
+{
+    m_formattersClasses.clear();
+
+    for (int i = m_directories.count() - 1; i >= 0; i--) {
+        QStringList files
+            = QDir(m_directories.at(i)).entryList(QDir::Files, QDir::Name);
+        for (auto file : files) {
+            if (!file.endsWith(QString(".desktop")))
+                continue;
+            qCInfo(LOG_AW) << "Found file" << file << "in"
+                           << m_directories.at(i);
+            QString filePath
+                = QString("%1/%2").arg(m_directories.at(i)).arg(file);
+            auto metadata = readMetadata(filePath);
+            QString name = metadata.first;
+            if (m_formattersClasses.contains(name))
+                continue;
+
+
+            switch (metadata.second) {
+            case AWAbstractFormatter::FormatterClass::DateTime:
+                m_formattersClasses[name]
+                    = new AWDateTimeFormatter(this, filePath);
+                break;
+            case AWAbstractFormatter::FormatterClass::Float:
+                m_formattersClasses[name]
+                    = new AWFloatFormatter(this, filePath);
+                break;
+            case AWAbstractFormatter::FormatterClass::List:
+                m_formattersClasses[name] = new AWListFormatter(this, filePath);
+                break;
+            case AWAbstractFormatter::FormatterClass::Script:
+                m_formattersClasses[name]
+                    = new AWScriptFormatter(this, filePath);
+                break;
+            case AWAbstractFormatter::FormatterClass::String:
+                m_formattersClasses[name]
+                    = new AWStringFormatter(this, filePath);
+                break;
+            case AWAbstractFormatter::FormatterClass::NoFormat:
+                m_formattersClasses[name] = new AWNoFormatter(this, filePath);
+                break;
+            }
+        }
+    }
+}
+
+
+void AWFormatterHelper::initKeys()
+{
+    m_formatters.clear();
+
+    QStringList configs = QStandardPaths::locateAll(
+        QStandardPaths::GenericDataLocation,
+        QString("awesomewidgets/formatters/formatters.ini"));
+
+    for (auto fileName : configs) {
+        QSettings settings(fileName, QSettings::IniFormat);
+        qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
+
+        settings.beginGroup(QString("Formatters"));
+        QStringList keys = settings.childKeys();
+        for (auto key : keys) {
+            QString name = settings.value(key).toString();
+            qCInfo(LOG_AW) << "Found formatter" << name << "for key" << key
+                           << "in" << settings.fileName();
+            if (name.isEmpty()) {
+                qCInfo(LOG_AW) << "Skip empty formatter for" << key;
+                continue;
+            }
+            if (!m_formattersClasses.contains(name)) {
+                qCWarning(LOG_AW) << "Invalid formatter" << name << "found in"
+                                  << key;
+                continue;
+            }
+            m_formatters[key] = m_formattersClasses[name];
+        }
+        settings.endGroup();
+    }
+}
+
+
+void AWFormatterHelper::installDirectories()
+{
+    // create directory at $HOME
+    QString localDir = QString("%1/awesomewidgets/formatters")
+                           .arg(QStandardPaths::writableLocation(
+                               QStandardPaths::GenericDataLocation));
+    QDir localDirectory;
+    if (localDirectory.mkpath(localDir))
+        qCInfo(LOG_AW) << "Created directory" << localDir;
+
+    m_directories = QStandardPaths::locateAll(
+        QStandardPaths::GenericDataLocation,
+        QString("awesomewidgets/formatters"), QStandardPaths::LocateDirectory);
+}
+
+
+QPair<QString, AWAbstractFormatter::FormatterClass>
+AWFormatterHelper::readMetadata(const QString filePath) const
+{
+    qCDebug(LOG_AW) << "Read initial parameters from" << filePath;
+
+    QSettings settings(filePath, QSettings::IniFormat);
+    settings.beginGroup(QString("Desktop Entry"));
+    QString name = settings.value(QString("Name"), filePath).toString();
+    QString type
+        = settings.value(QString("X-AW-Type"), QString("NoFormat")).toString();
+    AWAbstractFormatter::FormatterClass formatter = defineFormatterClass(type);
+    settings.endGroup();
+
+    return QPair<QString, AWAbstractFormatter::FormatterClass>(name, formatter);
+}
+
+
+void AWFormatterHelper::doCreateItem()
+{
+    QStringList selection = QStringList()
+                            << QString("NoFormat") << QString("DateTime")
+                            << QString("Float") << QString("List")
+                            << QString("Script") << QString("String");
+    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::NoFormat:
+        return createItem<AWNoFormatter>();
+    }
+}
+
+
+void AWFormatterHelper::initItems()
+{
+    installDirectories();
+    initFormatters();
+    initKeys();
+}

sources/awesome-widget/plugin/awformatterhelper.h

@@ -0,0 +1,66 @@
+/***************************************************************************
+ *   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"
+
+
+class AWAbstractFormatter;
+
+class AWFormatterHelper : public AbstractExtItemAggregator
+{
+    Q_OBJECT
+
+public:
+    explicit AWFormatterHelper(QWidget *parent = nullptr);
+    virtual ~AWFormatterHelper();
+    QString convert(const QVariant &value, const QString &name) const;
+    QStringList definedFormatters() const;
+    QHash<QString, QString> getFormatters() const;
+    QList<AbstractExtItem *> items() const;
+    QStringList knownFormatters() const;
+    bool writeFormatters(const QStringList keys) const;
+    bool writeFormatters(const QHash<QString, QString> configuration) const;
+
+public slots:
+    void editItems();
+
+private:
+    // methods
+    AWAbstractFormatter::FormatterClass
+    defineFormatterClass(const QString stringType) const;
+    void initFormatters();
+    void initKeys();
+    void installDirectories();
+    QPair<QString, AWAbstractFormatter::FormatterClass>
+    readMetadata(const QString filePath) const;
+    // parent methods
+    void doCreateItem();
+    void initItems();
+    // properties
+    QStringList m_directories;
+    QHash<QString, AWAbstractFormatter *> m_formatters;
+    QHash<QString, AWAbstractFormatter *> m_formattersClasses;
+};
+
+
+#endif /* AWFORMATTERHELPER_H */

sources/awesome-widget/plugin/awkeycache.cpp

@@ -0,0 +1,188 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awkeycache.h"
+
+#include <QDir>
+#include <QNetworkInterface>
+#include <QRegExp>
+#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 == QString("hdd")) {
+        QStringList allDevices
+            = QDir(QString("/dev")).entryList(QDir::System, QDir::Name);
+        QStringList devices
+            = allDevices.filter(QRegExp(QString("^[hms]d[a-z]$")));
+        for (auto dev : devices) {
+            QString device = QString("/dev/%1").arg(dev);
+            if (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 == QString("net")) {
+        QList<QNetworkInterface> rawInterfaceList
+            = QNetworkInterface::allInterfaces();
+        for (auto interface : rawInterfaceList) {
+            QString device = interface.name();
+            if (cachedValues.contains(device))
+                continue;
+            qCInfo(LOG_AW) << "Found new key" << device << "for type" << type;
+            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 &allKeys)
+{
+    qCDebug(LOG_AW) << "Looking for required keys in" << keys << bars
+                    << "using tooltip settings" << tooltip;
+
+    // initial copy
+    QSet<QString> used = QSet<QString>::fromList(keys);
+    used.unite(QSet<QString>::fromList(bars));
+    // insert keys from tooltip
+    for (auto key : tooltip.keys()) {
+        if ((key.endsWith(QString("Tooltip"))) && (tooltip[key].toBool())) {
+            key.remove(QString("Tooltip"));
+            used << key;
+        }
+    }
+
+    // insert depending keys, refer to AWKeys::calculateValues()
+    // hddtotmb*
+    for (auto key : allKeys.filter(QRegExp(QString("^hddtotmb")))) {
+        if (!used.contains(key))
+            continue;
+        key.remove(QString("hddtotmb"));
+        int index = key.toInt();
+        used << QString("hddfreemb%1").arg(index)
+             << QString("hddmb%1").arg(index);
+    }
+    // hddtotgb*
+    for (auto key : allKeys.filter(QRegExp(QString("^hddtotgb")))) {
+        if (!used.contains(key))
+            continue;
+        key.remove(QString("hddtotgb"));
+        int index = key.toInt();
+        used << QString("hddfreegb%1").arg(index)
+             << QString("hddgb%1").arg(index);
+    }
+    // mem
+    if (used.contains(QString("mem")))
+        used << QString("memmb") << QString("memtotmb");
+    // memtotmb
+    if (used.contains(QString("memtotmb")))
+        used << QString("memusedmb") << QString("memfreemb");
+    // memtotgb
+    if (used.contains(QString("memtotgb")))
+        used << QString("memusedgb") << QString("memfreegb");
+    // swap
+    if (used.contains(QString("swap")))
+        used << QString("swapmb") << QString("swaptotmb");
+    // swaptotmb
+    if (used.contains(QString("swaptotmb")))
+        used << QString("swapmb") << QString("swapfreemb");
+    // memtotgb
+    if (used.contains(QString("swaptotgb")))
+        used << QString("swapgb") << QString("swapfreegb");
+    // network keys
+    QStringList netKeys(QStringList()
+                        << QString("up") << QString("upkb")
+                        << QString("uptotal") << QString("uptotalkb")
+                        << QString("upunits") << QString("down")
+                        << QString("downkb") << QString("downtotal")
+                        << QString("downtotalkb") << QString("downunits"));
+    for (auto key : netKeys) {
+        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 << QString("netdev");
+
+    // HACK append dummy if there are no other keys. This hack is required
+    // because empty list leads to the same behaviour as skip checking
+    if (used.isEmpty())
+        used << QString("dummy");
+
+    return used.toList();
+}
+
+
+QHash<QString, QStringList> AWKeyCache::loadKeysFromCache()
+{
+    QString fileName = QString("%1/awesomewidgets.ndx")
+                           .arg(QStandardPaths::writableLocation(
+                               QStandardPaths::GenericCacheLocation));
+    qCInfo(LOG_AW) << "Cache file" << fileName;
+    QSettings cache(fileName, QSettings::IniFormat);
+
+    QHash<QString, QStringList> devices;
+    for (auto group : cache.childGroups()) {
+        cache.beginGroup(group);
+        for (auto key : cache.allKeys())
+            devices[group].append(cache.value(key).toString());
+        cache.endGroup();
+    }
+
+    return devices;
+}

sources/awesome-widget/plugin/awkeycache.h

@@ -0,0 +1,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/  *
+ ***************************************************************************/
+
+
+#ifndef AWKEYCACHE_H
+#define AWKEYCACHE_H
+
+#include <QHash>
+#include <QString>
+#include <QVariant>
+
+
+namespace AWKeyCache
+{
+bool addKeyToCache(const QString type, const QString key = QString(""));
+QStringList getRequiredKeys(const QStringList &keys, const QStringList &bars,
+                            const QVariantMap &tooltip,
+                            const QStringList &allKeys);
+QHash<QString, QStringList> loadKeysFromCache();
+};
+
+
+#endif /* AWKEYCACHE_H */

sources/awesome-widget/plugin/awkeyoperations.cpp

@@ -0,0 +1,350 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awkeyoperations.h"
+
+#include <QDir>
+#include <QJSEngine>
+#include <QRegExp>
+#include <QThread>
+
+#include "awdebug.h"
+#include "awkeycache.h"
+#include "awpatternfunctions.h"
+// extensions
+#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__;
+}
+
+
+AWKeyOperations::~AWKeyOperations()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    // extensions
+    delete graphicalItems;
+    delete extQuotes;
+    delete extScripts;
+    delete extUpgrade;
+    delete extWeather;
+}
+
+
+QStringList AWKeyOperations::devices(const QString type) const
+{
+    qCDebug(LOG_AW) << "Looking for type" << type;
+
+    return m_devices[type];
+}
+
+
+QHash<QString, QStringList> AWKeyOperations::devices() const
+{
+    return m_devices;
+}
+
+
+void AWKeyOperations::updateCache()
+{
+    // update network and hdd list
+    addKeyToCache(QString("hdd"));
+    addKeyToCache(QString("net"));
+}
+
+
+QStringList AWKeyOperations::dictKeys() const
+{
+    QStringList allKeys;
+    // weather
+    for (int i = extWeather->activeItems().count() - 1; i >= 0; i--) {
+        allKeys.append(
+            extWeather->activeItems().at(i)->tag(QString("weatherId")));
+        allKeys.append(
+            extWeather->activeItems().at(i)->tag(QString("weather")));
+        allKeys.append(
+            extWeather->activeItems().at(i)->tag(QString("humidity")));
+        allKeys.append(
+            extWeather->activeItems().at(i)->tag(QString("pressure")));
+        allKeys.append(
+            extWeather->activeItems().at(i)->tag(QString("temperature")));
+        allKeys.append(
+            extWeather->activeItems().at(i)->tag(QString("timestamp")));
+    }
+    // cpuclock & cpu
+    for (int i = QThread::idealThreadCount() - 1; i >= 0; i--) {
+        allKeys.append(QString("cpucl%1").arg(i));
+        allKeys.append(QString("cpu%1").arg(i));
+    }
+    // temperature
+    for (int i = m_devices[QString("temp")].count() - 1; i >= 0; i--)
+        allKeys.append(QString("temp%1").arg(i));
+    // hdd
+    for (int i = m_devices[QString("mount")].count() - 1; i >= 0; 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 = m_devices[QString("disk")].count() - 1; i >= 0; i--) {
+        allKeys.append(QString("hddr%1").arg(i));
+        allKeys.append(QString("hddw%1").arg(i));
+    }
+    // hdd temp
+    for (int i = m_devices[QString("hdd")].count() - 1; i >= 0; i--)
+        allKeys.append(QString("hddtemp%1").arg(i));
+    // network
+    for (int i = m_devices[QString("net")].count() - 1; i >= 0; i--) {
+        allKeys.append(QString("downunits%1").arg(i));
+        allKeys.append(QString("upunits%1").arg(i));
+        allKeys.append(QString("downtotalkb%1").arg(i));
+        allKeys.append(QString("downtotal%1").arg(i));
+        allKeys.append(QString("downkb%1").arg(i));
+        allKeys.append(QString("down%1").arg(i));
+        allKeys.append(QString("uptotalkb%1").arg(i));
+        allKeys.append(QString("uptotal%1").arg(i));
+        allKeys.append(QString("upkb%1").arg(i));
+        allKeys.append(QString("up%1").arg(i));
+    }
+    // battery
+    QStringList allBatteryDevices
+        = QDir(QString("/sys/class/power_supply"))
+              .entryList(QStringList() << QString("BAT*"),
+                         QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
+    for (int i = allBatteryDevices.count() - 1; i >= 0; i--)
+        allKeys.append(QString("bat%1").arg(i));
+    // package manager
+    for (int i = extUpgrade->activeItems().count() - 1; i >= 0; i--)
+        allKeys.append(
+            extUpgrade->activeItems().at(i)->tag(QString("pkgcount")));
+    // quotes
+    for (int i = extQuotes->activeItems().count() - 1; i >= 0; i--) {
+        allKeys.append(extQuotes->activeItems().at(i)->tag(QString("ask")));
+        allKeys.append(extQuotes->activeItems().at(i)->tag(QString("askchg")));
+        allKeys.append(
+            extQuotes->activeItems().at(i)->tag(QString("percaskchg")));
+        allKeys.append(extQuotes->activeItems().at(i)->tag(QString("bid")));
+        allKeys.append(extQuotes->activeItems().at(i)->tag(QString("bidchg")));
+        allKeys.append(
+            extQuotes->activeItems().at(i)->tag(QString("percbidchg")));
+        allKeys.append(extQuotes->activeItems().at(i)->tag(QString("price")));
+        allKeys.append(
+            extQuotes->activeItems().at(i)->tag(QString("pricechg")));
+        allKeys.append(
+            extQuotes->activeItems().at(i)->tag(QString("percpricechg")));
+    }
+    // custom
+    for (int i = extScripts->activeItems().count() - 1; i >= 0; i--)
+        allKeys.append(extScripts->activeItems().at(i)->tag(QString("custom")));
+    // bars
+    for (int i = graphicalItems->activeItems().count() - 1; i >= 0; i--)
+        allKeys.append(
+            graphicalItems->activeItems().at(i)->tag(QString("bar")));
+    // static keys
+    QStringList staticKeys = QString(STATIC_KEYS).split(QChar(','));
+    std::for_each(staticKeys.cbegin(), staticKeys.cend(),
+                  [&allKeys](const QString &key) { allKeys.append(key); });
+
+    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 graphicalItems->itemByTag(key, QString("bar"));
+}
+
+
+QString AWKeyOperations::infoByKey(QString key) const
+{
+    qCDebug(LOG_AW) << "Requested key" << key;
+
+    QString stripped = key;
+    stripped.remove(QRegExp(QString("\\d+")));
+    QString output;
+
+    if (key.startsWith(QString("bar"))) {
+        AbstractExtItem *item = graphicalItems->itemByTag(key, stripped);
+        if (item)
+            output = item->uniq();
+    } else if (key.startsWith(QString("custom"))) {
+        AbstractExtItem *item = extScripts->itemByTag(key, stripped);
+        if (item)
+            output = item->uniq();
+    } else if (key.contains(QRegExp(QString("^hdd[rw]")))) {
+        output = m_devices[QString("disk")]
+                          [key.remove(QRegExp(QString("hdd[rw]"))).toInt()];
+    } else if (key.contains(QRegExp(
+                   QString("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)")))) {
+        output
+            = m_devices[QString("mount")]
+                       [key
+                            .remove(QRegExp(QString(
+                                "^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)")))
+                            .toInt()];
+    } else if (key.startsWith(QString("hddtemp"))) {
+        output
+            = m_devices[QString("hdd")][key.remove(QString("hddtemp")).toInt()];
+    } else if (key.contains(QRegExp(QString("^(down|up)[0-9]")))) {
+        output = m_devices[QString("net")]
+                          [key.remove(QRegExp(QString("^(down|up)"))).toInt()];
+    } else if (key.startsWith(QString("pkgcount"))) {
+        AbstractExtItem *item = extUpgrade->itemByTag(key, stripped);
+        if (item)
+            output = item->uniq();
+    } else if (key.contains(
+                   QRegExp(QString("(^|perc)(ask|bid|price)(chg|)")))) {
+        AbstractExtItem *item = extQuotes->itemByTag(key, stripped);
+        if (item)
+            output = item->uniq();
+    } else if (key.contains(QRegExp(QString(
+                   "(weather|weatherId|humidity|pressure|temperature)")))) {
+        AbstractExtItem *item = extWeather->itemByTag(key, stripped);
+        if (item)
+            output = item->uniq();
+    } else if (key.startsWith(QString("temp"))) {
+        output
+            = m_devices[QString("temp")][key.remove(QString("temp")).toInt()];
+    } else {
+        output = QString("(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 == QString("graphicalitem")) {
+        QStringList keys = dictKeys().filter(QRegExp(
+            QString("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)")));
+        keys.sort();
+        graphicalItems->setConfigArgs(keys);
+        return graphicalItems->editItems();
+    } else if (type == QString("extquotes")) {
+        return extQuotes->editItems();
+    } else if (type == QString("extscript")) {
+        return extScripts->editItems();
+    } else if (type == QString("extupgrade")) {
+        return extUpgrade->editItems();
+    } else if (type == QString("extweather")) {
+        return extWeather->editItems();
+    }
+}
+
+
+void AWKeyOperations::addDevice(const QString &source)
+{
+    qCDebug(LOG_AW) << "Source" << source;
+
+    QRegExp diskRegexp
+        = QRegExp(QString("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)"));
+    QRegExp mountRegexp = QRegExp(QString("partitions/.*/filllevel"));
+
+    if (source.contains(diskRegexp)) {
+        QString device = source;
+        device.remove(QString("/Rate/rblk"));
+        addKeyToCache(QString("disk"), device);
+    } else if (source.contains(mountRegexp)) {
+        QString device = source;
+        device.remove(QString("partitions")).remove(QString("/filllevel"));
+        addKeyToCache(QString("mount"), device);
+    } else if (source.startsWith(QString("lmsensors"))) {
+        addKeyToCache(QString("temp"), source);
+    }
+}
+
+
+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()
+{
+    // renew extensions
+    // delete them if any
+    delete graphicalItems;
+    graphicalItems = nullptr;
+    delete extQuotes;
+    extQuotes = nullptr;
+    delete extScripts;
+    extScripts = nullptr;
+    delete extUpgrade;
+    extUpgrade = nullptr;
+    delete extWeather;
+    extWeather = nullptr;
+    // create
+    graphicalItems
+        = new ExtItemAggregator<GraphicalItem>(nullptr, QString("desktops"));
+    extQuotes = new ExtItemAggregator<ExtQuotes>(nullptr, QString("quotes"));
+    extScripts = new ExtItemAggregator<ExtScript>(nullptr, QString("scripts"));
+    extUpgrade = new ExtItemAggregator<ExtUpgrade>(nullptr, QString("upgrade"));
+    extWeather = new ExtItemAggregator<ExtWeather>(nullptr, QString("weather"));
+
+    // 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 <Plasma/DataEngine>
+
+#include <QMutex>
+#include <QObject>
+
+#include "extitemaggregator.h"
+
+
+class AWDataAggregator;
+class AWDataEngineAggregator;
+class AWKeysAggregator;
+class ExtQuotes;
+class ExtScript;
+class ExtUpgrade;
+class ExtWeather;
+class GraphicalItem;
+class QThreadPool;
+
+class AWKeyOperations : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString pattern READ pattern WRITE setPattern)
+
+public:
+    explicit AWKeyOperations(QObject *parent = nullptr);
+    virtual ~AWKeyOperations();
+    QStringList devices(const QString type) const;
+    QHash<QString, QStringList> devices() const;
+    void updateCache();
+    // keys
+    QStringList dictKeys() const;
+    GraphicalItem *giByKey(const QString key) const;
+    // values
+    QString infoByKey(QString key) const;
+    QString pattern() const;
+    void setPattern(const QString currentPattern);
+    // configuration
+    void editItem(const QString type);
+
+signals:
+    void updateKeys(const QStringList currentKeys);
+
+public slots:
+    void addDevice(const QString &source);
+
+private:
+    // methods
+    void addKeyToCache(const QString type, const QString key = QString(""));
+    void reinitKeys();
+    // objects
+    ExtItemAggregator<GraphicalItem> *graphicalItems = nullptr;
+    ExtItemAggregator<ExtQuotes> *extQuotes = nullptr;
+    ExtItemAggregator<ExtScript> *extScripts = nullptr;
+    ExtItemAggregator<ExtUpgrade> *extUpgrade = nullptr;
+    ExtItemAggregator<ExtWeather> *extWeather = nullptr;
+    // variables
+    QHash<QString, QStringList> m_devices;
+    QString m_pattern;
+};
+
+
+#endif /* AWKEYOPERATIONS_H */

sources/awesome-widget/plugin/awkeys.h

@@ -19,107 +19,80 @@
 #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);
+    explicit AWKeys(QObject *parent = nullptr);
+    virtual ~AWKeys();
+    Q_INVOKABLE void initDataAggregator(const QVariantMap tooltipParams);
+    Q_INVOKABLE void initKeys(const QString currentPattern, const int interval,
+                              const int limit, const bool optimize);
+    Q_INVOKABLE void setAggregatorProperty(const QString key,
+                                           const QVariant value);
     Q_INVOKABLE void setWrapNewLines(const bool wrap = false);
-    Q_INVOKABLE bool isDebugEnabled();
-    Q_INVOKABLE QString parsePattern();
-    Q_INVOKABLE QString toolTipImage();
-    Q_INVOKABLE QSize toolTipSize();
+    // 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 bool setDataBySource(const QString sourceName, const QVariantMap data,
-                                     const QVariantMap params);
+    Q_INVOKABLE QStringList dictKeys(const bool sorted = false,
+                                     const QString regexp = QString()) const;
+    Q_INVOKABLE QStringList getHddDevices() const;
     // values
-    Q_INVOKABLE void graphicalValueByKey();
-    Q_INVOKABLE QString infoByKey(QString key);
-    Q_INVOKABLE QString valueByKey(QString key);
+    Q_INVOKABLE QString infoByKey(QString key) const;
+    Q_INVOKABLE QString valueByKey(QString key) const;
     // configuration
     Q_INVOKABLE void editItem(const QString type);
 
+public slots:
+    void dataUpdated(const QString &sourceName,
+                     const Plasma::DataEngine::Data &data);
+    // dummy method required by DataEngine connections
+    void modelChanged(QString, QAbstractItemModel *){};
+
+signals:
+    void dropSourceFromDataengine(const QString source);
+    void needTextToBeUpdated(const QString newText) const;
+    void needToolTipToBeUpdated(const QString newText) const;
+
 private slots:
-    void 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();
+    QString parsePattern(QString pattern) const;
+    void setDataBySource(const QString &sourceName, const QVariantMap &data);
+    // objects
+    AWDataAggregator *dataAggregator = nullptr;
+    AWDataEngineAggregator *dataEngineAggregator = nullptr;
+    AWKeysAggregator *aggregator = nullptr;
+    AWKeyOperations *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 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,626 @@
+/***************************************************************************
+ *   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 <QRegExp>
+
+#include "awdebug.h"
+#include "awformatterhelper.h"
+
+
+AWKeysAggregator::AWKeysAggregator(QObject *parent)
+    : QObject(parent)
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    // default formatters
+    // memory
+    m_formatter[QString("mem")] = FormatterType::Float;
+    m_formatter[QString("memtotmb")] = FormatterType::MemMBFormat;
+    m_formatter[QString("memtotgb")] = FormatterType::MemGBFormat;
+    // network
+    m_formatter[QString("down")] = FormatterType::NetSmartFormat;
+    m_formatter[QString("downkb")] = FormatterType::Integer;
+    m_formatter[QString("downunits")] = FormatterType::NetSmartUnits;
+    m_formatter[QString("up")] = FormatterType::NetSmartFormat;
+    m_formatter[QString("upkb")] = FormatterType::Integer;
+    m_formatter[QString("upunits")] = FormatterType::NetSmartUnits;
+    // swap
+    m_formatter[QString("swap")] = FormatterType::Float;
+    m_formatter[QString("swaptotmb")] = FormatterType::MemMBFormat;
+    m_formatter[QString("swaptotgb")] = FormatterType::MemGBFormat;
+
+    m_customFormatters = new AWFormatterHelper(nullptr);
+}
+
+
+AWKeysAggregator::~AWKeysAggregator()
+{
+    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+
+    delete m_customFormatters;
+}
+
+
+QString AWKeysAggregator::formatter(const QVariant &data,
+                                    const QString &key) const
+{
+    qCDebug(LOG_AW) << "Data" << data << "for key" << key;
+
+    QString output;
+    QLocale loc = m_translate ? QLocale::system() : QLocale::c();
+    // case block
+    switch (m_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(QChar(','));
+        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") : QString("MB/s");
+        else
+            output = m_translate ? i18n("KB/s") : QString("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 : 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(QString("$dd"),
+                               QString("%1").arg(days, 3, 10, QChar('0')));
+                source.replace(QString("$d"), QString("%1").arg(days));
+                source.replace(QString("$hh"),
+                               QString("%1").arg(hours, 2, 10, QChar('0')));
+                source.replace(QString("$h"), QString("%1").arg(hours));
+                source.replace(QString("$mm"),
+                               QString("%1").arg(minutes, 2, 10, QChar('0')));
+                source.replace(QString("$m"), QString("%1").arg(minutes));
+                return source;
+            }(m_formatter[key] == FormatterType::Uptime
+                  ? QString("$ddd$hhh$mmm")
+                  : m_customUptime,
+              static_cast<int>(data.toFloat()));
+        break;
+    case FormatterType::NoFormat:
+        output = data.toString();
+        break;
+    case FormatterType::Custom:
+        output = m_customFormatters->convert(data, key);
+        break;
+    }
+
+    return output;
+}
+
+
+QStringList AWKeysAggregator::keysFromSource(const QString &source) const
+{
+    qCDebug(LOG_AW) << "Search for source" << source;
+
+    return m_map.values(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_devices = 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;
+}
+
+
+// HACK units required to define should the value be calculated as temperature
+// or fan data
+QStringList AWKeysAggregator::registerSource(const QString &source,
+                                             const QString &units,
+                                             const QStringList &keys)
+{
+    qCDebug(LOG_AW) << "Source" << source << "with units" << units;
+
+    // regular expressions
+    QRegExp cpuRegExp = QRegExp(QString("cpu/cpu.*/TotalLoad"));
+    QRegExp cpuclRegExp = QRegExp(QString("cpu/cpu.*/clock"));
+    QRegExp hddrRegExp = QRegExp(QString("disk/.*/Rate/rblk"));
+    QRegExp hddwRegExp = QRegExp(QString("disk/.*/Rate/wblk"));
+    QRegExp mountFillRegExp = QRegExp(QString("partitions/.*/filllevel"));
+    QRegExp mountFreeRegExp = QRegExp(QString("partitions/.*/freespace"));
+    QRegExp mountUsedRegExp = QRegExp(QString("partitions/.*/usedspace"));
+    QRegExp netRegExp = QRegExp(
+        QString("network/interfaces/.*/(receiver|transmitter)/data$"));
+    QRegExp netTotalRegExp = QRegExp(
+        QString("network/interfaces/.*/(receiver|transmitter)/dataTotal$"));
+
+    if (source == QString("battery/ac")) {
+        // AC
+        m_map[source] = QString("ac");
+        m_formatter[QString("ac")] = FormatterType::ACFormat;
+    } else if (source.startsWith(QString("battery/"))) {
+        // battery stats
+        QString key = source;
+        key.remove(QString("battery/"));
+        m_map[source] = key;
+        m_formatter[key] = FormatterType::IntegerThree;
+    } else if (source == QString("cpu/system/TotalLoad")) {
+        // cpu
+        m_map[source] = QString("cpu");
+        m_formatter[QString("cpu")] = FormatterType::Float;
+    } else if (source.contains(cpuRegExp)) {
+        // cpus
+        QString key = source;
+        key.remove(QString("cpu/")).remove(QString("/TotalLoad"));
+        m_map[source] = key;
+        m_formatter[key] = FormatterType::Float;
+    } else if (source == QString("cpu/system/AverageClock")) {
+        // cpucl
+        m_map[source] = QString("cpucl");
+        m_formatter[QString("cpucl")] = FormatterType::Integer;
+    } else if (source.contains(cpuclRegExp)) {
+        // cpucls
+        QString key = source;
+        key.remove(QString("cpu/cpu")).remove(QString("/clock"));
+        key = QString("cpucl%1").arg(key);
+        m_map[source] = key;
+        m_formatter[key] = FormatterType::Integer;
+    } else if (source.startsWith(QString("custom"))) {
+        // custom
+        QString key = source;
+        key.remove(QString("custom/"));
+        m_map[source] = key;
+        m_formatter[key] = FormatterType::NoFormat;
+    } else if (source == QString("desktop/current/name")) {
+        // current desktop name
+        m_map[source] = QString("desktop");
+        m_formatter[QString("desktop")] = FormatterType::NoFormat;
+    } else if (source == QString("desktop/current/number")) {
+        // current desktop number
+        m_map[source] = QString("ndesktop");
+        m_formatter[QString("ndesktop")] = FormatterType::NoFormat;
+    } else if (source == QString("desktop/total/number")) {
+        // desktop count
+        m_map[source] = QString("tdesktops");
+        m_formatter[QString("tdesktops")] = FormatterType::NoFormat;
+    } else if (source.contains(hddrRegExp)) {
+        // read speed
+        QString device = source;
+        device.remove(QString("/Rate/rblk"));
+        int index = m_devices[QString("disk")].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hddr%1").arg(index);
+            m_map[source] = key;
+            m_formatter[key] = FormatterType::Integer;
+        }
+    } else if (source.contains(hddwRegExp)) {
+        // write speed
+        QString device = source;
+        device.remove(QString("/Rate/wblk"));
+        int index = m_devices[QString("disk")].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hddw%1").arg(index);
+            m_map[source] = key;
+            m_formatter[key] = FormatterType::Integer;
+        }
+    } else if (source == QString("gpu/load")) {
+        // gpu load
+        m_map[source] = QString("gpu");
+        m_formatter[QString("gpu")] = FormatterType::Float;
+    } else if (source == QString("gpu/temperature")) {
+        // gpu temperature
+        m_map[source] = QString("gputemp");
+        m_formatter[QString("gputemp")] = FormatterType::Temperature;
+    } else if (source.contains(mountFillRegExp)) {
+        // fill level
+        QString device = source;
+        device.remove(QString("partitions")).remove(QString("/filllevel"));
+        int index = m_devices[QString("mount")].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hdd%1").arg(index);
+            m_map[source] = key;
+            m_formatter[key] = FormatterType::Float;
+            // additional keys
+            m_formatter[QString("hddtotmb%1").arg(index)]
+                = FormatterType::MemMBFormat;
+            m_formatter[QString("hddtotgb%1").arg(index)]
+                = FormatterType::MemGBFormat;
+        }
+    } else if (source.contains(mountFreeRegExp)) {
+        // free space
+        QString device = source;
+        device.remove(QString("partitions")).remove(QString("/freespace"));
+        int index = m_devices[QString("mount")].indexOf(device);
+        if (index > -1) {
+            // mb
+            QString key = QString("hddfreemb%1").arg(index);
+            m_map[source] = key;
+            m_formatter[key] = FormatterType::MemMBFormat;
+            // gb
+            key = QString("hddfreegb%1").arg(index);
+            m_map.insertMulti(source, key);
+            m_formatter[key] = FormatterType::MemGBFormat;
+        }
+    } else if (source.contains(mountUsedRegExp)) {
+        // used
+        QString device = source;
+        device.remove(QString("partitions")).remove(QString("/usedspace"));
+        int index = m_devices[QString("mount")].indexOf(device);
+        if (index > -1) {
+            // mb
+            QString key = QString("hddmb%1").arg(index);
+            m_map[source] = key;
+            m_formatter[key] = FormatterType::MemMBFormat;
+            // gb
+            key = QString("hddgb%1").arg(index);
+            m_map.insertMulti(source, key);
+            m_formatter[key] = FormatterType::MemGBFormat;
+        }
+    } else if (source.startsWith(QString("hdd/temperature"))) {
+        // hdd temperature
+        QString device = source;
+        device.remove(QString("hdd/temperature"));
+        int index = m_devices[QString("hdd")].indexOf(device);
+        if (index > -1) {
+            QString key = QString("hddtemp%1").arg(index);
+            m_map[source] = key;
+            m_formatter[key] = FormatterType::Temperature;
+        }
+    } else if (source.startsWith(QString("cpu/system/loadavg"))) {
+        // load average
+        QString time = source;
+        time.remove(QString("cpu/system/loadavg"));
+        QString key = QString("la%1").arg(time);
+        m_map[source] = key;
+        m_formatter[key] = FormatterType::FloatTwoSymbols;
+    } else if (source == QString("mem/physical/application")) {
+        // app memory
+        // mb
+        m_map[source] = QString("memmb");
+        m_formatter[QString("memmb")] = FormatterType::MemMBFormat;
+        // gb
+        m_map.insertMulti(source, QString("memgb"));
+        m_formatter[QString("memgb")] = FormatterType::MemGBFormat;
+    } else if (source == QString("mem/physical/free")) {
+        // free memory
+        // mb
+        m_map[source] = QString("memfreemb");
+        m_formatter[QString("memfreemb")] = FormatterType::MemMBFormat;
+        // gb
+        m_map.insertMulti(source, QString("memfreegb"));
+        m_formatter[QString("memfreegb")] = FormatterType::MemGBFormat;
+    } else if (source == QString("mem/physical/used")) {
+        // used memory
+        // mb
+        m_map[source] = QString("memusedmb");
+        m_formatter[QString("memusedmb")] = FormatterType::MemMBFormat;
+        // gb
+        m_map.insertMulti(source, QString("memusedgb"));
+        m_formatter[QString("memusedgb")] = FormatterType::MemGBFormat;
+    } else if (source == QString("network/current/name")) {
+        // network device
+        m_map[source] = QString("netdev");
+        m_formatter[QString("netdev")] = FormatterType::NoFormat;
+    } else if (source.contains(netRegExp)) {
+        // network speed
+        QString type = source.contains(QString("receiver")) ? QString("down")
+                                                            : QString("up");
+        int index
+            = m_devices[QString("net")].indexOf(source.split(QChar('/'))[2]);
+        if (index > -1) {
+            // kb
+            QString key = QString("%1kb%2").arg(type).arg(index);
+            m_map[source] = key;
+            m_formatter[key] = FormatterType::Integer;
+            // smart
+            key = QString("%1%2").arg(type).arg(index);
+            m_map.insertMulti(source, key);
+            m_formatter[key] = FormatterType::NetSmartFormat;
+            // units
+            key = QString("%1units%2").arg(type).arg(index);
+            m_map.insertMulti(source, key);
+            m_formatter[key] = FormatterType::NetSmartUnits;
+        }
+    } else if (source.contains(netTotalRegExp)) {
+        // network data total
+        QString type = source.contains(QString("receiver")) ? QString("down")
+                                                            : QString("up");
+        int index
+            = m_devices[QString("net")].indexOf(source.split(QChar('/'))[2]);
+        if (index > -1) {
+            // kb
+            QString key = QString("%1totalkb%2").arg(type).arg(index);
+            m_map[source] = key;
+            m_formatter[key] = FormatterType::Integer;
+            // mb
+            key = QString("%1total%2").arg(type).arg(index);
+            m_map.insertMulti(source, key);
+            m_formatter[key] = FormatterType::MemMBFormat;
+        }
+    } else if (source.startsWith(QString("upgrade"))) {
+        // package manager
+        QString key = source;
+        key.remove(QString("upgrade/"));
+        m_map[source] = key;
+        m_formatter[key] = FormatterType::IntegerThree;
+    } else if (source.startsWith(QString("player"))) {
+        // player
+        QString key = source;
+        key.remove(QString("player/"));
+        m_map[source] = key;
+        m_formatter[key] = FormatterType::NoFormat;
+    } else if (source == QString("ps/running/count")) {
+        // running processes count
+        m_map[source] = QString("pscount");
+        m_formatter[QString("pscount")] = FormatterType::NoFormat;
+    } else if (source == QString("ps/running/list")) {
+        // list of running processes
+        m_map[source] = QString("ps");
+        m_formatter[QString("ps")] = FormatterType::List;
+    } else if (source == QString("ps/total/count")) {
+        // total processes count
+        m_map[source] = QString("pstotal");
+        m_formatter[QString("pstotal")] = FormatterType::NoFormat;
+    } else if (source.startsWith(QString("quotes"))) {
+        // quotes
+        QString key = source;
+        key.remove(QString("quotes/"));
+        m_map[source] = key;
+        m_formatter[key] = FormatterType::Quotes;
+    } else if (source == QString("mem/swap/free")) {
+        // free swap
+        // mb
+        m_map[source] = QString("swapfreemb");
+        m_formatter[QString("swapfreemb")] = FormatterType::MemMBFormat;
+        // gb
+        m_map.insertMulti(source, QString("swapfreegb"));
+        m_formatter[QString("swapfreegb")] = FormatterType::MemGBFormat;
+    } else if (source == QString("mem/swap/used")) {
+        // used swap
+        // mb
+        m_map[source] = QString("swapmb");
+        m_formatter[QString("swapmb")] = FormatterType::MemMBFormat;
+        // gb
+        m_map.insertMulti(source, QString("swapgb"));
+        m_formatter[QString("swapgb")] = FormatterType::MemGBFormat;
+    } else if (source.startsWith(QString("lmsensors/"))) {
+        // temperature
+        int index = m_devices[QString("temp")].indexOf(source);
+        // HACK on DE initialization there are no units key
+        if (units.isEmpty())
+            return QStringList() << QString("temp%1").arg(index);
+        if (index > -1) {
+            QString key = QString("temp%1").arg(index);
+            m_map[source] = key;
+            m_formatter[key] = units == QString("°C")
+                                   ? FormatterType::Temperature
+                                   : FormatterType::Integer;
+        }
+    } else if (source == QString("Local")) {
+        // time
+        m_map[source] = QString("time");
+        m_formatter[QString("time")] = FormatterType::Time;
+        // custom time
+        m_map.insertMulti(source, QString("ctime"));
+        m_formatter[QString("ctime")] = FormatterType::TimeCustom;
+        // ISO time
+        m_map.insertMulti(source, QString("isotime"));
+        m_formatter[QString("isotime")] = FormatterType::TimeISO;
+        // long time
+        m_map.insertMulti(source, QString("longtime"));
+        m_formatter[QString("longtime")] = FormatterType::TimeLong;
+        // short time
+        m_map.insertMulti(source, QString("shorttime"));
+        m_formatter[QString("shorttime")] = FormatterType::TimeShort;
+        // timestamp
+        m_map.insertMulti(source, QString("tstime"));
+        m_formatter[QString("tstime")] = FormatterType::Timestamp;
+    } else if (source == QString("system/uptime")) {
+        // uptime
+        m_map[source] = QString("uptime");
+        m_formatter[QString("uptime")] = FormatterType::Uptime;
+        // custom uptime
+        m_map.insertMulti(source, QString("cuptime"));
+        m_formatter[QString("cuptime")] = FormatterType::UptimeCustom;
+    } else if (source.startsWith(QString("weather/temperature"))) {
+        // temperature
+        QString key = source;
+        key.remove(QString("weather/"));
+        m_map[source] = key;
+        m_formatter[key] = FormatterType::Temperature;
+    } else if (source.startsWith(QString("weather/"))) {
+        // other weather
+        QString key = source;
+        key.remove(QString("weather/"));
+        m_map[source] = key;
+        m_formatter[key] = FormatterType::NoFormat;
+    } else if (source.startsWith(QString("load/load"))) {
+        // load source
+        QString key = source;
+        key.remove(QString("load/"));
+        m_map[source] = key;
+        m_formatter[key] = FormatterType::Temperature;
+    }
+
+    QStringList foundKeys = keysFromSource(source);
+
+    // rewrite formatters for custom ones
+    QStringList customFormattersKeys = m_customFormatters->definedFormatters();
+    qCInfo(LOG_AW) << "Looking for fprmatters" << foundKeys << "in"
+                   << customFormattersKeys;
+    for (auto key : foundKeys) {
+        if (!customFormattersKeys.contains(key))
+            continue;
+        m_formatter[key] = FormatterType::Custom;
+    }
+
+    // drop key from dictionary if no one user requested key required it
+    qCInfo(LOG_AW) << "Looking for keys" << foundKeys << "in" << keys;
+    bool required
+        = keys.isEmpty() || std::any_of(foundKeys.cbegin(), foundKeys.cend(),
+                                        [&keys](const QString &key) {
+                                            return keys.contains(key);
+                                        });
+    if (!required) {
+        m_map.remove(source);
+        for (auto key : foundKeys)
+            m_formatter.remove(key);
+    }
+
+    return keysFromSource(source);
+}
+
+
+float AWKeysAggregator::temperature(const float temp) const
+{
+    qCDebug(LOG_AW) << "Temperature value" << temp;
+
+    float converted = temp;
+    if (m_tempUnits == QString("Celsius")) {
+    } else if (m_tempUnits == QString("Fahrenheit")) {
+        converted = temp * 9.0f / 5.0f + 32.0f;
+    } else if (m_tempUnits == QString("Kelvin")) {
+        converted = temp + 273.15f;
+    } else if (m_tempUnits == QString("Reaumur")) {
+        converted = temp * 0.8f;
+    } else if (m_tempUnits == QString("cm^-1")) {
+        converted = (temp + 273.15f) * 0.695f;
+    } else if (m_tempUnits == QString("kJ/mol")) {
+        converted = (temp + 273.15f) * 8.31f;
+    } else if (m_tempUnits == QString("kcal/mol")) {
+        converted = (temp + 273.15f) * 1.98f;
+    } else {
+        qCWarning(LOG_AW) << "Invalid units" << m_tempUnits;
+    }
+
+    return converted;
+}

sources/awesome-widget/plugin/awkeysaggregator.h

@@ -0,0 +1,105 @@
+/***************************************************************************
+ *   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>
+
+#include "version.h"
+
+
+class AWFormatterHelper;
+
+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);
+
+    enum class FormatterType {
+        // general formatters
+        Custom,
+        NoFormat,
+        Float,
+        FloatTwoSymbols,
+        Integer,
+        IntegerFive,
+        IntegerThree,
+        List,
+        // unit specific formatters
+        ACFormat,
+        MemGBFormat,
+        MemMBFormat,
+        NetSmartFormat,
+        NetSmartUnits,
+        Quotes,
+        Temperature,
+        Time,
+        TimeCustom,
+        TimeISO,
+        TimeLong,
+        TimeShort,
+        Timestamp,
+        Uptime,
+        UptimeCustom
+    };
+
+public:
+    explicit AWKeysAggregator(QObject *parent = nullptr);
+    virtual ~AWKeysAggregator();
+    // get methods
+    QString formatter(const QVariant &data, const QString &key) const;
+    QStringList keysFromSource(const QString &source) const;
+    // set methods
+    void setAcOffline(const QString inactive);
+    void setAcOnline(const QString active);
+    void setCustomTime(const QString customTime);
+    void setCustomUptime(const QString customUptime);
+    void setDevices(const QHash<QString, QStringList> devices);
+    void setTempUnits(const QString units);
+    void setTranslate(const bool translate);
+
+public slots:
+    QStringList registerSource(const QString &source, const QString &units,
+                               const QStringList &keys);
+
+private:
+    float temperature(const float temp) const;
+    AWFormatterHelper *m_customFormatters = nullptr;
+    QStringList timeKeys = QString(TIME_KEYS).split(QChar(','));
+    // variables
+    QString m_acOffline;
+    QString m_acOnline;
+    QString m_customTime;
+    QString m_customUptime;
+    QHash<QString, QStringList> m_devices;
+    QHash<QString, FormatterType> m_formatter;
+    QHash<QString, QString> m_map;
+    QString m_tempUnits;
+    bool m_translate = false;
+};
+
+
+#endif /* AWKEYSAGGREGATOR_H */

sources/awesome-widget/plugin/awpatternfunctions.cpp

@@ -0,0 +1,307 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+#include "awpatternfunctions.h"
+
+#include <QJSEngine>
+#include <QRegularExpression>
+
+#include "awdebug.h"
+#include "awkeysaggregator.h"
+
+
+QString AWPatternFunctions::expandLambdas(QString code,
+                                          AWKeysAggregator *aggregator,
+                                          const QVariantHash &metadata,
+                                          const QStringList &usedKeys)
+{
+    qCDebug(LOG_AW) << "Expand lamdas in" << code;
+
+    QJSEngine engine;
+    // apply $this values
+    code.replace(QString("$this"), metadata[code].toString());
+    // parsed values
+    for (auto lambdaKey : usedKeys)
+        code.replace(QString("$%1").arg(lambdaKey),
+                     aggregator->formatter(metadata[lambdaKey], lambdaKey));
+    qCInfo(LOG_AW) << "Expression" << code;
+    QJSValue result = engine.evaluate(code);
+    if (result.isError()) {
+        qCWarning(LOG_AW) << "Uncaught exception at line"
+                          << result.property("lineNumber").toInt() << ":"
+                          << result.toString();
+        return QString();
+    } 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(
+        QString("\\$template\\{\\{(?<body>.*?)\\}\\}"));
+    templatesRegexp.setPatternOptions(
+        QRegularExpression::DotMatchesEverythingOption);
+
+    QRegularExpressionMatchIterator it = templatesRegexp.globalMatch(code);
+    while (it.hasNext()) {
+        QRegularExpressionMatch match = it.next();
+        QString body = match.captured(QString("body"));
+
+        QJSEngine engine;
+        qCInfo(LOG_AW) << "Expression" << body;
+        QJSValue result = engine.evaluate(body);
+        QString templateResult = QString("");
+        if (result.isError()) {
+            qCWarning(LOG_AW) << "Uncaught exception at line"
+                              << result.property("lineNumber").toInt() << ":"
+                              << result.toString();
+        } else {
+            templateResult = result.toString();
+        }
+
+        // replace template
+        code.replace(match.captured(), templateResult);
+    }
+
+    return code;
+}
+
+
+QList<AWPatternFunctions::AWFunction>
+AWPatternFunctions::findFunctionCalls(const QString function,
+                                      const QString code)
+{
+    qCDebug(LOG_AW) << "Looking for function" << function << "in" << code;
+
+    // I suggest the following regex for the internal functions
+    // $aw_function_name<some args here if any>{{function body}}
+    // * args should be always comma separated (e.g. commas are not supported
+    // in this field if they are not screened by $, i.e. '$,'
+    // * body depends on the function name, double brackets should be screened
+    // by using $, e.g. ${
+    QRegularExpression regex(
+        QString("\\$%1\\<(?<args>.*?)\\>\\{\\{(?<body>.*?)\\}\\}")
+            .arg(function));
+    regex.setPatternOptions(QRegularExpression::DotMatchesEverythingOption);
+
+    QList<AWPatternFunctions::AWFunction> foundFunctions;
+    QRegularExpressionMatchIterator it = regex.globalMatch(code);
+    while (it.hasNext()) {
+        QRegularExpressionMatch match = it.next();
+
+        AWPatternFunctions::AWFunction metadata;
+        // work with args
+        QString argsString = match.captured(QString("args"));
+        if (argsString.isEmpty()) {
+            metadata.args = QStringList();
+        } else {
+            // replace '$,' to 0x1d
+            argsString.replace(QString("$,"), QString(0x1d));
+            QStringList args = argsString.split(QChar(','));
+            std::for_each(args.begin(), args.end(), [](QString &arg) {
+                arg.replace(QString(0x1d), QString(","));
+            });
+            metadata.args = args;
+        }
+        // other variables
+        metadata.body = match.captured(QString("body"));
+        metadata.what = match.captured();
+        // replace brackets
+        metadata.body.replace(QString("${"), QString("{"));
+        metadata.body.replace(QString("$}"), QString("}"));
+        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(QString("aw_all"), code);
+    for (auto function : found) {
+        QString separator
+            = function.args.isEmpty() ? QString(",") : 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(QString("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(QString("aw_names"), code);
+    for (auto function : found) {
+        QString separator
+            = function.args.isEmpty() ? QString(",") : 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(QString("aw_keys"), code);
+    for (auto function : found) {
+        QString separator
+            = function.args.isEmpty() ? QString(",") : 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(QString("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;
+    for (auto key : keys)
+        if ((key.startsWith(QString("bar")) == isBars)
+            && (code.contains(QString("$%1").arg(key)))) {
+            qCInfo(LOG_AW) << "Found key" << key << "with bar enabled"
+                           << isBars;
+            selectedKeys.append(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(QString("\\$\\{\\{(?<body>.*?)\\}\\}"));
+    lambdaRegexp.setPatternOptions(
+        QRegularExpression::DotMatchesEverythingOption);
+
+    QRegularExpressionMatchIterator it = lambdaRegexp.globalMatch(code);
+    while (it.hasNext()) {
+        QRegularExpressionMatch match = it.next();
+        QString lambda = match.captured(QString("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,54 @@
+/***************************************************************************
+ *   This file is part of awesome-widgets                                  *
+ *                                                                         *
+ *   awesome-widgets is free software: you can redistribute it and/or      *
+ *   modify it under the terms of the GNU General Public License as        *
+ *   published by the Free Software Foundation, either version 3 of the    *
+ *   License, or (at your option) any later version.                       *
+ *                                                                         *
+ *   awesome-widgets is distributed in the hope that it will be useful,    *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
+ ***************************************************************************/
+
+
+#ifndef AWPATTERNFUNCTIONS_H
+#define AWPATTERNFUNCTIONS_H
+
+#include <QString>
+#include <QVariant>
+
+
+class AWKeysAggregator;
+
+namespace AWPatternFunctions
+{
+typedef struct {
+    QStringList args;
+    QString body;
+    QString what;
+} AWFunction;
+
+// insert methods
+QString expandLambdas(QString code, AWKeysAggregator *aggregator,
+                      const QVariantHash &metadata,
+                      const QStringList &usedKeys);
+QString expandTemplates(QString code);
+QList<AWFunction> findFunctionCalls(const QString function, const QString code);
+QString insertAllKeys(QString code, const QStringList keys);
+QString insertKeyCount(QString code, const QStringList keys);
+QString insertKeyNames(QString code, const QStringList keys);
+QString insertKeys(QString code, const QStringList keys);
+QString insertMacros(QString code);
+// find methods
+QStringList findKeys(const QString code, const QStringList keys,
+                     const bool isBars);
+QStringList findLambdas(const QString code);
+};
+
+
+#endif /* AWPATTERNFUNCTIONS_H */

sources/awesome-widget/plugin/awtooltip.cpp

@@ -1,154 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#include "awtooltip.h"
-
-#include <QDebug>
-#include <QProcessEnvironment>
-#include <math.h>
-
-#include <pdebug/pdebug.h>
-
-
-AWToolTip::AWToolTip(QObject *parent, QVariantMap settings)
-    : QObject(parent),
-      configuration(settings)
-{
-    // debug
-    QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
-    QString debugEnv = environment.value(QString("DEBUG"), QString("no"));
-    debug = (debugEnv == QString("yes"));
-
-    toolTipScene = new QGraphicsScene();
-    toolTipView = new QGraphicsView(toolTipScene);
-    toolTipView->setStyleSheet(QString("background: transparent"));
-    toolTipView->setContentsMargins(0, 0, 0, 0);
-    toolTipView->setFrameShape(QFrame::NoFrame);
-    toolTipView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    toolTipView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-
-    counts += configuration[QString("cpuTooltip")].toInt();
-    counts += configuration[QString("cpuclTooltip")].toInt();
-    counts += configuration[QString("memTooltip")].toInt();
-    counts += configuration[QString("swapTooltip")].toInt();
-    counts += configuration[QString("downTooltip")].toInt();
-    counts += configuration[QString("batTooltip")].toInt();
-
-    boundaries[QString("cpuTooltip")] = 100.0;
-    boundaries[QString("cpuclTooltip")] = 4000.0;
-    boundaries[QString("memTooltip")] = 100.0;
-    boundaries[QString("swapTooltip")] = 100.0;
-    boundaries[QString("downTooltip")] = 1.0;
-    boundaries[QString("upTooltip")] = 1.0;
-    boundaries[QString("batTooltip")] = 100.0;
-    size.setHeight(105.0);
-    size.setWidth(100.0 * counts);
-
-    if (configuration[QString("cpuTooltip")].toBool()) requiredKeys.append(QString("cpuTooltip"));
-    if (configuration[QString("cpuclTooltip")].toBool()) requiredKeys.append(QString("cpuclTooltip"));
-    if (configuration[QString("memTooltip")].toBool()) requiredKeys.append(QString("memTooltip"));
-    if (configuration[QString("swapTooltip")].toBool()) requiredKeys.append(QString("swapTooltip"));
-    if (configuration[QString("downTooltip")].toBool()) requiredKeys.append(QString("downTooltip"));
-    if (configuration[QString("upTooltip")].toBool()) requiredKeys.append(QString("upTooltip"));
-    if (configuration[QString("batTooltip")].toBool()) requiredKeys.append(QString("batTooltip"));
-}
-
-
-AWToolTip::~AWToolTip()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    delete toolTipView;
-    delete toolTipScene;
-}
-
-
-QSize AWToolTip::getSize()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    return size;
-}
-
-
-QPixmap AWToolTip::image()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    toolTipView->resize(size);
-    // create image
-    toolTipScene->clear();
-    QPen pen = QPen();
-    // background
-    if (configuration[QString("useTooltipBackground")].toBool())
-        toolTipScene->setBackgroundBrush(QBrush(QColor(configuration[QString("tooltipBackground")].toString())));
-    else
-        toolTipScene->setBackgroundBrush(QBrush(Qt::NoBrush));
-    bool down = false;
-    for (int i=0; i<requiredKeys.count(); i++) {
-        float normX = 100.0 / static_cast<float>(data[requiredKeys[i]].count());
-        float normY = 100.0 / (1.5 * boundaries[requiredKeys[i]]);
-        if (requiredKeys[i] != QString("batTooltip"))
-            pen.setColor(QColor(configuration[QString("%1Color").arg(requiredKeys[i])].toString()));
-        float shift = i * 100.0;
-        if (down) shift -= 100.0;
-        for (int j=0; j<data[requiredKeys[i]].count()-1; j++) {
-            float x1 = j * normX + shift;
-            float y1 = - fabs(data[requiredKeys[i]][j]) * normY + 5.0;
-            float x2 = (j + 1) * normX + shift;
-            float y2 = - fabs(data[requiredKeys[i]][j+1]) * normY + 5.0;
-            if (requiredKeys[i] == QString("batTooltip")) {
-                if (data[requiredKeys[i]][j+1] > 0)
-                    pen.setColor(QColor(configuration[QString("batTooltipColor")].toString()));
-                else
-                    pen.setColor(QColor(configuration[QString("batInTooltipColor")].toString()));
-            }
-            toolTipScene->addLine(x1, y1, x2, y2, pen);
-        }
-        if (requiredKeys[i] == QString("downTooltip")) down = true;
-    }
-
-    return toolTipView->grab();
-}
-
-
-void AWToolTip::setData(const QString source, float value, const bool ac)
-{
-    if (debug) qDebug() << PDEBUG;
-
-    if (data[source].count() == 0)
-        data[source].append(0.0);
-    else if (data[source].count() > configuration[QString("tooltipNumber")].toInt())
-        data[source].takeFirst();
-    if (isnan(value)) value = 0.0;
-
-    if (ac)
-        data[source].append(value);
-    else
-        data[source].append(-value);
-
-    if ((source == QString("downTooltip")) || (source == QString("upTooltip"))) {
-        for (int i=0; i<data[QString("downTooltip")].count(); i++)
-            if (boundaries[QString("downTooltip")] < data[QString("downTooltip")][i])
-                boundaries[QString("downTooltip")] = data[QString("downTooltip")][i];
-        for (int i=0; i<data[QString("upTooltip")].count(); i++)
-            if (boundaries[QString("downTooltip")] < data[QString("upTooltip")][i])
-                boundaries[QString("downTooltip")] = data[QString("upTooltip")][i];
-        boundaries[QString("downTooltip")] *= 1.2;
-        boundaries[QString("upTooltip")] = boundaries[QString("downTooltip")];
-    }
-}

sources/awesome-widget/plugin/awupdatehelper.cpp

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

sources/awesome-widget/plugin/awupdatehelper.h

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

sources/awesome-widget/plugin/desktops/aw-bat-bar.desktop

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=bar3
-Comment=Simple bat bar
-X-AW-Value=bat
-X-AW-ActiveColor="0,0,0,255"
-X-AW-InactiveColor="255,255,255,255"
-X-AW-Type=Horizontal
-X-AW-Direction=LeftToRight
-X-AW-Height=25
-X-AW-Width=100
-X-AW-ApiVersion=1

sources/awesome-widget/plugin/desktops/aw-cpu-bar.desktop

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=bar0
-Comment=Simple cpu bar
-X-AW-Value=cpu
-X-AW-ActiveColor="0,0,0,255"
-X-AW-InactiveColor="255,255,255,255"
-X-AW-Type=Horizontal
-X-AW-Direction=LeftToRight
-X-AW-Height=25
-X-AW-Width=100
-X-AW-ApiVersion=1

sources/awesome-widget/plugin/desktops/aw-mem-bar.desktop

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=bar1
-Comment=Simple mem bar
-X-AW-Value=mem
-X-AW-ActiveColor="0,0,0,255"
-X-AW-InactiveColor="255,255,255,255"
-X-AW-Type=Horizontal
-X-AW-Direction=LeftToRight
-X-AW-Height=25
-X-AW-Width=100
-X-AW-ApiVersion=1

sources/awesome-widget/plugin/desktops/aw-swap-bar.desktop

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=bar2
-Comment=Simple swap bar
-X-AW-Value=swap
-X-AW-ActiveColor="0,0,0,255"
-X-AW-InactiveColor="255,255,255,255"
-X-AW-Type=Horizontal
-X-AW-Direction=LeftToRight
-X-AW-Height=25
-X-AW-Width=100
-X-AW-ApiVersion=1

sources/awesome-widget/plugin/graphicalitem.cpp

@@ -1,525 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#include "graphicalitem.h"
-#include "ui_graphicalitem.h"
-
-#include <KI18n/KLocalizedString>
-
-#include <QBuffer>
-#include <QColorDialog>
-#include <QDebug>
-#include <QDir>
-#include <QGraphicsEllipseItem>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QSettings>
-
-#include <pdebug/pdebug.h>
-
-#include "version.h"
-
-
-GraphicalItem::GraphicalItem(QWidget *parent, const QString desktopName, const QStringList directories, const bool debugCmd)
-    : QDialog(parent),
-      m_fileName(desktopName),
-      m_dirs(directories),
-      debug(debugCmd),
-      ui(new Ui::GraphicalItem)
-{
-    readConfiguration();
-
-    ui->setupUi(this);
-    connect(ui->pushButton_activeColor, SIGNAL(clicked()), this, SLOT(changeColor()));
-    connect(ui->pushButton_inactiveColor, SIGNAL(clicked()), this, SLOT(changeColor()));
-}
-
-
-GraphicalItem::~GraphicalItem()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    delete ui;
-}
-
-
-QString GraphicalItem::image(const float value)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Value" << value;
-    if (m_bar == QString("none")) return QString("");
-
-    QColor active = stringToColor(m_activeColor);
-    QColor inactive = stringToColor(m_inactiveColor);
-    float percent = value / 100.0;
-    int scale[2] = {1, 1};
-    QPen pen = QPen();
-    QGraphicsScene *scene = new QGraphicsScene();
-    scene->setBackgroundBrush(QBrush(Qt::NoBrush));
-    QGraphicsView *view = new QGraphicsView(scene);
-    view->setStyleSheet(QString("background: transparent"));
-    view->setContentsMargins(0, 0, 0, 0);
-    view->setFrameShape(QFrame::NoFrame);
-    view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    view->resize(m_width + 5.0, m_height + 5.0);
-
-    // paint
-    switch (m_type) {
-    case Vertical:
-        pen.setWidth(m_width);
-        // inactive
-        pen.setColor(inactive);
-        scene->addLine(0.5 * m_width, -0.5 * m_width, 0.5 * m_width,
-                       (1.0 - percent) * m_height - 0.5 * m_width, pen);
-        // active
-        pen.setColor(active);
-        scene->addLine(0.5 * m_width, (1.0 - percent) * m_height + 0.5 * m_width,
-                       0.5 * m_width, m_height + 0.5 * m_width, pen);
-        // scale
-        scale[1] = -2 * static_cast<int>(m_direction) + 1;
-        break;
-    case Circle:
-        QGraphicsEllipseItem *circle;
-        pen.setWidth(1.0);
-        // inactive
-        pen.setColor(inactive);
-        circle = scene->addEllipse(0.0, 0.0, m_width, m_height, pen, QBrush(inactive, Qt::SolidPattern));
-        circle->setSpanAngle(- (1.0 - percent) * 360.0 * 16.0);
-        circle->setStartAngle(90.0 * 16.0 - percent * 360.0 * 16.0);
-        // active
-        pen.setColor(active);
-        circle = scene->addEllipse(0.0, 0.0, m_width, m_height, pen, QBrush(active, Qt::SolidPattern));
-        circle->setSpanAngle(- percent * 360.0 * 16.0);
-        circle->setStartAngle(90.0 * 16.0);
-        // scale
-        scale[0] = -2 * static_cast<int>(m_direction) + 1;
-        break;
-    default:
-        pen.setWidth(m_height);
-        // inactive
-        pen.setColor(inactive);
-        scene->addLine(percent * m_width + 0.5 * m_height, 0.5 * m_height,
-                       m_width + 0.5 * m_height, 0.5 * m_height, pen);
-        // active
-        pen.setColor(active);
-        scene->addLine(-0.5 * m_height, 0.5 * m_height,
-                       percent * m_width - 0.5 * m_height, 0.5 * m_height, pen);
-        // scale
-        scale[0] = -2 * static_cast<int>(m_direction) + 1;
-        break;
-    }
-
-    // convert
-    QPixmap pixmap = view->grab().transformed(QTransform().scale(scale[0], scale[1]));
-    QByteArray byteArray;
-    QBuffer buffer(&byteArray);
-    pixmap.save(&buffer, "PNG");
-    QString url = QString("<img src=\"data:image/png;base64,%1\"/>").arg(QString(byteArray.toBase64()));
-    delete view;
-    delete scene;
-
-    return url;
-}
-
-
-QString GraphicalItem::fileName()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    return m_fileName;
-}
-
-
-int GraphicalItem::apiVersion()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    return m_apiVersion;
-}
-
-
-QString GraphicalItem::name()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    return m_name;
-}
-
-
-QString GraphicalItem::comment()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    return m_comment;
-}
-
-
-QString GraphicalItem::bar()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    return m_bar;
-}
-
-
-QString GraphicalItem::activeColor()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    return m_activeColor;
-}
-
-
-QString GraphicalItem::inactiveColor()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    return m_inactiveColor;
-}
-
-
-GraphicalItem::Type GraphicalItem::type()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    return m_type;
-}
-
-
-QString GraphicalItem::strType()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    QString value;
-    switch (m_type) {
-    case Vertical:
-        value = QString("Vertical");
-        break;
-    case Circle:
-        value = QString("Circle");
-        break;
-    default:
-        value = QString("Horizontal");
-        break;
-    }\
-
-    return value;
-}
-
-
-GraphicalItem::Direction GraphicalItem::direction()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    return m_direction;
-}
-
-
-QString GraphicalItem::strDirection()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    QString value;
-    switch (m_direction) {
-    case RightToLeft:
-        value = QString("RightToLeft");
-        break;
-    default:
-        value = QString("LeftToRight");
-        break;
-    }
-
-    return value;
-}
-
-
-int GraphicalItem::height()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    return m_height;
-}
-
-
-int GraphicalItem::width()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    return m_width;
-}
-
-
-void GraphicalItem::setApiVersion(const int _apiVersion)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Version" << _apiVersion;
-
-    m_apiVersion = _apiVersion;
-}
-
-
-void GraphicalItem::setName(const QString _name)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Name" << _name;
-
-    m_name = _name;
-}
-
-
-void GraphicalItem::setComment(const QString _comment)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Comment" << _comment;
-
-    m_comment = _comment;
-}
-
-
-void GraphicalItem::setBar(const QString _bar)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Bar" << _bar;
-
-    if ((!_bar.contains(QRegExp(QString("cpu(?!cl).*")))) &&
-        (!_bar.contains(QRegExp(QString("gpu")))) &&
-        (!_bar.contains(QRegExp(QString("mem")))) &&
-        (!_bar.contains(QRegExp(QString("swap")))) &&
-        (!_bar.contains(QRegExp(QString("hdd[0-9].*")))) &&
-        (!_bar.contains(QRegExp(QString("bat.*")))))
-        m_bar = QString("none");
-    else
-        m_bar = _bar;
-}
-
-
-void GraphicalItem::setActiveColor(const QString _color)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Color" << _color;
-
-    m_activeColor = _color;
-}
-
-
-void GraphicalItem::setInactiveColor(const QString _color)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Color" << _color;
-
-    m_inactiveColor = _color;
-}
-
-
-void GraphicalItem::setType(const Type _type)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Type" << _type;
-
-    m_type = _type;
-}
-
-
-void GraphicalItem::setStrType(const QString _type)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Type" << _type;
-
-    if (_type == QString("Vertical"))
-        setType(Vertical);
-    else if (_type == QString("Circle"))
-        setType(Circle);
-    else
-        setType(Horizontal);
-}
-
-
-void GraphicalItem::setDirection(const Direction _direction)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Direction" << _direction;
-
-    m_direction = _direction;
-}
-
-
-void GraphicalItem::setStrDirection(const QString _direction)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Direction" << _direction;
-
-    if (_direction == QString("RightToLeft"))
-        setDirection(RightToLeft);
-    else
-        setDirection(LeftToRight);
-}
-
-
-void GraphicalItem::setHeight(const int _height)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Height" << _height;
-    if (_height <= 0) return;
-
-    m_height = _height;
-}
-
-
-void GraphicalItem::setWidth(const int _width)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Width" << _width;
-    if (_width <= 0) return;
-
-    m_width = _width;
-}
-
-
-void GraphicalItem::readConfiguration()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    for (int i=m_dirs.count()-1; i>=0; i--) {
-        if (!QDir(m_dirs[i]).entryList(QDir::Files).contains(m_fileName)) continue;
-        QSettings settings(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName), QSettings::IniFormat);
-
-        settings.beginGroup(QString("Desktop Entry"));
-        setName(settings.value(QString("Name"), m_name).toString());
-        setComment(settings.value(QString("Comment"), m_comment).toString());
-        setApiVersion(settings.value(QString("X-AW-ApiVersion"), AWGIAPI).toInt());
-        setBar(settings.value(QString("X-AW-Value"), m_bar).toString());
-        setActiveColor(settings.value(QString("X-AW-ActiveColor"), m_activeColor).toString());
-        setInactiveColor(settings.value(QString("X-AW-InactiveColor"), m_inactiveColor).toString());
-        setStrType(settings.value(QString("X-AW-Type"), strType()).toString());
-        setStrDirection(settings.value(QString("X-AW-Direction"), strDirection()).toString());
-        setHeight(settings.value(QString("X-AW-Height"), m_height).toInt());
-        setWidth(settings.value(QString("X-AW-Width"), m_width).toInt());
-        settings.endGroup();
-    }
-}
-
-
-int GraphicalItem::showConfiguration(const QStringList tags)
-{
-    if (debug) qDebug() << PDEBUG;
-
-    ui->label_nameValue->setText(m_name);
-    ui->lineEdit_comment->setText(m_comment);
-    ui->comboBox_value->addItems(tags);
-    ui->comboBox_value->addItem(m_bar);
-    ui->comboBox_value->setCurrentIndex(ui->comboBox_value->count() - 1);
-    ui->pushButton_activeColor->setText(m_activeColor);
-    ui->pushButton_inactiveColor->setText(m_inactiveColor);
-    ui->comboBox_type->setCurrentIndex(static_cast<int>(m_type));
-    ui->comboBox_direction->setCurrentIndex(static_cast<int>(m_direction));
-    ui->spinBox_height->setValue(m_height);
-    ui->spinBox_width->setValue(m_width);
-
-    int ret = exec();
-    if (ret != 1) return ret;
-
-    setName(ui->label_nameValue->text());
-    setComment(ui->lineEdit_comment->text());
-    setApiVersion(AWGIAPI);
-    setBar(ui->comboBox_value->currentText());
-    setActiveColor(ui->pushButton_activeColor->text().remove(QChar('&')));
-    setInactiveColor(ui->pushButton_inactiveColor->text().remove(QChar('&')));
-    setStrType(ui->comboBox_type->currentText());
-    setStrDirection(ui->comboBox_direction->currentText());
-    setHeight(ui->spinBox_height->value());
-    setWidth(ui->spinBox_width->value());
-
-    writeConfiguration();
-    return ret;
-}
-
-
-bool GraphicalItem::tryDelete()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    for (int i=0; i<m_dirs.count(); i++)
-        if (debug) qDebug() << PDEBUG << ":" << "Remove file" << QString("%1/%2").arg(m_dirs[i]).arg(m_fileName) <<
-                               QFile::remove(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName));
-
-    // check if exists
-    for (int i=0; i<m_dirs.count(); i++)
-        if (QFile::exists(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName))) return false;
-    return true;
-}
-
-
-void GraphicalItem::writeConfiguration()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    QSettings settings(QString("%1/%2").arg(m_dirs[0]).arg(m_fileName), QSettings::IniFormat);
-    if (debug) qDebug() << PDEBUG << ":" << "Configuration file" << settings.fileName();
-
-    settings.beginGroup(QString("Desktop Entry"));
-    settings.setValue(QString("Encoding"), QString("UTF-8"));
-    settings.setValue(QString("Name"), m_name);
-    settings.setValue(QString("Comment"), m_comment);
-    settings.setValue(QString("X-AW-ApiVersion"), m_apiVersion);
-    settings.setValue(QString("X-AW-Value"), m_bar);
-    settings.setValue(QString("X-AW-ActiveColor"), m_activeColor);
-    settings.setValue(QString("X-AW-InactiveColor"), m_inactiveColor);
-    settings.setValue(QString("X-AW-Type"), strType());
-    settings.setValue(QString("X-AW-Direction"), strDirection());
-    settings.setValue(QString("X-AW-Height"), m_height);
-    settings.setValue(QString("X-AW-Width"), m_width);
-    settings.endGroup();
-
-    settings.sync();
-}
-
-
-void GraphicalItem::changeColor()
-{
-    if (debug) qDebug() << PDEBUG;
-
-    QColor color = stringToColor((dynamic_cast<QPushButton *>(sender()))->text());
-    QColor newColor = QColorDialog::getColor(color, 0, i18n("Select color"),
-                                             QColorDialog::ShowAlphaChannel);
-    if (!newColor.isValid()) return;
-
-    QStringList colorText;
-    colorText.append(QString("%1").arg(newColor.red()));
-    colorText.append(QString("%1").arg(newColor.green()));
-    colorText.append(QString("%1").arg(newColor.blue()));
-    colorText.append(QString("%1").arg(newColor.alpha()));
-    dynamic_cast<QPushButton *>(sender())->setText(colorText.join(QChar(',')));
-}
-
-
-QColor GraphicalItem::stringToColor(const QString _color)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Color" << _color;
-
-    QColor qcolor;
-    QStringList listColor = _color.split(QChar(','));
-    while (listColor.count() < 4)
-        listColor.append(QString("0"));
-    qcolor.setRed(listColor[0].toInt());
-    qcolor.setGreen(listColor[1].toInt());
-    qcolor.setBlue(listColor[2].toInt());
-    qcolor.setAlpha(listColor[3].toInt());
-
-    return qcolor;
-}

sources/awesome-widget/plugin/graphicalitem.h

@@ -1,115 +0,0 @@
-/***************************************************************************
- *   This file is part of awesome-widgets                                  *
- *                                                                         *
- *   awesome-widgets is free software: you can redistribute it and/or      *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   awesome-widgets is distributed in the hope that it will be useful,    *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
- ***************************************************************************/
-
-#ifndef GRAPHICALITEM_H
-#define GRAPHICALITEM_H
-
-#include <QColor>
-#include <QDialog>
-
-
-namespace Ui {
-    class GraphicalItem;
-}
-
-class GraphicalItem : public QDialog
-{
-    Q_OBJECT
-    Q_PROPERTY(int apiVersion READ apiVersion WRITE setApiVersion)
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(QString comment READ comment WRITE setComment)
-    Q_PROPERTY(QString bar READ bar WRITE setBar)
-    Q_PROPERTY(QString activeColor READ activeColor WRITE setActiveColor)
-    Q_PROPERTY(QString inactiveColor READ inactiveColor WRITE setInactiveColor)
-    Q_PROPERTY(Type type READ type WRITE setType)
-    Q_PROPERTY(Direction direction READ direction WRITE setDirection)
-    Q_PROPERTY(int height READ height WRITE setHeight)
-    Q_PROPERTY(int width READ width WRITE setWidth)
-
-public:
-    enum Direction {
-        LeftToRight = 0,
-        RightToLeft
-    };
-    enum Type {
-        Horizontal = 0,
-        Vertical,
-        Circle
-    };
-
-    explicit GraphicalItem(QWidget *parent = nullptr, const QString desktopName = QString(),
-                           const QStringList directories = QStringList(), const bool debugCmd = false);
-    ~GraphicalItem();
-    QString fileName();
-    QString image(const float value);
-    // get methods
-    int apiVersion();
-    QString name();
-    QString comment();
-    QString bar();
-    QString activeColor();
-    QString inactiveColor();
-    Type type();
-    QString strType();
-    Direction direction();
-    QString strDirection();
-    int height();
-    int width();
-    // set methods
-    void setApiVersion(const int _apiVersion = 0);
-    void setName(const QString _name = QString("none"));
-    void setComment(const QString _comment = QString("empty"));
-    void setBar(const QString _bar = QString("cpu"));
-    void setActiveColor(const QString _color = QString("0,0,0,130"));
-    void setInactiveColor(const QString _color = QString("255,255,255,130"));
-    void setType(const Type _type = Horizontal);
-    void setStrType(const QString _type = QString("Horizontal"));
-    void setDirection(const Direction _direction = LeftToRight);
-    void setStrDirection(const QString _direction = QString("LeftToRight"));
-    void setHeight(const int _height = 100);
-    void setWidth(const int _width = 100);
-
-public slots:
-    void readConfiguration();
-    int showConfiguration(const QStringList tags = QStringList());
-    bool tryDelete();
-    void writeConfiguration();
-
-private slots:
-    void changeColor();
-
-private:
-    QColor stringToColor(const QString _color);
-    QString m_fileName;
-    QStringList m_dirs;
-    bool debug;
-    Ui::GraphicalItem *ui;
-    // properties
-    int m_apiVersion = 0;
-    QString m_name = QString("none");
-    QString m_comment = QString("empty");
-    QString m_bar = QString("cpu");
-    QString m_activeColor = QString("0,0,0,130");
-    QString m_inactiveColor = QString("255,255,255,130");
-    Type m_type = Horizontal;
-    Direction m_direction = LeftToRight;
-    int m_height = 100;
-    int m_width = 100;
-};
-
-
-#endif /* GRAPHICALITEM_H */

sources/awesome-widget/plugin/qmldir

@@ -1,3 +1,2 @@
-module org.kde.plasma.awesomewidget
-
+module org.kde.plasma.private.awesomewidget
 plugin awplugin

sources/awesomewidgets/CMakeLists.txt

@@ -0,0 +1,41 @@
+set(SUBPROJECT ${PROJECT_LIBRARY})
+message(STATUS "Subproject ${SUBPROJECT}")
+add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidget\")
+
+include_directories(
+        ${CMAKE_SOURCE_DIR}
+        ${CMAKE_BINARY_DIR}
+        ${PROJECT_TRDPARTY_DIR}
+        ${Qt_INCLUDE}
+        ${Kf5_INCLUDE}
+)
+
+file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/qreplytimeout/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
+file(GLOB SUBPROJECT_HEADER *.h ${PROJECT_TRDPARTY_DIR}/qreplytimeout/*.h)
+file(GLOB SUBPROJECT_UI *.ui)
+file(GLOB SUBPROJECT_INI *.ini)
+set(SUBPROJECT_CONFIGS ${CMAKE_CURRENT_SOURCE_DIR}/configs)
+set(SUBPROJECT_GRAPHITEMS ${CMAKE_CURRENT_SOURCE_DIR}/desktops)
+set(SUBPROJECT_QUOTES ${CMAKE_CURRENT_SOURCE_DIR}/quotes)
+set(SUBPROJECT_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/scripts)
+set(SUBPROJECT_UPGRADE ${CMAKE_CURRENT_SOURCE_DIR}/upgrade)
+set(SUBPROJECT_WEATHER ${CMAKE_CURRENT_SOURCE_DIR}/weather)
+file(GLOB SUBPROJECT_WEATHER_JSON_IN *.json)
+file(RELATIVE_PATH SUBPROJECT_WEATHER_JSON ${CMAKE_SOURCE_DIR} ${SUBPROJECT_WEATHER_JSON_IN})
+
+# prepare
+configure_file(${SUBPROJECT_WEATHER_JSON_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_WEATHER_JSON})
+
+qt5_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
+add_library(${SUBPROJECT} STATIC ${SUBPROJECT_SOURCE} ${SUBPROJECT_HEADER} ${SUBPROJECT_UI_HEADER})
+target_link_libraries(${SUBPROJECT} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
+
+# install
+install(DIRECTORY ${SUBPROJECT_CONFIGS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_GRAPHITEMS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_QUOTES} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_SCRIPTS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_UPGRADE} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
+install(DIRECTORY ${SUBPROJECT_WEATHER} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
+install(FILES ${SUBPROJECT_INI} DESTINATION ${CONFIG_INSTALL_DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_WEATHER_JSON} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/weather)

sources/awesomewidgets/abstractextitem.cpp

@@ -0,0 +1,242 @@
+/***************************************************************************
+ *   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 "abstractextitem.h"
+
+#include <QDir>
+#include <QSettings>
+#include <QStandardPaths>
+#include <QTime>
+
+#include "abstractextitemaggregator.h"
+#include "awdebug.h"
+
+
+AbstractExtItem::AbstractExtItem(QWidget *parent, const QString filePath)
+    : QDialog(parent)
+    , m_fileName(filePath)
+{
+    qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
+
+    qCDebug(LOG_LIB) << "Desktop name" << filePath;
+
+    m_name = m_fileName;
+}
+
+
+AbstractExtItem::~AbstractExtItem()
+{
+    qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
+}
+
+
+void AbstractExtItem::bumpApi(const int _newVer)
+{
+    qCDebug(LOG_LIB) << "Bump API using new version" << _newVer;
+
+    // update for current API
+    if ((apiVersion() > 0) && (apiVersion() < _newVer)) {
+        qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to"
+                           << _newVer;
+        setApiVersion(_newVer);
+        writeConfiguration();
+    }
+}
+
+
+void AbstractExtItem::copyDefaults(AbstractExtItem *_other) const
+{
+    _other->setActive(isActive());
+    _other->setApiVersion(apiVersion());
+    _other->setComment(comment());
+    _other->setInterval(interval());
+    _other->setName(name());
+}
+
+
+QString AbstractExtItem::writtableConfig() const
+{
+    QString path = m_fileName;
+    QString name = QFileInfo(path).fileName();
+    path.remove(path.count() - name.count() - 1, name.count() + 1);
+    QString dir = QFileInfo(path).fileName();
+
+    return QString("%1/awesomewidgets/%2/%3")
+        .arg(QStandardPaths::writableLocation(
+            QStandardPaths::GenericDataLocation))
+        .arg(dir)
+        .arg(name);
+}
+
+
+int AbstractExtItem::apiVersion() const
+{
+    return m_apiVersion;
+}
+
+
+QString AbstractExtItem::comment() const
+{
+    return m_comment;
+}
+
+
+QString AbstractExtItem::fileName() const
+{
+    return m_fileName;
+}
+
+
+int AbstractExtItem::interval() const
+{
+    return m_interval;
+}
+
+
+bool AbstractExtItem::isActive() const
+{
+    return m_active;
+}
+
+
+QString AbstractExtItem::name() const
+{
+    return m_name;
+}
+
+
+int AbstractExtItem::number() const
+{
+    return m_number;
+}
+
+
+QString AbstractExtItem::tag(const QString _type) const
+{
+    qCDebug(LOG_LIB) << "Tag type" << _type;
+
+    return QString("%1%2").arg(_type).arg(number());
+}
+
+
+void AbstractExtItem::setApiVersion(const int _apiVersion)
+{
+    qCDebug(LOG_LIB) << "Version" << _apiVersion;
+
+    m_apiVersion = _apiVersion;
+}
+
+
+void AbstractExtItem::setActive(const bool _state)
+{
+    qCDebug(LOG_LIB) << "State" << _state;
+
+    m_active = _state;
+}
+
+
+void AbstractExtItem::setComment(const QString _comment)
+{
+    qCDebug(LOG_LIB) << "Comment" << _comment;
+
+    m_comment = _comment;
+}
+
+
+void AbstractExtItem::setInterval(const int _interval)
+{
+    qCDebug(LOG_LIB) << "Interval" << _interval;
+    if (_interval <= 0)
+        return;
+
+    m_interval = _interval;
+}
+
+
+void AbstractExtItem::setName(const QString _name)
+{
+    qCDebug(LOG_LIB) << "Name" << _name;
+
+    m_name = _name;
+}
+
+
+void AbstractExtItem::setNumber(int _number)
+{
+    qCDebug(LOG_LIB) << "Number" << _number;
+    bool generateNumber = (_number == -1);
+    if (generateNumber) {
+        _number = []() {
+            qCWarning(LOG_LIB) << "Number is empty, generate new one";
+            // we suppose that currentTIme().msec() is always valid time
+            qsrand(static_cast<uint>(QTime::currentTime().msec()));
+            int n = qrand() % 1000;
+            qCInfo(LOG_LIB) << "Generated number is" << n;
+            return n;
+        }();
+    }
+
+    m_number = _number;
+    if (generateNumber)
+        writeConfiguration();
+}
+
+
+void AbstractExtItem::readConfiguration()
+{
+    QSettings settings(m_fileName, QSettings::IniFormat);
+
+    settings.beginGroup(QString("Desktop Entry"));
+    setName(settings.value(QString("Name"), name()).toString());
+    setComment(settings.value(QString("Comment"), comment()).toString());
+    setApiVersion(
+        settings.value(QString("X-AW-ApiVersion"), apiVersion()).toInt());
+    setActive(
+        settings.value(QString("X-AW-Active"), QVariant(isActive())).toString()
+        == QString("true"));
+    setInterval(settings.value(QString("X-AW-Interval"), interval()).toInt());
+    setNumber(settings.value(QString("X-AW-Number"), number()).toInt());
+    settings.endGroup();
+}
+
+
+bool AbstractExtItem::tryDelete() const
+{
+    bool status = QFile::remove(m_fileName);
+    qCInfo(LOG_LIB) << "Remove file" << m_fileName << status;
+
+    return status;
+}
+
+
+void AbstractExtItem::writeConfiguration() const
+{
+    QSettings settings(writtableConfig(), QSettings::IniFormat);
+    qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
+
+    settings.beginGroup(QString("Desktop Entry"));
+    settings.setValue(QString("Encoding"), QString("UTF-8"));
+    settings.setValue(QString("Name"), name());
+    settings.setValue(QString("Comment"), comment());
+    settings.setValue(QString("X-AW-ApiVersion"), apiVersion());
+    settings.setValue(QString("X-AW-Active"), QVariant(isActive()).toString());
+    settings.setValue(QString("X-AW-Interval"), interval());
+    settings.setValue(QString("X-AW-Number"), number());
+    settings.endGroup();
+
+    settings.sync();
+}

sources/awesomewidgets/abstractextitem.h

@@ -15,82 +15,73 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#ifndef EXTUPGRADE_H
-#define EXTUPGRADE_H
+#ifndef ABSTRACTEXTITEM_H
+#define ABSTRACTEXTITEM_H
 
 #include <QDialog>
-#include <QProcess>
+#include <QVariant>
 
 
-namespace Ui {
-    class ExtUpgrade;
-}
-
-class ExtUpgrade : public QDialog
+class AbstractExtItem : public QDialog
 {
     Q_OBJECT
-    Q_PROPERTY(int apiVersion READ apiVersion WRITE setApiVersion)
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(QString comment READ comment WRITE setComment)
-    Q_PROPERTY(QString executable READ executable WRITE setExecutable)
-    Q_PROPERTY(int null READ null WRITE setNull)
-    Q_PROPERTY(int number READ number WRITE setNumber)
     Q_PROPERTY(bool active READ isActive WRITE setActive)
+    Q_PROPERTY(int apiVersion READ apiVersion WRITE setApiVersion)
+    Q_PROPERTY(QString comment READ comment WRITE setComment)
+    Q_PROPERTY(QString fileName READ fileName)
     Q_PROPERTY(int interval READ interval WRITE setInterval)
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(int number READ number WRITE setNumber)
+    Q_PROPERTY(QString uniq READ uniq)
 
 public:
-    explicit ExtUpgrade(QWidget *parent = nullptr, const QString upgradeName = QString(),
-                        const QStringList directories = QStringList(), const bool debugCmd = false);
-    ~ExtUpgrade();
+    explicit AbstractExtItem(QWidget *parent,
+                             const QString filePath = QString());
+    virtual ~AbstractExtItem();
+    virtual void bumpApi(const int _newVer);
+    virtual AbstractExtItem *copy(const QString _fileName, const int _number)
+        = 0;
+    virtual void copyDefaults(AbstractExtItem *_other) const;
+    QString writtableConfig() const;
     // get methods
-    int apiVersion();
-    QString comment();
-    QString executable();
-    QString fileName();
-    int interval();
-    QString name();
-    int null();
-    int number();
-    QString tag();
-    bool isActive();
+    int apiVersion() const;
+    QString comment() const;
+    QString fileName() const;
+    int interval() const;
+    bool isActive() const;
+    QString name() const;
+    int number() const;
+    QString tag(const QString _type) const;
+    virtual QString uniq() const = 0;
     // set methods
     void setApiVersion(const int _apiVersion = 0);
     void setActive(const bool _state = true);
     void setComment(const QString _comment = QString("empty"));
-    void setExecutable(const QString _executable = QString("/usr/bin/true"));
+    void setInterval(const int _interval = 1);
     void setName(const QString _name = QString("none"));
-    void setNull(const int _null = 0);
     void setNumber(int _number = -1);
-    void setInterval(const int _interval = 0);
+
+signals:
+    void dataReceived(const QVariantHash &data);
 
 public slots:
-    void readConfiguration();
-    int run();
-    int showConfiguration();
-    bool tryDelete();
-    void writeConfiguration();
-
-private slots:
-    void updateValue();
+    virtual void readConfiguration();
+    virtual QVariantHash run() = 0;
+    virtual int showConfiguration(const QVariant args = QVariant()) = 0;
+    bool tryDelete() const;
+    virtual void writeConfiguration() const;
 
 private:
-    QString m_fileName;
-    QStringList m_dirs;
-    bool debug;
-    QProcess *process = nullptr;
-    Ui::ExtUpgrade *ui;
+    QString m_fileName = QString("/dev/null");
+    virtual void translate() = 0;
     // properties
     int m_apiVersion = 0;
     bool m_active = true;
     QString m_comment = QString("empty");
-    QString m_executable = QString("/usr/bin/true");
+    int m_interval = 1;
     QString m_name = QString("none");
-    int m_null = 0;
     int m_number = -1;
-    int m_interval = 3600;
-    int times = 0;
-    int value = 0;
 };
 
 
-#endif /* EXTUPGRADE_H */
+#endif /* ABSTRACTEXTITEM_H */

sources/awesomewidgets/abstractextitemaggregator.cpp

@@ -0,0 +1,215 @@
+/***************************************************************************
+ *   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 "abstractextitemaggregator.h"
+#include "ui_abstractextitemaggregator.h"
+
+#include <KI18n/KLocalizedString>
+
+#include <QFileInfo>
+#include <QInputDialog>
+#include <QPushButton>
+
+
+AbstractExtItemAggregator::AbstractExtItemAggregator(QWidget *parent,
+                                                     const QString type)
+    : QDialog(parent)
+    , ui(new Ui::AbstractExtItemAggregator)
+    , m_type(type)
+{
+    qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
+
+    ui->setupUi(this);
+    copyButton
+        = ui->buttonBox->addButton(i18n("Copy"), QDialogButtonBox::ActionRole);
+    createButton = ui->buttonBox->addButton(i18n("Create"),
+                                            QDialogButtonBox::ActionRole);
+    deleteButton = ui->buttonBox->addButton(i18n("Remove"),
+                                            QDialogButtonBox::ActionRole);
+
+    connect(ui->buttonBox, SIGNAL(clicked(QAbstractButton *)), this,
+            SLOT(editItemButtonPressed(QAbstractButton *)));
+    connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(ui->listWidget, SIGNAL(itemActivated(QListWidgetItem *)), this,
+            SLOT(editItemActivated(QListWidgetItem *)));
+}
+
+
+AbstractExtItemAggregator::~AbstractExtItemAggregator()
+{
+    qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
+
+    delete ui;
+}
+
+
+void AbstractExtItemAggregator::copyItem()
+{
+    AbstractExtItem *source = itemFromWidget();
+    QString fileName = getName();
+    int number = uniqNumber();
+    QString dir = QString("%1/awesomewidgets/%2")
+                      .arg(QStandardPaths::writableLocation(
+                          QStandardPaths::GenericDataLocation))
+                      .arg(m_type);
+    if ((!source) || (fileName.isEmpty())) {
+        qCWarning(LOG_LIB) << "Nothing to copy";
+        return;
+    }
+    QString filePath = QString("%1/%2").arg(dir).arg(fileName);
+
+    AbstractExtItem *newItem = source->copy(filePath, number);
+    if (newItem->showConfiguration(configArgs()) == 1) {
+        initItems();
+        repaintList();
+    }
+}
+
+
+void AbstractExtItemAggregator::deleteItem()
+{
+    AbstractExtItem *source = itemFromWidget();
+    if (!source) {
+        qCWarning(LOG_LIB) << "Nothing to delete";
+        return;
+    };
+
+    if (source->tryDelete()) {
+        initItems();
+        repaintList();
+    }
+}
+
+
+void AbstractExtItemAggregator::editItem()
+{
+    AbstractExtItem *source = itemFromWidget();
+    if (!source) {
+        qCWarning(LOG_LIB) << "Nothing to edit";
+        return;
+    };
+
+    if (source->showConfiguration(configArgs()) == 1) {
+        initItems();
+        repaintList();
+    }
+}
+
+
+QString AbstractExtItemAggregator::getName()
+{
+    bool ok;
+    QString name = QInputDialog::getText(this, i18n("Enter file name"),
+                                         i18n("File name"), QLineEdit::Normal,
+                                         QString(""), &ok);
+    if ((!ok) || (name.isEmpty()))
+        return QString("");
+    if (!name.endsWith(QString(".desktop")))
+        name += QString(".desktop");
+
+    return name;
+}
+
+
+AbstractExtItem *AbstractExtItemAggregator::itemFromWidget()
+{
+    QListWidgetItem *widgetItem = ui->listWidget->currentItem();
+    if (!widgetItem)
+        return nullptr;
+
+    AbstractExtItem *found = nullptr;
+    for (auto item : items()) {
+        QString fileName = QFileInfo(item->fileName()).fileName();
+        if (fileName != widgetItem->text())
+            continue;
+        found = item;
+        break;
+    }
+    if (!found)
+        qCWarning(LOG_LIB) << "Could not find item by name"
+                           << widgetItem->text();
+
+    return found;
+}
+
+
+void AbstractExtItemAggregator::repaintList()
+{
+    ui->listWidget->clear();
+    for (auto _item : items()) {
+        QString fileName = QFileInfo(_item->fileName()).fileName();
+        QListWidgetItem *item = new QListWidgetItem(fileName, ui->listWidget);
+        QStringList tooltip;
+        tooltip.append(i18n("Name: %1", _item->name()));
+        tooltip.append(i18n("Comment: %1", _item->comment()));
+        tooltip.append(i18n("Identity: %1", _item->uniq()));
+        item->setToolTip(tooltip.join(QChar('\n')));
+        ui->listWidget->addItem(item);
+    }
+}
+
+
+int AbstractExtItemAggregator::uniqNumber() const
+{
+    QList<int> tagList;
+    for (auto item : items())
+        tagList.append(item->number());
+    int number = 0;
+    while (tagList.contains(number))
+        number++;
+
+    return number;
+}
+
+
+QVariant AbstractExtItemAggregator::configArgs() const
+{
+    return m_configArgs;
+}
+
+
+QString AbstractExtItemAggregator::type() const
+{
+    return m_type;
+}
+
+
+void AbstractExtItemAggregator::setConfigArgs(const QVariant _configArgs)
+{
+    qCDebug(LOG_LIB) << "Configuration arguments" << _configArgs;
+
+    m_configArgs = _configArgs;
+}
+
+
+void AbstractExtItemAggregator::editItemActivated(QListWidgetItem *)
+{
+    return editItem();
+}
+
+
+void AbstractExtItemAggregator::editItemButtonPressed(QAbstractButton *button)
+{
+    if (static_cast<QPushButton *>(button) == copyButton)
+        return copyItem();
+    else if (static_cast<QPushButton *>(button) == createButton)
+        return doCreateItem();
+    else if (static_cast<QPushButton *>(button) == deleteButton)
+        return deleteItem();
+    else if (ui->buttonBox->buttonRole(button) == QDialogButtonBox::AcceptRole)
+        return editItem();
+}

sources/awesomewidgets/abstractextitemaggregator.h

@@ -0,0 +1,99 @@
+/***************************************************************************
+ *   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 ABSTRACTEXTITEMAGGREGATOR_H
+#define ABSTRACTEXTITEMAGGREGATOR_H
+
+#include <QDialog>
+#include <QStandardPaths>
+
+#include "abstractextitem.h"
+#include "awdebug.h"
+
+
+class QAbstractButton;
+class QListWidgetItem;
+namespace Ui
+{
+class AbstractExtItemAggregator;
+}
+
+class AbstractExtItemAggregator : public QDialog
+{
+    Q_OBJECT
+    Q_PROPERTY(QVariant configArgs READ configArgs WRITE setConfigArgs)
+    Q_PROPERTY(QVariant type READ type)
+
+public:
+    explicit AbstractExtItemAggregator(QWidget *parent, const QString type);
+    virtual ~AbstractExtItemAggregator();
+    // methods
+    void copyItem();
+    template <class T> void createItem()
+    {
+        QString fileName = getName();
+        int number = uniqNumber();
+        QString dir = QString("%1/awesomewidgets/%2")
+                          .arg(QStandardPaths::writableLocation(
+                              QStandardPaths::GenericDataLocation))
+                          .arg(m_type);
+        if (fileName.isEmpty()) {
+            qCWarning(LOG_LIB) << "Nothing to create";
+            return;
+        };
+        QString filePath = QString("%1/%2").arg(dir).arg(fileName);
+
+        T *newItem = new T(this, filePath);
+        newItem->setNumber(number);
+        if (newItem->showConfiguration(configArgs()) == 1) {
+            initItems();
+            repaintList();
+        };
+    };
+    void deleteItem();
+    void editItem();
+    QString getName();
+    AbstractExtItem *itemFromWidget();
+    void repaintList();
+    int uniqNumber() const;
+    // get methods
+    QVariant configArgs() const;
+    virtual QList<AbstractExtItem *> items() const = 0;
+    QString type() const;
+    // set methods
+    void setConfigArgs(const QVariant _configArgs);
+
+private slots:
+    void editItemActivated(QListWidgetItem *);
+    void editItemButtonPressed(QAbstractButton *button);
+
+private:
+    // ui
+    Ui::AbstractExtItemAggregator *ui = nullptr;
+    QPushButton *copyButton = nullptr;
+    QPushButton *createButton = nullptr;
+    QPushButton *deleteButton = nullptr;
+    // properties
+    QVariant m_configArgs;
+    QString m_type;
+    // ui methods
+    virtual void doCreateItem() = 0;
+    virtual void initItems() = 0;
+};
+
+
+#endif /* ABSTRACTEXTITEMAGGREGATOR_H */

sources/awesomewidgets/abstractextitemaggregator.ui

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

sources/awesomewidgets/abstractweatherprovider.h

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