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

fix bugs caused by integration

Browse Source
This commit is contained in:
arcan1s
2015-09-10 04:59:35 +03:00
parent 9e45b02c8e
commit bf5c500938
14 changed files with 191 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/extsysmon/sources/batterysource.cpp
View File

@ -71,7 +71,7 @@ QVariantMap BatterySource::initialData(QString source) const
} else {
data[QString("min")] = 0;
data[QString("max")] = 100;
data[QString("name")] = QString("Battery %1 usage").arg(source.remove(QString("battery/bat")));
data[QString("name")] = QString("Battery %1 usage").arg(index(source));
data[QString("type")] = QString("integer");
data[QString("units")] = QString("%");
}

2
sources/extsysmon/sources/hddtempsource.cpp
View File

@ -31,7 +31,7 @@ HDDTemperatureSource::HDDTemperatureSource(QObject *parent, const QStringList ar
Q_ASSERT(args.count() == 2);
qCDebug(LOG_ESM);
m_devices = args.at(0).split(QChar(','));
m_devices = args.at(0).split(QChar(','), QString::SkipEmptyParts);
m_cmd = args.at(1);
m_smartctl = m_cmd.contains(QString("smartctl"));

7
sources/extsysmon/sources/playersource.cpp
View File

@ -235,15 +235,16 @@ QVariantHash PlayerSource::getPlayerMpdInfo(const QString mpdAddress) const
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() == 1) {
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();
if (metadata == QString("time")) {
// there are one more time...
if ((metadata == QString("time")) && (data.contains(QChar(':')))) {
QStringList times = data.split(QString(":"));
info[QString("player/duration")] = times.at(0).toInt();
info[QString("player/progress")] = times.at(1).toInt();
} else if (metadata == QString("Title")) {
} else if (m_metadata.contains(metadata)) {
info[QString("player/%1").arg(metadata)] = data;
}
}

1
sources/extsysmon/sources/playersource.h
View File

@ -45,6 +45,7 @@ private:
QString m_mpris;
QString m_player;
int m_symbols;
QStringList m_metadata = QStringList() << QString("album") << QString("artist") << QString("title");
QVariantHash values;
};

2
sources/extsysmon/sources/updatesource.cpp
View File

@ -50,7 +50,7 @@ QVariantMap UpdateSource::initialData(QString source) const
qCDebug(LOG_ESM) << "Source" << source;
QVariantMap data;
if (source == QString("desktop/current/name")) {
if (source == QString("update")) {
data[QString("min")] = true;
data[QString("max")] = true;
data[QString("name")] = QString("Simple value which is always true");

2
sources/extsysmon/sources/weathersource.cpp
View File

@ -78,7 +78,7 @@ QVariantMap WeatherSource::initialData(QString source) const
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/humidity"))) {
} 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());