mirror of
https://github.com/arcan1s/awesome-widgets.git
synced 2025-04-24 23:47:20 +00:00
fix bug with no actions
set network speed units as MB/s if the value more than 1k KB/s
This commit is contained in:
parent
aa0a4b417d
commit
1869a68122
@ -1,4 +1,6 @@
|
|||||||
Ver.2.3.2:
|
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
|
* improve quotes support, e.g. fix plasma crash
|
||||||
* rewrite main widget to signal-slot update model
|
* rewrite main widget to signal-slot update model
|
||||||
* improve battery calculation for system which has several batteries
|
* improve battery calculation for system which has several batteries
|
||||||
|
@ -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 1)
|
set (PROJECT_VERSION_PATCH 2)
|
||||||
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)
|
||||||
|
@ -65,6 +65,7 @@ Item {
|
|||||||
horizontalAlignment: Text.AlignLeft
|
horizontalAlignment: Text.AlignLeft
|
||||||
textFormat: Text.RichText
|
textFormat: Text.RichText
|
||||||
text: AWActions.getAboutText("links")
|
text: AWActions.getAboutText("links")
|
||||||
|
onLinkActivated: Qt.openUrlExternally(link);
|
||||||
}
|
}
|
||||||
|
|
||||||
QtControls.Label {
|
QtControls.Label {
|
||||||
@ -97,6 +98,7 @@ Item {
|
|||||||
verticalAlignment: Text.AlignTop
|
verticalAlignment: Text.AlignTop
|
||||||
textFormat: Text.RichText
|
textFormat: Text.RichText
|
||||||
text: AWActions.getAboutText("3rdparty")
|
text: AWActions.getAboutText("3rdparty")
|
||||||
|
onLinkActivated: Qt.openUrlExternally(link);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -70,6 +70,7 @@ Item {
|
|||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
wrapMode: Text.WordWrap
|
wrapMode: Text.WordWrap
|
||||||
text: i18n("Detailed information may be found on <a href=\"http://arcanis.name/projects/awesome-widgets/\">project homepage</a>")
|
text: i18n("Detailed information may be found on <a href=\"http://arcanis.name/projects/awesome-widgets/\">project homepage</a>")
|
||||||
|
onLinkActivated: Qt.openUrlExternally(link);
|
||||||
}
|
}
|
||||||
|
|
||||||
Row {
|
Row {
|
||||||
|
@ -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.1
|
X-KDE-PluginInfo-Version=2.3.2
|
||||||
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=
|
||||||
|
@ -556,9 +556,13 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
|
|||||||
QString device = sourceName;
|
QString device = sourceName;
|
||||||
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) {
|
if (allNetworkDevices[i] != device) continue;
|
||||||
values[QString("down%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0);
|
float value = data[QString("value")].toFloat();
|
||||||
|
if (value > 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;
|
break;
|
||||||
}
|
}
|
||||||
if (device == values[QString("netdev")]) {
|
if (device == values[QString("netdev")]) {
|
||||||
@ -570,8 +574,12 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
|
|||||||
QString device = sourceName;
|
QString device = sourceName;
|
||||||
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) {
|
if (allNetworkDevices[i] != device) continue;
|
||||||
|
float value = data[QString("value")].toFloat();
|
||||||
|
if (value > 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);
|
values[QString("up%1").arg(i)] = QString("%1").arg(data[QString("value")].toFloat(), 4, 'f', 0);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -65,6 +65,7 @@ Item {
|
|||||||
horizontalAlignment: Text.AlignLeft
|
horizontalAlignment: Text.AlignLeft
|
||||||
textFormat: Text.RichText
|
textFormat: Text.RichText
|
||||||
text: DPAdds.getAboutText("links")
|
text: DPAdds.getAboutText("links")
|
||||||
|
onLinkActivated: Qt.openUrlExternally(link);
|
||||||
}
|
}
|
||||||
|
|
||||||
QtControls.Label {
|
QtControls.Label {
|
||||||
@ -97,6 +98,7 @@ Item {
|
|||||||
verticalAlignment: Text.AlignTop
|
verticalAlignment: Text.AlignTop
|
||||||
textFormat: Text.RichText
|
textFormat: Text.RichText
|
||||||
text: DPAdds.getAboutText("3rdparty")
|
text: DPAdds.getAboutText("3rdparty")
|
||||||
|
onLinkActivated: Qt.openUrlExternally(link);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -42,6 +42,7 @@ Item {
|
|||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
wrapMode: Text.WordWrap
|
wrapMode: Text.WordWrap
|
||||||
text: i18n("Detailed information may be found on <a href=\"http://arcanis.name/projects/awesome-widgets/\">project homepage</a>")
|
text: i18n("Detailed information may be found on <a href=\"http://arcanis.name/projects/awesome-widgets/\">project homepage</a>")
|
||||||
|
onLinkActivated: Qt.openUrlExternally(link);
|
||||||
}
|
}
|
||||||
|
|
||||||
Row {
|
Row {
|
||||||
|
@ -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.1
|
X-KDE-PluginInfo-Version=2.3.2
|
||||||
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=
|
||||||
|
Loading…
Reference in New Issue
Block a user