diff --git a/sources/.clang-format b/sources/.clang-format
index b4b4e86..a3de373 100644
--- a/sources/.clang-format
+++ b/sources/.clang-format
@@ -21,7 +21,7 @@ BreakBeforeBinaryOperators: All
BreakBeforeBraces: Linux
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: true
-ColumnLimit: 80
+ColumnLimit: 100
CommentPragmas: '^ IWYU pragma:'
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 4
diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt
index 80d2ebc..d5b6fe4 100644
--- a/sources/CMakeLists.txt
+++ b/sources/CMakeLists.txt
@@ -6,6 +6,9 @@ cmake_policy(SET CMP0015 NEW)
if (POLICY CMP0063)
cmake_policy(SET CMP0063 OLD)
endif ()
+if (POLICY CMP0071)
+ cmake_policy(SET CMP0071 NEW)
+endif ()
project(awesomewidgets)
set(PROJECT_AUTHOR "Evgeniy Alekseev")
diff --git a/sources/awdebug.cpp b/sources/awdebug.cpp
index 84c14ba..852b18d 100644
--- a/sources/awdebug.cpp
+++ b/sources/awdebug.cpp
@@ -21,16 +21,12 @@
#include "awdebug.h"
-Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget",
- QtMsgType::QtWarningMsg)
+Q_LOGGING_CATEGORY(LOG_AW, "org.kde.plasma.awesomewidget", QtMsgType::QtWarningMsg)
Q_LOGGING_CATEGORY(LOG_DBUS, "org.kde.plasma.awdbus", QtMsgType::QtWarningMsg)
-Q_LOGGING_CATEGORY(LOG_DP, "org.kde.plasma.desktoppanel",
- QtMsgType::QtWarningMsg)
+Q_LOGGING_CATEGORY(LOG_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_ESS, "org.kde.plasma.extsysmonsources", QtMsgType::QtWarningMsg)
+Q_LOGGING_CATEGORY(LOG_LIB, "org.kde.plasma.awesomewidgets", QtMsgType::QtWarningMsg)
QString AWDebug::getAboutText(const QString &_type)
@@ -46,15 +42,9 @@ QString AWDebug::getAboutText(const QString &_type)
text = i18n("A set of minimalistic plasmoid widgets");
} else if (_type == "links") {
text = i18n("Links:") + "
"
- + QString("- %2
")
- .arg(HOMEPAGE)
- .arg(i18n("Homepage"))
- + QString("- %2
")
- .arg(REPOSITORY)
- .arg(i18n("Repository"))
- + QString("- %2
")
- .arg(BUGTRACKER)
- .arg(i18n("Bugtracker"))
+ + QString("- %2
").arg(HOMEPAGE).arg(i18n("Homepage"))
+ + QString("- %2
").arg(REPOSITORY).arg(i18n("Repository"))
+ + QString("- %2
").arg(BUGTRACKER).arg(i18n("Bugtracker"))
+ QString("- %2
")
.arg(TRANSLATION)
.arg(i18n("Translation issue"))
@@ -70,28 +60,22 @@ QString AWDebug::getAboutText(const QString &_type)
.arg(DATE)
.arg(EMAIL)
.arg(AUTHOR)
- + i18n("This software is licensed under %1", LICENSE)
- + "";
+ + i18n("This software is licensed under %1", LICENSE) + "";
} else if (_type == "translators") {
QStringList translatorList = QString(TRANSLATORS).split(',');
for (auto &translator : translatorList)
translator = QString("- %1
").arg(translator);
- text
- = i18n("Translators:") + "" + translatorList.join("") + "
";
+ text = i18n("Translators:") + "" + translatorList.join("") + "
";
} else if (_type == "3rdparty") {
- QStringList trdPartyList
- = QString(TRDPARTY_LICENSE).split(';', QString::SkipEmptyParts);
+ QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(';', QString::SkipEmptyParts);
for (int i = 0; i < trdPartyList.count(); i++)
- trdPartyList[i]
- = QString("- %1 (%2 license)
")
- .arg(trdPartyList.at(i).split(',')[0])
- .arg(trdPartyList.at(i).split(',')[1])
- .arg(trdPartyList.at(i).split(',')[2]);
- text = i18n("This software uses:") + "" + trdPartyList.join("")
- + "
";
+ trdPartyList[i] = QString("- %1 (%2 license)
")
+ .arg(trdPartyList.at(i).split(',')[0])
+ .arg(trdPartyList.at(i).split(',')[1])
+ .arg(trdPartyList.at(i).split(',')[2]);
+ text = i18n("This software uses:") + "" + trdPartyList.join("") + "
";
} else if (_type == "thanks") {
- QStringList thanks
- = QString(SPECIAL_THANKS).split(';', QString::SkipEmptyParts);
+ QStringList thanks = QString(SPECIAL_THANKS).split(';', QString::SkipEmptyParts);
for (int i = 0; i < thanks.count(); i++)
thanks[i] = QString("- %1
")
.arg(thanks.at(i).split(',')[0])
@@ -117,10 +101,8 @@ QStringList AWDebug::getBuildData()
metadata.append(QString(" AW_GRAPHITEM_API: %1").arg(AW_GRAPHITEM_API));
metadata.append(QString(" AW_EXTQUOTES_API: %1").arg(AW_EXTQUOTES_API));
metadata.append(QString(" AW_EXTSCRIPT_API: %1").arg(AW_EXTSCRIPT_API));
- metadata.append(
- QString(" AW_EXTUPGRADE_API: %1").arg(AW_EXTUPGRADE_API));
- metadata.append(
- QString(" AW_EXTWEATHER_API: %1").arg(AW_EXTWEATHER_API));
+ metadata.append(QString(" AW_EXTUPGRADE_API: %1").arg(AW_EXTUPGRADE_API));
+ metadata.append(QString(" AW_EXTWEATHER_API: %1").arg(AW_EXTWEATHER_API));
metadata.append(QString(" AW_FORMATTER_API: %1").arg(AW_FORMATTER_API));
metadata.append(QString(" REQUEST_TIMEOUT: %1").arg(REQUEST_TIMEOUT));
metadata.append(QString(" TIME_KEYS: %1").arg(TIME_KEYS));
@@ -128,41 +110,28 @@ QStringList AWDebug::getBuildData()
// cmake properties
metadata.append("cmake properties:");
metadata.append(QString(" CMAKE_BUILD_TYPE: %1").arg(CMAKE_BUILD_TYPE));
- metadata.append(
- QString(" CMAKE_CXX_COMPILER: %1").arg(CMAKE_CXX_COMPILER));
+ metadata.append(QString(" CMAKE_CXX_COMPILER: %1").arg(CMAKE_CXX_COMPILER));
metadata.append(QString(" CMAKE_CXX_FLAGS: %1").arg(CMAKE_CXX_FLAGS));
+ metadata.append(QString(" CMAKE_CXX_FLAGS_DEBUG: %1").arg(CMAKE_CXX_FLAGS_DEBUG));
+ metadata.append(QString(" CMAKE_CXX_FLAGS_RELEASE: %1").arg(CMAKE_CXX_FLAGS_RELEASE));
metadata.append(
- QString(" CMAKE_CXX_FLAGS_DEBUG: %1").arg(CMAKE_CXX_FLAGS_DEBUG));
- metadata.append(QString(" CMAKE_CXX_FLAGS_RELEASE: %1")
- .arg(CMAKE_CXX_FLAGS_RELEASE));
- metadata.append(QString(" CMAKE_CXX_FLAGS_OPTIMIZATION: %1")
- .arg(CMAKE_CXX_FLAGS_OPTIMIZATION));
- metadata.append(
- QString(" CMAKE_DEFINITIONS: %1").arg(CMAKE_DEFINITIONS));
- metadata.append(
- QString(" CMAKE_INSTALL_PREFIX: %1").arg(CMAKE_INSTALL_PREFIX));
- metadata.append(QString(" CMAKE_MODULE_LINKER_FLAGS: %1")
- .arg(CMAKE_MODULE_LINKER_FLAGS));
- metadata.append(QString(" CMAKE_SHARED_LINKER_FLAGS: %1")
- .arg(CMAKE_SHARED_LINKER_FLAGS));
+ QString(" CMAKE_CXX_FLAGS_OPTIMIZATION: %1").arg(CMAKE_CXX_FLAGS_OPTIMIZATION));
+ metadata.append(QString(" CMAKE_DEFINITIONS: %1").arg(CMAKE_DEFINITIONS));
+ metadata.append(QString(" CMAKE_INSTALL_PREFIX: %1").arg(CMAKE_INSTALL_PREFIX));
+ metadata.append(QString(" CMAKE_MODULE_LINKER_FLAGS: %1").arg(CMAKE_MODULE_LINKER_FLAGS));
+ metadata.append(QString(" CMAKE_SHARED_LINKER_FLAGS: %1").arg(CMAKE_SHARED_LINKER_FLAGS));
// components
metadata.append("Components data:");
metadata.append(QString(" BUILD_PLASMOIDS: %1").arg(BUILD_PLASMOIDS));
- metadata.append(
- QString(" BUILD_DEB_PACKAGE: %1").arg(BUILD_DEB_PACKAGE));
- metadata.append(
- QString(" BUILD_RPM_PACKAGE: %1").arg(BUILD_RPM_PACKAGE));
- metadata.append(
- QString(" CLANGFORMAT_EXECUTABLE: %1").arg(CLANGFORMAT_EXECUTABLE));
+ metadata.append(QString(" BUILD_DEB_PACKAGE: %1").arg(BUILD_DEB_PACKAGE));
+ metadata.append(QString(" BUILD_RPM_PACKAGE: %1").arg(BUILD_RPM_PACKAGE));
+ metadata.append(QString(" CLANGFORMAT_EXECUTABLE: %1").arg(CLANGFORMAT_EXECUTABLE));
metadata.append(QString(" COVERITY_COMMENT: %1").arg(COVERITY_COMMENT));
- metadata.append(
- QString(" COVERITY_DIRECTORY: %1").arg(COVERITY_DIRECTORY));
+ metadata.append(QString(" COVERITY_DIRECTORY: %1").arg(COVERITY_DIRECTORY));
metadata.append(QString(" COVERITY_EMAIL: %1").arg(COVERITY_EMAIL));
- metadata.append(
- QString(" COVERITY_EXECUTABLE: %1").arg(COVERITY_EXECUTABLE));
+ metadata.append(QString(" COVERITY_EXECUTABLE: %1").arg(COVERITY_EXECUTABLE));
metadata.append(QString(" COVERITY_URL: %1").arg(COVERITY_URL));
- metadata.append(
- QString(" CPPCHECK_EXECUTABLE: %1").arg(CPPCHECK_EXECUTABLE));
+ metadata.append(QString(" CPPCHECK_EXECUTABLE: %1").arg(CPPCHECK_EXECUTABLE));
// additional functions
metadata.append(QString(" PROP_FUTURE: %1").arg(PROP_FUTURE));
metadata.append(QString(" PROP_LOAD: %1").arg(PROP_LOAD));
diff --git a/sources/awesome-widget/plugin/awabstractpairconfig.cpp b/sources/awesome-widget/plugin/awabstractpairconfig.cpp
index aaab069..2b378cf 100644
--- a/sources/awesome-widget/plugin/awabstractpairconfig.cpp
+++ b/sources/awesome-widget/plugin/awabstractpairconfig.cpp
@@ -26,8 +26,7 @@
#include "awdebug.h"
-AWAbstractPairConfig::AWAbstractPairConfig(QWidget *_parent,
- const bool _hasEdit,
+AWAbstractPairConfig::AWAbstractPairConfig(QWidget *_parent, const bool _hasEdit,
const QStringList &_keys)
: QDialog(_parent)
, ui(new Ui::AWAbstractPairConfig)
@@ -43,8 +42,7 @@ AWAbstractPairConfig::AWAbstractPairConfig(QWidget *_parent,
// edit feature
if (m_hasEdit) {
- m_editButton = ui->buttonBox->addButton(i18n("Edit"),
- QDialogButtonBox::ActionRole);
+ m_editButton = ui->buttonBox->addButton(i18n("Edit"), QDialogButtonBox::ActionRole);
connect(m_editButton, SIGNAL(clicked(bool)), this, SLOT(edit()));
}
}
@@ -86,10 +84,8 @@ void AWAbstractPairConfig::edit()
void AWAbstractPairConfig::updateUi()
{
- QPair current
- = static_cast(sender())->current();
- int index
- = m_selectors.indexOf(static_cast(sender()));
+ QPair current = static_cast(sender())->current();
+ int index = m_selectors.indexOf(static_cast(sender()));
if ((current.first.isEmpty()) && (current.second.isEmpty())) {
// remove current selector if it is empty and does not last
@@ -108,15 +104,13 @@ void AWAbstractPairConfig::updateUi()
}
-void AWAbstractPairConfig::addSelector(const QStringList &_keys,
- const QStringList &_values,
+void AWAbstractPairConfig::addSelector(const QStringList &_keys, const QStringList &_values,
const QPair &_current)
{
qCDebug(LOG_AW) << "Add selector with keys" << _keys << "values" << _values
<< "and current ones" << _current;
- AWAbstractSelector *selector
- = new AWAbstractSelector(ui->scrollAreaWidgetContents, m_editable);
+ AWAbstractSelector *selector = new AWAbstractSelector(ui->scrollAreaWidgetContents, m_editable);
selector->init(_keys, _values, _current);
ui->verticalLayout->insertWidget(ui->verticalLayout->count() - 1, selector);
connect(selector, SIGNAL(selectionChanged()), this, SLOT(updateUi()));
@@ -127,8 +121,7 @@ void AWAbstractPairConfig::addSelector(const QStringList &_keys,
void AWAbstractPairConfig::clearSelectors()
{
for (auto &selector : m_selectors) {
- disconnect(selector, SIGNAL(selectionChanged()), this,
- SLOT(updateUi()));
+ disconnect(selector, SIGNAL(selectionChanged()), this, SLOT(updateUi()));
ui->verticalLayout->removeWidget(selector);
selector->deleteLater();
}
@@ -167,8 +160,7 @@ QPair AWAbstractPairConfig::initKeys() const
left.append(m_helper->leftKeys().isEmpty() ? m_keys : m_helper->leftKeys());
left.sort();
QStringList right = {""};
- right.append(m_helper->rightKeys().isEmpty() ? m_keys
- : m_helper->rightKeys());
+ right.append(m_helper->rightKeys().isEmpty() ? m_keys : m_helper->rightKeys());
right.sort();
return QPair(left, right);
@@ -182,8 +174,7 @@ void AWAbstractPairConfig::updateDialog()
auto keys = initKeys();
for (auto &key : m_helper->keys())
- addSelector(keys.first, keys.second,
- QPair(key, m_helper->pairs()[key]));
+ addSelector(keys.first, keys.second, QPair(key, m_helper->pairs()[key]));
// empty one
addSelector(keys.first, keys.second, QPair());
}
diff --git a/sources/awesome-widget/plugin/awabstractpairconfig.h b/sources/awesome-widget/plugin/awabstractpairconfig.h
index df1fd40..2834ee6 100644
--- a/sources/awesome-widget/plugin/awabstractpairconfig.h
+++ b/sources/awesome-widget/plugin/awabstractpairconfig.h
@@ -35,8 +35,7 @@ class AWAbstractPairConfig : public QDialog
Q_OBJECT
public:
- explicit AWAbstractPairConfig(QWidget *_parent = nullptr,
- const bool _hasEdit = false,
+ explicit AWAbstractPairConfig(QWidget *_parent = nullptr, const bool _hasEdit = false,
const QStringList &_keys = QStringList());
virtual ~AWAbstractPairConfig();
template void initHelper()
diff --git a/sources/awesome-widget/plugin/awabstractpairhelper.cpp b/sources/awesome-widget/plugin/awabstractpairhelper.cpp
index 5f37995..aac202e 100644
--- a/sources/awesome-widget/plugin/awabstractpairhelper.cpp
+++ b/sources/awesome-widget/plugin/awabstractpairhelper.cpp
@@ -23,8 +23,7 @@
#include "awdebug.h"
-AWAbstractPairHelper::AWAbstractPairHelper(const QString &_filePath,
- const QString &_section)
+AWAbstractPairHelper::AWAbstractPairHelper(const QString &_filePath, const QString &_section)
: m_filePath(_filePath)
, m_section(_section)
{
@@ -62,8 +61,8 @@ void AWAbstractPairHelper::initItems()
{
m_pairs.clear();
- QStringList configs = QStandardPaths::locateAll(
- QStandardPaths::GenericDataLocation, m_filePath);
+ QStringList configs
+ = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_filePath);
for (auto &fileName : configs) {
QSettings settings(fileName, QSettings::IniFormat);
@@ -86,15 +85,14 @@ void AWAbstractPairHelper::initItems()
}
-bool AWAbstractPairHelper::writeItems(
- const QHash &_configuration) const
+bool AWAbstractPairHelper::writeItems(const QHash &_configuration) const
{
qCDebug(LOG_AW) << "Write configuration" << _configuration;
- QString fileName = QString("%1/%2")
- .arg(QStandardPaths::writableLocation(
- QStandardPaths::GenericDataLocation))
- .arg(m_filePath);
+ QString fileName
+ = QString("%1/%2")
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
+ .arg(m_filePath);
QSettings settings(fileName, QSettings::IniFormat);
qCInfo(LOG_AW) << "Configuration file" << fileName;
@@ -113,10 +111,10 @@ bool AWAbstractPairHelper::removeUnusedKeys(const QStringList &_keys) const
{
qCDebug(LOG_AW) << "Remove keys" << _keys;
- QString fileName = QString("%1/%2")
- .arg(QStandardPaths::writableLocation(
- QStandardPaths::GenericDataLocation))
- .arg(m_filePath);
+ QString fileName
+ = QString("%1/%2")
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
+ .arg(m_filePath);
QSettings settings(fileName, QSettings::IniFormat);
qCInfo(LOG_AW) << "Configuration file" << fileName;
diff --git a/sources/awesome-widget/plugin/awabstractpairhelper.h b/sources/awesome-widget/plugin/awabstractpairhelper.h
index b1d5c33..c1eac82 100644
--- a/sources/awesome-widget/plugin/awabstractpairhelper.h
+++ b/sources/awesome-widget/plugin/awabstractpairhelper.h
@@ -25,16 +25,14 @@
class AWAbstractPairHelper
{
public:
- explicit AWAbstractPairHelper(const QString &_filePath = "",
- const QString &_section = "");
+ explicit AWAbstractPairHelper(const QString &_filePath = "", const QString &_section = "");
virtual ~AWAbstractPairHelper();
QStringList keys() const;
QHash pairs() const;
QStringList values() const;
// read-write methods
virtual void initItems();
- virtual bool
- writeItems(const QHash &_configuration) const;
+ virtual bool writeItems(const QHash &_configuration) const;
virtual bool removeUnusedKeys(const QStringList &_keys) const;
// configuration related
virtual void editPairs() = 0;
diff --git a/sources/awesome-widget/plugin/awabstractselector.cpp b/sources/awesome-widget/plugin/awabstractselector.cpp
index 4dc3bfd..aaa816c 100644
--- a/sources/awesome-widget/plugin/awabstractselector.cpp
+++ b/sources/awesome-widget/plugin/awabstractselector.cpp
@@ -21,8 +21,7 @@
#include "awdebug.h"
-AWAbstractSelector::AWAbstractSelector(QWidget *_parent,
- const QPair &_editable)
+AWAbstractSelector::AWAbstractSelector(QWidget *_parent, const QPair &_editable)
: QWidget(_parent)
, ui(new Ui::AWAbstractSelector)
{
@@ -32,10 +31,8 @@ AWAbstractSelector::AWAbstractSelector(QWidget *_parent,
ui->comboBox_key->setEditable(_editable.first);
ui->comboBox_value->setEditable(_editable.second);
- connect(ui->comboBox_key, SIGNAL(currentIndexChanged(int)), this,
- SIGNAL(selectionChanged()));
- connect(ui->comboBox_value, SIGNAL(currentIndexChanged(int)), this,
- SIGNAL(selectionChanged()));
+ connect(ui->comboBox_key, SIGNAL(currentIndexChanged(int)), this, SIGNAL(selectionChanged()));
+ connect(ui->comboBox_value, SIGNAL(currentIndexChanged(int)), this, SIGNAL(selectionChanged()));
}
@@ -56,18 +53,15 @@ QPair AWAbstractSelector::current() const
}
-void AWAbstractSelector::init(const QStringList &_keys,
- const QStringList &_values,
+void AWAbstractSelector::init(const QStringList &_keys, const QStringList &_values,
const QPair &_current)
{
- if ((!_keys.contains(_current.first))
- || (!_values.contains(_current.second))) {
- qCWarning(LOG_AW) << "Invalid current value" << _current
- << "not found in default ones";
+ if ((!_keys.contains(_current.first)) || (!_values.contains(_current.second))) {
+ qCWarning(LOG_AW) << "Invalid current value" << _current << "not found in default ones";
return;
}
- qCDebug(LOG_AW) << "Init selector with keys" << _keys << "and values"
- << _values << "and current ones are" << _current;
+ qCDebug(LOG_AW) << "Init selector with keys" << _keys << "and values" << _values
+ << "and current ones are" << _current;
// set data
ui->comboBox_key->clear();
diff --git a/sources/awesome-widget/plugin/awabstractselector.h b/sources/awesome-widget/plugin/awabstractselector.h
index ef85ab8..ef586ec 100644
--- a/sources/awesome-widget/plugin/awabstractselector.h
+++ b/sources/awesome-widget/plugin/awabstractselector.h
@@ -33,8 +33,7 @@ class AWAbstractSelector : public QWidget
public:
explicit AWAbstractSelector(QWidget *_parent = nullptr,
- const QPair &_editable
- = {false, false});
+ const QPair &_editable = {false, false});
virtual ~AWAbstractSelector();
QPair current() const;
void init(const QStringList &_keys, const QStringList &_values,
diff --git a/sources/awesome-widget/plugin/awactions.cpp b/sources/awesome-widget/plugin/awactions.cpp
index 5ba0d69..4935099 100644
--- a/sources/awesome-widget/plugin/awactions.cpp
+++ b/sources/awesome-widget/plugin/awactions.cpp
@@ -61,8 +61,7 @@ QString AWActions::getFileContent(const QString &_path) const
QFile inputFile(_path);
if (!inputFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
- qCWarning(LOG_AW) << "Could not open file as text"
- << inputFile.fileName();
+ qCWarning(LOG_AW) << "Could not open file as text" << inputFile.fileName();
return "";
}
@@ -102,8 +101,7 @@ void AWActions::showLegacyInfo() const
msgBox->setAttribute(Qt::WA_DeleteOnClose);
msgBox->setModal(false);
msgBox->setWindowTitle(i18n("Not supported"));
- msgBox->setText(
- i18n("You are using mammoth's Qt version, try to update it first"));
+ msgBox->setText(i18n("You are using mammoth's Qt version, try to update it first"));
msgBox->setStandardButtons(QMessageBox::Ok);
msgBox->setIcon(QMessageBox::Information);
@@ -126,11 +124,9 @@ QVariantMap AWActions::getFont(const QVariantMap &_defaultFont) const
QVariantMap fontMap;
int ret = 0;
- CFont defaultCFont
- = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(),
- 400, false, _defaultFont["color"].toString());
- CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false,
- false, &ret);
+ CFont defaultCFont = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(), 400,
+ false, _defaultFont["color"].toString());
+ CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, false, &ret);
fontMap["applied"] = ret;
fontMap["color"] = font.color().name();
@@ -142,13 +138,11 @@ QVariantMap AWActions::getFont(const QVariantMap &_defaultFont) const
// 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;
- KNotification *notification = KNotification::event(
- _eventId, QString("Awesome Widget ::: %1").arg(_eventId), _message);
- notification->setComponentName(
- "plasma-applet-org.kde.plasma.awesome-widget");
+ KNotification *notification
+ = KNotification::event(_eventId, QString("Awesome Widget ::: %1").arg(_eventId), _message);
+ notification->setComponentName("plasma-applet-org.kde.plasma.awesome-widget");
}
diff --git a/sources/awesome-widget/plugin/awactions.h b/sources/awesome-widget/plugin/awactions.h
index 9b8937b..a70d7b5 100644
--- a/sources/awesome-widget/plugin/awactions.h
+++ b/sources/awesome-widget/plugin/awactions.h
@@ -43,8 +43,7 @@ public:
Q_INVOKABLE QVariantMap getFont(const QVariantMap &_defaultFont) const;
public slots:
- Q_INVOKABLE static void sendNotification(const QString &_eventId,
- const QString &_message);
+ Q_INVOKABLE static void sendNotification(const QString &_eventId, const QString &_message);
private:
AWUpdateHelper *m_updateHelper = nullptr;
diff --git a/sources/awesome-widget/plugin/awbugreporter.cpp b/sources/awesome-widget/plugin/awbugreporter.cpp
index edc78ed..a2410db 100644
--- a/sources/awesome-widget/plugin/awbugreporter.cpp
+++ b/sources/awesome-widget/plugin/awbugreporter.cpp
@@ -49,22 +49,18 @@ void AWBugReporter::doConnect()
}
-QString AWBugReporter::generateText(const QString &_description,
- const QString &_reproduce,
- const QString &_expected,
- const QString &_logs) const
+QString AWBugReporter::generateText(const QString &_description, const QString &_reproduce,
+ const QString &_expected, const QString &_logs) const
{
// do not log _logs here, it may have quite large size
- qCDebug(LOG_AW) << "Generate text with description" << _description
- << "steps" << _reproduce << "and expected result"
- << _expected;
+ qCDebug(LOG_AW) << "Generate text with description" << _description << "steps" << _reproduce
+ << "and expected result" << _expected;
QString output;
output += QString("**Description**\n\n%1\n\n").arg(_description);
output += QString("**Step to _reproduce**\n\n%1\n\n").arg(_reproduce);
output += QString("**Expected result**\n\n%1\n\n").arg(_expected);
- output += QString("**Version**\n\n%1\n\n")
- .arg(AWDebug::getBuildData().join(QString("\n")));
+ output += QString("**Version**\n\n%1\n\n").arg(AWDebug::getBuildData().join(QString("\n")));
// append _logs
output += QString("**Logs**\n\n%1").arg(_logs);
@@ -74,8 +70,7 @@ QString AWBugReporter::generateText(const QString &_description,
void AWBugReporter::sendBugReport(const QString &_title, const QString &_body)
{
- qCDebug(LOG_AW) << "Send bug report with title" << _title << "and body"
- << _body;
+ qCDebug(LOG_AW) << "Send bug report with title" << _title << "and body" << _body;
QNetworkAccessManager *manager = new QNetworkAccessManager(nullptr);
connect(manager, SIGNAL(finished(QNetworkReply *)), this,
@@ -90,10 +85,8 @@ void AWBugReporter::sendBugReport(const QString &_title, const QString &_body)
payload["body"] = _body;
payload["labels"] = QStringList() << "from application";
// convert to QByteArray to send request
- QByteArray data
- = QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact);
- qCInfo(LOG_AW) << "Send request with _body" << data.data() << "and size"
- << data.size();
+ QByteArray data = QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact);
+ qCInfo(LOG_AW) << "Send request with _body" << data.data() << "and size" << data.size();
manager->post(request, data);
}
@@ -102,8 +95,8 @@ void AWBugReporter::sendBugReport(const QString &_title, const QString &_body)
void AWBugReporter::issueReplyRecieved(QNetworkReply *_reply)
{
if (_reply->error() != QNetworkReply::NoError) {
- qCWarning(LOG_AW) << "An error occurs" << _reply->error()
- << "with message" << _reply->errorString();
+ qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
+ << _reply->errorString();
return emit(replyReceived(0, ""));
}
@@ -126,8 +119,7 @@ void AWBugReporter::issueReplyRecieved(QNetworkReply *_reply)
void AWBugReporter::showInformation(const int _number, const QString &_url)
{
- qCDebug(LOG_AW) << "Created issue with number" << _number << "and url"
- << _url;
+ qCDebug(LOG_AW) << "Created issue with number" << _number << "and url" << _url;
// cache url first
m_lastBugUrl = _url;
@@ -146,8 +138,7 @@ void AWBugReporter::showInformation(const int _number, const QString &_url)
void AWBugReporter::userReplyOnBugReport(QAbstractButton *_button)
{
- QMessageBox::ButtonRole ret
- = static_cast(sender())->buttonRole(_button);
+ QMessageBox::ButtonRole ret = static_cast(sender())->buttonRole(_button);
qCInfo(LOG_AW) << "User select" << ret;
switch (ret) {
diff --git a/sources/awesome-widget/plugin/awbugreporter.h b/sources/awesome-widget/plugin/awbugreporter.h
index e7bae5b..88aed69 100644
--- a/sources/awesome-widget/plugin/awbugreporter.h
+++ b/sources/awesome-widget/plugin/awbugreporter.h
@@ -33,10 +33,8 @@ public:
explicit AWBugReporter(QObject *_parent = nullptr);
virtual ~AWBugReporter();
Q_INVOKABLE void doConnect();
- Q_INVOKABLE QString generateText(const QString &_description,
- const QString &_reproduce,
- const QString &_expected,
- const QString &_logs) const;
+ Q_INVOKABLE QString generateText(const QString &_description, const QString &_reproduce,
+ const QString &_expected, const QString &_logs) const;
Q_INVOKABLE void sendBugReport(const QString &_title, const QString &_body);
signals:
diff --git a/sources/awesome-widget/plugin/awconfighelper.cpp b/sources/awesome-widget/plugin/awconfighelper.cpp
index c2ccb57..edffc40 100644
--- a/sources/awesome-widget/plugin/awconfighelper.cpp
+++ b/sources/awesome-widget/plugin/awconfighelper.cpp
@@ -34,8 +34,7 @@ AWConfigHelper::AWConfigHelper(QObject *_parent)
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
m_baseDir = QString("%1/awesomewidgets")
- .arg(QStandardPaths::writableLocation(
- QStandardPaths::GenericDataLocation));
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
}
@@ -48,14 +47,13 @@ AWConfigHelper::~AWConfigHelper()
QString AWConfigHelper::configurationDirectory() const
{
// get readable directory
- QString localDir = QString("%1/awesomewidgets/configs")
- .arg(QStandardPaths::writableLocation(
- QStandardPaths::GenericDataLocation));
+ QString localDir
+ = QString("%1/awesomewidgets/configs")
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
// create directory and copy files from default settings
QDir localDirectory;
- if ((!localDirectory.exists(localDir))
- && (localDirectory.mkpath(localDir))) {
+ if ((!localDirectory.exists(localDir)) && (localDirectory.mkpath(localDir))) {
qCInfo(LOG_AW) << "Created directory" << localDir;
copyConfigs(localDir);
}
@@ -66,23 +64,21 @@ QString AWConfigHelper::configurationDirectory() const
bool AWConfigHelper::dropCache() const
{
- QString fileName = QString("%1/awesomewidgets.ndx")
- .arg(QStandardPaths::writableLocation(
- QStandardPaths::GenericCacheLocation));
+ QString fileName
+ = QString("%1/awesomewidgets.ndx")
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
return QFile(fileName).remove();
}
-bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig,
- const QString &_fileName) const
+bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig, const QString &_fileName) const
{
qCDebug(LOG_AW) << "Selected filename" << _fileName;
QSettings settings(_fileName, QSettings::IniFormat);
// plasmoid configuration
- const QQmlPropertyMap *configuration
- = static_cast(_nativeConfig);
+ const QQmlPropertyMap *configuration = static_cast(_nativeConfig);
settings.beginGroup("plasmoid");
for (auto &key : configuration->keys()) {
QVariant value = configuration->value(key);
@@ -94,9 +90,8 @@ bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig,
// extensions
for (auto &item : m_dirs) {
- QStringList items
- = QDir(QString("%1/%2").arg(m_baseDir).arg(item))
- .entryList(QStringList() << "*.desktop", QDir::Files);
+ QStringList items = QDir(QString("%1/%2").arg(m_baseDir).arg(item))
+ .entryList(QStringList() << "*.desktop", QDir::Files);
settings.beginGroup(item);
for (auto &it : items)
copyExtensions(it, item, settings, false);
@@ -107,18 +102,15 @@ bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig,
settings.beginGroup("json");
// script filters
readFile(settings, "filters",
- QString("%1/scripts/awesomewidgets-extscripts-filters.json")
- .arg(m_baseDir));
+ QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
// weather icon settings
readFile(settings, "weathers",
- QString("%1/weather/awesomewidgets-extweather-ids.json")
- .arg(m_baseDir));
+ QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
settings.endGroup();
settings.beginGroup("ini");
// formatter settings
- readFile(settings, "formatters",
- QString("%1/formatters/formatters.ini").arg(m_baseDir));
+ readFile(settings, "formatters", QString("%1/formatters/formatters.ini").arg(m_baseDir));
// custom keys settings
readFile(settings, "custom", QString("%1/custom.ini").arg(m_baseDir));
settings.endGroup();
@@ -155,18 +147,15 @@ QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName,
settings.beginGroup("json");
// script filters
writeFile(settings, "filters",
- QString("%1/scripts/awesomewidgets-extscripts-filters.json")
- .arg(m_baseDir));
+ QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
// weather icon settings
writeFile(settings, "weathers",
- QString("%1/weather/awesomewidgets-extweather-ids.json")
- .arg(m_baseDir));
+ QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
settings.endGroup();
settings.beginGroup("ini");
// formatter settings
- writeFile(settings, "formatters",
- QString("%1/formatters/formatters.ini").arg(m_baseDir));
+ writeFile(settings, "formatters", QString("%1/formatters/formatters.ini").arg(m_baseDir));
// custom keys settings
writeFile(settings, "custom", QString("%1/custom.ini").arg(m_baseDir));
settings.endGroup();
@@ -186,19 +175,17 @@ QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName,
QVariantMap AWConfigHelper::readDataEngineConfiguration() const
{
- QString fileName = QStandardPaths::locate(
- QStandardPaths::ConfigLocation, "plasma-dataengine-extsysmon.conf");
+ QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation,
+ "plasma-dataengine-extsysmon.conf");
qCInfo(LOG_AW) << "Configuration file" << fileName;
QSettings settings(fileName, QSettings::IniFormat);
QVariantMap configuration;
settings.beginGroup("Configuration");
- configuration["ACPIPATH"]
- = settings.value("ACPIPATH", "/sys/class/power_supply/");
+ configuration["ACPIPATH"] = settings.value("ACPIPATH", "/sys/class/power_supply/");
configuration["GPUDEV"] = settings.value("GPUDEV", "auto");
configuration["HDDDEV"] = settings.value("HDDDEV", "all");
- configuration["HDDTEMPCMD"]
- = settings.value("HDDTEMPCMD", "sudo smartctl -a");
+ configuration["HDDTEMPCMD"] = settings.value("HDDTEMPCMD", "sudo smartctl -a");
configuration["MPDADDRESS"] = settings.value("MPDADDRESS", "localhost");
configuration["MPDPORT"] = settings.value("MPDPORT", "6600");
configuration["MPRIS"] = settings.value("MPRIS", "auto");
@@ -212,14 +199,12 @@ QVariantMap AWConfigHelper::readDataEngineConfiguration() const
}
-bool AWConfigHelper::writeDataEngineConfiguration(
- const QVariantMap &_configuration) const
+bool AWConfigHelper::writeDataEngineConfiguration(const QVariantMap &_configuration) const
{
qCDebug(LOG_AW) << "Configuration" << _configuration;
QString fileName = QString("%1/plasma-dataengine-extsysmon.conf")
- .arg(QStandardPaths::writableLocation(
- QStandardPaths::ConfigLocation));
+ .arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation));
QSettings settings(fileName, QSettings::IniFormat);
qCInfo(LOG_AW) << "Configuration file" << settings.fileName();
@@ -245,35 +230,31 @@ void AWConfigHelper::copyConfigs(const QString &_localDir) const
{
qCDebug(LOG_AW) << "Local directory" << _localDir;
- QStringList dirs = QStandardPaths::locateAll(
- QStandardPaths::GenericDataLocation, "awesomewidgets/configs",
- QStandardPaths::LocateDirectory);
+ QStringList dirs
+ = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "awesomewidgets/configs",
+ QStandardPaths::LocateDirectory);
for (auto &dir : dirs) {
if (dir == _localDir)
continue;
QStringList files = QDir(dir).entryList(QDir::Files);
for (auto &source : files) {
QString destination = QString("%1/%2").arg(_localDir).arg(source);
- bool status = QFile::copy(QString("%1/%2").arg(dir).arg(source),
- destination);
- qCInfo(LOG_AW) << "File" << source << "has been copied to"
- << destination << "with status" << status;
+ bool status = QFile::copy(QString("%1/%2").arg(dir).arg(source), destination);
+ qCInfo(LOG_AW) << "File" << source << "has been copied to" << destination
+ << "with status" << status;
}
}
}
void AWConfigHelper::copyExtensions(const QString &_item, const QString &_type,
- QSettings &_settings,
- const bool _inverse) const
+ QSettings &_settings, const bool _inverse) const
{
- qCDebug(LOG_AW) << "Extension" << _item << "has type" << _type
- << "inverse copying" << _inverse;
+ qCDebug(LOG_AW) << "Extension" << _item << "has type" << _type << "inverse copying" << _inverse;
_settings.beginGroup(_item);
- QSettings itemSettings(
- QString("%1/%2/%3").arg(m_baseDir).arg(_type).arg(_item),
- QSettings::IniFormat);
+ QSettings itemSettings(QString("%1/%2/%3").arg(m_baseDir).arg(_type).arg(_item),
+ QSettings::IniFormat);
itemSettings.beginGroup("Desktop Entry");
if (_inverse)
copySettings(_settings, itemSettings);
diff --git a/sources/awesome-widget/plugin/awconfighelper.h b/sources/awesome-widget/plugin/awconfighelper.h
index 1997129..e008a64 100644
--- a/sources/awesome-widget/plugin/awconfighelper.h
+++ b/sources/awesome-widget/plugin/awconfighelper.h
@@ -34,31 +34,26 @@ public:
virtual ~AWConfigHelper();
Q_INVOKABLE QString configurationDirectory() const;
Q_INVOKABLE bool dropCache() const;
- Q_INVOKABLE bool exportConfiguration(QObject *_nativeConfig,
- const QString &_fileName) const;
+ Q_INVOKABLE bool exportConfiguration(QObject *_nativeConfig, const QString &_fileName) const;
Q_INVOKABLE QVariantMap importConfiguration(const QString &_fileName,
const bool _importPlasmoid,
const bool _importExtensions,
const bool _importAdds) const;
// dataengine
Q_INVOKABLE QVariantMap readDataEngineConfiguration() const;
- Q_INVOKABLE bool
- writeDataEngineConfiguration(const QVariantMap &_configuration) const;
+ Q_INVOKABLE bool writeDataEngineConfiguration(const QVariantMap &_configuration) const;
private:
// methods
void copyConfigs(const QString &_localDir) const;
- void copyExtensions(const QString &_item, const QString &_type,
- QSettings &_settings, const bool _inverse) const;
+ void copyExtensions(const QString &_item, const QString &_type, QSettings &_settings,
+ const bool _inverse) const;
void copySettings(QSettings &_from, QSettings &_to) const;
- void readFile(QSettings &_settings, const QString &_key,
- const QString &_fileName) const;
- void writeFile(QSettings &_settings, const QString &_key,
- const QString &_fileName) const;
+ void readFile(QSettings &_settings, const QString &_key, const QString &_fileName) const;
+ void writeFile(QSettings &_settings, const QString &_key, const QString &_fileName) const;
// properties
QString m_baseDir;
- QStringList m_dirs
- = {"desktops", "quotes", "scripts", "upgrade", "weather", "formatters"};
+ QStringList m_dirs = {"desktops", "quotes", "scripts", "upgrade", "weather", "formatters"};
};
diff --git a/sources/awesome-widget/plugin/awcustomkeysconfig.cpp b/sources/awesome-widget/plugin/awcustomkeysconfig.cpp
index 5409151..5435b86 100644
--- a/sources/awesome-widget/plugin/awcustomkeysconfig.cpp
+++ b/sources/awesome-widget/plugin/awcustomkeysconfig.cpp
@@ -21,8 +21,7 @@
#include "awdebug.h"
-AWCustomKeysConfig::AWCustomKeysConfig(QWidget *_parent,
- const QStringList &_keys)
+AWCustomKeysConfig::AWCustomKeysConfig(QWidget *_parent, const QStringList &_keys)
: AWAbstractPairConfig(_parent, false, _keys)
{
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
diff --git a/sources/awesome-widget/plugin/awdataaggregator.cpp b/sources/awesome-widget/plugin/awdataaggregator.cpp
index b7f239b..48e9e1e 100644
--- a/sources/awesome-widget/plugin/awdataaggregator.cpp
+++ b/sources/awesome-widget/plugin/awdataaggregator.cpp
@@ -60,10 +60,9 @@ QString AWDataAggregator::htmlImage(const QPixmap &_source) const
QBuffer buffer(&byteArray);
_source.save(&buffer, "PNG");
- return byteArray.isEmpty()
- ? ""
- : QString("
")
- .arg(QString(byteArray.toBase64()));
+ return byteArray.isEmpty() ? ""
+ : QString("
")
+ .arg(QString(byteArray.toBase64()));
}
@@ -125,8 +124,7 @@ QPixmap AWDataAggregator::tooltipImage()
shift -= 100.0;
// apply pen color
if (key != "batTooltip")
- pen.setColor(QColor(
- m_configuration[QString("%1Color").arg(key)].toString()));
+ pen.setColor(QColor(m_configuration[QString("%1Color").arg(key)].toString()));
// paint data inside frame
for (int j = 0; j < m_values[key].count() - 1; j++) {
// some magic here
@@ -136,11 +134,9 @@ QPixmap AWDataAggregator::tooltipImage()
float y2 = -std::fabs(m_values[key].at(j + 1)) * normY + 5.0f;
if (key == "batTooltip") {
if (m_values[key].at(j + 1) > 0)
- pen.setColor(
- QColor(m_configuration["batTooltipColor"].toString()));
+ pen.setColor(QColor(m_configuration["batTooltipColor"].toString()));
else
- pen.setColor(QColor(
- m_configuration["batInTooltipColor"].toString()));
+ pen.setColor(QColor(m_configuration["batInTooltipColor"].toString()));
}
m_toolTipScene->addLine(x1, y1, x2, y2, pen);
}
@@ -163,33 +159,27 @@ void AWDataAggregator::dataUpdate(const QVariantHash &_values)
void AWDataAggregator::checkValue(const QString &_source, const float _value,
const float _extremum) const
{
- qCDebug(LOG_AW) << "Notification source" << _source << "with value"
- << _value << "called with extremum" << _extremum;
+ qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value
+ << "called with extremum" << _extremum;
if (_value >= 0.0) {
- if ((m_enablePopup) && (_value > _extremum)
- && (m_values[_source].last() < _extremum))
- return AWActions::sendNotification(
- "event", notificationText(_source, _value));
+ if ((m_enablePopup) && (_value > _extremum) && (m_values[_source].last() < _extremum))
+ return AWActions::sendNotification("event", notificationText(_source, _value));
} else {
- if ((m_enablePopup) && (_value < _extremum)
- && (m_values[_source].last() > _extremum))
- return AWActions::sendNotification(
- "event", notificationText(_source, _value));
+ if ((m_enablePopup) && (_value < _extremum) && (m_values[_source].last() > _extremum))
+ return AWActions::sendNotification("event", notificationText(_source, _value));
}
}
-void AWDataAggregator::checkValue(const QString &_source,
- const QString &_current,
+void AWDataAggregator::checkValue(const QString &_source, const QString &_current,
const QString &_received) const
{
- qCDebug(LOG_AW) << "Notification source" << _source << "with current value"
- << _current << "and received one" << _received;
+ qCDebug(LOG_AW) << "Notification source" << _source << "with current value" << _current
+ << "and received one" << _received;
if ((m_enablePopup) && (_current != _received) && (!_received.isEmpty()))
- return AWActions::sendNotification(
- "event", notificationText(_source, _received));
+ return AWActions::sendNotification("event", notificationText(_source, _received));
}
@@ -205,11 +195,9 @@ void AWDataAggregator::initScene()
}
-QString AWDataAggregator::notificationText(const QString &_source,
- const float _value) const
+QString AWDataAggregator::notificationText(const QString &_source, const float _value) const
{
- qCDebug(LOG_AW) << "Notification source" << _source << "with value"
- << _value;
+ qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value;
QString output;
if (_source == "batTooltip")
@@ -227,11 +215,9 @@ QString AWDataAggregator::notificationText(const QString &_source,
}
-QString AWDataAggregator::notificationText(const QString &_source,
- const QString &_value) const
+QString AWDataAggregator::notificationText(const QString &_source, const QString &_value) const
{
- qCDebug(LOG_AW) << "Notification source" << _source << "with value"
- << _value;
+ qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value;
QString output;
if (_source == "netdev")
@@ -245,8 +231,8 @@ void AWDataAggregator::setData(const QVariantHash &_values)
{
// do not log these arguments
// battery update requires info is AC online or not
- setData(_values["ac"].toString() == m_configuration["acOnline"],
- "batTooltip", _values["bat"].toFloat());
+ setData(_values["ac"].toString() == m_configuration["acOnline"], "batTooltip",
+ _values["bat"].toFloat());
// usual case
setData("cpuTooltip", _values["cpu"].toFloat(), 90.0);
setData("cpuclTooltip", _values["cpucl"].toFloat());
@@ -267,16 +253,13 @@ void AWDataAggregator::setData(const QVariantHash &_values)
}
-void AWDataAggregator::setData(const QString &_source, float _value,
- const float _extremum)
+void AWDataAggregator::setData(const QString &_source, float _value, const float _extremum)
{
- qCDebug(LOG_AW) << "Source" << _source << "to value" << _value
- << "with extremum" << _extremum;
+ qCDebug(LOG_AW) << "Source" << _source << "to value" << _value << "with extremum" << _extremum;
if (m_values[_source].count() == 0)
m_values[_source].append(0.0);
- else if (m_values[_source].count()
- > m_configuration["tooltipNumber"].toInt())
+ else if (m_values[_source].count() > m_configuration["tooltipNumber"].toInt())
m_values[_source].removeFirst();
if (std::isnan(_value))
_value = 0.0;
@@ -286,8 +269,7 @@ void AWDataAggregator::setData(const QString &_source, float _value,
m_values[_source].append(_value);
if (_source == "downkbTooltip") {
- QList netValues
- = m_values["downkbTooltip"] + m_values["upkbTooltip"];
+ QList netValues = m_values["downkbTooltip"] + m_values["upkbTooltip"];
// to avoid inf value of normY
netValues << 1.0;
m_boundaries["downkbTooltip"]
@@ -297,11 +279,10 @@ void AWDataAggregator::setData(const QString &_source, float _value,
}
-void AWDataAggregator::setData(const bool _dontInvert, const QString &_source,
- float _value)
+void AWDataAggregator::setData(const bool _dontInvert, const QString &_source, float _value)
{
- qCDebug(LOG_AW) << "Do not invert" << _dontInvert << "value" << _value
- << "for source" << _source;
+ qCDebug(LOG_AW) << "Do not invert" << _dontInvert << "value" << _value << "for source"
+ << _source;
// invert values for different battery colours
_value = _dontInvert ? _value : -_value;
diff --git a/sources/awesome-widget/plugin/awdataaggregator.h b/sources/awesome-widget/plugin/awdataaggregator.h
index b554477..d0769dd 100644
--- a/sources/awesome-widget/plugin/awdataaggregator.h
+++ b/sources/awesome-widget/plugin/awdataaggregator.h
@@ -49,18 +49,15 @@ private:
// ui
QGraphicsScene *m_toolTipScene = nullptr;
QGraphicsView *m_toolTipView = nullptr;
- void checkValue(const QString &_source, const float _value,
- const float _extremum) const;
+ void checkValue(const QString &_source, const float _value, const float _extremum) const;
void checkValue(const QString &_source, const QString &_current,
const QString &_received) const;
void initScene();
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
void setData(const QVariantHash &_values);
- void setData(const QString &_source, float _value,
- const float _extremum = -1.0f);
+ void setData(const QString &_source, float _value, const float _extremum = -1.0f);
// different signature for battery device
void setData(const bool _dontInvert, const QString &_source, float _value);
// variables
diff --git a/sources/awesome-widget/plugin/awdataengineaggregator.cpp b/sources/awesome-widget/plugin/awdataengineaggregator.cpp
index 6ca46ef..e6d2c1c 100644
--- a/sources/awesome-widget/plugin/awdataengineaggregator.cpp
+++ b/sources/awesome-widget/plugin/awdataengineaggregator.cpp
@@ -34,13 +34,12 @@ AWDataEngineAggregator::AWDataEngineAggregator(QObject *_parent)
m_dataEngines["time"] = m_consumer->dataEngine("time");
// additional method required by systemmonitor structure
- m_newSourceConnection = connect(
- m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded,
- [this](const QString source) {
- emit(deviceAdded(source));
- m_dataEngines["systemmonitor"]->connectSource(source, parent(),
- 1000);
- });
+ m_newSourceConnection
+ = connect(m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded,
+ [this](const QString source) {
+ emit(deviceAdded(source));
+ m_dataEngines["systemmonitor"]->connectSource(source, parent(), 1000);
+ });
// required to define Qt::QueuedConnection for signal-slot connection
qRegisterMetaType("Plasma::DataEngine::Data");
@@ -74,13 +73,12 @@ void AWDataEngineAggregator::reconnectSources(const int _interval)
m_dataEngines["extsysmon"]->connectAllSources(parent(), _interval);
m_dataEngines["time"]->connectSource("Local", parent(), 1000);
- m_newSourceConnection = connect(
- m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded,
- [this, _interval](const QString source) {
- emit(deviceAdded(source));
- m_dataEngines["systemmonitor"]->connectSource(source, parent(),
- _interval);
- });
+ m_newSourceConnection
+ = connect(m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded,
+ [this, _interval](const QString source) {
+ emit(deviceAdded(source));
+ m_dataEngines["systemmonitor"]->connectSource(source, parent(), _interval);
+ });
#ifdef BUILD_FUTURE
createQueuedConnection();
@@ -105,24 +103,18 @@ void AWDataEngineAggregator::createQueuedConnection()
// for more details refer to plasma-framework source code
for (auto &dataEngine : m_dataEngines.keys()) {
// different source set for different engines
- QStringList sources = dataEngine == "time"
- ? QStringList() << "Local"
- : m_dataEngines[dataEngine]->sources();
+ QStringList sources = dataEngine == "time" ? QStringList() << "Local"
+ : m_dataEngines[dataEngine]->sources();
// reconnect sources
for (auto &source : sources) {
Plasma::DataContainer *container
= m_dataEngines[dataEngine]->containerForSource(source);
// disconnect old connections first
- disconnect(container,
- SIGNAL(dataUpdated(QString, Plasma::DataEngine::Data)),
- parent(),
+ disconnect(container, SIGNAL(dataUpdated(QString, Plasma::DataEngine::Data)), parent(),
SLOT(dataUpdated(QString, Plasma::DataEngine::Data)));
// and now reconnect with Qt::QueuedConnection type
- connect(container,
- SIGNAL(dataUpdated(QString, Plasma::DataEngine::Data)),
- parent(),
- SLOT(dataUpdated(QString, Plasma::DataEngine::Data)),
- Qt::QueuedConnection);
+ connect(container, SIGNAL(dataUpdated(QString, Plasma::DataEngine::Data)), parent(),
+ SLOT(dataUpdated(QString, Plasma::DataEngine::Data)), Qt::QueuedConnection);
}
}
}
diff --git a/sources/awesome-widget/plugin/awdataenginemapper.cpp b/sources/awesome-widget/plugin/awdataenginemapper.cpp
index 581d0f0..fa7f004 100644
--- a/sources/awesome-widget/plugin/awdataenginemapper.cpp
+++ b/sources/awesome-widget/plugin/awdataenginemapper.cpp
@@ -23,8 +23,7 @@
#include "awformatterhelper.h"
-AWDataEngineMapper::AWDataEngineMapper(QObject *_parent,
- AWFormatterHelper *_custom)
+AWDataEngineMapper::AWDataEngineMapper(QObject *_parent, AWFormatterHelper *_custom)
: QObject(_parent)
, m_customFormatters(_custom)
{
@@ -59,8 +58,7 @@ AWDataEngineMapper::~AWDataEngineMapper()
}
-AWKeysAggregator::FormatterType
-AWDataEngineMapper::formatter(const QString &_key) const
+AWKeysAggregator::FormatterType AWDataEngineMapper::formatter(const QString &_key) const
{
qCDebug(LOG_AW) << "Get formatter for key" << _key;
@@ -78,8 +76,7 @@ QStringList AWDataEngineMapper::keysFromSource(const QString &_source) const
// HACK units required to define should the value be calculated as temperature
// or fan data
-QStringList AWDataEngineMapper::registerSource(const QString &_source,
- const QString &_units,
+QStringList AWDataEngineMapper::registerSource(const QString &_source, const QString &_units,
const QStringList &_keys)
{
qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
@@ -92,10 +89,8 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source,
QRegExp mountFillRegExp = QRegExp("partitions/.*/filllevel");
QRegExp mountFreeRegExp = QRegExp("partitions/.*/freespace");
QRegExp mountUsedRegExp = QRegExp("partitions/.*/usedspace");
- QRegExp netRegExp
- = QRegExp("network/interfaces/.*/(receiver|transmitter)/data$");
- QRegExp netTotalRegExp
- = QRegExp("network/interfaces/.*/(receiver|transmitter)/dataTotal$");
+ QRegExp netRegExp = QRegExp("network/interfaces/.*/(receiver|transmitter)/data$");
+ QRegExp netTotalRegExp = QRegExp("network/interfaces/.*/(receiver|transmitter)/dataTotal$");
if (_source == "battery/ac") {
// AC
@@ -106,9 +101,8 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source,
QString key = _source;
key.remove("battery/");
m_map[_source] = key;
- m_formatter[key] = _source.contains("rate")
- ? AWKeysAggregator::FormatterType::Float
- : AWKeysAggregator::FormatterType::IntegerThree;
+ m_formatter[key] = _source.contains("rate") ? AWKeysAggregator::FormatterType::Float
+ : AWKeysAggregator::FormatterType::IntegerThree;
} else if (_source == "cpu/system/TotalLoad") {
// cpu
m_map[_source] = "cpu";
@@ -338,12 +332,10 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source,
// free swap
// mb
m_map[_source] = "swapfreemb";
- m_formatter["swapfreemb"]
- = AWKeysAggregator::FormatterType::MemMBFormat;
+ m_formatter["swapfreemb"] = AWKeysAggregator::FormatterType::MemMBFormat;
// gb
m_map.insertMulti(_source, "swapfreegb");
- m_formatter["swapfreegb"]
- = AWKeysAggregator::FormatterType::MemGBFormat;
+ m_formatter["swapfreegb"] = AWKeysAggregator::FormatterType::MemGBFormat;
} else if (_source == "mem/swap/used") {
// used swap
// mb
@@ -361,9 +353,8 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source,
if (index > -1) {
QString key = QString("temp%1").arg(index);
m_map[_source] = key;
- m_formatter[key]
- = _units == "°C" ? AWKeysAggregator::FormatterType::Temperature
- : AWKeysAggregator::FormatterType::Integer;
+ m_formatter[key] = _units == "°C" ? AWKeysAggregator::FormatterType::Temperature
+ : AWKeysAggregator::FormatterType::Integer;
}
} else if (_source == "Local") {
// time
@@ -417,8 +408,7 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source,
QStringList customFormattersKeys;
if (m_customFormatters)
customFormattersKeys = m_customFormatters->definedFormatters();
- qCInfo(LOG_AW) << "Looking for formatters" << foundKeys << "in"
- << customFormattersKeys;
+ qCInfo(LOG_AW) << "Looking for formatters" << foundKeys << "in" << customFormattersKeys;
for (auto &key : foundKeys) {
if (!customFormattersKeys.contains(key))
continue;
@@ -427,11 +417,9 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source,
// drop key from dictionary if no one user requested key required it
qCInfo(LOG_AW) << "Looking for keys" << foundKeys << "in" << _keys;
- bool required
- = _keys.isEmpty() || std::any_of(foundKeys.cbegin(), foundKeys.cend(),
- [&_keys](const QString &key) {
- return _keys.contains(key);
- });
+ bool required = _keys.isEmpty()
+ || std::any_of(foundKeys.cbegin(), foundKeys.cend(),
+ [&_keys](const QString &key) { return _keys.contains(key); });
if (!required) {
m_map.remove(_source);
for (auto &key : foundKeys)
diff --git a/sources/awesome-widget/plugin/awdataenginemapper.h b/sources/awesome-widget/plugin/awdataenginemapper.h
index e070f23..9f00e75 100644
--- a/sources/awesome-widget/plugin/awdataenginemapper.h
+++ b/sources/awesome-widget/plugin/awdataenginemapper.h
@@ -32,8 +32,7 @@ class AWDataEngineMapper : public QObject
Q_OBJECT
public:
- explicit AWDataEngineMapper(QObject *_parent = nullptr,
- AWFormatterHelper *_custom = nullptr);
+ explicit AWDataEngineMapper(QObject *_parent = nullptr, AWFormatterHelper *_custom = nullptr);
virtual ~AWDataEngineMapper();
// get methods
AWKeysAggregator::FormatterType formatter(const QString &_key) const;
diff --git a/sources/awesome-widget/plugin/awdbusadaptor.cpp b/sources/awesome-widget/plugin/awdbusadaptor.cpp
index db6b545..10a7906 100644
--- a/sources/awesome-widget/plugin/awdbusadaptor.cpp
+++ b/sources/awesome-widget/plugin/awdbusadaptor.cpp
@@ -40,8 +40,8 @@ AWDBusAdaptor::~AWDBusAdaptor()
QStringList AWDBusAdaptor::ActiveServices() const
{
- QDBusMessage listServices = QDBusConnection::sessionBus().interface()->call(
- QDBus::BlockWithGui, "ListNames");
+ QDBusMessage listServices
+ = QDBusConnection::sessionBus().interface()->call(QDBus::BlockWithGui, "ListNames");
if (listServices.arguments().isEmpty()) {
qCWarning(LOG_DBUS) << "Could not find any DBus service";
return {};
@@ -86,8 +86,8 @@ void AWDBusAdaptor::SetLogLevel(const QString &what, const int level)
qCDebug(LOG_DBUS) << "Set log level" << level << "for" << what;
if (level >= m_logLevels.count()) {
- qCDebug(LOG_DBUS) << "Invalid logging level" << level
- << "should be less than" << m_logLevels.count();
+ qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be less than"
+ << m_logLevels.count();
return;
}
@@ -96,19 +96,15 @@ void AWDBusAdaptor::SetLogLevel(const QString &what, const int level)
}
-void AWDBusAdaptor::SetLogLevel(const QString &what, const QString &level,
- const bool enabled)
+void AWDBusAdaptor::SetLogLevel(const QString &what, const QString &level, const bool enabled)
{
- qCDebug(LOG_DBUS) << "Set log level" << level << "enabled" << enabled
- << "for" << what;
+ qCDebug(LOG_DBUS) << "Set log level" << level << "enabled" << enabled << "for" << what;
if (!m_logLevels.contains(level)) {
- qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be in"
- << m_logLevels;
+ qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be in" << m_logLevels;
return;
}
QString state = enabled ? "true" : "false";
- QLoggingCategory::setFilterRules(
- QString("%1.%2=%3").arg(what).arg(level).arg(state));
+ QLoggingCategory::setFilterRules(QString("%1.%2=%3").arg(what).arg(level).arg(state));
}
diff --git a/sources/awesome-widget/plugin/awdbusadaptor.h b/sources/awesome-widget/plugin/awdbusadaptor.h
index f73110f..a790c2d 100644
--- a/sources/awesome-widget/plugin/awdbusadaptor.h
+++ b/sources/awesome-widget/plugin/awdbusadaptor.h
@@ -44,8 +44,7 @@ public slots:
qlonglong WhoAmI() const;
// set methods
void SetLogLevel(const QString &what, const int level);
- void SetLogLevel(const QString &what, const QString &level,
- const bool enabled);
+ void SetLogLevel(const QString &what, const QString &level, const bool enabled);
private:
AWKeys *m_plugin = nullptr;
diff --git a/sources/awesome-widget/plugin/awformatterhelper.cpp b/sources/awesome-widget/plugin/awformatterhelper.cpp
index f06e39a..d00d844 100644
--- a/sources/awesome-widget/plugin/awformatterhelper.cpp
+++ b/sources/awesome-widget/plugin/awformatterhelper.cpp
@@ -35,8 +35,7 @@
AWFormatterHelper::AWFormatterHelper(QWidget *_parent)
: AbstractExtItemAggregator(_parent, "formatters")
- , AWAbstractPairHelper("awesomewidgets/formatters/formatters.ini",
- "Formatters")
+ , AWAbstractPairHelper("awesomewidgets/formatters/formatters.ini", "Formatters")
{
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
@@ -63,8 +62,7 @@ void AWFormatterHelper::initItems()
for (auto &key : pairs().keys()) {
auto name = pairs()[key];
if (!m_formattersClasses.contains(name)) {
- qCWarning(LOG_AW)
- << "Invalid formatter" << name << "found in" << key;
+ qCWarning(LOG_AW) << "Invalid formatter" << name << "found in" << key;
continue;
}
@@ -73,13 +71,11 @@ void AWFormatterHelper::initItems()
}
-QString AWFormatterHelper::convert(const QVariant &_value,
- const QString &_name) const
+QString AWFormatterHelper::convert(const QVariant &_value, const QString &_name) const
{
qCDebug(LOG_AW) << "Convert value" << _value << "for" << _name;
- return m_formatters.contains(_name) ? m_formatters[_name]->convert(_value)
- : _value.toString();
+ return m_formatters.contains(_name) ? m_formatters[_name]->convert(_value) : _value.toString();
}
@@ -130,8 +126,7 @@ AWFormatterHelper::defineFormatterClass(const QString &_stringType) const
{
qCDebug(LOG_AW) << "Define formatter class for" << _stringType;
- AWAbstractFormatter::FormatterClass formatter
- = AWAbstractFormatter::FormatterClass::NoFormat;
+ AWAbstractFormatter::FormatterClass formatter = AWAbstractFormatter::FormatterClass::NoFormat;
if (_stringType == "DateTime")
formatter = AWAbstractFormatter::FormatterClass::DateTime;
else if (_stringType == "Float")
@@ -177,32 +172,25 @@ void AWFormatterHelper::initFormatters()
auto metadata = readMetadata(filePath);
switch (metadata.second) {
case AWAbstractFormatter::FormatterClass::DateTime:
- m_formattersClasses[metadata.first]
- = new AWDateTimeFormatter(this, filePath);
+ m_formattersClasses[metadata.first] = new AWDateTimeFormatter(this, filePath);
break;
case AWAbstractFormatter::FormatterClass::Float:
- m_formattersClasses[metadata.first]
- = new AWFloatFormatter(this, filePath);
+ m_formattersClasses[metadata.first] = new AWFloatFormatter(this, filePath);
break;
case AWAbstractFormatter::FormatterClass::List:
- m_formattersClasses[metadata.first]
- = new AWListFormatter(this, filePath);
+ m_formattersClasses[metadata.first] = new AWListFormatter(this, filePath);
break;
case AWAbstractFormatter::FormatterClass::Script:
- m_formattersClasses[metadata.first]
- = new AWScriptFormatter(this, filePath);
+ m_formattersClasses[metadata.first] = new AWScriptFormatter(this, filePath);
break;
case AWAbstractFormatter::FormatterClass::String:
- m_formattersClasses[metadata.first]
- = new AWStringFormatter(this, filePath);
+ m_formattersClasses[metadata.first] = new AWStringFormatter(this, filePath);
break;
case AWAbstractFormatter::FormatterClass::Json:
- m_formattersClasses[metadata.first]
- = new AWJsonFormatter(this, filePath);
+ m_formattersClasses[metadata.first] = new AWJsonFormatter(this, filePath);
break;
case AWAbstractFormatter::FormatterClass::NoFormat:
- m_formattersClasses[metadata.first]
- = new AWNoFormatter(this, filePath);
+ m_formattersClasses[metadata.first] = new AWNoFormatter(this, filePath);
break;
}
}
@@ -228,19 +216,17 @@ AWFormatterHelper::readMetadata(const QString &_filePath) const
void AWFormatterHelper::doCreateItem()
{
- QStringList selection
- = {"NoFormat", "DateTime", "Float", "List", "Script", "String", "Json"};
+ QStringList selection = {"NoFormat", "DateTime", "Float", "List", "Script", "String", "Json"};
bool ok;
- QString select = QInputDialog::getItem(
- this, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok);
+ QString select
+ = QInputDialog::getItem(this, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok);
if (!ok) {
qCWarning(LOG_AW) << "No type selected";
return;
}
qCInfo(LOG_AW) << "Selected type" << select;
- AWAbstractFormatter::FormatterClass formatter
- = defineFormatterClass(select);
+ AWAbstractFormatter::FormatterClass formatter = defineFormatterClass(select);
switch (formatter) {
case AWAbstractFormatter::FormatterClass::DateTime:
return createItem();
diff --git a/sources/awesome-widget/plugin/awformatterhelper.h b/sources/awesome-widget/plugin/awformatterhelper.h
index e8b4950..a1cfd71 100644
--- a/sources/awesome-widget/plugin/awformatterhelper.h
+++ b/sources/awesome-widget/plugin/awformatterhelper.h
@@ -24,8 +24,7 @@
#include "awabstractpairhelper.h"
-class AWFormatterHelper : public AbstractExtItemAggregator,
- public AWAbstractPairHelper
+class AWFormatterHelper : public AbstractExtItemAggregator, public AWAbstractPairHelper
{
Q_OBJECT
@@ -48,8 +47,7 @@ public slots:
private:
// methods
- AWAbstractFormatter::FormatterClass
- defineFormatterClass(const QString &_stringType) const;
+ AWAbstractFormatter::FormatterClass defineFormatterClass(const QString &_stringType) const;
void initFormatters();
QPair
readMetadata(const QString &_filePath) const;
diff --git a/sources/awesome-widget/plugin/awkeycache.cpp b/sources/awesome-widget/plugin/awkeycache.cpp
index e6a9f91..eac2749 100644
--- a/sources/awesome-widget/plugin/awkeycache.cpp
+++ b/sources/awesome-widget/plugin/awkeycache.cpp
@@ -29,9 +29,9 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
{
qCDebug(LOG_AW) << "Key" << _key << "with type" << _type;
- QString fileName = QString("%1/awesomewidgets.ndx")
- .arg(QStandardPaths::writableLocation(
- QStandardPaths::GenericCacheLocation));
+ QString fileName
+ = QString("%1/awesomewidgets.ndx")
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
qCInfo(LOG_AW) << "Cache file" << fileName;
QSettings cache(fileName, QSettings::IniFormat);
@@ -41,8 +41,7 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
cachedValues.append(cache.value(number).toString());
if (_type == "hdd") {
- QStringList allDevices
- = QDir("/dev").entryList(QDir::System, QDir::Name);
+ QStringList allDevices = QDir("/dev").entryList(QDir::System, QDir::Name);
QStringList devices = allDevices.filter(QRegExp("^[hms]d[a-z]$"));
for (auto &dev : devices) {
QString device = QString("/dev/%1").arg(dev);
@@ -50,30 +49,23 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
continue;
qCInfo(LOG_AW) << "Found new key" << device << "for type" << _type;
cachedValues.append(device);
- cache.setValue(
- QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')),
- device);
+ cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), device);
}
} else if (_type == "net") {
- QList rawInterfaceList
- = QNetworkInterface::allInterfaces();
+ QList rawInterfaceList = QNetworkInterface::allInterfaces();
for (auto &interface : rawInterfaceList) {
QString device = interface.name();
if (cachedValues.contains(device))
continue;
qCInfo(LOG_AW) << "Found new key" << device << "for type" << _type;
cachedValues.append(device);
- cache.setValue(
- QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')),
- device);
+ cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), device);
}
} else {
if (cachedValues.contains(_key))
return false;
qCInfo(LOG_AW) << "Found new key" << _key << "for type" << _type;
- cache.setValue(
- QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')),
- _key);
+ cache.setValue(QString("%1").arg(cache.allKeys().count(), 3, 10, QChar('0')), _key);
}
cache.endGroup();
@@ -82,14 +74,12 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
}
-QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys,
- const QStringList &_bars,
- const QVariantMap &_tooltip,
- const QStringList &_userKeys,
+QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringList &_bars,
+ const QVariantMap &_tooltip, const QStringList &_userKeys,
const QStringList &_allKeys)
{
- qCDebug(LOG_AW) << "Looking for required keys in" << _keys << _bars
- << "using tooltip settings" << _tooltip;
+ qCDebug(LOG_AW) << "Looking for required keys in" << _keys << _bars << "using tooltip settings"
+ << _tooltip;
// initial copy
QSet used = QSet::fromList(_keys);
@@ -110,8 +100,7 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys,
continue;
key.remove("hddtotmb");
int index = key.toInt();
- used << QString("hddfreemb%1").arg(index)
- << QString("hddmb%1").arg(index);
+ used << QString("hddfreemb%1").arg(index) << QString("hddmb%1").arg(index);
}
// hddtotgb*
for (auto &key : _allKeys.filter(QRegExp("^hddtotgb"))) {
@@ -119,8 +108,7 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys,
continue;
key.remove("hddtotgb");
int index = key.toInt();
- used << QString("hddfreegb%1").arg(index)
- << QString("hddgb%1").arg(index);
+ used << QString("hddfreegb%1").arg(index) << QString("hddgb%1").arg(index);
}
// mem
if (used.contains("mem"))
@@ -147,13 +135,12 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys,
used << "swapgb"
<< "swapfreegb";
// network keys
- QStringList netKeys({"up", "upkb", "uptot", "uptotkb", "upunits", "down",
- "downkb", "downtot", "downtotkb", "downunits"});
+ QStringList netKeys({"up", "upkb", "uptot", "uptotkb", "upunits", "down", "downkb", "downtot",
+ "downtotkb", "downunits"});
for (auto &key : netKeys) {
if (!used.contains(key))
continue;
- QStringList filt
- = _allKeys.filter(QRegExp(QString("^%1[0-9]{1,}").arg(key)));
+ QStringList filt = _allKeys.filter(QRegExp(QString("^%1[0-9]{1,}").arg(key)));
for (auto &filtered : filt)
used << filtered;
}
@@ -173,9 +160,9 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys,
QHash AWKeyCache::loadKeysFromCache()
{
- QString fileName = QString("%1/awesomewidgets.ndx")
- .arg(QStandardPaths::writableLocation(
- QStandardPaths::GenericCacheLocation));
+ QString fileName
+ = QString("%1/awesomewidgets.ndx")
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
qCInfo(LOG_AW) << "Cache file" << fileName;
QSettings cache(fileName, QSettings::IniFormat);
diff --git a/sources/awesome-widget/plugin/awkeycache.h b/sources/awesome-widget/plugin/awkeycache.h
index c9fb3bf..0317cc2 100644
--- a/sources/awesome-widget/plugin/awkeycache.h
+++ b/sources/awesome-widget/plugin/awkeycache.h
@@ -28,8 +28,7 @@ namespace AWKeyCache
{
bool addKeyToCache(const QString &_type, const QString &_key = "");
QStringList getRequiredKeys(const QStringList &_keys, const QStringList &_bars,
- const QVariantMap &_tooltip,
- const QStringList &_userKeys,
+ const QVariantMap &_tooltip, const QStringList &_userKeys,
const QStringList &_allKeys);
QHash loadKeysFromCache();
};
diff --git a/sources/awesome-widget/plugin/awkeyoperations.cpp b/sources/awesome-widget/plugin/awkeyoperations.cpp
index 7f6cb1a..f3e3a5c 100644
--- a/sources/awesome-widget/plugin/awkeyoperations.cpp
+++ b/sources/awesome-widget/plugin/awkeyoperations.cpp
@@ -41,10 +41,8 @@ AWKeyOperations::AWKeyOperations(QObject *_parent)
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
m_customKeys = new AWCustomKeysHelper(this);
- m_graphicalItems
- = new ExtItemAggregator(nullptr, "desktops");
- m_extNetRequest
- = new ExtItemAggregator(nullptr, "requests");
+ m_graphicalItems = new ExtItemAggregator(nullptr, "desktops");
+ m_extNetRequest = new ExtItemAggregator(nullptr, "requests");
m_extQuotes = new ExtItemAggregator(nullptr, "quotes");
m_extScripts = new ExtItemAggregator(nullptr, "scripts");
m_extUpgrade = new ExtItemAggregator(nullptr, "upgrade");
@@ -134,8 +132,7 @@ QStringList AWKeyOperations::dictKeys() const
// battery
QStringList allBatteryDevices
= QDir("/sys/class/power_supply")
- .entryList(QStringList({"BAT*"}),
- QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
+ .entryList(QStringList({"BAT*"}), QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
for (int i = 0; i < allBatteryDevices.count(); i++) {
allKeys.append(QString("bat%1").arg(i));
allKeys.append(QString("batleft%1").arg(i));
@@ -148,15 +145,12 @@ QStringList AWKeyOperations::dictKeys() const
allKeys.append(item->tag("pkgcount"));
// quotes
for (auto &item : m_extQuotes->activeItems()) {
- allKeys.append(item->tag("ask"));
- allKeys.append(item->tag("askchg"));
- allKeys.append(item->tag("percaskchg"));
- allKeys.append(item->tag("bid"));
- allKeys.append(item->tag("bidchg"));
- allKeys.append(item->tag("percbidchg"));
allKeys.append(item->tag("price"));
allKeys.append(item->tag("pricechg"));
allKeys.append(item->tag("percpricechg"));
+ allKeys.append(item->tag("volume"));
+ allKeys.append(item->tag("volumechg"));
+ allKeys.append(item->tag("percvolumechg"));
}
// custom
for (auto &item : m_extScripts->activeItems())
@@ -228,8 +222,7 @@ QString AWKeyOperations::infoByKey(const QString &_key) const
QString index = _key;
index.remove(QRegExp("hdd[rw]"));
output = m_devices["disk"][index.toInt()];
- } else if (_key.contains(
- QRegExp("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)"))) {
+ } else if (_key.contains(QRegExp("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)"))) {
QString index = _key;
index.remove(QRegExp("^hdd(|mb|gb|freemb|freegb|totmb|totgb)"));
output = m_devices["mount"][index.toInt()];
@@ -249,8 +242,7 @@ QString AWKeyOperations::infoByKey(const QString &_key) const
AbstractExtItem *item = m_extQuotes->itemByTag(_key, stripped);
if (item)
output = item->uniq();
- } else if (_key.contains(QRegExp(
- "(weather|weatherId|humidity|pressure|temperature)"))) {
+ } else if (_key.contains(QRegExp("(weather|weatherId|humidity|pressure|temperature)"))) {
AbstractExtItem *item = m_extWeather->itemByTag(_key, stripped);
if (item)
output = item->uniq();
@@ -289,8 +281,8 @@ void AWKeyOperations::editItem(const QString &_type)
qCDebug(LOG_AW) << "Item type" << _type;
if (_type == "graphicalitem") {
- QStringList keys = dictKeys().filter(
- QRegExp("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)"));
+ QStringList keys
+ = dictKeys().filter(QRegExp("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)"));
keys.sort();
m_graphicalItems->setConfigArgs(keys);
return m_graphicalItems->editItems();
diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp
index 9c8a8c7..208d392 100644
--- a/sources/awesome-widget/plugin/awkeys.cpp
+++ b/sources/awesome-widget/plugin/awkeys.cpp
@@ -62,11 +62,11 @@ AWKeys::AWKeys(QObject *_parent)
// transfer signal from AWDataAggregator object to QML ui
connect(m_dataAggregator, SIGNAL(toolTipPainted(const QString &)), this,
SIGNAL(needToolTipToBeUpdated(const QString &)));
- connect(this, SIGNAL(dropSourceFromDataengine(const QString &)),
- m_dataEngineAggregator, SLOT(dropSource(const QString &)));
+ connect(this, SIGNAL(dropSourceFromDataengine(const QString &)), m_dataEngineAggregator,
+ SLOT(dropSource(const QString &)));
// transfer signal from dataengine to update source list
- connect(m_dataEngineAggregator, SIGNAL(deviceAdded(const QString &)),
- m_keyOperator, SLOT(addDevice(const QString &)));
+ connect(m_dataEngineAggregator, SIGNAL(deviceAdded(const QString &)), m_keyOperator,
+ SLOT(addDevice(const QString &)));
}
@@ -91,17 +91,15 @@ void AWKeys::initDataAggregator(const QVariantMap &_tooltipParams)
}
-void AWKeys::initKeys(const QString &_currentPattern, const int _interval,
- const int _limit, const bool _optimize)
+void AWKeys::initKeys(const QString &_currentPattern, const int _interval, const int _limit,
+ const bool _optimize)
{
- qCDebug(LOG_AW) << "Pattern" << _currentPattern << "with interval"
- << _interval << "and queue limit" << _limit
- << "with optimization" << _optimize;
+ qCDebug(LOG_AW) << "Pattern" << _currentPattern << "with interval" << _interval
+ << "and queue limit" << _limit << "with optimization" << _optimize;
// init
m_optimize = _optimize;
- m_threadPool->setMaxThreadCount(_limit == 0 ? QThread::idealThreadCount()
- : _limit);
+ m_threadPool->setMaxThreadCount(_limit == 0 ? QThread::idealThreadCount() : _limit);
// child objects
m_aggregator->initFormatters();
m_keyOperator->setPattern(_currentPattern);
@@ -138,8 +136,7 @@ void AWKeys::updateCache()
QStringList AWKeys::dictKeys(const bool _sorted, const QString &_regexp) const
{
- qCDebug(LOG_AW) << "Should be sorted" << _sorted << "and filter applied"
- << _regexp;
+ qCDebug(LOG_AW) << "Should be sorted" << _sorted << "and filter applied" << _regexp;
// check if functions asked
if (_regexp == "functions")
@@ -190,8 +187,7 @@ QString AWKeys::valueByKey(const QString &_key) const
{
qCDebug(LOG_AW) << "Requested value for key" << _key;
- QString trueKey
- = _key.startsWith("bar") ? m_keyOperator->infoByKey(_key) : _key;
+ QString trueKey = _key.startsWith("bar") ? m_keyOperator->infoByKey(_key) : _key;
return m_aggregator->formatter(m_values[trueKey], trueKey);
}
@@ -205,12 +201,10 @@ void AWKeys::editItem(const QString &_type)
}
-void AWKeys::dataUpdated(const QString &_sourceName,
- const Plasma::DataEngine::Data &_data)
+void AWKeys::dataUpdated(const QString &_sourceName, const Plasma::DataEngine::Data &_data)
{
// run concurrent data update
- QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, _sourceName,
- _data);
+ QtConcurrent::run(m_threadPool, this, &AWKeys::setDataBySource, _sourceName, _data);
}
@@ -219,28 +213,24 @@ void AWKeys::reinitKeys(const QStringList &_currentKeys)
qCDebug(LOG_AW) << "Update found keys by using list" << _currentKeys;
// append lists
- m_foundBars = AWPatternFunctions::findKeys(m_keyOperator->pattern(),
- _currentKeys, true);
- m_foundKeys = AWPatternFunctions::findKeys(m_keyOperator->pattern(),
- _currentKeys, false);
+ m_foundBars = AWPatternFunctions::findKeys(m_keyOperator->pattern(), _currentKeys, true);
+ m_foundKeys = AWPatternFunctions::findKeys(m_keyOperator->pattern(), _currentKeys, false);
m_foundLambdas = AWPatternFunctions::findLambdas(m_keyOperator->pattern());
// generate list of required keys for bars
QStringList barKeys;
for (auto &bar : m_foundBars) {
GraphicalItem *item = m_keyOperator->giByKey(bar);
if (item->isCustom())
- item->setUsedKeys(
- AWPatternFunctions::findKeys(item->bar(), _currentKeys, false));
+ item->setUsedKeys(AWPatternFunctions::findKeys(item->bar(), _currentKeys, false));
else
item->setUsedKeys(QStringList() << item->bar());
barKeys.append(item->usedKeys());
}
// get required keys
- m_requiredKeys = m_optimize
- ? AWKeyCache::getRequiredKeys(
- m_foundKeys, barKeys, m_tooltipParams,
- m_keyOperator->requiredUserKeys(), _currentKeys)
- : QStringList();
+ m_requiredKeys
+ = m_optimize ? AWKeyCache::getRequiredKeys(m_foundKeys, barKeys, m_tooltipParams,
+ m_keyOperator->requiredUserKeys(), _currentKeys)
+ : QStringList();
// set key data to m_aggregator
m_aggregator->setDevices(m_keyOperator->devices());
@@ -278,17 +268,13 @@ void AWKeys::calculateValues()
}
// memtot*
- m_values["memtotmb"]
- = m_values["memusedmb"].toInt() + m_values["memfreemb"].toInt();
- m_values["memtotgb"]
- = m_values["memusedgb"].toFloat() + m_values["memfreegb"].toFloat();
+ m_values["memtotmb"] = m_values["memusedmb"].toInt() + m_values["memfreemb"].toInt();
+ m_values["memtotgb"] = m_values["memusedgb"].toFloat() + m_values["memfreegb"].toFloat();
// mem
- m_values["mem"]
- = 100.0f * m_values["memmb"].toFloat() / m_values["memtotmb"].toFloat();
+ m_values["mem"] = 100.0f * m_values["memmb"].toFloat() / m_values["memtotmb"].toFloat();
// up, down, upkb, downkb, upunits, downunits
- int netIndex
- = m_keyOperator->devices("net").indexOf(m_values["netdev"].toString());
+ int netIndex = m_keyOperator->devices("net").indexOf(m_values["netdev"].toString());
m_values["down"] = m_values[QString("down%1").arg(netIndex)];
m_values["downkb"] = m_values[QString("downkb%1").arg(netIndex)];
m_values["downtot"] = m_values[QString("downtot%1").arg(netIndex)];
@@ -301,13 +287,10 @@ void AWKeys::calculateValues()
m_values["upunits"] = m_values[QString("upunits%1").arg(netIndex)];
// swaptot*
- m_values["swaptotmb"]
- = m_values["swapmb"].toInt() + m_values["swapfreemb"].toInt();
- m_values["swaptotgb"]
- = m_values["swapgb"].toFloat() + m_values["swapfreegb"].toFloat();
+ m_values["swaptotmb"] = m_values["swapmb"].toInt() + m_values["swapfreemb"].toInt();
+ m_values["swaptotgb"] = m_values["swapgb"].toFloat() + m_values["swapfreegb"].toFloat();
// swap
- m_values["swap"] = 100.0f * m_values["swapmb"].toFloat()
- / m_values["swaptotmb"].toFloat();
+ m_values["swap"] = 100.0f * m_values["swapmb"].toFloat() / m_values["swaptotmb"].toFloat();
// user defined keys
for (auto &key : m_keyOperator->userKeys())
@@ -315,8 +298,7 @@ void AWKeys::calculateValues()
// lambdas
for (auto &key : m_foundLambdas)
- m_values[key] = AWPatternFunctions::expandLambdas(
- key, m_aggregator, m_values, m_foundKeys);
+ m_values[key] = AWPatternFunctions::expandLambdas(key, m_aggregator, m_values, m_foundKeys);
}
@@ -329,8 +311,7 @@ void AWKeys::createDBusInterface()
QDBusConnection instanceBus = QDBusConnection::sessionBus();
// HACK we are going to use different services because it binds to
// application
- if (instanceBus.registerService(
- QString("%1.i%2").arg(AWDBUS_SERVICE).arg(id))) {
+ if (instanceBus.registerService(QString("%1.i%2").arg(AWDBUS_SERVICE).arg(id))) {
if (!instanceBus.registerObject(AWDBUS_PATH, new AWDBusAdaptor(this),
QDBusConnection::ExportAllContents))
qCWarning(LOG_AW) << "Could not register DBus object, last error"
@@ -359,17 +340,15 @@ QString AWKeys::parsePattern(QString _pattern) const
// main keys
for (auto &key : m_foundKeys)
- _pattern.replace(QString("$%1").arg(key),
- m_aggregator->formatter(m_values[key], key));
+ _pattern.replace(QString("$%1").arg(key), m_aggregator->formatter(m_values[key], key));
// bars
for (auto &bar : m_foundBars) {
GraphicalItem *item = m_keyOperator->giByKey(bar);
- QString image
- = item->isCustom()
- ? item->image(AWPatternFunctions::expandLambdas(
- item->bar(), m_aggregator, m_values, item->usedKeys()))
- : item->image(m_values[item->bar()]);
+ QString image = item->isCustom()
+ ? item->image(AWPatternFunctions::expandLambdas(
+ item->bar(), m_aggregator, m_values, item->usedKeys()))
+ : item->image(m_values[item->bar()]);
_pattern.replace(QString("$%1").arg(bar), image);
}
@@ -382,16 +361,14 @@ QString AWKeys::parsePattern(QString _pattern) const
}
-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;
// first list init
QStringList tags = m_aggregator->keysFromSource(_sourceName);
if (tags.isEmpty())
- tags = m_aggregator->registerSource(
- _sourceName, _data["units"].toString(), m_requiredKeys);
+ tags = m_aggregator->registerSource(_sourceName, _data["units"].toString(), m_requiredKeys);
// update data or drop source if there are no matches and exit
if (tags.isEmpty()) {
@@ -401,10 +378,8 @@ void AWKeys::setDataBySource(const QString &_sourceName,
m_mutex.lock();
// HACK workaround for time values which are stored in the different path
- std::for_each(tags.cbegin(), tags.cend(),
- [this, &_data, &_sourceName](const QString &tag) {
- m_values[tag] = _sourceName == "Local" ? _data["DateTime"]
- : _data["value"];
- });
+ std::for_each(tags.cbegin(), tags.cend(), [this, &_data, &_sourceName](const QString &tag) {
+ m_values[tag] = _sourceName == "Local" ? _data["DateTime"] : _data["value"];
+ });
m_mutex.unlock();
}
diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h
index 0c49b8c..a1864ee 100644
--- a/sources/awesome-widget/plugin/awkeys.h
+++ b/sources/awesome-widget/plugin/awkeys.h
@@ -40,18 +40,15 @@ public:
explicit AWKeys(QObject *_parent = nullptr);
virtual ~AWKeys();
Q_INVOKABLE void initDataAggregator(const QVariantMap &_tooltipParams);
- Q_INVOKABLE void initKeys(const QString &_currentPattern,
- const int _interval, const int _limit,
+ Q_INVOKABLE void initKeys(const QString &_currentPattern, const int _interval, const int _limit,
const bool _optimize);
- Q_INVOKABLE void setAggregatorProperty(const QString &_key,
- const QVariant &_value);
+ Q_INVOKABLE void setAggregatorProperty(const QString &_key, const QVariant &_value);
Q_INVOKABLE void setWrapNewLines(const bool _wrap);
// additional method to force load keys from Qml UI. Used in some
// configuration pages
Q_INVOKABLE void updateCache();
// keys
- Q_INVOKABLE QStringList dictKeys(const bool _sorted = false,
- const QString &_regexp = "") const;
+ Q_INVOKABLE QStringList dictKeys(const bool _sorted = false, const QString &_regexp = "") const;
Q_INVOKABLE QVariantList getHddDevices() const;
// values
Q_INVOKABLE QString infoByKey(const QString &_key) const;
@@ -60,8 +57,7 @@ public:
Q_INVOKABLE void editItem(const QString &_type);
public slots:
- void dataUpdated(const QString &_sourceName,
- const Plasma::DataEngine::Data &_data);
+ void dataUpdated(const QString &_sourceName, const Plasma::DataEngine::Data &_data);
// dummy method required by DataEngine connections
void modelChanged(QString, QAbstractItemModel *){};
diff --git a/sources/awesome-widget/plugin/awkeysaggregator.cpp b/sources/awesome-widget/plugin/awkeysaggregator.cpp
index b099019..47632cb 100644
--- a/sources/awesome-widget/plugin/awkeysaggregator.cpp
+++ b/sources/awesome-widget/plugin/awkeysaggregator.cpp
@@ -55,8 +55,7 @@ void AWKeysAggregator::initFormatters()
}
-QString AWKeysAggregator::formatter(const QVariant &_data,
- const QString &_key) const
+QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key) const
{
qCDebug(LOG_AW) << "Data" << _data << "for key" << _key;
@@ -86,8 +85,7 @@ QString AWKeysAggregator::formatter(const QVariant &_data,
output = _data.toBool() ? m_acOnline : m_acOffline;
break;
case FormatterType::MemGBFormat:
- output
- = QString("%1").arg(_data.toFloat() / (1024.0 * 1024.0), 5, 'f', 1);
+ output = QString("%1").arg(_data.toFloat() / (1024.0 * 1024.0), 5, 'f', 1);
break;
case FormatterType::MemMBFormat:
output = QString("%1").arg(_data.toFloat() / 1024.0, 5, 'f', 0);
@@ -134,8 +132,7 @@ QString AWKeysAggregator::formatter(const QVariant &_data,
output = loc.toString(_data.toDateTime(), QLocale::ShortFormat);
break;
case FormatterType::Timestamp:
- output = QString("%1").arg(
- _data.toDateTime().toMSecsSinceEpoch() / 1000.0, 10, 'f', 0);
+ output = QString("%1").arg(_data.toDateTime().toMSecsSinceEpoch() / 1000.0, 10, 'f', 0);
break;
case FormatterType::Uptime:
case FormatterType::UptimeCustom:
@@ -145,19 +142,14 @@ QString AWKeysAggregator::formatter(const QVariant &_data,
int minutes = seconds / 60 % 60;
int hours = ((seconds / 60) - minutes) / 60 % 24;
int days = (((seconds / 60) - minutes) / 60 - hours) / 24;
- source.replace("$dd",
- QString("%1").arg(days, 3, 10, QChar('0')));
+ source.replace("$dd", QString("%1").arg(days, 3, 10, QChar('0')));
source.replace("$d", QString("%1").arg(days));
- source.replace("$hh",
- QString("%1").arg(hours, 2, 10, QChar('0')));
+ source.replace("$hh", QString("%1").arg(hours, 2, 10, QChar('0')));
source.replace("$h", QString("%1").arg(hours));
- source.replace("$mm",
- QString("%1").arg(minutes, 2, 10, QChar('0')));
+ source.replace("$mm", QString("%1").arg(minutes, 2, 10, QChar('0')));
source.replace("$m", QString("%1").arg(minutes));
return source;
- }(m_mapper->formatter(_key) == FormatterType::Uptime
- ? "$ddd$hhh$mmm"
- : m_customUptime,
+ }(m_mapper->formatter(_key) == FormatterType::Uptime ? "$ddd$hhh$mmm" : m_customUptime,
static_cast(_data.toFloat()));
break;
case FormatterType::NoFormat:
@@ -241,8 +233,7 @@ void AWKeysAggregator::setTranslate(const bool _translate)
}
-QStringList AWKeysAggregator::registerSource(const QString &_source,
- const QString &_units,
+QStringList AWKeysAggregator::registerSource(const QString &_source, const QString &_units,
const QStringList &_keys)
{
qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h
index d6d5d1a..8f99846 100644
--- a/sources/awesome-widget/plugin/awkeysaggregator.h
+++ b/sources/awesome-widget/plugin/awkeysaggregator.h
@@ -32,8 +32,7 @@ class AWKeysAggregator : public QObject
Q_PROPERTY(QString acOffline MEMBER m_acOffline WRITE setAcOffline);
Q_PROPERTY(QString acOnline MEMBER m_acOnline WRITE setAcOnline);
Q_PROPERTY(QString customTime MEMBER m_customTime WRITE setCustomTime);
- Q_PROPERTY(
- QString customUptime MEMBER m_customUptime WRITE setCustomUptime);
+ Q_PROPERTY(QString customUptime MEMBER m_customUptime WRITE setCustomUptime);
Q_PROPERTY(QString tempUnits MEMBER m_tempUnits WRITE setTempUnits);
Q_PROPERTY(bool translate MEMBER m_translate WRITE setTranslate);
diff --git a/sources/awesome-widget/plugin/awpatternfunctions.cpp b/sources/awesome-widget/plugin/awpatternfunctions.cpp
index b3d5ad5..c7feea7 100644
--- a/sources/awesome-widget/plugin/awpatternfunctions.cpp
+++ b/sources/awesome-widget/plugin/awpatternfunctions.cpp
@@ -24,8 +24,7 @@
#include "awkeysaggregator.h"
-QString AWPatternFunctions::expandLambdas(QString _code,
- AWKeysAggregator *_aggregator,
+QString AWPatternFunctions::expandLambdas(QString _code, AWKeysAggregator *_aggregator,
const QVariantHash &_metadata,
const QStringList &_usedKeys)
{
@@ -41,9 +40,8 @@ QString AWPatternFunctions::expandLambdas(QString _code,
qCInfo(LOG_AW) << "Expression" << _code;
QJSValue result = engine.evaluate(_code);
if (result.isError()) {
- qCWarning(LOG_AW) << "Uncaught exception at line"
- << result.property("lineNumber").toInt() << ":"
- << result.toString();
+ qCWarning(LOG_AW) << "Uncaught exception at line" << result.property("lineNumber").toInt()
+ << ":" << result.toString();
return "";
} else {
return result.toString();
@@ -57,8 +55,7 @@ QString AWPatternFunctions::expandTemplates(QString _code)
// match the following construction $template{{some code here}}
QRegularExpression templatesRegexp("\\$template\\{\\{(?.*?)\\}\\}");
- templatesRegexp.setPatternOptions(
- QRegularExpression::DotMatchesEverythingOption);
+ templatesRegexp.setPatternOptions(QRegularExpression::DotMatchesEverythingOption);
QRegularExpressionMatchIterator it = templatesRegexp.globalMatch(_code);
while (it.hasNext()) {
@@ -71,8 +68,7 @@ QString AWPatternFunctions::expandTemplates(QString _code)
QString templateResult = "";
if (result.isError()) {
qCWarning(LOG_AW) << "Uncaught exception at line"
- << result.property("lineNumber").toInt() << ":"
- << result.toString();
+ << result.property("lineNumber").toInt() << ":" << result.toString();
} else {
templateResult = result.toString();
}
@@ -86,8 +82,7 @@ QString AWPatternFunctions::expandTemplates(QString _code)
QList
-AWPatternFunctions::findFunctionCalls(const QString &_function,
- const QString &_code)
+AWPatternFunctions::findFunctionCalls(const QString &_function, const QString &_code)
{
qCDebug(LOG_AW) << "Looking for function" << _function << "in" << _code;
@@ -98,8 +93,7 @@ AWPatternFunctions::findFunctionCalls(const QString &_function,
// * body depends on the function name, double brackets should be screened
// by using $, e.g. ${
QRegularExpression regex(
- QString("\\$%1\\<(?.*?)\\>\\{\\{(?.*?)\\}\\}")
- .arg(_function));
+ QString("\\$%1\\<(?.*?)\\>\\{\\{(?.*?)\\}\\}").arg(_function));
regex.setPatternOptions(QRegularExpression::DotMatchesEverythingOption);
QList foundFunctions;
@@ -116,9 +110,8 @@ AWPatternFunctions::findFunctionCalls(const QString &_function,
// replace '$,' to 0x1d
argsString.replace("$,", QString(0x1d));
QStringList args = argsString.split(',');
- std::for_each(args.begin(), args.end(), [](QString &arg) {
- arg.replace(QString(0x1d), ",");
- });
+ std::for_each(args.begin(), args.end(),
+ [](QString &arg) { arg.replace(QString(0x1d), ","); });
metadata.args = args;
}
// other variables
@@ -134,20 +127,17 @@ 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"
- << _keys;
+ qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
QList found
= AWPatternFunctions::findFunctionCalls("aw_all", _code);
for (auto &function : found) {
QString separator = function.args.isEmpty() ? "," : function.args.at(0);
QStringList required = _keys.filter(QRegExp(function.body));
- std::for_each(required.begin(), required.end(), [](QString &value) {
- value = QString("%1: $%1").arg(value);
- });
+ std::for_each(required.begin(), required.end(),
+ [](QString &value) { value = QString("%1: $%1").arg(value); });
_code.replace(function.what, required.join(separator));
}
@@ -156,11 +146,9 @@ QString AWPatternFunctions::insertAllKeys(QString _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"
- << _keys;
+ qCDebug(LOG_AW) << "Looking for count in code" << _code << "using list" << _keys;
QList found
= AWPatternFunctions::findFunctionCalls("aw_count", _code);
@@ -174,11 +162,9 @@ QString AWPatternFunctions::insertKeyCount(QString _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"
- << _keys;
+ qCDebug(LOG_AW) << "Looking for key names in code" << _code << "using list" << _keys;
QList found
= AWPatternFunctions::findFunctionCalls("aw_names", _code);
@@ -195,17 +181,15 @@ QString AWPatternFunctions::insertKeyNames(QString _code,
QString AWPatternFunctions::insertKeys(QString _code, const QStringList &_keys)
{
- qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list"
- << _keys;
+ qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
QList found
= AWPatternFunctions::findFunctionCalls("aw_keys", _code);
for (auto &function : found) {
QString separator = function.args.isEmpty() ? "," : function.args.at(0);
QStringList required = _keys.filter(QRegExp(function.body));
- std::for_each(required.begin(), required.end(), [](QString &value) {
- value = QString("$%1").arg(value);
- });
+ std::for_each(required.begin(), required.end(),
+ [](QString &value) { value = QString("$%1").arg(value); });
_code.replace(function.what, required.join(separator));
}
@@ -229,13 +213,11 @@ QString AWPatternFunctions::insertMacros(QString _code)
QString name = macro.args.takeFirst();
// find macro usage
QList macroUsage
- = AWPatternFunctions::findFunctionCalls(
- QString("aw_macro_%1").arg(name), _code);
+ = AWPatternFunctions::findFunctionCalls(QString("aw_macro_%1").arg(name), _code);
for (auto &function : macroUsage) {
if (function.args.count() != macro.args.count()) {
- qCWarning(LOG_AW)
- << "Invalid args count found for call" << function.what
- << "with macro" << macro.what;
+ qCWarning(LOG_AW) << "Invalid args count found for call" << function.what
+ << "with macro" << macro.what;
continue;
}
// generate body to replace
@@ -243,8 +225,7 @@ QString AWPatternFunctions::insertMacros(QString _code)
std::for_each(macro.args.cbegin(), macro.args.cend(),
[&result, macro, function](const QString &arg) {
int index = macro.args.indexOf(arg);
- result.replace(QString("$%1").arg(arg),
- function.args.at(index));
+ result.replace(QString("$%1").arg(arg), function.args.at(index));
});
// do replace
_code.replace(function.what, result);
@@ -258,20 +239,17 @@ QString AWPatternFunctions::insertMacros(QString _code)
}
-QStringList AWPatternFunctions::findKeys(const QString &_code,
- const QStringList &_keys,
+QStringList AWPatternFunctions::findKeys(const QString &_code, const QStringList &_keys,
const bool _isBars)
{
- qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list"
- << _keys;
+ qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
QStringList selectedKeys;
QString replacedCode = _code;
for (auto &key : _keys)
if ((key.startsWith("bar") == _isBars)
&& (replacedCode.contains(QString("$%1").arg(key)))) {
- qCInfo(LOG_AW) << "Found key" << key << "with bar enabled"
- << _isBars;
+ qCInfo(LOG_AW) << "Found key" << key << "with bar enabled" << _isBars;
selectedKeys.append(key);
replacedCode.replace(QString("$%1").arg(key), "");
}
@@ -289,8 +267,7 @@ QStringList AWPatternFunctions::findLambdas(const QString &_code)
QStringList selectedKeys;
// match the following construction ${{some code here}}
QRegularExpression lambdaRegexp("\\$\\{\\{(?.*?)\\}\\}");
- lambdaRegexp.setPatternOptions(
- QRegularExpression::DotMatchesEverythingOption);
+ lambdaRegexp.setPatternOptions(QRegularExpression::DotMatchesEverythingOption);
QRegularExpressionMatchIterator it = lambdaRegexp.globalMatch(_code);
while (it.hasNext()) {
diff --git a/sources/awesome-widget/plugin/awpatternfunctions.h b/sources/awesome-widget/plugin/awpatternfunctions.h
index 6c3f0ba..9ea3441 100644
--- a/sources/awesome-widget/plugin/awpatternfunctions.h
+++ b/sources/awesome-widget/plugin/awpatternfunctions.h
@@ -34,20 +34,17 @@ typedef struct {
} AWFunction;
// insert methods
-QString expandLambdas(QString _code, AWKeysAggregator *_aggregator,
- const QVariantHash &_metadata,
+QString expandLambdas(QString _code, AWKeysAggregator *_aggregator, const QVariantHash &_metadata,
const QStringList &_usedKeys);
QString expandTemplates(QString _code);
-QList findFunctionCalls(const QString &_function,
- const QString &_code);
+QList findFunctionCalls(const QString &_function, const QString &_code);
QString insertAllKeys(QString _code, const QStringList &_keys);
QString insertKeyCount(QString _code, const QStringList &_keys);
QString insertKeyNames(QString _code, const QStringList &_keys);
QString insertKeys(QString _code, const QStringList &_keys);
QString insertMacros(QString _code);
// find methods
-QStringList findKeys(const QString &_code, const QStringList &_keys,
- const bool _isBars);
+QStringList findKeys(const QString &_code, const QStringList &_keys, const bool _isBars);
QStringList findLambdas(const QString &_code);
};
diff --git a/sources/awesome-widget/plugin/awtelemetryhandler.cpp b/sources/awesome-widget/plugin/awtelemetryhandler.cpp
index 8eb0091..43efaee 100644
--- a/sources/awesome-widget/plugin/awtelemetryhandler.cpp
+++ b/sources/awesome-widget/plugin/awtelemetryhandler.cpp
@@ -27,15 +27,13 @@
#include "awdebug.h"
-AWTelemetryHandler::AWTelemetryHandler(QObject *_parent,
- const QString &_clientId)
+AWTelemetryHandler::AWTelemetryHandler(QObject *_parent, const QString &_clientId)
: QObject(_parent)
{
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
m_localFile = QString("%1/awesomewidgets/telemetry.ini")
- .arg(QStandardPaths::writableLocation(
- QStandardPaths::GenericDataLocation));
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
// override client id if any
if (!_clientId.isEmpty())
@@ -73,11 +71,10 @@ QString AWTelemetryHandler::getLast(const QString &_group) const
}
-void AWTelemetryHandler::init(const int _count, const bool _enableRemote,
- const QString &_clientId)
+void AWTelemetryHandler::init(const int _count, const bool _enableRemote, const QString &_clientId)
{
- qCDebug(LOG_AW) << "Init telemetry with count" << _count << "enable remote"
- << _enableRemote << "client ID" << _clientId;
+ qCDebug(LOG_AW) << "Init telemetry with count" << _count << "enable remote" << _enableRemote
+ << "client ID" << _clientId;
m_storeCount = _count;
m_uploadEnabled = _enableRemote;
@@ -87,8 +84,7 @@ void AWTelemetryHandler::init(const int _count, const bool _enableRemote,
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);
settings.beginGroup(_group);
@@ -99,8 +95,7 @@ bool AWTelemetryHandler::put(const QString &_group, const QString &_value) const
saved.append(settings.value(key).toString());
// check if this value is already saved
if (saved.contains(_value)) {
- qCInfo(LOG_AW) << "Configuration" << _value << "for group" << _group
- << "is already saved";
+ qCInfo(LOG_AW) << "Configuration" << _value << "for group" << _group << "is already saved";
return false;
}
saved.append(_value);
@@ -123,11 +118,9 @@ bool AWTelemetryHandler::put(const QString &_group, const QString &_value) const
}
-void AWTelemetryHandler::uploadTelemetry(const QString &_group,
- const QString &_value)
+void AWTelemetryHandler::uploadTelemetry(const QString &_group, const QString &_value)
{
- qCDebug(LOG_AW) << "Upload data with group" << _group << "and value"
- << _value;
+ qCDebug(LOG_AW) << "Upload data with group" << _group << "and value" << _value;
if (!m_uploadEnabled) {
qCInfo(LOG_AW) << "Upload disabled by configuration";
return;
@@ -148,10 +141,8 @@ void AWTelemetryHandler::uploadTelemetry(const QString &_group,
payload["metadata"] = _value;
payload["type"] = _group;
// convert to QByteArray to send request
- QByteArray data
- = QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact);
- qCInfo(LOG_AW) << "Send request with body" << data.data() << "and size"
- << data.size();
+ QByteArray data = QJsonDocument::fromVariant(payload).toJson(QJsonDocument::Compact);
+ qCInfo(LOG_AW) << "Send request with body" << data.data() << "and size" << data.size();
manager->post(request, data);
}
@@ -160,8 +151,8 @@ void AWTelemetryHandler::uploadTelemetry(const QString &_group,
void AWTelemetryHandler::telemetryReplyRecieved(QNetworkReply *_reply)
{
if (_reply->error() != QNetworkReply::NoError) {
- qCWarning(LOG_AW) << "An error occurs" << _reply->error()
- << "with message" << _reply->errorString();
+ qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
+ << _reply->errorString();
return;
}
diff --git a/sources/awesome-widget/plugin/awtelemetryhandler.h b/sources/awesome-widget/plugin/awtelemetryhandler.h
index 9586db0..fb2d336 100644
--- a/sources/awesome-widget/plugin/awtelemetryhandler.h
+++ b/sources/awesome-widget/plugin/awtelemetryhandler.h
@@ -31,16 +31,13 @@ class AWTelemetryHandler : public QObject
public:
const char *REMOTE_TELEMETRY_URL = "https://arcanis.me/telemetry";
- explicit AWTelemetryHandler(QObject *_parent = nullptr,
- const QString &_clientId = "");
+ explicit AWTelemetryHandler(QObject *_parent = nullptr, const QString &_clientId = "");
virtual ~AWTelemetryHandler();
Q_INVOKABLE QStringList get(const QString &_group) const;
Q_INVOKABLE QString getLast(const QString &_group) const;
- Q_INVOKABLE void init(const int _count, const bool _enableRemote,
- const QString &_clientId);
+ Q_INVOKABLE void init(const int _count, const bool _enableRemote, const QString &_clientId);
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:
void replyReceived(const QString &_message);
diff --git a/sources/awesome-widget/plugin/awupdatehelper.cpp b/sources/awesome-widget/plugin/awupdatehelper.cpp
index f4839e2..261f3ad 100644
--- a/sources/awesome-widget/plugin/awupdatehelper.cpp
+++ b/sources/awesome-widget/plugin/awupdatehelper.cpp
@@ -34,9 +34,9 @@ AWUpdateHelper::AWUpdateHelper(QObject *_parent)
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
m_foundVersion = QVersionNumber::fromString(VERSION);
- m_genericConfig = QString("%1/awesomewidgets/general.ini")
- .arg(QStandardPaths::writableLocation(
- QStandardPaths::GenericDataLocation));
+ m_genericConfig
+ = QString("%1/awesomewidgets/general.ini")
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
}
@@ -53,10 +53,9 @@ void AWUpdateHelper::checkUpdates(const bool _showAnyway)
// showAnyway options requires to show message if no updates found on direct
// request. In case of automatic check no message will be shown
QNetworkAccessManager *manager = new QNetworkAccessManager(nullptr);
- connect(manager, &QNetworkAccessManager::finished,
- [_showAnyway, this](QNetworkReply *reply) {
- return versionReplyRecieved(reply, _showAnyway);
- });
+ connect(manager, &QNetworkAccessManager::finished, [_showAnyway, this](QNetworkReply *reply) {
+ return versionReplyRecieved(reply, _showAnyway);
+ });
manager->get(QNetworkRequest(QUrl(VERSION_API)));
}
@@ -65,17 +64,16 @@ void AWUpdateHelper::checkUpdates(const bool _showAnyway)
bool AWUpdateHelper::checkVersion()
{
QSettings settings(m_genericConfig, QSettings::IniFormat);
- QVersionNumber version = QVersionNumber::fromString(
- settings.value("Version", QString(VERSION)).toString());
+ QVersionNumber version
+ = QVersionNumber::fromString(settings.value("Version", QString(VERSION)).toString());
// update version
settings.setValue("Version", QString(VERSION));
settings.sync();
- qCInfo(LOG_AW) << "Found version" << version << "actual one is"
- << m_foundVersion;
+ qCInfo(LOG_AW) << "Found version" << version << "actual one is" << m_foundVersion;
if ((version != m_foundVersion) && (!QString(CHANGELOG).isEmpty())) {
- genMessageBox(i18n("Changelog of %1", VERSION),
- QString(CHANGELOG).replace('@', '\n'), QMessageBox::Ok)
+ genMessageBox(i18n("Changelog of %1", VERSION), QString(CHANGELOG).replace('@', '\n'),
+ QMessageBox::Ok)
->open();
return true;
} else if (version != m_foundVersion) {
@@ -93,12 +91,10 @@ void AWUpdateHelper::showInfo(const QVersionNumber &_version)
{
qCDebug(LOG_AW) << "Version" << _version;
- QString text
- = i18n("You are using the actual version %1", _version.toString());
+ QString text = i18n("You are using the actual version %1", _version.toString());
if (!QString(COMMIT_SHA).isEmpty())
text += QString(" (%1)").arg(QString(COMMIT_SHA));
- return genMessageBox(i18n("No new version found"), text, QMessageBox::Ok)
- ->open();
+ return genMessageBox(i18n("No new version found"), text, QMessageBox::Ok)->open();
}
@@ -108,28 +104,23 @@ void AWUpdateHelper::showUpdates(const QVersionNumber &_version)
QString text;
text += i18n("Current version : %1", VERSION);
- text += QString(COMMIT_SHA).isEmpty()
- ? "\n"
- : QString(" (%1)\n").arg(QString(COMMIT_SHA));
+ text += QString(COMMIT_SHA).isEmpty() ? "\n" : QString(" (%1)\n").arg(QString(COMMIT_SHA));
text += i18n("New version : %1", _version.toString()) + "\n\n";
text += i18n("Click \"Ok\" to download");
- genMessageBox(i18n("There are updates"), text,
- QMessageBox::Ok | QMessageBox::Cancel)
+ genMessageBox(i18n("There are updates"), text, QMessageBox::Ok | QMessageBox::Cancel)
->open(this, SLOT(userReplyOnUpdates(QAbstractButton *)));
}
void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *_button)
{
- QMessageBox::ButtonRole ret
- = static_cast(sender())->buttonRole(_button);
+ QMessageBox::ButtonRole ret = static_cast(sender())->buttonRole(_button);
qCInfo(LOG_AW) << "User select" << ret;
switch (ret) {
case QMessageBox::AcceptRole:
- QDesktopServices::openUrl(QString(RELEASES)
- + m_foundVersion.toString());
+ QDesktopServices::openUrl(QString(RELEASES) + m_foundVersion.toString());
break;
case QMessageBox::RejectRole:
default:
@@ -138,13 +129,12 @@ void AWUpdateHelper::userReplyOnUpdates(QAbstractButton *_button)
}
-void AWUpdateHelper::versionReplyRecieved(QNetworkReply *_reply,
- const bool _showAnyway)
+void AWUpdateHelper::versionReplyRecieved(QNetworkReply *_reply, const bool _showAnyway)
{
qCDebug(LOG_AW) << "Show message anyway" << _showAnyway;
if (_reply->error() != QNetworkReply::NoError) {
- qCWarning(LOG_AW) << "An error occurs" << _reply->error()
- << "with message" << _reply->errorString();
+ qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
+ << _reply->errorString();
return;
}
@@ -172,12 +162,10 @@ void AWUpdateHelper::versionReplyRecieved(QNetworkReply *_reply,
// additional method which is used to show message box which does not block UI
-QMessageBox *
-AWUpdateHelper::genMessageBox(const QString &_title, const QString &_body,
- const QMessageBox::StandardButtons _buttons)
+QMessageBox *AWUpdateHelper::genMessageBox(const QString &_title, const QString &_body,
+ const QMessageBox::StandardButtons _buttons)
{
- qCDebug(LOG_AW) << "Construct message box with title" << _title
- << "and body" << _body;
+ qCDebug(LOG_AW) << "Construct message box with title" << _title << "and body" << _body;
QMessageBox *msgBox = new QMessageBox(nullptr);
msgBox->setAttribute(Qt::WA_DeleteOnClose);
diff --git a/sources/awesomewidgets/abstractextitem.cpp b/sources/awesomewidgets/abstractextitem.cpp
index 317578e..c41ef67 100644
--- a/sources/awesomewidgets/abstractextitem.cpp
+++ b/sources/awesomewidgets/abstractextitem.cpp
@@ -57,8 +57,7 @@ void AbstractExtItem::bumpApi(const int _newVer)
// update for current API
if ((apiVersion() > 0) && (apiVersion() < _newVer)) {
- qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to"
- << _newVer;
+ qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to" << _newVer;
setApiVersion(_newVer);
writeConfiguration();
}
@@ -104,8 +103,7 @@ QString AbstractExtItem::writtableConfig() const
QString dir = QFileInfo(path).fileName();
return QString("%1/awesomewidgets/%2/%3")
- .arg(QStandardPaths::writableLocation(
- QStandardPaths::GenericDataLocation))
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
.arg(dir)
.arg(name);
}
@@ -202,8 +200,7 @@ void AbstractExtItem::setCron(const QString &_cron)
qCDebug(LOG_LIB) << "Cron string" << _cron;
// deinit module first
if (m_scheduler) {
- disconnect(m_scheduler, SIGNAL(activated()), this,
- SIGNAL(requestDataUpdate()));
+ disconnect(m_scheduler, SIGNAL(activated()), this, SIGNAL(requestDataUpdate()));
delete m_scheduler;
}
@@ -214,8 +211,7 @@ void AbstractExtItem::setCron(const QString &_cron)
// init scheduler
m_scheduler = new QCronScheduler(this);
m_scheduler->parse(cron());
- connect(m_scheduler, SIGNAL(activated()), this,
- SIGNAL(requestDataUpdate()));
+ connect(m_scheduler, SIGNAL(activated()), this, SIGNAL(requestDataUpdate()));
}
@@ -276,8 +272,7 @@ void AbstractExtItem::deinitSocket()
m_socket->close();
m_socket->removeServer(socket());
delete m_socket;
- disconnect(m_socket, SIGNAL(newConnection()), this,
- SLOT(newConnectionReceived()));
+ disconnect(m_socket, SIGNAL(newConnection()), this, SLOT(newConnectionReceived()));
}
@@ -289,8 +284,7 @@ void AbstractExtItem::initSocket()
m_socket = new QLocalServer(this);
bool listening = m_socket->listen(socket());
qCInfo(LOG_LIB) << "Server listening on" << socket() << listening;
- connect(m_socket, SIGNAL(newConnection()), this,
- SLOT(newConnectionReceived()));
+ connect(m_socket, SIGNAL(newConnection()), this, SLOT(newConnectionReceived()));
}
diff --git a/sources/awesomewidgets/abstractextitem.h b/sources/awesomewidgets/abstractextitem.h
index 1408f0b..f325db5 100644
--- a/sources/awesomewidgets/abstractextitem.h
+++ b/sources/awesomewidgets/abstractextitem.h
@@ -40,12 +40,10 @@ class AbstractExtItem : public QDialog
Q_PROPERTY(QString uniq READ uniq)
public:
- explicit AbstractExtItem(QWidget *_parent = nullptr,
- const QString &_filePath = "");
+ explicit AbstractExtItem(QWidget *_parent = nullptr, const QString &_filePath = "");
virtual ~AbstractExtItem();
virtual void bumpApi(const int _newVer);
- virtual AbstractExtItem *copy(const QString &_fileName, const int _number)
- = 0;
+ virtual AbstractExtItem *copy(const QString &_fileName, const int _number) = 0;
virtual void copyDefaults(AbstractExtItem *_other) const;
virtual void startTimer();
QString writtableConfig() const;
diff --git a/sources/awesomewidgets/abstractextitemaggregator.cpp b/sources/awesomewidgets/abstractextitemaggregator.cpp
index a2d8663..1189795 100644
--- a/sources/awesomewidgets/abstractextitemaggregator.cpp
+++ b/sources/awesomewidgets/abstractextitemaggregator.cpp
@@ -25,8 +25,7 @@
#include
-AbstractExtItemAggregator::AbstractExtItemAggregator(QWidget *_parent,
- const QString &_type)
+AbstractExtItemAggregator::AbstractExtItemAggregator(QWidget *_parent, const QString &_type)
: QDialog(_parent)
, ui(new Ui::AbstractExtItemAggregator)
, m_type(_type)
@@ -34,21 +33,18 @@ AbstractExtItemAggregator::AbstractExtItemAggregator(QWidget *_parent,
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
// create directory at $HOME
- QString localDir = QString("%1/awesomewidgets/%2")
- .arg(QStandardPaths::writableLocation(
- QStandardPaths::GenericDataLocation))
- .arg(type());
+ QString localDir
+ = QString("%1/awesomewidgets/%2")
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
+ .arg(type());
QDir localDirectory;
if (localDirectory.mkpath(localDir))
qCInfo(LOG_LIB) << "Created directory" << localDir;
ui->setupUi(this);
- copyButton
- = ui->buttonBox->addButton(i18n("Copy"), QDialogButtonBox::ActionRole);
- createButton = ui->buttonBox->addButton(i18n("Create"),
- QDialogButtonBox::ActionRole);
- deleteButton = ui->buttonBox->addButton(i18n("Remove"),
- QDialogButtonBox::ActionRole);
+ copyButton = ui->buttonBox->addButton(i18n("Copy"), QDialogButtonBox::ActionRole);
+ createButton = ui->buttonBox->addButton(i18n("Create"), QDialogButtonBox::ActionRole);
+ deleteButton = ui->buttonBox->addButton(i18n("Remove"), QDialogButtonBox::ActionRole);
connect(ui->buttonBox, SIGNAL(clicked(QAbstractButton *)), this,
SLOT(editItemButtonPressed(QAbstractButton *)));
@@ -72,8 +68,7 @@ void AbstractExtItemAggregator::copyItem()
QString fileName = getName();
int number = uniqNumber();
QString dir = QString("%1/awesomewidgets/%2")
- .arg(QStandardPaths::writableLocation(
- QStandardPaths::GenericDataLocation))
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
.arg(m_type);
if ((!source) || (fileName.isEmpty())) {
qCWarning(LOG_LIB) << "Nothing to copy";
@@ -122,9 +117,8 @@ void AbstractExtItemAggregator::editItem()
QString AbstractExtItemAggregator::getName()
{
bool ok;
- QString name
- = QInputDialog::getText(this, i18n("Enter file name"),
- i18n("File name"), QLineEdit::Normal, "", &ok);
+ QString name = QInputDialog::getText(this, i18n("Enter file name"), i18n("File name"),
+ QLineEdit::Normal, "", &ok);
if ((!ok) || (name.isEmpty()))
return "";
if (!name.endsWith(".desktop"))
@@ -149,8 +143,7 @@ AbstractExtItem *AbstractExtItemAggregator::itemFromWidget()
break;
}
if (!found)
- qCWarning(LOG_LIB) << "Could not find item by name"
- << widgetItem->text();
+ qCWarning(LOG_LIB) << "Could not find item by name" << widgetItem->text();
return found;
}
@@ -193,10 +186,9 @@ QVariant AbstractExtItemAggregator::configArgs() const
QStringList AbstractExtItemAggregator::directories() const
{
- auto dirs
- = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
- QString("awesomewidgets/%1").arg(type()),
- QStandardPaths::LocateDirectory);
+ auto dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
+ QString("awesomewidgets/%1").arg(type()),
+ QStandardPaths::LocateDirectory);
return dirs;
}
diff --git a/sources/awesomewidgets/abstractextitemaggregator.h b/sources/awesomewidgets/abstractextitemaggregator.h
index 7ef4d49..fc23c7a 100644
--- a/sources/awesomewidgets/abstractextitemaggregator.h
+++ b/sources/awesomewidgets/abstractextitemaggregator.h
@@ -47,10 +47,10 @@ public:
{
QString fileName = getName();
int number = uniqNumber();
- QString dir = QString("%1/awesomewidgets/%2")
- .arg(QStandardPaths::writableLocation(
- QStandardPaths::GenericDataLocation))
- .arg(m_type);
+ QString dir
+ = QString("%1/awesomewidgets/%2")
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
+ .arg(m_type);
if (fileName.isEmpty()) {
qCWarning(LOG_LIB) << "Nothing to create";
return;
diff --git a/sources/awesomewidgets/abstractquotesprovider.h b/sources/awesomewidgets/abstractquotesprovider.h
new file mode 100644
index 0000000..1dee50a
--- /dev/null
+++ b/sources/awesomewidgets/abstractquotesprovider.h
@@ -0,0 +1,45 @@
+/***************************************************************************
+ * This file is part of awesome-widgets *
+ * *
+ * awesome-widgets is free software: you can redistribute it and/or *
+ * modify it under the terms of the GNU General Public License as *
+ * published by the Free Software Foundation, either version 3 of the *
+ * License, or (at your option) any later version. *
+ * *
+ * awesome-widgets is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
+ ***************************************************************************/
+
+#ifndef ABSTRACTQUOTESPROVIDER_H
+#define ABSTRACTQUOTESPROVIDER_H
+
+#include
+#include
+
+#include "abstractextitem.h"
+
+
+class AbstractQuotesProvider : public QObject
+{
+ Q_OBJECT
+
+public:
+ explicit AbstractQuotesProvider(QObject *_parent)
+ : QObject(_parent){};
+ virtual ~AbstractQuotesProvider(){};
+ virtual void initUrl(const QString &_asset) = 0;
+ virtual QVariantHash parse(const QByteArray &_source, const QVariantHash &_oldValues) const = 0;
+ QString tag(const QString &_type) const
+ {
+ return static_cast(parent())->tag(_type);
+ };
+ virtual QUrl url() const = 0;
+};
+
+
+#endif /* ABSTRACTQUOTESPROVIDER_H */
diff --git a/sources/awesomewidgets/abstractweatherprovider.h b/sources/awesomewidgets/abstractweatherprovider.h
index 32fbaed..2bf6034 100644
--- a/sources/awesomewidgets/abstractweatherprovider.h
+++ b/sources/awesomewidgets/abstractweatherprovider.h
@@ -21,26 +21,24 @@
#include
#include
+#include "abstractextitem.h"
+
class AbstractWeatherProvider : public QObject
{
Q_OBJECT
- Q_PROPERTY(int number READ number)
public:
- explicit AbstractWeatherProvider(QObject *_parent, const int _number)
- : QObject(_parent)
- , m_number(_number){};
+ explicit AbstractWeatherProvider(QObject *_parent)
+ : QObject(_parent){};
virtual ~AbstractWeatherProvider(){};
- virtual void initUrl(const QString &_city, const QString &_country,
- const int _ts)
- = 0;
+ virtual void initUrl(const QString &_city, const QString &_country, const int _ts) = 0;
virtual QVariantHash parse(const QVariantMap &_json) const = 0;
+ QString tag(const QString &_type) const
+ {
+ return static_cast(parent())->tag(_type);
+ };
virtual QUrl url() const = 0;
- int number() const { return m_number; };
-
-private:
- int m_number;
};
diff --git a/sources/awesomewidgets/awabstractformatter.cpp b/sources/awesomewidgets/awabstractformatter.cpp
index 0ecfde1..ad3a0bf 100644
--- a/sources/awesomewidgets/awabstractformatter.cpp
+++ b/sources/awesomewidgets/awabstractformatter.cpp
@@ -22,8 +22,7 @@
#include "awdebug.h"
-AWAbstractFormatter::AWAbstractFormatter(QWidget *_parent,
- const QString &_filePath)
+AWAbstractFormatter::AWAbstractFormatter(QWidget *_parent, const QString &_filePath)
: AbstractExtItem(_parent, _filePath)
{
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
@@ -108,8 +107,7 @@ void AWAbstractFormatter::setStrType(const QString &_type)
}
-void AWAbstractFormatter::setType(
- const AWAbstractFormatter::FormatterClass _type)
+void AWAbstractFormatter::setType(const AWAbstractFormatter::FormatterClass _type)
{
qCDebug(LOG_LIB) << "Type" << static_cast(_type);
diff --git a/sources/awesomewidgets/awabstractformatter.h b/sources/awesomewidgets/awabstractformatter.h
index f575494..2e9dea2 100644
--- a/sources/awesomewidgets/awabstractformatter.h
+++ b/sources/awesomewidgets/awabstractformatter.h
@@ -28,18 +28,9 @@ class AWAbstractFormatter : public AbstractExtItem
Q_PROPERTY(QString strType READ strType WRITE setStrType)
public:
- enum class FormatterClass {
- DateTime,
- Float,
- List,
- Script,
- String,
- NoFormat,
- Json
- };
+ enum class FormatterClass { DateTime, Float, List, Script, String, NoFormat, Json };
- explicit AWAbstractFormatter(QWidget *_parent = nullptr,
- const QString &_filePath = "");
+ explicit AWAbstractFormatter(QWidget *_parent = nullptr, const QString &_filePath = "");
virtual ~AWAbstractFormatter();
virtual QString convert(const QVariant &_value) const = 0;
void copyDefaults(AbstractExtItem *_other) const;
diff --git a/sources/awesomewidgets/awdatetimeformatter.cpp b/sources/awesomewidgets/awdatetimeformatter.cpp
index 44bdcca..db08a42 100644
--- a/sources/awesomewidgets/awdatetimeformatter.cpp
+++ b/sources/awesomewidgets/awdatetimeformatter.cpp
@@ -27,8 +27,7 @@
#include "awdebug.h"
-AWDateTimeFormatter::AWDateTimeFormatter(QWidget *_parent,
- const QString &_filePath)
+AWDateTimeFormatter::AWDateTimeFormatter(QWidget *_parent, const QString &_filePath)
: AWAbstractFormatter(_parent, _filePath)
, ui(new Ui::AWDateTimeFormatter)
{
@@ -57,8 +56,7 @@ QString AWDateTimeFormatter::convert(const QVariant &_value) const
}
-AWDateTimeFormatter *AWDateTimeFormatter::copy(const QString &_fileName,
- const int _number)
+AWDateTimeFormatter *AWDateTimeFormatter::copy(const QString &_fileName, const int _number)
{
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
@@ -110,8 +108,7 @@ void AWDateTimeFormatter::readConfiguration()
settings.beginGroup("Desktop Entry");
setFormat(settings.value("X-AW-Format", format()).toString());
- setTranslateString(
- settings.value("X-AW-Translate", translateString()).toBool());
+ setTranslateString(settings.value("X-AW-Translate", translateString()).toBool());
settings.endGroup();
bumpApi(AW_FORMATTER_API);
@@ -126,8 +123,7 @@ int AWDateTimeFormatter::showConfiguration(const QVariant &_args)
ui->lineEdit_comment->setText(comment());
ui->label_typeValue->setText("DateTime");
ui->lineEdit_format->setText(format());
- ui->checkBox_translate->setCheckState(translateString() ? Qt::Checked
- : Qt::Unchecked);
+ ui->checkBox_translate->setCheckState(translateString() ? Qt::Checked : Qt::Unchecked);
int ret = exec();
if (ret != 1)
diff --git a/sources/awesomewidgets/awdatetimeformatter.h b/sources/awesomewidgets/awdatetimeformatter.h
index c83bc6c..492663d 100644
--- a/sources/awesomewidgets/awdatetimeformatter.h
+++ b/sources/awesomewidgets/awdatetimeformatter.h
@@ -32,12 +32,10 @@ class AWDateTimeFormatter : public AWAbstractFormatter
{
Q_OBJECT
Q_PROPERTY(QString format READ format WRITE setFormat)
- Q_PROPERTY(
- bool translateString READ translateString WRITE setTranslateString)
+ Q_PROPERTY(bool translateString READ translateString WRITE setTranslateString)
public:
- explicit AWDateTimeFormatter(QWidget *_parent = nullptr,
- const QString &_filePath = "");
+ explicit AWDateTimeFormatter(QWidget *_parent = nullptr, const QString &_filePath = "");
virtual ~AWDateTimeFormatter();
QString convert(const QVariant &_value) const;
AWDateTimeFormatter *copy(const QString &_fileName, const int _number);
diff --git a/sources/awesomewidgets/awfloatformatter.cpp b/sources/awesomewidgets/awfloatformatter.cpp
index f587ae1..7e34335 100644
--- a/sources/awesomewidgets/awfloatformatter.cpp
+++ b/sources/awesomewidgets/awfloatformatter.cpp
@@ -51,9 +51,8 @@ QString AWFloatFormatter::convert(const QVariant &_value) const
{
qCDebug(LOG_LIB) << "Convert value" << _value;
- QString output
- = QString("%1").arg(_value.toDouble() * multiplier() + summand(),
- count(), format(), precision(), fillChar());
+ QString output = QString("%1").arg(_value.toDouble() * multiplier() + summand(), count(),
+ format(), precision(), fillChar());
if (forceWidth())
output = output.left(count());
@@ -61,13 +60,11 @@ QString AWFloatFormatter::convert(const QVariant &_value) const
}
-AWFloatFormatter *AWFloatFormatter::copy(const QString &_fileName,
- const int _number)
+AWFloatFormatter *AWFloatFormatter::copy(const QString &_fileName, const int _number)
{
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
- AWFloatFormatter *item
- = new AWFloatFormatter(static_cast(parent()), _fileName);
+ AWFloatFormatter *item = new AWFloatFormatter(static_cast(parent()), _fileName);
AWAbstractFormatter::copyDefaults(item);
item->setCount(count());
item->setFormat(format());
@@ -152,8 +149,8 @@ void AWFloatFormatter::setFormat(char _format)
{
qCDebug(LOG_LIB) << "Set format" << _format;
// http://doc.qt.io/qt-5/qstring.html#argument-formats
- if ((_format != 'e') && (_format != 'E') && (_format != 'f')
- && (_format != 'g') && (_format != 'G')) {
+ if ((_format != 'e') && (_format != 'E') && (_format != 'f') && (_format != 'g')
+ && (_format != 'G')) {
qCWarning(LOG_LIB) << "Invalid format" << _format;
_format = 'f';
}
@@ -196,10 +193,7 @@ void AWFloatFormatter::readConfiguration()
setCount(settings.value("X-AW-Width", count()).toInt());
setFillChar(settings.value("X-AW-FillChar", fillChar()).toString().at(0));
setForceWidth(settings.value("X-AW-ForceWidth", forceWidth()).toBool());
- setFormat(settings.value("X-AW-Format", QString(format()))
- .toString()
- .at(0)
- .toLatin1());
+ setFormat(settings.value("X-AW-Format", QString(format())).toString().at(0).toLatin1());
setMultiplier(settings.value("X-AW-Multiplier", multiplier()).toDouble());
setPrecision(settings.value("X-AW-Precision", precision()).toInt());
setSummand(settings.value("X-AW-Summand", summand()).toDouble());
@@ -216,13 +210,11 @@ int AWFloatFormatter::showConfiguration(const QVariant &_args)
ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment());
ui->label_typeValue->setText("Float");
- ui->comboBox_format->setCurrentIndex(
- ui->comboBox_format->findText(QString(format())));
+ ui->comboBox_format->setCurrentIndex(ui->comboBox_format->findText(QString(format())));
ui->spinBox_precision->setValue(precision());
ui->spinBox_width->setValue(count());
ui->lineEdit_fill->setText(QString(fillChar()));
- ui->checkBox_forceWidth->setCheckState(forceWidth() ? Qt::Checked
- : Qt::Unchecked);
+ ui->checkBox_forceWidth->setCheckState(forceWidth() ? Qt::Checked : Qt::Unchecked);
ui->doubleSpinBox_multiplier->setValue(multiplier());
ui->doubleSpinBox_summand->setValue(summand());
diff --git a/sources/awesomewidgets/awfloatformatter.h b/sources/awesomewidgets/awfloatformatter.h
index d58fec1..f9bf166 100644
--- a/sources/awesomewidgets/awfloatformatter.h
+++ b/sources/awesomewidgets/awfloatformatter.h
@@ -38,8 +38,7 @@ class AWFloatFormatter : public AWAbstractFormatter
Q_PROPERTY(double summand READ summand WRITE setSummand)
public:
- explicit AWFloatFormatter(QWidget *_parent = nullptr,
- const QString &_filePath = "");
+ explicit AWFloatFormatter(QWidget *_parent = nullptr, const QString &_filePath = "");
virtual ~AWFloatFormatter();
QString convert(const QVariant &_value) const;
AWFloatFormatter *copy(const QString &_fileName, const int _number);
diff --git a/sources/awesomewidgets/awjsonformatter.cpp b/sources/awesomewidgets/awjsonformatter.cpp
index c9d9e67..0a27619 100644
--- a/sources/awesomewidgets/awjsonformatter.cpp
+++ b/sources/awesomewidgets/awjsonformatter.cpp
@@ -53,10 +53,9 @@ QString AWJsonFormatter::convert(const QVariant &_value) const
qCDebug(LOG_LIB) << "Convert value" << _value;
// check if _value is string and parse first if required
- QJsonDocument json
- = _value.type() == QVariant::String
- ? QJsonDocument::fromJson(_value.toString().toUtf8())
- : QJsonDocument::fromVariant(_value);
+ QJsonDocument json = _value.type() == QVariant::String
+ ? QJsonDocument::fromJson(_value.toString().toUtf8())
+ : QJsonDocument::fromVariant(_value);
QVariant converted = json.toVariant();
for (auto &element : m_splittedPath)
converted = getFromJson(converted, element);
@@ -65,13 +64,11 @@ QString AWJsonFormatter::convert(const QVariant &_value) const
}
-AWJsonFormatter *AWJsonFormatter::copy(const QString &_fileName,
- const int _number)
+AWJsonFormatter *AWJsonFormatter::copy(const QString &_fileName, const int _number)
{
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
- AWJsonFormatter *item
- = new AWJsonFormatter(static_cast(parent()), _fileName);
+ AWJsonFormatter *item = new AWJsonFormatter(static_cast(parent()), _fileName);
AWAbstractFormatter::copyDefaults(item);
item->setNumber(_number);
item->setPath(path());
@@ -147,8 +144,7 @@ void AWJsonFormatter::writeConfiguration() const
}
-QVariant AWJsonFormatter::getFromJson(const QVariant &_value,
- const QVariant &_element) const
+QVariant AWJsonFormatter::getFromJson(const QVariant &_value, const QVariant &_element) const
{
qCDebug(LOG_LIB) << "Looking for element" << _element << "in" << _value;
@@ -163,8 +159,7 @@ QVariant AWJsonFormatter::getFromJson(const QVariant &_value,
}
-QVariant AWJsonFormatter::getFromList(const QVariant &_value,
- const int _index) const
+QVariant AWJsonFormatter::getFromList(const QVariant &_value, const int _index) const
{
qCDebug(LOG_LIB) << "Looking for index" << _index << "in" << _value;
@@ -172,8 +167,7 @@ QVariant AWJsonFormatter::getFromList(const QVariant &_value,
}
-QVariant AWJsonFormatter::getFromMap(const QVariant &_value,
- const QString &_key) const
+QVariant AWJsonFormatter::getFromMap(const QVariant &_value, const QString &_key) const
{
qCDebug(LOG_LIB) << "Looking for key" << _key << "in" << _value;
diff --git a/sources/awesomewidgets/awjsonformatter.h b/sources/awesomewidgets/awjsonformatter.h
index 56a673a..112452d 100644
--- a/sources/awesomewidgets/awjsonformatter.h
+++ b/sources/awesomewidgets/awjsonformatter.h
@@ -32,8 +32,7 @@ class AWJsonFormatter : public AWAbstractFormatter
Q_PROPERTY(QString path READ path WRITE setPath)
public:
- explicit AWJsonFormatter(QWidget *_parent = nullptr,
- const QString &_filePath = "");
+ explicit AWJsonFormatter(QWidget *_parent = nullptr, const QString &_filePath = "");
virtual ~AWJsonFormatter();
QString convert(const QVariant &_value) const;
AWJsonFormatter *copy(const QString &_fileName, const int _number);
@@ -48,8 +47,7 @@ public slots:
private:
Ui::AWJsonFormatter *ui = nullptr;
- QVariant getFromJson(const QVariant &_value,
- const QVariant &_element) const;
+ QVariant getFromJson(const QVariant &_value, const QVariant &_element) const;
QVariant getFromList(const QVariant &_value, const int _index) const;
QVariant getFromMap(const QVariant &_value, const QString &_key) const;
void initPath();
diff --git a/sources/awesomewidgets/awlistformatter.cpp b/sources/awesomewidgets/awlistformatter.cpp
index c646d6c..f5207db 100644
--- a/sources/awesomewidgets/awlistformatter.cpp
+++ b/sources/awesomewidgets/awlistformatter.cpp
@@ -59,13 +59,11 @@ QString AWListFormatter::convert(const QVariant &_value) const
}
-AWListFormatter *AWListFormatter::copy(const QString &_fileName,
- const int _number)
+AWListFormatter *AWListFormatter::copy(const QString &_fileName, const int _number)
{
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
- AWListFormatter *item
- = new AWListFormatter(static_cast(parent()), _fileName);
+ AWListFormatter *item = new AWListFormatter(static_cast(parent()), _fileName);
AWAbstractFormatter::copyDefaults(item);
item->setFilter(filter());
item->setSeparator(separator());
@@ -144,8 +142,7 @@ int AWListFormatter::showConfiguration(const QVariant &_args)
ui->label_typeValue->setText("List");
ui->lineEdit_filter->setText(filter());
ui->lineEdit_separator->setText(separator());
- ui->checkBox_sorted->setCheckState(isSorted() ? Qt::Checked
- : Qt::Unchecked);
+ ui->checkBox_sorted->setCheckState(isSorted() ? Qt::Checked : Qt::Unchecked);
int ret = exec();
if (ret != 1)
diff --git a/sources/awesomewidgets/awlistformatter.h b/sources/awesomewidgets/awlistformatter.h
index e785b81..56f318a 100644
--- a/sources/awesomewidgets/awlistformatter.h
+++ b/sources/awesomewidgets/awlistformatter.h
@@ -34,8 +34,7 @@ class AWListFormatter : public AWAbstractFormatter
Q_PROPERTY(bool sorted READ isSorted WRITE setSorted)
public:
- explicit AWListFormatter(QWidget *_parent = nullptr,
- const QString &_filePath = "");
+ explicit AWListFormatter(QWidget *_parent = nullptr, const QString &_filePath = "");
virtual ~AWListFormatter();
QString convert(const QVariant &_value) const;
AWListFormatter *copy(const QString &_fileName, const int _number);
diff --git a/sources/awesomewidgets/awnoformatter.cpp b/sources/awesomewidgets/awnoformatter.cpp
index 42ecfeb..6409675 100644
--- a/sources/awesomewidgets/awnoformatter.cpp
+++ b/sources/awesomewidgets/awnoformatter.cpp
@@ -57,8 +57,7 @@ AWNoFormatter *AWNoFormatter::copy(const QString &_fileName, const int _number)
{
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
- AWNoFormatter *item
- = new AWNoFormatter(static_cast(parent()), _fileName);
+ AWNoFormatter *item = new AWNoFormatter(static_cast(parent()), _fileName);
AWAbstractFormatter::copyDefaults(item);
item->setNumber(_number);
diff --git a/sources/awesomewidgets/awnoformatter.h b/sources/awesomewidgets/awnoformatter.h
index 4768e9e..2f617d5 100644
--- a/sources/awesomewidgets/awnoformatter.h
+++ b/sources/awesomewidgets/awnoformatter.h
@@ -31,8 +31,7 @@ class AWNoFormatter : public AWAbstractFormatter
Q_OBJECT
public:
- explicit AWNoFormatter(QWidget *_parent = nullptr,
- const QString &_filePath = "");
+ explicit AWNoFormatter(QWidget *_parent = nullptr, const QString &_filePath = "");
virtual ~AWNoFormatter();
QString convert(const QVariant &_value) const;
AWNoFormatter *copy(const QString &_fileName, const int _number);
diff --git a/sources/awesomewidgets/awscriptformatter.cpp b/sources/awesomewidgets/awscriptformatter.cpp
index f6943a4..455e932 100644
--- a/sources/awesomewidgets/awscriptformatter.cpp
+++ b/sources/awesomewidgets/awscriptformatter.cpp
@@ -59,9 +59,8 @@ QString AWScriptFormatter::convert(const QVariant &_value) const
QJSValue result = fn.call(args);
if (result.isError()) {
- qCWarning(LOG_LIB) << "Uncaught exception at line"
- << result.property("lineNumber").toInt() << ":"
- << result.toString();
+ qCWarning(LOG_LIB) << "Uncaught exception at line" << result.property("lineNumber").toInt()
+ << ":" << result.toString();
return "";
} else {
return result.toString();
@@ -69,13 +68,11 @@ QString AWScriptFormatter::convert(const QVariant &_value) const
}
-AWScriptFormatter *AWScriptFormatter::copy(const QString &_fileName,
- const int _number)
+AWScriptFormatter *AWScriptFormatter::copy(const QString &_fileName, const int _number)
{
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
- AWScriptFormatter *item
- = new AWScriptFormatter(static_cast(parent()), _fileName);
+ AWScriptFormatter *item = new AWScriptFormatter(static_cast(parent()), _fileName);
AWAbstractFormatter::copyDefaults(item);
item->setAppendCode(appendCode());
item->setCode(code());
@@ -160,10 +157,8 @@ int AWScriptFormatter::showConfiguration(const QVariant &_args)
ui->lineEdit_name->setText(name());
ui->lineEdit_comment->setText(comment());
ui->label_typeValue->setText("Script");
- ui->checkBox_appendCode->setCheckState(appendCode() ? Qt::Checked
- : Qt::Unchecked);
- ui->checkBox_hasReturn->setCheckState(hasReturn() ? Qt::Checked
- : Qt::Unchecked);
+ ui->checkBox_appendCode->setCheckState(appendCode() ? Qt::Checked : Qt::Unchecked);
+ ui->checkBox_hasReturn->setCheckState(hasReturn() ? Qt::Checked : Qt::Unchecked);
ui->textEdit_code->setPlainText(code());
int ret = exec();
diff --git a/sources/awesomewidgets/awscriptformatter.h b/sources/awesomewidgets/awscriptformatter.h
index 45ef6b4..06cf4ac 100644
--- a/sources/awesomewidgets/awscriptformatter.h
+++ b/sources/awesomewidgets/awscriptformatter.h
@@ -35,8 +35,7 @@ class AWScriptFormatter : public AWAbstractFormatter
Q_PROPERTY(QString program READ program)
public:
- explicit AWScriptFormatter(QWidget *_parent = nullptr,
- const QString &_filePath = "");
+ explicit AWScriptFormatter(QWidget *_parent = nullptr, const QString &_filePath = "");
virtual ~AWScriptFormatter();
QString convert(const QVariant &_value) const;
AWScriptFormatter *copy(const QString &_fileName, const int _number);
diff --git a/sources/awesomewidgets/awstringformatter.cpp b/sources/awesomewidgets/awstringformatter.cpp
index 56c4e7f..87a19d6 100644
--- a/sources/awesomewidgets/awstringformatter.cpp
+++ b/sources/awesomewidgets/awstringformatter.cpp
@@ -59,13 +59,11 @@ QString AWStringFormatter::convert(const QVariant &_value) const
}
-AWStringFormatter *AWStringFormatter::copy(const QString &_fileName,
- const int _number)
+AWStringFormatter *AWStringFormatter::copy(const QString &_fileName, const int _number)
{
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
- AWStringFormatter *item
- = new AWStringFormatter(static_cast(parent()), _fileName);
+ AWStringFormatter *item = new AWStringFormatter(static_cast(parent()), _fileName);
AWAbstractFormatter::copyDefaults(item);
item->setCount(count());
item->setFillChar(fillChar());
@@ -143,8 +141,7 @@ int AWStringFormatter::showConfiguration(const QVariant &_args)
ui->label_typeValue->setText("String");
ui->spinBox_width->setValue(count());
ui->lineEdit_fill->setText(QString(fillChar()));
- ui->checkBox_forceWidth->setCheckState(forceWidth() ? Qt::Checked
- : Qt::Unchecked);
+ ui->checkBox_forceWidth->setCheckState(forceWidth() ? Qt::Checked : Qt::Unchecked);
int ret = exec();
if (ret != 1)
diff --git a/sources/awesomewidgets/awstringformatter.h b/sources/awesomewidgets/awstringformatter.h
index b08583e..2070bee 100644
--- a/sources/awesomewidgets/awstringformatter.h
+++ b/sources/awesomewidgets/awstringformatter.h
@@ -34,8 +34,7 @@ class AWStringFormatter : public AWAbstractFormatter
Q_PROPERTY(bool forceWidth READ forceWidth WRITE setForceWidth)
public:
- explicit AWStringFormatter(QWidget *_parent = nullptr,
- const QString &_filePath = "");
+ explicit AWStringFormatter(QWidget *_parent = nullptr, const QString &_filePath = "");
virtual ~AWStringFormatter();
QString convert(const QVariant &_value) const;
AWStringFormatter *copy(const QString &_fileName, const int _number);
diff --git a/sources/awesomewidgets/extitemaggregator.h b/sources/awesomewidgets/extitemaggregator.h
index 2a775ee..d0b4c9b 100644
--- a/sources/awesomewidgets/extitemaggregator.h
+++ b/sources/awesomewidgets/extitemaggregator.h
@@ -139,10 +139,9 @@ private:
qCInfo(LOG_LIB) << "Found file" << file << "in" << dir;
QString filePath = QString("%1/%2").arg(dir).arg(file);
// check if already exists
- if (std::any_of(items.cbegin(), items.cend(),
- [&filePath](AbstractExtItem *item) {
- return (item->fileName() == filePath);
- }))
+ if (std::any_of(items.cbegin(), items.cend(), [&filePath](AbstractExtItem *item) {
+ return (item->fileName() == filePath);
+ }))
continue;
items.append(new T(this, filePath));
}
diff --git a/sources/awesomewidgets/extnetworkrequest.cpp b/sources/awesomewidgets/extnetworkrequest.cpp
index b8a85b9..73f9e92 100644
--- a/sources/awesomewidgets/extnetworkrequest.cpp
+++ b/sources/awesomewidgets/extnetworkrequest.cpp
@@ -65,13 +65,11 @@ ExtNetworkRequest::~ExtNetworkRequest()
}
-ExtNetworkRequest *ExtNetworkRequest::copy(const QString &_fileName,
- const int _number)
+ExtNetworkRequest *ExtNetworkRequest::copy(const QString &_fileName, const int _number)
{
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
- ExtNetworkRequest *item
- = new ExtNetworkRequest(static_cast(parent()), _fileName);
+ ExtNetworkRequest *item = new ExtNetworkRequest(static_cast(parent()), _fileName);
copyDefaults(item);
item->setNumber(_number);
item->setStringUrl(stringUrl());
@@ -133,8 +131,7 @@ int ExtNetworkRequest::showConfiguration(const QVariant &_args)
ui->lineEdit_comment->setText(comment());
ui->label_numberValue->setText(QString("%1").arg(number()));
ui->lineEdit_url->setText(stringUrl());
- ui->checkBox_active->setCheckState(isActive() ? Qt::Checked
- : Qt::Unchecked);
+ ui->checkBox_active->setCheckState(isActive() ? Qt::Checked : Qt::Unchecked);
ui->lineEdit_schedule->setText(cron());
ui->lineEdit_socket->setText(socket());
ui->spinBox_interval->setValue(interval());
@@ -174,8 +171,8 @@ void ExtNetworkRequest::writeConfiguration() const
void ExtNetworkRequest::networkReplyReceived(QNetworkReply *_reply)
{
if (_reply->error() != QNetworkReply::NoError) {
- qCWarning(LOG_AW) << "An error occurs" << _reply->error()
- << "with message" << _reply->errorString();
+ qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
+ << _reply->errorString();
return;
}
diff --git a/sources/awesomewidgets/extnetworkrequest.h b/sources/awesomewidgets/extnetworkrequest.h
index 7a35331..80fc3c3 100644
--- a/sources/awesomewidgets/extnetworkrequest.h
+++ b/sources/awesomewidgets/extnetworkrequest.h
@@ -34,8 +34,7 @@ class ExtNetworkRequest : public AbstractExtItem
Q_PROPERTY(QString stringUrl READ stringUrl WRITE setStringUrl)
public:
- explicit ExtNetworkRequest(QWidget *_parent = nullptr,
- const QString &_filePath = "");
+ explicit ExtNetworkRequest(QWidget *_parent = nullptr, const QString &_filePath = "");
virtual ~ExtNetworkRequest();
ExtNetworkRequest *copy(const QString &_fileName, const int _number);
// get methods
diff --git a/sources/awesomewidgets/extquotes.cpp b/sources/awesomewidgets/extquotes.cpp
index 2a265d8..1eb2ca4 100644
--- a/sources/awesomewidgets/extquotes.cpp
+++ b/sources/awesomewidgets/extquotes.cpp
@@ -21,13 +21,13 @@
#include
#include
-#include
#include
-#include
#include
#include "awdebug.h"
+#include "stooqquotesprovider.h"
+#include "yahooquotesprovider.h"
ExtQuotes::ExtQuotes(QWidget *_parent, const QString &_filePath)
@@ -41,15 +41,12 @@ ExtQuotes::ExtQuotes(QWidget *_parent, const QString &_filePath)
ui->setupUi(this);
translate();
- m_values[tag("ask")] = 0.0;
- m_values[tag("askchg")] = 0.0;
- m_values[tag("percaskchg")] = 0.0;
- m_values[tag("bid")] = 0.0;
- m_values[tag("bidchg")] = 0.0;
- m_values[tag("percbidchg")] = 0.0;
m_values[tag("price")] = 0.0;
m_values[tag("pricechg")] = 0.0;
m_values[tag("percpricechg")] = 0.0;
+ m_values[tag("volume")] = 0;
+ m_values[tag("volumechg")] = 0;
+ m_values[tag("percvolumechg")] = 0.0;
// HACK declare as child of nullptr to avoid crash with plasmawindowed
// in the destructor
@@ -78,8 +75,7 @@ ExtQuotes *ExtQuotes::copy(const QString &_fileName, const int _number)
{
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
- ExtQuotes *item
- = new ExtQuotes(static_cast(parent()), _fileName);
+ ExtQuotes *item = new ExtQuotes(static_cast(parent()), _fileName);
copyDefaults(item);
item->setNumber(_number);
item->setTicker(ticker());
@@ -105,7 +101,7 @@ void ExtQuotes::setTicker(const QString &_ticker)
qCDebug(LOG_LIB) << "Ticker" << _ticker;
m_ticker = _ticker;
- initUrl();
+ initProvider();
}
@@ -141,8 +137,7 @@ int ExtQuotes::showConfiguration(const QVariant &_args)
ui->lineEdit_comment->setText(comment());
ui->label_numberValue->setText(QString("%1").arg(number()));
ui->lineEdit_ticker->setText(ticker());
- ui->checkBox_active->setCheckState(isActive() ? Qt::Checked
- : Qt::Unchecked);
+ ui->checkBox_active->setCheckState(isActive() ? Qt::Checked : Qt::Unchecked);
ui->lineEdit_schedule->setText(cron());
ui->lineEdit_socket->setText(socket());
ui->spinBox_interval->setValue(interval());
@@ -182,49 +177,19 @@ void ExtQuotes::writeConfiguration() const
void ExtQuotes::quotesReplyReceived(QNetworkReply *_reply)
{
if (_reply->error() != QNetworkReply::NoError) {
- qCWarning(LOG_AW) << "An error occurs" << _reply->error()
- << "with message" << _reply->errorString();
+ qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
+ << _reply->errorString();
return;
}
m_isRunning = false;
- QJsonParseError error;
- QJsonDocument jsonDoc = QJsonDocument::fromJson(_reply->readAll(), &error);
+ auto text = _reply->readAll();
_reply->deleteLater();
- if (error.error != QJsonParseError::NoError) {
- qCWarning(LOG_LIB) << "Parse error" << error.errorString();
+
+ QVariantHash data = m_providerObject->parse(text, m_values);
+ if (data.isEmpty())
return;
- }
- QVariantMap jsonQuotes = jsonDoc.toVariant().toMap()["query"].toMap();
- jsonQuotes = jsonQuotes["results"].toMap()["quote"].toMap();
- double value;
-
- // ask
- value = jsonQuotes["Ask"].toString().toDouble();
- m_values[tag("askchg")] = m_values[tag("ask")].toDouble() == 0.0
- ? 0.0
- : value - m_values[tag("ask")].toDouble();
- m_values[tag("percaskchg")] = 100.0 * m_values[tag("askchg")].toDouble()
- / m_values[tag("ask")].toDouble();
- m_values[tag("ask")] = value;
-
- // bid
- value = jsonQuotes["Bid"].toString().toDouble();
- m_values[tag("bidchg")] = m_values[tag("bid")].toDouble() == 0.0
- ? 0.0
- : value - m_values[tag("bid")].toDouble();
- m_values[tag("percbidchg")] = 100.0 * m_values[tag("bidchg")].toDouble()
- / m_values[tag("bid")].toDouble();
- m_values[tag("bid")] = value;
-
- // last trade
- value = jsonQuotes["LastTradePriceOnly"].toString().toDouble();
- m_values[tag("pricechg")] = m_values[tag("price")].toDouble() == 0.0
- ? 0.0
- : value - m_values[tag("price")].toDouble();
- m_values[tag("percpricechg")] = 100.0 * m_values[tag("pricechg")].toDouble()
- / m_values[tag("price")].toDouble();
- m_values[tag("price")] = value;
+ m_values = data;
emit(dataReceived(m_values));
}
@@ -233,20 +198,19 @@ void ExtQuotes::quotesReplyReceived(QNetworkReply *_reply)
void ExtQuotes::sendRequest()
{
m_isRunning = true;
- QNetworkReply *reply = m_manager->get(QNetworkRequest(m_url));
+ QNetworkReply *reply = m_manager->get(QNetworkRequest(m_providerObject->url()));
new QReplyTimeout(reply, REQUEST_TIMEOUT);
}
-void ExtQuotes::initUrl()
+void ExtQuotes::initProvider()
{
- // init query
- m_url = QUrl(YAHOO_QUOTES_URL);
- QUrlQuery params;
- params.addQueryItem("format", "json");
- params.addQueryItem("env", "store://datatables.org/alltableswithkeys");
- params.addQueryItem("q", QString(YAHOO_QUOTES_QUERY).arg(ticker()));
- m_url.setQuery(params);
+ delete m_providerObject;
+
+ // in the future release it is possible to change provider here
+ m_providerObject = new StooqQuotesProvider(this);
+
+ return m_providerObject->initUrl(ticker());
}
@@ -256,10 +220,9 @@ void ExtQuotes::translate()
ui->label_comment->setText(i18n("Comment"));
ui->label_number->setText(i18n("Tag"));
ui->label->setText(
- i18n("Use YAHOO! finance ticker to \
-get quotes for the instrument. Refer to \
-http://finance.yahoo.com/\
-
"));
+ i18n("Use Stooq ticker to get quotes for the instrument. Refer to https://stooq.com/
"));
ui->label_ticker->setText(i18n("Ticker"));
ui->checkBox_active->setText(i18n("Active"));
ui->label_schedule->setText(i18n("Schedule"));
diff --git a/sources/awesomewidgets/extquotes.h b/sources/awesomewidgets/extquotes.h
index ed7b31a..9237b31 100644
--- a/sources/awesomewidgets/extquotes.h
+++ b/sources/awesomewidgets/extquotes.h
@@ -23,6 +23,7 @@
#include "abstractextitem.h"
+class AbstractQuotesProvider;
namespace Ui
{
class ExtQuotes;
@@ -34,12 +35,7 @@ class ExtQuotes : public AbstractExtItem
Q_PROPERTY(QString ticker READ ticker WRITE setTicker)
public:
- const char *YAHOO_QUOTES_URL = "https://query.yahooapis.com/v1/public/yql";
- const char *YAHOO_QUOTES_QUERY
- = "select * from yahoo.finance.quotes where symbol='%1'";
-
- explicit ExtQuotes(QWidget *_parent = nullptr,
- const QString &_filePath = "");
+ explicit ExtQuotes(QWidget *_parent = nullptr, const QString &_filePath = "");
virtual ~ExtQuotes();
ExtQuotes *copy(const QString &_fileName, const int _number);
// get methods
@@ -59,11 +55,11 @@ private slots:
void sendRequest();
private:
+ AbstractQuotesProvider *m_providerObject = nullptr;
QNetworkAccessManager *m_manager = nullptr;
- QUrl m_url;
bool m_isRunning = false;
Ui::ExtQuotes *ui = nullptr;
- void initUrl();
+ void initProvider();
void translate();
// properties
QString m_ticker = "EURUSD=X";
diff --git a/sources/awesomewidgets/extquotes.ui b/sources/awesomewidgets/extquotes.ui
index ccdecae..c8c7f44 100644
--- a/sources/awesomewidgets/extquotes.ui
+++ b/sources/awesomewidgets/extquotes.ui
@@ -84,7 +84,7 @@
-
- <html><head/><body><p>Use YAHOO! finance ticker to get quotes for the instrument. Refer to <a href="http://finance.yahoo.com/"><span style=" text-decoration: underline; color:#0057ae;">http://finance.yahoo.com/</span></a></p></body></html>
+ <html><head/><body><p>Use Stooq ticker to get quotes for the instrument. Refer to <a href="https://stooq.com/"><span style=" text-decoration: underline; color:#0057ae;">https://stooq.com/</span></a></p></body></html>
Qt::AlignCenter
diff --git a/sources/awesomewidgets/extscript.cpp b/sources/awesomewidgets/extscript.cpp
index ef9c35d..8f0118d 100644
--- a/sources/awesomewidgets/extscript.cpp
+++ b/sources/awesomewidgets/extscript.cpp
@@ -44,8 +44,7 @@ ExtScript::ExtScript(QWidget *_parent, const QString &_filePath)
m_values[tag("custom")] = "";
m_process = new QProcess(nullptr);
- connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), this,
- SLOT(updateValue()));
+ connect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(updateValue()));
m_process->waitForFinished(0);
connect(this, SIGNAL(requestDataUpdate()), this, SLOT(startProcess()));
@@ -56,8 +55,7 @@ ExtScript::~ExtScript()
{
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
- disconnect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), this,
- SLOT(updateValue()));
+ disconnect(m_process, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(updateValue()));
m_process->kill();
m_process->deleteLater();
disconnect(this, SIGNAL(requestDataUpdate()), this, SLOT(startProcess()));
@@ -69,8 +67,7 @@ ExtScript *ExtScript::copy(const QString &_fileName, const int _number)
{
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
- ExtScript *item
- = new ExtScript(static_cast(parent()), _fileName);
+ ExtScript *item = new ExtScript(static_cast(parent()), _fileName);
copyDefaults(item);
item->setExecutable(executable());
item->setNumber(_number);
@@ -84,9 +81,9 @@ ExtScript *ExtScript::copy(const QString &_fileName, const int _number)
QString ExtScript::jsonFiltersFile() const
{
- QString fileName = QStandardPaths::locate(
- QStandardPaths::GenericDataLocation,
- "awesomewidgets/scripts/awesomewidgets-extscripts-filters.json");
+ QString fileName
+ = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
+ "awesomewidgets/scripts/awesomewidgets-extscripts-filters.json");
qCInfo(LOG_LIB) << "Filters file" << fileName;
return fileName;
@@ -157,9 +154,8 @@ void ExtScript::setFilters(const QStringList &_filters)
{
qCDebug(LOG_LIB) << "Filters" << _filters;
- std::for_each(
- _filters.cbegin(), _filters.cend(),
- [this](const QString &filter) { return updateFilter(filter, true); });
+ std::for_each(_filters.cbegin(), _filters.cend(),
+ [this](const QString &filter) { return updateFilter(filter, true); });
}
@@ -202,8 +198,7 @@ QString ExtScript::applyFilters(QString _value) const
qCInfo(LOG_LIB) << "Found filter" << filt;
QVariantMap filter = m_jsonFilters[filt].toMap();
if (filter.isEmpty()) {
- qCWarning(LOG_LIB)
- << "Could not find filter" << _value << "in the json";
+ qCWarning(LOG_LIB) << "Could not find filter" << _value << "in the json";
continue;
}
for (auto &f : filter.keys())
@@ -239,9 +234,8 @@ void ExtScript::readConfiguration()
setPrefix(settings.value("X-AW-Prefix", prefix()).toString());
setStrRedirect(settings.value("X-AW-Redirect", strRedirect()).toString());
// api == 3
- setFilters(settings.value("X-AW-Filters", filters())
- .toString()
- .split(',', QString::SkipEmptyParts));
+ setFilters(
+ settings.value("X-AW-Filters", filters()).toString().split(',', QString::SkipEmptyParts));
settings.endGroup();
bumpApi(AW_EXTSCRIPT_API);
@@ -290,19 +284,18 @@ int ExtScript::showConfiguration(const QVariant &_args)
ui->label_numberValue->setText(QString("%1").arg(number()));
ui->lineEdit_command->setText(executable());
ui->lineEdit_prefix->setText(prefix());
- ui->checkBox_active->setCheckState(isActive() ? Qt::Checked
- : Qt::Unchecked);
+ ui->checkBox_active->setCheckState(isActive() ? Qt::Checked : Qt::Unchecked);
ui->comboBox_redirect->setCurrentIndex(static_cast(redirect()));
ui->lineEdit_schedule->setText(cron());
ui->lineEdit_socket->setText(socket());
ui->spinBox_interval->setValue(interval());
// filters
- ui->checkBox_colorFilter->setCheckState(
- filters().contains("color") ? Qt::Checked : Qt::Unchecked);
- ui->checkBox_linesFilter->setCheckState(
- filters().contains("newline") ? Qt::Checked : Qt::Unchecked);
- ui->checkBox_spaceFilter->setCheckState(
- filters().contains("space") ? Qt::Checked : Qt::Unchecked);
+ ui->checkBox_colorFilter->setCheckState(filters().contains("color") ? Qt::Checked
+ : Qt::Unchecked);
+ ui->checkBox_linesFilter->setCheckState(filters().contains("newline") ? Qt::Checked
+ : Qt::Unchecked);
+ ui->checkBox_spaceFilter->setCheckState(filters().contains("space") ? Qt::Checked
+ : Qt::Unchecked);
int ret = exec();
if (ret != 1)
@@ -319,12 +312,9 @@ int ExtScript::showConfiguration(const QVariant &_args)
setSocket(ui->lineEdit_socket->text());
setInterval(ui->spinBox_interval->value());
// filters
- updateFilter("color",
- ui->checkBox_colorFilter->checkState() == Qt::Checked);
- updateFilter("newline",
- ui->checkBox_linesFilter->checkState() == Qt::Checked);
- updateFilter("space",
- ui->checkBox_spaceFilter->checkState() == Qt::Checked);
+ updateFilter("color", ui->checkBox_colorFilter->checkState() == Qt::Checked);
+ updateFilter("newline", ui->checkBox_linesFilter->checkState() == Qt::Checked);
+ updateFilter("space", ui->checkBox_spaceFilter->checkState() == Qt::Checked);
writeConfiguration();
return ret;
@@ -363,13 +353,11 @@ void ExtScript::startProcess()
void ExtScript::updateValue()
{
qCInfo(LOG_LIB) << "Cmd returns" << m_process->exitCode();
- QString qdebug = QTextCodec::codecForMib(106)
- ->toUnicode(m_process->readAllStandardError())
- .trimmed();
+ QString qdebug
+ = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed();
qCInfo(LOG_LIB) << "Error" << qdebug;
- QString qoutput = QTextCodec::codecForMib(106)
- ->toUnicode(m_process->readAllStandardOutput())
- .trimmed();
+ QString qoutput
+ = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
qCInfo(LOG_LIB) << "Output" << qoutput;
QString strValue;
diff --git a/sources/awesomewidgets/extscript.h b/sources/awesomewidgets/extscript.h
index de50223..79126dc 100644
--- a/sources/awesomewidgets/extscript.h
+++ b/sources/awesomewidgets/extscript.h
@@ -37,15 +37,9 @@ class ExtScript : public AbstractExtItem
Q_PROPERTY(Redirect redirect READ redirect WRITE setRedirect)
public:
- enum class Redirect {
- stdout2stderr = 0,
- nothing = 1,
- stderr2stdout = 2,
- swap = 3
- };
+ enum class Redirect { stdout2stderr = 0, nothing = 1, stderr2stdout = 2, swap = 3 };
- explicit ExtScript(QWidget *_parent = nullptr,
- const QString &_filePath = "");
+ explicit ExtScript(QWidget *_parent = nullptr, const QString &_filePath = "");
virtual ~ExtScript();
ExtScript *copy(const QString &_fileName, const int _number);
QString jsonFiltersFile() const;
diff --git a/sources/awesomewidgets/extupgrade.cpp b/sources/awesomewidgets/extupgrade.cpp
index 06bdbb9..303bc45 100644
--- a/sources/awesomewidgets/extupgrade.cpp
+++ b/sources/awesomewidgets/extupgrade.cpp
@@ -63,8 +63,7 @@ ExtUpgrade *ExtUpgrade::copy(const QString &_fileName, const int _number)
{
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
- ExtUpgrade *item
- = new ExtUpgrade(static_cast(parent()), _fileName);
+ ExtUpgrade *item = new ExtUpgrade(static_cast(parent()), _fileName);
copyDefaults(item);
item->setExecutable(executable());
item->setFilter(filter());
@@ -161,8 +160,7 @@ int ExtUpgrade::showConfiguration(const QVariant &_args)
ui->label_numberValue->setText(QString("%1").arg(number()));
ui->lineEdit_command->setText(executable());
ui->lineEdit_filter->setText(filter());
- ui->checkBox_active->setCheckState(isActive() ? Qt::Checked
- : Qt::Unchecked);
+ ui->checkBox_active->setCheckState(isActive() ? Qt::Checked : Qt::Unchecked);
ui->spinBox_null->setValue(null());
ui->lineEdit_schedule->setText(cron());
ui->lineEdit_socket->setText(socket());
@@ -218,16 +216,12 @@ void ExtUpgrade::updateValue()
qCInfo(LOG_LIB) << "Cmd returns" << m_process->exitCode();
qCInfo(LOG_LIB) << "Error" << m_process->readAllStandardError();
- QString qoutput = QTextCodec::codecForMib(106)
- ->toUnicode(m_process->readAllStandardOutput())
- .trimmed();
+ QString qoutput
+ = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
m_values[tag("pkgcount")] = [this](QString output) {
return filter().isEmpty()
- ? output.split('\n', QString::SkipEmptyParts).count()
- - null()
- : output.split('\n', QString::SkipEmptyParts)
- .filter(QRegExp(filter()))
- .count();
+ ? output.split('\n', QString::SkipEmptyParts).count() - null()
+ : output.split('\n', QString::SkipEmptyParts).filter(QRegExp(filter())).count();
}(qoutput);
emit(dataReceived(m_values));
diff --git a/sources/awesomewidgets/extupgrade.h b/sources/awesomewidgets/extupgrade.h
index e2783bd..f079144 100644
--- a/sources/awesomewidgets/extupgrade.h
+++ b/sources/awesomewidgets/extupgrade.h
@@ -36,8 +36,7 @@ class ExtUpgrade : public AbstractExtItem
Q_PROPERTY(int null READ null WRITE setNull)
public:
- explicit ExtUpgrade(QWidget *_parent = nullptr,
- const QString &_filePath = "");
+ explicit ExtUpgrade(QWidget *_parent = nullptr, const QString &_filePath = "");
virtual ~ExtUpgrade();
ExtUpgrade *copy(const QString &_fileName, const int _number);
// get methods
diff --git a/sources/awesomewidgets/extweather.cpp b/sources/awesomewidgets/extweather.cpp
index 70a00a0..cca7b87 100644
--- a/sources/awesomewidgets/extweather.cpp
+++ b/sources/awesomewidgets/extweather.cpp
@@ -77,8 +77,7 @@ ExtWeather *ExtWeather::copy(const QString &_fileName, const int _number)
{
qCDebug(LOG_LIB) << "File" << _fileName << "number" << _number;
- ExtWeather *item
- = new ExtWeather(static_cast(parent()), _fileName);
+ ExtWeather *item = new ExtWeather(static_cast(parent()), _fileName);
copyDefaults(item);
item->setCity(city());
item->setCountry(country());
@@ -93,9 +92,9 @@ ExtWeather *ExtWeather::copy(const QString &_fileName, const int _number)
QString ExtWeather::jsonMapFile() const
{
- QString fileName = QStandardPaths::locate(
- QStandardPaths::GenericDataLocation,
- "awesomewidgets/weather/awesomewidgets-extweather-ids.json");
+ QString fileName
+ = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
+ "awesomewidgets/weather/awesomewidgets-extweather-ids.json");
qCInfo(LOG_LIB) << "Map file" << fileName;
return fileName;
@@ -283,8 +282,7 @@ int ExtWeather::showConfiguration(const QVariant &_args)
ui->lineEdit_country->setText(country());
ui->spinBox_timestamp->setValue(ts());
ui->checkBox_image->setCheckState(image() ? Qt::Checked : Qt::Unchecked);
- ui->checkBox_active->setCheckState(isActive() ? Qt::Checked
- : Qt::Unchecked);
+ ui->checkBox_active->setCheckState(isActive() ? Qt::Checked : Qt::Unchecked);
ui->lineEdit_schedule->setText(cron());
ui->lineEdit_socket->setText(socket());
ui->spinBox_interval->setValue(interval());
@@ -333,8 +331,7 @@ void ExtWeather::writeConfiguration() const
void ExtWeather::sendRequest()
{
m_isRunning = true;
- QNetworkReply *reply
- = m_manager->get(QNetworkRequest(m_providerObject->url()));
+ QNetworkReply *reply = m_manager->get(QNetworkRequest(m_providerObject->url()));
new QReplyTimeout(reply, REQUEST_TIMEOUT);
}
@@ -342,8 +339,8 @@ void ExtWeather::sendRequest()
void ExtWeather::weatherReplyReceived(QNetworkReply *_reply)
{
if (_reply->error() != QNetworkReply::NoError) {
- qCWarning(LOG_AW) << "An error occurs" << _reply->error()
- << "with message" << _reply->errorString();
+ qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
+ << _reply->errorString();
return;
}
@@ -360,8 +357,7 @@ void ExtWeather::weatherReplyReceived(QNetworkReply *_reply)
if (data.isEmpty())
return;
m_values = data;
- m_values[tag("weather")]
- = weatherFromInt(m_values[tag("weatherId")].toInt());
+ m_values[tag("weather")] = weatherFromInt(m_values[tag("weatherId")].toInt());
emit(dataReceived(m_values));
}
@@ -373,10 +369,10 @@ void ExtWeather::initProvider()
switch (m_provider) {
case Provider::OWM:
- m_providerObject = new OWMWeatherProvider(this, number());
+ m_providerObject = new OWMWeatherProvider(this);
break;
case Provider::Yahoo:
- m_providerObject = new YahooWeatherProvider(this, number());
+ m_providerObject = new YahooWeatherProvider(this);
break;
}
diff --git a/sources/awesomewidgets/extweather.h b/sources/awesomewidgets/extweather.h
index 3908ce1..8894dc3 100644
--- a/sources/awesomewidgets/extweather.h
+++ b/sources/awesomewidgets/extweather.h
@@ -42,8 +42,7 @@ class ExtWeather : public AbstractExtItem
public:
enum class Provider { OWM = 0, Yahoo = 1 };
- explicit ExtWeather(QWidget *_parent = nullptr,
- const QString &_filePath = "");
+ explicit ExtWeather(QWidget *_parent = nullptr, const QString &_filePath = "");
virtual ~ExtWeather();
ExtWeather *copy(const QString &_fileName, const int _number);
QString jsonMapFile() const;
@@ -76,8 +75,8 @@ private slots:
void weatherReplyReceived(QNetworkReply *_reply);
private:
- QNetworkAccessManager *m_manager = nullptr;
AbstractWeatherProvider *m_providerObject = nullptr;
+ QNetworkAccessManager *m_manager = nullptr;
bool m_isRunning = false;
Ui::ExtWeather *ui = nullptr;
void initProvider();
diff --git a/sources/awesomewidgets/graphicalitem.cpp b/sources/awesomewidgets/graphicalitem.cpp
index 42e8442..5709fa0 100644
--- a/sources/awesomewidgets/graphicalitem.cpp
+++ b/sources/awesomewidgets/graphicalitem.cpp
@@ -56,14 +56,10 @@ GraphicalItem::GraphicalItem(QWidget *_parent, const QString &_filePath)
ui->setupUi(this);
translate();
- connect(ui->checkBox_custom, SIGNAL(stateChanged(int)), this,
- SLOT(changeValue(int)));
- connect(ui->comboBox_type, SIGNAL(currentIndexChanged(int)), this,
- SLOT(changeCountState(int)));
- connect(ui->toolButton_activeColor, SIGNAL(clicked()), this,
- SLOT(changeColor()));
- connect(ui->toolButton_inactiveColor, SIGNAL(clicked()), this,
- SLOT(changeColor()));
+ connect(ui->checkBox_custom, SIGNAL(stateChanged(int)), this, SLOT(changeValue(int)));
+ connect(ui->comboBox_type, SIGNAL(currentIndexChanged(int)), this, SLOT(changeCountState(int)));
+ connect(ui->toolButton_activeColor, SIGNAL(clicked()), this, SLOT(changeColor()));
+ connect(ui->toolButton_inactiveColor, SIGNAL(clicked()), this, SLOT(changeColor()));
}
@@ -79,8 +75,7 @@ GraphicalItem *GraphicalItem::copy(const QString &_fileName, const int _number)
{
qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number;
- GraphicalItem *item
- = new GraphicalItem(static_cast(parent()), _fileName);
+ GraphicalItem *item = new GraphicalItem(static_cast(parent()), _fileName);
copyDefaults(item);
item->setActiveColor(activeColor());
item->setBar(bar());
@@ -105,8 +100,7 @@ QString GraphicalItem::image(const QVariant &value)
m_scene->clear();
int scale[2] = {1, 1};
- float converted
- = m_helper->getPercents(value.toFloat(), minValue(), maxValue());
+ float converted = m_helper->getPercents(value.toFloat(), minValue(), maxValue());
// paint
switch (m_type) {
@@ -138,13 +132,12 @@ QString GraphicalItem::image(const QVariant &value)
}
// convert
- QPixmap pixmap
- = m_view->grab().transformed(QTransform().scale(scale[0], scale[1]));
+ QPixmap pixmap = m_view->grab().transformed(QTransform().scale(scale[0], scale[1]));
QByteArray byteArray;
QBuffer buffer(&byteArray);
pixmap.save(&buffer, "PNG");
- QString url = QString("
")
- .arg(QString(byteArray.toBase64()));
+ QString url
+ = QString("
").arg(QString(byteArray.toBase64()));
return url;
}
@@ -153,8 +146,7 @@ QString GraphicalItem::image(const QVariant &value)
void GraphicalItem::initScene()
{
m_view->resize(m_width + 5, m_height + 5);
- m_helper->setParameters(activeColor(), inactiveColor(), itemWidth(),
- itemHeight(), count());
+ m_helper->setParameters(activeColor(), inactiveColor(), itemWidth(), itemHeight(), count());
}
@@ -426,23 +418,18 @@ void GraphicalItem::readConfiguration()
setBar(settings.value("X-AW-Value", bar()).toString());
setMaxValue(settings.value("X-AW-Max", maxValue()).toFloat());
setMinValue(settings.value("X-AW-Min", minValue()).toFloat());
- setActiveColor(
- settings.value("X-AW-ActiveColor", activeColor()).toString());
- setInactiveColor(
- settings.value("X-AW-InactiveColor", inactiveColor()).toString());
+ setActiveColor(settings.value("X-AW-ActiveColor", activeColor()).toString());
+ setInactiveColor(settings.value("X-AW-InactiveColor", inactiveColor()).toString());
setStrType(settings.value("X-AW-Type", strType()).toString());
- setStrDirection(
- settings.value("X-AW-Direction", strDirection()).toString());
+ setStrDirection(settings.value("X-AW-Direction", strDirection()).toString());
setItemHeight(settings.value("X-AW-Height", itemHeight()).toInt());
setItemWidth(settings.value("X-AW-Width", itemWidth()).toInt());
// api == 5
if (apiVersion() < 5) {
QString prefix;
- prefix = activeColor().startsWith("/") ? QString("file://%1")
- : QString("color://%1");
+ prefix = activeColor().startsWith("/") ? QString("file://%1") : QString("color://%1");
m_activeColor = prefix.arg(activeColor());
- prefix = inactiveColor().startsWith("/") ? QString("file://%1")
- : QString("color://%1");
+ prefix = inactiveColor().startsWith("/") ? QString("file://%1") : QString("color://%1");
m_inactiveColor = prefix.arg(inactiveColor());
}
settings.endGroup();
@@ -487,8 +474,7 @@ int GraphicalItem::showConfiguration(const QVariant &_args)
ui->spinBox_width->setValue(itemWidth());
// update UI
- emit(ui->comboBox_type->currentIndexChanged(
- ui->comboBox_type->currentIndex()));
+ emit(ui->comboBox_type->currentIndexChanged(ui->comboBox_type->currentIndex()));
emit(ui->checkBox_custom->stateChanged(ui->checkBox_custom->checkState()));
int ret = exec();
@@ -499,15 +485,13 @@ int GraphicalItem::showConfiguration(const QVariant &_args)
setApiVersion(AW_GRAPHITEM_API);
setCount(ui->spinBox_count->value());
setCustom(ui->checkBox_custom->isChecked());
- setBar(m_custom ? ui->lineEdit_customValue->text()
- : ui->comboBox_value->currentText());
+ setBar(m_custom ? ui->lineEdit_customValue->text() : ui->comboBox_value->currentText());
setMaxValue(ui->doubleSpinBox_max->value());
setMinValue(ui->doubleSpinBox_min->value());
setActiveColor(ui->lineEdit_activeColor->text());
setInactiveColor(ui->lineEdit_inactiveColor->text());
setType(static_cast(ui->comboBox_type->currentIndex()));
- setDirection(
- static_cast(ui->comboBox_direction->currentIndex()));
+ setDirection(static_cast(ui->comboBox_direction->currentIndex()));
setItemHeight(ui->spinBox_height->value());
setItemWidth(ui->spinBox_width->value());
@@ -557,8 +541,8 @@ void GraphicalItem::changeColor()
QString outputColor;
if (state == 0) {
QColor color = m_helper->stringToColor(lineEdit->text());
- QColor newColor = QColorDialog::getColor(
- color, this, i18n("Select color"), QColorDialog::ShowAlphaChannel);
+ QColor newColor = QColorDialog::getColor(color, this, i18n("Select color"),
+ QColorDialog::ShowAlphaChannel);
if (!newColor.isValid())
return;
qCInfo(LOG_LIB) << "Selected color" << newColor;
@@ -573,10 +557,10 @@ void GraphicalItem::changeColor()
} else if (state == 1) {
QString path = lineEdit->text();
QString directory = QFileInfo(path).absolutePath();
- outputColor = QFileDialog::getOpenFileUrl(
- this, i18n("Select path"), directory,
- i18n("Images (*.png *.bpm *.jpg);;All files (*.*)"))
- .toString();
+ outputColor
+ = QFileDialog::getOpenFileUrl(this, i18n("Select path"), directory,
+ i18n("Images (*.png *.bpm *.jpg);;All files (*.*)"))
+ .toString();
qCInfo(LOG_LIB) << "Selected path" << outputColor;
}
diff --git a/sources/awesomewidgets/graphicalitem.h b/sources/awesomewidgets/graphicalitem.h
index c30b757..cc00212 100644
--- a/sources/awesomewidgets/graphicalitem.h
+++ b/sources/awesomewidgets/graphicalitem.h
@@ -50,16 +50,9 @@ class GraphicalItem : public AbstractExtItem
public:
enum class Direction { LeftToRight = 0, RightToLeft = 1 };
- enum class Type {
- Horizontal = 0,
- Vertical = 1,
- Circle = 2,
- Graph = 3,
- Bars = 4
- };
+ enum class Type { Horizontal = 0, Vertical = 1, Circle = 2, Graph = 3, Bars = 4 };
- explicit GraphicalItem(QWidget *_parent = nullptr,
- const QString &_filePath = "");
+ explicit GraphicalItem(QWidget *_parent = nullptr, const QString &_filePath = "");
virtual ~GraphicalItem();
GraphicalItem *copy(const QString &_fileName, const int _number);
QString image(const QVariant &value);
diff --git a/sources/awesomewidgets/graphicalitemhelper.cpp b/sources/awesomewidgets/graphicalitemhelper.cpp
index 1fcc703..fc8cca1 100644
--- a/sources/awesomewidgets/graphicalitemhelper.cpp
+++ b/sources/awesomewidgets/graphicalitemhelper.cpp
@@ -26,8 +26,7 @@
#include "awdebug.h"
-GraphicalItemHelper::GraphicalItemHelper(QObject *_parent,
- QGraphicsScene *_scene)
+GraphicalItemHelper::GraphicalItemHelper(QObject *_parent, QGraphicsScene *_scene)
: QObject(_parent)
, m_scene(_scene)
{
@@ -41,14 +40,11 @@ GraphicalItemHelper::~GraphicalItemHelper()
}
-void GraphicalItemHelper::setParameters(const QString &_active,
- const QString &_inactive,
- const int _width, const int _height,
- const int _count)
+void GraphicalItemHelper::setParameters(const QString &_active, const QString &_inactive,
+ const int _width, const int _height, const int _count)
{
- qCDebug(LOG_LIB) << "Use active color" << _active << ", inactive"
- << _inactive << ", width" << _width << ", height"
- << _height << ", count" << _count;
+ qCDebug(LOG_LIB) << "Use active color" << _active << ", inactive" << _inactive << ", width"
+ << _width << ", height" << _height << ", count" << _count;
// put images to pens if any otherwise set pen colors
// Images resize to content here as well
@@ -67,8 +63,7 @@ void GraphicalItemHelper::setParameters(const QString &_active,
if (isColor(_inactive)) {
m_inactivePen.setBrush(QBrush(stringToColor(_inactive)));
} else {
- qCInfo(LOG_LIB) << "Found path, trying to load Pixmap from"
- << _inactive;
+ qCInfo(LOG_LIB) << "Found path, trying to load Pixmap from" << _inactive;
QPixmap pixmap = QPixmap(QUrl(_inactive).toLocalFile());
if (pixmap.isNull()) {
qCWarning(LOG_LIB) << "Invalid pixmap found" << _inactive;
@@ -93,8 +88,7 @@ void GraphicalItemHelper::paintBars(const float _value)
storeValue(_value);
// default norms
- float normX
- = static_cast(m_width) / static_cast(m_values.count());
+ float normX = static_cast(m_width) / static_cast(m_values.count());
float normY = static_cast(m_height - 1);
// paint graph
for (int i = 0; i < m_values.count(); i++) {
@@ -118,13 +112,11 @@ void GraphicalItemHelper::paintCircle(const float _percent)
// Returns the start angle for an ellipse segment in 16ths of a degree
// inactive
- circle = m_scene->addEllipse(0.0, 0.0, m_width, m_height, m_inactivePen,
- m_inactivePen.brush());
+ circle = m_scene->addEllipse(0.0, 0.0, m_width, m_height, m_inactivePen, m_inactivePen.brush());
circle->setSpanAngle(-(1.0f - _percent) * 360.0f * 16.0f);
circle->setStartAngle(90.0f * 16.0f - _percent * 360.0f * 16.0f);
// active
- circle = m_scene->addEllipse(0.0, 0.0, m_width, m_height, m_activePen,
- m_activePen.brush());
+ circle = m_scene->addEllipse(0.0, 0.0, m_width, m_height, m_activePen, m_activePen.brush());
circle->setSpanAngle(-_percent * 360.0f * 16.0f);
circle->setStartAngle(90 * 16);
}
@@ -140,8 +132,7 @@ void GraphicalItemHelper::paintGraph(const float _value)
storeValue(_value);
// default norms
- float normX
- = static_cast(m_width) / static_cast(m_values.count());
+ float normX = static_cast(m_width) / static_cast(m_values.count());
float normY = static_cast(m_height - 1);
// paint graph
for (int i = 0; i < m_values.count() - 1; i++) {
@@ -162,12 +153,11 @@ void GraphicalItemHelper::paintHorizontal(const float _percent)
m_activePen.setWidth(m_height);
m_inactivePen.setWidth(m_height);
// inactive
- 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_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);
// active
- m_scene->addLine(-0.5 * m_height, 0.5 * m_height,
- _percent * m_width - 0.5 * m_height, 0.5 * m_height,
- m_activePen);
+ m_scene->addLine(-0.5 * m_height, 0.5 * m_height, _percent * m_width - 0.5 * m_height,
+ 0.5 * m_height, m_activePen);
}
@@ -179,16 +169,14 @@ void GraphicalItemHelper::paintVertical(const float _percent)
m_inactivePen.setWidth(m_height);
// inactive
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
- 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);
+ 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);
}
-float GraphicalItemHelper::getPercents(const float _value, const float _min,
- const float _max)
+float GraphicalItemHelper::getPercents(const float _value, const float _min, const float _max)
{
qCDebug(LOG_LIB) << "Get percent value from" << _value;
// newest Qt crashes here if value is nan
diff --git a/sources/awesomewidgets/graphicalitemhelper.h b/sources/awesomewidgets/graphicalitemhelper.h
index 5070e9a..f79dff5 100644
--- a/sources/awesomewidgets/graphicalitemhelper.h
+++ b/sources/awesomewidgets/graphicalitemhelper.h
@@ -30,12 +30,11 @@ class GraphicalItemHelper : public QObject
Q_OBJECT
public:
- explicit GraphicalItemHelper(QObject *_parent = nullptr,
- QGraphicsScene *_scene = nullptr);
+ explicit GraphicalItemHelper(QObject *_parent = nullptr, QGraphicsScene *_scene = nullptr);
virtual ~GraphicalItemHelper();
// parameters
- void setParameters(const QString &_active, const QString &_inactive,
- const int _width, const int _height, const int _count);
+ void setParameters(const QString &_active, const QString &_inactive, const int _width,
+ const int _height, const int _count);
// paint methods
void paintBars(const float _value);
void paintCircle(const float _percent);
diff --git a/sources/awesomewidgets/owmweatherprovider.cpp b/sources/awesomewidgets/owmweatherprovider.cpp
index 7cf67d5..6397ea7 100644
--- a/sources/awesomewidgets/owmweatherprovider.cpp
+++ b/sources/awesomewidgets/owmweatherprovider.cpp
@@ -23,8 +23,8 @@
#include "awdebug.h"
-OWMWeatherProvider::OWMWeatherProvider(QObject *_parent, const int _number)
- : AbstractWeatherProvider(_parent, _number)
+OWMWeatherProvider::OWMWeatherProvider(QObject *_parent)
+ : AbstractWeatherProvider(_parent)
{
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
}
@@ -36,11 +36,9 @@ OWMWeatherProvider::~OWMWeatherProvider()
}
-void OWMWeatherProvider::initUrl(const QString &_city, const QString &_country,
- const int ts)
+void OWMWeatherProvider::initUrl(const QString &_city, 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;
@@ -60,8 +58,7 @@ QVariantHash OWMWeatherProvider::parse(const QVariantMap &_json) const
qCDebug(LOG_LIB) << "Parse json" << _json;
if (_json["cod"].toInt() != 200) {
- qCWarning(LOG_LIB) << "Invalid OpenWeatherMap return code"
- << _json["cod"].toInt();
+ qCWarning(LOG_LIB) << "Invalid OpenWeatherMap return code" << _json["cod"].toInt();
return QVariantHash();
}
@@ -91,23 +88,19 @@ QVariantHash OWMWeatherProvider::parseSingleJson(const QVariantMap &_json) const
QVariantList weather = _json["weather"].toList();
if (!weather.isEmpty()) {
int id = weather.first().toMap()["id"].toInt();
- output[QString("weatherId%1").arg(number())] = id;
+ output[tag("weatherId")] = id;
}
// main data
QVariantMap mainWeather = _json["main"].toMap();
if (!weather.isEmpty()) {
- output[QString("humidity%1").arg(number())]
- = mainWeather["humidity"].toFloat();
- output[QString("pressure%1").arg(number())]
- = mainWeather["pressure"].toFloat();
- output[QString("temperature%1").arg(number())]
- = mainWeather["temp"].toFloat();
+ output[tag("humidity")] = mainWeather["humidity"].toFloat();
+ output[tag("pressure")] = mainWeather["pressure"].toFloat();
+ output[tag("temperature")] = mainWeather["temp"].toFloat();
}
// timestamp
- output[QString("timestamp%1").arg(number())]
- = QDateTime::fromTime_t(_json["dt"].toUInt()).toUTC();
+ output[tag("timestamp")] = QDateTime::fromTime_t(_json["dt"].toUInt()).toUTC();
return output;
}
diff --git a/sources/awesomewidgets/owmweatherprovider.h b/sources/awesomewidgets/owmweatherprovider.h
index e9e5ed1..7c23f8c 100644
--- a/sources/awesomewidgets/owmweatherprovider.h
+++ b/sources/awesomewidgets/owmweatherprovider.h
@@ -31,7 +31,7 @@ public:
const char *OWM_WEATHER_URL = "https://arcanis.me/weather";
const char *OWM_FORECAST_URL = "https://arcanis.me/forecast";
- explicit OWMWeatherProvider(QObject *_parent, const int _number);
+ explicit OWMWeatherProvider(QObject *_parent);
virtual ~OWMWeatherProvider();
void initUrl(const QString &_city, const QString &_country, const int);
QVariantHash parse(const QVariantMap &_json) const;
diff --git a/sources/awesomewidgets/qcronscheduler.cpp b/sources/awesomewidgets/qcronscheduler.cpp
index 90d5adc..894a638 100644
--- a/sources/awesomewidgets/qcronscheduler.cpp
+++ b/sources/awesomewidgets/qcronscheduler.cpp
@@ -76,11 +76,9 @@ void QCronScheduler::expired()
}
-QList QCronScheduler::parseField(const QString &_value, const int _min,
- const int _max) const
+QList QCronScheduler::parseField(const QString &_value, const int _min, const int _max) const
{
- qCDebug(LOG_LIB) << "Parse field" << _value << "with corner values" << _min
- << _max;
+ qCDebug(LOG_LIB) << "Parse field" << _value << "with corner values" << _min << _max;
QList parsed;
auto fields = _value.split(',');
@@ -89,9 +87,7 @@ QList QCronScheduler::parseField(const QString &_value, const int _min,
parsedField.fromRange(field.split('/').first(), _min, _max);
if (field.contains('/')) {
bool status;
- parsedField.div = field.split('/', QString::SkipEmptyParts)
- .at(1)
- .toInt(&status);
+ parsedField.div = field.split('/', QString::SkipEmptyParts).at(1).toInt(&status);
if (!status)
parsedField.div = 1;
}
@@ -103,11 +99,9 @@ QList QCronScheduler::parseField(const QString &_value, const int _min,
}
-void QCronScheduler::QCronField::fromRange(const QString &_range,
- const int _min, const int _max)
+void QCronScheduler::QCronField::fromRange(const QString &_range, const int _min, const int _max)
{
- qCDebug(LOG_LIB) << "Parse field from range" << _range
- << "with corner values" << _min << _max;
+ qCDebug(LOG_LIB) << "Parse field from range" << _range << "with corner values" << _min << _max;
if (_range == "*") {
minValue = _min;
diff --git a/sources/awesomewidgets/qcronscheduler.h b/sources/awesomewidgets/qcronscheduler.h
index 185c076..cfcbdec 100644
--- a/sources/awesomewidgets/qcronscheduler.h
+++ b/sources/awesomewidgets/qcronscheduler.h
@@ -56,8 +56,7 @@ private slots:
private:
QCronRunSchedule m_schedule;
QTimer *m_timer = nullptr;
- QList parseField(const QString &_value, const int _min,
- const int _max) const;
+ QList parseField(const QString &_value, const int _min, const int _max) const;
};
diff --git a/sources/awesomewidgets/quotes/aapl.desktop b/sources/awesomewidgets/quotes/aapl.desktop
index c744c32..c2eb130 100644
--- a/sources/awesomewidgets/quotes/aapl.desktop
+++ b/sources/awesomewidgets/quotes/aapl.desktop
@@ -4,7 +4,7 @@ Name=AAPL.NASDAQ
Comment=Apple Inc
X-AW-Ticker="AAPL"
X-AW-Active=false
-X-AW-ApiVersion=4
+X-AW-ApiVersion=5
X-AW-Interval=60
X-AW-Number=0
X-AW-Schedule=
diff --git a/sources/awesomewidgets/quotes/eurrub.desktop b/sources/awesomewidgets/quotes/eurrub.desktop
index c5c0453..4f8cbcb 100644
--- a/sources/awesomewidgets/quotes/eurrub.desktop
+++ b/sources/awesomewidgets/quotes/eurrub.desktop
@@ -2,9 +2,9 @@
Encoding=UTF-8
Name=EUR/RUB
Comment=EUR/RUB
-X-AW-Ticker="EURRUB=X"
+X-AW-Ticker="EURRUB"
X-AW-Active=false
-X-AW-ApiVersion=4
+X-AW-ApiVersion=5
X-AW-Interval=60
X-AW-Number=1
X-AW-Schedule=
diff --git a/sources/awesomewidgets/quotes/eurusd.desktop b/sources/awesomewidgets/quotes/eurusd.desktop
index 5d18f4d..564bbcd 100644
--- a/sources/awesomewidgets/quotes/eurusd.desktop
+++ b/sources/awesomewidgets/quotes/eurusd.desktop
@@ -2,9 +2,9 @@
Encoding=UTF-8
Name=EUR/USD
Comment=EUR/USD
-X-AW-Ticker="EURUSD=X"
+X-AW-Ticker="EURUSD"
X-AW-Active=false
-X-AW-ApiVersion=4
+X-AW-ApiVersion=5
X-AW-Interval=60
X-AW-Number=2
X-AW-Schedule=
diff --git a/sources/awesomewidgets/quotes/goog.desktop b/sources/awesomewidgets/quotes/goog.desktop
index d27306d..85003b6 100644
--- a/sources/awesomewidgets/quotes/goog.desktop
+++ b/sources/awesomewidgets/quotes/goog.desktop
@@ -4,7 +4,7 @@ Name=GOOG.NASDAQ
Comment=Google Inc
X-AW-Ticker="GOOG"
X-AW-Active=false
-X-AW-ApiVersion=4
+X-AW-ApiVersion=5
X-AW-Interval=60
X-AW-Number=3
X-AW-Schedule=
diff --git a/sources/awesomewidgets/quotes/msft.desktop b/sources/awesomewidgets/quotes/msft.desktop
index b02e4d4..2fdcea3 100644
--- a/sources/awesomewidgets/quotes/msft.desktop
+++ b/sources/awesomewidgets/quotes/msft.desktop
@@ -4,7 +4,7 @@ Name=MSFT.NASDAQ
Comment=Microsoft Corp
X-AW-Ticker="MSFT"
X-AW-Active=false
-X-AW-ApiVersion=4
+X-AW-ApiVersion=5
X-AW-Interval=60
X-AW-Number=4
X-AW-Schedule=
diff --git a/sources/awesomewidgets/quotes/rts.desktop b/sources/awesomewidgets/quotes/rts.desktop
index 7b235a2..87a46c7 100644
--- a/sources/awesomewidgets/quotes/rts.desktop
+++ b/sources/awesomewidgets/quotes/rts.desktop
@@ -2,10 +2,10 @@
Encoding=UTF-8
Name=RTS
Comment=RTS Index
-X-AW-Ticker="RTS.RS"
+X-AW-Ticker="^RTS"
X-AW-Active=false
-X-AW-ApiVersion=4
+X-AW-ApiVersion=5
X-AW-Interval=60
-X-AW-Number=5
+X-AW-Number=4
X-AW-Schedule=
X-AW-Socket=
diff --git a/sources/awesomewidgets/quotes/snp.desktop b/sources/awesomewidgets/quotes/snp.desktop
deleted file mode 100644
index a5b955d..0000000
--- a/sources/awesomewidgets/quotes/snp.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=S&P
-Comment=S&P 500 Index
-X-AW-Ticker="^GSPC"
-X-AW-Active=false
-X-AW-ApiVersion=4
-X-AW-Interval=60
-X-AW-Number=6
-X-AW-Schedule=
-X-AW-Socket=
diff --git a/sources/awesomewidgets/quotes/usdrub.desktop b/sources/awesomewidgets/quotes/usdrub.desktop
index 2b38ca0..6e51795 100644
--- a/sources/awesomewidgets/quotes/usdrub.desktop
+++ b/sources/awesomewidgets/quotes/usdrub.desktop
@@ -2,9 +2,9 @@
Encoding=UTF-8
Name=USD/RUB
Comment=USD/RUB
-X-AW-Ticker="USDRUB=X"
+X-AW-Ticker="USDRUB"
X-AW-Active=false
-X-AW-ApiVersion=4
+X-AW-ApiVersion=5
X-AW-Interval=60
X-AW-Number=8
X-AW-Schedule=
diff --git a/sources/awesomewidgets/quotes/vix.desktop b/sources/awesomewidgets/quotes/vix.desktop
deleted file mode 100644
index 287c966..0000000
--- a/sources/awesomewidgets/quotes/vix.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=VIX
-Comment=Volatility S&P 500
-X-AW-Ticker="^VIX"
-X-AW-Active=false
-X-AW-ApiVersion=4
-X-AW-Interval=60
-X-AW-Number=7
-X-AW-Schedule=
-X-AW-Socket=
diff --git a/sources/awesomewidgets/stooqquotesprovider.cpp b/sources/awesomewidgets/stooqquotesprovider.cpp
new file mode 100644
index 0000000..dafa060
--- /dev/null
+++ b/sources/awesomewidgets/stooqquotesprovider.cpp
@@ -0,0 +1,88 @@
+/***************************************************************************
+ * This file is part of awesome-widgets *
+ * *
+ * awesome-widgets is free software: you can redistribute it and/or *
+ * modify it under the terms of the GNU General Public License as *
+ * published by the Free Software Foundation, either version 3 of the *
+ * License, or (at your option) any later version. *
+ * *
+ * awesome-widgets is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
+ ***************************************************************************/
+
+#include "stooqquotesprovider.h"
+
+#include
+#include
+
+#include "awdebug.h"
+
+
+StooqQuotesProvider::StooqQuotesProvider(QObject *_parent)
+ : AbstractQuotesProvider(_parent)
+{
+ qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
+}
+
+
+StooqQuotesProvider::~StooqQuotesProvider()
+{
+ qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
+}
+
+
+void StooqQuotesProvider::initUrl(const QString &_asset)
+{
+ qCDebug(LOG_LIB) << "Init query for" << _asset;
+
+ m_url = QUrl(STOOQ_QUOTES_URL);
+ QUrlQuery params;
+ params.addQueryItem("s", _asset);
+ params.addQueryItem("f", "pv");
+ params.addQueryItem("e", "csv");
+ m_url.setQuery(params);
+}
+
+
+QVariantHash StooqQuotesProvider::parse(const QByteArray &_source,
+ const QVariantHash &_oldValues) const
+{
+ qCDebug(LOG_LIB) << "Parse csv" << _source;
+
+ QVariantHash values;
+
+ QStringList sourceValues
+ = QTextCodec::codecForMib(106)->toUnicode(_source).trimmed().split(',');
+ if (sourceValues.count() != 2) {
+ qCWarning(LOG_LIB) << "Parse error" << sourceValues;
+ return values;
+ }
+
+ // extract old data
+ auto oldPrice = _oldValues[tag("price")].toDouble();
+ auto oldVolume = _oldValues[tag("volume")].toInt();
+
+ // last trade
+ auto price = sourceValues.at(0).toDouble();
+ values[tag("pricechg")] = oldPrice == 0.0 ? 0.0 : price - oldPrice;
+ values[tag("percpricechg")] = 100.0 * values[tag("pricechg")].toDouble() / price;
+ values[tag("price")] = price;
+ // volume
+ auto volume = sourceValues.at(1).toInt();
+ values[tag("volumechg")] = oldVolume == 0 ? 0 : volume - oldVolume;
+ values[tag("percvolumechg")] = 100.0 * values[tag("volumechg")].toDouble() / volume;
+ values[tag("volume")] = volume;
+
+ return values;
+}
+
+
+QUrl StooqQuotesProvider::url() const
+{
+ return m_url;
+}
diff --git a/sources/awesomewidgets/stooqquotesprovider.h b/sources/awesomewidgets/stooqquotesprovider.h
new file mode 100644
index 0000000..f38b068
--- /dev/null
+++ b/sources/awesomewidgets/stooqquotesprovider.h
@@ -0,0 +1,42 @@
+/***************************************************************************
+ * This file is part of awesome-widgets *
+ * *
+ * awesome-widgets is free software: you can redistribute it and/or *
+ * modify it under the terms of the GNU General Public License as *
+ * published by the Free Software Foundation, either version 3 of the *
+ * License, or (at your option) any later version. *
+ * *
+ * awesome-widgets is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
+ ***************************************************************************/
+
+#ifndef STOOQQUOTESPROVIDER_H
+#define STOOQQUOTESPROVIDER_H
+
+#include "abstractquotesprovider.h"
+
+
+class StooqQuotesProvider : public AbstractQuotesProvider
+{
+ Q_OBJECT
+
+public:
+ const char *STOOQ_QUOTES_URL = "https://stooq.com/q/l/";
+
+ explicit StooqQuotesProvider(QObject *_parent);
+ virtual ~StooqQuotesProvider();
+ void initUrl(const QString &_asset);
+ QVariantHash parse(const QByteArray &_source, const QVariantHash &_oldValues) const;
+ QUrl url() const;
+
+private:
+ QUrl m_url;
+};
+
+
+#endif /* STOOQQUOTESPROVIDER_H */
diff --git a/sources/awesomewidgets/yahooquotesprovider.cpp b/sources/awesomewidgets/yahooquotesprovider.cpp
new file mode 100644
index 0000000..fb8d29e
--- /dev/null
+++ b/sources/awesomewidgets/yahooquotesprovider.cpp
@@ -0,0 +1,88 @@
+/***************************************************************************
+ * This file is part of awesome-widgets *
+ * *
+ * awesome-widgets is free software: you can redistribute it and/or *
+ * modify it under the terms of the GNU General Public License as *
+ * published by the Free Software Foundation, either version 3 of the *
+ * License, or (at your option) any later version. *
+ * *
+ * awesome-widgets is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
+ ***************************************************************************/
+
+#include "yahooquotesprovider.h"
+
+#include
+#include
+
+#include "awdebug.h"
+
+
+YahooQuotesProvider::YahooQuotesProvider(QObject *_parent)
+ : AbstractQuotesProvider(_parent)
+{
+ qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
+}
+
+
+YahooQuotesProvider::~YahooQuotesProvider()
+{
+ qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
+}
+
+
+void YahooQuotesProvider::initUrl(const QString &_asset)
+{
+ qCDebug(LOG_LIB) << "Init query for" << _asset;
+
+ m_url = QUrl(YAHOO_QUOTES_URL);
+ QUrlQuery params;
+ params.addQueryItem("format", "json");
+ params.addQueryItem("env", "store://datatables.org/alltableswithkeys");
+ params.addQueryItem("q", QString(YAHOO_QUOTES_QUERY).arg(_asset));
+ m_url.setQuery(params);
+}
+
+
+QVariantHash YahooQuotesProvider::parse(const QByteArray &_source,
+ const QVariantHash &_oldValues) const
+{
+ qCDebug(LOG_LIB) << "Parse json" << _source;
+
+ QVariantHash values;
+
+ QJsonParseError error;
+ QJsonDocument jsonDoc = QJsonDocument::fromJson(_source, &error);
+ if (error.error != QJsonParseError::NoError) {
+ qCWarning(LOG_LIB) << "Parse error" << error.errorString();
+ return values;
+ }
+ QVariantMap jsonQuotes = jsonDoc.toVariant().toMap()["query"].toMap();
+ jsonQuotes = jsonQuotes["results"].toMap()["quote"].toMap();
+
+ // extract old data
+ auto oldPrice = _oldValues[tag("price")].toDouble();
+
+ // last trade
+ auto value = jsonQuotes["LastTradePriceOnly"].toString().toDouble();
+ values[tag("pricechg")] = oldPrice == 0.0 ? 0.0 : value - oldPrice;
+ values[tag("percpricechg")] = 100.0 * values[tag("pricechg")].toDouble() / value;
+ values[tag("price")] = value;
+ // volume
+ values[tag("volume")] = 0;
+ values[tag("volumechg")] = 0;
+ values[tag("percvolumechg")] = 0.0;
+
+ return values;
+}
+
+
+QUrl YahooQuotesProvider::url() const
+{
+ return m_url;
+}
diff --git a/sources/awesomewidgets/yahooquotesprovider.h b/sources/awesomewidgets/yahooquotesprovider.h
new file mode 100644
index 0000000..00369b7
--- /dev/null
+++ b/sources/awesomewidgets/yahooquotesprovider.h
@@ -0,0 +1,43 @@
+/***************************************************************************
+ * This file is part of awesome-widgets *
+ * *
+ * awesome-widgets is free software: you can redistribute it and/or *
+ * modify it under the terms of the GNU General Public License as *
+ * published by the Free Software Foundation, either version 3 of the *
+ * License, or (at your option) any later version. *
+ * *
+ * awesome-widgets is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ *
+ ***************************************************************************/
+
+#ifndef YAHOOQUOTESPROVIDER_H
+#define YAHOOQUOTESPROVIDER_H
+
+#include "abstractquotesprovider.h"
+
+
+class YahooQuotesProvider : public AbstractQuotesProvider
+{
+ Q_OBJECT
+
+public:
+ const char *YAHOO_QUOTES_URL = "https://query.yahooapis.com/v1/public/yql";
+ const char *YAHOO_QUOTES_QUERY = "select * from yahoo.finance.quotes where symbol='%1'";
+
+ explicit YahooQuotesProvider(QObject *_parent);
+ virtual ~YahooQuotesProvider();
+ void initUrl(const QString &_asset);
+ QVariantHash parse(const QByteArray &_source, const QVariantHash &_oldValues) const;
+ QUrl url() const;
+
+private:
+ QUrl m_url;
+};
+
+
+#endif /* YAHOOQUOTESPROVIDER_H */
diff --git a/sources/awesomewidgets/yahooweatherprovider.cpp b/sources/awesomewidgets/yahooweatherprovider.cpp
index 37729b4..efac315 100644
--- a/sources/awesomewidgets/yahooweatherprovider.cpp
+++ b/sources/awesomewidgets/yahooweatherprovider.cpp
@@ -22,8 +22,8 @@
#include "awdebug.h"
-YahooWeatherProvider::YahooWeatherProvider(QObject *_parent, const int _number)
- : AbstractWeatherProvider(_parent, _number)
+YahooWeatherProvider::YahooWeatherProvider(QObject *_parent)
+ : AbstractWeatherProvider(_parent)
{
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
}
@@ -35,11 +35,9 @@ YahooWeatherProvider::~YahooWeatherProvider()
}
-void YahooWeatherProvider::initUrl(const QString &_city,
- const QString &_country, const int ts)
+void YahooWeatherProvider::initUrl(const QString &_city, 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;
@@ -58,8 +56,7 @@ QVariantHash YahooWeatherProvider::parse(const QVariantMap &_json) const
QVariantMap jsonMap = _json["query"].toMap();
if (jsonMap["count"].toInt() != 1) {
- qCWarning(LOG_LIB) << "Found data count" << _json["count"].toInt()
- << "is not 1";
+ qCWarning(LOG_LIB) << "Found data count" << _json["count"].toInt() << "is not 1";
return QVariantHash();
}
QVariantMap results = jsonMap["results"].toMap()["channel"].toMap();
@@ -76,9 +73,8 @@ QUrl YahooWeatherProvider::url() const
}
-QVariantHash
-YahooWeatherProvider::parseCurrent(const QVariantMap &_json,
- const QVariantMap &_atmosphere) const
+QVariantHash YahooWeatherProvider::parseCurrent(const QVariantMap &_json,
+ const QVariantMap &_atmosphere) const
{
qCDebug(LOG_LIB) << "Parse current weather from" << _json;
@@ -86,14 +82,12 @@ YahooWeatherProvider::parseCurrent(const QVariantMap &_json,
QVariantHash values;
int id = _json["condition"].toMap()["code"].toInt();
- values[QString("weatherId%1").arg(number())] = id;
- values[QString("temperature%1").arg(number())] = condition["temp"].toInt();
- values[QString("timestamp%1").arg(number())] = condition["date"].toString();
- values[QString("humidity%1").arg(number())]
- = _atmosphere["humidity"].toInt();
+ values[tag("weatherId")] = id;
+ values[tag("temperature")] = condition["temp"].toInt();
+ values[tag("timestamp")] = condition["date"].toString();
+ values[tag("humidity")] = _atmosphere["humidity"].toInt();
// HACK temporary fix of invalid values on Yahoo! side
- values[QString("pressure%1").arg(number())]
- = static_cast(_atmosphere["pressure"].toFloat() / 33.863753);
+ values[tag("pressure")] = static_cast(_atmosphere["pressure"].toFloat() / 33.863753);
return values;
}
@@ -105,19 +99,16 @@ QVariantHash YahooWeatherProvider::parseForecast(const QVariantMap &_json) const
QVariantHash values;
QVariantList weatherList = _json["forecast"].toList();
- QVariantMap weatherMap = weatherList.count() < m_ts
- ? weatherList.last().toMap()
- : weatherList.at(m_ts).toMap();
+ QVariantMap weatherMap
+ = weatherList.count() < m_ts ? weatherList.last().toMap() : weatherList.at(m_ts).toMap();
int id = weatherMap["code"].toInt();
- values[QString("weatherId%1").arg(number())] = id;
- values[QString("timestamp%1").arg(number())]
- = weatherMap["date"].toString();
+ values[tag("weatherId")] = id;
+ values[tag("timestamp")] = weatherMap["date"].toString();
// yahoo provides high and low temperatures. Lets calculate average one
- values[QString("temperature%1").arg(number())]
- = (weatherMap["high"].toFloat() + weatherMap["low"].toFloat()) / 2.0;
+ values[tag("temperature")] = (weatherMap["high"].toFloat() + weatherMap["low"].toFloat()) / 2.0;
// ... and no forecast data for humidity and pressure
- values[QString("humidity%1").arg(number())] = 0;
- values[QString("pressure%1").arg(number())] = 0.0;
+ values[tag("humidity")] = 0;
+ values[tag("pressure")] = 0.0;
return values;
}
diff --git a/sources/awesomewidgets/yahooweatherprovider.h b/sources/awesomewidgets/yahooweatherprovider.h
index 342b8b9..8d99ef6 100644
--- a/sources/awesomewidgets/yahooweatherprovider.h
+++ b/sources/awesomewidgets/yahooweatherprovider.h
@@ -31,15 +31,14 @@ public:
"u='c' and woeid in (select woeid from "
"geo.places(1) where text='%1, %2')";
- explicit YahooWeatherProvider(QObject *_parent, const int _number);
+ explicit YahooWeatherProvider(QObject *_parent);
virtual ~YahooWeatherProvider();
void initUrl(const QString &_city, const QString &_country, const int);
QVariantHash parse(const QVariantMap &_json) const;
QUrl url() const;
private:
- QVariantHash parseCurrent(const QVariantMap &_json,
- const QVariantMap &_atmosphere) const;
+ QVariantHash parseCurrent(const QVariantMap &_json, const QVariantMap &_atmosphere) const;
QVariantHash parseForecast(const QVariantMap &_json) const;
int m_ts = 0;
QUrl m_url;
diff --git a/sources/desktop-panel/plugin/dpadds.cpp b/sources/desktop-panel/plugin/dpadds.cpp
index 098f737..15842f4 100644
--- a/sources/desktop-panel/plugin/dpadds.cpp
+++ b/sources/desktop-panel/plugin/dpadds.cpp
@@ -44,10 +44,8 @@ DPAdds::DPAdds(QObject *_parent)
connect(KWindowSystem::self(), SIGNAL(currentDesktopChanged(int)), this,
SIGNAL(desktopChanged()));
- connect(KWindowSystem::self(), SIGNAL(windowAdded(WId)), this,
- SIGNAL(windowListChanged()));
- connect(KWindowSystem::self(), SIGNAL(windowRemoved(WId)), this,
- SIGNAL(windowListChanged()));
+ connect(KWindowSystem::self(), SIGNAL(windowAdded(WId)), this, SIGNAL(windowListChanged()));
+ connect(KWindowSystem::self(), SIGNAL(windowRemoved(WId)), this, SIGNAL(windowListChanged()));
}
@@ -72,8 +70,7 @@ int DPAdds::currentDesktop() const
QStringList DPAdds::dictKeys(const bool _sorted, const QString &_regexp) const
{
- qCDebug(LOG_DP) << "Should be sorted" << _sorted << "and filter applied"
- << _regexp;
+ qCDebug(LOG_DP) << "Should be sorted" << _sorted << "and filter applied" << _regexp;
QStringList allKeys;
allKeys.append("mark");
@@ -106,11 +103,9 @@ QString DPAdds::toolTipImage(const int _desktop) const
// special tooltip format for names
if (m_tooltipType == "names") {
QStringList windowList;
- std::for_each(
- info.windowsData.cbegin(), info.windowsData.cend(),
- [&windowList](WindowData data) { windowList.append(data.name); });
- return QString("")
- .arg(windowList.join("- "));
+ std::for_each(info.windowsData.cbegin(), info.windowsData.cend(),
+ [&windowList](WindowData data) { windowList.append(data.name); });
+ return QString("").arg(windowList.join("
- "));
}
// init
@@ -133,8 +128,7 @@ QString DPAdds::toolTipImage(const int _desktop) const
toolTipScene->addLine(0, info.desktop.height() + 2.0 * margin,
info.desktop.width() + 2.0 * margin,
info.desktop.height() + 2.0 * margin);
- toolTipScene->addLine(info.desktop.width() + 2.0 * margin,
- info.desktop.height() + 2.0 * margin,
+ toolTipScene->addLine(info.desktop.width() + 2.0 * margin, info.desktop.height() + 2.0 * margin,
info.desktop.width() + 2.0 * margin, 0);
toolTipScene->addLine(info.desktop.width() + 2.0 * margin, 0, 0, 0);
@@ -145,39 +139,35 @@ QString DPAdds::toolTipImage(const int _desktop) const
for (auto &data : info.windowsData) {
QRect rect = data.rect;
toolTipScene->addLine(rect.left() + margin, rect.bottom() + margin,
- rect.left() + margin, rect.top() + margin,
- pen);
- toolTipScene->addLine(rect.left() + margin, rect.top() + margin,
- rect.right() + margin, rect.top() + margin,
- pen);
- toolTipScene->addLine(rect.right() + margin, rect.top() + margin,
- rect.right() + margin, rect.bottom() + margin,
- pen);
+ rect.left() + margin, rect.top() + margin, pen);
+ toolTipScene->addLine(rect.left() + margin, rect.top() + margin, rect.right() + margin,
+ rect.top() + margin, pen);
+ toolTipScene->addLine(rect.right() + margin, rect.top() + margin, rect.right() + margin,
+ rect.bottom() + margin, pen);
toolTipScene->addLine(rect.right() + margin, rect.bottom() + margin,
- rect.left() + margin, rect.bottom() + margin,
- pen);
+ rect.left() + margin, rect.bottom() + margin, pen);
}
} else if (m_tooltipType == "clean") {
QScreen *screen = QGuiApplication::primaryScreen();
std::for_each(info.desktopsData.cbegin(), info.desktopsData.cend(),
[&toolTipScene, &screen](const WindowData &data) {
QPixmap desktop = screen->grabWindow(data.id);
- toolTipScene->addPixmap(desktop)->setOffset(
- data.rect.left(), data.rect.top());
+ toolTipScene->addPixmap(desktop)->setOffset(data.rect.left(),
+ data.rect.top());
});
} else if (m_tooltipType == "windows") {
QScreen *screen = QGuiApplication::primaryScreen();
std::for_each(info.desktopsData.cbegin(), info.desktopsData.cend(),
[&toolTipScene, &screen](const WindowData &data) {
QPixmap desktop = screen->grabWindow(data.id);
- toolTipScene->addPixmap(desktop)->setOffset(
- data.rect.left(), data.rect.top());
+ toolTipScene->addPixmap(desktop)->setOffset(data.rect.left(),
+ data.rect.top());
});
std::for_each(info.windowsData.cbegin(), info.windowsData.cend(),
[&toolTipScene, &screen](const WindowData &data) {
QPixmap window = screen->grabWindow(data.id);
- toolTipScene->addPixmap(window)->setOffset(
- data.rect.left(), data.rect.top());
+ toolTipScene->addPixmap(window)->setOffset(data.rect.left(),
+ data.rect.top());
});
}
@@ -189,8 +179,7 @@ QString DPAdds::toolTipImage(const int _desktop) const
delete toolTipView;
delete toolTipScene;
- return QString("
")
- .arg(QString(byteArray.toBase64()));
+ return QString("
").arg(QString(byteArray.toBase64()));
}
@@ -271,11 +260,9 @@ QVariantMap DPAdds::getFont(const QVariantMap &_defaultFont) const
QVariantMap fontMap;
int ret = 0;
- CFont defaultCFont
- = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(),
- 400, false, _defaultFont["color"].toString());
- CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false,
- false, &ret);
+ CFont defaultCFont = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(), 400,
+ false, _defaultFont["color"].toString());
+ CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, false, &ret);
fontMap["applied"] = ret;
fontMap["color"] = font.color().name();
@@ -291,10 +278,9 @@ void DPAdds::sendNotification(const QString &_eventId, const QString &_message)
{
qCDebug(LOG_DP) << "Event" << _eventId << "with message" << _message;
- KNotification *notification = KNotification::event(
- _eventId, QString("Desktop Panel ::: %1").arg(_eventId), _message);
- notification->setComponentName(
- "plasma-applet-org.kde.plasma.desktop-panel");
+ KNotification *notification
+ = KNotification::event(_eventId, QString("Desktop Panel ::: %1").arg(_eventId), _message);
+ notification->setComponentName("plasma-applet-org.kde.plasma.desktop-panel");
}
@@ -317,18 +303,15 @@ DPAdds::DesktopWindowsInfo DPAdds::getInfoByDesktop(const int _desktop) const
for (auto &id : KWindowSystem::windows()) {
KWindowInfo winInfo = KWindowInfo(
- id,
- NET::Property::WMDesktop | NET::Property::WMGeometry
- | NET::Property::WMState | NET::Property::WMWindowType
- | NET::Property::WMVisibleName);
+ id, NET::Property::WMDesktop | NET::Property::WMGeometry | NET::Property::WMState
+ | NET::Property::WMWindowType | NET::Property::WMVisibleName);
if (!winInfo.isOnDesktop(_desktop))
continue;
WindowData data;
data.id = id;
data.name = winInfo.visibleName();
data.rect = winInfo.geometry();
- if (winInfo.windowType(NET::WindowTypeMask::NormalMask)
- == NET::WindowType::Normal) {
+ if (winInfo.windowType(NET::WindowTypeMask::NormalMask) == NET::WindowType::Normal) {
if (winInfo.isMinimized())
continue;
info.windowsData.append(data);
diff --git a/sources/desktop-panel/plugin/dpadds.h b/sources/desktop-panel/plugin/dpadds.h
index b631c61..b8f8c2f 100644
--- a/sources/desktop-panel/plugin/dpadds.h
+++ b/sources/desktop-panel/plugin/dpadds.h
@@ -45,18 +45,15 @@ public:
virtual ~DPAdds();
Q_INVOKABLE bool isDebugEnabled() const;
Q_INVOKABLE int currentDesktop() const;
- Q_INVOKABLE QStringList dictKeys(const bool _sorted = true,
- const QString &_regexp = "") const;
+ Q_INVOKABLE QStringList dictKeys(const bool _sorted = true, const QString &_regexp = "") const;
Q_INVOKABLE int numberOfDesktops() const;
Q_INVOKABLE QString toolTipImage(const int _desktop) const;
- Q_INVOKABLE QString parsePattern(const QString &_pattern,
- const int _desktop) const;
+ Q_INVOKABLE QString parsePattern(const QString &_pattern, const int _desktop) const;
// values
Q_INVOKABLE void setMark(const QString &_newMark);
Q_INVOKABLE void setToolTipData(const QVariantMap &_tooltipData);
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
Q_INVOKABLE QString getAboutText(const QString &_type) const;
Q_INVOKABLE QVariantMap getFont(const QVariantMap &_defaultFont) const;
@@ -66,8 +63,7 @@ signals:
void windowListChanged() const;
public slots:
- Q_INVOKABLE static void sendNotification(const QString &_eventId,
- const QString &_message);
+ Q_INVOKABLE static void sendNotification(const QString &_eventId, const QString &_message);
Q_INVOKABLE void setCurrentDesktop(const int _desktop) const;
private:
diff --git a/sources/extsysmon/extsysmon.cpp b/sources/extsysmon/extsysmon.cpp
index fab99fd..65a8f1f 100644
--- a/sources/extsysmon/extsysmon.cpp
+++ b/sources/extsysmon/extsysmon.cpp
@@ -86,26 +86,22 @@ bool ExtendedSysMon::updateSourceEvent(const QString &_source)
void ExtendedSysMon::readConfiguration()
{
- QString fileName = QStandardPaths::locate(
- QStandardPaths::ConfigLocation, "plasma-dataengine-extsysmon.conf");
+ QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation,
+ "plasma-dataengine-extsysmon.conf");
qCInfo(LOG_ESM) << "Configuration file" << fileName;
QSettings settings(fileName, QSettings::IniFormat);
QHash rawConfig;
settings.beginGroup("Configuration");
- rawConfig["ACPIPATH"]
- = settings.value("ACPIPATH", "/sys/class/power_supply/").toString();
+ rawConfig["ACPIPATH"] = settings.value("ACPIPATH", "/sys/class/power_supply/").toString();
rawConfig["GPUDEV"] = settings.value("GPUDEV", "auto").toString();
rawConfig["HDDDEV"] = settings.value("HDDDEV", "all").toString();
- rawConfig["HDDTEMPCMD"]
- = settings.value("HDDTEMPCMD", "sudo smartctl -a").toString();
- rawConfig["MPDADDRESS"]
- = settings.value("MPDADDRESS", "localhost").toString();
+ rawConfig["HDDTEMPCMD"] = settings.value("HDDTEMPCMD", "sudo smartctl -a").toString();
+ rawConfig["MPDADDRESS"] = settings.value("MPDADDRESS", "localhost").toString();
rawConfig["MPDPORT"] = settings.value("MPDPORT", "6600").toString();
rawConfig["MPRIS"] = settings.value("MPRIS", "auto").toString();
rawConfig["PLAYER"] = settings.value("PLAYER", "mpris").toString();
- rawConfig["PLAYERSYMBOLS"]
- = settings.value("PLAYERSYMBOLS", "10").toString();
+ rawConfig["PLAYERSYMBOLS"] = settings.value("PLAYERSYMBOLS", "10").toString();
settings.endGroup();
m_configuration = updateConfiguration(rawConfig);
@@ -122,8 +118,7 @@ ExtendedSysMon::updateConfiguration(QHash _rawConfig) const
;
else if (_rawConfig["GPUDEV"] == "auto")
_rawConfig["GPUDEV"] = GPULoadSource::autoGpu();
- else if ((_rawConfig["GPUDEV"] != "ati")
- && (_rawConfig["GPUDEV"] != "nvidia"))
+ else if ((_rawConfig["GPUDEV"] != "ati") && (_rawConfig["GPUDEV"] != "nvidia"))
_rawConfig["GPUDEV"] = GPULoadSource::autoGpu();
// hdddev
QStringList allHddDevices = HDDTemperatureSource::allHdd();
@@ -132,8 +127,7 @@ ExtendedSysMon::updateConfiguration(QHash _rawConfig) const
} else if (_rawConfig["HDDDEV"] == "disable") {
_rawConfig["HDDDEV"] = "";
} else {
- QStringList deviceList
- = _rawConfig["HDDDEV"].split(',', QString::SkipEmptyParts);
+ QStringList deviceList = _rawConfig["HDDDEV"].split(',', QString::SkipEmptyParts);
QStringList devices;
QRegExp diskRegexp = QRegExp("^/dev/[hms]d[a-z]$");
for (auto &device : deviceList)
@@ -158,7 +152,6 @@ ExtendedSysMon::updateConfiguration(QHash _rawConfig) const
}
-K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(extsysmon, ExtendedSysMon,
- "plasma-dataengine-extsysmon.json")
+K_EXPORT_PLASMA_DATAENGINE_WITH_JSON(extsysmon, ExtendedSysMon, "plasma-dataengine-extsysmon.json")
#include "extsysmon.moc"
diff --git a/sources/extsysmon/extsysmon.h b/sources/extsysmon/extsysmon.h
index 16e3224..a211579 100644
--- a/sources/extsysmon/extsysmon.h
+++ b/sources/extsysmon/extsysmon.h
@@ -42,8 +42,7 @@ private:
QHash m_configuration;
// methods
void readConfiguration();
- QHash
- updateConfiguration(QHash _rawConfig) const;
+ QHash updateConfiguration(QHash _rawConfig) const;
};
diff --git a/sources/extsysmon/extsysmonaggregator.cpp b/sources/extsysmon/extsysmonaggregator.cpp
index 342ad75..2ab3e6e 100644
--- a/sources/extsysmon/extsysmonaggregator.cpp
+++ b/sources/extsysmon/extsysmonaggregator.cpp
@@ -34,8 +34,7 @@
#include "weathersource.h"
-ExtSysMonAggregator::ExtSysMonAggregator(QObject *_parent,
- const QHash &_config)
+ExtSysMonAggregator::ExtSysMonAggregator(QObject *_parent, const QHash &_config)
: QObject(_parent)
{
qCDebug(LOG_ESM) << __PRETTY_FUNCTION__;
@@ -72,8 +71,7 @@ QVariantMap ExtSysMonAggregator::initialData(const QString &_source) const
{
qCDebug(LOG_ESM) << "Source" << _source;
- return hasSource(_source) ? m_map[_source]->initialData(_source)
- : QVariantMap();
+ return hasSource(_source) ? m_map[_source]->initialData(_source) : QVariantMap();
}
@@ -97,8 +95,7 @@ void ExtSysMonAggregator::init(const QHash &_config)
for (auto &source : customItem->sources())
m_map[source] = customItem;
// desktop
- AbstractExtSysMonSource *desktopItem
- = new DesktopSource(this, QStringList());
+ AbstractExtSysMonSource *desktopItem = new DesktopSource(this, QStringList());
for (auto &source : desktopItem->sources())
m_map[source] = desktopItem;
// gpu load
@@ -112,30 +109,26 @@ void ExtSysMonAggregator::init(const QHash &_config)
for (auto &source : gpuTempItem->sources())
m_map[source] = gpuTempItem;
// hdd temperature
- AbstractExtSysMonSource *hddTempItem = new HDDTemperatureSource(
- this, QStringList({_config["HDDDEV"], _config["HDDTEMPCMD"]}));
+ AbstractExtSysMonSource *hddTempItem
+ = new HDDTemperatureSource(this, QStringList({_config["HDDDEV"], _config["HDDTEMPCMD"]}));
for (auto &source : hddTempItem->sources())
m_map[source] = hddTempItem;
// network
- AbstractExtSysMonSource *networkItem
- = new NetworkSource(this, QStringList());
+ AbstractExtSysMonSource *networkItem = new NetworkSource(this, QStringList());
for (auto &source : networkItem->sources())
m_map[source] = networkItem;
// player
AbstractExtSysMonSource *playerItem = new PlayerSource(
- this, QStringList({_config["PLAYER"], _config["MPDADDRESS"],
- _config["MPDPORT"], _config["MPRIS"],
- _config["PLAYERSYMBOLS"]}));
+ this, QStringList({_config["PLAYER"], _config["MPDADDRESS"], _config["MPDPORT"],
+ _config["MPRIS"], _config["PLAYERSYMBOLS"]}));
for (auto &source : playerItem->sources())
m_map[source] = playerItem;
// processes
- AbstractExtSysMonSource *processesItem
- = new ProcessesSource(this, QStringList());
+ AbstractExtSysMonSource *processesItem = new ProcessesSource(this, QStringList());
for (auto &source : processesItem->sources())
m_map[source] = processesItem;
// network request
- AbstractExtSysMonSource *requestItem
- = new RequestSource(this, QStringList());
+ AbstractExtSysMonSource *requestItem = new RequestSource(this, QStringList());
for (auto &source : requestItem->sources())
m_map[source] = requestItem;
// quotes
@@ -143,13 +136,11 @@ void ExtSysMonAggregator::init(const QHash &_config)
for (auto &source : quotesItem->sources())
m_map[source] = quotesItem;
// upgrade
- AbstractExtSysMonSource *upgradeItem
- = new UpgradeSource(this, QStringList());
+ AbstractExtSysMonSource *upgradeItem = new UpgradeSource(this, QStringList());
for (auto &source : upgradeItem->sources())
m_map[source] = upgradeItem;
// weather
- AbstractExtSysMonSource *weatherItem
- = new WeatherSource(this, QStringList());
+ AbstractExtSysMonSource *weatherItem = new WeatherSource(this, QStringList());
for (auto &source : weatherItem->sources())
m_map[source] = weatherItem;
#ifdef BUILD_LOAD
diff --git a/sources/extsysmon/extsysmonaggregator.h b/sources/extsysmon/extsysmonaggregator.h
index 8153141..f752f53 100644
--- a/sources/extsysmon/extsysmonaggregator.h
+++ b/sources/extsysmon/extsysmonaggregator.h
@@ -28,8 +28,7 @@ class ExtSysMonAggregator : public QObject
Q_OBJECT
public:
- explicit ExtSysMonAggregator(QObject *_parent,
- const QHash &_config);
+ explicit ExtSysMonAggregator(QObject *_parent, const QHash &_config);
virtual ~ExtSysMonAggregator();
QVariant data(const QString &_source) const;
bool hasSource(const QString &_source) const;
diff --git a/sources/extsysmonsources/batterysource.cpp b/sources/extsysmonsources/batterysource.cpp
index 810ce9c..4e9423f 100644
--- a/sources/extsysmonsources/batterysource.cpp
+++ b/sources/extsysmonsources/batterysource.cpp
@@ -54,8 +54,7 @@ QStringList BatterySource::getSources()
m_batteriesCount
= QDir(m_acpiPath)
- .entryList(QStringList({"BAT*"}),
- QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name)
+ .entryList(QStringList({"BAT*"}), QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name)
.count();
qCInfo(LOG_ESS) << "Init batteries count as" << m_batteriesCount;
@@ -165,16 +164,14 @@ void BatterySource::run()
// adaptor
QFile acFile(QString("%1/AC/online").arg(m_acpiPath));
if (acFile.open(QIODevice::ReadOnly | QIODevice::Text))
- m_values["battery/ac"]
- = (QString(acFile.readLine()).trimmed().toInt() == 1);
+ m_values["battery/ac"] = (QString(acFile.readLine()).trimmed().toInt() == 1);
acFile.close();
// batteries
float currentLevel = 0.0, fullLevel = 0.0;
for (int i = 0; i < m_batteriesCount; i++) {
// current level
- QFile currentLevelFile(
- QString("%1/BAT%2/energy_now").arg(m_acpiPath).arg(i));
+ QFile currentLevelFile(QString("%1/BAT%2/energy_now").arg(m_acpiPath).arg(i));
if (currentLevelFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
auto value = QString(currentLevelFile.readLine()).toInt();
m_trend[i + 1].append(value);
@@ -182,16 +179,15 @@ void BatterySource::run()
}
currentLevelFile.close();
// total
- QFile fullLevelFile(
- QString("%1/BAT%2/energy_full").arg(m_acpiPath).arg(i));
+ QFile fullLevelFile(QString("%1/BAT%2/energy_full").arg(m_acpiPath).arg(i));
if (fullLevelFile.open(QIODevice::ReadOnly | QIODevice::Text))
m_values[QString("battery/battotal%1").arg(i)]
= QString(fullLevelFile.readLine()).toInt();
fullLevelFile.close();
- m_values[QString("battery/bat%1").arg(i)] = static_cast(
- 100 * m_values[QString("battery/batnow%1").arg(i)].toFloat()
- / m_values[QString("battery/battotal%1").arg(i)].toFloat());
+ m_values[QString("battery/bat%1").arg(i)]
+ = static_cast(100 * m_values[QString("battery/batnow%1").arg(i)].toFloat()
+ / m_values[QString("battery/battotal%1").arg(i)].toFloat());
// accumulate
currentLevel += m_values[QString("battery/batnow%1").arg(i)].toFloat();
fullLevel += m_values[QString("battery/battotal%1").arg(i)].toFloat();
@@ -241,23 +237,20 @@ void BatterySource::calculateRates()
// check time interval
auto now = QDateTime::currentDateTimeUtc();
- auto interval
- = (now.toMSecsSinceEpoch() - m_timestamp.toMSecsSinceEpoch()) / 1000.0f;
+ auto interval = (now.toMSecsSinceEpoch() - m_timestamp.toMSecsSinceEpoch()) / 1000.0f;
m_timestamp.swap(now);
for (int i = 0; i < m_batteriesCount; i++) {
auto approx = approximate(m_trend[i + 1]);
m_values[QString("battery/batrate%1").arg(i)] = approx / interval;
m_values[QString("battery/batleft%1").arg(i)]
- = interval * m_values[QString("battery/batnow%1").arg(i)].toFloat()
- / approx;
+ = interval * m_values[QString("battery/batnow%1").arg(i)].toFloat() / approx;
}
// total
auto approx = approximate(m_trend[0]);
m_values["battery/batrate"] = approx / interval;
- m_values["battery/batleft"]
- = interval * m_values["battery/batnow"].toFloat() / approx;
+ m_values["battery/batleft"] = interval * m_values["battery/batnow"].toFloat() / approx;
// old data cleanup
for (auto &trend : m_trend.keys()) {
diff --git a/sources/extsysmonsources/customsource.cpp b/sources/extsysmonsources/customsource.cpp
index e4d9664..912a501 100644
--- a/sources/extsysmonsources/customsource.cpp
+++ b/sources/extsysmonsources/customsource.cpp
@@ -45,10 +45,7 @@ QVariant CustomSource::data(const QString &_source)
qCDebug(LOG_ESS) << "Source" << _source;
// there are only one value
- return m_extScripts->itemByTagNumber(index(_source))
- ->run()
- .values()
- .first();
+ return m_extScripts->itemByTagNumber(index(_source))->run().values().first();
}
@@ -59,9 +56,8 @@ QVariantMap CustomSource::initialData(const QString &_source) const
QVariantMap data;
data["min"] = "";
data["max"] = "";
- data["name"]
- = QString("Custom command '%1' output")
- .arg(m_extScripts->itemByTagNumber(index(_source))->uniq());
+ data["name"] = QString("Custom command '%1' output")
+ .arg(m_extScripts->itemByTagNumber(index(_source))->uniq());
data["type"] = "QString";
data["units"] = "";
diff --git a/sources/extsysmonsources/gpuloadsource.cpp b/sources/extsysmonsources/gpuloadsource.cpp
index 72840fa..f35d73c 100644
--- a/sources/extsysmonsources/gpuloadsource.cpp
+++ b/sources/extsysmonsources/gpuloadsource.cpp
@@ -36,8 +36,7 @@ GPULoadSource::GPULoadSource(QObject *_parent, const QStringList &_args)
m_process = new QProcess(nullptr);
// fucking magic from http://doc.qt.io/qt-5/qprocess.html#finished
connect(m_process,
- static_cast(
- &QProcess::finished),
+ static_cast(&QProcess::finished),
[this](int, QProcess::ExitStatus) { return updateValue(); });
m_process->waitForFinished(0);
}
@@ -57,8 +56,7 @@ QString GPULoadSource::autoGpu()
QString gpu = "disable";
QFile moduleFile("/proc/modules");
if (!moduleFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
- qCWarning(LOG_AW) << "Could not open file as text"
- << moduleFile.fileName();
+ qCWarning(LOG_AW) << "Could not open file as text" << moduleFile.fileName();
return gpu;
}
@@ -107,8 +105,7 @@ void GPULoadSource::run()
if ((m_device != "nvidia") && (m_device != "ati"))
return;
// build cmd
- QString cmd = m_device == "nvidia" ? "nvidia-smi -q -x"
- : "aticonfig --od-getclocks";
+ QString cmd = m_device == "nvidia" ? "nvidia-smi -q -x" : "aticonfig --od-getclocks";
qCInfo(LOG_ESS) << "cmd" << cmd;
m_process->start(cmd);
@@ -127,21 +124,18 @@ QStringList GPULoadSource::sources() const
void GPULoadSource::updateValue()
{
qCInfo(LOG_ESS) << "Cmd returns" << m_process->exitCode();
- QString qdebug = QTextCodec::codecForMib(106)
- ->toUnicode(m_process->readAllStandardError())
- .trimmed();
+ QString qdebug
+ = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed();
qCInfo(LOG_ESS) << "Error" << qdebug;
- QString qoutput = QTextCodec::codecForMib(106)
- ->toUnicode(m_process->readAllStandardOutput())
- .trimmed();
+ QString qoutput
+ = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
qCInfo(LOG_ESS) << "Output" << qoutput;
if (m_device == "nvidia") {
for (auto &str : qoutput.split('\n', QString::SkipEmptyParts)) {
if (!str.contains(""))
continue;
- auto load
- = str.remove("").remove("").remove('%');
+ auto load = str.remove("").remove("").remove('%');
m_values["gpu/load"] = load.toFloat();
break;
}
@@ -149,8 +143,7 @@ void GPULoadSource::updateValue()
for (auto &str : qoutput.split('\n', QString::SkipEmptyParts)) {
if (!str.contains("load"))
continue;
- QString load
- = str.split(' ', QString::SkipEmptyParts)[3].remove('%');
+ QString load = str.split(' ', QString::SkipEmptyParts)[3].remove('%');
m_values["gpu/load"] = load.toFloat();
break;
}
diff --git a/sources/extsysmonsources/gputempsource.cpp b/sources/extsysmonsources/gputempsource.cpp
index 1b6e401..6a3b796 100644
--- a/sources/extsysmonsources/gputempsource.cpp
+++ b/sources/extsysmonsources/gputempsource.cpp
@@ -25,8 +25,7 @@
#include "awdebug.h"
-GPUTemperatureSource::GPUTemperatureSource(QObject *_parent,
- const QStringList &_args)
+GPUTemperatureSource::GPUTemperatureSource(QObject *_parent, const QStringList &_args)
: AbstractExtSysMonSource(_parent, _args)
{
Q_ASSERT(_args.count() == 1);
@@ -37,8 +36,7 @@ GPUTemperatureSource::GPUTemperatureSource(QObject *_parent,
m_process = new QProcess(nullptr);
// fucking magic from http://doc.qt.io/qt-5/qprocess.html#finished
connect(m_process,
- static_cast(
- &QProcess::finished),
+ static_cast(&QProcess::finished),
[this](int, QProcess::ExitStatus) { return updateValue(); });
m_process->waitForFinished(0);
}
@@ -86,8 +84,7 @@ void GPUTemperatureSource::run()
if ((m_device != "nvidia") && (m_device != "ati"))
return;
// build cmd
- QString cmd = m_device == "nvidia" ? "nvidia-smi -q -x"
- : "aticonfig --od-gettemperature";
+ QString cmd = m_device == "nvidia" ? "nvidia-smi -q -x" : "aticonfig --od-gettemperature";
qCInfo(LOG_ESS) << "cmd" << cmd;
m_process->start(cmd);
@@ -106,13 +103,11 @@ QStringList GPUTemperatureSource::sources() const
void GPUTemperatureSource::updateValue()
{
qCInfo(LOG_ESS) << "Cmd returns" << m_process->exitCode();
- QString qdebug = QTextCodec::codecForMib(106)
- ->toUnicode(m_process->readAllStandardError())
- .trimmed();
+ QString qdebug
+ = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed();
qCInfo(LOG_ESS) << "Error" << qdebug;
- QString qoutput = QTextCodec::codecForMib(106)
- ->toUnicode(m_process->readAllStandardOutput())
- .trimmed();
+ QString qoutput
+ = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
qCInfo(LOG_ESS) << "Output" << qoutput;
if (m_device == "nvidia") {
diff --git a/sources/extsysmonsources/hddtempsource.cpp b/sources/extsysmonsources/hddtempsource.cpp
index ef67deb..361c7be 100644
--- a/sources/extsysmonsources/hddtempsource.cpp
+++ b/sources/extsysmonsources/hddtempsource.cpp
@@ -25,8 +25,7 @@
#include "awdebug.h"
-HDDTemperatureSource::HDDTemperatureSource(QObject *_parent,
- const QStringList &_args)
+HDDTemperatureSource::HDDTemperatureSource(QObject *_parent, const QStringList &_args)
: AbstractExtSysMonSource(_parent, _args)
{
Q_ASSERT(_args.count() == 2);
@@ -42,11 +41,8 @@ HDDTemperatureSource::HDDTemperatureSource(QObject *_parent,
m_processes[device] = new QProcess(nullptr);
// fucking magic from http://doc.qt.io/qt-5/qprocess.html#finished
connect(m_processes[device],
- static_cast(
- &QProcess::finished),
- [this, device](int, QProcess::ExitStatus) {
- return updateValue(device);
- });
+ static_cast(&QProcess::finished),
+ [this, device](int, QProcess::ExitStatus) { return updateValue(device); });
m_processes[device]->waitForFinished(0);
}
}
@@ -121,15 +117,13 @@ void HDDTemperatureSource::updateValue(const QString &_device)
qCDebug(LOG_ESS) << "Called with device" << _device;
qCInfo(LOG_ESS) << "Cmd returns" << m_processes[_device]->exitCode();
- QString qdebug
- = QTextCodec::codecForMib(106)
- ->toUnicode(m_processes[_device]->readAllStandardError())
- .trimmed();
+ QString qdebug = QTextCodec::codecForMib(106)
+ ->toUnicode(m_processes[_device]->readAllStandardError())
+ .trimmed();
qCInfo(LOG_ESS) << "Error" << qdebug;
- QString qoutput
- = QTextCodec::codecForMib(106)
- ->toUnicode(m_processes[_device]->readAllStandardOutput())
- .trimmed();
+ QString qoutput = QTextCodec::codecForMib(106)
+ ->toUnicode(m_processes[_device]->readAllStandardOutput())
+ .trimmed();
qCInfo(LOG_ESS) << "Output" << qoutput;
// parse
@@ -140,8 +134,7 @@ void HDDTemperatureSource::updateValue(const QString &_device)
continue;
if (str.split(' ', QString::SkipEmptyParts).count() < 9)
continue;
- m_values[_device]
- = str.split(' ', QString::SkipEmptyParts).at(9).toFloat();
+ m_values[_device] = str.split(' ', QString::SkipEmptyParts).at(9).toFloat();
break;
}
} else {
diff --git a/sources/extsysmonsources/networksource.cpp b/sources/extsysmonsources/networksource.cpp
index 754b14a..ebe41ca 100644
--- a/sources/extsysmonsources/networksource.cpp
+++ b/sources/extsysmonsources/networksource.cpp
@@ -43,13 +43,11 @@ QVariant NetworkSource::data(const QString &_source)
if (_source == "network/current/name") {
QString device = "lo";
- QList rawInterfaceList
- = QNetworkInterface::allInterfaces();
+ QList rawInterfaceList = QNetworkInterface::allInterfaces();
qCInfo(LOG_ESS) << "Devices" << rawInterfaceList;
for (auto &interface : rawInterfaceList) {
if ((interface.flags().testFlag(QNetworkInterface::IsLoopBack))
- || (interface.flags().testFlag(
- QNetworkInterface::IsPointToPoint)))
+ || (interface.flags().testFlag(QNetworkInterface::IsPointToPoint)))
continue;
if (interface.addressEntries().isEmpty())
continue;
diff --git a/sources/extsysmonsources/playersource.cpp b/sources/extsysmonsources/playersource.cpp
index 17d90bc..add634e 100644
--- a/sources/extsysmonsources/playersource.cpp
+++ b/sources/extsysmonsources/playersource.cpp
@@ -40,12 +40,9 @@ PlayerSource::PlayerSource(QObject *_parent, const QStringList &_args)
m_mpris = _args.at(3);
m_symbols = _args.at(4).toInt();
- connect(&m_mpdSocket, SIGNAL(connected()), this,
- SLOT(mpdSocketConnected()));
- connect(&m_mpdSocket, SIGNAL(readyRead()), this,
- SLOT(mpdSocketReadyRead()));
- connect(&m_mpdSocket, SIGNAL(bytesWritten(qint64)), this,
- SLOT(mpdSocketWritten(const qint64)));
+ connect(&m_mpdSocket, SIGNAL(connected()), this, SLOT(mpdSocketConnected()));
+ connect(&m_mpdSocket, SIGNAL(readyRead()), this, SLOT(mpdSocketReadyRead()));
+ connect(&m_mpdSocket, SIGNAL(bytesWritten(qint64)), this, SLOT(mpdSocketWritten(const qint64)));
m_mpdCached = defaultInfo();
}
@@ -71,8 +68,8 @@ QVariant PlayerSource::data(const QString &_source)
QString PlayerSource::getAutoMpris() const
{
- QDBusMessage listServices = QDBusConnection::sessionBus().interface()->call(
- QDBus::BlockWithGui, "ListNames");
+ QDBusMessage listServices
+ = QDBusConnection::sessionBus().interface()->call(QDBus::BlockWithGui, "ListNames");
if (listServices.arguments().isEmpty()) {
qCWarning(LOG_ESS) << "Could not find any DBus service";
return "";
@@ -106,15 +103,13 @@ QVariantMap PlayerSource::initialData(const QString &_source) const
} else if (_source == "player/salbum") {
data["min"] = "";
data["max"] = "";
- data["name"]
- = QString("Current song album (%1 symbols)").arg(m_symbols);
+ data["name"] = QString("Current song album (%1 symbols)").arg(m_symbols);
data["type"] = "QString";
data["units"] = "";
} else if (_source == "player/dalbum") {
data["min"] = "";
data["max"] = "";
- data["name"] = QString("Current song album (%1 symbols, dynamic)")
- .arg(m_symbols);
+ data["name"] = QString("Current song album (%1 symbols, dynamic)").arg(m_symbols);
data["type"] = "QString";
data["units"] = "";
} else if (_source == "player/artist") {
@@ -126,15 +121,13 @@ QVariantMap PlayerSource::initialData(const QString &_source) const
} else if (_source == "player/sartist") {
data["min"] = "";
data["max"] = "";
- data["name"]
- = QString("Current song artist (%1 symbols)").arg(m_symbols);
+ data["name"] = QString("Current song artist (%1 symbols)").arg(m_symbols);
data["type"] = "QString";
data["units"] = "";
} else if (_source == "player/dartist") {
data["min"] = "";
data["max"] = "";
- data["name"] = QString("Current song artist (%1 symbols, dynamic)")
- .arg(m_symbols);
+ data["name"] = QString("Current song artist (%1 symbols, dynamic)").arg(m_symbols);
data["type"] = "QString";
data["units"] = "";
} else if (_source == "player/duration") {
@@ -158,15 +151,13 @@ QVariantMap PlayerSource::initialData(const QString &_source) const
} else if (_source == "player/stitle") {
data["min"] = "";
data["max"] = "";
- data["name"]
- = QString("Current song title (%1 symbols)").arg(m_symbols);
+ data["name"] = QString("Current song title (%1 symbols)").arg(m_symbols);
data["type"] = "QString";
data["units"] = "";
} else if (_source == "player/dtitle") {
data["min"] = "";
data["max"] = "";
- data["name"] = QString("Current song title (%1 symbols, dynamic)")
- .arg(m_symbols);
+ data["name"] = QString("Current song title (%1 symbols, dynamic)").arg(m_symbols);
data["type"] = "QString";
data["units"] = "";
}
@@ -192,22 +183,16 @@ void PlayerSource::run()
// dymanic properties
// solid
- m_values["player/salbum"]
- = stripString(m_values["player/album"].toString(), m_symbols);
- m_values["player/sartist"]
- = stripString(m_values["player/artist"].toString(), m_symbols);
- m_values["player/stitle"]
- = stripString(m_values["player/title"].toString(), m_symbols);
+ m_values["player/salbum"] = stripString(m_values["player/album"].toString(), m_symbols);
+ m_values["player/sartist"] = stripString(m_values["player/artist"].toString(), m_symbols);
+ m_values["player/stitle"] = stripString(m_values["player/title"].toString(), m_symbols);
// dynamic
- m_values["player/dalbum"]
- = buildString(m_values["player/dalbum"].toString(),
- m_values["player/album"].toString(), m_symbols);
- m_values["player/dartist"]
- = buildString(m_values["player/dartist"].toString(),
- m_values["player/artist"].toString(), m_symbols);
- m_values["player/dtitle"]
- = buildString(m_values["player/dtitle"].toString(),
- m_values["player/title"].toString(), m_symbols);
+ m_values["player/dalbum"] = buildString(m_values["player/dalbum"].toString(),
+ m_values["player/album"].toString(), m_symbols);
+ m_values["player/dartist"] = buildString(m_values["player/dartist"].toString(),
+ m_values["player/artist"].toString(), m_symbols);
+ m_values["player/dtitle"] = buildString(m_values["player/dtitle"].toString(),
+ m_values["player/title"].toString(), m_symbols);
}
@@ -230,8 +215,7 @@ QStringList PlayerSource::sources() const
}
-QString PlayerSource::buildString(const QString &_current,
- const QString &_value, const int _s)
+QString PlayerSource::buildString(const QString &_current, const QString &_value, const int _s)
{
qCDebug(LOG_ESS) << "Current value" << _current << "received" << _value
<< "will be stripped after" << _s;
@@ -240,8 +224,7 @@ QString PlayerSource::buildString(const QString &_current,
if ((_current.isEmpty()) || ((index + _s + 1) > _value.count()))
return QString("%1").arg(_value.left(_s), -_s, QLatin1Char(' '));
else
- return QString("%1").arg(_value.mid(index + 1, _s), -_s,
- QLatin1Char(' '));
+ return QString("%1").arg(_value.mid(index + 1, _s), -_s, QLatin1Char(' '));
}
@@ -262,26 +245,22 @@ bool PlayerSource::isMpdSocketConnected() const
void PlayerSource::mpdSocketConnected()
{
- qCDebug(LOG_ESS) << "MPD socket connected to" << m_mpdSocket.peerName()
- << "with state" << m_mpdSocket.state();
+ qCDebug(LOG_ESS) << "MPD socket connected to" << m_mpdSocket.peerName() << "with state"
+ << m_mpdSocket.state();
}
void PlayerSource::mpdSocketReadyRead()
{
- QString qoutput = QTextCodec::codecForMib(106)
- ->toUnicode(m_mpdSocket.readAll())
- .trimmed();
+ QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_mpdSocket.readAll()).trimmed();
qCInfo(LOG_ESS) << "Output" << qoutput;
// parse
for (auto &str : qoutput.split('\n', QString::SkipEmptyParts)) {
if (str.split(": ", QString::SkipEmptyParts).count() == 2) {
// "Metadata: data"
- QString metadata
- = str.split(": ", QString::SkipEmptyParts).first().toLower();
- QString data
- = str.split(": ", QString::SkipEmptyParts).last().trimmed();
+ QString metadata = str.split(": ", QString::SkipEmptyParts).first().toLower();
+ QString data = str.split(": ", QString::SkipEmptyParts).last().trimmed();
// there are one more time...
if ((metadata == "time") && (data.contains(':'))) {
QStringList times = data.split(':');
@@ -299,8 +278,7 @@ void PlayerSource::mpdSocketReadyRead()
void PlayerSource::mpdSocketWritten(const qint64 _bytes)
{
- qCDebug(LOG_ESS) << "Bytes written" << _bytes << "to"
- << m_mpdSocket.peerName();
+ qCDebug(LOG_ESS) << "Bytes written" << _bytes << "to" << m_mpdSocket.peerName();
}
@@ -326,8 +304,7 @@ QVariantHash PlayerSource::getPlayerMpdInfo()
} else if (m_mpdSocket.state() == QAbstractSocket::ConnectedState) {
// send request
if (m_mpdSocket.write(MPD_STATUS_REQUEST) == -1)
- qCWarning(LOG_ESS)
- << "Could not write request to" << m_mpdSocket.peerName();
+ qCWarning(LOG_ESS) << "Could not write request to" << m_mpdSocket.peerName();
}
return m_mpdCached;
@@ -351,30 +328,22 @@ QVariantHash PlayerSource::getPlayerMprisInfo(const QString &_mpris) const
// dbus-send --print-reply --session --dest=org.mpris.MediaPlayer2.vlc
// /org/mpris/MediaPlayer2 org.freedesktop.DBus.Properties.Get
// string:'org.mpris.MediaPlayer2.Player' string:'Metadata'
- QVariantList args
- = QVariantList({"org.mpris.MediaPlayer2.Player", "Metadata"});
+ QVariantList args = QVariantList({"org.mpris.MediaPlayer2.Player", "Metadata"});
QDBusMessage request = QDBusMessage::createMethodCall(
- QString("org.mpris.MediaPlayer2.%1").arg(_mpris),
- "/org/mpris/MediaPlayer2", "org.freedesktop.DBus.Properties", "Get");
+ QString("org.mpris.MediaPlayer2.%1").arg(_mpris), "/org/mpris/MediaPlayer2",
+ "org.freedesktop.DBus.Properties", "Get");
request.setArguments(args);
- QDBusMessage response
- = bus.call(request, QDBus::BlockWithGui, REQUEST_TIMEOUT);
- if ((response.type() != QDBusMessage::ReplyMessage)
- || (response.arguments().isEmpty())) {
+ QDBusMessage response = bus.call(request, QDBus::BlockWithGui, REQUEST_TIMEOUT);
+ if ((response.type() != QDBusMessage::ReplyMessage) || (response.arguments().isEmpty())) {
qCWarning(LOG_ESS) << "Error message" << response.errorMessage();
} else {
// another portion of dirty magic
- QVariantHash map
- = qdbus_cast(response.arguments()
- .first()
- .value()
- .variant()
- .value());
+ QVariantHash map = qdbus_cast(
+ response.arguments().first().value().variant().value());
info["player/album"] = map.value("xesam:album", "unknown");
// artist is array
info["player/artist"] = map.value("xesam:artist", "unknown").toString();
- info["player/duration"]
- = map.value("mpris:length", 0).toInt() / (1000 * 1000);
+ info["player/duration"] = map.value("mpris:length", 0).toInt() / (1000 * 1000);
info["player/title"] = map.value("xesam:title", "unknown");
}
@@ -382,17 +351,13 @@ QVariantHash PlayerSource::getPlayerMprisInfo(const QString &_mpris) const
args[1] = "Position";
request.setArguments(args);
response = bus.call(request, QDBus::BlockWithGui);
- if ((response.type() != QDBusMessage::ReplyMessage)
- || (response.arguments().isEmpty())) {
+ if ((response.type() != QDBusMessage::ReplyMessage) || (response.arguments().isEmpty())) {
qCWarning(LOG_ESS) << "Error message" << response.errorMessage();
} else {
// this cast is simpler than the previous one ;)
- info["player/progress"] = response.arguments()
- .first()
- .value()
- .variant()
- .toLongLong()
- / (1000 * 1000);
+ info["player/progress"]
+ = response.arguments().first().value().variant().toLongLong()
+ / (1000 * 1000);
}
return info;
diff --git a/sources/extsysmonsources/playersource.h b/sources/extsysmonsources/playersource.h
index 84ed556..ed30f78 100644
--- a/sources/extsysmonsources/playersource.h
+++ b/sources/extsysmonsources/playersource.h
@@ -42,8 +42,7 @@ public:
void run();
QStringList sources() const;
// additional method to build dynamic tags
- static QString buildString(const QString &_current, const QString &_value,
- const int _s);
+ static QString buildString(const QString &_current, const QString &_value, const int _s);
static QString stripString(const QString &_value, const int _s);
// additional test method
bool isMpdSocketConnected() const;
diff --git a/sources/extsysmonsources/processessource.cpp b/sources/extsysmonsources/processessource.cpp
index 20c868e..99b3287 100644
--- a/sources/extsysmonsources/processessource.cpp
+++ b/sources/extsysmonsources/processessource.cpp
@@ -79,8 +79,8 @@ QVariantMap ProcessesSource::initialData(const QString &_source) const
void ProcessesSource::run()
{
- QStringList allDirectories = QDir("/proc").entryList(
- QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
+ QStringList allDirectories
+ = QDir("/proc").entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
QStringList directories = allDirectories.filter(QRegExp("(\\d+)"));
QStringList running;
diff --git a/sources/extsysmonsources/quotessource.cpp b/sources/extsysmonsources/quotessource.cpp
index 2a29cad..3b07f08 100644
--- a/sources/extsysmonsources/quotessource.cpp
+++ b/sources/extsysmonsources/quotessource.cpp
@@ -63,49 +63,7 @@ QVariantMap QuotesSource::initialData(const QString &_source) const
int ind = index(_source);
QVariantMap data;
- if (_source.startsWith("quotes/askchg")) {
- data["min"] = 0.0;
- data["max"] = 0.0;
- data["name"] = QString("Absolute ask changes for '%1'")
- .arg(m_extQuotes->itemByTagNumber(ind)->uniq());
- data["type"] = "double";
- data["units"] = "";
- } else if (_source.startsWith("quotes/ask")) {
- data["min"] = 0.0;
- data["max"] = 0.0;
- data["name"] = QString("Ask for '%1'")
- .arg(m_extQuotes->itemByTagNumber(ind)->uniq());
- data["type"] = "double";
- data["units"] = "";
- } else if (_source.startsWith("quotes/percaskchg")) {
- data["min"] = -100.0;
- data["max"] = 100.0;
- data["name"] = QString("Ask changes for '%1'")
- .arg(m_extQuotes->itemByTagNumber(ind)->uniq());
- data["type"] = "double";
- data["units"] = "";
- } else if (_source.startsWith("quotes/bidchg")) {
- data["min"] = 0.0;
- data["max"] = 0.0;
- data["name"] = QString("Absolute bid changes for '%1'")
- .arg(m_extQuotes->itemByTagNumber(ind)->uniq());
- data["type"] = "double";
- data["units"] = "";
- } else if (_source.startsWith("quotes/bid")) {
- data["min"] = 0.0;
- data["max"] = 0.0;
- data["name"] = QString("Bid for '%1'")
- .arg(m_extQuotes->itemByTagNumber(ind)->uniq());
- data["type"] = "double";
- data["units"] = "";
- } else if (_source.startsWith("quotes/percbidchg")) {
- data["min"] = -100.0;
- data["max"] = 100.0;
- data["name"] = QString("Bid changes for '%1'")
- .arg(m_extQuotes->itemByTagNumber(ind)->uniq());
- data["type"] = "double";
- data["units"] = "";
- } else if (_source.startsWith("quotes/pricechg")) {
+ if (_source.startsWith("quotes/pricechg")) {
data["min"] = 0.0;
data["max"] = 0.0;
data["name"] = QString("Absolute prie changes for '%1'")
@@ -115,15 +73,34 @@ QVariantMap QuotesSource::initialData(const QString &_source) const
} else if (_source.startsWith("quotes/price")) {
data["min"] = 0.0;
data["max"] = 0.0;
- data["name"] = QString("Price for '%1'")
- .arg(m_extQuotes->itemByTagNumber(ind)->uniq());
+ data["name"] = QString("Price for '%1'").arg(m_extQuotes->itemByTagNumber(ind)->uniq());
data["type"] = "double";
data["units"] = "";
} else if (_source.startsWith("quotes/percpricechg")) {
data["min"] = -100.0;
data["max"] = 100.0;
- data["name"] = QString("Price changes for '%1'")
+ data["name"]
+ = QString("Price changes for '%1'").arg(m_extQuotes->itemByTagNumber(ind)->uniq());
+ data["type"] = "double";
+ data["units"] = "";
+ } else if (_source.startsWith("quotes/volumechg")) {
+ data["min"] = 0;
+ data["max"] = 0;
+ data["name"] = QString("Absolute volume changes for '%1'")
.arg(m_extQuotes->itemByTagNumber(ind)->uniq());
+ data["type"] = "int";
+ data["units"] = "";
+ } else if (_source.startsWith("quotes/volume")) {
+ data["min"] = 0;
+ data["max"] = 0;
+ data["name"] = QString("Volume for '%1'").arg(m_extQuotes->itemByTagNumber(ind)->uniq());
+ data["type"] = "int";
+ data["units"] = "";
+ } else if (_source.startsWith("quotes/percvolumechg")) {
+ data["min"] = -100.0;
+ data["max"] = 100.0;
+ data["name"]
+ = QString("Volume changes for '%1'").arg(m_extQuotes->itemByTagNumber(ind)->uniq());
data["type"] = "double";
data["units"] = "";
}
@@ -142,15 +119,12 @@ QStringList QuotesSource::getSources()
{
QStringList sources;
for (auto &item : m_extQuotes->activeItems()) {
- sources.append(QString("quotes/%1").arg(item->tag("ask")));
- sources.append(QString("quotes/%1").arg(item->tag("askchg")));
- sources.append(QString("quotes/%1").arg(item->tag("percaskchg")));
- sources.append(QString("quotes/%1").arg(item->tag("bid")));
- sources.append(QString("quotes/%1").arg(item->tag("bidchg")));
- sources.append(QString("quotes/%1").arg(item->tag("percbidchg")));
sources.append(QString("quotes/%1").arg(item->tag("price")));
sources.append(QString("quotes/%1").arg(item->tag("pricechg")));
sources.append(QString("quotes/%1").arg(item->tag("percpricechg")));
+ sources.append(QString("quotes/%1").arg(item->tag("volume")));
+ sources.append(QString("quotes/%1").arg(item->tag("volumechg")));
+ sources.append(QString("quotes/%1").arg(item->tag("percvolumechg")));
}
return sources;
diff --git a/sources/extsysmonsources/requestsource.cpp b/sources/extsysmonsources/requestsource.cpp
index 6ac889b..4e85008 100644
--- a/sources/extsysmonsources/requestsource.cpp
+++ b/sources/extsysmonsources/requestsource.cpp
@@ -28,8 +28,7 @@ RequestSource::RequestSource(QObject *_parent, const QStringList &_args)
Q_ASSERT(_args.count() == 0);
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
- m_extNetRequest
- = new ExtItemAggregator(nullptr, "requests");
+ m_extNetRequest = new ExtItemAggregator(nullptr, "requests");
m_extNetRequest->initSockets();
m_sources = getSources();
}
@@ -67,8 +66,8 @@ QVariantMap RequestSource::initialData(const QString &_source) const
if (_source.startsWith("network/response")) {
data["min"] = "";
data["max"] = "";
- data["name"] = QString("Network response for %1")
- .arg(m_extNetRequest->itemByTagNumber(ind)->uniq());
+ data["name"]
+ = QString("Network response for %1").arg(m_extNetRequest->itemByTagNumber(ind)->uniq());
data["type"] = "QString";
data["units"] = "";
}
diff --git a/sources/extsysmonsources/upgradesource.cpp b/sources/extsysmonsources/upgradesource.cpp
index 1968e24..1ece01f 100644
--- a/sources/extsysmonsources/upgradesource.cpp
+++ b/sources/extsysmonsources/upgradesource.cpp
@@ -45,10 +45,7 @@ QVariant UpgradeSource::data(const QString &_source)
qCDebug(LOG_ESS) << "Source" << _source;
// there are only one value
- return m_extUpgrade->itemByTagNumber(index(_source))
- ->run()
- .values()
- .first();
+ return m_extUpgrade->itemByTagNumber(index(_source))->run().values().first();
}
@@ -59,9 +56,8 @@ QVariantMap UpgradeSource::initialData(const QString &_source) const
QVariantMap data;
data["min"] = "";
data["max"] = "";
- data["name"]
- = QString("Package manager '%1' metadata")
- .arg(m_extUpgrade->itemByTagNumber(index(_source))->uniq());
+ data["name"] = QString("Package manager '%1' metadata")
+ .arg(m_extUpgrade->itemByTagNumber(index(_source))->uniq());
data["type"] = "QString";
data["units"] = "";
diff --git a/sources/extsysmonsources/weathersource.cpp b/sources/extsysmonsources/weathersource.cpp
index 576a285..6973ca1 100644
--- a/sources/extsysmonsources/weathersource.cpp
+++ b/sources/extsysmonsources/weathersource.cpp
@@ -73,15 +73,14 @@ QVariantMap WeatherSource::initialData(const QString &_source) const
} else if (_source.startsWith("weather/weather")) {
data["min"] = "";
data["max"] = "";
- data["name"] = QString("ID string map for '%1'")
- .arg(m_extWeather->itemByTagNumber(ind)->uniq());
+ data["name"]
+ = QString("ID string map for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
data["type"] = "QString";
data["units"] = "";
} else if (_source.startsWith("weather/humidity")) {
data["min"] = 0;
data["max"] = 100;
- data["name"] = QString("Humidity for '%1'")
- .arg(m_extWeather->itemByTagNumber(ind)->uniq());
+ data["name"] = QString("Humidity for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
data["type"] = "integer";
data["units"] = "%";
} else if (_source.startsWith("weather/pressure")) {
@@ -94,15 +93,15 @@ QVariantMap WeatherSource::initialData(const QString &_source) const
} else if (_source.startsWith("weather/temperature")) {
data["min"] = 0.0;
data["max"] = 0.0;
- data["name"] = QString("Temperature for '%1'")
- .arg(m_extWeather->itemByTagNumber(ind)->uniq());
+ data["name"]
+ = QString("Temperature for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
data["type"] = "float";
data["units"] = "°C";
} else if (_source.startsWith("weather/timestamp")) {
data["min"] = "";
data["max"] = "";
- data["name"] = QString("Timestamp for '%1'")
- .arg(m_extWeather->itemByTagNumber(ind)->uniq());
+ data["name"]
+ = QString("Timestamp for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
data["type"] = "QString";
data["units"] = "";
}
diff --git a/sources/qml/General.qml b/sources/qml/General.qml
index 690e716..c96ede0 100644
--- a/sources/qml/General.qml
+++ b/sources/qml/General.qml
@@ -88,7 +88,7 @@ QtObject {
},
{
"label": i18n("Quotes"),
- "regexp": "^(perc)?(ask|bid|price)(chg)?.*"
+ "regexp": "^(perc)?(price|volume)(chg)?.*"
},
{
"label": i18n("Upgrades"),
diff --git a/sources/test/awtestlibrary.cpp b/sources/test/awtestlibrary.cpp
index 4ba9ce2..ec6ddda 100644
--- a/sources/test/awtestlibrary.cpp
+++ b/sources/test/awtestlibrary.cpp
@@ -59,11 +59,11 @@ double AWTestLibrary::randomDouble()
QPair AWTestLibrary::randomFilenames()
{
- QString fileName = QString("%1/").arg(
- QStandardPaths::writableLocation(QStandardPaths::TempLocation));
- QString writeFileName = QString("%1/awesomewidgets/tmp/")
- .arg(QStandardPaths::writableLocation(
- QStandardPaths::GenericDataLocation));
+ QString fileName
+ = QString("%1/").arg(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
+ QString writeFileName
+ = QString("%1/awesomewidgets/tmp/")
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
QString name = randomString(1, 20);
fileName += name;
diff --git a/sources/test/testabstractformatter.cpp b/sources/test/testabstractformatter.cpp
index ac356f3..78cc30d 100644
--- a/sources/test/testabstractformatter.cpp
+++ b/sources/test/testabstractformatter.cpp
@@ -37,9 +37,7 @@ void TestAbstractFormatter::cleanupTestCase()
}
-void TestAbstractFormatter::test_values()
-{
-}
+void TestAbstractFormatter::test_values() {}
void TestAbstractFormatter::test_type()
diff --git a/sources/test/testawbugreporter.cpp b/sources/test/testawbugreporter.cpp
index d57d88e..ed18109 100644
--- a/sources/test/testawbugreporter.cpp
+++ b/sources/test/testawbugreporter.cpp
@@ -40,8 +40,7 @@ void TestAWBugReporter::cleanupTestCase()
void TestAWBugReporter::test_generateText()
{
data = AWTestLibrary::randomStringList(4);
- QString output
- = plugin->generateText(data.at(0), data.at(1), data.at(2), data.at(3));
+ QString output = plugin->generateText(data.at(0), data.at(1), data.at(2), data.at(3));
for (auto &string : data)
QVERIFY(output.contains(string));
@@ -51,9 +50,8 @@ void TestAWBugReporter::test_generateText()
void TestAWBugReporter::test_sendBugReport()
{
QSignalSpy spy(plugin, SIGNAL(replyReceived(int, QString &)));
- plugin->sendBugReport(
- AWTestLibrary::randomString(),
- plugin->generateText(data.at(0), data.at(1), data.at(2), data.at(3)));
+ plugin->sendBugReport(AWTestLibrary::randomString(),
+ plugin->generateText(data.at(0), data.at(1), data.at(2), data.at(3)));
QVERIFY(spy.wait(5000));
QVariantList arguments = spy.takeFirst();
diff --git a/sources/test/testawconfighelper.cpp b/sources/test/testawconfighelper.cpp
index 79ee180..18b7c56 100644
--- a/sources/test/testawconfighelper.cpp
+++ b/sources/test/testawconfighelper.cpp
@@ -56,8 +56,7 @@ void TestAWConfigHelper::test_exportConfiguration()
void TestAWConfigHelper::test_importConfiguration()
{
- QVariantMap imported
- = plugin->importConfiguration(filename, true, true, true);
+ QVariantMap imported = plugin->importConfiguration(filename, true, true, true);
QVariantMap converted;
for (auto &key : map.keys())
converted[key] = map.value(key);
diff --git a/sources/test/testawkeycache.cpp b/sources/test/testawkeycache.cpp
index 2be9b0e..22c3cfc 100644
--- a/sources/test/testawkeycache.cpp
+++ b/sources/test/testawkeycache.cpp
@@ -30,9 +30,7 @@ void TestAWKeyCache::initTestCase()
}
-void TestAWKeyCache::cleanupTestCase()
-{
-}
+void TestAWKeyCache::cleanupTestCase() {}
QTEST_MAIN(TestAWKeyCache);
diff --git a/sources/test/testawkeys.cpp b/sources/test/testawkeys.cpp
index 13c55b8..5551ddf 100644
--- a/sources/test/testawkeys.cpp
+++ b/sources/test/testawkeys.cpp
@@ -175,16 +175,15 @@ void TestAWKeys::test_dbus()
QDBusConnection bus = QDBusConnection::sessionBus();
// check if there is active sessions first
- QDBusMessage sessions = QDBusMessage::createMethodCall(
- AWDBUS_SERVICE, AWDBUS_PATH, AWDBUS_SERVICE, "ActiveServicess");
+ QDBusMessage sessions = QDBusMessage::createMethodCall(AWDBUS_SERVICE, AWDBUS_PATH,
+ AWDBUS_SERVICE, "ActiveServicess");
QDBusMessage sessionsResponse = bus.call(sessions, QDBus::BlockWithGui);
if (sessionsResponse.arguments().isEmpty())
QSKIP("No active sessions found, skip DBus tests");
// dbus checks
QDBusMessage request = QDBusMessage::createMethodCall(
- QString("%1.i%2").arg(AWDBUS_SERVICE).arg(id), AWDBUS_PATH,
- AWDBUS_SERVICE, "WhoAmI");
+ QString("%1.i%2").arg(AWDBUS_SERVICE).arg(id), AWDBUS_PATH, AWDBUS_SERVICE, "WhoAmI");
// send message to dbus
QDBusMessage response = bus.call(request, QDBus::BlockWithGui);
diff --git a/sources/test/testawpatternfunctions.cpp b/sources/test/testawpatternfunctions.cpp
index a57e457..8247996 100644
--- a/sources/test/testawpatternfunctions.cpp
+++ b/sources/test/testawpatternfunctions.cpp
@@ -30,9 +30,7 @@ void TestAWPatternFunctions::initTestCase()
}
-void TestAWPatternFunctions::cleanupTestCase()
-{
-}
+void TestAWPatternFunctions::cleanupTestCase() {}
void TestAWPatternFunctions::test_findFunctionCalls()
@@ -40,11 +38,9 @@ void TestAWPatternFunctions::test_findFunctionCalls()
QString name = QString("aw_%1").arg(AWTestLibrary::randomString(1, 10));
QString code = AWTestLibrary::randomString(1, 20);
QStringList args = AWTestLibrary::randomStringList(20);
- QString function
- = QString("$%1<%2>{{%3}}").arg(name).arg(args.join(',')).arg(code);
+ QString function = QString("$%1<%2>{{%3}}").arg(name).arg(args.join(',')).arg(code);
- QString pattern = AWTestLibrary::randomString() + function
- + AWTestLibrary::randomString();
+ QString pattern = AWTestLibrary::randomString() + function + AWTestLibrary::randomString();
QList found
= AWPatternFunctions::findFunctionCalls(name, pattern);
@@ -69,10 +65,8 @@ void TestAWPatternFunctions::test_findKeys()
auto keys = AWTestLibrary::randomSelect(allKeys);
auto bars = AWTestLibrary::randomSelect(allKeys);
- std::for_each(bars.begin(), bars.end(),
- [](QString &bar) { bar.prepend("bar"); });
- QString pattern
- = QString("$%1 $%2").arg(keys.join(" $")).arg(bars.join(" $"));
+ std::for_each(bars.begin(), bars.end(), [](QString &bar) { bar.prepend("bar"); });
+ QString pattern = QString("$%1 $%2").arg(keys.join(" $")).arg(bars.join(" $"));
allKeys.append(bars);
allKeys.sort();
@@ -80,11 +74,9 @@ void TestAWPatternFunctions::test_findKeys()
keys.sort();
bars.sort();
- QStringList foundKeys
- = AWPatternFunctions::findKeys(pattern, allKeys, false);
+ QStringList foundKeys = AWPatternFunctions::findKeys(pattern, allKeys, false);
foundKeys.sort();
- QStringList foundBars
- = AWPatternFunctions::findKeys(pattern, allKeys, true);
+ QStringList foundBars = AWPatternFunctions::findKeys(pattern, allKeys, true);
foundBars.sort();
QCOMPARE(foundKeys, keys);
@@ -95,8 +87,7 @@ void TestAWPatternFunctions::test_findKeys()
void TestAWPatternFunctions::test_findLambdas()
{
QStringList lambdas = AWTestLibrary::randomStringList(20);
- QString pattern = AWTestLibrary::randomString()
- + QString("${{%1}}").arg(lambdas.join("}}${{"))
+ QString pattern = AWTestLibrary::randomString() + QString("${{%1}}").arg(lambdas.join("}}${{"))
+ AWTestLibrary::randomString();
QCOMPARE(AWPatternFunctions::findLambdas(pattern), lambdas);
@@ -108,13 +99,11 @@ void TestAWPatternFunctions::test_expandTemplates()
int firstValue = AWTestLibrary::randomInt();
int secondValue = AWTestLibrary::randomInt();
int result = firstValue + secondValue;
- QString code
- = QString("$template{{%1+%2}}").arg(firstValue).arg(secondValue);
+ QString code = QString("$template{{%1+%2}}").arg(firstValue).arg(secondValue);
QString prefix = AWTestLibrary::randomString();
QString pattern = prefix + code;
- QCOMPARE(AWPatternFunctions::expandTemplates(pattern),
- QString("%1%2").arg(prefix).arg(result));
+ QCOMPARE(AWPatternFunctions::expandTemplates(pattern), QString("%1%2").arg(prefix).arg(result));
}
diff --git a/sources/test/testbatterysource.cpp b/sources/test/testbatterysource.cpp
index 843d986..2ad11ad 100644
--- a/sources/test/testbatterysource.cpp
+++ b/sources/test/testbatterysource.cpp
@@ -49,15 +49,13 @@ void TestBatterySource::test_battery()
QSKIP("No battery found, test will be skipped");
QStringList batteries = source->sources();
- std::for_each(batteries.begin(), batteries.end(),
- [this](const QString bat) {
- QVariant value = source->data(bat);
- if (bat == "battery/ac")
- QCOMPARE(value.type(), QVariant::Bool);
- else
- QVERIFY((value.toFloat() >= battery.first)
- && (value.toFloat() <= battery.second));
- });
+ std::for_each(batteries.begin(), batteries.end(), [this](const QString bat) {
+ QVariant value = source->data(bat);
+ if (bat == "battery/ac")
+ QCOMPARE(value.type(), QVariant::Bool);
+ else
+ QVERIFY((value.toFloat() >= battery.first) && (value.toFloat() <= battery.second));
+ });
}
diff --git a/sources/test/testdatetimeformatter.cpp b/sources/test/testdatetimeformatter.cpp
index 57dfa3a..501d6a7 100644
--- a/sources/test/testdatetimeformatter.cpp
+++ b/sources/test/testdatetimeformatter.cpp
@@ -28,8 +28,7 @@
void TestAWDateTimeFormatter::initTestCase()
{
AWTestLibrary::init();
- format
- = AWTestLibrary::randomSelect(QString(TIME_KEYS).split(',')).join(' ');
+ format = AWTestLibrary::randomSelect(QString(TIME_KEYS).split(',')).join(' ');
formatter = new AWDateTimeFormatter(nullptr);
formatter->setFormat(format);
diff --git a/sources/test/testextquotes.cpp b/sources/test/testextquotes.cpp
index 10a8df1..e400609 100644
--- a/sources/test/testextquotes.cpp
+++ b/sources/test/testextquotes.cpp
@@ -64,8 +64,8 @@ void TestExtQuotes::test_run()
for (auto &type : types) {
QCOMPARE(firstValue[extQuotes->tag(type)].toDouble(), 0.0);
- QVERIFY((cache[type].toDouble() > price.first)
- && (cache[type].toDouble() < price.second));
+ QVERIFY((cache[type].toDouble() >= price.first)
+ && (cache[type].toDouble() <= price.second));
}
}
@@ -84,9 +84,7 @@ void TestExtQuotes::test_derivatives()
values[type] = arguments.at(0).toHash()[extQuotes->tag(type)];
for (auto &type : types) {
- QCOMPARE(arguments.at(0)
- .toHash()[extQuotes->tag(QString("%1chg").arg(type))]
- .toDouble(),
+ QCOMPARE(arguments.at(0).toHash()[extQuotes->tag(QString("%1chg").arg(type))].toDouble(),
(values[type].toDouble() - cache[type].toDouble()));
}
}
diff --git a/sources/test/testextquotes.h b/sources/test/testextquotes.h
index df5c16d..5997d0d 100644
--- a/sources/test/testextquotes.h
+++ b/sources/test/testextquotes.h
@@ -42,12 +42,10 @@ private slots:
private:
ExtQuotes *extQuotes = nullptr;
QVariantHash cache;
- QString ticker = "EURUSD=X";
- QStringList types = QStringList() << "ask"
- << "bid"
- << "price";
+ QString ticker = "EURUSD";
+ QStringList types = {"price", "volume"};
// we assume that price will not be differ more than in 2 times
- QPair price = QPair(0.5, 2.0);
+ QPair price = QPair(0.0, 2.0);
};
diff --git a/sources/test/testextupgrade.cpp b/sources/test/testextupgrade.cpp
index 7e35e7a..129c1b3 100644
--- a/sources/test/testextupgrade.cpp
+++ b/sources/test/testextupgrade.cpp
@@ -64,8 +64,7 @@ void TestExtUpgrade::test_run()
QList arguments = spy.takeFirst();
QCOMPARE(firstValue[extUpgrade->tag("pkgcount")].toInt(), 0);
- QCOMPARE(arguments.at(0).toHash()[extUpgrade->tag("pkgcount")].toInt(),
- randomStrings.count());
+ QCOMPARE(arguments.at(0).toHash()[extUpgrade->tag("pkgcount")].toInt(), randomStrings.count());
}
@@ -95,8 +94,7 @@ void TestExtUpgrade::test_filter()
// check values
QVERIFY(spy.wait(5000));
QList arguments = spy.takeFirst();
- QCOMPARE(arguments.at(0).toHash()[extUpgrade->tag("pkgcount")].toInt(),
- filters.count());
+ QCOMPARE(arguments.at(0).toHash()[extUpgrade->tag("pkgcount")].toInt(), filters.count());
}
diff --git a/sources/test/testextweather.cpp b/sources/test/testextweather.cpp
index 869704a..531f068 100644
--- a/sources/test/testextweather.cpp
+++ b/sources/test/testextweather.cpp
@@ -88,8 +88,7 @@ void TestExtWeather::test_image()
// check values
QVERIFY(spy.wait(5000));
QVariantHash arguments = spy.takeFirst().at(0).toHash();
- QVERIFY(
- arguments[extWeather->tag("weather")].toString().startsWith("
tag("weather")].toString().startsWith("
tag("weatherId")].toInt(), 0);
- QVERIFY(
- (arguments[extWeather->tag("humidity")].toInt() >= humidity.first)
- && (arguments[extWeather->tag("humidity")].toInt() <= humidity.second));
- QVERIFY(
- (arguments[extWeather->tag("pressure")].toInt() > pressure.first)
- && (arguments[extWeather->tag("pressure")].toInt() < pressure.second));
- QVERIFY(
- (arguments[extWeather->tag("temperature")].toFloat() > temp.first)
- && (arguments[extWeather->tag("temperature")].toFloat() < temp.second));
+ QVERIFY((arguments[extWeather->tag("humidity")].toInt() >= humidity.first)
+ && (arguments[extWeather->tag("humidity")].toInt() <= humidity.second));
+ QVERIFY((arguments[extWeather->tag("pressure")].toInt() > pressure.first)
+ && (arguments[extWeather->tag("pressure")].toInt() < pressure.second));
+ QVERIFY((arguments[extWeather->tag("temperature")].toFloat() > temp.first)
+ && (arguments[extWeather->tag("temperature")].toFloat() < temp.second));
// image should be only one symbol here
if (extWeather->jsonMapFile().isEmpty())
QSKIP("No json map found for weather, skip image test");
diff --git a/sources/test/testfloatformatter.cpp b/sources/test/testfloatformatter.cpp
index 2e4a855..b1c90b4 100644
--- a/sources/test/testfloatformatter.cpp
+++ b/sources/test/testfloatformatter.cpp
@@ -37,9 +37,7 @@ void TestAWFloatFormatter::cleanupTestCase()
}
-void TestAWFloatFormatter::test_values()
-{
-}
+void TestAWFloatFormatter::test_values() {}
void TestAWFloatFormatter::test_count()
@@ -140,8 +138,7 @@ void TestAWFloatFormatter::test_multiplier()
// test
double value = AWTestLibrary::randomDouble();
- QCOMPARE(formatter->convert(value),
- QString::number(value * multiplier, 'f', 6));
+ QCOMPARE(formatter->convert(value), QString::number(value * multiplier, 'f', 6));
// reset
formatter->setMultiplier(1.0);
@@ -157,8 +154,7 @@ void TestAWFloatFormatter::test_summand()
// test
double value = AWTestLibrary::randomDouble();
- QCOMPARE(formatter->convert(value),
- QString::number(value + summand, 'f', 6));
+ QCOMPARE(formatter->convert(value), QString::number(value + summand, 'f', 6));
// reset
formatter->setSummand(1.0);
diff --git a/sources/test/testhddtempsource.cpp b/sources/test/testhddtempsource.cpp
index 6c6e34e..bc51f58 100644
--- a/sources/test/testhddtempsource.cpp
+++ b/sources/test/testhddtempsource.cpp
@@ -30,10 +30,10 @@ void TestHDDTemperatureSource::initTestCase()
devices = HDDTemperatureSource::allHdd();
QVERIFY(devices.count() > 0);
- hddtempSource = new HDDTemperatureSource(
- this, QStringList() << devices.join(',') << hddtempCmd);
- smartctlSource = new HDDTemperatureSource(
- this, QStringList() << devices.join(',') << smartctlCmd);
+ hddtempSource
+ = new HDDTemperatureSource(this, QStringList() << devices.join(',') << hddtempCmd);
+ smartctlSource
+ = new HDDTemperatureSource(this, QStringList() << devices.join(',') << smartctlCmd);
}
@@ -57,8 +57,7 @@ void TestHDDTemperatureSource::test_sources()
void TestHDDTemperatureSource::test_hddtemp()
{
std::for_each(devices.begin(), devices.end(), [this](QString device) {
- QSignalSpy spy(hddtempSource,
- SIGNAL(dataReceived(const QVariantHash &)));
+ QSignalSpy spy(hddtempSource, SIGNAL(dataReceived(const QVariantHash &)));
float firstValue = hddtempSource->data(device).toFloat();
QVERIFY(spy.wait(5000));
@@ -75,8 +74,7 @@ void TestHDDTemperatureSource::test_hddtemp()
void TestHDDTemperatureSource::test_smartctl()
{
std::for_each(devices.begin(), devices.end(), [this](QString &device) {
- QSignalSpy spy(smartctlSource,
- SIGNAL(dataReceived(const QVariantHash &)));
+ QSignalSpy spy(smartctlSource, SIGNAL(dataReceived(const QVariantHash &)));
float firstValue = smartctlSource->data(device).toFloat();
QVERIFY(spy.wait(5000));
diff --git a/sources/test/testlistformatter.cpp b/sources/test/testlistformatter.cpp
index 353624c..bbc4f1a 100644
--- a/sources/test/testlistformatter.cpp
+++ b/sources/test/testlistformatter.cpp
@@ -73,8 +73,7 @@ void TestAWListFormatter::test_filter()
value.sort();
formatter->setFilter(QString("(^%1$)").arg(filters.join("$|^")));
- QCOMPARE(formatter->convert(value).split(separator).count(),
- filters.count());
+ QCOMPARE(formatter->convert(value).split(separator).count(), filters.count());
}
diff --git a/sources/test/testnoformatter.cpp b/sources/test/testnoformatter.cpp
index 1f005da..cb9023a 100644
--- a/sources/test/testnoformatter.cpp
+++ b/sources/test/testnoformatter.cpp
@@ -37,9 +37,7 @@ void TestAWNoFormatter::cleanupTestCase()
}
-void TestAWNoFormatter::test_values()
-{
-}
+void TestAWNoFormatter::test_values() {}
void TestAWNoFormatter::test_conversion()
diff --git a/sources/test/testplayersource.cpp b/sources/test/testplayersource.cpp
index b4e5b6b..6472546 100644
--- a/sources/test/testplayersource.cpp
+++ b/sources/test/testplayersource.cpp
@@ -30,9 +30,7 @@ void TestPlayerSource::initTestCase()
}
-void TestPlayerSource::cleanupTestCase()
-{
-}
+void TestPlayerSource::cleanupTestCase() {}
void TestPlayerSource::_test_sources(const PlayerSource *_source)
@@ -57,8 +55,7 @@ void TestPlayerSource::test_buildString()
void TestPlayerSource::test_stripString()
{
- QString str
- = PlayerSource::buildString("", AWTestLibrary::randomString(1, 40), 20);
+ QString str = PlayerSource::buildString("", AWTestLibrary::randomString(1, 40), 20);
QCOMPARE(str.count(), 20);
str = PlayerSource::buildString("", AWTestLibrary::randomString(1, 10), 20);
@@ -68,9 +65,8 @@ void TestPlayerSource::test_stripString()
void TestPlayerSource::test_autoMpris()
{
- QStringList args(QStringList()
- << "mpris" << mpdAddress << QString::number(mpdPort)
- << "auto" << QString::number(10));
+ QStringList args(QStringList() << "mpris" << mpdAddress << QString::number(mpdPort) << "auto"
+ << QString::number(10));
PlayerSource *source = new PlayerSource(this, args);
bool empty = source->getAutoMpris().isEmpty();
@@ -83,9 +79,8 @@ void TestPlayerSource::test_autoMpris()
void TestPlayerSource::test_mpd()
{
- QStringList args(QStringList()
- << "mpd" << mpdAddress << QString::number(mpdPort)
- << "auto" << QString::number(10));
+ QStringList args(QStringList() << "mpd" << mpdAddress << QString::number(mpdPort) << "auto"
+ << QString::number(10));
PlayerSource *source = new PlayerSource(this, args);
_test_sources(source);
@@ -104,16 +99,14 @@ void TestPlayerSource::test_mpd()
if (secondValue["player/title"].toString() == "unknown")
QSKIP("No mpd found");
- QVERIFY(secondValue["player/progress"].toInt()
- < secondValue["player/duration"].toInt());
+ QVERIFY(secondValue["player/progress"].toInt() < secondValue["player/duration"].toInt());
}
void TestPlayerSource::test_mpris()
{
- QStringList args(QStringList()
- << "mpris" << mpdAddress << QString::number(mpdPort)
- << "auto" << QString::number(10));
+ QStringList args(QStringList() << "mpris" << mpdAddress << QString::number(mpdPort) << "auto"
+ << QString::number(10));
PlayerSource *source = new PlayerSource(this, args);
_test_sources(source);
diff --git a/sources/test/teststringformatter.cpp b/sources/test/teststringformatter.cpp
index 62bcb5d..85ec061 100644
--- a/sources/test/teststringformatter.cpp
+++ b/sources/test/teststringformatter.cpp
@@ -37,9 +37,7 @@ void TestAWStringFormatter::cleanupTestCase()
}
-void TestAWStringFormatter::test_values()
-{
-}
+void TestAWStringFormatter::test_values() {}
void TestAWStringFormatter::test_count()
diff --git a/sources/version.h.in b/sources/version.h.in
index ad4b040..8cdb0a3 100644
--- a/sources/version.h.in
+++ b/sources/version.h.in
@@ -17,17 +17,16 @@ const char TRDPARTY_LICENSE[] = "QReplyTimeout "
"wrapper,no,http://"
"codereview.stackexchange.com/questions/30031/"
"qnetworkreply-network-reply-timeout-helper";
-const char SPECIAL_THANKS[]
- = "Yahoo! Finance,https://finance.yahoo.com/;Yahoo! "
- "Weather,https://weather.yahoo.com/;JetBrains,https://www.jetbrains.com/"
- ";OpenWeatherMap,http://openweathermap.org/";
+const char SPECIAL_THANKS[] = "Stooq,https://stooq.com/;Yahoo! "
+ "Weather,https://weather.yahoo.com/;JetBrains,https://"
+ "www.jetbrains.com/;OpenWeatherMap,http://openweathermap.org/";
const char CHANGELOG[] = "@PROJECT_CHANGELOG@";
// configuraion
// graphical items api version
const int AW_GRAPHITEM_API = 6;
// extquotes api version
-const int AW_EXTQUOTES_API = 4;
+const int AW_EXTQUOTES_API = 5;
// extscript api version
const int AW_EXTSCRIPT_API = 5;
// extupgrade api version
@@ -48,8 +47,7 @@ const char AWDBUS_PATH[] = "/awesomewidgets";
// network requests timeout, ms
const int REQUEST_TIMEOUT = 3000;
// available time keys
-const char TIME_KEYS[]
- = "d,dd,ddd,dddd,M,MM,MMM,MMMM,yy,yyyy,h,hh,H,HH,m,mm,s,ss,t,a,ap,A,AP";
+const char TIME_KEYS[] = "d,dd,ddd,dddd,M,MM,MMM,MMMM,yy,yyyy,h,hh,H,HH,m,mm,s,ss,t,a,ap,A,AP";
// static keys
const char STATIC_FUNCTIONS[] = "{{\n\n}},template{{\n\n}},aw_all<>{{}},aw_"
"count<>{{}},aw_keys<>{{}},aw_macro<>{{}},aw_"
@@ -69,19 +67,13 @@ const char STATIC_KEYS[]
// links
const char HOMEPAGE[] = "https://arcanis.me/projects/awesome-widgets";
const char REPOSITORY[] = "https://github.com/arcan1s/awesome-widgets";
-const char RELEASES[]
- = "https://github.com/arcan1s/awesome-widgets/releases/tag/V.";
-const char VERSION_API[]
- = "https://api.github.com/repos/arcan1s/awesome-widgets/releases";
+const char RELEASES[] = "https://github.com/arcan1s/awesome-widgets/releases/tag/V.";
+const char VERSION_API[] = "https://api.github.com/repos/arcan1s/awesome-widgets/releases";
const char BUGTRACKER[] = "https://github.com/arcan1s/awesome-widgets/issues";
-const char BUGTRACKER_API[]
- = "https://arcanis.me/repos/arcan1s/awesome-widgets/issues";
-const char TRANSLATION[]
- = "https://github.com/arcan1s/awesome-widgets/issues/14";
-const char AUR_PACKAGES[]
- = "https://aur.archlinux.org/packages/plasma5-applet-awesome-widgets/";
-const char OPENSUSE_PACKAGES[]
- = "http://software.opensuse.org/package/plasma5-awesome-widgets";
+const char BUGTRACKER_API[] = "https://arcanis.me/repos/arcan1s/awesome-widgets/issues";
+const char TRANSLATION[] = "https://github.com/arcan1s/awesome-widgets/issues/14";
+const char AUR_PACKAGES[] = "https://aur.archlinux.org/packages/plasma5-applet-awesome-widgets/";
+const char OPENSUSE_PACKAGES[] = "http://software.opensuse.org/package/plasma5-awesome-widgets";
// build information
const char BUILD_DATE[] = "@CURRENT_DATE@";