1
=== modified file 'plugins/Unity/Indicators/qml/IndicatorPage.qml'
2
--- plugins/Unity/Indicators/qml/IndicatorPage.qml	2013-09-30 16:37:55 +0000
3
+++ plugins/Unity/Indicators/qml/IndicatorPage.qml	2013-10-16 15:57:58 +0000
4
@@ -34,11 +34,36 @@
5
34
    Indicators.UnityMenuModelStack {
34
    Indicators.UnityMenuModelStack {
6
35
        id: menuStack
35
        id: menuStack
7
36
        head: contentActive ? main.menuModel : null
36
        head: contentActive ? main.menuModel : null
8
37
9
38
        property var rootMenu: null
10
39
11
40
        onTailChanged: {
12
41
            if (!tail) {
13
42
                rootMenu = null;
14
43
            } else if (rootMenu != tail) {
15
44
                if (tail.get(0, "type") === rootMenuType) {
16
45
                    rootMenu = menuStack.tail.submenu(0);
17
46
                    push(rootMenu, 0);
18
47
                } else {
19
48
                    rootMenu = null;
20
49
                }
21
50
            }
22
51
        }
23
52
    }
24
53
25
54
    Connections {
26
55
        target: menuStack.tail
27
56
        onRowsInserted: {
28
57
            if (menuStack.rootMenu !== menuStack.tail && menuStack.tail.get(0, "type") === rootMenuType) {
29
58
                menuStack.rootMenu = menuStack.tail.submenu(0);
30
59
                menuStack.push(menuStack.rootMenu, 0);
31
60
            }
32
61
        }
33
37
    }
62
    }
34
38
63
35
39
    ListView {
64
    ListView {
36
40
        id: mainMenu
65
        id: mainMenu
38
41
        model: menuStack.tail ? menuStack.tail : null
66
        model: menuStack.rootMenu
39
42
67
40
43
        anchors {
68
        anchors {
41
44
            fill: parent
69
            fill: parent
42
@@ -102,7 +127,7 @@
43
102
127
44
103
            Loader {
128
            Loader {
45
104
                id: loader
129
                id: loader
47
105
                asynchronous: true
130
                asynchronous: false
48
106
131
49
107
                property int modelIndex: index
132
                property int modelIndex: index
50
108
133
51
@@ -114,10 +139,6 @@
52
114
                sourceComponent: factory.load(model)
139
                sourceComponent: factory.load(model)
53
115
140
54
116
                onLoaded: {
141
                onLoaded: {
55
117
                    if (model.type === rootMenuType) {
56
118
                        menuStack.push(mainMenu.model.submenu(index));
57
119
                    }
58
120
59
121
                    if (item.hasOwnProperty("menuSelected")) {
142
                    if (item.hasOwnProperty("menuSelected")) {
60
122
                        item.menuSelected = Qt.binding(function() { return mainMenu.selectedIndex == index; });
143
                        item.menuSelected = Qt.binding(function() { return mainMenu.selectedIndex == index; });
61
123
                        item.selectMenu.connect(function() { mainMenu.selectedIndex = index; });
144
                        item.selectMenu.connect(function() { mainMenu.selectedIndex = index; });
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-11-01
Michael Zanetti (community)		2013-10-16	Approve on 2013-10-21
Review via email: mp+191447@code.launchpad.net