Merge lp:~nick-dedekind/unity8/indicator-location into lp:unity8

[Nick Dedekind]

Added location indicator defaults.

Added location indicator defaults.
Updated indicator default widget/page to use new indicator backend impl.

[Albert Astals Cid (aacid)]

Ok, a bit sad that the backend doesn't provide the title, but oh well

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:258
http://jenkins.qa.ubuntu.com/job/unity8-ci/787/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2674
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/301
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/788
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/788/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/787
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2680
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2680/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/303
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/303/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/277

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/787/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

On Tue, 2013-08-27 at 10:40 +0000, Albert Astals Cid wrote:

> Ok, a bit sad that the backend doesn't provide the title, but oh well

Agreed. For some reason I thought you were using the accessibility
description, but I'm realizing that wouldn't have worked. Let's add a
title so that everything gets translated together.

Also, I didn't realize there was a list of indicators in the code. Is
it possible we could move that just using the files installed? What
other information would we need to add to the indicators?

=== modified file 'Panel/IndicatorsDataModel.qml'
--- Panel/IndicatorsDataModel.qml	2013-08-21 12:37:51 +0000
+++ Panel/IndicatorsDataModel.qml	2013-08-27 10:21:03 +0000
@@ -27,6 +27,12 @@
     Component.onCompleted: load()
 
     indicatorData : {
+        'indicator-location' : {
+            'title': 'Location',
+            'description' : '',
+            'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget2.qml',
+            'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorPage2.qml'
+        },
         'indicator-bluetooth' : {
             'title': 'Bluetooth',
             'description' : '',

=== modified file 'plugins/Unity/Indicators/indicatorsmodel.cpp'
--- plugins/Unity/Indicators/indicatorsmodel.cpp	2013-08-09 17:30:51 +0000
+++ plugins/Unity/Indicators/indicatorsmodel.cpp	2013-08-27 10:21:03 +0000
@@ -229,9 +229,9 @@
         case IndicatorsModelRole::Description:
             return "";
         case IndicatorsModelRole::WidgetSource:
-            return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorWidget.qml";
+            return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorWidget2.qml";
         case IndicatorsModelRole::PageSource:
-            return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorPage.qml";
+            return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorPage2.qml";
     }
     return QVariant();
 }