Merge 115bef3dbedcc6c7033a56e0700d4c8b337cb1c7 into eecb128865d463a5e8faeb09f2b0b7d9d6d682f0

.github/workflows/release.yml

@@ -25,17 +25,17 @@ jobs:
         env:
           VERSION: ${{ steps.version.outputs.VERSION }}
 
-#      - name: build debian package
+      - name: build debian package
-#        run: |
+        run: |
-#          sudo apt update && \
+          sudo apt update && \
-#          sudo apt install -yq cmake extra-cmake-modules g++ git gettext make && \
+          sudo apt install -yq cmake extra-cmake-modules g++ git gettext make && \
-#          sudo apt install -yq libkf5i18n-dev libkf5notifications-dev libkf5service-dev \
+          sudo apt install -yq libkf5i18n-dev libkf5notifications-dev libkf5service-dev \
-#            libkf5windowsystem-dev libkf5plasma-dev qtbase5-dev qtdeclarative5-dev \
+            libkf5windowsystem-dev libkf5plasma-dev qtbase5-dev qtdeclarative5-dev \
-#            plasma-workspace-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 && \
+          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 && \
+          cd build-deb && \
-#          make package && \
+          make package && \
-#          cd ..
+          cd ..
 
       - name: release
         uses: softprops/action-gh-release@v1
@@ -45,7 +45,7 @@ jobs:
             ${{ steps.changelog.outputs.changelog }}
           files: |
             awesome-widgets-*-src.tar.xz
-#            build-deb/plasma-widget-awesome-widgets-*.deb
+            build-deb/plasma-widget-awesome-widgets-*.deb
           fail_on_unmatched_files: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG

@@ -1,6 +1,3 @@
-Ver.4.0.0:
-* migration to plasma 6
-
 Ver.3.5.0:
 + wayland support
 * update code to latest standards
