git.iko.soy/unity8
on xenial help sign in
fixed up messaging icons
commit671adbf2c6d4a7988525316cc923caa2a55eda54 authorNick Dedekind <nicholas.dedekind@gmail.com> dateWed 25 Sep 2013, 12:29 (13 years ago) parent032654b
2 files changed+10−11
compare with xenial
unifiedsplit
plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml+6−6 plugins/Unity/Indicators/qml/MenuItemFactory.qml+4−5
plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml+6−6
@@ -68,8 +68,8 @@ Indicators.BaseMenuItem {
6868 time: menu ? Utils.formatDate(menu.ext.xCanonicalTime) : ""
6969 message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""
7070 // icons
71− avatar: menu && menu.ext.xCanonicalIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalIcon) : "qrc:/indicators/artwork/messaging/default_contact.png"
72− appIcon: menu && menu.ext.xCanonicalAppIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalAppIcon) : ""
71+ avatar: menu && menu.ext.icon !== undefined ? menu.ext.icon : "qrc:/indicators/artwork/messaging/default_contact.png"
72+ appIcon: menu && menu.ext.xCanonicalAppIcon !== undefined ? menu.ext.xCanonicalAppIcon : "qrc:/indicators/artwork/messaging/default_app.svg"
7373
7474 onActivateApp: {
7575 menuItem.model.activate(modelIndex, true);
@@ -94,8 +94,8 @@ Indicators.BaseMenuItem {
9494 message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""
9595 replyButtonText: actionsDescription && actionsDescription[0].label ? actionsDescription[0].label : "Send"
9696 // icons
97− avatar: menu && menu.ext.xCanonicalIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalIcon) : "qrc:/indicators/artwork/messaging/default_contact.png"
98− appIcon: menu && menu.ext.xCanonicalAppIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalAppIcon) : ""
97+ avatar: menu && menu.ext.icon !== undefined ? menu.ext.icon : "qrc:/indicators/artwork/messaging/default_contact.png"
98+ appIcon: menu && menu.ext.xCanonicalAppIcon !== undefined ? menu.ext.xCanonicalAppIcon : "qrc:/indicators/artwork/messaging/default_app.svg"
9999 // actions
100100 replyEnabled: replyAction.valid && replyAction.enabled
101101
@@ -132,8 +132,8 @@ Indicators.BaseMenuItem {
132132 replyButtonText: actionsDescription && actionsDescription[1].label ? actionsDescription[1].label : "Send"
133133 replyMessages: actionsDescription && actionsDescription[1]["parameter-hint"] ? actionsDescription[1]["parameter-hint"] : ""
134134 // icons
135− avatar: menu && menu.ext.xCanonicalIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalIcon) : "qrc:/indicators/artwork/messaging/default_contact.png"
136− appIcon: menu && menu.ext.xCanonicalAppIcon ? "image://theme/" + encodeURI(menu.ext.xCanonicalAppIcon) : ""
135+ avatar: menu && menu.ext.icon !== undefined ? menu.ext.icon : "qrc:/indicators/artwork/messaging/default_contact.png"
136+ appIcon: menu && menu.ext.xCanonicalAppIcon !== undefined ? menu.ext.xCanonicalAppIcon : "qrc:/indicators/artwork/messaging/default_app.svg"
137137 // actions
138138 activateEnabled: activateAction.valid && activateAction.enabled
139139 replyEnabled: replyAction.valid && replyAction.enabled
plugins/Unity/Indicators/qml/MenuItemFactory.qml+4−5
@@ -204,8 +204,8 @@ Item {
204204 model.loadExtendedAttributes(modelIndex, {'x-canonical-time': 'int64',
205205 'x-canonical-text': 'string',
206206 'x-canonical-message-actions': 'variant',
207− 'x-canonical-icon': 'string',
208− 'x-canonical-app-icon': 'string'});
207+ 'icon': 'icon',
208+ 'x-canonical-app-icon': 'icon'});
209209 }
210210 }
211211 }
@@ -217,11 +217,10 @@ Item {
217217
218218 title: menu && menu.label ? menu.label : ""
219219 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"
222221
223222 Component.onCompleted: {
224− model.loadExtendedAttributes(modelIndex, {'x-canonical-icon': 'string'});
223+ model.loadExtendedAttributes(modelIndex, {'icon': 'icon'});
225224 }
226225 onActivateApp: {
227226 model.activate(modelIndex, true);