@@ -26,10 +26,8 @@ Rectangle {
2626 id: content
2727
2828 property QtObject indicatorsModel: null
29− property bool __contentActive: false
3029 readonly property alias currentMenuIndex: listViewHeader.currentIndex
3130 color: "#221e1c" // FIXME not in palette yet
32− property int contentReleaseInterval: 20000
3331 property real headerHeight: listViewHeader.height
3432
3533 width: units.gu(40)
@@ -39,17 +37,6 @@ Rectangle {
3937 listViewHeader.currentIndex = index;
4038 }
4139
42− function activateContent() {
43− contentReleaseTimer.stop();
44− __contentActive = true;
45− }
46−
47− function releaseContent() {
48− if (__contentActive) {
49− contentReleaseTimer.restart();
50− }
51− }
52−
5340 ListView {
5441 id: listViewHeader
5542 objectName: "indicatorsHeaderListView"
@@ -117,17 +104,6 @@ Rectangle {
117104 source: pageSource
118105 asynchronous: true
119106
120− readonly property bool indexActive: index >= 0 && index < menuActivator.count && menuActivator.content[index].active
121− readonly property bool contentActive: content.__contentActive && indexActive
122−
123− onContentActiveChanged: {
124− if (contentActive && item) {
125− item.start()
126− } else if (!contentActive && item) {
127− item.stop()
128− }
129− }
130−
131107 onVisibleChanged: {
132108 // Reset the indicator states
133109 if (!visible && item && item["reset"]) {
@@ -141,9 +117,6 @@ Rectangle {
141117 item[pName] = indicatorProperties[pName]
142118 }
143119 }
144− if (contentActive && listViewContent.visible) {
145− item.start()
146− }
147120 }
148121
149122 Binding {
@@ -153,21 +126,4 @@ Rectangle {
153126 }
154127 }
155128 }
156−
157− Timer {
158− id: contentReleaseTimer
159−
160− interval: contentReleaseInterval
161− onTriggered: {
162− content.__contentActive = false;
163− menuActivator.clear();
164− }
165− }
166−
167− Indicators.MenuContentActivator {
168− id: menuActivator
169− running: content.__contentActive
170− baseIndex: content.currentMenuIndex
171− count: indicatorsModel.count
172− }
173129}