From f77cf7c1aaf1b2261a132a96d6f063210133bbd2 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Wed, 21 Oct 2015 13:29:06 +0300 Subject: [PATCH 1/8] update contributing.md fix #69 by adding special patches --- CONTRIBUTING.md | 2 + packages/qt5.4-replace-qml-dialogs.patch | 85 ++++++++++++++++++++ packages/qt5.5-qstringlist-declaration.patch | 12 +++ 3 files changed, 99 insertions(+) create mode 100644 packages/qt5.4-replace-qml-dialogs.patch create mode 100644 packages/qt5.5-qstringlist-declaration.patch diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cebc934..66fb446 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -128,6 +128,8 @@ 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 --------- diff --git a/packages/qt5.4-replace-qml-dialogs.patch b/packages/qt5.4-replace-qml-dialogs.patch new file mode 100644 index 0000000..ffcf260 --- /dev/null +++ b/packages/qt5.4-replace-qml-dialogs.patch @@ -0,0 +1,85 @@ +diff --git a/sources/awesome-widget/package/contents/ui/main.qml b/sources/awesome-widget/package/contents/ui/main.qml +index 23e9690..ec83b91 100644 +--- a/sources/awesome-widget/package/contents/ui/main.qml ++++ b/sources/awesome-widget/package/contents/ui/main.qml +@@ -17,7 +17,6 @@ + + import QtQuick 2.4 + import QtQuick.Controls 1.3 as QtControls +-import QtQuick.Dialogs 1.2 as QtDialogs + import QtQuick.Layouts 1.1 + import org.kde.plasma.plasmoid 2.0 + import org.kde.plasma.core 2.0 as PlasmaCore +@@ -110,27 +109,6 @@ Item { + } + } + +- QtDialogs.Dialog { +- id: tagSelector +- title: i18n("Select tag") +- +- QtControls.ComboBox { +- id: tagSelectorBox +- width: parent.width +- editable: true +- } +- +- onAccepted: { +- var tag = tagSelectorBox.editText +- var message = i18n("Tag: %1", tag) +- message += "
" +- message += i18n("Value: %1", awKeys.valueByKey(tag)) +- message += "
" +- message += i18n("Info: %1", awKeys.infoByKey(tag)) +- awActions.sendNotification("tag", message) +- } +- } +- + + Component.onCompleted: { + if (debug) console.debug() +@@ -216,7 +194,12 @@ Item { + function action_requestKey() { + if (debug) console.debug() + +- tagSelectorBox.model = awKeys.dictKeys(true) +- return tagSelector.open() ++ var tag = awKeys.graphicalKey() ++ var message = i18n("Tag: %1", tag) ++ message += "
" ++ message += i18n("Value: %1", awKeys.valueByKey(tag)) ++ message += "
" ++ message += i18n("Info: %1", awKeys.infoByKey(tag)) ++ awActions.sendNotification("tag", message) + } + } +diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp +index e5b9861..039d24e 100644 +--- a/sources/awesome-widget/plugin/awkeys.cpp ++++ b/sources/awesome-widget/plugin/awkeys.cpp +@@ -324,6 +324,13 @@ QStringList AWKeys::getHddDevices() const + } + + ++QString AWKeys::graphicalKey() const ++{ ++ return QInputDialog::getItem(nullptr, i18n("Select tag"), QString(), ++ dictKeys(true), 0, true); ++} ++ ++ + QString AWKeys::infoByKey(QString key) const + { + qCDebug(LOG_AW) << "Requested key" << key; +diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h +index a8300f1..8edc3bd 100644 +--- a/sources/awesome-widget/plugin/awkeys.h ++++ b/sources/awesome-widget/plugin/awkeys.h +@@ -55,6 +55,7 @@ public: + Q_INVOKABLE QStringList dictKeys(const bool sorted = false, + const QString regexp = QString()) const; + Q_INVOKABLE QStringList getHddDevices() const; ++ Q_INVOKABLE QString graphicalKey() const; + // values + Q_INVOKABLE QString infoByKey(QString key) const; + Q_INVOKABLE QString valueByKey(QString key) const; diff --git a/packages/qt5.5-qstringlist-declaration.patch b/packages/qt5.5-qstringlist-declaration.patch new file mode 100644 index 0000000..695d3dd --- /dev/null +++ b/packages/qt5.5-qstringlist-declaration.patch @@ -0,0 +1,12 @@ +diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h +index f808d03..a056b3f 100644 +--- a/sources/awesome-widget/plugin/awkeysaggregator.h ++++ b/sources/awesome-widget/plugin/awkeysaggregator.h +@@ -21,6 +21,7 @@ + + #include + #include ++#include + + #include "version.h" + From 8545192ef8ca0ec9691abcce8cecb40e2788afab Mon Sep 17 00:00:00 2001 From: arcan1s Date: Thu, 22 Oct 2015 02:52:06 +0300 Subject: [PATCH 2/8] move dialog part to qml files --- .../package/contents/ui/advanced.qml | 63 ++++++++++++- .../awesome-widget/plugin/awconfighelper.cpp | 89 +++---------------- .../awesome-widget/plugin/awconfighelper.h | 9 +- 3 files changed, 80 insertions(+), 81 deletions(-) diff --git a/sources/awesome-widget/package/contents/ui/advanced.qml b/sources/awesome-widget/package/contents/ui/advanced.qml index 1ec7ba6..01bcd58 100644 --- a/sources/awesome-widget/package/contents/ui/advanced.qml +++ b/sources/awesome-widget/package/contents/ui/advanced.qml @@ -17,6 +17,7 @@ import QtQuick 2.0 import QtQuick.Controls 1.3 as QtControls +import QtQuick.Dialogs 1.2 as QtDialogs import org.kde.plasma.private.awesomewidget 1.0 @@ -371,7 +372,31 @@ Item { QtControls.Button { width: parent.width * 3 / 5 text: i18n("Export configuration") - onClicked: awConfig.exportConfiguration(plasmoid.configuration) + onClicked: saveConfigAs.open() + } + + QtDialogs.FileDialog { + id: saveConfigAs + selectExisting: false + title: i18n("Export") + onAccepted: { + var status = awConfig.exportConfiguration( + plasmoid.configuration, + saveConfigAs.fileUrl.toString().replace("file://", "")) + if (status) { + messageDialog.title = i18n("Success") + messageDialog.text = i18n("Please note that binary files were not copied") + } else { + messageDialog.title = i18n("Ooops...") + messageDialog.text = i18n("Could not save configuration file") + } + messageDialog.open() + } + } + + QtDialogs.MessageDialog { + id: messageDialog + standardButtons: QtDialogs.StandardButton.Ok } } @@ -385,9 +410,41 @@ Item { QtControls.Button { width: parent.width * 3 / 5 text: i18n("Import configuration") - onClicked: { + onClicked: openConfig.open() + } + + QtDialogs.FileDialog { + id: openConfig + title: i18n("Import") + onAccepted: importSelection.open() + } + + QtDialogs.Dialog { + id: importSelection + + Column { + QtControls.CheckBox { + id: importPlasmoid + text: i18n("Import plasmoid settings") + } + + QtControls.CheckBox { + id: importExtensions + text: i18n("Import extensions") + } + + QtControls.CheckBox { + id: importAdds + text: i18n("Import additional files") + } + } + + onAccepted: { if (debug) console.debug() - var importConfig = awConfig.importConfiguration() + var importConfig = awConfig.importConfiguration( + openConfig.fileUrl.toString().replace("file://", ""), + importPlasmoid.checked, importExtensions.checked, + importAdds.checked) for (var key in importConfig) plasmoid.configuration[key] = importConfig[key] } diff --git a/sources/awesome-widget/plugin/awconfighelper.cpp b/sources/awesome-widget/plugin/awconfighelper.cpp index 5f61d2a..5901fc8 100644 --- a/sources/awesome-widget/plugin/awconfighelper.cpp +++ b/sources/awesome-widget/plugin/awconfighelper.cpp @@ -19,15 +19,11 @@ #include -#include -#include #include -#include #include #include #include #include -#include #include "awdebug.h" @@ -55,13 +51,11 @@ bool AWConfigHelper::dropCache() const } -void AWConfigHelper::exportConfiguration(QObject *nativeConfig) const +bool AWConfigHelper::exportConfiguration(QObject *nativeConfig, + const QString fileName) const { - // get file path and init settings object - QString fileName = QFileDialog::getSaveFileName(nullptr, i18n("Export")); - if (fileName.isEmpty()) - return; - qCInfo(LOG_AW) << "Selected filename" << fileName; + qCDebug(LOG_AW) << "Selected filename" << fileName; + QSettings settings(fileName, QSettings::IniFormat); // plasmoid configuration @@ -103,33 +97,22 @@ void AWConfigHelper::exportConfiguration(QObject *nativeConfig) const // sync settings settings.sync(); // show additional message - switch (settings.status()) { - case QSettings::NoError: - QMessageBox::information( - nullptr, i18n("Success"), - i18n("Please note that binary files were not copied")); - break; - default: - QMessageBox::critical(nullptr, i18n("Ooops..."), - i18n("Could not save configuration file")); - break; - } + return settings.status() == QSettings::NoError; } -QVariantMap AWConfigHelper::importConfiguration() const +QVariantMap AWConfigHelper::importConfiguration(const QString fileName, + const bool importPlasmoid, + const bool importExtensions, + const bool importAdds) const { + qCDebug(LOG_AW) << "Selected filename" << fileName; + QVariantMap configuration; - // get file path and init settings object - QString fileName = QFileDialog::getOpenFileName(nullptr, i18n("Import")); - if (fileName.isEmpty()) - return configuration; - qCInfo(LOG_AW) << "Selected filename" << fileName; QSettings settings(fileName, QSettings::IniFormat); - QHash selection = selectImport(); // extensions - if (selection[QString("extensions")]) { + if (importExtensions) { foreach (QString item, m_dirs) { settings.beginGroup(item); foreach (QString it, settings.childGroups()) @@ -139,7 +122,7 @@ QVariantMap AWConfigHelper::importConfiguration() const } // additional files - if (selection[QString("adds")]) { + if (importAdds) { settings.beginGroup(QString("json")); // script filters writeFile(settings, QString("filters"), @@ -153,7 +136,7 @@ QVariantMap AWConfigHelper::importConfiguration() const } // plasmoid configuration - if (selection[QString("plasmoid")]) { + if (importPlasmoid) { settings.beginGroup(QString("plasmoid")); foreach (QString key, settings.childKeys()) configuration[key] = settings.value(key); @@ -279,50 +262,6 @@ void AWConfigHelper::readFile(QSettings &settings, const QString key, } -QHash AWConfigHelper::selectImport() const -{ - QDialog *dialog = new QDialog(nullptr); - QCheckBox *importPlasmoidSettings - = new QCheckBox(i18n("Import plasmoid settings"), dialog); - importPlasmoidSettings->setChecked(true); - QCheckBox *importExtensionsSettings - = new QCheckBox(i18n("Import extensions"), dialog); - importExtensionsSettings->setChecked(true); - QCheckBox *importAddsSettings - = new QCheckBox(i18n("Import additional files"), dialog); - importAddsSettings->setChecked(true); - QDialogButtonBox *dialogButtons - = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, - Qt::Horizontal, dialog); - QVBoxLayout *layout = new QVBoxLayout(dialog); - layout->addWidget(importPlasmoidSettings); - layout->addWidget(importExtensionsSettings); - layout->addWidget(importAddsSettings); - layout->addWidget(dialogButtons); - connect(dialogButtons, SIGNAL(accepted()), dialog, SLOT(accept())); - connect(dialogButtons, SIGNAL(rejected()), dialog, SLOT(reject())); - - // get parameters - QHash import; - import[QString("plasmoid")] = false; - import[QString("extensions")] = false; - import[QString("adds")] = false; - switch (dialog->exec()) { - case QDialog::Accepted: - import[QString("plasmoid")] = importPlasmoidSettings->isChecked(); - import[QString("extensions")] = importExtensionsSettings->isChecked(); - import[QString("adds")] = importAddsSettings->isChecked(); - break; - case QDialog::Rejected: - default: - break; - } - dialog->deleteLater(); - - return import; -} - - void AWConfigHelper::writeFile(QSettings &settings, const QString key, const QString fileName) const { diff --git a/sources/awesome-widget/plugin/awconfighelper.h b/sources/awesome-widget/plugin/awconfighelper.h index dc51dfb..912ac3d 100644 --- a/sources/awesome-widget/plugin/awconfighelper.h +++ b/sources/awesome-widget/plugin/awconfighelper.h @@ -33,8 +33,12 @@ public: explicit AWConfigHelper(QObject *parent = nullptr); virtual ~AWConfigHelper(); Q_INVOKABLE bool dropCache() const; - Q_INVOKABLE void exportConfiguration(QObject *nativeConfig) const; - Q_INVOKABLE QVariantMap importConfiguration() const; + Q_INVOKABLE bool exportConfiguration(QObject *nativeConfig, + const QString fileName) const; + Q_INVOKABLE QVariantMap importConfiguration(const QString fileName, + const bool importPlasmoid, + const bool importExtensions, + const bool importAdds) const; // dataengine Q_INVOKABLE QVariantMap readDataEngineConfiguration() const; Q_INVOKABLE void @@ -47,7 +51,6 @@ private: void copySettings(QSettings &from, QSettings &to) const; void readFile(QSettings &settings, const QString key, const QString fileName) const; - QHash selectImport() const; void writeFile(QSettings &settings, const QString key, const QString fileName) const; // properties From d0ba320e1ba6b1319f5414b400ce23f41b219872 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Thu, 22 Oct 2015 02:57:06 +0300 Subject: [PATCH 3/8] add patch to revert the last commit =) --- packages/qt5.4-replace-qml-dialogs.patch | 265 +++++++++++++++++++++++ 1 file changed, 265 insertions(+) diff --git a/packages/qt5.4-replace-qml-dialogs.patch b/packages/qt5.4-replace-qml-dialogs.patch index ffcf260..9c30e94 100644 --- a/packages/qt5.4-replace-qml-dialogs.patch +++ b/packages/qt5.4-replace-qml-dialogs.patch @@ -83,3 +83,268 @@ index a8300f1..8edc3bd 100644 // values Q_INVOKABLE QString infoByKey(QString key) const; Q_INVOKABLE QString valueByKey(QString key) const; +diff --git a/sources/awesome-widget/package/contents/ui/advanced.qml b/sources/awesome-widget/package/contents/ui/advanced.qml +index 01bcd58..1ec7ba6 100644 +--- a/sources/awesome-widget/package/contents/ui/advanced.qml ++++ b/sources/awesome-widget/package/contents/ui/advanced.qml +@@ -17,7 +17,6 @@ + + import QtQuick 2.0 + import QtQuick.Controls 1.3 as QtControls +-import QtQuick.Dialogs 1.2 as QtDialogs + + import org.kde.plasma.private.awesomewidget 1.0 + +@@ -372,31 +371,7 @@ Item { + QtControls.Button { + width: parent.width * 3 / 5 + text: i18n("Export configuration") +- onClicked: saveConfigAs.open() +- } +- +- QtDialogs.FileDialog { +- id: saveConfigAs +- selectExisting: false +- title: i18n("Export") +- onAccepted: { +- var status = awConfig.exportConfiguration( +- plasmoid.configuration, +- saveConfigAs.fileUrl.toString().replace("file://", "")) +- if (status) { +- messageDialog.title = i18n("Success") +- messageDialog.text = i18n("Please note that binary files were not copied") +- } else { +- messageDialog.title = i18n("Ooops...") +- messageDialog.text = i18n("Could not save configuration file") +- } +- messageDialog.open() +- } +- } +- +- QtDialogs.MessageDialog { +- id: messageDialog +- standardButtons: QtDialogs.StandardButton.Ok ++ onClicked: awConfig.exportConfiguration(plasmoid.configuration) + } + } + +@@ -410,41 +385,9 @@ Item { + QtControls.Button { + width: parent.width * 3 / 5 + text: i18n("Import configuration") +- onClicked: openConfig.open() +- } +- +- QtDialogs.FileDialog { +- id: openConfig +- title: i18n("Import") +- onAccepted: importSelection.open() +- } +- +- QtDialogs.Dialog { +- id: importSelection +- +- Column { +- QtControls.CheckBox { +- id: importPlasmoid +- text: i18n("Import plasmoid settings") +- } +- +- QtControls.CheckBox { +- id: importExtensions +- text: i18n("Import extensions") +- } +- +- QtControls.CheckBox { +- id: importAdds +- text: i18n("Import additional files") +- } +- } +- +- onAccepted: { ++ onClicked: { + if (debug) console.debug() +- var importConfig = awConfig.importConfiguration( +- openConfig.fileUrl.toString().replace("file://", ""), +- importPlasmoid.checked, importExtensions.checked, +- importAdds.checked) ++ var importConfig = awConfig.importConfiguration() + for (var key in importConfig) + plasmoid.configuration[key] = importConfig[key] + } +diff --git a/sources/awesome-widget/plugin/awconfighelper.cpp b/sources/awesome-widget/plugin/awconfighelper.cpp +index 5901fc8..5f61d2a 100644 +--- a/sources/awesome-widget/plugin/awconfighelper.cpp ++++ b/sources/awesome-widget/plugin/awconfighelper.cpp +@@ -19,11 +19,15 @@ + + #include + ++#include ++#include + #include ++#include + #include + #include + #include + #include ++#include + + #include "awdebug.h" + +@@ -51,11 +55,13 @@ bool AWConfigHelper::dropCache() const + } + + +-bool AWConfigHelper::exportConfiguration(QObject *nativeConfig, +- const QString fileName) const ++void AWConfigHelper::exportConfiguration(QObject *nativeConfig) const + { +- qCDebug(LOG_AW) << "Selected filename" << fileName; +- ++ // get file path and init settings object ++ QString fileName = QFileDialog::getSaveFileName(nullptr, i18n("Export")); ++ if (fileName.isEmpty()) ++ return; ++ qCInfo(LOG_AW) << "Selected filename" << fileName; + QSettings settings(fileName, QSettings::IniFormat); + + // plasmoid configuration +@@ -97,22 +103,33 @@ bool AWConfigHelper::exportConfiguration(QObject *nativeConfig, + // sync settings + settings.sync(); + // show additional message +- return settings.status() == QSettings::NoError; ++ switch (settings.status()) { ++ case QSettings::NoError: ++ QMessageBox::information( ++ nullptr, i18n("Success"), ++ i18n("Please note that binary files were not copied")); ++ break; ++ default: ++ QMessageBox::critical(nullptr, i18n("Ooops..."), ++ i18n("Could not save configuration file")); ++ break; ++ } + } + + +-QVariantMap AWConfigHelper::importConfiguration(const QString fileName, +- const bool importPlasmoid, +- const bool importExtensions, +- const bool importAdds) const ++QVariantMap AWConfigHelper::importConfiguration() const + { +- qCDebug(LOG_AW) << "Selected filename" << fileName; +- + QVariantMap configuration; ++ // get file path and init settings object ++ QString fileName = QFileDialog::getOpenFileName(nullptr, i18n("Import")); ++ if (fileName.isEmpty()) ++ return configuration; ++ qCInfo(LOG_AW) << "Selected filename" << fileName; + QSettings settings(fileName, QSettings::IniFormat); ++ QHash selection = selectImport(); + + // extensions +- if (importExtensions) { ++ if (selection[QString("extensions")]) { + foreach (QString item, m_dirs) { + settings.beginGroup(item); + foreach (QString it, settings.childGroups()) +@@ -122,7 +139,7 @@ QVariantMap AWConfigHelper::importConfiguration(const QString fileName, + } + + // additional files +- if (importAdds) { ++ if (selection[QString("adds")]) { + settings.beginGroup(QString("json")); + // script filters + writeFile(settings, QString("filters"), +@@ -136,7 +153,7 @@ QVariantMap AWConfigHelper::importConfiguration(const QString fileName, + } + + // plasmoid configuration +- if (importPlasmoid) { ++ if (selection[QString("plasmoid")]) { + settings.beginGroup(QString("plasmoid")); + foreach (QString key, settings.childKeys()) + configuration[key] = settings.value(key); +@@ -262,6 +279,50 @@ void AWConfigHelper::readFile(QSettings &settings, const QString key, + } + + ++QHash AWConfigHelper::selectImport() const ++{ ++ QDialog *dialog = new QDialog(nullptr); ++ QCheckBox *importPlasmoidSettings ++ = new QCheckBox(i18n("Import plasmoid settings"), dialog); ++ importPlasmoidSettings->setChecked(true); ++ QCheckBox *importExtensionsSettings ++ = new QCheckBox(i18n("Import extensions"), dialog); ++ importExtensionsSettings->setChecked(true); ++ QCheckBox *importAddsSettings ++ = new QCheckBox(i18n("Import additional files"), dialog); ++ importAddsSettings->setChecked(true); ++ QDialogButtonBox *dialogButtons ++ = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, ++ Qt::Horizontal, dialog); ++ QVBoxLayout *layout = new QVBoxLayout(dialog); ++ layout->addWidget(importPlasmoidSettings); ++ layout->addWidget(importExtensionsSettings); ++ layout->addWidget(importAddsSettings); ++ layout->addWidget(dialogButtons); ++ connect(dialogButtons, SIGNAL(accepted()), dialog, SLOT(accept())); ++ connect(dialogButtons, SIGNAL(rejected()), dialog, SLOT(reject())); ++ ++ // get parameters ++ QHash import; ++ import[QString("plasmoid")] = false; ++ import[QString("extensions")] = false; ++ import[QString("adds")] = false; ++ switch (dialog->exec()) { ++ case QDialog::Accepted: ++ import[QString("plasmoid")] = importPlasmoidSettings->isChecked(); ++ import[QString("extensions")] = importExtensionsSettings->isChecked(); ++ import[QString("adds")] = importAddsSettings->isChecked(); ++ break; ++ case QDialog::Rejected: ++ default: ++ break; ++ } ++ dialog->deleteLater(); ++ ++ return import; ++} ++ ++ + void AWConfigHelper::writeFile(QSettings &settings, const QString key, + const QString fileName) const + { +diff --git a/sources/awesome-widget/plugin/awconfighelper.h b/sources/awesome-widget/plugin/awconfighelper.h +index 912ac3d..dc51dfb 100644 +--- a/sources/awesome-widget/plugin/awconfighelper.h ++++ b/sources/awesome-widget/plugin/awconfighelper.h +@@ -33,12 +33,8 @@ public: + explicit AWConfigHelper(QObject *parent = nullptr); + virtual ~AWConfigHelper(); + Q_INVOKABLE bool dropCache() const; +- Q_INVOKABLE bool exportConfiguration(QObject *nativeConfig, +- const QString fileName) const; +- Q_INVOKABLE QVariantMap importConfiguration(const QString fileName, +- const bool importPlasmoid, +- const bool importExtensions, +- const bool importAdds) const; ++ Q_INVOKABLE void exportConfiguration(QObject *nativeConfig) const; ++ Q_INVOKABLE QVariantMap importConfiguration() const; + // dataengine + Q_INVOKABLE QVariantMap readDataEngineConfiguration() const; + Q_INVOKABLE void +@@ -51,6 +47,7 @@ private: + void copySettings(QSettings &from, QSettings &to) const; + void readFile(QSettings &settings, const QString key, + const QString fileName) const; ++ QHash selectImport() const; + void writeFile(QSettings &settings, const QString key, + const QString fileName) const; + // properties From 919a10fff6406baa142b21521d88f3efb0a7ab9f Mon Sep 17 00:00:00 2001 From: arcan1s Date: Thu, 22 Oct 2015 03:39:07 +0300 Subject: [PATCH 4/8] add patch to avoid errors with Qt5.3 --- ...3-qtconcurrent-and-qlogging-category.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 packages/qt5.3-qtconcurrent-and-qlogging-category.patch diff --git a/packages/qt5.3-qtconcurrent-and-qlogging-category.patch b/packages/qt5.3-qtconcurrent-and-qlogging-category.patch new file mode 100644 index 0000000..04ccff4 --- /dev/null +++ b/packages/qt5.3-qtconcurrent-and-qlogging-category.patch @@ -0,0 +1,57 @@ +diff --git a/sources/awdebug.cpp b/sources/awdebug.cpp +index eee61e1..9da8dad 100644 +--- a/sources/awdebug.cpp ++++ b/sources/awdebug.cpp +@@ -20,13 +20,10 @@ + #include "version.h" + + +-Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget", +- QtMsgType::QtWarningMsg) +-Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel", +- QtMsgType::QtWarningMsg) +-Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon", QtMsgType::QtWarningMsg) +-Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets", +- QtMsgType::QtWarningMsg) ++Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget") ++Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel") ++Q_LOGGING_CATEGORY(LOG_ESM, "org.kde.plasma.extsysmon") ++Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets") + + + const QStringList getBuildData() +diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp +index e5b9861..eb73073 100644 +--- a/sources/awesome-widget/plugin/awkeys.cpp ++++ b/sources/awesome-widget/plugin/awkeys.cpp +@@ -439,7 +439,7 @@ void AWKeys::dataUpdated(const QString &sourceName, + + #ifdef BUILD_FUTURE + // run concurrent data update +- QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, sourceName, ++ QtConcurrent::run(this, &AWKeys::setDataBySource, sourceName, + data); + #else /* BUILD_FUTURE */ + return setDataBySource(sourceName, data); +@@ -564,7 +564,7 @@ void AWKeys::reinitKeys() + void AWKeys::updateTextData() + { + #ifdef BUILD_FUTURE +- QFuture text = QtConcurrent::run(m_threadPool, [this]() { ++ QFuture text = QtConcurrent::run([this]() { + calculateValues(); + return parsePattern(m_pattern); + }); +diff --git a/sources/libraries.cmake b/sources/libraries.cmake +index 33192f7..46e2b1e 100644 +--- a/sources/libraries.cmake ++++ b/sources/libraries.cmake +@@ -2,7 +2,7 @@ + find_package(Gettext REQUIRED) + + # main qt libraries +-find_package(Qt5 5.4.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets) ++find_package(Qt5 5.3.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets) + add_definitions( + ${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS} + ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} From 68dd2432cd403526443e61ae58343cfa8bbead9f Mon Sep 17 00:00:00 2001 From: arcan1s Date: Thu, 22 Oct 2015 05:01:38 +0300 Subject: [PATCH 5/8] drop qcinfo support (it will be moved to additional patch) --- sources/awdebug.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sources/awdebug.h b/sources/awdebug.h index 8b37523..48dc580 100644 --- a/sources/awdebug.h +++ b/sources/awdebug.h @@ -28,15 +28,11 @@ "category}][%{function}] %{message}" #endif /* LOG_FORMAT */ -// define info log level -// #if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) -// #ifndef qCInfo // redefine info because it doesn't log properly #ifdef qCInfo #undef qCInfo #endif /* qCInfo */ #define qCInfo qCDebug -// #endif /* QT_VERSION */ Q_DECLARE_LOGGING_CATEGORY(LOG_AW) From 99e38118a414c82337211e2d821f35d9be1ab3a3 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Thu, 22 Oct 2015 05:22:02 +0300 Subject: [PATCH 6/8] drop unused declarations, update qt5.5 patch --- packages/qt5.5-qstringlist-and-qinfo.patch | 29 +++++++++++++++++++ packages/qt5.5-qstringlist-declaration.patch | 12 -------- sources/awesome-widget/plugin/CMakeLists.txt | 2 -- .../awesome-widget/plugin/awconfighelper.cpp | 1 - sources/awesomewidgets/CMakeLists.txt | 2 -- sources/desktop-panel/plugin/CMakeLists.txt | 2 -- sources/extsysmon/CMakeLists.txt | 2 -- 7 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 packages/qt5.5-qstringlist-and-qinfo.patch delete mode 100644 packages/qt5.5-qstringlist-declaration.patch diff --git a/packages/qt5.5-qstringlist-and-qinfo.patch b/packages/qt5.5-qstringlist-and-qinfo.patch new file mode 100644 index 0000000..626e498 --- /dev/null +++ b/packages/qt5.5-qstringlist-and-qinfo.patch @@ -0,0 +1,29 @@ +diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h +index f808d03..a056b3f 100644 +--- a/sources/awesome-widget/plugin/awkeysaggregator.h ++++ b/sources/awesome-widget/plugin/awkeysaggregator.h +@@ -21,6 +21,7 @@ + + #include + #include ++#include + + #include "version.h" + +diff --git a/sources/awdebug.h b/sources/awdebug.h +index 48dc580..530c0d6 100644 +--- a/sources/awdebug.h ++++ b/sources/awdebug.h +@@ -23,9 +23,9 @@ + + #ifndef LOG_FORMAT + #define LOG_FORMAT \ +- "[%{time process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%{if-" \ +- "warning}WW%{endif}%{if-critical}CC%{endif}%{if-fatal}FF%{endif}][%{" \ +- "category}][%{function}] %{message}" ++ "[%{time process}][%{if-debug}DD%{endif}%{if-warning}WW%{endif}%{if-" \ ++ "critical}CC%{endif}%{if-fatal}FF%{endif}][%{category}][%{function}] " \ ++ "%{message}" + #endif /* LOG_FORMAT */ + + // redefine info because it doesn't log properly diff --git a/packages/qt5.5-qstringlist-declaration.patch b/packages/qt5.5-qstringlist-declaration.patch deleted file mode 100644 index 695d3dd..0000000 --- a/packages/qt5.5-qstringlist-declaration.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h -index f808d03..a056b3f 100644 ---- a/sources/awesome-widget/plugin/awkeysaggregator.h -+++ b/sources/awesome-widget/plugin/awkeysaggregator.h -@@ -21,6 +21,7 @@ - - #include - #include -+#include - - #include "version.h" - diff --git a/sources/awesome-widget/plugin/CMakeLists.txt b/sources/awesome-widget/plugin/CMakeLists.txt index 2c936b6..381937f 100644 --- a/sources/awesome-widget/plugin/CMakeLists.txt +++ b/sources/awesome-widget/plugin/CMakeLists.txt @@ -4,8 +4,6 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidge include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../../${PROJECT_LIBRARY}/ ${PROJECT_TRDPARTY_DIR} ${Qt_INCLUDE} diff --git a/sources/awesome-widget/plugin/awconfighelper.cpp b/sources/awesome-widget/plugin/awconfighelper.cpp index 5901fc8..6263b30 100644 --- a/sources/awesome-widget/plugin/awconfighelper.cpp +++ b/sources/awesome-widget/plugin/awconfighelper.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include #include diff --git a/sources/awesomewidgets/CMakeLists.txt b/sources/awesomewidgets/CMakeLists.txt index c6bff53..fe9dfc0 100644 --- a/sources/awesomewidgets/CMakeLists.txt +++ b/sources/awesomewidgets/CMakeLists.txt @@ -5,8 +5,6 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidge include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/../ ${PROJECT_TRDPARTY_DIR} ${Qt_INCLUDE} ${Kf5_INCLUDE} diff --git a/sources/desktop-panel/plugin/CMakeLists.txt b/sources/desktop-panel/plugin/CMakeLists.txt index 96de365..34d3aad 100644 --- a/sources/desktop-panel/plugin/CMakeLists.txt +++ b/sources/desktop-panel/plugin/CMakeLists.txt @@ -4,8 +4,6 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.desktoppanel include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/../ ${PROJECT_TRDPARTY_DIR} ${Qt_INCLUDE} ${Kf5_INCLUDE} diff --git a/sources/extsysmon/CMakeLists.txt b/sources/extsysmon/CMakeLists.txt index 54a68fd..f7ca636 100644 --- a/sources/extsysmon/CMakeLists.txt +++ b/sources/extsysmon/CMakeLists.txt @@ -5,8 +5,6 @@ add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidge include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_BINARY_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../${PROJECT_LIBRARY}/ ${PROJECT_TRDPARTY_DIR} ${Qt_INCLUDE} From 2d9ca281a98725eaf65833a10a28ca81b9d4c263 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Thu, 22 Oct 2015 05:25:00 +0300 Subject: [PATCH 7/8] update patch...again --- packages/qt5.4-replace-qml-dialogs.patch | 186 +++++++++++------------ 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/packages/qt5.4-replace-qml-dialogs.patch b/packages/qt5.4-replace-qml-dialogs.patch index 9c30e94..641730d 100644 --- a/packages/qt5.4-replace-qml-dialogs.patch +++ b/packages/qt5.4-replace-qml-dialogs.patch @@ -1,88 +1,3 @@ -diff --git a/sources/awesome-widget/package/contents/ui/main.qml b/sources/awesome-widget/package/contents/ui/main.qml -index 23e9690..ec83b91 100644 ---- a/sources/awesome-widget/package/contents/ui/main.qml -+++ b/sources/awesome-widget/package/contents/ui/main.qml -@@ -17,7 +17,6 @@ - - import QtQuick 2.4 - import QtQuick.Controls 1.3 as QtControls --import QtQuick.Dialogs 1.2 as QtDialogs - import QtQuick.Layouts 1.1 - import org.kde.plasma.plasmoid 2.0 - import org.kde.plasma.core 2.0 as PlasmaCore -@@ -110,27 +109,6 @@ Item { - } - } - -- QtDialogs.Dialog { -- id: tagSelector -- title: i18n("Select tag") -- -- QtControls.ComboBox { -- id: tagSelectorBox -- width: parent.width -- editable: true -- } -- -- onAccepted: { -- var tag = tagSelectorBox.editText -- var message = i18n("Tag: %1", tag) -- message += "
" -- message += i18n("Value: %1", awKeys.valueByKey(tag)) -- message += "
" -- message += i18n("Info: %1", awKeys.infoByKey(tag)) -- awActions.sendNotification("tag", message) -- } -- } -- - - Component.onCompleted: { - if (debug) console.debug() -@@ -216,7 +194,12 @@ Item { - function action_requestKey() { - if (debug) console.debug() - -- tagSelectorBox.model = awKeys.dictKeys(true) -- return tagSelector.open() -+ var tag = awKeys.graphicalKey() -+ var message = i18n("Tag: %1", tag) -+ message += "
" -+ message += i18n("Value: %1", awKeys.valueByKey(tag)) -+ message += "
" -+ message += i18n("Info: %1", awKeys.infoByKey(tag)) -+ awActions.sendNotification("tag", message) - } - } -diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp -index e5b9861..039d24e 100644 ---- a/sources/awesome-widget/plugin/awkeys.cpp -+++ b/sources/awesome-widget/plugin/awkeys.cpp -@@ -324,6 +324,13 @@ QStringList AWKeys::getHddDevices() const - } - - -+QString AWKeys::graphicalKey() const -+{ -+ return QInputDialog::getItem(nullptr, i18n("Select tag"), QString(), -+ dictKeys(true), 0, true); -+} -+ -+ - QString AWKeys::infoByKey(QString key) const - { - qCDebug(LOG_AW) << "Requested key" << key; -diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h -index a8300f1..8edc3bd 100644 ---- a/sources/awesome-widget/plugin/awkeys.h -+++ b/sources/awesome-widget/plugin/awkeys.h -@@ -55,6 +55,7 @@ public: - Q_INVOKABLE QStringList dictKeys(const bool sorted = false, - const QString regexp = QString()) const; - Q_INVOKABLE QStringList getHddDevices() const; -+ Q_INVOKABLE QString graphicalKey() const; - // values - Q_INVOKABLE QString infoByKey(QString key) const; - Q_INVOKABLE QString valueByKey(QString key) const; diff --git a/sources/awesome-widget/package/contents/ui/advanced.qml b/sources/awesome-widget/package/contents/ui/advanced.qml index 01bcd58..1ec7ba6 100644 --- a/sources/awesome-widget/package/contents/ui/advanced.qml @@ -172,11 +87,66 @@ index 01bcd58..1ec7ba6 100644 for (var key in importConfig) plasmoid.configuration[key] = importConfig[key] } +diff --git a/sources/awesome-widget/package/contents/ui/main.qml b/sources/awesome-widget/package/contents/ui/main.qml +index 23e9690..ec83b91 100644 +--- a/sources/awesome-widget/package/contents/ui/main.qml ++++ b/sources/awesome-widget/package/contents/ui/main.qml +@@ -17,7 +17,6 @@ + + import QtQuick 2.4 + import QtQuick.Controls 1.3 as QtControls +-import QtQuick.Dialogs 1.2 as QtDialogs + import QtQuick.Layouts 1.1 + import org.kde.plasma.plasmoid 2.0 + import org.kde.plasma.core 2.0 as PlasmaCore +@@ -110,27 +109,6 @@ Item { + } + } + +- QtDialogs.Dialog { +- id: tagSelector +- title: i18n("Select tag") +- +- QtControls.ComboBox { +- id: tagSelectorBox +- width: parent.width +- editable: true +- } +- +- onAccepted: { +- var tag = tagSelectorBox.editText +- var message = i18n("Tag: %1", tag) +- message += "
" +- message += i18n("Value: %1", awKeys.valueByKey(tag)) +- message += "
" +- message += i18n("Info: %1", awKeys.infoByKey(tag)) +- awActions.sendNotification("tag", message) +- } +- } +- + + Component.onCompleted: { + if (debug) console.debug() +@@ -216,7 +194,12 @@ Item { + function action_requestKey() { + if (debug) console.debug() + +- tagSelectorBox.model = awKeys.dictKeys(true) +- return tagSelector.open() ++ var tag = awKeys.graphicalKey() ++ var message = i18n("Tag: %1", tag) ++ message += "
" ++ message += i18n("Value: %1", awKeys.valueByKey(tag)) ++ message += "
" ++ message += i18n("Info: %1", awKeys.infoByKey(tag)) ++ awActions.sendNotification("tag", message) + } + } diff --git a/sources/awesome-widget/plugin/awconfighelper.cpp b/sources/awesome-widget/plugin/awconfighelper.cpp -index 5901fc8..5f61d2a 100644 +index 6263b30..5f61d2a 100644 --- a/sources/awesome-widget/plugin/awconfighelper.cpp +++ b/sources/awesome-widget/plugin/awconfighelper.cpp -@@ -19,11 +19,15 @@ +@@ -19,10 +19,15 @@ #include @@ -184,7 +154,7 @@ index 5901fc8..5f61d2a 100644 +#include #include +#include - #include ++#include #include #include #include @@ -192,7 +162,7 @@ index 5901fc8..5f61d2a 100644 #include "awdebug.h" -@@ -51,11 +55,13 @@ bool AWConfigHelper::dropCache() const +@@ -50,11 +55,13 @@ bool AWConfigHelper::dropCache() const } @@ -210,7 +180,7 @@ index 5901fc8..5f61d2a 100644 QSettings settings(fileName, QSettings::IniFormat); // plasmoid configuration -@@ -97,22 +103,33 @@ bool AWConfigHelper::exportConfiguration(QObject *nativeConfig, +@@ -96,22 +103,33 @@ bool AWConfigHelper::exportConfiguration(QObject *nativeConfig, // sync settings settings.sync(); // show additional message @@ -252,7 +222,7 @@ index 5901fc8..5f61d2a 100644 foreach (QString item, m_dirs) { settings.beginGroup(item); foreach (QString it, settings.childGroups()) -@@ -122,7 +139,7 @@ QVariantMap AWConfigHelper::importConfiguration(const QString fileName, +@@ -121,7 +139,7 @@ QVariantMap AWConfigHelper::importConfiguration(const QString fileName, } // additional files @@ -261,7 +231,7 @@ index 5901fc8..5f61d2a 100644 settings.beginGroup(QString("json")); // script filters writeFile(settings, QString("filters"), -@@ -136,7 +153,7 @@ QVariantMap AWConfigHelper::importConfiguration(const QString fileName, +@@ -135,7 +153,7 @@ QVariantMap AWConfigHelper::importConfiguration(const QString fileName, } // plasmoid configuration @@ -270,7 +240,7 @@ index 5901fc8..5f61d2a 100644 settings.beginGroup(QString("plasmoid")); foreach (QString key, settings.childKeys()) configuration[key] = settings.value(key); -@@ -262,6 +279,50 @@ void AWConfigHelper::readFile(QSettings &settings, const QString key, +@@ -261,6 +279,50 @@ void AWConfigHelper::readFile(QSettings &settings, const QString key, } @@ -348,3 +318,33 @@ index 912ac3d..dc51dfb 100644 void writeFile(QSettings &settings, const QString key, const QString fileName) const; // properties +diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp +index e5b9861..039d24e 100644 +--- a/sources/awesome-widget/plugin/awkeys.cpp ++++ b/sources/awesome-widget/plugin/awkeys.cpp +@@ -324,6 +324,13 @@ QStringList AWKeys::getHddDevices() const + } + + ++QString AWKeys::graphicalKey() const ++{ ++ return QInputDialog::getItem(nullptr, i18n("Select tag"), QString(), ++ dictKeys(true), 0, true); ++} ++ ++ + QString AWKeys::infoByKey(QString key) const + { + qCDebug(LOG_AW) << "Requested key" << key; +diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h +index a8300f1..8edc3bd 100644 +--- a/sources/awesome-widget/plugin/awkeys.h ++++ b/sources/awesome-widget/plugin/awkeys.h +@@ -55,6 +55,7 @@ public: + Q_INVOKABLE QStringList dictKeys(const bool sorted = false, + const QString regexp = QString()) const; + Q_INVOKABLE QStringList getHddDevices() const; ++ Q_INVOKABLE QString graphicalKey() const; + // values + Q_INVOKABLE QString infoByKey(QString key) const; + Q_INVOKABLE QString valueByKey(QString key) const; From ac089dee9c1a782be01868d33b96eca098d1d41f Mon Sep 17 00:00:00 2001 From: arcan1s Date: Fri, 23 Oct 2015 00:20:30 +0300 Subject: [PATCH 8/8] Release 3.0.1 drop nullptr checking --- CHANGELOG | 5 +++ CHANGELOG-RU | 5 +++ CONTRIBUTING.md | 4 +- packages/PKGBUILD | 7 ++-- sources/CMakeLists.txt | 2 +- .../awesome-widget/package/metadata.desktop | 2 +- sources/awesome-widget/plugin/awkeys.cpp | 41 ++++++++----------- .../desktop-panel/package/metadata.desktop | 2 +- 8 files changed, 37 insertions(+), 31 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ad926e9..8370635 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +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 diff --git a/CHANGELOG-RU b/CHANGELOG-RU index 1a3b98c..c1fcbd5 100644 --- a/CHANGELOG-RU +++ b/CHANGELOG-RU @@ -1,3 +1,8 @@ +Вер.3.0.1: ++ добавлены патчи для старых версий Qt +- убрана проверка на nullptr +* диалоги перемещены в QML + Вер.3.0.0: + добавлены теги upunits, downunits, upkb, downkb + добавлены теги dalbum, dartist, dtitle, salbum, sartist, stitle diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 66fb446..3f94a57 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -81,6 +81,8 @@ for more details. To avoid manual labor there is automatic cmake target named * Create one file (source and header) per class. * `else if` construction is allowed and recommended. * 'true ? foo : bar' construction is allowed and recommended for one-line assignment. +* any global pointer should be assign to `nullptr` after deletion and before + initialization. Exception: if object is deleted into class destructor. Comments -------- @@ -101,7 +103,7 @@ 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). + 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 diff --git a/packages/PKGBUILD b/packages/PKGBUILD index 812e17f..3cc9da5 100644 --- a/packages/PKGBUILD +++ b/packages/PKGBUILD @@ -2,7 +2,7 @@ pkgname=plasma5-applet-awesome-widgets _pkgname=awesome-widgets -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Collection of minimalistic Plasmoids which look like Awesome WM widgets (ex-PyTextMonitor)" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=("catalyst: for GPU monitor" makedepends=('cmake' 'extra-cmake-modules') source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz) install=${pkgname}.install -md5sums=('4878899f092ee12ad8f935f0551ef6b2') +md5sums=('71f5b358d443075540377284ee868a93') backup=('etc/xdg/plasma-dataengine-extsysmon.conf') prepare() { @@ -28,8 +28,9 @@ prepare() { build () { cd "${srcdir}/build" cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=Optimization \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_FUTURE=ON \ "../${_pkgname}" make } diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 8e45d58..bc96fb9 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -15,7 +15,7 @@ set(PROJECT_CONTACT "esalexeev@gmail.com") set(PROJECT_LICENSE "GPL3") set(PROJECT_VERSION_MAJOR "3") set(PROJECT_VERSION_MINOR "0") -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 "") diff --git a/sources/awesome-widget/package/metadata.desktop b/sources/awesome-widget/package/metadata.desktop index ddba55c..8983e48 100644 --- a/sources/awesome-widget/package/metadata.desktop +++ b/sources/awesome-widget/package/metadata.desktop @@ -20,7 +20,7 @@ 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=3.0.0 +X-KDE-PluginInfo-Version=3.0.1 X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/ X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Depends= diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp index e5b9861..39e0647 100644 --- a/sources/awesome-widget/plugin/awkeys.cpp +++ b/sources/awesome-widget/plugin/awkeys.cpp @@ -66,22 +66,15 @@ AWKeys::~AWKeys() qCDebug(LOG_AW) << __PRETTY_FUNCTION__; // extensions - if (graphicalItems != nullptr) - delete graphicalItems; - if (extQuotes != nullptr) - delete extQuotes; - if (extScripts != nullptr) - delete extScripts; - if (extUpgrade != nullptr) - delete extUpgrade; - if (extWeather != nullptr) - delete extWeather; + delete graphicalItems; + delete extQuotes; + delete extScripts; + delete extUpgrade; + delete extWeather; // core - if (dataEngineAggregator != nullptr) - delete dataEngineAggregator; - if (m_threadPool != nullptr) - delete m_threadPool; + delete dataEngineAggregator; + delete m_threadPool; delete aggregator; delete dataAggregator; } @@ -471,16 +464,16 @@ void AWKeys::reinitKeys() { // renew extensions // delete them if any - if (graphicalItems != nullptr) - delete graphicalItems; - if (extQuotes != nullptr) - delete extQuotes; - if (extScripts != nullptr) - delete extScripts; - if (extUpgrade != nullptr) - delete extUpgrade; - if (extWeather != nullptr) - delete extWeather; + delete graphicalItems; + graphicalItems = nullptr; + delete extQuotes; + extQuotes = nullptr; + delete extScripts; + extScripts = nullptr; + delete extUpgrade; + extUpgrade = nullptr; + delete extWeather; + extWeather = nullptr; // create graphicalItems = new ExtItemAggregator(nullptr, QString("desktops")); diff --git a/sources/desktop-panel/package/metadata.desktop b/sources/desktop-panel/package/metadata.desktop index f3ec7f3..3f82376 100644 --- a/sources/desktop-panel/package/metadata.desktop +++ b/sources/desktop-panel/package/metadata.desktop @@ -20,7 +20,7 @@ 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.desktoppanel -X-KDE-PluginInfo-Version=3.0.0 +X-KDE-PluginInfo-Version=3.0.1 X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/ X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Depends=