[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
wilder-5.14
Kai Uwe Broulik 10 years ago
parent 412b6f9040
commit abb3183c27
  1. 5
      applets/batterymonitor/package/contents/code/logic.js
  2. 3
      applets/batterymonitor/package/contents/ui/batterymonitor.qml

@ -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),

@ -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 {

Loading…
Cancel
Save