git.iko.soy/unity8
on xenial help sign in
Updated Factories for usc
14500fcNick Dedekind
Panel/Indicators/DefaultIndicatorPage.qml+9−5
compare with xenial
unifiedsplit
@@ -138,10 +138,14 @@ Indicators.IndicatorBase {
138 sourceComponent: factory.load(model)
138 sourceComponent: factory.load(model)
139
139
140 onLoaded: {
140 onLoaded: {
141+ if (item.hasOwnProperty("selected")) {
142+ item.selected = mainMenu.selectedIndex == index;
143+ }
141 if (item.hasOwnProperty("menuSelected")) {
144 if (item.hasOwnProperty("menuSelected")) {
142− item.menuSelected = mainMenu.selectedIndex == index;
143− item.selectMenu.connect(function() { mainMenu.selectedIndex = index; });
145+ item.menuSelected.connect(function() { mainMenu.selectedIndex = index; });
146+ }
147+ if (item.hasOwnProperty("menuDeselected")) {
144− item.deselectMenu.connect(function() { mainMenu.selectedIndex = -1; });
148+ item.menuDeselected.connect(function() { mainMenu.selectedIndex = -1; });
145 }
149 }
146 if (item.hasOwnProperty("menuData")) {
150 if (item.hasOwnProperty("menuData")) {
147 item.menuData = Qt.binding(function() { return model; });
151 item.menuData = Qt.binding(function() { return model; });
@@ -162,8 +166,8 @@ Indicators.IndicatorBase {
162 Connections {
166 Connections {
163 target: mainMenu
167 target: mainMenu
164 onSelectedIndexChanged: {
168 onSelectedIndexChanged: {
165− if (loader.item && loader.item.hasOwnProperty("menuSelected")) {
169+ if (loader.item && loader.item.hasOwnProperty("selected")) {
166− loader.item.menuSelected = mainMenu.selectedIndex == index;
170+ loader.item.selected = mainMenu.selectedIndex == index;
167 }
171 }
168 }
172 }
169 }
173 }
plugins/Unity/Indicators/qml/MenuItemFactory.qml+201−42
@@ -18,11 +18,10 @@
18 */
18 */
19
19
20import QtQuick 2.0
20import QtQuick 2.0
21−import Unity.Indicators 0.1 as Indicators
21+import Ubuntu.Settings.Menus 0.1 as Menus
22−import Unity.Indicators.Network 0.1 as ICNetwork
23−import Unity.Indicators.Messaging 0.1 as ICMessaging
24import QMenuModel 0.1 as QMenuModel
22import QMenuModel 0.1 as QMenuModel
23+import Unity.Indicators 0.1 as Indicators
25−import Ubuntu.Components 0.1
24+import Ubuntu.Components.ListItems 0.1 as ListItems
26
25
27Item {
26Item {
28 id: menuFactory
27 id: menuFactory
@@ -33,12 +32,14 @@ Item {
33 "unity.widgets.systemsettings.tablet.volumecontrol" : sliderMenu,
32 "unity.widgets.systemsettings.tablet.volumecontrol" : sliderMenu,
34 "unity.widgets.systemsettings.tablet.switch" : switchMenu,
33 "unity.widgets.systemsettings.tablet.switch" : switchMenu,
35
34
36− "com.canonical.indicator.button" : buttonMenu,
35+ "com.canonical.indicator.button" : buttonMenu,
37− "com.canonical.indicator.div" : divMenu,
36+ "com.canonical.indicator.div" : separatorMenu,
38− "com.canonical.indicator.section" : sectionMenu,
37+ "com.canonical.indicator.section" : sectionMenu,
39− "com.canonical.indicator.progress" : progressMenu,
38+ "com.canonical.indicator.progress" : progressMenu,
40− "com.canonical.indicator.slider" : sliderMenu,
39+ "com.canonical.indicator.slider" : sliderMenu,
41− "com.canonical.indicator.switch" : switchMenu,
40+ "com.canonical.indicator.switch" : switchMenu,
41+ "com.canonical.indicator.alarm" : alarmMenu,
42+ "com.canonical.indicator.appointment" : appointmentMenu,
42
43
43 "com.canonical.indicator.messages.messageitem" : messageItem,
44 "com.canonical.indicator.messages.messageitem" : messageItem,
44 "com.canonical.indicator.messages.sourceitem" : groupedMessage,
45 "com.canonical.indicator.messages.sourceitem" : groupedMessage,
@@ -46,6 +47,9 @@ Item {
46 "com.canonical.unity.slider" : sliderMenu,
47 "com.canonical.unity.slider" : sliderMenu,
47 "com.canonical.unity.switch" : switchMenu,
48 "com.canonical.unity.switch" : switchMenu,
48
49
50+ "com.canonical.unity.media-player" : mediaPayerMenu,
51+ "com.canonical.unity.playback-item" : playbackItemMenu,
52+
49 "unity.widgets.systemsettings.tablet.wifisection" : wifiSection,
53 "unity.widgets.systemsettings.tablet.wifisection" : wifiSection,
50 "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,
54 "unity.widgets.systemsettings.tablet.accesspoint" : accessPoint,
51 }
55 }
@@ -58,15 +62,15 @@ Item {
58 }
62 }
59
63
60 Component {
64 Component {
61− id: divMenu;
65+ id: separatorMenu;
62− Indicators.DivMenuItem {
66+ Menus.SeparatorMenu {
63− objectName: "divMenu"
67+ objectName: "separatorMenu"
64 }
68 }
65 }
69 }
66
70
67 Component {
71 Component {
68 id: sliderMenu;
72 id: sliderMenu;
69− Indicators.SliderMenuItem {
73+ Menus.SliderMenu {
70 objectName: "sliderMenu"
74 objectName: "sliderMenu"
71 property QtObject menuData: null
75 property QtObject menuData: null
72 property var menuModel: menuFactory.menuModel
76 property var menuModel: menuFactory.menuModel
@@ -95,12 +99,12 @@ Item {
95 onMenuIndexChanged: {
99 onMenuIndexChanged: {
96 loadAttributes();
100 loadAttributes();
97 }
101 }
98− onChangeState: {
102+ onUpdated: {
99 menuModel.changeState(menuIndex, value);
103 menuModel.changeState(menuIndex, value);
100 }
104 }
101
105
102 function loadAttributes() {
106 function loadAttributes() {
103− if (!menuModel || menuIndex == undefined) return;
107+ if (!menuModel || menuIndex == -1) return;
104 menuModel.loadExtendedAttributes(menuIndex, {'min-value': 'double',
108 menuModel.loadExtendedAttributes(menuIndex, {'min-value': 'double',
105 'max-value': 'double',
109 'max-value': 'double',
106 'min-icon': 'icon',
110 'min-icon': 'icon',
@@ -111,7 +115,7 @@ Item {
111
115
112 Component {
116 Component {
113 id: buttonMenu;
117 id: buttonMenu;
114− Indicators.ButtonMenuItem {
118+ Menus.ButtonMenu {
115 objectName: "buttonMenu"
119 objectName: "buttonMenu"
116 property QtObject menuData: null
120 property QtObject menuData: null
117 property var menuModel: menuFactory.menuModel
121 property var menuModel: menuFactory.menuModel
@@ -120,7 +124,7 @@ Item {
120 buttonText: menuData && menuData.label || ""
124 buttonText: menuData && menuData.label || ""
121 enabled: menuData && menuData.sensitive || false
125 enabled: menuData && menuData.sensitive || false
122
126
123− onActivate: {
127+ onTriggered: {
124 menuModel.activate(menuIndex);
128 menuModel.activate(menuIndex);
125 shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
129 shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
126 }
130 }
@@ -128,18 +132,19 @@ Item {
128 }
132 }
129 Component {
133 Component {
130 id: sectionMenu;
134 id: sectionMenu;
131− Indicators.SectionMenuItem {
135+ Menus.SectionMenu {
132 objectName: "sectionMenu"
136 objectName: "sectionMenu"
133 property QtObject menuData: null
137 property QtObject menuData: null
134 property var menuIndex: undefined
138 property var menuIndex: undefined
135
139
136 text: menuData && menuData.label || ""
140 text: menuData && menuData.label || ""
141+ busy: false
137 }
142 }
138 }
143 }
139
144
140 Component {
145 Component {
141 id: progressMenu;
146 id: progressMenu;
142− Indicators.ProgressMenuItem {
147+ Menus.ProgressValueMenu {
143 objectName: "progressMenu"
148 objectName: "progressMenu"
144 property QtObject menuData: null
149 property QtObject menuData: null
145 property int menuIndex: -1
150 property int menuIndex: -1
@@ -153,7 +158,7 @@ Item {
153
158
154 Component {
159 Component {
155 id: standardMenu;
160 id: standardMenu;
156− Indicators.StandardMenuItem {
161+ ListItems.Standard {
157 objectName: "standardMenu"
162 objectName: "standardMenu"
158 property QtObject menuData: null
163 property QtObject menuData: null
159 property int menuIndex: -1
164 property int menuIndex: -1
@@ -161,10 +166,8 @@ Item {
161 text: menuData && menuData.label || ""
166 text: menuData && menuData.label || ""
162 iconSource: menuData && menuData.icon || ""
167 iconSource: menuData && menuData.icon || ""
163 enabled: menuData && menuData.sensitive || false
168 enabled: menuData && menuData.sensitive || false
164− checkable: menuData ? (menuData.isCheck || menuData.isRadio) : false
165− checked: checkable ? menuData.isToggled : false
166
169
167− onActivate: {
170+ onTriggered: {
168 menuModel.activate(menuIndex);
171 menuModel.activate(menuIndex);
169 shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
172 shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
170 }
173 }
@@ -173,7 +176,7 @@ Item {
173
176
174 Component {
177 Component {
175 id: switchMenu;
178 id: switchMenu;
176− Indicators.SwitchMenuItem {
179+ Menus.SwitchMenu {
177 objectName: "switchMenu"
180 objectName: "switchMenu"
178 property QtObject menuData: null
181 property QtObject menuData: null
179 property int menuIndex: -1
182 property int menuIndex: -1
@@ -181,18 +184,96 @@ Item {
181 text: menuData && menuData.label || ""
184 text: menuData && menuData.label || ""
182 iconSource: menuData && menuData.icon || ""
185 iconSource: menuData && menuData.icon || ""
183 enabled: menuData && menuData.sensitive || false
186 enabled: menuData && menuData.sensitive || false
184− checked: menuData ? menuData.isToggled : false
187+ checked: menuData && menuData.isToggled || false
185
188
186− onActivate: {
189+ onTriggered: {
187 menuModel.activate(menuIndex);
190 menuModel.activate(menuIndex);
188 shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
191 shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
189 }
192 }
190 }
193 }
191 }
194 }
192
195
196+ Component {
197+ id: alarmMenu;
198+ Menus.EventMenu {
199+ objectName: "alarmMenu"
200+ property QtObject menuData: null
201+ property var menuModel: menuFactory.menuModel
202+ property int menuIndex: -1
203+ property var extendedData: menuData && menuData.ext || undefined
204+ // TODO - bug #1260728
205+ property var timeFormatter: Indicators.TimeFormatter {
206+ time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
207+// format: getExtendedProperty(extendedData, "xCanonicalTimeFormat", "")
208+ format: "hh:mm - MMM dd"
209+ }
210+
211+ text: menuData && menuData.label || ""
212+ iconSource: menuData && menuData.icon || "image://theme/alarm-clock"
213+ time: timeFormatter.timeString
214+ enabled: menuData && menuData.sensitive || false
215+
216+ onMenuModelChanged: {
217+ loadAttributes();
218+ }
219+ onMenuIndexChanged: {
220+ loadAttributes();
221+ }
222+ onTriggered: {
223+ menuModel.activate(menuIndex);
224+ }
225+
226+ function loadAttributes() {
227+ if (!menuModel || menuIndex == -1) return;
228+ menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-time': 'int64',
229+ 'x-canonical-time-format': 'string'});
230+ }
231+ }
232+ }
233+
234+ Component {
235+ id: appointmentMenu;
236+ Menus.EventMenu {
237+ objectName: "appointmentMenu"
238+ property QtObject menuData: null
239+ property var menuModel: menuFactory.menuModel
240+ property int menuIndex: -1
241+ property var extendedData: menuData && menuData.ext || undefined
242+ // TODO - bug #1260728
243+ property var timeFormatter: Indicators.TimeFormatter {
244+ time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
245+// format: getExtendedProperty(extendedData, "xCanonicalTimeFormat", "")
246+ format: "hh:mm - MMM dd"
247+ }
248+
249+ text: menuData && menuData.label || ""
250+ iconSource: menuData && menuData.icon || "image://theme/calendar"
251+ time: timeFormatter.timeString
252+ eventColor: menu && menu.ext.hasOwnProperty("xCanonicalColor") ? menu.ext.xCanonicalColor : Qt.rgba(0.0, 0.0, 0.0, 0.0)
253+ enabled: menuData && menuData.sensitive || false
254+
255+ onMenuModelChanged: {
256+ loadAttributes();
257+ }
258+ onMenuIndexChanged: {
259+ loadAttributes();
260+ }
261+ onTriggered: {
262+ menuModel.activate(menuIndex);
263+ }
264+
265+ function loadAttributes() {
266+ if (!menuModel || menuIndex == -1) return;
267+ menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-color': 'string',
268+ 'x-canonical-time': 'int64',
269+ 'x-canonical-time-format': 'string'});
270+ }
271+ }
272+ }
273+
193 Component {
274 Component {
194 id: wifiSection;
275 id: wifiSection;
195− Indicators.SectionMenuItem {
276+ Menus.SectionMenu {
196 objectName: "wifiSection"
277 objectName: "wifiSection"
197 property QtObject menuData: null
278 property QtObject menuData: null
198 property var menuModel: menuFactory.menuModel
279 property var menuModel: menuFactory.menuModel
@@ -210,7 +291,7 @@ Item {
210 }
291 }
211
292
212 function loadAttributes() {
293 function loadAttributes() {
213− if (!menuModel || menuIndex == undefined) return;
294+ if (!menuModel || menuIndex == -1) return;
214 menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-busy-action': 'bool'})
295 menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-busy-action': 'bool'})
215 }
296 }
216 }
297 }
@@ -218,7 +299,7 @@ Item {
218
299
219 Component {
300 Component {
220 id: accessPoint;
301 id: accessPoint;
221− ICNetwork.AccessPoint {
302+ Menus.AccessPointMenu {
222 objectName: "accessPoint"
303 objectName: "accessPoint"
223 property QtObject menuData: null
304 property QtObject menuData: null
224 property var menuModel: menuFactory.menuModel
305 property var menuModel: menuFactory.menuModel
@@ -231,11 +312,11 @@ Item {
231 name: getExtendedProperty(extendedData, "xCanonicalWifiApStrengthAction", "")
312 name: getExtendedProperty(extendedData, "xCanonicalWifiApStrengthAction", "")
232 }
313 }
233
314
234− label: menuData && menuData.label || ""
315+ text: menuData && menuData.label || ""
235 enabled: menuData && menuData.sensitive || false
316 enabled: menuData && menuData.sensitive || false
317+ checked: menuData && menuData.isToggled || false
236 secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
318 secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
237 adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
319 adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
238− checked: menuData ? menuData.isToggled : false
239 signalStrength: strengthAction.valid ? strengthAction.state : 0
320 signalStrength: strengthAction.valid ? strengthAction.state : 0
240
321
241 onMenuModelChanged: {
322 onMenuModelChanged: {
@@ -244,13 +325,13 @@ Item {
244 onMenuIndexChanged: {
325 onMenuIndexChanged: {
245 loadAttributes();
326 loadAttributes();
246 }
327 }
247− onActivate: {
328+ onTriggered: {
248 menuModel.activate(menuIndex);
329 menuModel.activate(menuIndex);
249 shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
330 shell.hideIndicatorMenu(UbuntuAnimation.BriskDuration);
250 }
331 }
251
332
252 function loadAttributes() {
333 function loadAttributes() {
253− if (!menuModel || menuIndex == undefined) return;
334+ if (!menuModel || menuIndex == -1) return;
254 menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
335 menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
255 'x-canonical-wifi-ap-is-secure': 'bool',
336 'x-canonical-wifi-ap-is-secure': 'bool',
256 'x-canonical-wifi-ap-strength-action': 'string'});
337 'x-canonical-wifi-ap-strength-action': 'string'});
@@ -260,7 +341,7 @@ Item {
260
341
261 Component {
342 Component {
262 id: messageItem
343 id: messageItem
263− ICMessaging.MessageMenuItemFactory {
344+ MessageMenuItemFactory {
264 objectName: "messageItem"
345 objectName: "messageItem"
265 menuModel: menuFactory.menuModel
346 menuModel: menuFactory.menuModel
266 }
347 }
@@ -268,17 +349,18 @@ Item {
268
349
269 Component {
350 Component {
270 id: groupedMessage
351 id: groupedMessage
271− ICMessaging.GroupedMessage {
352+ Menus.GroupedMessageMenu {
272 objectName: "groupedMessage"
353 objectName: "groupedMessage"
273 property QtObject menuData: null
354 property QtObject menuData: null
274 property var menuModel: menuFactory.menuModel
355 property var menuModel: menuFactory.menuModel
275 property int menuIndex: -1
356 property int menuIndex: -1
276 property var extendedData: menuData && menuData.ext || undefined
357 property var extendedData: menuData && menuData.ext || undefined
277
358
278− title: menuData && menuData.label || ""
359+ text: menuData && menuData.label || ""
279− appIcon: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_app.svg")
360+ icon: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_app.svg")
280 count: menuData && menuData.actionState.length > 0 ? menuData.actionState[0] : "0"
361 count: menuData && menuData.actionState.length > 0 ? menuData.actionState[0] : "0"
281 enabled: menuData && menuData.sensitive || false
362 enabled: menuData && menuData.sensitive || false
363+ removable: true
282
364
283 onMenuModelChanged: {
365 onMenuModelChanged: {
284 loadAttributes();
366 loadAttributes();
@@ -286,21 +368,98 @@ Item {
286 onMenuIndexChanged: {
368 onMenuIndexChanged: {
287 loadAttributes();
369 loadAttributes();
288 }
370 }
289− onActivateApp: {
371+ onClicked: {
290 menuModel.activate(menuIndex, true);
372 menuModel.activate(menuIndex, true);
291 shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
373 shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
292 }
374 }
293− onDismiss: {
375+ onDismissed: {
294 menuModel.activate(menuIndex, false);
376 menuModel.activate(menuIndex, false);
295 }
377 }
296
378
297 function loadAttributes() {
379 function loadAttributes() {
298− if (!menuModel || menuIndex == undefined) return;
380+ if (!menuModel || menuIndex == -1) return;
299 menuModel.loadExtendedAttributes(modelIndex, {'icon': 'icon'});
381 menuModel.loadExtendedAttributes(modelIndex, {'icon': 'icon'});
300 }
382 }
301 }
383 }
302 }
384 }
303
385
386+ Component {
387+ id: mediaPayerMenu;
388+ Menus.MediaPlayerMenu {
389+ property QtObject menuData: null
390+ property var menuModel: menuFactory.menuModel
391+ property int menuIndex: -1
392+ property var actionState: menuData && menuData.actionState || undefined
393+
394+ playerIcon: menuData && menuData.icon || ""
395+ playerName: menuData && menuData.label || ""
396+
397+ albumArt: getExtendedProperty(actionState, "art-url", "")
398+ song: getExtendedProperty(actionState, "title", "unknown")
399+ artist: getExtendedProperty(actionState, "artist", "unknown")
400+ album: getExtendedProperty(actionState, "album", "unknown")
401+ running: getExtendedProperty(actionState, "running", false)
402+ state: getExtendedProperty(actionState, "state", "")
403+
404+ onTriggered: {
405+ model.activate(modelIndex);
406+ }
407+ }
408+ }
409+
410+ Component {
411+ id: playbackItemMenu;
412+ Menus.PlaybackItemMenu {
413+ property var menuModel: menuFactory.menuModel
414+ property int menuIndex: -1
415+ property var extendedData: menuData && menuData.ext || undefined
416+
417+ property var playAction: QMenuModel.UnityMenuAction {
418+ model: menuModel
419+ index: menuIndex
420+ name: getExtendedProperty(extendedData, "xCanonicalPlayAction", "")
421+ }
422+ property var nextAction: QMenuModel.UnityMenuAction {
423+ model: menuModel
424+ index: menuIndex
425+ name: getExtendedProperty(extendedData, "xCanonicalNextAction", "")
426+ }
427+ property var previousAction: QMenuModel.UnityMenuAction {
428+ model: menuModel
429+ index: menuIndex
430+ name: getExtendedProperty(extendedData, "xCanonicalPreviousAction", "")
431+ }
432+
433+ playing: playAction.state === "Playing"
434+ canPlay: playAction.valid
435+ canGoNext: nextAction.valid
436+ canGoPrevious: previousAction.valid
437+
438+ onPlay: {
439+ playAction.activate();
440+ }
441+ onNext: {
442+ nextAction.activate();
443+ }
444+ onPrevious: {
445+ previousAction.activate();
446+ }
447+ onMenuModelChanged: {
448+ loadAttributes();
449+ }
450+ onMenuIndexChanged: {
451+ loadAttributes();
452+ }
453+
454+ function loadAttributes() {
455+ if (!menuModel || menuIndex == -1) return;
456+ menuModel.loadExtendedAttributes(modelIndex, {'x-canonical-play-action': 'string',
457+ 'x-canonical-next-action': 'string',
458+ 'x-canonical-previous-action': 'string'});
459+ }
460+ }
461+ }
462+
304 function load(modelData) {
463 function load(modelData) {
305 if (modelData.type !== undefined) {
464 if (modelData.type !== undefined) {
306 var component = _map[modelData.type];
465 var component = _map[modelData.type];
@@ -309,7 +468,7 @@ Item {
309 }
468 }
310 }
469 }
311 if (modelData.isSeparator) {
470 if (modelData.isSeparator) {
312− return divMenu;
471+ return separatorMenu;
313 }
472 }
314 return standardMenu;
473 return standardMenu;
315 }
474 }
plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml → plugins/Unity/Indicators/qml/MessageMenuItemFactory.qmlrenamed+72−31
@@ -20,18 +20,29 @@
20
20
21import QtQuick 2.0
21import QtQuick 2.0
22import Ubuntu.Components 0.1
22import Ubuntu.Components 0.1
23−import Unity.Indicators 0.1 as Indicators
23+import Ubuntu.Settings.Menus 0.1 as Menus
24import QMenuModel 0.1 as QMenuModel
24import QMenuModel 0.1 as QMenuModel
25+import Unity.Indicators 0.1 as Indicators
25
26
26−Indicators.BaseMenuItem {
27+Item {
27 id: messageFactoryItem
28 id: messageFactoryItem
28 property var menuModel: null
29 property var menuModel: null
29 property QtObject menuData: null
30 property QtObject menuData: null
30 property int menuIndex: -1
31 property int menuIndex: -1
31
32
33+ property bool selected: false
34+ signal menuSelected
35+ signal menuDeselected
36+
32 property var extendedData: menuData && menuData.ext || undefined
37 property var extendedData: menuData && menuData.ext || undefined
33 property var actionsDescription: getExtendedProperty(extendedData, "xCanonicalMessageActions", undefined)
38 property var actionsDescription: getExtendedProperty(extendedData, "xCanonicalMessageActions", undefined)
34
39
40+ // TODO - bug #1260728
41+ property var timeFormatter: Indicators.TimeFormatter {
42+ time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
43+ format: "hh:mm - MMM dd"
44+ }
45+
35 onMenuModelChanged: {
46 onMenuModelChanged: {
36 loadAttributes();
47 loadAttributes();
37 }
48 }
@@ -40,8 +51,7 @@ Indicators.BaseMenuItem {
40 }
51 }
41
52
42 function loadAttributes() {
53 function loadAttributes() {
43− if (!menuModel || menuIndex == undefined) return;
54+ if (!menuModel || menuIndex == -1) return;
44−
45 menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-time': 'int64',
55 menuModel.loadExtendedAttributes(menuIndex, {'x-canonical-time': 'int64',
46 'x-canonical-text': 'string',
56 'x-canonical-text': 'string',
47 'x-canonical-message-actions': 'variant',
57 'x-canonical-message-actions': 'variant',
@@ -67,34 +77,46 @@ Indicators.BaseMenuItem {
67
77
68 Component {
78 Component {
69 id: simpleTextMessage
79 id: simpleTextMessage
70− SimpleTextMessage {
80+ Menus.SimpleTextMessageMenu {
81+ id: message
71 objectName: "simpleTextMessage"
82 objectName: "simpleTextMessage"
72 // text
83 // text
73 title: menuData && menuData.label || ""
84 title: menuData && menuData.label || ""
74− time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
85+ time: timeFormatter.timeString
75 message: getExtendedProperty(extendedData, "xCanonicalText", "")
86 message: getExtendedProperty(extendedData, "xCanonicalText", "")
76 // icons
87 // icons
77 avatar: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_contact.png")
88 avatar: getExtendedProperty(extendedData, "icon", "qrc:/indicators/artwork/messaging/default_contact.png")
78 appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
89 appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
79 // actions
90 // actions
80− enabled: menuData && menuData.sensitive || false
91+// enabled: menuData && menuData.sensitive || false
92+ removable: !selected
93+ selected: messageFactoryItem.selected
81
94
82− onActivateApp: {
95+ onAppActivated: {
83 menuModel.activate(menuIndex, true);
96 menuModel.activate(menuIndex, true);
84 shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
97 shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
85 }
98 }
86− onDismiss: {
99+ onDismissed: {
87 menuModel.activate(menuIndex, false);
100 menuModel.activate(menuIndex, false);
88 }
101 }
102+ onClicked: {
103+ if (selected) {
104+ menuDeselected();
105+ } else {
106+ menuSelected();
107+ }
108+ }
89
109
90− menuSelected: messageFactoryItem.menuSelected
110+ backgroundIndicator: RemoveBackground {
91− onSelectMenu: messageFactoryItem.selectMenu()
111+ state: message.swipingState
92− onDeselectMenu: messageFactoryItem.deselectMenu()
112+ }
93 }
113 }
94 }
114 }
115+
95 Component {
116 Component {
96 id: textMessage
117 id: textMessage
97− TextMessage {
118+ Menus.TextMessageMenu {
119+ id: message
98 objectName: "textMessage"
120 objectName: "textMessage"
99 property var replyActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined
121 property var replyActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined
100
122
@@ -106,7 +128,7 @@ Indicators.BaseMenuItem {
106
128
107 // text
129 // text
108 title: menuData && menuData.label || ""
130 title: menuData && menuData.label || ""
109− time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
131+ time: timeFormatter.timeString
110 message: getExtendedProperty(extendedData, "xCanonicalText", "")
132 message: getExtendedProperty(extendedData, "xCanonicalText", "")
111 replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
133 replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
112 // icons
134 // icons
@@ -114,27 +136,37 @@ Indicators.BaseMenuItem {
114 appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
136 appIcon: getExtendedProperty(extendedData, "xCanonicalAppIcon", "qrc:/indicators/artwork/messaging/default_app.svg")
115 // actions
137 // actions
116 replyEnabled: replyAction.valid && replyAction.enabled
138 replyEnabled: replyAction.valid && replyAction.enabled
117− enabled: menuData && menuData.sensitive || false
139+// enabled: menuData && menuData.sensitive || false
140+ removable: !selected
141+ selected: messageFactoryItem.selected
118
142
119− onActivateApp: {
143+ onAppActivated: {
120 menuModel.activate(menuIndex, true);
144 menuModel.activate(menuIndex, true);
121 shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
145 shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
122 }
146 }
123− onDismiss: {
147+ onDismissed: {
124 menuModel.activate(menuIndex, false);
148 menuModel.activate(menuIndex, false);
125 }
149 }
126− onReply: {
150+ onReplied: {
127 replyAction.activate(value);
151 replyAction.activate(value);
128 }
152 }
153+ onClicked: {
154+ if (selected) {
155+ menuDeselected();
156+ } else {
157+ menuSelected();
158+ }
159+ }
129
160
130− menuSelected: messageFactoryItem.menuSelected
161+ backgroundIndicator: RemoveBackground {
131− onSelectMenu: messageFactoryItem.selectMenu()
162+ state: message.swipingState
132− onDeselectMenu: messageFactoryItem.deselectMenu()
163+ }
133 }
164 }
134 }
165 }
135 Component {
166 Component {
136 id: snapDecision
167 id: snapDecision
137− SnapDecision {
168+ Menus.SnapDecisionMenu {
169+ id: message
138 objectName: "snapDecision"
170 objectName: "snapDecision"
139 property var activateActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined
171 property var activateActionDescription: actionsDescription && actionsDescription.length > 0 ? actionsDescription[0] : undefined
140 property var replyActionDescription: actionsDescription && actionsDescription.length > 1 ? actionsDescription[1] : undefined
172 property var replyActionDescription: actionsDescription && actionsDescription.length > 1 ? actionsDescription[1] : undefined
@@ -152,7 +184,7 @@ Indicators.BaseMenuItem {
152
184
153 // text
185 // text
154 title: menuData && menuData.label || ""
186 title: menuData && menuData.label || ""
155− time: getExtendedProperty(extendedData, "xCanonicalTime", 0)
187+ time: timeFormatter.timeString
156 message: getExtendedProperty(extendedData, "xCanonicalText", "")
188 message: getExtendedProperty(extendedData, "xCanonicalText", "")
157 actionButtonText: getExtendedProperty(activateActionDescription, "label", "Call back")
189 actionButtonText: getExtendedProperty(activateActionDescription, "label", "Call back")
158 replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
190 replyButtonText: getExtendedProperty(replyActionDescription, "label", "Send")
@@ -163,25 +195,34 @@ Indicators.BaseMenuItem {
163 // actions
195 // actions
164 activateEnabled: activateAction.valid && activateAction.enabled
196 activateEnabled: activateAction.valid && activateAction.enabled
165 replyEnabled: replyAction.valid && replyAction.enabled
197 replyEnabled: replyAction.valid && replyAction.enabled
166− enabled: menuData && menuData.sensitive || false
198+// enabled: menuData && menuData.sensitive || false
199+ removable: !selected
200+ selected: messageFactoryItem.selected
167
201
168− onActivateApp: {
202+ onAppActivated: {
169 menuModel.activate(menuIndex, true);
203 menuModel.activate(menuIndex, true);
170 shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
204 shell.hideIndicatorMenu(UbuntuAnimation.FastDuration);
171 }
205 }
172− onDismiss: {
206+ onDismissed: {
173 menuModel.activate(menuIndex, false);
207 menuModel.activate(menuIndex, false);
174 }
208 }
175− onActivate: {
209+ onActivated: {
176 activateAction.activate();
210 activateAction.activate();
177 }
211 }
178− onReply: {
212+ onReplied: {
179 replyAction.activate(value);
213 replyAction.activate(value);
180 }
214 }
215+ onClicked: {
216+ if (selected) {
217+ menuDeselected();
218+ } else {
219+ menuSelected();
220+ }
221+ }
181
222
182− menuSelected: messageFactoryItem.menuSelected
223+ backgroundIndicator: RemoveBackground {
183− onSelectMenu: messageFactoryItem.selectMenu()
224+ state: message.swipingState
184− onDeselectMenu: messageFactoryItem.deselectMenu()
225+ }
185 }
226 }
186 }
227 }
187 }
228 }