@@ -15,6 +12,7 @@ Ver.3.4.2:
 * update to new qt api
 - fix non printable spaces (#142, #143)
 
+
 Ver.3.3.3:
 + add custom keys support (#101)
 * DBus interface improvements

packages/PKGBUILD

@@ -1,21 +1,22 @@
 # Maintainer: Evgeniy Alekseev <arcanis at archlinux dot org>
 
-pkgname=plasma6-applet-awesome-widgets
+pkgname=plasma5-applet-awesome-widgets
 _pkgname=awesome-widgets
-pkgver=4.0.0alpha1
+pkgver=3.4.3
 pkgrel=1
 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)"
-arch=('x86_64')
+arch=('i686' 'x86_64')
 url="https://arcanis.me/projects/awesome-widgets"
 license=('GPL3')
-depends=('plasma-workspace')
+depends=('ksysguard' 'plasma-framework')
 optdepends=("hddtemp: for HDD temperature monitor"
             "smartmontools: for HDD temperature monitor"
             "mpd: for music player monitor"
             "nvidia-utils: for GPU monitor")
 makedepends=('cmake' 'extra-cmake-modules' 'python')
-source=(https://github.com/arcan1s/awesome-widgets/releases/download/${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
+source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz)
-install="$pkgname.install"
+install=${pkgname}.install
+md5sums=('5953ba518191bb6fff83cdb8633c735c')
 backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
 
 build () {
@@ -29,5 +30,3 @@ build () {
 package() {
       DESTDIR="$pkgdir" cmake --install build
 }
-
-sha256sums=('b2a7b07a1df6f710f4e0d6e5898933f4ddb131818b922dc4b8e48afe3e98a664')

sources/CMakeLists.txt

@@ -14,9 +14,9 @@ project(awesomewidgets)
 set(PROJECT_AUTHOR "Evgeniy Alekseev")
 set(PROJECT_CONTACT "esalexeev@gmail.com")
 set(PROJECT_LICENSE "GPL3")
-set(PROJECT_VERSION_MAJOR "4")
+set(PROJECT_VERSION_MAJOR "3")
-set(PROJECT_VERSION_MINOR "0")
+set(PROJECT_VERSION_MINOR "5")
-set(PROJECT_VERSION_PATCH "0")
+set(PROJECT_VERSION_PATCH "1")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 # append git version if any
 set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "")

sources/awesome-widget/plugin/awdataenginemapper.cpp

@@ -131,15 +131,15 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         key.remove("extsysmon/custom/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "extsysmon/desktop/name") {
+    } else if (_source == "extsysmon/desktop/current/name") {
         // current desktop name
         m_map.insert(_source, "desktop");
         m_formatter["desktop"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "extsysmon/desktop/number") {
+    } else if (_source == "extsysmon/desktop/current/number") {
         // current desktop number
         m_map.insert(_source, "ndesktop");
         m_formatter["ndesktop"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "extsysmon/desktop/count") {
+    } else if (_source == "extsysmon/desktop/total/number") {
         // desktop count
         m_map.insert(_source, "tdesktops");
         m_formatter["tdesktops"] = AWKeysAggregator::FormatterType::NoFormat;
@@ -217,7 +217,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
     } else if (_source.startsWith("extsysmon/hdd/temperature")) {
         // hdd temperature
         QString device = _source;
-        device.remove("extsysmon/hdd/temperature");
+        device.remove("hdd/temperature");
         int index = m_devices["hdd"].indexOf(device);
         if (index > -1) {
             QString key = QString("hddtemp%1").arg(index);
@@ -313,15 +313,15 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const KSy
         key.remove("extsysmon/player/");
         m_map.insert(_source, key);
         m_formatter[key] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "extsysmon/ps/running") {
+    } else if (_source == "extsysmon/ps/running/count") {
         // running processes count
         m_map.insert(_source, "pscount");
         m_formatter["pscount"] = AWKeysAggregator::FormatterType::NoFormat;
-    } else if (_source == "extsysmon/ps/list") {
+    } else if (_source == "extsysmon/ps/running/list") {
         // list of running processes
         m_map.insert(_source, "ps");
         m_formatter["ps"] = AWKeysAggregator::FormatterType::List;
-    } else if (_source == "extsysmon/ps/count") {
+    } else if (_source == "extsysmon/ps/total/count") {
         // total processes count
         m_map.insert(_source, "pstot");
         m_formatter["pstot"] = AWKeysAggregator::FormatterType::NoFormat;

sources/awesome-widget/plugin/awkeyoperations.cpp

@@ -302,17 +302,17 @@ void AWKeyOperations::addDevice(const QString &_source)
 {
     qCDebug(LOG_AW) << "Source" << _source;
 
-    auto diskRegexp = QRegularExpression("disk/.*/read");
+    auto diskRegexp = QRegularExpression("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)");
-    auto mountRegexp = QRegularExpression("disk/.*/usedPercent");
+    auto mountRegexp = QRegularExpression("partitions/.*/filllevel");
     auto cpuTempRegExp = QRegularExpression("^cpu/cpu.*/temperature$");
 
     if (_source.contains(diskRegexp)) {
-        auto device = _source;
+        QString device = _source;
-        device.remove("disk/").remove("/read");
+        device.remove("/Rate/rblk");
         addKeyToCache("disk", device);
     } else if (_source.contains(mountRegexp)) {
-        auto device = _source;
+        QString device = _source;
-        device.remove("disk/").remove("/usedPercent");
+        device.remove("partitions").remove("/filllevel");
         addKeyToCache("mount", device);
     } else if (_source.startsWith("lmsensors") || _source.contains(cpuTempRegExp)
                || _source == "cpu/all/averageTemperature") {

sources/awesome-widget/plugin/awkeys.cpp

@@ -103,7 +103,6 @@ void AWKeys::initKeys(const QString &_currentPattern, const int _interval, const
     m_aggregator->initFormatters();
     m_keyOperator->setPattern(_currentPattern);
     m_keyOperator->updateCache();
-    m_dataEngineAggregator->connectSources();
 
     // timer
     m_timer->setInterval(_interval);

sources/extsysmon/extsysmonaggregator.cpp

@@ -64,8 +64,8 @@ void ExtSysMonAggregator::init(const QHash<QString, QString> &_config)
     // custom
     createSensor("custom", i18n("Scripts"), new CustomSource(this, {}));
     // desktop
-    // FIXME causes segfault in kde libs
+    // FIXME causes segfault
-//    createSensor("desktop", i18n("Desktop"), new DesktopSource(this, {}));
+    createSensor("desktop", i18n("Desktop"), new DesktopSource(this, {}));
     // gpu load
     createSensor("gpuload", i18n("GPU load"), new GPULoadSource(this, {_config["GPUDEV"]}));
     // gpu temperature

sources/extsysmonsources/desktopsource.cpp

@@ -51,13 +51,13 @@ QVariant DesktopSource::data(const QString &_source)
     auto decrement = KWindowSystem::isPlatformX11() ? 1 : 0;
     auto current = nativeIndex - decrement;
 
-    if (_source == "name") {
+    if (_source == "current/name") {
         return m_vdi->desktopNames().at(current);
-    } else if (_source == "number") {
+    } else if (_source == "current/number") {
         return current + 1;
-    } else if (_source == "names") {
+    } else if (_source == "total/name") {
         return m_vdi->desktopNames();
-    } else if (_source == "count") {
+    } else if (_source == "total/number") {
         return m_vdi->numberOfDesktops();
     }
 
@@ -70,20 +70,20 @@ KSysGuard::SensorInfo *DesktopSource::initialData(const QString &_source) const
     qCDebug(LOG_ESS) << "Source" << _source;
 
     auto data = new KSysGuard::SensorInfo();
-    if (_source == "name") {
+    if (_source == "current/name") {
         data->name = "Current desktop name";
         data->variantType = QVariant::String;
         data->unit = KSysGuard::UnitNone;
-    } else if (_source == "number") {
+    } else if (_source == "current/number") {
         data->min = 0;
         data->name = "Current desktop number";
         data->variantType = QVariant::Int;
         data->unit = KSysGuard::UnitNone;
-    } else if (_source == "names") {
+    } else if (_source == "total/name") {
         data->name = "All desktops by name";
         data->variantType = QVariant::StringList;
         data->unit = KSysGuard::UnitNone;
-    } else if (_source == "count") {
+    } else if (_source == "total/number") {
         data->min = 0;
         data->name = "Desktops count";
         data->variantType = QVariant::Int;
@@ -97,10 +97,10 @@ KSysGuard::SensorInfo *DesktopSource::initialData(const QString &_source) const
 QStringList DesktopSource::sources() const
 {
     QStringList sources;
-    sources.append("name");
+    sources.append("current/name");
-    sources.append("number");
+    sources.append("current/number");
-    sources.append("names");
+    sources.append("total/name");
-    sources.append("count");
+    sources.append("total/number");
 
     return sources;
 }

sources/extsysmonsources/processessource.cpp

@@ -56,17 +56,17 @@ KSysGuard::SensorInfo *ProcessesSource::initialData(const QString &_source) cons
     qCDebug(LOG_ESS) << "Source" << _source;
 
     auto data = new KSysGuard::SensorInfo();
-    if (_source == "running") {
+    if (_source == "running/count") {
         data->min = 0;
         data->max = 0;
         data->name = "Count of running processes";
         data->variantType = QVariant::Int;
         data->unit = KSysGuard::UnitNone;
-    } else if (_source == "list") {
+    } else if (_source == "running/list") {
         data->name = "All running processes list";
         data->variantType = QVariant::StringList;
         data->unit = KSysGuard::UnitNone;
-    } else if (_source == "count") {
+    } else if (_source == "total/count") {
         data->min = 0;
         data->max = 0;
         data->name = "Total count of processes";
@@ -99,18 +99,18 @@ void ProcessesSource::run()
         cmdFile.close();
     }
 
-    m_values["running"] = running.count();
+    m_values["running/count"] = running.count();
-    m_values["list"] = running;
+    m_values["running/list"] = running;
-    m_values["count"] = directories.count();
+    m_values["total/count"] = directories.count();
 }
 
 
 QStringList ProcessesSource::sources() const
 {
     QStringList sources;
-    sources.append("running");
+    sources.append("running/count");
-    sources.append("list");
+    sources.append("running/list");
-    sources.append("count");
+    sources.append("total/count");
 
     return sources;
 }

sources/test/CMakeLists.txt

@@ -20,9 +20,9 @@ include_directories(
 set(AWTESTLIBRARY_HEADERS awtestlibrary.h)
 set(AWTESTLIBRARY_SOURCES awtestlibrary.cpp)
 add_library(${SUBPROJECT}-awtest STATIC ${AWTESTLIBRARY_SOURCES} ${AWTESTLIBRARY_HEADERS})
-target_link_libraries(${SUBPROJECT}-awtest ${Qt_LIBRARIES} ${Qt6Test_LIBRARIES} ${Kf6_LIBRARIES})
+target_link_libraries(${SUBPROJECT}-awtest ${Qt_LIBRARIES} ${Qt5Test_LIBRARIES} ${Kf6_LIBRARIES})
 set(LIBRARY_TEST_SET ${SUBPROJECT}-awtest ${PROJECT_LIBRARY} ${PROJECT_MONITORSOURCES}
-        ${Qt_LIBRARIES} ${Kf6_LIBRARIES} ${Qt6Test_LIBRARIES})
+        ${Qt_LIBRARIES} ${Kf6_LIBRARIES} ${Qt5Test_LIBRARIES})
 
 # modules
 set(TEST_MODULES