diff --git a/CHANGELOG b/CHANGELOG index ddcd048..fb6cfed 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +Ver.2.1.0: ++ add autoupdate function +* change regexp matching + Ver.2.0.5: + add tooltip bottom (#30) * fix network interface update diff --git a/CHANGELOG-RU b/CHANGELOG-RU index 27ef373..5f673d2 100644 --- a/CHANGELOG-RU +++ b/CHANGELOG-RU @@ -1,3 +1,7 @@ +Вер.2.1.0: ++ добавлена функция автообновления +* изменен поиск регулярных выражений + Вер.2.0.5: + добавлен нижний край к тултипу (#30) * исправлен баг с обновлением сетевого интерфейса diff --git a/sources/awesome-widget/awesome-widget.cpp b/sources/awesome-widget/awesome-widget.cpp index bd4f59d..d722f92 100644 --- a/sources/awesome-widget/awesome-widget.cpp +++ b/sources/awesome-widget/awesome-widget.cpp @@ -277,8 +277,7 @@ QStringList AwesomeWidget::findKeys() QStringList selectedKeys; for (int i=0; i -1) { + if (configuration[QString("text")].contains(QString("$") + keys[i])) { if (debug) qDebug() << PDEBUG << ":" << "Found key" << keys[i]; selectedKeys.append(keys[i]); } diff --git a/sources/awesome-widget/configuration.cpp b/sources/awesome-widget/configuration.cpp index 505e3e2..198c900 100644 --- a/sources/awesome-widget/configuration.cpp +++ b/sources/awesome-widget/configuration.cpp @@ -671,7 +671,7 @@ void AwesomeWidget::configChanged() QStringList acpiDevices = QDir(deSettings[QString("ACPIPATH")]).entryList(QDir::Dirs | QDir::NoDotAndDotDot); QRegExp batRegexp = QRegExp(QString("BAT.*")); for (int i=0; i -1) + if (acpiDevices[i].contains(batRegexp)) counts[QString("bat")]++; counts[QString("cpu")] = getNumberCpus(); counts[QString("custom")] = deSettings[QString("CUSTOM")].split(QString("@@")).count(); diff --git a/sources/awesome-widget/deinteraction.cpp b/sources/awesome-widget/deinteraction.cpp index 637d6d2..8ee6365 100644 --- a/sources/awesome-widget/deinteraction.cpp +++ b/sources/awesome-widget/deinteraction.cpp @@ -214,7 +214,7 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng tooltipValues[QString("cpu")].takeFirst(); tooltipValues[QString("cpu")].append(data[QString("value")].toFloat()); } - } else if (sourceName.indexOf(cpuRegExp) > -1) { + } else if (sourceName.contains(cpuRegExp)) { QString number = sourceName; number.remove(QString("cpu/cpu")); number.remove(QString("/TotalLoad")); @@ -227,7 +227,7 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng tooltipValues[QString("cpucl")].takeFirst(); tooltipValues[QString("cpucl")].append(data[QString("value")].toFloat()); } - } else if (sourceName.indexOf(cpuclRegExp) > -1) { + } else if (sourceName.contains(cpuclRegExp)) { QString number = sourceName; number.remove(QString("cpu/cpu")); number.remove(QString("/clock")); @@ -239,7 +239,7 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng values[QString("desktop")] = data[QString("currentName")].toString(); values[QString("ndesktop")] = QString("%1").arg(data[QString("currentNumber")].toInt()); values[QString("tdesktops")] = QString("%1").arg(data[QString("number")].toInt()); - } else if (sourceName.indexOf(hddrRegExp) > -1) { + } else if (sourceName.contains(hddrRegExp)) { QString device = sourceName; device.remove(QString("/Rate/rblk")); for (int i=0; i -1) { + } else if (sourceName.contains(hddwRegExp)) { QString device = sourceName; device.remove(QString("/Rate/wblk")); for (int i=0; i -1) { + } else if (sourceName.contains(mountFillRegExp)) { QString mount = sourceName; mount.remove(QString("partitions")); mount.remove(QString("/filllevel")); @@ -268,7 +268,7 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng values[QString("hdd") + QString::number(i)] = QString("%1").arg(data[QString("value")].toFloat(), 5, 'f', 1); break; } - } else if (sourceName.indexOf(mountFreeRegExp) > -1) { + } else if (sourceName.contains(mountFreeRegExp)) { QString mount = sourceName; mount.remove(QString("partitions")); mount.remove(QString("/freespace")); @@ -280,7 +280,7 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng data[QString("value")].toFloat() / (1024.0 * 1024.0), 5, 'f', 1); break; } - } else if (sourceName.indexOf(mountUsedRegExp) > -1) { + } else if (sourceName.contains(mountUsedRegExp)) { QString mount = sourceName; mount.remove(QString("partitions")); mount.remove(QString("/usedspace")); @@ -331,7 +331,7 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng tooltipValues[QString("mem")].takeFirst(); tooltipValues[QString("mem")].append(values[QString("mem")].toFloat()); } - } else if (sourceName.indexOf(netRecRegExp) > -1) { + } else if (sourceName.contains(netRecRegExp)) { values[QString("down")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0); if ((configuration[QString("downTooltip")].toInt() == 2) && (!isnan(data[QString("value")].toFloat()))) { @@ -352,7 +352,7 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng this, configuration[QString("interval")].toInt()); } } - } else if (sourceName.indexOf(netTransRegExp) > -1) { + } else if (sourceName.contains(netTransRegExp)) { values[QString("up")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0); if ((configuration[QString("downTooltip")].toInt() == 2) && (!isnan(data[QString("value")].toFloat()))) { @@ -393,7 +393,7 @@ void AwesomeWidget::dataUpdated(const QString &sourceName, const Plasma::DataEng tooltipValues[QString("swap")].takeFirst(); tooltipValues[QString("swap")].append(values[QString("swap")].toFloat()); } - } else if (sourceName.indexOf(tempRegExp) > -1) { + } else if (sourceName.contains(tempRegExp)) { if (data[QString("units")].toString() == QString("rpm")) { for (int i=0; i ExtendedSysMon::getBattery(const QString acpiPath) QStringList batDevices; QRegExp batRegexp = QRegExp(QString("BAT.*")); for (int i=0; i -1) + if (allDevices[i].contains(batRegexp)) batDevices.append(allDevices[i]); for (int i=0; i