messaging-app

Merge lp:~zsombi/messaging-app/prototypeWithMCV into lp:messaging-app

  1. prototypeWithMCV
  2. Merge into trunk
Proposed by Cris Dywan
Status: Work in progress
Proposed branch: lp:~zsombi/messaging-app/prototypeWithMCV
Merge into: lp:messaging-app
Diff against target: 873 lines (+122/-118)
41 files modified
src/qml/AccountSectionDelegate.qml (+3/-3)
src/qml/ColoredImage.qml (+1/-1)
src/qml/ContactSearchList.qml (+3/-3)
src/qml/Dialogs/NoDefaultSIMCardDialog.qml (+2/-2)
src/qml/Dialogs/NoSIMCardSelectedDialog.qml (+2/-2)
src/qml/Dialogs/SetDefaultSIMCardDialog.qml (+2/-2)
src/qml/Dialogs/SimLockedDialog.qml (+2/-2)
src/qml/KeyboardRectangle.qml (+1/-1)
src/qml/LocalPageWithBottomEdge.qml (+2/-2)
src/qml/MMS/MMSBase.qml (+1/-1)
src/qml/MMS/MMSContact.qml (+2/-2)
src/qml/MMS/MMSDefault.qml (+2/-2)
src/qml/MMS/MMSImage.qml (+2/-2)
src/qml/MMS/MMSVideo.qml (+2/-2)
src/qml/MMS/Previewer.qml (+4/-4)
src/qml/MMS/PreviewerContact.qml (+2/-2)
src/qml/MMS/PreviewerImage.qml (+2/-2)
src/qml/MMS/PreviewerVideo.qml (+2/-2)
src/qml/MMSDelegate.qml (+2/-2)
src/qml/MMSMessageBubble.qml (+1/-1)
src/qml/MainPage.qml (+5/-5)
src/qml/MessageBubble.qml (+2/-2)
src/qml/MessageDateSection.qml (+3/-3)
src/qml/MessageDelegate.qml (+1/-1)
src/qml/MessageDelegateFactory.qml (+2/-2)
src/qml/MessageInfoDialog.qml (+2/-2)
src/qml/Messages.qml (+7/-6)
src/qml/MessagesListView.qml (+3/-3)
src/qml/MessagingContactEditorPage.qml (+2/-2)
src/qml/MessagingContactViewPage.qml (+7/-7)
src/qml/MultiRecipientInput.qml (+3/-3)
src/qml/NewRecipientPage.qml (+4/-4)
src/qml/PictureImport.qml (+2/-2)
src/qml/RegularMessageDelegate.qml (+1/-1)
src/qml/SMSDelegate.qml (+2/-2)
src/qml/SettingsPage.qml (+3/-3)
src/qml/StandardAnimation.qml (+1/-1)
src/qml/SwipeItemDemo.qml (+3/-3)
src/qml/ThreadDelegate.qml (+2/-2)
src/qml/messaging-app.qml (+26/-23)
tests/qml/tst_MessageBubble.qml (+1/-1)
To merge this branch: bzr merge lp:~zsombi/messaging-app/prototypeWithMCV
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+262592@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

382. By Zsombor Egri

MultiColumnView API changes

381. By Zsombor Egri

