Merge lp:~laney/ubuntu-system-settings/battery-percentage-indicator into lp:ubuntu-system-settings

[Iain Lane]

Use the indicator's value for the charge level instead of calculating it from QtSystems derived information

Seems calculating from the raw values is unreliable; just use what the indicator gives us (which currently is 'capacity').

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:402
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/418/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/418

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/418/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Seems fine to me, thanks

review: Approve

=== modified file 'plugins/battery/PageComponent.qml'
--- plugins/battery/PageComponent.qml	2013-09-26 11:36:07 +0000
+++ plugins/battery/PageComponent.qml	2013-09-30 09:57:35 +0000
@@ -81,12 +81,6 @@
                 isCharging = true
             }
         }
-        onRemainingCapacityChanged: {
-            if(batteryInfo.batteryCount > 0)
-                /* TRANSLATORS: %1 refers to a percentage that indicates the charging level of the battery */
-                chargingLevel.value = i18n.tr("%1 %").arg((batteryInfo.remainingCapacity(0)/batteryInfo.maximumCapacity(0)*100).toFixed(0))
-        }
-
         Component.onCompleted: {
             onChargingStateChanged(0, chargingState(0))
             onRemainingCapacityChanged(0, remainingCapacity(0))
@@ -104,6 +98,7 @@
         objectPath: "/com/canonical/indicator/power"
 
         property variant brightness: action("brightness")
+        property variant batteryLevel: action("battery-level")
     }
 
     Component.onCompleted: indicatorPower.start()
@@ -122,7 +117,16 @@
             ListItem.SingleValue {
                 id: chargingLevel
                 text: i18n.tr("Charge level")
-                value: i18n.tr("N/A")
+                value: {
+                    var chargeLevel = indicatorPower.batteryLevel.state
+
+                    if (chargeLevel === null)
+                        return i18n.tr("N/A")
+
+                    /* TRANSLATORS: %1 refers to a percentage that indicates the charging level of the battery */
+                    return i18n.tr("%1%".arg(chargeLevel))
+                }
+
                 showDivider: false
             }
 

=== modified file 'po/ubuntu-system-settings.pot'
--- po/ubuntu-system-settings.pot	2013-09-26 11:36:07 +0000
+++ po/ubuntu-system-settings.pot	2013-09-30 09:57:35 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-system-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-26 13:30+0200\n"
+"POT-Creation-Date: 2013-09-30 09:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -27,9 +27,9 @@
 msgstr ""
 
 #: ../plugins/about/PageComponent.qml:77 ../plugins/about/PageComponent.qml:84
-#: ../plugins/about/Storage.qml:137 ../plugins/battery/PageComponent.qml:125
-#: ../plugins/battery/PageComponent.qml:132
-#: ../plugins/cellular/PageComponent.qml:75
+#: ../plugins/about/Storage.qml:190 ../plugins/battery/PageComponent.qml:124
+#: ../plugins/battery/PageComponent.qml:136
+#: ../plugins/cellular/PageComponent.qml:73
 msgid "N/A"
 msgstr ""
 
@@ -46,11 +46,11 @@
 msgstr ""
 
 #: ../plugins/about/PageComponent.qml:98
-#: ../plugins/battery/PageComponent.qml:245
-#: ../plugins/battery/PageComponent.qml:253
+#: ../plugins/battery/PageComponent.qml:249
+#: ../plugins/battery/PageComponent.qml:257
 #: ../plugins/battery/SleepValues.qml:91
 #: ../plugins/system-update/Download.qml:53
-#: ../plugins/system-update/PageComponent.qml:335
+#: ../plugins/system-update/PageComponent.qml:334
 msgid "Never"
 msgstr ""
 
@@ -58,7 +58,7 @@
 msgid "Check for updates"
 msgstr ""
 
-#: ../plugins/about/PageComponent.qml:112 ../plugins/about/Storage.qml:33
+#: ../plugins/about/PageComponent.qml:112 ../plugins/about/Storage.qml:32
 msgid "Storage"
 msgstr ""
 
@@ -74,59 +74,47 @@
 msgid "Regulatory info"
 msgstr ""
 
-#: ../plugins/about/Storage.qml:39
+#: ../plugins/about/Storage.qml:87
 msgid "Used by Ubuntu"
 msgstr ""
 
-#: ../plugins/about/Storage.qml:39
+#: ../plugins/about/Storage.qml:88
 msgid "Movies"
 msgstr ""
 
-#: ../plugins/about/Storage.qml:39
+#: ../plugins/about/Storage.qml:89
 msgid "Audio"
 msgstr ""
 
-#: ../plugins/about/Storage.qml:40
+#: ../plugins/about/Storage.qml:90
 msgid "Pictures"
 msgstr ""
 
-#: ../plugins/about/Storage.qml:40
+#: ../plugins/about/Storage.qml:91
 msgid "Other files"
 msgstr ""
 
-#: ../plugins/about/Storage.qml:40
+#: ../plugins/about/Storage.qml:92
 msgid "Used by apps"
 msgstr ""
 
