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

[Nick Dedekind]

Moved indicator page titles to the root action state of menu model.

Moved indicator page titles to the root action state of menu model.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:327
http://jenkins.qa.ubuntu.com/job/unity8-ci/1028/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3530
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1058
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1733
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1029
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1029/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1028
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3542
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3542/artifact/work/output/*zip*/output.zip
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2991/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1060
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1060/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/883
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/895

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

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Test was aborted, but has been re-triggered.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:327
http://jenkins.qa.ubuntu.com/job/unity8-ci/1030/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1068
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1736
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1031
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1031/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1030
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3552
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3552/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2999
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1070
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1070/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/888
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/900

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

There's a conflict in Panel/IndicatorsDataModel.qml

[lp:~nick-dedekind/unity8/indicator-titles]

328. By Nick Dedekind on 2013-09-30

merged with trunk

[Nick Dedekind (nick-dedekind)]

> There's a conflict in Panel/IndicatorsDataModel.qml

Fixed.

[Michał Sawicz (saviq)]

../plugins/Unity/Indicators/indicatorsmodel.cpp:218:10: warning: unused parameter ‘indicator’ [-Wunused-parameter]
 QVariant IndicatorsModel::defaultData(Indicator::Ptr indicator, int role)
          ^
Please mark unused.

review: Needs Fixing

[Michał Sawicz (saviq)]

When indicators are unloaded, their titles are, too, which results in indicator-$something being visible for a split second when opening the panel. Not sure this is acceptable, nor if there's a solution we know? Maybe the title could be transferred/cached with the panel icon/label?

review: Needs Information

[lp:~nick-dedekind/unity8/indicator-titles]

329. By Nick Dedekind on 2013-09-30

Fixed network indicator not displaying

330. By Nick Dedekind on 2013-09-30

Always populate root model pages, but not menu items

[Nick Dedekind (nick-dedekind)]

> When indicators are unloaded, their titles are, too, which results in
> indicator-$something being visible for a split second when opening the panel.
> Not sure this is acceptable, nor if there's a solution we know? Maybe the
> title could be transferred/cached with the panel icon/label?

I've changed it so that we load up the models for the pages, but still not populate the menu items. This way we get the titles for the pages all the time. Seeing as the modes are created and cached by the panel icons, there is no real overhead.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:328
http://jenkins.qa.ubuntu.com/job/unity8-ci/1171/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4189
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1856
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1933/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/194
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1171
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1171/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1170/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/484
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/57
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1858
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1858/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1554
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1566

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

A warning introduced by this, when an indicator is removed (e.g. disable bluetooth), please protect:

Panel/MenuContent.qml:112: TypeError: Cannot read property 'active' of undefined

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:330
http://jenkins.qa.ubuntu.com/job/unity8-ci/1179/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4213
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1880
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1942
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/202
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1179
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1179/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1178
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/507
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/81
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/81/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1882
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1882/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1578
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1591

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:330
http://jenkins.qa.ubuntu.com/job/unity8-ci/1183/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4232
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1900
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1947
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1183
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1183/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1182
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/525
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/99
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/99/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1902
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1902/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1599
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1614

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:330
http://jenkins.qa.ubuntu.com/job/unity8-ci/1184/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1923
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1953
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1184
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1184/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1183
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/545
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/122
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/122/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1925
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1925/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1623
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1641

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

review: Needs Fixing (continuous-integration)

[lp:~nick-dedekind/unity8/indicator-titles]

331. By Nick Dedekind on 2013-10-01

fixed warning

[Nick Dedekind (nick-dedekind)]

> A warning introduced by this, when an indicator is removed (e.g. disable
> bluetooth), please protect:
>
> Panel/MenuContent.qml:112: TypeError: Cannot read property 'active' of
> undefined

Added content activator index checks.

[Michał Sawicz (saviq)]

