create pkgbuild for the last stable archive in 2.4.0 branch

.github/workflows/build.yml

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

.github/workflows/release.yml

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

.gitignore

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

.gitmodules

@@ -0,0 +1,9 @@
+[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,11 @@
+install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y cmake extra-cmake-modules g++ git libkf5i18n-dev libkf5notifications-dev libkf5service-dev libkf5windowsystem-dev plasma-framework-dev qtbase5-dev qtdeclarative5-dev
+  - git submobule update --init
+  - rm -rf build
+  - mkdir build
+
+script:
+  - cd build
+  - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_USE_QT_SYS_PATHS=ON ../sources
+  - make

.tx/config

@@ -1,8 +0,0 @@
-[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,15 +1,9 @@
 Current developers:
 Evgeniy Alekseev aka arcanis <esalexeev (at) gmail (dot) com>
 
-Packagers:
-Konstantin Voinov (openSuSe)
-
 Translators:
-@Mermouy (French)
+@Mermouy (French translation)
-Ernesto Avilés Vzqz (Spanish)
+Ernesto Avilés Vzqz (Spanish translation)
-@underr (Brazillian Portuguese)
+@underr (Brazillian Portuguese translation)
-Виктор Слободян (Ukrainian)
+Виктор Слободян (Ukrainian translation)
-Steve Lemuel (Chinese)
+Steve Lemuel (Chinese translation)
-Mariusz Kocoń (Polish)
-Ibnu Daru Aji (Indonesian)
-Antonio Vivace (Italian)

CHANGELOG

@@ -1,168 +1,5 @@
-Ver.4.0.1:
++ add tags upunits, downunits
-- temporary disable tooltip painting in main widget
-
-Ver.4.0.0:
-* migration to plasma 6
-* dialog windows have been replaced by notifications
-+ $gpuN keys have been added
-+ new key $ssid
-- $cuptime key has been removed in favour of $uptime
-- $gputemp key has been replaced by $gpuN
-
-Ver.3.5.0:
-+ wayland support
-* update code to latest standards
-- drop support of windows preview
-
-Ver.3.4.2:
-+ Italian translation (#136, thanks to @avivace)
-+ stooq quotes support (default) (#131)
-+ Indonesian translation (#132, thanks to @ibnuda)
-+ new keys - $batleftN, $batnowN, $batrateN, $battotalN, $brightness, $volume
-* fix compiler warnings
-* update to new qt api
-- fix non printable spaces (#142, #143)
-
-Ver.3.3.3:
-+ add custom keys support (#101)
-* DBus interface improvements
-* rename tags (up|down|ps)total.* to (up|down|ps)tot.*
-- fix issue with invalid (up|down)total($|kb) calculation (#127)
-- fix issue with wrong applet identation (#125)
-
-Ver.3.3.2:
-- fix bug with invalid DP colour configuration
-- fix bug with invalid HTML tags operation
-* update to newest Qt and plasma
-
-Ver.3.3.1:
-+ add ability to direct issue report (#104)
-+ add key completion (#105)
-+ add ability to load historical configuration (#106)
-+ add ability to upload configuration to remote server (#106)
-+ add stylish (#112)
-+ add DBus intergration (#115)
-+ add cron-like extenstion triggers (`X-AW-Socket` option) (#117)
-+ add ability to trigger extensions by calling socket (`X-AW-Schedule` option) (#118)
-+ add source for network requests
-+ add Json formatter
-- drop patches provided support for Qt 5.4
-* use custom signal slot connection for dataengine (`BUILD_FUTURE` flag required)
-* update UI
-* refactoring
-
-Ver.3.2.1:
-+ add X-AW-Translate option to DateTime formatter
-+ add formatters to configuration export and import
-+ add macro fuction to selector
-+ add default formatters
-- add translation reinit (fix #102)
-- fix invalid float formatter saving
-- fix missing ApiVersion for formatters
-* use sockets for MPD data
-* translation update
-
-Ver.3.2.0:
-+ custom formatters (#91)
-+ add backend tests (#95)
-+ add OWM weather provider for ExtWeather. It can be switched by using X-AW-Provider (ApiVer 3)
-+ add DBus timeout for calls (#96)
-+ add macros support (`$aw_macro` and `$aw_macro_*` for calls)
-- fix vertical alignment (#94)
-- fix bug with invalid updates on `X-AW-Interval=1` for ExtScript and ExtUpgrade
-- fix bug with missing derivate vaules in ExtQuotes
-- fix possible plasma crash (#96)
-- fix possible undefined behaviour if no extensions was found by name
-* split dataengine sources to own library
-* allow to use screened double brakets inside functions
-
-Ver.3.1.2:
-+ add standalone widget configuration example
-+ new tag tstime
-+ new tags uptotal* and downtotal*
-+ add background configuration button
-+ allow X-AW-Direction property works with graphs and bars (graphical items)
-+ add bars support to Graphical Items
-+ add integration with transifex
-+ add integration with coverity
-- drop update source (breaking changes if you are using it as developer)
-- fix pen generation from file image (graphical items)
-- fix bug with which font html parameters will be pasted even if there cancel clicked
-- fix bug with invalid total memory formating
-- fix bug in configuration UI with which there is no selected text pasted
-- fixes in graphical item configuration UI and behaviour
-- fix changelog building
-- fix invalid cast (found by coverity)
-* change text update mechanism
-* grahical item improvements
-* code improvements
-* translation update
-
-Ver.3.1.1:
-- fix broken gcc build (#87)
-* translation update
-
-Ver.3.1.0:
-+ implement templates support (#71)
-+ implement special functions (#71)
-+ special directory for configs (#72)
-+ custom bar images (#80)
-+ custom bar values (#80)
-+ show changelog after updates
-+ add Polish translation (thanks to Mariusz Kocoń)
-+ use Qt-5.6 features
-- fix invalid tooltip resize in desktop panel (#74)
-- fix graphical items blinking (#81)
-- drop tasks and move to native QProcess to avoid crash (#83)
-- the newest Qt (5.6) fixes
-- the newest Plasma fixes
-* move from OWM to Yahoo! Weather (#73)
-* improve performance by using optimized subscriptions (#75)
-* improve performance by storing QVariant instead of frequent casting (#75)
-* change bar names semantic to the simplest one (#80, breaking changes)
-* high memory usage notifications have been changed from 90 to 80 perc
-* a large part of refactoring
-
-Ver.3.0.1:
-+ add patches for old Qt versions
-- drop `nullptr` checking
-* move dialogs to QML part
-
-Ver.3.0.0:
-+ add tags upunits, downunits, upkb, downkb
-+ add tags dalbum, dartist, dtitle, salbum, sartist, stitle
-+ add support of lambda functions
-+ add Dutch translation (thanks to Heimen Stoffels)
-+ add check for update function on startup (optional)
-+ add ability to disable string tags translations
-+ add filtering to ExtUpgrade (ApiVer == 3)
-+ add ability to change weather icons (ApiVer == 2)
-+ show message if no updates found on direct request
-+ add swap redirect type to ExtScript (ApiVer == 4)
-+ add ability to wrap words
-+ add support of graphs to GraphicalItems (ApiVer == 3)
-+ add ability to show preview from configuration
-+ add configuration export and import functions
 - fix warning for empty tooltip image
-- fix bug with widget auto resizing
-- fix bug with no settings saving in DE
-- fix bug with large start size
-- fix bug with no possibility use more than 10 ext tags
-- drop HDD free space notifications
-- drop X-AW-Output key for ExtScript (ApiVer == 4)
-- fix possible crash on web sources destruction
-* more pretty configuration ui
-* improve logging, change format to Qt5 style
-* switch to concurrent data update
-* some more optimization
-* better network device definition
-* quotes values now have double type (ApiVer == 3)
-* better quotes output
-* more comments inside code
-* more Qt code style
-* move update interval to another group
-* move DataEnignes operations to plugin
-* change DataEngine data format (breaking changes)
 
 Ver.2.4.0:
 + add support of weather items

CHANGELOG-RU

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

CONTRIBUTING.md

@@ -1,187 +0,0 @@
-Code style
-----------
-
-The recommended code style is Qt one. See [this document](https://wiki.qt.io/Qt_Coding_Style)
-for more details. To avoid manual labor there is automatic cmake target named
-`clangformat` (see below). Some additional detail see below.
-
-* Indent is only spaces. 4 spaces.
-* Any private variable should start with `m_` prefix (`m_foo`). The only one exception is `Ui` object which should be named as `ui`.
-* Avoid to create a large methods. Exception: if method contains lambda functions.
-* 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 `#pragma once`.
-* 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++23**.
-* Do not use C-like code:
-    * C-like style iteration if possible. Use `for (auto &foo : bar)` and `std::for_each` instead if possible. It is also recommended to use iterators.
-    * C-like casts, use `const_cast`, `static_cast`, `dymanic_Cast` instead. Using of `reinterpret_cast` is not recommended. It is highly recommended to use `dynamic_cast` with the exception catching. It is also possible to use `qvariant_cast` if required.
-    * C-like `NULL`, use `nullptr` instead.
-    * C-like constant definition, use `static const vartype foo = bar` definition instead.
-* Abstract classes (which have at least one pure virtual method) are allowed.
-* Templates are allowed and recommended. Templates usually should be described inside header not source code file.
-* Hardcode is not recommended. But it is possible to use cmake variables to configure some items during build time.
-* 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 assigned to `nullptr` after deletion and before initialization. Exception: if object is deleted into class destructor.
-* Do not use semicolon in qml files unless it is required.
-* Any method argument including class constructors should start with `_`.
-
-Comments
---------
-
-Please do not hesitate to use comments inside source code (especially in non-obvious blocks). Comments also may use the following keywords:
-
-* **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 **master**.
-* For experimental features development new branch `feature/foo` creation is allowed and recommended.
-* Experimental features should be added inside `BUILD_FUTURE` definition:
-
-  ```
-  #ifdef BUILD_FUTURE
-  someTestFunctionInside();
-  #endif /* BUILD_FUTURE */
-  ```
-
-* Any project specific build variable should be mentioned inside `version.h` as well.
-* Recommended compiler is `clang`.
-
-HIG
----
-
-The recommended HIG is [KDE one](https://techbase.kde.org/Projects/Usability/HIG). Avoid to paint interfaces inside plugin because QML and C++ parts may have different theming.
-
-Licensing
----------
-
-All files should be licensed under GPLv3, the owner of the license should be the project (i.e. **awesome-widgets**). See **Tools** section for more details.
-
-Logging
--------
-
-For logging please use [QLoggingCategory](http://doc.qt.io/qt-5/qloggingcategory.html). Available categories should be declared in `awdebug.*` files. The following log levels should be used:
-
-* **debug** (`qCDebug()`) - method arguments information. Please note that it is recommended to logging all arguments in the one line.
-* **info** (`qCInfo()`) - additional information inside methods.
-* **warning** (`qCWarning()`) - not critical information, which may be caused by mistakes in configuration for example.
-* **critical** (`qCCritical()`) - a critical error. After this error program may be terminated.
-
-The empty log string (e.g. `qCDebug();`) is not allowed because the method names will be stripped by compiler with `Release` build type. To log class constructor and destructor use `__PRETTY_FUNCTION__` macro.
-
-Testing
--------
-
-* Any changes should be tested by using `plasmawindowed` and `plasmashell` applications. (It is also possible to use `plasmaengineexplorer` and `plasmoidviewer` in addition.)
-* Any test should be performed on real (not Virtual Machine) system.
-* Test builds should be:
-    1. `-DCMAKE_BUILD_TYPE=Debug`.
-    2. `-DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON`.
-    3. `-DCMAKE_BUILD_TYPE=Release`.
-* Additional test functions should be declated and used only inside `BUILD_TESTING` definition.
-
-Tools
------
-
-* For QString concatenation use `QString::arg` method.
-* Any source file should have license header:
-
-  ```
-  /***************************************************************************
-  *   This file is part of awesome-widgets                                  *
-  *                                                                         *
-  *   awesome-widgets is free software: you can redistribute it and/or      *
-  *   modify it under the terms of the GNU General Public License as        *
-  *   published by the Free Software Foundation, either version 3 of the    *
-  *   License, or (at your option) any later version.                       *
-  *                                                                         *
-  *   awesome-widgets is distributed in the hope that it will be useful,    *
-  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-  *   GNU General Public License for more details.                          *
-  *                                                                         *
-  *   You should have received a copy of the GNU General Public License     *
-  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
-  ***************************************************************************/
-  ```
-
-* Recommended class constructor for QObject based classes:
-
-  ```
-  FooClass::FooClass(QObject *_parent, const QVariant _var)
-      : QObject(_parent)
-      , m_var(_var)
-  {
-      qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-      // some code below if any
-  }
-  ```
-
-* Property usage:
-
-  ```
-        Q_PROPERTY(bool prop READ prop WRITE setProp);
-  public:
-        bool prop() const
-        {
-            return m_prop;
-        };
-        void setProp(const bool _prop)
-        {
-            // error checking if required
-            m_prop = _prop
-        }
-  private:
-        // declare with default value
-        bool m_prop = false;
-  ```
-* Use `cppcheck` to avoid common errors in the code. To start application just run `make cppcheck`.
-* Use `clang-format` to apply valid code format. To start application just run `make clangformat`.
-* use `-DCMAKE_CXX_COMPILER=clang++` in order to enable clang-tidy checks.

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.
 
-    {one line to give the program's name and a brief idea of what it does.}
+    awesome-widgets
-    Copyright (C) {year}  {name of author}
+    Copyright (C) 2013-2014 Evgeniy Alekseev
 
     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:
 
-    {project}  Copyright (C) {year}  {fullname}
+    awesome-widgets  Copyright (C) 2013 Evgeniy Alekseev
     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,9 +1,6 @@
 awesome-widgets (ex-pytextmonitor)
 ==================================
 
-[![build & tests](https://github.com/arcan1s/awesome-widgets/actions/workflows/build.yml/badge.svg)](https://github.com/arcan1s/awesome-widgets/actions/workflows/build.yml)
-[![Coverity Scan Build Status](https://scan.coverity.com/projects/8254/badge.svg)](https://scan.coverity.com/projects/awesome-widgets)
-
 Information
 -----------
 
@@ -14,11 +11,11 @@ A collection of minimalistic widgets which looks like Awesome Window Manager wid
 Features
 ========
 
-* easy and fully configurable native Plasma widget which may be used as desktop or panel widget
+* easy and fully configurable native Plasma widget which may be used as Conky widget or as Awesome-like information panel
-* additionnal widget which shows active desktop status
+* panel which shows active desktop status
-* clear text configuration with html tags support
+* clear Conky-like configuration with html tags support
 * custom command support (it may be simple action as well as special custom tag)
-* graphical widgets support - tooltips, bars
+* graphical item support - tooltips, bars
 
 See [links](#Links) for more details.
 
@@ -30,13 +27,15 @@ Instruction
 Dependencies
 ------------
 
-* plasma-workspace
+* plasma-framework
 
 Optional dependencies
 ---------------------
 
+* proprietary video driver
+* hddtemp
+* smartmontools
 * music player (mpd or MPRIS supported)
-* wireless_tools
 
 Make dependencies
 -----------------
@@ -44,20 +43,17 @@ Make dependencies
 * cmake
 * extra-cmake-modules
 
-In addition, some distros might require to install some -dev packages, e.g. the list of required packages for deb-based distros can be found [here](https://github.com/arcan1s/awesome-widgets/blob/development/.docker/Dockerfile-ubuntu-amd64#L7).
-
 Installation
 ------------
 
 * download sources
-* build package
+* install
 
-      cmake -B build -S sources -DCMAKE_BUILD_TYPE=Release
+        mkdir build && cd build
-      cmake --build build
+        cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../
+        make && sudo make install
 
-* install package 
+  **NOTE** on Plasma 5 it very likely requires `-DKDE_INSTALL_USE_QT_SYS_PATHS=ON` flag
-
-      cmake --install build
 
 Additional information
 ======================
@@ -70,9 +66,9 @@ See [milestones](https://github.com/arcan1s/awesome-widgets/milestones) for more
 Links
 -----
 
-* [Homepage](https://arcanis.me/projects/awesome-widgets/)
+* [Homepage](http://arcanis.name/projects/awesome-widgets/)
-* [Migration to 2.*](https://arcanis.me/en/2014/09/04/migration-to-v2/)
+* [Migration to 2.*](http://arcanis.name/en/2014/09/04/migration-to-v2/)
-* [Scripts and bars](https://arcanis.me/en/2014/12/19/aw-v21-bells-and-whistles/)
+* [Scripts and bars](http://arcanis.name/en/2014/12/19/aw-v21-bells-and-whistles/)
 * Plasmoid on [kde-look](http://kde-look.org/content/show.php/Awesome+Widgets?content=157124)
 * DataEngine on [kde-look](http://kde-look.org/content/show.php/Extended+Systemmonitor+DataEngine?content=158773)
 * Archlinux [AUR](https://aur.archlinux.org/packages/plasma5-applet-awesome-widgets/) package

create_archive.sh

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

packages/PKGBUILD

@@ -1,31 +1,54 @@
 # Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
 
-pkgname=plasma6-applet-awesome-widgets
+pkgname=plasma5-applet-awesome-widgets
 _pkgname=awesome-widgets
-pkgver=4.0.0alpha2
+pkgver=2.4.0.r34.gbe26033
 pkgrel=1
-pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
+pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor). Git version"
-arch=('x86_64')
+arch=('i686' 'x86_64')
-url="https://arcanis.me/projects/awesome-widgets"
+url="http://arcanis.name/projects/awesome-widgets"
 license=('GPL3')
-depends=('plasma-workspace')
+depends=('plasma-framework')
-optdepends=("mpd: for music player monitor"
+optdepends=("amarok: for music player monitor"
-            "wireless_tools: wifi information")
+            "clementine: for music player monitor"
-makedepends=('cmake' 'extra-cmake-modules' 'python')
+            "catalyst: for GPU monitor"
-source=(https://github.com/arcan1s/awesome-widgets/releases/download/${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
+            "hddtemp: for HDD temperature monitor"
-install="$pkgname.install"
+            "smartmontools: for HDD temperature monitor"
+            "mpd: for music player monitor"
+            "nvidia-utils: for GPU monitor"
+            "qmmp: for music player monitor")
+makedepends=('cmake' 'extra-cmake-modules' 'git')
+source=(${_pkgname}::git+https://github.com/arcan1s/awesome-widgets.git#branch=release-2.4.0)
+install=${pkgname}.install
+md5sums=('SKIP')
 backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
 
+pkgver() {
+  cd "${srcdir}/${_pkgname}"
+  git describe --tags --long | sed 's/V\.//' | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  rm -rf "${srcdir}/${_pkgname}/build"
+  mkdir "${srcdir}/${_pkgname}/build"
+
+  # update submobules
+  cd "${srcdir}/${_pkgname}"
+  git submodule init
+  git submodule update --recursive
+  echo "$pkgver"
+}
+
 build () {
-    cmake -B build -S "${_pkgname}" \
+  cd "${srcdir}/${_pkgname}/build"
-          -DCMAKE_BUILD_TYPE=Optimization \
+  cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-          -DBUILD_FUTURE=ON \
+        -DCMAKE_BUILD_TYPE=Release \
-          -DBUILD_TESTING=OFF
+        -DCMAKE_INSTALL_PREFIX=/usr \
-    cmake --build build
+        "../sources"
+  make
 }
 
 package() {
-      DESTDIR="$pkgdir" cmake --install build
+  cd "${srcdir}/${_pkgname}/build"
+  make DESTDIR="${pkgdir}" install
 }
-
-sha256sums=('b2a7b07a1df6f710f4e0d6e5898933f4ddb131818b922dc4b8e48afe3e98a664')

packages/PKGBUILD-git

@@ -1,54 +0,0 @@
-# Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
-
-pkgname=plasma5-applet-awesome-widgets
-_pkgname=awesome-widgets
-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="https://arcanis.me/projects/awesome-widgets"
-license=('GPL3')
-depends=('plasma-framework')
-optdepends=("amarok: for music player monitor"
-            "clementine: for music player monitor"
-            "catalyst: for GPU monitor"
-            "hddtemp: for HDD temperature monitor"
-            "smartmontools: for HDD temperature monitor"
-            "mpd: for music player monitor"
-            "nvidia-utils: for GPU monitor"
-            "qmmp: for music player monitor")
-makedepends=('cmake' 'extra-cmake-modules' 'git')
-source=(${_pkgname}::git+https://github.com/arcan1s/awesome-widgets/)
-install=${pkgname}.install
-md5sums=('SKIP')
-backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
-
-pkgver() {
-  cd "${srcdir}/${_pkgname}"
-  git describe --tags --long | sed 's/V\.//' | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-  rm -rf "${srcdir}/${_pkgname}/build"
-  mkdir "${srcdir}/${_pkgname}/build"
-
-  # update submobules
-  cd "${srcdir}/${_pkgname}"
-  git submodule init
-  git submodule update --recursive
-  echo "$pkgver"
-}
-
-build () {
-  cd "${srcdir}/${_pkgname}/build"
-  cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        "../sources"
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}/build"
-  make DESTDIR="${pkgdir}" install
-}

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

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

sources/.clang-format

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

sources/.kdev4/awesomewidgets.kdev4

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

sources/.kdev4/sources.kdev4

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

sources/3rdparty/about/about.ui

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

sources/3rdparty/fontdialog/COPYING

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

sources/3rdparty/fontdialog/README.md

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

sources/3rdparty/fontdialog/fontdialog.cpp

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

sources/3rdparty/fontdialog/fontdialog.h

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

sources/3rdparty/qreplytimeout/qreplytimeout.cpp

@@ -12,7 +12,7 @@ QReplyTimeout::QReplyTimeout(QNetworkReply *reply, const int timeout)
 
 void QReplyTimeout::timeout()
 {
-    auto reply = dynamic_cast<QNetworkReply *>(parent());
+    QNetworkReply *reply = static_cast<QNetworkReply *>(parent());
     if (reply->isRunning())
         reply->close();
 }

sources/CMakeLists.txt

@@ -1,29 +1,22 @@
-cmake_minimum_required(VERSION 3.16.0)
+cmake_minimum_required(VERSION 2.8.12)
 
 # 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 NEW)
+    cmake_policy(SET CMP0063 OLD)
-endif ()
+endif()
-if (POLICY CMP0071)
-    cmake_policy(SET CMP0071 NEW)
-endif ()
-if (POLICY CMP0160)
-    cmake_policy(SET CMP0160 OLD)
-endif ()
 
 project(awesomewidgets)
 set(PROJECT_AUTHOR "Evgeniy Alekseev")
 set(PROJECT_CONTACT "esalexeev@gmail.com")
 set(PROJECT_LICENSE "GPL3")
-set(PROJECT_VERSION_MAJOR "4")
+set(PROJECT_VERSION_MAJOR "2")
-set(PROJECT_VERSION_MINOR "0")
+set(PROJECT_VERSION_MINOR "4")
-set(PROJECT_VERSION_PATCH "1")
+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")
@@ -32,48 +25,43 @@ 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
+# flags
-set(PROJECT_CHANGELOG "Changelog" CACHE INTERNAL "")
+if(CMAKE_COMPILER_IS_GNUCXX)
-include(changelog.cmake)
+    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)
+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")
+    # linker flags
+    set(CMAKE_EXE_LINKER_FLAGS "-lc++abi")
+    set(CMAKE_MODULE_LINKER_FLAGS "-lc++abi")
+    set(CMAKE_SHARED_LINKER_FLAGS "-lc++abi")
+else()
+    message(FATAL_ERROR "Unknown compiler")
+endif()
+if(CMAKE_BUILD_TYPE MATCHES Debug)
+    set(CMAKE_VERBOSE_MAKEFILE ON)
+endif()
 
-# directories
+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_LIBRARY awesomewidgets)
-set(PROJECT_MONITORSOURCES extsysmonsources)
-
-# modules
-include(compiler.cmake)
 include(libraries.cmake)
-include(clang-format.cmake)
-include(cppcheck.cmake)
-include(coverity.cmake)
 
-# pre-configure
-get_directory_property(CMAKE_DEFINITIONS COMPILE_DEFINITIONS)
-configure_file(${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
-
-# build components
 add_subdirectory(awesomewidgets)
-add_subdirectory(extsysmonsources)
 add_subdirectory(extsysmon)
-if (BUILD_PLASMOIDS)
+if(BUILD_PLASMOIDS)
-    add_subdirectory(qml)
     add_subdirectory(awesome-widget)
     add_subdirectory(desktop-panel)
     add_subdirectory(translations)
-endif ()
+endif()
-if (BUILD_TESTING)
-    enable_testing()
-    add_subdirectory(test)
-endif ()
 
 include(packages-recipe.cmake)

sources/awdebug.cpp

@@ -15,115 +15,11 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#ifndef NDEBUG
-#define NDEBUG
-#endif /* NDEBUG */
-#include <KI18n/KLocalizedString>
 
 #include "awdebug.h"
 
 
 Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget", QtMsgType::QtWarningMsg)
-Q_LOGGING_CATEGORY(LOG_DBUS, "org.kde.plasma.awdbus", QtMsgType::QtWarningMsg)
 Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel", QtMsgType::QtWarningMsg)
 Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon", QtMsgType::QtWarningMsg)
-Q_LOGGING_CATEGORY(LOG_ESS, "org.kde.plasma.extsysmonsources", QtMsgType::QtWarningMsg)
 Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets", QtMsgType::QtWarningMsg)
-
-
-QString AWDebug::getAboutText(const QString &_type)
-{
-    QString text;
-    if (_type == "header") {
-        text = NAME;
-    } else if (_type == "version") {
-        text = i18n("Version %1 (build date %2)", VERSION, BUILD_DATE);
-        if (!QString(COMMIT_SHA).isEmpty())
-            text += QString(" (%1)").arg(COMMIT_SHA);
-    } else if (_type == "description") {
-        text = i18n("A set of minimalistic plasmoid widgets");
-    } else if (_type == "links") {
-        text = i18n("Links:") + "<ul>" + QString("<li><a href=\"%1\">%2</a></li>").arg(HOMEPAGE, i18n("Homepage"))
-               + QString("<li><a href=\"%1\">%2</a></li>").arg(REPOSITORY, i18n("Repository"))
-               + QString("<li><a href=\"%1\">%2</a></li>").arg(BUGTRACKER, i18n("Bugtracker"))
-               + QString("<li><a href=\"%1\">%2</a></li>").arg(TRANSLATION, i18n("Translation issue"))
-               + QString("<li><a href=\"%1\">%2</a></li>").arg(AUR_PACKAGES, i18n("AUR packages"))
-               + QString("<li><a href=\"%1\">%2</a></li>").arg(OPENSUSE_PACKAGES, i18n("openSUSE packages")) + "</ul>";
-    } else if (_type == "copy") {
-        text = QString("<small>&copy; %1 <a href=\"mailto:%2\">%3</a><br>").arg(DATE, EMAIL, AUTHOR)
-               + i18n("This software is licensed under %1", LICENSE) + "</small>";
-    } else if (_type == "translators") {
-        auto translatorList = QString(TRANSLATORS).split(',');
-        for (auto &translator : translatorList)
-            translator = QString("<li>%1</li>").arg(translator);
-        text = i18n("Translators:") + "<ul>" + translatorList.join("") + "</ul>";
-    } else if (_type == "3rdparty") {
-        auto trdPartyList = QString(TRDPARTY_LICENSE).split(';', Qt::SkipEmptyParts);
-        for (auto i = 0; i < trdPartyList.count(); ++i)
-            trdPartyList[i] = QString("<li><a href=\"%3\">%1</a> (%2 license)</li>")
-                                  .arg(trdPartyList.at(i).split(',')[0], trdPartyList.at(i).split(',')[1],
-                                       trdPartyList.at(i).split(',')[2]);
-        text = i18n("This software uses:") + "<ul>" + trdPartyList.join("") + "</ul>";
-    } else if (_type == "thanks") {
-        auto thanks = QString(SPECIAL_THANKS).split(';', Qt::SkipEmptyParts);
-        for (auto i = 0; i < thanks.count(); ++i)
-            thanks[i]
-                = QString("<li><a href=\"%2\">%1</a></li>").arg(thanks.at(i).split(',')[0], thanks.at(i).split(',')[1]);
-        text = i18n("Special thanks to:") + "<ul>" + thanks.join("") + "</ul>";
-    }
-
-    return text;
-}
-
-
-QStringList AWDebug::getBuildData()
-{
-    QStringList metadata;
-    metadata.append("=== Awesome Widgets configuration details ===");
-    // build information
-    metadata.append("Build details:");
-    metadata.append(QString("    VERSION: %1").arg(VERSION));
-    metadata.append(QString("    COMMIT_SHA: %1").arg(COMMIT_SHA));
-    metadata.append(QString("    BUILD_DATE: %1").arg(BUILD_DATE));
-    // configuration
-    metadata.append("API details:");
-    metadata.append(QString("    AW_GRAPHITEM_API: %1").arg(AW_GRAPHITEM_API));
-    metadata.append(QString("    AW_EXTQUOTES_API: %1").arg(AW_EXTQUOTES_API));
-    metadata.append(QString("    AW_EXTSCRIPT_API: %1").arg(AW_EXTSCRIPT_API));
-    metadata.append(QString("    AW_EXTUPGRADE_API: %1").arg(AW_EXTUPGRADE_API));
-    metadata.append(QString("    AW_EXTWEATHER_API: %1").arg(AW_EXTWEATHER_API));
-    metadata.append(QString("    AW_FORMATTER_API: %1").arg(AW_FORMATTER_API));
-    metadata.append(QString("    REQUEST_TIMEOUT: %1").arg(REQUEST_TIMEOUT));
-    metadata.append(QString("    TIME_KEYS: %1").arg(TIME_KEYS));
-    metadata.append(QString("    STATIC_KEYS: %1").arg(STATIC_KEYS));
-    // cmake properties
-    metadata.append("cmake properties:");
-    metadata.append(QString("    CMAKE_BUILD_TYPE: %1").arg(CMAKE_BUILD_TYPE));
-    metadata.append(QString("    CMAKE_CXX_COMPILER: %1").arg(CMAKE_CXX_COMPILER));
-    metadata.append(QString("    CMAKE_CXX_FLAGS: %1").arg(CMAKE_CXX_FLAGS));
-    metadata.append(QString("    CMAKE_CXX_FLAGS_DEBUG: %1").arg(CMAKE_CXX_FLAGS_DEBUG));
-    metadata.append(QString("    CMAKE_CXX_FLAGS_RELEASE: %1").arg(CMAKE_CXX_FLAGS_RELEASE));
-    metadata.append(QString("    CMAKE_CXX_FLAGS_OPTIMIZATION: %1").arg(CMAKE_CXX_FLAGS_OPTIMIZATION));
-    metadata.append(QString("    CMAKE_DEFINITIONS: %1").arg(CMAKE_DEFINITIONS));
-    metadata.append(QString("    CMAKE_INSTALL_PREFIX: %1").arg(CMAKE_INSTALL_PREFIX));
-    metadata.append(QString("    CMAKE_MODULE_LINKER_FLAGS: %1").arg(CMAKE_MODULE_LINKER_FLAGS));
-    metadata.append(QString("    CMAKE_SHARED_LINKER_FLAGS: %1").arg(CMAKE_SHARED_LINKER_FLAGS));
-    // components
-    metadata.append("Components data:");
-    metadata.append(QString("    BUILD_PLASMOIDS: %1").arg(BUILD_PLASMOIDS));
-    metadata.append(QString("    BUILD_DEB_PACKAGE: %1").arg(BUILD_DEB_PACKAGE));
-    metadata.append(QString("    BUILD_RPM_PACKAGE: %1").arg(BUILD_RPM_PACKAGE));
-    metadata.append(QString("    CLANGFORMAT_EXECUTABLE: %1").arg(CLANGFORMAT_EXECUTABLE));
-    metadata.append(QString("    COVERITY_COMMENT: %1").arg(COVERITY_COMMENT));
-    metadata.append(QString("    COVERITY_DIRECTORY: %1").arg(COVERITY_DIRECTORY));
-    metadata.append(QString("    COVERITY_EMAIL: %1").arg(COVERITY_EMAIL));
-    metadata.append(QString("    COVERITY_EXECUTABLE: %1").arg(COVERITY_EXECUTABLE));
-    metadata.append(QString("    COVERITY_URL: %1").arg(COVERITY_URL));
-    metadata.append(QString("    CPPCHECK_EXECUTABLE: %1").arg(CPPCHECK_EXECUTABLE));
-    // additional functions
-    metadata.append(QString("    PROP_FUTURE: %1").arg(PROP_FUTURE));
-    metadata.append(QString("    PROP_LOAD: %1").arg(PROP_LOAD));
-    metadata.append(QString("    PROP_TEST: %1").arg(PROP_TEST));
-
-    return metadata;
-}

sources/awdebug.h

@@ -15,28 +15,31 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWDEBUG_H
+#define AWDEBUG_H
 
 #include <QLoggingCategory>
 
-#include "version.h"
+#ifndef LOG_FORMAT
+#define LOG_FORMAT "[%{time yyyy-MM-ddTHH:mm:ss.zzz}][%{if-debug}DD%{endif}%{if-info}II%{endif}%{if-warning}WW%{endif}%{if-critical}CC%{endif}%{if-fatal}FF%{endif}][%{category}][%{function}] %{message}"
+#endif /* LOG_FORMAT */
 
-namespace AWDebug
+// define info log level
-{
+// #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
-const char LOG_FORMAT[] = "[%{time "
+// #ifndef qCInfo
-                          "process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%"
+// redefine info because it doesn't log properly
-                          "{if-warning}WW%{endif}%{if-critical}CC%{endif}%{if-"
+#ifdef qCInfo
-                          "fatal}FF%{endif}][%{category}][%{function}] "
+#undef qCInfo
-                          "%{message}";
+#endif /* qCInfo */
-
+#define qCInfo qCDebug
-QString getAboutText(const QString &_type);
+// #endif /* QT_VERSION */
-QStringList getBuildData();
-} // namespace AWDebug
 
 
 Q_DECLARE_LOGGING_CATEGORY(LOG_AW)
-Q_DECLARE_LOGGING_CATEGORY(LOG_DBUS)
 Q_DECLARE_LOGGING_CATEGORY(LOG_DP)
 Q_DECLARE_LOGGING_CATEGORY(LOG_ESM)
-Q_DECLARE_LOGGING_CATEGORY(LOG_ESS)
 Q_DECLARE_LOGGING_CATEGORY(LOG_LIB)
+
+
+#endif /* AWDEBUG_H */

sources/awesome-widget/CMakeLists.txt

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

sources/awesome-widget/metadata.desktop

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

sources/awesome-widget/metadata.json

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

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

@@ -15,7 +15,7 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.0
 
 import org.kde.plasma.configuration 2.0
 
@@ -51,12 +51,6 @@ ConfigModel {
         source: "dataengine.qml"
     }
 
-    ConfigCategory {
-        name: i18n("Report bug")
-        icon: "tools-report-bug"
-        source: "bug.qml"
-    }
-
     ConfigCategory {
         name: i18n("About")
         icon: "help-about"

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

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

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

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

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

@@ -15,220 +15,295 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.0
-import QtQuick.Controls
+import QtQuick.Controls 1.3 as QtControls
-import org.kde.kcmutils as KCM
 
-import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget 1.0
-import org.kde.plasma.private.awesomewidget
 
 
-KCM.SimpleKCM {
+Item {
     id: advancedPage
-
     // backend
-    AWConfigHelper {
+    AWActions {
-        id: awConfig
+        id: awActions;
     }
 
-    property alias cfg_background: background.checked
+    width: childrenRect.width
-    property alias cfg_translateStrings: translate.checked
+    height: childrenRect.height
-    property alias cfg_wrapNewLines: wrapNewLines.checked
+    implicitWidth: pageColumn.implicitWidth
-    property alias cfg_wrapText: wordWrap.checked
+    implicitHeight: pageColumn.implicitHeight
-    property alias cfg_notify: notify.checked
+
-    property alias cfg_checkUpdates: updates.checked
+    property bool debug: awActions.isDebugEnabled()
-    property alias cfg_optimize: optimize.checked
+
     property alias cfg_height: widgetHeight.value
     property alias cfg_width: widgetWidth.value
-    property alias cfg_interval: update.value
+    property alias cfg_notify: notify.checked
-    property string cfg_tempUnits: tempUnits.value
+    property alias cfg_wrapNewLines: wrapNewLines.checked
-    property alias cfg_customTime: customTime.value
+    property alias cfg_background: background.checked
-    property alias cfg_customUptime: customUptime.value
+    property alias cfg_customTime: customTime.text
-    property alias cfg_acOnline: acOnline.value
+    property alias cfg_customUptime: customUptime.text
-    property alias cfg_acOffline: acOffline.value
+    property string cfg_tempUnits: tempUnits.currentText
-    property alias cfg_historyCount: historyCount.value
+    property alias cfg_acOnline: acOnline.text
+    property alias cfg_acOffline: acOffline.text
+    property alias cfg_checkUpdates: updates.checked
+    property alias cfg_translateStrings: translate.checked
+
 
     Column {
+        id: pageColumn
         anchors.fill: parent
-
+        Row {
-        CheckBoxSelector {
-            id: background
-            text: i18n("Enable background")
-        }
-
-        CheckBoxSelector {
-            id: translate
-            text: i18n("Translate strings")
-        }
-
-        CheckBoxSelector {
-            id: wrapNewLines
-            text: i18n("Wrap new lines")
-        }
-
-        CheckBoxSelector {
-            id: wordWrap
-            text: i18n("Enable word wrap")
-        }
-
-        CheckBoxSelector {
-            id: notify
-            text: i18n("Enable notifications")
-        }
-
-        CheckBoxSelector {
-            id: updates
-            text: i18n("Check updates on startup")
-        }
-
-        CheckBoxSelector {
-            id: optimize
-            text: i18n("Optimize subscription")
-        }
-
-        IntegerSelector {
-            id: widgetHeight
-            maximumValue: 4096
-            minimumValue: 0
-            stepSize: 50
-            text: i18n("Widget height, px")
-            value: plasmoid.configuration.height
-        }
-
-        IntegerSelector {
-            id: widgetWidth
-            maximumValue: 4096
-            minimumValue: 0
-            stepSize: 50
-            text: i18n("Widget width, px")
-            value: plasmoid.configuration.width
-        }
-
-        IntegerSelector {
-            id: update
-            maximumValue: 10000
-            minimumValue: 1000
-            stepSize: 500
-            text: i18n("Time interval")
-            value: plasmoid.configuration.interval
-        }
-
-        ComboBoxSelector {
-            id: tempUnits
-            model: [
-                {
-                    "label": i18n("Celsius"),
-                    "name": "Celsius"
-                },
-                {
-                    "label": i18n("Fahrenheit"),
-                    "name": "Fahrenheit"
-                },
-                {
-                    "label": i18n("Kelvin"),
-                    "name": "Kelvin"
-                },
-                {
-                    "label": i18n("Reaumur"),
-                    "name": "Reaumur"
-                },
-                {
-                    "label": i18n("cm^-1"),
-                    "name": "cm^-1"
-                },
-                {
-                    "label": i18n("kJ/mol"),
-                    "name": "kJ/mol"
-                },
-                {
-                    "label": i18n("kcal/mol"),
-                    "name": "kcal/mol"
-                }
-            ]
-            text: i18n("Temperature units")
-            value: plasmoid.configuration.tempUnits
-            onValueEdited: newValue => cfg_tempUnits = newValue
-        }
-
-        LineSelector {
-            id: customTime
-            text: i18n("Custom time format")
-            value: plasmoid.configuration.customTime
-        }
-
-        LineSelector {
-            id: customUptime
-            text: i18n("Custom uptime format")
-            value: plasmoid.configuration.customUptime
-        }
-
-        LineSelector {
-            id: acOnline
-            text: i18n("AC online tag")
-            value: plasmoid.configuration.acOnline
-        }
-
-        LineSelector {
-            id: acOffline
-            text: i18n("AC offline tag")
-            value: plasmoid.configuration.acOffline
-        }
-
-        GroupBox {
-            width: parent.width
             height: implicitHeight
-            title: i18n("Actions")
+            width: parent.width
+            QtControls.Label {
+                height: parent.height
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("Widget height, px")
+            }
+            QtControls.SpinBox {
+                id: widgetHeight
+                width: parent.width * 3 / 5
+                minimumValue: 0
+                maximumValue: 4096
+                stepSize: 50
+                value: plasmoid.configuration.height
+            }
+        }
 
-            Column {
+        Row {
-                height: implicitHeight
+            height: implicitHeight
-                width: parent.width
+            width: parent.width
+            QtControls.Label {
+                height: parent.height
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("Widget width, px")
+            }
+            QtControls.SpinBox {
+                id: widgetWidth
+                width: parent.width * 3 / 5
+                minimumValue: 0
+                maximumValue: 4096
+                stepSize: 50
+                value: plasmoid.configuration.width
+            }
+        }
 
-                ButtonSelector {
+        Row {
-                    value: i18n("Drop key cache")
+            height: implicitHeight
-                    onButtonActivated: awConfig.dropCache()
+            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")
+            }
+        }
 
-                ButtonSelector {
+        Row {
-                    ExportDialog {
+            height: implicitHeight
-                        id: saveConfigAs
+            width: parent.width
-                        configuration: plasmoid.configuration
+            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")
+            }
+        }
+
+        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
+            QtControls.Label {
+                height: parent.height
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("Temperature units")
+            }
+            QtControls.ComboBox {
+                id: tempUnits
+                width: parent.width * 3 / 5
+                textRole: "label"
+                model: [
+                    {
+                        'label': i18n("Celsius"),
+                        'name': "Celsius"
+                    },
+                    {
+                        'label': i18n("Fahrenheit"),
+                        'name': "Fahrenheit"
+                    },
+                    {
+                        'label': i18n("Kelvin"),
+                        'name': "Kelvin"
+                    },
+                    {
+                        'label': i18n("Reaumur"),
+                        'name': "Reaumur"
+                    },
+                    {
+                        'label': i18n("cm^-1"),
+                        'name': "cm^-1"
+                    },
+                    {
+                        'label': i18n("kJ/mol"),
+                        'name': "kJ/mol"
+                    },
+                    {
+                        'label': i18n("kcal/mol"),
+                        'name': "kcal/mol"
                     }
-                    value: i18n("Export configuration")
+                ]
-                    onButtonActivated: saveConfigAs.open()
+                onCurrentIndexChanged: cfg_tempUnits = model[currentIndex]["name"]
-                }
+                Component.onCompleted: {
-
+                    if (debug) console.debug()
-                ButtonSelector {
+                    for (var i = 0; i < model.length; i++) {
-                    ImportDialog {
+                        if (model[i]["name"] == plasmoid.configuration.tempUnits) {
-                        id: loadConfigFrom
+                            if (debug) console.info("Found", model[i]["name"], "on", i)
-                        onConfigurationReceived: {
+                            tempUnits.currentIndex = i;
-                            for (const key in configuration)
-                                plasmoid.configuration[key] = configuration[key]
                         }
                     }
-                    value: i18n("Import configuration")
-                    onButtonActivated: loadConfigFrom.open()
                 }
             }
         }
 
-        GroupBox {
+        Row {
             height: implicitHeight
             width: parent.width
-            title: i18n("History")
+            QtControls.Label {
+                height: parent.height
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("AC online tag")
+            }
+            QtControls.TextField {
+                id: acOnline
+                width: parent.width * 3 / 5
+                text: plasmoid.configuration.acOnline
+            }
+        }
 
-            Column {
+        Row {
-                height: implicitHeight
+            height: implicitHeight
-                width: parent.width
+            width: parent.width
+            QtControls.Label {
+                height: parent.height
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("AC offline tag")
+            }
+            QtControls.TextField {
+                id: acOffline
+                width: parent.width * 3 / 5
+                text: plasmoid.configuration.acOffline
+            }
+        }
 
-                IntegerSelector {
+        Row {
-                    id: historyCount
+            height: implicitHeight
-                    maximumValue: 10000
+            width: parent.width
-                    minimumValue: 0
+            QtControls.Label {
-                    stepSize: 50
+                height: parent.heigth
-                    text: i18n("History count")
+                width: parent.width * 2 / 5
-                    value: plasmoid.configuration.historyCount
+            }
-                }
+            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: translate
+                width: parent.width * 3 / 5
+                text: i18n("Translate strings")
+            }
+        }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: parent.height
+                width: parent.width * 2 / 5
+            }
+            QtControls.Button {
+                id: selectFont
+                width: parent.width * 3 / 5
+                text: i18n("Drop key cache")
+                onClicked: awActions.dropCache()
             }
         }
     }
+
+    Component.onCompleted: {
+        if (debug) console.debug()
+    }
 }

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

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

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

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

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

@@ -15,185 +15,309 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.0
-import QtQuick.Controls
+import QtQuick.Controls 1.0 as QtControls
-import org.kde.kcmutils as KCM
+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.awesomewidgets
+import org.kde.plasma.private.awesomewidget 1.0
-import org.kde.plasma.private.awesomewidget
 
 
-KCM.SimpleKCM {
+Item {
     id: dataenginePage
-
     // backend
     AWKeys {
-        id: awKeys
+        id: awKeys;
     }
-    AWConfigHelper {
+    AWActions {
-        id: awConfig
+        id: awActions;
     }
 
-    property variant cfg_dataengine: awConfig.readDataEngineConfiguration()
+    width: childrenRect.width
+    height: childrenRect.height
+    implicitWidth: pageColumn.implicitWidth
+    implicitHeight: pageColumn.implicitHeight
+
+    property bool debug: awActions.isDebugEnabled()
+
+    property variant cfg_dataengine: awActions.readDataEngineConfiguration()
 
     Column {
+        id: pageColumn
         anchors.fill: parent
-
+        Row {
-        GroupBox {
             height: implicitHeight
             width: parent.width
-            title: i18n("ACPI")
+            QtControls.Label {
-            LineSelector {
+                height: parent.height
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
                 text: i18n("ACPI path")
-                value: cfg_dataengine["ACPIPATH"]
+            }
-                onValueEdited: newValue => cfg_dataengine["ACPIPATH"] = newValue
+            QtControls.TextField {
+                width: parent.width * 3 / 5
+                text: cfg_dataengine["ACPIPATH"]
+                onEditingFinished: cfg_dataengine["ACPIPATH"] = text
             }
         }
 
-        GroupBox {
+        Row {
             height: implicitHeight
             width: parent.width
-            title: i18n("Player")
+            QtControls.Label {
-
+                height: parent.height
-            Column {
+                width: parent.width * 2 / 5
-                height: implicitHeight
+                horizontalAlignment: Text.AlignRight
-                width: parent.width
+                verticalAlignment: Text.AlignVCenter
-                IntegerSelector {
+                text: i18n("GPU device")
-                    maximumValue: 100
+            }
-                    minimumValue: 1
+            QtControls.ComboBox {
-                    stepSize: 1
+                id: gpuDev
-                    text: i18n("Player data symbols")
+                width: parent.width * 3 / 5
-                    value: cfg_dataengine["PLAYERSYMBOLS"]
+                model: ["auto", "disable", "ati", "nvidia"]
-                    onValueEdited: newValue => cfg_dataengine["PLAYERSYMBOLS"] = newValue
+                Component.onCompleted: {
-                }
+                    if (debug) console.debug()
-
+                    for (var i=0; i<model.length; i++) {
-                ComboBoxSelector {
+                        if (model[i] == cfg_dataengine["GPUDEV"]) {
-                    model: [
+                            if (debug) console.info("Found", model[i], "on", i)
-                        {
+                            currentIndex = i;
-                            "label": "disable",
-                            "name": "disable"
-                        },
-                        {
-                            "label": "mpris",
-                            "name": "mpris"
-                        },
-                        {
-                            "label": "mpd",
-                            "name": "mpd"
                         }
-                    ]
+                    }
-                    text: i18n("Music player")
-                    value: cfg_dataengine["PLAYER"]
-                    onValueEdited: newValue => cfg_dataengine["PLAYER"] = newValue
-                }
-
-                ComboBoxSelector {
-                    id: mpris
-                    editable: true
-                    model: [
-                        {
-                            "label": "auto",
-                            "name": "auto"
-                        },
-                        {
-                            "label": "amarok",
-                            "name": "amarok"
-                        },
-                        {
-                            "label": "audacious",
-                            "name": "audacious"
-                        },
-                        {
-                            "label": "clementine",
-                            "name": "clementine"
-                        },
-                        {
-                            "label": "DeaDBeeF",
-                            "name": "DeaDBeeF"
-                        },
-                        {
-                            "label": "vlc",
-                            "name": "vlc"
-                        },
-                        {
-                            "label": "qmmp",
-                            "name": "qmmp"
-                        },
-                        {
-                            "label": "xmms2",
-                            "name": "xmms2"
-                        },
-                        {
-                            "label": cfg_dataengine["MPRIS"],
-                            "name": cfg_dataengine["MPRIS"]
-                        }
-                    ]
-                    text: i18n("MPRIS player name")
-                    currentIndex: model.length - 1
-                }
-
-                LineSelector {
-                    text: i18n("MPD address")
-                    value: cfg_dataengine["MPDADDRESS"]
-                    onValueEdited: newValue => cfg_dataengine["MPDADDRESS"] = newValue
-                }
-
-                IntegerSelector {
-                    maximumValue: 65535
-                    minimumValue: 1000
-                    stepSize: 1
-                    text: i18n("MPD port")
-                    value: cfg_dataengine["MPDPORT"]
-                    onValueEdited: newValue => cfg_dataengine["MPDPORT"] = newValue
                 }
             }
         }
 
-        GroupBox {
+        Row {
             height: implicitHeight
             width: parent.width
-            title: i18n("Extensions")
+            QtControls.Label {
-
+                height: parent.height
-            Column {
+                width: parent.width * 2 / 5
-                height: implicitHeight
+                horizontalAlignment: Text.AlignRight
-                width: parent.width
+                verticalAlignment: Text.AlignVCenter
-
+                text: i18n("HDD")
-                ButtonSelector {
+            }
-                    value: i18n("Custom scripts")
+            QtControls.ComboBox {
-                    onButtonActivated: awKeys.editItem("extscript")
+                id: hdd
+                width: parent.width * 3 / 5
+                model: awKeys.getHddDevices(true)
+                Component.onCompleted: {
+                    if (debug) console.debug()
+                    for (var i=0; i<model.length; i++) {
+                        if (model[i] == cfg_dataengine["HDDDEV"]) {
+                            if (debug) console.info("Found", model[i], "on", i)
+                            hdd.currentIndex = i;
+                        }
+                    }
                 }
+            }
+        }
 
-                ButtonSelector {
+        Row {
-                    value: i18n("Network requests")
+            height: implicitHeight
-                    onButtonActivated: awKeys.editItem("extnetworkrequest")
+            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
+            }
+        }
 
-                ButtonSelector {
+        Row {
-                    value: i18n("Package manager")
+            height: implicitHeight
-                    onButtonActivated: awKeys.editItem("extupgrade")
+            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
+            }
+        }
 
-                ButtonSelector {
+        Row {
-                    value: i18n("Quotes monitor")
+            height: implicitHeight
-                    onButtonActivated: awKeys.editItem("extquotes")
+            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
+            }
+        }
 
-                ButtonSelector {
+        Row {
-                    value: i18n("Weather")
+            height: implicitHeight
-                    onButtonActivated: awKeys.editItem("extweather")
+            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: ["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("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("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("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.debug()
+
         // init submodule
-        awKeys.updateCache()
+        awKeys.initKeys(plasmoid.configuration.text)
     }
 
     Component.onDestruction: {
-        cfg_dataengine["MPRIS"] = mpris.editText
+        if (debug) console.debug()
-        awConfig.writeDataEngineConfiguration(cfg_dataengine)
+
+        cfg_dataengine["GPUDEV"] = gpuDev.currentText
+        cfg_dataengine["HDDDEV"] = hdd.currentText
+        cfg_dataengine["PLAYER"] = player.currentText
+        cfg_dataengine["MPRIS"] = mpris.currentText
+        awActions.writeDataEngineConfiguration(cfg_dataengine)
     }
 }

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

@@ -15,24 +15,22 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+pragma Singleton
-import QtQuick.Controls
+import QtQuick 2.0
 
 
-Row {
+QtObject {
-    height: implicitHeight
+    property variant fontWeight: {
-    width: parent.width
+        "light": Font.Light,
-
+        "normal": Font.Normal,
-    property alias text: checkBox.text
+        "demibold": Font.DemiBold,
-    property alias checked: checkBox.checked
+        "bold": Font.Bold,
-
+        "black": Font.Black
-    Label {
-        height: parent.heigth
-        width: parent.width * 2 / 5
     }
-
+    property variant align: {
-    CheckBox {
+        "left": Text.AlignLeft,
-        id: checkBox
+        "center": Text.AlignHCenter,
-        width: parent.width * 3 / 5
+        "right": Text.AlignRight,
+        "justify": Text.AlignJustify
     }
 }

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

@@ -15,29 +15,35 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.4
-import QtQuick.Layouts
+import QtQuick.Controls 1.3 as QtControls
-import org.kde.plasma.core as PlasmaCore
+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.awesomewidgets
+import org.kde.plasma.private.awesomewidget 1.0
-import org.kde.plasma.private.awesomewidget
+import "."
 
 
-PlasmoidItem {
+Item {
     id: main
-
     // backend
     AWKeys {
-        id: awKeys
+        id: awKeys;
     }
     AWActions {
-        id: awActions
+        id: awActions;
-    }
-    AWTelemetryHandler {
-        id: awTelemetryHandler
     }
 
+    property bool debug: awActions.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,
@@ -46,33 +52,86 @@ PlasmoidItem {
         "cpuclTooltip": plasmoid.configuration.cpuclTooltip,
         "memTooltip": plasmoid.configuration.memTooltip,
         "swapTooltip": plasmoid.configuration.swapTooltip,
-        "downkbTooltip": plasmoid.configuration.downkbTooltip,
+        "downTooltip": plasmoid.configuration.downTooltip,
-        "upkbTooltip": plasmoid.configuration.downkbTooltip,
+        "upTooltip": plasmoid.configuration.downTooltip,
         "batTooltip": plasmoid.configuration.batTooltip,
         "cpuTooltipColor": plasmoid.configuration.cpuTooltipColor,
         "cpuclTooltipColor": plasmoid.configuration.cpuclTooltipColor,
         "memTooltipColor": plasmoid.configuration.memTooltipColor,
         "swapTooltipColor": plasmoid.configuration.swapTooltipColor,
-        "downkbTooltipColor": plasmoid.configuration.downkbTooltipColor,
+        "downTooltipColor": plasmoid.configuration.downTooltipColor,
-        "upkbTooltipColor": plasmoid.configuration.upkbTooltipColor,
+        "upTooltipColor": plasmoid.configuration.upTooltipColor,
         "batTooltipColor": plasmoid.configuration.batTooltipColor,
         "batInTooltipColor": plasmoid.configuration.batInTooltipColor,
-        // additional field to parse AC status
+        // additinal field to parse AC status
-        "acOnline": plasmoid.configuration.acOnline,
+        "acOnline": plasmoid.configuration.acOnline
-        // additional field to send notifications
-        "notify": plasmoid.configuration.notify
     }
 
+    signal dropSource(string sourceName)
     signal needTextUpdate(string newText)
     signal needToolTipUpdate(string newText)
     signal sizeUpdate
 
-    Layout.fillWidth: PlasmoidItem.formFactor !== PlasmaCore.Planar
+
-    Layout.fillHeight: PlasmoidItem.formFactor !== PlasmaCore.Planar
+    // init
+    Plasmoid.preferredRepresentation: Plasmoid.fullRepresentation
+    Plasmoid.compactRepresentation: Plasmoid.fullRepresentation
+
+    Layout.fillWidth: plasmoid.formFactor != PlasmaCore.Planar
+    Layout.fillHeight: plasmoid.formFactor != PlasmaCore.Planar
     Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
 
     Plasmoid.icon: "utilities-system-monitor"
     Plasmoid.backgroundHints: plasmoid.configuration.background ? "DefaultBackground" : "NoBackground"
+    Plasmoid.associatedApplication: "ksysguard"
+
+    PlasmaCore.DataSource {
+        id: systemmonitorDE
+        engine: "systemmonitor"
+        connectedSources: systemmonitorDE.sources
+        interval: plasmoid.configuration.interval
+
+        onNewData: {
+            if (debug) console.debug("Update source", sourceName)
+            systemmonitorDE.interval = plasmoid.configuration.interval
+
+            awKeys.setDataBySource(sourceName, data, settings)
+        }
+
+        onSourceAdded: {
+            if (debug) console.debug("Source", source)
+
+            awKeys.addDevice(source)
+        }
+    }
+
+    PlasmaCore.DataSource {
+        id: extsysmonDE
+        engine: "extsysmon"
+        connectedSources: extsysmonDE.sources
+        interval: plasmoid.configuration.interval
+
+        onNewData: {
+            if (debug) console.debug("Update source", sourceName)
+            extsysmonDE.interval = plasmoid.configuration.interval
+
+            awKeys.setDataBySource(sourceName, data, settings)
+        }
+    }
+
+    PlasmaCore.DataSource {
+        id: timeDE
+        engine: "time"
+        connectedSources: ["Local"]
+        interval: 1000
+
+        onNewData: {
+            if (debug) console.debug("Update source", sourceName)
+
+            awKeys.setDataBySource(sourceName, data, settings)
+        }
+    }
+
 
     // ui
     Text {
@@ -80,19 +139,16 @@ PlasmoidItem {
         anchors.fill: parent
         renderType: Text.NativeRendering
         textFormat: Text.RichText
-        wrapMode: plasmoid.configuration.wrapText ? Text.WordWrap : Text.NoWrap
+        wrapMode: Text.NoWrap
 
-        horizontalAlignment: General.align[plasmoid.configuration.textAlign]
+        horizontalAlignment: general.align[plasmoid.configuration.textAlign]
         verticalAlignment: Text.AlignVCenter
 
         color: plasmoid.configuration.fontColor
         font.family: plasmoid.configuration.fontFamily
-        font.italic: plasmoid.configuration.fontStyle === "italic"
+        font.italic: plasmoid.configuration.fontStyle == "italic" ? true : false
         font.pointSize: plasmoid.configuration.fontSize
-        font.weight: General.fontWeight[plasmoid.configuration.fontWeight]
+        font.weight: general.fontWeight[plasmoid.configuration.fontWeight]
-
-        style: General.textStyle[plasmoid.configuration.textStyle]
-        styleColor: plasmoid.configuration.textStyleColor
 
         PlasmaCore.ToolTipArea {
             height: tooltip.height
@@ -106,55 +162,57 @@ PlasmoidItem {
         }
     }
 
-    Plasmoid.contextualActions: [
-        PlasmaCore.Action {
-            text: i18n("Run monitor")
-            icon.name: "utilities-system-monitor"
-            onTriggered: awActions.runCmd("plasma-systemmonitor", [])
-        },
-        PlasmaCore.Action {
-            text: i18n("Show README")
-            icon.name: "text-x-readme"
-            onTriggered: awActions.showReadme()
-        },
-        PlasmaCore.Action {
-            text: i18n("Check updates")
-            icon.name: "system-software-update"
-            onTriggered: awActions.checkUpdates(true)
-        }
-    ]
-
-
     Component.onCompleted: {
+        if (debug) console.debug()
+
+        // actions
+        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)
         // connect data
+        awKeys.dropSourceFromDataengine.connect(dropSource)
         awKeys.needTextToBeUpdated.connect(needTextUpdate)
-        //awKeys.needToolTipToBeUpdated.connect(needToolTipUpdate)
+        awKeys.needToolTipToBeUpdated.connect(needToolTipUpdate)
         // check updates if required
-        if (plasmoid.configuration.checkUpdates) return awActions.checkUpdates(false)
+        if (plasmoid.configuration.checkUpdates) return action_checkUpdates()
     }
 
-    onNeedTextUpdate: newText => {
+    onDropSource: {
+        if (debug) console.debug()
+        if (debug) console.debug("Source", sourceName)
+
+        systemmonitorDE.disconnectSource(sourceName)
+    }
+
+    onNeedTextUpdate: {
+        if (debug) console.debug()
+
         text.text = newText
         sizeUpdate()
     }
 
-    onNeedToolTipUpdate: newText => {
+    onNeedToolTipUpdate: {
+        if (debug) console.debug()
+
         tooltip.text = newText
     }
 
     onSizeUpdate: {
+        if (debug) console.debug()
         // 16 is a magic number
         // in other case plasmoid will increase own size on each update
-        if (plasmoid.configuration.height === 0) {
+
+        if (plasmoid.configuration.height == 0) {
             Layout.minimumHeight = text.contentHeight - 16
             Layout.maximumHeight = -1
         } else {
             Layout.minimumHeight = plasmoid.configuration.height
             Layout.maximumHeight = plasmoid.configuration.height
         }
-        if (plasmoid.configuration.width === 0) {
+        if (plasmoid.configuration.width == 0) {
             Layout.minimumWidth = text.contentWidth - 16
             Layout.maximumWidth = -1
         } else {
@@ -165,20 +223,37 @@ PlasmoidItem {
 
     Plasmoid.onUserConfiguringChanged: {
         if (plasmoid.userConfiguring) return
+        if (debug) console.debug()
 
         // init submodule
-        awKeys.initDataAggregator(tooltipSettings)
+        awKeys.initKeys(plasmoid.configuration.text)
-        awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.interval, plasmoid.configuration.optimize)
+        awKeys.initTooltip(tooltipSettings)
+        awKeys.setPopupEnabled(plasmoid.configuration.notify)
+        awKeys.setTranslateStrings(plasmoid.configuration.translateStrings)
         awKeys.setWrapNewLines(plasmoid.configuration.wrapNewLines)
-        // configure aggregator
+    }
-        awKeys.setAggregatorProperty("acOffline", plasmoid.configuration.acOffline)
+
-        awKeys.setAggregatorProperty("acOnline", plasmoid.configuration.acOnline)
+    function action_checkUpdates() {
-        awKeys.setAggregatorProperty("customTime", plasmoid.configuration.customTime)
+        if (debug) console.debug()
-        awKeys.setAggregatorProperty("customUptime", plasmoid.configuration.customUptime)
+
-        awKeys.setAggregatorProperty("tempUnits", plasmoid.configuration.tempUnits)
+        return awActions.checkUpdates()
-        awKeys.setAggregatorProperty("translate", plasmoid.configuration.translateStrings)
+    }
-        // save telemetry
+
-        awTelemetryHandler.init(plasmoid.configuration.historyCount)
+    function action_showReadme() {
-        awTelemetryHandler.put("awwidgetconfig", plasmoid.configuration.text)
+        if (debug) console.debug()
+
+        return awActions.showReadme()
+    }
+
+    function action_report() {
+        if (debug) console.debug()
+
+        return awActions.sendEmail()
+    }
+
+    function action_requestKey() {
+        if (debug) console.debug()
+
+        return awKeys.graphicalValueByKey()
     }
 }

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

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

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

@@ -15,199 +15,504 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.0
-import QtQuick.Controls
+import QtQuick.Controls 1.3 as QtControls
-import org.kde.kcmutils as KCM
+import QtQuick.Controls.Styles 1.3 as QtStyles
+import QtQuick.Dialogs 1.1 as QtDialogs
 
-import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget 1.0
-import org.kde.plasma.private.awesomewidget
 
 
-KCM.SimpleKCM {
+Item {
     id: tooltipPage
+    // backend
+    AWActions {
+        id: awActions;
+    }
+
+    width: childrenRect.width
+    height: childrenRect.height
+    implicitWidth: pageColumn.implicitWidth
+    implicitHeight: pageColumn.implicitHeight
+
+    property bool debug: awActions.isDebugEnabled()
 
     property alias cfg_tooltipNumber: tooltipNumber.value
     property alias cfg_useTooltipBackground: useTooltipBackground.checked
-    property alias cfg_tooltipBackground: tooltipBackground.value
+    property alias cfg_tooltipBackground: tooltipBackground.text
     property alias cfg_cpuTooltip: cpuTooltip.checked
-    property alias cfg_cpuTooltipColor: cpuTooltipColor.value
+    property alias cfg_cpuTooltipColor: cpuTooltipColor.text
     property alias cfg_cpuclTooltip: cpuclTooltip.checked
-    property alias cfg_cpuclTooltipColor: cpuclTooltipColor.value
+    property alias cfg_cpuclTooltipColor: cpuclTooltipColor.text
     property alias cfg_memTooltip: memTooltip.checked
-    property alias cfg_memTooltipColor: memTooltipColor.value
+    property alias cfg_memTooltipColor: memTooltipColor.text
     property alias cfg_swapTooltip: swapTooltip.checked
-    property alias cfg_swapTooltipColor: swapTooltipColor.value
+    property alias cfg_swapTooltipColor: swapTooltipColor.text
-    property alias cfg_downkbTooltip: networkTooltip.checked
+    property alias cfg_downTooltip: downTooltip.checked
-    property alias cfg_downkbTooltipColor: downkbTooltipColor.value
+    property alias cfg_downTooltipColor: downTooltipColor.text
-    property alias cfg_upkbTooltipColor: upkbTooltipColor.value
+    property alias cfg_upTooltipColor: upTooltipColor.text
     property alias cfg_batTooltip: batTooltip.checked
-    property alias cfg_batTooltipColor: batTooltipColor.value
+    property alias cfg_batTooltipColor: batTooltipColor.text
-    property alias cfg_batInTooltipColor: batInTooltipColor.value
+    property alias cfg_batInTooltipColor: batInTooltipColor.text
+
 
     Column {
+        id: pageColumn
         anchors.fill: parent
-
+        QtControls.Label {
-        Label {
           width: parent.width
           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 checked.")
+          text: i18n("CPU, CPU clock, memory, swap and network labels support graphical tooltip. To enable them just make needed checkbox fully checked.")
         }
 
-        IntegerSelector {
+        Row {
-            id: tooltipNumber
+            height: implicitHeight
-            maximumValue: 1000
-            minimumValue: 50
-            stepSize: 25
-            text: i18n("Number of values for tooltips")
-            value: plasmoid.configuration.tooltipNumber
-        }
-
-        GroupBox {
-            id: useTooltipBackground
             width: parent.width
+            QtControls.Label {
+                height: parent.height
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("Number of values for tooltips")
+            }
+            QtControls.SpinBox {
+                id: tooltipNumber
+                width: parent.width * 3 / 5
+                minimumValue: 50
+                maximumValue: 1000
+                stepSize: 25
+                value: plasmoid.configuration.tooltipNumber
+            }
+        }
 
-            property alias checked: useTooltipBackgroundLabel.checked
+        Row {
-            label: CheckBox {
+            height: implicitHeight
-                id: useTooltipBackgroundLabel
+            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 {
-            ColorSelector {
+                id: useTooltipBackground
+                height: parent.height
+                width: implicitWidth
+                style: QtStyles.CheckBoxStyle {
+                    indicator: Rectangle {
+                        implicitWidth: 16
+                        implicitHeight: 16
+                        radius: 3
+                        border.width: 1
+                        border.color: control.activeFocus ? "darkblue" : "gray"
+                        Rectangle {
+                            visible: control.checked
+                            radius: 1
+                            anchors.fill: parent
+                            anchors.margins: 4
+                            color: "#555555"
+                            border.color: "#333333"
+                        }
+                    }
+                }
+            }
+            QtControls.Button {
                 id: tooltipBackground
-                enabled: useTooltipBackgroundLabel.checked
+                width: parent.width * 3 / 5
-                text: i18n("Background color")
+                style: QtStyles.ButtonStyle {
-                value: plasmoid.configuration.tooltipBackground
+                    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
             }
         }
 
-        GroupBox {
+        Row {
-            id: cpuTooltip
+            height: implicitHeight
             width: parent.width
-
+            QtControls.Label {
-            property alias checked: cpuTooltipLabel.checked
+                height: parent.height
-            label: CheckBox {
+                width: parent.width * 2 / 5 - cpuTooltip.width
-                id: cpuTooltipLabel
+                horizontalAlignment: Text.AlignRight
-                text: i18n("CPU")
+                verticalAlignment: Text.AlignVCenter
-            }
-
-            ColorSelector {
-                id: cpuTooltipColor
-                enabled: cpuTooltipLabel.checked
                 text: i18n("CPU color")
-                value: plasmoid.configuration.cpuTooltipColor
+            }
+            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"
+                        }
+                    }
+                }
+            }
+            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
             }
         }
 
-        GroupBox {
+        Row {
-            id: cpuclTooltip
+            height: implicitHeight
             width: parent.width
-
+            QtControls.Label {
-            property alias checked: cpuclTooltipLabel.checked
+                height: parent.height
-            label: CheckBox {
+                width: parent.width * 2 / 5 - cpuclTooltip.width
-                id: cpuclTooltipLabel
+                horizontalAlignment: Text.AlignRight
-                text: i18n("CPU clock")
+                verticalAlignment: Text.AlignVCenter
-            }
-
-            ColorSelector {
-                id: cpuclTooltipColor
-                enabled: cpuclTooltipLabel.checked
                 text: i18n("CPU clock color")
-                value: plasmoid.configuration.cpuclTooltipColor
+            }
+            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"
+                        }
+                    }
+                }
+            }
+            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
             }
         }
 
-        GroupBox {
+        Row {
-            id: memTooltip
+            height: implicitHeight
             width: parent.width
-
+            QtControls.Label {
-            property alias checked: memTooltipLabel.checked
+                height: parent.height
-            label: CheckBox {
+                width: parent.width * 2 / 5 - memTooltip.width
-                id: memTooltipLabel
+                horizontalAlignment: Text.AlignRight
-                text: i18n("Memory")
+                verticalAlignment: Text.AlignVCenter
-            }
-
-            ColorSelector {
-                id: memTooltipColor
-                enabled: memTooltipLabel.checked
                 text: i18n("Memory color")
-                value: plasmoid.configuration.memTooltipColor
+            }
+            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"
+                        }
+                    }
+                }
+            }
+            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
             }
         }
 
-        GroupBox {
+        Row {
-            id: swapTooltip
+            height: implicitHeight
             width: parent.width
-
+            QtControls.Label {
-            property alias checked: swapTooltipLabel.checked
+                height: parent.height
-            label: CheckBox {
+                width: parent.width * 2 / 5 - swapTooltip.width
-                id: swapTooltipLabel
+                horizontalAlignment: Text.AlignRight
-                text: i18n("Swap")
+                verticalAlignment: Text.AlignVCenter
-            }
-
-            ColorSelector {
-                id: swapTooltipColor
-                enabled: swapTooltipLabel.checked
                 text: i18n("Swap color")
-                value: plasmoid.configuration.swapTooltipColor
+            }
+            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"
+                        }
+                    }
+                }
+            }
+            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
             }
         }
 
-        GroupBox {
+        Row {
-            id: networkTooltip
+            height: implicitHeight
             width: parent.width
-
+            QtControls.Label {
-            property alias checked: networkTooltipLabel.checked
+                height: parent.height
-            label: CheckBox {
+                width: parent.width * 2 / 5 - downTooltip.width
-                id: networkTooltipLabel
+                horizontalAlignment: Text.AlignRight
-                text: i18n("Network")
+                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"
+                        }
+                    }
+                }
+            }
+            QtControls.Button {
+                id: downTooltipColor
+                width: parent.width * 3 / 5
+                style: QtStyles.ButtonStyle {
+                    background: Rectangle {
+                        color: plasmoid.configuration.downTooltipColor
+                    }
+                }
+                text: plasmoid.configuration.downTooltipColor
+                onClicked: downTooltipColorDialog.visible = true
             }
 
-            Column {
+            QtDialogs.ColorDialog {
-                width: parent.width
+                id: downTooltipColorDialog
-                enabled: networkTooltipLabel.checked
+                title: i18n("Select a color")
-
+                color: downTooltipColor.text
-                ColorSelector {
+                onAccepted: downTooltipColor.text = downTooltipColorDialog.color
-                    id: downkbTooltipColor
-                    text: i18n("Download speed color")
-                    value: plasmoid.configuration.downkbTooltipColor
-                }
-
-                ColorSelector {
-                    id: upkbTooltipColor
-                    text: i18n("Upload speed color")
-                    value: plasmoid.configuration.upkbTooltipColor
-                }
             }
         }
 
-        GroupBox {
+        Row {
-            id: batTooltip
+            height: implicitHeight
             width: parent.width
-
+            QtControls.Label {
-            property alias checked: batteryTooltipLabel.checked
+                height: parent.height
-            label: CheckBox {
+                width: parent.width * 2 / 5
-                id: batteryTooltipLabel
+                horizontalAlignment: Text.AlignRight
-                text: i18n("Battery")
+                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
             }
 
-            Column {
+            QtDialogs.ColorDialog {
-                width: parent.width
+                id: upTooltipColorDialog
-                enabled: batteryTooltipLabel.checked
+                title: i18n("Select a color")
+                color: upTooltipColor.text
+                onAccepted: upTooltipColor.text = upTooltipColorDialog.color
+            }
+        }
 
-                ColorSelector {
+        Row {
-                    id: batTooltipColor
+            height: implicitHeight
-                    text: i18n("Battery active color")
+            width: parent.width
-                    value: plasmoid.configuration.batTooltipColor
+            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: batTooltipColor
+                width: parent.width * 3 / 5
+                style: QtStyles.ButtonStyle {
+                    background: Rectangle {
+                        color: plasmoid.configuration.batTooltipColor
+                    }
+                }
+                text: plasmoid.configuration.batTooltipColor
+                onClicked: batTooltipColorDialog.visible = true
+            }
 
-                ColorSelector {
+            QtDialogs.ColorDialog {
-                    id: batInTooltipColor
+                id: batTooltipColorDialog
-                    text: i18n("Battery inactive color")
+                title: i18n("Select a color")
-                    value: plasmoid.configuration.batInTooltipColor
+                color: batTooltipColor.text
+                onAccepted: batTooltipColor.text = batTooltipColorDialog.color
+            }
+        }
+
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Label {
+                height: parent.height
+                width: parent.width * 2 / 5
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                text: i18n("Battery inactive color")
+            }
+            QtControls.Button {
+                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
             }
         }
     }
+
+    Component.onCompleted: {
+        if (debug) console.debug()
+    }
 }

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

@@ -15,76 +15,383 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-import QtQuick 2.15
+import QtQuick 2.0
-import QtQuick.Controls
+import QtQuick.Controls 1.3 as QtControls
-import org.kde.kcmutils as KCM
+import org.kde.plasma.core 2.0 as PlasmaCore
 
-import org.kde.plasma.awesomewidgets
+import org.kde.plasma.private.awesomewidget 1.0
-import org.kde.plasma.private.awesomewidget
 
 
-KCM.SimpleKCM {
+Item {
     id: widgetPage
-
     // backend
     AWKeys {
-        id: awKeys
+        id: awKeys;
     }
     AWActions {
-        id: awActions
+        id: awActions;
+    }
+
+    width: childrenRect.width
+    height: childrenRect.height
+    implicitWidth: pageColumn.implicitWidth
+    implicitHeight: pageColumn.implicitHeight
+
+    property bool debug: awActions.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 alias cfg_text: textPattern.text
-    property bool lock: true
 
-    signal needTextUpdate(string newText)
 
     Column {
+        id: pageColumn
         anchors.fill: parent
-
+        QtControls.Label {
-        AWInfoLabel {}
+          width: parent.width
-
+          horizontalAlignment: Text.AlignHCenter
-        HtmlDefaultFunctionsBar {
+          verticalAlignment: Text.AlignVCenter
-            textArea: textPattern
+          wrapMode: Text.WordWrap
+          text: i18n("Detailed information may be found on <a href=\"http://arcanis.name/projects/awesome-widgets/\">project homepage</a>")
+          onLinkActivated: Qt.openUrlExternally(link);
         }
 
-        AWTagSelector {
+        Row {
-            backend: awKeys
+            height: implicitHeight
-            notifyBackend: awActions
+            width: parent.width
-            textArea: textPattern
+            QtControls.Button {
-            groups: General.awTagRegexp
+                width: parent.width * 3 / 12
+                text: i18n("Font")
+                iconName: "font"
+
+                onClicked: {
+                    if (debug) console.debug("Font button")
+                    var defaultFont = {
+                        "color": plasmoid.configuration.fontColor,
+                        "family": plasmoid.configuration.fontFamily,
+                        "size": plasmoid.configuration.fontSize
+                    }
+                    var font = awActions.getFont(defaultFont)
+                    var pos = textPattern.cursorPosition
+                    var selected = textPattern.selectedText
+                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
+                    textPattern.insert(pos, "<span style=\"color:" + font.color +
+                                            "; font-family:'" + font.family +
+                                            "'; font-size:" + font.size + "pt;\">" +
+                                            selected + "</span>")
+                }
+            }
+            QtControls.Button {
+                width: parent.width / 12
+                iconName: "format-indent-more"
+
+                onClicked: {
+                    if (debug) console.debug("Indent button")
+                    var pos = textPattern.cursorPosition
+                    var selected = textPattern.selectedText
+                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
+                    textPattern.insert(pos, selected + "<br>\n")
+                }
+            }
+
+            QtControls.Button {
+                width: parent.width / 12
+                iconName: "format-text-bold"
+
+                onClicked: {
+                    if (debug) console.debug("Bold button")
+                    var pos = textPattern.cursorPosition
+                    var selected = textPattern.selectedText
+                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
+                    textPattern.insert(pos, "<b>" + selected + "</b>")
+                }
+            }
+            QtControls.Button {
+                width: parent.width / 12
+                iconName: "format-text-italic"
+
+                onClicked: {
+                    if (debug) console.debug("Italic button")
+                    var pos = textPattern.cursorPosition
+                    var selected = textPattern.selectedText
+                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
+                    textPattern.insert(pos, "<i>" + selected + "</i>")
+                }
+            }
+            QtControls.Button {
+                width: parent.width / 12
+                iconName: "format-text-underline"
+
+                onClicked: {
+                    if (debug) console.debug("Underline button")
+                    var pos = textPattern.cursorPosition
+                    var selected = textPattern.selectedText
+                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
+                    textPattern.insert(pos, "<u>" + selected + "</u>")
+                }
+            }
+            QtControls.Button {
+                width: parent.width / 12
+                iconName: "format-text-strikethrough"
+
+                onClicked: {
+                    if (debug) console.debug("Strike button")
+                    var pos = textPattern.cursorPosition
+                    var selected = textPattern.selectedText
+                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
+                    textPattern.insert(pos, "<s>" + selected + "</s>")
+                }
+            }
+
+            QtControls.Button {
+                width: parent.width / 12
+                iconName: "format-justify-left"
+
+                onClicked: {
+                    if (debug) console.debug("Left button")
+                    var pos = textPattern.cursorPosition
+                    var selected = textPattern.selectedText
+                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
+                    textPattern.insert(pos, "<p align=\"left\">" + selected + "</p>")
+                }
+            }
+            QtControls.Button {
+                width: parent.width / 12
+                iconName: "format-justify-center"
+
+                onClicked: {
+                    if (debug) console.debug("Center button")
+                    var pos = textPattern.cursorPosition
+                    var selected = textPattern.selectedText
+                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
+                    textPattern.insert(pos, "<p align=\"center\">" + selected + "</p>")
+                }
+            }
+            QtControls.Button {
+                width: parent.width / 12
+                iconName: "format-justify-right"
+
+                onClicked: {
+                    if (debug) console.debug("Right button")
+                    var pos = textPattern.cursorPosition
+                    var selected = textPattern.selectedText
+                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
+                    textPattern.insert(pos, "<p align=\"right\">" + selected + "</p>")
+                }
+            }
+            QtControls.Button {
+                width: parent.width / 12
+                iconName: "format-justify-fill"
+
+                onClicked: {
+                    if (debug) console.debug("Justify button")
+                    var pos = textPattern.cursorPosition
+                    var selected = textPattern.selectedText
+                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
+                    textPattern.insert(pos, "<p align=\"justify\">" + selected + "</p>")
+                }
+            }
         }
 
-        AWExtensions {
+        Row {
-            id: extensions
+            height: implicitHeight
-            backend: awKeys
+            width: parent.width
-            textArea: textPattern
+            QtControls.ComboBox {
-            onUnlock: lock = false
+                width: (parent.width - addTagButton.width - showValueButton.width - addLambdaButton.width) / 2
+                textRole: "label"
+                model: [
+                    {
+                        'label': i18n("AC"),
+                        'regexp': "^(ac|bat).*"
+                    },
+                    {
+                        'label': i18n("Bars"),
+                        'regexp': "^bar.*"
+                    },
+                    {
+                        'label': i18n("CPU"),
+                        'regexp': "^(cpu|gpu|la|ps|temp(?!erature)).*"
+                    },
+                    {
+                        'label': i18n("Desktops"),
+                        'regexp': "^(n|t)?desktop(s)?"
+                    },
+                    {
+                        'label': i18n("HDD"),
+                        'regexp': "^hdd.*"
+                    },
+                    {
+                        'label': i18n("Memory"),
+                        'regexp': "^(mem|swap).*"
+                    },
+                    {
+                        'label': i18n("Network"),
+                        'regexp': "^(netdev|(down|up(?!time)).*)"
+                    },
+                    {
+                        'label': i18n("Music player"),
+                        'regexp': "(^|d|s)(album|artist|duration|progress|title)"
+                    },
+                    {
+                        'label': i18n("Scripts"),
+                        'regexp': "^custom.*"
+                    },
+                    {
+                        'label': i18n("Time"),
+                        'regexp': ".*time$"
+                    },
+                    {
+                        'label': i18n("Quotes"),
+                        'regexp': "^(perc)?(ask|bid|price)(chg)?.*"
+                    },
+                    {
+                        'label': i18n("Upgrades"),
+                        'regexp': "^pkgcount.*"
+                    },
+                    {
+                        'label': i18n("Weathers"),
+                        'regexp': "^(weather(Id)?|humidity|pressure|temperature|timestamp)"
+                    }
+                ]
+                onCurrentIndexChanged: {
+                    if (debug) console.debug()
+                    tags.model = awKeys.dictKeys(true, model[currentIndex]["regexp"])
+                    if (debug) console.info("Init model", tags.model, "for", model[currentIndex]["label"])
+                    tags.currentIndex = -1
+                }
+            }
+            QtControls.ComboBox {
+                id: tags
+                width: (parent.width - addTagButton.width - showValueButton.width - addLambdaButton.width) / 2
+            }
+            QtControls.Button {
+                id: addTagButton
+                text: i18n("Add")
+
+                onClicked: {
+                    if (!tags.currentText) return
+                    if (debug) console.debug("Add tag button")
+                    var pos = textPattern.cursorPosition
+                    var selected = textPattern.selectedText
+                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
+                    textPattern.insert(pos, selected + "$" + tags.currentText)
+                }
+            }
+            QtControls.Button {
+                id: showValueButton
+                text: i18n("Show value")
+
+                onClicked: {
+                    if (!tags.currentText) return
+                    if (debug) console.debug("Show tag button")
+                    var message = i18n("Tag: %1", tags.currentText)
+                    message += "<br>"
+                    message += i18n("Value: %1", awKeys.valueByKey(tags.currentText))
+                    message += "<br>"
+                    message += i18n("Info: %1", awKeys.infoByKey(tags.currentText))
+                    awActions.sendNotification("tag", message)
+                }
+            }
+            QtControls.Button {
+                id: addLambdaButton
+                text: i18n("Add lambda")
+
+                onClicked: {
+                    if (debug) console.debug("Lambda button")
+                    var pos = textPattern.cursorPosition
+                    var selected = textPattern.selectedText
+                    textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
+                    textPattern.insert(pos, selected + "${{\n\n}}")
+                }
+            }
         }
 
-        AWTextEditor {
+        Row {
+            height: implicitHeight
+            width: parent.width
+            QtControls.Button {
+                width: parent.width
+                text: i18n("Edit bars")
+                onClicked: awKeys.editItem("graphicalitem")
+            }
+        }
+
+        QtControls.TextArea {
             id: textPattern
-            backend: awKeys
+            width: parent.width
+            height: parent.height * 4 / 5
+            textFormat: TextEdit.PlainText
+            text: plasmoid.configuration.text
+        }
+    }
+
+    // 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.debug("Update source", sourceName)
+            awKeys.setDataBySource(sourceName, data, settings)
+        }
+    }
+
+    PlasmaCore.DataSource {
+        id: extsysmonDE
+        engine: "extsysmon"
+        connectedSources: extsysmonDE.sources
+        interval: 5000
+
+        onNewData: {
+            if (debug) console.debug("Update source", sourceName)
+            awKeys.setDataBySource(sourceName, data, settings)
+        }
+    }
+
+    PlasmaCore.DataSource {
+        id: timeDE
+        engine: "time"
+        connectedSources: ["Local"]
+        interval: 5000
+
+        onNewData: {
+            if (debug) console.debug("Update source", sourceName)
+            awKeys.setDataBySource(sourceName, data, settings)
         }
     }
 
     Component.onCompleted: {
-        awKeys.needTextToBeUpdated.connect(needTextUpdate)
+        if (debug) console.debug()
+
         // init submodule
-        awKeys.initKeys(plasmoid.configuration.text, plasmoid.configuration.interval,
+        awKeys.initKeys(plasmoid.configuration.text)
-                        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: newText => {
-        if (lock) return
-
-        extensions.showMessage(newText)
-        lock = true
     }
 }

sources/awesome-widget/package/metadata.desktop

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

sources/awesome-widget/package/metadata.json

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

sources/awesome-widget/plugin/CMakeLists.txt

@@ -2,22 +2,24 @@ set(PLUGIN_NAME awplugin)
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidget\")
 
 include_directories(
-        ${CMAKE_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}
-        ${CMAKE_BINARY_DIR}
+    ${CMAKE_BINARY_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/../../${PROJECT_LIBRARY}/
+    ${CMAKE_CURRENT_BINARY_DIR}
-        ${PROJECT_TRDPARTY_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}/../
-        ${Qt_INCLUDE}
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../${PROJECT_LIBRARY}/
-        ${Kf6_INCLUDE}
+    ${PROJECT_TRDPARTY_DIR}
+    ${Qt_INCLUDE}
+    ${Kf5_INCLUDE}
 )
 
-file(GLOB SUBPROJECT_SOURCE *.cpp formatters/*.cpp matchers/*.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
+file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
 file(GLOB SUBPROJECT_UI *.ui)
 file(GLOB SUBPROJECT_NOTIFY *.notifyrc)
 
-qt6_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI} OPTIONS --translate ui_i18n)
+qt5_wrap_ui(SUBPROJECT_UI_HEADER ${SUBPROJECT_UI})
 add_library(${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE} ${SUBPROJECT_UI_HEADER})
-target_link_libraries(${PLUGIN_NAME} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf6_LIBRARIES})
+target_link_libraries(${PLUGIN_NAME} ${PROJECT_LIBRARY} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
 
-install(TARGETS ${PLUGIN_NAME} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/awesomewidget)
+install(TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget)
-install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/awesomewidget)
+install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget)
-install(FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
+install(FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KNOTIFYRC_INSTALL_DIR})

sources/awesome-widget/plugin/awabstractpairconfig.cpp

@@ -1,188 +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 "awabstractpairconfig.h"
-#include "ui_awabstractpairconfig.h"
-
-#include <KI18n/KLocalizedString>
-
-#include <QPushButton>
-#include <utility>
-
-#include "awabstractselector.h"
-#include "awdebug.h"
-
-
-AWAbstractPairConfig::AWAbstractPairConfig(QWidget *_parent, const bool _hasEdit, QStringList _keys)
-    : QDialog(_parent)
-    , ui(new Ui::AWAbstractPairConfig)
-    , m_hasEdit(_hasEdit)
-    , m_keys(std::move(_keys))
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    ui->setupUi(this);
-
-    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &AWAbstractPairConfig::accept);
-    connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &AWAbstractPairConfig::reject);
-
-    // edit feature
-    if (m_hasEdit) {
-        m_editButton = ui->buttonBox->addButton(i18n("Edit"), QDialogButtonBox::ActionRole);
-        connect(m_editButton, &QPushButton::clicked, [this]() { return edit(); });
-    }
-}
-
-
-AWAbstractPairConfig::~AWAbstractPairConfig()
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    clearSelectors();
-
-    delete ui;
-}
-
-
-void AWAbstractPairConfig::setHelper(std::unique_ptr<AWAbstractPairHelper> _helper)
-{
-    m_helper = std::move(_helper);
-}
-
-
-void AWAbstractPairConfig::showDialog()
-{
-    // update dialog
-    updateDialog();
-    // exec dialog
-    return execDialog();
-}
-
-
-void AWAbstractPairConfig::setEditable(const bool _first, const bool _second)
-{
-    qCDebug(LOG_AW) << "Set editable" << _first << _second;
-
-    m_editable = {_first, _second};
-}
-
-
-void AWAbstractPairConfig::edit()
-{
-    m_helper->editPairs();
-    updateDialog();
-}
-
-
-void AWAbstractPairConfig::updateUi()
-{
-    auto current = dynamic_cast<AWAbstractSelector *>(sender())->current();
-    auto index = m_selectors.indexOf(dynamic_cast<AWAbstractSelector *>(sender()));
-
-    if ((current.first.isEmpty()) && (current.second.isEmpty())) {
-        // remove current selector if it is empty and does not last
-        if (sender() == m_selectors.last())
-            return;
-        auto selector = m_selectors.takeAt(index);
-        ui->verticalLayout->removeWidget(selector);
-        selector->deleteLater();
-    } else {
-        // add new selector if something changed
-        if (sender() != m_selectors.last())
-            return;
-        auto keys = initKeys();
-        addSelector(keys.first, keys.second, QPair<QString, QString>());
-    }
-}
-
-
-void AWAbstractPairConfig::addSelector(const QStringList &_keys, const QStringList &_values,
-                                       const QPair<QString, QString> &_current)
-{
-    qCDebug(LOG_AW) << "Add selector with keys" << _keys << "values" << _values << "and current ones" << _current;
-
-    auto selector = new AWAbstractSelector(ui->scrollAreaWidgetContents, m_editable);
-    selector->init(_keys, _values, _current);
-    ui->verticalLayout->insertWidget(ui->verticalLayout->count() - 1, selector);
-    connect(selector, &AWAbstractSelector::selectionChanged, this, &AWAbstractPairConfig::updateUi);
-    m_selectors.append(selector);
-}
-
-
-void AWAbstractPairConfig::clearSelectors()
-{
-    for (auto selector : m_selectors) {
-        disconnect(selector, &AWAbstractSelector::selectionChanged, this, &AWAbstractPairConfig::updateUi);
-        ui->verticalLayout->removeWidget(selector);
-        selector->deleteLater();
-    }
-    m_selectors.clear();
-}
-
-
-void AWAbstractPairConfig::execDialog()
-{
-    auto ret = exec();
-    QHash<QString, QString> data;
-    for (auto selector : m_selectors) {
-        auto select = selector->current();
-        if (select.first.isEmpty())
-            continue;
-        data[select.first] = select.second;
-    }
-
-    // save configuration if required
-    auto status = true;
-    switch (ret) {
-    case 0:
-        break;
-    case 1:
-    default:
-        status &= m_helper->writeItems(data);
-        status &= m_helper->removeUnusedKeys(data.keys());
-        break;
-    }
-    qCDebug(LOG_AW) << "Configuration save status" << status;
-}
-
-
-QPair<QStringList, QStringList> AWAbstractPairConfig::initKeys() const
-{
-    // we are adding empty string at the start
-    QStringList left = {""};
-    left.append(m_helper->leftKeys().isEmpty() ? m_keys : m_helper->leftKeys());
-    left.sort();
-
-    QStringList right = {""};
-    right.append(m_helper->rightKeys().isEmpty() ? m_keys : m_helper->rightKeys());
-    right.sort();
-
-    return {left, right};
-}
-
-
-void AWAbstractPairConfig::updateDialog()
-{
-    clearSelectors();
-    auto pairs = m_helper->pairs();
-    auto keys = initKeys();
-
-    for (auto &key : m_helper->keys())
-        addSelector(keys.first, keys.second, {key, pairs[key]});
-    // empty one
-    addSelector(keys.first, keys.second, {});
-}

sources/awesome-widget/plugin/awabstractpairconfig.h

@@ -1,62 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include <QDialog>
-
-#include "awabstractpairhelper.h"
-
-
-class AWAbstractSelector;
-namespace Ui
-{
-class AWAbstractPairConfig;
-}
-
-class AWAbstractPairConfig : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit AWAbstractPairConfig(QWidget *_parent = nullptr, bool _hasEdit = false, QStringList _keys = {});
-    ~AWAbstractPairConfig() override;
-    void setHelper(std::unique_ptr<AWAbstractPairHelper> _helper);
-    void showDialog();
-    // properties
-    void setEditable(bool _first, bool _second);
-
-private slots:
-    void edit();
-    void updateUi();
-
-private:
-    QPushButton *m_editButton = nullptr;
-    Ui::AWAbstractPairConfig *ui = nullptr;
-    std::unique_ptr<AWAbstractPairHelper> m_helper;
-    QList<AWAbstractSelector *> m_selectors;
-    // properties
-    QPair<bool, bool> m_editable = {false, false};
-    bool m_hasEdit = false;
-    QStringList m_keys;
-    // methods
-    void addSelector(const QStringList &_keys, const QStringList &_values, const QPair<QString, QString> &_current);
-    void clearSelectors();
-    void execDialog();
-    [[nodiscard]] QPair<QStringList, QStringList> initKeys() const;
-    void updateDialog();
-};

sources/awesome-widget/plugin/awabstractpairconfig.ui

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

sources/awesome-widget/plugin/awabstractpairhelper.cpp

@@ -1,128 +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 "awabstractpairhelper.h"
-
-#include <QSettings>
-#include <QStandardPaths>
-#include <utility>
-
-#include "awdebug.h"
-
-
-AWAbstractPairHelper::AWAbstractPairHelper(QString _filePath, QString _section)
-    : m_filePath(std::move(_filePath))
-    , m_section(std::move(_section))
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    AWAbstractPairHelper::initItems();
-}
-
-
-QStringList AWAbstractPairHelper::keys() const
-{
-    return m_pairs.keys();
-}
-
-
-QHash<QString, QString> AWAbstractPairHelper::pairs() const
-{
-    return m_pairs;
-}
-
-
-QStringList AWAbstractPairHelper::values() const
-{
-    return m_pairs.values();
-}
-
-
-QSet<QString> AWAbstractPairHelper::valuesSet() const
-{
-    auto values = m_pairs.values();
-    return {values.cbegin(), values.cend()};
-}
-
-
-void AWAbstractPairHelper::initItems()
-{
-    m_pairs.clear();
-
-    auto configs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_filePath);
-
-    for (auto &fileName : configs) {
-        QSettings settings(fileName, QSettings::IniFormat);
-        qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
-
-        settings.beginGroup(m_section);
-        auto keys = settings.childKeys();
-        for (auto &key : keys) {
-            auto value = settings.value(key).toString();
-            qCInfo(LOG_AW) << "Found key" << key << "for value" << value << "in" << settings.fileName();
-            if (value.isEmpty()) {
-                qCInfo(LOG_AW) << "Skip empty value for" << key;
-                continue;
-            }
-            m_pairs[key] = value;
-        }
-        settings.endGroup();
-    }
-}
-
-
-bool AWAbstractPairHelper::writeItems(const QHash<QString, QString> &_configuration) const
-{
-    qCDebug(LOG_AW) << "Write configuration" << _configuration;
-
-    auto fileName
-        = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation), m_filePath);
-    QSettings settings(fileName, QSettings::IniFormat);
-    qCInfo(LOG_AW) << "Configuration file" << fileName;
-
-    settings.beginGroup(m_section);
-    for (auto &key : _configuration.keys())
-        settings.setValue(key, _configuration[key]);
-    settings.endGroup();
-
-    settings.sync();
-
-    return settings.status() == QSettings::NoError;
-}
-
-
-bool AWAbstractPairHelper::removeUnusedKeys(const QStringList &_keys) const
-{
-    qCDebug(LOG_AW) << "Remove keys" << _keys;
-
-    auto fileName
-        = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation), m_filePath);
-    QSettings settings(fileName, QSettings::IniFormat);
-    qCInfo(LOG_AW) << "Configuration file" << fileName;
-
-    settings.beginGroup(m_section);
-    for (auto &key : settings.childKeys()) {
-        if (_keys.contains(key))
-            continue;
-        settings.remove(key);
-    }
-    settings.endGroup();
-
-    settings.sync();
-
-    return settings.status() == QSettings::NoError;
-}

sources/awesome-widget/plugin/awabstractpairhelper.h

@@ -1,46 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include <QHash>
-
-
-class AWAbstractPairHelper
-{
-public:
-    explicit AWAbstractPairHelper(QString _filePath = "", QString _section = "");
-    virtual ~AWAbstractPairHelper() = default;
-    [[nodiscard]] QStringList keys() const;
-    [[nodiscard]] QHash<QString, QString> pairs() const;
-    [[nodiscard]] QStringList values() const;
-    [[nodiscard]] QSet<QString> valuesSet() const;
-    // read-write methods
-    virtual void initItems();
-    [[nodiscard]] virtual bool writeItems(const QHash<QString, QString> &_configuration) const;
-    [[nodiscard]] virtual bool removeUnusedKeys(const QStringList &_keys) const;
-    // configuration related
-    virtual void editPairs() = 0;
-    virtual QStringList leftKeys() = 0;
-    virtual QStringList rightKeys() = 0;
-
-private:
-    // properties
-    QHash<QString, QString> m_pairs;
-    QString m_filePath;
-    QString m_section;
-};

sources/awesome-widget/plugin/awabstractselector.cpp

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

sources/awesome-widget/plugin/awabstractselector.h

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

sources/awesome-widget/plugin/awabstractselector.ui

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

sources/awesome-widget/plugin/awactions.cpp

@@ -21,100 +21,261 @@
 #include <KNotifications/KNotification>
 
 #include <QDesktopServices>
-#include <QFile>
+#include <QDir>
+#include <QJsonDocument>
+#include <QJsonParseError>
+#include <QMessageBox>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
 #include <QProcess>
-#include <QUrl>
+#include <QProcessEnvironment>
+#include <QSettings>
+#include <QStandardPaths>
 
 #include <fontdialog/fontdialog.h>
 
 #include "awdebug.h"
-#include "awupdatehelper.h"
+#include "version.h"
 
 
-AWActions::AWActions(QObject *_parent)
+AWActions::AWActions(QObject *parent)
-    : QObject(_parent)
+    : QObject(parent)
 {
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
+    qCDebug(LOG_AW);
-
-    m_updateHelper = new AWUpdateHelper(this);
 }
 
 
-void AWActions::checkUpdates(const bool _showAnyway)
+AWActions::~AWActions()
 {
-    qCDebug(LOG_AW) << "Show anyway" << _showAnyway;
+    qCDebug(LOG_AW);
-
-    if (!m_updateHelper->checkVersion())
-        m_updateHelper->checkUpdates(_showAnyway);
 }
 
 
-QString AWActions::getFileContent(const QString &_path)
+void AWActions::checkUpdates()
 {
-    qCDebug(LOG_AW) << "Get content from file" << _path;
+    qCDebug(LOG_AW);
 
-    QFile inputFile(_path);
+    QNetworkAccessManager *manager = new QNetworkAccessManager(this);
-    if (!inputFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+    connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(versionReplyRecieved(QNetworkReply *)));
-        qCWarning(LOG_AW) << "Could not open file as text" << inputFile.fileName();
+
-        return "";
+    manager->get(QNetworkRequest(QUrl(VERSION_API)));
+}
+
+
+bool AWActions::dropCache() const
+{
+    qCDebug(LOG_AW);
+
+    QString fileName = QString("%1/awesomewidgets.ndx")
+                       .arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
+
+    return QFile(fileName).remove();
+}
+
+
+bool AWActions::isDebugEnabled() const
+{
+    qCDebug(LOG_AW);
+
+    return LOG_AW().isDebugEnabled();
+}
+
+
+void AWActions::runCmd(const QString cmd) const
+{
+    qCDebug(LOG_AW);
+    qCDebug(LOG_AW) << "Cmd" << cmd;
+
+    QProcess command;
+    sendNotification(QString("Info"), i18n("Run %1", cmd));
+
+    command.startDetached(cmd);
+}
+
+
+void AWActions::sendEmail() const
+{
+    qCDebug(LOG_AW);
+}
+
+
+void AWActions::showReadme() const
+{
+    qCDebug(LOG_AW);
+
+    QDesktopServices::openUrl(QString(HOMEPAGE));
+}
+
+
+QString AWActions::getAboutText(const QString type) const
+{
+    qCDebug(LOG_AW);
+    qCDebug(LOG_AW) << "Type" << type;
+
+    QString text;
+    if (type == QString("header"))
+        text = QString(NAME);
+    else if (type == QString("version"))
+        text = i18n("Version %1 (build date %2)", QString(VERSION), QString(BUILD_DATE));
+    else if (type == QString("description"))
+        text = i18n("A set of minimalistic plasmoid widgets");
+    else if (type == QString("links"))
+        text = i18n("Links:") + QString("<br>") +
+               QString("<a href=\"%1\">%2</a><br>").arg(QString(HOMEPAGE)).arg(i18n("Homepage")) +
+               QString("<a href=\"%1\">%2</a><br>").arg(QString(REPOSITORY)).arg(i18n("Repository")) +
+               QString("<a href=\"%1\">%2</a><br>").arg(QString(BUGTRACKER)).arg(i18n("Bugtracker")) +
+               QString("<a href=\"%1\">%2</a><br>").arg(QString(TRANSLATION)).arg(i18n("Translation issue")) +
+               QString("<a href=\"%1\">%2</a><br>").arg(QString(AUR_PACKAGES)).arg(i18n("AUR packages")) +
+               QString("<a href=\"%1\">%2</a>").arg(QString(OPENSUSE_PACKAGES)).arg(i18n("openSUSE packages"));
+    else if (type == QString("copy"))
+        text = QString("<small>&copy; %1 <a href=\"mailto:%2\">%3</a><br>").arg(QString(DATE)).arg(QString(EMAIL)).arg(QString(AUTHOR)) +
+               i18n("This software is licensed under %1", QString(LICENSE)) + QString("</small>");
+    else if (type == QString("translators"))
+        text = i18n("Translators: %1", QString(TRANSLATORS));
+    else if (type == QString("3rdparty")) {
+        QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(QChar(';'), QString::SkipEmptyParts);
+        for (int i=0; i<trdPartyList.count(); i++)
+            trdPartyList[i] = QString("<a href=\"%3\">%1</a> (%2 license)")
+                    .arg(trdPartyList.at(i).split(QChar(','))[0])
+                    .arg(trdPartyList.at(i).split(QChar(','))[1])
+                    .arg(trdPartyList.at(i).split(QChar(','))[2]);
+        text = i18n("This software uses: %1", trdPartyList.join(QString(", ")));
     }
 
-    auto output = inputFile.readAll();
+    return text;
-    inputFile.close();
-    return output;
 }
 
 
-bool AWActions::runCmd(const QString &_cmd, const QStringList &_args)
+QVariantMap AWActions::getFont(const QVariantMap defaultFont) const
 {
-    qCDebug(LOG_AW) << "Cmd" << _cmd << "args" << _args;
+    qCDebug(LOG_AW);
-
+    qCDebug(LOG_AW) << "Default font is" << defaultFont;
-    sendNotification("system", i18n("Run %1", _cmd));
-
-    return QProcess::startDetached(_cmd, _args);
-}
-
-
-// HACK: this method uses variable from version.h
-void AWActions::showReadme()
-{
-    QDesktopServices::openUrl(QUrl(HOMEPAGE));
-}
-
-
-// HACK: this method uses variables from version.h
-QString AWActions::getAboutText(const QString &_type)
-{
-    qCDebug(LOG_AW) << "Type" << _type;
-
-    return AWDebug::getAboutText(_type);
-}
-
-
-QVariantMap AWActions::getFont(const QVariantMap &_defaultFont)
-{
-    qCDebug(LOG_AW) << "Default font is" << _defaultFont;
 
     QVariantMap fontMap;
-    auto ret = 0;
+    CFont defaultCFont = CFont(defaultFont[QString("family")].toString(),
-    auto defaultCFont = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(), 400, false,
+                               defaultFont[QString("size")].toInt(),
-                              _defaultFont["color"].toString());
+                               400, false, defaultFont[QString("color")].toString());
-    auto font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, false, &ret);
+    CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont,
-
+                                      false, false);
-    fontMap["applied"] = ret;
+    fontMap[QString("color")] = font.color().name();
-    fontMap["color"] = font.color().name();
+    fontMap[QString("family")] = font.family();
-    fontMap["family"] = font.family();
+    fontMap[QString("size")] = font.pointSize();
-    fontMap["size"] = font.pointSize();
 
     return fontMap;
 }
 
 
-// to avoid additional object definition this method is static
+QVariantMap AWActions::readDataEngineConfiguration() const
-void AWActions::sendNotification(const QString &_eventId, const QString &_message)
 {
-    qCDebug(LOG_AW) << "Event" << _eventId << "with message" << _message;
+    qCDebug(LOG_AW);
 
-    auto event = KNotification::event(_eventId, QString("Awesome Widget ::: %1").arg(_eventId), _message);
+    QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation, QString("plasma-dataengine-extsysmon.conf"));
-    event->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
+    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();
+
+    return configuration;
+}
+
+
+void AWActions::writeDataEngineConfiguration(const QVariantMap configuration) const
+{
+    qCDebug(LOG_AW);
+
+    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();
+}
+
+
+void AWActions::sendNotification(const QString eventId, const QString message,
+                                 const bool enablePopup)
+{
+    qCDebug(LOG_AW);
+    qCDebug(LOG_AW) << "Event" << eventId;
+    qCDebug(LOG_AW) << "Message" << message;
+    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) const
+{
+    qCDebug(LOG_AW);
+
+    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(nullptr, 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) const
+{
+    qCDebug(LOG_AW);
+    qCDebug(LOG_AW) << "Return code" << reply->error();
+    qCDebug(LOG_AW) << "Reply error message" << reply->errorString();
+
+    QJsonParseError error;
+    QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll(), &error);
+    reply->deleteLater();
+    if ((reply->error() != QNetworkReply::NoError) ||
+        (error.error != QJsonParseError::NoError)) {
+        qCWarning(LOG_AW) << "Parse error" << error.errorString();
+        return;
+    }
+
+    // convert to map
+    QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
+    QString version = firstRelease[QString("tag_name")].toString();
+    version.remove(QString("V."));
+    qCInfo(LOG_AW) << "Found version" << version;
+
+    int old_major = QString(VERSION).split(QChar('.')).at(0).toInt();
+    int old_minor = QString(VERSION).split(QChar('.')).at(1).toInt();
+    int old_patch = QString(VERSION).split(QChar('.')).at(2).toInt();
+    int new_major = QString(version).split(QChar('.')).at(0).toInt();
+    int new_minor = QString(version).split(QChar('.')).at(1).toInt();
+    int new_patch = QString(version).split(QChar('.')).at(2).toInt();
+    if ((old_major < new_major) ||
+        ((old_major == new_major) && (old_minor < new_minor)) ||
+        ((old_major == new_major) && (old_minor == new_minor) && (old_patch < new_patch)))
+        return showUpdates(version);
 }

sources/awesome-widget/plugin/awactions.h

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

sources/awesome-widget/plugin/awbugreporter.cpp

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

sources/awesome-widget/plugin/awbugreporter.h

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

sources/awesome-widget/plugin/awconfighelper.cpp

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

sources/awesome-widget/plugin/awconfighelper.h

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

sources/awesome-widget/plugin/awcustomkeysconfig.cpp

@@ -1,31 +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 "awcustomkeysconfig.h"
-
-#include "awcustomkeyshelper.h"
-#include "awdebug.h"
-
-
-AWCustomKeysConfig::AWCustomKeysConfig(QWidget *_parent, const QStringList &_keys)
-    : AWAbstractPairConfig(_parent, false, _keys)
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    setEditable(true, false);
-    setHelper(std::make_unique<AWCustomKeysHelper>());
-}

sources/awesome-widget/plugin/awcustomkeysconfig.h

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

sources/awesome-widget/plugin/awcustomkeyshelper.cpp

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

sources/awesome-widget/plugin/awcustomkeyshelper.h

@@ -1,40 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include <QObject>
-
-#include "awabstractpairhelper.h"
-
-
-class AWCustomKeysHelper : public QObject, public AWAbstractPairHelper
-{
-    Q_OBJECT
-
-public:
-    explicit AWCustomKeysHelper(QObject *_parent = nullptr);
-    ~AWCustomKeysHelper() override = default;
-    // get
-    [[nodiscard]] QString source(const QString &_key) const;
-    [[nodiscard]] QStringList sources() const;
-    [[nodiscard]] QStringList refinedSources() const;
-    // configuration related
-    void editPairs() override{};
-    QStringList leftKeys() override;
-    QStringList rightKeys() override;
-};

sources/awesome-widget/plugin/awdataaggregator.cpp

@@ -1,295 +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 "awdataaggregator.h"
-
-#include <KI18n/KLocalizedString>
-
-#include <QBuffer>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-
-#include <cmath>
-
-#include "awactions.h"
-#include "awdebug.h"
-
-
-AWDataAggregator::AWDataAggregator(QObject *_parent)
-    : QObject(_parent)
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    m_boundaries["cpuTooltip"] = 100.0;
-    m_boundaries["cpuclTooltip"] = 4000.0;
-    m_boundaries["memTooltip"] = 100.0;
-    m_boundaries["swapTooltip"] = 100.0;
-    m_boundaries["downkbTooltip"] = 1.0;
-    m_boundaries["upkbTooltip"] = 1.0;
-    m_boundaries["batTooltip"] = 100.0;
-
-    initScene();
-}
-
-
-AWDataAggregator::~AWDataAggregator()
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    m_toolTipView->deleteLater();
-    m_toolTipScene->deleteLater();
-}
-
-
-QString AWDataAggregator::htmlImage(const QPixmap &_source)
-{
-    QByteArray byteArray;
-    QBuffer buffer(&byteArray);
-    _source.save(&buffer, "PNG");
-
-    return byteArray.isEmpty() ? ""
-                               : QString("<img src=\"data:image/png;base64,%1\"/>").arg(QString(byteArray.toBase64()));
-}
-
-
-void AWDataAggregator::setParameters(const QVariantMap &_settings)
-{
-    qCDebug(LOG_AW) << "Settings" << _settings;
-
-    // cast from QVariantMap to QVariantHash without data lost
-    m_configuration = qvariant_cast<QVariantHash>(_settings);
-
-    m_enablePopup = m_configuration["notify"].toBool();
-
-    m_counts = 0;
-    m_counts += m_configuration["cpuTooltip"].toInt();
-    m_counts += m_configuration["cpuclTooltip"].toInt();
-    m_counts += m_configuration["memTooltip"].toInt();
-    m_counts += m_configuration["swapTooltip"].toInt();
-    m_counts += m_configuration["downkbTooltip"].toInt();
-    m_counts += m_configuration["batTooltip"].toInt();
-    // resize tooltip image
-    m_toolTipView->resize(100 * m_counts, 105);
-
-    m_requiredKeys.clear();
-    if (m_configuration["cpuTooltip"].toBool())
-        m_requiredKeys.append("cpuTooltip");
-    if (m_configuration["cpuclTooltip"].toBool())
-        m_requiredKeys.append("cpuclTooltip");
-    if (m_configuration["memTooltip"].toBool())
-        m_requiredKeys.append("memTooltip");
-    if (m_configuration["swapTooltip"].toBool())
-        m_requiredKeys.append("swapTooltip");
-    if (m_configuration["downkbTooltip"].toBool())
-        m_requiredKeys.append("downkbTooltip");
-    if (m_configuration["upkbTooltip"].toBool())
-        m_requiredKeys.append("upkbTooltip");
-    if (m_configuration["batTooltip"].toBool())
-        m_requiredKeys.append("batTooltip");
-
-    // background
-    m_toolTipScene->setBackgroundBrush(m_configuration["useTooltipBackground"].toBool()
-                                           ? QColor(m_configuration["tooltipBackground"].toString())
-                                           : Qt::NoBrush);
-}
-
-
-QPixmap AWDataAggregator::tooltipImage()
-{
-    // create image
-    m_toolTipScene->clear();
-    QPen pen;
-    auto shift = 0.0;
-
-    for (auto i = 0; i < m_requiredKeys.count(); ++i) {
-        auto key = m_requiredKeys[i];
-
-        // create frame
-        auto normX = 100.0 / static_cast<float>(m_values[key].count());
-        auto normY = 100.0 / (1.5 * m_boundaries[key]);
-
-        // apply pen color
-        if (key != "batTooltip")
-            pen.setColor(m_configuration[QString("%1Color").arg(key)].toString());
-
-        // paint data inside frame
-        for (int j = 0; j < m_values[key].count() - 1; j++) {
-            // some magic here
-            auto x1 = j * normX + shift;
-            auto y1 = -std::fabs(m_values[key].at(j)) * normY + 5.0;
-            auto x2 = (j + 1) * normX + shift;
-            auto y2 = -std::fabs(m_values[key].at(j + 1)) * normY + 5.0;
-            // apply color for the battery tooltip based on charge/discharge
-            if (key == "batTooltip") {
-                if (m_values[key].at(j + 1) > 0)
-                    pen.setColor(QColor(m_configuration["batTooltipColor"].toString()));
-                else
-                    pen.setColor(QColor(m_configuration["batInTooltipColor"].toString()));
-            }
-
-            m_toolTipScene->addLine(x1, y1, x2, y2, pen);
-        }
-
-        // increase frame shift if not downkbtooltip
-        // Additional workaround is required because there is frame (uokb and downkb) which contains two charts
-        // with the same shift
-        if (key != "downkbTooltip")
-            shift += 100.0;
-    }
-
-    return m_toolTipView->grab();
-}
-
-
-void AWDataAggregator::dataUpdate(const QVariantHash &_values)
-{
-    // do not log these arguments
-    setData(_values);
-    emit(toolTipPainted(htmlImage(tooltipImage())));
-}
-
-
-void AWDataAggregator::checkValue(const QString &_source, const double _value, const double _extremum) const
-{
-    qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value << "called with extremum"
-                    << _extremum;
-
-    if (_value >= 0.0) {
-        if ((m_enablePopup) && (_value > _extremum) && (m_values[_source].last() < _extremum))
-            return AWActions::sendNotification("event", notificationText(_source, _value));
-    } else {
-        if ((m_enablePopup) && (_value < _extremum) && (m_values[_source].last() > _extremum))
-            return AWActions::sendNotification("event", notificationText(_source, _value));
-    }
-}
-
-
-void AWDataAggregator::checkValue(const QString &_source, const QString &_current, const QString &_received) const
-{
-    qCDebug(LOG_AW) << "Notification source" << _source << "with current value" << _current << "and received one"
-                    << _received;
-
-    if ((m_enablePopup) && (_current != _received) && (!_received.isEmpty()))
-        return AWActions::sendNotification("event", notificationText(_source, _received));
-}
-
-
-void AWDataAggregator::initScene()
-{
-    m_toolTipScene = new QGraphicsScene(nullptr);
-    m_toolTipView = new QGraphicsView(m_toolTipScene);
-    m_toolTipView->setStyleSheet("background: transparent");
-    m_toolTipView->setContentsMargins(0, 0, 0, 0);
-    m_toolTipView->setFrameShape(QFrame::NoFrame);
-    m_toolTipView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    m_toolTipView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-}
-
-
-QString AWDataAggregator::notificationText(const QString &_source, const float _value)
-{
-    qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value;
-
-    QString output;
-    if (_source == "batTooltip")
-        output = _value > 0.0 ? i18n("AC online") : i18n("AC offline");
-    else if (_source == "cpuTooltip")
-        output = i18n("High CPU load");
-    else if (_source == "memTooltip")
-        output = i18n("High memory usage");
-    else if (_source == "swapTooltip")
-        output = i18n("Swap is used");
-    else if (_source == "gpu")
-        output = i18n("High GPU load");
-
-    return output;
-}
-
-
-QString AWDataAggregator::notificationText(const QString &_source, const QString &_value)
-{
-    qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value;
-
-    QString output;
-    if (_source == "netdev")
-        output = i18n("Network device has been changed to %1", _value);
-
-    return output;
-}
-
-
-void AWDataAggregator::setData(const QVariantHash &_values)
-{
-    // do not log these arguments
-    // battery update requires info is AC online or not
-    setData(_values["ac"].toString() == m_configuration["acOnline"], "batTooltip", _values["bat"].toDouble());
-
-    // usual case
-    setData("cpuTooltip", _values["cpu"].toDouble(), 90.0);
-    setData("cpuclTooltip", _values["cpucl"].toDouble());
-    setData("memTooltip", _values["mem"].toDouble(), 80.0);
-    setData("swapTooltip", _values["swap"].toDouble(), 0.0);
-    setData("downkbTooltip", _values["downkb"].toDouble());
-    setData("upkbTooltip", _values["upkb"].toDouble());
-
-    // additional check for network device
-    auto currentNetworkDevice = _values["netdev"].toString();
-    checkValue("netdev", m_currentNetworkDevice, currentNetworkDevice);
-    m_currentNetworkDevice = currentNetworkDevice;
-
-    // additional check for GPU load
-    checkValue("gpu", _values["gpu"].toDouble(), 90.0);
-}
-
-
-void AWDataAggregator::setData(const QString &_source, double _value, const double _extremum)
-{
-    qCDebug(LOG_AW) << "Source" << _source << "to value" << _value << "with extremum" << _extremum;
-
-    if (m_values[_source].count() == 0)
-        m_values[_source].append(0.0);
-    else if (m_values[_source].count() > m_configuration["tooltipNumber"].toInt())
-        m_values[_source].removeFirst();
-    if (std::isnan(_value))
-        _value = 0.0;
-
-    // notifications
-    checkValue(_source, _value, _extremum);
-
-    m_values[_source].append(_value);
-    if (_source == "downkbTooltip") {
-        // to avoid copying of objects to another list we find max elements in each sequence and compare them
-        auto downMax = m_values["downkbTooltip"].empty()
-                           ? 1.0
-                           : *std::max_element(m_values["downkbTooltip"].cbegin(), m_values["downkbTooltip"].cend());
-        auto upMax = m_values["upkbTooltip"].empty()
-                         ? 1.0
-                         : *std::max_element(m_values["upkbTooltip"].cbegin(), m_values["upkbTooltip"].cend());
-        // assign both
-        m_boundaries["upkbTooltip"] = m_boundaries["downkbTooltip"] = 1.2 * std::max(downMax, upMax);
-    }
-}
-
-
-void AWDataAggregator::setData(const bool _dontInvert, const QString &_source, double _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

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

sources/awesome-widget/plugin/awdataengineaggregator.cpp

@@ -1,155 +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 "awdataengineaggregator.h"
-
-#include <ksysguard/formatter/Unit.h>
-#include <ksysguard/systemstats/DBusInterface.h>
-
-#include <QDBusConnection>
-
-#include "awdebug.h"
-
-
-AWDataEngineAggregator::AWDataEngineAggregator(QObject *_parent)
-    : QObject(_parent)
-    , m_interface(new KSysGuard::SystemStats::DBusInterface())
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    qDBusRegisterMetaType<KSysGuard::SensorData>();
-    qDBusRegisterMetaType<KSysGuard::SensorInfo>();
-    qDBusRegisterMetaType<KSysGuard::SensorDataList>();
-    qDBusRegisterMetaType<QHash<QString, KSysGuard::SensorInfo>>();
-
-    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::newSensorData, this,
-            &AWDataEngineAggregator::updateData);
-    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::sensorMetaDataChanged, this,
-            &AWDataEngineAggregator::updateSensors);
-    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::sensorAdded, this,
-            &AWDataEngineAggregator::sensorAdded);
-    connect(m_interface, &KSysGuard::SystemStats::DBusInterface::sensorRemoved, this,
-            &AWDataEngineAggregator::sensorRemoved);
-
-    loadSources();
-}
-
-
-AWDataEngineAggregator::~AWDataEngineAggregator()
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    disconnectSources();
-    m_interface->deleteLater();
-}
-
-
-void AWDataEngineAggregator::connectSources()
-{
-    auto keys = m_sensors.keys();
-    auto newKeys = QSet(keys.cbegin(), keys.cend()) - m_subscribed;
-
-    m_interface->subscribe(newKeys.values()).waitForFinished();
-    m_subscribed.unite(newKeys);
-}
-
-
-void AWDataEngineAggregator::disconnectSources()
-{
-    m_interface->unsubscribe(m_subscribed.values()).waitForFinished();
-    m_subscribed.clear();
-}
-
-
-bool AWDataEngineAggregator::isValidSensor(const KSysGuard::SensorInfo &_sensor)
-{
-    return _sensor.unit != KSysGuard::UnitInvalid;
-}
-
-
-void AWDataEngineAggregator::loadSources()
-{
-    auto response = m_interface->allSensors();
-    response.waitForFinished();
-
-    auto sensors = response.value();
-    updateSensors(sensors);
-    connectSources();
-
-    for (auto &sensor : m_sensors.keys())
-        emit(deviceAdded(sensor));
-}
-
-
-void AWDataEngineAggregator::dropSource(const QString &_source)
-{
-    qCDebug(LOG_AW) << "Disconnect sensor" << _source;
-
-    if (m_subscribed.contains(_source)) {
-        m_interface->unsubscribe({_source}).waitForFinished();
-        m_subscribed.remove(_source);
-    }
-}
-
-
-void AWDataEngineAggregator::sensorAdded(const QString &_sensor)
-{
-    qCDebug(LOG_AW) << "New sensor added" << _sensor;
-
-    // check if sensor is actually valid
-    auto response = m_interface->sensors({_sensor});
-    response.waitForFinished();
-
-    auto info = response.value().value(_sensor);
-    if (!isValidSensor(info))
-        return;
-
-    m_sensors[_sensor] = info;
-    dropSource(_sensor); // force reconnect
-    if (!m_subscribed.contains(_sensor)) {
-        m_interface->subscribe({_sensor}).waitForFinished();
-        m_subscribed.insert(_sensor);
-    }
-
-    // notify about new device
-    emit(deviceAdded(_sensor));
-}
-
-
-void AWDataEngineAggregator::sensorRemoved(const QString &_sensor)
-{
-    qCDebug(LOG_AW) << "Sensor" << _sensor << "has been removed";
-
-    m_sensors.remove(_sensor);
-    dropSource(_sensor);
-}
-
-
-void AWDataEngineAggregator::updateData(const KSysGuard::SensorDataList &_data)
-{
-    emit(dataUpdated(m_sensors, _data));
-}
-
-
-void AWDataEngineAggregator::updateSensors(const QHash<QString, KSysGuard::SensorInfo> &_sensors)
-{
-    for (auto [source, sensor] : _sensors.asKeyValueRange()) {
-        if (!isValidSensor(sensor))
-            continue;
-        m_sensors.insert(source, sensor);
-    }
-}

sources/awesome-widget/plugin/awdataengineaggregator.h

@@ -1,59 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include <ksysguard/systemstats/SensorInfo.h>
-
-#include <QHash>
-#include <QObject>
-#include <QSet>
-
-
-namespace KSysGuard::SystemStats
-{
-class DBusInterface;
-}
-
-class AWDataEngineAggregator : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit AWDataEngineAggregator(QObject *_parent = nullptr);
-    ~AWDataEngineAggregator() override;
-    void connectSources();
-    void disconnectSources();
-    [[nodiscard]] static bool isValidSensor(const KSysGuard::SensorInfo &_sensor);
-    void loadSources();
-
-signals:
-    void dataUpdated(const QHash<QString, KSysGuard::SensorInfo> &_sensors, const KSysGuard::SensorDataList &_data);
-    void deviceAdded(const QString &_source);
-
-public slots:
-    void dropSource(const QString &_source);
-    void sensorAdded(const QString &_sensor);
-    void sensorRemoved(const QString &_sensor);
-    void updateData(const KSysGuard::SensorDataList &_data);
-    void updateSensors(const QHash<QString, KSysGuard::SensorInfo> &_sensors);
-
-private:
-    KSysGuard::SystemStats::DBusInterface *m_interface = nullptr;
-    QHash<QString, KSysGuard::SensorInfo> m_sensors;
-    QSet<QString> m_subscribed;
-};

sources/awesome-widget/plugin/awdataenginemapper.cpp

@@ -1,112 +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 "awdataenginemapper.h"
-
-#include <QRegularExpression>
-
-#include "awdebug.h"
-#include "awformatterhelper.h"
-#include "formatters/formatters.h"
-#include "matchers/matchers.h"
-
-
-AWDataEngineMapper::AWDataEngineMapper(QObject *_parent, AWFormatterHelper *_custom)
-    : QObject(_parent)
-    , m_customFormatters(_custom)
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    // default formatters
-    // network
-    m_formatter["down"] = AWPluginFormatterNet::instance();
-    m_formatter["downkb"] = AWPluginFormatterMemory::instance();
-    m_formatter["downtot"] = AWPluginFormatterMemoryMB::instance();
-    m_formatter["downtotkb"] = AWPluginFormatterMemory::instance();
-    m_formatter["downunits"] = AWPluginFormatterNetUnits::instance();
-    m_formatter["up"] = AWPluginFormatterNet::instance();
-    m_formatter["upkb"] = AWPluginFormatterMemory::instance();
-    m_formatter["uptot"] = AWPluginFormatterMemoryMB::instance();
-    m_formatter["uptotkb"] = AWPluginFormatterMemory::instance();
-    m_formatter["upunits"] = AWPluginFormatterNetUnits::instance();
-}
-
-
-AWPluginFormaterInterface *AWDataEngineMapper::formatter(const QString &_key) const
-{
-    qCDebug(LOG_AW) << "Get formatter for key" << _key;
-
-    return m_formatter.value(_key, AWPluginFormatterNoFormat::instance());
-}
-
-
-QStringList AWDataEngineMapper::keysFromSource(const QString &_source) const
-{
-    qCDebug(LOG_AW) << "Search for source" << _source;
-
-    return m_map.values(_source);
-}
-
-
-// HACK units required to define should the value be calculated as temperature
-// or fan data
-QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSysGuard::Unit _units,
-                                               const QStringList &_keys)
-{
-    qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
-
-    auto matchers = AWPluginMatchers::matchers;
-    auto matcher = std::find_if(matchers.cbegin(), matchers.cend(),
-                                [&_source](auto matcher) { return matcher->matches(_source); });
-    if (matcher == matchers.cend())
-        return {};
-
-    auto foundKeys = (*matcher)->keys(_source, _units, m_settings);
-    auto keys = foundKeys.keys(); // speedup a little bit
-
-    // rewrite formatters for custom ones
-    QStringList customFormattersKeys;
-    if (m_customFormatters)
-        customFormattersKeys = m_customFormatters->definedFormatters();
-    qCInfo(LOG_AW) << "Looking for formatters" << keys << "in" << customFormattersKeys;
-    for (auto &key : keys) {
-        if (!customFormattersKeys.contains(key))
-            continue;
-        foundKeys[key] = AWPluginFormatterCustom::instance();
-    }
-
-    // check if keys were actually requested
-    qCInfo(LOG_AW) << "Looking for keys" << keys << "in" << _keys;
-    auto required = _keys.isEmpty()
-                    || std::any_of(keys.cbegin(), keys.cend(), [&_keys](auto &key) { return _keys.contains(key); });
-    if (!required)
-        return {};
-
-    // insert keys into memory
-    for (auto [key, formatter] : foundKeys.asKeyValueRange()) {
-        m_map.insert(_source, key);
-        m_formatter[key] = formatter;
-    }
-
-    return keys;
-}
-
-
-void AWDataEngineMapper::setDevices(const AWPluginMatcherSettings &_settings)
-{
-    m_settings = _settings;
-}

sources/awesome-widget/plugin/awdataenginemapper.h

@@ -1,52 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include <ksysguard/formatter/Unit.h>
-
-#include <QMultiHash>
-#include <QObject>
-
-#include "formatters/awpluginformatter.h"
-#include "matchers/awpluginmatchersettings.h"
-
-
-class AWFormatterHelper;
-
-class AWDataEngineMapper : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit AWDataEngineMapper(QObject *_parent = nullptr, AWFormatterHelper *_custom = nullptr);
-    ~AWDataEngineMapper() override = default;
-    // get methods
-    [[nodiscard]] AWPluginFormaterInterface *formatter(const QString &_key) const;
-    [[nodiscard]] QStringList keysFromSource(const QString &_source) const;
-    // set methods
-    QStringList registerSource(const QString &_source, KSysGuard::Unit _units, const QStringList &_keys);
-    void setDevices(const AWPluginMatcherSettings &_settings);
-
-private:
-    AWFormatterHelper *m_customFormatters = nullptr;
-    AWPluginMatcherSettings m_settings;
-    // variables
-    QHash<QString, QStringList> m_devices;
-    QHash<QString, AWPluginFormaterInterface *> m_formatter;
-    QMultiHash<QString, QString> m_map;
-};

sources/awesome-widget/plugin/awdbusadaptor.cpp

@@ -1,101 +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 "awdbusadaptor.h"
-
-#include <QDBusConnection>
-#include <QDBusConnectionInterface>
-
-#include "awdebug.h"
-#include "awkeys.h"
-
-
-AWDBusAdaptor::AWDBusAdaptor(AWKeys *_parent)
-    : QDBusAbstractAdaptor(_parent)
-    , m_plugin(_parent)
-{
-    qCDebug(LOG_DBUS) << __PRETTY_FUNCTION__;
-}
-
-
-QStringList AWDBusAdaptor::ActiveServices()
-{
-    auto listServices = QDBusConnection::sessionBus().interface()->call(QDBus::BlockWithGui, "ListNames");
-    if (listServices.arguments().isEmpty()) {
-        qCWarning(LOG_DBUS) << "Could not find any DBus service";
-        return {};
-    }
-    auto arguments = listServices.arguments().first().toStringList();
-
-    return std::accumulate(arguments.cbegin(), arguments.cend(), QStringList(), [](auto source, auto &service) {
-        if (service.startsWith(AWDBUS_SERVICE))
-            source.append(service);
-        return source;
-    });
-}
-
-
-QString AWDBusAdaptor::Info(const QString &key) const
-{
-    return m_plugin->infoByKey(key);
-}
-
-
-QStringList AWDBusAdaptor::Keys(const QString &regexp) const
-{
-    return m_plugin->dictKeys(true, regexp);
-}
-
-
-QString AWDBusAdaptor::Value(const QString &key) const
-{
-    return m_plugin->valueByKey(key);
-}
-
-
-qlonglong AWDBusAdaptor::WhoAmI() const
-{
-    return reinterpret_cast<qlonglong>(m_plugin);
-}
-
-
-void AWDBusAdaptor::SetLogLevel(const QString &what, const int level)
-{
-    qCDebug(LOG_DBUS) << "Set log level" << level << "for" << what;
-
-    if (level >= m_logLevels.count()) {
-        qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be less than" << m_logLevels.count();
-        return;
-    }
-
-    for (auto &lev : m_logLevels)
-        SetLogLevel(what, lev, m_logLevels.indexOf(lev) >= level);
-}
-
-
-void AWDBusAdaptor::SetLogLevel(const QString &what, const QString &level, const bool enabled)
-{
-    qCDebug(LOG_DBUS) << "Set log level" << level << "enabled" << enabled << "for" << what;
-
-    if (!m_logLevels.contains(level)) {
-        qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be in" << m_logLevels;
-        return;
-    }
-
-    auto state = enabled ? "true" : "false";
-    QLoggingCategory::setFilterRules(QString("%1.%2=%3").arg(what, level, state));
-}

sources/awesome-widget/plugin/awdbusadaptor.h

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

sources/awesome-widget/plugin/awesomewidget.cpp

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

sources/awesome-widget/plugin/awesomewidget.h

@@ -15,7 +15,9 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
+
+#ifndef AWPLUGIN_H
+#define AWPLUGIN_H
 
 #include <QQmlExtensionPlugin>
 
@@ -26,5 +28,8 @@ class AWPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 
 public:
-    void registerTypes(const char *uri) override;
+    void registerTypes(const char *uri);
 };
+
+
+#endif /* AWPLUGIN_H */

sources/awesome-widget/plugin/awformatterconfig.cpp

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

sources/awesome-widget/plugin/awformatterconfig.h

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

sources/awesome-widget/plugin/awformatterhelper.cpp

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

sources/awesome-widget/plugin/awformatterhelper.h

@@ -1,56 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include "abstractextitemaggregator.h"
-#include "awabstractformatter.h"
-#include "awabstractpairhelper.h"
-
-
-class AWFormatterHelper : public AbstractExtItemAggregator, public AWAbstractPairHelper
-{
-    Q_OBJECT
-
-public:
-    explicit AWFormatterHelper(QObject *_parent = nullptr);
-    ~AWFormatterHelper() override;
-    // read-write methods
-    void initItems() override;
-    // methods
-    [[nodiscard]] QString convert(const QVariant &_value, const QString &_name) const;
-    [[nodiscard]] QStringList definedFormatters() const;
-    [[nodiscard]] QList<AbstractExtItem *> items() const override;
-    // configuration related
-    void editPairs() override;
-    QStringList leftKeys() override;
-    QStringList rightKeys() override;
-
-public slots:
-    void editItems();
-
-private:
-    // methods
-    static AWAbstractFormatter::FormatterClass defineFormatterClass(const QString &_stringType);
-    void initFormatters();
-    [[nodiscard]] static QPair<QString, AWAbstractFormatter::FormatterClass> readMetadata(const QString &_filePath);
-    // parent methods
-    void doCreateItem(QListWidget *_widget) override;
-    // properties
-    QHash<QString, AWAbstractFormatter *> m_formatters;
-    QHash<QString, AWAbstractFormatter *> m_formattersClasses;
-};

sources/awesome-widget/plugin/awkeycache.cpp

@@ -1,130 +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 "awkeycache.h"
-
-#include <QDir>
-#include <QNetworkInterface>
-#include <QRegularExpression>
-#include <QSettings>
-#include <QStandardPaths>
-
-#include "awdebug.h"
-
-
-bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
-{
-    qCDebug(LOG_AW) << "Key" << _key << "with type" << _type;
-
-    auto fileName
-        = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
-    qCInfo(LOG_AW) << "Cache file" << fileName;
-    QSettings cache(fileName, QSettings::IniFormat);
-
-    cache.beginGroup(_type);
-    QStringList cachedValues;
-    for (auto &number : cache.allKeys())
-        cachedValues.append(cache.value(number).toString());
-
-    if (_type == "net") {
-        auto rawInterfaceList = QNetworkInterface::allInterfaces();
-        for (auto &interface : rawInterfaceList) {
-            auto device = interface.name();
-            if (cachedValues.contains(device))
-                continue;
-            qCInfo(LOG_AW) << "Found new key" << device << "for type" << _type;
-            cachedValues.append(device);
-            cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), device);
-        }
-    } else {
-        if (cachedValues.contains(_key))
-            return false;
-        qCInfo(LOG_AW) << "Found new key" << _key << "for type" << _type;
-        cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), _key);
-    }
-    cache.endGroup();
-
-    cache.sync();
-    return true;
-}
-
-
-QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringList &_bars, const QVariantMap &_tooltip,
-                                        const QStringList &_userKeys, const QStringList &_allKeys)
-{
-    qCDebug(LOG_AW) << "Looking for required keys in" << _keys << _bars << "using tooltip settings" << _tooltip;
-
-    // initial copy
-    QSet<QString> used(_keys.cbegin(), _keys.cend());
-    used.unite(QSet(_bars.cbegin(), _bars.cend()));
-    used.unite(QSet(_userKeys.cbegin(), _userKeys.cend()));
-    // insert keys from tooltip
-    for (auto [key, value] : _tooltip.asKeyValueRange()) {
-        if ((key.endsWith("Tooltip")) && value.toBool()) {
-            auto local = key;
-            local.remove("Tooltip");
-            used << local;
-        }
-    }
-
-    // insert keys which depend on others, refer to AWKeys::calculateValues()
-    // network keys
-    QStringList netKeys(
-        {"up", "upkb", "uptot", "uptotkb", "upunits", "down", "downkb", "downtot", "downtotkb", "downunits"});
-    for (auto &key : netKeys) {
-        if (!used.contains(key))
-            continue;
-        auto filt = _allKeys.filter(QRegularExpression(QString("^%1[0-9]{1,}").arg(key)));
-        for (auto &filtered : filt)
-            used << filtered;
-    }
-    // netdev key
-    if (std::any_of(netKeys.cbegin(), netKeys.cend(), [&used](auto &key) { return used.contains(key); }))
-        used << "netdev";
-
-    // HACK append dummy if there are no other keys. This hack is required
-    // because empty list leads to the same behaviour as skip checking
-    if (used.isEmpty())
-        used << "dummy";
-
-    return used.values();
-}
-
-
-AWPluginMatcherSettings AWKeyCache::loadKeysFromCache()
-{
-    auto fileName
-        = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
-    qCInfo(LOG_AW) << "Cache file" << fileName;
-    QSettings cache(fileName, QSettings::IniFormat);
-
-    AWPluginMatcherSettings devices;
-    QHash<QString, QStringList *> groups = {
-        {"disk", &devices.disk},   {"gpu", &devices.gpu},      {"mount", &devices.mount},
-        {"net", &devices.network}, {"temp", &devices.sensors},
-    };
-
-    for (auto [group, list] : groups.asKeyValueRange()) {
-        cache.beginGroup(group);
-        for (auto &key : cache.allKeys())
-            list->append(cache.value(key).toString());
-        cache.endGroup();
-    }
-
-    return devices;
-}

sources/awesome-widget/plugin/awkeycache.h

@@ -1,32 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include <QString>
-#include <QVariant>
-
-#include <matchers/awpluginmatchersettings.h>
-
-
-namespace AWKeyCache
-{
-bool addKeyToCache(const QString &_type, const QString &_key = "");
-QStringList getRequiredKeys(const QStringList &_keys, const QStringList &_bars, const QVariantMap &_tooltip,
-                            const QStringList &_userKeys, const QStringList &_allKeys);
-AWPluginMatcherSettings loadKeysFromCache();
-} // namespace AWKeyCache

sources/awesome-widget/plugin/awkeyoperations.cpp

@@ -1,357 +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 "awkeyoperations.h"
-
-#include <QDir>
-#include <QRegularExpression>
-#include <QThread>
-
-#include "awcustomkeyshelper.h"
-#include "awdebug.h"
-#include "awkeycache.h"
-#include "awpatternfunctions.h"
-// extensions
-#include "extnetworkrequest.h"
-#include "extquotes.h"
-#include "extscript.h"
-#include "extupgrade.h"
-#include "extweather.h"
-#include "graphicalitem.h"
-
-
-AWKeyOperations::AWKeyOperations(QObject *_parent)
-    : QObject(_parent)
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    m_customKeys = new AWCustomKeysHelper(this);
-    m_graphicalItems = new ExtItemAggregator<GraphicalItem>(this, "desktops");
-    m_extNetRequest = new ExtItemAggregator<ExtNetworkRequest>(this, "requests");
-    m_extQuotes = new ExtItemAggregator<ExtQuotes>(this, "quotes");
-    m_extScripts = new ExtItemAggregator<ExtScript>(this, "scripts");
-    m_extUpgrade = new ExtItemAggregator<ExtUpgrade>(this, "upgrade");
-    m_extWeather = new ExtItemAggregator<ExtWeather>(this, "weather");
-}
-
-
-AWPluginMatcherSettings AWKeyOperations::devices() const
-{
-    return m_devices;
-}
-
-
-void AWKeyOperations::updateCache()
-{
-    // update network and hdd list
-    addKeyToCache("net");
-}
-
-
-QStringList AWKeyOperations::dictKeys() const
-{
-    QStringList allKeys;
-    // weather
-    for (auto item : m_extWeather->activeItems()) {
-        allKeys.append(item->tag("weatherId"));
-        allKeys.append(item->tag("weather"));
-        allKeys.append(item->tag("humidity"));
-        allKeys.append(item->tag("pressure"));
-        allKeys.append(item->tag("temperature"));
-        allKeys.append(item->tag("timestamp"));
-    }
-    // cpuclock & cpu
-    for (auto i = 0; i < QThread::idealThreadCount(); ++i) {
-        allKeys.append(QString("cpucl%1").arg(i));
-        allKeys.append(QString("cpu%1").arg(i));
-    }
-    // temperature
-    for (auto i = 0; i < m_devices.sensors.count(); ++i)
-        allKeys.append(QString("temp%1").arg(i));
-    // gpu
-    for (auto i = 0; i < m_devices.gpu.count(); ++i) {
-        allKeys.append(QString("gpu%1").arg(i));
-        allKeys.append(QString("gputemp%1").arg(i));
-    }
-    // hdd
-    for (auto i = 0; i < m_devices.mount.count(); ++i) {
-        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 (auto i = 0; i < m_devices.disk.count(); ++i) {
-        allKeys.append(QString("hddr%1").arg(i));
-        allKeys.append(QString("hddw%1").arg(i));
-    }
-    // network
-    for (auto i = 0; i < m_devices.network.count(); ++i) {
-        allKeys.append(QString("downunits%1").arg(i));
-        allKeys.append(QString("upunits%1").arg(i));
-        allKeys.append(QString("downtotkb%1").arg(i));
-        allKeys.append(QString("downtot%1").arg(i));
-        allKeys.append(QString("downkb%1").arg(i));
-        allKeys.append(QString("down%1").arg(i));
-        allKeys.append(QString("uptotkb%1").arg(i));
-        allKeys.append(QString("uptot%1").arg(i));
-        allKeys.append(QString("upkb%1").arg(i));
-        allKeys.append(QString("up%1").arg(i));
-    }
-    // battery
-    auto allBatteryDevices = QDir("/sys/class/power_supply")
-                                 .entryList(QStringList({"BAT*"}), QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
-    for (int i = 0; i < allBatteryDevices.count(); ++i) {
-        allKeys.append(QString("bat%1").arg(i));
-        allKeys.append(QString("batleft%1").arg(i));
-        allKeys.append(QString("batnow%1").arg(i));
-        allKeys.append(QString("batrate%1").arg(i));
-        allKeys.append(QString("battotal%1").arg(i));
-    }
-    // package manager
-    for (auto item : m_extUpgrade->activeItems())
-        allKeys.append(item->tag("pkgcount"));
-    // quotes
-    for (auto item : m_extQuotes->activeItems()) {
-        allKeys.append(item->tag("price"));
-        allKeys.append(item->tag("pricechg"));
-        allKeys.append(item->tag("percpricechg"));
-        allKeys.append(item->tag("volume"));
-        allKeys.append(item->tag("volumechg"));
-        allKeys.append(item->tag("percvolumechg"));
-    }
-    // custom
-    for (auto item : m_extScripts->activeItems())
-        allKeys.append(item->tag("custom"));
-    // network requests
-    for (auto item : m_extNetRequest->activeItems())
-        allKeys.append(item->tag("response"));
-    // bars
-    for (auto item : m_graphicalItems->activeItems())
-        allKeys.append(item->tag("bar"));
-    // user defined keys
-    allKeys.append(m_customKeys->keys());
-    // static keys
-    allKeys.append(QString(STATIC_KEYS).split(','));
-
-    // sort in valid order
-    allKeys.sort();
-    std::reverse(allKeys.begin(), allKeys.end());
-
-    return allKeys;
-}
-
-
-// this method is required to provide GraphicalItem functions (e.g. paint()) to
-// parent classes
-GraphicalItem *AWKeyOperations::giByKey(const QString &_key) const
-{
-    qCDebug(LOG_AW) << "Looking for item" << _key;
-
-    return m_graphicalItems->itemByTag(_key, "bar");
-}
-
-
-QStringList AWKeyOperations::requiredUserKeys() const
-{
-    return m_customKeys->refinedSources();
-}
-
-
-QStringList AWKeyOperations::userKeys() const
-{
-    return m_customKeys->keys();
-}
-
-
-QString AWKeyOperations::userKeySource(const QString &_key) const
-{
-    return m_customKeys->source(_key);
-}
-
-
-QString AWKeyOperations::infoByKey(const QString &_key) const
-{
-    qCDebug(LOG_AW) << "Requested key" << _key;
-
-    static auto numberRegExp = QRegularExpression("\\d+");
-
-    auto stripped = _key;
-    stripped.remove(numberRegExp);
-    QString output;
-
-    static auto hddRegExp = QRegularExpression("^hdd(|mb|gb|freemb|freegb|totmb|totgb)");
-    static auto hddrwRegExp = QRegularExpression("^hdd[rw]");
-    static auto hddMatchRegExp = QRegularExpression("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)");
-    static auto netRegExp = QRegularExpression("^(down|up)");
-    static auto netMatchRegExp = QRegularExpression("^(down|up)[0-9]");
-    static auto quotesRegExp = QRegularExpression("^(|perc)(ask|bid|price)(chg|)");
-    static auto weatherRegExp = QRegularExpression("^(weather|weatherId|humidity|pressure|temperature)");
-
-    if (_key.startsWith("bar")) {
-        auto item = m_graphicalItems->itemByTag(_key, stripped);
-        if (item)
-            output = item->uniq();
-    } else if (_key.startsWith("custom")) {
-        auto item = m_extScripts->itemByTag(_key, stripped);
-        if (item)
-            output = item->uniq();
-    } else if (_key.contains(hddrwRegExp)) {
-        auto index = _key;
-        index.remove(hddrwRegExp);
-        output = m_devices.disk[index.toInt()];
-    } else if (_key.contains(hddMatchRegExp)) {
-        auto index = _key;
-        index.remove(hddRegExp);
-        output = m_devices.mount[index.toInt()];
-    } else if (_key.contains(netMatchRegExp)) {
-        auto index = _key;
-        index.remove(netRegExp);
-        output = m_devices.network[index.toInt()];
-    } else if (_key.startsWith("pkgcount")) {
-        auto item = m_extUpgrade->itemByTag(_key, stripped);
-        if (item)
-            output = item->uniq();
-    } else if (_key.contains(quotesRegExp)) {
-        auto item = m_extQuotes->itemByTag(_key, stripped);
-        if (item)
-            output = item->uniq();
-    } else if (_key.contains(weatherRegExp)) {
-        auto item = m_extWeather->itemByTag(_key, stripped);
-        if (item)
-            output = item->uniq();
-    } else if (_key.startsWith("temp")) {
-        auto index = _key;
-        index.remove("temp");
-        output = m_devices.sensors[index.toInt()];
-    } else if (_key.startsWith("response")) {
-        auto item = m_extNetRequest->itemByTag(_key, stripped);
-        if (item)
-            output = item->uniq();
-    } else {
-        output = "(none)";
-    }
-
-    return output;
-}
-
-
-QString AWKeyOperations::pattern() const
-{
-    return m_pattern;
-}
-
-
-void AWKeyOperations::setPattern(const QString &_currentPattern)
-{
-    qCDebug(LOG_AW) << "Set pattern" << _currentPattern;
-
-    m_pattern = _currentPattern;
-}
-
-
-void AWKeyOperations::editItem(const QString &_type)
-{
-    qCDebug(LOG_AW) << "Item type" << _type;
-
-    static auto supportsGraphicalRegExp = QRegularExpression("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)");
-
-    if (_type == "graphicalitem") {
-        auto keys = dictKeys().filter(supportsGraphicalRegExp);
-        keys.sort();
-        m_graphicalItems->setConfigArgs(keys);
-        return m_graphicalItems->editItems();
-    } else if (_type == "extnetworkrequest") {
-        return m_extNetRequest->editItems();
-    } else if (_type == "extquotes") {
-        return m_extQuotes->editItems();
-    } else if (_type == "extscript") {
-        return m_extScripts->editItems();
-    } else if (_type == "extupgrade") {
-        return m_extUpgrade->editItems();
-    } else if (_type == "extweather") {
-        return m_extWeather->editItems();
-    }
-}
-
-
-void AWKeyOperations::addDevice(const QString &_source)
-{
-    qCDebug(LOG_AW) << "Source" << _source;
-
-    static auto diskRegexp = QRegularExpression("^disk/.*/read$");
-    static auto mountRegexp = QRegularExpression("^disk/.*/usedPercent$");
-    static auto cpuTempRegExp = QRegularExpression("^cpu/cpu.*/temperature$");
-    static auto gpuRegExp = QRegularExpression("^gpu/gpu.*/usage$");
-
-    if (_source.contains(diskRegexp)) {
-        auto device = _source;
-        device.remove("disk/").remove("/read");
-        addKeyToCache("disk", device);
-    } else if (_source.contains(mountRegexp)) {
-        auto device = _source;
-        device.remove("disk/").remove("/usedPercent");
-        addKeyToCache("mount", device);
-    } else if (_source.startsWith("lmsensors") || _source.contains(cpuTempRegExp)
-               || _source == "cpu/all/averageTemperature") {
-        addKeyToCache("temp", _source);
-    } else if (_source.contains(gpuRegExp)) {
-        auto device = _source;
-        device.remove("gpu/").remove("/usage");
-        addKeyToCache("gpu", device);
-    }
-}
-
-
-void AWKeyOperations::addKeyToCache(const QString &_type, const QString &_key)
-{
-    qCDebug(LOG_AW) << "Key" << _key << "with type" << _type;
-
-    if (AWKeyCache::addKeyToCache(_type, _key)) {
-        m_devices = AWKeyCache::loadKeysFromCache();
-        reinitKeys();
-    }
-}
-
-
-void AWKeyOperations::reinitKeys()
-{
-    m_customKeys->initItems();
-    m_graphicalItems->initItems();
-    m_extNetRequest->initItems();
-    m_extQuotes->initItems();
-    m_extScripts->initItems();
-    m_extUpgrade->initItems();
-    m_extWeather->initItems();
-
-    // init
-    auto allKeys = dictKeys();
-
-    // apply aw_* functions
-    m_pattern = AWPatternFunctions::insertAllKeys(m_pattern, allKeys);
-    m_pattern = AWPatternFunctions::insertKeyCount(m_pattern, allKeys);
-    m_pattern = AWPatternFunctions::insertKeyNames(m_pattern, allKeys);
-    m_pattern = AWPatternFunctions::insertKeys(m_pattern, allKeys);
-    m_pattern = AWPatternFunctions::insertMacros(m_pattern);
-    // wrap templates
-    m_pattern = AWPatternFunctions::expandTemplates(m_pattern);
-
-    emit(updateKeys(allKeys));
-}

sources/awesome-widget/plugin/awkeyoperations.h

@@ -1,78 +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/  *
- ***************************************************************************/
-
-#pragma once
-
-#include <QObject>
-
-#include "extitemaggregator.h"
-#include "matchers/awpluginmatchersettings.h"
-
-
-class AWCustomKeysHelper;
-class ExtNetworkRequest;
-class ExtQuotes;
-class ExtScript;
-class ExtUpgrade;
-class ExtWeather;
-class GraphicalItem;
-
-class AWKeyOperations : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString pattern READ pattern WRITE setPattern)
-
-public:
-    explicit AWKeyOperations(QObject *_parent = nullptr);
-    ~AWKeyOperations() override = default;
-    [[nodiscard]] AWPluginMatcherSettings devices() const;
-    void updateCache();
-    // keys
-    [[nodiscard]] QStringList dictKeys() const;
-    [[nodiscard]] GraphicalItem *giByKey(const QString &_key) const;
-    [[nodiscard]] QStringList requiredUserKeys() const;
-    [[nodiscard]] QStringList userKeys() const;
-    [[nodiscard]] QString userKeySource(const QString &_key) const;
-    // values
-    [[nodiscard]] QString infoByKey(const QString &_key) const;
-    [[nodiscard]] QString pattern() const;
-    void setPattern(const QString &_currentPattern);
-    // configuration
-    void editItem(const QString &_type);
-
-signals:
-    void updateKeys(const QStringList &_currentKeys);
-
-public slots:
-    void addDevice(const QString &_source);
-
-private:
-    // methods
-    void addKeyToCache(const QString &_type, const QString &_key = "");
-    void reinitKeys();
-    // objects
-    AWCustomKeysHelper *m_customKeys = nullptr;
-    ExtItemAggregator<GraphicalItem> *m_graphicalItems = nullptr;
-    ExtItemAggregator<ExtNetworkRequest> *m_extNetRequest = nullptr;
-    ExtItemAggregator<ExtQuotes> *m_extQuotes = nullptr;
-    ExtItemAggregator<ExtScript> *m_extScripts = nullptr;
-    ExtItemAggregator<ExtUpgrade> *m_extUpgrade = nullptr;
-    ExtItemAggregator<ExtWeather> *m_extWeather = nullptr;
-    // variables
-    AWPluginMatcherSettings m_devices;
-    QString m_pattern;
-};

sources/awesome-widget/plugin/awkeys.h

@@ -15,67 +15,87 @@
  *   along with awesome-widgets. If not, see http://www.gnu.org/licenses/  *
  ***************************************************************************/
 
-#pragma once
 
+#ifndef AWKEYS_H
+#define AWKEYS_H
+
+#include <QHash>
 #include <QObject>
+#include <QStringList>
+#include <QVariant>
 
-#include <ksysguard/systemstats/SensorInfo.h>
+#include "extitemaggregator.h"
+#include "version.h"
 
 
-class AWDataAggregator;
+class AWToolTip;
-class AWDataEngineAggregator;
+class ExtQuotes;
-class AWKeyOperations;
+class ExtScript;
-class AWKeysAggregator;
+class ExtUpgrade;
-class QTimer;
+class ExtWeather;
+class GraphicalItem;
 
-class __attribute__((visibility("default"))) AWKeys : public QObject
+class AWKeys : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit AWKeys(QObject *_parent = nullptr);
+    explicit AWKeys(QObject *parent = nullptr);
-    ~AWKeys() override;
+    virtual ~AWKeys();
-    Q_INVOKABLE void initDataAggregator(const QVariantMap &_tooltipParams);
+
-    Q_INVOKABLE void initKeys(const QString &_currentPattern, int _interval, bool _optimize);
+    Q_INVOKABLE void initKeys(const QString currentPattern);
-    Q_INVOKABLE void setAggregatorProperty(const QString &_key, const QVariant &_value);
+    Q_INVOKABLE void initTooltip(const QVariantMap tooltipParams);
-    Q_INVOKABLE void setWrapNewLines(bool _wrap);
+    Q_INVOKABLE void setPopupEnabled(const bool popup = false);
-    // additional method to force load keys from Qml UI. Used in some
+    Q_INVOKABLE void setTranslateStrings(const bool translate = false);
-    // configuration pages
+    Q_INVOKABLE void setWrapNewLines(const bool wrap = false);
-    Q_INVOKABLE void updateCache();
+    Q_INVOKABLE QSize toolTipSize() const;
     // keys
-    Q_INVOKABLE [[nodiscard]] QStringList dictKeys(bool _sorted = false, const QString &_regexp = "") const;
+    Q_INVOKABLE void addDevice(const QString source);
+    Q_INVOKABLE QStringList dictKeys(const bool sorted = false,
+                                     const QString regexp = QString()) const;
+    Q_INVOKABLE QStringList getHddDevices() const;
+    Q_INVOKABLE void setDataBySource(const QString sourceName, const QVariantMap data,
+                                     const QVariantMap params);
     // values
-    Q_INVOKABLE [[nodiscard]] QString infoByKey(const QString &_key) const;
+    Q_INVOKABLE void graphicalValueByKey() const;
-    Q_INVOKABLE [[nodiscard]] QString valueByKey(const QString &_key) const;
+    Q_INVOKABLE QString infoByKey(QString key) const;
+    Q_INVOKABLE QString valueByKey(QString key) const;
     // configuration
-    Q_INVOKABLE void editItem(const QString &_type);
+    Q_INVOKABLE void editItem(const QString type);
 
 signals:
-    void dropSourceFromDataengine(const QString &_source);
+    void dropSourceFromDataengine(const QString source);
-    void needTextToBeUpdated(const QString &_newText) const;
+    void needTextToBeUpdated(const QString newText) const;
-    void needToolTipToBeUpdated(const QString &_newText) const;
+    void needToolTipToBeUpdated(const QString newText) const;
+    void needToBeUpdated();
 
 private slots:
-    void dataUpdated(const QHash<QString, KSysGuard::SensorInfo> &_sensors, const KSysGuard::SensorDataList &_data);
+    void dataUpdate();
-    void reinitKeys(const QStringList &_currentKeys);
+    void loadKeysFromCache();
-    void updateTextData();
+    void reinitKeys();
 
 private:
     // methods
-    void calculateValues();
+    void addKeyToCache(const QString type, const QString key = QString(""));
-    void createDBusInterface();
+    void calculateLambdas();
-    [[nodiscard]] QString parsePattern(QString _pattern) const;
+    QString parsePattern() const;
-    void setDataBySource(const QString &_source, const KSysGuard::SensorInfo &_sensor, const QVariant &_value);
+    float temperature(const float temp, const QString units) const;
-    // objects
+    // get methods
-    AWDataAggregator *m_dataAggregator = nullptr;
+    AWToolTip *toolTip = nullptr;
-    AWDataEngineAggregator *m_dataEngineAggregator = nullptr;
+    bool enablePopup = false;
-    AWKeysAggregator *m_aggregator = nullptr;
+    bool translateStrings = false;
-    AWKeyOperations *m_keyOperator = nullptr;
+    bool wrapNewLines = false;
-    QTimer *m_timer = nullptr;
+    ExtItemAggregator<GraphicalItem> *graphicalItems;
-    // variables
+    ExtItemAggregator<ExtQuotes> *extQuotes;
-    QVariantMap m_tooltipParams;
+    ExtItemAggregator<ExtScript> *extScripts;
-    QStringList m_foundBars, m_foundKeys, m_foundLambdas, m_requiredKeys;
+    ExtItemAggregator<ExtUpgrade> *extUpgrade;
-    QVariantHash m_values;
+    ExtItemAggregator<ExtWeather> *extWeather;
-    bool m_optimize = false;
+    QString pattern;
-    bool m_wrapNewLines = false;
+    QStringList foundBars, foundKeys, foundLambdas;
+    QStringList timeKeys = QString(TIME_KEYS).split(QChar(','));
+    QHash<QString, QString> values;
+    QStringList diskDevices, hddDevices, mountDevices, networkDevices, tempDevices;
 };
+
+
+#endif /* AWKEYS_H */

sources/awesome-widget/plugin/awkeysaggregator.cpp

@@ -1,159 +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 "awkeysaggregator.h"
-
-#include "awdataenginemapper.h"
-#include "awdebug.h"
-#include "awformatterhelper.h"
-
-
-AWKeysAggregator::AWKeysAggregator(QObject *_parent)
-    : QObject(_parent)
-{
-    qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
-
-    m_settings.customFormatters = new AWFormatterHelper(this);
-    m_mapper = new AWDataEngineMapper(this, m_settings.customFormatters);
-}
-
-
-void AWKeysAggregator::initFormatters()
-{
-    m_settings.customFormatters->initItems();
-}
-
-
-QString AWKeysAggregator::acOffline() const
-{
-    return m_settings.acOffline;
-}
-
-
-QString AWKeysAggregator::acOnline() const
-{
-    return m_settings.acOnline;
-}
-
-
-QString AWKeysAggregator::customTime() const
-{
-    return m_settings.customTime;
-}
-
-
-QString AWKeysAggregator::customUptime() const
-{
-    return m_settings.customUptime;
-}
-
-
-QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key, bool replaceSpace) const
-{
-    qCDebug(LOG_AW) << "Data" << _data << "for key" << _key;
-
-    auto output = m_mapper->formatter(_key)->format(_data, _key, m_settings);
-    // replace spaces to non-breakable ones
-    replaceSpace &= (!_key.startsWith("custom") && (!_key.startsWith("weather")));
-    if (replaceSpace)
-        output.replace(" ", "&nbsp;");
-
-    return output;
-}
-
-
-QStringList AWKeysAggregator::keysFromSource(const QString &_source) const
-{
-    qCDebug(LOG_AW) << "Search for source" << _source;
-
-    return m_mapper->keysFromSource(_source);
-}
-
-
-QString AWKeysAggregator::tempUnits() const
-{
-    return m_settings.tempUnits;
-}
-
-
-bool AWKeysAggregator::translate() const
-{
-    return m_settings.translate;
-}
-
-
-void AWKeysAggregator::setAcOffline(const QString &_inactive)
-{
-    qCDebug(LOG_AW) << "Inactive AC string" << _inactive;
-
-    m_settings.acOffline = _inactive;
-}
-
-
-void AWKeysAggregator::setAcOnline(const QString &_active)
-{
-    qCDebug(LOG_AW) << "Active AC string" << _active;
-
-    m_settings.acOnline = _active;
-}
-
-
-void AWKeysAggregator::setCustomTime(const QString &_customTime)
-{
-    qCDebug(LOG_AW) << "Format" << _customTime;
-
-    m_settings.customTime = _customTime;
-}
-
-
-void AWKeysAggregator::setCustomUptime(const QString &_customUptime)
-{
-    qCDebug(LOG_AW) << "Format" << _customUptime;
-
-    m_settings.customUptime = _customUptime;
-}
-
-
-void AWKeysAggregator::setDevices(const AWPluginMatcherSettings &_settings)
-{
-    m_mapper->setDevices(_settings);
-}
-
-
-void AWKeysAggregator::setTempUnits(const QString &_units)
-{
-    qCDebug(LOG_AW) << "Units" << _units;
-
-    m_settings.tempUnits = _units;
-}
-
-
-void AWKeysAggregator::setTranslate(const bool _translate)
-{
-    qCDebug(LOG_AW) << "Translate" << _translate;
-
-    m_settings.translate = _translate;
-}
-
-
-QStringList AWKeysAggregator::registerSource(const QString &_source, const KSysGuard::Unit _units,
-                                             const QStringList &_keys)
-{
-    qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
-
-    return m_mapper->registerSource(_source, _units, _keys);
-}