git.iko.soy/unity8
on xenial help sign in
updated for changes to ListItem.Empty
aa4043dNick Dedekind
qml/Panel/Indicators/MenuItemFactory.qml+17−1
compare with xenial
unifiedsplit
@@ -107,6 +107,7 @@ Item {
107 return maximum;
107 return maximum;
108 }
108 }
109 enabled: menuData && menuData.sensitive || false
109 enabled: menuData && menuData.sensitive || false
110+ highlightWhenPressed: false
110
111
111 onMenuModelChanged: {
112 onMenuModelChanged: {
112 loadAttributes();
113 loadAttributes();
@@ -146,6 +147,7 @@ Item {
146
147
147 buttonText: menuData && menuData.label || ""
148 buttonText: menuData && menuData.label || ""
148 enabled: menuData && menuData.sensitive || false
149 enabled: menuData && menuData.sensitive || false
150+ highlightWhenPressed: false
149
151
150 onTriggered: {
152 onTriggered: {
151 menuModel.activate(menuIndex);
153 menuModel.activate(menuIndex);
@@ -207,6 +209,7 @@ Item {
207 iconSource: menuData && menuData.icon || ""
209 iconSource: menuData && menuData.icon || ""
208 value : menuData && menuData.actionState || 0.0
210 value : menuData && menuData.actionState || 0.0
209 enabled: menuData && menuData.sensitive || false
211 enabled: menuData && menuData.sensitive || false
212+ highlightWhenPressed: false
210 }
213 }
211 }
214 }
212
215
@@ -221,6 +224,7 @@ Item {
221 text: menuData && menuData.label || ""
224 text: menuData && menuData.label || ""
222 iconSource: menuData && menuData.icon || ""
225 iconSource: menuData && menuData.icon || ""
223 enabled: menuData && menuData.sensitive || false
226 enabled: menuData && menuData.sensitive || false
227+ highlightWhenPressed: false
224
228
225 onTriggered: {
229 onTriggered: {
226 menuModel.activate(menuIndex);
230 menuModel.activate(menuIndex);
@@ -228,7 +232,7 @@ Item {
228
232
229 // FIXME : At the moment, the indicators aren't using
233 // FIXME : At the moment, the indicators aren't using
230 // com.canonical.indicators.link for settings menu. Need to fudge it.
234 // com.canonical.indicators.link for settings menu. Need to fudge it.
231− property bool settingsMenu: menuData.action.indexOf("settings") > -1
235+ property bool settingsMenu: menuData && menuData.action.indexOf("settings") > -1 || false
232 backColor: settingsMenu ? Qt.rgba(1,1,1,0.07) : "transparent"
236 backColor: settingsMenu ? Qt.rgba(1,1,1,0.07) : "transparent"
233 component: settingsMenu ? buttonForSettings : undefined
237 component: settingsMenu ? buttonForSettings : undefined
234 Component {
238 Component {
@@ -254,6 +258,7 @@ Item {
254 text: menuData && menuData.label || ""
258 text: menuData && menuData.label || ""
255 iconSource: menuData && menuData.icon || ""
259 iconSource: menuData && menuData.icon || ""
256 enabled: menuData && menuData.sensitive || false
260 enabled: menuData && menuData.sensitive || false
261+ highlightWhenPressed: false
257
262
258 onTriggered: {
263 onTriggered: {
259 menuModel.activate(menuIndex);
264 menuModel.activate(menuIndex);
@@ -285,6 +290,7 @@ Item {
285 text: menuData && menuData.label || ""
290 text: menuData && menuData.label || ""
286 enabled: menuData && menuData.sensitive || false
291 enabled: menuData && menuData.sensitive || false
287 checked: menuData && menuData.isToggled || false
292 checked: menuData && menuData.isToggled || false
293+ highlightWhenPressed: false
288
294
289 onTriggered: {
295 onTriggered: {
290 menuModel.activate(menuIndex);
296 menuModel.activate(menuIndex);
@@ -304,6 +310,7 @@ Item {
304 iconSource: menuData && menuData.icon || ""
310 iconSource: menuData && menuData.icon || ""
305 enabled: menuData && menuData.sensitive || false
311 enabled: menuData && menuData.sensitive || false
306 checked: menuData && menuData.isToggled || false
312 checked: menuData && menuData.isToggled || false
313+ highlightWhenPressed: false
307
314
308 onTriggered: {
315 onTriggered: {
309 menuModel.activate(menuIndex);
316 menuModel.activate(menuIndex);
@@ -330,6 +337,7 @@ Item {
330 iconSource: menuData && menuData.icon || "image://theme/alarm-clock"
337 iconSource: menuData && menuData.icon || "image://theme/alarm-clock"
331 time: timeFormatter.timeString
338 time: timeFormatter.timeString
332 enabled: menuData && menuData.sensitive || false
339 enabled: menuData && menuData.sensitive || false
340+ highlightWhenPressed: false
333
341
334 onMenuModelChanged: {
342 onMenuModelChanged: {
335 loadAttributes();
343 loadAttributes();
@@ -369,6 +377,7 @@ Item {
369 time: timeFormatter.timeString
377 time: timeFormatter.timeString
370 eventColor: getExtendedProperty(extendedData, "xCanonicalColor", Qt.rgba(0.0, 0.0, 0.0, 0.0))
378 eventColor: getExtendedProperty(extendedData, "xCanonicalColor", Qt.rgba(0.0, 0.0, 0.0, 0.0))
371 enabled: menuData && menuData.sensitive || false
379 enabled: menuData && menuData.sensitive || false
380+ highlightWhenPressed: false
372
381
373 onMenuModelChanged: {
382 onMenuModelChanged: {
374 loadAttributes();
383 loadAttributes();
@@ -438,6 +447,7 @@ Item {
438 secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
447 secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
439 adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
448 adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
440 signalStrength: strengthAction.valid ? strengthAction.state : 0
449 signalStrength: strengthAction.valid ? strengthAction.state : 0
450+ highlightWhenPressed: false
441
451
442 onMenuModelChanged: {
452 onMenuModelChanged: {
443 loadAttributes();
453 loadAttributes();
@@ -466,6 +476,7 @@ Item {
466 property var menuModel: menuFactory.menuModel
476 property var menuModel: menuFactory.menuModel
467 property int menuIndex: -1
477 property int menuIndex: -1
468 property var extendedData: menuData && menuData.ext || undefined
478 property var extendedData: menuData && menuData.ext || undefined
479+ highlightWhenPressed: false
469
480
470 property var statusLabelAction: UnityMenuAction {
481 property var statusLabelAction: UnityMenuAction {
471 model: menuModel
482 model: menuModel
@@ -554,6 +565,7 @@ Item {
554 iconSource: getExtendedProperty(extendedData, "icon", "image://theme/message")
565 iconSource: getExtendedProperty(extendedData, "icon", "image://theme/message")
555 count: menuData && menuData.actionState.length > 0 ? menuData.actionState[0] : "0"
566 count: menuData && menuData.actionState.length > 0 ? menuData.actionState[0] : "0"
556 enabled: menuData && menuData.sensitive || false
567 enabled: menuData && menuData.sensitive || false
568+ highlightWhenPressed: false
557 removable: true
569 removable: true
558
570
559 onMenuModelChanged: {
571 onMenuModelChanged: {
@@ -596,6 +608,7 @@ Item {
596 running: getExtendedProperty(actionState, "running", false)
608 running: getExtendedProperty(actionState, "running", false)
597 state: getExtendedProperty(actionState, "state", "")
609 state: getExtendedProperty(actionState, "state", "")
598 enabled: menuData && menuData.sensitive || false
610 enabled: menuData && menuData.sensitive || false
611+ highlightWhenPressed: false
599 showDivider: false
612 showDivider: false
600
613
601 onTriggered: {
614 onTriggered: {
@@ -635,6 +648,7 @@ Item {
635 canGoNext: nextAction.valid
648 canGoNext: nextAction.valid
636 canGoPrevious: previousAction.valid
649 canGoPrevious: previousAction.valid
637 enabled: menuData && menuData.sensitive || false
650 enabled: menuData && menuData.sensitive || false
651+ highlightWhenPressed: false
638
652
639 onPlay: {
653 onPlay: {
640 playAction.activate();
654 playAction.activate();
@@ -677,6 +691,7 @@ Item {
677 iconSource: menuData && menuData.icon || "image://theme/transfer-none"
691 iconSource: menuData && menuData.icon || "image://theme/transfer-none"
678 maximum: 1.0
692 maximum: 1.0
679 enabled: menuData && menuData.sensitive || false
693 enabled: menuData && menuData.sensitive || false
694+ highlightWhenPressed: false
680 removable: true
695 removable: true
681 confirmRemoval: true
696 confirmRemoval: true
682
697
@@ -781,6 +796,7 @@ Item {
781
796
782 iconSource: menuData && menuData.icon || ""
797 iconSource: menuData && menuData.icon || ""
783 enabled: menuData && menuData.sensitive || false
798 enabled: menuData && menuData.sensitive || false
799+ highlightWhenPressed: false
784 text: menuData && menuData.label || ""
800 text: menuData && menuData.label || ""
785 foregroundColor: Theme.palette.normal.backgroundText
801 foregroundColor: Theme.palette.normal.backgroundText
786
802