git.iko.soy/unity8
on xenial help sign in
Merge pull request #363 from ubports/xenial_-_fix-lights
49c89dbRodney
qml/Panel/Indicators/IndicatorsLight.qml+5−7
compare with xenial
unifiedsplit
@@ -27,7 +27,7 @@ import Wizard 0.1
27
27
28import "../../.."
28import "../../.."
29
29
30−QtObject {
30+Item {
31 id: root
31 id: root
32
32
33 property bool supportsMultiColorLed: true
33 property bool supportsMultiColorLed: true
@@ -40,7 +40,7 @@ QtObject {
40
40
41 property double batteryLevel: 0
41 property double batteryLevel: 0
42 property string deviceState: ""
42 property string deviceState: ""
43− property bool hasMessages: false
43+ property alias hasMessages: _rootState.hasMessages
44
44
45 property string batteryIconName: Status.batteryIcon
45 property string batteryIconName: Status.batteryIcon
46 property string displayStatus: Powerd.status
46 property string displayStatus: Powerd.status
@@ -183,15 +183,13 @@ console.log("no support for Multicolor LED. " + indicatorState)
183 objectPath: "/com/canonical/indicator/messages"
183 objectPath: "/com/canonical/indicator/messages"
184 }
184 }
185
185
186− property var _rootState: Indicators.ActionRootState {
186+ Indicators.ActionRootState {
187+ id: _rootState
187 actionGroup: _actionGroup
188 actionGroup: _actionGroup
188 actionName: "messages"
189 actionName: "messages"
189 Component.onCompleted: actionGroup.start()
190 Component.onCompleted: actionGroup.start()
190 property bool hasMessages: (String(icons).indexOf("indicator-messages-new") != -1) && valid
191 property bool hasMessages: (String(icons).indexOf("indicator-messages-new") != -1) && valid
191− onHasMessagesChanged: {
192− root.hasMessages = hasMessages
193− updateLightState("onHasMessagesChanged")
192+ onHasMessagesChanged: updateLightState("onHasMessagesChanged")
194− }
195 }
193 }
196
194
197 // Charging state and battery level are determined by listening to dbus signals from upower.
195 // Charging state and battery level are determined by listening to dbus signals from upower.