Merge lp:~ken-vandine/ubuntu-system-settings/lp1329702_battery_charging_status into lp:ubuntu-system-settings

[Ken VanDine]

Use device-state from indicator-power to determine charging status. QtSystemsInfo doesn't support UPower 0.99.

Use device-state from indicator-power to determine charging status. QtSystemsInfo doesn't support UPower 0.99.

This change requires indicator-power from https://code.launchpad.net/~charlesk/indicator-power/lp-1416096-publish-primary-device-state-on-bus-15.04/+merge/248145

[Charles Kerr (charlesk)]

Works for me, tested on mako with vivid r84

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-01-15 19:52:22 +0000
+++ debian/control	2015-01-30 18:12:16 +0000
@@ -66,6 +66,7 @@
          gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),
          indicator-bluetooth (>> 0.0.6+13.10.20131010),
          indicator-network (>= 0.5.0+13.10.20130918),
+         indicator-power (>= 12.10.6+15.04.20150130),
          powerd (>= 0.15) | gnome-settings-daemon,
          qmenumodel-qml,
          qtdeclarative5-folderlistmodel-plugin,

=== modified file 'plugins/battery/PageComponent.qml'
--- plugins/battery/PageComponent.qml	2014-11-12 19:03:03 +0000
+++ plugins/battery/PageComponent.qml	2015-01-30 18:12:16 +0000
@@ -34,8 +34,6 @@
     title: i18n.tr("Battery")
     flickable: scrollWidget
 
-    property bool isCharging
-
     function timeDeltaString(timeDelta) {
         var sec = timeDelta,
             min = Math.round (timeDelta / 60),
@@ -71,36 +69,10 @@
         objectPath: "/com/canonical/indicator/power"
         property variant brightness: action("brightness").state
         property variant batteryLevel: action("battery-level").state
+        property variant deviceState: action("device-state").state
         Component.onCompleted: start()
     }
 
-    BatteryInfo {
-        id: batteryInfo
-
-        monitorChargingState: true
-        monitorBatteryStatus: true
-
-        onChargingStateChanged: {
-            if (state === BatteryInfo.Charging) {
-                chargingEntry.text = i18n.tr("Charging now")
-                isCharging = true
-            }
-            else if (state === BatteryInfo.Discharging &&
-                     batteryInfo.batteryStatus(0) !== BatteryInfo.BatteryFull) {
-                chargingEntry.text = i18n.tr("Last full charge")
-                isCharging = false
-            }
-            else if (batteryInfo.batteryStatus(0) === BatteryInfo.BatteryFull ||
-                     state === BatteryInfo.NotCharging) {
-                chargingEntry.text = i18n.tr("Fully charged")
-                isCharging = true
-            }
-        }
-        Component.onCompleted: {
-            onChargingStateChanged(0, chargingState(0))
-        }
-    }
-
     UbuntuBatteryPanel {
         id: batteryBackend
     }
@@ -283,8 +255,25 @@
 
             ListItem.SingleValue {
                 id: chargingEntry
-                value: isCharging ?
-                           "" : (batteryBackend.lastFullCharge ? timeDeltaString(batteryBackend.lastFullCharge) : i18n.tr("N/A"))
+                text: {
+                    if (indicatorPower.deviceState === "charging")
+                        return i18n.tr("Charging now")
+                    else if (indicatorPower.deviceState === "discharging")
+                        return i18n.tr("Last full charge")
+                    else if (indicatorPower.deviceState === "fully-charged")
+                        return i18n.tr("Fully charged")
+                }
+
+                value: {
+                    if (indicatorPower.deviceState === "discharging") {
+                        if (batteryBackend.lastFullCharge)
+                            return timeDeltaString(batteryBackend.lastFullCharge)
+                        else
+                            return i18n.tr("N/A")
+                    }
+                    else
+                        return ""
+                }
                 showDivider: false
             }
 

=== modified file 'plugins/battery/SleepValues.qml'
--- plugins/battery/SleepValues.qml	2014-10-31 08:47:17 +0000
+++ plugins/battery/SleepValues.qml	2015-01-30 18:12:16 +0000
@@ -23,7 +23,6 @@
 
 import GSettings 1.0
 import QtQuick 2.0
-import QtSystemInfo 5.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import SystemSettings 1.0

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2015-01-23 10:01:34 +0000
+++ plugins/system-update/PageComponent.qml	2015-01-30 18:12:16 +0000
@@ -21,7 +21,6 @@
 
 import QMenuModel 0.1
 import QtQuick 2.0
-import QtSystemInfo 5.0
 import SystemSettings 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
@@ -42,7 +41,7 @@
     property bool includeSystemUpdate: false
     property bool systemUpdateInProgress: false
     property int updatesAvailable: 0
-    property bool isCharging: false
+    property bool isCharging: indicatorPower.deviceState === "charging"
     property bool batterySafeForUpdate: isCharging || chargeLevel > 25
     property var chargeLevel: indicatorPower.batteryLevel || 0
     property var notificationAction;
@@ -59,6 +58,7 @@
         busName: "com.canonical.indicator.power"
         objectPath: "/com/canonical/indicator/power"
         property variant batteryLevel: action("battery-level").state
+        property variant deviceState: action("device-state").state
         Component.onCompleted: start()
     }
 
@@ -76,33 +76,6 @@
         }
     }
 
-
-    DeviceInfo {
-        id: deviceInfo
-    }
-
-    BatteryInfo {
-        id: batteryInfo
-        monitorChargingState: true
-
-        onChargingStateChanged: {
-            if (state === BatteryInfo.Charging) {
-                isCharging = true
-            }
-            else if (state === BatteryInfo.Discharging &&
-                     batteryInfo.batteryStatus(0) !== BatteryInfo.BatteryFull) {
-                isCharging = false
-            }
-            else if (batteryInfo.batteryStatus(0) === BatteryInfo.BatteryFull ||
-                     state === BatteryInfo.NotCharging) {
-                isCharging = true
-            }
-        }
-        Component.onCompleted: {
-            onChargingStateChanged(0, chargingState(0))
-        }
-    }
-
     Setup {
         id: uoaConfig
         applicationId: "ubuntu-system-settings"