From abb3183c27cea308676bdb6a56b552a3a3a06dfd Mon Sep 17 00:00:00 2001 From: Kai Uwe Broulik Date: Wed, 9 Mar 2016 12:39:49 +0100 Subject: [PATCH] [Battery Monitor] Just use "battery tooltip icon There's no point in having separate logic for the tooltip and Breeze doesn't have the icons we need anyway. CCBUG: 360276 --- applets/batterymonitor/package/contents/code/logic.js | 5 ----- .../batterymonitor/package/contents/ui/batterymonitor.qml | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/applets/batterymonitor/package/contents/code/logic.js b/applets/batterymonitor/package/contents/code/logic.js index a07c84e2c..efdcf91c8 100755 --- a/applets/batterymonitor/package/contents/code/logic.js +++ b/applets/batterymonitor/package/contents/code/logic.js @@ -59,17 +59,12 @@ function updateTooltip(remainingTime) { } if (batteries.count === 0) { - batteries.tooltipImage = "battery-missing"; batteries.tooltipMainText = i18n("No Batteries Available"); } else if (pmSource.data["Battery"]["State"] === "FullyCharged") { - batteries.tooltipImage = "battery-100"; batteries.tooltipMainText = i18n("Fully Charged"); } else if (pmSource.data["AC Adapter"] && pmSource.data["AC Adapter"]["Plugged in"]) { - batteries.tooltipImage = "battery-charging" batteries.tooltipMainText = i18n("%1%. Charging", pmSource.data["Battery"]["Percent"]) } else { - batteries.tooltipImage = "battery-discharging" - if (remainingTime > 0) { batteries.tooltipMainText = i18nc("%1 is remaining time, %2 is percentage", "%1 Remaining (%2%)", KCoreAddons.Format.formatDuration(remainingTime, KCoreAddons.FormatTypes.HideSeconds), diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml index a08658167..1a52c5cef 100755 --- a/applets/batterymonitor/package/contents/ui/batterymonitor.qml +++ b/applets/batterymonitor/package/contents/ui/batterymonitor.qml @@ -37,7 +37,7 @@ Item { Plasmoid.toolTipMainText: batteries.tooltipMainText Plasmoid.toolTipSubText: batteries.tooltipSubText - Plasmoid.icon: batteries.tooltipImage + Plasmoid.icon: "battery" property bool disableBrightnessUpdate: false @@ -154,7 +154,6 @@ Item { property string tooltipMainText property string tooltipSubText - property string tooltipImage } Plasmoid.fullRepresentation: PopupDialog {