items;
- foreach(QString dir, dirs) {
+ foreach (QString dir, dirs) {
QStringList files = QDir(dir).entryList(QDir::Files, QDir::Name);
- foreach(QString file, files) {
+ foreach (QString file, files) {
if ((!file.endsWith(QString(".desktop")))
|| (names.contains(file)))
continue;
@@ -196,7 +199,7 @@ private:
m_activeItems.clear();
m_items = getItems();
- foreach(T *item, m_items) {
+ foreach (T *item, m_items) {
if (!item->isActive())
continue;
m_activeItems.append(item);
@@ -208,8 +211,9 @@ private:
qCDebug(LOG_LIB);
widgetDialog->clear();
- foreach(T *_item, m_items) {
- QListWidgetItem *item = new QListWidgetItem(_item->fileName(), widgetDialog);
+ foreach (T *_item, m_items) {
+ QListWidgetItem *item
+ = new QListWidgetItem(_item->fileName(), widgetDialog);
QStringList tooltip;
tooltip.append(i18n("Name: %1", _item->name()));
tooltip.append(i18n("Comment: %1", _item->comment()));
@@ -227,8 +231,7 @@ private:
T *source = itemFromWidget();
QString fileName = getName();
int number = uniqNumber();
- if ((source == nullptr)
- || (fileName.isEmpty())) {
+ if ((source == nullptr) || (fileName.isEmpty())) {
qCWarning(LOG_LIB) << "Nothing to copy";
return;
}
@@ -246,9 +249,10 @@ private:
QString fileName = getName();
int number = uniqNumber();
- QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
- QString("awesomewidgets/%1").arg(m_type),
- QStandardPaths::LocateDirectory);
+ QStringList dirs = QStandardPaths::locateAll(
+ QStandardPaths::GenericDataLocation,
+ QString("awesomewidgets/%1").arg(m_type),
+ QStandardPaths::LocateDirectory);
if (fileName.isEmpty()) {
qCWarning(LOG_LIB) << "Nothing to create";
return;
diff --git a/sources/awesomewidgets/extquotes.cpp b/sources/awesomewidgets/extquotes.cpp
index 8d7e329..c0219e4 100644
--- a/sources/awesomewidgets/extquotes.cpp
+++ b/sources/awesomewidgets/extquotes.cpp
@@ -35,8 +35,8 @@
ExtQuotes::ExtQuotes(QWidget *parent, const QString quotesName,
const QStringList directories)
- : AbstractExtItem(parent, quotesName, directories),
- ui(new Ui::ExtQuotes)
+ : AbstractExtItem(parent, quotesName, directories)
+ , ui(new Ui::ExtQuotes)
{
qCDebug(LOG_LIB);
@@ -54,9 +54,11 @@ ExtQuotes::ExtQuotes(QWidget *parent, const QString quotesName,
values[tag(QString("pricechg"))] = 0.0;
values[tag(QString("percpricechg"))] = 0.0;
- manager = new QNetworkAccessManager(this);
- connect(manager, SIGNAL(finished(QNetworkReply *)),
- this, SLOT(quotesReplyReceived(QNetworkReply *)));
+ // HACK declare as child of nullptr to avoid crash with plasmawindowed
+ // in the destructor
+ manager = new QNetworkAccessManager(nullptr);
+ connect(manager, SIGNAL(finished(QNetworkReply *)), this,
+ SLOT(quotesReplyReceived(QNetworkReply *)));
}
@@ -64,10 +66,10 @@ ExtQuotes::~ExtQuotes()
{
qCDebug(LOG_LIB);
- disconnect(manager, SIGNAL(finished(QNetworkReply *)),
- this, SLOT(quotesReplyReceived(QNetworkReply *)));
+ disconnect(manager, SIGNAL(finished(QNetworkReply *)), this,
+ SLOT(quotesReplyReceived(QNetworkReply *)));
- delete manager;
+ manager->deleteLater();
delete ui;
}
@@ -78,8 +80,8 @@ ExtQuotes *ExtQuotes::copy(const QString _fileName, const int _number)
qCDebug(LOG_LIB) << "File" << _fileName;
qCDebug(LOG_LIB) << "Number" << _number;
- ExtQuotes *item = new ExtQuotes(static_cast(parent()),
- _fileName, directories());
+ ExtQuotes *item = new ExtQuotes(static_cast(parent()), _fileName,
+ directories());
item->setActive(isActive());
item->setApiVersion(apiVersion());
item->setComment(comment());
@@ -122,11 +124,14 @@ void ExtQuotes::readConfiguration()
qCDebug(LOG_LIB);
AbstractExtItem::readConfiguration();
- for (int i=directories().count()-1; i>=0; i--) {
- if (!QDir(directories().at(i)).entryList(QDir::Files).contains(fileName()))
+ for (int i = directories().count() - 1; i >= 0; i--) {
+ if (!QDir(directories().at(i))
+ .entryList(QDir::Files)
+ .contains(fileName()))
continue;
- QSettings settings(QString("%1/%2").arg(directories().at(i)).arg(fileName()),
- QSettings::IniFormat);
+ QSettings settings(
+ QString("%1/%2").arg(directories().at(i)).arg(fileName()),
+ QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
setTicker(settings.value(QString("X-AW-Ticker"), m_ticker).toString());
@@ -135,7 +140,8 @@ void ExtQuotes::readConfiguration()
// update for current API
if ((apiVersion() > 0) && (apiVersion() < AWEQAPI)) {
- qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to" << AWEQAPI;
+ qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to"
+ << AWEQAPI;
setApiVersion(AWEQAPI);
writeConfiguration();
}
@@ -173,7 +179,8 @@ int ExtQuotes::showConfiguration(const QVariant args)
ui->lineEdit_comment->setText(comment());
ui->label_numberValue->setText(QString("%1").arg(number()));
ui->lineEdit_ticker->setText(m_ticker);
- ui->checkBox_active->setCheckState(isActive() ? Qt::Checked : Qt::Unchecked);
+ ui->checkBox_active->setCheckState(isActive() ? Qt::Checked
+ : Qt::Unchecked);
ui->spinBox_interval->setValue(interval());
int ret = exec();
@@ -197,8 +204,9 @@ void ExtQuotes::writeConfiguration() const
qCDebug(LOG_LIB);
AbstractExtItem::writeConfiguration();
- QSettings settings(QString("%1/%2").arg(directories().first()).arg(fileName()),
- QSettings::IniFormat);
+ QSettings settings(
+ QString("%1/%2").arg(directories().first()).arg(fileName()),
+ QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));
@@ -223,35 +231,43 @@ void ExtQuotes::quotesReplyReceived(QNetworkReply *reply)
qCWarning(LOG_LIB) << "Parse error" << error.errorString();
return;
}
- QVariantMap jsonQuotes = jsonDoc.toVariant().toMap()[QString("query")].toMap();
- jsonQuotes = jsonQuotes[QString("results")].toMap()[QString("quote")].toMap();
+ QVariantMap jsonQuotes
+ = jsonDoc.toVariant().toMap()[QString("query")].toMap();
+ jsonQuotes
+ = jsonQuotes[QString("results")].toMap()[QString("quote")].toMap();
double value;
// ask
value = jsonQuotes[QString("Ask")].toString().toDouble();
- values[tag(QString("askchg"))] = values[QString("ask")].toDouble() == 0.0
- ? 0.0
- : value - values[QString("ask")].toDouble();
- values[tag(QString("percaskchg"))] = 100.0 * values[QString("askchg")].toDouble()
- / values[QString("ask")].toDouble();
+ values[tag(QString("askchg"))]
+ = values[QString("ask")].toDouble() == 0.0
+ ? 0.0
+ : value - values[QString("ask")].toDouble();
+ values[tag(QString("percaskchg"))] = 100.0
+ * values[QString("askchg")].toDouble()
+ / values[QString("ask")].toDouble();
values[tag(QString("ask"))] = value;
// bid
value = jsonQuotes[QString("Bid")].toString().toDouble();
- values[tag(QString("bidchg"))] = values[QString("bid")].toDouble() == 0.0
- ? 0.0
- : value - values[QString("bid")].toDouble();
- values[tag(QString("percbidchg"))] = 100.0 * values[QString("bidchg")].toDouble()
- / values[QString("bid")].toDouble();
+ values[tag(QString("bidchg"))]
+ = values[QString("bid")].toDouble() == 0.0
+ ? 0.0
+ : value - values[QString("bid")].toDouble();
+ values[tag(QString("percbidchg"))] = 100.0
+ * values[QString("bidchg")].toDouble()
+ / values[QString("bid")].toDouble();
values[tag(QString("bid"))] = value;
// last trade
value = jsonQuotes[QString("LastTradePriceOnly")].toString().toDouble();
- values[tag(QString("pricechg"))] = values[QString("price")].toDouble() == 0.0
- ? 0.0
- : value - values[QString("price")].toDouble();
- values[tag(QString("percpricechg"))] = 100.0 * values[QString("pricechg")].toDouble()
- / values[QString("price")].toDouble();
+ values[tag(QString("pricechg"))]
+ = values[QString("price")].toDouble() == 0.0
+ ? 0.0
+ : value - values[QString("price")].toDouble();
+ values[tag(QString("percpricechg"))]
+ = 100.0 * values[QString("pricechg")].toDouble()
+ / values[QString("price")].toDouble();
values[tag(QString("price"))] = value;
}
@@ -263,7 +279,8 @@ void ExtQuotes::translate()
ui->label_name->setText(i18n("Name"));
ui->label_comment->setText(i18n("Comment"));
ui->label_number->setText(i18n("Tag"));
- ui->label->setText(i18n("Use YAHOO! finance ticker to \
+ ui->label->setText(
+ i18n("
Use YAHOO! finance ticker to \
get quotes for the instrument. Refer to \
http://finance.yahoo.com/\
"));
diff --git a/sources/awesomewidgets/extquotes.h b/sources/awesomewidgets/extquotes.h
index c010973..c271b8c 100644
--- a/sources/awesomewidgets/extquotes.h
+++ b/sources/awesomewidgets/extquotes.h
@@ -22,11 +22,16 @@
#include "abstractextitem.h"
-#define YAHOO_URL "https://query.yahooapis.com/v1/public/yql?q=select * from yahoo.finance.quotes where symbol=\"$TICKER\"&env=store://datatables.org/alltableswithkeys&format=json"
+#define YAHOO_URL \
+ "https://query.yahooapis.com/v1/public/yql?q=select * from " \
+ "yahoo.finance.quotes where " \
+ "symbol=\"$TICKER\"&env=store://datatables.org/" \
+ "alltableswithkeys&format=json"
-namespace Ui {
- class ExtQuotes;
+namespace Ui
+{
+class ExtQuotes;
}
class ExtQuotes : public AbstractExtItem
@@ -35,7 +40,8 @@ class ExtQuotes : public AbstractExtItem
Q_PROPERTY(QString ticker READ ticker WRITE setTicker)
public:
- explicit ExtQuotes(QWidget *parent = nullptr, const QString quotesName = QString(),
+ explicit ExtQuotes(QWidget *parent = nullptr,
+ const QString quotesName = QString(),
const QStringList directories = QStringList());
virtual ~ExtQuotes();
ExtQuotes *copy(const QString _fileName, const int _number);
diff --git a/sources/awesomewidgets/extscript.cpp b/sources/awesomewidgets/extscript.cpp
index 56c2151..57f9aa3 100644
--- a/sources/awesomewidgets/extscript.cpp
+++ b/sources/awesomewidgets/extscript.cpp
@@ -33,8 +33,8 @@
ExtScript::ExtScript(QWidget *parent, const QString scriptName,
const QStringList directories)
- : AbstractExtItem(parent, scriptName, directories),
- ui(new Ui::ExtScript)
+ : AbstractExtItem(parent, scriptName, directories)
+ , ui(new Ui::ExtScript)
{
qCDebug(LOG_LIB);
@@ -46,7 +46,8 @@ ExtScript::ExtScript(QWidget *parent, const QString scriptName,
value[tag(QString("custom"))] = QString("");
process = new QProcess(this);
- connect(process, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(updateValue()));
+ connect(process, SIGNAL(finished(int, QProcess::ExitStatus)), this,
+ SLOT(updateValue()));
process->waitForFinished(0);
}
@@ -67,8 +68,8 @@ ExtScript *ExtScript::copy(const QString _fileName, const int _number)
qCDebug(LOG_LIB) << "File" << _fileName;
qCDebug(LOG_LIB) << "Number" << _number;
- ExtScript *item = new ExtScript(static_cast(parent()),
- _fileName, directories());
+ ExtScript *item = new ExtScript(static_cast(parent()), _fileName,
+ directories());
item->setActive(isActive());
item->setApiVersion(apiVersion());
item->setComment(comment());
@@ -162,9 +163,8 @@ void ExtScript::setFilters(const QStringList _filters)
qCDebug(LOG_LIB);
qCDebug(LOG_LIB) << "Filters" << _filters;
- std::for_each(_filters.cbegin(), _filters.cend(), [this](QString filter) {
- return updateFilter(filter);
- });
+ std::for_each(_filters.cbegin(), _filters.cend(),
+ [this](QString filter) { return updateFilter(filter); });
}
@@ -207,14 +207,15 @@ QString ExtScript::applyFilters(QString _value) const
qCDebug(LOG_LIB);
qCDebug(LOG_LIB) << "Value" << _value;
- foreach(QString filt, m_filters) {
+ foreach (QString filt, m_filters) {
qCInfo(LOG_LIB) << "Found filter" << filt;
QVariantMap filter = 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;
}
- foreach(QString f, filter.keys())
+ foreach (QString f, filter.keys())
_value.replace(f, filter[f].toString());
}
@@ -243,24 +244,31 @@ void ExtScript::readConfiguration()
qCDebug(LOG_LIB);
AbstractExtItem::readConfiguration();
- for (int i=directories().count()-1; i>=0; i--) {
- if (!QDir(directories().at(i)).entryList(QDir::Files).contains(fileName()))
+ for (int i = directories().count() - 1; i >= 0; i--) {
+ if (!QDir(directories().at(i))
+ .entryList(QDir::Files)
+ .contains(fileName()))
continue;
- QSettings settings(QString("%1/%2").arg(directories().at(i)).arg(fileName()), QSettings::IniFormat);
+ QSettings settings(
+ QString("%1/%2").arg(directories().at(i)).arg(fileName()),
+ QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
setExecutable(settings.value(QString("Exec"), m_executable).toString());
setPrefix(settings.value(QString("X-AW-Prefix"), m_prefix).toString());
- setStrRedirect(settings.value(QString("X-AW-Redirect"), strRedirect()).toString());
+ setStrRedirect(
+ settings.value(QString("X-AW-Redirect"), strRedirect()).toString());
// api == 3
- setFilters(settings.value(QString("X-AW-Filters"), m_filters).toString().
- split(QChar(','), QString::SkipEmptyParts));
+ setFilters(settings.value(QString("X-AW-Filters"), m_filters)
+ .toString()
+ .split(QChar(','), QString::SkipEmptyParts));
settings.endGroup();
}
// update for current API
if ((apiVersion() > 0) && (apiVersion() < AWESAPI)) {
- qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to" << AWESAPI;
+ qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to"
+ << AWESAPI;
setApiVersion(AWESAPI);
writeConfiguration();
}
@@ -271,8 +279,10 @@ void ExtScript::readJsonFilters()
{
qCDebug(LOG_LIB);
- QString fileName = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
- QString("awesomewidgets/scripts/awesomewidgets-extscripts-filters.json"));
+ QString fileName = QStandardPaths::locate(
+ QStandardPaths::GenericDataLocation,
+ QString(
+ "awesomewidgets/scripts/awesomewidgets-extscripts-filters.json"));
qCInfo(LOG_LIB) << "Filters file" << fileName;
QFile jsonFile(fileName);
if (!jsonFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -326,19 +336,17 @@ int ExtScript::showConfiguration(const QVariant args)
ui->label_numberValue->setText(QString("%1").arg(number()));
ui->lineEdit_command->setText(m_executable);
ui->lineEdit_prefix->setText(m_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(m_redirect));
ui->spinBox_interval->setValue(interval());
// filters
- ui->checkBox_colorFilter->setCheckState(m_filters.contains(QString("color"))
- ? Qt::Checked
- : Qt::Unchecked);
- ui->checkBox_linesFilter->setCheckState(m_filters.contains(QString("newline"))
- ? Qt::Checked
- : Qt::Unchecked);
- ui->checkBox_spaceFilter->setCheckState(m_filters.contains(QString("space"))
- ? Qt::Checked
- : Qt::Unchecked);
+ ui->checkBox_colorFilter->setCheckState(
+ m_filters.contains(QString("color")) ? Qt::Checked : Qt::Unchecked);
+ ui->checkBox_linesFilter->setCheckState(
+ m_filters.contains(QString("newline")) ? Qt::Checked : Qt::Unchecked);
+ ui->checkBox_spaceFilter->setCheckState(
+ m_filters.contains(QString("space")) ? Qt::Checked : Qt::Unchecked);
int ret = exec();
if (ret != 1)
@@ -353,9 +361,12 @@ int ExtScript::showConfiguration(const QVariant args)
setStrRedirect(ui->comboBox_redirect->currentText());
setInterval(ui->spinBox_interval->value());
// filters
- updateFilter(QString("color"), ui->checkBox_colorFilter->checkState() == Qt::Checked);
- updateFilter(QString("newline"), ui->checkBox_linesFilter->checkState() == Qt::Checked);
- updateFilter(QString("space"), ui->checkBox_spaceFilter->checkState() == Qt::Checked);
+ updateFilter(QString("color"),
+ ui->checkBox_colorFilter->checkState() == Qt::Checked);
+ updateFilter(QString("newline"),
+ ui->checkBox_linesFilter->checkState() == Qt::Checked);
+ updateFilter(QString("space"),
+ ui->checkBox_spaceFilter->checkState() == Qt::Checked);
writeConfiguration();
return ret;
@@ -367,8 +378,9 @@ void ExtScript::writeConfiguration() const
qCDebug(LOG_LIB);
AbstractExtItem::writeConfiguration();
- QSettings settings(QString("%1/%2").arg(directories().first()).arg(fileName()),
- QSettings::IniFormat);
+ QSettings settings(
+ QString("%1/%2").arg(directories().first()).arg(fileName()),
+ QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));
@@ -387,9 +399,13 @@ void ExtScript::updateValue()
qCDebug(LOG_LIB);
qCInfo(LOG_LIB) << "Cmd returns" << process->exitCode();
- QString qdebug = QTextCodec::codecForMib(106)->toUnicode(process->readAllStandardError()).trimmed();
+ QString qdebug = QTextCodec::codecForMib(106)
+ ->toUnicode(process->readAllStandardError())
+ .trimmed();
qCInfo(LOG_LIB) << "Error" << qdebug;
- QString qoutput = QTextCodec::codecForMib(106)->toUnicode(process->readAllStandardOutput()).trimmed();
+ QString qoutput = QTextCodec::codecForMib(106)
+ ->toUnicode(process->readAllStandardOutput())
+ .trimmed();
qCInfo(LOG_LIB) << "Output" << qoutput;
QString strValue;
diff --git a/sources/awesomewidgets/extscript.h b/sources/awesomewidgets/extscript.h
index 66ac5fb..3aa899b 100644
--- a/sources/awesomewidgets/extscript.h
+++ b/sources/awesomewidgets/extscript.h
@@ -23,8 +23,9 @@
#include "abstractextitem.h"
-namespace Ui {
- class ExtScript;
+namespace Ui
+{
+class ExtScript;
}
class ExtScript : public AbstractExtItem
@@ -36,14 +37,10 @@ class ExtScript : public AbstractExtItem
Q_PROPERTY(Redirect redirect READ redirect WRITE setRedirect)
public:
- enum Redirect {
- stdout2stderr = 0,
- nothing,
- stderr2stdout,
- swap
- };
+ enum Redirect { stdout2stderr = 0, nothing, stderr2stdout, swap };
- explicit ExtScript(QWidget *parent = nullptr, const QString scriptName = QString(),
+ explicit ExtScript(QWidget *parent = nullptr,
+ const QString scriptName = QString(),
const QStringList directories = QStringList());
virtual ~ExtScript();
ExtScript *copy(const QString _fileName, const int _number);
diff --git a/sources/awesomewidgets/extupgrade.cpp b/sources/awesomewidgets/extupgrade.cpp
index 7ac65ae..c9ff403 100644
--- a/sources/awesomewidgets/extupgrade.cpp
+++ b/sources/awesomewidgets/extupgrade.cpp
@@ -31,8 +31,8 @@
ExtUpgrade::ExtUpgrade(QWidget *parent, const QString upgradeName,
const QStringList directories)
- : AbstractExtItem(parent, upgradeName, directories),
- ui(new Ui::ExtUpgrade)
+ : AbstractExtItem(parent, upgradeName, directories)
+ , ui(new Ui::ExtUpgrade)
{
qCDebug(LOG_LIB);
@@ -134,7 +134,8 @@ void ExtUpgrade::setNull(const int _null)
{
qCDebug(LOG_LIB);
qCDebug(LOG_LIB) << "Null lines" << _null;
- if (_null < 0) return;
+ if (_null < 0)
+ return;
m_null = _null;
}
@@ -145,11 +146,14 @@ void ExtUpgrade::readConfiguration()
qCDebug(LOG_LIB);
AbstractExtItem::readConfiguration();
- for (int i=directories().count()-1; i>=0; i--) {
- if (!QDir(directories().at(i)).entryList(QDir::Files).contains(fileName()))
+ for (int i = directories().count() - 1; i >= 0; i--) {
+ if (!QDir(directories().at(i))
+ .entryList(QDir::Files)
+ .contains(fileName()))
continue;
- QSettings settings(QString("%1/%2").arg(directories().at(i)).arg(fileName()),
- QSettings::IniFormat);
+ QSettings settings(
+ QString("%1/%2").arg(directories().at(i)).arg(fileName()),
+ QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
setExecutable(settings.value(QString("Exec"), m_executable).toString());
@@ -161,7 +165,8 @@ void ExtUpgrade::readConfiguration()
// update for current API
if ((apiVersion() > 0) && (apiVersion() < AWEUAPI)) {
- qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to" << AWEUAPI;
+ qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to"
+ << AWEUAPI;
setApiVersion(AWEUAPI);
writeConfiguration();
}
@@ -197,7 +202,8 @@ int ExtUpgrade::showConfiguration(const QVariant args)
ui->label_numberValue->setText(QString("%1").arg(number()));
ui->lineEdit_command->setText(m_executable);
ui->lineEdit_filter->setText(m_filter);
- ui->checkBox_active->setCheckState(isActive() ? Qt::Checked : Qt::Unchecked);
+ ui->checkBox_active->setCheckState(isActive() ? Qt::Checked
+ : Qt::Unchecked);
ui->spinBox_null->setValue(m_null);
ui->spinBox_interval->setValue(interval());
@@ -224,8 +230,9 @@ void ExtUpgrade::writeConfiguration() const
qCDebug(LOG_LIB);
AbstractExtItem::writeConfiguration();
- QSettings settings(QString("%1/%2").arg(directories().first()).arg(fileName()),
- QSettings::IniFormat);
+ QSettings settings(
+ QString("%1/%2").arg(directories().first()).arg(fileName()),
+ QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));
@@ -245,11 +252,16 @@ void ExtUpgrade::updateValue()
qCInfo(LOG_LIB) << "Cmd returns" << process->exitCode();
qCInfo(LOG_LIB) << "Error" << process->readAllStandardError();
- QString qoutput = QTextCodec::codecForMib(106)->toUnicode(process->readAllStandardOutput()).trimmed();
+ QString qoutput = QTextCodec::codecForMib(106)
+ ->toUnicode(process->readAllStandardOutput())
+ .trimmed();
value[tag(QString("pkgcount"))] = [this](QString output) {
return m_filter.isEmpty()
- ? output.split(QChar('\n'), QString::SkipEmptyParts).count() - m_null
- : output.split(QChar('\n'), QString::SkipEmptyParts).filter(QRegExp(m_filter)).count();
+ ? output.split(QChar('\n'), QString::SkipEmptyParts).count()
+ - m_null
+ : output.split(QChar('\n'), QString::SkipEmptyParts)
+ .filter(QRegExp(m_filter))
+ .count();
}(qoutput);
}
diff --git a/sources/awesomewidgets/extupgrade.h b/sources/awesomewidgets/extupgrade.h
index 8b09286..c5a3b8a 100644
--- a/sources/awesomewidgets/extupgrade.h
+++ b/sources/awesomewidgets/extupgrade.h
@@ -23,8 +23,9 @@
#include "abstractextitem.h"
-namespace Ui {
- class ExtUpgrade;
+namespace Ui
+{
+class ExtUpgrade;
}
class ExtUpgrade : public AbstractExtItem
@@ -35,7 +36,8 @@ class ExtUpgrade : public AbstractExtItem
Q_PROPERTY(int null READ null WRITE setNull)
public:
- explicit ExtUpgrade(QWidget *parent = nullptr, const QString upgradeName = QString(),
+ explicit ExtUpgrade(QWidget *parent = nullptr,
+ const QString upgradeName = QString(),
const QStringList directories = QStringList());
virtual ~ExtUpgrade();
ExtUpgrade *copy(const QString _fileName, const int _number);
diff --git a/sources/awesomewidgets/extweather.cpp b/sources/awesomewidgets/extweather.cpp
index 37a0874..f4ed386 100644
--- a/sources/awesomewidgets/extweather.cpp
+++ b/sources/awesomewidgets/extweather.cpp
@@ -36,8 +36,8 @@
ExtWeather::ExtWeather(QWidget *parent, const QString weatherName,
const QStringList directories)
- : AbstractExtItem(parent, weatherName, directories),
- ui(new Ui::ExtWeather)
+ : AbstractExtItem(parent, weatherName, directories)
+ , ui(new Ui::ExtWeather)
{
qCDebug(LOG_LIB);
@@ -52,9 +52,11 @@ ExtWeather::ExtWeather(QWidget *parent, const QString weatherName,
values[tag(QString("pressure"))] = 0.0;
values[tag(QString("temperature"))] = 0.0;
- manager = new QNetworkAccessManager(this);
- connect(manager, SIGNAL(finished(QNetworkReply *)),
- this, SLOT(weatherReplyReceived(QNetworkReply *)));
+ // HACK declare as child of nullptr to avoid crash with plasmawindowed
+ // in the destructor
+ manager = new QNetworkAccessManager(nullptr);
+ connect(manager, SIGNAL(finished(QNetworkReply *)), this,
+ SLOT(weatherReplyReceived(QNetworkReply *)));
}
@@ -62,10 +64,10 @@ ExtWeather::~ExtWeather()
{
qCDebug(LOG_LIB);
- disconnect(manager, SIGNAL(finished(QNetworkReply *)),
- this, SLOT(weatherReplyReceived(QNetworkReply *)));
+ disconnect(manager, SIGNAL(finished(QNetworkReply *)), this,
+ SLOT(weatherReplyReceived(QNetworkReply *)));
- delete manager;
+ manager->deleteLater();
delete ui;
}
@@ -98,7 +100,8 @@ QString ExtWeather::weatherFromInt(const int _id) const
qCDebug(LOG_LIB);
qCDebug(LOG_LIB) << "Weather ID" << _id;
- QVariantMap map = jsonMap[m_image ? QString("image") : QString("text")].toMap();
+ QVariantMap map
+ = jsonMap[m_image ? QString("image") : QString("text")].toMap();
return map.value(QString::number(_id), map[QString("default")]).toString();
}
@@ -184,24 +187,31 @@ void ExtWeather::readConfiguration()
qCDebug(LOG_LIB);
AbstractExtItem::readConfiguration();
- for (int i=directories().count()-1; i>=0; i--) {
- if (!QDir(directories().at(i)).entryList(QDir::Files).contains(fileName()))
+ for (int i = directories().count() - 1; i >= 0; i--) {
+ if (!QDir(directories().at(i))
+ .entryList(QDir::Files)
+ .contains(fileName()))
continue;
- QSettings settings(QString("%1/%2").arg(directories().at(i)).arg(fileName()),
- QSettings::IniFormat);
+ QSettings settings(
+ QString("%1/%2").arg(directories().at(i)).arg(fileName()),
+ QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
setCity(settings.value(QString("X-AW-City"), m_city).toString());
- setCountry(settings.value(QString("X-AW-Country"), m_country).toString());
+ setCountry(
+ settings.value(QString("X-AW-Country"), m_country).toString());
setTs(settings.value(QString("X-AW-TS"), m_ts).toInt());
// api == 2
- setImage(settings.value(QString("X-AW-Image"), QVariant(m_image)).toString() == QString("true"));
+ setImage(
+ settings.value(QString("X-AW-Image"), QVariant(m_image)).toString()
+ == QString("true"));
settings.endGroup();
}
// update for current API
if ((apiVersion() > 0) && (apiVersion() < AWEWAPI)) {
- qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to" << AWEWAPI;
+ qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to"
+ << AWEWAPI;
setApiVersion(AWEWAPI);
writeConfiguration();
}
@@ -212,8 +222,9 @@ void ExtWeather::readJsonMap()
{
qCDebug(LOG_LIB);
- QString fileName = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
- QString("awesomewidgets/weather/awesomewidgets-extweather-ids.json"));
+ QString fileName = QStandardPaths::locate(
+ QStandardPaths::GenericDataLocation,
+ QString("awesomewidgets/weather/awesomewidgets-extweather-ids.json"));
qCInfo(LOG_LIB) << "Map file" << fileName;
QFile jsonFile(fileName);
if (!jsonFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -244,7 +255,8 @@ QVariantHash ExtWeather::run()
if (times == 1) {
qCInfo(LOG_LIB) << "Send request";
isRunning = true;
- QNetworkReply *reply = manager->get(QNetworkRequest(QUrl(url(m_ts != 0))));
+ QNetworkReply *reply
+ = manager->get(QNetworkRequest(QUrl(url(m_ts != 0))));
new QReplyTimeout(reply, 1000);
}
@@ -269,7 +281,8 @@ int ExtWeather::showConfiguration(const QVariant args)
ui->lineEdit_country->setText(m_country);
ui->spinBox_timestamp->setValue(m_ts);
ui->checkBox_image->setCheckState(m_image ? Qt::Checked : Qt::Unchecked);
- ui->checkBox_active->setCheckState(isActive() ? Qt::Checked : Qt::Unchecked);
+ ui->checkBox_active->setCheckState(isActive() ? Qt::Checked
+ : Qt::Unchecked);
ui->spinBox_interval->setValue(interval());
int ret = exec();
@@ -296,8 +309,9 @@ void ExtWeather::writeConfiguration() const
qCDebug(LOG_LIB);
AbstractExtItem::writeConfiguration();
- QSettings settings(QString("%1/%2").arg(directories().first()).arg(fileName()),
- QSettings::IniFormat);
+ QSettings settings(
+ QString("%1/%2").arg(directories().first()).arg(fileName()),
+ QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));
@@ -330,7 +344,8 @@ void ExtWeather::weatherReplyReceived(QNetworkReply *reply)
// convert to map
QVariantMap json = jsonDoc.toVariant().toMap();
if (json[QString("cod")].toInt() != 200) {
- qCWarning(LOG_LIB) << "Invalid OpenWeatherMap return code" << json[QString("cod")].toInt();
+ qCWarning(LOG_LIB) << "Invalid OpenWeatherMap return code"
+ << json[QString("cod")].toInt();
return;
}
@@ -339,11 +354,10 @@ void ExtWeather::weatherReplyReceived(QNetworkReply *reply)
data = parseSingleJson(json);
} else {
QVariantList list = json[QString("list")].toList();
- data = parseSingleJson(list.count() <= m_ts
- ? list.at(m_ts-1).toMap()
- : list.last().toMap());
+ data = parseSingleJson(list.count() <= m_ts ? list.at(m_ts - 1).toMap()
+ : list.last().toMap());
}
- foreach(QString key, data.keys())
+ foreach (QString key, data.keys())
values[tag(key)] = data[key];
}
@@ -366,8 +380,10 @@ QVariantHash ExtWeather::parseSingleJson(const QVariantMap json) const
// main data
QVariantMap mainWeather = json[QString("main")].toMap();
if (!weather.isEmpty()) {
- output[QString("humidity")] = mainWeather[QString("humidity")].toFloat();
- output[QString("pressure")] = mainWeather[QString("pressure")].toFloat();
+ output[QString("humidity")]
+ = mainWeather[QString("humidity")].toFloat();
+ output[QString("pressure")]
+ = mainWeather[QString("pressure")].toFloat();
output[QString("temperature")] = mainWeather[QString("temp")].toFloat();
}
diff --git a/sources/awesomewidgets/extweather.h b/sources/awesomewidgets/extweather.h
index 38ab7d7..0639314 100644
--- a/sources/awesomewidgets/extweather.h
+++ b/sources/awesomewidgets/extweather.h
@@ -22,12 +22,17 @@
#include "abstractextitem.h"
-#define OWM_URL "http://api.openweathermap.org/data/2.5/weather?q=$CITY,$COUNTRY&units=metric"
-#define OWM_FORECAST_URL "http://api.openweathermap.org/data/2.5/forecast?q=$CITY,$COUNTRY&units=metric"
+#define OWM_URL \
+ "http://api.openweathermap.org/data/2.5/" \
+ "weather?q=$CITY,$COUNTRY&units=metric"
+#define OWM_FORECAST_URL \
+ "http://api.openweathermap.org/data/2.5/" \
+ "forecast?q=$CITY,$COUNTRY&units=metric"
-namespace Ui {
- class ExtWeather;
+namespace Ui
+{
+class ExtWeather;
}
class ExtWeather : public AbstractExtItem
@@ -39,7 +44,8 @@ class ExtWeather : public AbstractExtItem
Q_PROPERTY(int ts READ ts WRITE setTs)
public:
- explicit ExtWeather(QWidget *parent = nullptr, const QString weatherName = QString(),
+ explicit ExtWeather(QWidget *parent = nullptr,
+ const QString weatherName = QString(),
const QStringList directories = QStringList());
virtual ~ExtWeather();
ExtWeather *copy(const QString _fileName, const int _number);
diff --git a/sources/awesomewidgets/graphicalitem.cpp b/sources/awesomewidgets/graphicalitem.cpp
index d712179..1da0da5 100644
--- a/sources/awesomewidgets/graphicalitem.cpp
+++ b/sources/awesomewidgets/graphicalitem.cpp
@@ -36,8 +36,8 @@
GraphicalItem::GraphicalItem(QWidget *parent, const QString desktopName,
const QStringList directories)
- : AbstractExtItem(parent, desktopName, directories),
- ui(new Ui::GraphicalItem)
+ : AbstractExtItem(parent, desktopName, directories)
+ , ui(new Ui::GraphicalItem)
{
qCDebug(LOG_LIB);
@@ -47,8 +47,10 @@ GraphicalItem::GraphicalItem(QWidget *parent, const QString desktopName,
initScene();
- connect(ui->pushButton_activeColor, SIGNAL(clicked()), this, SLOT(changeColor()));
- connect(ui->pushButton_inactiveColor, SIGNAL(clicked()), this, SLOT(changeColor()));
+ connect(ui->pushButton_activeColor, SIGNAL(clicked()), this,
+ SLOT(changeColor()));
+ connect(ui->pushButton_inactiveColor, SIGNAL(clicked()), this,
+ SLOT(changeColor()));
}
@@ -91,10 +93,11 @@ QString GraphicalItem::image(const QVariant value)
{
qCDebug(LOG_LIB);
qCDebug(LOG_LIB) << "Value" << value;
- if (m_bar == QString("none")) return QString("");
+ if (m_bar == QString("none"))
+ return QString("");
m_scene->clear();
- int scale[2] = { 1, 1 };
+ int scale[2] = {1, 1};
// paint
switch (m_type) {
@@ -121,12 +124,13 @@ 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("![](\"data:image/png;base64,%1\"/)
").
- arg(QString(byteArray.toBase64()));
+ QString url = QString("")
+ .arg(QString(byteArray.toBase64()));
return url;
}
@@ -253,7 +257,8 @@ void GraphicalItem::setBar(const QString _bar)
qCDebug(LOG_LIB);
qCDebug(LOG_LIB) << "Bar" << _bar;
- if (!_bar.contains(QRegExp(QString("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)")))) {
+ if (!_bar.contains(QRegExp(
+ QString("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)")))) {
qCWarning(LOG_LIB) << "Unsupported bar type" << _bar;
m_bar = QString("none");
} else {
@@ -353,18 +358,27 @@ void GraphicalItem::readConfiguration()
qCDebug(LOG_LIB);
AbstractExtItem::readConfiguration();
- for (int i=directories().count()-1; i>=0; i--) {
- if (!QDir(directories().at(i)).entryList(QDir::Files).contains(fileName()))
+ for (int i = directories().count() - 1; i >= 0; i--) {
+ if (!QDir(directories().at(i))
+ .entryList(QDir::Files)
+ .contains(fileName()))
continue;
- QSettings settings(QString("%1/%2").arg(directories().at(i)).arg(fileName()),
- QSettings::IniFormat);
+ QSettings settings(
+ QString("%1/%2").arg(directories().at(i)).arg(fileName()),
+ QSettings::IniFormat);
settings.beginGroup(QString("Desktop Entry"));
setBar(settings.value(QString("X-AW-Value"), m_bar).toString());
- setActiveColor(settings.value(QString("X-AW-ActiveColor"), m_activeColor).toString());
- setInactiveColor(settings.value(QString("X-AW-InactiveColor"), m_inactiveColor).toString());
+ setActiveColor(
+ settings.value(QString("X-AW-ActiveColor"), m_activeColor)
+ .toString());
+ setInactiveColor(
+ settings.value(QString("X-AW-InactiveColor"), m_inactiveColor)
+ .toString());
setStrType(settings.value(QString("X-AW-Type"), strType()).toString());
- setStrDirection(settings.value(QString("X-AW-Direction"), strDirection()).toString());
+ setStrDirection(
+ settings.value(QString("X-AW-Direction"), strDirection())
+ .toString());
setHeight(settings.value(QString("X-AW-Height"), m_height).toInt());
setWidth(settings.value(QString("X-AW-Width"), m_width).toInt());
// api == 2
@@ -375,7 +389,8 @@ void GraphicalItem::readConfiguration()
// update for current API
if ((apiVersion() > 0) && (apiVersion() < AWGIAPI)) {
- qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to" << AWGIAPI;
+ qCWarning(LOG_LIB) << "Bump API version from" << apiVersion() << "to"
+ << AWGIAPI;
setApiVersion(AWGIAPI);
writeConfiguration();
}
@@ -433,8 +448,9 @@ void GraphicalItem::writeConfiguration() const
qCDebug(LOG_LIB);
AbstractExtItem::writeConfiguration();
- QSettings settings(QString("%1/%2").arg(directories().first()).arg(fileName()),
- QSettings::IniFormat);
+ QSettings settings(
+ QString("%1/%2").arg(directories().first()).arg(fileName()),
+ QSettings::IniFormat);
qCInfo(LOG_LIB) << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));
@@ -455,7 +471,8 @@ void GraphicalItem::changeColor()
{
qCDebug(LOG_LIB);
- QColor color = stringToColor((static_cast(sender()))->text());
+ QColor color
+ = stringToColor((static_cast(sender()))->text());
QColor newColor = QColorDialog::getColor(color, this, tr("Select color"),
QColorDialog::ShowAlphaChannel);
if (!newColor.isValid())
@@ -468,7 +485,8 @@ void GraphicalItem::changeColor()
colorText.append(QString("%1").arg(newColor.blue()));
colorText.append(QString("%1").arg(newColor.alpha()));
- return static_cast(sender())->setText(colorText.join(QChar(',')));
+ return static_cast(sender())
+ ->setText(colorText.join(QChar(',')));
}
@@ -509,13 +527,13 @@ void GraphicalItem::paintCircle(const float value)
pen.setColor(inactive);
circle = m_scene->addEllipse(0.0, 0.0, m_width, m_height, pen,
QBrush(inactive, Qt::SolidPattern));
- circle->setSpanAngle(- (1.0 - percent) * 360.0 * 16.0);
+ circle->setSpanAngle(-(1.0 - percent) * 360.0 * 16.0);
circle->setStartAngle(90.0 * 16.0 - percent * 360.0 * 16.0);
// active
pen.setColor(active);
circle = m_scene->addEllipse(0.0, 0.0, m_width, m_height, pen,
QBrush(active, Qt::SolidPattern));
- circle->setSpanAngle(- percent * 360.0 * 16.0);
+ circle->setSpanAngle(-percent * 360.0 * 16.0);
circle->setStartAngle(90.0 * 16.0);
}
@@ -528,15 +546,16 @@ void GraphicalItem::paintGraph(const QList value)
pen.setColor(stringToColor(m_activeColor));
// default norms
- float normX = static_cast(m_width) / static_cast(value.count());
+ float normX
+ = static_cast(m_width) / static_cast(value.count());
float normY = static_cast(m_height) / (1.5 * 100.0);
// paint graph
- for (int i=0; iaddLine(x1, y1, x2, y2, pen);
}
}
diff --git a/sources/awesomewidgets/graphicalitem.h b/sources/awesomewidgets/graphicalitem.h
index 3c82b8b..eb0ef78 100644
--- a/sources/awesomewidgets/graphicalitem.h
+++ b/sources/awesomewidgets/graphicalitem.h
@@ -26,8 +26,9 @@
class QGraphicsScene;
class QGraphicsView;
-namespace Ui {
- class GraphicalItem;
+namespace Ui
+{
+class GraphicalItem;
}
class GraphicalItem : public AbstractExtItem
@@ -42,18 +43,11 @@ class GraphicalItem : public AbstractExtItem
Q_PROPERTY(int width READ width WRITE setWidth)
public:
- enum Direction {
- LeftToRight = 0,
- RightToLeft
- };
- enum Type {
- Horizontal = 0,
- Vertical,
- Circle,
- Graph
- };
+ enum Direction { LeftToRight = 0, RightToLeft };
+ enum Type { Horizontal = 0, Vertical, Circle, Graph };
- explicit GraphicalItem(QWidget *parent = nullptr, const QString desktopName = QString(),
+ explicit GraphicalItem(QWidget *parent = nullptr,
+ const QString desktopName = QString(),
const QStringList directories = QStringList());
virtual ~GraphicalItem();
GraphicalItem *copy(const QString _fileName, const int _number);
diff --git a/sources/checkgit.cmake b/sources/checkgit.cmake
index e6fc555..a485e5f 100644
--- a/sources/checkgit.cmake
+++ b/sources/checkgit.cmake
@@ -1,11 +1,11 @@
exec_program(
- "git"
- ${CMAKE_CURRENT_SOURCE_DIR}
- ARGS "log" "-1" "--format=\"%h\""
- OUTPUT_VARIABLE COMMIT_SHA
- RETURN_VALUE GIT_RETURN
+ "git"
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ARGS "log" "-1" "--format=\"%h\""
+ OUTPUT_VARIABLE COMMIT_SHA
+ RETURN_VALUE GIT_RETURN
)
-if(${GIT_RETURN} EQUAL "0")
+if (${GIT_RETURN} EQUAL "0")
set(PROJECT_COMMIT_SHA "${COMMIT_SHA}")
-endif()
+endif ()
diff --git a/sources/clang-format.cmake b/sources/clang-format.cmake
new file mode 100644
index 0000000..3c9f08e
--- /dev/null
+++ b/sources/clang-format.cmake
@@ -0,0 +1,18 @@
+# additional target to perform clang-format run, requires clang-format
+
+# get all project files
+file(GLOB_RECURSE ALL_SOURCE_FILES *.cpp *.h)
+foreach (SOURCE_FILE ${ALL_SOURCE_FILES})
+ string(FIND ${SOURCE_FILE} ${PROJECT_TRDPARTY_DIR} PROJECT_TRDPARTY_DIR_FOUND)
+ if (NOT ${PROJECT_TRDPARTY_DIR_FOUND} EQUAL -1)
+ list(REMOVE_ITEM ALL_SOURCE_FILES ${SOURCE_FILE})
+ endif ()
+endforeach ()
+
+add_custom_target(
+ clangformat
+ COMMAND ${CLANGFORMAT_EXECUTABLE}
+ -style=file
+ -i
+ ${ALL_SOURCE_FILES}
+)
diff --git a/sources/cppcheck.cmake b/sources/cppcheck.cmake
new file mode 100644
index 0000000..ac2a844
--- /dev/null
+++ b/sources/cppcheck.cmake
@@ -0,0 +1,23 @@
+# additional target to perform cppcheck run, requires cppcheck
+
+# get all project files
+# HACK this workaround is required to avoid qml files checking ^_^
+file(GLOB_RECURSE ALL_SOURCE_FILES *.cpp *.h)
+foreach (SOURCE_FILE ${ALL_SOURCE_FILES})
+ string(FIND ${SOURCE_FILE} ${PROJECT_TRDPARTY_DIR} PROJECT_TRDPARTY_DIR_FOUND)
+ if (NOT ${PROJECT_TRDPARTY_DIR_FOUND} EQUAL -1)
+ list(REMOVE_ITEM ALL_SOURCE_FILES ${SOURCE_FILE})
+ endif ()
+endforeach ()
+
+add_custom_target(
+ cppcheck
+ COMMAND ${CPPCHECK_EXECUTABLE}
+ --enable=warning,performance,portability,information,missingInclude
+ --std=c++11
+ --library=qt.cfg
+ --template="[{severity}][{id}] {message} {callstack} \(On {file}:{line}\)"
+ --verbose
+ --quiet
+ ${ALL_SOURCE_FILES}
+)
diff --git a/sources/desktop-panel/plugin/CMakeLists.txt b/sources/desktop-panel/plugin/CMakeLists.txt
index 268a0df..96de365 100644
--- a/sources/desktop-panel/plugin/CMakeLists.txt
+++ b/sources/desktop-panel/plugin/CMakeLists.txt
@@ -2,13 +2,13 @@ set(PLUGIN_NAME dpplugin)
add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.desktoppanel\")
include_directories(
- ${CMAKE_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}/../
- ${PROJECT_TRDPARTY_DIR}
- ${Qt_INCLUDE}
- ${Kf5_INCLUDE}
+ ${CMAKE_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}/../
+ ${PROJECT_TRDPARTY_DIR}
+ ${Qt_INCLUDE}
+ ${Kf5_INCLUDE}
)
file(GLOB SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp ${CMAKE_SOURCE_DIR}/*.cpp)
diff --git a/sources/desktop-panel/plugin/dpadds.cpp b/sources/desktop-panel/plugin/dpadds.cpp
index 82bd782..1c98695 100644
--- a/sources/desktop-panel/plugin/dpadds.cpp
+++ b/sources/desktop-panel/plugin/dpadds.cpp
@@ -45,9 +45,12 @@ DPAdds::DPAdds(QObject *parent)
// logging
qSetMessagePattern(LOG_FORMAT);
- 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(currentDesktopChanged(int)), this,
+ SIGNAL(desktopChanged()));
+ connect(KWindowSystem::self(), SIGNAL(windowAdded(WId)), this,
+ SIGNAL(windowListChanged()));
+ connect(KWindowSystem::self(), SIGNAL(windowRemoved(WId)), this,
+ SIGNAL(windowListChanged()));
}
@@ -101,16 +104,19 @@ QString DPAdds::toolTipImage(const int desktop) const
qCDebug(LOG_DP);
qCDebug(LOG_DP) << "Desktop" << desktop;
// drop if no tooltip required
- if (m_tooltipType == QString("none")) return QString();
+ if (m_tooltipType == QString("none"))
+ return QString();
// prepare
DesktopWindowsInfo info = getInfoByDesktop(desktop);
// special tooltip format for names
if (m_tooltipType == QString("names")) {
QStringList windowList;
- std::for_each(info.windowsData.cbegin(), info.windowsData.cend(),
- [&windowList](WindowData data) { windowList.append(data.name); });
- return QString("").arg(windowList.join(QString("")));
+ std::for_each(
+ info.windowsData.cbegin(), info.windowsData.cend(),
+ [&windowList](WindowData data) { windowList.append(data.name); });
+ return QString("")
+ .arg(windowList.join(QString("")));
}
// init
QGraphicsScene *toolTipScene = new QGraphicsScene();
@@ -122,14 +128,17 @@ QString DPAdds::toolTipImage(const int desktop) const
toolTipView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
// update
float margin = 5.0 * info.desktop.width() / 400.0;
- toolTipView->resize(info.desktop.width() + 2.0 * margin, info.desktop.height() + 2.0 * margin);
+ toolTipView->resize(info.desktop.width() + 2.0 * margin,
+ info.desktop.height() + 2.0 * margin);
toolTipScene->clear();
toolTipScene->setBackgroundBrush(QBrush(Qt::NoBrush));
// borders
toolTipScene->addLine(0, 0, 0, info.desktop.height() + 2.0 * margin);
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,
+ 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);
@@ -137,36 +146,43 @@ QString DPAdds::toolTipImage(const int desktop) const
QPen pen = QPen();
pen.setWidthF(2.0 * info.desktop.width() / 400.0);
pen.setColor(QColor(m_tooltipColor));
- foreach(WindowData data, info.windowsData) {
+ foreach (WindowData data, info.windowsData) {
QRect rect = data.rect;
toolTipScene->addLine(rect.left() + margin, rect.bottom() + margin,
- rect.left() + margin, rect.top() + margin, pen);
+ rect.left() + margin, rect.top() + margin,
+ pen);
toolTipScene->addLine(rect.left() + margin, rect.top() + margin,
- rect.right() + margin, rect.top() + margin, pen);
+ rect.right() + margin, rect.top() + margin,
+ pen);
toolTipScene->addLine(rect.right() + margin, rect.top() + margin,
- rect.right() + margin, rect.bottom() + margin, pen);
+ 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 == QString("clean")) {
QScreen *screen = QGuiApplication::primaryScreen();
std::for_each(info.desktopsData.cbegin(), info.desktopsData.cend(),
[&toolTipScene, &screen](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 == QString("windows")) {
QScreen *screen = QGuiApplication::primaryScreen();
std::for_each(info.desktopsData.cbegin(), info.desktopsData.cend(),
[&toolTipScene, &screen](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](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());
+ });
}
QPixmap image = toolTipView->grab().scaledToWidth(m_tooltipWidth);
@@ -177,7 +193,8 @@ QString DPAdds::toolTipImage(const int desktop) const
delete toolTipView;
delete toolTipScene;
- return QString("").arg(QString(byteArray.toBase64()));
+ return QString("")
+ .arg(QString(byteArray.toBase64()));
}
@@ -189,7 +206,7 @@ QString DPAdds::parsePattern(const QString pattern, const int desktop) const
QString parsed = pattern;
parsed.replace(QString("$$"), QString("$\\$\\"));
- foreach(QString key, dictKeys())
+ foreach (QString key, dictKeys())
parsed.replace(QString("$%1").arg(key), valueByKey(key, desktop));
parsed.replace(QString("$\\$\\"), QString("$$"));
@@ -222,14 +239,17 @@ QString DPAdds::valueByKey(const QString key, int desktop) const
qCDebug(LOG_DP);
qCDebug(LOG_DP) << "Requested key" << key;
qCDebug(LOG_DP) << "Desktop number" << desktop;
- if (desktop == -1) desktop = currentDesktop();
+ if (desktop == -1)
+ desktop = currentDesktop();
QString currentMark = currentDesktop() == desktop ? m_mark : QString("");
if (key == QString("mark"))
- return QString("%1").arg(currentMark, m_mark.count(), QLatin1Char(' '))
- .replace(QString(" "), QString(" "));
+ return QString("%1")
+ .arg(currentMark, m_mark.count(), QLatin1Char(' '))
+ .replace(QString(" "), QString(" "));
else if (key == QString("name"))
- return KWindowSystem::desktopName(desktop).replace(QString(" "), QString(" "));
+ return KWindowSystem::desktopName(desktop)
+ .replace(QString(" "), QString(" "));
else if (key == QString("number"))
return QString::number(desktop);
else if (key == QString("total"))
@@ -246,33 +266,54 @@ QString DPAdds::getAboutText(const QString type) const
qCDebug(LOG_DP) << "Type" << type;
QString text;
- if (type == QString("header"))
+ if (type == QString("header")) {
text = QString(NAME);
- else if (type == QString("version")) {
- text = i18n("Version %1 (build date %2)", QString(VERSION), QString(BUILD_DATE));
- if (!QString(COMMIT_SHA).isEmpty()) text += QString(" (%1)").arg(QString(COMMIT_SHA));
- } else if (type == QString("description"))
+ } else if (type == QString("version")) {
+ text = i18n("Version %1 (build date %2)", QString(VERSION),
+ QString(BUILD_DATE));
+ if (!QString(COMMIT_SHA).isEmpty())
+ text += QString(" (%1)").arg(QString(COMMIT_SHA));
+ } else if (type == QString("description")) {
text = i18n("A set of minimalistic plasmoid widgets");
- else if (type == QString("links"))
- text = i18n("Links:") + QString("
") +
- QString("%2
").arg(QString(HOMEPAGE)).arg(i18n("Homepage")) +
- QString("%2
").arg(QString(REPOSITORY)).arg(i18n("Repository")) +
- QString("%2
").arg(QString(BUGTRACKER)).arg(i18n("Bugtracker")) +
- QString("%2
").arg(QString(TRANSLATION)).arg(i18n("Translation issue")) +
- QString("%2
").arg(QString(AUR_PACKAGES)).arg(i18n("AUR packages")) +
- QString("%2").arg(QString(OPENSUSE_PACKAGES)).arg(i18n("openSUSE packages"));
- else if (type == QString("copy"))
- text = QString("© %1 %3
").arg(QString(DATE)).arg(QString(EMAIL)).arg(QString(AUTHOR)) +
- i18n("This software is licensed under %1", QString(LICENSE)) + QString("");
- else if (type == QString("translators"))
+ } else if (type == QString("links")) {
+ text = i18n("Links:") + QString("
")
+ + QString("%2
")
+ .arg(QString(HOMEPAGE))
+ .arg(i18n("Homepage"))
+ + QString("%2
")
+ .arg(QString(REPOSITORY))
+ .arg(i18n("Repository"))
+ + QString("%2
")
+ .arg(QString(BUGTRACKER))
+ .arg(i18n("Bugtracker"))
+ + QString("%2
")
+ .arg(QString(TRANSLATION))
+ .arg(i18n("Translation issue"))
+ + QString("%2
")
+ .arg(QString(AUR_PACKAGES))
+ .arg(i18n("AUR packages"))
+ + QString("%2")
+ .arg(QString(OPENSUSE_PACKAGES))
+ .arg(i18n("openSUSE packages"));
+ } else if (type == QString("copy")) {
+ text = QString("© %1 %3
")
+ .arg(QString(DATE))
+ .arg(QString(EMAIL))
+ .arg(QString(AUTHOR))
+ + i18n("This software is licensed under %1", QString(LICENSE))
+ + QString("");
+ } else if (type == QString("translators")) {
text = i18n("Translators: %1", QString(TRANSLATORS));
- else if (type == QString("3rdparty")) {
- QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(QChar(';'), QString::SkipEmptyParts);
- for (int i=0; i%1 (%2 license)")
- .arg(trdPartyList.at(i).split(QChar(',')).at(0))
- .arg(trdPartyList.at(i).split(QChar(',')).at(1))
- .arg(trdPartyList.at(i).split(QChar(',')).at(2));
+ } else if (type == QString("3rdparty")) {
+ QStringList trdPartyList
+ = QString(TRDPARTY_LICENSE)
+ .split(QChar(';'), QString::SkipEmptyParts);
+ for (int i = 0; i < trdPartyList.count(); i++)
+ trdPartyList[i]
+ = QString("%1 (%2 license)")
+ .arg(trdPartyList.at(i).split(QChar(',')).at(0))
+ .arg(trdPartyList.at(i).split(QChar(',')).at(1))
+ .arg(trdPartyList.at(i).split(QChar(',')).at(2));
text = i18n("This software uses: %1", trdPartyList.join(QString(", ")));
}
@@ -287,10 +328,10 @@ QVariantMap DPAdds::getFont(const QVariantMap defaultFont) const
QVariantMap fontMap;
CFont defaultCFont = CFont(defaultFont[QString("family")].toString(),
- defaultFont[QString("size")].toInt(),
- 400, false, defaultFont[QString("color")].toString());
- CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont,
- false, false);
+ defaultFont[QString("size")].toInt(), 400, false,
+ defaultFont[QString("color")].toString());
+ CFont font
+ = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, false);
fontMap[QString("color")] = font.color().name();
fontMap[QString("family")] = font.family();
fontMap[QString("size")] = font.pointSize();
@@ -306,8 +347,10 @@ void DPAdds::sendNotification(const QString eventId, const QString message)
qCDebug(LOG_DP) << "Event" << eventId;
qCDebug(LOG_DP) << "Message" << message;
- KNotification *notification = KNotification::event(eventId, QString("Desktop Panel ::: %1").arg(eventId), message);
- notification->setComponentName(QString("plasma-applet-org.kde.plasma.desktop-panel"));
+ KNotification *notification = KNotification::event(
+ eventId, QString("Desktop Panel ::: %1").arg(eventId), message);
+ notification->setComponentName(
+ QString("plasma-applet-org.kde.plasma.desktop-panel"));
}
@@ -330,20 +373,24 @@ DPAdds::DesktopWindowsInfo DPAdds::getInfoByDesktop(const int desktop) const
DesktopWindowsInfo info;
info.desktop = KWindowSystem::workArea(desktop);
- foreach(WId id, KWindowSystem::windows()) {
- KWindowInfo winInfo = KWindowInfo(id,
- NET::Property::WMDesktop | NET::Property::WMGeometry |
- NET::Property::WMState | NET::Property::WMWindowType |
- NET::Property::WMVisibleName);
- if (!winInfo.isOnDesktop(desktop)) continue;
+ foreach (WId id, KWindowSystem::windows()) {
+ KWindowInfo winInfo = KWindowInfo(
+ 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.isMinimized()) continue;
+ if (winInfo.windowType(NET::WindowTypeMask::NormalMask)
+ == NET::WindowType::Normal) {
+ if (winInfo.isMinimized())
+ continue;
info.windowsData.append(data);
- } else if (winInfo.windowType(NET::WindowTypeMask::DesktopMask) == NET::WindowType::Desktop) {
+ } else if (winInfo.windowType(NET::WindowTypeMask::DesktopMask)
+ == NET::WindowType::Desktop) {
info.desktopsData.append(data);
}
}
diff --git a/sources/desktop-panel/plugin/dpadds.h b/sources/desktop-panel/plugin/dpadds.h
index c5499f7..3c85a6b 100644
--- a/sources/desktop-panel/plugin/dpadds.h
+++ b/sources/desktop-panel/plugin/dpadds.h
@@ -43,13 +43,13 @@ class DPAdds : public QObject
public:
explicit DPAdds(QObject *parent = nullptr);
virtual ~DPAdds();
-
Q_INVOKABLE bool isDebugEnabled() const;
Q_INVOKABLE int currentDesktop() const;
Q_INVOKABLE QStringList dictKeys() 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);
@@ -63,7 +63,8 @@ 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/CMakeLists.txt b/sources/extsysmon/CMakeLists.txt
index b9344ab..54a68fd 100644
--- a/sources/extsysmon/CMakeLists.txt
+++ b/sources/extsysmon/CMakeLists.txt
@@ -3,14 +3,14 @@ message(STATUS "Subproject ${SUBPROJECT}")
add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidget\")
include_directories(
- ${CMAKE_SOURCE_DIR}
- ${CMAKE_BINARY_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}/../
- ${CMAKE_CURRENT_SOURCE_DIR}/../${PROJECT_LIBRARY}/
- ${PROJECT_TRDPARTY_DIR}
- ${Qt_INCLUDE}
- ${Kf5_INCLUDE}
+ ${CMAKE_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}/../
+ ${CMAKE_CURRENT_SOURCE_DIR}/../${PROJECT_LIBRARY}/
+ ${PROJECT_TRDPARTY_DIR}
+ ${Qt_INCLUDE}
+ ${Kf5_INCLUDE}
)
file(GLOB SUBPROJECT_DESKTOP_IN *.desktop)
diff --git a/sources/extsysmon/extsysmon.cpp b/sources/extsysmon/extsysmon.cpp
index 9cf239a..69ddf8f 100644
--- a/sources/extsysmon/extsysmon.cpp
+++ b/sources/extsysmon/extsysmon.cpp
@@ -42,7 +42,7 @@ ExtendedSysMon::ExtendedSysMon(QObject *parent, const QVariantList &args)
// init aggregator
aggregator = new ExtSysMonAggregator(this, configuration);
- foreach(QString source, aggregator->sources())
+ foreach (QString source, aggregator->sources())
setData(source, aggregator->initialData(source));
}
@@ -92,9 +92,10 @@ QStringList ExtendedSysMon::getAllHdd() const
{
qCDebug(LOG_ESM);
- QStringList allDevices = QDir(QString("/dev")).entryList(QDir::System, QDir::Name);
+ QStringList allDevices
+ = QDir(QString("/dev")).entryList(QDir::System, QDir::Name);
QStringList devices = allDevices.filter(QRegExp(QString("^[hms]d[a-z]$")));
- for (int i=0; i rawConfig;
settings.beginGroup(QString("Configuration"));
- rawConfig[QString("ACPIPATH")] = settings.value(QString("ACPIPATH"), QString("/sys/class/power_supply/")).toString();
- rawConfig[QString("GPUDEV")] = settings.value(QString("GPUDEV"), QString("auto")).toString();
- rawConfig[QString("HDDDEV")] = settings.value(QString("HDDDEV"), QString("all")).toString();
- rawConfig[QString("HDDTEMPCMD")] = settings.value(QString("HDDTEMPCMD"), QString("sudo smartctl -a")).toString();
- rawConfig[QString("MPDADDRESS")] = settings.value(QString("MPDADDRESS"), QString("localhost")).toString();
- rawConfig[QString("MPDPORT")] = settings.value(QString("MPDPORT"), QString("6600")).toString();
- rawConfig[QString("MPRIS")] = settings.value(QString("MPRIS"), QString("auto")).toString();
- rawConfig[QString("PLAYER")] = settings.value(QString("PLAYER"), QString("mpris")).toString();
- rawConfig[QString("PLAYERSYMBOLS")] = settings.value(QString("PLAYERSYMBOLS"), QString("10")).toString();
+ rawConfig[QString("ACPIPATH")]
+ = settings.value(QString("ACPIPATH"),
+ QString("/sys/class/power_supply/"))
+ .toString();
+ rawConfig[QString("GPUDEV")]
+ = settings.value(QString("GPUDEV"), QString("auto")).toString();
+ rawConfig[QString("HDDDEV")]
+ = settings.value(QString("HDDDEV"), QString("all")).toString();
+ rawConfig[QString("HDDTEMPCMD")]
+ = settings.value(QString("HDDTEMPCMD"), QString("sudo smartctl -a"))
+ .toString();
+ rawConfig[QString("MPDADDRESS")]
+ = settings.value(QString("MPDADDRESS"), QString("localhost"))
+ .toString();
+ rawConfig[QString("MPDPORT")]
+ = settings.value(QString("MPDPORT"), QString("6600")).toString();
+ rawConfig[QString("MPRIS")]
+ = settings.value(QString("MPRIS"), QString("auto")).toString();
+ rawConfig[QString("PLAYER")]
+ = settings.value(QString("PLAYER"), QString("mpris")).toString();
+ rawConfig[QString("PLAYERSYMBOLS")]
+ = settings.value(QString("PLAYERSYMBOLS"), QString("10")).toString();
settings.endGroup();
configuration = updateConfiguration(rawConfig);
}
-QHash ExtendedSysMon::updateConfiguration(QHash rawConfig) const
+QHash
+ExtendedSysMon::updateConfiguration(QHash rawConfig) const
{
qCDebug(LOG_ESM);
qCDebug(LOG_ESM) << "Raw configuration" << rawConfig;
@@ -157,20 +174,21 @@ QHash ExtendedSysMon::updateConfiguration(QHash ExtendedSysMon::updateConfiguration(QHash updateConfiguration(QHash rawConfig) const;
+ QHash
+ updateConfiguration(QHash rawConfig) const;
};
diff --git a/sources/extsysmon/extsysmonaggregator.cpp b/sources/extsysmon/extsysmonaggregator.cpp
index ce65603..23ed9b9 100644
--- a/sources/extsysmon/extsysmonaggregator.cpp
+++ b/sources/extsysmon/extsysmonaggregator.cpp
@@ -35,7 +35,8 @@
#include "sources/weathersource.h"
-ExtSysMonAggregator::ExtSysMonAggregator(QObject *parent, const QHash config)
+ExtSysMonAggregator::ExtSysMonAggregator(QObject *parent,
+ const QHash config)
: QObject(parent)
{
qCDebug(LOG_ESM);
@@ -61,15 +62,6 @@ QVariant ExtSysMonAggregator::data(const QString source) const
}
-AbstractExtSysMonSource *ExtSysMonAggregator::engine(const QString source)
-{
- qCDebug(LOG_ESM);
- qCDebug(LOG_ESM) << "Source" << source;
-
- return hasSource(source) ? m_map[source] : nullptr;
-}
-
-
bool ExtSysMonAggregator::hasSource(const QString source) const
{
return m_map.contains(source);
@@ -81,7 +73,8 @@ QVariantMap ExtSysMonAggregator::initialData(const QString source) const
qCDebug(LOG_ESM);
qCDebug(LOG_ESM) << "Source" << source;
- return hasSource(source) ? m_map[source]->initialData(source) : QVariantMap();
+ return hasSource(source) ? m_map[source]->initialData(source)
+ : QVariantMap();
}
@@ -100,64 +93,75 @@ void ExtSysMonAggregator::init(const QHash config)
qCDebug(LOG_ESM);
// battery
- AbstractExtSysMonSource *batteryItem = new BatterySource(this, QStringList() << config[QString("ACPIPATH")]);
- foreach(QString source, batteryItem->sources())
+ AbstractExtSysMonSource *batteryItem
+ = new BatterySource(this, QStringList() << config[QString("ACPIPATH")]);
+ foreach (QString source, batteryItem->sources())
m_map[source] = batteryItem;
// custom
AbstractExtSysMonSource *customItem = new CustomSource(this, QStringList());
- foreach(QString source, customItem->sources())
+ foreach (QString source, customItem->sources())
m_map[source] = customItem;
// desktop
- AbstractExtSysMonSource *desktopItem = new DesktopSource(this, QStringList());
- foreach(QString source, desktopItem->sources())
+ AbstractExtSysMonSource *desktopItem
+ = new DesktopSource(this, QStringList());
+ foreach (QString source, desktopItem->sources())
m_map[source] = desktopItem;
// gpu load
- AbstractExtSysMonSource *gpuLoadItem = new GPULoadSource(this, QStringList() << config[QString("GPUDEV")]);
- foreach(QString source, gpuLoadItem->sources())
+ AbstractExtSysMonSource *gpuLoadItem
+ = new GPULoadSource(this, QStringList() << config[QString("GPUDEV")]);
+ foreach (QString source, gpuLoadItem->sources())
m_map[source] = gpuLoadItem;
// gpu temperature
- AbstractExtSysMonSource *gpuTempItem = new GPUTemperatureSource(this, QStringList() << config[QString("GPUDEV")]);
- foreach(QString source, gpuTempItem->sources())
+ AbstractExtSysMonSource *gpuTempItem = new GPUTemperatureSource(
+ this, QStringList() << config[QString("GPUDEV")]);
+ foreach (QString source, gpuTempItem->sources())
m_map[source] = gpuTempItem;
// hdd temperature
- AbstractExtSysMonSource *hddTempItem = new HDDTemperatureSource(this,
- QStringList() << config[QString("HDDDEV")] << config[QString("HDDTEMPCMD")]);
- foreach(QString source, hddTempItem->sources())
+ AbstractExtSysMonSource *hddTempItem = new HDDTemperatureSource(
+ this, QStringList() << config[QString("HDDDEV")]
+ << config[QString("HDDTEMPCMD")]);
+ foreach (QString source, hddTempItem->sources())
m_map[source] = hddTempItem;
// network
- AbstractExtSysMonSource *networkItem = new NetworkSource(this, QStringList());
- foreach(QString source, networkItem->sources())
+ AbstractExtSysMonSource *networkItem
+ = new NetworkSource(this, QStringList());
+ foreach (QString source, networkItem->sources())
m_map[source] = networkItem;
// player
- AbstractExtSysMonSource *playerItem = new PlayerSource(this,
- QStringList() << config[QString("PLAYER")] << config[QString("MPDADDRESS")]
- << config[QString("MPDPORT")] << config[QString("MPRIS")] << config[QString("PLAYERSYMBOLS")]);
- foreach(QString source, playerItem->sources())
+ AbstractExtSysMonSource *playerItem = new PlayerSource(
+ this, QStringList()
+ << config[QString("PLAYER")] << config[QString("MPDADDRESS")]
+ << config[QString("MPDPORT")] << config[QString("MPRIS")]
+ << config[QString("PLAYERSYMBOLS")]);
+ foreach (QString source, playerItem->sources())
m_map[source] = playerItem;
// processes
- AbstractExtSysMonSource *processesItem = new ProcessesSource(this, QStringList());
- foreach(QString source, processesItem->sources())
+ AbstractExtSysMonSource *processesItem
+ = new ProcessesSource(this, QStringList());
+ foreach (QString source, processesItem->sources())
m_map[source] = processesItem;
// quotes
AbstractExtSysMonSource *quotesItem = new QuotesSource(this, QStringList());
- foreach(QString source, quotesItem->sources())
+ foreach (QString source, quotesItem->sources())
m_map[source] = quotesItem;
// update
AbstractExtSysMonSource *updateItem = new UpdateSource(this, QStringList());
- foreach(QString source, updateItem->sources())
+ foreach (QString source, updateItem->sources())
m_map[source] = updateItem;
// upgrade
- AbstractExtSysMonSource *upgradeItem = new UpgradeSource(this, QStringList());
- foreach(QString source, upgradeItem->sources())
+ AbstractExtSysMonSource *upgradeItem
+ = new UpgradeSource(this, QStringList());
+ foreach (QString source, upgradeItem->sources())
m_map[source] = upgradeItem;
// weather
- AbstractExtSysMonSource *weatherItem = new WeatherSource(this, QStringList());
- foreach(QString source, weatherItem->sources())
+ AbstractExtSysMonSource *weatherItem
+ = new WeatherSource(this, QStringList());
+ foreach (QString source, weatherItem->sources())
m_map[source] = weatherItem;
#ifdef BUILD_TESTING
// additional load source
AbstractExtSysMonSource *loadItem = new LoadSource(this, QStringList());
- foreach(QString source, loadItem->sources())
+ foreach (QString source, loadItem->sources())
m_map[source] = loadItem;
#endif /* BUILD_TESTING */
}
diff --git a/sources/extsysmon/extsysmonaggregator.h b/sources/extsysmon/extsysmonaggregator.h
index 2630ca9..6918a24 100644
--- a/sources/extsysmon/extsysmonaggregator.h
+++ b/sources/extsysmon/extsysmonaggregator.h
@@ -28,10 +28,10 @@ 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;
- AbstractExtSysMonSource *engine(const QString source);
bool hasSource(const QString source) const;
QVariantMap initialData(const QString source) const;
QStringList sources() const;
diff --git a/sources/extsysmon/sources/abstractextsysmonsource.h b/sources/extsysmon/sources/abstractextsysmonsource.h
index a2b9b00..23526cf 100644
--- a/sources/extsysmon/sources/abstractextsysmonsource.h
+++ b/sources/extsysmon/sources/abstractextsysmonsource.h
@@ -26,8 +26,9 @@
class AbstractExtSysMonSource : public QObject
{
public:
- explicit AbstractExtSysMonSource(QObject *parent, const QStringList) : QObject(parent) {};
- virtual ~AbstractExtSysMonSource() {};
+ explicit AbstractExtSysMonSource(QObject *parent, const QStringList)
+ : QObject(parent){};
+ virtual ~AbstractExtSysMonSource(){};
virtual QVariant data(QString source) = 0;
virtual QVariantMap initialData(QString source) const = 0;
virtual void run() = 0;
diff --git a/sources/extsysmon/sources/batterysource.cpp b/sources/extsysmon/sources/batterysource.cpp
index b4e5191..597ae90 100644
--- a/sources/extsysmon/sources/batterysource.cpp
+++ b/sources/extsysmon/sources/batterysource.cpp
@@ -45,7 +45,8 @@ QVariant BatterySource::data(QString source)
qCDebug(LOG_ESM);
qCDebug(LOG_ESM) << "Source" << source;
- if (source == QString("battery/ac")) run();
+ if (source == QString("battery/ac"))
+ run();
return values[source];
}
@@ -87,27 +88,34 @@ void BatterySource::run()
// adaptor
QFile acFile(QString("%1/AC/online").arg(m_acpiPath));
if (acFile.open(QIODevice::ReadOnly))
- values[QString("battery/ac")] = (QString(acFile.readLine()).trimmed().toInt() == 1);
+ values[QString("battery/ac")]
+ = (QString(acFile.readLine()).trimmed().toInt() == 1);
acFile.close();
// batterites
float currentLevel = 0.0;
float fullLevel = 0.0;
- for (int i=0; i(100 * batCurrent / batFull);
+ for (int i = 0; i < m_batteriesCount; i++) {
+ QFile currentLevelFile(
+ QString("%1/BAT%2/energy_now").arg(m_acpiPath).arg(i));
+ QFile fullLevelFile(
+ QString("%1/BAT%2/energy_full").arg(m_acpiPath).arg(i));
+ if ((currentLevelFile.open(QIODevice::ReadOnly))
+ && (fullLevelFile.open(QIODevice::ReadOnly))) {
+ float batCurrent
+ = QString(currentLevelFile.readLine()).trimmed().toFloat();
+ float batFull
+ = QString(fullLevelFile.readLine()).trimmed().toFloat();
+ values[QString("battery/bat%1").arg(i)]
+ = static_cast(100 * batCurrent / batFull);
currentLevel += batCurrent;
fullLevel += batFull;
}
currentLevelFile.close();
fullLevelFile.close();
}
- values[QString("battery/bat")] = static_cast(100 * currentLevel / fullLevel);
+ values[QString("battery/bat")]
+ = static_cast(100 * currentLevel / fullLevel);
}
@@ -126,13 +134,15 @@ QStringList BatterySource::getSources()
QStringList sources;
sources.append(QString("battery/ac"));
sources.append(QString("battery/bat"));
- m_batteriesCount = QDir(m_acpiPath).entryList(QStringList() << QString("BAT*"),
- QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name).count();
+ m_batteriesCount
+ = QDir(m_acpiPath)
+ .entryList(QStringList() << QString("BAT*"),
+ QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name)
+ .count();
qCInfo(LOG_ESM) << "Init batteries count as" << m_batteriesCount;
- for (int i=0; iitemByTagNumber(index(source))->uniq());
+ data[QString("name")]
+ = QString("Custom command '%1' output")
+ .arg(extScripts->itemByTagNumber(index(source))->uniq());
data[QString("type")] = QString("QString");
data[QString("units")] = QString("");
@@ -80,7 +82,7 @@ QStringList CustomSource::getSources()
qCDebug(LOG_ESM);
QStringList sources;
- foreach(ExtScript *item, extScripts->activeItems())
+ foreach (ExtScript *item, extScripts->activeItems())
sources.append(QString("custom/%1").arg(item->tag(QString("custom"))));
return sources;
diff --git a/sources/extsysmon/sources/customsource.h b/sources/extsysmon/sources/customsource.h
index 474c912..91ee081 100644
--- a/sources/extsysmon/sources/customsource.h
+++ b/sources/extsysmon/sources/customsource.h
@@ -33,7 +33,7 @@ public:
virtual ~CustomSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
- void run() {};
+ void run(){};
QStringList sources() const;
private:
diff --git a/sources/extsysmon/sources/desktopsource.cpp b/sources/extsysmon/sources/desktopsource.cpp
index 7f6de3a..5916c5b 100644
--- a/sources/extsysmon/sources/desktopsource.cpp
+++ b/sources/extsysmon/sources/desktopsource.cpp
@@ -51,7 +51,7 @@ QVariant DesktopSource::data(QString source)
return current;
} else if (source == QString("desktop/total/name")) {
QStringList desktops;
- for (int i=1; itoUnicode(process.output).trimmed();
- if (m_device == QString("nvidia"))
- foreach(QString str, qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
- if (!str.contains(QString(""))) continue;
- QString load = str.remove(QString("")).remove(QString(""))
- .remove(QChar('%'));
+ QString qoutput
+ = QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed();
+ if (m_device == QString("nvidia")) {
+ foreach (QString str,
+ qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
+ if (!str.contains(QString("")))
+ continue;
+ QString load = str.remove(QString(""))
+ .remove(QString(""))
+ .remove(QChar('%'));
value = load.toFloat();
break;
}
- else if (m_device == QString("ati"))
- foreach(QString str, qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
- if (!str.contains(QString("load"))) continue;
- QString load = str.split(QChar(' '), QString::SkipEmptyParts)[3]
- .remove(QChar('%'));
+ } else if (m_device == QString("ati")) {
+ foreach (QString str,
+ qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
+ if (!str.contains(QString("load")))
+ continue;
+ QString load
+ = str.split(QChar(' '), QString::SkipEmptyParts)[3].remove(
+ QChar('%'));
value = load.toFloat();
break;
}
+ }
// return
return value;
}
diff --git a/sources/extsysmon/sources/gpuloadsource.h b/sources/extsysmon/sources/gpuloadsource.h
index 51a983a..3ddff3b 100644
--- a/sources/extsysmon/sources/gpuloadsource.h
+++ b/sources/extsysmon/sources/gpuloadsource.h
@@ -30,7 +30,7 @@ public:
virtual ~GPULoadSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
- void run() {};
+ void run(){};
QStringList sources() const;
private:
diff --git a/sources/extsysmon/sources/gputempsource.cpp b/sources/extsysmon/sources/gputempsource.cpp
index dd3436f..65b2f89 100644
--- a/sources/extsysmon/sources/gputempsource.cpp
+++ b/sources/extsysmon/sources/gputempsource.cpp
@@ -25,7 +25,8 @@
#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);
@@ -51,27 +52,37 @@ QVariant GPUTemperatureSource::data(QString source)
if ((m_device != QString("nvidia")) && (m_device != QString("ati")))
return value;
// build cmd
- QString cmd = m_device == QString("nvidia") ? QString("nvidia-smi -q -x") : QString("aticonfig --od-gettemperature");
+ QString cmd = m_device == QString("nvidia")
+ ? QString("nvidia-smi -q -x")
+ : QString("aticonfig --od-gettemperature");
qCInfo(LOG_ESM) << "cmd" << cmd;
TaskResult process = runTask(cmd);
qCInfo(LOG_ESM) << "Cmd returns" << process.exitCode;
qCInfo(LOG_ESM) << "Error" << process.error;
// parse
- QString qoutput = QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed();
- if (m_device == QString("nvidia"))
- foreach(QString str, qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
- if (!str.contains(QString(""))) continue;
- QString temp = str.remove(QString("")).remove(QString("C"));
+ QString qoutput
+ = QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed();
+ if (m_device == QString("nvidia")) {
+ foreach (QString str,
+ qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
+ if (!str.contains(QString("")))
+ continue;
+ QString temp = str.remove(QString(""))
+ .remove(QString("C"));
value = temp.toFloat();
break;
}
- else if (m_device == QString("ati"))
- foreach(QString str, qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
- if (!str.contains(QString("Temperature"))) continue;
- QString temp = str.split(QChar(' '), QString::SkipEmptyParts).at(4);
+ } else if (m_device == QString("ati")) {
+ foreach (QString str,
+ qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
+ if (!str.contains(QString("Temperature")))
+ continue;
+ QString temp
+ = str.split(QChar(' '), QString::SkipEmptyParts).at(4);
value = temp.toFloat();
break;
}
+ }
// return
return value;
}
diff --git a/sources/extsysmon/sources/gputempsource.h b/sources/extsysmon/sources/gputempsource.h
index 4196fd4..3e62bad 100644
--- a/sources/extsysmon/sources/gputempsource.h
+++ b/sources/extsysmon/sources/gputempsource.h
@@ -30,7 +30,7 @@ public:
virtual ~GPUTemperatureSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
- void run() {};
+ void run(){};
QStringList sources() const;
private:
diff --git a/sources/extsysmon/sources/hddtempsource.cpp b/sources/extsysmon/sources/hddtempsource.cpp
index 53fd1cd..5d11c76 100644
--- a/sources/extsysmon/sources/hddtempsource.cpp
+++ b/sources/extsysmon/sources/hddtempsource.cpp
@@ -25,7 +25,8 @@
#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);
@@ -58,17 +59,24 @@ QVariant HDDTemperatureSource::data(QString source)
qCInfo(LOG_ESM) << "Error" << process.error;
// parse
- QString qoutput = QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed();
+ QString qoutput
+ = QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed();
if (m_smartctl) {
- foreach(QString str, qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
- if (!str.startsWith(QString("194"))) continue;
- if (str.split(QChar(' '), QString::SkipEmptyParts).count() < 9) break;
- value = str.split(QChar(' '), QString::SkipEmptyParts).at(9).toFloat();
+ foreach (QString str,
+ qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
+ if (!str.startsWith(QString("194")))
+ continue;
+ if (str.split(QChar(' '), QString::SkipEmptyParts).count() < 9)
+ break;
+ value = str.split(QChar(' '), QString::SkipEmptyParts)
+ .at(9)
+ .toFloat();
break;
}
} else {
if (qoutput.split(QChar(':'), QString::SkipEmptyParts).count() >= 3) {
- QString temp = qoutput.split(QChar(':'), QString::SkipEmptyParts).at(2);
+ QString temp
+ = qoutput.split(QChar(':'), QString::SkipEmptyParts).at(2);
temp.remove(QChar(0260)).remove(QChar('C'));
value = temp.toFloat();
}
@@ -100,7 +108,7 @@ QStringList HDDTemperatureSource::sources() const
qCDebug(LOG_ESM);
QStringList sources;
- foreach(QString device, m_devices)
+ foreach (QString device, m_devices)
sources.append(QString("hdd/temperature%1").arg(device));
return sources;
diff --git a/sources/extsysmon/sources/hddtempsource.h b/sources/extsysmon/sources/hddtempsource.h
index dcd9dd4..0da6f31 100644
--- a/sources/extsysmon/sources/hddtempsource.h
+++ b/sources/extsysmon/sources/hddtempsource.h
@@ -30,7 +30,7 @@ public:
virtual ~HDDTemperatureSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
- void run() {};
+ void run(){};
QStringList sources() const;
private:
diff --git a/sources/extsysmon/sources/loadsource.cpp b/sources/extsysmon/sources/loadsource.cpp
index 3b211f1..e8f8ee6 100644
--- a/sources/extsysmon/sources/loadsource.cpp
+++ b/sources/extsysmon/sources/loadsource.cpp
@@ -68,8 +68,8 @@ QStringList LoadSource::sources() const
qCDebug(LOG_ESM);
QStringList sources;
- for (int i=0; i<1000; i++)
- sources.append(QString("load/load%1").arg(i));
+ for (int i = 0; i < 1000; i++)
+ sources.append(QString("load/load%1").arg(i));
return sources;
}
diff --git a/sources/extsysmon/sources/loadsource.h b/sources/extsysmon/sources/loadsource.h
index 8ef7ab7..e31963b 100644
--- a/sources/extsysmon/sources/loadsource.h
+++ b/sources/extsysmon/sources/loadsource.h
@@ -30,7 +30,7 @@ public:
virtual ~LoadSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
- void run() {};
+ void run(){};
QStringList sources() const;
};
diff --git a/sources/extsysmon/sources/networksource.cpp b/sources/extsysmon/sources/networksource.cpp
index a594d72..f5beb52 100644
--- a/sources/extsysmon/sources/networksource.cpp
+++ b/sources/extsysmon/sources/networksource.cpp
@@ -44,13 +44,16 @@ QVariant NetworkSource::data(QString source)
if (source == QString("network/current/name")) {
QString device = QString("lo");
- QList rawInterfaceList = QNetworkInterface::allInterfaces();
+ QList rawInterfaceList
+ = QNetworkInterface::allInterfaces();
qCInfo(LOG_ESM) << "Devices" << rawInterfaceList;
- foreach(QNetworkInterface interface, rawInterfaceList) {
- if ((interface.flags().testFlag(QNetworkInterface::IsLoopBack)) ||
- (interface.flags().testFlag(QNetworkInterface::IsPointToPoint)))
+ foreach (QNetworkInterface interface, rawInterfaceList) {
+ if ((interface.flags().testFlag(QNetworkInterface::IsLoopBack))
+ || (interface.flags().testFlag(
+ QNetworkInterface::IsPointToPoint)))
+ continue;
+ if (interface.addressEntries().isEmpty())
continue;
- if (interface.addressEntries().isEmpty()) continue;
device = interface.name();
break;
}
diff --git a/sources/extsysmon/sources/networksource.h b/sources/extsysmon/sources/networksource.h
index e83c606..126fc19 100644
--- a/sources/extsysmon/sources/networksource.h
+++ b/sources/extsysmon/sources/networksource.h
@@ -30,7 +30,7 @@ public:
virtual ~NetworkSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
- void run() {};
+ void run(){};
QStringList sources() const;
};
diff --git a/sources/extsysmon/sources/playersource.cpp b/sources/extsysmon/sources/playersource.cpp
index 7a122a6..ad23865 100644
--- a/sources/extsysmon/sources/playersource.cpp
+++ b/sources/extsysmon/sources/playersource.cpp
@@ -53,7 +53,8 @@ QVariant PlayerSource::data(QString source)
qCDebug(LOG_ESM);
qCDebug(LOG_ESM) << "Source" << source;
- if (source == QString("player/title")) run();
+ if (source == QString("player/title"))
+ run();
return values[source];
}
@@ -73,13 +74,16 @@ QVariantMap PlayerSource::initialData(QString source) const
} else if (source == QString("player/salbum")) {
data[QString("min")] = QString("");
data[QString("max")] = QString("");
- data[QString("name")] = QString("Current song album (%1 symbols)").arg(m_symbols);
+ data[QString("name")]
+ = QString("Current song album (%1 symbols)").arg(m_symbols);
data[QString("type")] = QString("QString");
data[QString("units")] = QString("");
} else if (source == QString("player/dalbum")) {
data[QString("min")] = QString("");
data[QString("max")] = QString("");
- data[QString("name")] = QString("Current song album (%1 symbols, dynamic)").arg(m_symbols);
+ data[QString("name")]
+ = QString("Current song album (%1 symbols, dynamic)")
+ .arg(m_symbols);
data[QString("type")] = QString("QString");
data[QString("units")] = QString("");
} else if (source == QString("player/artist")) {
@@ -91,13 +95,16 @@ QVariantMap PlayerSource::initialData(QString source) const
} else if (source == QString("player/sartist")) {
data[QString("min")] = QString("");
data[QString("max")] = QString("");
- data[QString("name")] = QString("Current song artist (%1 symbols)").arg(m_symbols);
+ data[QString("name")]
+ = QString("Current song artist (%1 symbols)").arg(m_symbols);
data[QString("type")] = QString("QString");
data[QString("units")] = QString("");
} else if (source == QString("player/dartist")) {
data[QString("min")] = QString("");
data[QString("max")] = QString("");
- data[QString("name")] = QString("Current song artist (%1 symbols, dynamic)").arg(m_symbols);
+ data[QString("name")]
+ = QString("Current song artist (%1 symbols, dynamic)")
+ .arg(m_symbols);
data[QString("type")] = QString("QString");
data[QString("units")] = QString("");
} else if (source == QString("player/duration")) {
@@ -121,13 +128,16 @@ QVariantMap PlayerSource::initialData(QString source) const
} else if (source == QString("player/stitle")) {
data[QString("min")] = QString("");
data[QString("max")] = QString("");
- data[QString("name")] = QString("Current song title (%1 symbols)").arg(m_symbols);
+ data[QString("name")]
+ = QString("Current song title (%1 symbols)").arg(m_symbols);
data[QString("type")] = QString("QString");
data[QString("units")] = QString("");
} else if (source == QString("player/dtitle")) {
data[QString("min")] = QString("");
data[QString("max")] = QString("");
- data[QString("name")] = QString("Current song title (%1 symbols, dynamic)").arg(m_symbols);
+ data[QString("name")]
+ = QString("Current song title (%1 symbols, dynamic)")
+ .arg(m_symbols);
data[QString("type")] = QString("QString");
data[QString("units")] = QString("");
}
@@ -144,32 +154,34 @@ void PlayerSource::run()
if (m_player == QString("mpd")) {
// mpd
QHash data = getPlayerMpdInfo(m_mpdAddress);
- foreach(QString key, data.keys()) values[key] = data[key];
+ foreach (QString key, data.keys())
+ values[key] = data[key];
} else if (m_player == QString("mpris")) {
// players which supports mpris
QString mpris = m_mpris == QString("auto") ? getAutoMpris() : m_mpris;
QHash data = getPlayerMprisInfo(mpris);
- foreach(QString key, data.keys()) values[key] = data[key];
+ foreach (QString key, data.keys())
+ values[key] = data[key];
}
// dymanic properties
// solid
- values[QString("player/salbum")] = stripString(values[QString("player/album")].toString(),
- m_symbols);
- values[QString("player/sartist")] = stripString(values[QString("player/artist")].toString(),
- m_symbols);
- values[QString("player/stitle")] = stripString(values[QString("player/title")].toString(),
- m_symbols);
+ values[QString("player/salbum")]
+ = stripString(values[QString("player/album")].toString(), m_symbols);
+ values[QString("player/sartist")]
+ = stripString(values[QString("player/artist")].toString(), m_symbols);
+ values[QString("player/stitle")]
+ = stripString(values[QString("player/title")].toString(), m_symbols);
// dynamic
- values[QString("player/dalbum")] = buildString(values[QString("player/dalbum")].toString(),
- values[QString("player/album")].toString(),
- m_symbols);
- values[QString("player/dartist")] = buildString(values[QString("player/dartist")].toString(),
- values[QString("player/artist")].toString(),
- m_symbols);
- values[QString("player/dtitle")] = buildString(values[QString("player/dtitle")].toString(),
- values[QString("player/title")].toString(),
- m_symbols);
+ values[QString("player/dalbum")]
+ = buildString(values[QString("player/dalbum")].toString(),
+ values[QString("player/album")].toString(), m_symbols);
+ values[QString("player/dartist")]
+ = buildString(values[QString("player/dartist")].toString(),
+ values[QString("player/artist")].toString(), m_symbols);
+ values[QString("player/dtitle")]
+ = buildString(values[QString("player/dtitle")].toString(),
+ values[QString("player/title")].toString(), m_symbols);
}
@@ -211,12 +223,15 @@ QString PlayerSource::getAutoMpris() const
{
qCDebug(LOG_ESM);
- QDBusMessage listServices = QDBusConnection::sessionBus().interface()->call(QDBus::BlockWithGui, QString("ListNames"));
- if (listServices.arguments().isEmpty()) return QString();
+ QDBusMessage listServices = QDBusConnection::sessionBus().interface()->call(
+ QDBus::BlockWithGui, QString("ListNames"));
+ if (listServices.arguments().isEmpty())
+ return QString();
QStringList arguments = listServices.arguments().first().toStringList();
- foreach(QString arg, arguments) {
- if (!arg.startsWith(QString("org.mpris.MediaPlayer2."))) continue;
+ foreach (QString arg, arguments) {
+ if (!arg.startsWith(QString("org.mpris.MediaPlayer2.")))
+ continue;
qCInfo(LOG_ESM) << "Service found" << arg;
QString service = arg;
service.remove(QString("org.mpris.MediaPlayer2."));
@@ -235,19 +250,25 @@ QVariantHash PlayerSource::getPlayerMpdInfo(const QString mpdAddress) const
QVariantHash info = defaultInfo();
// build cmd
- QString cmd = QString("bash -c \"echo 'currentsong\nstatus\nclose' | curl --connect-timeout 1 -fsm 3 telnet://%1\"")
- .arg(mpdAddress);
+ QString cmd = QString("bash -c \"echo 'currentsong\nstatus\nclose' | curl "
+ "--connect-timeout 1 -fsm 3 telnet://%1\"")
+ .arg(mpdAddress);
qCInfo(LOG_ESM) << "cmd" << cmd;
TaskResult process = runTask(cmd);
qCInfo(LOG_ESM) << "Cmd returns" << process.exitCode;
qCInfo(LOG_ESM) << "Error" << process.error;
- QString qoutput = QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed();
- foreach(QString str, qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
+ QString qoutput
+ = QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed();
+ foreach (QString str, qoutput.split(QChar('\n'), QString::SkipEmptyParts)) {
if (str.split(QString(": "), QString::SkipEmptyParts).count() == 2) {
// "Metadata: data"
- QString metadata = str.split(QString(": "), QString::SkipEmptyParts).first().toLower();
- QString data = str.split(QString(": "), QString::SkipEmptyParts).last().trimmed();
+ QString metadata = str.split(QString(": "), QString::SkipEmptyParts)
+ .first()
+ .toLower();
+ QString data = str.split(QString(": "), QString::SkipEmptyParts)
+ .last()
+ .trimmed();
// there are one more time...
if ((metadata == QString("time")) && (data.contains(QChar(':')))) {
QStringList times = data.split(QString(":"));
@@ -269,44 +290,63 @@ QVariantHash PlayerSource::getPlayerMprisInfo(const QString mpris) const
qCDebug(LOG_ESM) << "MPRIS" << mpris;
QVariantHash info = defaultInfo();
- if (mpris.isEmpty()) return info;
+ if (mpris.isEmpty())
+ return info;
QDBusConnection bus = QDBusConnection::sessionBus();
// comes from the following request:
- // qdbus org.mpris.MediaPlayer2.vlc /org/mpris/MediaPlayer2 org.freedesktop.DBus.Properties.Get org.mpris.MediaPlayer2.Player Metadata
+ // qdbus org.mpris.MediaPlayer2.vlc /org/mpris/MediaPlayer2
+ // org.freedesktop.DBus.Properties.Get org.mpris.MediaPlayer2.Player
+ // Metadata
// or the same but using dbus-send:
- // 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() << QString("org.mpris.MediaPlayer2.Player") << QString("Metadata");
- QDBusMessage request = QDBusMessage::createMethodCall(QString("org.mpris.MediaPlayer2.%1").arg(mpris),
- QString("/org/mpris/MediaPlayer2"),
- QString(""),
- QString("Get"));
+ // 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()
+ << QString("org.mpris.MediaPlayer2.Player")
+ << QString("Metadata");
+ QDBusMessage request = QDBusMessage::createMethodCall(
+ QString("org.mpris.MediaPlayer2.%1").arg(mpris),
+ QString("/org/mpris/MediaPlayer2"), QString(""), QString("Get"));
request.setArguments(args);
QDBusMessage response = bus.call(request, QDBus::BlockWithGui);
- if ((response.type() != QDBusMessage::ReplyMessage) || (response.arguments().isEmpty())) {
+ if ((response.type() != QDBusMessage::ReplyMessage)
+ || (response.arguments().isEmpty())) {
qCWarning(LOG_ESM) << "Error message" << response.errorMessage();
} else {
// another portion of dirty magic
- QVariantHash map = qdbus_cast(response.arguments().first()
- .value().variant()
- .value());
- info[QString("player/album")] = map.value(QString("xesam:album"), QString("unknown"));
+ QVariantHash map
+ = qdbus_cast(response.arguments()
+ .first()
+ .value()
+ .variant()
+ .value());
+ info[QString("player/album")]
+ = map.value(QString("xesam:album"), QString("unknown"));
// artist is array
- info[QString("player/artist")] = map.value(QString("xesam:artist"), QString("unknown")).toString();
- info[QString("player/duration")] = map.value(QString("mpris:length"), 0).toInt() / (1000 * 1000);
- info[QString("player/title")] = map.value(QString("xesam:title"), QString("unknown"));
+ info[QString("player/artist")]
+ = map.value(QString("xesam:artist"), QString("unknown")).toString();
+ info[QString("player/duration")]
+ = map.value(QString("mpris:length"), 0).toInt() / (1000 * 1000);
+ info[QString("player/title")]
+ = map.value(QString("xesam:title"), QString("unknown"));
}
// position
args[1] = QString("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_ESM) << "Error message" << response.errorMessage();
} else {
// this cast is simpler than the previous one ;)
- info[QString("player/progress")] = response.arguments().first().value()
- .variant().toLongLong() / (1000 * 1000);
+ info[QString("player/progress")] = response.arguments()
+ .first()
+ .value()
+ .variant()
+ .toLongLong()
+ / (1000 * 1000);
}
return info;
@@ -322,10 +362,11 @@ QString PlayerSource::buildString(const QString current, const QString value,
qCDebug(LOG_ESM) << "Strip after" << s;
int index = value.indexOf(current);
- if ((current.isEmpty()) || ((index + s + 1) > value.count()))
+ if ((current.isEmpty()) || ((index + s + 1) > value.count())) {
return QString("%1").arg(value.left(s), s, QLatin1Char(' '));
- else
+ } else {
return QString("%1").arg(value.mid(index + 1, s), s, QLatin1Char(' '));
+ }
}
@@ -335,6 +376,6 @@ QString PlayerSource::stripString(const QString value, const int s) const
qCDebug(LOG_ESM) << "New value" << value;
qCDebug(LOG_ESM) << "Strip after" << s;
- return value.count() > s ? QString("%1\u2026").arg(value.left(s - 1)) :
- value.leftJustified(s, QLatin1Char(' '));
+ return value.count() > s ? QString("%1\u2026").arg(value.left(s - 1))
+ : value.leftJustified(s, QLatin1Char(' '));
}
diff --git a/sources/extsysmon/sources/playersource.h b/sources/extsysmon/sources/playersource.h
index b95ce3e..14904bd 100644
--- a/sources/extsysmon/sources/playersource.h
+++ b/sources/extsysmon/sources/playersource.h
@@ -39,14 +39,17 @@ private:
QVariantHash getPlayerMpdInfo(const QString mpdAddress) const;
QVariantHash getPlayerMprisInfo(const QString mpris) const;
// additional method to build dynamic tags
- QString buildString(const QString current, const QString value, const int s) const;
+ QString buildString(const QString current, const QString value,
+ const int s) const;
QString stripString(const QString value, const int s) const;
// configuration and values
QString m_mpdAddress;
QString m_mpris;
QString m_player;
int m_symbols;
- QStringList m_metadata = QStringList() << QString("album") << QString("artist") << QString("title");
+ QStringList m_metadata = QStringList() << QString("album")
+ << QString("artist")
+ << QString("title");
QVariantHash values;
};
diff --git a/sources/extsysmon/sources/processessource.cpp b/sources/extsysmon/sources/processessource.cpp
index 9d1c79c..d9e2291 100644
--- a/sources/extsysmon/sources/processessource.cpp
+++ b/sources/extsysmon/sources/processessource.cpp
@@ -42,7 +42,8 @@ QVariant ProcessesSource::data(QString source)
qCDebug(LOG_ESM);
qCDebug(LOG_ESM) << "Source" << source;
- if (source == QString("ps/running/count")) run();
+ if (source == QString("ps/running/count"))
+ run();
return values[source];
}
@@ -81,19 +82,23 @@ void ProcessesSource::run()
{
qCDebug(LOG_ESM);
- QStringList allDirectories = QDir(QString("/proc")).entryList(QDir::Dirs | QDir::NoDotAndDotDot,
- QDir::Name);
+ QStringList allDirectories
+ = QDir(QString("/proc"))
+ .entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
QStringList directories = allDirectories.filter(QRegExp(QString("(\\d+)")));
QStringList running;
- foreach(QString dir, directories) {
+ foreach (QString dir, directories) {
QFile statusFile(QString("/proc/%1/status").arg(dir));
- if (!statusFile.open(QIODevice::ReadOnly)) continue;
+ if (!statusFile.open(QIODevice::ReadOnly))
+ continue;
QFile cmdFile(QString("/proc/%1/cmdline").arg(dir));
- if (!cmdFile.open(QIODevice::ReadOnly)) continue;
+ if (!cmdFile.open(QIODevice::ReadOnly))
+ continue;
QString output = statusFile.readAll();
- if (output.contains(QString("running"))) running.append(cmdFile.readAll());
+ if (output.contains(QString("running")))
+ running.append(cmdFile.readAll());
}
values[QString("ps/running/count")] = running.count();
diff --git a/sources/extsysmon/sources/quotessource.cpp b/sources/extsysmon/sources/quotessource.cpp
index dce42e6..c412573 100644
--- a/sources/extsysmon/sources/quotessource.cpp
+++ b/sources/extsysmon/sources/quotessource.cpp
@@ -48,7 +48,8 @@ QVariant QuotesSource::data(QString source)
if (source.startsWith(QString("quotes/percpricechg"))) {
QVariantHash data = extQuotes->itemByTagNumber(index(source))->run();
- foreach(QString key, data.keys()) values[key] = data[key];
+ foreach (QString key, data.keys())
+ values[key] = data[key];
}
QString key = QString(source).remove(QString("quotes/"));
return values[key];
@@ -65,55 +66,73 @@ QVariantMap QuotesSource::initialData(QString source) const
if (source.startsWith(QString("quotes/askchg"))) {
data[QString("min")] = 0.0;
data[QString("max")] = 0.0;
- data[QString("name")] = QString("Absolute ask changes for '%1'").arg(extQuotes->itemByTagNumber(ind)->uniq());
+ data[QString("name")]
+ = QString("Absolute ask changes for '%1'")
+ .arg(extQuotes->itemByTagNumber(ind)->uniq());
data[QString("type")] = QString("double");
data[QString("units")] = QString("");
} else if (source.startsWith(QString("quotes/ask"))) {
data[QString("min")] = 0.0;
data[QString("max")] = 0.0;
- data[QString("name")] = QString("Ask for '%1'").arg(extQuotes->itemByTagNumber(ind)->uniq());
+ data[QString("name")]
+ = QString("Ask for '%1'")
+ .arg(extQuotes->itemByTagNumber(ind)->uniq());
data[QString("type")] = QString("double");
data[QString("units")] = QString("");
} else if (source.startsWith(QString("quotes/percaskchg"))) {
data[QString("min")] = -100.0;
data[QString("max")] = 100.0;
- data[QString("name")] = QString("Ask changes for '%1'").arg(extQuotes->itemByTagNumber(ind)->uniq());
+ data[QString("name")]
+ = QString("Ask changes for '%1'")
+ .arg(extQuotes->itemByTagNumber(ind)->uniq());
data[QString("type")] = QString("double");
data[QString("units")] = QString("");
} else if (source.startsWith(QString("quotes/bidchg"))) {
data[QString("min")] = 0.0;
data[QString("max")] = 0.0;
- data[QString("name")] = QString("Absolute bid changes for '%1'").arg(extQuotes->itemByTagNumber(ind)->uniq());
+ data[QString("name")]
+ = QString("Absolute bid changes for '%1'")
+ .arg(extQuotes->itemByTagNumber(ind)->uniq());
data[QString("type")] = QString("double");
data[QString("units")] = QString("");
} else if (source.startsWith(QString("quotes/bid"))) {
data[QString("min")] = 0.0;
data[QString("max")] = 0.0;
- data[QString("name")] = QString("Bid for '%1'").arg(extQuotes->itemByTagNumber(ind)->uniq());
+ data[QString("name")]
+ = QString("Bid for '%1'")
+ .arg(extQuotes->itemByTagNumber(ind)->uniq());
data[QString("type")] = QString("double");
data[QString("units")] = QString("");
} else if (source.startsWith(QString("quotes/percbidchg"))) {
data[QString("min")] = -100.0;
data[QString("max")] = 100.0;
- data[QString("name")] = QString("Bid changes for '%1'").arg(extQuotes->itemByTagNumber(ind)->uniq());
+ data[QString("name")]
+ = QString("Bid changes for '%1'")
+ .arg(extQuotes->itemByTagNumber(ind)->uniq());
data[QString("type")] = QString("double");
data[QString("units")] = QString("");
} else if (source.startsWith(QString("quotes/pricechg"))) {
data[QString("min")] = 0.0;
data[QString("max")] = 0.0;
- data[QString("name")] = QString("Absolute prie changes for '%1'").arg(extQuotes->itemByTagNumber(ind)->uniq());
+ data[QString("name")]
+ = QString("Absolute prie changes for '%1'")
+ .arg(extQuotes->itemByTagNumber(ind)->uniq());
data[QString("type")] = QString("double");
data[QString("units")] = QString("");
} else if (source.startsWith(QString("quotes/price"))) {
data[QString("min")] = 0.0;
data[QString("max")] = 0.0;
- data[QString("name")] = QString("Price for '%1'").arg(extQuotes->itemByTagNumber(ind)->uniq());
+ data[QString("name")]
+ = QString("Price for '%1'")
+ .arg(extQuotes->itemByTagNumber(ind)->uniq());
data[QString("type")] = QString("double");
data[QString("units")] = QString("");
} else if (source.startsWith(QString("quotes/percpricechg"))) {
data[QString("min")] = -100.0;
data[QString("max")] = 100.0;
- data[QString("name")] = QString("Price changes for '%1'").arg(extQuotes->itemByTagNumber(ind)->uniq());
+ data[QString("name")]
+ = QString("Price changes for '%1'")
+ .arg(extQuotes->itemByTagNumber(ind)->uniq());
data[QString("type")] = QString("double");
data[QString("units")] = QString("");
}
@@ -135,16 +154,20 @@ QStringList QuotesSource::getSources()
qCDebug(LOG_ESM);
QStringList sources;
- foreach(ExtQuotes *item, extQuotes->activeItems()) {
+ foreach (ExtQuotes *item, extQuotes->activeItems()) {
sources.append(QString("quotes/%1").arg(item->tag(QString("ask"))));
sources.append(QString("quotes/%1").arg(item->tag(QString("askchg"))));
- sources.append(QString("quotes/%1").arg(item->tag(QString("percaskchg"))));
+ sources.append(
+ QString("quotes/%1").arg(item->tag(QString("percaskchg"))));
sources.append(QString("quotes/%1").arg(item->tag(QString("bid"))));
sources.append(QString("quotes/%1").arg(item->tag(QString("bidchg"))));
- sources.append(QString("quotes/%1").arg(item->tag(QString("percbidchg"))));
+ sources.append(
+ QString("quotes/%1").arg(item->tag(QString("percbidchg"))));
sources.append(QString("quotes/%1").arg(item->tag(QString("price"))));
- sources.append(QString("quotes/%1").arg(item->tag(QString("pricechg"))));
- sources.append(QString("quotes/%1").arg(item->tag(QString("percpricechg"))));
+ sources.append(
+ QString("quotes/%1").arg(item->tag(QString("pricechg"))));
+ sources.append(
+ QString("quotes/%1").arg(item->tag(QString("percpricechg"))));
}
return sources;
diff --git a/sources/extsysmon/sources/quotessource.h b/sources/extsysmon/sources/quotessource.h
index 08d8706..2dbc4c5 100644
--- a/sources/extsysmon/sources/quotessource.h
+++ b/sources/extsysmon/sources/quotessource.h
@@ -33,7 +33,7 @@ public:
virtual ~QuotesSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
- void run() {};
+ void run(){};
QStringList sources() const;
private:
diff --git a/sources/extsysmon/sources/updatesource.h b/sources/extsysmon/sources/updatesource.h
index 20f962c..521534d 100644
--- a/sources/extsysmon/sources/updatesource.h
+++ b/sources/extsysmon/sources/updatesource.h
@@ -30,7 +30,7 @@ public:
virtual ~UpdateSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
- void run() {};
+ void run(){};
QStringList sources() const;
};
diff --git a/sources/extsysmon/sources/upgradesource.cpp b/sources/extsysmon/sources/upgradesource.cpp
index dfefc5d..a6d088b 100644
--- a/sources/extsysmon/sources/upgradesource.cpp
+++ b/sources/extsysmon/sources/upgradesource.cpp
@@ -59,7 +59,9 @@ QVariantMap UpgradeSource::initialData(QString source) const
QVariantMap data;
data[QString("min")] = QString("");
data[QString("max")] = QString("");
- data[QString("name")] = QString("Package manager '%1' metadata").arg(extUpgrade->itemByTagNumber(index(source))->uniq());
+ data[QString("name")]
+ = QString("Package manager '%1' metadata")
+ .arg(extUpgrade->itemByTagNumber(index(source))->uniq());
data[QString("type")] = QString("QString");
data[QString("units")] = QString("");
@@ -80,8 +82,9 @@ QStringList UpgradeSource::getSources()
qCDebug(LOG_ESM);
QStringList sources;
- foreach(ExtUpgrade *item, extUpgrade->activeItems())
- sources.append(QString("upgrade/%1").arg(item->tag(QString("pkgcount"))));
+ foreach (ExtUpgrade *item, extUpgrade->activeItems())
+ sources.append(
+ QString("upgrade/%1").arg(item->tag(QString("pkgcount"))));
return sources;
}
diff --git a/sources/extsysmon/sources/upgradesource.h b/sources/extsysmon/sources/upgradesource.h
index 60200ac..d020151 100644
--- a/sources/extsysmon/sources/upgradesource.h
+++ b/sources/extsysmon/sources/upgradesource.h
@@ -33,7 +33,7 @@ public:
virtual ~UpgradeSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
- void run() {};
+ void run(){};
QStringList sources() const;
private:
diff --git a/sources/extsysmon/sources/weathersource.cpp b/sources/extsysmon/sources/weathersource.cpp
index 91e30be..125e850 100644
--- a/sources/extsysmon/sources/weathersource.cpp
+++ b/sources/extsysmon/sources/weathersource.cpp
@@ -48,7 +48,8 @@ QVariant WeatherSource::data(QString source)
if (source.startsWith(QString("weather/weatherId"))) {
QVariantHash data = extWeather->itemByTagNumber(index(source))->run();
- foreach(QString key, data.keys()) values[key] = data[key];
+ foreach (QString key, data.keys())
+ values[key] = data[key];
}
QString key = QString(source).remove(QString("weather/"));
return values[key];
@@ -65,31 +66,41 @@ QVariantMap WeatherSource::initialData(QString source) const
if (source.startsWith(QString("weather/weatherId"))) {
data[QString("min")] = 0;
data[QString("max")] = 1000;
- data[QString("name")] = QString("Numeric weather ID for '%1'").arg(extWeather->itemByTagNumber(ind)->uniq());
+ data[QString("name")]
+ = QString("Numeric weather ID for '%1'")
+ .arg(extWeather->itemByTagNumber(ind)->uniq());
data[QString("type")] = QString("integer");
data[QString("units")] = QString("");
} else if (source.startsWith(QString("weather/weather"))) {
data[QString("min")] = QString("");
data[QString("max")] = QString("");
- data[QString("name")] = QString("ID string map for '%1'").arg(extWeather->itemByTagNumber(ind)->uniq());
+ data[QString("name")]
+ = QString("ID string map for '%1'")
+ .arg(extWeather->itemByTagNumber(ind)->uniq());
data[QString("type")] = QString("QString");
data[QString("units")] = QString("");
} else if (source.startsWith(QString("weather/humidity"))) {
data[QString("min")] = 0;
data[QString("max")] = 100;
- data[QString("name")] = QString("Humidity for '%1'").arg(extWeather->itemByTagNumber(ind)->uniq());
+ data[QString("name")]
+ = QString("Humidity for '%1'")
+ .arg(extWeather->itemByTagNumber(ind)->uniq());
data[QString("type")] = QString("integer");
data[QString("units")] = QString("%");
} else if (source.startsWith(QString("weather/pressure"))) {
data[QString("min")] = 0;
data[QString("max")] = 0;
- data[QString("name")] = QString("Atmospheric pressure for '%1'").arg(extWeather->itemByTagNumber(ind)->uniq());
+ data[QString("name")]
+ = QString("Atmospheric pressure for '%1'")
+ .arg(extWeather->itemByTagNumber(ind)->uniq());
data[QString("type")] = QString("integer");
data[QString("units")] = QString("hPa");
} else if (source.startsWith(QString("weather/temperature"))) {
data[QString("min")] = 0.0;
data[QString("max")] = 0.0;
- data[QString("name")] = QString("Temperature for '%1'").arg(extWeather->itemByTagNumber(ind)->uniq());
+ data[QString("name")]
+ = QString("Temperature for '%1'")
+ .arg(extWeather->itemByTagNumber(ind)->uniq());
data[QString("type")] = QString("float");
data[QString("units")] = QString("°C");
}
@@ -111,12 +122,17 @@ QStringList WeatherSource::getSources()
qCDebug(LOG_ESM);
QStringList sources;
- foreach(ExtWeather *item, extWeather->activeItems()) {
- sources.append(QString("weather/%1").arg(item->tag(QString("weatherId"))));
- sources.append(QString("weather/%1").arg(item->tag(QString("weather"))));
- sources.append(QString("weather/%1").arg(item->tag(QString("humidity"))));
- sources.append(QString("weather/%1").arg(item->tag(QString("pressure"))));
- sources.append(QString("weather/%1").arg(item->tag(QString("temperature"))));
+ foreach (ExtWeather *item, extWeather->activeItems()) {
+ sources.append(
+ QString("weather/%1").arg(item->tag(QString("weatherId"))));
+ sources.append(
+ QString("weather/%1").arg(item->tag(QString("weather"))));
+ sources.append(
+ QString("weather/%1").arg(item->tag(QString("humidity"))));
+ sources.append(
+ QString("weather/%1").arg(item->tag(QString("pressure"))));
+ sources.append(
+ QString("weather/%1").arg(item->tag(QString("temperature"))));
}
return sources;
diff --git a/sources/extsysmon/sources/weathersource.h b/sources/extsysmon/sources/weathersource.h
index c9817d1..5132fff 100644
--- a/sources/extsysmon/sources/weathersource.h
+++ b/sources/extsysmon/sources/weathersource.h
@@ -33,7 +33,7 @@ public:
virtual ~WeatherSource();
QVariant data(QString source);
QVariantMap initialData(QString source) const;
- void run() {};
+ void run(){};
QStringList sources() const;
private:
diff --git a/sources/libraries.cmake b/sources/libraries.cmake
index ee4c44c..33192f7 100644
--- a/sources/libraries.cmake
+++ b/sources/libraries.cmake
@@ -4,16 +4,16 @@ find_package(Gettext REQUIRED)
# main qt libraries
find_package(Qt5 5.4.0 REQUIRED COMPONENTS Core DBus Network Qml Widgets)
add_definitions(
- ${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
- ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}
+ ${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS} ${Qt5Network_DEFINITIONS}
+ ${Qt5Qml_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}
)
set(Qt_INCLUDE
- ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}
- ${Qt5Qml_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}
+ ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}
+ ${Qt5Qml_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}
)
set(Qt_LIBRARIES
- ${Qt5Core_LIBRARIES} ${Qt5DBus_LIBRARIES} ${Qt5Network_LIBRARIES}
- ${Qt5Qml_LIBRARIES} ${Qt5Widgets_LIBRARIES}
+ ${Qt5Core_LIBRARIES} ${Qt5DBus_LIBRARIES} ${Qt5Network_LIBRARIES}
+ ${Qt5Qml_LIBRARIES} ${Qt5Widgets_LIBRARIES}
)
# kf5 libraries
diff --git a/sources/packages-recipe.cmake b/sources/packages-recipe.cmake
index 0a7f21c..ba4e857 100644
--- a/sources/packages-recipe.cmake
+++ b/sources/packages-recipe.cmake
@@ -1,10 +1,10 @@
# generators
-if(BUILD_DEB_PACKAGE)
+if (BUILD_DEB_PACKAGE)
set(CPACK_GENERATOR ${CPACK_GENERATOR} "DEB")
-endif()
-if(BUILD_RPM_PACKAGE)
+endif ()
+if (BUILD_RPM_PACKAGE)
set(CPACK_GENERATOR ${CPACK_GENERATOR} "RPM")
-endif()
+endif ()
# build properties
set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
@@ -32,6 +32,6 @@ set(CPACK_RPM_PACKAGE_REQUIRES "plasma-framework")
set(CPACK_RPM_PACKAGE_SUGGESTS "mpd, smartmontools")
set(CPACK_RPM_PACKAGE_URL "https://arcanis.name/projects/awesome-widgets")
-if(BUILD_DEB_PACKAGE OR BUILD_RPM_PACKAGE)
+if (BUILD_DEB_PACKAGE OR BUILD_RPM_PACKAGE)
include(CPack)
-endif()
+endif ()
diff --git a/sources/translations/CMakeLists.txt b/sources/translations/CMakeLists.txt
index 0870952..dc48c27 100644
--- a/sources/translations/CMakeLists.txt
+++ b/sources/translations/CMakeLists.txt
@@ -4,26 +4,26 @@ set(SND_MO_NAME plasma_applet_org.kde.plasma.desktoppanel.mo)
file(GLOB _po_files *.po)
set(_gmoFiles)
-foreach(_current_PO_FILE ${_po_files})
+foreach (_current_PO_FILE ${_po_files})
get_filename_component(_lang ${_current_PO_FILE} NAME_WE)
set(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo)
add_custom_command(
- OUTPUT ${_gmoFile}
- COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_current_PO_FILE}
- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
- DEPENDS ${_current_PO_FILE}
+ OUTPUT ${_gmoFile}
+ COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_current_PO_FILE}
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+ DEPENDS ${_current_PO_FILE}
)
install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo
- DESTINATION ${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES/
- RENAME ${MO_NAME}
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo
+ DESTINATION ${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES/
+ RENAME ${MO_NAME}
)
install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo
- DESTINATION ${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES/
- RENAME ${SND_MO_NAME}
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo
+ DESTINATION ${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES/
+ RENAME ${SND_MO_NAME}
)
list(APPEND _gmoFiles ${_gmoFile})
-endforeach(_current_PO_FILE)
+endforeach (_current_PO_FILE)
add_custom_target(aw_pofiles ALL DEPENDS ${_gmoFiles})
diff --git a/utils/cpp-check.sh b/utils/cpp-check.sh
deleted file mode 100755
index ae993be..0000000
--- a/utils/cpp-check.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# This code is used to check source files with cppcheck
-
-cppcheck --enable=all \
- --std=c++11 \
- --verbose \
- --quiet \
- ../sources 2>&1 | grep -v '3rdparty'
diff --git a/utils/qt-code-style.sh b/utils/qt-code-style.sh
deleted file mode 100755
index 357d934..0000000
--- a/utils/qt-code-style.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# This script will check the source code by using clang-format with required arguments.
-# The template comes from https://gist.github.com/Uflex/7086827
-# More details may be found here http://clang.llvm.org/docs/ClangFormatStyleOptions.html
-
-clang-format -i \
- -style=file \
- $(find ../sources -not -path '*3rdparty*' \
- -and \( -name '*.cpp' -or -name '*.h' \))