feat: restore multithreaded processing

sources/CMakeLists.txt

@@ -9,9 +9,6 @@ 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")

sources/awesome-widget/plugin/awactions.cpp

@@ -88,6 +88,20 @@ void AWActions::showReadme()
 }
 
 
+void AWActions::showLegacyInfo()
+{
+    auto msgBox = new QMessageBox(nullptr);
+    msgBox->setAttribute(Qt::WA_DeleteOnClose);
+    msgBox->setModal(false);
+    msgBox->setWindowTitle(i18n("Not supported"));
+    msgBox->setText(i18n("You are using mammoth's Qt version, try to update it first"));
+    msgBox->setStandardButtons(QMessageBox::Ok);
+    msgBox->setIcon(QMessageBox::Information);
+
+    msgBox->open();
+}
+
+
 // HACK: this method uses variables from version.h
 QString AWActions::getAboutText(const QString &_type)
 {
@@ -121,6 +135,7 @@ void AWActions::sendNotification(const QString &_eventId, const QString &_messag
 {
     qCDebug(LOG_AW) << "Event" << _eventId << "with message" << _message;
 
-    auto *event = KNotification::event(_eventId, QString("Awesome Widget ::: %1").arg(_eventId), _message);
-    event->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
+    KNotification *notification
+        = KNotification::event(_eventId, QString("Awesome Widget ::: %1").arg(_eventId), _message);
+    notification->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
 }

sources/awesome-widget/plugin/awactions.h

@@ -33,6 +33,7 @@ public:
     Q_INVOKABLE void checkUpdates(bool _showAnyway = false);
     Q_INVOKABLE static QString getFileContent(const QString &_path);
     Q_INVOKABLE static bool runCmd(const QString &_cmd, const QStringList &_args);
+    Q_INVOKABLE static void showLegacyInfo();
     Q_INVOKABLE static void showReadme();
     // configuration slots
     Q_INVOKABLE static QString getAboutText(const QString &_type);

sources/awesome-widget/plugin/awbugreporter.cpp

@@ -18,7 +18,6 @@
 #include "awbugreporter.h"
 
 #include <KI18n/KLocalizedString>
-#include <KNotifications/KNotification>
 
 #include <QDesktopServices>
 #include <QJsonDocument>
@@ -115,12 +114,6 @@ void AWBugReporter::issueReplyReceived(QNetworkReply *_reply)
 }
 
 
-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;
@@ -128,9 +121,29 @@ void AWBugReporter::showInformation(const int _number, const QString &_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 msgBox = new QMessageBox(nullptr);
+    msgBox->setAttribute(Qt::WA_DeleteOnClose);
+    msgBox->setModal(false);
+    msgBox->setWindowTitle(i18n("Issue created"));
+    msgBox->setText(i18n("Issue %1 has been created", _number));
+    msgBox->setStandardButtons(QMessageBox::Open | QMessageBox::Close);
+    msgBox->setIcon(QMessageBox::Information);
 
-    auto action = event->addAction(i18n("Details"));
-    connect(action, &KNotificationAction::activated, this, &AWBugReporter::openBugReport);
+    msgBox->open(this, SLOT(userReplyOnBugReport(QAbstractButton *)));
+}
+
+
+void AWBugReporter::userReplyOnBugReport(QAbstractButton *_button)
+{
+    auto ret = dynamic_cast<QMessageBox *>(sender())->buttonRole(_button);
+    qCInfo(LOG_AW) << "User select" << ret;
+
+    switch (ret) {
+    case QMessageBox::AcceptRole:
+        QDesktopServices::openUrl(m_lastBugUrl);
+        break;
+    case QMessageBox::RejectRole:
+    default:
+        break;
+    }
 }

sources/awesome-widget/plugin/awbugreporter.h

@@ -40,8 +40,8 @@ signals:
 
 private slots:
     void issueReplyReceived(QNetworkReply *_reply);
-    void openBugReport();
     void showInformation(int _number, const QString &_url);
+    void userReplyOnBugReport(QAbstractButton *_button);
 
 private:
     QString m_lastBugUrl;

sources/awesome-widget/plugin/awkeys.cpp

@@ -21,7 +21,7 @@
 #include <QDBusError>
 #include <QThread>
 #include <QTimer>
-#include <QtConcurrent>
+#include <QtConcurrent/QtConcurrent>
 
 #include "awdataaggregator.h"
 #include "awdataengineaggregator.h"
@@ -189,8 +189,7 @@ void AWKeys::dataUpdated(const QHash<QString, KSysGuard::SensorInfo> &_sensors,
         if (!_sensors.contains(data.sensorProperty))
             continue;
         auto sensor = _sensors[data.sensorProperty];
-        std::ignore = QtConcurrent::run(m_threadPool, &AWKeys::setDataBySource, this, data.sensorProperty, sensor,
-                                        data.payload);
+        std::ignore = QtConcurrent::run(m_threadPool, &AWKeys::setDataBySource, this, data.sensorProperty, sensor, data.payload);
     }
 }
 

sources/awesome-widget/plugin/awupdatehelper.cpp

@@ -18,7 +18,6 @@
 #include "awupdatehelper.h"
 
 #include <KI18n/KLocalizedString>
-#include <KNotifications/KNotification>
 
 #include <QDesktopServices>
 #include <QJsonDocument>