-#: ../plugins/about/Storage.qml:61
-msgid "kB"
-msgstr ""
-
-#: ../plugins/about/Storage.qml:63
-msgid "MB"
-msgstr ""
-
-#: ../plugins/about/Storage.qml:65
-msgid "GB"
-msgstr ""
-
-#: ../plugins/about/Storage.qml:85
+#: ../plugins/about/Storage.qml:134
 msgid "Total storage"
 msgstr ""
 
-#: ../plugins/about/Storage.qml:94
+#: ../plugins/about/Storage.qml:145
 msgid "Free space"
 msgstr ""
 
-#: ../plugins/about/Storage.qml:110
+#: ../plugins/about/Storage.qml:163
 msgid "Installed apps"
 msgstr ""
 
-#: ../plugins/about/Storage.qml:111
+#: ../plugins/about/Storage.qml:164
 msgid "By name"
 msgstr ""
 
-#: ../plugins/about/Storage.qml:111
+#: ../plugins/about/Storage.qml:164
 msgid "By size"
 msgstr ""
 
@@ -134,19 +122,19 @@
 msgid "Background"
 msgstr ""
 
-#: ../plugins/background/MainPage.qml:68
+#: ../plugins/background/MainPage.qml:71
 msgid "Welcome screen"
 msgstr ""
 
-#: ../plugins/background/MainPage.qml:143
+#: ../plugins/background/MainPage.qml:134
 msgid "Home screen"
 msgstr ""
 
-#: ../plugins/background/MainPage.qml:223
+#: ../plugins/background/MainPage.qml:160
 msgid "Same background for both"
 msgstr ""
 
-#: ../plugins/background/MainPage.qml:224
+#: ../plugins/background/MainPage.qml:161
 msgid "Different background for each"
 msgstr ""
 
@@ -194,36 +182,36 @@
 msgid "Fully charged"
 msgstr ""
 
+#: ../plugins/battery/PageComponent.qml:119
+msgid "Charge level"
+msgstr ""
+
 #. TRANSLATORS: %1 refers to a percentage that indicates the charging level of the battery
-#: ../plugins/battery/PageComponent.qml:87
+#: ../plugins/battery/PageComponent.qml:127
 #, qt-format
-msgid "%1 %"
-msgstr ""
-
-#: ../plugins/battery/PageComponent.qml:124
-msgid "Charge level"
-msgstr ""
-
-#: ../plugins/battery/PageComponent.qml:176
+msgid "%1%"
+msgstr ""
+
+#: ../plugins/battery/PageComponent.qml:180
 msgid "Ways to reduce battery use:"
 msgstr ""
 
-#: ../plugins/battery/PageComponent.qml:180
+#: ../plugins/battery/PageComponent.qml:184
 msgid "Display brightness"
 msgstr ""
 
-#: ../plugins/battery/PageComponent.qml:237
+#: ../plugins/battery/PageComponent.qml:241
 #: ../plugins/security-privacy/PhoneLocking.qml:62
 msgid "Lock when idle"
 msgstr ""
 
-#: ../plugins/battery/PageComponent.qml:237
+#: ../plugins/battery/PageComponent.qml:241
 #: ../plugins/security-privacy/PhoneLocking.qml:63
 msgid "Sleep when idle"
 msgstr ""
 
-#: ../plugins/battery/PageComponent.qml:242
-#: ../plugins/battery/PageComponent.qml:250
+#: ../plugins/battery/PageComponent.qml:246
+#: ../plugins/battery/PageComponent.qml:254
 #: ../plugins/battery/SleepValues.qml:76 ../plugins/battery/SleepValues.qml:79
 #: ../plugins/battery/SleepValues.qml:82 ../plugins/battery/SleepValues.qml:85
 #: ../plugins/battery/SleepValues.qml:88
@@ -233,22 +221,22 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/battery/PageComponent.qml:263
+#: ../plugins/battery/PageComponent.qml:267
 #: ../plugins/wifi/PageComponent.qml:27 ../.build/settings.js:18
 msgid "Wi-Fi"
 msgstr ""
 
-#: ../plugins/battery/PageComponent.qml:287
+#: ../plugins/battery/PageComponent.qml:291
 #: ../plugins/bluetooth/PageComponent.qml:98
 #: ../plugins/bluetooth/PageComponent.qml:106 ../.build/settings.js:5
 msgid "Bluetooth"
 msgstr ""
 
-#: ../plugins/battery/PageComponent.qml:316
+#: ../plugins/battery/PageComponent.qml:320
 msgid "GPS"
 msgstr ""
 
-#: ../plugins/battery/PageComponent.qml:334
+#: ../plugins/battery/PageComponent.qml:338
 msgid "Accurate location detection requires GPS and/or Wi-Fi."
 msgstr ""
 
@@ -282,7 +270,7 @@
 
 #: ../plugins/bluetooth/ConfirmPasskeyDialog.qml:48
 #: ../plugins/bluetooth/ProvidePasskeyDialog.qml:54
