git.iko.soy/unity8
on xenial help sign in
Changed menuIndex to int
cfc2288Nick Dedekind
plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml+1−1
compare with xenial
unifiedsplit
@@ -27,7 +27,7 @@ Indicators.BaseMenuItem {
27 id: messageFactoryItem
27 id: messageFactoryItem
28 property var menuModel: null
28 property var menuModel: null
29 property QtObject menuData: null
29 property QtObject menuData: null
30− property var menuIndex: undefined
30+ property int menuIndex: -1
31
31
32 property var extendedData: menuData && menuData.ext || undefined
32 property var extendedData: menuData && menuData.ext || undefined
33 property var actionsDescription: getExtendedProperty(extendedData, "xCanonicalMessageActions", undefined)
33 property var actionsDescription: getExtendedProperty(extendedData, "xCanonicalMessageActions", undefined)
plugins/Unity/Indicators/qml/MenuItemFactory.qml+8−8
@@ -64,7 +64,7 @@ Item {
64 Indicators.SliderMenuItem {
64 Indicators.SliderMenuItem {
65 property QtObject menuData: null
65 property QtObject menuData: null
66 property var menuModel: menuFactory.menuModel
66 property var menuModel: menuFactory.menuModel
67− property var menuIndex: undefined
67+ property int menuIndex: -1
68 property var extendedData: menuData && menuData.ext || undefined
68 property var extendedData: menuData && menuData.ext || undefined
69
69
70 text: menuData && menuData.label || ""
70 text: menuData && menuData.label || ""
@@ -108,7 +108,7 @@ Item {
108 Indicators.ButtonMenuItem {
108 Indicators.ButtonMenuItem {
109 property QtObject menuData: null
109 property QtObject menuData: null
110 property var menuModel: menuFactory.menuModel
110 property var menuModel: menuFactory.menuModel
111− property var menuIndex: undefined
111+ property int menuIndex: -1
112
112
113 text: menuData && menuData.label || ""
113 text: menuData && menuData.label || ""
114 enabled: menuData && menuData.sensitive || false
114 enabled: menuData && menuData.sensitive || false
@@ -133,7 +133,7 @@ Item {
133 id: progressMenu;
133 id: progressMenu;
134 Indicators.ProgressMenuItem {
134 Indicators.ProgressMenuItem {
135 property QtObject menuData: null
135 property QtObject menuData: null
136− property var menuIndex: undefined
136+ property int menuIndex: -1
137
137
138 text: menuData && menuData.label || ""
138 text: menuData && menuData.label || ""
139 iconSource: menuData && menuData.icon || ""
139 iconSource: menuData && menuData.icon || ""
@@ -146,7 +146,7 @@ Item {
146 id: standardMenu;
146 id: standardMenu;
147 Indicators.StandardMenuItem {
147 Indicators.StandardMenuItem {
148 property QtObject menuData: null
148 property QtObject menuData: null
149− property var menuIndex: undefined
149+ property int menuIndex: -1
150
150
151 text: menuData && menuData.label || ""
151 text: menuData && menuData.label || ""
152 iconSource: menuData && menuData.icon || ""
152 iconSource: menuData && menuData.icon || ""
@@ -165,7 +165,7 @@ Item {
165 id: switchMenu;
165 id: switchMenu;
166 Indicators.SwitchMenuItem {
166 Indicators.SwitchMenuItem {
167 property QtObject menuData: null
167 property QtObject menuData: null
168− property var menuIndex: undefined
168+ property int menuIndex: -1
169
169
170 text: menuData && menuData.label || ""
170 text: menuData && menuData.label || ""
171 iconSource: menuData && menuData.icon || ""
171 iconSource: menuData && menuData.icon || ""
@@ -184,7 +184,7 @@ Item {
184 Indicators.SectionMenuItem {
184 Indicators.SectionMenuItem {
185 property QtObject menuData: null
185 property QtObject menuData: null
186 property var menuModel: menuFactory.menuModel
186 property var menuModel: menuFactory.menuModel
187− property var menuIndex: undefined
187+ property int menuIndex: -1
188 property var extendedData: menuData && menuData.ext || undefined
188 property var extendedData: menuData && menuData.ext || undefined
189
189
190 text: menuData && menuData.label || ""
190 text: menuData && menuData.label || ""
@@ -209,7 +209,7 @@ Item {
209 ICNetwork.AccessPoint {
209 ICNetwork.AccessPoint {
210 property QtObject menuData: null
210 property QtObject menuData: null
211 property var menuModel: menuFactory.menuModel
211 property var menuModel: menuFactory.menuModel
212− property var menuIndex: undefined
212+ property int menuIndex: -1
213 property var extendedData: menuData && menuData.ext || undefined
213 property var extendedData: menuData && menuData.ext || undefined
214
214
215 property var strengthAction: QMenuModel.UnityMenuAction {
215 property var strengthAction: QMenuModel.UnityMenuAction {
@@ -257,7 +257,7 @@ Item {
257 ICMessaging.GroupedMessage {
257 ICMessaging.GroupedMessage {
258 property QtObject menuData: null
258 property QtObject menuData: null
259 property var menuModel: menuFactory.menuModel
259 property var menuModel: menuFactory.menuModel
260− property var menuIndex: undefined
260+ property int menuIndex: -1
261 property var extendedData: menuData && menuData.ext || undefined
261 property var extendedData: menuData && menuData.ext || undefined
262
262
263 title: menuData && menuData.label || ""
263 title: menuData && menuData.label || ""