git.iko.soy/unity8
on xenial help sign in
Fix up indicators-client after refactoring
47a2527Pete Woods
qml/Panel/Indicators/client/IndicatorRepresentation.qml+24−5
compare with xenial
unifiedsplit
@@ -20,6 +20,7 @@
20
20
21import QtQuick 2.4
21import QtQuick 2.4
22import Ubuntu.Components 1.3
22import Ubuntu.Components 1.3
23+import ".."
23import "../.."
24import "../.."
24
25
25Page {
26Page {
@@ -77,11 +78,29 @@ Page {
77
78
78 Component {
79 Component {
79 id: page
80 id: page
80− IndicatorPage {
81+ PanelMenuPage {
82+ objectName: model.identifier + "-page"
83+ submenuIndex: 0
84+
85+ menuModel: delegate.menuModel
86+
87+ factory: IndicatorMenuItemFactory {
88+ indicator: {
81− identifier: model.identifier
89+ var context = model.identifier;
90+ if (context && context.indexOf("fake-") === 0) {
91+ context = context.substring("fake-".length)
92+ }
93+ return context;
94+ }
95+ rootModel: delegate.menuModel
96+ }
97+
98+ IndicatorDelegate {
99+ id: delegate
82− busName: indicatorProperties.busName
100+ busName: indicatorProperties.busName
83− actionsObjectPath: indicatorProperties.actionsObjectPath
101+ actionsObjectPath: indicatorProperties.actionsObjectPath
84− menuObjectPath: indicatorProperties.menuObjectPath
102+ menuObjectPath: indicatorProperties.menuObjectPath
103+ }
85 }
104 }
86 }
105 }
87 Component {
106 Component {