diff --git a/sources/awesome-widget/plugin/awkeycache.cpp b/sources/awesome-widget/plugin/awkeycache.cpp index cf2347b..11fdcd4 100644 --- a/sources/awesome-widget/plugin/awkeycache.cpp +++ b/sources/awesome-widget/plugin/awkeycache.cpp @@ -138,10 +138,12 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &keys, if (used.contains(QString("swaptotgb"))) used << QString("swapgb") << QString("swapfreegb"); // network keys - QStringList netKeys(QStringList() << QString("up") << QString("upkb") - << QString("upunits") << QString("down") - << QString("downkb") - << QString("downunits")); + QStringList netKeys(QStringList() + << QString("up") << QString("upkb") + << QString("uptotal") << QString("uptotalkb") + << QString("upunits") << QString("down") + << QString("downkb") << QString("downtotal") + << QString("downtotalkb") << QString("downunits")); for (auto key : netKeys) { if (!used.contains(key)) continue; diff --git a/sources/awesome-widget/plugin/awkeyoperations.cpp b/sources/awesome-widget/plugin/awkeyoperations.cpp index e9e0d4c..9441aba 100644 --- a/sources/awesome-widget/plugin/awkeyoperations.cpp +++ b/sources/awesome-widget/plugin/awkeyoperations.cpp @@ -124,8 +124,12 @@ QStringList AWKeyOperations::dictKeys() const for (int i = m_devices[QString("net")].count() - 1; i >= 0; i--) { allKeys.append(QString("downunits%1").arg(i)); allKeys.append(QString("upunits%1").arg(i)); + allKeys.append(QString("downtotalkb%1").arg(i)); + allKeys.append(QString("downtotal%1").arg(i)); allKeys.append(QString("downkb%1").arg(i)); allKeys.append(QString("down%1").arg(i)); + allKeys.append(QString("uptotalkb%1").arg(i)); + allKeys.append(QString("uptotal%1").arg(i)); allKeys.append(QString("upkb%1").arg(i)); allKeys.append(QString("up%1").arg(i)); } diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp index 033d850..b8045fb 100644 --- a/sources/awesome-widget/plugin/awkeys.cpp +++ b/sources/awesome-widget/plugin/awkeys.cpp @@ -268,9 +268,14 @@ void AWKeys::calculateValues() .indexOf(values[QString("netdev")].toString()); values[QString("down")] = values[QString("down%1").arg(netIndex)]; values[QString("downkb")] = values[QString("downkb%1").arg(netIndex)]; + values[QString("downtotal")] = values[QString("downtotal%1").arg(netIndex)]; + values[QString("downtotalkb")] + = values[QString("downtotalkb%1").arg(netIndex)]; values[QString("downunits")] = values[QString("downunits%1").arg(netIndex)]; values[QString("up")] = values[QString("up%1").arg(netIndex)]; values[QString("upkb")] = values[QString("upkb%1").arg(netIndex)]; + values[QString("uptotal")] = values[QString("uptotal%1").arg(netIndex)]; + values[QString("uptotalkb")] = values[QString("uptotalkb%1").arg(netIndex)]; values[QString("upunits")] = values[QString("upunits%1").arg(netIndex)]; // swaptot* diff --git a/sources/awesome-widget/plugin/awkeysaggregator.cpp b/sources/awesome-widget/plugin/awkeysaggregator.cpp index 791968f..608f417 100644 --- a/sources/awesome-widget/plugin/awkeysaggregator.cpp +++ b/sources/awesome-widget/plugin/awkeysaggregator.cpp @@ -247,6 +247,8 @@ QStringList AWKeysAggregator::registerSource(const QString &source, QRegExp mountUsedRegExp = QRegExp(QString("partitions/.*/usedspace")); QRegExp netRegExp = QRegExp( QString("network/interfaces/.*/(receiver|transmitter)/data$")); + QRegExp netTotalRegExp = QRegExp( + QString("network/interfaces/.*/(receiver|transmitter)/dataTotal$")); if (source == QString("battery/ac")) { // AC @@ -435,6 +437,22 @@ QStringList AWKeysAggregator::registerSource(const QString &source, m_map.insertMulti(source, key); m_formater[key] = FormaterType::NetSmartUnits; } + } else if (source.contains(netTotalRegExp)) { + // network data total + QString type = source.contains(QString("receiver")) ? QString("down") + : QString("up"); + int index + = m_devices[QString("net")].indexOf(source.split(QChar('/'))[2]); + if (index > -1) { + // kb + QString key = QString("%1totalkb%2").arg(type).arg(index); + m_map[source] = key; + m_formater[key] = FormaterType::Integer; + // mb + key = QString("%1total%2").arg(type).arg(index); + m_map.insertMulti(source, key); + m_formater[key] = FormaterType::MemMBFormat; + } } else if (source.startsWith(QString("upgrade"))) { // package manager QString key = source; diff --git a/sources/version.h.in b/sources/version.h.in index b3f6ab9..10fe51b 100644 --- a/sources/version.h.in +++ b/sources/version.h.in @@ -43,9 +43,10 @@ "time,isotime,shorttime,longtime,ctime,uptime,cuptime,cpucl,cpu,gputemp," \ "gpu,memmb,memgb,memfreemb,memfreegb,memtotmb,memtotgb,memusedmb," \ "memusedgb,mem,swapmb,swapgb,swapfreemb,swapfreegb,swaptotmb,swaptotgb," \ - "swap,downunits,upunits,downkb,down,upkb,up,netdev,ac,bat,album,artist," \ - "duration,progress,title,dalbum,dartist,dtitle,salbum,sartist,stitle," \ - "pscount,pstotal,ps,desktop,ndesktop,tdesktops,la15,la5,la1" + "swap,downunits,upunits,downkb,downtotalkb,downtotal,down,uptotalkb," \ + "uptotal,upkb,up,netdev,ac,bat,album,artist,duration,progress,title," \ + "dalbum,dartist,dtitle,salbum,sartist,stitle,pscount,pstotal,ps,desktop," \ + "ndesktop,tdesktops,la15,la5,la1" #cmakedefine BUILD_FUTURE #cmakedefine BUILD_TESTING