git.iko.soy/unity8
on xenial help sign in
fixed up messaging icons
671adbfNick Dedekind
plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml+6−6
compare with xenial
unifiedsplit
@@ -68,8 +68,8 @@ Indicators.BaseMenuItem {
68 time: menu ? Utils.formatDate(menu.ext.xCanonicalTime) : ""
68 time: menu ? Utils.formatDate(menu.ext.xCanonicalTime) : ""
69 message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""
69 message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""
70 // icons
70 // icons
71− avatar: menu && menu.ext.xCanonicalIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalIcon) : "qrc:/indicators/artwork/messaging/default_contact.png"
71+ avatar: menu && menu.ext.icon !== undefined ? menu.ext.icon : "qrc:/indicators/artwork/messaging/default_contact.png"
72− appIcon: menu && menu.ext.xCanonicalAppIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalAppIcon) : ""
72+ appIcon: menu && menu.ext.xCanonicalAppIcon !== undefined ? menu.ext.xCanonicalAppIcon : "qrc:/indicators/artwork/messaging/default_app.svg"
73
73
74 onActivateApp: {
74 onActivateApp: {
75 menuItem.model.activate(modelIndex, true);
75 menuItem.model.activate(modelIndex, true);
@@ -94,8 +94,8 @@ Indicators.BaseMenuItem {
94 message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""
94 message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""
95 replyButtonText: actionsDescription && actionsDescription[0].label ? actionsDescription[0].label : "Send"
95 replyButtonText: actionsDescription && actionsDescription[0].label ? actionsDescription[0].label : "Send"
96 // icons
96 // icons
97− avatar: menu && menu.ext.xCanonicalIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalIcon) : "qrc:/indicators/artwork/messaging/default_contact.png"
97+ avatar: menu && menu.ext.icon !== undefined ? menu.ext.icon : "qrc:/indicators/artwork/messaging/default_contact.png"
98− appIcon: menu && menu.ext.xCanonicalAppIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalAppIcon) : ""
98+ appIcon: menu && menu.ext.xCanonicalAppIcon !== undefined ? menu.ext.xCanonicalAppIcon : "qrc:/indicators/artwork/messaging/default_app.svg"
99 // actions
99 // actions
100 replyEnabled: replyAction.valid && replyAction.enabled
100 replyEnabled: replyAction.valid && replyAction.enabled
101
101
@@ -132,8 +132,8 @@ Indicators.BaseMenuItem {
132 replyButtonText: actionsDescription && actionsDescription[1].label ? actionsDescription[1].label : "Send"
132 replyButtonText: actionsDescription && actionsDescription[1].label ? actionsDescription[1].label : "Send"
133 replyMessages: actionsDescription && actionsDescription[1]["parameter-hint"] ? actionsDescription[1]["parameter-hint"] : ""
133 replyMessages: actionsDescription && actionsDescription[1]["parameter-hint"] ? actionsDescription[1]["parameter-hint"] : ""
134 // icons
134 // icons
135− avatar: menu && menu.ext.xCanonicalIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalIcon) : "qrc:/indicators/artwork/messaging/default_contact.png"
135+ avatar: menu && menu.ext.icon !== undefined ? menu.ext.icon : "qrc:/indicators/artwork/messaging/default_contact.png"
136− appIcon: menu && menu.ext.xCanonicalAppIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalAppIcon) : ""
136+ appIcon: menu && menu.ext.xCanonicalAppIcon !== undefined ? menu.ext.xCanonicalAppIcon : "qrc:/indicators/artwork/messaging/default_app.svg"
137 // actions
137 // actions
138 activateEnabled: activateAction.valid && activateAction.enabled
138 activateEnabled: activateAction.valid && activateAction.enabled
139 replyEnabled: replyAction.valid && replyAction.enabled
139 replyEnabled: replyAction.valid && replyAction.enabled
plugins/Unity/Indicators/qml/MenuItemFactory.qml+4−5
@@ -204,8 +204,8 @@ Item {
204 model.loadExtendedAttributes(modelIndex, {'x-canonical-time': 'int64',
204 model.loadExtendedAttributes(modelIndex, {'x-canonical-time': 'int64',
205 'x-canonical-text': 'string',
205 'x-canonical-text': 'string',
206 'x-canonical-message-actions': 'variant',
206 'x-canonical-message-actions': 'variant',
207− 'x-canonical-icon': 'string',
207+ 'icon': 'icon',
208− 'x-canonical-app-icon': 'string'});
208+ 'x-canonical-app-icon': 'icon'});
209 }
209 }
210 }
210 }
211 }
211 }
@@ -217,11 +217,10 @@ Item {
217
217
218 title: menu && menu.label ? menu.label : ""
218 title: menu && menu.label ? menu.label : ""
219 count: menu && menu.actionState[0] ? menu.actionState[0] : "0"
219 count: menu && menu.actionState[0] ? menu.actionState[0] : "0"
220− appIcon: menu && (menu.ext.xCanonicalIcon.length > 0) ? "image://theme/" + encodeURI(menu.ext.xCanonicalIcon) :
221− "qrc:/indicators/artwork/messaging/default_app.svg"
220+ appIcon: menu && menu.ext.icon !== undefined ? menu.ext.icon : "qrc:/indicators/artwork/messaging/default_app.svg"
222
221
223 Component.onCompleted: {
222 Component.onCompleted: {
224− model.loadExtendedAttributes(modelIndex, {'x-canonical-icon': 'string'});
223+ model.loadExtendedAttributes(modelIndex, {'icon': 'icon'});
225 }
224 }
226 onActivateApp: {
225 onActivateApp: {
227 model.activate(modelIndex, true);
226 model.activate(modelIndex, true);