Merge lp:~renatofilho/dialer-app/fix-1489330 into lp:dialer-app

Proposed by Renato Araujo Oliveira Filho
Status: Approved
Approved by: Gustavo Pichorim Boiko
Approved revision: 481
Proposed branch: lp:~renatofilho/dialer-app/fix-1489330
Merge into: lp:dialer-app
Diff against target: 33 lines (+8/-1)
1 file modified
src/qml/ContactsPage/ContactsPage.qml (+8/-1)
To merge this branch: bzr merge lp:~renatofilho/dialer-app/fix-1489330
Reviewer Review Type Date Requested Status
Gustavo Pichorim Boiko (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+276130@code.launchpad.net

Commit message

Only show favorite section if the list contains favorite contacts.

To post a comment you must log in.
477. By Renato Araujo Oliveira Filho

Only show header section if there is favorite contacts.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
478. By Renato Araujo Oliveira Filho

Trunk merged.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
479. By Renato Araujo Oliveira Filho

Use the new ContactMap component to check the favorites contacts.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
480. By Renato Araujo Oliveira Filho

Make sure that 'all' contacts is listed when 'favorite' section is gone.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
481. By Renato Araujo Oliveira Filho

Show favorite section if the most called model is not empty.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Gustavo Pichorim Boiko (boiko) wrote :

Looks good!

review: Approve
482. By Renato Araujo Oliveira Filho

Trunk merged.

483. By Renato Araujo Oliveira Filho

Trunk merged.

484. By Renato Araujo Oliveira Filho

Trunk merged.

Unmerged revisions

484. By Renato Araujo Oliveira Filho

Trunk merged.

483. By Renato Araujo Oliveira Filho

Trunk merged.

482. By Renato Araujo Oliveira Filho

Trunk merged.

481. By Renato Araujo Oliveira Filho

Show favorite section if the most called model is not empty.

480. By Renato Araujo Oliveira Filho

Make sure that 'all' contacts is listed when 'favorite' section is gone.

479. By Renato Araujo Oliveira Filho

Use the new ContactMap component to check the favorites contacts.

478. By Renato Araujo Oliveira Filho

Trunk merged.

477. By Renato Araujo Oliveira Filho

Only show header section if there is favorite contacts.

476. By Renato Araujo Oliveira Filho

Only show favorite section if the list contains favorite contacts.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/ContactsPage/ContactsPage.qml'
2--- src/qml/ContactsPage/ContactsPage.qml 2015-11-19 01:08:28 +0000
3+++ src/qml/ContactsPage/ContactsPage.qml 2016-05-16 15:56:50 +0000
4@@ -89,7 +89,8 @@
5 PropertyChanges {
6 target: contactsPage.head
7 actions: defaultState.actions
8- sections.model: [i18n.ctr("All Contacts", "All"), i18n.tr("Favorites")]
9+ sections.model: contactMap.hasFavorites || (contactList.mostCalledCount > 0) ?
10+ [i18n.ctr("All Contacts", "All"), i18n.tr("Favorites") ] : []
11 }
12 PropertyChanges {
13 target: searchField
14@@ -127,6 +128,8 @@
15
16 Connections {
17 target: contactsPage.head.sections
18+
19+ onModelChanged: contactsPage.head.sections.selectedIndex = 0
20 onSelectedIndexChanged: {
21 switch (contactsPage.head.sections.selectedIndex) {
22 case 0:
23@@ -186,6 +189,10 @@
24 }
25 }
26
27+ ContactMap {
28+ id: contactMap
29+ }
30+
31 Component.onCompleted: {
32 if (QTCONTACTS_PRELOAD_VCARD !== "") {
33 contactList.listModel.importContacts("file://" + QTCONTACTS_PRELOAD_VCARD)

Subscribers

People subscribed via source and target branches