arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-04-25 07:57:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #122 from arcan1s/development

Browse Source 
Release 3.3.0
This commit is contained in:
Evgenii Alekseev 2017-05-15 17:29:53 +03:00 committed by GitHub
commit 1a50484deb
180 changed files with 6424 additions and 6419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
CONTRIBUTING.md
View File

@ -37,32 +37,17 @@ for more details. To avoid manual labor there is automatic cmake target named
* `Q_PROPERTY` macro is allowed and recommended for QObject based classes. * `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 * 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. `Q_FOREACH` (`foreach`) is not allowed use `for (auto &foo : bar)` instead.
* Current project standard is **C++11**. * Current project standard is **C++11**.
* Do not use C-like code: * Do not use C-like code:
* C-like style iteration if possible. Use `for (auto foo : bar)` and * 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. `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 * C-like casts, use `const_cast`, `static_cast`, `dymanic_Cast` instead. Using
of `reinterpret_cast` is not recommended. It is highly recommended to use of `reinterpret_cast` is not recommended. It is highly recommended to use
`dynamic_cast` with the exception catching. It is also possible to use `dynamic_cast` with the exception catching. It is also possible to use
`qvariant_cast` if required. Exception is class constructors, e.g.: `qvariant_cast` if required.
```
char c = 'c';
std::string s = "string";
qDebug() << QString("some string") << QChar(c) << QString(s);
```
* C-like `NULL`, use `nullptr` instead. * C-like `NULL`, use `nullptr` instead.
* C-like constant definition, use `const vartype foo = bar` definition instead. * C-like constant definition, use `const vartype foo = bar` definition instead.
* It is highly recommended to avoid implicit casts. Exception `nullptr` casts to
boolean, e.g.:
```
if (nullptr)
qDebug() << "nullptr is true, wtf";
```
* Abstract classes (which have at least one pure virtual method) are allowed. * Abstract classes (which have at least one pure virtual method) are allowed.
* Templates are allowed and recommended. Templates usually should be described * Templates are allowed and recommended. Templates usually should be described
inside header not source code file. inside header not source code file.
@ -93,6 +78,7 @@ for more details. To avoid manual labor there is automatic cmake target named
* Any global pointer should be assign to `nullptr` after deletion and before * Any global pointer should be assign to `nullptr` after deletion and before
initialization. Exception: if object is deleted into class destructor. initialization. Exception: if object is deleted into class destructor.
* Do not use semicolon in qml files unless it is required. * Do not use semicolon in qml files unless it is required.
* Any method argument including class constructors should start with `_`.
Comments Comments
-------- --------
@ -178,8 +164,7 @@ Testing
1. `-DCMAKE_BUILD_TYPE=Debug`. 1. `-DCMAKE_BUILD_TYPE=Debug`.
2. `-DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON`. 2. `-DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON`.
3. `-DCMAKE_BUILD_TYPE=Release`. 3. `-DCMAKE_BUILD_TYPE=Release`.
* It is recommended to create addition test if possible. * Additional test functions should be declated and used only inside `BUILD_TESTING`
* Addition test functions should be declated and used only inside `BUILD_TESTING`
definition. definition.
Tools Tools
@ -210,9 +195,9 @@ Tools
* Recommended class constructor for QObject based classes: * Recommended class constructor for QObject based classes:
``` ```
FooClass::FooClass(QObject *parent, const QVariant var) FooClass::FooClass(QObject *_parent, const QVariant _var)
: QObject(parent) : QObject(_parent)
, m_var(var) , m_var(_var)
{ {
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
// some code below if any // some code below if any

4
packages/PKGBUILD
View File

@ -2,7 +2,7 @@
pkgname=plasma5-applet-awesome-widgets pkgname=plasma5-applet-awesome-widgets
_pkgname=awesome-widgets _pkgname=awesome-widgets
pkgver=3.2.1 pkgver=3.3.0
pkgrel=1 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)"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
@ -17,7 +17,7 @@ optdepends=("catalyst: for GPU monitor"
makedepends=('cmake' 'extra-cmake-modules' 'python') makedepends=('cmake' 'extra-cmake-modules' 'python')
source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${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=('73da19c31aa95edd428ff5ce7b541ee1') md5sums=('0dddbf8c47992204de515e63026c16f3')
backup=('etc/xdg/plasma-dataengine-extsysmon.conf') backup=('etc/xdg/plasma-dataengine-extsysmon.conf')
prepare() { prepare() {

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

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

41
patches/qt5.5-qstringlist-and-qinfo.patch
View File

@ -1,5 +1,25 @@
diff --git a/sources/awdebug.h b/sources/awdebug.h
index 8447c65..9f8e298 100644
--- a/sources/awdebug.h
+++ b/sources/awdebug.h
@@ -23,10 +23,14 @@
#include "version.h"
+#ifndef qCInfo
+#define qCInfo qCDebug
+#endif
+
namespace AWDebug
{
const char LOG_FORMAT[] = "[%{time "
- "process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%"
+ "process}][%{if-debug}DD%{endif}%"
"{if-warning}WW%{endif}%{if-critical}CC%{endif}%{if-"
"fatal}FF%{endif}][%{category}][%{function}] "
"%{message}";
diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h
index f808d03..a056b3f 100644 index d29672e..f15a729 100644
--- a/sources/awesome-widget/plugin/awkeysaggregator.h --- a/sources/awesome-widget/plugin/awkeysaggregator.h
+++ b/sources/awesome-widget/plugin/awkeysaggregator.h +++ b/sources/awesome-widget/plugin/awkeysaggregator.h
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
@ -10,22 +30,3 @@ index f808d03..a056b3f 100644
#include "version.h" #include "version.h"
diff --git a/sources/awdebug.h b/sources/awdebug.h
index 43944ce..c679281 100644
--- a/sources/awdebug.h
+++ b/sources/awdebug.h
@@ -21,9 +21,13 @@
#include "version.h"
+#ifndef qCInfo
+#define qCInfo qCDebug
+#endif
+
#ifndef LOG_FORMAT
#define LOG_FORMAT \
- "[%{time process}][%{if-debug}DD%{endif}%{if-info}II%{endif}%{if-" \
+ "[%{time process}][%{if-debug}DD%{endif}%{if-" \
"warning}WW%{endif}%{if-critical}CC%{endif}%{if-fatal}FF%{endif}][%{" \
"category}][%{function}] %{message}"
#endif /* LOG_FORMAT */

83
patches/qt5.6-qversionnumber.patch
View File

@ -1,69 +1,60 @@
diff --git a/sources/awesome-widget/plugin/awupdatehelper.cpp b/sources/awesome-widget/plugin/awupdatehelper.cpp diff --git a/sources/awesome-widget/plugin/awupdatehelper.cpp b/sources/awesome-widget/plugin/awupdatehelper.cpp
index 3698602..42871c8 100644 index f6b5338..b5a3163 100644
--- a/sources/awesome-widget/plugin/awupdatehelper.cpp --- a/sources/awesome-widget/plugin/awupdatehelper.cpp
+++ b/sources/awesome-widget/plugin/awupdatehelper.cpp +++ b/sources/awesome-widget/plugin/awupdatehelper.cpp
@@ -37,7 +37,7 @@ AWUpdateHelper::AWUpdateHelper(QObject *parent) @@ -35,7 +35,7 @@ AWUpdateHelper::AWUpdateHelper(QObject *_parent)
{ {
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
- m_foundVersion = QVersionNumber::fromString(VERSION); - m_foundVersion = QVersionNumber::fromString(VERSION);
+ m_foundVersion = QString(VERSION); + m_foundVersion = VERSION;
m_genericConfig = QString("%1/awesomewidgets/general.ini") m_genericConfig = QString("%1/awesomewidgets/general.ini")
.arg(QStandardPaths::writableLocation( .arg(QStandardPaths::writableLocation(
QStandardPaths::GenericDataLocation)); QStandardPaths::GenericDataLocation));
@@ -69,15 +69,15 @@ void AWUpdateHelper::checkUpdates(const bool showAnyway) @@ -67,8 +67,7 @@ void AWUpdateHelper::checkUpdates(const bool _showAnyway)
bool AWUpdateHelper::checkVersion() bool AWUpdateHelper::checkVersion()
{ {
QSettings settings(m_genericConfig, QSettings::IniFormat); QSettings settings(m_genericConfig, QSettings::IniFormat);
- QVersionNumber version = QVersionNumber::fromString( - QVersionNumber version = QVersionNumber::fromString(
- settings.value(QString("Version"), QString(VERSION)).toString()); - settings.value("Version", QString(VERSION)).toString());
+ QString version + QString version = settings.value("Version", VERSION).toString();
+ = settings.value(QString("Version"), QString(VERSION)).toString();
// update version // update version
settings.setValue(QString("Version"), QString(VERSION)); settings.setValue("Version", QString(VERSION));
settings.sync(); settings.sync();
qCInfo(LOG_AW) << "Found version" << version << "actual one is" @@ -91,12 +90,11 @@ bool AWUpdateHelper::checkVersion()
<< m_foundVersion;
- if ((version != m_foundVersion) && (!QString(CHANGELOG).isEmpty())) {
+ if ((version != QString(VERSION)) && (!QString(CHANGELOG).isEmpty())) {
genMessageBox(i18n("Changelog of %1", QString(VERSION)),
QString(CHANGELOG).replace(QChar('@'), QChar('\n')),
QMessageBox::Ok)
@@ -90,12 +90,11 @@ bool AWUpdateHelper::checkVersion()
} }
-void AWUpdateHelper::showInfo(const QVersionNumber version) -void AWUpdateHelper::showInfo(const QVersionNumber &_version)
+void AWUpdateHelper::showInfo(const QString version) +void AWUpdateHelper::showInfo(const QString &_version)
{ {
qCDebug(LOG_AW) << "Version" << version; qCDebug(LOG_AW) << "Version" << _version;
- QString text - QString text
- = i18n("You are using the actual version %1", version.toString()); - = i18n("You are using the actual version %1", _version.toString());
+ QString text = i18n("You are using the actual version %1", version); + QString text = i18n("You are using the actual version %1", _version);
if (!QString(COMMIT_SHA).isEmpty()) if (!QString(COMMIT_SHA).isEmpty())
text += QString(" (%1)").arg(QString(COMMIT_SHA)); text += QString(" (%1)").arg(QString(COMMIT_SHA));
return genMessageBox(i18n("No new version found"), text, QMessageBox::Ok) return genMessageBox(i18n("No new version found"), text, QMessageBox::Ok)
@@ -103,7 +102,7 @@ void AWUpdateHelper::showInfo(const QVersionNumber version) @@ -104,7 +102,7 @@ void AWUpdateHelper::showInfo(const QVersionNumber &_version)
} }
-void AWUpdateHelper::showUpdates(const QVersionNumber version) -void AWUpdateHelper::showUpdates(const QVersionNumber &_version)
+void AWUpdateHelper::showUpdates(const QString version) +void AWUpdateHelper::showUpdates(const QString &_version)
{ {
qCDebug(LOG_AW) << "Version" << version; qCDebug(LOG_AW) << "Version" << _version;
@@ -112,7 +111,7 @@ void AWUpdateHelper::showUpdates(const QVersionNumber version) @@ -113,7 +111,7 @@ void AWUpdateHelper::showUpdates(const QVersionNumber &_version)
text += QString(COMMIT_SHA).isEmpty() text += QString(COMMIT_SHA).isEmpty()
? QString("\n") ? "\n"
: QString(" (%1)\n").arg(QString(COMMIT_SHA)); : QString(" (%1)\n").arg(QString(COMMIT_SHA));
- text += i18n("New version : %1", version.toString()) + QString("\n\n"); - text += i18n("New version : %1", _version.toString()) + "\n\n";
+ text += i18n("New version : %1", version) + QString("\n\n"); + text += i18n("New version : %1", _version) + "\n\n";
text += i18n("Click \"Ok\" to download"); text += i18n("Click \"Ok\" to download");
genMessageBox(i18n("There are updates"), text, genMessageBox(i18n("There are updates"), text,
@@ -128,8 +127,7 @@ void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *button) @@ -130,8 +128,7 @@ void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *_button)
switch (ret) { switch (ret) {
case QMessageBox::AcceptRole: case QMessageBox::AcceptRole:
@ -73,10 +64,10 @@ index 3698602..42871c8 100644
break; break;
case QMessageBox::RejectRole: case QMessageBox::RejectRole:
default: default:
@@ -157,14 +155,23 @@ void AWUpdateHelper::versionReplyRecieved(QNetworkReply *reply, @@ -162,14 +159,23 @@ void AWUpdateHelper::versionReplyRecieved(QNetworkReply *_reply,
QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap(); QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
QString version = firstRelease[QString("tag_name")].toString(); QString version = firstRelease["tag_name"].toString();
version.remove(QString("V.")); version.remove("V.");
- m_foundVersion = QVersionNumber::fromString(version); - m_foundVersion = QVersionNumber::fromString(version);
+ m_foundVersion = version; + m_foundVersion = version;
qCInfo(LOG_AW) << "Update found version to" << m_foundVersion; qCInfo(LOG_AW) << "Update found version to" << m_foundVersion;
@ -96,14 +87,14 @@ index 3698602..42871c8 100644
+ || ((old_major == new_major) && (old_minor == new_minor) + || ((old_major == new_major) && (old_minor == new_minor)
+ && (old_patch < new_patch))) + && (old_patch < new_patch)))
+ return showUpdates(version); + return showUpdates(version);
else if (showAnyway) else if (_showAnyway)
- return showInfo(m_foundVersion); - return showInfo(m_foundVersion);
+ return showInfo(version); + return showInfo(version);
} }
diff --git a/sources/awesome-widget/plugin/awupdatehelper.h b/sources/awesome-widget/plugin/awupdatehelper.h diff --git a/sources/awesome-widget/plugin/awupdatehelper.h b/sources/awesome-widget/plugin/awupdatehelper.h
index 359cdb2..9c6a42d 100644 index cfd26e7..b311be2 100644
--- a/sources/awesome-widget/plugin/awupdatehelper.h --- a/sources/awesome-widget/plugin/awupdatehelper.h
+++ b/sources/awesome-widget/plugin/awupdatehelper.h +++ b/sources/awesome-widget/plugin/awupdatehelper.h
@@ -21,7 +21,6 @@ @@ -21,7 +21,6 @@
@ -118,23 +109,23 @@ index 359cdb2..9c6a42d 100644
bool checkVersion(); bool checkVersion();
private slots: private slots:
- void showInfo(const QVersionNumber version); - void showInfo(const QVersionNumber &_version);
- void showUpdates(const QVersionNumber version); - void showUpdates(const QVersionNumber &_version);
+ void showInfo(const QString version); + void showInfo(const QString &_version);
+ void showUpdates(const QString version); + void showUpdates(const QString &_version);
void userReplyOnUpdates(QAbstractButton *button); void userReplyOnUpdates(QAbstractButton *_button);
void versionReplyRecieved(QNetworkReply *reply, const bool showAnyway); void versionReplyRecieved(QNetworkReply *_reply, const bool _showAnyway);
private: private:
QMessageBox *genMessageBox(const QString title, const QString body, QMessageBox *genMessageBox(const QString &_title, const QString &_body,
const QMessageBox::StandardButtons buttons); const QMessageBox::StandardButtons _buttons);
- QVersionNumber m_foundVersion; - QVersionNumber m_foundVersion;
+ QString m_foundVersion; + QString m_foundVersion;
QString m_genericConfig; QString m_genericConfig;
}; };
diff --git a/sources/libraries.cmake b/sources/libraries.cmake diff --git a/sources/libraries.cmake b/sources/libraries.cmake
index 33192f7..339bb58 100644 index 6f171a6..004b39f 100644
--- a/sources/libraries.cmake --- a/sources/libraries.cmake
+++ b/sources/libraries.cmake +++ b/sources/libraries.cmake
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
@ -142,7 +133,7 @@ index 33192f7..339bb58 100644
# main qt libraries # main qt libraries
-find_package(Qt5 5.6.0 REQUIRED COMPONENTS Core DBus Network Qml Test Widgets) -find_package(Qt5 5.6.0 REQUIRED COMPONENTS Core DBus Network Qml Test Widgets)
+find_package(Qt5 5.4.0 REQUIRED COMPONENTS Core DBus Network Qml Test Widgets) +find_package(Qt5 5.5.0 REQUIRED COMPONENTS Core DBus Network Qml Test Widgets)
add_definitions( add_definitions(
${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS} ${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}

7
sources/CMakeLists.txt
View File

@ -14,8 +14,8 @@ set(PROJECT_AUTHOR "Evgeniy Alekseev")
set(PROJECT_CONTACT "esalexeev@gmail.com") set(PROJECT_CONTACT "esalexeev@gmail.com")
set(PROJECT_LICENSE "GPL3") set(PROJECT_LICENSE "GPL3")
set(PROJECT_VERSION_MAJOR "3") set(PROJECT_VERSION_MAJOR "3")
set(PROJECT_VERSION_MINOR "2") set(PROJECT_VERSION_MINOR "3")
set(PROJECT_VERSION_PATCH "1") set(PROJECT_VERSION_PATCH "0")
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
# append git version if any # append git version if any
set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "") set(PROJECT_COMMIT_SHA "Commit hash" CACHE INTERNAL "")
@ -55,9 +55,6 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
set(CMAKE_CXX_FLAGS_OPTIMIZATION "-Ofast -DNDEBUG") set(CMAKE_CXX_FLAGS_OPTIMIZATION "-Ofast -DNDEBUG")
# linker flags # linker flags
# set(CMAKE_EXE_LINKER_FLAGS "-lc++abi")
# set(CMAKE_MODULE_LINKER_FLAGS "-lc++abi")
# set(CMAKE_SHARED_LINKER_FLAGS "-lc++abi")
else () else ()
message(FATAL_ERROR "Unknown compiler") message(FATAL_ERROR "Unknown compiler")
endif () endif ()

91
sources/awdebug.cpp
View File

@ -33,73 +33,70 @@ Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets",
QtMsgType::QtWarningMsg) QtMsgType::QtWarningMsg)
QString AWDebug::getAboutText(const QString type) QString AWDebug::getAboutText(const QString &_type)
{ {
QString text; QString text;
if (type == QString("header")) { if (_type == "header") {
text = QString(NAME); text = NAME;
} else if (type == QString("version")) { } else if (_type == "version") {
text = i18n("Version %1 (build date %2)", QString(VERSION), text = i18n("Version %1 (build date %2)", VERSION, BUILD_DATE);
QString(BUILD_DATE));
if (!QString(COMMIT_SHA).isEmpty()) if (!QString(COMMIT_SHA).isEmpty())
text += QString(" (%1)").arg(QString(COMMIT_SHA)); text += QString(" (%1)").arg(COMMIT_SHA);
} else if (type == QString("description")) { } else if (_type == "description") {
text = i18n("A set of minimalistic plasmoid widgets"); text = i18n("A set of minimalistic plasmoid widgets");
} else if (type == QString("links")) { } else if (_type == "links") {
text = i18n("Links:") + QString("<ul>") text = i18n("Links:") + "<ul>"
+ QString("<li><a href=\"%1\">%2</a></li>") + QString("<li><a href=\"%1\">%2</a></li>")
.arg(QString(HOMEPAGE)) .arg(HOMEPAGE)
.arg(i18n("Homepage")) .arg(i18n("Homepage"))
+ QString("<li><a href=\"%1\">%2</a></li>") + QString("<li><a href=\"%1\">%2</a></li>")
.arg(QString(REPOSITORY)) .arg(REPOSITORY)
.arg(i18n("Repository")) .arg(i18n("Repository"))
+ QString("<li><a href=\"%1\">%2</a></li>") + QString("<li><a href=\"%1\">%2</a></li>")
.arg(QString(BUGTRACKER)) .arg(BUGTRACKER)
.arg(i18n("Bugtracker")) .arg(i18n("Bugtracker"))
+ QString("<li><a href=\"%1\">%2</a></li>") + QString("<li><a href=\"%1\">%2</a></li>")
.arg(QString(TRANSLATION)) .arg(TRANSLATION)
.arg(i18n("Translation issue")) .arg(i18n("Translation issue"))
+ QString("<li><a href=\"%1\">%2</a></li>") + QString("<li><a href=\"%1\">%2</a></li>")
.arg(QString(AUR_PACKAGES)) .arg(AUR_PACKAGES)
.arg(i18n("AUR packages")) .arg(i18n("AUR packages"))
+ QString("<li><a href=\"%1\">%2</a></li>") + QString("<li><a href=\"%1\">%2</a></li>")
.arg(QString(OPENSUSE_PACKAGES)) .arg(OPENSUSE_PACKAGES)
.arg(i18n("openSUSE packages")) .arg(i18n("openSUSE packages"))
+ QString("</ul>"); + "</ul>";
} else if (type == QString("copy")) { } else if (_type == "copy") {
text = QString("<small>&copy; %1 <a href=\"mailto:%2\">%3</a><br>") text = QString("<small>&copy; %1 <a href=\"mailto:%2\">%3</a><br>")
.arg(QString(DATE)) .arg(DATE)
.arg(QString(EMAIL)) .arg(EMAIL)
.arg(QString(AUTHOR)) .arg(AUTHOR)
+ i18n("This software is licensed under %1", QString(LICENSE)) + i18n("This software is licensed under %1", LICENSE)
+ QString("</small>"); + "</small>";
} else if (type == QString("translators")) { } else if (_type == "translators") {
QStringList translatorList = QString(TRANSLATORS).split(QChar(',')); QStringList translatorList = QString(TRANSLATORS).split(',');
for (auto &translator : translatorList) for (auto &translator : translatorList)
translator = QString("<li>%1</li>").arg(translator); translator = QString("<li>%1</li>").arg(translator);
text = i18n("Translators:") + QString("<ul>") text
+ translatorList.join(QString("")) + QString("</ul>"); = i18n("Translators:") + "<ul>" + translatorList.join("") + "</ul>";
} else if (type == QString("3rdparty")) { } else if (_type == "3rdparty") {
QStringList trdPartyList QStringList trdPartyList
= QString(TRDPARTY_LICENSE) = QString(TRDPARTY_LICENSE).split(';', QString::SkipEmptyParts);
.split(QChar(';'), QString::SkipEmptyParts);
for (int i = 0; i < trdPartyList.count(); i++) for (int i = 0; i < trdPartyList.count(); i++)
trdPartyList[i] trdPartyList[i]
= QString("<li><a href=\"%3\">%1</a> (%2 license)</li>") = QString("<li><a href=\"%3\">%1</a> (%2 license)</li>")
.arg(trdPartyList.at(i).split(QChar(','))[0]) .arg(trdPartyList.at(i).split(',')[0])
.arg(trdPartyList.at(i).split(QChar(','))[1]) .arg(trdPartyList.at(i).split(',')[1])
.arg(trdPartyList.at(i).split(QChar(','))[2]); .arg(trdPartyList.at(i).split(',')[2]);
text = i18n("This software uses:") + QString("<ul>") text = i18n("This software uses:") + "<ul>" + trdPartyList.join("")
+ trdPartyList.join(QString("")) + QString("</ul>"); + "</ul>";
} else if (type == QString("thanks")) { } else if (_type == "thanks") {
QStringList thanks = QString(SPECIAL_THANKS) QStringList thanks
.split(QChar(';'), QString::SkipEmptyParts); = QString(SPECIAL_THANKS).split(';', QString::SkipEmptyParts);
for (int i = 0; i < thanks.count(); i++) for (int i = 0; i < thanks.count(); i++)
thanks[i] = QString("<li><a href=\"%2\">%1</a></li>") thanks[i] = QString("<li><a href=\"%2\">%1</a></li>")
.arg(thanks.at(i).split(QChar(','))[0]) .arg(thanks.at(i).split(',')[0])
.arg(thanks.at(i).split(QChar(','))[1]); .arg(thanks.at(i).split(',')[1]);
text = i18n("Special thanks to:") + QString("<ul>") text = i18n("Special thanks to:") + "<ul>" + thanks.join("") + "</ul>";
+ thanks.join(QString("")) + QString("</ul>");
} }
return text; return text;
@ -109,14 +106,14 @@ QString AWDebug::getAboutText(const QString type)
QStringList AWDebug::getBuildData() QStringList AWDebug::getBuildData()
{ {
QStringList metadata; QStringList metadata;
metadata.append(QString("=== Awesome Widgets configuration details ===")); metadata.append("=== Awesome Widgets configuration details ===");
// build information // build information
metadata.append(QString("Build details:")); metadata.append("Build details:");
metadata.append(QString(" VERSION: %1").arg(VERSION)); metadata.append(QString(" VERSION: %1").arg(VERSION));
metadata.append(QString(" COMMIT_SHA: %1").arg(COMMIT_SHA)); metadata.append(QString(" COMMIT_SHA: %1").arg(COMMIT_SHA));
metadata.append(QString(" BUILD_DATE: %1").arg(BUILD_DATE)); metadata.append(QString(" BUILD_DATE: %1").arg(BUILD_DATE));
// configuration // configuration
metadata.append(QString("API details:")); metadata.append("API details:");
metadata.append(QString(" AW_GRAPHITEM_API: %1").arg(AW_GRAPHITEM_API)); 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_EXTQUOTES_API: %1").arg(AW_EXTQUOTES_API));
metadata.append(QString(" AW_EXTSCRIPT_API: %1").arg(AW_EXTSCRIPT_API)); metadata.append(QString(" AW_EXTSCRIPT_API: %1").arg(AW_EXTSCRIPT_API));
@ -129,7 +126,7 @@ QStringList AWDebug::getBuildData()
metadata.append(QString(" TIME_KEYS: %1").arg(TIME_KEYS)); metadata.append(QString(" TIME_KEYS: %1").arg(TIME_KEYS));
metadata.append(QString(" STATIC_KEYS: %1").arg(STATIC_KEYS)); metadata.append(QString(" STATIC_KEYS: %1").arg(STATIC_KEYS));
// cmake properties // cmake properties
metadata.append(QString("cmake properties:")); metadata.append("cmake properties:");
metadata.append(QString(" CMAKE_BUILD_TYPE: %1").arg(CMAKE_BUILD_TYPE)); metadata.append(QString(" CMAKE_BUILD_TYPE: %1").arg(CMAKE_BUILD_TYPE));
metadata.append( metadata.append(
QString(" CMAKE_CXX_COMPILER: %1").arg(CMAKE_CXX_COMPILER)); QString(" CMAKE_CXX_COMPILER: %1").arg(CMAKE_CXX_COMPILER));
@ -149,7 +146,7 @@ QStringList AWDebug::getBuildData()
metadata.append(QString(" CMAKE_SHARED_LINKER_FLAGS: %1") metadata.append(QString(" CMAKE_SHARED_LINKER_FLAGS: %1")
.arg(CMAKE_SHARED_LINKER_FLAGS)); .arg(CMAKE_SHARED_LINKER_FLAGS));
// components // components
metadata.append(QString("Components data:")); metadata.append("Components data:");
metadata.append(QString(" BUILD_PLASMOIDS: %1").arg(BUILD_PLASMOIDS)); metadata.append(QString(" BUILD_PLASMOIDS: %1").arg(BUILD_PLASMOIDS));
metadata.append( metadata.append(
QString(" BUILD_DEB_PACKAGE: %1").arg(BUILD_DEB_PACKAGE)); QString(" BUILD_DEB_PACKAGE: %1").arg(BUILD_DEB_PACKAGE));

2
sources/awdebug.h
View File

@ -31,7 +31,7 @@ const char LOG_FORMAT[] = "[%{time "
"fatal}FF%{endif}][%{category}][%{function}] " "fatal}FF%{endif}][%{category}][%{function}] "
"%{message}"; "%{message}";
QString getAboutText(const QString type); QString getAboutText(const QString &_type);
QStringList getBuildData(); QStringList getBuildData();
} }

2
sources/awesome-widget/package/metadata.desktop
View File

@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Email=esalexeev@gmail.com
X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
X-KDE-PluginInfo-Version=3.2.1 X-KDE-PluginInfo-Version=3.3.0
X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/ X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Category=System Information
X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-Depends=

32
sources/awesome-widget/plugin/awabstractselector.cpp
View File

@ -21,16 +21,16 @@
#include "awdebug.h" #include "awdebug.h"
AWAbstractSelector::AWAbstractSelector(QWidget *parent, AWAbstractSelector::AWAbstractSelector(QWidget *_parent,
const QPair<bool, bool> editable) const QPair<bool, bool> &_editable)
: QWidget(parent) : QWidget(_parent)
, ui(new Ui::AWAbstractSelector) , ui(new Ui::AWAbstractSelector)
{ {
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
ui->setupUi(this); ui->setupUi(this);
ui->comboBox_key->setEditable(editable.first); ui->comboBox_key->setEditable(_editable.first);
ui->comboBox_value->setEditable(editable.second); ui->comboBox_value->setEditable(_editable.second);
connect(ui->comboBox_key, SIGNAL(currentIndexChanged(int)), this, connect(ui->comboBox_key, SIGNAL(currentIndexChanged(int)), this,
SIGNAL(selectionChanged())); SIGNAL(selectionChanged()));
@ -56,24 +56,26 @@ QPair<QString, QString> AWAbstractSelector::current() const
} }
void AWAbstractSelector::init(const QStringList keys, const QStringList values, void AWAbstractSelector::init(const QStringList &_keys,
const QPair<QString, QString> current) const QStringList &_values,
const QPair<QString, QString> &_current)
{ {
if ((!keys.contains(current.first)) || (!values.contains(current.second))) { if ((!_keys.contains(_current.first))
qCWarning(LOG_AW) << "Invalid current value" << current || (!_values.contains(_current.second))) {
qCWarning(LOG_AW) << "Invalid current value" << _current
<< "not found in default ones"; << "not found in default ones";
return; return;
} }
qCDebug(LOG_AW) << "Init selector with keys" << keys << "and values" qCDebug(LOG_AW) << "Init selector with keys" << _keys << "and values"
<< values << "and current ones are" << current; << _values << "and current ones are" << _current;
// set data // set data
ui->comboBox_key->clear(); ui->comboBox_key->clear();
ui->comboBox_key->addItems(keys); ui->comboBox_key->addItems(_keys);
ui->comboBox_value->clear(); ui->comboBox_value->clear();
ui->comboBox_value->addItems(values); ui->comboBox_value->addItems(_values);
// set current values // set current values
ui->comboBox_key->setCurrentText(current.first); ui->comboBox_key->setCurrentText(_current.first);
ui->comboBox_value->setCurrentText(current.second); ui->comboBox_value->setCurrentText(_current.second);
} }

8
sources/awesome-widget/plugin/awabstractselector.h
View File

@ -32,13 +32,13 @@ class AWAbstractSelector : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit AWAbstractSelector(QWidget *parent = nullptr, explicit AWAbstractSelector(QWidget *_parent = nullptr,
const QPair<bool, bool> editable const QPair<bool, bool> &_editable
= {false, false}); = {false, false});
virtual ~AWAbstractSelector(); virtual ~AWAbstractSelector();
QPair<QString, QString> current() const; QPair<QString, QString> current() const;
void init(const QStringList keys, const QStringList values, void init(const QStringList &_keys, const QStringList &_values,
const QPair<QString, QString> current); const QPair<QString, QString> &_current);
signals: signals:
void selectionChanged(); void selectionChanged();

61
sources/awesome-widget/plugin/awactions.cpp
View File

@ -31,8 +31,8 @@
#include "awupdatehelper.h" #include "awupdatehelper.h"
AWActions::AWActions(QObject *parent) AWActions::AWActions(QObject *_parent)
: QObject(parent) : QObject(_parent)
{ {
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
@ -48,24 +48,24 @@ AWActions::~AWActions()
} }
void AWActions::checkUpdates(const bool showAnyway) void AWActions::checkUpdates(const bool _showAnyway)
{ {
qCDebug(LOG_AW) << "Show anyway" << showAnyway; qCDebug(LOG_AW) << "Show anyway" << _showAnyway;
if (!m_updateHelper->checkVersion()) if (!m_updateHelper->checkVersion())
m_updateHelper->checkUpdates(showAnyway); m_updateHelper->checkUpdates(_showAnyway);
} }
QString AWActions::getFileContent(const QString path) const QString AWActions::getFileContent(const QString &_path) const
{ {
qCDebug(LOG_AW) << "Get content from file" << path; qCDebug(LOG_AW) << "Get content from file" << _path;
QFile inputFile(path); QFile inputFile(_path);
if (!inputFile.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!inputFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
qCWarning(LOG_AW) << "Could not open file as text" qCWarning(LOG_AW) << "Could not open file as text"
<< inputFile.fileName(); << inputFile.fileName();
return QString(); return "";
} }
QString output = inputFile.readAll(); QString output = inputFile.readAll();
@ -81,13 +81,13 @@ bool AWActions::isDebugEnabled() const
} }
bool AWActions::runCmd(const QString cmd) const bool AWActions::runCmd(const QString &_cmd) const
{ {
qCDebug(LOG_AW) << "Cmd" << cmd; qCDebug(LOG_AW) << "Cmd" << _cmd;
sendNotification(QString("Info"), i18n("Run %1", cmd)); sendNotification(QString("Info"), i18n("Run %1", _cmd));
return QProcess::startDetached(cmd); return QProcess::startDetached(_cmd);
} }
@ -105,7 +105,7 @@ void AWActions::showLegacyInfo() const
msgBox->setModal(false); msgBox->setModal(false);
msgBox->setWindowTitle(i18n("Not supported")); msgBox->setWindowTitle(i18n("Not supported"));
msgBox->setText( msgBox->setText(
i18n("You are using mammoth's Qt version, try to update it first!")); i18n("You are using mammoth's Qt version, try to update it first"));
msgBox->setStandardButtons(QMessageBox::Ok); msgBox->setStandardButtons(QMessageBox::Ok);
msgBox->setIcon(QMessageBox::Information); msgBox->setIcon(QMessageBox::Information);
@ -114,42 +114,43 @@ void AWActions::showLegacyInfo() const
// HACK: this method uses variables from version.h // HACK: this method uses variables from version.h
QString AWActions::getAboutText(const QString type) const QString AWActions::getAboutText(const QString &_type) const
{ {
qCDebug(LOG_AW) << "Type" << type; qCDebug(LOG_AW) << "Type" << _type;
return AWDebug::getAboutText(type); return AWDebug::getAboutText(_type);
} }
QVariantMap AWActions::getFont(const QVariantMap defaultFont) const QVariantMap AWActions::getFont(const QVariantMap &_defaultFont) const
{ {
qCDebug(LOG_AW) << "Default font is" << defaultFont; qCDebug(LOG_AW) << "Default font is" << _defaultFont;
QVariantMap fontMap; QVariantMap fontMap;
int ret = 0; int ret = 0;
CFont defaultCFont = CFont(defaultFont[QString("family")].toString(), CFont defaultCFont
defaultFont[QString("size")].toInt(), 400, false, = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(),
defaultFont[QString("color")].toString()); 400, false, _defaultFont["color"].toString());
CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false,
false, &ret); false, &ret);
fontMap[QString("applied")] = ret; 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; return fontMap;
} }
// to avoid additional object definition this method is static // to avoid additional object definition this method is static
void AWActions::sendNotification(const QString eventId, const QString message) void AWActions::sendNotification(const QString &_eventId,
const QString &_message)
{ {
qCDebug(LOG_AW) << "Event" << eventId << "with message" << message; qCDebug(LOG_AW) << "Event" << _eventId << "with message" << _message;
KNotification *notification = KNotification::event( KNotification *notification = KNotification::event(
eventId, QString("Awesome Widget ::: %1").arg(eventId), message); _eventId, QString("Awesome Widget ::: %1").arg(_eventId), _message);
notification->setComponentName( notification->setComponentName(
QString("plasma-applet-org.kde.plasma.awesome-widget")); "plasma-applet-org.kde.plasma.awesome-widget");
} }

17
sources/awesome-widget/plugin/awactions.h
View File

@ -30,22 +30,21 @@ class AWActions : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit AWActions(QObject *parent = nullptr); explicit AWActions(QObject *_parent = nullptr);
virtual ~AWActions(); virtual ~AWActions();
Q_INVOKABLE void checkUpdates(const bool showAnyway = false); Q_INVOKABLE void checkUpdates(const bool _showAnyway = false);
Q_INVOKABLE QString getFileContent(const QString path) const; Q_INVOKABLE QString getFileContent(const QString &_path) const;
Q_INVOKABLE bool isDebugEnabled() const; Q_INVOKABLE bool isDebugEnabled() const;
Q_INVOKABLE bool runCmd(const QString cmd = QString("/usr/bin/true")) const; Q_INVOKABLE bool runCmd(const QString &_cmd) const;
Q_INVOKABLE void showLegacyInfo() const; Q_INVOKABLE void showLegacyInfo() const;
Q_INVOKABLE void showReadme() const; Q_INVOKABLE void showReadme() const;
// configuration slots // configuration slots
Q_INVOKABLE QString getAboutText(const QString type Q_INVOKABLE QString getAboutText(const QString &_type) const;
= QString("header")) const; Q_INVOKABLE QVariantMap getFont(const QVariantMap &_defaultFont) const;
Q_INVOKABLE QVariantMap getFont(const QVariantMap defaultFont) const;
public slots: public slots:
Q_INVOKABLE static void sendNotification(const QString eventId, Q_INVOKABLE static void sendNotification(const QString &_eventId,
const QString message); const QString &_message);
private: private:
AWUpdateHelper *m_updateHelper = nullptr; AWUpdateHelper *m_updateHelper = nullptr;

82
sources/awesome-widget/plugin/awbugreporter.cpp
View File

@ -30,8 +30,8 @@
#include "awdebug.h" #include "awdebug.h"
AWBugReporter::AWBugReporter(QObject *parent) AWBugReporter::AWBugReporter(QObject *_parent)
: QObject(parent) : QObject(_parent)
{ {
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
} }
@ -46,38 +46,38 @@ AWBugReporter::~AWBugReporter()
void AWBugReporter::doConnect() void AWBugReporter::doConnect()
{ {
// additional method for testing needs // additional method for testing needs
connect(this, SIGNAL(replyReceived(const int, const QString)), this, connect(this, SIGNAL(replyReceived(const int, const QString &)), this,
SLOT(showInformation(const int, const QString))); SLOT(showInformation(const int, const QString &)));
} }
QString AWBugReporter::generateText(const QString description, QString AWBugReporter::generateText(const QString &_description,
const QString reproduce, const QString &_reproduce,
const QString expected, const QString &_expected,
const QString logs) const const QString &_logs) const
{ {
// do not log logs here, it may have quite large size // do not log _logs here, it may have quite large size
qCDebug(LOG_AW) << "Generate text with description" << description qCDebug(LOG_AW) << "Generate text with description" << _description
<< "steps" << reproduce << "and expected result" << "steps" << _reproduce << "and expected result"
<< expected; << _expected;
QString output; QString output;
output += QString("**Description**\n\n%1\n\n").arg(description); output += QString("**Description**\n\n%1\n\n").arg(_description);
output += QString("**Step to reproduce**\n\n%1\n\n").arg(reproduce); 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("**Expected result**\n\n%1\n\n").arg(_expected);
output += QString("**Version**\n\n%1\n\n") output += QString("**Version**\n\n%1\n\n")
.arg(AWDebug::getBuildData().join(QString("\n"))); .arg(AWDebug::getBuildData().join(QString("\n")));
// append logs // append _logs
output += QString("**Logs**\n\n%1").arg(logs); output += QString("**Logs**\n\n%1").arg(_logs);
return output; return output;
} }
void AWBugReporter::sendBugReport(const QString title, const QString body) void AWBugReporter::sendBugReport(const QString &_title, const QString &_body)
{ {
qCDebug(LOG_AW) << "Send bug report with title" << title << "and body" qCDebug(LOG_AW) << "Send bug report with title" << _title << "and body"
<< body; << _body;
QNetworkAccessManager *manager = new QNetworkAccessManager(nullptr); QNetworkAccessManager *manager = new QNetworkAccessManager(nullptr);
connect(manager, SIGNAL(finished(QNetworkReply *)), this, connect(manager, SIGNAL(finished(QNetworkReply *)), this,
@ -88,57 +88,57 @@ void AWBugReporter::sendBugReport(const QString title, const QString body)
// generate payload // generate payload
QVariantMap payload; QVariantMap payload;
payload[QString("title")] = title; payload["title"] = _title;
payload[QString("body")] = body; payload["body"] = _body;
payload[QString("labels")] = QStringList() << QString("from application"); payload["labels"] = QStringList() << "from application";
// convert to QByteArray to send request // convert to QByteArray to send request
QByteArray data QByteArray data
= QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact); = QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact);
qCInfo(LOG_AW) << "Send request with body" << data.data() << "and size" qCInfo(LOG_AW) << "Send request with _body" << data.data() << "and size"
<< data.size(); << data.size();
manager->post(request, data); manager->post(request, data);
} }
void AWBugReporter::issueReplyRecieved(QNetworkReply *reply) void AWBugReporter::issueReplyRecieved(QNetworkReply *_reply)
{ {
if (reply->error() != QNetworkReply::NoError) { if (_reply->error() != QNetworkReply::NoError) {
qCWarning(LOG_AW) << "An error occurs" << reply->error() qCWarning(LOG_AW) << "An error occurs" << _reply->error()
<< "with message" << reply->errorString(); << "with message" << _reply->errorString();
return emit(replyReceived(0, QString())); return emit(replyReceived(0, ""));
} }
QJsonParseError error; QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll(), &error); QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
if (error.error != QJsonParseError::NoError) { if (error.error != QJsonParseError::NoError) {
qCWarning(LOG_AW) << "Parse error" << error.errorString(); qCWarning(LOG_AW) << "Parse error" << error.errorString();
return emit(replyReceived(0, QString())); return emit(replyReceived(0, ""));
} }
reply->deleteLater(); _reply->deleteLater();
// convert to map // convert to map
QVariantMap response = jsonDoc.toVariant().toMap(); QVariantMap response = jsonDoc.toVariant().toMap();
QString url = response[QString("html_url")].toString(); QString url = response["html_url"].toString();
int number = response[QString("number")].toInt(); int number = response["number"].toInt();
return emit(replyReceived(number, url)); return emit(replyReceived(number, url));
} }
void AWBugReporter::showInformation(const int number, const QString url) void AWBugReporter::showInformation(const int _number, const QString &_url)
{ {
qCDebug(LOG_AW) << "Created issue with number" << number << "and url" qCDebug(LOG_AW) << "Created issue with number" << _number << "and url"
<< url; << _url;
// cache url first // cache url first
m_lastBugUrl = url; m_lastBugUrl = _url;
QMessageBox *msgBox = new QMessageBox(nullptr); QMessageBox *msgBox = new QMessageBox(nullptr);
msgBox->setAttribute(Qt::WA_DeleteOnClose); msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->setModal(false); msgBox->setModal(false);
msgBox->setWindowTitle(i18n("Issue created")); msgBox->setWindowTitle(i18n("Issue created"));
msgBox->setText(i18n("Issue %1 has been created", number)); msgBox->setText(i18n("Issue %1 has been created", _number));
msgBox->setStandardButtons(QMessageBox::Open | QMessageBox::Close); msgBox->setStandardButtons(QMessageBox::Open | QMessageBox::Close);
msgBox->setIcon(QMessageBox::Information); msgBox->setIcon(QMessageBox::Information);
@ -146,10 +146,10 @@ void AWBugReporter::showInformation(const int number, const QString url)
} }
void AWBugReporter::userReplyOnBugReport(QAbstractButton *button) void AWBugReporter::userReplyOnBugReport(QAbstractButton *_button)
{ {
QMessageBox::ButtonRole ret QMessageBox::ButtonRole ret
= static_cast<QMessageBox *>(sender())->buttonRole(button); = static_cast<QMessageBox *>(sender())->buttonRole(_button);
qCInfo(LOG_AW) << "User select" << ret; qCInfo(LOG_AW) << "User select" << ret;
switch (ret) { switch (ret) {

20
sources/awesome-widget/plugin/awbugreporter.h
View File

@ -30,22 +30,22 @@ class AWBugReporter : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit AWBugReporter(QObject *parent = nullptr); explicit AWBugReporter(QObject *_parent = nullptr);
virtual ~AWBugReporter(); virtual ~AWBugReporter();
Q_INVOKABLE void doConnect(); Q_INVOKABLE void doConnect();
Q_INVOKABLE QString generateText(const QString description, Q_INVOKABLE QString generateText(const QString &_description,
const QString reproduce, const QString &_reproduce,
const QString expected, const QString &_expected,
const QString logs) const; const QString &_logs) const;
Q_INVOKABLE void sendBugReport(const QString title, const QString body); Q_INVOKABLE void sendBugReport(const QString &_title, const QString &_body);
signals: signals:
void replyReceived(const int number, const QString url); void replyReceived(const int _number, const QString &_url);
private slots: private slots:
void issueReplyRecieved(QNetworkReply *reply); void issueReplyRecieved(QNetworkReply *_reply);
void showInformation(const int number, const QString url); void showInformation(const int _number, const QString &_url);
void userReplyOnBugReport(QAbstractButton *button); void userReplyOnBugReport(QAbstractButton *_button);
private: private:
QString m_lastBugUrl; QString m_lastBugUrl;

204
sources/awesome-widget/plugin/awconfighelper.cpp
View File

@ -27,8 +27,8 @@
#include "awdebug.h" #include "awdebug.h"
AWConfigHelper::AWConfigHelper(QObject *parent) AWConfigHelper::AWConfigHelper(QObject *_parent)
: QObject(parent) : QObject(_parent)
{ {
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
} }
@ -69,17 +69,17 @@ bool AWConfigHelper::dropCache() const
} }
bool AWConfigHelper::exportConfiguration(QObject *nativeConfig, bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig,
const QString fileName) const const QString &_fileName) const
{ {
qCDebug(LOG_AW) << "Selected filename" << fileName; qCDebug(LOG_AW) << "Selected filename" << _fileName;
QSettings settings(fileName, QSettings::IniFormat); QSettings settings(_fileName, QSettings::IniFormat);
// plasmoid configuration // plasmoid configuration
const QQmlPropertyMap *configuration const QQmlPropertyMap *configuration
= static_cast<const QQmlPropertyMap *>(nativeConfig); = static_cast<const QQmlPropertyMap *>(_nativeConfig);
settings.beginGroup(QString("plasmoid")); settings.beginGroup("plasmoid");
for (auto key : configuration->keys()) { for (auto &key : configuration->keys()) {
QVariant value = configuration->value(key); QVariant value = configuration->value(key);
if (!value.isValid()) if (!value.isValid())
continue; continue;
@ -88,29 +88,28 @@ bool AWConfigHelper::exportConfiguration(QObject *nativeConfig,
settings.endGroup(); settings.endGroup();
// extensions // extensions
for (auto item : m_dirs) { for (auto &item : m_dirs) {
QStringList items QStringList items
= QDir(QString("%1/%2").arg(m_baseDir).arg(item)) = QDir(QString("%1/%2").arg(m_baseDir).arg(item))
.entryList(QStringList() << QString("*.desktop"), .entryList(QStringList() << "*.desktop", QDir::Files);
QDir::Files);
settings.beginGroup(item); settings.beginGroup(item);
for (auto it : items) for (auto &it : items)
copyExtensions(it, item, settings, false); copyExtensions(it, item, settings, false);
settings.endGroup(); settings.endGroup();
} }
// additional files // additional files
settings.beginGroup(QString("json")); settings.beginGroup("json");
// script filters // script filters
readFile(settings, QString("filters"), readFile(settings, "filters",
QString("%1/scripts/awesomewidgets-extscripts-filters.json") QString("%1/scripts/awesomewidgets-extscripts-filters.json")
.arg(m_baseDir)); .arg(m_baseDir));
// weather icon settings // weather icon settings
readFile(settings, QString("weathers"), readFile(settings, "weathers",
QString("%1/weather/awesomewidgets-extweather-ids.json") QString("%1/weather/awesomewidgets-extweather-ids.json")
.arg(m_baseDir)); .arg(m_baseDir));
// formatter settings // formatter settings
readFile(settings, QString("formatters"), readFile(settings, "formatters",
QString("%1/formatters/formatters.ini").arg(m_baseDir)); QString("%1/formatters/formatters.ini").arg(m_baseDir));
settings.endGroup(); settings.endGroup();
@ -121,47 +120,47 @@ bool AWConfigHelper::exportConfiguration(QObject *nativeConfig,
} }
QVariantMap AWConfigHelper::importConfiguration(const QString fileName, QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName,
const bool importPlasmoid, const bool _importPlasmoid,
const bool importExtensions, const bool _importExtensions,
const bool importAdds) const const bool _importAdds) const
{ {
qCDebug(LOG_AW) << "Selected filename" << fileName; qCDebug(LOG_AW) << "Selected filename" << _fileName;
QVariantMap configuration; QVariantMap configuration;
QSettings settings(fileName, QSettings::IniFormat); QSettings settings(_fileName, QSettings::IniFormat);
// extensions // extensions
if (importExtensions) { if (_importExtensions) {
for (auto item : m_dirs) { for (auto &item : m_dirs) {
settings.beginGroup(item); settings.beginGroup(item);
for (auto it : settings.childGroups()) for (auto &it : settings.childGroups())
copyExtensions(it, item, settings, true); copyExtensions(it, item, settings, true);
settings.endGroup(); settings.endGroup();
} }
} }
// additional files // additional files
if (importAdds) { if (_importAdds) {
settings.beginGroup(QString("json")); settings.beginGroup("json");
// script filters // script filters
writeFile(settings, QString("filters"), writeFile(settings, "filters",
QString("%1/scripts/awesomewidgets-extscripts-filters.json") QString("%1/scripts/awesomewidgets-extscripts-filters.json")
.arg(m_baseDir)); .arg(m_baseDir));
// weather icon settings // weather icon settings
writeFile(settings, QString("weathers"), writeFile(settings, "weathers",
QString("%1/weather/awesomewidgets-extweather-ids.json") QString("%1/weather/awesomewidgets-extweather-ids.json")
.arg(m_baseDir)); .arg(m_baseDir));
// formatter settings // formatter settings
writeFile(settings, QString("formatters"), writeFile(settings, "formatters",
QString("%1/formatters/formatters.ini").arg(m_baseDir)); QString("%1/formatters/formatters.ini").arg(m_baseDir));
settings.endGroup(); settings.endGroup();
} }
// plasmoid configuration // plasmoid configuration
if (importPlasmoid) { if (_importPlasmoid) {
settings.beginGroup(QString("plasmoid")); settings.beginGroup("plasmoid");
for (auto key : settings.childKeys()) for (auto &key : settings.childKeys())
configuration[key] = settings.value(key); configuration[key] = settings.value(key);
settings.endGroup(); settings.endGroup();
} }
@ -172,32 +171,24 @@ QVariantMap AWConfigHelper::importConfiguration(const QString fileName,
QVariantMap AWConfigHelper::readDataEngineConfiguration() const QVariantMap AWConfigHelper::readDataEngineConfiguration() const
{ {
QString fileName QString fileName = QStandardPaths::locate(
= QStandardPaths::locate(QStandardPaths::ConfigLocation, QStandardPaths::ConfigLocation, "plasma-dataengine-extsysmon.conf");
QString("plasma-dataengine-extsysmon.conf"));
qCInfo(LOG_AW) << "Configuration file" << fileName; qCInfo(LOG_AW) << "Configuration file" << fileName;
QSettings settings(fileName, QSettings::IniFormat); QSettings settings(fileName, QSettings::IniFormat);
QVariantMap configuration; QVariantMap configuration;
settings.beginGroup(QString("Configuration")); settings.beginGroup("Configuration");
configuration[QString("ACPIPATH")] = settings.value( configuration["ACPIPATH"]
QString("ACPIPATH"), QString("/sys/class/power_supply/")); = settings.value("ACPIPATH", "/sys/class/power_supply/");
configuration[QString("GPUDEV")] configuration["GPUDEV"] = settings.value("GPUDEV", "auto");
= settings.value(QString("GPUDEV"), QString("auto")); configuration["HDDDEV"] = settings.value("HDDDEV", "all");
configuration[QString("HDDDEV")] configuration["HDDTEMPCMD"]
= settings.value(QString("HDDDEV"), QString("all")); = settings.value("HDDTEMPCMD", "sudo smartctl -a");
configuration[QString("HDDTEMPCMD")] configuration["MPDADDRESS"] = settings.value("MPDADDRESS", "localhost");
= settings.value(QString("HDDTEMPCMD"), QString("sudo smartctl -a")); configuration["MPDPORT"] = settings.value("MPDPORT", "6600");
configuration[QString("MPDADDRESS")] configuration["MPRIS"] = settings.value("MPRIS", "auto");
= settings.value(QString("MPDADDRESS"), QString("localhost")); configuration["PLAYER"] = settings.value("PLAYER", "mpris");
configuration[QString("MPDPORT")] configuration["PLAYERSYMBOLS"] = settings.value("PLAYERSYMBOLS", "10");
= 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(); settings.endGroup();
qCInfo(LOG_AW) << "Configuration" << configuration; qCInfo(LOG_AW) << "Configuration" << configuration;
@ -207,29 +198,26 @@ QVariantMap AWConfigHelper::readDataEngineConfiguration() const
bool AWConfigHelper::writeDataEngineConfiguration( bool AWConfigHelper::writeDataEngineConfiguration(
const QVariantMap configuration) const const QVariantMap &_configuration) const
{ {
qCDebug(LOG_AW) << "Configuration" << configuration; qCDebug(LOG_AW) << "Configuration" << _configuration;
QString fileName QString fileName = QString("%1/plasma-dataengine-extsysmon.conf")
= QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) .arg(QStandardPaths::writableLocation(
+ QString("/plasma-dataengine-extsysmon.conf"); QStandardPaths::ConfigLocation));
QSettings settings(fileName, QSettings::IniFormat); QSettings settings(fileName, QSettings::IniFormat);
qCInfo(LOG_AW) << "Configuration file" << settings.fileName(); qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Configuration")); settings.beginGroup("Configuration");
settings.setValue(QString("ACPIPATH"), configuration[QString("ACPIPATH")]); settings.setValue("ACPIPATH", _configuration["ACPIPATH"]);
settings.setValue(QString("GPUDEV"), configuration[QString("GPUDEV")]); settings.setValue("GPUDEV", _configuration["GPUDEV"]);
settings.setValue(QString("HDDDEV"), configuration[QString("HDDDEV")]); settings.setValue("HDDDEV", _configuration["HDDDEV"]);
settings.setValue(QString("HDDTEMPCMD"), settings.setValue("HDDTEMPCMD", _configuration["HDDTEMPCMD"]);
configuration[QString("HDDTEMPCMD")]); settings.setValue("MPDADDRESS", _configuration["MPDADDRESS"]);
settings.setValue(QString("MPDADDRESS"), settings.setValue("MPDPORT", _configuration["MPDPORT"]);
configuration[QString("MPDADDRESS")]); settings.setValue("MPRIS", _configuration["MPRIS"]);
settings.setValue(QString("MPDPORT"), configuration[QString("MPDPORT")]); settings.setValue("PLAYER", _configuration["PLAYER"]);
settings.setValue(QString("MPRIS"), configuration[QString("MPRIS")]); settings.setValue("PLAYERSYMBOLS", _configuration["PLAYERSYMBOLS"]);
settings.setValue(QString("PLAYER"), configuration[QString("PLAYER")]);
settings.setValue(QString("PLAYERSYMBOLS"),
configuration[QString("PLAYERSYMBOLS")]);
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();
@ -238,19 +226,19 @@ bool AWConfigHelper::writeDataEngineConfiguration(
} }
void AWConfigHelper::copyConfigs(const QString localDir) const void AWConfigHelper::copyConfigs(const QString &_localDir) const
{ {
qCDebug(LOG_AW) << "Local directory" << localDir; qCDebug(LOG_AW) << "Local directory" << _localDir;
QStringList dirs = QStandardPaths::locateAll( QStringList dirs = QStandardPaths::locateAll(
QStandardPaths::GenericDataLocation, QString("awesomewidgets/configs"), QStandardPaths::GenericDataLocation, "awesomewidgets/configs",
QStandardPaths::LocateDirectory); QStandardPaths::LocateDirectory);
for (auto dir : dirs) { for (auto &dir : dirs) {
if (dir == localDir) if (dir == _localDir)
continue; continue;
QStringList files = QDir(dir).entryList(QDir::Files); QStringList files = QDir(dir).entryList(QDir::Files);
for (auto source : files) { for (auto &source : files) {
QString destination = QString("%1/%2").arg(localDir).arg(source); QString destination = QString("%1/%2").arg(_localDir).arg(source);
bool status = QFile::copy(QString("%1/%2").arg(dir).arg(source), bool status = QFile::copy(QString("%1/%2").arg(dir).arg(source),
destination); destination);
qCInfo(LOG_AW) << "File" << source << "has been copied to" qCInfo(LOG_AW) << "File" << source << "has been copied to"
@ -260,66 +248,66 @@ void AWConfigHelper::copyConfigs(const QString localDir) const
} }
void AWConfigHelper::copyExtensions(const QString item, const QString type, void AWConfigHelper::copyExtensions(const QString &_item, const QString &_type,
QSettings &settings, QSettings &_settings,
const bool inverse) const const bool _inverse) const
{ {
qCDebug(LOG_AW) << "Extension" << item << "has type" << type qCDebug(LOG_AW) << "Extension" << _item << "has type" << _type
<< "inverse copying" << inverse; << "inverse copying" << _inverse;
settings.beginGroup(item); _settings.beginGroup(_item);
QSettings itemSettings( QSettings itemSettings(
QString("%1/%2/%3").arg(m_baseDir).arg(type).arg(item), QString("%1/%2/%3").arg(m_baseDir).arg(_type).arg(_item),
QSettings::IniFormat); QSettings::IniFormat);
itemSettings.beginGroup(QString("Desktop Entry")); itemSettings.beginGroup("Desktop Entry");
if (inverse) if (_inverse)
copySettings(settings, itemSettings); copySettings(_settings, itemSettings);
else else
copySettings(itemSettings, settings); copySettings(itemSettings, _settings);
itemSettings.endGroup(); itemSettings.endGroup();
settings.endGroup(); _settings.endGroup();
if (inverse) if (_inverse)
itemSettings.sync(); itemSettings.sync();
} }
void AWConfigHelper::copySettings(QSettings &from, QSettings &to) const void AWConfigHelper::copySettings(QSettings &_from, QSettings &_to) const
{ {
for (auto key : from.childKeys()) for (auto &key : _from.childKeys())
to.setValue(key, from.value(key)); _to.setValue(key, _from.value(key));
} }
void AWConfigHelper::readFile(QSettings &settings, const QString key, void AWConfigHelper::readFile(QSettings &_settings, const QString &_key,
const QString fileName) const const QString &_fileName) const
{ {
qCDebug(LOG_AW) << "Key" << key << "from file" << fileName; qCDebug(LOG_AW) << "Key" << _key << "from file" << _fileName;
QFile file(fileName); QFile file(_fileName);
if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
QString text = QString::fromUtf8(file.readAll()); QString text = QString::fromUtf8(file.readAll());
file.close(); file.close();
settings.setValue(key, text); _settings.setValue(_key, text);
} else { } else {
qCWarning(LOG_AW) << "Could not open" << file.fileName(); qCWarning(LOG_AW) << "Could not open" << file.fileName();
} }
} }
void AWConfigHelper::writeFile(QSettings &settings, const QString key, void AWConfigHelper::writeFile(QSettings &_settings, const QString &_key,
const QString fileName) const const QString &_fileName) const
{ {
qCDebug(LOG_AW) << "Key" << key << "to file" << fileName; qCDebug(LOG_AW) << "Key" << _key << "to file" << _fileName;
if (!settings.contains(key)) if (!_settings.contains(_key))
return; return;
QFile file(fileName); QFile file(_fileName);
if (file.open(QIODevice::WriteOnly | QIODevice::Text)) { if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
QTextStream out(&file); QTextStream out(&file);
out.setCodec("UTF-8"); out.setCodec("UTF-8");
out << settings.value(key).toString().toUtf8(); out << _settings.value(_key).toString().toUtf8();
out.flush(); out.flush();
file.close(); file.close();
} else { } else {

42
sources/awesome-widget/plugin/awconfighelper.h
View File

@ -31,39 +31,41 @@ class AWConfigHelper : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit AWConfigHelper(QObject *parent = nullptr); explicit AWConfigHelper(QObject *_parent = nullptr);
virtual ~AWConfigHelper(); virtual ~AWConfigHelper();
Q_INVOKABLE QString configurationDirectory() const; Q_INVOKABLE QString configurationDirectory() const;
Q_INVOKABLE bool dropCache() const; Q_INVOKABLE bool dropCache() const;
Q_INVOKABLE bool exportConfiguration(QObject *nativeConfig, Q_INVOKABLE bool exportConfiguration(QObject *_nativeConfig,
const QString fileName) const; const QString &_fileName) const;
Q_INVOKABLE QVariantMap importConfiguration(const QString fileName, Q_INVOKABLE QVariantMap importConfiguration(const QString &_fileName,
const bool importPlasmoid, const bool _importPlasmoid,
const bool importExtensions, const bool _importExtensions,
const bool importAdds) const; const bool _importAdds) const;
// dataengine // dataengine
Q_INVOKABLE QVariantMap readDataEngineConfiguration() const; Q_INVOKABLE QVariantMap readDataEngineConfiguration() const;
Q_INVOKABLE bool Q_INVOKABLE bool
writeDataEngineConfiguration(const QVariantMap configuration) const; writeDataEngineConfiguration(const QVariantMap &_configuration) const;
private: private:
// methods // methods
void copyConfigs(const QString localDir) const; void copyConfigs(const QString &_localDir) const;
void copyExtensions(const QString item, const QString type, void copyExtensions(const QString &_item, const QString &_type,
QSettings &settings, const bool inverse) const; QSettings &_settings, const bool _inverse) const;
void copySettings(QSettings &from, QSettings &to) const; void copySettings(QSettings &_from, QSettings &_to) const;
void readFile(QSettings &settings, const QString key, void readFile(QSettings &_settings, const QString &_key,
const QString fileName) const; const QString &_fileName) const;
void writeFile(QSettings &settings, const QString key, void writeFile(QSettings &_settings, const QString &_key,
const QString fileName) const; const QString &_fileName) const;
// properties // properties
QString m_baseDir = QString("%1/awesomewidgets") QString m_baseDir = QString("%1/awesomewidgets")
.arg(QStandardPaths::writableLocation( .arg(QStandardPaths::writableLocation(
QStandardPaths::GenericDataLocation)); QStandardPaths::GenericDataLocation));
QStringList m_dirs = QStringList() QStringList m_dirs = QStringList() << "desktops"
<< QString("desktops") << QString("quotes") << "quotes"
<< QString("scripts") << QString("upgrade") << "scripts"
<< QString("weather") << QString("formatters"); << "upgrade"
<< "weather"
<< "formatters";
}; };

254
sources/awesome-widget/plugin/awdataaggregator.cpp
View File

@ -30,18 +30,18 @@
#include "awdebug.h" #include "awdebug.h"
AWDataAggregator::AWDataAggregator(QObject *parent) AWDataAggregator::AWDataAggregator(QObject *_parent)
: QObject(parent) : QObject(_parent)
{ {
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
m_boundaries[QString("cpuTooltip")] = 100.0; m_boundaries["cpuTooltip"] = 100.0;
m_boundaries[QString("cpuclTooltip")] = 4000.0; m_boundaries["cpuclTooltip"] = 4000.0;
m_boundaries[QString("memTooltip")] = 100.0; m_boundaries["memTooltip"] = 100.0;
m_boundaries[QString("swapTooltip")] = 100.0; m_boundaries["swapTooltip"] = 100.0;
m_boundaries[QString("downkbTooltip")] = 1.0; m_boundaries["downkbTooltip"] = 1.0;
m_boundaries[QString("upkbTooltip")] = 1.0; m_boundaries["upkbTooltip"] = 1.0;
m_boundaries[QString("batTooltip")] = 100.0; m_boundaries["batTooltip"] = 100.0;
initScene(); initScene();
connect(this, SIGNAL(updateData(const QVariantHash &)), this, connect(this, SIGNAL(updateData(const QVariantHash &)), this,
@ -57,67 +57,66 @@ AWDataAggregator::~AWDataAggregator()
} }
QList<float> AWDataAggregator::getData(const QString key) const QList<float> AWDataAggregator::getData(const QString &_key) const
{ {
qCDebug(LOG_AW) << "Key" << key; qCDebug(LOG_AW) << "Key" << _key;
return m_values[QString("%1Tooltip").arg(key)]; return m_values[QString("%1Tooltip").arg(_key)];
} }
QString AWDataAggregator::htmlImage(const QPixmap &source) const QString AWDataAggregator::htmlImage(const QPixmap &_source) const
{ {
QByteArray byteArray; QByteArray byteArray;
QBuffer buffer(&byteArray); QBuffer buffer(&byteArray);
source.save(&buffer, "PNG"); _source.save(&buffer, "PNG");
return byteArray.isEmpty() return byteArray.isEmpty()
? QString() ? ""
: QString("<img src=\"data:image/png;base64,%1\"/>") : QString("<img src=\"data:image/png;base64,%1\"/>")
.arg(QString(byteArray.toBase64())); .arg(QString(byteArray.toBase64()));
} }
void AWDataAggregator::setParameters(QVariantMap settings) void AWDataAggregator::setParameters(const QVariantMap &_settings)
{ {
qCDebug(LOG_AW) << "Settings" << settings; qCDebug(LOG_AW) << "Settings" << _settings;
// cast from QVariantMap to QVariantHash without data lost // cast from QVariantMap to QVariantHash without data lost
m_configuration = qvariant_cast<QVariantHash>(settings); m_configuration = qvariant_cast<QVariantHash>(_settings);
m_enablePopup = m_configuration[QString("notify")].toBool(); m_enablePopup = m_configuration["notify"].toBool();
m_counts = 0; m_counts = 0;
m_counts += m_configuration[QString("cpuTooltip")].toInt(); m_counts += m_configuration["cpuTooltip"].toInt();
m_counts += m_configuration[QString("cpuclTooltip")].toInt(); m_counts += m_configuration["cpuclTooltip"].toInt();
m_counts += m_configuration[QString("memTooltip")].toInt(); m_counts += m_configuration["memTooltip"].toInt();
m_counts += m_configuration[QString("swapTooltip")].toInt(); m_counts += m_configuration["swapTooltip"].toInt();
m_counts += m_configuration[QString("downkbTooltip")].toInt(); m_counts += m_configuration["downkbTooltip"].toInt();
m_counts += m_configuration[QString("batTooltip")].toInt(); m_counts += m_configuration["batTooltip"].toInt();
// resize tooltip image // resize tooltip image
m_toolTipView->resize(100 * m_counts, 105); m_toolTipView->resize(100 * m_counts, 105);
requiredKeys.clear(); requiredKeys.clear();
if (m_configuration[QString("cpuTooltip")].toBool()) if (m_configuration["cpuTooltip"].toBool())
requiredKeys.append(QString("cpuTooltip")); requiredKeys.append("cpuTooltip");
if (m_configuration[QString("cpuclTooltip")].toBool()) if (m_configuration["cpuclTooltip"].toBool())
requiredKeys.append(QString("cpuclTooltip")); requiredKeys.append("cpuclTooltip");
if (m_configuration[QString("memTooltip")].toBool()) if (m_configuration["memTooltip"].toBool())
requiredKeys.append(QString("memTooltip")); requiredKeys.append("memTooltip");
if (m_configuration[QString("swapTooltip")].toBool()) if (m_configuration["swapTooltip"].toBool())
requiredKeys.append(QString("swapTooltip")); requiredKeys.append("swapTooltip");
if (m_configuration[QString("downkbTooltip")].toBool()) if (m_configuration["downkbTooltip"].toBool())
requiredKeys.append(QString("downkbTooltip")); requiredKeys.append("downkbTooltip");
if (m_configuration[QString("upkbTooltip")].toBool()) if (m_configuration["upkbTooltip"].toBool())
requiredKeys.append(QString("upkbTooltip")); requiredKeys.append("upkbTooltip");
if (m_configuration[QString("batTooltip")].toBool()) if (m_configuration["batTooltip"].toBool())
requiredKeys.append(QString("batTooltip")); requiredKeys.append("batTooltip");
// background // background
m_toolTipScene->setBackgroundBrush( m_toolTipScene->setBackgroundBrush(
m_configuration[QString("useTooltipBackground")].toBool() m_configuration["useTooltipBackground"].toBool()
? QBrush(QColor( ? QBrush(QColor(m_configuration["tooltipBackground"].toString()))
m_configuration[QString("tooltipBackground")].toString()))
: QBrush(Qt::NoBrush)); : QBrush(Qt::NoBrush));
} }
@ -128,7 +127,7 @@ QPixmap AWDataAggregator::tooltipImage()
m_toolTipScene->clear(); m_toolTipScene->clear();
QPen pen; QPen pen;
bool down = false; bool down = false;
for (auto key : requiredKeys) { for (auto &key : requiredKeys) {
// create frame // create frame
float normX = 100.0f / static_cast<float>(m_values[key].count()); float normX = 100.0f / static_cast<float>(m_values[key].count());
float normY = 100.0f / (1.5f * m_boundaries[key]); float normY = 100.0f / (1.5f * m_boundaries[key]);
@ -136,7 +135,7 @@ QPixmap AWDataAggregator::tooltipImage()
if (down) if (down)
shift -= 100.0; shift -= 100.0;
// apply pen color // apply pen color
if (key != QString("batTooltip")) if (key != "batTooltip")
pen.setColor(QColor( pen.setColor(QColor(
m_configuration[QString("%1Color").arg(key)].toString())); m_configuration[QString("%1Color").arg(key)].toString()));
// paint data inside frame // paint data inside frame
@ -146,19 +145,17 @@ QPixmap AWDataAggregator::tooltipImage()
float y1 = -std::fabs(m_values[key].at(j)) * normY + 5.0f; float y1 = -std::fabs(m_values[key].at(j)) * normY + 5.0f;
float x2 = (j + 1) * normX + shift; float x2 = (j + 1) * normX + shift;
float y2 = -std::fabs(m_values[key].at(j + 1)) * normY + 5.0f; float y2 = -std::fabs(m_values[key].at(j + 1)) * normY + 5.0f;
if (key == QString("batTooltip")) { if (key == "batTooltip") {
if (m_values[key].at(j + 1) > 0) if (m_values[key].at(j + 1) > 0)
pen.setColor( pen.setColor(
QColor(m_configuration[QString("batTooltipColor")] QColor(m_configuration["batTooltipColor"].toString()));
.toString()));
else else
pen.setColor( pen.setColor(QColor(
QColor(m_configuration[QString("batInTooltipColor")] m_configuration["batInTooltipColor"].toString()));
.toString()));
} }
m_toolTipScene->addLine(x1, y1, x2, y2, pen); m_toolTipScene->addLine(x1, y1, x2, y2, pen);
} }
if (key == QString("downkbTooltip")) if (key == "downkbTooltip")
down = true; down = true;
} }
@ -166,43 +163,44 @@ QPixmap AWDataAggregator::tooltipImage()
} }
void AWDataAggregator::dataUpdate(const QVariantHash &values) void AWDataAggregator::dataUpdate(const QVariantHash &_values)
{ {
// do not log these arguments // do not log these arguments
setData(values); setData(_values);
emit(toolTipPainted(htmlImage(tooltipImage()))); emit(toolTipPainted(htmlImage(tooltipImage())));
} }
void AWDataAggregator::checkValue(const QString source, const float value, void AWDataAggregator::checkValue(const QString &_source, const float _value,
const float extremum) const const float _extremum) const
{ {
qCDebug(LOG_AW) << "Notification source" << source << "with value" << value qCDebug(LOG_AW) << "Notification source" << _source << "with value"
<< "called with extremum" << extremum; << _value << "called with extremum" << _extremum;
if (value >= 0.0) { if (_value >= 0.0) {
if ((m_enablePopup) && (value > extremum) if ((m_enablePopup) && (_value > _extremum)
&& (m_values[source].last() < extremum)) && (m_values[_source].last() < _extremum))
return AWActions::sendNotification(QString("event"), return AWActions::sendNotification(
notificationText(source, value)); "event", notificationText(_source, _value));
} else { } else {
if ((m_enablePopup) && (value < extremum) if ((m_enablePopup) && (_value < _extremum)
&& (m_values[source].last() > extremum)) && (m_values[_source].last() > _extremum))
return AWActions::sendNotification(QString("event"), return AWActions::sendNotification(
notificationText(source, value)); "event", notificationText(_source, _value));
} }
} }
void AWDataAggregator::checkValue(const QString source, const QString current, void AWDataAggregator::checkValue(const QString &_source,
const QString received) const const QString &_current,
const QString &_received) const
{ {
qCDebug(LOG_AW) << "Notification source" << source << "with current value" qCDebug(LOG_AW) << "Notification source" << _source << "with current value"
<< current << "and received one" << received; << _current << "and received one" << _received;
if ((m_enablePopup) && (current != received) && (!received.isEmpty())) if ((m_enablePopup) && (_current != _received) && (!_received.isEmpty()))
return AWActions::sendNotification(QString("event"), return AWActions::sendNotification(
notificationText(source, received)); "event", notificationText(_source, _received));
} }
@ -210,7 +208,7 @@ void AWDataAggregator::initScene()
{ {
m_toolTipScene = new QGraphicsScene(nullptr); m_toolTipScene = new QGraphicsScene(nullptr);
m_toolTipView = new QGraphicsView(m_toolTipScene); m_toolTipView = new QGraphicsView(m_toolTipScene);
m_toolTipView->setStyleSheet(QString("background: transparent")); m_toolTipView->setStyleSheet("background: transparent");
m_toolTipView->setContentsMargins(0, 0, 0, 0); m_toolTipView->setContentsMargins(0, 0, 0, 0);
m_toolTipView->setFrameShape(QFrame::NoFrame); m_toolTipView->setFrameShape(QFrame::NoFrame);
m_toolTipView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); m_toolTipView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@ -218,105 +216,105 @@ void AWDataAggregator::initScene()
} }
QString AWDataAggregator::notificationText(const QString source, QString AWDataAggregator::notificationText(const QString &_source,
const float value) const const float _value) const
{ {
qCDebug(LOG_AW) << "Notification source" << source << "with value" << value; qCDebug(LOG_AW) << "Notification source" << _source << "with value"
<< _value;
QString output; QString output;
if (source == QString("batTooltip")) if (_source == "batTooltip")
output = value > 0.0 ? i18n("AC online") : i18n("AC offline"); output = _value > 0.0 ? i18n("AC online") : i18n("AC offline");
else if (source == QString("cpuTooltip")) else if (_source == "cpuTooltip")
output = i18n("High CPU load"); output = i18n("High CPU load");
else if (source == QString("memTooltip")) else if (_source == "memTooltip")
output = i18n("High memory usage"); output = i18n("High memory usage");
else if (source == QString("swapTooltip")) else if (_source == "swapTooltip")
output = i18n("Swap is used"); output = i18n("Swap is used");
else if (source == QString("gpu")) else if (_source == "gpu")
output = i18n("High GPU load"); output = i18n("High GPU load");
return output; return output;
} }
QString AWDataAggregator::notificationText(const QString source, QString AWDataAggregator::notificationText(const QString &_source,
const QString value) const const QString &_value) const
{ {
qCDebug(LOG_AW) << "Notification source" << source << "with value" << value; qCDebug(LOG_AW) << "Notification source" << _source << "with value"
<< _value;
QString output; QString output;
if (source == QString("netdev")) if (_source == "netdev")
output = i18n("Network device has been changed to %1", value); output = i18n("Network device has been changed to %1", _value);
return output; return output;
} }
void AWDataAggregator::setData(const QVariantHash &values) void AWDataAggregator::setData(const QVariantHash &_values)
{ {
// do not log these arguments // do not log these arguments
// battery update requires info is AC online or not // battery update requires info is AC online or not
setData(values[QString("ac")].toString() setData(_values["ac"].toString() == m_configuration["acOnline"],
== m_configuration[QString("acOnline")], "batTooltip", _values["bat"].toFloat());
QString("batTooltip"), values[QString("bat")].toFloat());
// usual case // usual case
setData(QString("cpuTooltip"), values[QString("cpu")].toFloat(), 90.0); setData("cpuTooltip", _values["cpu"].toFloat(), 90.0);
setData(QString("cpuclTooltip"), values[QString("cpucl")].toFloat()); setData("cpuclTooltip", _values["cpucl"].toFloat());
setData(QString("memTooltip"), values[QString("mem")].toFloat(), 80.0); setData("memTooltip", _values["mem"].toFloat(), 80.0);
setData(QString("swapTooltip"), values[QString("swap")].toFloat(), 0.0); setData("swapTooltip", _values["swap"].toFloat(), 0.0);
setData(QString("downkbTooltip"), values[QString("downkb")].toFloat()); setData("downkbTooltip", _values["downkb"].toFloat());
setData(QString("upkbTooltip"), values[QString("upkb")].toFloat()); setData("upkbTooltip", _values["upkb"].toFloat());
// additional check for network device // additional check for network device
[this](const QString value) { [this](const QString &value) {
checkValue(QString("netdev"), m_currentNetworkDevice, value); checkValue("netdev", m_currentNetworkDevice, value);
m_currentNetworkDevice = value; m_currentNetworkDevice = value;
}(values[QString("netdev")].toString()); }(_values["netdev"].toString());
// additional check for GPU load // additional check for GPU load
[this](const float value) { [this](const float value) {
checkValue(QString("gpu"), value, 90.0); checkValue("gpu", value, 90.0);
m_currentGPULoad = value; m_currentGPULoad = value;
}(values[QString("gpu")].toFloat()); }(_values["gpu"].toFloat());
} }
void AWDataAggregator::setData(const QString &source, float value, void AWDataAggregator::setData(const QString &_source, float _value,
const float extremum) const float _extremum)
{ {
qCDebug(LOG_AW) << "Source" << source << "to value" << value qCDebug(LOG_AW) << "Source" << _source << "to value" << _value
<< "with extremum" << extremum; << "with extremum" << _extremum;
if (m_values[source].count() == 0) if (m_values[_source].count() == 0)
m_values[source].append(0.0); m_values[_source].append(0.0);
else if (m_values[source].count() else if (m_values[_source].count()
> m_configuration[QString("tooltipNumber")].toInt()) > m_configuration["tooltipNumber"].toInt())
m_values[source].removeFirst(); m_values[_source].removeFirst();
if (std::isnan(value)) if (std::isnan(_value))
value = 0.0; _value = 0.0;
// notifications // notifications
checkValue(source, value, extremum); checkValue(_source, _value, _extremum);
m_values[source].append(value); m_values[_source].append(_value);
if (source == QString("downkbTooltip")) { if (_source == "downkbTooltip") {
QList<float> netValues = m_values[QString("downkbTooltip")] QList<float> netValues
+ m_values[QString("upkbTooltip")]; = m_values["downkbTooltip"] + m_values["upkbTooltip"];
// to avoid inf value of normY // to avoid inf value of normY
netValues << 1.0; netValues << 1.0;
m_boundaries[QString("downkbTooltip")] m_boundaries["downkbTooltip"]
= 1.2f * *std::max_element(netValues.cbegin(), netValues.cend()); = 1.2f * *std::max_element(netValues.cbegin(), netValues.cend());
m_boundaries[QString("upkbTooltip")] m_boundaries["upkbTooltip"] = m_boundaries["downkbTooltip"];
= m_boundaries[QString("downkbTooltip")];
} }
} }
void AWDataAggregator::setData(const bool dontInvert, const QString &source, void AWDataAggregator::setData(const bool _dontInvert, const QString &_source,
float value) float _value)
{ {
qCDebug(LOG_AW) << "Do not invert" << dontInvert << "value" << value qCDebug(LOG_AW) << "Do not invert" << _dontInvert << "value" << _value
<< "for source" << source; << "for source" << _source;
// invert values for different battery colours // invert values for different battery colours
value = dontInvert ? value : -value; _value = _dontInvert ? _value : -_value;
return setData(source, value, 0.0); return setData(_source, _value, 0.0);
} }

39
sources/awesome-widget/plugin/awdataaggregator.h
View File

@ -33,42 +33,43 @@ class AWDataAggregator : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit AWDataAggregator(QObject *parent = nullptr); explicit AWDataAggregator(QObject *_parent = nullptr);
virtual ~AWDataAggregator(); virtual ~AWDataAggregator();
QList<float> getData(const QString key) const; QList<float> getData(const QString &_key) const;
QString htmlImage(const QPixmap &source) const; QString htmlImage(const QPixmap &_source) const;
void setParameters(QVariantMap settings); void setParameters(const QVariantMap &_settings);
QPixmap tooltipImage(); QPixmap tooltipImage();
signals: signals:
void updateData(const QVariantHash &values); void updateData(const QVariantHash &_values);
void toolTipPainted(const QString image) const; void toolTipPainted(const QString &_image) const;
private slots: private slots:
void dataUpdate(const QVariantHash &values); void dataUpdate(const QVariantHash &_values);
private: private:
// ui // ui
QGraphicsScene *m_toolTipScene = nullptr; QGraphicsScene *m_toolTipScene = nullptr;
QGraphicsView *m_toolTipView = nullptr; QGraphicsView *m_toolTipView = nullptr;
void checkValue(const QString source, const float value, void checkValue(const QString &_source, const float _value,
const float extremum) const; const float _extremum) const;
void checkValue(const QString source, const QString current, void checkValue(const QString &_source, const QString &_current,
const QString received) const; const QString &_received) const;
void initScene(); void initScene();
QString notificationText(const QString source, const float value) const; QString notificationText(const QString &_source, const float _value) const;
QString notificationText(const QString source, const QString value) const; QString notificationText(const QString &_source,
const QString &_value) const;
// main method // main method
void setData(const QVariantHash &values); void setData(const QVariantHash &_values);
void setData(const QString &source, float value, void setData(const QString &_source, float _value,
const float extremum = -1.0f); const float _extremum = -1.0f);
// different signature for battery device // different signature for battery device
void setData(const bool dontInvert, const QString &source, float value); void setData(const bool _dontInvert, const QString &_source, float _value);
// variables // variables
int m_counts = 0; int m_counts = 0;
QVariantHash m_configuration; QVariantHash m_configuration;
float m_currentGPULoad = 0.0; float m_currentGPULoad = 0.0f;
QString m_currentNetworkDevice = QString("lo"); QString m_currentNetworkDevice = "lo";
QHash<QString, float> m_boundaries; QHash<QString, float> m_boundaries;
QHash<QString, QList<float>> m_values; QHash<QString, QList<float>> m_values;
bool m_enablePopup = false; bool m_enablePopup = false;

62
sources/awesome-widget/plugin/awdataengineaggregator.cpp
View File

@ -23,8 +23,8 @@
#include "awkeys.h" #include "awkeys.h"
AWDataEngineAggregator::AWDataEngineAggregator(QObject *parent) AWDataEngineAggregator::AWDataEngineAggregator(QObject *_parent)
: QObject(parent) : QObject(_parent)
{ {
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
@ -53,56 +53,50 @@ void AWDataEngineAggregator::clear()
void AWDataEngineAggregator::disconnectSources() void AWDataEngineAggregator::disconnectSources()
{ {
for (auto dataengine : m_dataEngines.values()) for (auto dataengine : m_dataEngines.values())
for (auto source : dataengine->sources()) for (auto &source : dataengine->sources())
dataengine->disconnectSource(source, parent()); dataengine->disconnectSource(source, parent());
} }
void AWDataEngineAggregator::initDataEngines(const int interval) void AWDataEngineAggregator::initDataEngines(const int _interval)
{ {
qCDebug(LOG_AW) << "Init dataengines with interval" << interval; qCDebug(LOG_AW) << "Init dataengines with interval" << _interval;
m_consumer = new Plasma::DataEngineConsumer(); m_consumer = new Plasma::DataEngineConsumer();
m_dataEngines[QString("systemmonitor")] m_dataEngines["systemmonitor"] = m_consumer->dataEngine("systemmonitor");
= m_consumer->dataEngine(QString("systemmonitor")); m_dataEngines["extsysmon"] = m_consumer->dataEngine("extsysmon");
m_dataEngines[QString("extsysmon")] m_dataEngines["time"] = m_consumer->dataEngine("time");
= m_consumer->dataEngine(QString("extsysmon"));
m_dataEngines[QString("time")] = m_consumer->dataEngine(QString("time"));
// additional method required by systemmonitor structure // additional method required by systemmonitor structure
connect(m_dataEngines[QString("systemmonitor")], connect(m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded,
&Plasma::DataEngine::sourceAdded, [this, _interval](const QString source) {
[this, interval](const QString source) {
emit(deviceAdded(source)); emit(deviceAdded(source));
m_dataEngines[QString("systemmonitor")]->connectSource( m_dataEngines["systemmonitor"]->connectSource(source, parent(),
source, parent(), interval); _interval);
}); });
return reconnectSources(interval); return reconnectSources(_interval);
} }
void AWDataEngineAggregator::dropSource(const QString source) void AWDataEngineAggregator::dropSource(const QString &_source)
{ {
qCDebug(LOG_AW) << "Source" << source; qCDebug(LOG_AW) << "Source" << _source;
// HACK there is no possibility to check to which dataengine source // HACK there is no possibility to check to which dataengine source
// connected we will try to disconnect it from systemmonitor and extsysmon // connected we will try to disconnect it from systemmonitor and extsysmon
m_dataEngines[QString("systemmonitor")]->disconnectSource(source, parent()); for (auto dataengine : m_dataEngines.values())
m_dataEngines[QString("extsysmon")]->disconnectSource(source, parent()); dataengine->disconnectSource(_source, parent());
m_dataEngines[QString("time")]->disconnectSource(source, parent());
} }
void AWDataEngineAggregator::reconnectSources(const int interval) void AWDataEngineAggregator::reconnectSources(const int _interval)
{ {
qCDebug(LOG_AW) << "Reconnect sources with interval" << interval; qCDebug(LOG_AW) << "Reconnect sources with interval" << _interval;
m_dataEngines[QString("systemmonitor")]->connectAllSources(parent(), m_dataEngines["systemmonitor"]->connectAllSources(parent(), _interval);
interval); m_dataEngines["extsysmon"]->connectAllSources(parent(), _interval);
m_dataEngines[QString("extsysmon")]->connectAllSources(parent(), interval); m_dataEngines["time"]->connectSource("Local", parent(), 1000);
m_dataEngines[QString("time")]->connectSource(QString("Local"), parent(),
1000);
#ifdef BUILD_FUTURE #ifdef BUILD_FUTURE
createQueuedConnection(); createQueuedConnection();
@ -114,15 +108,13 @@ void AWDataEngineAggregator::createQueuedConnection()
{ {
// HACK additional method which forces QueuedConnection instead of Auto one // HACK additional method which forces QueuedConnection instead of Auto one
// for more details refer to plasma-framework source code // for more details refer to plasma-framework source code
for (auto dataEngine : m_dataEngines.keys()) { for (auto &dataEngine : m_dataEngines.keys()) {
// different source set for different engines // different source set for different engines
QStringList sources; QStringList sources = dataEngine == "time"
if (dataEngine == QString("time")) ? QStringList() << "Local"
sources.append(QString("Local")); : m_dataEngines[dataEngine]->sources();
else
sources = m_dataEngines[dataEngine]->sources();
// reconnect sources // reconnect sources
for (auto source : sources) { for (auto &source : sources) {
Plasma::DataContainer *container Plasma::DataContainer *container
= m_dataEngines[dataEngine]->containerForSource(source); = m_dataEngines[dataEngine]->containerForSource(source);
// disconnect old connections first // disconnect old connections first

10
sources/awesome-widget/plugin/awdataengineaggregator.h
View File

@ -30,18 +30,18 @@ class AWDataEngineAggregator : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit AWDataEngineAggregator(QObject *parent = nullptr); explicit AWDataEngineAggregator(QObject *_parent = nullptr);
virtual ~AWDataEngineAggregator(); virtual ~AWDataEngineAggregator();
void clear(); void clear();
void disconnectSources(); void disconnectSources();
void initDataEngines(const int interval); void initDataEngines(const int _interval);
signals: signals:
void deviceAdded(const QString &source); void deviceAdded(const QString &_source);
public slots: public slots:
void dropSource(const QString source); void dropSource(const QString &_source);
void reconnectSources(const int interval); void reconnectSources(const int _interval);
private: private:
void createQueuedConnection(); void createQueuedConnection();

20
sources/awesome-widget/plugin/awdbusadaptor.cpp
View File

@ -21,9 +21,9 @@
#include "awkeys.h" #include "awkeys.h"
AWDBusAdaptor::AWDBusAdaptor(AWKeys *parent) AWDBusAdaptor::AWDBusAdaptor(AWKeys *_parent)
: QDBusAbstractAdaptor(parent) : QDBusAbstractAdaptor(_parent)
, m_plugin(parent) , m_plugin(_parent)
{ {
qCDebug(LOG_DBUS) << __PRETTY_FUNCTION__; qCDebug(LOG_DBUS) << __PRETTY_FUNCTION__;
} }
@ -35,19 +35,19 @@ AWDBusAdaptor::~AWDBusAdaptor()
} }
QString AWDBusAdaptor::Info(const QString key) const QString AWDBusAdaptor::Info(const QString &key) const
{ {
return m_plugin->infoByKey(key); return m_plugin->infoByKey(key);
} }
QStringList AWDBusAdaptor::Keys(const QString regexp) const QStringList AWDBusAdaptor::Keys(const QString &regexp) const
{ {
return m_plugin->dictKeys(true, regexp); return m_plugin->dictKeys(true, regexp);
} }
QString AWDBusAdaptor::Value(const QString key) const QString AWDBusAdaptor::Value(const QString &key) const
{ {
return m_plugin->valueByKey(key); return m_plugin->valueByKey(key);
} }
@ -59,7 +59,7 @@ qlonglong AWDBusAdaptor::WhoAmI() const
} }
void AWDBusAdaptor::SetLogLevel(const QString what, const int level) void AWDBusAdaptor::SetLogLevel(const QString &what, const int level)
{ {
qCDebug(LOG_DBUS) << "Set log level" << level << "for" << what; qCDebug(LOG_DBUS) << "Set log level" << level << "for" << what;
@ -69,12 +69,12 @@ void AWDBusAdaptor::SetLogLevel(const QString what, const int level)
return; return;
} }
for (auto lev : m_logLevels) for (auto &lev : m_logLevels)
SetLogLevel(what, lev, m_logLevels.indexOf(lev) >= level); SetLogLevel(what, lev, m_logLevels.indexOf(lev) >= level);
} }
void AWDBusAdaptor::SetLogLevel(const QString what, const QString level, void AWDBusAdaptor::SetLogLevel(const QString &what, const QString &level,
const bool enabled) const bool enabled)
{ {
qCDebug(LOG_DBUS) << "Set log level" << level << "enabled" << enabled qCDebug(LOG_DBUS) << "Set log level" << level << "enabled" << enabled
@ -86,7 +86,7 @@ void AWDBusAdaptor::SetLogLevel(const QString what, const QString level,
return; return;
} }
QString state = enabled ? QString("true") : QString("false"); QString state = enabled ? "true" : "false";
QLoggingCategory::setFilterRules( QLoggingCategory::setFilterRules(
QString("%1.%2=%3").arg(what).arg(level).arg(state)); QString("%1.%2=%3").arg(what).arg(level).arg(state));
} }

19
sources/awesome-widget/plugin/awdbusadaptor.h
View File

@ -32,25 +32,26 @@ class AWDBusAdaptor : public QDBusAbstractAdaptor
Q_CLASSINFO("D-Bus Interface", AWDBUS_SERVICE_NAME) Q_CLASSINFO("D-Bus Interface", AWDBUS_SERVICE_NAME)
public: public:
explicit AWDBusAdaptor(AWKeys *parent = nullptr); explicit AWDBusAdaptor(AWKeys *_parent = nullptr);
virtual ~AWDBusAdaptor(); virtual ~AWDBusAdaptor();
public slots: public slots:
// get methods // get methods
QString Info(const QString key) const; QString Info(const QString &key) const;
QStringList Keys(const QString regexp) const; QStringList Keys(const QString &regexp) const;
QString Value(const QString key) const; QString Value(const QString &key) const;
qlonglong WhoAmI() const; qlonglong WhoAmI() const;
// set methods // set methods
void SetLogLevel(const QString what, const int level); void SetLogLevel(const QString &what, const int level);
void SetLogLevel(const QString what, const QString level, void SetLogLevel(const QString &what, const QString &level,
const bool enabled); const bool enabled);
private: private:
AWKeys *m_plugin = nullptr; AWKeys *m_plugin = nullptr;
QStringList m_logLevels = QStringList() QStringList m_logLevels = QStringList() << "debug"
<< QString("debug") << QString("info") << "info"
<< QString("warning") << QString("critical"); << "warning"
<< "critical";
}; };

28
sources/awesome-widget/plugin/awformatterconfig.cpp
View File

@ -27,10 +27,10 @@
#include "awformatterhelper.h" #include "awformatterhelper.h"
AWFormatterConfig::AWFormatterConfig(QWidget *parent, const QStringList keys) AWFormatterConfig::AWFormatterConfig(QWidget *_parent, const QStringList &_keys)
: QDialog(parent) : QDialog(_parent)
, ui(new Ui::AWFormatterConfig) , ui(new Ui::AWFormatterConfig)
, m_keys(keys) , m_keys(_keys)
{ {
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
@ -96,16 +96,16 @@ void AWFormatterConfig::updateUi()
} }
void AWFormatterConfig::addSelector(const QStringList &keys, void AWFormatterConfig::addSelector(const QStringList &_keys,
const QStringList &values, const QStringList &_values,
const QPair<QString, QString> &current) const QPair<QString, QString> &_current)
{ {
qCDebug(LOG_AW) << "Add selector with keys" << keys << "values" << values qCDebug(LOG_AW) << "Add selector with keys" << _keys << "values" << _values
<< "and current ones" << current; << "and current ones" << _current;
AWAbstractSelector *selector AWAbstractSelector *selector
= new AWAbstractSelector(ui->scrollAreaWidgetContents); = new AWAbstractSelector(ui->scrollAreaWidgetContents);
selector->init(keys, values, current); selector->init(_keys, _values, _current);
ui->verticalLayout->insertWidget(ui->verticalLayout->count() - 1, selector); ui->verticalLayout->insertWidget(ui->verticalLayout->count() - 1, selector);
connect(selector, SIGNAL(selectionChanged()), this, SLOT(updateUi())); connect(selector, SIGNAL(selectionChanged()), this, SLOT(updateUi()));
m_selectors.append(selector); m_selectors.append(selector);
@ -114,7 +114,7 @@ void AWFormatterConfig::addSelector(const QStringList &keys,
void AWFormatterConfig::clearSelectors() void AWFormatterConfig::clearSelectors()
{ {
for (auto selector : m_selectors) { for (auto &selector : m_selectors) {
disconnect(selector, SIGNAL(selectionChanged()), this, disconnect(selector, SIGNAL(selectionChanged()), this,
SLOT(updateUi())); SLOT(updateUi()));
ui->verticalLayout->removeWidget(selector); ui->verticalLayout->removeWidget(selector);
@ -128,7 +128,7 @@ void AWFormatterConfig::execDialog()
{ {
int ret = exec(); int ret = exec();
QHash<QString, QString> data; QHash<QString, QString> data;
for (auto selector : m_selectors) { for (auto &selector : m_selectors) {
QPair<QString, QString> select = selector->current(); QPair<QString, QString> select = selector->current();
if (select.first.isEmpty()) if (select.first.isEmpty())
continue; continue;
@ -158,10 +158,10 @@ void AWFormatterConfig::init()
QPair<QStringList, QStringList> AWFormatterConfig::initKeys() const QPair<QStringList, QStringList> AWFormatterConfig::initKeys() const
{ {
// we are adding empty string at the start // we are adding empty string at the start
QStringList keys = QStringList() << QString(""); QStringList keys = QStringList() << "";
keys.append(m_keys); keys.append(m_keys);
keys.sort(); keys.sort();
QStringList knownFormatters = QStringList() << QString(""); QStringList knownFormatters = QStringList() << "";
knownFormatters.append(m_helper->knownFormatters()); knownFormatters.append(m_helper->knownFormatters());
knownFormatters.sort(); knownFormatters.sort();
@ -175,7 +175,7 @@ void AWFormatterConfig::updateDialog()
QHash<QString, QString> appliedFormatters = m_helper->getFormatters(); QHash<QString, QString> appliedFormatters = m_helper->getFormatters();
auto keys = initKeys(); auto keys = initKeys();
for (auto key : appliedFormatters.keys()) for (auto &key : appliedFormatters.keys())
addSelector(keys.first, keys.second, addSelector(keys.first, keys.second,
QPair<QString, QString>(key, appliedFormatters[key])); QPair<QString, QString>(key, appliedFormatters[key]));
// empty one // empty one

8
sources/awesome-widget/plugin/awformatterconfig.h
View File

@ -34,8 +34,8 @@ class AWFormatterConfig : public QDialog
Q_OBJECT Q_OBJECT
public: public:
explicit AWFormatterConfig(QWidget *parent = nullptr, explicit AWFormatterConfig(QWidget *_parent = nullptr,
const QStringList keys = QStringList()); const QStringList &_keys = QStringList());
virtual ~AWFormatterConfig(); virtual ~AWFormatterConfig();
Q_INVOKABLE void showDialog(); Q_INVOKABLE void showDialog();
@ -51,8 +51,8 @@ private:
// properties // properties
QStringList m_keys; QStringList m_keys;
// methods // methods
void addSelector(const QStringList &keys, const QStringList &values, void addSelector(const QStringList &_keys, const QStringList &_values,
const QPair<QString, QString> &current); const QPair<QString, QString> &_current);
void clearSelectors(); void clearSelectors();
void execDialog(); void execDialog();
void init(); void init();

8
sources/awesome-widget/plugin/awformatterconfigfactory.cpp
View File

@ -21,8 +21,8 @@
#include "awformatterconfig.h" #include "awformatterconfig.h"
AWFormatterConfigFactory::AWFormatterConfigFactory(QObject *parent) AWFormatterConfigFactory::AWFormatterConfigFactory(QObject *_parent)
: QObject(parent) : QObject(_parent)
{ {
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
} }
@ -34,9 +34,9 @@ AWFormatterConfigFactory::~AWFormatterConfigFactory()
} }
void AWFormatterConfigFactory::showDialog(const QStringList keys) void AWFormatterConfigFactory::showDialog(const QStringList &_keys)
{ {
AWFormatterConfig *config = new AWFormatterConfig(nullptr, keys); AWFormatterConfig *config = new AWFormatterConfig(nullptr, _keys);
config->showDialog(); config->showDialog();
config->deleteLater(); config->deleteLater();
} }

4
sources/awesome-widget/plugin/awformatterconfigfactory.h
View File

@ -27,9 +27,9 @@ class AWFormatterConfigFactory : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit AWFormatterConfigFactory(QObject *parent = nullptr); explicit AWFormatterConfigFactory(QObject *_parent = nullptr);
virtual ~AWFormatterConfigFactory(); virtual ~AWFormatterConfigFactory();
Q_INVOKABLE void showDialog(const QStringList keys); Q_INVOKABLE void showDialog(const QStringList &_keys);
private: private:
}; };

99
sources/awesome-widget/plugin/awformatterhelper.cpp
View File

@ -33,12 +33,12 @@
#include "awstringformatter.h" #include "awstringformatter.h"
AWFormatterHelper::AWFormatterHelper(QWidget *parent) AWFormatterHelper::AWFormatterHelper(QWidget *_parent)
: AbstractExtItemAggregator(parent, QString("formatters")) : AbstractExtItemAggregator(_parent, "formatters")
{ {
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
m_filePath = QString("awesomewidgets/formatters/formatters.ini"); m_filePath = "awesomewidgets/formatters/formatters.ini";
initItems(); initItems();
} }
@ -52,13 +52,13 @@ AWFormatterHelper::~AWFormatterHelper()
} }
QString AWFormatterHelper::convert(const QVariant &value, QString AWFormatterHelper::convert(const QVariant &_value,
const QString &name) const const QString &_name) const
{ {
qCDebug(LOG_AW) << "Convert value" << value << "for" << name; qCDebug(LOG_AW) << "Convert value" << _value << "for" << _name;
return m_formatters.contains(name) ? m_formatters[name]->convert(value) return m_formatters.contains(_name) ? m_formatters[_name]->convert(_value)
: value.toString(); : _value.toString();
} }
@ -71,7 +71,7 @@ QStringList AWFormatterHelper::definedFormatters() const
QHash<QString, QString> AWFormatterHelper::getFormatters() const QHash<QString, QString> AWFormatterHelper::getFormatters() const
{ {
QHash<QString, QString> map; QHash<QString, QString> map;
for (auto tag : m_formatters.keys()) for (auto &tag : m_formatters.keys())
map[tag] = m_formatters[tag]->name(); map[tag] = m_formatters[tag]->name();
return map; return map;
@ -81,7 +81,7 @@ QHash<QString, QString> AWFormatterHelper::getFormatters() const
QList<AbstractExtItem *> AWFormatterHelper::items() const QList<AbstractExtItem *> AWFormatterHelper::items() const
{ {
QList<AbstractExtItem *> converted; QList<AbstractExtItem *> converted;
for (auto item : m_formattersClasses.values()) for (auto &item : m_formattersClasses.values())
converted.append(item); converted.append(item);
return converted; return converted;
@ -94,9 +94,9 @@ QStringList AWFormatterHelper::knownFormatters() const
} }
bool AWFormatterHelper::removeUnusedFormatters(const QStringList keys) const bool AWFormatterHelper::removeUnusedFormatters(const QStringList &_keys) const
{ {
qCDebug(LOG_AW) << "Remove formatters" << keys; qCDebug(LOG_AW) << "Remove formatters" << _keys;
QString fileName = QString("%1/%2") QString fileName = QString("%1/%2")
.arg(QStandardPaths::writableLocation( .arg(QStandardPaths::writableLocation(
@ -105,10 +105,10 @@ bool AWFormatterHelper::removeUnusedFormatters(const QStringList keys) const
QSettings settings(fileName, QSettings::IniFormat); QSettings settings(fileName, QSettings::IniFormat);
qCInfo(LOG_AW) << "Configuration file" << fileName; qCInfo(LOG_AW) << "Configuration file" << fileName;
settings.beginGroup(QString("Formatters")); settings.beginGroup("Formatters");
QStringList foundKeys = settings.childKeys(); QStringList foundKeys = settings.childKeys();
for (auto key : foundKeys) { for (auto &key : foundKeys) {
if (keys.contains(key)) if (_keys.contains(key))
continue; continue;
settings.remove(key); settings.remove(key);
} }
@ -121,9 +121,9 @@ bool AWFormatterHelper::removeUnusedFormatters(const QStringList keys) const
bool AWFormatterHelper::writeFormatters( bool AWFormatterHelper::writeFormatters(
const QHash<QString, QString> configuration) const const QHash<QString, QString> &_configuration) const
{ {
qCDebug(LOG_AW) << "Write configuration" << configuration; qCDebug(LOG_AW) << "Write configuration" << _configuration;
QString fileName = QString("%1/%2") QString fileName = QString("%1/%2")
.arg(QStandardPaths::writableLocation( .arg(QStandardPaths::writableLocation(
@ -132,9 +132,9 @@ bool AWFormatterHelper::writeFormatters(
QSettings settings(fileName, QSettings::IniFormat); QSettings settings(fileName, QSettings::IniFormat);
qCInfo(LOG_AW) << "Configuration file" << fileName; qCInfo(LOG_AW) << "Configuration file" << fileName;
settings.beginGroup(QString("Formatters")); settings.beginGroup("Formatters");
for (auto key : configuration.keys()) for (auto &key : _configuration.keys())
settings.setValue(key, configuration[key]); settings.setValue(key, _configuration[key]);
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();
@ -152,28 +152,28 @@ void AWFormatterHelper::editItems()
AWAbstractFormatter::FormatterClass AWAbstractFormatter::FormatterClass
AWFormatterHelper::defineFormatterClass(const QString stringType) const AWFormatterHelper::defineFormatterClass(const QString &_stringType) const
{ {
qCDebug(LOG_AW) << "Define formatter class for" << stringType; qCDebug(LOG_AW) << "Define formatter class for" << _stringType;
AWAbstractFormatter::FormatterClass formatter AWAbstractFormatter::FormatterClass formatter
= AWAbstractFormatter::FormatterClass::NoFormat; = AWAbstractFormatter::FormatterClass::NoFormat;
if (stringType == QString("DateTime")) if (_stringType == "DateTime")
formatter = AWAbstractFormatter::FormatterClass::DateTime; formatter = AWAbstractFormatter::FormatterClass::DateTime;
else if (stringType == QString("Float")) else if (_stringType == "Float")
formatter = AWAbstractFormatter::FormatterClass::Float; formatter = AWAbstractFormatter::FormatterClass::Float;
else if (stringType == QString("List")) else if (_stringType == "List")
formatter = AWAbstractFormatter::FormatterClass::List; formatter = AWAbstractFormatter::FormatterClass::List;
else if (stringType == QString("NoFormat")) else if (_stringType == "NoFormat")
; ;
else if (stringType == QString("Script")) else if (_stringType == "Script")
formatter = AWAbstractFormatter::FormatterClass::Script; formatter = AWAbstractFormatter::FormatterClass::Script;
else if (stringType == QString("String")) else if (_stringType == "String")
formatter = AWAbstractFormatter::FormatterClass::String; formatter = AWAbstractFormatter::FormatterClass::String;
else if (stringType == QString("Json")) else if (_stringType == "Json")
formatter = AWAbstractFormatter::FormatterClass::Json; formatter = AWAbstractFormatter::FormatterClass::Json;
else else
qCWarning(LOG_AW) << "Unknown formatter" << stringType; qCWarning(LOG_AW) << "Unknown formatter" << _stringType;
return formatter; return formatter;
} }
@ -186,8 +186,8 @@ void AWFormatterHelper::initFormatters()
for (int i = m_directories.count() - 1; i >= 0; i--) { for (int i = m_directories.count() - 1; i >= 0; i--) {
QStringList files QStringList files
= QDir(m_directories.at(i)).entryList(QDir::Files, QDir::Name); = QDir(m_directories.at(i)).entryList(QDir::Files, QDir::Name);
for (auto file : files) { for (auto &file : files) {
if (!file.endsWith(QString(".desktop"))) if (!file.endsWith(".desktop"))
continue; continue;
qCInfo(LOG_AW) << "Found file" << file << "in" qCInfo(LOG_AW) << "Found file" << file << "in"
<< m_directories.at(i); << m_directories.at(i);
@ -238,13 +238,13 @@ void AWFormatterHelper::initKeys()
QStringList configs = QStandardPaths::locateAll( QStringList configs = QStandardPaths::locateAll(
QStandardPaths::GenericDataLocation, m_filePath); QStandardPaths::GenericDataLocation, m_filePath);
for (auto fileName : configs) { for (auto &fileName : configs) {
QSettings settings(fileName, QSettings::IniFormat); QSettings settings(fileName, QSettings::IniFormat);
qCInfo(LOG_AW) << "Configuration file" << settings.fileName(); qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Formatters")); settings.beginGroup("Formatters");
QStringList keys = settings.childKeys(); QStringList keys = settings.childKeys();
for (auto key : keys) { for (auto &key : keys) {
QString name = settings.value(key).toString(); QString name = settings.value(key).toString();
qCInfo(LOG_AW) << "Found formatter" << name << "for key" << key qCInfo(LOG_AW) << "Found formatter" << name << "for key" << key
<< "in" << settings.fileName(); << "in" << settings.fileName();
@ -275,21 +275,20 @@ void AWFormatterHelper::installDirectories()
qCInfo(LOG_AW) << "Created directory" << localDir; qCInfo(LOG_AW) << "Created directory" << localDir;
m_directories = QStandardPaths::locateAll( m_directories = QStandardPaths::locateAll(
QStandardPaths::GenericDataLocation, QStandardPaths::GenericDataLocation, "awesomewidgets/formatters",
QString("awesomewidgets/formatters"), QStandardPaths::LocateDirectory); QStandardPaths::LocateDirectory);
} }
QPair<QString, AWAbstractFormatter::FormatterClass> QPair<QString, AWAbstractFormatter::FormatterClass>
AWFormatterHelper::readMetadata(const QString filePath) const AWFormatterHelper::readMetadata(const QString &_filePath) const
{ {
qCDebug(LOG_AW) << "Read initial parameters from" << filePath; qCDebug(LOG_AW) << "Read initial parameters from" << _filePath;
QSettings settings(filePath, QSettings::IniFormat); QSettings settings(_filePath, QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
QString name = settings.value(QString("Name"), filePath).toString(); QString name = settings.value("Name", _filePath).toString();
QString type QString type = settings.value("X-AW-Type", "NoFormat").toString();
= settings.value(QString("X-AW-Type"), QString("NoFormat")).toString();
AWAbstractFormatter::FormatterClass formatter = defineFormatterClass(type); AWAbstractFormatter::FormatterClass formatter = defineFormatterClass(type);
settings.endGroup(); settings.endGroup();
@ -299,11 +298,13 @@ AWFormatterHelper::readMetadata(const QString filePath) const
void AWFormatterHelper::doCreateItem() void AWFormatterHelper::doCreateItem()
{ {
QStringList selection = QStringList() QStringList selection = QStringList() << "NoFormat"
<< QString("NoFormat") << QString("DateTime") << "DateTime"
<< QString("Float") << QString("List") << "Float"
<< QString("Script") << QString("String") << "List"
<< QString("Json"); << "Script"
<< "String"
<< "Json";
bool ok; bool ok;
QString select = QInputDialog::getItem( QString select = QInputDialog::getItem(
this, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok); this, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok);

12
sources/awesome-widget/plugin/awformatterhelper.h
View File

@ -31,15 +31,15 @@ class AWFormatterHelper : public AbstractExtItemAggregator
Q_OBJECT Q_OBJECT
public: public:
explicit AWFormatterHelper(QWidget *parent = nullptr); explicit AWFormatterHelper(QWidget *_parent = nullptr);
virtual ~AWFormatterHelper(); virtual ~AWFormatterHelper();
QString convert(const QVariant &value, const QString &name) const; QString convert(const QVariant &_value, const QString &_name) const;
QStringList definedFormatters() const; QStringList definedFormatters() const;
QHash<QString, QString> getFormatters() const; QHash<QString, QString> getFormatters() const;
QList<AbstractExtItem *> items() const; QList<AbstractExtItem *> items() const;
QStringList knownFormatters() const; QStringList knownFormatters() const;
bool removeUnusedFormatters(const QStringList keys) const; bool removeUnusedFormatters(const QStringList &_keys) const;
bool writeFormatters(const QHash<QString, QString> configuration) const; bool writeFormatters(const QHash<QString, QString> &_configuration) const;
public slots: public slots:
void editItems(); void editItems();
@ -47,12 +47,12 @@ public slots:
private: private:
// methods // methods
AWAbstractFormatter::FormatterClass AWAbstractFormatter::FormatterClass
defineFormatterClass(const QString stringType) const; defineFormatterClass(const QString &_stringType) const;
void initFormatters(); void initFormatters();
void initKeys(); void initKeys();
void installDirectories(); void installDirectories();
QPair<QString, AWAbstractFormatter::FormatterClass> QPair<QString, AWAbstractFormatter::FormatterClass>
readMetadata(const QString filePath) const; readMetadata(const QString &_filePath) const;
// parent methods // parent methods
void doCreateItem(); void doCreateItem();
void initItems(); void initItems();

115
sources/awesome-widget/plugin/awkeycache.cpp
View File

@ -26,9 +26,9 @@
#include "awdebug.h" #include "awdebug.h"
bool AWKeyCache::addKeyToCache(const QString type, const QString key) bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
{ {
qCDebug(LOG_AW) << "Key" << key << "with type" << type; qCDebug(LOG_AW) << "Key" << _key << "with type" << _type;
QString fileName = QString("%1/awesomewidgets.ndx") QString fileName = QString("%1/awesomewidgets.ndx")
.arg(QStandardPaths::writableLocation( .arg(QStandardPaths::writableLocation(
@ -36,45 +36,45 @@ bool AWKeyCache::addKeyToCache(const QString type, const QString key)
qCInfo(LOG_AW) << "Cache file" << fileName; qCInfo(LOG_AW) << "Cache file" << fileName;
QSettings cache(fileName, QSettings::IniFormat); QSettings cache(fileName, QSettings::IniFormat);
cache.beginGroup(type); cache.beginGroup(_type);
QStringList cachedValues; QStringList cachedValues;
for (auto number : cache.allKeys()) for (auto &number : cache.allKeys())
cachedValues.append(cache.value(number).toString()); cachedValues.append(cache.value(number).toString());
if (type == QString("hdd")) { if (_type == "hdd") {
QStringList allDevices QStringList allDevices
= QDir(QString("/dev")).entryList(QDir::System, QDir::Name); = QDir("/dev").entryList(QDir::System, QDir::Name);
QStringList devices QStringList devices = allDevices.filter(QRegExp("^[hms]d[a-z]$"));
= allDevices.filter(QRegExp(QString("^[hms]d[a-z]$"))); for (auto &dev : devices) {
for (auto dev : devices) {
QString device = QString("/dev/%1").arg(dev); QString device = QString("/dev/%1").arg(dev);
if (cachedValues.contains(device)) if (cachedValues.contains(device))
continue; continue;
qCInfo(LOG_AW) << "Found new key" << device << "for type" << type; qCInfo(LOG_AW) << "Found new key" << device << "for type" << _type;
cachedValues.append(device); cachedValues.append(device);
cache.setValue( cache.setValue(
QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')),
device); device);
} }
} else if (type == QString("net")) { } else if (_type == "net") {
QList<QNetworkInterface> rawInterfaceList QList<QNetworkInterface> rawInterfaceList
= QNetworkInterface::allInterfaces(); = QNetworkInterface::allInterfaces();
for (auto interface : rawInterfaceList) { for (auto &interface : rawInterfaceList) {
QString device = interface.name(); QString device = interface.name();
if (cachedValues.contains(device)) if (cachedValues.contains(device))
continue; continue;
qCInfo(LOG_AW) << "Found new key" << device << "for type" << type; qCInfo(LOG_AW) << "Found new key" << device << "for type" << _type;
cachedValues.append(device); cachedValues.append(device);
cache.setValue( cache.setValue(
QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')),
device); device);
} }
} else { } else {
if (cachedValues.contains(key)) if (cachedValues.contains(_key))
return false; return false;
qCInfo(LOG_AW) << "Found new key" << key << "for type" << type; qCInfo(LOG_AW) << "Found new key" << _key << "for type" << _type;
cache.setValue( cache.setValue(
QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), key); QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')),
_key);
} }
cache.endGroup(); cache.endGroup();
@ -83,86 +83,89 @@ bool AWKeyCache::addKeyToCache(const QString type, const QString key)
} }
QStringList AWKeyCache::getRequiredKeys(const QStringList &keys, QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys,
const QStringList &bars, const QStringList &_bars,
const QVariantMap &tooltip, const QVariantMap &_tooltip,
const QStringList &allKeys) const QStringList &_allKeys)
{ {
qCDebug(LOG_AW) << "Looking for required keys in" << keys << bars qCDebug(LOG_AW) << "Looking for required keys in" << _keys << _bars
<< "using tooltip settings" << tooltip; << "using tooltip settings" << _tooltip;
// initial copy // initial copy
QSet<QString> used = QSet<QString>::fromList(keys); QSet<QString> used = QSet<QString>::fromList(_keys);
used.unite(QSet<QString>::fromList(bars)); used.unite(QSet<QString>::fromList(_bars));
// insert keys from tooltip // insert keys from tooltip
for (auto key : tooltip.keys()) { for (auto &key : _tooltip.keys()) {
if ((key.endsWith(QString("Tooltip"))) && (tooltip[key].toBool())) { if ((key.endsWith("Tooltip")) && (_tooltip[key].toBool())) {
key.remove(QString("Tooltip")); key.remove("Tooltip");
used << key; used << key;
} }
} }
// insert depending keys, refer to AWKeys::calculateValues() // insert depending keys, refer to AWKeys::calculateValues()
// hddtotmb* // hddtotmb*
for (auto key : allKeys.filter(QRegExp(QString("^hddtotmb")))) { for (auto &key : _allKeys.filter(QRegExp("^hddtotmb"))) {
if (!used.contains(key)) if (!used.contains(key))
continue; continue;
key.remove(QString("hddtotmb")); key.remove("hddtotmb");
int index = key.toInt(); int index = key.toInt();
used << QString("hddfreemb%1").arg(index) used << QString("hddfreemb%1").arg(index)
<< QString("hddmb%1").arg(index); << QString("hddmb%1").arg(index);
} }
// hddtotgb* // hddtotgb*
for (auto key : allKeys.filter(QRegExp(QString("^hddtotgb")))) { for (auto &key : _allKeys.filter(QRegExp("^hddtotgb"))) {
if (!used.contains(key)) if (!used.contains(key))
continue; continue;
key.remove(QString("hddtotgb")); key.remove("hddtotgb");
int index = key.toInt(); int index = key.toInt();
used << QString("hddfreegb%1").arg(index) used << QString("hddfreegb%1").arg(index)
<< QString("hddgb%1").arg(index); << QString("hddgb%1").arg(index);
} }
// mem // mem
if (used.contains(QString("mem"))) if (used.contains("mem"))
used << QString("memmb") << QString("memtotmb"); used << "memmb"
<< "memtotmb";
// memtotmb // memtotmb
if (used.contains(QString("memtotmb"))) if (used.contains("memtotmb"))
used << QString("memusedmb") << QString("memfreemb"); used << "memusedmb"
<< "memfreemb";
// memtotgb // memtotgb
if (used.contains(QString("memtotgb"))) if (used.contains("memtotgb"))
used << QString("memusedgb") << QString("memfreegb"); used << "memusedgb"
<< "memfreegb";
// swap // swap
if (used.contains(QString("swap"))) if (used.contains("swap"))
used << QString("swapmb") << QString("swaptotmb"); used << "swapmb"
<< "swaptotmb";
// swaptotmb // swaptotmb
if (used.contains(QString("swaptotmb"))) if (used.contains("swaptotmb"))
used << QString("swapmb") << QString("swapfreemb"); used << "swapmb"
<< "swapfreemb";
// memtotgb // memtotgb
if (used.contains(QString("swaptotgb"))) if (used.contains("swaptotgb"))
used << QString("swapgb") << QString("swapfreegb"); used << "swapgb"
<< "swapfreegb";
// network keys // network keys
QStringList netKeys(QStringList() QStringList netKeys({"up", "upkb", "uptotal", "uptotalkb", "upunits",
<< QString("up") << QString("upkb") "down", "downkb", "downtotal", "downtotalkb",
<< QString("uptotal") << QString("uptotalkb") "downunits"});
<< QString("upunits") << QString("down") for (auto &key : netKeys) {
<< QString("downkb") << QString("downtotal")
<< QString("downtotalkb") << QString("downunits"));
for (auto key : netKeys) {
if (!used.contains(key)) if (!used.contains(key))
continue; continue;
QStringList filt QStringList filt
= allKeys.filter(QRegExp(QString("^%1[0-9]{1,}").arg(key))); = _allKeys.filter(QRegExp(QString("^%1[0-9]{1,}").arg(key)));
for (auto filtered : filt) for (auto &filtered : filt)
used << filtered; used << filtered;
} }
// netdev key // netdev key
if (std::any_of(netKeys.cbegin(), netKeys.cend(), if (std::any_of(netKeys.cbegin(), netKeys.cend(),
[&used](const QString &key) { return used.contains(key); })) [&used](const QString &key) { return used.contains(key); }))
used << QString("netdev"); used << "netdev";
// HACK append dummy if there are no other keys. This hack is required // HACK append dummy if there are no other keys. This hack is required
// because empty list leads to the same behaviour as skip checking // because empty list leads to the same behaviour as skip checking
if (used.isEmpty()) if (used.isEmpty())
used << QString("dummy"); used << "dummy";
return used.toList(); return used.toList();
} }
@ -177,9 +180,9 @@ QHash<QString, QStringList> AWKeyCache::loadKeysFromCache()
QSettings cache(fileName, QSettings::IniFormat); QSettings cache(fileName, QSettings::IniFormat);
QHash<QString, QStringList> devices; QHash<QString, QStringList> devices;
for (auto group : cache.childGroups()) { for (auto &group : cache.childGroups()) {
cache.beginGroup(group); cache.beginGroup(group);
for (auto key : cache.allKeys()) for (auto &key : cache.allKeys())
devices[group].append(cache.value(key).toString()); devices[group].append(cache.value(key).toString());
cache.endGroup(); cache.endGroup();
} }

8
sources/awesome-widget/plugin/awkeycache.h
View File

@ -26,10 +26,10 @@
namespace AWKeyCache namespace AWKeyCache
{ {
bool addKeyToCache(const QString type, const QString key = QString("")); bool addKeyToCache(const QString &_type, const QString &_key = "");
QStringList getRequiredKeys(const QStringList &keys, const QStringList &bars, QStringList getRequiredKeys(const QStringList &_keys, const QStringList &_bars,
const QVariantMap &tooltip, const QVariantMap &_tooltip,
const QStringList &allKeys); const QStringList &_allKeys);
QHash<QString, QStringList> loadKeysFromCache(); QHash<QString, QStringList> loadKeysFromCache();
}; };

242
sources/awesome-widget/plugin/awkeyoperations.cpp
View File

@ -34,8 +34,8 @@
#include "graphicalitem.h" #include "graphicalitem.h"
AWKeyOperations::AWKeyOperations(QObject *parent) AWKeyOperations::AWKeyOperations(QObject *_parent)
: QObject(parent) : QObject(_parent)
{ {
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
} }
@ -55,11 +55,11 @@ AWKeyOperations::~AWKeyOperations()
} }
QStringList AWKeyOperations::devices(const QString type) const QStringList AWKeyOperations::devices(const QString &_type) const
{ {
qCDebug(LOG_AW) << "Looking for type" << type; qCDebug(LOG_AW) << "Looking for type" << _type;
return m_devices[type]; return m_devices[_type];
} }
@ -72,8 +72,8 @@ QHash<QString, QStringList> AWKeyOperations::devices() const
void AWKeyOperations::updateCache() void AWKeyOperations::updateCache()
{ {
// update network and hdd list // update network and hdd list
addKeyToCache(QString("hdd")); addKeyToCache("hdd");
addKeyToCache(QString("net")); addKeyToCache("net");
} }
@ -81,13 +81,13 @@ QStringList AWKeyOperations::dictKeys() const
{ {
QStringList allKeys; QStringList allKeys;
// weather // weather
for (auto item : m_extWeather->activeItems()) { for (auto &item : m_extWeather->activeItems()) {
allKeys.append(item->tag(QString("weatherId"))); allKeys.append(item->tag("weatherId"));
allKeys.append(item->tag(QString("weather"))); allKeys.append(item->tag("weather"));
allKeys.append(item->tag(QString("humidity"))); allKeys.append(item->tag("humidity"));
allKeys.append(item->tag(QString("pressure"))); allKeys.append(item->tag("pressure"));
allKeys.append(item->tag(QString("temperature"))); allKeys.append(item->tag("temperature"));
allKeys.append(item->tag(QString("timestamp"))); allKeys.append(item->tag("timestamp"));
} }
// cpuclock & cpu // cpuclock & cpu
for (int i = 0; i < QThread::idealThreadCount(); i++) { for (int i = 0; i < QThread::idealThreadCount(); i++) {
@ -95,10 +95,10 @@ QStringList AWKeyOperations::dictKeys() const
allKeys.append(QString("cpu%1").arg(i)); allKeys.append(QString("cpu%1").arg(i));
} }
// temperature // temperature
for (int i = 0; i < m_devices[QString("temp")].count(); i++) for (int i = 0; i < m_devices["temp"].count(); i++)
allKeys.append(QString("temp%1").arg(i)); allKeys.append(QString("temp%1").arg(i));
// hdd // hdd
for (int i = 0; i < m_devices[QString("mount")].count(); i++) { for (int i = 0; i < m_devices["mount"].count(); i++) {
allKeys.append(QString("hddmb%1").arg(i)); allKeys.append(QString("hddmb%1").arg(i));
allKeys.append(QString("hddgb%1").arg(i)); allKeys.append(QString("hddgb%1").arg(i));
allKeys.append(QString("hddfreemb%1").arg(i)); allKeys.append(QString("hddfreemb%1").arg(i));
@ -108,15 +108,15 @@ QStringList AWKeyOperations::dictKeys() const
allKeys.append(QString("hdd%1").arg(i)); allKeys.append(QString("hdd%1").arg(i));
} }
// hdd speed // hdd speed
for (int i = 0; i < m_devices[QString("disk")].count(); i++) { for (int i = 0; i < m_devices["disk"].count(); i++) {
allKeys.append(QString("hddr%1").arg(i)); allKeys.append(QString("hddr%1").arg(i));
allKeys.append(QString("hddw%1").arg(i)); allKeys.append(QString("hddw%1").arg(i));
} }
// hdd temp // hdd temp
for (int i = 0; i < m_devices[QString("hdd")].count(); i++) for (int i = 0; i < m_devices["hdd"].count(); i++)
allKeys.append(QString("hddtemp%1").arg(i)); allKeys.append(QString("hddtemp%1").arg(i));
// network // network
for (int i = 0; i < m_devices[QString("net")].count(); i++) { for (int i = 0; i < m_devices["net"].count(); i++) {
allKeys.append(QString("downunits%1").arg(i)); allKeys.append(QString("downunits%1").arg(i));
allKeys.append(QString("upunits%1").arg(i)); allKeys.append(QString("upunits%1").arg(i));
allKeys.append(QString("downtotalkb%1").arg(i)); allKeys.append(QString("downtotalkb%1").arg(i));
@ -130,37 +130,37 @@ QStringList AWKeyOperations::dictKeys() const
} }
// battery // battery
QStringList allBatteryDevices QStringList allBatteryDevices
= QDir(QString("/sys/class/power_supply")) = QDir("/sys/class/power_supply")
.entryList(QStringList() << QString("BAT*"), .entryList(QStringList({"BAT*"}),
QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name); QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
for (int i = 0; i < allBatteryDevices.count(); i++) for (int i = 0; i < allBatteryDevices.count(); i++)
allKeys.append(QString("bat%1").arg(i)); allKeys.append(QString("bat%1").arg(i));
// package manager // package manager
for (auto item : m_extUpgrade->activeItems()) for (auto &item : m_extUpgrade->activeItems())
allKeys.append(item->tag(QString("pkgcount"))); allKeys.append(item->tag("pkgcount"));
// quotes // quotes
for (auto item : m_extQuotes->activeItems()) { for (auto &item : m_extQuotes->activeItems()) {
allKeys.append(item->tag(QString("ask"))); allKeys.append(item->tag("ask"));
allKeys.append(item->tag(QString("askchg"))); allKeys.append(item->tag("askchg"));
allKeys.append(item->tag(QString("percaskchg"))); allKeys.append(item->tag("percaskchg"));
allKeys.append(item->tag(QString("bid"))); allKeys.append(item->tag("bid"));
allKeys.append(item->tag(QString("bidchg"))); allKeys.append(item->tag("bidchg"));
allKeys.append(item->tag(QString("percbidchg"))); allKeys.append(item->tag("percbidchg"));
allKeys.append(item->tag(QString("price"))); allKeys.append(item->tag("price"));
allKeys.append(item->tag(QString("pricechg"))); allKeys.append(item->tag("pricechg"));
allKeys.append(item->tag(QString("percpricechg"))); allKeys.append(item->tag("percpricechg"));
} }
// custom // custom
for (auto item : m_extScripts->activeItems()) for (auto &item : m_extScripts->activeItems())
allKeys.append(item->tag(QString("custom"))); allKeys.append(item->tag("custom"));
// network requests // network requests
for (auto item : m_extNetRequest->activeItems()) for (auto &item : m_extNetRequest->activeItems())
allKeys.append(item->tag(QString("response"))); allKeys.append(item->tag("response"));
// bars // bars
for (auto item : m_graphicalItems->activeItems()) for (auto &item : m_graphicalItems->activeItems())
allKeys.append(item->tag(QString("bar"))); allKeys.append(item->tag("bar"));
// static keys // static keys
allKeys.append(QString(STATIC_KEYS).split(QChar(','))); allKeys.append(QString(STATIC_KEYS).split(','));
// sort in valid order // sort in valid order
allKeys.sort(); allKeys.sort();
@ -172,70 +172,70 @@ QStringList AWKeyOperations::dictKeys() const
// this method is required to provide GraphicalItem functions (e.g. paint()) to // this method is required to provide GraphicalItem functions (e.g. paint()) to
// parent classes // parent classes
GraphicalItem *AWKeyOperations::giByKey(const QString key) const GraphicalItem *AWKeyOperations::giByKey(const QString &_key) const
{ {
qCDebug(LOG_AW) << "Looking for item" << key; qCDebug(LOG_AW) << "Looking for item" << _key;
return m_graphicalItems->itemByTag(key, QString("bar")); return m_graphicalItems->itemByTag(_key, "bar");
} }
QString AWKeyOperations::infoByKey(QString key) const QString AWKeyOperations::infoByKey(const QString &_key) const
{ {
qCDebug(LOG_AW) << "Requested key" << key; qCDebug(LOG_AW) << "Requested key" << _key;
QString stripped = key; QString stripped = _key;
stripped.remove(QRegExp(QString("\\d+"))); stripped.remove(QRegExp("\\d+"));
QString output; QString output;
if (key.startsWith(QString("bar"))) { if (_key.startsWith("bar")) {
AbstractExtItem *item = m_graphicalItems->itemByTag(key, stripped); AbstractExtItem *item = m_graphicalItems->itemByTag(_key, stripped);
if (item) if (item)
output = item->uniq(); output = item->uniq();
} else if (key.startsWith(QString("custom"))) { } else if (_key.startsWith("custom")) {
AbstractExtItem *item = m_extScripts->itemByTag(key, stripped); AbstractExtItem *item = m_extScripts->itemByTag(_key, stripped);
if (item) if (item)
output = item->uniq(); output = item->uniq();
} else if (key.contains(QRegExp(QString("^hdd[rw]")))) { } else if (_key.contains(QRegExp("^hdd[rw]"))) {
output = m_devices[QString("disk")] QString index = _key;
[key.remove(QRegExp(QString("hdd[rw]"))).toInt()]; index.remove(QRegExp("hdd[rw]"));
} else if (key.contains(QRegExp( output = m_devices["disk"][index.toInt()];
QString("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)")))) { } else if (_key.contains(
output QRegExp("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)"))) {
= m_devices[QString("mount")] QString index = _key;
[key index.remove(QRegExp("^hdd(|mb|gb|freemb|freegb|totmb|totgb)"));
.remove(QRegExp(QString( output = m_devices["mount"][index.toInt()];
"^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)"))) } else if (_key.startsWith("hddtemp")) {
.toInt()]; QString index = _key;
} else if (key.startsWith(QString("hddtemp"))) { index.remove("hddtemp");
output output = m_devices["hdd"][index.toInt()];
= m_devices[QString("hdd")][key.remove(QString("hddtemp")).toInt()]; } else if (_key.contains(QRegExp("^(down|up)[0-9]"))) {
} else if (key.contains(QRegExp(QString("^(down|up)[0-9]")))) { QString index = _key;
output = m_devices[QString("net")] index.remove(QRegExp("^(down|up)"));
[key.remove(QRegExp(QString("^(down|up)"))).toInt()]; output = m_devices["net"][index.toInt()];
} else if (key.startsWith(QString("pkgcount"))) { } else if (_key.startsWith("pkgcount")) {
AbstractExtItem *item = m_extUpgrade->itemByTag(key, stripped); AbstractExtItem *item = m_extUpgrade->itemByTag(_key, stripped);
if (item) if (item)
output = item->uniq(); output = item->uniq();
} else if (key.contains( } else if (_key.contains(QRegExp("(^|perc)(ask|bid|price)(chg|)"))) {
QRegExp(QString("(^|perc)(ask|bid|price)(chg|)")))) { AbstractExtItem *item = m_extQuotes->itemByTag(_key, stripped);
AbstractExtItem *item = m_extQuotes->itemByTag(key, stripped);
if (item) if (item)
output = item->uniq(); output = item->uniq();
} else if (key.contains(QRegExp(QString( } else if (_key.contains(QRegExp(
"(weather|weatherId|humidity|pressure|temperature)")))) { "(weather|weatherId|humidity|pressure|temperature)"))) {
AbstractExtItem *item = m_extWeather->itemByTag(key, stripped); AbstractExtItem *item = m_extWeather->itemByTag(_key, stripped);
if (item) if (item)
output = item->uniq(); output = item->uniq();
} else if (key.startsWith(QString("temp"))) { } else if (_key.startsWith("temp")) {
output QString index = _key;
= m_devices[QString("temp")][key.remove(QString("temp")).toInt()]; index.remove("temp");
} else if (key.startsWith(QString("response"))) { output = m_devices["temp"][index.toInt()];
AbstractExtItem *item = m_extNetRequest->itemByTag(key, stripped); } else if (_key.startsWith("response")) {
AbstractExtItem *item = m_extNetRequest->itemByTag(_key, stripped);
if (item) if (item)
output = item->uniq(); output = item->uniq();
} else { } else {
output = QString("(none)"); output = "(none)";
} }
return output; return output;
@ -248,65 +248,64 @@ QString AWKeyOperations::pattern() const
} }
void AWKeyOperations::setPattern(const QString currentPattern) void AWKeyOperations::setPattern(const QString &_currentPattern)
{ {
qCDebug(LOG_AW) << "Set pattern" << currentPattern; qCDebug(LOG_AW) << "Set pattern" << _currentPattern;
m_pattern = currentPattern; m_pattern = _currentPattern;
} }
void AWKeyOperations::editItem(const QString type) void AWKeyOperations::editItem(const QString &_type)
{ {
qCDebug(LOG_AW) << "Item type" << type; qCDebug(LOG_AW) << "Item type" << _type;
if (type == QString("graphicalitem")) { if (_type == "graphicalitem") {
QStringList keys = dictKeys().filter(QRegExp( QStringList keys = dictKeys().filter(
QString("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)"))); QRegExp("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)"));
keys.sort(); keys.sort();
m_graphicalItems->setConfigArgs(keys); m_graphicalItems->setConfigArgs(keys);
return m_graphicalItems->editItems(); return m_graphicalItems->editItems();
} else if (type == QString("extnetworkrequest")) { } else if (_type == "extnetworkrequest") {
return m_extNetRequest->editItems(); return m_extNetRequest->editItems();
} else if (type == QString("extquotes")) { } else if (_type == "extquotes") {
return m_extQuotes->editItems(); return m_extQuotes->editItems();
} else if (type == QString("extscript")) { } else if (_type == "extscript") {
return m_extScripts->editItems(); return m_extScripts->editItems();
} else if (type == QString("extupgrade")) { } else if (_type == "extupgrade") {
return m_extUpgrade->editItems(); return m_extUpgrade->editItems();
} else if (type == QString("extweather")) { } else if (_type == "extweather") {
return m_extWeather->editItems(); return m_extWeather->editItems();
} }
} }
void AWKeyOperations::addDevice(const QString &source) void AWKeyOperations::addDevice(const QString &_source)
{ {
qCDebug(LOG_AW) << "Source" << source; qCDebug(LOG_AW) << "Source" << _source;
QRegExp diskRegexp QRegExp diskRegexp = QRegExp("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)");
= QRegExp(QString("disk/(?:md|sd|hd)[a-z|0-9]_.*/Rate/(?:rblk)")); QRegExp mountRegexp = QRegExp("partitions/.*/filllevel");
QRegExp mountRegexp = QRegExp(QString("partitions/.*/filllevel"));
if (source.contains(diskRegexp)) { if (_source.contains(diskRegexp)) {
QString device = source; QString device = _source;
device.remove(QString("/Rate/rblk")); device.remove("/Rate/rblk");
addKeyToCache(QString("disk"), device); addKeyToCache("disk", device);
} else if (source.contains(mountRegexp)) { } else if (_source.contains(mountRegexp)) {
QString device = source; QString device = _source;
device.remove(QString("partitions")).remove(QString("/filllevel")); device.remove("partitions").remove("/filllevel");
addKeyToCache(QString("mount"), device); addKeyToCache("mount", device);
} else if (source.startsWith(QString("lmsensors"))) { } else if (_source.startsWith("lmsensors")) {
addKeyToCache(QString("temp"), source); addKeyToCache("temp", _source);
} }
} }
void AWKeyOperations::addKeyToCache(const QString type, const QString key) void AWKeyOperations::addKeyToCache(const QString &_type, const QString &_key)
{ {
qCDebug(LOG_AW) << "Key" << key << "with type" << type; qCDebug(LOG_AW) << "Key" << _key << "with type" << _type;
if (AWKeyCache::addKeyToCache(type, key)) { if (AWKeyCache::addKeyToCache(_type, _key)) {
m_devices = AWKeyCache::loadKeysFromCache(); m_devices = AWKeyCache::loadKeysFromCache();
reinitKeys(); reinitKeys();
} }
@ -331,16 +330,13 @@ void AWKeyOperations::reinitKeys()
m_extWeather = nullptr; m_extWeather = nullptr;
// create // create
m_graphicalItems m_graphicalItems
= new ExtItemAggregator<GraphicalItem>(nullptr, QString("desktops")); = new ExtItemAggregator<GraphicalItem>(nullptr, "desktops");
m_extNetRequest = new ExtItemAggregator<ExtNetworkRequest>( m_extNetRequest
nullptr, QString("requests")); = new ExtItemAggregator<ExtNetworkRequest>(nullptr, "requests");
m_extQuotes = new ExtItemAggregator<ExtQuotes>(nullptr, QString("quotes")); m_extQuotes = new ExtItemAggregator<ExtQuotes>(nullptr, "quotes");
m_extScripts m_extScripts = new ExtItemAggregator<ExtScript>(nullptr, "scripts");
= new ExtItemAggregator<ExtScript>(nullptr, QString("scripts")); m_extUpgrade = new ExtItemAggregator<ExtUpgrade>(nullptr, "upgrade");
m_extUpgrade m_extWeather = new ExtItemAggregator<ExtWeather>(nullptr, "weather");
= new ExtItemAggregator<ExtUpgrade>(nullptr, QString("upgrade"));
m_extWeather
= new ExtItemAggregator<ExtWeather>(nullptr, QString("weather"));
// init // init
QStringList allKeys = dictKeys(); QStringList allKeys = dictKeys();

18
sources/awesome-widget/plugin/awkeyoperations.h
View File

@ -44,30 +44,30 @@ class AWKeyOperations : public QObject
Q_PROPERTY(QString pattern READ pattern WRITE setPattern) Q_PROPERTY(QString pattern READ pattern WRITE setPattern)
public: public:
explicit AWKeyOperations(QObject *parent = nullptr); explicit AWKeyOperations(QObject *_parent = nullptr);
virtual ~AWKeyOperations(); virtual ~AWKeyOperations();
QStringList devices(const QString type) const; QStringList devices(const QString &_type) const;
QHash<QString, QStringList> devices() const; QHash<QString, QStringList> devices() const;
void updateCache(); void updateCache();
// keys // keys
QStringList dictKeys() const; QStringList dictKeys() const;
GraphicalItem *giByKey(const QString key) const; GraphicalItem *giByKey(const QString &_key) const;
// values // values
QString infoByKey(QString key) const; QString infoByKey(const QString &_key) const;
QString pattern() const; QString pattern() const;
void setPattern(const QString currentPattern); void setPattern(const QString &_currentPattern);
// configuration // configuration
void editItem(const QString type); void editItem(const QString &_type);
signals: signals:
void updateKeys(const QStringList currentKeys); void updateKeys(const QStringList &_currentKeys);
public slots: public slots:
void addDevice(const QString &source); void addDevice(const QString &_source);
private: private:
// methods // methods
void addKeyToCache(const QString type, const QString key = QString("")); void addKeyToCache(const QString &_type, const QString &_key = "");
void reinitKeys(); void reinitKeys();
// objects // objects
ExtItemAggregator<GraphicalItem> *m_graphicalItems = nullptr; ExtItemAggregator<GraphicalItem> *m_graphicalItems = nullptr;

233
sources/awesome-widget/plugin/awkeys.cpp
View File

@ -35,8 +35,8 @@
#include "graphicalitem.h" #include "graphicalitem.h"
AWKeys::AWKeys(QObject *parent) AWKeys::AWKeys(QObject *_parent)
: QObject(parent) : QObject(_parent)
{ {
qSetMessagePattern(AWDebug::LOG_FORMAT); qSetMessagePattern(AWDebug::LOG_FORMAT);
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
@ -57,14 +57,14 @@ AWKeys::AWKeys(QObject *parent)
createDBusInterface(); createDBusInterface();
// update key data if required // update key data if required
connect(m_keyOperator, SIGNAL(updateKeys(QStringList)), this, connect(m_keyOperator, SIGNAL(updateKeys(const QStringList &)), this,
SLOT(reinitKeys(QStringList))); SLOT(reinitKeys(const QStringList &)));
connect(m_timer, SIGNAL(timeout()), this, SLOT(updateTextData())); connect(m_timer, SIGNAL(timeout()), this, SLOT(updateTextData()));
// transfer signal from AWDataAggregator object to QML ui // transfer signal from AWDataAggregator object to QML ui
connect(m_dataAggregator, SIGNAL(toolTipPainted(const QString)), this, connect(m_dataAggregator, SIGNAL(toolTipPainted(const QString &)), this,
SIGNAL(needToolTipToBeUpdated(const QString))); SIGNAL(needToolTipToBeUpdated(const QString &)));
connect(this, SIGNAL(dropSourceFromDataengine(QString)), connect(this, SIGNAL(dropSourceFromDataengine(const QString &)),
m_dataEngineAggregator, SLOT(dropSource(QString))); m_dataEngineAggregator, SLOT(dropSource(const QString &)));
// transfer signal from dataengine to update source list // transfer signal from dataengine to update source list
connect(m_dataEngineAggregator, SIGNAL(deviceAdded(const QString &)), connect(m_dataEngineAggregator, SIGNAL(deviceAdded(const QString &)),
m_keyOperator, SLOT(addDevice(const QString &))); m_keyOperator, SLOT(addDevice(const QString &)));
@ -97,53 +97,53 @@ bool AWKeys::isDBusActive() const
} }
void AWKeys::initDataAggregator(const QVariantMap tooltipParams) void AWKeys::initDataAggregator(const QVariantMap &_tooltipParams)
{ {
qCDebug(LOG_AW) << "Tooltip parameters" << tooltipParams; qCDebug(LOG_AW) << "Tooltip parameters" << _tooltipParams;
// store parameters to generate m_requiredKeys // store parameters to generate m_requiredKeys
m_tooltipParams = tooltipParams; m_tooltipParams = _tooltipParams;
m_dataAggregator->setParameters(m_tooltipParams); m_dataAggregator->setParameters(m_tooltipParams);
} }
void AWKeys::initKeys(const QString currentPattern, const int interval, void AWKeys::initKeys(const QString &_currentPattern, const int _interval,
const int limit, const bool optimize) const int _limit, const bool _optimize)
{ {
qCDebug(LOG_AW) << "Pattern" << currentPattern << "with interval" qCDebug(LOG_AW) << "Pattern" << _currentPattern << "with interval"
<< interval << "and queue limit" << limit << _interval << "and queue limit" << _limit
<< "with optimization" << optimize; << "with optimization" << _optimize;
// init // init
m_optimize = optimize; m_optimize = _optimize;
m_threadPool->setMaxThreadCount(limit == 0 ? QThread::idealThreadCount() m_threadPool->setMaxThreadCount(_limit == 0 ? QThread::idealThreadCount()
: limit); : _limit);
// child objects // child objects
m_aggregator->initFormatters(); m_aggregator->initFormatters();
m_keyOperator->setPattern(currentPattern); m_keyOperator->setPattern(_currentPattern);
m_keyOperator->updateCache(); m_keyOperator->updateCache();
m_dataEngineAggregator->clear(); m_dataEngineAggregator->clear();
m_dataEngineAggregator->initDataEngines(interval); m_dataEngineAggregator->initDataEngines(_interval);
// timer // timer
m_timer->setInterval(interval); m_timer->setInterval(_interval);
m_timer->start(); m_timer->start();
} }
void AWKeys::setAggregatorProperty(const QString key, const QVariant value) void AWKeys::setAggregatorProperty(const QString &_key, const QVariant &_value)
{ {
qCDebug(LOG_AW) << "Key" << key << "with value" << value; qCDebug(LOG_AW) << "Key" << _key << "with value" << _value;
m_aggregator->setProperty(key.toUtf8().constData(), value); m_aggregator->setProperty(_key.toUtf8().constData(), _value);
} }
void AWKeys::setWrapNewLines(const bool wrap) void AWKeys::setWrapNewLines(const bool _wrap)
{ {
qCDebug(LOG_AW) << "Is wrapping enabled" << wrap; qCDebug(LOG_AW) << "Is wrapping enabled" << _wrap;
m_wrapNewLines = wrap; m_wrapNewLines = _wrap;
} }
@ -153,37 +153,37 @@ void AWKeys::updateCache()
} }
QStringList AWKeys::dictKeys(const bool sorted, const QString regexp) const QStringList AWKeys::dictKeys(const bool _sorted, const QString &_regexp) const
{ {
qCDebug(LOG_AW) << "Should be sorted" << sorted << "and filter applied" qCDebug(LOG_AW) << "Should be sorted" << _sorted << "and filter applied"
<< regexp; << _regexp;
// check if functions asked // check if functions asked
if (regexp == QString("functions")) if (_regexp == "functions")
return QString(STATIC_FUNCTIONS).split(QChar(',')); return QString(STATIC_FUNCTIONS).split(',');
QStringList allKeys = m_keyOperator->dictKeys(); QStringList allKeys = m_keyOperator->dictKeys();
// sort if required // sort if required
if (sorted) if (_sorted)
allKeys.sort(); allKeys.sort();
return allKeys.filter(QRegExp(regexp)); return allKeys.filter(QRegExp(_regexp));
} }
QVariantList AWKeys::getHddDevices() const QVariantList AWKeys::getHddDevices() const
{ {
QStringList hddDevices = m_keyOperator->devices(QString("hdd")); QStringList hddDevices = m_keyOperator->devices("hdd");
// required by selector in the UI // required by selector in the UI
hddDevices.insert(0, QString("disable")); hddDevices.insert(0, "disable");
hddDevices.insert(0, QString("auto")); hddDevices.insert(0, "auto");
// build model // build model
QVariantList devices; QVariantList devices;
for (auto device : hddDevices) { for (auto &device : hddDevices) {
QVariantMap model; QVariantMap model;
model[QString("label")] = device; model["label"] = device;
model[QString("name")] = device; model["name"] = device;
devices.append(model); devices.append(model);
} }
@ -191,68 +191,68 @@ QVariantList AWKeys::getHddDevices() const
} }
QString AWKeys::infoByKey(QString key) const QString AWKeys::infoByKey(const QString &_key) const
{ {
qCDebug(LOG_AW) << "Requested info for key" << key; qCDebug(LOG_AW) << "Requested info for key" << _key;
return m_keyOperator->infoByKey(key); return m_keyOperator->infoByKey(_key);
} }
// HACK this method requires to define tag value from bar from UI interface // HACK this method requires to define tag value from bar from UI interface
QString AWKeys::valueByKey(QString key) const QString AWKeys::valueByKey(const QString &_key) const
{ {
qCDebug(LOG_AW) << "Requested value for key" << key; qCDebug(LOG_AW) << "Requested value for key" << _key;
QString trueKey QString trueKey
= key.startsWith(QString("bar")) ? m_keyOperator->infoByKey(key) : key; = _key.startsWith("bar") ? m_keyOperator->infoByKey(_key) : _key;
return m_aggregator->formatter(m_values[trueKey], trueKey); return m_aggregator->formatter(m_values[trueKey], trueKey);
} }
void AWKeys::editItem(const QString type) void AWKeys::editItem(const QString &_type)
{ {
qCDebug(LOG_AW) << "Item type" << type; qCDebug(LOG_AW) << "Item type" << _type;
return m_keyOperator->editItem(type); return m_keyOperator->editItem(_type);
} }
void AWKeys::dataUpdated(const QString &sourceName, void AWKeys::dataUpdated(const QString &_sourceName,
const Plasma::DataEngine::Data &data) const Plasma::DataEngine::Data &_data)
{ {
// run concurrent data update // run concurrent data update
QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, sourceName, QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, _sourceName,
data); _data);
} }
void AWKeys::reinitKeys(const QStringList currentKeys) void AWKeys::reinitKeys(const QStringList &_currentKeys)
{ {
qCDebug(LOG_AW) << "Update found keys by using list" << currentKeys; qCDebug(LOG_AW) << "Update found keys by using list" << _currentKeys;
// append lists // append lists
m_foundBars = AWPatternFunctions::findKeys(m_keyOperator->pattern(), m_foundBars = AWPatternFunctions::findKeys(m_keyOperator->pattern(),
currentKeys, true); _currentKeys, true);
m_foundKeys = AWPatternFunctions::findKeys(m_keyOperator->pattern(), m_foundKeys = AWPatternFunctions::findKeys(m_keyOperator->pattern(),
currentKeys, false); _currentKeys, false);
m_foundLambdas = AWPatternFunctions::findLambdas(m_keyOperator->pattern()); m_foundLambdas = AWPatternFunctions::findLambdas(m_keyOperator->pattern());
// generate list of required keys for bars // generate list of required keys for bars
QStringList barKeys; QStringList barKeys;
for (auto bar : m_foundBars) { for (auto &bar : m_foundBars) {
GraphicalItem *item = m_keyOperator->giByKey(bar); GraphicalItem *item = m_keyOperator->giByKey(bar);
if (item->isCustom()) if (item->isCustom())
item->setUsedKeys( item->setUsedKeys(
AWPatternFunctions::findKeys(item->bar(), currentKeys, false)); AWPatternFunctions::findKeys(item->bar(), _currentKeys, false));
else else
item->setUsedKeys(QStringList() << item->bar()); item->setUsedKeys(QStringList() << item->bar());
barKeys.append(item->usedKeys()); barKeys.append(item->usedKeys());
} }
// get required keys // get required keys
m_requiredKeys m_requiredKeys
= m_optimize ? AWKeyCache::getRequiredKeys(m_foundKeys, barKeys, = m_optimize ? AWKeyCache::getRequiredKeys(
m_tooltipParams, currentKeys) m_foundKeys, barKeys, m_tooltipParams, _currentKeys)
: QStringList(); : QStringList();
// set key data to m_aggregator // set key data to m_aggregator
@ -278,8 +278,8 @@ void AWKeys::updateTextData()
void AWKeys::calculateValues() void AWKeys::calculateValues()
{ {
// hddtot* // hddtot*
QStringList mountDevices = m_keyOperator->devices(QString("mount")); QStringList mountDevices = m_keyOperator->devices("mount");
for (auto device : mountDevices) { for (auto &device : mountDevices) {
int index = mountDevices.indexOf(device); int index = mountDevices.indexOf(device);
m_values[QString("hddtotmb%1").arg(index)] m_values[QString("hddtotmb%1").arg(index)]
= m_values[QString("hddfreemb%1").arg(index)].toFloat() = m_values[QString("hddfreemb%1").arg(index)].toFloat()
@ -290,44 +290,39 @@ void AWKeys::calculateValues()
} }
// memtot* // memtot*
m_values[QString("memtotmb")] = m_values[QString("memusedmb")].toInt() m_values["memtotmb"]
+ m_values[QString("memfreemb")].toInt(); = m_values["memusedmb"].toInt() + m_values["memfreemb"].toInt();
m_values[QString("memtotgb")] = m_values[QString("memusedgb")].toFloat() m_values["memtotgb"]
+ m_values[QString("memfreegb")].toFloat(); = m_values["memusedgb"].toFloat() + m_values["memfreegb"].toFloat();
// mem // mem
m_values[QString("mem")] = 100.0f * m_values[QString("memmb")].toFloat() m_values["mem"]
/ m_values[QString("memtotmb")].toFloat(); = 100.0f * m_values["memmb"].toFloat() / m_values["memtotmb"].toFloat();
// up, down, upkb, downkb, upunits, downunits // up, down, upkb, downkb, upunits, downunits
int netIndex = m_keyOperator->devices(QString("net")) int netIndex
.indexOf(m_values[QString("netdev")].toString()); = m_keyOperator->devices("net").indexOf(m_values["netdev"].toString());
m_values[QString("down")] = m_values[QString("down%1").arg(netIndex)]; m_values["down"] = m_values[QString("down%1").arg(netIndex)];
m_values[QString("downkb")] = m_values[QString("downkb%1").arg(netIndex)]; m_values["downkb"] = m_values[QString("downkb%1").arg(netIndex)];
m_values[QString("downtotal")] m_values["downtotal"] = m_values[QString("downtotal%1").arg(netIndex)];
= m_values[QString("downtotal%1").arg(netIndex)]; m_values["downtotalkb"] = m_values[QString("downtotalkb%1").arg(netIndex)];
m_values[QString("downtotalkb")] m_values["downunits"] = m_values[QString("downunits%1").arg(netIndex)];
= m_values[QString("downtotalkb%1").arg(netIndex)]; m_values["up"] = m_values[QString("up%1").arg(netIndex)];
m_values[QString("downunits")] m_values["upkb"] = m_values[QString("upkb%1").arg(netIndex)];
= m_values[QString("downunits%1").arg(netIndex)]; m_values["uptotal"] = m_values[QString("uptotal%1").arg(netIndex)];
m_values[QString("up")] = m_values[QString("up%1").arg(netIndex)]; m_values["uptotalkb"] = m_values[QString("uptotalkb%1").arg(netIndex)];
m_values[QString("upkb")] = m_values[QString("upkb%1").arg(netIndex)]; m_values["upunits"] = m_values[QString("upunits%1").arg(netIndex)];
m_values[QString("uptotal")] = m_values[QString("uptotal%1").arg(netIndex)];
m_values[QString("uptotalkb")]
= m_values[QString("uptotalkb%1").arg(netIndex)];
m_values[QString("upunits")] = m_values[QString("upunits%1").arg(netIndex)];
// swaptot* // swaptot*
m_values[QString("swaptotmb")] = m_values[QString("swapmb")].toInt() m_values["swaptotmb"]
+ m_values[QString("swapfreemb")].toInt(); = m_values["swapmb"].toInt() + m_values["swapfreemb"].toInt();
m_values[QString("swaptotgb")] m_values["swaptotgb"]
= m_values[QString("swapgb")].toFloat() = m_values["swapgb"].toFloat() + m_values["swapfreegb"].toFloat();
+ m_values[QString("swapfreegb")].toFloat();
// swap // swap
m_values[QString("swap")] = 100.0f * m_values[QString("swapmb")].toFloat() m_values["swap"] = 100.0f * m_values["swapmb"].toFloat()
/ m_values[QString("swaptotmb")].toFloat(); / m_values["swaptotmb"].toFloat();
// lambdas // lambdas
for (auto key : m_foundLambdas) for (auto &key : m_foundLambdas)
m_values[key] = AWPatternFunctions::expandLambdas( m_values[key] = AWPatternFunctions::expandLambdas(
key, m_aggregator, m_values, m_foundKeys); key, m_aggregator, m_values, m_foundKeys);
} }
@ -354,69 +349,69 @@ void AWKeys::createDBusInterface()
} }
QString AWKeys::parsePattern(QString pattern) const QString AWKeys::parsePattern(QString _pattern) const
{ {
// screen sign // screen sign
pattern.replace(QString("$$"), QString(0x1d)); _pattern.replace("$$", QString(0x1d));
// lambdas // lambdas
for (auto key : m_foundLambdas) for (auto &key : m_foundLambdas)
pattern.replace(QString("${{%1}}").arg(key), m_values[key].toString()); _pattern.replace(QString("${{%1}}").arg(key), m_values[key].toString());
// main keys // main keys
for (auto key : m_foundKeys) for (auto &key : m_foundKeys)
pattern.replace(QString("$%1").arg(key), [this](const QString &tag, _pattern.replace(
const QVariant &value) { QString("$%1").arg(key),
[this](const QString &tag, const QVariant &value) {
QString strValue = m_aggregator->formatter(value, tag); QString strValue = m_aggregator->formatter(value, tag);
if ((!tag.startsWith(QString("custom"))) if ((!tag.startsWith("custom")) && (!tag.startsWith("weather")))
&& (!tag.startsWith(QString("weather")))) strValue.replace(" ", "&nbsp;");
strValue.replace(QString(" "), QString("&nbsp;"));
return strValue; return strValue;
}(key, m_values[key])); }(key, m_values[key]));
// bars // bars
for (auto bar : m_foundBars) { for (auto &bar : m_foundBars) {
GraphicalItem *item = m_keyOperator->giByKey(bar); GraphicalItem *item = m_keyOperator->giByKey(bar);
QString image QString image
= item->isCustom() = item->isCustom()
? item->image(AWPatternFunctions::expandLambdas( ? item->image(AWPatternFunctions::expandLambdas(
item->bar(), m_aggregator, m_values, item->usedKeys())) item->bar(), m_aggregator, m_values, item->usedKeys()))
: item->image(m_values[item->bar()]); : item->image(m_values[item->bar()]);
pattern.replace(QString("$%1").arg(bar), image); _pattern.replace(QString("$%1").arg(bar), image);
} }
// prepare strings // prepare strings
pattern.replace(QString(0x1d), QString("$")); _pattern.replace(QString(0x1d), "$");
if (m_wrapNewLines) if (m_wrapNewLines)
pattern.replace(QString("\n"), QString("<br>")); _pattern.replace("\n", "<br>");
return pattern; return _pattern;
} }
void AWKeys::setDataBySource(const QString &sourceName, const QVariantMap &data) void AWKeys::setDataBySource(const QString &_sourceName,
const QVariantMap &_data)
{ {
qCDebug(LOG_AW) << "Source" << sourceName << "with data" << data; qCDebug(LOG_AW) << "Source" << _sourceName << "with data" << _data;
// first list init // first list init
QStringList tags = m_aggregator->keysFromSource(sourceName); QStringList tags = m_aggregator->keysFromSource(_sourceName);
if (tags.isEmpty()) if (tags.isEmpty())
tags = m_aggregator->registerSource( tags = m_aggregator->registerSource(
sourceName, data[QString("units")].toString(), m_requiredKeys); _sourceName, _data["units"].toString(), m_requiredKeys);
// update data or drop source if there are no matches and exit // update data or drop source if there are no matches and exit
if (tags.isEmpty()) { if (tags.isEmpty()) {
qCInfo(LOG_AW) << "Source" << sourceName << "not found"; qCInfo(LOG_AW) << "Source" << _sourceName << "not found";
return emit(dropSourceFromDataengine(sourceName)); return emit(dropSourceFromDataengine(_sourceName));
} }
m_mutex.lock(); m_mutex.lock();
// HACK workaround for time values which are stored in the different path // HACK workaround for time values which are stored in the different path
std::for_each(tags.cbegin(), tags.cend(), std::for_each(tags.cbegin(), tags.cend(),
[this, &data, &sourceName](const QString &tag) { [this, &_data, &_sourceName](const QString &tag) {
m_values[tag] = sourceName == QString("Local") m_values[tag] = _sourceName == "Local" ? _data["DateTime"]
? data[QString("DateTime")] : _data["value"];
: data[QString("value")];
}); });
m_mutex.unlock(); m_mutex.unlock();
} }

41
sources/awesome-widget/plugin/awkeys.h
View File

@ -37,49 +37,50 @@ class AWKeys : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit AWKeys(QObject *parent = nullptr); explicit AWKeys(QObject *_parent = nullptr);
virtual ~AWKeys(); virtual ~AWKeys();
bool isDBusActive() const; bool isDBusActive() const;
Q_INVOKABLE void initDataAggregator(const QVariantMap tooltipParams); Q_INVOKABLE void initDataAggregator(const QVariantMap &_tooltipParams);
Q_INVOKABLE void initKeys(const QString currentPattern, const int interval, Q_INVOKABLE void initKeys(const QString &_currentPattern,
const int limit, const bool optimize); const int _interval, const int _limit,
Q_INVOKABLE void setAggregatorProperty(const QString key, const bool _optimize);
const QVariant value); Q_INVOKABLE void setAggregatorProperty(const QString &_key,
Q_INVOKABLE void setWrapNewLines(const bool wrap = false); const QVariant &_value);
Q_INVOKABLE void setWrapNewLines(const bool _wrap = false);
// additional method to force load keys from Qml UI. Used in some // additional method to force load keys from Qml UI. Used in some
// configuration pages // configuration pages
Q_INVOKABLE void updateCache(); Q_INVOKABLE void updateCache();
// keys // keys
Q_INVOKABLE QStringList dictKeys(const bool sorted = false, Q_INVOKABLE QStringList dictKeys(const bool _sorted = false,
const QString regexp = QString()) const; const QString &_regexp = "") const;
Q_INVOKABLE QVariantList getHddDevices() const; Q_INVOKABLE QVariantList getHddDevices() const;
// values // values
Q_INVOKABLE QString infoByKey(QString key) const; Q_INVOKABLE QString infoByKey(const QString &_key) const;
Q_INVOKABLE QString valueByKey(QString key) const; Q_INVOKABLE QString valueByKey(const QString &_key) const;
// configuration // configuration
Q_INVOKABLE void editItem(const QString type); Q_INVOKABLE void editItem(const QString &_type);
public slots: public slots:
void dataUpdated(const QString &sourceName, void dataUpdated(const QString &_sourceName,
const Plasma::DataEngine::Data &data); const Plasma::DataEngine::Data &_data);
// dummy method required by DataEngine connections // dummy method required by DataEngine connections
void modelChanged(QString, QAbstractItemModel *){}; void modelChanged(QString, QAbstractItemModel *){};
signals: 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;
private slots: private slots:
void reinitKeys(const QStringList currentKeys); void reinitKeys(const QStringList &_currentKeys);
void updateTextData(); void updateTextData();
private: private:
// methods // methods
void calculateValues(); void calculateValues();
void createDBusInterface(); void createDBusInterface();
QString parsePattern(QString pattern) const; QString parsePattern(QString _pattern) const;
void setDataBySource(const QString &sourceName, const QVariantMap &data); void setDataBySource(const QString &_sourceName, const QVariantMap &_data);
// objects // objects
AWDataAggregator *m_dataAggregator = nullptr; AWDataAggregator *m_dataAggregator = nullptr;
AWDataEngineAggregator *m_dataEngineAggregator = nullptr; AWDataEngineAggregator *m_dataEngineAggregator = nullptr;

568
sources/awesome-widget/plugin/awkeysaggregator.cpp
View File

@ -27,8 +27,8 @@
#include "awformatterhelper.h" #include "awformatterhelper.h"
AWKeysAggregator::AWKeysAggregator(QObject *parent) AWKeysAggregator::AWKeysAggregator(QObject *_parent)
: QObject(parent) : QObject(_parent)
{ {
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
@ -38,20 +38,20 @@ AWKeysAggregator::AWKeysAggregator(QObject *parent)
// default formatters // default formatters
// memory // memory
m_formatter[QString("mem")] = FormatterType::Float; m_formatter["mem"] = FormatterType::Float;
m_formatter[QString("memtotmb")] = FormatterType::MemMBFormat; m_formatter["memtotmb"] = FormatterType::MemMBFormat;
m_formatter[QString("memtotgb")] = FormatterType::MemGBFormat; m_formatter["memtotgb"] = FormatterType::MemGBFormat;
// network // network
m_formatter[QString("down")] = FormatterType::NetSmartFormat; m_formatter["down"] = FormatterType::NetSmartFormat;
m_formatter[QString("downkb")] = FormatterType::Integer; m_formatter["downkb"] = FormatterType::Integer;
m_formatter[QString("downunits")] = FormatterType::NetSmartUnits; m_formatter["downunits"] = FormatterType::NetSmartUnits;
m_formatter[QString("up")] = FormatterType::NetSmartFormat; m_formatter["up"] = FormatterType::NetSmartFormat;
m_formatter[QString("upkb")] = FormatterType::Integer; m_formatter["upkb"] = FormatterType::Integer;
m_formatter[QString("upunits")] = FormatterType::NetSmartUnits; m_formatter["upunits"] = FormatterType::NetSmartUnits;
// swap // swap
m_formatter[QString("swap")] = FormatterType::Float; m_formatter["swap"] = FormatterType::Float;
m_formatter[QString("swaptotmb")] = FormatterType::MemMBFormat; m_formatter["swaptotmb"] = FormatterType::MemMBFormat;
m_formatter[QString("swaptotgb")] = FormatterType::MemGBFormat; m_formatter["swaptotgb"] = FormatterType::MemGBFormat;
} }
@ -71,42 +71,42 @@ void AWKeysAggregator::initFormatters()
} }
QString AWKeysAggregator::formatter(const QVariant &data, QString AWKeysAggregator::formatter(const QVariant &_data,
const QString &key) const const QString &_key) const
{ {
qCDebug(LOG_AW) << "Data" << data << "for key" << key; qCDebug(LOG_AW) << "Data" << _data << "for key" << _key;
QString output; QString output;
QLocale loc = m_translate ? QLocale::system() : QLocale::c(); QLocale loc = m_translate ? QLocale::system() : QLocale::c();
// case block // case block
switch (m_formatter[key]) { switch (m_formatter[_key]) {
case FormatterType::Float: case FormatterType::Float:
output = QString("%1").arg(data.toFloat(), 5, 'f', 1); output = QString("%1").arg(_data.toFloat(), 5, 'f', 1);
break; break;
case FormatterType::FloatTwoSymbols: case FormatterType::FloatTwoSymbols:
output = QString("%1").arg(data.toFloat(), 5, 'f', 2); output = QString("%1").arg(_data.toFloat(), 5, 'f', 2);
break; break;
case FormatterType::Integer: case FormatterType::Integer:
output = QString("%1").arg(data.toFloat(), 4, 'f', 0); output = QString("%1").arg(_data.toFloat(), 4, 'f', 0);
break; break;
case FormatterType::IntegerFive: case FormatterType::IntegerFive:
output = QString("%1").arg(data.toFloat(), 5, 'f', 0); output = QString("%1").arg(_data.toFloat(), 5, 'f', 0);
break; break;
case FormatterType::IntegerThree: case FormatterType::IntegerThree:
output = QString("%1").arg(data.toFloat(), 3, 'f', 0); output = QString("%1").arg(_data.toFloat(), 3, 'f', 0);
break; break;
case FormatterType::List: case FormatterType::List:
output = data.toStringList().join(QChar(',')); output = _data.toStringList().join(',');
break; break;
case FormatterType::ACFormat: case FormatterType::ACFormat:
output = data.toBool() ? m_acOnline : m_acOffline; output = _data.toBool() ? m_acOnline : m_acOffline;
break; break;
case FormatterType::MemGBFormat: case FormatterType::MemGBFormat:
output output
= QString("%1").arg(data.toFloat() / (1024.0 * 1024.0), 5, 'f', 1); = QString("%1").arg(_data.toFloat() / (1024.0 * 1024.0), 5, 'f', 1);
break; break;
case FormatterType::MemMBFormat: case FormatterType::MemMBFormat:
output = QString("%1").arg(data.toFloat() / 1024.0, 5, 'f', 0); output = QString("%1").arg(_data.toFloat() / 1024.0, 5, 'f', 0);
break; break;
case FormatterType::NetSmartFormat: case FormatterType::NetSmartFormat:
output = [](const float value) { output = [](const float value) {
@ -114,44 +114,44 @@ QString AWKeysAggregator::formatter(const QVariant &data,
return QString("%1").arg(value / 1024.0, 4, 'f', 1); return QString("%1").arg(value / 1024.0, 4, 'f', 1);
else else
return QString("%1").arg(value, 4, 'f', 0); return QString("%1").arg(value, 4, 'f', 0);
}(data.toFloat()); }(_data.toFloat());
break; break;
case FormatterType::NetSmartUnits: case FormatterType::NetSmartUnits:
if (data.toFloat() > 1024.0) if (_data.toFloat() > 1024.0)
output = m_translate ? i18n("MB/s") : QString("MB/s"); output = m_translate ? i18n("MB/s") : "MB/s";
else else
output = m_translate ? i18n("KB/s") : QString("KB/s"); output = m_translate ? i18n("KB/s") : "KB/s";
break; break;
case FormatterType::Quotes: case FormatterType::Quotes:
// first cast // first cast
output = QString("%1").arg(data.toDouble(), 0, 'f'); output = QString("%1").arg(_data.toDouble(), 0, 'f');
output = output.rightJustified(8, QLatin1Char(' '), true); output = output.rightJustified(8, QLatin1Char(' '), true);
break; break;
case FormatterType::Temperature: case FormatterType::Temperature:
output = QString("%1").arg(temperature(data.toFloat()), 5, 'f', 1); output = QString("%1").arg(temperature(_data.toFloat()), 5, 'f', 1);
break; break;
case FormatterType::Time: case FormatterType::Time:
output = data.toDateTime().toString(); output = _data.toDateTime().toString();
break; break;
case FormatterType::TimeCustom: case FormatterType::TimeCustom:
output = m_customTime; output = m_customTime;
[&output, loc, this](const QDateTime dt) { [&output, loc, this](const QDateTime dt) {
for (auto key : m_timeKeys) for (auto &key : m_timeKeys)
output.replace(QString("$%1").arg(key), loc.toString(dt, key)); output.replace(QString("$%1").arg(key), loc.toString(dt, key));
}(data.toDateTime()); }(_data.toDateTime());
break; break;
case FormatterType::TimeISO: case FormatterType::TimeISO:
output = data.toDateTime().toString(Qt::ISODate); output = _data.toDateTime().toString(Qt::ISODate);
break; break;
case FormatterType::TimeLong: case FormatterType::TimeLong:
output = loc.toString(data.toDateTime(), QLocale::LongFormat); output = loc.toString(_data.toDateTime(), QLocale::LongFormat);
break; break;
case FormatterType::TimeShort: case FormatterType::TimeShort:
output = loc.toString(data.toDateTime(), QLocale::ShortFormat); output = loc.toString(_data.toDateTime(), QLocale::ShortFormat);
break; break;
case FormatterType::Timestamp: case FormatterType::Timestamp:
output = QString("%1").arg( output = QString("%1").arg(
data.toDateTime().toMSecsSinceEpoch() / 1000.0, 10, 'f', 0); _data.toDateTime().toMSecsSinceEpoch() / 1000.0, 10, 'f', 0);
break; break;
case FormatterType::Uptime: case FormatterType::Uptime:
case FormatterType::UptimeCustom: case FormatterType::UptimeCustom:
@ -161,27 +161,26 @@ QString AWKeysAggregator::formatter(const QVariant &data,
int minutes = seconds / 60 % 60; int minutes = seconds / 60 % 60;
int hours = ((seconds / 60) - minutes) / 60 % 24; int hours = ((seconds / 60) - minutes) / 60 % 24;
int days = (((seconds / 60) - minutes) / 60 - hours) / 24; int days = (((seconds / 60) - minutes) / 60 - hours) / 24;
source.replace(QString("$dd"), source.replace("$dd",
QString("%1").arg(days, 3, 10, QChar('0'))); QString("%1").arg(days, 3, 10, QChar('0')));
source.replace(QString("$d"), QString("%1").arg(days)); source.replace("$d", QString("%1").arg(days));
source.replace(QString("$hh"), source.replace("$hh",
QString("%1").arg(hours, 2, 10, QChar('0'))); QString("%1").arg(hours, 2, 10, QChar('0')));
source.replace(QString("$h"), QString("%1").arg(hours)); source.replace("$h", QString("%1").arg(hours));
source.replace(QString("$mm"), source.replace("$mm",
QString("%1").arg(minutes, 2, 10, QChar('0'))); QString("%1").arg(minutes, 2, 10, QChar('0')));
source.replace(QString("$m"), QString("%1").arg(minutes)); source.replace("$m", QString("%1").arg(minutes));
return source; return source;
}(m_formatter[key] == FormatterType::Uptime }(m_formatter[_key] == FormatterType::Uptime ? "$ddd$hhh$mmm"
? QString("$ddd$hhh$mmm")
: m_customUptime, : m_customUptime,
static_cast<int>(data.toFloat())); static_cast<int>(_data.toFloat()));
break; break;
case FormatterType::NoFormat: case FormatterType::NoFormat:
output = data.toString(); output = _data.toString();
break; break;
case FormatterType::Custom: case FormatterType::Custom:
if (m_customFormatters) if (m_customFormatters)
output = m_customFormatters->convert(data, key); output = m_customFormatters->convert(_data, _key);
break; break;
} }
@ -189,176 +188,176 @@ QString AWKeysAggregator::formatter(const QVariant &data,
} }
QStringList AWKeysAggregator::keysFromSource(const QString &source) const QStringList AWKeysAggregator::keysFromSource(const QString &_source) const
{ {
qCDebug(LOG_AW) << "Search for source" << source; qCDebug(LOG_AW) << "Search for source" << _source;
return m_map.values(source); return m_map.values(_source);
} }
void AWKeysAggregator::setAcOffline(const QString inactive) void AWKeysAggregator::setAcOffline(const QString &_inactive)
{ {
qCDebug(LOG_AW) << "Inactive AC string" << inactive; qCDebug(LOG_AW) << "Inactive AC string" << _inactive;
m_acOffline = inactive; m_acOffline = _inactive;
} }
void AWKeysAggregator::setAcOnline(const QString active) void AWKeysAggregator::setAcOnline(const QString &_active)
{ {
qCDebug(LOG_AW) << "Active AC string" << active; qCDebug(LOG_AW) << "Active AC string" << _active;
m_acOnline = active; m_acOnline = _active;
} }
void AWKeysAggregator::setCustomTime(const QString customTime) void AWKeysAggregator::setCustomTime(const QString &_customTime)
{ {
qCDebug(LOG_AW) << "Format" << customTime; qCDebug(LOG_AW) << "Format" << _customTime;
m_customTime = customTime; m_customTime = _customTime;
} }
void AWKeysAggregator::setCustomUptime(const QString customUptime) void AWKeysAggregator::setCustomUptime(const QString &_customUptime)
{ {
qCDebug(LOG_AW) << "Format" << customUptime; qCDebug(LOG_AW) << "Format" << _customUptime;
m_customUptime = customUptime; m_customUptime = _customUptime;
} }
void AWKeysAggregator::setDevices(const QHash<QString, QStringList> devices) void AWKeysAggregator::setDevices(const QHash<QString, QStringList> &_devices)
{ {
qCDebug(LOG_AW) << "Devices" << devices; qCDebug(LOG_AW) << "Devices" << _devices;
m_devices = devices; m_devices = _devices;
} }
void AWKeysAggregator::setTempUnits(const QString units) void AWKeysAggregator::setTempUnits(const QString &_units)
{ {
qCDebug(LOG_AW) << "Units" << units; qCDebug(LOG_AW) << "Units" << _units;
m_tempUnits = units; m_tempUnits = _units;
} }
void AWKeysAggregator::setTranslate(const bool translate) void AWKeysAggregator::setTranslate(const bool _translate)
{ {
qCDebug(LOG_AW) << "Translate" << translate; qCDebug(LOG_AW) << "Translate" << _translate;
m_translate = translate; m_translate = _translate;
} }
// HACK units required to define should the value be calculated as temperature // HACK units required to define should the value be calculated as temperature
// or fan data // or fan data
QStringList AWKeysAggregator::registerSource(const QString &source, QStringList AWKeysAggregator::registerSource(const QString &_source,
const QString &units, const QString &_units,
const QStringList &keys) const QStringList &_keys)
{ {
qCDebug(LOG_AW) << "Source" << source << "with units" << units; qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
// regular expressions // regular expressions
QRegExp cpuRegExp = QRegExp(QString("cpu/cpu.*/TotalLoad")); QRegExp cpuRegExp = QRegExp("cpu/cpu.*/TotalLoad");
QRegExp cpuclRegExp = QRegExp(QString("cpu/cpu.*/clock")); QRegExp cpuclRegExp = QRegExp("cpu/cpu.*/clock");
QRegExp hddrRegExp = QRegExp(QString("disk/.*/Rate/rblk")); QRegExp hddrRegExp = QRegExp("disk/.*/Rate/rblk");
QRegExp hddwRegExp = QRegExp(QString("disk/.*/Rate/wblk")); QRegExp hddwRegExp = QRegExp("disk/.*/Rate/wblk");
QRegExp mountFillRegExp = QRegExp(QString("partitions/.*/filllevel")); QRegExp mountFillRegExp = QRegExp("partitions/.*/filllevel");
QRegExp mountFreeRegExp = QRegExp(QString("partitions/.*/freespace")); QRegExp mountFreeRegExp = QRegExp("partitions/.*/freespace");
QRegExp mountUsedRegExp = QRegExp(QString("partitions/.*/usedspace")); QRegExp mountUsedRegExp = QRegExp("partitions/.*/usedspace");
QRegExp netRegExp = QRegExp( QRegExp netRegExp
QString("network/interfaces/.*/(receiver|transmitter)/data$")); = QRegExp("network/interfaces/.*/(receiver|transmitter)/data$");
QRegExp netTotalRegExp = QRegExp( QRegExp netTotalRegExp
QString("network/interfaces/.*/(receiver|transmitter)/dataTotal$")); = QRegExp("network/interfaces/.*/(receiver|transmitter)/dataTotal$");
if (source == QString("battery/ac")) { if (_source == "battery/ac") {
// AC // AC
m_map[source] = QString("ac"); m_map[_source] = "ac";
m_formatter[QString("ac")] = FormatterType::ACFormat; m_formatter["ac"] = FormatterType::ACFormat;
} else if (source.startsWith(QString("battery/"))) { } else if (_source.startsWith("battery/")) {
// battery stats // battery stats
QString key = source; QString key = _source;
key.remove(QString("battery/")); key.remove("battery/");
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::IntegerThree; m_formatter[key] = FormatterType::IntegerThree;
} else if (source == QString("cpu/system/TotalLoad")) { } else if (_source == "cpu/system/TotalLoad") {
// cpu // cpu
m_map[source] = QString("cpu"); m_map[_source] = "cpu";
m_formatter[QString("cpu")] = FormatterType::Float; m_formatter["cpu"] = FormatterType::Float;
} else if (source.contains(cpuRegExp)) { } else if (_source.contains(cpuRegExp)) {
// cpus // cpus
QString key = source; QString key = _source;
key.remove(QString("cpu/")).remove(QString("/TotalLoad")); key.remove("cpu/").remove("/TotalLoad");
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::Float; m_formatter[key] = FormatterType::Float;
} else if (source == QString("cpu/system/AverageClock")) { } else if (_source == "cpu/system/AverageClock") {
// cpucl // cpucl
m_map[source] = QString("cpucl"); m_map[_source] = "cpucl";
m_formatter[QString("cpucl")] = FormatterType::Integer; m_formatter["cpucl"] = FormatterType::Integer;
} else if (source.contains(cpuclRegExp)) { } else if (_source.contains(cpuclRegExp)) {
// cpucls // cpucls
QString key = source; QString key = _source;
key.remove(QString("cpu/cpu")).remove(QString("/clock")); key.remove("cpu/cpu").remove("/clock");
key = QString("cpucl%1").arg(key); key = QString("cpucl%1").arg(key);
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::Integer; m_formatter[key] = FormatterType::Integer;
} else if (source.startsWith(QString("custom"))) { } else if (_source.startsWith("custom")) {
// custom // custom
QString key = source; QString key = _source;
key.remove(QString("custom/")); key.remove("custom/");
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::NoFormat; m_formatter[key] = FormatterType::NoFormat;
} else if (source == QString("desktop/current/name")) { } else if (_source == "desktop/current/name") {
// current desktop name // current desktop name
m_map[source] = QString("desktop"); m_map[_source] = "desktop";
m_formatter[QString("desktop")] = FormatterType::NoFormat; m_formatter["desktop"] = FormatterType::NoFormat;
} else if (source == QString("desktop/current/number")) { } else if (_source == "desktop/current/number") {
// current desktop number // current desktop number
m_map[source] = QString("ndesktop"); m_map[_source] = "ndesktop";
m_formatter[QString("ndesktop")] = FormatterType::NoFormat; m_formatter["ndesktop"] = FormatterType::NoFormat;
} else if (source == QString("desktop/total/number")) { } else if (_source == "desktop/total/number") {
// desktop count // desktop count
m_map[source] = QString("tdesktops"); m_map[_source] = "tdesktops";
m_formatter[QString("tdesktops")] = FormatterType::NoFormat; m_formatter["tdesktops"] = FormatterType::NoFormat;
} else if (source.contains(hddrRegExp)) { } else if (_source.contains(hddrRegExp)) {
// read speed // read speed
QString device = source; QString device = _source;
device.remove(QString("/Rate/rblk")); device.remove("/Rate/rblk");
int index = m_devices[QString("disk")].indexOf(device); int index = m_devices["disk"].indexOf(device);
if (index > -1) { if (index > -1) {
QString key = QString("hddr%1").arg(index); QString key = QString("hddr%1").arg(index);
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::Integer; m_formatter[key] = FormatterType::Integer;
} }
} else if (source.contains(hddwRegExp)) { } else if (_source.contains(hddwRegExp)) {
// write speed // write speed
QString device = source; QString device = _source;
device.remove(QString("/Rate/wblk")); device.remove("/Rate/wblk");
int index = m_devices[QString("disk")].indexOf(device); int index = m_devices["disk"].indexOf(device);
if (index > -1) { if (index > -1) {
QString key = QString("hddw%1").arg(index); QString key = QString("hddw%1").arg(index);
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::Integer; m_formatter[key] = FormatterType::Integer;
} }
} else if (source == QString("gpu/load")) { } else if (_source == "gpu/load") {
// gpu load // gpu load
m_map[source] = QString("gpu"); m_map[_source] = "gpu";
m_formatter[QString("gpu")] = FormatterType::Float; m_formatter["gpu"] = FormatterType::Float;
} else if (source == QString("gpu/temperature")) { } else if (_source == "gpu/temperature") {
// gpu temperature // gpu temperature
m_map[source] = QString("gputemp"); m_map[_source] = "gputemp";
m_formatter[QString("gputemp")] = FormatterType::Temperature; m_formatter["gputemp"] = FormatterType::Temperature;
} else if (source.contains(mountFillRegExp)) { } else if (_source.contains(mountFillRegExp)) {
// fill level // fill level
QString device = source; QString device = _source;
device.remove(QString("partitions")).remove(QString("/filllevel")); device.remove("partitions").remove("/filllevel");
int index = m_devices[QString("mount")].indexOf(device); int index = m_devices["mount"].indexOf(device);
if (index > -1) { if (index > -1) {
QString key = QString("hdd%1").arg(index); QString key = QString("hdd%1").arg(index);
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::Float; m_formatter[key] = FormatterType::Float;
// additional keys // additional keys
m_formatter[QString("hddtotmb%1").arg(index)] m_formatter[QString("hddtotmb%1").arg(index)]
@ -366,229 +365,224 @@ QStringList AWKeysAggregator::registerSource(const QString &source,
m_formatter[QString("hddtotgb%1").arg(index)] m_formatter[QString("hddtotgb%1").arg(index)]
= FormatterType::MemGBFormat; = FormatterType::MemGBFormat;
} }
} else if (source.contains(mountFreeRegExp)) { } else if (_source.contains(mountFreeRegExp)) {
// free space // free space
QString device = source; QString device = _source;
device.remove(QString("partitions")).remove(QString("/freespace")); device.remove("partitions").remove("/freespace");
int index = m_devices[QString("mount")].indexOf(device); int index = m_devices["mount"].indexOf(device);
if (index > -1) { if (index > -1) {
// mb // mb
QString key = QString("hddfreemb%1").arg(index); QString key = QString("hddfreemb%1").arg(index);
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::MemMBFormat; m_formatter[key] = FormatterType::MemMBFormat;
// gb // gb
key = QString("hddfreegb%1").arg(index); key = QString("hddfreegb%1").arg(index);
m_map.insertMulti(source, key); m_map.insertMulti(_source, key);
m_formatter[key] = FormatterType::MemGBFormat; m_formatter[key] = FormatterType::MemGBFormat;
} }
} else if (source.contains(mountUsedRegExp)) { } else if (_source.contains(mountUsedRegExp)) {
// used // used
QString device = source; QString device = _source;
device.remove(QString("partitions")).remove(QString("/usedspace")); device.remove("partitions").remove("/usedspace");
int index = m_devices[QString("mount")].indexOf(device); int index = m_devices["mount"].indexOf(device);
if (index > -1) { if (index > -1) {
// mb // mb
QString key = QString("hddmb%1").arg(index); QString key = QString("hddmb%1").arg(index);
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::MemMBFormat; m_formatter[key] = FormatterType::MemMBFormat;
// gb // gb
key = QString("hddgb%1").arg(index); key = QString("hddgb%1").arg(index);
m_map.insertMulti(source, key); m_map.insertMulti(_source, key);
m_formatter[key] = FormatterType::MemGBFormat; m_formatter[key] = FormatterType::MemGBFormat;
} }
} else if (source.startsWith(QString("hdd/temperature"))) { } else if (_source.startsWith("hdd/temperature")) {
// hdd temperature // hdd temperature
QString device = source; QString device = _source;
device.remove(QString("hdd/temperature")); device.remove("hdd/temperature");
int index = m_devices[QString("hdd")].indexOf(device); int index = m_devices["hdd"].indexOf(device);
if (index > -1) { if (index > -1) {
QString key = QString("hddtemp%1").arg(index); QString key = QString("hddtemp%1").arg(index);
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::Temperature; m_formatter[key] = FormatterType::Temperature;
} }
} else if (source.startsWith(QString("cpu/system/loadavg"))) { } else if (_source.startsWith("cpu/system/loadavg")) {
// load average // load average
QString time = source; QString time = _source;
time.remove(QString("cpu/system/loadavg")); time.remove("cpu/system/loadavg");
QString key = QString("la%1").arg(time); QString key = QString("la%1").arg(time);
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::FloatTwoSymbols; m_formatter[key] = FormatterType::FloatTwoSymbols;
} else if (source == QString("mem/physical/application")) { } else if (_source == "mem/physical/application") {
// app memory // app memory
// mb // mb
m_map[source] = QString("memmb"); m_map[_source] = "memmb";
m_formatter[QString("memmb")] = FormatterType::MemMBFormat; m_formatter["memmb"] = FormatterType::MemMBFormat;
// gb // gb
m_map.insertMulti(source, QString("memgb")); m_map.insertMulti(_source, "memgb");
m_formatter[QString("memgb")] = FormatterType::MemGBFormat; m_formatter["memgb"] = FormatterType::MemGBFormat;
} else if (source == QString("mem/physical/free")) { } else if (_source == "mem/physical/free") {
// free memory // free memory
// mb // mb
m_map[source] = QString("memfreemb"); m_map[_source] = "memfreemb";
m_formatter[QString("memfreemb")] = FormatterType::MemMBFormat; m_formatter["memfreemb"] = FormatterType::MemMBFormat;
// gb // gb
m_map.insertMulti(source, QString("memfreegb")); m_map.insertMulti(_source, "memfreegb");
m_formatter[QString("memfreegb")] = FormatterType::MemGBFormat; m_formatter["memfreegb"] = FormatterType::MemGBFormat;
} else if (source == QString("mem/physical/used")) { } else if (_source == "mem/physical/used") {
// used memory // used memory
// mb // mb
m_map[source] = QString("memusedmb"); m_map[_source] = "memusedmb";
m_formatter[QString("memusedmb")] = FormatterType::MemMBFormat; m_formatter["memusedmb"] = FormatterType::MemMBFormat;
// gb // gb
m_map.insertMulti(source, QString("memusedgb")); m_map.insertMulti(_source, "memusedgb");
m_formatter[QString("memusedgb")] = FormatterType::MemGBFormat; m_formatter["memusedgb"] = FormatterType::MemGBFormat;
} else if (source == QString("network/current/name")) { } else if (_source == "network/current/name") {
// network device // network device
m_map[source] = QString("netdev"); m_map[_source] = "netdev";
m_formatter[QString("netdev")] = FormatterType::NoFormat; m_formatter["netdev"] = FormatterType::NoFormat;
} else if (source.startsWith(QString("network/response"))) { } else if (_source.startsWith("network/response")) {
// network response // network response
QString key = source; QString key = _source;
key.remove(QString("network/")); key.remove("network/");
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::NoFormat; m_formatter[key] = FormatterType::NoFormat;
} else if (source.contains(netRegExp)) { } else if (_source.contains(netRegExp)) {
// network speed // network speed
QString type = source.contains(QString("receiver")) ? QString("down") QString type = _source.contains("receiver") ? "down" : "up";
: QString("up"); int index = m_devices["net"].indexOf(_source.split('/')[2]);
int index
= m_devices[QString("net")].indexOf(source.split(QChar('/'))[2]);
if (index > -1) { if (index > -1) {
// kb // kb
QString key = QString("%1kb%2").arg(type).arg(index); QString key = QString("%1kb%2").arg(type).arg(index);
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::Integer; m_formatter[key] = FormatterType::Integer;
// smart // smart
key = QString("%1%2").arg(type).arg(index); key = QString("%1%2").arg(type).arg(index);
m_map.insertMulti(source, key); m_map.insertMulti(_source, key);
m_formatter[key] = FormatterType::NetSmartFormat; m_formatter[key] = FormatterType::NetSmartFormat;
// units // units
key = QString("%1units%2").arg(type).arg(index); key = QString("%1units%2").arg(type).arg(index);
m_map.insertMulti(source, key); m_map.insertMulti(_source, key);
m_formatter[key] = FormatterType::NetSmartUnits; m_formatter[key] = FormatterType::NetSmartUnits;
} }
} else if (source.contains(netTotalRegExp)) { } else if (_source.contains(netTotalRegExp)) {
// network data total // network data total
QString type = source.contains(QString("receiver")) ? QString("down") QString type = _source.contains("receiver") ? "down" : "up";
: QString("up"); int index = m_devices["net"].indexOf(_source.split('/')[2]);
int index
= m_devices[QString("net")].indexOf(source.split(QChar('/'))[2]);
if (index > -1) { if (index > -1) {
// kb // kb
QString key = QString("%1totalkb%2").arg(type).arg(index); QString key = QString("%1totalkb%2").arg(type).arg(index);
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::Integer; m_formatter[key] = FormatterType::Integer;
// mb // mb
key = QString("%1total%2").arg(type).arg(index); key = QString("%1total%2").arg(type).arg(index);
m_map.insertMulti(source, key); m_map.insertMulti(_source, key);
m_formatter[key] = FormatterType::MemMBFormat; m_formatter[key] = FormatterType::MemMBFormat;
} }
} else if (source.startsWith(QString("upgrade"))) { } else if (_source.startsWith("upgrade")) {
// package manager // package manager
QString key = source; QString key = _source;
key.remove(QString("upgrade/")); key.remove("upgrade/");
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::IntegerThree; m_formatter[key] = FormatterType::IntegerThree;
} else if (source.startsWith(QString("player"))) { } else if (_source.startsWith("player")) {
// player // player
QString key = source; QString key = _source;
key.remove(QString("player/")); key.remove("player/");
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::NoFormat; m_formatter[key] = FormatterType::NoFormat;
} else if (source == QString("ps/running/count")) { } else if (_source == "ps/running/count") {
// running processes count // running processes count
m_map[source] = QString("pscount"); m_map[_source] = "pscount";
m_formatter[QString("pscount")] = FormatterType::NoFormat; m_formatter["pscount"] = FormatterType::NoFormat;
} else if (source == QString("ps/running/list")) { } else if (_source == "ps/running/list") {
// list of running processes // list of running processes
m_map[source] = QString("ps"); m_map[_source] = "ps";
m_formatter[QString("ps")] = FormatterType::List; m_formatter["ps"] = FormatterType::List;
} else if (source == QString("ps/total/count")) { } else if (_source == "ps/total/count") {
// total processes count // total processes count
m_map[source] = QString("pstotal"); m_map[_source] = "pstotal";
m_formatter[QString("pstotal")] = FormatterType::NoFormat; m_formatter["pstotal"] = FormatterType::NoFormat;
} else if (source.startsWith(QString("quotes"))) { } else if (_source.startsWith("quotes")) {
// quotes // quotes
QString key = source; QString key = _source;
key.remove(QString("quotes/")); key.remove("quotes/");
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::Quotes; m_formatter[key] = FormatterType::Quotes;
} else if (source == QString("mem/swap/free")) { } else if (_source == "mem/swap/free") {
// free swap // free swap
// mb // mb
m_map[source] = QString("swapfreemb"); m_map[_source] = "swapfreemb";
m_formatter[QString("swapfreemb")] = FormatterType::MemMBFormat; m_formatter["swapfreemb"] = FormatterType::MemMBFormat;
// gb // gb
m_map.insertMulti(source, QString("swapfreegb")); m_map.insertMulti(_source, "swapfreegb");
m_formatter[QString("swapfreegb")] = FormatterType::MemGBFormat; m_formatter["swapfreegb"] = FormatterType::MemGBFormat;
} else if (source == QString("mem/swap/used")) { } else if (_source == "mem/swap/used") {
// used swap // used swap
// mb // mb
m_map[source] = QString("swapmb"); m_map[_source] = "swapmb";
m_formatter[QString("swapmb")] = FormatterType::MemMBFormat; m_formatter["swapmb"] = FormatterType::MemMBFormat;
// gb // gb
m_map.insertMulti(source, QString("swapgb")); m_map.insertMulti(_source, "swapgb");
m_formatter[QString("swapgb")] = FormatterType::MemGBFormat; m_formatter["swapgb"] = FormatterType::MemGBFormat;
} else if (source.startsWith(QString("lmsensors/"))) { } else if (_source.startsWith("lmsensors/")) {
// temperature // temperature
int index = m_devices[QString("temp")].indexOf(source); int index = m_devices["temp"].indexOf(_source);
// HACK on DE initialization there are no units key // HACK on DE initialization there are no units key
if (units.isEmpty()) if (_units.isEmpty())
return QStringList() << QString("temp%1").arg(index); return QStringList({QString("temp%1").arg(index)});
if (index > -1) { if (index > -1) {
QString key = QString("temp%1").arg(index); QString key = QString("temp%1").arg(index);
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = units == QString("°C") m_formatter[key] = _units == "°C" ? FormatterType::Temperature
? FormatterType::Temperature
: FormatterType::Integer; : FormatterType::Integer;
} }
} else if (source == QString("Local")) { } else if (_source == "Local") {
// time // time
m_map[source] = QString("time"); m_map[_source] = "time";
m_formatter[QString("time")] = FormatterType::Time; m_formatter["time"] = FormatterType::Time;
// custom time // custom time
m_map.insertMulti(source, QString("ctime")); m_map.insertMulti(_source, "ctime");
m_formatter[QString("ctime")] = FormatterType::TimeCustom; m_formatter["ctime"] = FormatterType::TimeCustom;
// ISO time // ISO time
m_map.insertMulti(source, QString("isotime")); m_map.insertMulti(_source, "isotime");
m_formatter[QString("isotime")] = FormatterType::TimeISO; m_formatter["isotime"] = FormatterType::TimeISO;
// long time // long time
m_map.insertMulti(source, QString("longtime")); m_map.insertMulti(_source, "longtime");
m_formatter[QString("longtime")] = FormatterType::TimeLong; m_formatter["longtime"] = FormatterType::TimeLong;
// short time // short time
m_map.insertMulti(source, QString("shorttime")); m_map.insertMulti(_source, "shorttime");
m_formatter[QString("shorttime")] = FormatterType::TimeShort; m_formatter["shorttime"] = FormatterType::TimeShort;
// timestamp // timestamp
m_map.insertMulti(source, QString("tstime")); m_map.insertMulti(_source, "tstime");
m_formatter[QString("tstime")] = FormatterType::Timestamp; m_formatter["tstime"] = FormatterType::Timestamp;
} else if (source == QString("system/uptime")) { } else if (_source == "system/uptime") {
// uptime // uptime
m_map[source] = QString("uptime"); m_map[_source] = "uptime";
m_formatter[QString("uptime")] = FormatterType::Uptime; m_formatter["uptime"] = FormatterType::Uptime;
// custom uptime // custom uptime
m_map.insertMulti(source, QString("cuptime")); m_map.insertMulti(_source, "cuptime");
m_formatter[QString("cuptime")] = FormatterType::UptimeCustom; m_formatter["cuptime"] = FormatterType::UptimeCustom;
} else if (source.startsWith(QString("weather/temperature"))) { } else if (_source.startsWith("weather/temperature")) {
// temperature // temperature
QString key = source; QString key = _source;
key.remove(QString("weather/")); key.remove("weather/");
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::Temperature; m_formatter[key] = FormatterType::Temperature;
} else if (source.startsWith(QString("weather/"))) { } else if (_source.startsWith("weather/")) {
// other weather // other weather
QString key = source; QString key = _source;
key.remove(QString("weather/")); key.remove("weather/");
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::NoFormat; m_formatter[key] = FormatterType::NoFormat;
} else if (source.startsWith(QString("load/load"))) { } else if (_source.startsWith("load/load")) {
// load source // load source
QString key = source; QString key = _source;
key.remove(QString("load/")); key.remove("load/");
m_map[source] = key; m_map[_source] = key;
m_formatter[key] = FormatterType::Temperature; m_formatter[key] = FormatterType::Temperature;
} }
QStringList foundKeys = keysFromSource(source); QStringList foundKeys = keysFromSource(_source);
// rewrite formatters for custom ones // rewrite formatters for custom ones
QStringList customFormattersKeys; QStringList customFormattersKeys;
@ -596,26 +590,26 @@ QStringList AWKeysAggregator::registerSource(const QString &source,
customFormattersKeys = m_customFormatters->definedFormatters(); customFormattersKeys = m_customFormatters->definedFormatters();
qCInfo(LOG_AW) << "Looking for fprmatters" << foundKeys << "in" qCInfo(LOG_AW) << "Looking for fprmatters" << foundKeys << "in"
<< customFormattersKeys; << customFormattersKeys;
for (auto key : foundKeys) { for (auto &key : foundKeys) {
if (!customFormattersKeys.contains(key)) if (!customFormattersKeys.contains(key))
continue; continue;
m_formatter[key] = FormatterType::Custom; m_formatter[key] = FormatterType::Custom;
} }
// drop key from dictionary if no one user requested key required it // drop key from dictionary if no one user requested key required it
qCInfo(LOG_AW) << "Looking for keys" << foundKeys << "in" << keys; qCInfo(LOG_AW) << "Looking for keys" << foundKeys << "in" << _keys;
bool required bool required
= keys.isEmpty() || std::any_of(foundKeys.cbegin(), foundKeys.cend(), = _keys.isEmpty() || std::any_of(foundKeys.cbegin(), foundKeys.cend(),
[&keys](const QString &key) { [&_keys](const QString &key) {
return keys.contains(key); return _keys.contains(key);
}); });
if (!required) { if (!required) {
m_map.remove(source); m_map.remove(_source);
for (auto key : foundKeys) for (auto &key : foundKeys)
m_formatter.remove(key); m_formatter.remove(key);
} }
return keysFromSource(source); return keysFromSource(_source);
} }
@ -624,18 +618,18 @@ float AWKeysAggregator::temperature(const float temp) const
qCDebug(LOG_AW) << "Temperature value" << temp; qCDebug(LOG_AW) << "Temperature value" << temp;
float converted = temp; float converted = temp;
if (m_tempUnits == QString("Celsius")) { if (m_tempUnits == "Celsius") {
} else if (m_tempUnits == QString("Fahrenheit")) { } else if (m_tempUnits == "Fahrenheit") {
converted = temp * 9.0f / 5.0f + 32.0f; converted = temp * 9.0f / 5.0f + 32.0f;
} else if (m_tempUnits == QString("Kelvin")) { } else if (m_tempUnits == "Kelvin") {
converted = temp + 273.15f; converted = temp + 273.15f;
} else if (m_tempUnits == QString("Reaumur")) { } else if (m_tempUnits == "Reaumur") {
converted = temp * 0.8f; converted = temp * 0.8f;
} else if (m_tempUnits == QString("cm^-1")) { } else if (m_tempUnits == "cm^-1") {
converted = (temp + 273.15f) * 0.695f; converted = (temp + 273.15f) * 0.695f;
} else if (m_tempUnits == QString("kJ/mol")) { } else if (m_tempUnits == "kJ/mol") {
converted = (temp + 273.15f) * 8.31f; converted = (temp + 273.15f) * 8.31f;
} else if (m_tempUnits == QString("kcal/mol")) { } else if (m_tempUnits == "kcal/mol") {
converted = (temp + 273.15f) * 1.98f; converted = (temp + 273.15f) * 1.98f;
} else { } else {
qCWarning(LOG_AW) << "Invalid units" << m_tempUnits; qCWarning(LOG_AW) << "Invalid units" << m_tempUnits;

26
sources/awesome-widget/plugin/awkeysaggregator.h
View File

@ -67,29 +67,29 @@ class AWKeysAggregator : public QObject
}; };
public: public:
explicit AWKeysAggregator(QObject *parent = nullptr); explicit AWKeysAggregator(QObject *_parent = nullptr);
virtual ~AWKeysAggregator(); virtual ~AWKeysAggregator();
void initFormatters(); void initFormatters();
// get methods // get methods
QString formatter(const QVariant &data, const QString &key) const; QString formatter(const QVariant &_data, const QString &_key) const;
QStringList keysFromSource(const QString &source) const; QStringList keysFromSource(const QString &_source) const;
// set methods // set methods
void setAcOffline(const QString inactive); void setAcOffline(const QString &_inactive);
void setAcOnline(const QString active); void setAcOnline(const QString &_active);
void setCustomTime(const QString customTime); void setCustomTime(const QString &_customTime);
void setCustomUptime(const QString customUptime); void setCustomUptime(const QString &_customUptime);
void setDevices(const QHash<QString, QStringList> devices); void setDevices(const QHash<QString, QStringList> &_devices);
void setTempUnits(const QString units); void setTempUnits(const QString &_units);
void setTranslate(const bool translate); void setTranslate(const bool _translate);
public slots: public slots:
QStringList registerSource(const QString &source, const QString &units, QStringList registerSource(const QString &_source, const QString &_units,
const QStringList &keys); const QStringList &_keys);
private: private:
float temperature(const float temp) const; float temperature(const float temp) const;
AWFormatterHelper *m_customFormatters = nullptr; AWFormatterHelper *m_customFormatters = nullptr;
QStringList m_timeKeys = QString(TIME_KEYS).split(QChar(',')); QStringList m_timeKeys = QString(TIME_KEYS).split(',');
// variables // variables
QString m_acOffline; QString m_acOffline;
QString m_acOnline; QString m_acOnline;

187
sources/awesome-widget/plugin/awpatternfunctions.cpp
View File

@ -24,52 +24,51 @@
#include "awkeysaggregator.h" #include "awkeysaggregator.h"
QString AWPatternFunctions::expandLambdas(QString code, QString AWPatternFunctions::expandLambdas(QString _code,
AWKeysAggregator *aggregator, AWKeysAggregator *_aggregator,
const QVariantHash &metadata, const QVariantHash &_metadata,
const QStringList &usedKeys) const QStringList &_usedKeys)
{ {
qCDebug(LOG_AW) << "Expand lamdas in" << code; qCDebug(LOG_AW) << "Expand lamdas in" << _code;
QJSEngine engine; QJSEngine engine;
// apply $this values // apply $this values
code.replace(QString("$this"), metadata[code].toString()); _code.replace("$this", _metadata[_code].toString());
// parsed values // parsed values
for (auto lambdaKey : usedKeys) for (auto &lambdaKey : _usedKeys)
code.replace(QString("$%1").arg(lambdaKey), _code.replace(QString("$%1").arg(lambdaKey),
aggregator->formatter(metadata[lambdaKey], lambdaKey)); _aggregator->formatter(_metadata[lambdaKey], lambdaKey));
qCInfo(LOG_AW) << "Expression" << code; qCInfo(LOG_AW) << "Expression" << _code;
QJSValue result = engine.evaluate(code); QJSValue result = engine.evaluate(_code);
if (result.isError()) { if (result.isError()) {
qCWarning(LOG_AW) << "Uncaught exception at line" qCWarning(LOG_AW) << "Uncaught exception at line"
<< result.property("lineNumber").toInt() << ":" << result.property("lineNumber").toInt() << ":"
<< result.toString(); << result.toString();
return QString(); return "";
} else { } else {
return result.toString(); return result.toString();
} }
} }
QString AWPatternFunctions::expandTemplates(QString code) QString AWPatternFunctions::expandTemplates(QString _code)
{ {
qCDebug(LOG_AW) << "Expand templates in" << code; qCDebug(LOG_AW) << "Expand templates in" << _code;
// match the following construction $template{{some code here}} // match the following construction $template{{some code here}}
QRegularExpression templatesRegexp( QRegularExpression templatesRegexp("\\$template\\{\\{(?<body>.*?)\\}\\}");
QString("\\$template\\{\\{(?<body>.*?)\\}\\}"));
templatesRegexp.setPatternOptions( templatesRegexp.setPatternOptions(
QRegularExpression::DotMatchesEverythingOption); QRegularExpression::DotMatchesEverythingOption);
QRegularExpressionMatchIterator it = templatesRegexp.globalMatch(code); QRegularExpressionMatchIterator it = templatesRegexp.globalMatch(_code);
while (it.hasNext()) { while (it.hasNext()) {
QRegularExpressionMatch match = it.next(); QRegularExpressionMatch match = it.next();
QString body = match.captured(QString("body")); QString body = match.captured("body");
QJSEngine engine; QJSEngine engine;
qCInfo(LOG_AW) << "Expression" << body; qCInfo(LOG_AW) << "Expression" << body;
QJSValue result = engine.evaluate(body); QJSValue result = engine.evaluate(body);
QString templateResult = QString(""); QString templateResult = "";
if (result.isError()) { if (result.isError()) {
qCWarning(LOG_AW) << "Uncaught exception at line" qCWarning(LOG_AW) << "Uncaught exception at line"
<< result.property("lineNumber").toInt() << ":" << result.property("lineNumber").toInt() << ":"
@ -79,18 +78,18 @@ QString AWPatternFunctions::expandTemplates(QString code)
} }
// replace template // replace template
code.replace(match.captured(), templateResult); _code.replace(match.captured(), templateResult);
} }
return code; return _code;
} }
QList<AWPatternFunctions::AWFunction> QList<AWPatternFunctions::AWFunction>
AWPatternFunctions::findFunctionCalls(const QString function, AWPatternFunctions::findFunctionCalls(const QString &_function,
const QString code) const QString &_code)
{ {
qCDebug(LOG_AW) << "Looking for function" << function << "in" << code; qCDebug(LOG_AW) << "Looking for function" << _function << "in" << _code;
// I suggest the following regex for the internal functions // I suggest the following regex for the internal functions
// $aw_function_name<some args here if any>{{function body}} // $aw_function_name<some args here if any>{{function body}}
@ -100,34 +99,34 @@ AWPatternFunctions::findFunctionCalls(const QString function,
// by using $, e.g. ${ // by using $, e.g. ${
QRegularExpression regex( QRegularExpression regex(
QString("\\$%1\\<(?<args>.*?)\\>\\{\\{(?<body>.*?)\\}\\}") QString("\\$%1\\<(?<args>.*?)\\>\\{\\{(?<body>.*?)\\}\\}")
.arg(function)); .arg(_function));
regex.setPatternOptions(QRegularExpression::DotMatchesEverythingOption); regex.setPatternOptions(QRegularExpression::DotMatchesEverythingOption);
QList<AWPatternFunctions::AWFunction> foundFunctions; QList<AWPatternFunctions::AWFunction> foundFunctions;
QRegularExpressionMatchIterator it = regex.globalMatch(code); QRegularExpressionMatchIterator it = regex.globalMatch(_code);
while (it.hasNext()) { while (it.hasNext()) {
QRegularExpressionMatch match = it.next(); QRegularExpressionMatch match = it.next();
AWPatternFunctions::AWFunction metadata; AWPatternFunctions::AWFunction metadata;
// work with args // work with args
QString argsString = match.captured(QString("args")); QString argsString = match.captured("args");
if (argsString.isEmpty()) { if (argsString.isEmpty()) {
metadata.args = QStringList(); metadata.args = QStringList();
} else { } else {
// replace '$,' to 0x1d // replace '$,' to 0x1d
argsString.replace(QString("$,"), QString(0x1d)); argsString.replace("$,", QString(0x1d));
QStringList args = argsString.split(QChar(',')); QStringList args = argsString.split(',');
std::for_each(args.begin(), args.end(), [](QString &arg) { std::for_each(args.begin(), args.end(), [](QString &arg) {
arg.replace(QString(0x1d), QString(",")); arg.replace(QString(0x1d), ",");
}); });
metadata.args = args; metadata.args = args;
} }
// other variables // other variables
metadata.body = match.captured(QString("body")); metadata.body = match.captured("body");
metadata.what = match.captured(); metadata.what = match.captured();
// replace brackets // replace brackets
metadata.body.replace(QString("${"), QString("{")); metadata.body.replace("${", "{");
metadata.body.replace(QString("$}"), QString("}")); metadata.body.replace("$}", "}");
foundFunctions.append(metadata); foundFunctions.append(metadata);
} }
@ -135,93 +134,93 @@ AWPatternFunctions::findFunctionCalls(const QString function,
} }
QString AWPatternFunctions::insertAllKeys(QString code, const QStringList keys) QString AWPatternFunctions::insertAllKeys(QString _code,
const QStringList &_keys)
{ {
qCDebug(LOG_AW) << "Looking for keys in code" << code << "using list" qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list"
<< keys; << _keys;
QList<AWPatternFunctions::AWFunction> found QList<AWPatternFunctions::AWFunction> found
= AWPatternFunctions::findFunctionCalls(QString("aw_all"), code); = AWPatternFunctions::findFunctionCalls("aw_all", _code);
for (auto function : found) { for (auto &function : found) {
QString separator QString separator = function.args.isEmpty() ? "," : function.args.at(0);
= function.args.isEmpty() ? QString(",") : function.args.at(0); QStringList required = _keys.filter(QRegExp(function.body));
QStringList required = keys.filter(QRegExp(function.body));
std::for_each(required.begin(), required.end(), [](QString &value) { std::for_each(required.begin(), required.end(), [](QString &value) {
value = QString("%1: $%1").arg(value); value = QString("%1: $%1").arg(value);
}); });
code.replace(function.what, required.join(separator)); _code.replace(function.what, required.join(separator));
} }
return code; return _code;
} }
QString AWPatternFunctions::insertKeyCount(QString code, const QStringList keys) QString AWPatternFunctions::insertKeyCount(QString _code,
const QStringList &_keys)
{ {
qCDebug(LOG_AW) << "Looking for count in code" << code << "using list" qCDebug(LOG_AW) << "Looking for count in code" << _code << "using list"
<< keys; << _keys;
QList<AWPatternFunctions::AWFunction> found QList<AWPatternFunctions::AWFunction> found
= AWPatternFunctions::findFunctionCalls(QString("aw_count"), code); = AWPatternFunctions::findFunctionCalls("aw_count", _code);
for (auto function : found) { for (auto &function : found) {
int count = keys.filter(QRegExp(function.body)).count(); int count = _keys.filter(QRegExp(function.body)).count();
code.replace(function.what, QString::number(count)); _code.replace(function.what, QString::number(count));
} }
return code; return _code;
} }
QString AWPatternFunctions::insertKeyNames(QString code, const QStringList keys) QString AWPatternFunctions::insertKeyNames(QString _code,
const QStringList &_keys)
{ {
qCDebug(LOG_AW) << "Looking for key names in code" << code << "using list" qCDebug(LOG_AW) << "Looking for key names in code" << _code << "using list"
<< keys; << _keys;
QList<AWPatternFunctions::AWFunction> found QList<AWPatternFunctions::AWFunction> found
= AWPatternFunctions::findFunctionCalls(QString("aw_names"), code); = AWPatternFunctions::findFunctionCalls("aw_names", _code);
for (auto function : found) { for (auto &function : found) {
QString separator QString separator = function.args.isEmpty() ? "," : function.args.at(0);
= function.args.isEmpty() ? QString(",") : function.args.at(0); QStringList required = _keys.filter(QRegExp(function.body));
QStringList required = keys.filter(QRegExp(function.body));
code.replace(function.what, required.join(separator)); _code.replace(function.what, required.join(separator));
} }
return code; return _code;
} }
QString AWPatternFunctions::insertKeys(QString code, const QStringList keys) QString AWPatternFunctions::insertKeys(QString _code, const QStringList &_keys)
{ {
qCDebug(LOG_AW) << "Looking for keys in code" << code << "using list" qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list"
<< keys; << _keys;
QList<AWPatternFunctions::AWFunction> found QList<AWPatternFunctions::AWFunction> found
= AWPatternFunctions::findFunctionCalls(QString("aw_keys"), code); = AWPatternFunctions::findFunctionCalls("aw_keys", _code);
for (auto function : found) { for (auto &function : found) {
QString separator QString separator = function.args.isEmpty() ? "," : function.args.at(0);
= function.args.isEmpty() ? QString(",") : function.args.at(0); QStringList required = _keys.filter(QRegExp(function.body));
QStringList required = keys.filter(QRegExp(function.body));
std::for_each(required.begin(), required.end(), [](QString &value) { std::for_each(required.begin(), required.end(), [](QString &value) {
value = QString("$%1").arg(value); value = QString("$%1").arg(value);
}); });
code.replace(function.what, required.join(separator)); _code.replace(function.what, required.join(separator));
} }
return code; return _code;
} }
QString AWPatternFunctions::insertMacros(QString code) QString AWPatternFunctions::insertMacros(QString _code)
{ {
qCDebug(LOG_AW) << "Looking for macros in code" << code; qCDebug(LOG_AW) << "Looking for macros in code" << _code;
QList<AWPatternFunctions::AWFunction> found QList<AWPatternFunctions::AWFunction> found
= AWPatternFunctions::findFunctionCalls(QString("aw_macro"), code); = AWPatternFunctions::findFunctionCalls("aw_macro", _code);
for (auto macro : found) { for (auto &macro : found) {
// get macro params // get macro params
if (macro.args.isEmpty()) { if (macro.args.isEmpty()) {
qCWarning(LOG_AW) << "No macro name found for" << macro.what; qCWarning(LOG_AW) << "No macro name found for" << macro.what;
@ -231,8 +230,8 @@ QString AWPatternFunctions::insertMacros(QString code)
// find macro usage // find macro usage
QList<AWPatternFunctions::AWFunction> macroUsage QList<AWPatternFunctions::AWFunction> macroUsage
= AWPatternFunctions::findFunctionCalls( = AWPatternFunctions::findFunctionCalls(
QString("aw_macro_%1").arg(name), code); QString("aw_macro_%1").arg(name), _code);
for (auto function : macroUsage) { for (auto &function : macroUsage) {
if (function.args.count() != macro.args.count()) { if (function.args.count() != macro.args.count()) {
qCWarning(LOG_AW) qCWarning(LOG_AW)
<< "Invalid args count found for call" << function.what << "Invalid args count found for call" << function.what
@ -248,31 +247,31 @@ QString AWPatternFunctions::insertMacros(QString code)
function.args.at(index)); function.args.at(index));
}); });
// do replace // do replace
code.replace(function.what, result); _code.replace(function.what, result);
} }
// remove macro from source pattern // remove macro from source pattern
code.remove(macro.what); _code.remove(macro.what);
} }
return code; return _code;
} }
QStringList AWPatternFunctions::findKeys(const QString code, QStringList AWPatternFunctions::findKeys(const QString &_code,
const QStringList keys, const QStringList &_keys,
const bool isBars) const bool _isBars)
{ {
qCDebug(LOG_AW) << "Looking for keys in code" << code << "using list" qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list"
<< keys; << _keys;
QStringList selectedKeys; QStringList selectedKeys;
QString replacedCode = code; QString replacedCode = _code;
for (auto key : keys) for (auto &key : _keys)
if ((key.startsWith(QString("bar")) == isBars) if ((key.startsWith("bar") == _isBars)
&& (replacedCode.contains(QString("$%1").arg(key)))) { && (replacedCode.contains(QString("$%1").arg(key)))) {
qCInfo(LOG_AW) << "Found key" << key << "with bar enabled" qCInfo(LOG_AW) << "Found key" << key << "with bar enabled"
<< isBars; << _isBars;
selectedKeys.append(key); selectedKeys.append(key);
replacedCode.replace(QString("$%1").arg(key), ""); replacedCode.replace(QString("$%1").arg(key), "");
} }
@ -283,20 +282,20 @@ QStringList AWPatternFunctions::findKeys(const QString code,
} }
QStringList AWPatternFunctions::findLambdas(const QString code) QStringList AWPatternFunctions::findLambdas(const QString &_code)
{ {
qCDebug(LOG_AW) << "Looking for lambdas in code" << code; qCDebug(LOG_AW) << "Looking for lambdas in code" << _code;
QStringList selectedKeys; QStringList selectedKeys;
// match the following construction ${{some code here}} // match the following construction ${{some code here}}
QRegularExpression lambdaRegexp(QString("\\$\\{\\{(?<body>.*?)\\}\\}")); QRegularExpression lambdaRegexp("\\$\\{\\{(?<body>.*?)\\}\\}");
lambdaRegexp.setPatternOptions( lambdaRegexp.setPatternOptions(
QRegularExpression::DotMatchesEverythingOption); QRegularExpression::DotMatchesEverythingOption);
QRegularExpressionMatchIterator it = lambdaRegexp.globalMatch(code); QRegularExpressionMatchIterator it = lambdaRegexp.globalMatch(_code);
while (it.hasNext()) { while (it.hasNext()) {
QRegularExpressionMatch match = it.next(); QRegularExpressionMatch match = it.next();
QString lambda = match.captured(QString("body")); QString lambda = match.captured("body");
// append // append
qCInfo(LOG_AW) << "Found lambda" << lambda; qCInfo(LOG_AW) << "Found lambda" << lambda;

27
sources/awesome-widget/plugin/awpatternfunctions.h
View File

@ -34,20 +34,21 @@ typedef struct {
} AWFunction; } AWFunction;
// insert methods // insert methods
QString expandLambdas(QString code, AWKeysAggregator *aggregator, QString expandLambdas(QString _code, AWKeysAggregator *_aggregator,
const QVariantHash &metadata, const QVariantHash &_metadata,
const QStringList &usedKeys); const QStringList &_usedKeys);
QString expandTemplates(QString code); QString expandTemplates(QString _code);
QList<AWFunction> findFunctionCalls(const QString function, const QString code); QList<AWFunction> findFunctionCalls(const QString &_function,
QString insertAllKeys(QString code, const QStringList keys); const QString &_code);
QString insertKeyCount(QString code, const QStringList keys); QString insertAllKeys(QString _code, const QStringList &_keys);
QString insertKeyNames(QString code, const QStringList keys); QString insertKeyCount(QString _code, const QStringList &_keys);
QString insertKeys(QString code, const QStringList keys); QString insertKeyNames(QString _code, const QStringList &_keys);
QString insertMacros(QString code); QString insertKeys(QString _code, const QStringList &_keys);
QString insertMacros(QString _code);
// find methods // find methods
QStringList findKeys(const QString code, const QStringList keys, QStringList findKeys(const QString &_code, const QStringList &_keys,
const bool isBars); const bool _isBars);
QStringList findLambdas(const QString code); QStringList findLambdas(const QString &_code);
}; };

94
sources/awesome-widget/plugin/awtelemetryhandler.cpp
View File

@ -29,8 +29,9 @@
#include "awdebug.h" #include "awdebug.h"
AWTelemetryHandler::AWTelemetryHandler(QObject *parent, const QString clientId) AWTelemetryHandler::AWTelemetryHandler(QObject *_parent,
: QObject(parent) const QString &_clientId)
: QObject(_parent)
{ {
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
@ -39,8 +40,8 @@ AWTelemetryHandler::AWTelemetryHandler(QObject *parent, const QString clientId)
QStandardPaths::GenericDataLocation)); QStandardPaths::GenericDataLocation));
// override client id if any // override client id if any
if (!clientId.isEmpty()) if (!_clientId.isEmpty())
m_clientId = clientId; m_clientId = _clientId;
} }
@ -50,15 +51,15 @@ AWTelemetryHandler::~AWTelemetryHandler()
} }
QStringList AWTelemetryHandler::get(const QString group) const QStringList AWTelemetryHandler::get(const QString &_group) const
{ {
qCDebug(LOG_AW) << "Get stored data for group" << group; qCDebug(LOG_AW) << "Get stored data for group" << _group;
QStringList values; QStringList values;
QSettings settings(m_localFile, QSettings::IniFormat); QSettings settings(m_localFile, QSettings::IniFormat);
settings.beginGroup(group); settings.beginGroup(_group);
for (auto key : settings.childKeys()) for (auto &key : settings.childKeys())
values.append(settings.value(key).toString()); values.append(settings.value(key).toString());
settings.endGroup(); settings.endGroup();
@ -66,53 +67,54 @@ QStringList AWTelemetryHandler::get(const QString group) const
} }
QString AWTelemetryHandler::getLast(const QString group) const QString AWTelemetryHandler::getLast(const QString &_group) const
{ {
qCDebug(LOG_AW) << "Get last stored data for group" << group; qCDebug(LOG_AW) << "Get last stored data for group" << _group;
return get(group).last(); return get(_group).last();
} }
void AWTelemetryHandler::init(const int count, const bool enableRemote, void AWTelemetryHandler::init(const int _count, const bool _enableRemote,
const QString clientId) const QString &_clientId)
{ {
qCDebug(LOG_AW) << "Init telemetry with count" << count << "enable remote" qCDebug(LOG_AW) << "Init telemetry with count" << _count << "enable remote"
<< enableRemote << "client ID" << clientId; << _enableRemote << "client ID" << _clientId;
m_storeCount = count; m_storeCount = _count;
m_uploadEnabled = enableRemote; m_uploadEnabled = _enableRemote;
m_clientId = clientId; m_clientId = _clientId;
} }
bool AWTelemetryHandler::put(const QString group, const QString value) const bool AWTelemetryHandler::put(const QString &_group, const QString &_value) const
{ {
qCDebug(LOG_AW) << "Store data with group" << group << "and value" << value; qCDebug(LOG_AW) << "Store data with group" << _group << "and value"
<< _value;
QSettings settings(m_localFile, QSettings::IniFormat); QSettings settings(m_localFile, QSettings::IniFormat);
settings.beginGroup(group); settings.beginGroup(_group);
// values will be stored as num=value inside specified group // values will be stored as num=value inside specified group
// load all values to memory // load all values to memory
QStringList saved; QStringList saved;
for (auto key : settings.childKeys()) for (auto &key : settings.childKeys())
saved.append(settings.value(key).toString()); saved.append(settings.value(key).toString());
// check if this value is already saved // check if this value is already saved
if (saved.contains(value)) { if (saved.contains(_value)) {
qCInfo(LOG_AW) << "Configuration" << value << "for group" << group qCInfo(LOG_AW) << "Configuration" << _value << "for group" << _group
<< "is already saved"; << "is already saved";
return false; return false;
} }
saved.append(value); saved.append(_value);
// remove old ones // remove old ones
while (saved.count() > m_storeCount) while (saved.count() > m_storeCount)
saved.takeFirst(); saved.takeFirst();
// clear group // clear group
settings.remove(QString("")); settings.remove("");
// and save now // and save now
for (auto value : saved) { for (auto &val : saved) {
QString key = getKey(settings.childKeys().count()); QString key = getKey(settings.childKeys().count());
settings.setValue(key, value); settings.setValue(key, val);
} }
// sync settings // sync settings
@ -123,11 +125,11 @@ bool AWTelemetryHandler::put(const QString group, const QString value) const
} }
void AWTelemetryHandler::uploadTelemetry(const QString group, void AWTelemetryHandler::uploadTelemetry(const QString &_group,
const QString value) const QString &_value)
{ {
qCDebug(LOG_AW) << "Upload data with group" << group << "and value" qCDebug(LOG_AW) << "Upload data with group" << _group << "and value"
<< value; << _value;
if (!m_uploadEnabled) { if (!m_uploadEnabled) {
qCInfo(LOG_AW) << "Upload disabled by configuration"; qCInfo(LOG_AW) << "Upload disabled by configuration";
return; return;
@ -143,10 +145,10 @@ void AWTelemetryHandler::uploadTelemetry(const QString group,
// generate payload // generate payload
QVariantMap payload; QVariantMap payload;
payload[QString("api")] = AW_TELEMETRY_API; payload["api"] = AW_TELEMETRY_API;
payload[QString("client_id")] = m_clientId; payload["client_id"] = m_clientId;
payload[QString("metadata")] = value; payload["metadata"] = _value;
payload[QString("type")] = group; payload["type"] = _group;
// convert to QByteArray to send request // convert to QByteArray to send request
QByteArray data QByteArray data
= QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact); = QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact);
@ -157,34 +159,34 @@ void AWTelemetryHandler::uploadTelemetry(const QString group,
} }
void AWTelemetryHandler::telemetryReplyRecieved(QNetworkReply *reply) void AWTelemetryHandler::telemetryReplyRecieved(QNetworkReply *_reply)
{ {
if (reply->error() != QNetworkReply::NoError) { if (_reply->error() != QNetworkReply::NoError) {
qCWarning(LOG_AW) << "An error occurs" << reply->error() qCWarning(LOG_AW) << "An error occurs" << _reply->error()
<< "with message" << reply->errorString(); << "with message" << _reply->errorString();
return; return;
} }
QJsonParseError error; QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll(), &error); QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
if (error.error != QJsonParseError::NoError) { if (error.error != QJsonParseError::NoError) {
qCWarning(LOG_AW) << "Parse error" << error.errorString(); qCWarning(LOG_AW) << "Parse error" << error.errorString();
return; return;
} }
reply->deleteLater(); _reply->deleteLater();
// convert to map // convert to map
QVariantMap response = jsonDoc.toVariant().toMap(); QVariantMap response = jsonDoc.toVariant().toMap();
QString message = response[QString("message")].toString(); QString message = response["message"].toString();
qCInfo(LOG_AW) << "Server reply on telemetry" << message; qCInfo(LOG_AW) << "Server reply on telemetry" << message;
return emit(replyReceived(message)); return emit(replyReceived(message));
} }
QString AWTelemetryHandler::getKey(const int count) const QString AWTelemetryHandler::getKey(const int _count) const
{ {
qCDebug(LOG_AW) << "Get key for keys count" << count; qCDebug(LOG_AW) << "Get key for keys count" << _count;
return QString("%1").arg(count, 3, 10, QChar('0')); return QString("%1").arg(_count, 3, 10, QChar('0'));
} }

23
sources/awesome-widget/plugin/awtelemetryhandler.h
View File

@ -33,24 +33,25 @@ class AWTelemetryHandler : public QObject
public: public:
const char *REMOTE_TELEMETRY_URL = "https://arcanis.me/telemetry"; const char *REMOTE_TELEMETRY_URL = "https://arcanis.me/telemetry";
explicit AWTelemetryHandler(QObject *parent = nullptr, explicit AWTelemetryHandler(QObject *_parent = nullptr,
const QString clientId = QString()); const QString &_clientId = "");
virtual ~AWTelemetryHandler(); virtual ~AWTelemetryHandler();
Q_INVOKABLE QStringList get(const QString group) const; Q_INVOKABLE QStringList get(const QString &_group) const;
Q_INVOKABLE QString getLast(const QString group) const; Q_INVOKABLE QString getLast(const QString &_group) const;
Q_INVOKABLE void init(const int count, const bool enableRemote, Q_INVOKABLE void init(const int _count, const bool _enableRemote,
const QString clientId); const QString &_clientId);
Q_INVOKABLE bool put(const QString group, const QString value) const; Q_INVOKABLE bool put(const QString &_group, const QString &_value) const;
Q_INVOKABLE void uploadTelemetry(const QString group, const QString value); Q_INVOKABLE void uploadTelemetry(const QString &_group,
const QString &_value);
signals: signals:
void replyReceived(QString message); void replyReceived(const QString &_message);
private slots: private slots:
void telemetryReplyRecieved(QNetworkReply *reply); void telemetryReplyRecieved(QNetworkReply *_reply);
private: private:
QString getKey(const int count) const; QString getKey(const int _count) const;
QString m_clientId; QString m_clientId;
QString m_localFile; QString m_localFile;
int m_storeCount = 0; int m_storeCount = 0;

77
sources/awesome-widget/plugin/awupdatehelper.cpp
View File

@ -30,8 +30,8 @@
#include "awdebug.h" #include "awdebug.h"
AWUpdateHelper::AWUpdateHelper(QObject *parent) AWUpdateHelper::AWUpdateHelper(QObject *_parent)
: QObject(parent) : QObject(_parent)
{ {
qCDebug(LOG_AW) << __PRETTY_FUNCTION__; qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
@ -48,16 +48,16 @@ AWUpdateHelper::~AWUpdateHelper()
} }
void AWUpdateHelper::checkUpdates(const bool showAnyway) void AWUpdateHelper::checkUpdates(const bool _showAnyway)
{ {
qCDebug(LOG_AW) << "Show anyway" << showAnyway; qCDebug(LOG_AW) << "Show anyway" << _showAnyway;
// showAnyway options requires to show message if no updates found on direct // showAnyway options requires to show message if no updates found on direct
// request. In case of automatic check no message will be shown // request. In case of automatic check no message will be shown
QNetworkAccessManager *manager = new QNetworkAccessManager(nullptr); QNetworkAccessManager *manager = new QNetworkAccessManager(nullptr);
connect(manager, &QNetworkAccessManager::finished, connect(manager, &QNetworkAccessManager::finished,
[showAnyway, this](QNetworkReply *reply) { [_showAnyway, this](QNetworkReply *reply) {
return versionReplyRecieved(reply, showAnyway); return versionReplyRecieved(reply, _showAnyway);
}); });
manager->get(QNetworkRequest(QUrl(VERSION_API))); manager->get(QNetworkRequest(QUrl(VERSION_API)));
@ -68,17 +68,16 @@ bool AWUpdateHelper::checkVersion()
{ {
QSettings settings(m_genericConfig, QSettings::IniFormat); QSettings settings(m_genericConfig, QSettings::IniFormat);
QVersionNumber version = QVersionNumber::fromString( QVersionNumber version = QVersionNumber::fromString(
settings.value(QString("Version"), QString(VERSION)).toString()); settings.value("Version", QString(VERSION)).toString());
// update version // update version
settings.setValue(QString("Version"), QString(VERSION)); settings.setValue("Version", QString(VERSION));
settings.sync(); settings.sync();
qCInfo(LOG_AW) << "Found version" << version << "actual one is" qCInfo(LOG_AW) << "Found version" << version << "actual one is"
<< m_foundVersion; << m_foundVersion;
if ((version != m_foundVersion) && (!QString(CHANGELOG).isEmpty())) { if ((version != m_foundVersion) && (!QString(CHANGELOG).isEmpty())) {
genMessageBox(i18n("Changelog of %1", QString(VERSION)), genMessageBox(i18n("Changelog of %1", VERSION),
QString(CHANGELOG).replace(QChar('@'), QChar('\n')), QString(CHANGELOG).replace('@', '\n'), QMessageBox::Ok)
QMessageBox::Ok)
->open(); ->open();
return true; return true;
} else if (version != m_foundVersion) { } else if (version != m_foundVersion) {
@ -92,12 +91,12 @@ bool AWUpdateHelper::checkVersion()
} }
void AWUpdateHelper::showInfo(const QVersionNumber version) void AWUpdateHelper::showInfo(const QVersionNumber &_version)
{ {
qCDebug(LOG_AW) << "Version" << version; qCDebug(LOG_AW) << "Version" << _version;
QString text QString text
= i18n("You are using the actual version %1", version.toString()); = i18n("You are using the actual version %1", _version.toString());
if (!QString(COMMIT_SHA).isEmpty()) if (!QString(COMMIT_SHA).isEmpty())
text += QString(" (%1)").arg(QString(COMMIT_SHA)); text += QString(" (%1)").arg(QString(COMMIT_SHA));
return genMessageBox(i18n("No new version found"), text, QMessageBox::Ok) return genMessageBox(i18n("No new version found"), text, QMessageBox::Ok)
@ -105,16 +104,16 @@ void AWUpdateHelper::showInfo(const QVersionNumber version)
} }
void AWUpdateHelper::showUpdates(const QVersionNumber version) void AWUpdateHelper::showUpdates(const QVersionNumber &_version)
{ {
qCDebug(LOG_AW) << "Version" << version; qCDebug(LOG_AW) << "Version" << _version;
QString text; QString text;
text += i18n("Current version : %1", QString(VERSION)); text += i18n("Current version : %1", VERSION);
text += QString(COMMIT_SHA).isEmpty() text += QString(COMMIT_SHA).isEmpty()
? QString("\n") ? "\n"
: QString(" (%1)\n").arg(QString(COMMIT_SHA)); : QString(" (%1)\n").arg(QString(COMMIT_SHA));
text += i18n("New version : %1", version.toString()) + QString("\n\n"); text += i18n("New version : %1", _version.toString()) + "\n\n";
text += i18n("Click \"Ok\" to download"); text += i18n("Click \"Ok\" to download");
genMessageBox(i18n("There are updates"), text, genMessageBox(i18n("There are updates"), text,
@ -123,10 +122,10 @@ void AWUpdateHelper::showUpdates(const QVersionNumber version)
} }
void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *button) void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *_button)
{ {
QMessageBox::ButtonRole ret QMessageBox::ButtonRole ret
= static_cast<QMessageBox *>(sender())->buttonRole(button); = static_cast<QMessageBox *>(sender())->buttonRole(_button);
qCInfo(LOG_AW) << "User select" << ret; qCInfo(LOG_AW) << "User select" << ret;
switch (ret) { switch (ret) {
@ -141,53 +140,53 @@ void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *button)
} }
void AWUpdateHelper::versionReplyRecieved(QNetworkReply *reply, void AWUpdateHelper::versionReplyRecieved(QNetworkReply *_reply,
const bool showAnyway) const bool _showAnyway)
{ {
qCDebug(LOG_AW) << "Show message anyway" << showAnyway; qCDebug(LOG_AW) << "Show message anyway" << _showAnyway;
if (reply->error() != QNetworkReply::NoError) { if (_reply->error() != QNetworkReply::NoError) {
qCWarning(LOG_AW) << "An error occurs" << reply->error() qCWarning(LOG_AW) << "An error occurs" << _reply->error()
<< "with message" << reply->errorString(); << "with message" << _reply->errorString();
return; return;
} }
QJsonParseError error; QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll(), &error); QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
if (error.error != QJsonParseError::NoError) { if (error.error != QJsonParseError::NoError) {
qCWarning(LOG_AW) << "Parse error" << error.errorString(); qCWarning(LOG_AW) << "Parse error" << error.errorString();
return; return;
} }
reply->deleteLater(); _reply->deleteLater();
// convert to map // convert to map
QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap(); QVariantMap firstRelease = jsonDoc.toVariant().toList().first().toMap();
QString version = firstRelease[QString("tag_name")].toString(); QString version = firstRelease["tag_name"].toString();
version.remove(QString("V.")); version.remove("V.");
m_foundVersion = QVersionNumber::fromString(version); m_foundVersion = QVersionNumber::fromString(version);
qCInfo(LOG_AW) << "Update found version to" << m_foundVersion; qCInfo(LOG_AW) << "Update found version to" << m_foundVersion;
QVersionNumber oldVersion = QVersionNumber::fromString(VERSION); QVersionNumber oldVersion = QVersionNumber::fromString(VERSION);
if (oldVersion < m_foundVersion) if (oldVersion < m_foundVersion)
return showUpdates(m_foundVersion); return showUpdates(m_foundVersion);
else if (showAnyway) else if (_showAnyway)
return showInfo(m_foundVersion); return showInfo(m_foundVersion);
} }
// additional method which is used to show message box which does not block UI // additional method which is used to show message box which does not block UI
QMessageBox * QMessageBox *
AWUpdateHelper::genMessageBox(const QString title, const QString body, AWUpdateHelper::genMessageBox(const QString &_title, const QString &_body,
const QMessageBox::StandardButtons buttons) const QMessageBox::StandardButtons _buttons)
{ {
qCDebug(LOG_AW) << "Construct message box with title" << title << "and body" qCDebug(LOG_AW) << "Construct message box with title" << _title
<< body; << "and body" << _body;
QMessageBox *msgBox = new QMessageBox(nullptr); QMessageBox *msgBox = new QMessageBox(nullptr);
msgBox->setAttribute(Qt::WA_DeleteOnClose); msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->setModal(false); msgBox->setModal(false);
msgBox->setWindowTitle(title); msgBox->setWindowTitle(_title);
msgBox->setText(body); msgBox->setText(_body);
msgBox->setStandardButtons(buttons); msgBox->setStandardButtons(_buttons);
msgBox->setIcon(QMessageBox::Information); msgBox->setIcon(QMessageBox::Information);
return msgBox; return msgBox;

16
sources/awesome-widget/plugin/awupdatehelper.h
View File

@ -31,20 +31,20 @@ class AWUpdateHelper : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit AWUpdateHelper(QObject *parent = nullptr); explicit AWUpdateHelper(QObject *_parent = nullptr);
virtual ~AWUpdateHelper(); virtual ~AWUpdateHelper();
void checkUpdates(const bool showAnyway = false); void checkUpdates(const bool _showAnyway = false);
bool checkVersion(); bool checkVersion();
private slots: private slots:
void showInfo(const QVersionNumber version); void showInfo(const QVersionNumber &_version);
void showUpdates(const QVersionNumber version); void showUpdates(const QVersionNumber &_version);
void userReplyOnUpdates(QAbstractButton *button); void userReplyOnUpdates(QAbstractButton *_button);
void versionReplyRecieved(QNetworkReply *reply, const bool showAnyway); void versionReplyRecieved(QNetworkReply *_reply, const bool _showAnyway);
private: private:
QMessageBox *genMessageBox(const QString title, const QString body, QMessageBox *genMessageBox(const QString &_title, const QString &_body,
const QMessageBox::StandardButtons buttons); const QMessageBox::StandardButtons _buttons);
QVersionNumber m_foundVersion; QVersionNumber m_foundVersion;
QString m_genericConfig; QString m_genericConfig;
}; };

61
sources/awesomewidgets/abstractextitem.cpp
View File

@ -28,13 +28,13 @@
#include "qcronscheduler.h" #include "qcronscheduler.h"
AbstractExtItem::AbstractExtItem(QWidget *parent, const QString filePath) AbstractExtItem::AbstractExtItem(QWidget *_parent, const QString &_filePath)
: QDialog(parent) : QDialog(_parent)
, m_fileName(filePath) , m_fileName(_filePath)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
qCDebug(LOG_LIB) << "Desktop name" << filePath; qCDebug(LOG_LIB) << "Desktop name" << _filePath;
m_name = m_fileName; m_name = m_fileName;
} }
@ -166,7 +166,7 @@ QString AbstractExtItem::socket() const
} }
QString AbstractExtItem::tag(const QString _type) const QString AbstractExtItem::tag(const QString &_type) const
{ {
qCDebug(LOG_LIB) << "Tag type" << _type; qCDebug(LOG_LIB) << "Tag type" << _type;
@ -190,7 +190,7 @@ void AbstractExtItem::setActive(const bool _state)
} }
void AbstractExtItem::setComment(const QString _comment) void AbstractExtItem::setComment(const QString &_comment)
{ {
qCDebug(LOG_LIB) << "Comment" << _comment; qCDebug(LOG_LIB) << "Comment" << _comment;
@ -198,7 +198,7 @@ void AbstractExtItem::setComment(const QString _comment)
} }
void AbstractExtItem::setCron(const QString _cron) void AbstractExtItem::setCron(const QString &_cron)
{ {
qCDebug(LOG_LIB) << "Cron string" << _cron; qCDebug(LOG_LIB) << "Cron string" << _cron;
// deinit module first // deinit module first
@ -230,7 +230,7 @@ void AbstractExtItem::setInterval(const int _interval)
} }
void AbstractExtItem::setName(const QString _name) void AbstractExtItem::setName(const QString &_name)
{ {
qCDebug(LOG_LIB) << "Name" << _name; qCDebug(LOG_LIB) << "Name" << _name;
@ -259,7 +259,7 @@ void AbstractExtItem::setNumber(int _number)
} }
void AbstractExtItem::setSocket(const QString _socket) void AbstractExtItem::setSocket(const QString &_socket)
{ {
qCDebug(LOG_LIB) << "Socket" << _socket; qCDebug(LOG_LIB) << "Socket" << _socket;
// remove old socket first // remove old socket first
@ -299,18 +299,15 @@ void AbstractExtItem::readConfiguration()
{ {
QSettings settings(m_fileName, QSettings::IniFormat); QSettings settings(m_fileName, QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
setName(settings.value(QString("Name"), name()).toString()); setName(settings.value("Name", name()).toString());
setComment(settings.value(QString("Comment"), comment()).toString()); setComment(settings.value("Comment", comment()).toString());
setApiVersion( setApiVersion(settings.value("X-AW-ApiVersion", apiVersion()).toInt());
settings.value(QString("X-AW-ApiVersion"), apiVersion()).toInt()); setActive(settings.value("X-AW-Active", isActive()).toBool());
setActive( setInterval(settings.value("X-AW-Interval", interval()).toInt());
settings.value(QString("X-AW-Active"), QVariant(isActive())).toString() setNumber(settings.value("X-AW-Number", number()).toInt());
== QString("true")); setCron(settings.value("X-AW-Schedule", cron()).toString());
setInterval(settings.value(QString("X-AW-Interval"), interval()).toInt()); setSocket(settings.value("X-AW-Socket", socket()).toString());
setNumber(settings.value(QString("X-AW-Number"), number()).toInt());
setCron(settings.value(QString("X-AW-Schedule"), cron()).toString());
setSocket(settings.value(QString("X-AW-Socket"), socket()).toString());
settings.endGroup(); settings.endGroup();
} }
@ -329,18 +326,16 @@ void AbstractExtItem::writeConfiguration() const
QSettings settings(writtableConfig(), QSettings::IniFormat); QSettings settings(writtableConfig(), QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName(); qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
settings.setValue(QString("Encoding"), QString("UTF-8")); settings.setValue("Encoding", "UTF-8");
settings.setValue(QString("Name"), name()); settings.setValue("Name", name());
settings.setValue(QString("Comment"), comment()); settings.setValue("Comment", comment());
settings.setValue(QString("X-AW-ApiVersion"), apiVersion()); settings.setValue("X-AW-ApiVersion", apiVersion());
settings.setValue(QString("X-AW-Active"), QVariant(isActive()).toString()); settings.setValue("X-AW-Active", isActive());
settings.setValue(QString("X-AW-Interval"), settings.setValue("X-AW-Interval", interval());
cron().isEmpty() ? QVariant(interval()) settings.setValue("X-AW-Number", number());
: QVariant(cron())); settings.setValue("X-AW-Schedule", cron());
settings.setValue(QString("X-AW-Number"), number()); settings.setValue("X-AW-Socket", socket());
settings.setValue(QString("X-AW-Schedule"), cron());
settings.setValue(QString("X-AW-Socket"), socket());
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();

36
sources/awesomewidgets/abstractextitem.h
View File

@ -40,11 +40,11 @@ class AbstractExtItem : public QDialog
Q_PROPERTY(QString uniq READ uniq) Q_PROPERTY(QString uniq READ uniq)
public: public:
explicit AbstractExtItem(QWidget *parent, explicit AbstractExtItem(QWidget *_parent = nullptr,
const QString filePath = QString()); const QString &_filePath = "");
virtual ~AbstractExtItem(); virtual ~AbstractExtItem();
virtual void bumpApi(const int _newVer); virtual void bumpApi(const int _newVer);
virtual AbstractExtItem *copy(const QString _fileName, const int _number) virtual AbstractExtItem *copy(const QString &_fileName, const int _number)
= 0; = 0;
virtual void copyDefaults(AbstractExtItem *_other) const; virtual void copyDefaults(AbstractExtItem *_other) const;
virtual void startTimer(); virtual void startTimer();
@ -59,20 +59,20 @@ public:
QString name() const; QString name() const;
int number() const; int number() const;
QString socket() const; QString socket() const;
QString tag(const QString _type) const; QString tag(const QString &_type) const;
virtual QString uniq() const = 0; virtual QString uniq() const = 0;
// set methods // set methods
void setApiVersion(const int _apiVersion = 0); void setApiVersion(const int _apiVersion);
void setActive(const bool _state = true); void setActive(const bool _state);
void setComment(const QString _comment = QString("empty")); void setComment(const QString &_comment);
void setCron(const QString _cron = ""); void setCron(const QString &_cron);
void setInterval(const int _interval = 1); void setInterval(const int _interval);
void setName(const QString _name = QString("none")); void setName(const QString &_name);
void setNumber(int _number = -1); void setNumber(int _number);
void setSocket(const QString _socket = QString("")); void setSocket(const QString &_socket);
signals: signals:
void dataReceived(const QVariantHash &data); void dataReceived(const QVariantHash &_data);
void requestDataUpdate(); void requestDataUpdate();
public slots: public slots:
@ -80,7 +80,7 @@ public slots:
virtual void initSocket(); virtual void initSocket();
virtual void readConfiguration(); virtual void readConfiguration();
virtual QVariantHash run() = 0; virtual QVariantHash run() = 0;
virtual int showConfiguration(const QVariant args = QVariant()) = 0; virtual int showConfiguration(const QVariant &_args) = 0;
virtual bool tryDelete() const; virtual bool tryDelete() const;
virtual void writeConfiguration() const; virtual void writeConfiguration() const;
@ -89,19 +89,19 @@ private slots:
private: private:
QCronScheduler *m_scheduler = nullptr; QCronScheduler *m_scheduler = nullptr;
QString m_fileName = QString("/dev/null"); QString m_fileName = "/dev/null";
int m_times = 0; int m_times = 0;
virtual void translate() = 0; virtual void translate() = 0;
// properties // properties
int m_apiVersion = 0; int m_apiVersion = 0;
bool m_active = true; bool m_active = true;
QString m_comment = QString("empty"); QString m_comment = "empty";
QString m_cron = ""; QString m_cron = "";
int m_interval = 1; int m_interval = 1;
QString m_name = QString("none"); QString m_name = "none";
int m_number = -1; int m_number = -1;
QLocalServer *m_socket = nullptr; QLocalServer *m_socket = nullptr;
QString m_socketFile = QString(""); QString m_socketFile = "";
}; };

40
sources/awesomewidgets/abstractextitemaggregator.cpp
View File

@ -25,11 +25,11 @@
#include <QPushButton> #include <QPushButton>
AbstractExtItemAggregator::AbstractExtItemAggregator(QWidget *parent, AbstractExtItemAggregator::AbstractExtItemAggregator(QWidget *_parent,
const QString type) const QString &_type)
: QDialog(parent) : QDialog(_parent)
, ui(new Ui::AbstractExtItemAggregator) , ui(new Ui::AbstractExtItemAggregator)
, m_type(type) , m_type(_type)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
@ -113,13 +113,13 @@ void AbstractExtItemAggregator::editItem()
QString AbstractExtItemAggregator::getName() QString AbstractExtItemAggregator::getName()
{ {
bool ok; bool ok;
QString name = QInputDialog::getText(this, i18n("Enter file name"), QString name
i18n("File name"), QLineEdit::Normal, = QInputDialog::getText(this, i18n("Enter file name"),
QString(""), &ok); i18n("File name"), QLineEdit::Normal, "", &ok);
if ((!ok) || (name.isEmpty())) if ((!ok) || (name.isEmpty()))
return QString(""); return "";
if (!name.endsWith(QString(".desktop"))) if (!name.endsWith(".desktop"))
name += QString(".desktop"); name += ".desktop";
return name; return name;
} }
@ -132,7 +132,7 @@ AbstractExtItem *AbstractExtItemAggregator::itemFromWidget()
return nullptr; return nullptr;
AbstractExtItem *found = nullptr; AbstractExtItem *found = nullptr;
for (auto item : items()) { for (auto &item : items()) {
QString fileName = QFileInfo(item->fileName()).fileName(); QString fileName = QFileInfo(item->fileName()).fileName();
if (fileName != widgetItem->text()) if (fileName != widgetItem->text())
continue; continue;
@ -150,14 +150,14 @@ AbstractExtItem *AbstractExtItemAggregator::itemFromWidget()
void AbstractExtItemAggregator::repaintList() void AbstractExtItemAggregator::repaintList()
{ {
ui->listWidget->clear(); ui->listWidget->clear();
for (auto _item : items()) { for (auto &_item : items()) {
QString fileName = QFileInfo(_item->fileName()).fileName(); QString fileName = QFileInfo(_item->fileName()).fileName();
QListWidgetItem *item = new QListWidgetItem(fileName, ui->listWidget); QListWidgetItem *item = new QListWidgetItem(fileName, ui->listWidget);
QStringList tooltip; QStringList tooltip;
tooltip.append(i18n("Name: %1", _item->name())); tooltip.append(i18n("Name: %1", _item->name()));
tooltip.append(i18n("Comment: %1", _item->comment())); tooltip.append(i18n("Comment: %1", _item->comment()));
tooltip.append(i18n("Identity: %1", _item->uniq())); tooltip.append(i18n("Identity: %1", _item->uniq()));
item->setToolTip(tooltip.join(QChar('\n'))); item->setToolTip(tooltip.join('\n'));
ui->listWidget->addItem(item); ui->listWidget->addItem(item);
} }
} }
@ -166,7 +166,7 @@ void AbstractExtItemAggregator::repaintList()
int AbstractExtItemAggregator::uniqNumber() const int AbstractExtItemAggregator::uniqNumber() const
{ {
QList<int> tagList; QList<int> tagList;
for (auto item : items()) for (auto &item : items())
tagList.append(item->number()); tagList.append(item->number());
int number = 0; int number = 0;
while (tagList.contains(number)) while (tagList.contains(number))
@ -188,7 +188,7 @@ QString AbstractExtItemAggregator::type() const
} }
void AbstractExtItemAggregator::setConfigArgs(const QVariant _configArgs) void AbstractExtItemAggregator::setConfigArgs(const QVariant &_configArgs)
{ {
qCDebug(LOG_LIB) << "Configuration arguments" << _configArgs; qCDebug(LOG_LIB) << "Configuration arguments" << _configArgs;
@ -202,14 +202,14 @@ void AbstractExtItemAggregator::editItemActivated(QListWidgetItem *)
} }
void AbstractExtItemAggregator::editItemButtonPressed(QAbstractButton *button) void AbstractExtItemAggregator::editItemButtonPressed(QAbstractButton *_button)
{ {
if (static_cast<QPushButton *>(button) == copyButton) if (static_cast<QPushButton *>(_button) == copyButton)
return copyItem(); return copyItem();
else if (static_cast<QPushButton *>(button) == createButton) else if (static_cast<QPushButton *>(_button) == createButton)
return doCreateItem(); return doCreateItem();
else if (static_cast<QPushButton *>(button) == deleteButton) else if (static_cast<QPushButton *>(_button) == deleteButton)
return deleteItem(); return deleteItem();
else if (ui->buttonBox->buttonRole(button) == QDialogButtonBox::AcceptRole) else if (ui->buttonBox->buttonRole(_button) == QDialogButtonBox::AcceptRole)
return editItem(); return editItem();
} }

6
sources/awesomewidgets/abstractextitemaggregator.h
View File

@ -39,7 +39,7 @@ class AbstractExtItemAggregator : public QDialog
Q_PROPERTY(QVariant type READ type) Q_PROPERTY(QVariant type READ type)
public: public:
explicit AbstractExtItemAggregator(QWidget *parent, const QString type); explicit AbstractExtItemAggregator(QWidget *_parent, const QString &_type);
virtual ~AbstractExtItemAggregator(); virtual ~AbstractExtItemAggregator();
// methods // methods
void copyItem(); void copyItem();
@ -75,11 +75,11 @@ public:
virtual QList<AbstractExtItem *> items() const = 0; virtual QList<AbstractExtItem *> items() const = 0;
QString type() const; QString type() const;
// set methods // set methods
void setConfigArgs(const QVariant _configArgs); void setConfigArgs(const QVariant &_configArgs);
private slots: private slots:
void editItemActivated(QListWidgetItem *); void editItemActivated(QListWidgetItem *);
void editItemButtonPressed(QAbstractButton *button); void editItemButtonPressed(QAbstractButton *_button);
private: private:
// ui // ui

12
sources/awesomewidgets/abstractweatherprovider.h
View File

@ -28,14 +28,14 @@ class AbstractWeatherProvider : public QObject
Q_PROPERTY(int number READ number) Q_PROPERTY(int number READ number)
public: public:
explicit AbstractWeatherProvider(QObject *parent, const int number) explicit AbstractWeatherProvider(QObject *_parent, const int _number)
: QObject(parent) : QObject(_parent)
, m_number(number){}; , m_number(_number){};
virtual ~AbstractWeatherProvider(){}; virtual ~AbstractWeatherProvider(){};
virtual void initUrl(const QString city, const QString country, virtual void initUrl(const QString &_city, const QString &_country,
const int ts) const int _ts)
= 0; = 0;
virtual QVariantHash parse(const QVariantMap &json) const = 0; virtual QVariantHash parse(const QVariantMap &_json) const = 0;
virtual QUrl url() const = 0; virtual QUrl url() const = 0;
int number() const { return m_number; }; int number() const { return m_number; };

42
sources/awesomewidgets/awabstractformatter.cpp
View File

@ -22,9 +22,9 @@
#include "awdebug.h" #include "awdebug.h"
AWAbstractFormatter::AWAbstractFormatter(QWidget *parent, AWAbstractFormatter::AWAbstractFormatter(QWidget *_parent,
const QString filePath) const QString &_filePath)
: AbstractExtItem(parent, filePath) : AbstractExtItem(_parent, _filePath)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
} }
@ -55,25 +55,25 @@ QString AWAbstractFormatter::strType() const
QString value; QString value;
switch (m_type) { switch (m_type) {
case FormatterClass::DateTime: case FormatterClass::DateTime:
value = QString("DateTime"); value = "DateTime";
break; break;
case FormatterClass::Float: case FormatterClass::Float:
value = QString("Float"); value = "Float";
break; break;
case FormatterClass::List: case FormatterClass::List:
value = QString("List"); value = "List";
break; break;
case FormatterClass::Script: case FormatterClass::Script:
value = QString("Script"); value = "Script";
break; break;
case FormatterClass::String: case FormatterClass::String:
value = QString("String"); value = "String";
break; break;
case FormatterClass::Json: case FormatterClass::Json:
value = QString("Json"); value = "Json";
break; break;
case FormatterClass::NoFormat: case FormatterClass::NoFormat:
value = QString("NoFormat"); value = "NoFormat";
break; break;
} }
@ -87,21 +87,21 @@ AWAbstractFormatter::FormatterClass AWAbstractFormatter::type() const
} }
void AWAbstractFormatter::setStrType(const QString _type) void AWAbstractFormatter::setStrType(const QString &_type)
{ {
qCDebug(LOG_LIB) << "Type" << _type; qCDebug(LOG_LIB) << "Type" << _type;
if (_type == QString("DateTime")) if (_type == "DateTime")
m_type = FormatterClass::DateTime; m_type = FormatterClass::DateTime;
else if (_type == QString("Float")) else if (_type == "Float")
m_type = FormatterClass::Float; m_type = FormatterClass::Float;
else if (_type == QString("List")) else if (_type == "List")
m_type = FormatterClass::List; m_type = FormatterClass::List;
else if (_type == QString("Script")) else if (_type == "Script")
m_type = FormatterClass::Script; m_type = FormatterClass::Script;
else if (_type == QString("String")) else if (_type == "String")
m_type = FormatterClass::String; m_type = FormatterClass::String;
else if (_type == QString("Json")) else if (_type == "Json")
m_type = FormatterClass::Json; m_type = FormatterClass::Json;
else else
m_type = FormatterClass::NoFormat; m_type = FormatterClass::NoFormat;
@ -123,8 +123,8 @@ void AWAbstractFormatter::readConfiguration()
QSettings settings(fileName(), QSettings::IniFormat); QSettings settings(fileName(), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
setStrType(settings.value(QString("X-AW-Type"), strType()).toString()); setStrType(settings.value("X-AW-Type", strType()).toString());
settings.endGroup(); settings.endGroup();
} }
@ -136,8 +136,8 @@ void AWAbstractFormatter::writeConfiguration() const
QSettings settings(writtableConfig(), QSettings::IniFormat); QSettings settings(writtableConfig(), QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName(); qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
settings.setValue(QString("X-AW-Type"), strType()); settings.setValue("X-AW-Type", strType());
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();

8
sources/awesomewidgets/awabstractformatter.h
View File

@ -38,8 +38,8 @@ public:
Json Json
}; };
explicit AWAbstractFormatter(QWidget *parent, explicit AWAbstractFormatter(QWidget *_parent = nullptr,
const QString filePath = QString()); const QString &_filePath = "");
virtual ~AWAbstractFormatter(); virtual ~AWAbstractFormatter();
virtual QString convert(const QVariant &_value) const = 0; virtual QString convert(const QVariant &_value) const = 0;
void copyDefaults(AbstractExtItem *_other) const; void copyDefaults(AbstractExtItem *_other) const;
@ -47,8 +47,8 @@ public:
// properties // properties
QString strType() const; QString strType() const;
FormatterClass type() const; FormatterClass type() const;
void setStrType(const QString type); void setStrType(const QString &_type);
void setType(const FormatterClass _type = FormatterClass::NoFormat); void setType(const FormatterClass _type);
public slots: public slots:
virtual void readConfiguration(); virtual void readConfiguration();

30
sources/awesomewidgets/awdatetimeformatter.cpp
View File

@ -28,14 +28,14 @@
#include "awdebug.h" #include "awdebug.h"
AWDateTimeFormatter::AWDateTimeFormatter(QWidget *parent, AWDateTimeFormatter::AWDateTimeFormatter(QWidget *_parent,
const QString filePath) const QString &_filePath)
: AWAbstractFormatter(parent, filePath) : AWAbstractFormatter(_parent, _filePath)
, ui(new Ui::AWDateTimeFormatter) , ui(new Ui::AWDateTimeFormatter)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
if (!filePath.isEmpty()) if (!_filePath.isEmpty())
readConfiguration(); readConfiguration();
ui->setupUi(this); ui->setupUi(this);
translate(); translate();
@ -58,7 +58,7 @@ QString AWDateTimeFormatter::convert(const QVariant &_value) const
} }
AWDateTimeFormatter *AWDateTimeFormatter::copy(const QString _fileName, AWDateTimeFormatter *AWDateTimeFormatter::copy(const QString &_fileName,
const int _number) const int _number)
{ {
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
@ -86,7 +86,7 @@ bool AWDateTimeFormatter::translateString() const
} }
void AWDateTimeFormatter::setFormat(const QString _format) void AWDateTimeFormatter::setFormat(const QString &_format)
{ {
qCDebug(LOG_LIB) << "Set format" << _format; qCDebug(LOG_LIB) << "Set format" << _format;
@ -109,23 +109,23 @@ void AWDateTimeFormatter::readConfiguration()
QSettings settings(fileName(), QSettings::IniFormat); QSettings settings(fileName(), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
setFormat(settings.value(QString("X-AW-Format"), format()).toString()); setFormat(settings.value("X-AW-Format", format()).toString());
setTranslateString( setTranslateString(
settings.value(QString("X-AW-Translate"), translateString()).toBool()); settings.value("X-AW-Translate", translateString()).toBool());
settings.endGroup(); settings.endGroup();
bumpApi(AW_FORMATTER_API); bumpApi(AW_FORMATTER_API);
} }
int AWDateTimeFormatter::showConfiguration(const QVariant args) int AWDateTimeFormatter::showConfiguration(const QVariant &_args)
{ {
Q_UNUSED(args) Q_UNUSED(_args)
ui->lineEdit_name->setText(name()); ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment()); ui->lineEdit_comment->setText(comment());
ui->label_typeValue->setText(QString("DateTime")); ui->label_typeValue->setText("DateTime");
ui->lineEdit_format->setText(format()); ui->lineEdit_format->setText(format());
ui->checkBox_translate->setCheckState(translateString() ? Qt::Checked ui->checkBox_translate->setCheckState(translateString() ? Qt::Checked
: Qt::Unchecked); : Qt::Unchecked);
@ -152,9 +152,9 @@ void AWDateTimeFormatter::writeConfiguration() const
QSettings settings(writtableConfig(), QSettings::IniFormat); QSettings settings(writtableConfig(), QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName(); qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
settings.setValue(QString("X-AW-Format"), format()); settings.setValue("X-AW-Format", format());
settings.setValue(QString("X-AW-Translate"), translateString()); settings.setValue("X-AW-Translate", translateString());
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();

12
sources/awesomewidgets/awdatetimeformatter.h
View File

@ -35,20 +35,20 @@ class AWDateTimeFormatter : public AWAbstractFormatter
bool translateString READ translateString WRITE setTranslateString) bool translateString READ translateString WRITE setTranslateString)
public: public:
explicit AWDateTimeFormatter(QWidget *parent, explicit AWDateTimeFormatter(QWidget *_parent = nullptr,
const QString filePath = QString()); const QString &_filePath = "");
virtual ~AWDateTimeFormatter(); virtual ~AWDateTimeFormatter();
QString convert(const QVariant &_value) const; QString convert(const QVariant &_value) const;
AWDateTimeFormatter *copy(const QString _fileName, const int _number); AWDateTimeFormatter *copy(const QString &_fileName, const int _number);
// properties // properties
QString format() const; QString format() const;
bool translateString() const; bool translateString() const;
void setFormat(const QString _format); void setFormat(const QString &_format);
void setTranslateString(const bool _translate); void setTranslateString(const bool _translate);
public slots: public slots:
void readConfiguration(); void readConfiguration();
int showConfiguration(const QVariant args = QVariant()); int showConfiguration(const QVariant &_args);
void writeConfiguration() const; void writeConfiguration() const;
private: private:
@ -57,7 +57,7 @@ private:
void translate(); void translate();
// properties // properties
QLocale m_locale; QLocale m_locale;
QString m_format = QString(); QString m_format = "";
bool m_translate = true; bool m_translate = true;
}; };

52
sources/awesomewidgets/awfloatformatter.cpp
View File

@ -27,13 +27,13 @@
#include "awdebug.h" #include "awdebug.h"
AWFloatFormatter::AWFloatFormatter(QWidget *parent, const QString filePath) AWFloatFormatter::AWFloatFormatter(QWidget *_parent, const QString &_filePath)
: AWAbstractFormatter(parent, filePath) : AWAbstractFormatter(_parent, _filePath)
, ui(new Ui::AWFloatFormatter) , ui(new Ui::AWFloatFormatter)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
if (!filePath.isEmpty()) if (!_filePath.isEmpty())
readConfiguration(); readConfiguration();
ui->setupUi(this); ui->setupUi(this);
translate(); translate();
@ -62,7 +62,7 @@ QString AWFloatFormatter::convert(const QVariant &_value) const
} }
AWFloatFormatter *AWFloatFormatter::copy(const QString _fileName, AWFloatFormatter *AWFloatFormatter::copy(const QString &_fileName,
const int _number) const int _number)
{ {
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
@ -133,7 +133,7 @@ void AWFloatFormatter::setCount(const int _count)
} }
void AWFloatFormatter::setFillChar(const QChar _fillChar) void AWFloatFormatter::setFillChar(const QChar &_fillChar)
{ {
qCDebug(LOG_LIB) << "Set char" << _fillChar; qCDebug(LOG_LIB) << "Set char" << _fillChar;
@ -193,34 +193,30 @@ void AWFloatFormatter::readConfiguration()
QSettings settings(fileName(), QSettings::IniFormat); QSettings settings(fileName(), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
setCount(settings.value(QString("X-AW-Width"), count()).toInt()); setCount(settings.value("X-AW-Width", count()).toInt());
setFillChar( setFillChar(settings.value("X-AW-FillChar", fillChar()).toString().at(0));
settings.value(QString("X-AW-FillChar"), fillChar()).toString().at(0)); setForceWidth(settings.value("X-AW-ForceWidth", forceWidth()).toBool());
setForceWidth( setFormat(settings.value("X-AW-Format", QString(format()))
settings.value(QString("X-AW-ForceWidth"), forceWidth()).toBool());
setFormat(settings.value(QString("X-AW-Format"), QString(format()))
.toString() .toString()
.at(0) .at(0)
.toLatin1()); .toLatin1());
setMultiplier( setMultiplier(settings.value("X-AW-Multiplier", multiplier()).toDouble());
settings.value(QString("X-AW-Multiplier"), multiplier()).toDouble()); setPrecision(settings.value("X-AW-Precision", precision()).toInt());
setPrecision( setSummand(settings.value("X-AW-Summand", summand()).toDouble());
settings.value(QString("X-AW-Precision"), precision()).toInt());
setSummand(settings.value(QString("X-AW-Summand"), summand()).toDouble());
settings.endGroup(); settings.endGroup();
bumpApi(AW_FORMATTER_API); bumpApi(AW_FORMATTER_API);
} }
int AWFloatFormatter::showConfiguration(const QVariant args) int AWFloatFormatter::showConfiguration(const QVariant &_args)
{ {
Q_UNUSED(args) Q_UNUSED(_args)
ui->lineEdit_name->setText(name()); ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment()); ui->lineEdit_comment->setText(comment());
ui->label_typeValue->setText(QString("Float")); ui->label_typeValue->setText("Float");
ui->comboBox_format->setCurrentIndex( ui->comboBox_format->setCurrentIndex(
ui->comboBox_format->findText(QString(format()))); ui->comboBox_format->findText(QString(format())));
ui->spinBox_precision->setValue(precision()); ui->spinBox_precision->setValue(precision());
@ -258,14 +254,14 @@ void AWFloatFormatter::writeConfiguration() const
QSettings settings(writtableConfig(), QSettings::IniFormat); QSettings settings(writtableConfig(), QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName(); qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
settings.setValue(QString("X-AW-Width"), count()); settings.setValue("X-AW-Width", count());
settings.setValue(QString("X-AW-FillChar"), fillChar()); settings.setValue("X-AW-FillChar", fillChar());
settings.setValue(QString("X-AW-Format"), QString(format())); settings.setValue("X-AW-Format", QString(format()));
settings.setValue(QString("X-AW-ForceWidth"), forceWidth()); settings.setValue("X-AW-ForceWidth", forceWidth());
settings.setValue(QString("X-AW-Multiplier"), multiplier()); settings.setValue("X-AW-Multiplier", multiplier());
settings.setValue(QString("X-AW-Precision"), precision()); settings.setValue("X-AW-Precision", precision());
settings.setValue(QString("X-AW-Summand"), summand()); settings.setValue("X-AW-Summand", summand());
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();

10
sources/awesomewidgets/awfloatformatter.h
View File

@ -38,11 +38,11 @@ class AWFloatFormatter : public AWAbstractFormatter
Q_PROPERTY(double summand READ summand WRITE setSummand) Q_PROPERTY(double summand READ summand WRITE setSummand)
public: public:
explicit AWFloatFormatter(QWidget *parent, explicit AWFloatFormatter(QWidget *_parent = nullptr,
const QString filePath = QString()); const QString &_filePath = "");
virtual ~AWFloatFormatter(); virtual ~AWFloatFormatter();
QString convert(const QVariant &_value) const; QString convert(const QVariant &_value) const;
AWFloatFormatter *copy(const QString _fileName, const int _number); AWFloatFormatter *copy(const QString &_fileName, const int _number);
// properties // properties
int count() const; int count() const;
QChar fillChar() const; QChar fillChar() const;
@ -52,7 +52,7 @@ public:
int precision() const; int precision() const;
double summand() const; double summand() const;
void setCount(const int _count); void setCount(const int _count);
void setFillChar(const QChar _fillChar); void setFillChar(const QChar &_fillChar);
void setForceWidth(const bool _forceWidth); void setForceWidth(const bool _forceWidth);
void setFormat(char _format); void setFormat(char _format);
void setMultiplier(const double _multiplier); void setMultiplier(const double _multiplier);
@ -61,7 +61,7 @@ public:
public slots: public slots:
void readConfiguration(); void readConfiguration();
int showConfiguration(const QVariant args = QVariant()); int showConfiguration(const QVariant &_args);
void writeConfiguration() const; void writeConfiguration() const;
private: private:

64
sources/awesomewidgets/awjsonformatter.cpp
View File

@ -27,13 +27,13 @@
#include "awdebug.h" #include "awdebug.h"
AWJsonFormatter::AWJsonFormatter(QWidget *parent, const QString filePath) AWJsonFormatter::AWJsonFormatter(QWidget *_parent, const QString &_filePath)
: AWAbstractFormatter(parent, filePath) : AWAbstractFormatter(_parent, _filePath)
, ui(new Ui::AWJsonFormatter) , ui(new Ui::AWJsonFormatter)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
if (!filePath.isEmpty()) if (!_filePath.isEmpty())
readConfiguration(); readConfiguration();
ui->setupUi(this); ui->setupUi(this);
translate(); translate();
@ -65,7 +65,7 @@ QString AWJsonFormatter::convert(const QVariant &_value) const
} }
AWJsonFormatter *AWJsonFormatter::copy(const QString _fileName, AWJsonFormatter *AWJsonFormatter::copy(const QString &_fileName,
const int _number) const int _number)
{ {
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
@ -86,7 +86,7 @@ QString AWJsonFormatter::path() const
} }
void AWJsonFormatter::setPath(const QString _path) void AWJsonFormatter::setPath(const QString &_path)
{ {
qCDebug(LOG_LIB) << "Path" << _path; qCDebug(LOG_LIB) << "Path" << _path;
@ -101,21 +101,21 @@ void AWJsonFormatter::readConfiguration()
QSettings settings(fileName(), QSettings::IniFormat); QSettings settings(fileName(), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
setPath(settings.value(QString("X-AW-Path"), path()).toString()); setPath(settings.value("X-AW-Path", path()).toString());
settings.endGroup(); settings.endGroup();
bumpApi(AW_FORMATTER_API); bumpApi(AW_FORMATTER_API);
} }
int AWJsonFormatter::showConfiguration(const QVariant args) int AWJsonFormatter::showConfiguration(const QVariant &args)
{ {
Q_UNUSED(args) Q_UNUSED(args)
ui->lineEdit_name->setText(name()); ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment()); ui->lineEdit_comment->setText(comment());
ui->label_typeValue->setText(QString("Json")); ui->label_typeValue->setText("Json");
ui->lineEdit_path->setText(path()); ui->lineEdit_path->setText(path());
int ret = exec(); int ret = exec();
@ -139,61 +139,57 @@ void AWJsonFormatter::writeConfiguration() const
QSettings settings(writtableConfig(), QSettings::IniFormat); QSettings settings(writtableConfig(), QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName(); qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
settings.setValue(QString("X-AW-Path"), path()); settings.setValue("X-AW-Path", path());
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();
} }
QVariant AWJsonFormatter::getFromJson(const QVariant &value, QVariant AWJsonFormatter::getFromJson(const QVariant &_value,
const QVariant &element) const const QVariant &_element) const
{ {
qCDebug(LOG_LIB) << "Looking for element" << element << "in" << value; qCDebug(LOG_LIB) << "Looking for element" << _element << "in" << _value;
if (element.type() == QVariant::String) { if (_element.type() == QVariant::String) {
return getFromMap(value, element.toString()); return getFromMap(_value, _element.toString());
} else if (element.type() == QVariant::Int) { } else if (_element.type() == QVariant::Int) {
return getFromList(value, element.toInt()); return getFromList(_value, _element.toInt());
} else { } else {
qCWarning(LOG_LIB) << "Unknown type" << element.typeName(); qCWarning(LOG_LIB) << "Unknown type" << _element.typeName();
return value; return _value;
} }
} }
QVariant AWJsonFormatter::getFromList(const QVariant &value, QVariant AWJsonFormatter::getFromList(const QVariant &_value,
const int index) const const int _index) const
{ {
qCDebug(LOG_LIB) << "Looking for index" << index << "in" << value; qCDebug(LOG_LIB) << "Looking for index" << _index << "in" << _value;
return value.toList()[index]; return _value.toList()[_index];
} }
QVariant AWJsonFormatter::getFromMap(const QVariant &value, QVariant AWJsonFormatter::getFromMap(const QVariant &_value,
const QString &key) const const QString &_key) const
{ {
qCDebug(LOG_LIB) << "Looking for key" << key << "in" << value; qCDebug(LOG_LIB) << "Looking for key" << _key << "in" << _value;
return value.toMap()[key]; return _value.toMap()[_key];
} }
void AWJsonFormatter::initPath() void AWJsonFormatter::initPath()
{ {
m_splittedPath.clear(); m_splittedPath.clear();
QStringList splittedByDot QStringList splittedByDot = m_path.split('.', QString::SkipEmptyParts);
= m_path.split(QChar('.'), QString::SkipEmptyParts);
for (auto &element : splittedByDot) { for (auto &element : splittedByDot) {
bool ok; bool ok;
int number = element.toInt(&ok); int number = element.toInt(&ok);
if (ok) m_splittedPath.append(ok ? QVariant(number) : QVariant(element));
m_splittedPath.append(number);
else
m_splittedPath.append(element);
} }
} }

17
sources/awesomewidgets/awjsonformatter.h
View File

@ -32,25 +32,26 @@ class AWJsonFormatter : public AWAbstractFormatter
Q_PROPERTY(QString path READ path WRITE setPath) Q_PROPERTY(QString path READ path WRITE setPath)
public: public:
explicit AWJsonFormatter(QWidget *parent, explicit AWJsonFormatter(QWidget *_parent = nullptr,
const QString filePath = QString()); const QString &_filePath = "");
virtual ~AWJsonFormatter(); virtual ~AWJsonFormatter();
QString convert(const QVariant &_value) const; QString convert(const QVariant &_value) const;
AWJsonFormatter *copy(const QString _fileName, const int _number); AWJsonFormatter *copy(const QString &_fileName, const int _number);
// properties // properties
QString path() const; QString path() const;
void setPath(const QString _path); void setPath(const QString &_path);
public slots: public slots:
void readConfiguration(); void readConfiguration();
int showConfiguration(const QVariant args = QVariant()); int showConfiguration(const QVariant &_args);
void writeConfiguration() const; void writeConfiguration() const;
private: private:
Ui::AWJsonFormatter *ui = nullptr; Ui::AWJsonFormatter *ui = nullptr;
QVariant getFromJson(const QVariant &value, const QVariant &element) const; QVariant getFromJson(const QVariant &_value,
QVariant getFromList(const QVariant &value, const int index) const; const QVariant &_element) const;
QVariant getFromMap(const QVariant &value, const QString &key) const; QVariant getFromList(const QVariant &_value, const int _index) const;
QVariant getFromMap(const QVariant &_value, const QString &_key) const;
void initPath(); void initPath();
void translate(); void translate();
// properties // properties

35
sources/awesomewidgets/awlistformatter.cpp
View File

@ -26,13 +26,13 @@
#include "awdebug.h" #include "awdebug.h"
AWListFormatter::AWListFormatter(QWidget *parent, const QString filePath) AWListFormatter::AWListFormatter(QWidget *_parent, const QString &_filePath)
: AWAbstractFormatter(parent, filePath) : AWAbstractFormatter(_parent, _filePath)
, ui(new Ui::AWListFormatter) , ui(new Ui::AWListFormatter)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
if (!filePath.isEmpty()) if (!_filePath.isEmpty())
readConfiguration(); readConfiguration();
ui->setupUi(this); ui->setupUi(this);
translate(); translate();
@ -59,7 +59,7 @@ QString AWListFormatter::convert(const QVariant &_value) const
} }
AWListFormatter *AWListFormatter::copy(const QString _fileName, AWListFormatter *AWListFormatter::copy(const QString &_fileName,
const int _number) const int _number)
{ {
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
@ -94,7 +94,7 @@ QString AWListFormatter::separator() const
} }
void AWListFormatter::setFilter(const QString _filter) void AWListFormatter::setFilter(const QString &_filter)
{ {
qCDebug(LOG_LIB) << "Filter" << _filter; qCDebug(LOG_LIB) << "Filter" << _filter;
@ -103,7 +103,7 @@ void AWListFormatter::setFilter(const QString _filter)
} }
void AWListFormatter::setSeparator(const QString _separator) void AWListFormatter::setSeparator(const QString &_separator)
{ {
qCDebug(LOG_LIB) << "Separtor" << _separator; qCDebug(LOG_LIB) << "Separtor" << _separator;
@ -125,24 +125,23 @@ void AWListFormatter::readConfiguration()
QSettings settings(fileName(), QSettings::IniFormat); QSettings settings(fileName(), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
setFilter(settings.value(QString("X-AW-Filter"), filter()).toString()); setFilter(settings.value("X-AW-Filter", filter()).toString());
setSeparator( setSeparator(settings.value("X-AW-Separator", separator()).toString());
settings.value(QString("X-AW-Separator"), separator()).toString()); setSorted(settings.value("X-AW-Sort", isSorted()).toBool());
setSorted(settings.value(QString("X-AW-Sort"), isSorted()).toBool());
settings.endGroup(); settings.endGroup();
bumpApi(AW_FORMATTER_API); bumpApi(AW_FORMATTER_API);
} }
int AWListFormatter::showConfiguration(const QVariant args) int AWListFormatter::showConfiguration(const QVariant &_args)
{ {
Q_UNUSED(args) Q_UNUSED(_args)
ui->lineEdit_name->setText(name()); ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment()); ui->lineEdit_comment->setText(comment());
ui->label_typeValue->setText(QString("NoFormat")); ui->label_typeValue->setText("List");
ui->lineEdit_filter->setText(filter()); ui->lineEdit_filter->setText(filter());
ui->lineEdit_separator->setText(separator()); ui->lineEdit_separator->setText(separator());
ui->checkBox_sorted->setCheckState(isSorted() ? Qt::Checked ui->checkBox_sorted->setCheckState(isSorted() ? Qt::Checked
@ -171,10 +170,10 @@ void AWListFormatter::writeConfiguration() const
QSettings settings(writtableConfig(), QSettings::IniFormat); QSettings settings(writtableConfig(), QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName(); qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
settings.setValue(QString("X-AW-Filter"), filter()); settings.setValue("X-AW-Filter", filter());
settings.setValue(QString("X-AW-Separator"), separator()); settings.setValue("X-AW-Separator", separator());
settings.setValue(QString("X-AW-Sort"), isSorted()); settings.setValue("X-AW-Sort", isSorted());
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();

16
sources/awesomewidgets/awlistformatter.h
View File

@ -34,30 +34,30 @@ class AWListFormatter : public AWAbstractFormatter
Q_PROPERTY(bool sorted READ isSorted WRITE setSorted) Q_PROPERTY(bool sorted READ isSorted WRITE setSorted)
public: public:
explicit AWListFormatter(QWidget *parent, explicit AWListFormatter(QWidget *_parent = nullptr,
const QString filePath = QString()); const QString &_filePath = "");
virtual ~AWListFormatter(); virtual ~AWListFormatter();
QString convert(const QVariant &_value) const; QString convert(const QVariant &_value) const;
AWListFormatter *copy(const QString _fileName, const int _number); AWListFormatter *copy(const QString &_fileName, const int _number);
// properties // properties
QString filter() const; QString filter() const;
bool isSorted() const; bool isSorted() const;
QString separator() const; QString separator() const;
void setFilter(const QString _filter); void setFilter(const QString &_filter);
void setSeparator(const QString _separator); void setSeparator(const QString &_separator);
void setSorted(const bool _sorted); void setSorted(const bool _sorted);
public slots: public slots:
void readConfiguration(); void readConfiguration();
int showConfiguration(const QVariant args = QVariant()); int showConfiguration(const QVariant &_args);
void writeConfiguration() const; void writeConfiguration() const;
private: private:
Ui::AWListFormatter *ui = nullptr; Ui::AWListFormatter *ui = nullptr;
void translate(); void translate();
// properties // properties
QString m_filter = QString(); QString m_filter = "";
QString m_separator = QString(); QString m_separator = "";
bool m_sorted = false; bool m_sorted = false;
QRegExp m_regex; QRegExp m_regex;
}; };

14
sources/awesomewidgets/awnoformatter.cpp
View File

@ -24,13 +24,13 @@
#include "awdebug.h" #include "awdebug.h"
AWNoFormatter::AWNoFormatter(QWidget *parent, const QString filePath) AWNoFormatter::AWNoFormatter(QWidget *_parent, const QString &_filePath)
: AWAbstractFormatter(parent, filePath) : AWAbstractFormatter(_parent, _filePath)
, ui(new Ui::AWNoFormatter) , ui(new Ui::AWNoFormatter)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
if (!filePath.isEmpty()) if (!_filePath.isEmpty())
readConfiguration(); readConfiguration();
ui->setupUi(this); ui->setupUi(this);
translate(); translate();
@ -53,7 +53,7 @@ QString AWNoFormatter::convert(const QVariant &_value) const
} }
AWNoFormatter *AWNoFormatter::copy(const QString _fileName, const int _number) AWNoFormatter *AWNoFormatter::copy(const QString &_fileName, const int _number)
{ {
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
@ -66,13 +66,13 @@ AWNoFormatter *AWNoFormatter::copy(const QString _fileName, const int _number)
} }
int AWNoFormatter::showConfiguration(const QVariant args) int AWNoFormatter::showConfiguration(const QVariant &_args)
{ {
Q_UNUSED(args) Q_UNUSED(_args)
ui->lineEdit_name->setText(name()); ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment()); ui->lineEdit_comment->setText(comment());
ui->label_typeValue->setText(QString("NoFormat")); ui->label_typeValue->setText("NoFormat");
int ret = exec(); int ret = exec();
if (ret != 1) if (ret != 1)

7
sources/awesomewidgets/awnoformatter.h
View File

@ -31,13 +31,14 @@ class AWNoFormatter : public AWAbstractFormatter
Q_OBJECT Q_OBJECT
public: public:
explicit AWNoFormatter(QWidget *parent, const QString filePath = QString()); explicit AWNoFormatter(QWidget *_parent = nullptr,
const QString &_filePath = "");
virtual ~AWNoFormatter(); virtual ~AWNoFormatter();
QString convert(const QVariant &_value) const; QString convert(const QVariant &_value) const;
AWNoFormatter *copy(const QString _fileName, const int _number); AWNoFormatter *copy(const QString &_fileName, const int _number);
public slots: public slots:
int showConfiguration(const QVariant args = QVariant()); int showConfiguration(const QVariant &_args);
private: private:
Ui::AWNoFormatter *ui = nullptr; Ui::AWNoFormatter *ui = nullptr;

41
sources/awesomewidgets/awscriptformatter.cpp
View File

@ -28,13 +28,13 @@
#include "awdebug.h" #include "awdebug.h"
AWScriptFormatter::AWScriptFormatter(QWidget *parent, const QString filePath) AWScriptFormatter::AWScriptFormatter(QWidget *_parent, const QString &_filePath)
: AWAbstractFormatter(parent, filePath) : AWAbstractFormatter(_parent, _filePath)
, ui(new Ui::AWScriptFormatter) , ui(new Ui::AWScriptFormatter)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
if (!filePath.isEmpty()) if (!_filePath.isEmpty())
readConfiguration(); readConfiguration();
ui->setupUi(this); ui->setupUi(this);
translate(); translate();
@ -63,14 +63,14 @@ QString AWScriptFormatter::convert(const QVariant &_value) const
qCWarning(LOG_LIB) << "Uncaught exception at line" qCWarning(LOG_LIB) << "Uncaught exception at line"
<< result.property("lineNumber").toInt() << ":" << result.property("lineNumber").toInt() << ":"
<< result.toString(); << result.toString();
return QString(); return "";
} else { } else {
return result.toString(); return result.toString();
} }
} }
AWScriptFormatter *AWScriptFormatter::copy(const QString _fileName, AWScriptFormatter *AWScriptFormatter::copy(const QString &_fileName,
const int _number) const int _number)
{ {
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
@ -120,7 +120,7 @@ void AWScriptFormatter::setAppendCode(const bool _appendCode)
} }
void AWScriptFormatter::setCode(const QString _code) void AWScriptFormatter::setCode(const QString &_code)
{ {
qCDebug(LOG_LIB) << "Set code" << _code; qCDebug(LOG_LIB) << "Set code" << _code;
@ -144,25 +144,23 @@ void AWScriptFormatter::readConfiguration()
QSettings settings(fileName(), QSettings::IniFormat); QSettings settings(fileName(), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
setAppendCode( setAppendCode(settings.value("X-AW-AppendCode", appendCode()).toBool());
settings.value(QString("X-AW-AppendCode"), appendCode()).toBool()); setCode(settings.value("X-AW-Code", code()).toString());
setCode(settings.value(QString("X-AW-Code"), code()).toString()); setHasReturn(settings.value("X-AW-HasReturn", hasReturn()).toBool());
setHasReturn(
settings.value(QString("X-AW-HasReturn"), hasReturn()).toBool());
settings.endGroup(); settings.endGroup();
bumpApi(AW_FORMATTER_API); bumpApi(AW_FORMATTER_API);
} }
int AWScriptFormatter::showConfiguration(const QVariant args) int AWScriptFormatter::showConfiguration(const QVariant &_args)
{ {
Q_UNUSED(args) Q_UNUSED(_args)
ui->lineEdit_name->setText(name()); ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment()); ui->lineEdit_comment->setText(comment());
ui->label_typeValue->setText(QString("Script")); ui->label_typeValue->setText("Script");
ui->checkBox_appendCode->setCheckState(appendCode() ? Qt::Checked ui->checkBox_appendCode->setCheckState(appendCode() ? Qt::Checked
: Qt::Unchecked); : Qt::Unchecked);
ui->checkBox_hasReturn->setCheckState(hasReturn() ? Qt::Checked ui->checkBox_hasReturn->setCheckState(hasReturn() ? Qt::Checked
@ -193,10 +191,10 @@ void AWScriptFormatter::writeConfiguration() const
QSettings settings(writtableConfig(), QSettings::IniFormat); QSettings settings(writtableConfig(), QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName(); qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
settings.setValue(QString("X-AW-AppendCode"), appendCode()); settings.setValue("X-AW-AppendCode", appendCode());
settings.setValue(QString("X-AW-Code"), code()); settings.setValue("X-AW-Code", code());
settings.setValue(QString("X-AW-HasReturn"), hasReturn()); settings.setValue("X-AW-HasReturn", hasReturn());
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();
@ -207,10 +205,9 @@ void AWScriptFormatter::initProgram()
{ {
// init JS code // init JS code
if (appendCode()) if (appendCode())
m_program m_program = QString("(function(value) { %1%2 })")
= QString("(function(value) { %1%2 })")
.arg(code()) .arg(code())
.arg(hasReturn() ? QString("") : QString("; return output;")); .arg(hasReturn() ? "" : "; return output;");
else else
m_program = code(); m_program = code();

12
sources/awesomewidgets/awscriptformatter.h
View File

@ -35,23 +35,23 @@ class AWScriptFormatter : public AWAbstractFormatter
Q_PROPERTY(QString program READ program) Q_PROPERTY(QString program READ program)
public: public:
explicit AWScriptFormatter(QWidget *parent, explicit AWScriptFormatter(QWidget *_parent = nullptr,
const QString filePath = QString()); const QString &_filePath = "");
virtual ~AWScriptFormatter(); virtual ~AWScriptFormatter();
QString convert(const QVariant &_value) const; QString convert(const QVariant &_value) const;
AWScriptFormatter *copy(const QString _fileName, const int _number); AWScriptFormatter *copy(const QString &_fileName, const int _number);
// properties // properties
bool appendCode() const; bool appendCode() const;
QString code() const; QString code() const;
bool hasReturn() const; bool hasReturn() const;
QString program() const; QString program() const;
void setAppendCode(const bool _appendCode); void setAppendCode(const bool _appendCode);
void setCode(const QString _code); void setCode(const QString &_code);
void setHasReturn(const bool _hasReturn); void setHasReturn(const bool _hasReturn);
public slots: public slots:
void readConfiguration(); void readConfiguration();
int showConfiguration(const QVariant args = QVariant()); int showConfiguration(const QVariant &_args);
void writeConfiguration() const; void writeConfiguration() const;
private: private:
@ -60,7 +60,7 @@ private:
void translate(); void translate();
// properties // properties
bool m_appendCode = true; bool m_appendCode = true;
QString m_code = QString(); QString m_code = "";
bool m_hasReturn = false; bool m_hasReturn = false;
QString m_program; QString m_program;
}; };

34
sources/awesomewidgets/awstringformatter.cpp
View File

@ -27,13 +27,13 @@
#include "awdebug.h" #include "awdebug.h"
AWStringFormatter::AWStringFormatter(QWidget *parent, const QString filePath) AWStringFormatter::AWStringFormatter(QWidget *_parent, const QString &_filePath)
: AWAbstractFormatter(parent, filePath) : AWAbstractFormatter(_parent, _filePath)
, ui(new Ui::AWStringFormatter) , ui(new Ui::AWStringFormatter)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
if (!filePath.isEmpty()) if (!_filePath.isEmpty())
readConfiguration(); readConfiguration();
ui->setupUi(this); ui->setupUi(this);
translate(); translate();
@ -60,7 +60,7 @@ QString AWStringFormatter::convert(const QVariant &_value) const
} }
AWStringFormatter *AWStringFormatter::copy(const QString _fileName, AWStringFormatter *AWStringFormatter::copy(const QString &_fileName,
const int _number) const int _number)
{ {
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
@ -103,7 +103,7 @@ void AWStringFormatter::setCount(const int _count)
} }
void AWStringFormatter::setFillChar(const QChar _fillChar) void AWStringFormatter::setFillChar(const QChar &_fillChar)
{ {
qCDebug(LOG_LIB) << "Set char" << _fillChar; qCDebug(LOG_LIB) << "Set char" << _fillChar;
@ -125,25 +125,23 @@ void AWStringFormatter::readConfiguration()
QSettings settings(fileName(), QSettings::IniFormat); QSettings settings(fileName(), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
setCount(settings.value(QString("X-AW-Width"), count()).toInt()); setCount(settings.value("X-AW-Width", count()).toInt());
setFillChar( setFillChar(settings.value("X-AW-FillChar", fillChar()).toString().at(0));
settings.value(QString("X-AW-FillChar"), fillChar()).toString().at(0)); setForceWidth(settings.value("X-AW-ForceWidth", forceWidth()).toBool());
setForceWidth(
settings.value(QString("X-AW-ForceWidth"), forceWidth()).toBool());
settings.endGroup(); settings.endGroup();
bumpApi(AW_FORMATTER_API); bumpApi(AW_FORMATTER_API);
} }
int AWStringFormatter::showConfiguration(const QVariant args) int AWStringFormatter::showConfiguration(const QVariant &_args)
{ {
Q_UNUSED(args) Q_UNUSED(_args)
ui->lineEdit_name->setText(name()); ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment()); ui->lineEdit_comment->setText(comment());
ui->label_typeValue->setText(QString("String")); ui->label_typeValue->setText("String");
ui->spinBox_width->setValue(count()); ui->spinBox_width->setValue(count());
ui->lineEdit_fill->setText(QString(fillChar())); ui->lineEdit_fill->setText(QString(fillChar()));
ui->checkBox_forceWidth->setCheckState(forceWidth() ? Qt::Checked ui->checkBox_forceWidth->setCheckState(forceWidth() ? Qt::Checked
@ -172,10 +170,10 @@ void AWStringFormatter::writeConfiguration() const
QSettings settings(writtableConfig(), QSettings::IniFormat); QSettings settings(writtableConfig(), QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName(); qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
settings.setValue(QString("X-AW-Width"), count()); settings.setValue("X-AW-Width", count());
settings.setValue(QString("X-AW-FillChar"), fillChar()); settings.setValue("X-AW-FillChar", fillChar());
settings.setValue(QString("X-AW-ForceWidth"), forceWidth()); settings.setValue("X-AW-ForceWidth", forceWidth());
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();

10
sources/awesomewidgets/awstringformatter.h
View File

@ -34,22 +34,22 @@ class AWStringFormatter : public AWAbstractFormatter
Q_PROPERTY(bool forceWidth READ forceWidth WRITE setForceWidth) Q_PROPERTY(bool forceWidth READ forceWidth WRITE setForceWidth)
public: public:
explicit AWStringFormatter(QWidget *parent, explicit AWStringFormatter(QWidget *_parent = nullptr,
const QString filePath = QString()); const QString &_filePath = "");
virtual ~AWStringFormatter(); virtual ~AWStringFormatter();
QString convert(const QVariant &_value) const; QString convert(const QVariant &_value) const;
AWStringFormatter *copy(const QString _fileName, const int _number); AWStringFormatter *copy(const QString &_fileName, const int _number);
// properties // properties
int count() const; int count() const;
QChar fillChar() const; QChar fillChar() const;
bool forceWidth() const; bool forceWidth() const;
void setCount(const int _count); void setCount(const int _count);
void setFillChar(const QChar _fillChar); void setFillChar(const QChar &_fillChar);
void setForceWidth(const bool _forceWidth); void setForceWidth(const bool _forceWidth);
public slots: public slots:
void readConfiguration(); void readConfiguration();
int showConfiguration(const QVariant args = QVariant()); int showConfiguration(const QVariant &_args);
void writeConfiguration() const; void writeConfiguration() const;
private: private:

23
sources/awesomewidgets/extitemaggregator.h
View File

@ -31,15 +31,15 @@
template <class T> class ExtItemAggregator : public AbstractExtItemAggregator template <class T> class ExtItemAggregator : public AbstractExtItemAggregator
{ {
public: public:
explicit ExtItemAggregator(QWidget *parent, const QString type) explicit ExtItemAggregator(QWidget *_parent, const QString &_type)
: AbstractExtItemAggregator(parent, type) : AbstractExtItemAggregator(_parent, _type)
{ {
qSetMessagePattern(AWDebug::LOG_FORMAT); qSetMessagePattern(AWDebug::LOG_FORMAT);
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
for (auto &metadata : AWDebug::getBuildData()) for (auto &metadata : AWDebug::getBuildData())
qCDebug(LOG_LIB) << metadata; qCDebug(LOG_LIB) << metadata;
qCDebug(LOG_LIB) << "Type" << type; qCDebug(LOG_LIB) << "Type" << _type;
initItems(); initItems();
}; };
@ -66,16 +66,16 @@ public:
// HACK as soon as per one widget instance we have two objects each of // HACK as soon as per one widget instance we have two objects each of
// them will try to control socket, whereas actually only one of them // them will try to control socket, whereas actually only one of them
// should be owner of the socket // should be owner of the socket
for (auto item : m_items) for (auto &item : m_items)
item->initSocket(); item->initSocket();
} }
T *itemByTag(const QString _tag, const QString _type) const T *itemByTag(const QString &_tag, const QString &_type) const
{ {
qCDebug(LOG_LIB) << "Tag" << _tag << "with used type" << _type; qCDebug(LOG_LIB) << "Tag" << _tag << "with used type" << _type;
T *found = nullptr; T *found = nullptr;
for (auto item : m_items) { for (auto &item : m_items) {
if (item->tag(_type) != _tag) if (item->tag(_type) != _tag)
continue; continue;
found = static_cast<T *>(item); found = static_cast<T *>(item);
@ -92,7 +92,7 @@ public:
qCDebug(LOG_LIB) << "Number" << _number; qCDebug(LOG_LIB) << "Number" << _number;
T *found = nullptr; T *found = nullptr;
for (auto item : m_items) { for (auto &item : m_items) {
if (item->number() != _number) if (item->number() != _number)
continue; continue;
found = static_cast<T *>(item); found = static_cast<T *>(item);
@ -129,11 +129,10 @@ private:
QStandardPaths::LocateDirectory); QStandardPaths::LocateDirectory);
QStringList names; QStringList names;
QList<AbstractExtItem *> items; QList<AbstractExtItem *> items;
for (auto dir : dirs) { for (auto &dir : dirs) {
QStringList files = QDir(dir).entryList(QDir::Files, QDir::Name); QStringList files = QDir(dir).entryList(QDir::Files, QDir::Name);
for (auto file : files) { for (auto &file : files) {
if ((!file.endsWith(QString(".desktop"))) if ((!file.endsWith(".desktop")) || (names.contains(file)))
|| (names.contains(file)))
continue; continue;
qCInfo(LOG_LIB) << "Found file" << file << "in" << dir; qCInfo(LOG_LIB) << "Found file" << file << "in" << dir;
names.append(file); names.append(file);
@ -156,7 +155,7 @@ private:
m_activeItems.clear(); m_activeItems.clear();
m_items = getItems(); m_items = getItems();
for (auto item : m_items) { for (auto &item : m_items) {
if (!item->isActive()) if (!item->isActive())
continue; continue;
m_activeItems.append(static_cast<T *>(item)); m_activeItems.append(static_cast<T *>(item));

36
sources/awesomewidgets/extnetworkrequest.cpp
View File

@ -31,18 +31,18 @@
#include "awdebug.h" #include "awdebug.h"
ExtNetworkRequest::ExtNetworkRequest(QWidget *parent, const QString filePath) ExtNetworkRequest::ExtNetworkRequest(QWidget *_parent, const QString &_filePath)
: AbstractExtItem(parent, filePath) : AbstractExtItem(_parent, _filePath)
, ui(new Ui::ExtNetworkRequest) , ui(new Ui::ExtNetworkRequest)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
if (!filePath.isEmpty()) if (!_filePath.isEmpty())
readConfiguration(); readConfiguration();
ui->setupUi(this); ui->setupUi(this);
translate(); translate();
m_values[tag(QString("response"))] = QString(); m_values[tag("response")] = "";
// HACK declare as child of nullptr to avoid crash with plasmawindowed // HACK declare as child of nullptr to avoid crash with plasmawindowed
// in the destructor // in the destructor
@ -67,7 +67,7 @@ ExtNetworkRequest::~ExtNetworkRequest()
} }
ExtNetworkRequest *ExtNetworkRequest::copy(const QString _fileName, ExtNetworkRequest *ExtNetworkRequest::copy(const QString &_fileName,
const int _number) const int _number)
{ {
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
@ -94,7 +94,7 @@ QString ExtNetworkRequest::uniq() const
} }
void ExtNetworkRequest::setStringUrl(const QString _url) void ExtNetworkRequest::setStringUrl(const QString &_url)
{ {
qCDebug(LOG_LIB) << "Url" << _url; qCDebug(LOG_LIB) << "Url" << _url;
@ -109,8 +109,8 @@ void ExtNetworkRequest::readConfiguration()
QSettings settings(fileName(), QSettings::IniFormat); QSettings settings(fileName(), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
setStringUrl(settings.value(QString("X-AW-Url"), stringUrl()).toString()); setStringUrl(settings.value("X-AW-Url", stringUrl()).toString());
settings.endGroup(); settings.endGroup();
bumpApi(AW_EXTNETREQUEST_API); bumpApi(AW_EXTNETREQUEST_API);
@ -127,9 +127,9 @@ QVariantHash ExtNetworkRequest::run()
} }
int ExtNetworkRequest::showConfiguration(const QVariant args) int ExtNetworkRequest::showConfiguration(const QVariant &_args)
{ {
Q_UNUSED(args) Q_UNUSED(_args)
ui->lineEdit_name->setText(name()); ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment()); ui->lineEdit_comment->setText(comment());
@ -166,24 +166,24 @@ void ExtNetworkRequest::writeConfiguration() const
QSettings settings(writtableConfig(), QSettings::IniFormat); QSettings settings(writtableConfig(), QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName(); qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
settings.setValue(QString("X-AW-Url"), stringUrl()); settings.setValue("X-AW-Url", stringUrl());
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();
} }
void ExtNetworkRequest::networkReplyReceived(QNetworkReply *reply) void ExtNetworkRequest::networkReplyReceived(QNetworkReply *_reply)
{ {
if (reply->error() != QNetworkReply::NoError) { if (_reply->error() != QNetworkReply::NoError) {
qCWarning(LOG_AW) << "An error occurs" << reply->error() qCWarning(LOG_AW) << "An error occurs" << _reply->error()
<< "with message" << reply->errorString(); << "with message" << _reply->errorString();
return; return;
} }
m_isRunning = false; m_isRunning = false;
m_values[tag(QString("response"))] m_values[tag("response")]
= QTextCodec::codecForMib(106)->toUnicode(reply->readAll()).trimmed(); = QTextCodec::codecForMib(106)->toUnicode(_reply->readAll()).trimmed();
emit(dataReceived(m_values)); emit(dataReceived(m_values));
} }

15
sources/awesomewidgets/extnetworkrequest.h
View File

@ -34,24 +34,24 @@ class ExtNetworkRequest : public AbstractExtItem
Q_PROPERTY(QString stringUrl READ stringUrl WRITE setStringUrl) Q_PROPERTY(QString stringUrl READ stringUrl WRITE setStringUrl)
public: public:
explicit ExtNetworkRequest(QWidget *parent, explicit ExtNetworkRequest(QWidget *_parent = nullptr,
const QString filePath = QString()); const QString &_filePath = "");
virtual ~ExtNetworkRequest(); virtual ~ExtNetworkRequest();
ExtNetworkRequest *copy(const QString _fileName, const int _number); ExtNetworkRequest *copy(const QString &_fileName, const int _number);
// get methods // get methods
QString stringUrl() const; QString stringUrl() const;
QString uniq() const; QString uniq() const;
// set methods // set methods
void setStringUrl(const QString _url = QString("https://httpbin.org/get")); void setStringUrl(const QString &_url);
public slots: public slots:
void readConfiguration(); void readConfiguration();
QVariantHash run(); QVariantHash run();
int showConfiguration(const QVariant args = QVariant()); int showConfiguration(const QVariant &_args);
void writeConfiguration() const; void writeConfiguration() const;
private slots: private slots:
void networkReplyReceived(QNetworkReply *reply); void networkReplyReceived(QNetworkReply *_reply);
void sendRequest(); void sendRequest();
private: private:
@ -62,9 +62,8 @@ private:
void initUrl(); void initUrl();
void translate(); void translate();
// properties // properties
QString m_stringUrl = QString("https://httpbin.org/get"); QString m_stringUrl = "https://httpbin.org/get";
// values // values
int m_times = 0;
QVariantHash m_values; QVariantHash m_values;
}; };

67
sources/awesomewidgets/extnetworkrequest.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>420</width> <width>420</width>
<height>301</height> <height>320</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -134,6 +134,42 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBox_update">
<property name="title">
<string>Update</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="layout_interval">
<item>
<widget class="QLabel" name="label_interval">
<property name="text">
<string>Interval</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_interval">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
<property name="singleStep">
<number>500</number>
</property>
<property name="value">
<number>3600</number>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<layout class="QHBoxLayout" name="layout_schedule"> <layout class="QHBoxLayout" name="layout_schedule">
<item> <item>
@ -180,35 +216,8 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QHBoxLayout" name="layout_interval">
<item>
<widget class="QLabel" name="label_interval">
<property name="text">
<string>Interval</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_interval">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
<property name="singleStep">
<number>10</number>
</property>
<property name="value">
<number>60</number>
</property>
</widget>
</item>
</layout> </layout>
</widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">

108
sources/awesomewidgets/extquotes.cpp
View File

@ -33,26 +33,26 @@
#include "awdebug.h" #include "awdebug.h"
ExtQuotes::ExtQuotes(QWidget *parent, const QString filePath) ExtQuotes::ExtQuotes(QWidget *_parent, const QString &_filePath)
: AbstractExtItem(parent, filePath) : AbstractExtItem(_parent, _filePath)
, ui(new Ui::ExtQuotes) , ui(new Ui::ExtQuotes)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
if (!filePath.isEmpty()) if (!_filePath.isEmpty())
readConfiguration(); readConfiguration();
ui->setupUi(this); ui->setupUi(this);
translate(); translate();
m_values[tag(QString("ask"))] = 0.0; m_values[tag("ask")] = 0.0;
m_values[tag(QString("askchg"))] = 0.0; m_values[tag("askchg")] = 0.0;
m_values[tag(QString("percaskchg"))] = 0.0; m_values[tag("percaskchg")] = 0.0;
m_values[tag(QString("bid"))] = 0.0; m_values[tag("bid")] = 0.0;
m_values[tag(QString("bidchg"))] = 0.0; m_values[tag("bidchg")] = 0.0;
m_values[tag(QString("percbidchg"))] = 0.0; m_values[tag("percbidchg")] = 0.0;
m_values[tag(QString("price"))] = 0.0; m_values[tag("price")] = 0.0;
m_values[tag(QString("pricechg"))] = 0.0; m_values[tag("pricechg")] = 0.0;
m_values[tag(QString("percpricechg"))] = 0.0; m_values[tag("percpricechg")] = 0.0;
// HACK declare as child of nullptr to avoid crash with plasmawindowed // HACK declare as child of nullptr to avoid crash with plasmawindowed
// in the destructor // in the destructor
@ -77,7 +77,7 @@ ExtQuotes::~ExtQuotes()
} }
ExtQuotes *ExtQuotes::copy(const QString _fileName, const int _number) ExtQuotes *ExtQuotes::copy(const QString &_fileName, const int _number)
{ {
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
@ -103,7 +103,7 @@ QString ExtQuotes::uniq() const
} }
void ExtQuotes::setTicker(const QString _ticker) void ExtQuotes::setTicker(const QString &_ticker)
{ {
qCDebug(LOG_LIB) << "Ticker" << _ticker; qCDebug(LOG_LIB) << "Ticker" << _ticker;
@ -118,8 +118,8 @@ void ExtQuotes::readConfiguration()
QSettings settings(fileName(), QSettings::IniFormat); QSettings settings(fileName(), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
setTicker(settings.value(QString("X-AW-Ticker"), ticker()).toString()); setTicker(settings.value("X-AW-Ticker", ticker()).toString());
settings.endGroup(); settings.endGroup();
bumpApi(AW_EXTQUOTES_API); bumpApi(AW_EXTQUOTES_API);
@ -136,9 +136,9 @@ QVariantHash ExtQuotes::run()
} }
int ExtQuotes::showConfiguration(const QVariant args) int ExtQuotes::showConfiguration(const QVariant &_args)
{ {
Q_UNUSED(args) Q_UNUSED(_args)
ui->lineEdit_name->setText(name()); ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment()); ui->lineEdit_comment->setText(comment());
@ -175,67 +175,59 @@ void ExtQuotes::writeConfiguration() const
QSettings settings(writtableConfig(), QSettings::IniFormat); QSettings settings(writtableConfig(), QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName(); qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
settings.setValue(QString("X-AW-Ticker"), ticker()); settings.setValue("X-AW-Ticker", ticker());
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();
} }
void ExtQuotes::quotesReplyReceived(QNetworkReply *reply) void ExtQuotes::quotesReplyReceived(QNetworkReply *_reply)
{ {
if (reply->error() != QNetworkReply::NoError) { if (_reply->error() != QNetworkReply::NoError) {
qCWarning(LOG_AW) << "An error occurs" << reply->error() qCWarning(LOG_AW) << "An error occurs" << _reply->error()
<< "with message" << reply->errorString(); << "with message" << _reply->errorString();
return; return;
} }
m_isRunning = false; m_isRunning = false;
QJsonParseError error; QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll(), &error); QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
reply->deleteLater(); _reply->deleteLater();
if (error.error != QJsonParseError::NoError) { if (error.error != QJsonParseError::NoError) {
qCWarning(LOG_LIB) << "Parse error" << error.errorString(); qCWarning(LOG_LIB) << "Parse error" << error.errorString();
return; return;
} }
QVariantMap jsonQuotes QVariantMap jsonQuotes = jsonDoc.toVariant().toMap()["query"].toMap();
= jsonDoc.toVariant().toMap()[QString("query")].toMap(); jsonQuotes = jsonQuotes["results"].toMap()["quote"].toMap();
jsonQuotes
= jsonQuotes[QString("results")].toMap()[QString("quote")].toMap();
double value; double value;
// ask // ask
value = jsonQuotes[QString("Ask")].toString().toDouble(); value = jsonQuotes["Ask"].toString().toDouble();
m_values[tag(QString("askchg"))] m_values[tag("askchg")] = m_values[tag("ask")].toDouble() == 0.0
= m_values[tag(QString("ask"))].toDouble() == 0.0
? 0.0 ? 0.0
: value - m_values[tag(QString("ask"))].toDouble(); : value - m_values[tag("ask")].toDouble();
m_values[tag(QString("percaskchg"))] m_values[tag("percaskchg")] = 100.0 * m_values[tag("askchg")].toDouble()
= 100.0 * m_values[tag(QString("askchg"))].toDouble() / m_values[tag("ask")].toDouble();
/ m_values[tag(QString("ask"))].toDouble(); m_values[tag("ask")] = value;
m_values[tag(QString("ask"))] = value;
// bid // bid
value = jsonQuotes[QString("Bid")].toString().toDouble(); value = jsonQuotes["Bid"].toString().toDouble();
m_values[tag(QString("bidchg"))] m_values[tag("bidchg")] = m_values[tag("bid")].toDouble() == 0.0
= m_values[tag(QString("bid"))].toDouble() == 0.0
? 0.0 ? 0.0
: value - m_values[tag(QString("bid"))].toDouble(); : value - m_values[tag("bid")].toDouble();
m_values[tag(QString("percbidchg"))] m_values[tag("percbidchg")] = 100.0 * m_values[tag("bidchg")].toDouble()
= 100.0 * m_values[tag(QString("bidchg"))].toDouble() / m_values[tag("bid")].toDouble();
/ m_values[tag(QString("bid"))].toDouble(); m_values[tag("bid")] = value;
m_values[tag(QString("bid"))] = value;
// last trade // last trade
value = jsonQuotes[QString("LastTradePriceOnly")].toString().toDouble(); value = jsonQuotes["LastTradePriceOnly"].toString().toDouble();
m_values[tag(QString("pricechg"))] m_values[tag("pricechg")] = m_values[tag("price")].toDouble() == 0.0
= m_values[tag(QString("price"))].toDouble() == 0.0
? 0.0 ? 0.0
: value - m_values[tag(QString("price"))].toDouble(); : value - m_values[tag("price")].toDouble();
m_values[tag(QString("percpricechg"))] m_values[tag("percpricechg")] = 100.0 * m_values[tag("pricechg")].toDouble()
= 100.0 * m_values[tag(QString("pricechg"))].toDouble() / m_values[tag("price")].toDouble();
/ m_values[tag(QString("price"))].toDouble(); m_values[tag("price")] = value;
m_values[tag(QString("price"))] = value;
emit(dataReceived(m_values)); emit(dataReceived(m_values));
} }
@ -254,11 +246,9 @@ void ExtQuotes::initUrl()
// init query // init query
m_url = QUrl(YAHOO_QUOTES_URL); m_url = QUrl(YAHOO_QUOTES_URL);
QUrlQuery params; QUrlQuery params;
params.addQueryItem(QString("format"), QString("json")); params.addQueryItem("format", "json");
params.addQueryItem(QString("env"), params.addQueryItem("env", "store://datatables.org/alltableswithkeys");
QString("store://datatables.org/alltableswithkeys")); params.addQueryItem("q", QString(YAHOO_QUOTES_QUERY).arg(ticker()));
params.addQueryItem(QString("q"),
QString(YAHOO_QUOTES_QUERY).arg(ticker()));
m_url.setQuery(params); m_url.setQuery(params);
} }

14
sources/awesomewidgets/extquotes.h
View File

@ -38,23 +38,24 @@ public:
const char *YAHOO_QUOTES_QUERY const char *YAHOO_QUOTES_QUERY
= "select * from yahoo.finance.quotes where symbol='%1'"; = "select * from yahoo.finance.quotes where symbol='%1'";
explicit ExtQuotes(QWidget *parent, const QString filePath = QString()); explicit ExtQuotes(QWidget *_parent = nullptr,
const QString &_filePath = "");
virtual ~ExtQuotes(); virtual ~ExtQuotes();
ExtQuotes *copy(const QString _fileName, const int _number); ExtQuotes *copy(const QString &_fileName, const int _number);
// get methods // get methods
QString ticker() const; QString ticker() const;
QString uniq() const; QString uniq() const;
// set methods // set methods
void setTicker(const QString _ticker = QString("EURUSD=X")); void setTicker(const QString &_ticker);
public slots: public slots:
void readConfiguration(); void readConfiguration();
QVariantHash run(); QVariantHash run();
int showConfiguration(const QVariant args = QVariant()); int showConfiguration(const QVariant &_args);
void writeConfiguration() const; void writeConfiguration() const;
private slots: private slots:
void quotesReplyReceived(QNetworkReply *reply); void quotesReplyReceived(QNetworkReply *_reply);
void sendRequest(); void sendRequest();
private: private:
@ -65,9 +66,8 @@ private:
void initUrl(); void initUrl();
void translate(); void translate();
// properties // properties
QString m_ticker = QString("EURUSD=X"); QString m_ticker = "EURUSD=X";
// values // values
int m_times = 0;
QVariantHash m_values; QVariantHash m_values;
}; };

67
sources/awesomewidgets/extquotes.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>420</width> <width>420</width>
<height>339</height> <height>378</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -150,6 +150,42 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBox_update">
<property name="title">
<string>Update</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="layout_interval">
<item>
<widget class="QLabel" name="label_interval">
<property name="text">
<string>Interval</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_interval">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
<property name="singleStep">
<number>500</number>
</property>
<property name="value">
<number>3600</number>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<layout class="QHBoxLayout" name="layout_schedule"> <layout class="QHBoxLayout" name="layout_schedule">
<item> <item>
@ -196,35 +232,8 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QHBoxLayout" name="layout_interval">
<item>
<widget class="QLabel" name="label_interval">
<property name="text">
<string>Interval</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_interval">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
<property name="singleStep">
<number>10</number>
</property>
<property name="value">
<number>60</number>
</property>
</widget>
</item>
</layout> </layout>
</widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">

91
sources/awesomewidgets/extscript.cpp
View File

@ -30,19 +30,19 @@
#include "awdebug.h" #include "awdebug.h"
ExtScript::ExtScript(QWidget *parent, const QString filePath) ExtScript::ExtScript(QWidget *_parent, const QString &_filePath)
: AbstractExtItem(parent, filePath) : AbstractExtItem(_parent, _filePath)
, ui(new Ui::ExtScript) , ui(new Ui::ExtScript)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
if (!filePath.isEmpty()) if (!_filePath.isEmpty())
readConfiguration(); readConfiguration();
readJsonFilters(); readJsonFilters();
ui->setupUi(this); ui->setupUi(this);
translate(); translate();
m_values[tag(QString("custom"))] = QString(""); m_values[tag("custom")] = "";
m_process = new QProcess(nullptr); m_process = new QProcess(nullptr);
connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), this, connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), this,
@ -66,7 +66,7 @@ ExtScript::~ExtScript()
} }
ExtScript *ExtScript::copy(const QString _fileName, const int _number) ExtScript *ExtScript::copy(const QString &_fileName, const int _number)
{ {
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
@ -87,8 +87,7 @@ QString ExtScript::jsonFiltersFile() const
{ {
QString fileName = QStandardPaths::locate( QString fileName = QStandardPaths::locate(
QStandardPaths::GenericDataLocation, QStandardPaths::GenericDataLocation,
QString( "awesomewidgets/scripts/awesomewidgets-extscripts-filters.json");
"awesomewidgets/scripts/awesomewidgets-extscripts-filters.json"));
qCInfo(LOG_LIB) << "Filters file" << fileName; qCInfo(LOG_LIB) << "Filters file" << fileName;
return fileName; return fileName;
@ -130,16 +129,16 @@ QString ExtScript::strRedirect() const
QString value; QString value;
switch (redirect()) { switch (redirect()) {
case Redirect::stdout2stderr: case Redirect::stdout2stderr:
value = QString("stdout2stderr"); value = "stdout2stderr";
break; break;
case Redirect::stderr2stdout: case Redirect::stderr2stdout:
value = QString("stderr2stdout"); value = "stderr2stdout";
break; break;
case Redirect::swap: case Redirect::swap:
value = QString("swap"); value = "swap";
break; break;
case Redirect::nothing: case Redirect::nothing:
value = QString("nothing"); value = "nothing";
break; break;
} }
@ -147,7 +146,7 @@ QString ExtScript::strRedirect() const
} }
void ExtScript::setExecutable(const QString _executable) void ExtScript::setExecutable(const QString &_executable)
{ {
qCDebug(LOG_LIB) << "Executable" << _executable; qCDebug(LOG_LIB) << "Executable" << _executable;
@ -155,16 +154,17 @@ void ExtScript::setExecutable(const QString _executable)
} }
void ExtScript::setFilters(const QStringList _filters) void ExtScript::setFilters(const QStringList &_filters)
{ {
qCDebug(LOG_LIB) << "Filters" << _filters; qCDebug(LOG_LIB) << "Filters" << _filters;
std::for_each(_filters.cbegin(), _filters.cend(), std::for_each(
[this](QString filter) { return updateFilter(filter); }); _filters.cbegin(), _filters.cend(),
[this](const QString &filter) { return updateFilter(filter, true); });
} }
void ExtScript::setPrefix(const QString _prefix) void ExtScript::setPrefix(const QString &_prefix)
{ {
qCDebug(LOG_LIB) << "Prefix" << _prefix; qCDebug(LOG_LIB) << "Prefix" << _prefix;
@ -180,15 +180,15 @@ void ExtScript::setRedirect(const Redirect _redirect)
} }
void ExtScript::setStrRedirect(const QString _redirect) void ExtScript::setStrRedirect(const QString &_redirect)
{ {
qCDebug(LOG_LIB) << "Redirect" << _redirect; qCDebug(LOG_LIB) << "Redirect" << _redirect;
if (_redirect == QString("stdout2sdterr")) if (_redirect == "stdout2sdterr")
setRedirect(Redirect::stdout2stderr); setRedirect(Redirect::stdout2stderr);
else if (_redirect == QString("stderr2sdtout")) else if (_redirect == "stderr2sdtout")
setRedirect(Redirect::stderr2stdout); setRedirect(Redirect::stderr2stdout);
else if (_redirect == QString("swap")) else if (_redirect == "swap")
setRedirect(Redirect::swap); setRedirect(Redirect::swap);
else else
setRedirect(Redirect::nothing); setRedirect(Redirect::nothing);
@ -199,7 +199,7 @@ QString ExtScript::applyFilters(QString _value) const
{ {
qCDebug(LOG_LIB) << "Value" << _value; qCDebug(LOG_LIB) << "Value" << _value;
for (auto filt : filters()) { for (auto &filt : filters()) {
qCInfo(LOG_LIB) << "Found filter" << filt; qCInfo(LOG_LIB) << "Found filter" << filt;
QVariantMap filter = m_jsonFilters[filt].toMap(); QVariantMap filter = m_jsonFilters[filt].toMap();
if (filter.isEmpty()) { if (filter.isEmpty()) {
@ -207,7 +207,7 @@ QString ExtScript::applyFilters(QString _value) const
<< "Could not find filter" << _value << "in the json"; << "Could not find filter" << _value << "in the json";
continue; continue;
} }
for (auto f : filter.keys()) for (auto &f : filter.keys())
_value.replace(f, filter[f].toString()); _value.replace(f, filter[f].toString());
} }
@ -215,7 +215,7 @@ QString ExtScript::applyFilters(QString _value) const
} }
void ExtScript::updateFilter(const QString _filter, const bool _add) void ExtScript::updateFilter(const QString &_filter, const bool _add)
{ {
qCDebug(LOG_LIB) << "Should be added filters" << _add << "from" << _filter; qCDebug(LOG_LIB) << "Should be added filters" << _add << "from" << _filter;
@ -235,15 +235,14 @@ void ExtScript::readConfiguration()
QSettings settings(fileName(), QSettings::IniFormat); QSettings settings(fileName(), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
setExecutable(settings.value(QString("Exec"), executable()).toString()); setExecutable(settings.value("Exec", executable()).toString());
setPrefix(settings.value(QString("X-AW-Prefix"), prefix()).toString()); setPrefix(settings.value("X-AW-Prefix", prefix()).toString());
setStrRedirect( setStrRedirect(settings.value("X-AW-Redirect", strRedirect()).toString());
settings.value(QString("X-AW-Redirect"), strRedirect()).toString());
// api == 3 // api == 3
setFilters(settings.value(QString("X-AW-Filters"), filters()) setFilters(settings.value("X-AW-Filters", filters())
.toString() .toString()
.split(QChar(','), QString::SkipEmptyParts)); .split(',', QString::SkipEmptyParts));
settings.endGroup(); settings.endGroup();
bumpApi(AW_EXTSCRIPT_API); bumpApi(AW_EXTSCRIPT_API);
@ -283,9 +282,9 @@ QVariantHash ExtScript::run()
} }
int ExtScript::showConfiguration(const QVariant args) int ExtScript::showConfiguration(const QVariant &_args)
{ {
Q_UNUSED(args) Q_UNUSED(_args)
ui->lineEdit_name->setText(name()); ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment()); ui->lineEdit_comment->setText(comment());
@ -300,11 +299,11 @@ int ExtScript::showConfiguration(const QVariant args)
ui->spinBox_interval->setValue(interval()); ui->spinBox_interval->setValue(interval());
// filters // filters
ui->checkBox_colorFilter->setCheckState( ui->checkBox_colorFilter->setCheckState(
filters().contains(QString("color")) ? Qt::Checked : Qt::Unchecked); filters().contains("color") ? Qt::Checked : Qt::Unchecked);
ui->checkBox_linesFilter->setCheckState( ui->checkBox_linesFilter->setCheckState(
filters().contains(QString("newline")) ? Qt::Checked : Qt::Unchecked); filters().contains("newline") ? Qt::Checked : Qt::Unchecked);
ui->checkBox_spaceFilter->setCheckState( ui->checkBox_spaceFilter->setCheckState(
filters().contains(QString("space")) ? Qt::Checked : Qt::Unchecked); filters().contains("space") ? Qt::Checked : Qt::Unchecked);
int ret = exec(); int ret = exec();
if (ret != 1) if (ret != 1)
@ -321,11 +320,11 @@ int ExtScript::showConfiguration(const QVariant args)
setSocket(ui->lineEdit_socket->text()); setSocket(ui->lineEdit_socket->text());
setInterval(ui->spinBox_interval->value()); setInterval(ui->spinBox_interval->value());
// filters // filters
updateFilter(QString("color"), updateFilter("color",
ui->checkBox_colorFilter->checkState() == Qt::Checked); ui->checkBox_colorFilter->checkState() == Qt::Checked);
updateFilter(QString("newline"), updateFilter("newline",
ui->checkBox_linesFilter->checkState() == Qt::Checked); ui->checkBox_linesFilter->checkState() == Qt::Checked);
updateFilter(QString("space"), updateFilter("space",
ui->checkBox_spaceFilter->checkState() == Qt::Checked); ui->checkBox_spaceFilter->checkState() == Qt::Checked);
writeConfiguration(); writeConfiguration();
@ -340,11 +339,11 @@ void ExtScript::writeConfiguration() const
QSettings settings(writtableConfig(), QSettings::IniFormat); QSettings settings(writtableConfig(), QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName(); qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
settings.setValue(QString("Exec"), executable()); settings.setValue("Exec", executable());
settings.setValue(QString("X-AW-Prefix"), prefix()); settings.setValue("X-AW-Prefix", prefix());
settings.setValue(QString("X-AW-Redirect"), strRedirect()); settings.setValue("X-AW-Redirect", strRedirect());
settings.setValue(QString("X-AW-Filters"), filters().join(QChar(','))); settings.setValue("X-AW-Filters", filters().join(','));
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();
@ -357,8 +356,8 @@ void ExtScript::startProcess()
if (!prefix().isEmpty()) if (!prefix().isEmpty())
cmdList.append(prefix()); cmdList.append(prefix());
cmdList.append(executable()); cmdList.append(executable());
qCInfo(LOG_LIB) << "Run cmd" << cmdList.join(QChar(' ')); qCInfo(LOG_LIB) << "Run cmd" << cmdList.join(' ');
m_process->start(cmdList.join(QChar(' '))); m_process->start(cmdList.join(' '));
} }
@ -390,7 +389,7 @@ void ExtScript::updateValue()
} }
// filters // filters
m_values[tag(QString("custom"))] = applyFilters(strValue); m_values[tag("custom")] = applyFilters(strValue);
emit(dataReceived(m_values)); emit(dataReceived(m_values));
} }

26
sources/awesomewidgets/extscript.h
View File

@ -44,9 +44,10 @@ public:
swap = 3 swap = 3
}; };
explicit ExtScript(QWidget *parent, const QString filePath = QString()); explicit ExtScript(QWidget *_parent = nullptr,
const QString &_filePath = "");
virtual ~ExtScript(); virtual ~ExtScript();
ExtScript *copy(const QString _fileName, const int _number); ExtScript *copy(const QString &_fileName, const int _number);
QString jsonFiltersFile() const; QString jsonFiltersFile() const;
// get methods // get methods
QString executable() const; QString executable() const;
@ -57,20 +58,20 @@ public:
// derivatives // derivatives
QString strRedirect() const; QString strRedirect() const;
// set methods // set methods
void setExecutable(const QString _executable = QString("/usr/bin/true")); void setExecutable(const QString &_executable);
void setFilters(const QStringList _filters = QStringList()); void setFilters(const QStringList &_filters);
void setPrefix(const QString _prefix = QString("")); void setPrefix(const QString &_prefix);
void setRedirect(const Redirect _redirect = Redirect::nothing); void setRedirect(const Redirect _redirect);
void setStrRedirect(const QString _redirect = QString("nothing")); void setStrRedirect(const QString &_redirect);
// filters // filters
QString applyFilters(QString _value) const; QString applyFilters(QString _value) const;
void updateFilter(const QString _filter, const bool _add = true); void updateFilter(const QString &_filter, const bool _add);
public slots: public slots:
void readConfiguration(); void readConfiguration();
void readJsonFilters(); void readJsonFilters();
QVariantHash run(); QVariantHash run();
int showConfiguration(const QVariant args = QVariant()); int showConfiguration(const QVariant &_args);
void writeConfiguration() const; void writeConfiguration() const;
private slots: private slots:
@ -82,13 +83,12 @@ private:
Ui::ExtScript *ui = nullptr; Ui::ExtScript *ui = nullptr;
void translate(); void translate();
// properties // properties
QString m_executable = QString("/usr/bin/true"); QString m_executable = "/usr/bin/true";
QStringList m_filters = QStringList(); QStringList m_filters = QStringList();
QString m_prefix = QString(""); QString m_prefix = "";
Redirect m_redirect = Redirect::nothing; Redirect m_redirect = Redirect::nothing;
// internal properties // internal properties
QVariantMap m_jsonFilters = QVariantMap(); QVariantMap m_jsonFilters;
int m_times = 0;
QVariantHash m_values; QVariantHash m_values;
}; };

61
sources/awesomewidgets/extscript.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>420</width> <width>420</width>
<height>473</height> <height>506</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -195,6 +195,42 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBox_update">
<property name="title">
<string>Update</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout" name="layout_interval">
<item>
<widget class="QLabel" name="label_interval">
<property name="text">
<string>Interval</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_interval">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
<property name="singleStep">
<number>500</number>
</property>
<property name="value">
<number>3600</number>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<layout class="QHBoxLayout" name="layout_schedule"> <layout class="QHBoxLayout" name="layout_schedule">
<item> <item>
@ -241,29 +277,8 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QHBoxLayout" name="layout_interval">
<item>
<widget class="QLabel" name="label_interval">
<property name="text">
<string>Interval</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_interval">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
</widget>
</item>
</layout> </layout>
</widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox_filters"> <widget class="QGroupBox" name="groupBox_filters">

40
sources/awesomewidgets/extupgrade.cpp
View File

@ -28,18 +28,18 @@
#include "awdebug.h" #include "awdebug.h"
ExtUpgrade::ExtUpgrade(QWidget *parent, const QString filePath) ExtUpgrade::ExtUpgrade(QWidget *_parent, const QString &_filePath)
: AbstractExtItem(parent, filePath) : AbstractExtItem(_parent, _filePath)
, ui(new Ui::ExtUpgrade) , ui(new Ui::ExtUpgrade)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
if (!filePath.isEmpty()) if (!_filePath.isEmpty())
readConfiguration(); readConfiguration();
ui->setupUi(this); ui->setupUi(this);
translate(); translate();
m_values[tag(QString("pkgcount"))] = 0; m_values[tag("pkgcount")] = 0;
m_process = new QProcess(nullptr); m_process = new QProcess(nullptr);
connect(m_process, SIGNAL(finished(int)), this, SLOT(updateValue())); connect(m_process, SIGNAL(finished(int)), this, SLOT(updateValue()));
@ -60,7 +60,7 @@ ExtUpgrade::~ExtUpgrade()
} }
ExtUpgrade *ExtUpgrade::copy(const QString _fileName, const int _number) ExtUpgrade *ExtUpgrade::copy(const QString &_fileName, const int _number)
{ {
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
@ -100,7 +100,7 @@ QString ExtUpgrade::uniq() const
} }
void ExtUpgrade::setExecutable(const QString _executable) void ExtUpgrade::setExecutable(const QString &_executable)
{ {
qCDebug(LOG_LIB) << "Executable" << _executable; qCDebug(LOG_LIB) << "Executable" << _executable;
@ -108,7 +108,7 @@ void ExtUpgrade::setExecutable(const QString _executable)
} }
void ExtUpgrade::setFilter(const QString _filter) void ExtUpgrade::setFilter(const QString &_filter)
{ {
qCDebug(LOG_LIB) << "Filter" << _filter; qCDebug(LOG_LIB) << "Filter" << _filter;
@ -132,11 +132,11 @@ void ExtUpgrade::readConfiguration()
QSettings settings(fileName(), QSettings::IniFormat); QSettings settings(fileName(), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
setExecutable(settings.value(QString("Exec"), executable()).toString()); setExecutable(settings.value("Exec", executable()).toString());
setNull(settings.value(QString("X-AW-Null"), null()).toInt()); setNull(settings.value("X-AW-Null", null()).toInt());
// api == 3 // api == 3
setFilter(settings.value(QString("X-AW-Filter"), filter()).toString()); setFilter(settings.value("X-AW-Filter", filter()).toString());
settings.endGroup(); settings.endGroup();
bumpApi(AW_EXTUPGRADE_API); bumpApi(AW_EXTUPGRADE_API);
@ -153,9 +153,9 @@ QVariantHash ExtUpgrade::run()
} }
int ExtUpgrade::showConfiguration(const QVariant args) int ExtUpgrade::showConfiguration(const QVariant &_args)
{ {
Q_UNUSED(args) Q_UNUSED(_args)
ui->lineEdit_name->setText(name()); ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment()); ui->lineEdit_comment->setText(comment());
@ -196,10 +196,10 @@ void ExtUpgrade::writeConfiguration() const
QSettings settings(writtableConfig(), QSettings::IniFormat); QSettings settings(writtableConfig(), QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName(); qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
settings.setValue(QString("Exec"), executable()); settings.setValue("Exec", executable());
settings.setValue(QString("X-AW-Filter"), filter()); settings.setValue("X-AW-Filter", filter());
settings.setValue(QString("X-AW-Null"), null()); settings.setValue("X-AW-Null", null());
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();
@ -222,11 +222,11 @@ void ExtUpgrade::updateValue()
QString qoutput = QTextCodec::codecForMib(106) QString qoutput = QTextCodec::codecForMib(106)
->toUnicode(m_process->readAllStandardOutput()) ->toUnicode(m_process->readAllStandardOutput())
.trimmed(); .trimmed();
m_values[tag(QString("pkgcount"))] = [this](QString output) { m_values[tag("pkgcount")] = [this](QString output) {
return filter().isEmpty() return filter().isEmpty()
? output.split(QChar('\n'), QString::SkipEmptyParts).count() ? output.split('\n', QString::SkipEmptyParts).count()
- null() - null()
: output.split(QChar('\n'), QString::SkipEmptyParts) : output.split('\n', QString::SkipEmptyParts)
.filter(QRegExp(filter())) .filter(QRegExp(filter()))
.count(); .count();
}(qoutput); }(qoutput);

18
sources/awesomewidgets/extupgrade.h
View File

@ -36,23 +36,24 @@ class ExtUpgrade : public AbstractExtItem
Q_PROPERTY(int null READ null WRITE setNull) Q_PROPERTY(int null READ null WRITE setNull)
public: public:
explicit ExtUpgrade(QWidget *parent, const QString filePath = QString()); explicit ExtUpgrade(QWidget *_parent = nullptr,
const QString &_filePath = "");
virtual ~ExtUpgrade(); virtual ~ExtUpgrade();
ExtUpgrade *copy(const QString _fileName, const int _number); ExtUpgrade *copy(const QString &_fileName, const int _number);
// get methods // get methods
QString executable() const; QString executable() const;
QString filter() const; QString filter() const;
int null() const; int null() const;
QString uniq() const; QString uniq() const;
// set methods // set methods
void setExecutable(const QString _executable = QString("/usr/bin/true")); void setExecutable(const QString &_executable);
void setFilter(const QString _filter = QString()); void setFilter(const QString &_filter);
void setNull(const int _null = 0); void setNull(const int _null);
public slots: public slots:
void readConfiguration(); void readConfiguration();
QVariantHash run(); QVariantHash run();
int showConfiguration(const QVariant args = QVariant()); int showConfiguration(const QVariant &_args);
void writeConfiguration() const; void writeConfiguration() const;
private slots: private slots:
@ -64,11 +65,10 @@ private:
Ui::ExtUpgrade *ui = nullptr; Ui::ExtUpgrade *ui = nullptr;
void translate(); void translate();
// properties // properties
QString m_executable = QString("/usr/bin/true"); QString m_executable = "/usr/bin/true";
QString m_filter = QString(""); QString m_filter = "";
int m_null = 0; int m_null = 0;
// internal properties // internal properties
int m_times = 0;
QVariantHash m_values; QVariantHash m_values;
}; };

67
sources/awesomewidgets/extupgrade.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>420</width> <width>420</width>
<height>349</height> <height>382</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -181,6 +181,42 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBox_update">
<property name="title">
<string>Update</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="layout_interval">
<item>
<widget class="QLabel" name="label_interval">
<property name="text">
<string>Interval</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_interval">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
<property name="singleStep">
<number>500</number>
</property>
<property name="value">
<number>3600</number>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<layout class="QHBoxLayout" name="layout_schedule"> <layout class="QHBoxLayout" name="layout_schedule">
<item> <item>
@ -227,35 +263,8 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QHBoxLayout" name="layout_interval">
<item>
<widget class="QLabel" name="label_interval">
<property name="text">
<string>Interval</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_interval">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
<property name="singleStep">
<number>500</number>
</property>
<property name="value">
<number>3600</number>
</property>
</widget>
</item>
</layout> </layout>
</widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">

83
sources/awesomewidgets/extweather.cpp
View File

@ -35,23 +35,23 @@
#include "yahooweatherprovider.h" #include "yahooweatherprovider.h"
ExtWeather::ExtWeather(QWidget *parent, const QString filePath) ExtWeather::ExtWeather(QWidget *_parent, const QString &_filePath)
: AbstractExtItem(parent, filePath) : AbstractExtItem(_parent, _filePath)
, ui(new Ui::ExtWeather) , ui(new Ui::ExtWeather)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
if (!filePath.isEmpty()) if (!_filePath.isEmpty())
readConfiguration(); readConfiguration();
readJsonMap(); readJsonMap();
ui->setupUi(this); ui->setupUi(this);
translate(); translate();
m_values[tag(QString("weatherId"))] = 0; m_values[tag("weatherId")] = 0;
m_values[tag(QString("weather"))] = QString(""); m_values[tag("weather")] = "";
m_values[tag(QString("humidity"))] = 0; m_values[tag("humidity")] = 0;
m_values[tag(QString("pressure"))] = 0.0; m_values[tag("pressure")] = 0.0;
m_values[tag(QString("temperature"))] = 0.0; m_values[tag("temperature")] = 0.0;
// HACK declare as child of nullptr to avoid crash with plasmawindowed // HACK declare as child of nullptr to avoid crash with plasmawindowed
// in the destructor // in the destructor
@ -77,7 +77,7 @@ ExtWeather::~ExtWeather()
} }
ExtWeather *ExtWeather::copy(const QString _fileName, const int _number) ExtWeather *ExtWeather::copy(const QString &_fileName, const int _number)
{ {
qCDebug(LOG_LIB) << "File" << _fileName << "number" << _number; qCDebug(LOG_LIB) << "File" << _fileName << "number" << _number;
@ -99,7 +99,7 @@ QString ExtWeather::jsonMapFile() const
{ {
QString fileName = QStandardPaths::locate( QString fileName = QStandardPaths::locate(
QStandardPaths::GenericDataLocation, QStandardPaths::GenericDataLocation,
QString("awesomewidgets/weather/awesomewidgets-extweather-ids.json")); "awesomewidgets/weather/awesomewidgets-extweather-ids.json");
qCInfo(LOG_LIB) << "Map file" << fileName; qCInfo(LOG_LIB) << "Map file" << fileName;
return fileName; return fileName;
@ -110,9 +110,8 @@ QString ExtWeather::weatherFromInt(const int _id) const
{ {
qCDebug(LOG_LIB) << "Weather ID" << _id; qCDebug(LOG_LIB) << "Weather ID" << _id;
QVariantMap map QVariantMap map = m_jsonMap[m_image ? "image" : "text"].toMap();
= m_jsonMap[m_image ? QString("image") : QString("text")].toMap(); return map.value(QString::number(_id), map["default"]).toString();
return map.value(QString::number(_id), map[QString("default")]).toString();
} }
@ -145,10 +144,10 @@ QString ExtWeather::strProvider() const
QString value; QString value;
switch (m_provider) { switch (m_provider) {
case Provider::OWM: case Provider::OWM:
value = QString("OWM"); value = "OWM";
break; break;
case Provider::Yahoo: case Provider::Yahoo:
value = QString("Yahoo"); value = "Yahoo";
break; break;
} }
@ -168,7 +167,7 @@ QString ExtWeather::uniq() const
} }
void ExtWeather::setCity(const QString _city) void ExtWeather::setCity(const QString &_city)
{ {
qCDebug(LOG_LIB) << "City" << _city; qCDebug(LOG_LIB) << "City" << _city;
@ -177,7 +176,7 @@ void ExtWeather::setCity(const QString _city)
} }
void ExtWeather::setCountry(const QString _country) void ExtWeather::setCountry(const QString &_country)
{ {
qCDebug(LOG_LIB) << "Country" << _country; qCDebug(LOG_LIB) << "Country" << _country;
@ -203,11 +202,11 @@ void ExtWeather::setProvider(const Provider _provider)
} }
void ExtWeather::setStrProvider(const QString _provider) void ExtWeather::setStrProvider(const QString &_provider)
{ {
qCDebug(LOG_LIB) << "Provider" << _provider; qCDebug(LOG_LIB) << "Provider" << _provider;
if (_provider == QString("Yahoo")) if (_provider == "Yahoo")
setProvider(Provider::Yahoo); setProvider(Provider::Yahoo);
else else
setProvider(Provider::OWM); setProvider(Provider::OWM);
@ -229,16 +228,14 @@ void ExtWeather::readConfiguration()
QSettings settings(fileName(), QSettings::IniFormat); QSettings settings(fileName(), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
setCity(settings.value(QString("X-AW-City"), city()).toString()); setCity(settings.value("X-AW-City", city()).toString());
setCountry(settings.value(QString("X-AW-Country"), country()).toString()); setCountry(settings.value("X-AW-Country", country()).toString());
setTs(settings.value(QString("X-AW-TS"), ts()).toInt()); setTs(settings.value("X-AW-TS", ts()).toInt());
// api == 2 // api == 2
setImage(settings.value(QString("X-AW-Image"), QVariant(image())).toString() setImage(settings.value("X-AW-Image", image()).toBool());
== QString("true"));
// api == 3 // api == 3
setStrProvider( setStrProvider(settings.value("X-AW-Provider", strProvider()).toString());
settings.value(QString("X-AW-Provider"), strProvider()).toString());
settings.endGroup(); settings.endGroup();
bumpApi(AW_EXTWEATHER_API); bumpApi(AW_EXTWEATHER_API);
@ -278,9 +275,9 @@ QVariantHash ExtWeather::run()
} }
int ExtWeather::showConfiguration(const QVariant args) int ExtWeather::showConfiguration(const QVariant &_args)
{ {
Q_UNUSED(args) Q_UNUSED(_args)
ui->lineEdit_name->setText(name()); ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment()); ui->lineEdit_comment->setText(comment());
@ -325,12 +322,12 @@ void ExtWeather::writeConfiguration() const
QSettings settings(writtableConfig(), QSettings::IniFormat); QSettings settings(writtableConfig(), QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName(); qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
settings.setValue(QString("X-AW-City"), city()); settings.setValue("X-AW-City", city());
settings.setValue(QString("X-AW-Country"), country()); settings.setValue("X-AW-Country", country());
settings.setValue(QString("X-AW-Image"), image()); settings.setValue("X-AW-Image", image());
settings.setValue(QString("X-AW-Provider"), strProvider()); settings.setValue("X-AW-Provider", strProvider());
settings.setValue(QString("X-AW-TS"), ts()); settings.setValue("X-AW-TS", ts());
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();
@ -346,18 +343,18 @@ void ExtWeather::sendRequest()
} }
void ExtWeather::weatherReplyReceived(QNetworkReply *reply) void ExtWeather::weatherReplyReceived(QNetworkReply *_reply)
{ {
if (reply->error() != QNetworkReply::NoError) { if (_reply->error() != QNetworkReply::NoError) {
qCWarning(LOG_AW) << "An error occurs" << reply->error() qCWarning(LOG_AW) << "An error occurs" << _reply->error()
<< "with message" << reply->errorString(); << "with message" << _reply->errorString();
return; return;
} }
m_isRunning = false; m_isRunning = false;
QJsonParseError error; QJsonParseError error;
QJsonDocument jsonDoc = QJsonDocument::fromJson(reply->readAll(), &error); QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
reply->deleteLater(); _reply->deleteLater();
if (error.error != QJsonParseError::NoError) { if (error.error != QJsonParseError::NoError) {
qCWarning(LOG_LIB) << "Parse error" << error.errorString(); qCWarning(LOG_LIB) << "Parse error" << error.errorString();
return; return;
@ -367,8 +364,8 @@ void ExtWeather::weatherReplyReceived(QNetworkReply *reply)
if (data.isEmpty()) if (data.isEmpty())
return; return;
m_values = data; m_values = data;
m_values[tag(QString("weather"))] m_values[tag("weather")]
= weatherFromInt(m_values[tag(QString("weatherId"))].toInt()); = weatherFromInt(m_values[tag("weatherId")].toInt());
emit(dataReceived(m_values)); emit(dataReceived(m_values));
} }

28
sources/awesomewidgets/extweather.h
View File

@ -42,9 +42,10 @@ class ExtWeather : public AbstractExtItem
public: public:
enum class Provider { OWM = 0, Yahoo = 1 }; enum class Provider { OWM = 0, Yahoo = 1 };
explicit ExtWeather(QWidget *parent, const QString filePath = QString()); explicit ExtWeather(QWidget *_parent = nullptr,
const QString &_filePath = "");
virtual ~ExtWeather(); virtual ~ExtWeather();
ExtWeather *copy(const QString _fileName, const int _number); ExtWeather *copy(const QString &_fileName, const int _number);
QString jsonMapFile() const; QString jsonMapFile() const;
QString weatherFromInt(const int _id) const; QString weatherFromInt(const int _id) const;
// get methods // get methods
@ -56,23 +57,23 @@ public:
int ts() const; int ts() const;
QString uniq() const; QString uniq() const;
// set methods // set methods
void setCity(const QString _city = QString("London")); void setCity(const QString &_city);
void setCountry(const QString _country = QString("uk")); void setCountry(const QString &_country);
void setImage(const bool _image = false); void setImage(const bool _image);
void setProvider(const Provider _provider = Provider::OWM); void setProvider(const Provider _provider);
void setStrProvider(const QString _provider = QString("OWM")); void setStrProvider(const QString &_provider);
void setTs(const int _ts = 0); void setTs(const int _ts);
public slots: public slots:
void readConfiguration(); void readConfiguration();
void readJsonMap(); void readJsonMap();
QVariantHash run(); QVariantHash run();
int showConfiguration(const QVariant args = QVariant()); int showConfiguration(const QVariant &_args);
void writeConfiguration() const; void writeConfiguration() const;
private slots: private slots:
void sendRequest(); void sendRequest();
void weatherReplyReceived(QNetworkReply *reply); void weatherReplyReceived(QNetworkReply *_reply);
private: private:
QNetworkAccessManager *m_manager = nullptr; QNetworkAccessManager *m_manager = nullptr;
@ -82,14 +83,13 @@ private:
void initProvider(); void initProvider();
void translate(); void translate();
// properties // properties
QString m_city = QString("London"); QString m_city = "London";
QString m_country = QString("uk"); QString m_country = "uk";
bool m_image = false; bool m_image = false;
Provider m_provider = Provider::OWM; Provider m_provider = Provider::OWM;
int m_ts = 0; int m_ts = 0;
QVariantMap m_jsonMap = QVariantMap(); QVariantMap m_jsonMap;
// values // values
int m_times = 0;
QVariantHash m_values; QVariantHash m_values;
}; };

67
sources/awesomewidgets/extweather.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>420</width> <width>420</width>
<height>413</height> <height>446</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -248,6 +248,42 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBox_update">
<property name="title">
<string>Update</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="layout_interval">
<item>
<widget class="QLabel" name="label_interval">
<property name="text">
<string>Interval</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_interval">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
<property name="singleStep">
<number>500</number>
</property>
<property name="value">
<number>3600</number>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<layout class="QHBoxLayout" name="layout_schedule"> <layout class="QHBoxLayout" name="layout_schedule">
<item> <item>
@ -294,35 +330,8 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QHBoxLayout" name="layout_interval">
<item>
<widget class="QLabel" name="label_interval">
<property name="text">
<string>Interval</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinBox_interval">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
<property name="singleStep">
<number>10</number>
</property>
<property name="value">
<number>60</number>
</property>
</widget>
</item>
</layout> </layout>
</widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">

130
sources/awesomewidgets/graphicalitem.cpp
View File

@ -32,13 +32,13 @@
#include "graphicalitemhelper.h" #include "graphicalitemhelper.h"
GraphicalItem::GraphicalItem(QWidget *parent, const QString filePath) GraphicalItem::GraphicalItem(QWidget *_parent, const QString &_filePath)
: AbstractExtItem(parent, filePath) : AbstractExtItem(_parent, _filePath)
, ui(new Ui::GraphicalItem) , ui(new Ui::GraphicalItem)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
if (!filePath.isEmpty()) if (!_filePath.isEmpty())
readConfiguration(); readConfiguration();
ui->setupUi(this); ui->setupUi(this);
translate(); translate();
@ -64,7 +64,7 @@ GraphicalItem::~GraphicalItem()
} }
GraphicalItem *GraphicalItem::copy(const QString _fileName, const int _number) GraphicalItem *GraphicalItem::copy(const QString &_fileName, const int _number)
{ {
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
@ -150,7 +150,7 @@ void GraphicalItem::initScene()
m_scene->setBackgroundBrush(QBrush(Qt::NoBrush)); m_scene->setBackgroundBrush(QBrush(Qt::NoBrush));
// init view // init view
m_view = new QGraphicsView(m_scene); m_view = new QGraphicsView(m_scene);
m_view->setStyleSheet(QString("background: transparent")); m_view->setStyleSheet("background: transparent");
m_view->setContentsMargins(0, 0, 0, 0); m_view->setContentsMargins(0, 0, 0, 0);
m_view->setFrameShape(QFrame::NoFrame); m_view->setFrameShape(QFrame::NoFrame);
m_view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); m_view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@ -229,19 +229,19 @@ QString GraphicalItem::strType() const
QString value; QString value;
switch (type()) { switch (type()) {
case Type::Vertical: case Type::Vertical:
value = QString("Vertical"); value = "Vertical";
break; break;
case Type::Circle: case Type::Circle:
value = QString("Circle"); value = "Circle";
break; break;
case Type::Graph: case Type::Graph:
value = QString("Graph"); value = "Graph";
break; break;
case Type::Bars: case Type::Bars:
value = QString("Bars"); value = "Bars";
break; break;
case Type::Horizontal: case Type::Horizontal:
value = QString("Horizontal"); value = "Horizontal";
break; break;
} }
@ -260,10 +260,10 @@ QString GraphicalItem::strDirection() const
QString value; QString value;
switch (direction()) { switch (direction()) {
case Direction::RightToLeft: case Direction::RightToLeft:
value = QString("RightToLeft"); value = "RightToLeft";
break; break;
case Direction::LeftToRight: case Direction::LeftToRight:
value = QString("LeftToRight"); value = "LeftToRight";
break; break;
} }
@ -283,7 +283,7 @@ QString GraphicalItem::uniq() const
} }
void GraphicalItem::setBar(const QString _bar) void GraphicalItem::setBar(const QString &_bar)
{ {
qCDebug(LOG_LIB) << "Bar" << _bar; qCDebug(LOG_LIB) << "Bar" << _bar;
@ -291,7 +291,7 @@ void GraphicalItem::setBar(const QString _bar)
} }
void GraphicalItem::setActiveColor(const QString _color) void GraphicalItem::setActiveColor(const QString &_color)
{ {
qCDebug(LOG_LIB) << "Color" << _color; qCDebug(LOG_LIB) << "Color" << _color;
@ -317,7 +317,7 @@ void GraphicalItem::setCustom(const bool _custom)
} }
void GraphicalItem::setInactiveColor(const QString _color) void GraphicalItem::setInactiveColor(const QString &_color)
{ {
qCDebug(LOG_LIB) << "Color" << _color; qCDebug(LOG_LIB) << "Color" << _color;
@ -369,17 +369,17 @@ void GraphicalItem::setType(const Type _type)
} }
void GraphicalItem::setStrType(const QString _type) void GraphicalItem::setStrType(const QString &_type)
{ {
qCDebug(LOG_LIB) << "Type" << _type; qCDebug(LOG_LIB) << "Type" << _type;
if (_type == QString("Vertical")) if (_type == "Vertical")
setType(Type::Vertical); setType(Type::Vertical);
else if (_type == QString("Circle")) else if (_type == "Circle")
setType(Type::Circle); setType(Type::Circle);
else if (_type == QString("Graph")) else if (_type == "Graph")
setType(Type::Graph); setType(Type::Graph);
else if (_type == QString("Bars")) else if (_type == "Bars")
setType(Type::Bars); setType(Type::Bars);
else else
setType(Type::Horizontal); setType(Type::Horizontal);
@ -394,25 +394,25 @@ void GraphicalItem::setDirection(const Direction _direction)
} }
void GraphicalItem::setStrDirection(const QString _direction) void GraphicalItem::setStrDirection(const QString &_direction)
{ {
qCDebug(LOG_LIB) << "Direction" << _direction; qCDebug(LOG_LIB) << "Direction" << _direction;
if (_direction == QString("RightToLeft")) if (_direction == "RightToLeft")
setDirection(Direction::RightToLeft); setDirection(Direction::RightToLeft);
else else
setDirection(Direction::LeftToRight); setDirection(Direction::LeftToRight);
} }
void GraphicalItem::setUsedKeys(const QStringList _usedKeys) void GraphicalItem::setUsedKeys(const QStringList &_usedKeys)
{ {
qCDebug(LOG_LIB) << "Used keys" << _usedKeys; qCDebug(LOG_LIB) << "Used keys" << _usedKeys;
// remove dubs // remove dubs
// HACK converting to set may break order // HACK converting to set may break order
usedKeys().clear(); usedKeys().clear();
for (auto key : _usedKeys) { for (auto &key : _usedKeys) {
if (usedKeys().contains(key)) if (usedKeys().contains(key))
continue; continue;
usedKeys().append(key); usedKeys().append(key);
@ -426,30 +426,28 @@ void GraphicalItem::readConfiguration()
QSettings settings(fileName(), QSettings::IniFormat); QSettings settings(fileName(), QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
setCount(settings.value(QString("X-AW-Count"), count()).toInt()); setCount(settings.value("X-AW-Count", count()).toInt());
setCustom(settings.value(QString("X-AW-Custom"), isCustom()).toBool()); setCustom(settings.value("X-AW-Custom", isCustom()).toBool());
setBar(settings.value(QString("X-AW-Value"), bar()).toString()); setBar(settings.value("X-AW-Value", bar()).toString());
setMaxValue(settings.value(QString("X-AW-Max"), maxValue()).toFloat()); setMaxValue(settings.value("X-AW-Max", maxValue()).toFloat());
setMinValue(settings.value(QString("X-AW-Min"), minValue()).toFloat()); setMinValue(settings.value("X-AW-Min", minValue()).toFloat());
setActiveColor( setActiveColor(
settings.value(QString("X-AW-ActiveColor"), activeColor()).toString()); settings.value("X-AW-ActiveColor", activeColor()).toString());
setInactiveColor( setInactiveColor(
settings.value(QString("X-AW-InactiveColor"), inactiveColor()) settings.value("X-AW-InactiveColor", inactiveColor()).toString());
.toString()); setStrType(settings.value("X-AW-Type", strType()).toString());
setStrType(settings.value(QString("X-AW-Type"), strType()).toString());
setStrDirection( setStrDirection(
settings.value(QString("X-AW-Direction"), strDirection()).toString()); settings.value("X-AW-Direction", strDirection()).toString());
setItemHeight(settings.value(QString("X-AW-Height"), itemHeight()).toInt()); setItemHeight(settings.value("X-AW-Height", itemHeight()).toInt());
setItemWidth(settings.value(QString("X-AW-Width"), itemWidth()).toInt()); setItemWidth(settings.value("X-AW-Width", itemWidth()).toInt());
// api == 5 // api == 5
if (apiVersion() < 5) { if (apiVersion() < 5) {
QString prefix; QString prefix;
prefix = activeColor().startsWith(QString("/")) ? QString("file://%1") prefix = activeColor().startsWith("/") ? QString("file://%1")
: QString("color://%1"); : QString("color://%1");
m_activeColor = prefix.arg(activeColor()); m_activeColor = prefix.arg(activeColor());
prefix = inactiveColor().startsWith(QString("/")) prefix = inactiveColor().startsWith("/") ? QString("file://%1")
? QString("file://%1")
: QString("color://%1"); : QString("color://%1");
m_inactiveColor = prefix.arg(inactiveColor()); m_inactiveColor = prefix.arg(inactiveColor());
} }
@ -460,10 +458,10 @@ void GraphicalItem::readConfiguration()
} }
int GraphicalItem::showConfiguration(const QVariant args) int GraphicalItem::showConfiguration(const QVariant &_args)
{ {
qCDebug(LOG_LIB) << "Combobox arguments" << args; qCDebug(LOG_LIB) << "Combobox arguments" << _args;
QStringList tags = args.toStringList(); QStringList tags = _args.toStringList();
ui->lineEdit_name->setText(name()); ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment()); ui->lineEdit_comment->setText(comment());
@ -531,18 +529,18 @@ void GraphicalItem::writeConfiguration() const
QSettings settings(writtableConfig(), QSettings::IniFormat); QSettings settings(writtableConfig(), QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName(); qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry")); settings.beginGroup("Desktop Entry");
settings.setValue(QString("X-AW-Value"), bar()); settings.setValue("X-AW-Value", bar());
settings.setValue(QString("X-AW-Count"), count()); settings.setValue("X-AW-Count", count());
settings.setValue(QString("X-AW-Custom"), isCustom()); settings.setValue("X-AW-Custom", isCustom());
settings.setValue(QString("X-AW-Max"), maxValue()); settings.setValue("X-AW-Max", maxValue());
settings.setValue(QString("X-AW-Min"), minValue()); settings.setValue("X-AW-Min", minValue());
settings.setValue(QString("X-AW-ActiveColor"), activeColor()); settings.setValue("X-AW-ActiveColor", activeColor());
settings.setValue(QString("X-AW-InactiveColor"), inactiveColor()); settings.setValue("X-AW-InactiveColor", inactiveColor());
settings.setValue(QString("X-AW-Type"), strType()); settings.setValue("X-AW-Type", strType());
settings.setValue(QString("X-AW-Direction"), strDirection()); settings.setValue("X-AW-Direction", strDirection());
settings.setValue(QString("X-AW-Height"), itemHeight()); settings.setValue("X-AW-Height", itemHeight());
settings.setValue(QString("X-AW-Width"), itemWidth()); settings.setValue("X-AW-Width", itemWidth());
settings.endGroup(); settings.endGroup();
settings.sync(); settings.sync();
@ -566,7 +564,7 @@ void GraphicalItem::changeColor()
if (state == 0) { if (state == 0) {
QColor color = m_helper->stringToColor(lineEdit->text()); QColor color = m_helper->stringToColor(lineEdit->text());
QColor newColor = QColorDialog::getColor( QColor newColor = QColorDialog::getColor(
color, this, tr("Select color"), QColorDialog::ShowAlphaChannel); color, this, i18n("Select color"), QColorDialog::ShowAlphaChannel);
if (!newColor.isValid()) if (!newColor.isValid())
return; return;
qCInfo(LOG_LIB) << "Selected color" << newColor; qCInfo(LOG_LIB) << "Selected color" << newColor;
@ -577,13 +575,13 @@ void GraphicalItem::changeColor()
colorText.append(QString("%1").arg(newColor.blue())); colorText.append(QString("%1").arg(newColor.blue()));
colorText.append(QString("%1").arg(newColor.alpha())); colorText.append(QString("%1").arg(newColor.alpha()));
outputColor = QString("color://%1").arg(colorText.join(QChar(','))); outputColor = QString("color://%1").arg(colorText.join(','));
} else if (state == 1) { } else if (state == 1) {
QString path = lineEdit->text(); QString path = lineEdit->text();
QString directory = QFileInfo(path).absolutePath(); QString directory = QFileInfo(path).absolutePath();
outputColor = QFileDialog::getOpenFileUrl( outputColor = QFileDialog::getOpenFileUrl(
this, tr("Select path"), directory, this, i18n("Select path"), directory,
tr("Images (*.png *.bpm *.jpg);;All files (*.*)")) i18n("Images (*.png *.bpm *.jpg);;All files (*.*)"))
.toString(); .toString();
qCInfo(LOG_LIB) << "Selected path" << outputColor; qCInfo(LOG_LIB) << "Selected path" << outputColor;
@ -597,21 +595,21 @@ void GraphicalItem::changeColor()
} }
void GraphicalItem::changeCountState(const int state) void GraphicalItem::changeCountState(const int _state)
{ {
qCDebug(LOG_LIB) << "Current state is" << state; qCDebug(LOG_LIB) << "Current state is" << _state;
// 3 is magic number. Actually 3 is Graph mode // 3 is magic number. Actually 3 is Graph mode
ui->widget_count->setHidden(state != 3); ui->widget_count->setHidden(_state != 3);
} }
void GraphicalItem::changeValue(const int state) void GraphicalItem::changeValue(const int _state)
{ {
qCDebug(LOG_LIB) << "Current state is" << state; qCDebug(LOG_LIB) << "Current state is" << _state;
ui->widget_value->setHidden(state != Qt::Unchecked); ui->widget_value->setHidden(_state != Qt::Unchecked);
ui->widget_customValue->setHidden(state == Qt::Unchecked); ui->widget_customValue->setHidden(_state == Qt::Unchecked);
} }

46
sources/awesomewidgets/graphicalitem.h
View File

@ -58,9 +58,10 @@ public:
Bars = 4 Bars = 4
}; };
explicit GraphicalItem(QWidget *parent, const QString filePath = QString()); explicit GraphicalItem(QWidget *_parent = nullptr,
const QString &_filePath = "");
virtual ~GraphicalItem(); virtual ~GraphicalItem();
GraphicalItem *copy(const QString _fileName, const int _number); GraphicalItem *copy(const QString &_fileName, const int _number);
QString image(const QVariant &value); QString image(const QVariant &value);
void initScene(); void initScene();
// get methods // get methods
@ -80,32 +81,31 @@ public:
QStringList usedKeys() const; QStringList usedKeys() const;
QString uniq() const; QString uniq() const;
// set methods // set methods
void setBar(const QString _bar = QString("cpu")); void setBar(const QString &_bar);
void setActiveColor(const QString _color = QString("color://0,0,0,130")); void setActiveColor(const QString &_color);
void setCount(const int _count = 100); void setCount(const int _count);
void setCustom(const bool _custom = false); void setCustom(const bool _custom);
void setInactiveColor(const QString _color void setInactiveColor(const QString &_color);
= QString("color://255,255,255,130")); void setItemHeight(const int _height);
void setItemHeight(const int _height = 100); void setItemWidth(const int _width);
void setItemWidth(const int _width = 100); void setMinValue(const float _value);
void setMinValue(const float _value = 0.0); void setMaxValue(const float _value);
void setMaxValue(const float _value = 100.0); void setType(const Type _type);
void setType(const Type _type = Type::Horizontal); void setStrType(const QString &_type);
void setStrType(const QString _type = QString("Horizontal")); void setDirection(const Direction _direction);
void setDirection(const Direction _direction = Direction::LeftToRight); void setStrDirection(const QString &_direction);
void setStrDirection(const QString _direction = QString("LeftToRight")); void setUsedKeys(const QStringList &_usedKeys);
void setUsedKeys(const QStringList _usedKeys = QStringList());
public slots: public slots:
void readConfiguration(); void readConfiguration();
QVariantHash run() { return QVariantHash(); }; QVariantHash run() { return QVariantHash(); };
int showConfiguration(const QVariant args = QVariant()); int showConfiguration(const QVariant &_args);
void writeConfiguration() const; void writeConfiguration() const;
private slots: private slots:
void changeColor(); void changeColor();
void changeCountState(const int state); void changeCountState(const int _state);
void changeValue(const int state); void changeValue(const int _state);
private: private:
GraphicalItemHelper *m_helper = nullptr; GraphicalItemHelper *m_helper = nullptr;
@ -114,11 +114,11 @@ private:
Ui::GraphicalItem *ui = nullptr; Ui::GraphicalItem *ui = nullptr;
void translate(); void translate();
// properties // properties
QString m_bar = QString("cpu"); QString m_bar = "cpu";
int m_count = 100; int m_count = 100;
bool m_custom = false; bool m_custom = false;
QString m_activeColor = QString("color://0,0,0,130"); QString m_activeColor = "color://0,0,0,130";
QString m_inactiveColor = QString("color://255,255,255,130"); QString m_inactiveColor = "color://255,255,255,130";
float m_minValue = 0.0f; float m_minValue = 0.0f;
float m_maxValue = 100.0f; float m_maxValue = 100.0f;
Type m_type = Type::Horizontal; Type m_type = Type::Horizontal;

122
sources/awesomewidgets/graphicalitemhelper.cpp
View File

@ -27,9 +27,10 @@
#include "awdebug.h" #include "awdebug.h"
GraphicalItemHelper::GraphicalItemHelper(QObject *parent, QGraphicsScene *scene) GraphicalItemHelper::GraphicalItemHelper(QObject *_parent,
: QObject(parent) QGraphicsScene *_scene)
, m_scene(scene) : QObject(_parent)
, m_scene(_scene)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
} }
@ -41,54 +42,56 @@ GraphicalItemHelper::~GraphicalItemHelper()
} }
void GraphicalItemHelper::setParameters(const QString active, void GraphicalItemHelper::setParameters(const QString &_active,
const QString inactive, const int width, const QString &_inactive,
const int height, const int count) const int _width, const int _height,
const int _count)
{ {
qCDebug(LOG_LIB) << "Use active color" << active << ", inactive" << inactive qCDebug(LOG_LIB) << "Use active color" << _active << ", inactive"
<< ", width" << width << ", height" << height << ", count" << _inactive << ", width" << _width << ", height"
<< count; << _height << ", count" << _count;
// put images to pens if any otherwise set pen colors // put images to pens if any otherwise set pen colors
// Images resize to content here as well // Images resize to content here as well
if (isColor(active)) { if (isColor(_active)) {
m_activePen.setBrush(QBrush(stringToColor(active))); m_activePen.setBrush(QBrush(stringToColor(_active)));
} else { } else {
qCInfo(LOG_LIB) << "Found path, trying to load Pixmap from" << active; qCInfo(LOG_LIB) << "Found path, trying to load Pixmap from" << _active;
QPixmap pixmap = QPixmap(QUrl(active).toLocalFile()); QPixmap pixmap = QPixmap(QUrl(_active).toLocalFile());
if (pixmap.isNull()) { if (pixmap.isNull()) {
qCWarning(LOG_LIB) << "Invalid pixmap found" << active; qCWarning(LOG_LIB) << "Invalid pixmap found" << _active;
m_activePen.setBrush(QBrush(QColor(0, 0, 0, 130))); m_activePen.setBrush(QBrush(QColor(0, 0, 0, 130)));
} else { } else {
m_activePen.setBrush(QBrush(pixmap.scaled(width, height))); m_activePen.setBrush(QBrush(pixmap.scaled(_width, _height)));
} }
} }
if (isColor(inactive)) { if (isColor(_inactive)) {
m_inactivePen.setBrush(QBrush(stringToColor(inactive))); m_inactivePen.setBrush(QBrush(stringToColor(_inactive)));
} else { } else {
qCInfo(LOG_LIB) << "Found path, trying to load Pixmap from" << inactive; qCInfo(LOG_LIB) << "Found path, trying to load Pixmap from"
QPixmap pixmap = QPixmap(QUrl(inactive).toLocalFile()); << _inactive;
QPixmap pixmap = QPixmap(QUrl(_inactive).toLocalFile());
if (pixmap.isNull()) { if (pixmap.isNull()) {
qCWarning(LOG_LIB) << "Invalid pixmap found" << inactive; qCWarning(LOG_LIB) << "Invalid pixmap found" << _inactive;
m_inactivePen.setBrush(QBrush(QColor(255, 255, 255, 130))); m_inactivePen.setBrush(QBrush(QColor(255, 255, 255, 130)));
} else { } else {
m_inactivePen.setBrush(QBrush(pixmap.scaled(width, height))); m_inactivePen.setBrush(QBrush(pixmap.scaled(_width, _height)));
} }
} }
m_width = width; m_width = _width;
m_height = height; m_height = _height;
m_count = count; m_count = _count;
} }
void GraphicalItemHelper::paintBars(const float &value) void GraphicalItemHelper::paintBars(const float _value)
{ {
qCDebug(LOG_LIB) << "Paint with value" << value; qCDebug(LOG_LIB) << "Paint with value" << _value;
// refresh background image // refresh background image
m_scene->setBackgroundBrush(m_inactivePen.brush()); m_scene->setBackgroundBrush(m_inactivePen.brush());
storeValue(value); storeValue(_value);
// default norms // default norms
float normX float normX
@ -105,9 +108,9 @@ void GraphicalItemHelper::paintBars(const float &value)
} }
void GraphicalItemHelper::paintCircle(const float &percent) void GraphicalItemHelper::paintCircle(const float _percent)
{ {
qCDebug(LOG_LIB) << "Paint with percent" << percent; qCDebug(LOG_LIB) << "Paint with percent" << _percent;
m_activePen.setWidth(1); m_activePen.setWidth(1);
m_inactivePen.setWidth(1); m_inactivePen.setWidth(1);
@ -118,24 +121,24 @@ void GraphicalItemHelper::paintCircle(const float &percent)
// inactive // inactive
circle = m_scene->addEllipse(0.0, 0.0, m_width, m_height, m_inactivePen, circle = m_scene->addEllipse(0.0, 0.0, m_width, m_height, m_inactivePen,
m_inactivePen.brush()); m_inactivePen.brush());
circle->setSpanAngle(-(1.0f - percent) * 360.0f * 16.0f); circle->setSpanAngle(-(1.0f - _percent) * 360.0f * 16.0f);
circle->setStartAngle(90.0f * 16.0f - percent * 360.0f * 16.0f); circle->setStartAngle(90.0f * 16.0f - _percent * 360.0f * 16.0f);
// active // active
circle = m_scene->addEllipse(0.0, 0.0, m_width, m_height, m_activePen, circle = m_scene->addEllipse(0.0, 0.0, m_width, m_height, m_activePen,
m_activePen.brush()); m_activePen.brush());
circle->setSpanAngle(-percent * 360.0f * 16.0f); circle->setSpanAngle(-_percent * 360.0f * 16.0f);
circle->setStartAngle(90 * 16); circle->setStartAngle(90 * 16);
} }
void GraphicalItemHelper::paintGraph(const float &value) void GraphicalItemHelper::paintGraph(const float _value)
{ {
qCDebug(LOG_LIB) << "Paint with value" << value; qCDebug(LOG_LIB) << "Paint with value" << _value;
// refresh background image // refresh background image
m_scene->setBackgroundBrush(m_inactivePen.brush()); m_scene->setBackgroundBrush(m_inactivePen.brush());
storeValue(value); storeValue(_value);
// default norms // default norms
float normX float normX
@ -153,66 +156,67 @@ void GraphicalItemHelper::paintGraph(const float &value)
} }
void GraphicalItemHelper::paintHorizontal(const float &percent) void GraphicalItemHelper::paintHorizontal(const float _percent)
{ {
qCDebug(LOG_LIB) << "Paint with percent" << percent; qCDebug(LOG_LIB) << "Paint with percent" << _percent;
m_activePen.setWidth(m_height); m_activePen.setWidth(m_height);
m_inactivePen.setWidth(m_height); m_inactivePen.setWidth(m_height);
// inactive // inactive
m_scene->addLine(percent * m_width + 0.5 * m_height, 0.5 * m_height, m_scene->addLine(_percent * m_width + 0.5 * m_height, 0.5 * m_height,
m_width + 0.5 * m_height, 0.5 * m_height, m_inactivePen); m_width + 0.5 * m_height, 0.5 * m_height, m_inactivePen);
// active // active
m_scene->addLine(-0.5 * m_height, 0.5 * m_height, m_scene->addLine(-0.5 * m_height, 0.5 * m_height,
percent * m_width - 0.5 * m_height, 0.5 * m_height, _percent * m_width - 0.5 * m_height, 0.5 * m_height,
m_activePen); m_activePen);
} }
void GraphicalItemHelper::paintVertical(const float &percent) void GraphicalItemHelper::paintVertical(const float _percent)
{ {
qCDebug(LOG_LIB) << "Paint with percent" << percent; qCDebug(LOG_LIB) << "Paint with percent" << _percent;
m_activePen.setWidth(m_height); m_activePen.setWidth(m_height);
m_inactivePen.setWidth(m_height); m_inactivePen.setWidth(m_height);
// inactive // inactive
m_scene->addLine(0.5 * m_width, -0.5 * m_width, 0.5 * m_width, m_scene->addLine(0.5 * m_width, -0.5 * m_width, 0.5 * m_width,
(1.0 - percent) * m_height - 0.5 * m_width, m_inactivePen); (1.0 - _percent) * m_height - 0.5 * m_width,
m_inactivePen);
// active // active
m_scene->addLine(0.5 * m_width, (1.0 - percent) * m_height + 0.5 * m_width, m_scene->addLine(0.5 * m_width, (1.0 - _percent) * m_height + 0.5 * m_width,
0.5 * m_width, m_height + 0.5 * m_width, m_activePen); 0.5 * m_width, m_height + 0.5 * m_width, m_activePen);
} }
float GraphicalItemHelper::getPercents(const float &value, const float &min, float GraphicalItemHelper::getPercents(const float _value, const float _min,
const float &max) const float _max)
{ {
qCDebug(LOG_LIB) << "Get percent value from" << value; qCDebug(LOG_LIB) << "Get percent value from" << _value;
// newest Qt crashes here if value is nan // newest Qt crashes here if value is nan
if (std::isnan(value)) if (std::isnan(_value))
return 0.0; return 0.0;
return (value - min) / (max - min); return (_value - _min) / (_max - _min);
} }
bool GraphicalItemHelper::isColor(const QString &input) bool GraphicalItemHelper::isColor(const QString &_input)
{ {
qCDebug(LOG_LIB) << "Define input type in" << input; qCDebug(LOG_LIB) << "Define input type in" << _input;
return input.startsWith(QString("color://")); return _input.startsWith("color://");
} }
QColor GraphicalItemHelper::stringToColor(const QString &color) QColor GraphicalItemHelper::stringToColor(const QString &_color)
{ {
qCDebug(LOG_LIB) << "Color" << color; qCDebug(LOG_LIB) << "Color" << _color;
QStringList listColor = color.split(QChar(',')); QStringList listColor = _color.split(',');
while (listColor.count() < 4) while (listColor.count() < 4)
listColor.append(QString("0")); listColor.append("0");
// remove prefix // remove prefix
listColor[0].remove(QString("color://")); listColor[0].remove("color://");
// init color // init color
QColor qColor; QColor qColor;
qColor.setRed(listColor.at(0).toInt()); qColor.setRed(listColor.at(0).toInt());
@ -224,14 +228,14 @@ QColor GraphicalItemHelper::stringToColor(const QString &color)
} }
void GraphicalItemHelper::storeValue(const float &value) void GraphicalItemHelper::storeValue(const float _value)
{ {
qCDebug(LOG_LIB) << "Save value to array" << value; qCDebug(LOG_LIB) << "Save value to array" << _value;
if (m_values.count() == 0) if (m_values.count() == 0)
m_values.append(1.0); m_values.append(1.0);
else if (m_values.count() > m_count) else if (m_values.count() > m_count)
m_values.removeFirst(); m_values.removeFirst();
m_values.append(value); m_values.append(_value);
} }

26
sources/awesomewidgets/graphicalitemhelper.h
View File

@ -30,25 +30,25 @@ class GraphicalItemHelper : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit GraphicalItemHelper(QObject *parent = nullptr, explicit GraphicalItemHelper(QObject *_parent = nullptr,
QGraphicsScene *scene = nullptr); QGraphicsScene *_scene = nullptr);
virtual ~GraphicalItemHelper(); virtual ~GraphicalItemHelper();
// parameters // parameters
void setParameters(const QString active, const QString inactive, void setParameters(const QString &_active, const QString &_inactive,
const int width, const int height, const int count); const int _width, const int _height, const int _count);
// paint methods // paint methods
void paintBars(const float &value); void paintBars(const float _value);
void paintCircle(const float &percent); void paintCircle(const float _percent);
void paintGraph(const float &value); void paintGraph(const float _value);
void paintHorizontal(const float &percent); void paintHorizontal(const float _percent);
void paintVertical(const float &percent); void paintVertical(const float _percent);
// additional conversion methods // additional conversion methods
float getPercents(const float &value, const float &min, const float &max); float getPercents(const float _value, const float _min, const float _max);
bool isColor(const QString &input); bool isColor(const QString &_input);
QColor stringToColor(const QString &color); QColor stringToColor(const QString &_color);
private: private:
void storeValue(const float &value); void storeValue(const float _value);
QGraphicsScene *m_scene = nullptr; QGraphicsScene *m_scene = nullptr;
int m_count = 100; int m_count = 100;
QPen m_activePen; QPen m_activePen;

43
sources/awesomewidgets/owmweatherprovider.cpp
View File

@ -23,8 +23,8 @@
#include "awdebug.h" #include "awdebug.h"
OWMWeatherProvider::OWMWeatherProvider(QObject *parent, const int number) OWMWeatherProvider::OWMWeatherProvider(QObject *_parent, const int _number)
: AbstractWeatherProvider(parent, number) : AbstractWeatherProvider(_parent, _number)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
} }
@ -36,10 +36,11 @@ OWMWeatherProvider::~OWMWeatherProvider()
} }
void OWMWeatherProvider::initUrl(const QString city, const QString country, void OWMWeatherProvider::initUrl(const QString &_city, const QString &_country,
const int ts) const int ts)
{ {
qCDebug(LOG_LIB) << "Init query for" << city << country << "with ts" << ts; qCDebug(LOG_LIB) << "Init query for" << _city << _country << "with ts"
<< ts;
m_ts = ts; m_ts = ts;
@ -48,26 +49,26 @@ void OWMWeatherProvider::initUrl(const QString city, const QString country,
else else
m_url = QUrl(OWM_FORECAST_URL); m_url = QUrl(OWM_FORECAST_URL);
QUrlQuery params; QUrlQuery params;
params.addQueryItem(QString("q"), QString("%1,%2").arg(city, country)); params.addQueryItem("q", QString("%1,%2").arg(_city, _country));
params.addQueryItem(QString("units"), QString("metric")); params.addQueryItem("units", "metric");
m_url.setQuery(params); m_url.setQuery(params);
} }
QVariantHash OWMWeatherProvider::parse(const QVariantMap &json) const QVariantHash OWMWeatherProvider::parse(const QVariantMap &_json) const
{ {
qCDebug(LOG_LIB) << "Parse json" << json; qCDebug(LOG_LIB) << "Parse json" << _json;
if (json[QString("cod")].toInt() != 200) { if (_json["cod"].toInt() != 200) {
qCWarning(LOG_LIB) << "Invalid OpenWeatherMap return code" qCWarning(LOG_LIB) << "Invalid OpenWeatherMap return code"
<< json[QString("cod")].toInt(); << _json["cod"].toInt();
return QVariantHash(); return QVariantHash();
} }
if (m_ts == 0) { if (m_ts == 0) {
return parseSingleJson(json); return parseSingleJson(_json);
} else { } else {
QVariantList list = json[QString("list")].toList(); QVariantList list = _json["list"].toList();
return parseSingleJson(list.count() <= m_ts ? list.at(m_ts - 1).toMap() return parseSingleJson(list.count() <= m_ts ? list.at(m_ts - 1).toMap()
: list.last().toMap()); : list.last().toMap());
} }
@ -80,33 +81,33 @@ QUrl OWMWeatherProvider::url() const
} }
QVariantHash OWMWeatherProvider::parseSingleJson(const QVariantMap &json) const QVariantHash OWMWeatherProvider::parseSingleJson(const QVariantMap &_json) const
{ {
qCDebug(LOG_LIB) << "Single json data" << json; qCDebug(LOG_LIB) << "Single json data" << _json;
QVariantHash output; QVariantHash output;
// weather status // weather status
QVariantList weather = json[QString("weather")].toList(); QVariantList weather = _json["weather"].toList();
if (!weather.isEmpty()) { if (!weather.isEmpty()) {
int id = weather.first().toMap()[QString("id")].toInt(); int id = weather.first().toMap()["id"].toInt();
output[QString("weatherId%1").arg(number())] = id; output[QString("weatherId%1").arg(number())] = id;
} }
// main data // main data
QVariantMap mainWeather = json[QString("main")].toMap(); QVariantMap mainWeather = _json["main"].toMap();
if (!weather.isEmpty()) { if (!weather.isEmpty()) {
output[QString("humidity%1").arg(number())] output[QString("humidity%1").arg(number())]
= mainWeather[QString("humidity")].toFloat(); = mainWeather["humidity"].toFloat();
output[QString("pressure%1").arg(number())] output[QString("pressure%1").arg(number())]
= mainWeather[QString("pressure")].toFloat(); = mainWeather["pressure"].toFloat();
output[QString("temperature%1").arg(number())] output[QString("temperature%1").arg(number())]
= mainWeather[QString("temp")].toFloat(); = mainWeather["temp"].toFloat();
} }
// timestamp // timestamp
output[QString("timestamp%1").arg(number())] output[QString("timestamp%1").arg(number())]
= QDateTime::fromTime_t(json[QString("dt")].toUInt()).toUTC(); = QDateTime::fromTime_t(_json["dt"].toUInt()).toUTC();
return output; return output;
} }

8
sources/awesomewidgets/owmweatherprovider.h
View File

@ -31,14 +31,14 @@ public:
const char *OWM_WEATHER_URL = "https://arcanis.me/weather"; const char *OWM_WEATHER_URL = "https://arcanis.me/weather";
const char *OWM_FORECAST_URL = "https://arcanis.me/forecast"; const char *OWM_FORECAST_URL = "https://arcanis.me/forecast";
explicit OWMWeatherProvider(QObject *parent, const int number); explicit OWMWeatherProvider(QObject *_parent, const int _number);
virtual ~OWMWeatherProvider(); virtual ~OWMWeatherProvider();
void initUrl(const QString city, const QString country, const int); void initUrl(const QString &_city, const QString &_country, const int);
QVariantHash parse(const QVariantMap &json) const; QVariantHash parse(const QVariantMap &_json) const;
QUrl url() const; QUrl url() const;
private: private:
QVariantHash parseSingleJson(const QVariantMap &json) const; QVariantHash parseSingleJson(const QVariantMap &_json) const;
int m_ts = 0; int m_ts = 0;
QUrl m_url; QUrl m_url;
}; };

50
sources/awesomewidgets/qcronscheduler.cpp
View File

@ -24,8 +24,8 @@
#include "awdebug.h" #include "awdebug.h"
QCronScheduler::QCronScheduler(QObject *parent) QCronScheduler::QCronScheduler(QObject *_parent)
: QObject(parent) : QObject(_parent)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
@ -48,11 +48,11 @@ QCronScheduler::~QCronScheduler()
} }
void QCronScheduler::parse(const QString &timer) void QCronScheduler::parse(const QString &_timer)
{ {
qCDebug(LOG_LIB) << "Parse timer string" << timer; qCDebug(LOG_LIB) << "Parse timer string" << _timer;
QStringList fields = timer.split(' '); QStringList fields = _timer.split(' ');
if (fields.count() != 5) if (fields.count() != 5)
return; return;
@ -77,17 +77,17 @@ void QCronScheduler::expired()
} }
QList<int> QCronScheduler::parseField(const QString &value, const int min, QList<int> QCronScheduler::parseField(const QString &_value, const int _min,
const int max) const const int _max) const
{ {
qCDebug(LOG_LIB) << "Parse field" << value << "with corner values" << min qCDebug(LOG_LIB) << "Parse field" << _value << "with corner values" << _min
<< max; << _max;
QList<int> parsed; QList<int> parsed;
auto fields = value.split(','); auto fields = _value.split(',');
for (auto &field : fields) { for (auto &field : fields) {
QCronField parsedField; QCronField parsedField;
parsedField.fromRange(field.split('/').first(), min, max); parsedField.fromRange(field.split('/').first(), _min, _max);
if (field.contains('/')) { if (field.contains('/')) {
bool status; bool status;
parsedField.div = field.split('/', QString::SkipEmptyParts) parsedField.div = field.split('/', QString::SkipEmptyParts)
@ -104,26 +104,26 @@ QList<int> QCronScheduler::parseField(const QString &value, const int min,
} }
void QCronScheduler::QCronField::fromRange(const QString &range, const int min, void QCronScheduler::QCronField::fromRange(const QString &_range,
const int max) const int _min, const int _max)
{ {
qCDebug(LOG_LIB) << "Parse field from range" << range qCDebug(LOG_LIB) << "Parse field from range" << _range
<< "with corner values" << min << max; << "with corner values" << _min << _max;
if (range == '*') { if (_range == "*") {
minValue = min; minValue = _min;
maxValue = max; maxValue = _max;
} else if (range.contains('-')) { } else if (_range.contains("-")) {
auto interval = range.split('-', QString::SkipEmptyParts); auto interval = _range.split('-', QString::SkipEmptyParts);
if (interval.count() != 2) if (interval.count() != 2)
return; return;
bool status; bool status;
// minimal value // minimal value
minValue = std::max(min, interval.at(0).toInt(&status)); minValue = std::max(_min, interval.at(0).toInt(&status));
if (!status) if (!status)
minValue = -1; minValue = -1;
// maximal value // maximal value
maxValue = std::min(max, interval.at(1).toInt(&status)); maxValue = std::min(_max, interval.at(1).toInt(&status));
if (!status) if (!status)
maxValue = -1; maxValue = -1;
// error check // error check
@ -131,8 +131,8 @@ void QCronScheduler::QCronField::fromRange(const QString &range, const int min,
std::swap(minValue, maxValue); std::swap(minValue, maxValue);
} else { } else {
bool status; bool status;
int value = range.toInt(&status); int value = _range.toInt(&status);
if (!status || (value < min) || (value > max)) if (!status || (value < _min) || (value > _max))
value = -1; value = -1;
minValue = value; minValue = value;
maxValue = value; maxValue = value;
@ -147,7 +147,7 @@ QList<int> QCronScheduler::QCronField::toList()
return QList<int>(); return QList<int>();
QList<int> output; QList<int> output;
for (auto i = minValue; i <= maxValue; ++i) { for (auto &i = minValue; i <= maxValue; ++i) {
if (i % div != 0) if (i % div != 0)
continue; continue;
output.append(i); output.append(i);

10
sources/awesomewidgets/qcronscheduler.h
View File

@ -39,13 +39,13 @@ public:
int minValue = -1; int minValue = -1;
int maxValue = -1; int maxValue = -1;
int div = 1; int div = 1;
void fromRange(const QString &range, const int min, const int max); void fromRange(const QString &_range, const int _min, const int _max);
QList<int> toList(); QList<int> toList();
} QCronField; } QCronField;
explicit QCronScheduler(QObject *parent); explicit QCronScheduler(QObject *_parent = nullptr);
virtual ~QCronScheduler(); virtual ~QCronScheduler();
void parse(const QString &timer); void parse(const QString &_timer);
signals: signals:
void activated(); void activated();
@ -56,8 +56,8 @@ private slots:
private: private:
QCronRunSchedule m_schedule; QCronRunSchedule m_schedule;
QTimer *m_timer = nullptr; QTimer *m_timer = nullptr;
QList<int> parseField(const QString &value, const int min, QList<int> parseField(const QString &_value, const int _min,
const int max) const; const int _max) const;
}; };

74
sources/awesomewidgets/yahooweatherprovider.cpp
View File

@ -22,8 +22,8 @@
#include "awdebug.h" #include "awdebug.h"
YahooWeatherProvider::YahooWeatherProvider(QObject *parent, const int number) YahooWeatherProvider::YahooWeatherProvider(QObject *_parent, const int _number)
: AbstractWeatherProvider(parent, number) : AbstractWeatherProvider(_parent, _number)
{ {
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
} }
@ -35,38 +35,36 @@ YahooWeatherProvider::~YahooWeatherProvider()
} }
void YahooWeatherProvider::initUrl(const QString city, const QString country, void YahooWeatherProvider::initUrl(const QString &_city,
const int ts) const QString &_country, const int ts)
{ {
qCDebug(LOG_LIB) << "Init query for" << city << country << "with ts" << ts; qCDebug(LOG_LIB) << "Init query for" << _city << _country << "with ts"
<< ts;
m_ts = ts; m_ts = ts;
m_url = QUrl(YAHOO_WEATHER_URL); m_url = QUrl(YAHOO_WEATHER_URL);
QUrlQuery params; QUrlQuery params;
params.addQueryItem(QString("format"), QString("json")); params.addQueryItem("format", "json");
params.addQueryItem(QString("env"), params.addQueryItem("env", "store://datatables.org/alltableswithkeys");
QString("store://datatables.org/alltableswithkeys")); params.addQueryItem("q", QString(YAHOO_WEATHER_QUERY).arg(_city, _country));
params.addQueryItem(QString("q"),
QString(YAHOO_WEATHER_QUERY).arg(city, country));
m_url.setQuery(params); m_url.setQuery(params);
} }
QVariantHash YahooWeatherProvider::parse(const QVariantMap &json) const QVariantHash YahooWeatherProvider::parse(const QVariantMap &_json) const
{ {
qCDebug(LOG_LIB) << "Parse json" << json; qCDebug(LOG_LIB) << "Parse json" << _json;
QVariantMap jsonMap = json[QString("query")].toMap(); QVariantMap jsonMap = _json["query"].toMap();
if (jsonMap[QString("count")].toInt() != 1) { if (jsonMap["count"].toInt() != 1) {
qCWarning(LOG_LIB) << "Found data count" qCWarning(LOG_LIB) << "Found data count" << _json["count"].toInt()
<< json[QString("count")].toInt() << "is not 1"; << "is not 1";
return QVariantHash(); return QVariantHash();
} }
QVariantMap results QVariantMap results = jsonMap["results"].toMap()["channel"].toMap();
= jsonMap[QString("results")].toMap()[QString("channel")].toMap(); QVariantMap item = results["item"].toMap();
QVariantMap item = results[QString("item")].toMap(); QVariantMap atmosphere = results["atmosphere"].toMap();
QVariantMap atmosphere = results[QString("atmosphere")].toMap();
return m_ts == 0 ? parseCurrent(item, atmosphere) : parseForecast(item); return m_ts == 0 ? parseCurrent(item, atmosphere) : parseForecast(item);
} }
@ -79,46 +77,44 @@ QUrl YahooWeatherProvider::url() const
QVariantHash QVariantHash
YahooWeatherProvider::parseCurrent(const QVariantMap &json, YahooWeatherProvider::parseCurrent(const QVariantMap &_json,
const QVariantMap &atmosphere) const const QVariantMap &_atmosphere) const
{ {
qCDebug(LOG_LIB) << "Parse current weather from" << json; qCDebug(LOG_LIB) << "Parse current weather from" << _json;
auto condition = _json["condition"].toMap();
QVariantHash values; QVariantHash values;
int id = json[QString("condition")].toMap()[QString("code")].toInt(); int id = _json["condition"].toMap()["code"].toInt();
values[QString("weatherId%1").arg(number())] = id; values[QString("weatherId%1").arg(number())] = id;
values[QString("temperature%1").arg(number())] values[QString("temperature%1").arg(number())] = condition["temp"].toInt();
= json[QString("condition")].toMap()[QString("temp")].toInt(); values[QString("timestamp%1").arg(number())] = condition["date"].toString();
values[QString("timestamp%1").arg(number())]
= json[QString("condition")].toMap()[QString("date")].toString();
values[QString("humidity%1").arg(number())] values[QString("humidity%1").arg(number())]
= atmosphere[QString("humidity")].toInt(); = _atmosphere["humidity"].toInt();
// HACK temporary fix of invalid values on Yahoo! side // HACK temporary fix of invalid values on Yahoo! side
values[QString("pressure%1").arg(number())] = static_cast<int>( values[QString("pressure%1").arg(number())]
atmosphere[QString("pressure")].toFloat() / 33.863753); = static_cast<int>(_atmosphere["pressure"].toFloat() / 33.863753);
return values; return values;
} }
QVariantHash YahooWeatherProvider::parseForecast(const QVariantMap &json) const QVariantHash YahooWeatherProvider::parseForecast(const QVariantMap &_json) const
{ {
qCDebug(LOG_LIB) << "Parse forecast from" << json; qCDebug(LOG_LIB) << "Parse forecast from" << _json;
QVariantHash values; QVariantHash values;
QVariantList weatherList = json[QString("forecast")].toList(); QVariantList weatherList = _json["forecast"].toList();
QVariantMap weatherMap = weatherList.count() < m_ts QVariantMap weatherMap = weatherList.count() < m_ts
? weatherList.last().toMap() ? weatherList.last().toMap()
: weatherList.at(m_ts).toMap(); : weatherList.at(m_ts).toMap();
int id = weatherMap[QString("code")].toInt(); int id = weatherMap["code"].toInt();
values[QString("weatherId%1").arg(number())] = id; values[QString("weatherId%1").arg(number())] = id;
values[QString("timestamp%1").arg(number())] values[QString("timestamp%1").arg(number())]
= weatherMap[QString("date")].toString(); = weatherMap["date"].toString();
// yahoo provides high and low temperatures. Lets calculate average one // yahoo provides high and low temperatures. Lets calculate average one
values[QString("temperature%1").arg(number())] values[QString("temperature%1").arg(number())]
= (weatherMap[QString("high")].toFloat() = (weatherMap["high"].toFloat() + weatherMap["low"].toFloat()) / 2.0;
+ weatherMap[QString("low")].toFloat())
/ 2.0;
// ... and no forecast data for humidity and pressure // ... and no forecast data for humidity and pressure
values[QString("humidity%1").arg(number())] = 0; values[QString("humidity%1").arg(number())] = 0;
values[QString("pressure%1").arg(number())] = 0.0; values[QString("pressure%1").arg(number())] = 0.0;

12
sources/awesomewidgets/yahooweatherprovider.h
View File

@ -31,16 +31,16 @@ public:
"u='c' and woeid in (select woeid from " "u='c' and woeid in (select woeid from "
"geo.places(1) where text='%1, %2')"; "geo.places(1) where text='%1, %2')";
explicit YahooWeatherProvider(QObject *parent, const int number); explicit YahooWeatherProvider(QObject *_parent, const int _number);
virtual ~YahooWeatherProvider(); virtual ~YahooWeatherProvider();
void initUrl(const QString city, const QString country, const int); void initUrl(const QString &_city, const QString &_country, const int);
QVariantHash parse(const QVariantMap &json) const; QVariantHash parse(const QVariantMap &_json) const;
QUrl url() const; QUrl url() const;
private: private:
QVariantHash parseCurrent(const QVariantMap &json, QVariantHash parseCurrent(const QVariantMap &_json,
const QVariantMap &atmosphere) const; const QVariantMap &_atmosphere) const;
QVariantHash parseForecast(const QVariantMap &json) const; QVariantHash parseForecast(const QVariantMap &_json) const;
int m_ts = 0; int m_ts = 0;
QUrl m_url; QUrl m_url;
}; };

2
sources/desktop-panel/package/metadata.desktop
View File

@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Email=esalexeev@gmail.com
X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel
X-KDE-PluginInfo-Version=3.2.1 X-KDE-PluginInfo-Version=3.3.0
X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/ X-KDE-PluginInfo-Website=https://arcanis.me/projects/awesome-widgets/
X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Category=System Information
X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-Depends=

171
sources/desktop-panel/plugin/dpadds.cpp
View File

@ -36,8 +36,8 @@
#include "awdebug.h" #include "awdebug.h"
DPAdds::DPAdds(QObject *parent) DPAdds::DPAdds(QObject *_parent)
: QObject(parent) : QObject(_parent)
{ {
qSetMessagePattern(AWDebug::LOG_FORMAT); qSetMessagePattern(AWDebug::LOG_FORMAT);
qCDebug(LOG_DP) << __PRETTY_FUNCTION__; qCDebug(LOG_DP) << __PRETTY_FUNCTION__;
@ -72,21 +72,21 @@ int DPAdds::currentDesktop() const
} }
QStringList DPAdds::dictKeys(const bool sorted, const QString regexp) const QStringList DPAdds::dictKeys(const bool _sorted, const QString &_regexp) const
{ {
qCDebug(LOG_DP) << "Should be sorted" << sorted << "and filter applied" qCDebug(LOG_DP) << "Should be sorted" << _sorted << "and filter applied"
<< regexp; << _regexp;
QStringList allKeys; QStringList allKeys;
allKeys.append(QString("mark")); allKeys.append("mark");
allKeys.append(QString("name")); allKeys.append("name");
allKeys.append(QString("number")); allKeys.append("number");
allKeys.append(QString("total")); allKeys.append("total");
if (sorted) if (_sorted)
allKeys.sort(); allKeys.sort();
return allKeys.filter(QRegExp(regexp)); return allKeys.filter(QRegExp(_regexp));
} }
@ -96,36 +96,38 @@ int DPAdds::numberOfDesktops() const
} }
QString DPAdds::toolTipImage(const int desktop) const QString DPAdds::toolTipImage(const int _desktop) const
{ {
qCDebug(LOG_DP) << "Desktop" << desktop; qCDebug(LOG_DP) << "Desktop" << _desktop;
// drop if no tooltip required // drop if no tooltip required
if (m_tooltipType == QString("none")) if (m_tooltipType == "none")
return QString(); return "";
// prepare // prepare
DesktopWindowsInfo info = getInfoByDesktop(desktop); DesktopWindowsInfo info = getInfoByDesktop(_desktop);
// special tooltip format for names // special tooltip format for names
if (m_tooltipType == QString("names")) { if (m_tooltipType == "names") {
QStringList windowList; QStringList windowList;
std::for_each( std::for_each(
info.windowsData.cbegin(), info.windowsData.cend(), info.windowsData.cbegin(), info.windowsData.cend(),
[&windowList](WindowData data) { windowList.append(data.name); }); [&windowList](WindowData data) { windowList.append(data.name); });
return QString("<ul><li>%1</li></ul>") return QString("<ul><li>%1</li></ul>")
.arg(windowList.join(QString("</li><li>"))); .arg(windowList.join("</li><li>"));
} }
// init // init
QGraphicsScene *toolTipScene = new QGraphicsScene(); QGraphicsScene *toolTipScene = new QGraphicsScene();
QGraphicsView *toolTipView = new QGraphicsView(toolTipScene); QGraphicsView *toolTipView = new QGraphicsView(toolTipScene);
toolTipView->setStyleSheet(QString("background: transparent")); toolTipView->setStyleSheet("background: transparent");
toolTipView->setContentsMargins(0, 0, 0, 0); toolTipView->setContentsMargins(0, 0, 0, 0);
toolTipView->setFrameShape(QFrame::NoFrame); toolTipView->setFrameShape(QFrame::NoFrame);
toolTipView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); toolTipView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
toolTipView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); toolTipView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
// update // update
float margin = 5.0 * info.desktop.width() / 400.0; float margin = 5.0f * info.desktop.width() / 400.0f;
toolTipView->resize(info.desktop.width() + 2.0 * margin, toolTipView->resize(info.desktop.width() + 2.0f * margin,
info.desktop.height() + 2.0 * margin); info.desktop.height() + 2.0f * margin);
toolTipScene->clear(); toolTipScene->clear();
toolTipScene->setBackgroundBrush(QBrush(Qt::NoBrush)); toolTipScene->setBackgroundBrush(QBrush(Qt::NoBrush));
// borders // borders
@ -138,11 +140,11 @@ QString DPAdds::toolTipImage(const int desktop) const
info.desktop.width() + 2.0 * margin, 0); info.desktop.width() + 2.0 * margin, 0);
toolTipScene->addLine(info.desktop.width() + 2.0 * margin, 0, 0, 0); toolTipScene->addLine(info.desktop.width() + 2.0 * margin, 0, 0, 0);
if (m_tooltipType == QString("contours")) { if (m_tooltipType == "contours") {
QPen pen = QPen(); QPen pen = QPen();
pen.setWidthF(2.0 * info.desktop.width() / 400.0); pen.setWidthF(2.0 * info.desktop.width() / 400.0);
pen.setColor(QColor(m_tooltipColor)); pen.setColor(QColor(m_tooltipColor));
for (auto data : info.windowsData) { for (auto &data : info.windowsData) {
QRect rect = data.rect; QRect rect = data.rect;
toolTipScene->addLine(rect.left() + margin, rect.bottom() + margin, toolTipScene->addLine(rect.left() + margin, rect.bottom() + margin,
rect.left() + margin, rect.top() + margin, rect.left() + margin, rect.top() + margin,
@ -157,24 +159,24 @@ QString DPAdds::toolTipImage(const int desktop) const
rect.left() + margin, rect.bottom() + margin, rect.left() + margin, rect.bottom() + margin,
pen); pen);
} }
} else if (m_tooltipType == QString("clean")) { } else if (m_tooltipType == "clean") {
QScreen *screen = QGuiApplication::primaryScreen(); QScreen *screen = QGuiApplication::primaryScreen();
std::for_each(info.desktopsData.cbegin(), info.desktopsData.cend(), std::for_each(info.desktopsData.cbegin(), info.desktopsData.cend(),
[&toolTipScene, &screen](WindowData data) { [&toolTipScene, &screen](const WindowData &data) {
QPixmap desktop = screen->grabWindow(data.id); QPixmap desktop = screen->grabWindow(data.id);
toolTipScene->addPixmap(desktop)->setOffset( toolTipScene->addPixmap(desktop)->setOffset(
data.rect.left(), data.rect.top()); data.rect.left(), data.rect.top());
}); });
} else if (m_tooltipType == QString("windows")) { } else if (m_tooltipType == "windows") {
QScreen *screen = QGuiApplication::primaryScreen(); QScreen *screen = QGuiApplication::primaryScreen();
std::for_each(info.desktopsData.cbegin(), info.desktopsData.cend(), std::for_each(info.desktopsData.cbegin(), info.desktopsData.cend(),
[&toolTipScene, &screen](WindowData data) { [&toolTipScene, &screen](const WindowData &data) {
QPixmap desktop = screen->grabWindow(data.id); QPixmap desktop = screen->grabWindow(data.id);
toolTipScene->addPixmap(desktop)->setOffset( toolTipScene->addPixmap(desktop)->setOffset(
data.rect.left(), data.rect.top()); data.rect.left(), data.rect.top());
}); });
std::for_each(info.windowsData.cbegin(), info.windowsData.cend(), std::for_each(info.windowsData.cbegin(), info.windowsData.cend(),
[&toolTipScene, &screen](WindowData data) { [&toolTipScene, &screen](const WindowData &data) {
QPixmap window = screen->grabWindow(data.id); QPixmap window = screen->grabWindow(data.id);
toolTipScene->addPixmap(window)->setOffset( toolTipScene->addPixmap(window)->setOffset(
data.rect.left(), data.rect.top()); data.rect.left(), data.rect.top());
@ -194,135 +196,134 @@ QString DPAdds::toolTipImage(const int desktop) const
} }
QString DPAdds::parsePattern(const QString pattern, const int desktop) const QString DPAdds::parsePattern(const QString &_pattern, const int _desktop) const
{ {
qCDebug(LOG_DP) << "Pattern" << pattern << "for desktop" << desktop; qCDebug(LOG_DP) << "Pattern" << _pattern << "for desktop" << _desktop;
QString parsed = pattern; QString parsed = _pattern;
parsed.replace(QString("$$"), QString("$\\$\\")); parsed.replace("$$", "$\\$\\");
for (auto key : dictKeys()) for (auto &key : dictKeys())
parsed.replace(QString("$%1").arg(key), valueByKey(key, desktop)); parsed.replace(QString("$%1").arg(key), valueByKey(key, _desktop));
parsed.replace(QString("$\\$\\"), QString("$$")); parsed.replace("$\\$\\", "$$");
return parsed; return parsed;
} }
void DPAdds::setMark(const QString newMark) void DPAdds::setMark(const QString &_newMark)
{ {
qCDebug(LOG_DP) << "Mark" << newMark; qCDebug(LOG_DP) << "Mark" << _newMark;
m_mark = newMark; m_mark = _newMark;
} }
void DPAdds::setToolTipData(const QVariantMap tooltipData) void DPAdds::setToolTipData(const QVariantMap &_tooltipData)
{ {
qCDebug(LOG_DP) << "Data" << tooltipData; qCDebug(LOG_DP) << "Data" << _tooltipData;
m_tooltipColor = tooltipData[QString("tooltipColor")].toString(); m_tooltipColor = _tooltipData["tooltipColor"].toString();
m_tooltipType = tooltipData[QString("tooltipType")].toString(); m_tooltipType = _tooltipData["tooltipType"].toString();
m_tooltipWidth = tooltipData[QString("tooltipWidth")].toInt(); m_tooltipWidth = _tooltipData["tooltipWidth"].toInt();
} }
QString DPAdds::infoByKey(QString key) const QString DPAdds::infoByKey(const QString &_key) const
{ {
qCDebug(LOG_AW) << "Requested info for key" << key; qCDebug(LOG_AW) << "Requested info for key" << _key;
return QString("(none)"); return "(none)";
} }
QString DPAdds::valueByKey(const QString key, int desktop) const QString DPAdds::valueByKey(const QString &_key, int _desktop) const
{ {
qCDebug(LOG_DP) << "Requested key" << key << "for desktop" << desktop; qCDebug(LOG_DP) << "Requested key" << _key << "for desktop" << _desktop;
if (desktop == -1) if (_desktop == -1)
desktop = currentDesktop(); _desktop = currentDesktop();
QString currentMark = currentDesktop() == desktop ? m_mark : QString(""); QString currentMark = currentDesktop() == _desktop ? m_mark : "";
if (key == QString("mark")) if (_key == "mark")
return QString("%1") return QString("%1")
.arg(currentMark, m_mark.count(), QLatin1Char(' ')) .arg(currentMark, m_mark.count(), QLatin1Char(' '))
.replace(QString(" "), QString("&nbsp;")); .replace(" ", "&nbsp;");
else if (key == QString("name")) else if (_key == "name")
return KWindowSystem::desktopName(desktop).replace(QString(" "), return KWindowSystem::desktopName(_desktop).replace(" ", "&nbsp;");
QString("&nbsp;")); else if (_key == "number")
else if (key == QString("number")) return QString::number(_desktop);
return QString::number(desktop); else if (_key == "total")
else if (key == QString("total"))
return QString::number(numberOfDesktops()); return QString::number(numberOfDesktops());
else else
return QString(); return "";
} }
// HACK: this method uses variables from version.h // HACK: this method uses variables from version.h
QString DPAdds::getAboutText(const QString type) const QString DPAdds::getAboutText(const QString &_type) const
{ {
qCDebug(LOG_DP) << "Type" << type; qCDebug(LOG_DP) << "Type" << _type;
return AWDebug::getAboutText(type); return AWDebug::getAboutText(_type);
} }
QVariantMap DPAdds::getFont(const QVariantMap defaultFont) const QVariantMap DPAdds::getFont(const QVariantMap &_defaultFont) const
{ {
qCDebug(LOG_DP) << "Default font is" << defaultFont; qCDebug(LOG_DP) << "Default font is" << _defaultFont;
QVariantMap fontMap; QVariantMap fontMap;
int ret = 0; int ret = 0;
CFont defaultCFont = CFont(defaultFont[QString("family")].toString(), CFont defaultCFont
defaultFont[QString("size")].toInt(), 400, false, = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(),
defaultFont[QString("color")].toString()); 400, false, _defaultFont["color"].toString());
CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false,
false, &ret); false, &ret);
fontMap[QString("applied")] = ret; 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; return fontMap;
} }
// to avoid additional object definition this method is static // to avoid additional object definition this method is static
void DPAdds::sendNotification(const QString eventId, const QString message) void DPAdds::sendNotification(const QString &_eventId, const QString &_message)
{ {
qCDebug(LOG_DP) << "Event" << eventId << "with message" << message; qCDebug(LOG_DP) << "Event" << _eventId << "with message" << _message;
KNotification *notification = KNotification::event( KNotification *notification = KNotification::event(
eventId, QString("Desktop Panel ::: %1").arg(eventId), message); _eventId, QString("Desktop Panel ::: %1").arg(_eventId), _message);
notification->setComponentName( notification->setComponentName(
QString("plasma-applet-org.kde.plasma.desktop-panel")); "plasma-applet-org.kde.plasma.desktop-panel");
} }
// slot for mouse click // slot for mouse click
void DPAdds::setCurrentDesktop(const int desktop) const void DPAdds::setCurrentDesktop(const int _desktop) const
{ {
qCDebug(LOG_DP) << "Desktop" << desktop; qCDebug(LOG_DP) << "Desktop" << _desktop;
KWindowSystem::setCurrentDesktop(desktop); KWindowSystem::setCurrentDesktop(_desktop);
} }
DPAdds::DesktopWindowsInfo DPAdds::getInfoByDesktop(const int desktop) const DPAdds::DesktopWindowsInfo DPAdds::getInfoByDesktop(const int _desktop) const
{ {
qCDebug(LOG_DP) << "Desktop" << desktop; qCDebug(LOG_DP) << "Desktop" << _desktop;
DesktopWindowsInfo info; DesktopWindowsInfo info;
info.desktop = KWindowSystem::workArea(desktop); info.desktop = KWindowSystem::workArea(_desktop);
for (auto id : KWindowSystem::windows()) { for (auto &id : KWindowSystem::windows()) {
KWindowInfo winInfo = KWindowInfo( KWindowInfo winInfo = KWindowInfo(
id, id,
NET::Property::WMDesktop | NET::Property::WMGeometry NET::Property::WMDesktop | NET::Property::WMGeometry
| NET::Property::WMState | NET::Property::WMWindowType | NET::Property::WMState | NET::Property::WMWindowType
| NET::Property::WMVisibleName); | NET::Property::WMVisibleName);
if (!winInfo.isOnDesktop(desktop)) if (!winInfo.isOnDesktop(_desktop))
continue; continue;
WindowData data; WindowData data;
data.id = id; data.id = id;

39
sources/desktop-panel/plugin/dpadds.h
View File

@ -41,41 +41,42 @@ class DPAdds : public QObject
} DesktopWindowsInfo; } DesktopWindowsInfo;
public: public:
explicit DPAdds(QObject *parent = nullptr); explicit DPAdds(QObject *_parent = nullptr);
virtual ~DPAdds(); virtual ~DPAdds();
Q_INVOKABLE bool isDebugEnabled() const; Q_INVOKABLE bool isDebugEnabled() const;
Q_INVOKABLE int currentDesktop() const; Q_INVOKABLE int currentDesktop() const;
Q_INVOKABLE QStringList dictKeys(const bool sorted = true, Q_INVOKABLE QStringList dictKeys(const bool _sorted = true,
const QString regexp = QString()) const; const QString &_regexp = "") const;
Q_INVOKABLE int numberOfDesktops() const; Q_INVOKABLE int numberOfDesktops() const;
Q_INVOKABLE QString toolTipImage(const int desktop) const; Q_INVOKABLE QString toolTipImage(const int _desktop) const;
Q_INVOKABLE QString parsePattern(const QString pattern, Q_INVOKABLE QString parsePattern(const QString &_pattern,
const int desktop) const; const int _desktop) const;
// values // values
Q_INVOKABLE void setMark(const QString newMark); Q_INVOKABLE void setMark(const QString &_newMark);
Q_INVOKABLE void setToolTipData(const QVariantMap tooltipData); Q_INVOKABLE void setToolTipData(const QVariantMap &_tooltipData);
Q_INVOKABLE QString infoByKey(QString key) const; Q_INVOKABLE QString infoByKey(const QString &_key) const;
Q_INVOKABLE QString valueByKey(const QString key, int desktop = -1) const; Q_INVOKABLE QString valueByKey(const QString &_key,
int _desktop = -1) const;
// configuration slots // configuration slots
Q_INVOKABLE QString getAboutText(const QString type = "header") const; Q_INVOKABLE QString getAboutText(const QString &_type) const;
Q_INVOKABLE QVariantMap getFont(const QVariantMap defaultFont) const; Q_INVOKABLE QVariantMap getFont(const QVariantMap &_defaultFont) const;
signals: signals:
void desktopChanged() const; void desktopChanged() const;
void windowListChanged() const; void windowListChanged() const;
public slots: public slots:
Q_INVOKABLE static void sendNotification(const QString eventId, Q_INVOKABLE static void sendNotification(const QString &_eventId,
const QString message); const QString &_message);
Q_INVOKABLE void setCurrentDesktop(const int desktop) const; Q_INVOKABLE void setCurrentDesktop(const int _desktop) const;
private: private:
DesktopWindowsInfo getInfoByDesktop(const int desktop) const; DesktopWindowsInfo getInfoByDesktop(const int _desktop) const;
// variables // variables
int m_tooltipWidth = 200; int m_tooltipWidth = 200;
QString m_mark = QString("*"); QString m_mark = "*";
QString m_tooltipColor = QString("#000000"); QString m_tooltipColor = "#000000";
QString m_tooltipType = QString("none"); QString m_tooltipType = "none";
}; };

123
sources/extsysmon/extsysmon.cpp
View File

@ -24,14 +24,14 @@
#include "awdebug.h" #include "awdebug.h"
#include "extsysmonaggregator.h" #include "extsysmonaggregator.h"
#include "gputempsource.h" #include "gpuloadsource.h"
#include "hddtempsource.h" #include "hddtempsource.h"
ExtendedSysMon::ExtendedSysMon(QObject *parent, const QVariantList &args) ExtendedSysMon::ExtendedSysMon(QObject *_parent, const QVariantList &_args)
: Plasma::DataEngine(parent, args) : Plasma::DataEngine(_parent, _args)
{ {
Q_UNUSED(args) Q_UNUSED(_args)
qSetMessagePattern(AWDebug::LOG_FORMAT); qSetMessagePattern(AWDebug::LOG_FORMAT);
qCDebug(LOG_ESM) << __PRETTY_FUNCTION__; qCDebug(LOG_ESM) << __PRETTY_FUNCTION__;
for (auto &metadata : AWDebug::getBuildData()) for (auto &metadata : AWDebug::getBuildData())
@ -42,7 +42,7 @@ ExtendedSysMon::ExtendedSysMon(QObject *parent, const QVariantList &args)
// init aggregator // init aggregator
m_aggregator = new ExtSysMonAggregator(this, m_configuration); m_aggregator = new ExtSysMonAggregator(this, m_configuration);
for (auto source : m_aggregator->sources()) for (auto &source : m_aggregator->sources())
setData(source, m_aggregator->initialData(source)); setData(source, m_aggregator->initialData(source));
} }
@ -61,25 +61,25 @@ QStringList ExtendedSysMon::sources() const
} }
bool ExtendedSysMon::sourceRequestEvent(const QString &source) bool ExtendedSysMon::sourceRequestEvent(const QString &_source)
{ {
qCDebug(LOG_ESM) << "Source" << source; qCDebug(LOG_ESM) << "Source" << _source;
return updateSourceEvent(source); return updateSourceEvent(_source);
} }
bool ExtendedSysMon::updateSourceEvent(const QString &source) bool ExtendedSysMon::updateSourceEvent(const QString &_source)
{ {
qCDebug(LOG_ESM) << "Source" << source; qCDebug(LOG_ESM) << "Source" << _source;
if (m_aggregator->hasSource(source)) { if (m_aggregator->hasSource(_source)) {
QVariant data = m_aggregator->data(source); QVariant data = m_aggregator->data(_source);
if (data.isNull()) if (data.isNull())
return false; return false;
setData(source, QString("value"), data); setData(_source, "value", data);
} else { } else {
qCWarning(LOG_ESM) << "Unknown source" << source; qCWarning(LOG_ESM) << "Unknown source" << _source;
return false; return false;
} }
@ -89,36 +89,26 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
void ExtendedSysMon::readConfiguration() void ExtendedSysMon::readConfiguration()
{ {
QString fileName QString fileName = QStandardPaths::locate(
= QStandardPaths::locate(QStandardPaths::ConfigLocation, QStandardPaths::ConfigLocation, "plasma-dataengine-extsysmon.conf");
QString("plasma-dataengine-extsysmon.conf"));
qCInfo(LOG_ESM) << "Configuration file" << fileName; qCInfo(LOG_ESM) << "Configuration file" << fileName;
QSettings settings(fileName, QSettings::IniFormat); QSettings settings(fileName, QSettings::IniFormat);
QHash<QString, QString> rawConfig; QHash<QString, QString> rawConfig;
settings.beginGroup(QString("Configuration")); settings.beginGroup("Configuration");
rawConfig[QString("ACPIPATH")] rawConfig["ACPIPATH"]
= settings = settings.value("ACPIPATH", "/sys/class/power_supply/").toString();
.value(QString("ACPIPATH"), QString("/sys/class/power_supply/")) rawConfig["GPUDEV"] = settings.value("GPUDEV", "auto").toString();
.toString(); rawConfig["HDDDEV"] = settings.value("HDDDEV", "all").toString();
rawConfig[QString("GPUDEV")] rawConfig["HDDTEMPCMD"]
= settings.value(QString("GPUDEV"), QString("auto")).toString(); = settings.value("HDDTEMPCMD", "sudo smartctl -a").toString();
rawConfig[QString("HDDDEV")] rawConfig["MPDADDRESS"]
= settings.value(QString("HDDDEV"), QString("all")).toString(); = settings.value("MPDADDRESS", "localhost").toString();
rawConfig[QString("HDDTEMPCMD")] rawConfig["MPDPORT"] = settings.value("MPDPORT", "6600").toString();
= settings.value(QString("HDDTEMPCMD"), QString("sudo smartctl -a")) rawConfig["MPRIS"] = settings.value("MPRIS", "auto").toString();
.toString(); rawConfig["PLAYER"] = settings.value("PLAYER", "mpris").toString();
rawConfig[QString("MPDADDRESS")] rawConfig["PLAYERSYMBOLS"]
= settings.value(QString("MPDADDRESS"), QString("localhost")) = settings.value("PLAYERSYMBOLS", "10").toString();
.toString();
rawConfig[QString("MPDPORT")]
= settings.value(QString("MPDPORT"), QString("6600")).toString();
rawConfig[QString("MPRIS")]
= settings.value(QString("MPRIS"), QString("auto")).toString();
rawConfig[QString("PLAYER")]
= settings.value(QString("PLAYER"), QString("mpris")).toString();
rawConfig[QString("PLAYERSYMBOLS")]
= settings.value(QString("PLAYERSYMBOLS"), QString("10")).toString();
settings.endGroup(); settings.endGroup();
m_configuration = updateConfiguration(rawConfig); m_configuration = updateConfiguration(rawConfig);
@ -126,49 +116,48 @@ void ExtendedSysMon::readConfiguration()
QHash<QString, QString> QHash<QString, QString>
ExtendedSysMon::updateConfiguration(QHash<QString, QString> rawConfig) const ExtendedSysMon::updateConfiguration(QHash<QString, QString> _rawConfig) const
{ {
qCDebug(LOG_ESM) << "Raw configuration" << rawConfig; qCDebug(LOG_ESM) << "Raw configuration" << _rawConfig;
// gpudev // gpudev
if (rawConfig[QString("GPUDEV")] == QString("disable")) if (_rawConfig["GPUDEV"] == "disable")
rawConfig[QString("GPUDEV")] = QString("disable"); ;
else if (rawConfig[QString("GPUDEV")] == QString("auto")) else if (_rawConfig["GPUDEV"] == "auto")
rawConfig[QString("GPUDEV")] = GPUTemperatureSource::autoGpu(); _rawConfig["GPUDEV"] = GPULoadSource::autoGpu();
else if ((rawConfig[QString("GPUDEV")] != QString("ati")) else if ((_rawConfig["GPUDEV"] != "ati")
&& (rawConfig[QString("GPUDEV")] != QString("nvidia"))) && (_rawConfig["GPUDEV"] != "nvidia"))
rawConfig[QString("GPUDEV")] = GPUTemperatureSource::autoGpu(); _rawConfig["GPUDEV"] = GPULoadSource::autoGpu();
// hdddev // hdddev
QStringList allHddDevices = HDDTemperatureSource::allHdd(); QStringList allHddDevices = HDDTemperatureSource::allHdd();
if (rawConfig[QString("HDDDEV")] == QString("all")) { if (_rawConfig["HDDDEV"] == "all") {
rawConfig[QString("HDDDEV")] = allHddDevices.join(QChar(',')); _rawConfig["HDDDEV"] = allHddDevices.join(',');
} else if (rawConfig[QString("HDDDEV")] == QString("disable")) { } else if (_rawConfig["HDDDEV"] == "disable") {
rawConfig[QString("HDDDEV")] = QString(""); _rawConfig["HDDDEV"] = "";
} else { } else {
QStringList deviceList = rawConfig[QString("HDDDEV")].split( QStringList deviceList
QChar(','), QString::SkipEmptyParts); = _rawConfig["HDDDEV"].split(',', QString::SkipEmptyParts);
QStringList devices; QStringList devices;
QRegExp diskRegexp = QRegExp("^/dev/[hms]d[a-z]$"); QRegExp diskRegexp = QRegExp("^/dev/[hms]d[a-z]$");
for (auto device : deviceList) for (auto &device : deviceList)
if ((QFile::exists(device)) && (device.contains(diskRegexp))) if ((QFile::exists(device)) && (device.contains(diskRegexp)))
devices.append(device); devices.append(device);
if (devices.isEmpty()) if (devices.isEmpty())
rawConfig[QString("HDDDEV")] = allHddDevices.join(QChar(',')); _rawConfig["HDDDEV"] = allHddDevices.join(',');
else else
rawConfig[QString("HDDDEV")] = devices.join(QChar(',')); _rawConfig["HDDDEV"] = devices.join(',');
} }
// player // player
if ((rawConfig[QString("PLAYER")] != QString("mpd")) if ((_rawConfig["PLAYER"] != "mpd") && (_rawConfig["PLAYER"] != "mpris")
&& (rawConfig[QString("PLAYER")] != QString("mpris")) && (_rawConfig["PLAYER"] != "disable"))
&& (rawConfig[QString("PLAYER")] != QString("disable"))) _rawConfig["PLAYER"] = "mpris";
rawConfig[QString("PLAYER")] = QString("mpris");
// player symbols // player symbols
if (rawConfig[QString("PLAYERSYMBOLS")].toInt() <= 0) if (_rawConfig["PLAYERSYMBOLS"].toInt() <= 0)
rawConfig[QString("PLAYERSYMBOLS")] = QString("10"); _rawConfig["PLAYERSYMBOLS"] = "10";
for (auto key : rawConfig.keys()) for (auto &key : _rawConfig.keys())
qCInfo(LOG_ESM) << key << "=" << rawConfig[key]; qCInfo(LOG_ESM) << key << "=" << _rawConfig[key];
return rawConfig; return _rawConfig;
} }

8
sources/extsysmon/extsysmon.h
View File

@ -28,13 +28,13 @@ class ExtendedSysMon : public Plasma::DataEngine
Q_OBJECT Q_OBJECT
public: public:
explicit ExtendedSysMon(QObject *parent, const QVariantList &args); explicit ExtendedSysMon(QObject *_parent, const QVariantList &_args);
virtual ~ExtendedSysMon(); virtual ~ExtendedSysMon();
protected: protected:
QStringList sources() const; QStringList sources() const;
bool sourceRequestEvent(const QString &source); bool sourceRequestEvent(const QString &_source);
bool updateSourceEvent(const QString &source); bool updateSourceEvent(const QString &_source);
private: private:
// configuration // configuration
@ -43,7 +43,7 @@ private:
// methods // methods
void readConfiguration(); void readConfiguration();
QHash<QString, QString> QHash<QString, QString>
updateConfiguration(QHash<QString, QString> rawConfig) const; updateConfiguration(QHash<QString, QString> _rawConfig) const;
}; };

78
sources/extsysmon/extsysmonaggregator.cpp
View File

@ -34,13 +34,13 @@
#include "weathersource.h" #include "weathersource.h"
ExtSysMonAggregator::ExtSysMonAggregator(QObject *parent, ExtSysMonAggregator::ExtSysMonAggregator(QObject *_parent,
const QHash<QString, QString> config) const QHash<QString, QString> &_config)
: QObject(parent) : QObject(_parent)
{ {
qCDebug(LOG_ESM) << __PRETTY_FUNCTION__; qCDebug(LOG_ESM) << __PRETTY_FUNCTION__;
init(config); init(_config);
} }
@ -52,27 +52,27 @@ ExtSysMonAggregator::~ExtSysMonAggregator()
} }
QVariant ExtSysMonAggregator::data(const QString source) const QVariant ExtSysMonAggregator::data(const QString &_source) const
{ {
qCDebug(LOG_ESM) << "Source" << source; qCDebug(LOG_ESM) << "Source" << _source;
return m_map[source]->data(source); return m_map[_source]->data(_source);
} }
bool ExtSysMonAggregator::hasSource(const QString source) const bool ExtSysMonAggregator::hasSource(const QString &_source) const
{ {
qCDebug(LOG_ESM) << "Source" << source; qCDebug(LOG_ESM) << "Source" << _source;
return m_map.contains(source); return m_map.contains(_source);
} }
QVariantMap ExtSysMonAggregator::initialData(const QString source) const QVariantMap ExtSysMonAggregator::initialData(const QString &_source) const
{ {
qCDebug(LOG_ESM) << "Source" << source; qCDebug(LOG_ESM) << "Source" << _source;
return hasSource(source) ? m_map[source]->initialData(source) return hasSource(_source) ? m_map[_source]->initialData(_source)
: QVariantMap(); : QVariantMap();
} }
@ -83,83 +83,79 @@ QStringList ExtSysMonAggregator::sources() const
} }
void ExtSysMonAggregator::init(const QHash<QString, QString> config) void ExtSysMonAggregator::init(const QHash<QString, QString> &_config)
{ {
qCDebug(LOG_ESM) << "Configuration" << config; qCDebug(LOG_ESM) << "Configuration" << _config;
// battery // battery
AbstractExtSysMonSource *batteryItem AbstractExtSysMonSource *batteryItem
= new BatterySource(this, QStringList() << config[QString("ACPIPATH")]); = new BatterySource(this, QStringList() << _config["ACPIPATH"]);
for (auto source : batteryItem->sources()) for (auto &source : batteryItem->sources())
m_map[source] = batteryItem; m_map[source] = batteryItem;
// custom // custom
AbstractExtSysMonSource *customItem = new CustomSource(this, QStringList()); AbstractExtSysMonSource *customItem = new CustomSource(this, QStringList());
for (auto source : customItem->sources()) for (auto &source : customItem->sources())
m_map[source] = customItem; m_map[source] = customItem;
// desktop // desktop
AbstractExtSysMonSource *desktopItem AbstractExtSysMonSource *desktopItem
= new DesktopSource(this, QStringList()); = new DesktopSource(this, QStringList());
for (auto source : desktopItem->sources()) for (auto &source : desktopItem->sources())
m_map[source] = desktopItem; m_map[source] = desktopItem;
// gpu load // gpu load
AbstractExtSysMonSource *gpuLoadItem AbstractExtSysMonSource *gpuLoadItem
= new GPULoadSource(this, QStringList() << config[QString("GPUDEV")]); = new GPULoadSource(this, QStringList({_config["GPUDEV"]}));
for (auto source : gpuLoadItem->sources()) for (auto &source : gpuLoadItem->sources())
m_map[source] = gpuLoadItem; m_map[source] = gpuLoadItem;
// gpu temperature // gpu temperature
AbstractExtSysMonSource *gpuTempItem = new GPUTemperatureSource( AbstractExtSysMonSource *gpuTempItem
this, QStringList() << config[QString("GPUDEV")]); = new GPUTemperatureSource(this, QStringList({_config["GPUDEV"]}));
for (auto source : gpuTempItem->sources()) for (auto &source : gpuTempItem->sources())
m_map[source] = gpuTempItem; m_map[source] = gpuTempItem;
// hdd temperature // hdd temperature
AbstractExtSysMonSource *hddTempItem = new HDDTemperatureSource( AbstractExtSysMonSource *hddTempItem = new HDDTemperatureSource(
this, this, QStringList({_config["HDDDEV"], _config["HDDTEMPCMD"]}));
QStringList() << config[QString("HDDDEV")] for (auto &source : hddTempItem->sources())
<< config[QString("HDDTEMPCMD")]);
for (auto source : hddTempItem->sources())
m_map[source] = hddTempItem; m_map[source] = hddTempItem;
// network // network
AbstractExtSysMonSource *networkItem AbstractExtSysMonSource *networkItem
= new NetworkSource(this, QStringList()); = new NetworkSource(this, QStringList());
for (auto source : networkItem->sources()) for (auto &source : networkItem->sources())
m_map[source] = networkItem; m_map[source] = networkItem;
// player // player
AbstractExtSysMonSource *playerItem = new PlayerSource( AbstractExtSysMonSource *playerItem = new PlayerSource(
this, this, QStringList({_config["PLAYER"], _config["MPDADDRESS"],
QStringList() << config[QString("PLAYER")] _config["MPDPORT"], _config["MPRIS"],
<< config[QString("MPDADDRESS")] _config["PLAYERSYMBOLS"]}));
<< config[QString("MPDPORT")] << config[QString("MPRIS")] for (auto &source : playerItem->sources())
<< config[QString("PLAYERSYMBOLS")]);
for (auto source : playerItem->sources())
m_map[source] = playerItem; m_map[source] = playerItem;
// processes // processes
AbstractExtSysMonSource *processesItem AbstractExtSysMonSource *processesItem
= new ProcessesSource(this, QStringList()); = new ProcessesSource(this, QStringList());
for (auto source : processesItem->sources()) for (auto &source : processesItem->sources())
m_map[source] = processesItem; m_map[source] = processesItem;
// network request // network request
AbstractExtSysMonSource *requestItem AbstractExtSysMonSource *requestItem
= new RequestSource(this, QStringList()); = new RequestSource(this, QStringList());
for (auto source : requestItem->sources()) for (auto &source : requestItem->sources())
m_map[source] = requestItem; m_map[source] = requestItem;
// quotes // quotes
AbstractExtSysMonSource *quotesItem = new QuotesSource(this, QStringList()); AbstractExtSysMonSource *quotesItem = new QuotesSource(this, QStringList());
for (auto source : quotesItem->sources()) for (auto &source : quotesItem->sources())
m_map[source] = quotesItem; m_map[source] = quotesItem;
// upgrade // upgrade
AbstractExtSysMonSource *upgradeItem AbstractExtSysMonSource *upgradeItem
= new UpgradeSource(this, QStringList()); = new UpgradeSource(this, QStringList());
for (auto source : upgradeItem->sources()) for (auto &source : upgradeItem->sources())
m_map[source] = upgradeItem; m_map[source] = upgradeItem;
// weather // weather
AbstractExtSysMonSource *weatherItem AbstractExtSysMonSource *weatherItem
= new WeatherSource(this, QStringList()); = new WeatherSource(this, QStringList());
for (auto source : weatherItem->sources()) for (auto &source : weatherItem->sources())
m_map[source] = weatherItem; m_map[source] = weatherItem;
#ifdef BUILD_LOAD #ifdef BUILD_LOAD
// additional load source // additional load source
AbstractExtSysMonSource *loadItem = new LoadSource(this, QStringList()); AbstractExtSysMonSource *loadItem = new LoadSource(this, QStringList());
for (auto source : loadItem->sources()) for (auto &source : loadItem->sources())
m_map[source] = loadItem; m_map[source] = loadItem;
#endif /* BUILD_LOAD */ #endif /* BUILD_LOAD */
} }

12
sources/extsysmon/extsysmonaggregator.h
View File

@ -28,16 +28,16 @@ class ExtSysMonAggregator : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit ExtSysMonAggregator(QObject *parent, explicit ExtSysMonAggregator(QObject *_parent,
const QHash<QString, QString> config); const QHash<QString, QString> &_config);
virtual ~ExtSysMonAggregator(); virtual ~ExtSysMonAggregator();
QVariant data(const QString source) const; QVariant data(const QString &_source) const;
bool hasSource(const QString source) const; bool hasSource(const QString &_source) const;
QVariantMap initialData(const QString source) const; QVariantMap initialData(const QString &_source) const;
QStringList sources() const; QStringList sources() const;
private: private:
void init(const QHash<QString, QString> config); void init(const QHash<QString, QString> &_config);
QHash<QString, AbstractExtSysMonSource *> m_map; QHash<QString, AbstractExtSysMonSource *> m_map;
}; };

14
sources/extsysmonsources/abstractextsysmonsource.h
View File

@ -28,18 +28,18 @@ class AbstractExtSysMonSource : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit AbstractExtSysMonSource(QObject *parent, const QStringList) explicit AbstractExtSysMonSource(QObject *_parent, const QStringList &)
: QObject(parent){}; : QObject(_parent){};
virtual ~AbstractExtSysMonSource(){}; virtual ~AbstractExtSysMonSource(){};
virtual QVariant data(QString source) = 0; virtual QVariant data(const QString &_source) = 0;
virtual QVariantMap initialData(QString source) const = 0; virtual QVariantMap initialData(const QString &_source) const = 0;
virtual void run() = 0; virtual void run() = 0;
virtual QStringList sources() const = 0; virtual QStringList sources() const = 0;
// used by extensions // used by extensions
int index(const QString source) const int index(const QString &_source) const
{ {
QRegExp rx(QString("\\d+")); QRegExp rx("\\d+");
rx.indexIn(source); rx.indexIn(_source);
return rx.cap().toInt(); return rx.cap().toInt();
} }

65
sources/extsysmonsources/batterysource.cpp
View File

@ -23,13 +23,13 @@
#include "awdebug.h" #include "awdebug.h"
BatterySource::BatterySource(QObject *parent, const QStringList args) BatterySource::BatterySource(QObject *_parent, const QStringList &_args)
: AbstractExtSysMonSource(parent, args) : AbstractExtSysMonSource(_parent, _args)
{ {
Q_ASSERT(args.count() == 1); Q_ASSERT(_args.count() == 1);
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__; qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
m_acpiPath = args.at(0); m_acpiPath = _args.at(0);
m_sources = getSources(); m_sources = getSources();
} }
@ -43,11 +43,11 @@ BatterySource::~BatterySource()
QStringList BatterySource::getSources() QStringList BatterySource::getSources()
{ {
QStringList sources; QStringList sources;
sources.append(QString("battery/ac")); sources.append("battery/ac");
sources.append(QString("battery/bat")); sources.append("battery/bat");
m_batteriesCount m_batteriesCount
= QDir(m_acpiPath) = QDir(m_acpiPath)
.entryList(QStringList() << QString("BAT*"), .entryList(QStringList({"BAT*"}),
QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name) QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name)
.count(); .count();
qCInfo(LOG_ESS) << "Init batteries count as" << m_batteriesCount; qCInfo(LOG_ESS) << "Init batteries count as" << m_batteriesCount;
@ -59,40 +59,40 @@ QStringList BatterySource::getSources()
} }
QVariant BatterySource::data(QString source) QVariant BatterySource::data(const QString &_source)
{ {
qCDebug(LOG_ESS) << "Source" << source; qCDebug(LOG_ESS) << "Source" << _source;
if (!m_values.contains(source)) if (!m_values.contains(_source))
run(); run();
QVariant value = m_values.take(source); QVariant value = m_values.take(_source);
return value; return value;
} }
QVariantMap BatterySource::initialData(QString source) const QVariantMap BatterySource::initialData(const QString &_source) const
{ {
qCDebug(LOG_ESS) << "Source" << source; qCDebug(LOG_ESS) << "Source" << _source;
QVariantMap data; QVariantMap data;
if (source == QString("battery/ac")) { if (_source == "battery/ac") {
data[QString("min")] = false; data["min"] = false;
data[QString("max")] = true; data["max"] = true;
data[QString("name")] = QString("Is AC online or not"); data["name"] = "Is AC online or not";
data[QString("type")] = QString("bool"); data["type"] = "bool";
data[QString("units")] = QString(""); data["units"] = "";
} else if (source == QString("battery/bat")) { } else if (_source == "battery/bat") {
data[QString("min")] = 0; data["min"] = 0;
data[QString("max")] = 100; data["max"] = 100;
data[QString("name")] = QString("Average battery usage"); data["name"] = "Average battery usage";
data[QString("type")] = QString("integer"); data["type"] = "integer";
data[QString("units")] = QString("%"); data["units"] = "%";
} else { } else {
data[QString("min")] = 0; data["min"] = 0;
data[QString("max")] = 100; data["max"] = 100;
data[QString("name")] = QString("Battery %1 usage").arg(index(source)); data["name"] = QString("Battery %1 usage").arg(index(_source));
data[QString("type")] = QString("integer"); data["type"] = "integer";
data[QString("units")] = QString("%"); data["units"] = "%";
} }
return data; return data;
@ -104,7 +104,7 @@ void BatterySource::run()
// adaptor // adaptor
QFile acFile(QString("%1/AC/online").arg(m_acpiPath)); QFile acFile(QString("%1/AC/online").arg(m_acpiPath));
if (acFile.open(QIODevice::ReadOnly | QIODevice::Text)) if (acFile.open(QIODevice::ReadOnly | QIODevice::Text))
m_values[QString("battery/ac")] m_values["battery/ac"]
= (QString(acFile.readLine()).trimmed().toInt() == 1); = (QString(acFile.readLine()).trimmed().toInt() == 1);
acFile.close(); acFile.close();
@ -130,8 +130,7 @@ void BatterySource::run()
currentLevelFile.close(); currentLevelFile.close();
fullLevelFile.close(); fullLevelFile.close();
} }
m_values[QString("battery/bat")] m_values["battery/bat"] = static_cast<int>(100 * currentLevel / fullLevel);
= static_cast<int>(100 * currentLevel / fullLevel);
} }

6
sources/extsysmonsources/batterysource.h
View File

@ -28,11 +28,11 @@ class BatterySource : public AbstractExtSysMonSource
Q_OBJECT Q_OBJECT
public: public:
explicit BatterySource(QObject *parent, const QStringList args); explicit BatterySource(QObject *_parent, const QStringList &_args);
virtual ~BatterySource(); virtual ~BatterySource();
QStringList getSources(); QStringList getSources();
QVariant data(QString source); QVariant data(const QString &_source);
QVariantMap initialData(QString source) const; QVariantMap initialData(const QString &_source) const;
void run(); void run();
QStringList sources() const; QStringList sources() const;

Some files were not shown because too many files have changed in this diff Show More