[Battery plasmoid] do not show vendor and product, always show battery details

Summary:
Retry after D23237
Vendor and Product will be shown in the energy information kcm after D23152

Test Plan:
After:
{F7260208}

Reviewers: #vdg, #plasma, broulik, ngraham

Reviewed By: #vdg, #plasma, broulik, ngraham

Subscribers: ngraham, alexde, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D23260
wilder-5.17
Méven Car 7 years ago
parent e37b012822
commit df2469e7d2
  1. 1
      applets/batterymonitor/package/contents/ui/BatteryItem.qml
  2. 13
      applets/batterymonitor/package/contents/ui/logic.js

@ -209,7 +209,6 @@ Item {
visible: !!item
opacity: 0.5
sourceComponent: batteryDetails
active: batterymonitor.batteries.count < 2
}
}

@ -46,19 +46,6 @@ function batteryDetails(batteryData, remainingTime) {
data.push({value: i18nc("Placeholder is battery capacity", "%1%", batteryData["Capacity"]) })
}
// Non-powersupply batteries have a name consisting of the vendor and model already
if (batteryData["Is Power Supply"]) {
if (batteryData["Vendor"] != "" && typeof batteryData["Vendor"] == "string") {
data.push({label: i18n("Vendor:") })
data.push({value: batteryData["Vendor"] })
}
if (batteryData["Product"] != "" && typeof batteryData["Product"] == "string") {
data.push({label: i18n("Model:") })
data.push({value: batteryData["Product"] })
}
}
return data
}

Loading…
Cancel
Save