From e1cc4cd0f7210d99984a90f0015c5499ea0813e7 Mon Sep 17 00:00:00 2001 From: nephros Date: Thu, 23 Feb 2023 16:07:05 +0100 Subject: [PATCH] [AC] Support USB+AC Charging: QML --- application/qml/components/BatteryGraph.qml | 1 + application/qml/pages/MainPage.qml | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/application/qml/components/BatteryGraph.qml b/application/qml/components/BatteryGraph.qml index 11c29ee..fdc0df1 100644 --- a/application/qml/components/BatteryGraph.qml +++ b/application/qml/components/BatteryGraph.qml @@ -45,6 +45,7 @@ Item { property int counter: 0 running: (enableLowBatteryAnimation && !battery.chargerConnected + && !battery.acConnected && _charge <= settings.lowAlert) repeat: true interval: 400 diff --git a/application/qml/pages/MainPage.qml b/application/qml/pages/MainPage.qml index 1b2e713..98749e5 100644 --- a/application/qml/pages/MainPage.qml +++ b/application/qml/pages/MainPage.qml @@ -132,8 +132,15 @@ Page { } MyDetailItem { + property bool connected: (battery.chargerConnected || battery.acConnected) + property string chargerType: { + if ( battery.chargerConnected && !battery.acConnected) { return qsTr("USB") } + else if (!battery.chargerConnected && battery.acConnected) { return qsTr("AC") } + else if ( battery.chargerConnected && battery.acConnected) { return qsTr("USB") + "/" + qsTr("AC") } + return "unknown power source" + } label: qsTr("Charger connected:") - value: battery.chargerConnected ? qsTr("yes") : qsTr("no") + value: connected ? (qsTr("yes") + " (" + chargerType + ")") : qsTr("no") } MyDetailItem { label: qsTr("State:")