Merge lp:~karni/telegram-app/telegram-app-contacts-update into lp:telegram-app/app

Proposed by Michał Karnicki
Status: Merged
Merged at revision: 29
Proposed branch: lp:~karni/telegram-app/telegram-app-contacts-update
Merge into: lp:telegram-app/app
Diff against target: 50 lines (+13/-2)
2 files modified
ui/ContactsPage.qml (+12/-1)
ui/DialogsPage.qml (+1/-1)
To merge this branch: bzr merge lp:~karni/telegram-app/telegram-app-contacts-update
Reviewer Review Type Date Requested Status
Roberto Mier Escandon (community) Approve
Review via email: mp+230596@code.launchpad.net

Description of the change

Contacts page update to align with library update.

To post a comment you must log in.
Revision history for this message
Roberto Mier Escandon (rmescandon) wrote :

Just a comment

review: Approve
33. By Michał Karnicki

Review fix.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ui/ContactsPage.qml'
2--- ui/ContactsPage.qml 2014-07-31 02:48:33 +0000
3+++ ui/ContactsPage.qml 2014-08-13 09:47:42 +0000
4@@ -28,6 +28,17 @@
5 text: i18n.tr("No contacts")
6 }
7
8+ ContactsModel {
9+ id: contactsModel
10+ }
11+
12+ ContactsProxy {
13+ id: contactsProxy
14+ sourceModel: contactsModel
15+ sortRole: ContactsModel.FirstNameRole
16+ ascending: true
17+ }
18+
19 ListView {
20 id: contactListView
21 anchors {
22@@ -37,7 +48,7 @@
23
24 clip: true
25
26- model: telegramClient.contactsModel
27+ model: contactsProxy
28 delegate: TelegramContactsListItem {
29 // no image and lastSeen, lp #1347491
30 image: model.thumbnail !== "" ? model.thumbnail
31
32=== modified file 'ui/DialogsPage.qml'
33--- ui/DialogsPage.qml 2014-08-11 17:52:13 +0000
34+++ ui/DialogsPage.qml 2014-08-13 09:47:42 +0000
35@@ -52,6 +52,7 @@
36 sourceModel: dialogsModel
37 sortRole: DialogsModel.TopMessageDateRole
38 dynamicSortFilter: true
39+ ascending: false
40 }
41
42 ListView {
43@@ -59,7 +60,6 @@
44 anchors.fill: parent
45 clip: true
46
47-
48 model: dialogsProxy
49 delegate: TelegramDialogsListItem {
50 image: model.thumbnail !== "" ?

Subscribers

People subscribed via source and target branches