141 + console.log("CLEARED");

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/unity8-ci/1191/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1953
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1963
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1191
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1191/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1190
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-vm-saucy/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4307
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4307/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1955
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1955/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1648
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1666

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

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

> 141 + console.log("CLEARED");

neverending!
Fixed.

[lp:~nick-dedekind/unity8/indicator-titles]

332. By Nick Dedekind on 2013-10-02

removed debug log

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:332
http://jenkins.qa.ubuntu.com/job/unity8-ci/1215/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4361/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2086/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2000/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/238/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1215/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1214/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/235/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2088/console

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Argh, conflicts now...

review: Needs Fixing

[Nick Dedekind (nick-dedekind)]

> Argh, conflicts now...

Merged with trunk.

[lp:~nick-dedekind/unity8/indicator-titles]

333. By Nick Dedekind on 2013-10-02

merged with trunk

[Michał Sawicz (saviq)]

Yup!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:333
http://jenkins.qa.ubuntu.com/job/unity8-ci/1232/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4400
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2140
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2023/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1232
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1232/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1231
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/684
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/275
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/275/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2142
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1821
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1838

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Panel/Indicators/DefaultIndicatorWidget.qml'
--- Panel/Indicators/DefaultIndicatorWidget.qml	2013-09-09 09:21:55 +0000
+++ Panel/Indicators/DefaultIndicatorWidget.qml	2013-10-02 16:10:35 +0000
@@ -86,8 +86,8 @@
         }
     }
 
-    onActionStateChanged: {
-        if (actionState == undefined) {
+    onRootActionStateChanged: {
+        if (rootActionState == undefined) {
             leftLabel = "";
             rightLabel = "";
             icons = undefined;
@@ -95,9 +95,9 @@
             return;
         }
 
-        leftLabel = actionState.leftLabel ? actionState.leftLabel : "";
-        rightLabel = actionState.rightLabel ? actionState.rightLabel : "";
-        icons = actionState.icons;
-        enabled = actionState.visible;
+        leftLabel = rootActionState.leftLabel ? rootActionState.leftLabel : "";
+        rightLabel = rootActionState.rightLabel ? rootActionState.rightLabel : "";
+        icons = rootActionState.icons;
+        enabled = rootActionState.visible;
     }
 }

=== modified file 'Panel/Indicators/NetworkIndicatorPage.qml'
--- Panel/Indicators/NetworkIndicatorPage.qml	2013-09-09 09:21:55 +0000
+++ Panel/Indicators/NetworkIndicatorPage.qml	2013-10-02 16:10:35 +0000
@@ -30,7 +30,7 @@
     // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1211704
     __propagated: null
 
-    property alias title: _mainPage.title
+    property alias title: pluginItem.title
     property alias emptyText: pluginItem.emptyText
     property alias busName: pluginItem.busName
     property alias actionsObjectPath : pluginItem.actionsObjectPath

=== modified file 'Panel/IndicatorsDataModel.qml'
--- Panel/IndicatorsDataModel.qml	2013-09-09 09:21:55 +0000
+++ Panel/IndicatorsDataModel.qml	2013-10-02 16:10:35 +0000
@@ -27,39 +27,8 @@
     Component.onCompleted: load()
 
     indicatorData : {
-        'indicator-location' : {
-            'title': 'Location',
-            'description' : ''
-        },
-        'indicator-bluetooth' : {
-            'title': 'Bluetooth',
-            'description' : ''
-        },
-        'indicator-messages' : {
-            'title': 'Messaging',
-            'description' : ''
-        },
-        'indicator-sound' : {
-            'title': 'Sound',
-            'description' : ''
-        },
         'indicator-network' : {
-            'title': 'Networks',
-            'description' : '',
-            'widgetSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/DefaultIndicatorWidget.qml',
             'pageSource' : ApplicationPaths.shellAppDirectory()+'/Panel/Indicators/NetworkIndicatorPage.qml'
         },
-        'indicator-power' : {
-            'title': 'Battery',
-            'description' : ''
-        },
-        'indicator-session' : {
-            'title': 'Session',
-            'description' : ''
-        },
-        'indicator-datetime' : {
-            'title': 'Date and Time',
-            'description' : ''
-        }
     }
 }

