Merge lp:~lukas-kde/indicator-power/showTimeAndPercentageOptions into lp:indicator-power

[Lukáš Tinkl]

Add show-time and show-percentage actions to the phone profile

Add show-time and show-percentage actions to the phone profile

Brings those options to the phone profile as part of the convergence effort. The phone profile is the default one for unity8, even in desktop scenarios.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:299
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-power-ci/3/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1097
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1104
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/895
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/895/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/895
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/895/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/895
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/895/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/895
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/895/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/895
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/895/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/895
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/895/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-power-ci/3/rebuild

review: Approve (continuous-integration)

Unmerged revisions

299. By Lukáš Tinkl on 2016-10-25

merge trunk

298. By Lukáš Tinkl on 2016-10-18

add show-time, show-percentage config actions to phone profile

=== modified file 'src/service.c'
--- src/service.c	2016-05-26 18:21:09 +0000
+++ src/service.c	2016-10-25 11:50:03 +0000
@@ -657,6 +657,14 @@
       g_object_unref(item);
     }
 
+  g_menu_append (section,
+                 _("Show Time in Menu Bar"),
+                 "indicator.show-time");
+
+  g_menu_append (section,
+                 _("Show Percentage in Menu Bar"),
+                 "indicator.show-percentage");
+
   g_menu_append(section, _("Battery settings…"), "indicator.activate-phone-settings");
 
   return G_MENU_MODEL(section);