Merge lp:~renatofilho/address-book-app/fix-1213046 into lp:address-book-app

Proposed by Renato Araujo Oliveira Filho on 2013-10-09
Status: Merged
Approved by: Tiago Salem Herrmann on 2013-10-09
Approved revision: 95
Merged at revision: 96
Proposed branch: lp:~renatofilho/address-book-app/fix-1213046
Merge into: lp:address-book-app
Diff against target: 33 lines (+1/-15)
1 file modified
src/imports/Ubuntu/Contacts/ContactDelegate.qml (+1/-15)
To merge this branch: bzr merge lp:~renatofilho/address-book-app/fix-1213046
Reviewer Review Type Date Requested Status
Tiago Salem Herrmann (community) 2013-10-09 Approve on 2013-10-09
PS Jenkins bot continuous-integration Approve on 2013-10-09
Review via email: mp+190123@code.launchpad.net

Commit message

Ask for confirmation during the contact removal.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Tiago Salem Herrmann (tiagosh) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/imports/Ubuntu/Contacts/ContactDelegate.qml'
2--- src/imports/Ubuntu/Contacts/ContactDelegate.qml 2013-10-07 18:41:15 +0000
3+++ src/imports/Ubuntu/Contacts/ContactDelegate.qml 2013-10-09 13:09:34 +0000
4@@ -54,7 +54,7 @@
5 contactListView.swipeToDelete &&
6 !detailsShown &&
7 !contactListView.isInSelectionMode
8-
9+ confirmRemoval: removable
10 UbuntuShape {
11 id: avatar
12
13@@ -150,20 +150,6 @@
14 onItemRemoved: {
15 contactsModel.removeContact(contact.contactId)
16 }
17-
18- backgroundIndicator: Rectangle {
19- anchors.fill: parent
20- color: Theme.palette.selected.base
21- Label {
22- text: "Delete"
23- anchors {
24- fill: parent
25- margins: units.gu(2)
26- }
27- verticalAlignment: Text.AlignVCenter
28- horizontalAlignment: delegate.swipingState === "SwipingLeft" ? Text.AlignLeft : Text.AlignRight
29- }
30- }
31 }
32
33 Loader {

Subscribers

People subscribed via source and target branches