=== modified file 'Panel/MenuContent.qml'
--- Panel/MenuContent.qml	2013-09-23 23:53:31 +0000
+++ Panel/MenuContent.qml	2013-10-02 16:10:35 +0000
@@ -100,16 +100,17 @@
             Tab {
                 id: tab
                 objectName: model.identifier
-                title: model.title
 
                 page: Page {
                     Loader {
+                        id: loader
                         clip: true
                         anchors.fill: parent
                         source: pageSource
                         asynchronous: true
 
-                        property bool contentActive: content.__contentActive && menuActivator.content[index].active
+                        readonly property bool indexActive: index >= 0 && index < menuActivator.count && menuActivator.content[index].active
+                        readonly property bool contentActive: content.__contentActive && indexActive
 
                         onContentActiveChanged: {
                             if (contentActive && item) {
@@ -136,6 +137,12 @@
                                 item.start()
                             }
                         }
+
+                        Binding {
+                            target: tab
+                            property: "title"
+                            value: loader.item && loader.item.hasOwnProperty("title") && loader.item.title !== "" ? loader.item.title : model.identifier
+                        }
                     }
                 }
             }

=== modified file 'plugins/Unity/Indicators/indicators.h'
--- plugins/Unity/Indicators/indicators.h	2013-08-15 16:03:35 +0000
+++ plugins/Unity/Indicators/indicators.h	2013-10-02 16:10:35 +0000
@@ -74,8 +74,6 @@
     enum Roles {
         Identifier = 0,
         Position,
-        Title,
-        Description,
         WidgetSource,
         PageSource,
         IndicatorProperties,

=== modified file 'plugins/Unity/Indicators/indicatorsmodel.cpp'
--- plugins/Unity/Indicators/indicatorsmodel.cpp	2013-09-24 10:20:30 +0000
+++ plugins/Unity/Indicators/indicatorsmodel.cpp	2013-10-02 16:10:35 +0000
@@ -201,8 +201,6 @@
     {
         roles[IndicatorsModelRole::Identifier] = "identifier";
         roles[IndicatorsModelRole::Position] = "position";
-        roles[IndicatorsModelRole::Title] = "title";
-        roles[IndicatorsModelRole::Description] = "description";
         roles[IndicatorsModelRole::WidgetSource] = "widgetSource";
         roles[IndicatorsModelRole::PageSource] = "pageSource";
         roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";
@@ -223,10 +221,6 @@
     {
         case IndicatorsModelRole::Position:
             return 0;
-        case IndicatorsModelRole::Title:
-            return indicator ? indicator->identifier() : "Unknown";
-        case IndicatorsModelRole::Description:
-            return "";
         case IndicatorsModelRole::WidgetSource:
             return shellAppDirectory()+"/Panel/Indicators/DefaultIndicatorWidget.qml";
         case IndicatorsModelRole::PageSource:
@@ -268,8 +262,6 @@
                 return QVariant(indicator->indicatorProperties());
             }
             break;
-        case IndicatorsModelRole::Title:
-        case IndicatorsModelRole::Description:
         case IndicatorsModelRole::WidgetSource:
         case IndicatorsModelRole::PageSource:
             return indicatorData(indicator, role);
@@ -286,7 +278,7 @@
         QVariantMap data = m_parsed_indicator_data[indicator->identifier()];
         if (data.contains(roleNames()[role])) {
             return data[roleNames()[role]];
-        };
+        }
     }
     return defaultData(indicator, role);
 }