1.3 used and MultiColumnView added

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/AccountSectionDelegate.qml'
2--- src/qml/AccountSectionDelegate.qml 2014-10-14 17:47:34 +0000
3+++ src/qml/AccountSectionDelegate.qml 2015-06-22 15:00:39 +0000
4@@ -16,10 +16,10 @@
5 * along with this program. If not, see <http://www.gnu.org/licenses/>.
6 */
7
8-import QtQuick 2.2
9+import QtQuick 2.4
10
11-import Ubuntu.Components 1.1
12-import Ubuntu.Components.ListItems 0.1 as ListItem
13+import Ubuntu.Components 1.3
14+import Ubuntu.Components.ListItems 1.3 as ListItem
15 import Ubuntu.Contacts 0.1
16
17 import "dateUtils.js" as DateUtils
18
19=== modified file 'src/qml/ColoredImage.qml'
20--- src/qml/ColoredImage.qml 2014-08-27 16:05:37 +0000
21+++ src/qml/ColoredImage.qml 2015-06-22 15:00:39 +0000
22@@ -14,7 +14,7 @@
23 * along with this program. If not, see <http://www.gnu.org/licenses/>.
24 */
25
26-import QtQuick 2.2
27+import QtQuick 2.4
28
29 Item {
30 id: root
31
32=== modified file 'src/qml/ContactSearchList.qml'
33--- src/qml/ContactSearchList.qml 2015-03-18 13:44:33 +0000
34+++ src/qml/ContactSearchList.qml 2015-06-22 15:00:39 +0000
35@@ -16,11 +16,11 @@
36 * along with this program. If not, see <http://www.gnu.org/licenses/>.
37 */
38
39-import QtQuick 2.2
40+import QtQuick 2.4
41 import QtContacts 5.0
42
43-import Ubuntu.Components 1.1
44-import Ubuntu.Components.ListItems 0.1 as ListItem
45+import Ubuntu.Components 1.3
46+import Ubuntu.Components.ListItems 1.3 as ListItem
47 import Ubuntu.Contacts 0.1
48
49 ListView {
50
51=== modified file 'src/qml/Dialogs/NoDefaultSIMCardDialog.qml'
52--- src/qml/Dialogs/NoDefaultSIMCardDialog.qml 2014-08-15 21:19:49 +0000
53+++ src/qml/Dialogs/NoDefaultSIMCardDialog.qml 2015-06-22 15:00:39 +0000
54@@ -17,8 +17,8 @@
55 */
56
57 import QtQuick 2.0
58-import Ubuntu.Components 1.1
59-import Ubuntu.Components.Popups 0.1
60+import Ubuntu.Components 1.3
61+import Ubuntu.Components.Popups 1.3
62 import Ubuntu.Telephony 0.1
63
64 Component {
65
66=== modified file 'src/qml/Dialogs/NoSIMCardSelectedDialog.qml'
67--- src/qml/Dialogs/NoSIMCardSelectedDialog.qml 2014-08-11 22:22:59 +0000
68+++ src/qml/Dialogs/NoSIMCardSelectedDialog.qml 2015-06-22 15:00:39 +0000
69@@ -17,8 +17,8 @@
70 */
71
72 import QtQuick 2.0
73-import Ubuntu.Components 1.1
74-import Ubuntu.Components.Popups 0.1
75+import Ubuntu.Components 1.3
76+import Ubuntu.Components.Popups 1.3
77
78 Component {
79 Dialog {
80
81=== modified file 'src/qml/Dialogs/SetDefaultSIMCardDialog.qml'
82--- src/qml/Dialogs/SetDefaultSIMCardDialog.qml 2014-08-20 14:26:35 +0000
83+++ src/qml/Dialogs/SetDefaultSIMCardDialog.qml 2015-06-22 15:00:39 +0000
84@@ -17,8 +17,8 @@
85 */
86
87 import QtQuick 2.0
88-import Ubuntu.Components 1.1
89-import Ubuntu.Components.Popups 0.1
90+import Ubuntu.Components 1.3
91+import Ubuntu.Components.Popups 1.3
92 import Ubuntu.Telephony 0.1
93
94 Component {
95
96=== modified file 'src/qml/Dialogs/SimLockedDialog.qml'
97--- src/qml/Dialogs/SimLockedDialog.qml 2014-10-01 15:57:46 +0000
98+++ src/qml/Dialogs/SimLockedDialog.qml 2015-06-22 15:00:39 +0000
99@@ -17,8 +17,8 @@
100 */
101
102 import QtQuick 2.0
103-import Ubuntu.Components 1.1
104-import Ubuntu.Components.Popups 0.1
105+import Ubuntu.Components 1.3
106+import Ubuntu.Components.Popups 1.3
107
108 Component {
109 Dialog {
110
111=== modified file 'src/qml/KeyboardRectangle.qml'
112--- src/qml/KeyboardRectangle.qml 2014-08-11 22:59:14 +0000
113+++ src/qml/KeyboardRectangle.qml 2015-06-22 15:00:39 +0000
114@@ -16,7 +16,7 @@
115 * along with this program. If not, see <http://www.gnu.org/licenses/>.
116 */
117
118-import QtQuick 2.2
119+import QtQuick 2.4
120
121 Item {
122 id: keyboardRect
123
124=== modified file 'src/qml/LocalPageWithBottomEdge.qml'
125--- src/qml/LocalPageWithBottomEdge.qml 2014-10-01 19:54:08 +0000
126+++ src/qml/LocalPageWithBottomEdge.qml 2015-06-22 15:00:39 +0000
127@@ -62,8 +62,8 @@
128
129 */
130
131-import QtQuick 2.2
132-import Ubuntu.Components 1.1
133+import QtQuick 2.4
134+import Ubuntu.Components 1.3
135
136 Page {
137 id: page
138
139=== modified file 'src/qml/MMS/MMSBase.qml'
140--- src/qml/MMS/MMSBase.qml 2014-08-19 18:41:57 +0000
141+++ src/qml/MMS/MMSBase.qml 2015-06-22 15:00:39 +0000
142@@ -15,7 +15,7 @@
143 * You should have received a copy of the GNU General Public License
144 * along with this program. If not, see <http://www.gnu.org/licenses/>.
145 */
146-import QtQuick 2.2
147+import QtQuick 2.4
148
149 Item {
150 id: baseDelegate
151
152=== modified file 'src/qml/MMS/MMSContact.qml'
153--- src/qml/MMS/MMSContact.qml 2015-06-10 23:12:40 +0000
154+++ src/qml/MMS/MMSContact.qml 2015-06-22 15:00:39 +0000
155@@ -16,8 +16,8 @@
156 * along with this program. If not, see <http://www.gnu.org/licenses/>.
157 */
158
159-import QtQuick 2.2
160-import Ubuntu.Components 1.1
161+import QtQuick 2.4
162+import Ubuntu.Components 1.3
163 import Ubuntu.Contacts 0.1
164 import Ubuntu.History 0.1
165
166
167=== modified file 'src/qml/MMS/MMSDefault.qml'
168--- src/qml/MMS/MMSDefault.qml 2015-02-27 21:41:28 +0000
169+++ src/qml/MMS/MMSDefault.qml 2015-06-22 15:00:39 +0000
170@@ -16,8 +16,8 @@
171 * along with this program. If not, see <http://www.gnu.org/licenses/>.
172 */
173
174-import QtQuick 2.2
175-import Ubuntu.Components 1.1
176+import QtQuick 2.4
177+import Ubuntu.Components 1.3
178 import ".."
179
180 MMSBase {
181
182=== modified file 'src/qml/MMS/MMSImage.qml'
183--- src/qml/MMS/MMSImage.qml 2014-08-29 14:06:26 +0000
184+++ src/qml/MMS/MMSImage.qml 2015-06-22 15:00:39 +0000
185@@ -16,8 +16,8 @@
186 * along with this program. If not, see <http://www.gnu.org/licenses/>.
187 */
188
189-import QtQuick 2.2
190-import Ubuntu.Components 1.1
191+import QtQuick 2.4
192+import Ubuntu.Components 1.3
193
194 MMSBase {
195 id: imageDelegate
196
197=== modified file 'src/qml/MMS/MMSVideo.qml'
198--- src/qml/MMS/MMSVideo.qml 2014-08-11 22:59:14 +0000
199+++ src/qml/MMS/MMSVideo.qml 2015-06-22 15:00:39 +0000
200@@ -16,8 +16,8 @@
201 * along with this program. If not, see <http://www.gnu.org/licenses/>.
202 */
203
204-import QtQuick 2.2
205-import Ubuntu.Components 1.1
206+import QtQuick 2.4
207+import Ubuntu.Components 1.3
208 import QtMultimedia 5.0
209 import ".."
210
211
212=== modified file 'src/qml/MMS/Previewer.qml'
213--- src/qml/MMS/Previewer.qml 2014-08-29 21:59:55 +0000
214+++ src/qml/MMS/Previewer.qml 2015-06-22 15:00:39 +0000
215@@ -16,8 +16,8 @@
216 * along with this program. If not, see <http://www.gnu.org/licenses/>.
217 */
218
219-import QtQuick 2.2
220-import Ubuntu.Components 1.1
221+import QtQuick 2.4
222+import Ubuntu.Components 1.3
223 import Ubuntu.Content 0.1
224 import ".."
225
226@@ -79,11 +79,11 @@
227
228 onPeerSelected: {
229 picker.curTransfer = peer.request();
230- mainStack.pop();
231+ mainStack.removePages(picker);
232 if (picker.curTransfer.state === ContentTransfer.InProgress)
233 picker.__exportItems(picker.url);
234 }
235- onCancelPressed: mainStack.pop();
236+ onCancelPressed: mainStack.removePages(picker);
237 }
238
239 Connections {
240
241=== modified file 'src/qml/MMS/PreviewerContact.qml'
242--- src/qml/MMS/PreviewerContact.qml 2015-06-10 23:12:40 +0000
243+++ src/qml/MMS/PreviewerContact.qml 2015-06-22 15:00:39 +0000
244@@ -16,8 +16,8 @@
245 * along with this program. If not, see <http://www.gnu.org/licenses/>.
246 */
247
248-import QtQuick 2.2
249-import Ubuntu.Components 1.1
250+import QtQuick 2.4
251+import Ubuntu.Components 1.3
252 import Ubuntu.Content 0.1
253 import ".."
254
255
256=== modified file 'src/qml/MMS/PreviewerImage.qml'
257--- src/qml/MMS/PreviewerImage.qml 2014-08-21 16:12:06 +0000
258+++ src/qml/MMS/PreviewerImage.qml 2015-06-22 15:00:39 +0000
259@@ -16,8 +16,8 @@
260 * along with this program. If not, see <http://www.gnu.org/licenses/>.
261 */
262
263-import QtQuick 2.2
264-import Ubuntu.Components 1.1
265+import QtQuick 2.4
266+import Ubuntu.Components 1.3
267 import Ubuntu.Content 0.1
268 import ".."
269
270
271=== modified file 'src/qml/MMS/PreviewerVideo.qml'
272--- src/qml/MMS/PreviewerVideo.qml 2014-08-11 22:59:14 +0000
273+++ src/qml/MMS/PreviewerVideo.qml 2015-06-22 15:00:39 +0000
274@@ -16,8 +16,8 @@
275 * along with this program. If not, see <http://www.gnu.org/licenses/>.
276 */
277
278-import QtQuick 2.2
279-import Ubuntu.Components 1.1
280+import QtQuick 2.4
281+import Ubuntu.Components 1.3
282 import QtMultimedia 5.0
283 import ".."
284
285
286=== modified file 'src/qml/MMSDelegate.qml'
287--- src/qml/MMSDelegate.qml 2015-02-28 04:08:20 +0000
288+++ src/qml/MMSDelegate.qml 2015-06-22 15:00:39 +0000
289@@ -16,8 +16,8 @@
290 * along with this program. If not, see <http://www.gnu.org/licenses/>.
291 */
292
293-import QtQuick 2.2
294-import Ubuntu.Components 1.1
295+import QtQuick 2.4
296+import Ubuntu.Components 1.3
297 import Ubuntu.Telephony 0.1
298
299 MessageDelegate {
300
301=== modified file 'src/qml/MMSMessageBubble.qml'
302--- src/qml/MMSMessageBubble.qml 2014-08-27 16:05:37 +0000
303+++ src/qml/MMSMessageBubble.qml 2015-06-22 15:00:39 +0000
304@@ -16,7 +16,7 @@
305 * along with this program. If not, see <http://www.gnu.org/licenses/>.
306 */
307
308-import QtQuick 2.2
309+import QtQuick 2.4
310
311 MessageBubble {
312 id: bubble
313
314=== modified file 'src/qml/MainPage.qml'
315--- src/qml/MainPage.qml 2015-04-30 22:47:38 +0000
316+++ src/qml/MainPage.qml 2015-06-22 15:00:39 +0000
317@@ -16,9 +16,9 @@
318 * along with this program. If not, see <http://www.gnu.org/licenses/>.
319 */
320
321-import QtQuick 2.2
322-import Ubuntu.Components 1.1
323-import Ubuntu.Components.ListItems 0.1 as ListItem
324+import QtQuick 2.4
325+import Ubuntu.Components 1.3
326+import Ubuntu.Components.ListItems 1.3 as ListItem
327 import Ubuntu.Contacts 0.1
328 import Ubuntu.History 0.1
329 import "dateUtils.js" as DateUtils
330@@ -77,7 +77,7 @@
331 objectName: "settingsAction"
332 text: i18n.tr("Settings")
333 iconName: "settings"
334- onTriggered: pageStack.push(Qt.resolvedUrl("SettingsPage.qml"))
335+ onTriggered: pageStack.addPageToCurrentColumn(mainPage, Qt.resolvedUrl("SettingsPage.qml"))
336 }
337 ]
338 },
339@@ -217,7 +217,7 @@
340 if (model.participants[0].alias) {
341 properties["firstRecipientAlias"] = model.participants[0].alias;
342 }
343- mainStack.push(Qt.resolvedUrl("Messages.qml"), properties)
344+ mainStack.addPageToNextColumn(mainPage, Qt.resolvedUrl("Messages.qml"), properties)
345 }
346 }
347 onItemPressAndHold: {
348
349=== modified file 'src/qml/MessageBubble.qml'
350--- src/qml/MessageBubble.qml 2014-11-24 18:39:02 +0000
351+++ src/qml/MessageBubble.qml 2015-06-22 15:00:39 +0000
352@@ -16,8 +16,8 @@
353 * along with this program. If not, see <http://www.gnu.org/licenses/>.
354 */
355
356-import QtQuick 2.2
357-import Ubuntu.Components 1.1
358+import QtQuick 2.4
359+import Ubuntu.Components 1.3
360 import Ubuntu.History 0.1
361 import Ubuntu.Telephony.PhoneNumber 0.1 as PhoneNumber
362
363
364=== modified file 'src/qml/MessageDateSection.qml'
365--- src/qml/MessageDateSection.qml 2014-09-24 19:57:31 +0000
366+++ src/qml/MessageDateSection.qml 2015-06-22 15:00:39 +0000
367@@ -16,9 +16,9 @@
368 * along with this program. If not, see <http://www.gnu.org/licenses/>.
369 */
370
371-import QtQuick 2.2
372-import Ubuntu.Components 1.1
373-import Ubuntu.Components.ListItems 0.1 as ListItem
374+import QtQuick 2.4
375+import Ubuntu.Components 1.3
376+import Ubuntu.Components.ListItems 1.3 as ListItem
377
378 Item {
379 property alias text: label.text
380
381=== modified file 'src/qml/MessageDelegate.qml'
382--- src/qml/MessageDelegate.qml 2014-08-28 21:54:12 +0000
383+++ src/qml/MessageDelegate.qml 2015-06-22 15:00:39 +0000
384@@ -16,7 +16,7 @@
385 * along with this program. If not, see <http://www.gnu.org/licenses/>.
386 */
387
388-import QtQuick 2.2
389+import QtQuick 2.4
390
391 Item {
392 id: messageDelegate
393
394=== modified file 'src/qml/MessageDelegateFactory.qml'
395--- src/qml/MessageDelegateFactory.qml 2015-05-21 18:52:13 +0000
396+++ src/qml/MessageDelegateFactory.qml 2015-06-22 15:00:39 +0000
397@@ -16,8 +16,8 @@
398 * along with this program. If not, see <http://www.gnu.org/licenses/>.
399 */
400
401-import QtQuick 2.2
402-import Ubuntu.Components 1.1
403+import QtQuick 2.4
404+import Ubuntu.Components 1.3
405 import Ubuntu.Contacts 0.1
406 import Ubuntu.History 0.1
407
408
409=== modified file 'src/qml/MessageInfoDialog.qml'
410--- src/qml/MessageInfoDialog.qml 2015-02-26 19:08:50 +0000
411+++ src/qml/MessageInfoDialog.qml 2015-06-22 15:00:39 +0000
412@@ -16,8 +16,8 @@
413 * along with this program. If not, see <http://www.gnu.org/licenses/>.
414 */
415
416-import QtQuick 2.2
417-import Ubuntu.Components 1.1
418+import QtQuick 2.4
419+import Ubuntu.Components 1.3
420 import Ubuntu.Components.Popups 0.1
421 import Ubuntu.History 0.1
422 import Ubuntu.Telephony.PhoneNumber 0.1 as PhoneUtils
423
424=== modified file 'src/qml/Messages.qml'
425--- src/qml/Messages.qml 2015-06-10 23:12:40 +0000
426+++ src/qml/Messages.qml 2015-06-22 15:00:39 +0000
427@@ -16,10 +16,10 @@
428 * along with this program. If not, see <http://www.gnu.org/licenses/>.
429 */
430
431-import QtQuick 2.2
432+import QtQuick 2.4
433 import QtQuick.Window 2.0
434-import Ubuntu.Components 1.1
435-import Ubuntu.Components.ListItems 0.1 as ListItem
436+import Ubuntu.Components 1.3
437+import Ubuntu.Components.ListItems 1.3 as ListItem
438 import Ubuntu.Components.Popups 0.1
439 import Ubuntu.Content 0.1
440 import Ubuntu.History 0.1
441@@ -499,7 +499,7 @@
442 if (typeof mainPage !== 'undefined') {
443 mainPage.temporaryProperties = null
444 }
445- mainStack.pop()
446+ mainStack.removePages(messages)
447 }
448 }
449
450@@ -591,7 +591,7 @@
451 iconName: "contact"
452 onTriggered: {
453 Qt.inputMethod.hide()
454- mainStack.push(Qt.resolvedUrl("NewRecipientPage.qml"), {"multiRecipient": multiRecipient, "parentPage": messages})
455+ mainStack.addPageToCurrentColumn(messages, Qt.resolvedUrl("NewRecipientPage.qml"), {"multiRecipient": multiRecipient, "parentPage": messages})
456 }
457 }
458
459@@ -745,7 +745,8 @@
460 property alias text: messageTextArea.text
461 property alias inputMethodComposing: messageTextArea.inputMethodComposing
462 property int fullSize: attachmentThumbnails.height + messageTextArea.height
463- style: Theme.createStyleComponent("TextAreaStyle.qml", textEntry)
464+// style: Theme.createStyleComponent("TextAreaStyle.qml", textEntry)
465+ styleName: "TextAreaStyle"
466 anchors.bottomMargin: units.gu(1)
467 anchors.bottom: parent.bottom
468 anchors.left: attachButton.right
469
470=== modified file 'src/qml/MessagesListView.qml'
471--- src/qml/MessagesListView.qml 2015-04-30 15:15:01 +0000
472+++ src/qml/MessagesListView.qml 2015-06-22 15:00:39 +0000
473@@ -16,10 +16,10 @@
474 * along with this program. If not, see <http://www.gnu.org/licenses/>.
475 */
476
477-import QtQuick 2.2
478+import QtQuick 2.4
479
480-import Ubuntu.Components 1.1
481-import Ubuntu.Components.ListItems 0.1 as ListItem
482+import Ubuntu.Components 1.3
483+import Ubuntu.Components.ListItems 1.3 as ListItem
484 import Ubuntu.Contacts 0.1
485 import Ubuntu.History 0.1
486
487
488=== modified file 'src/qml/MessagingContactEditorPage.qml'
489--- src/qml/MessagingContactEditorPage.qml 2015-04-30 22:06:35 +0000
490+++ src/qml/MessagingContactEditorPage.qml 2015-06-22 15:00:39 +0000
491@@ -16,10 +16,10 @@
492 * along with this program. If not, see <http://www.gnu.org/licenses/>.
493 */
494
495-import QtQuick 2.2
496+import QtQuick 2.4
497 import QtContacts 5.0
498
499-import Ubuntu.Components 1.1
500+import Ubuntu.Components 1.3
501
502 import Ubuntu.AddressBook.ContactEditor 0.1
503
504
505=== modified file 'src/qml/MessagingContactViewPage.qml'
506--- src/qml/MessagingContactViewPage.qml 2015-06-01 20:15:09 +0000
507+++ src/qml/MessagingContactViewPage.qml 2015-06-22 15:00:39 +0000
508@@ -17,10 +17,10 @@
509 */
510
511
512-import QtQuick 2.2
513+import QtQuick 2.4
514 import QtContacts 5.0
515
516-import Ubuntu.Components 1.1
517+import Ubuntu.Components 1.3
518 import Ubuntu.Components.Popups 1.0 as Popups
519 import Ubuntu.Contacts 0.1
520
521@@ -42,7 +42,7 @@
522 var newDetail = Qt.createQmlObject(detailSourceTemplate, contact)
523 if (newDetail) {
524 contact.addDetail(newDetail)
525- pageStack.push(root.contactEditorPageURL,
526+ pageStack.addPageToNextColumn(root, root.contactEditorPageURL,
527 { model: root.model,
528 contact: contact,
529 initialFocusSection: "phones",
530@@ -60,7 +60,7 @@
531 text: i18n.tr("Share")
532 iconName: "share"
533 onTriggered: {
534- pageStack.push(contactShareComponent,
535+ pageStack.addPageToNextColumn(root, contactShareComponent,
536 { contactModel: root.model,
537 contacts: [root.contact] })
538 }
539@@ -70,7 +70,7 @@
540 text: i18n.tr("Edit")
541 iconName: "edit"
542 onTriggered: {
543- pageStack.push(contactEditorPageURL,
544+ pageStack.addPageToNextColumn(root, contactEditorPageURL,
545 { model: root.model,
546 contact: root.contact,
547 contactListPage: root.contactListPage })
548@@ -120,9 +120,9 @@
549 } else {
550 Qt.openUrlExternally(("%1:%2").arg(action).arg(detail.value(0)))
551 }
552- pageStack.pop()
553+ pageStack.removePages(root)
554 }
555- onContactRemoved: pageStack.pop()
556+ onContactRemoved: pageStack.removePages(root)
557 onContactFetched: {
558 root.contact = contact
559 if (root.active && root.addPhoneToContact != "") {
560
561=== modified file 'src/qml/MultiRecipientInput.qml'
562--- src/qml/MultiRecipientInput.qml 2015-03-18 13:44:33 +0000
563+++ src/qml/MultiRecipientInput.qml 2015-06-22 15:00:39 +0000
564@@ -16,8 +16,8 @@
565 * along with this program. If not, see <http://www.gnu.org/licenses/>.
566 */
567
568-import QtQuick 2.2
569-import Ubuntu.Components 1.1
570+import QtQuick 2.4
571+import Ubuntu.Components 1.3
572 import Ubuntu.Contacts 0.1
573 import Ubuntu.Telephony 0.1
574 import QtContacts 5.0
575@@ -29,7 +29,7 @@
576 property variant recipients: []
577 property string searchString: ""
578 signal clearSearch()
579- style: Theme.createStyleComponent("TextFieldStyle.qml", multiRecipientWidget)
580+ styleName: "TextFieldStyle"
581 clip: true
582 height: contactFlow.height
583 focus: activeFocus
584
585=== modified file 'src/qml/NewRecipientPage.qml'
586--- src/qml/NewRecipientPage.qml 2015-05-13 19:37:01 +0000
587+++ src/qml/NewRecipientPage.qml 2015-06-22 15:00:39 +0000
588@@ -16,8 +16,8 @@
589 * along with this program. If not, see <http://www.gnu.org/licenses/>.
590 */
591
592-import QtQuick 2.2
593-import Ubuntu.Components 1.1
594+import QtQuick 2.4
595+import Ubuntu.Components 1.3
596 import Ubuntu.Contacts 0.1
597 import QtContacts 5.0
598
599@@ -44,7 +44,7 @@
600 {
601 multiRecipient.addRecipient(phoneNumber)
602 multiRecipient.forceActiveFocus()
603- mainStack.pop()
604+ mainStack.removePages(newRecipientPage)
605 }
606
607 title: i18n.tr("Add recipient")
608@@ -152,7 +152,7 @@
609
610 onAddNewContactClicked: {
611 var newContact = ContactsJS.createEmptyContact(newRecipientPage.phoneToAdd, newRecipientPage)
612- pageStack.push(Qt.resolvedUrl("MessagingContactEditorPage.qml"),
613+ pageStack.addPageToNextColumn(newRecipientPage, Qt.resolvedUrl("MessagingContactEditorPage.qml"),
614 { model: contactList.listModel,
615 contact: newContact,
616 initialFocusSection: (newRecipientPage.phoneToAdd != "" ? "phones" : "name"),
617
618=== modified file 'src/qml/PictureImport.qml'
619--- src/qml/PictureImport.qml 2014-09-05 12:35:40 +0000
620+++ src/qml/PictureImport.qml 2015-06-22 15:00:39 +0000
621@@ -14,8 +14,8 @@
622 * along with this program. If not, see <http://www.gnu.org/licenses/>.
623 */
624
625-import QtQuick 2.2
626-import Ubuntu.Components 1.1
627+import QtQuick 2.4
628+import Ubuntu.Components 1.3
629 import Ubuntu.Components.Popups 1.0 as Popups
630 import Ubuntu.Content 0.1 as ContentHub
631
632
633=== modified file 'src/qml/RegularMessageDelegate.qml'
634--- src/qml/RegularMessageDelegate.qml 2015-04-29 16:51:01 +0000
635+++ src/qml/RegularMessageDelegate.qml 2015-06-22 15:00:39 +0000
636@@ -16,7 +16,7 @@
637 * along with this program. If not, see <http://www.gnu.org/licenses/>.
638 */
639
640-import QtQuick 2.2
641+import QtQuick 2.4
642 import Ubuntu.History 0.1
643 import "dateUtils.js" as DateUtils
644
645
646=== modified file 'src/qml/SMSDelegate.qml'
647--- src/qml/SMSDelegate.qml 2015-02-24 14:42:19 +0000
648+++ src/qml/SMSDelegate.qml 2015-06-22 15:00:39 +0000
649@@ -16,8 +16,8 @@
650 * along with this program. If not, see <http://www.gnu.org/licenses/>.
651 */
652
653-import QtQuick 2.2
654-import Ubuntu.Components 1.1
655+import QtQuick 2.4
656+import Ubuntu.Components 1.3
657
658 import "dateUtils.js" as DateUtils
659
660
661=== modified file 'src/qml/SettingsPage.qml'
662--- src/qml/SettingsPage.qml 2015-04-30 22:47:38 +0000
663+++ src/qml/SettingsPage.qml 2015-06-22 15:00:39 +0000
664@@ -16,9 +16,9 @@
665 * along with this program. If not, see <http://www.gnu.org/licenses/>.
666 */
667
668-import QtQuick 2.2
669-import Ubuntu.Components 1.1
670-import Ubuntu.Components.ListItems 0.1 as ListItem
671+import QtQuick 2.4
672+import Ubuntu.Components 1.3
673+import Ubuntu.Components.ListItems 1.3 as ListItem
674 import GSettings 1.0
675
676 Page {
677
678=== modified file 'src/qml/StandardAnimation.qml'
679--- src/qml/StandardAnimation.qml 2014-08-11 22:59:14 +0000
680+++ src/qml/StandardAnimation.qml 2015-06-22 15:00:39 +0000
681@@ -16,7 +16,7 @@
682 * along with this program. If not, see <http://www.gnu.org/licenses/>.
683 */
684
685-import QtQuick 2.2
686+import QtQuick 2.4
687
688 NumberAnimation {
689 duration: 300
690
691=== modified file 'src/qml/SwipeItemDemo.qml'
692--- src/qml/SwipeItemDemo.qml 2015-05-07 17:20:59 +0000
693+++ src/qml/SwipeItemDemo.qml 2015-06-22 15:00:39 +0000
694@@ -16,11 +16,11 @@
695 * along with this program. If not, see <http://www.gnu.org/licenses/>.
696 */
697
698-import QtQuick 2.0
699+import QtQuick 2.4
700 import QtQuick.Layouts 1.1
701 import Qt.labs.settings 1.0
702
703-import Ubuntu.Components 1.1
704+import Ubuntu.Components 1.3
705 import Ubuntu.Contacts 0.1
706
707
708@@ -186,7 +186,7 @@
709 }
710 ]
711
712- animated: false
713+// animated: false
714 onXPosChanged: listItem.updatePosition(xPos)
715
716 }
717
718=== modified file 'src/qml/ThreadDelegate.qml'
719--- src/qml/ThreadDelegate.qml 2015-04-08 22:00:19 +0000
720+++ src/qml/ThreadDelegate.qml 2015-06-22 15:00:39 +0000
721@@ -16,8 +16,8 @@
722 * along with this program. If not, see <http://www.gnu.org/licenses/>.
723 */
724
725-import QtQuick 2.2
726-import Ubuntu.Components 1.1
727+import QtQuick 2.4
728+import Ubuntu.Components 1.3
729 import Ubuntu.Components.Popups 0.1
730 import Ubuntu.Telephony 0.1
731 import Ubuntu.Contacts 0.1
732
733=== modified file 'src/qml/messaging-app.qml'
734--- src/qml/messaging-app.qml 2015-05-13 19:37:01 +0000
735+++ src/qml/messaging-app.qml 2015-06-22 15:00:39 +0000
736@@ -16,10 +16,10 @@
737 * along with this program. If not, see <http://www.gnu.org/licenses/>.
738 */
739
740-import QtQuick 2.2
741+import QtQuick 2.4
742 import Qt.labs.settings 1.0
743-import Ubuntu.Components 1.1
744-import Ubuntu.Components.Popups 0.1
745+import Ubuntu.Components 1.3
746+import Ubuntu.Components.Popups 1.3
747 import Ubuntu.Telephony 0.1
748 import Ubuntu.Content 0.1
749 import Ubuntu.History 0.1
750@@ -53,12 +53,12 @@
751 initialProperties['contact'] = contact
752 }
753
754- mainStack.push(Qt.resolvedUrl("MessagingContactViewPage.qml"),
755+ mainStack.addPageToNextColumn(contactListPage, Qt.resolvedUrl("MessagingContactViewPage.qml"),
756 initialProperties)
757 }
758
759 function addNewContact(phoneNumber, contactListPage) {
760- mainStack.push(Qt.resolvedUrl("MessagingContactEditorPage.qml"),
761+ mainStack.addPageToNextColumn(contactListPage, Qt.resolvedUrl("MessagingContactEditorPage.qml"),
762 { "contactId": contactId,
763 "addPhoneToContact": phoneNumber,
764 "contactListPage": contactListPage })
765@@ -66,7 +66,7 @@
766
767 function addPhoneToContact(contact, phoneNumber, contactListPage, contactsModel) {
768 if (contact === "") {
769- mainStack.push(Qt.resolvedUrl("NewRecipientPage.qml"),
770+ mainStack.addPageToNextColumn(contactListPage, Qt.resolvedUrl("NewRecipientPage.qml"),
771 { "phoneToAdd": phoneNumber })
772 } else {
773 var initialProperties = { "addPhoneToContact": phoneNumber,
774@@ -77,7 +77,7 @@
775 } else {
776 initialProperties['contact'] = contact
777 }
778- mainStack.push(Qt.resolvedUrl("MessagingContactViewPage.qml"),
779+ mainStack.addPageToNextColumn(contactListPage, Qt.resolvedUrl("MessagingContactViewPage.qml"),
780 initialProperties)
781 }
782 }
783@@ -98,9 +98,8 @@
784
785
786 automaticOrientation: true
787- width: units.gu(40)
788+ width: units.gu(90)
789 height: units.gu(71)
790- useDeprecatedToolbar: false
791 anchorToKeyboard: false
792
793 Component.onCompleted: {
794@@ -143,9 +142,10 @@
795 target: ContentHub
796 onShareRequested: {
797 var properties = {}
798- emptyStack()
799+ mainStack.emptyStack()
800 properties["sharedAttachmentsTransfer"] = transfer
801- mainStack.currentPage.showBottomEdgePage(Qt.resolvedUrl("Messages.qml"), properties)
802+ // FIXME this won't work, we need something which gives the current page over the column
803+// mainStack.currentPage.showBottomEdgePage(Qt.resolvedUrl("Messages.qml"), properties)
804 }
805 }
806
807@@ -166,16 +166,11 @@
808 return ContentType.Unknown
809 }
810
811- function emptyStack() {
812- while (mainStack.depth !== 1 && mainStack.depth !== 0) {
813- mainStack.pop()
814- }
815- }
816-
817 function startNewMessage() {
818 var properties = {}
819- emptyStack()
820- mainStack.currentPage.showBottomEdgePage(Qt.resolvedUrl("Messages.qml"))
821+ mainStack.emptyStack()
822+ // FIXME this won't work, we need something which gives the current page over the column
823+// mainStack.currentPage.showBottomEdgePage(Qt.resolvedUrl("Messages.qml"))
824 }
825
826 function startChat(identifiers, text) {
827@@ -183,11 +178,11 @@
828 var participants = identifiers.split(";")
829 properties["participants"] = participants
830 properties["text"] = text
831- emptyStack()
832+ mainPages.emptyStack()
833 if (participants.length === 0) {
834 return;
835 }
836- mainStack.push(Qt.resolvedUrl("Messages.qml"), properties)
837+ mainStack.addPageToCurrentColumn(mainStack.mainPage, Qt.resolvedUrl("Messages.qml"), properties)
838 }
839
840 Connections {
841@@ -200,10 +195,18 @@
842 }
843
844
845- PageStack {
846+ MultiColumnView {
847 id: mainStack
848
849+ anchors.fill: parent
850+
851 objectName: "mainStack"
852- Component.onCompleted: mainStack.push(Qt.resolvedUrl("MainPage.qml"))
853+ columns: mainStack.width > units.gu(80) ? 2 : 1
854+ property Page mainPage
855+ Component.onCompleted: mainPage = mainStack.addPageToCurrentColumn(null, Qt.resolvedUrl("MainPage.qml"))
856+
857+ function emptyStack() {
858+ removePages(mainPage);
859+ }
860 }
861 }
862
863=== modified file 'tests/qml/tst_MessageBubble.qml'
864--- tests/qml/tst_MessageBubble.qml 2014-08-27 17:50:35 +0000
865+++ tests/qml/tst_MessageBubble.qml 2015-06-22 15:00:39 +0000
866@@ -16,7 +16,7 @@
867 * along with this program. If not, see <http://www.gnu.org/licenses/>.
868 */
869
870-import QtQuick 2.2
871+import QtQuick 2.4
872 import QtTest 1.0
873 import Ubuntu.Test 0.1
874

Subscribers

People subscribed via source and target branches