From df2469e7d238ac070f6d87f2c403ce41470dccda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9ven=20Car?= Date: Mon, 19 Aug 2019 17:03:35 +0200 Subject: [PATCH] [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 --- .../package/contents/ui/BatteryItem.qml | 1 - applets/batterymonitor/package/contents/ui/logic.js | 13 ------------- 2 files changed, 14 deletions(-) diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml index 7e2d97588..11eb63d7a 100644 --- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml +++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml @@ -209,7 +209,6 @@ Item { visible: !!item opacity: 0.5 sourceComponent: batteryDetails - active: batterymonitor.batteries.count < 2 } } diff --git a/applets/batterymonitor/package/contents/ui/logic.js b/applets/batterymonitor/package/contents/ui/logic.js index 4303da305..7dc671abf 100644 --- a/applets/batterymonitor/package/contents/ui/logic.js +++ b/applets/batterymonitor/package/contents/ui/logic.js @@ -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 }