git.iko.soy/unity8
on xenial help sign in
Added actionState parser to the indicators-client text printer so that we get the icon.
034bf6eNick Dedekind
Panel/Indicators/client/IndicatorsList.qml+2−5
compare with xenial
unifiedsplit
@@ -41,16 +41,13 @@ Page {
41 delegate: Indicators.FramedMenuItem {
41 delegate: Indicators.FramedMenuItem {
42 anchors.left: parent.left
42 anchors.left: parent.left
43 anchors.right: parent.right
43 anchors.right: parent.right
44− progression: true
45 objectName: identifier
44 objectName: identifier
46
45
47 text: title
46 text: title
48
47
49 onClicked: {
48 onClicked: {
50− if (progression) {
51− var new_page = Qt.createComponent("IndicatorsPage.qml");
49+ var new_page = Qt.createComponent("IndicatorsPage.qml");
52− page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties, "pageSource" : model.pageSource});
50+ page.pageStack.push(new_page.createObject(pages), {"indicatorProperties" : model.indicatorProperties, "pageSource" : model.pageSource});
53− }
54 }
51 }
55
52
56 Rectangle {
53 Rectangle {
Panel/Indicators/client/IndicatorsTree.qml+4
@@ -44,6 +44,10 @@ Page {
44 menuObjectPath: page.deviceMenuObjectPath
44 menuObjectPath: page.deviceMenuObjectPath
45 }
45 }
46
46
47+ Indicators.RootActionState {
48+ menu: unityModel
49+ }
50+
47 Indicators.ModelPrinter {
51 Indicators.ModelPrinter {
48 id: printer
52 id: printer
49 model: unityModel
53 model: unityModel