git.iko.soy/unity8
on xenial help sign in
Fix up indicators-client after refactoring (LP: #1672797)
84ad8d9Pete Woods
qml/Panel/Indicators/client/IndicatorRepresentation.qml+18−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,23 @@ 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 {
81− identifier: model.identifier
88+ indicator: model.identifier
89+ rootModel: delegate.menuModel
90+ }
91+
92+ IndicatorDelegate {
93+ id: delegate
82− busName: indicatorProperties.busName
94+ busName: indicatorProperties.busName
83− actionsObjectPath: indicatorProperties.actionsObjectPath
95+ actionsObjectPath: indicatorProperties.actionsObjectPath
84− menuObjectPath: indicatorProperties.menuObjectPath
96+ menuObjectPath: indicatorProperties.menuObjectPath
97+ }
85 }
98 }
86 }
99 }
87 Component {
100 Component {