Ubuntu Notes app

Merge lp:~mzanetti/reminders-app/fix-edit-button into lp:reminders-app

  1. fix-edit-button
  2. Merge into trunk
Proposed by Michael Zanetti on 2016-04-29
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄 on 2016-04-29
Approved revision: 551
Merged at revision: 552
Proposed branch: lp:~mzanetti/reminders-app/fix-edit-button
Merge into: lp:reminders-app
Diff against target: 38 lines (+3/-3)
2 files modified
src/app/qml/Reminders.qml (+3/-2)
src/app/qml/ui/EditNoteView.qml (+0/-1)
To merge this branch: bzr merge lp:~mzanetti/reminders-app/fix-edit-button
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 🦄 2016-04-29 Approve on 2016-04-29
Jenkins Bot continuous-integration Approve on 2016-04-29
Review via email: mp+293363@code.launchpad.net

Commit Message

fix the edit button

To post a comment you must log in.
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Tested on my bq e4.5 and it works! 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/Reminders.qml'
2--- src/app/qml/Reminders.qml 2016-03-01 14:57:01 +0000
3+++ src/app/qml/Reminders.qml 2016-04-29 08:41:12 +0000
4@@ -158,7 +158,7 @@
5 })
6 } else {
7 var page = pagestack.push(Qt.createComponent(Qt.resolvedUrl("ui/NotePage.qml")), {readOnly: conflictMode, note: note })
8- page.editNote.connect(function(note) {root.switchToEditMode(note)})
9+ page.editNote.connect(function() {root.switchToEditMode(note)})
10 }
11 } else {
12 var view;
13@@ -189,11 +189,12 @@
14 if (root.narrowMode) {
15 if (pagestack.depth > 1) {
16 pagestack.pop();
17+ var page = pagestack.push(Qt.resolvedUrl("ui/EditNotePage.qml"), {note: note, newNote: false});
18+ page.exitEditMode.connect(function() {Qt.inputMethod.hide(); pagestack.pop();});
19 }
20 } else {
21 sideViewLoader.clear();
22 var view = sideViewLoader.embed(Qt.resolvedUrl("ui/EditNoteView.qml"))
23- print("--- setting note:", note)
24 view.note = note;
25 view.exitEditMode.connect(function(note) {root.displayNote(note)});
26 }
27
28=== modified file 'src/app/qml/ui/EditNoteView.qml'
29--- src/app/qml/ui/EditNoteView.qml 2015-11-02 20:26:37 +0000
30+++ src/app/qml/ui/EditNoteView.qml 2016-04-29 08:41:12 +0000
31@@ -111,7 +111,6 @@
32 Connections {
33 target: Qt.application
34 onActiveChanged: {
35- print("active changed", root, root.note, active)
36 if (root.note) {
37 print("Saving note:", root.note.guid)
38 root.saveNote()

Subscribers

People subscribed via source and target branches