-#: ../plugins/language/DisplayLanguage.qml:89
+#: ../plugins/language/DisplayLanguage.qml:95
 #: ../plugins/phone/CallForwarding.qml:113
 #: ../plugins/reset/EraseEverything.qml:36
 #: ../plugins/reset/ResetAllSettings.qml:36
@@ -432,15 +420,15 @@
 msgstr ""
 
 #: ../plugins/cellular/ChooseCarrier.qml:28
-#: ../plugins/cellular/PageComponent.qml:74
+#: ../plugins/cellular/PageComponent.qml:72
 msgid "Carrier"
 msgstr ""
 
-#: ../plugins/cellular/ChooseCarrier.qml:80
+#: ../plugins/cellular/ChooseCarrier.qml:78
 msgid "Refresh"
 msgstr ""
 
-#: ../plugins/cellular/ChooseCarrier.qml:97
+#: ../plugins/cellular/ChooseCarrier.qml:95
 msgid "Searching"
 msgstr ""
 
@@ -448,52 +436,40 @@
 msgid "Cellular"
 msgstr ""
 
-#: ../plugins/cellular/PageComponent.qml:68
+#: ../plugins/cellular/PageComponent.qml:66
 msgid "Choose carrier:"
 msgstr ""
 
-#: ../plugins/cellular/PageComponent.qml:69
+#: ../plugins/cellular/PageComponent.qml:67
 #: ../plugins/time-date/ChooseTimeZone.qml:35
 #: ../plugins/time-date/PageComponent.qml:66
 msgid "Automatically"
 msgstr ""
 
-#: ../plugins/cellular/PageComponent.qml:69
+#: ../plugins/cellular/PageComponent.qml:67
 #: ../plugins/time-date/ChooseTimeZone.qml:35
 #: ../plugins/time-date/PageComponent.qml:66
 msgid "Manually"
 msgstr ""
 
-#: ../plugins/cellular/PageComponent.qml:89
-msgid "Cellular data:"
-msgstr ""
-
-#: ../plugins/cellular/PageComponent.qml:90
-msgid "Off"
-msgstr ""
-
-#: ../plugins/cellular/PageComponent.qml:91
-msgid "2G only (saves battery)"
-msgstr ""
-
-#: ../plugins/cellular/PageComponent.qml:92
-msgid "2G/3G/4G (faster)"
-msgstr ""
-
-#: ../plugins/cellular/PageComponent.qml:103
+#: ../plugins/cellular/PageComponent.qml:101
+msgid "Cellular data"
+msgstr ""
+
+#: ../plugins/cellular/PageComponent.qml:109
 msgid "Data roaming"
 msgstr ""
 
-#: ../plugins/cellular/PageComponent.qml:112
+#: ../plugins/cellular/PageComponent.qml:118
 msgid "Data usage statistics"
 msgstr ""
 
-#: ../plugins/language/DisplayLanguage.qml:34
+#: ../plugins/language/DisplayLanguage.qml:33
 #: ../plugins/language/PageComponent.qml:55
 msgid "Display language"
 msgstr ""
 
-#: ../plugins/language/DisplayLanguage.qml:109
+#: ../plugins/language/DisplayLanguage.qml:115
 #: ../plugins/security-privacy/LockSecurity.qml:217
 msgid "Confirm"
 msgstr ""
@@ -961,7 +937,7 @@
 msgstr ""
 
 #: ../plugins/system-update/Download.qml:29
-#: ../plugins/system-update/PageComponent.qml:332
+#: ../plugins/system-update/PageComponent.qml:331
 msgid "Auto download"
 msgstr ""
 
@@ -1036,7 +1012,7 @@
 msgstr ""
 
 #: ../plugins/system-update/PageComponent.qml:200
-#: ../plugins/system-update/PageComponent.qml:310
+#: ../plugins/system-update/PageComponent.qml:309
 msgid "Retry"
 msgstr ""
 
@@ -1049,27 +1025,27 @@
 msgid "Version %1"
 msgstr ""
 
-#: ../plugins/system-update/PageComponent.qml:280
+#: ../plugins/system-update/PageComponent.qml:279
 msgid "Pause downloading"
 msgstr ""
 
-#: ../plugins/system-update/PageComponent.qml:287
+#: ../plugins/system-update/PageComponent.qml:286
 msgid "Resume downloading"
 msgstr ""
 
-#: ../plugins/system-update/PageComponent.qml:303
+#: ../plugins/system-update/PageComponent.qml:302
 msgid "Download"
 msgstr ""
 
-#: ../plugins/system-update/PageComponent.qml:317
+#: ../plugins/system-update/PageComponent.qml:316
 msgid "Install & Restart"
 msgstr ""
 
-#: ../plugins/system-update/PageComponent.qml:337
+#: ../plugins/system-update/PageComponent.qml:336
 msgid "On wi-fi"
 msgstr ""
 
-#: ../plugins/system-update/PageComponent.qml:339
+#: ../plugins/system-update/PageComponent.qml:338
 msgid "Always"
 msgstr ""