diff --git a/CHANGELOG b/CHANGELOG index c20e7f8..4d9c8e8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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: * change text rendering from Qt to native diff --git a/sources/.kdev4/awesomewidgets.kdev4 b/sources/.kdev4/awesomewidgets.kdev4 index ea73c1d..b97529b 100644 --- a/sources/.kdev4/awesomewidgets.kdev4 +++ b/sources/.kdev4/awesomewidgets.kdev4 @@ -8,7 +8,7 @@ ProjectRootRelative=./ [CMake][CMake Build Directory 0] Build Directory Path=file:///home/arcanis/Documents/github/awesome-widgets/build -Build Type=Release +Build Type=Debug CMake Binary=file:///usr/bin/cmake Environment Profile= Extra Arguments= diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 5127559..99a473c 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -11,7 +11,7 @@ set (PROJECT_CONTACT "esalexeev@gmail.com") set (PROJECT_LICENSE "GPLv3") set (PROJECT_VERSION_MAJOR 2) 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}) string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC) diff --git a/sources/awesome-widget/package/metadata.desktop b/sources/awesome-widget/package/metadata.desktop index db5ce42..58d788f 100644 --- a/sources/awesome-widget/package/metadata.desktop +++ b/sources/awesome-widget/package/metadata.desktop @@ -20,7 +20,7 @@ X-Plasma-RemoteLocation= X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Email=esalexeev@gmail.com 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-Category=System Information X-KDE-PluginInfo-Depends= diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp index 3a765de..fac6a44 100644 --- a/sources/awesome-widget/plugin/awkeys.cpp +++ b/sources/awesome-widget/plugin/awkeys.cpp @@ -553,11 +553,11 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data, } else if (sourceName.contains(netRecRegExp)) { // download speed QString device = sourceName; + float value = data[QString("value")].toFloat(); device.remove(QString("network/interfaces/")).remove(QString("/receiver/data")); QStringList allNetworkDevices = networkDevices; for (int i=0; i 1000.0) values[QString("down%1").arg(i)] = QString("%1").arg(value / 1024.0, 4, 'f', 1); else @@ -565,17 +565,20 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data, break; } if (device == values[QString("netdev")]) { - values[QString("down")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0); - if (toolTip != nullptr) toolTip->setData(QString("downTooltip"), data[QString("value")].toFloat()); + if (value > 1000.0) + 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)) { // upload speed QString device = sourceName; + float value = data[QString("value")].toFloat(); device.remove(QString("network/interfaces/")).remove(QString("/transmitter/data")); QStringList allNetworkDevices = networkDevices; for (int i=0; i 1000.0) values[QString("up%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat() / 1024.0, 4, 'f', 1); else @@ -583,7 +586,10 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data, break; } 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()); } } else if (sourceName == QString("pkg")) { diff --git a/sources/desktop-panel/package/metadata.desktop b/sources/desktop-panel/package/metadata.desktop index faa0063..4efcf34 100644 --- a/sources/desktop-panel/package/metadata.desktop +++ b/sources/desktop-panel/package/metadata.desktop @@ -20,7 +20,7 @@ X-Plasma-RemoteLocation= X-KDE-PluginInfo-Author=Evgeniy Alekseev aka arcanis X-KDE-PluginInfo-Email=esalexeev@gmail.com 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-Category=System Information X-KDE-PluginInfo-Depends=