@@ -71,7 +70,8 @@ bool AWUpdateHelper::checkVersion()
     qCInfo(LOG_AW) << "Found version" << version << "actual one is" << m_foundVersion;
 
     if ((version != m_foundVersion) && (!QString(CHANGELOG).isEmpty())) {
-        sendNotification(i18nc("Changelog of %1", VERSION), QString(CHANGELOG).replace('@', '\n'));
+        genMessageBox(i18nc("Changelog of %1", VERSION), QString(CHANGELOG).replace('@', '\n'), QMessageBox::Ok)
+            ->open();
         return true;
     } else if (version != m_foundVersion) {
         qCWarning(LOG_AW) << "No changelog information provided";
@@ -84,12 +84,6 @@ bool AWUpdateHelper::checkVersion()
 }
 
 
-void AWUpdateHelper::openReleasesPage()
-{
-    QDesktopServices::openUrl(QString(RELEASES) + m_foundVersion.toString());
-}
-
-
 void AWUpdateHelper::showInfo(const QVersionNumber &_version)
 {
     qCDebug(LOG_AW) << "Version" << _version;
@@ -97,7 +91,7 @@ void AWUpdateHelper::showInfo(const QVersionNumber &_version)
     auto text = i18n("You are using the actual version %1", _version.toString());
     if (!QString(COMMIT_SHA).isEmpty())
         text += QString(" (%1)").arg(QString(COMMIT_SHA));
-    sendNotification(i18n("No new version found"), text);
+    return genMessageBox(i18n("No new version found"), text, QMessageBox::Ok)->open();
 }
 
 
@@ -111,9 +105,24 @@ void AWUpdateHelper::showUpdates(const QVersionNumber &_version)
     text += i18n("New version : %1", _version.toString()) + "\n\n";
     text += i18n("Click \"Ok\" to download");
 
-    auto event = sendNotification(i18n("There are updates"), text);
-    auto action = event->addAction(i18n("Details"));
-    connect(action, &KNotificationAction::activated, this, &AWUpdateHelper::openReleasesPage);
+    genMessageBox(i18n("There are updates"), text, QMessageBox::Ok | QMessageBox::Cancel)
+        ->open(this, SLOT(userReplyOnUpdates(QAbstractButton *)));
+}
+
+
+void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *_button)
+{
+    auto ret = dynamic_cast<QMessageBox *>(sender())->buttonRole(_button);
+    qCInfo(LOG_AW) << "User select" << ret;
+
+    switch (ret) {
+    case QMessageBox::AcceptRole:
+        QDesktopServices::openUrl(QString(RELEASES) + m_foundVersion.toString());
+        break;
+    case QMessageBox::RejectRole:
+    default:
+        break;
+    }
 }
 
 
@@ -149,12 +158,18 @@ void AWUpdateHelper::versionReplyReceived(QNetworkReply *_reply, const bool _sho
 
 
 // additional method which is used to show message box which does not block UI
-KNotification *AWUpdateHelper::sendNotification(const QString &_title, const QString &_body)
+QMessageBox *AWUpdateHelper::genMessageBox(const QString &_title, const QString &_body,
+                                           const QMessageBox::StandardButtons _buttons)
 {
     qCDebug(LOG_AW) << "Construct message box with title" << _title << "and body" << _body;
 
-    auto event = KNotification::event("system", _title, _body);
-    event->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
+    auto msgBox = new QMessageBox(nullptr);
+    msgBox->setAttribute(Qt::WA_DeleteOnClose);
+    msgBox->setModal(false);
+    msgBox->setWindowTitle(_title);
+    msgBox->setText(_body);
+    msgBox->setStandardButtons(_buttons);
+    msgBox->setIcon(QMessageBox::Information);
 
-    return event;
+    return msgBox;
 }

sources/awesome-widget/plugin/awupdatehelper.h

@@ -17,11 +17,11 @@
 
 #pragma once
 
+#include <QMessageBox>
 #include <QObject>
 #include <QVersionNumber>
 
 
-class KNotification;
 class QNetworkReply;
 
 class AWUpdateHelper : public QObject
@@ -35,13 +35,14 @@ public:
     bool checkVersion();
 
 private slots:
-    void openReleasesPage();
     static void showInfo(const QVersionNumber &_version);
     void showUpdates(const QVersionNumber &_version);
+    void userReplyOnUpdates(QAbstractButton *_button);
     void versionReplyReceived(QNetworkReply *_reply, bool _showAnyway);
 
 private:
-    static KNotification *sendNotification(const QString &_title, const QString &_body);
+    static QMessageBox *genMessageBox(const QString &_title, const QString &_body,
+                                      QMessageBox::StandardButtons _buttons);
     QVersionNumber m_foundVersion;
     QString m_genericConfig;
 };

sources/libraries.cmake

@@ -8,7 +8,7 @@ add_definitions(
         ${Qt6Qml_DEFINITIONS} ${Qt6Widgets_DEFINITIONS}
 )
 set(Qt_INCLUDE
-        ${Qt6Core_INCLUDE_DIRS} ${Qt6Concurrent_INCLUDE_DIRS} ${Qt6DBus_INCLUDE_DIRS} ${Qt6Network_INCLUDE_DIRS}
+        ${Qt6Core_INCLUDE_DIRS} ${Qt6DBus_INCLUDE_DIRS} ${Qt6Network_INCLUDE_DIRS}
         ${Qt6Qml_INCLUDE_DIRS} ${Qt6Widgets_INCLUDE_DIRS}
 )
 set(Qt_LIBRARIES