=== modified file 'plugins/Unity/Indicators/qml/IndicatorBase.qml'
--- plugins/Unity/Indicators/qml/IndicatorBase.qml	2013-08-30 08:17:10 +0000
+++ plugins/Unity/Indicators/qml/IndicatorBase.qml	2013-10-02 16:10:35 +0000
@@ -27,13 +27,11 @@
     enabled: menuObjectPaths.hasOwnProperty(device)
 
     //const
-    property string title
     property string busName
     property string actionsObjectPath
     property var menuObjectPaths: undefined
     readonly property string device: "phone"
     property string rootMenuType: "com.canonical.indicator.root"
-    property bool active: false
 
     property string deviceMenuObjectPath: menuObjectPaths.hasOwnProperty(device) ? menuObjectPaths[device] : ""
 
@@ -41,8 +39,13 @@
 
     CachedUnityMenuModel {
         id: cachedModel
-        busName: active ? indicatorItem.busName : ""
-        actionsObjectPath: active ? indicatorItem.actionsObjectPath : ""
-        menuObjectPath: active ? indicatorItem.deviceMenuObjectPath : ""
+        busName: indicatorItem.busName
+        actionsObjectPath: indicatorItem.actionsObjectPath
+        menuObjectPath: indicatorItem.deviceMenuObjectPath
+    }
+
+    property var rootActionState: Indicators.RootActionState {
+        menu: menuModel
+        onUpdated: indicatorItem.rootActionStateChanged()
     }
 }

=== modified file 'plugins/Unity/Indicators/qml/IndicatorPage.qml'
--- plugins/Unity/Indicators/qml/IndicatorPage.qml	2013-09-26 11:00:25 +0000
+++ plugins/Unity/Indicators/qml/IndicatorPage.qml	2013-10-02 16:10:35 +0000
@@ -26,12 +26,14 @@
     id: main
 
     //const
