Prerelease 1.7.2

This commit is contained in:
arcan1s
2014-04-03 02:32:56 +04:00
parent d7cc354432
commit 0db909d914
14 changed files with 610 additions and 211 deletions

View File

@ -43,6 +43,7 @@ QStringList ExtendedSysMon::sources() const
source.append(QString("gputemp"));
source.append(QString("hddtemp"));
source.append(QString("player"));
source.append(QString("custom"));
return source;
}
@ -73,6 +74,8 @@ bool ExtendedSysMon::readConfiguration()
mpdAddress = QString("localhost");
mpdPort = QString("6600");
customCommand = QString("wget -qO- http://ifconfig.me/ip");
QString fileStr;
// FIXME: define configuration file
QString confFileName = QString(getenv("HOME")) + QString("/.kde4/share/config/extsysmon.conf");
@ -111,6 +114,8 @@ bool ExtendedSysMon::readConfiguration()
mpdAddress = fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed();
else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("MPDPORT"))
mpdPort = fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed();
else if (fileStr.split(QString("="), QString::SkipEmptyParts)[0] == QString("CUSTOM"))
customCommand = fileStr.split(QString("="), QString::SkipEmptyParts)[1].trimmed();
}
}
if (confFile.atEnd())
@ -350,6 +355,14 @@ bool ExtendedSysMon::updateSourceEvent(const QString &source)
key = QString("mpd_title");
setData(source, key, value);
}
else if (source == QString("custom")) {
QProcess custom;
custom.start(QString("bash -c \"") + QString(customCommand) + QString("\""));
custom.waitForFinished(-1);
value = QTextCodec::codecForMib(106)->toUnicode(custom.readAllStandardOutput()).trimmed();
key = QString("custom");
setData(source, key, value);
}
return true;
}