git.iko.soy/unity8
on xenial help sign in
renamed extAttrib to extendedData
4dfc20fNick Dedekind
plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml+14−14
compare with xenial
unifiedsplit
@@ -29,8 +29,8 @@ Indicators.BaseMenuItem {
29 property QtObject menuData: null
29 property QtObject menuData: null
30 property var menuIndex: undefined
30 property var menuIndex: undefined
31
31
32− property var extAttrib: menuData && menuData.ext ? menuData.ext : undefined
32+ property var extendedData: menuData && menuData.ext ? menuData.ext : undefined
33− property var actionsDescription: extAttrib && extAttrib.hasOwnProperty("xCanonicalMessageActions") ? extAttrib.xCanonicalMessageActions : undefined
33+ property var actionsDescription: extendedData && extendedData.hasOwnProperty("xCanonicalMessageActions") ? extendedData.xCanonicalMessageActions : undefined
34
34
35 onMenuModelChanged: {
35 onMenuModelChanged: {
36 loadAttributes();
36 loadAttributes();
@@ -62,11 +62,11 @@ Indicators.BaseMenuItem {
62 SimpleTextMessage {
62 SimpleTextMessage {
63 // text
63 // text
64 title: menuData && menuData.label ? menuData.label : ""
64 title: menuData && menuData.label ? menuData.label : ""
65− time: extAttrib && extAttrib.hasOwnProperty("xCanonicalTime") ? extAttrib.xCanonicalTime : 0
65+ time: extendedData && extendedData.hasOwnProperty("xCanonicalTime") ? extendedData.xCanonicalTime : 0
66− message: extAttrib && extAttrib.hasOwnProperty("xCanonicalText") ? extAttrib.xCanonicalText : ""
66+ message: extendedData && extendedData.hasOwnProperty("xCanonicalText") ? extendedData.xCanonicalText : ""
67 // icons
67 // icons
68− avatar: extAttrib && extAttrib.hasOwnProperty("icon") ? extAttrib.icon : "qrc:/indicators/artwork/messaging/default_contact.png"
68+ avatar: extendedData && extendedData.hasOwnProperty("icon") ? extendedData.icon : "qrc:/indicators/artwork/messaging/default_contact.png"
69− appIcon: extAttrib && extAttrib.hasOwnProperty("xCanonicalAppIcon") ? extAttrib.xCanonicalAppIcon : "qrc:/indicators/artwork/messaging/default_app.svg"
69+ appIcon: extendedData && extendedData.hasOwnProperty("xCanonicalAppIcon") ? extendedData.xCanonicalAppIcon : "qrc:/indicators/artwork/messaging/default_app.svg"
70
70
71 onActivateApp: {
71 onActivateApp: {
72 menuModel.activate(menuIndex, true);
72 menuModel.activate(menuIndex, true);
@@ -94,12 +94,12 @@ Indicators.BaseMenuItem {
94
94
95 // text
95 // text
96 title: menuData && menuData.label ? menuData.label : ""
96 title: menuData && menuData.label ? menuData.label : ""
97− time: extAttrib && extAttrib.hasOwnProperty("xCanonicalTime") ? extAttrib.xCanonicalTime : 0
97+ time: extendedData && extendedData.hasOwnProperty("xCanonicalTime") ? extendedData.xCanonicalTime : 0
98− message: extAttrib && extAttrib.hasOwnProperty("xCanonicalText") ? extAttrib.xCanonicalText : ""
98+ message: extendedData && extendedData.hasOwnProperty("xCanonicalText") ? extendedData.xCanonicalText : ""
99 replyButtonText: replyActionDescription !== undefined && replyActionDescription.hasOwnProperty("label") ? replyActionDescription.label : "Send"
99 replyButtonText: replyActionDescription !== undefined && replyActionDescription.hasOwnProperty("label") ? replyActionDescription.label : "Send"
100 // icons
100 // icons
101− avatar: extAttrib && extAttrib.hasOwnProperty("icon") ? extAttrib.icon : "qrc:/indicators/artwork/messaging/default_contact.png"
101+ avatar: extendedData && extendedData.hasOwnProperty("icon") ? extendedData.icon : "qrc:/indicators/artwork/messaging/default_contact.png"
102− appIcon: extAttrib && extAttrib.hasOwnProperty("xCanonicalAppIcon") ? extAttrib.xCanonicalAppIcon : "qrc:/indicators/artwork/messaging/default_app.svg"
102+ appIcon: extendedData && extendedData.hasOwnProperty("xCanonicalAppIcon") ? extendedData.xCanonicalAppIcon : "qrc:/indicators/artwork/messaging/default_app.svg"
103 // actions
103 // actions
104 replyEnabled: replyAction.valid && replyAction.enabled
104 replyEnabled: replyAction.valid && replyAction.enabled
105
105
@@ -138,14 +138,14 @@ Indicators.BaseMenuItem {
138
138
139 // text
139 // text
140 title: menuData && menuData.label ? menuData.label : ""
140 title: menuData && menuData.label ? menuData.label : ""
141− time: extAttrib && extAttrib.hasOwnProperty("xCanonicalTime") ? extAttrib.xCanonicalTime : ""
141+ time: extendedData && extendedData.hasOwnProperty("xCanonicalTime") ? extendedData.xCanonicalTime : ""
142− message: extAttrib && extAttrib.hasOwnProperty("xCanonicalText") ? extAttrib.xCanonicalText : ""
142+ message: extendedData && extendedData.hasOwnProperty("xCanonicalText") ? extendedData.xCanonicalText : ""
143 actionButtonText: activateActionDescription !== undefined && activateActionDescription.hasOwnProperty("label") ? activateActionDescription.label : "Call back"
143 actionButtonText: activateActionDescription !== undefined && activateActionDescription.hasOwnProperty("label") ? activateActionDescription.label : "Call back"
144 replyButtonText: replyActionDescription !== undefined && replyActionDescription.hasOwnProperty("label") ? replyActionDescription.label : "Send"
144 replyButtonText: replyActionDescription !== undefined && replyActionDescription.hasOwnProperty("label") ? replyActionDescription.label : "Send"
145 replyMessages: replyActionDescription !== undefined && replyActionDescription.hasOwnProperty("parameter-hint") ? replyActionDescription["parameter-hint"] : ""
145 replyMessages: replyActionDescription !== undefined && replyActionDescription.hasOwnProperty("parameter-hint") ? replyActionDescription["parameter-hint"] : ""
146 // icons
146 // icons
147− avatar: extAttrib && extAttrib.hasOwnProperty("icon") ? extAttrib.icon : "qrc:/indicators/artwork/messaging/default_contact.png"
147+ avatar: extendedData && extendedData.hasOwnProperty("icon") ? extendedData.icon : "qrc:/indicators/artwork/messaging/default_contact.png"
148− appIcon: extAttrib && extAttrib.hasOwnProperty("xCanonicalAppIcon") ? extAttrib.xCanonicalAppIcon : "qrc:/indicators/artwork/messaging/default_app.svg"
148+ appIcon: extendedData && extendedData.hasOwnProperty("xCanonicalAppIcon") ? extendedData.xCanonicalAppIcon : "qrc:/indicators/artwork/messaging/default_app.svg"
149 // actions
149 // actions
150 activateEnabled: activateAction.valid && activateAction.enabled
150 activateEnabled: activateAction.valid && activateAction.enabled
151 replyEnabled: replyAction.valid && replyAction.enabled
151 replyEnabled: replyAction.valid && replyAction.enabled
plugins/Unity/Indicators/qml/MenuItemFactory.qml+13−13
@@ -58,16 +58,16 @@ Item {
58 property QtObject menuData: null
58 property QtObject menuData: null
59 property var menuModel: menuFactory.menuModel
59 property var menuModel: menuFactory.menuModel
60 property var menuIndex: undefined
60 property var menuIndex: undefined
61− property var extAttrib: menuData && menuData.ext ? menuData.ext : undefined
61+ property var extendedData: menuData && menuData.ext ? menuData.ext : undefined
62
62
63 text: menuData && menuData.label ? menuData.label : ""
63 text: menuData && menuData.label ? menuData.label : ""
64 icon: menuData && menuData.icon ? menuData.icon : ""
64 icon: menuData && menuData.icon ? menuData.icon : ""
65− minIcon: extAttrib && extAttrib.hasOwnProperty("minIcon") ? extAttrib.minIcon : ""
65+ minIcon: extendedData && extendedData.hasOwnProperty("minIcon") ? extendedData.minIcon : ""
66− maxIcon: extAttrib && extAttrib.hasOwnProperty("maxIcon") ? extAttrib.maxIcon : ""
66+ maxIcon: extendedData && extendedData.hasOwnProperty("maxIcon") ? extendedData.maxIcon : ""
67
67
68− minimumValue: extAttrib && extAttrib.hasOwnProperty("minValue") ? extAttrib.minValue : 0.0
68+ minimumValue: extendedData && extendedData.hasOwnProperty("minValue") ? extendedData.minValue : 0.0
69 maximumValue: {
69 maximumValue: {
70− var maximum = extAttrib && extAttrib.hasOwnProperty("maxValue") ? extAttrib.maxValue : 1.0
70+ var maximum = extendedData && extendedData.hasOwnProperty("maxValue") ? extendedData.maxValue : 1.0
71 if (maximum <= minimumValue) {
71 if (maximum <= minimumValue) {
72 return minimumValue + 1;
72 return minimumValue + 1;
73 }
73 }
@@ -178,10 +178,10 @@ Item {
178 property QtObject menuData: null
178 property QtObject menuData: null
179 property var menuModel: menuFactory.menuModel
179 property var menuModel: menuFactory.menuModel
180 property var menuIndex: undefined
180 property var menuIndex: undefined
181− property var extAttrib: menuData && menuData.ext ? menuData.ext : undefined
181+ property var extendedData: menuData && menuData.ext ? menuData.ext : undefined
182
182
183 text: menuData && menuData.label ? menuData.label : ""
183 text: menuData && menuData.label ? menuData.label : ""
184− busy: extAttrib && extAttrib.hasOwnProperty("xCanonicalBusyAction") ? extAttrib.xCanonicalBusyAction : false
184+ busy: extendedData && extendedData.hasOwnProperty("xCanonicalBusyAction") ? extendedData.xCanonicalBusyAction : false
185
185
186 onMenuModelChanged: {
186 onMenuModelChanged: {
187 loadAttributes();
187 loadAttributes();
@@ -203,17 +203,17 @@ Item {
203 property QtObject menuData: null
203 property QtObject menuData: null
204 property var menuModel: menuFactory.menuModel
204 property var menuModel: menuFactory.menuModel
205 property var menuIndex: undefined
205 property var menuIndex: undefined
206− property var extAttrib: menuData && menuData.ext ? menuData.ext : undefined
206+ property var extendedData: menuData && menuData.ext ? menuData.ext : undefined
207
207
208 property var strengthAction: QMenuModel.UnityMenuAction {
208 property var strengthAction: QMenuModel.UnityMenuAction {
209 model: menuModel
209 model: menuModel
210 index: menuIndex
210 index: menuIndex
211− name: extAttrib && extAttrib.hasOwnProperty("xCanonicalWifiApStrengthAction") ? extAttrib.xCanonicalWifiApStrengthAction : ""
211+ name: extendedData && extendedData.hasOwnProperty("xCanonicalWifiApStrengthAction") ? extendedData.xCanonicalWifiApStrengthAction : ""
212 }
212 }
213
213
214 text: menuData && menuData.label ? menuData.label : ""
214 text: menuData && menuData.label ? menuData.label : ""
215− secure: extAttrib && extAttrib.hasOwnProperty("xCanonicalWifiApIsSecure") ? extAttrib.xCanonicalWifiApIsSecure : false
215+ secure: extendedData && extendedData.hasOwnProperty("xCanonicalWifiApIsSecure") ? extendedData.xCanonicalWifiApIsSecure : false
216− adHoc: extAttrib && extAttrib.hasOwnProperty("xCanonicalWifiApIsAdhoc") ? extAttrib.xCanonicalWifiApIsAdhoc : false
216+ adHoc: extendedData && extendedData.hasOwnProperty("xCanonicalWifiApIsAdhoc") ? extendedData.xCanonicalWifiApIsAdhoc : false
217 checked: menuData ? menuData.isToggled : false
217 checked: menuData ? menuData.isToggled : false
218 signalStrength: strengthAction.valid ? strengthAction.state : 0
218 signalStrength: strengthAction.valid ? strengthAction.state : 0
219 enabled: menuData ? menuData.sensitive : false
219 enabled: menuData ? menuData.sensitive : false
@@ -251,11 +251,11 @@ Item {
251 property QtObject menuData: null
251 property QtObject menuData: null
252 property var menuModel: menuFactory.menuModel
252 property var menuModel: menuFactory.menuModel
253 property var menuIndex: undefined
253 property var menuIndex: undefined
254− property var extAttrib: menuData && menuData.ext ? menuData.ext : undefined
254+ property var extendedData: menuData && menuData.ext ? menuData.ext : undefined
255
255
256 title: menuData && menuData.label ? menuData.label : ""
256 title: menuData && menuData.label ? menuData.label : ""
257 count: menuData && menuData.actionState.length > 0 ? menuData.actionState[0] : "0"
257 count: menuData && menuData.actionState.length > 0 ? menuData.actionState[0] : "0"
258− appIcon: extAttrib && extAttrib.hasOwnProperty("icon") ? extAttrib.icon : "qrc:/indicators/artwork/messaging/default_app.svg"
258+ appIcon: extendedData && extendedData.hasOwnProperty("icon") ? extendedData.icon : "qrc:/indicators/artwork/messaging/default_app.svg"
259
259
260 onMenuModelChanged: {
260 onMenuModelChanged: {
261 loadAttributes();
261 loadAttributes();