arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-12-15 01:23:42 +00:00
Code Issues Projects Releases Wiki Activity

add support of several $bat tags. Update translations

Browse Source
This commit is contained in:
arcan1s
2014-09-21 20:19:57 +04:00
parent 0b3832cc32
commit 830bab7cb6
20 changed files with 524 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sources/awesome-widget/deinteraction.cpp
View File

@ -29,7 +29,7 @@ void AwesomeWidget::connectToEngine()
QRegExp regExp;
// battery
regExp = QRegExp(QString("(ac|bat)"));
regExp = QRegExp(QString("(ac|bat.*)"));
if ((foundKeys.indexOf(regExp) > -1) ||
(configuration[QString("batteryTooltip")].toInt() == 2))
extsysmonEngine->connectSource(QString("battery"),
@ -188,19 +188,23 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng
if (data.keys().isEmpty()) return;
if (sourceName == QString("battery")) {
if (data[QString("ac")].toBool())
values[QString("ac")] = configuration[QString("acOnline")];
else
values[QString("ac")] = configuration[QString("acOffline")];
values[QString("bat")] = QString("%1").arg(data[QString("bat")].toFloat(), 3, 'f', 0);
for (int i=0; i<data.keys().count(); i++) {
if (data.keys()[i] == QString("ac")) {
if (data[QString("ac")].toBool())
values[QString("ac")] = configuration[QString("acOnline")];
else
values[QString("ac")] = configuration[QString("acOffline")];
} else
values[data.keys()[i]] = QString("%1").arg(data[data.keys()[i]].toFloat(), 3, 'f', 0);
}
if ((configuration[QString("batteryTooltip")].toInt() == 2) &&
(!isnan(data[QString("bat")].toFloat()))) {
(!isnan(data[QString("bat0")].toFloat()))) {
if (tooltipValues[QString("bat")].count() > configuration[QString("tooltipNumber")].toInt())
tooltipValues[QString("bat")].takeFirst();
if (data[QString("ac")].toBool())
tooltipValues[QString("bat")].append(data[QString("bat")].toFloat());
tooltipValues[QString("bat0")].append(data[QString("bat0")].toFloat());
else
tooltipValues[QString("bat")].append(-data[QString("bat")].toFloat());
tooltipValues[QString("bat0")].append(-data[QString("bat0")].toFloat());
}
} else if (sourceName == QString("cpu/system/TotalLoad")) {
values[QString("cpu")] = QString("%1").arg(data[QString("value")].toFloat(), 5, 'f', 1);