Merge lp:~mzanetti/reminders-app/abstractbuttons into lp:reminders-app

Proposed by Michael Zanetti
Status: Merged
Approved by: Riccardo Padovani
Approved revision: 350
Merged at revision: 351
Proposed branch: lp:~mzanetti/reminders-app/abstractbuttons
Merge into: lp:reminders-app
Diff against target: 53 lines (+13/-14)
1 file modified
src/app/qml/ui/EditNoteView.qml (+13/-14)
To merge this branch: bzr merge lp:~mzanetti/reminders-app/abstractbuttons
Reviewer Review Type Date Requested Status
Riccardo Padovani Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+250847@code.launchpad.net

Commit message

Use AbstractButtons in EditNoteView

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

lgtm, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/ui/EditNoteView.qml'
2--- src/app/qml/ui/EditNoteView.qml 2015-02-16 23:35:52 +0000
3+++ src/app/qml/ui/EditNoteView.qml 2015-02-24 22:50:22 +0000
4@@ -89,18 +89,17 @@
5 anchors { left: parent.left; right: parent.right; margins: units.gu(1) }
6 height: units.gu(7)
7 spacing: units.gu(2)
8- Icon {
9+ AbstractButton {
10 id: backIcon
11- name: "back"
12 height: units.gu(3)
13 width: height
14 anchors.verticalCenter: parent.verticalCenter
15-
16- MouseArea {
17+ Icon {
18+ name: "back"
19 anchors.fill: parent
20- onClicked: {
21- root.exitEditMode(root.note);
22- }
23+ }
24+ onClicked: {
25+ root.exitEditMode(root.note);
26 }
27 }
28
29@@ -112,17 +111,17 @@
30 width: parent.width - (backIcon.width + parent.spacing) * 2
31 anchors.verticalCenter: parent.verticalCenter
32 }
33- Icon {
34- name: "save"
35+ AbstractButton {
36 height: units.gu(3)
37 width: height
38 anchors.verticalCenter: parent.verticalCenter
39- MouseArea {
40+ Icon {
41+ name: "save"
42 anchors.fill: parent
43- onClicked: {
44- saveNote();
45- root.exitEditMode(root.note);
46- }
47+ }
48+ onClicked: {
49+ saveNote();
50+ root.exitEditMode(root.note);
51 }
52 }
53 }

Subscribers

People subscribed via source and target branches