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

Proposed by Renato Araujo Oliveira Filho
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 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

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
=== modified file 'src/qml/ContactsPage/ContactsPage.qml'
--- src/qml/ContactsPage/ContactsPage.qml 2015-01-13 12:08:06 +0000
+++ src/qml/ContactsPage/ContactsPage.qml 2015-02-12 15:00:04 +0000
@@ -137,70 +137,11 @@
137 bottom: keyboardRect.top137 bottom: keyboardRect.top
138 }138 }
139139
140140 showAddNewButton: true
141 header: Item {141 showImportOptions: (contactList.count === 0) && (filterTerm === "")
142 id: addNewContactButton142 onAddNewContactClicked: mainView.createNewContactForPhone(" ")
143 objectName: "addNewContact"143 onInfoRequested: mainView.viewContact(contact.contactId)
144144
145 anchors {
146 left: parent.left
147 right: parent.right
148 }
149 height: units.gu(8)
150
151 Rectangle {
152 anchors.fill: parent
153 color: Theme.palette.selected.background
154 opacity: addNewContactButtonArea.pressed ? 1.0 : 0.0
155 }
156
157 UbuntuShape {
158 id: addIcon
159
160 anchors {
161 left: parent.left
162 top: parent.top
163 bottom: parent.bottom
164 margins: units.gu(1)
165 }
166 width: height
167 radius: "medium"
168 color: Theme.palette.normal.overlay
169 Image {
170 anchors.centerIn: parent
171 width: units.gu(2)
172 height: units.gu(2)
173 source: "image://theme/add"
174 }
175 }
176
177 Label {
178 id: name
179
180 anchors {
181 left: addIcon.right
182 leftMargin: units.gu(2)
183 verticalCenter: parent.verticalCenter
184 right: parent.right
185 rightMargin: units.gu(2)
186 }
187 color: UbuntuColors.lightAubergine
188 // TRANSLATORS: this refers to a new contact
189 text: i18n.tr("+ Create New")
190 elide: Text.ElideRight
191 }
192
193 MouseArea {
194 id: addNewContactButtonArea
195
196 anchors.fill: parent
197 onClicked: mainView.createNewContactForPhone(" ")
198 }
199 }
200
201 onInfoRequested: {
202 mainView.viewContact(contact.contactId)
203 }
204 filterTerm: searchField.text145 filterTerm: searchField.text
205 detailToPick: ContactDetail.PhoneNumber146 detailToPick: ContactDetail.PhoneNumber
206 onDetailClicked: {147 onDetailClicked: {

Subscribers

People subscribed via source and target branches