From 1869a68122799313d8e7dab0c6afe7020ebbe975 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Fri, 3 Jul 2015 00:04:03 +0300 Subject: [PATCH] fix bug with no actions set network speed units as MB/s if the value more than 1k KB/s --- CHANGELOG | 2 ++ sources/CMakeLists.txt | 2 +- .../package/contents/ui/about.qml | 2 ++ .../package/contents/ui/widget.qml | 1 + .../awesome-widget/package/metadata.desktop | 2 +- sources/awesome-widget/plugin/awkeys.cpp | 22 +++++++++++++------ .../package/contents/ui/about.qml | 2 ++ .../package/contents/ui/widget.qml | 1 + .../desktop-panel/package/metadata.desktop | 2 +- 9 files changed, 26 insertions(+), 10 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2bdec40..0b394fd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,6 @@ Ver.2.3.2: ++ change network speed units from KB/s to MB/s if value is more than 1000 KB/s (metrics are the same) +- fix bug with no actions on link activation (thanks to infans) * improve quotes support, e.g. fix plasma crash * rewrite main widget to signal-slot update model * improve battery calculation for system which has several batteries diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index ec8784e..426a6db 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 1) +set (PROJECT_VERSION_PATCH 2) 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/contents/ui/about.qml b/sources/awesome-widget/package/contents/ui/about.qml index 6fe123e..92c4dd0 100644 --- a/sources/awesome-widget/package/contents/ui/about.qml +++ b/sources/awesome-widget/package/contents/ui/about.qml @@ -65,6 +65,7 @@ Item { horizontalAlignment: Text.AlignLeft textFormat: Text.RichText text: AWActions.getAboutText("links") + onLinkActivated: Qt.openUrlExternally(link); } QtControls.Label { @@ -97,6 +98,7 @@ Item { verticalAlignment: Text.AlignTop textFormat: Text.RichText text: AWActions.getAboutText("3rdparty") + onLinkActivated: Qt.openUrlExternally(link); } } } diff --git a/sources/awesome-widget/package/contents/ui/widget.qml b/sources/awesome-widget/package/contents/ui/widget.qml index 0d9e68d..a7b73c9 100644 --- a/sources/awesome-widget/package/contents/ui/widget.qml +++ b/sources/awesome-widget/package/contents/ui/widget.qml @@ -70,6 +70,7 @@ Item { verticalAlignment: Text.AlignVCenter wrapMode: Text.WordWrap text: i18n("Detailed information may be found on project homepage") + onLinkActivated: Qt.openUrlExternally(link); } Row { diff --git a/sources/awesome-widget/package/metadata.desktop b/sources/awesome-widget/package/metadata.desktop index af0479a..3e936ff 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.1 +X-KDE-PluginInfo-Version=2.3.2 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 4c0c5f6..dd9994b 100644 --- a/sources/awesome-widget/plugin/awkeys.cpp +++ b/sources/awesome-widget/plugin/awkeys.cpp @@ -556,10 +556,14 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data, QString device = sourceName; device.remove(QString("network/interfaces/")).remove(QString("/receiver/data")); QStringList allNetworkDevices = networkDevices; - for (int i=0; i 1000) + values[QString("down%1").arg(i)] = QString("%1").arg(value / 1024.0, 4, 'f', 1); + else + values[QString("down%1").arg(i)] = QString("%1").arg(value, 4, 'f', 0); + break; } if (device == values[QString("netdev")]) { values[QString("down")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0); @@ -570,10 +574,14 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data, QString device = sourceName; device.remove(QString("network/interfaces/")).remove(QString("/transmitter/data")); QStringList allNetworkDevices = networkDevices; - for (int i=0; i 1000) + values[QString("up%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat() / 1024.0, 4, 'f', 1); + else values[QString("up%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0); - break; + break; } if (device == values[QString("netdev")]) { values[QString("up")] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0); diff --git a/sources/desktop-panel/package/contents/ui/about.qml b/sources/desktop-panel/package/contents/ui/about.qml index 51c0630..ad3201b 100644 --- a/sources/desktop-panel/package/contents/ui/about.qml +++ b/sources/desktop-panel/package/contents/ui/about.qml @@ -65,6 +65,7 @@ Item { horizontalAlignment: Text.AlignLeft textFormat: Text.RichText text: DPAdds.getAboutText("links") + onLinkActivated: Qt.openUrlExternally(link); } QtControls.Label { @@ -97,6 +98,7 @@ Item { verticalAlignment: Text.AlignTop textFormat: Text.RichText text: DPAdds.getAboutText("3rdparty") + onLinkActivated: Qt.openUrlExternally(link); } } } diff --git a/sources/desktop-panel/package/contents/ui/widget.qml b/sources/desktop-panel/package/contents/ui/widget.qml index 5a577ab..27616be 100644 --- a/sources/desktop-panel/package/contents/ui/widget.qml +++ b/sources/desktop-panel/package/contents/ui/widget.qml @@ -42,6 +42,7 @@ Item { verticalAlignment: Text.AlignVCenter wrapMode: Text.WordWrap text: i18n("Detailed information may be found on project homepage") + onLinkActivated: Qt.openUrlExternally(link); } Row { diff --git a/sources/desktop-panel/package/metadata.desktop b/sources/desktop-panel/package/metadata.desktop index 16e90dd..4102c18 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.1 +X-KDE-PluginInfo-Version=2.3.2 X-KDE-PluginInfo-Website=http://arcanis.name/projects/awesome-widgets/ X-KDE-PluginInfo-Category=System Information X-KDE-PluginInfo-Depends=