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

fix network speed calculation for $down and $up tags

Browse Source
This commit is contained in:
arcan1s 2015-07-14 00:18:29 +03:00
parent 4e78e0e1dd
commit 467a3bf508
6 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -1,3 +1,7 @@
ver.2.3.4:
- fix bug with invalid network data calculation
* update pattern parsing to recent plasma changes
Ver.2.3.3: Ver.2.3.3:
* change text rendering from Qt to native * change text rendering from Qt to native

2
sources/.kdev4/awesomewidgets.kdev4
View File

@ -8,7 +8,7 @@ ProjectRootRelative=./
[CMake][CMake Build Directory 0] [CMake][CMake Build Directory 0]
Build Directory Path=file:///home/arcanis/Documents/github/awesome-widgets/build Build Directory Path=file:///home/arcanis/Documents/github/awesome-widgets/build
Build Type=Release Build Type=Debug
CMake Binary=file:///usr/bin/cmake CMake Binary=file:///usr/bin/cmake
Environment Profile= Environment Profile=
Extra Arguments= Extra Arguments=

2
sources/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set (PROJECT_CONTACT "esalexeev@gmail.com")
set (PROJECT_LICENSE "GPLv3") set (PROJECT_LICENSE "GPLv3")
set (PROJECT_VERSION_MAJOR 2) set (PROJECT_VERSION_MAJOR 2)
set (PROJECT_VERSION_MINOR 3) set (PROJECT_VERSION_MINOR 3)
set (PROJECT_VERSION_PATCH 3) set (PROJECT_VERSION_PATCH 4)
set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC) string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC)

2
sources/awesome-widget/package/metadata.desktop
View File

@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Email=esalexeev@gmail.com
X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget X-KDE-PluginInfo-Name=org.kde.plasma.awesomewidget
X-KDE-PluginInfo-Version=2.3.3 X-KDE-PluginInfo-Version=2.3.4
X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/ X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/
X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Category=System Information
X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-Depends=

16
sources/awesome-widget/plugin/awkeys.cpp
View File

@ -553,11 +553,11 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
} else if (sourceName.contains(netRecRegExp)) { } else if (sourceName.contains(netRecRegExp)) {
// download speed // download speed
QString device = sourceName; QString device = sourceName;
float value = data[QString("value")].toFloat();
device.remove(QString("network/interfaces/")).remove(QString("/receiver/data")); device.remove(QString("network/interfaces/")).remove(QString("/receiver/data"));
QStringList allNetworkDevices = networkDevices; QStringList allNetworkDevices = networkDevices;
for (int i=0; i<allNetworkDevices.count(); i++) { for (int i=0; i<allNetworkDevices.count(); i++) {
if (allNetworkDevices[i] != device) continue; if (allNetworkDevices[i] != device) continue;
float value = data[QString("value")].toFloat();
if (value > 1000.0) if (value > 1000.0)
values[QString("down%1").arg(i)] = QString("%1").arg(value / 1024.0, 4, 'f', 1); values[QString("down%1").arg(i)] = QString("%1").arg(value / 1024.0, 4, 'f', 1);
else else
@ -565,17 +565,20 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
break; break;
} }
if (device == values[QString("netdev")]) { if (device == values[QString("netdev")]) {
values[QString("down")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0); if (value > 1000.0)
if (toolTip != nullptr) toolTip->setData(QString("downTooltip"), data[QString("value")].toFloat()); values[QString("down")] = QString("%1").arg(value / 1024.0, 4, 'f', 1);
else
values[QString("down")] = QString("%1").arg(value, 4, 'f', 0);
if (toolTip != nullptr) toolTip->setData(QString("downTooltip"), value);
} }
} else if (sourceName.contains(netTransRegExp)) { } else if (sourceName.contains(netTransRegExp)) {
// upload speed // upload speed
QString device = sourceName; QString device = sourceName;
float value = data[QString("value")].toFloat();
device.remove(QString("network/interfaces/")).remove(QString("/transmitter/data")); device.remove(QString("network/interfaces/")).remove(QString("/transmitter/data"));
QStringList allNetworkDevices = networkDevices; QStringList allNetworkDevices = networkDevices;
for (int i=0; i<allNetworkDevices.count(); i++) { for (int i=0; i<allNetworkDevices.count(); i++) {
if (allNetworkDevices[i] != device) continue; if (allNetworkDevices[i] != device) continue;
float value = data[QString("value")].toFloat();
if (value > 1000.0) if (value > 1000.0)
values[QString("up%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat() / 1024.0, 4, 'f', 1); values[QString("up%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat() / 1024.0, 4, 'f', 1);
else else
@ -583,7 +586,10 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
break; break;
} }
if (device == values[QString("netdev")]) { if (device == values[QString("netdev")]) {
values[QString("up")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0); if (value > 1000.0)
values[QString("up")] = QString("%1").arg(value / 1024.0, 4, 'f', 1);
else
values[QString("up")] = QString("%1").arg(value, 4, 'f', 0);
if (toolTip != nullptr) toolTip->setData(QString("upTooltip"), data[QString("value")].toFloat()); if (toolTip != nullptr) toolTip->setData(QString("upTooltip"), data[QString("value")].toFloat());
} }
} else if (sourceName == QString("pkg")) { } else if (sourceName == QString("pkg")) {

2
sources/desktop-panel/package/metadata.desktop
View File

@ -20,7 +20,7 @@ X-Plasma-RemoteLocation=
X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis
X-KDE-PluginInfo-Email=esalexeev@gmail.com X-KDE-PluginInfo-Email=esalexeev@gmail.com
X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel X-KDE-PluginInfo-Name=org.kde.plasma.desktoppanel
X-KDE-PluginInfo-Version=2.3.3 X-KDE-PluginInfo-Version=2.3.4
X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/ X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/
X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Category=System Information
X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-Depends=