+    property bool contentActive: false
+    property string title: rootActionState.title
     property alias emptyText: emptyLabel.text
     property alias highlightFollowsCurrentItem : mainMenu.highlightFollowsCurrentItem
 
     Indicators.UnityMenuModelStack {
         id: menuStack
-        head: main.menuModel
+        head: contentActive ? main.menuModel : null
     }
 
     ListView {
@@ -162,15 +164,15 @@
     function start()
     {
         reset()
-        if (!active) {
-            active = true;
+        if (!contentActive) {
+            contentActive = true;
         }
     }
 
     function stop()
     {
-        if (active) {
-            active = false;
+        if (contentActive) {
+            contentActive = false;
         }
     }
 

=== modified file 'plugins/Unity/Indicators/qml/IndicatorWidget.qml'
--- plugins/Unity/Indicators/qml/IndicatorWidget.qml	2013-08-15 16:04:46 +0000
+++ plugins/Unity/Indicators/qml/IndicatorWidget.qml	2013-10-02 16:10:35 +0000
@@ -23,12 +23,6 @@
 IndicatorBase {
     id: indicatorWidget
 
-    active: true
     enabled: false
     property int iconSize: height - units.gu(0.5)
-
-    property var actionState: Indicators.RootActionState {
-        menu: menuModel
-        onUpdated: indicatorWidget.actionStateChanged()
-    }
 }

=== modified file 'plugins/Unity/Indicators/rootactionstate.cpp'
--- plugins/Unity/Indicators/rootactionstate.cpp	2013-09-09 14:34:15 +0000
+++ plugins/Unity/Indicators/rootactionstate.cpp	2013-10-02 16:10:35 +0000
@@ -102,12 +102,18 @@
     Q_EMIT updated();
 }
 
-
 bool RootActionState::isValid() const
 {
     return m_menu && m_menu->rowCount() > 0;
 }
 
+QString RootActionState::title() const
+{
+    if (!isValid()) return QString();
+
+    return m_cachedState.value("title", QVariant::fromValue(QString())).toString();
+}
+
 QString RootActionState::leftLabel() const
 {
     if (!isValid()) return QString();

=== modified file 'plugins/Unity/Indicators/rootactionstate.h'
--- plugins/Unity/Indicators/rootactionstate.h	2013-09-06 14:09:56 +0000
+++ plugins/Unity/Indicators/rootactionstate.h	2013-10-02 16:10:35 +0000
@@ -32,6 +32,7 @@
     Q_PROPERTY(UnityMenuModel* menu READ menu WRITE setMenu NOTIFY menuChanged)
 
     Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)
+    Q_PROPERTY(QString title READ title NOTIFY titleChanged)
     Q_PROPERTY(QString leftLabel READ leftLabel NOTIFY leftLabelChanged)
     Q_PROPERTY(QString rightLabel READ rightLabel NOTIFY rightLabelChanged)
     Q_PROPERTY(QStringList icons READ icons NOTIFY iconsChanged)
@@ -48,6 +49,7 @@
     void setIndex(int index);
 
     bool isValid() const;
+    QString title() const;
     QString leftLabel() const;
     QString rightLabel() const;
     QStringList icons() const;
@@ -64,6 +66,7 @@
     void indexChanged();
 
     void validChanged();
+    void titleChanged();
     void leftLabelChanged();
     void rightLabelChanged();
     void iconsChanged();

=== modified file 'plugins/Unity/Indicators/visibleindicatorsmodel.cpp'
--- plugins/Unity/Indicators/visibleindicatorsmodel.cpp	2013-09-02 08:11:14 +0000
+++ plugins/Unity/Indicators/visibleindicatorsmodel.cpp	2013-10-02 16:10:35 +0000
@@ -33,8 +33,6 @@
     {
         roles[IndicatorsModelRole::Identifier] = "identifier";
         roles[IndicatorsModelRole::Position] = "position";
-        roles[IndicatorsModelRole::Title] = "title";
-        roles[IndicatorsModelRole::Description] = "description";
         roles[IndicatorsModelRole::WidgetSource] = "widgetSource";
         roles[IndicatorsModelRole::PageSource] = "pageSource";
         roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";

=== modified file 'tests/mocks/Unity/Indicators/IndicatorsModel.qml'
--- tests/mocks/Unity/Indicators/IndicatorsModel.qml	2013-09-02 08:11:14 +0000
+++ tests/mocks/Unity/Indicators/IndicatorsModel.qml	2013-10-02 16:10:35 +0000
@@ -28,45 +28,35 @@
     // which throws off the filter for non-visible indicators.
     Component.onCompleted: {
         append({    "identifier": "indicator-fake1",
-                    "priority": 0,
-                    "title": "Menu1",
-                    "description": "",
+                    "position": 0,
                     "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget1.qml",
                     "pageSource": "qrc:/tests/indciators/qml/fake_menu_page1.qml",
                     "indicatorProperties": ""
         });
 
         append({    "identifier": "indicator-fake2",
-                    "priority": 1,
-                    "title": "Menu2",
-                    "description": "",
+                    "position": 1,
                     "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget2.qml",
                     "pageSource": "qrc:/tests/indciators/qml/fake_menu_page2.qml",
                     "indicatorProperties": ""
         });
 
         append({    "identifier": "indicator-fake3",
-                    "priority": 2,
-                    "title": "Menu3",
-                    "description": "",
+                    "position": 2,
                     "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget3.qml",
                     "pageSource": "qrc:/tests/indciators/qml/fake_menu_page3.qml",
                     "indicatorProperties": ""
         });
 
         append({    "identifier": "indicator-fake4",
-                    "priority": 3,
-                    "title": "Menu4",
-                    "description": "",
+                    "position": 3,
                     "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget4.qml",
                     "pageSource": "qrc:/tests/indciators/qml/fake_menu_page4.qml",
                     "indicatorProperties": ""
         });
 
         append({    "identifier": "indicator-fake5",
-                    "priority": 4,
-                    "title": "Menu5",
-                    "description": "",
+                    "position": 4,
                     "widgetSource": "qrc:/tests/indciators/qml/fake_menu_widget5.qml",
                     "pageSource": "qrc:/tests/indciators/qml/fake_menu_page5.qml",
                     "indicatorProperties": ""

=== modified file 'tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp'
--- tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp	2013-09-24 10:20:30 +0000
+++ tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp	2013-10-02 16:10:35 +0000
@@ -65,38 +65,25 @@
     void testDataAndOrder()
     {
         // Priority order. (2, 1, 4, 3)
-        QVariantMap map;
-        QVariantMap map1; map1["title"] = "fake1";
-        QVariantMap map2; map2["title"] = "fake2";
-        QVariantMap map3; map3["title"] = "fake3";
-        map["indicator-fake1"] = map1;
-        map["indicator-fake2"] = map2;
-        map["indicator-fake3"] = map3;
-
         IndicatorsModel model;
-        model.setIndicatorData(map);
         model.load();
 
         // should be in order:
         // fake3, fake4, fake1, fake2
 
         QCOMPARE(model.data(0, IndicatorsModelRole::Identifier).toString(), QString("indicator-fake3"));
-        QCOMPARE(model.data(0, IndicatorsModelRole::Title).toString(), QString("fake3"));
         QCOMPARE(model.data(0, IndicatorsModelRole::Position).toInt(), 3);
         QCOMPARE(model.data(0, IndicatorsModelRole::IndicatorProperties).toMap()["busName"].toString(), QString("com.canonical.indicator.fake3"));
 
         QCOMPARE(model.data(1, IndicatorsModelRole::Identifier).toString(), QString("indicator-fake4"));
-        QCOMPARE(model.data(1, IndicatorsModelRole::Title).toString(), QString("indicator-fake4"));
         QCOMPARE(model.data(1, IndicatorsModelRole::Position).toInt(), 2);
         QCOMPARE(model.data(1, IndicatorsModelRole::IndicatorProperties).toMap()["busName"].toString(), QString("com.canonical.indicator.fake4"));
 
         QCOMPARE(model.data(2, IndicatorsModelRole::Identifier).toString(), QString("indicator-fake1"));
-        QCOMPARE(model.data(2, IndicatorsModelRole::Title).toString(), QString("fake1"));
         QCOMPARE(model.data(2, IndicatorsModelRole::Position).toInt(), 1);
         QCOMPARE(model.data(2, IndicatorsModelRole::IndicatorProperties).toMap()["busName"].toString(), QString("com.canonical.indicator.fake1"));
 
         QCOMPARE(model.data(3, IndicatorsModelRole::Identifier).toString(), QString("indicator-fake2"));
-        QCOMPARE(model.data(3, IndicatorsModelRole::Title).toString(), QString("fake2"));
         QCOMPARE(model.data(3, IndicatorsModelRole::Position).toInt(), 0);
         QCOMPARE(model.data(3, IndicatorsModelRole::IndicatorProperties).toMap()["busName"].toString(), QString("com.canonical.indicator.fake2"));
     }

=== modified file 'tests/qmltests/Panel/tst_IndicatorRow.qml'
--- tests/qmltests/Panel/tst_IndicatorRow.qml	2013-07-24 11:52:22 +0000
+++ tests/qmltests/Panel/tst_IndicatorRow.qml	2013-10-02 16:10:35 +0000
@@ -62,13 +62,13 @@
         function test_set_current_item() {
             init_test();
             indicatorRow.setCurrentItem(0);
-            compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).title, "Menu1", "Incorrect item at position 0");
+            compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake1", "Incorrect item at position 0");
 
             indicatorRow.setCurrentItem(1);
-            compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).title, "Menu2", "Incorrect item at position 1");
+            compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake2", "Incorrect item at position 1");
 
             indicatorRow.setCurrentItem(2);
-            compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).title, "Menu3", "Incorrect item at position 2");
+            compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake3", "Incorrect item at position 2");
         }
     }