@@ -20,6 +20,7 @@
2020
2121import QtQuick 2.4
2222import Ubuntu.Components 1.3
23+import ".."
2324import "../.."
2425
2526Page {
@@ -77,11 +78,23 @@ Page {
7778
7879 Component {
7980 id: page
80− IndicatorPage {
81− identifier: model.identifier
82− busName: indicatorProperties.busName
83− actionsObjectPath: indicatorProperties.actionsObjectPath
84− menuObjectPath: indicatorProperties.menuObjectPath
81+ PanelMenuPage {
82+ objectName: model.identifier + "-page"
83+ submenuIndex: 0
84+
85+ menuModel: delegate.menuModel
86+
87+ factory: IndicatorMenuItemFactory {
88+ indicator: model.identifier
89+ rootModel: delegate.menuModel
90+ }
91+
92+ IndicatorDelegate {
93+ id: delegate
94+ busName: indicatorProperties.busName
95+ actionsObjectPath: indicatorProperties.actionsObjectPath
96+ menuObjectPath: indicatorProperties.menuObjectPath
97+ }
8598 }
8699 }
87100 Component {