Merge lp:~renatofilho/dialer-app/fix-1417341-rtm into lp:dialer-app/rtm-14.09

Proposed by Renato Araujo Oliveira Filho on 2015-02-12
Status: Needs review
Proposed branch: lp:~renatofilho/dialer-app/fix-1417341-rtm
Merge into: lp:dialer-app/rtm-14.09
Diff against target: 79 lines (+5/-64)
1 file modified
src/qml/ContactsPage/ContactsPage.qml (+5/-64)
To merge this branch: bzr merge lp:~renatofilho/dialer-app/fix-1417341-rtm
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2015-02-12 Pending
Review via email: mp+249504@code.launchpad.net

Commit message

Added "sync with google account" button on empty contact list.

To post a comment you must log in.

Unmerged revisions

265. By Renato Araujo Oliveira Filho on 2015-02-12

Added "sync with google account" button on empty contact list.

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-01-13 12:08:06 +0000
3+++ src/qml/ContactsPage/ContactsPage.qml 2015-02-12 15:00:04 +0000
4@@ -137,70 +137,11 @@
5 bottom: keyboardRect.top
6 }
7
8-
9- header: Item {
10- id: addNewContactButton
11- objectName: "addNewContact"
12-
13- anchors {
14- left: parent.left
15- right: parent.right
16- }
17- height: units.gu(8)
18-
19- Rectangle {
20- anchors.fill: parent
21- color: Theme.palette.selected.background
22- opacity: addNewContactButtonArea.pressed ? 1.0 : 0.0
23- }
24-
25- UbuntuShape {
26- id: addIcon
27-
28- anchors {
29- left: parent.left
30- top: parent.top
31- bottom: parent.bottom
32- margins: units.gu(1)
33- }
34- width: height
35- radius: "medium"
36- color: Theme.palette.normal.overlay
37- Image {
38- anchors.centerIn: parent
39- width: units.gu(2)
40- height: units.gu(2)
41- source: "image://theme/add"
42- }
43- }
44-
45- Label {
46- id: name
47-
48- anchors {
49- left: addIcon.right
50- leftMargin: units.gu(2)
51- verticalCenter: parent.verticalCenter
52- right: parent.right
53- rightMargin: units.gu(2)
54- }
55- color: UbuntuColors.lightAubergine
56- // TRANSLATORS: this refers to a new contact
57- text: i18n.tr("+ Create New")
58- elide: Text.ElideRight
59- }
60-
61- MouseArea {
62- id: addNewContactButtonArea
63-
64- anchors.fill: parent
65- onClicked: mainView.createNewContactForPhone(" ")
66- }
67- }
68-
69- onInfoRequested: {
70- mainView.viewContact(contact.contactId)
71- }
72+ showAddNewButton: true
73+ showImportOptions: (contactList.count === 0) && (filterTerm === "")
74+ onAddNewContactClicked: mainView.createNewContactForPhone(" ")
75+ onInfoRequested: mainView.viewContact(contact.contactId)
76+
77 filterTerm: searchField.text
78 detailToPick: ContactDetail.PhoneNumber
79 onDetailClicked: {

Subscribers

People subscribed via source and target branches