Merge lp:~mzanetti/reminders-app/new-notebook-input into lp:reminders-app

Proposed by Michael Zanetti
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„
Approved revision: 515
Merged at revision: 515
Proposed branch: lp:~mzanetti/reminders-app/new-notebook-input
Merge into: lp:reminders-app
Diff against target: 30 lines (+6/-2)
1 file modified
src/app/qml/ui/NotebooksPage.qml (+6/-2)
To merge this branch: bzr merge lp:~mzanetti/reminders-app/new-notebook-input
Reviewer Review Type Date Requested Status
Alan Pope 🍺🐧🐱 πŸ¦„ (community) Approve
Jenkins Bot continuous-integration Approve
Review via email: mp+277437@code.launchpad.net

Commit message

Fix the input field for new notebook in regard to predictive OSK

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

LGTM

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/NotebooksPage.qml'
2--- src/app/qml/ui/NotebooksPage.qml 2015-09-21 16:32:10 +0000
3+++ src/app/qml/ui/NotebooksPage.qml 2015-11-13 12:13:53 +0000
4@@ -164,20 +164,24 @@
5 id: cancelButton
6 anchors { left: parent.left; verticalCenter: parent.verticalCenter }
7 text: i18n.tr("Cancel")
8+ activeFocusOnPress: false
9 onClicked: {
10 newNoteTitleTextField.text = "";
11 contentColumn.newNotebook = false
12+ newNoteTitleTextField.focus = false;
13 }
14 }
15 Button {
16 objectName: "saveButton"
17+ activeFocusOnPress: false
18 anchors { right: parent.right; verticalCenter: parent.verticalCenter }
19 text: i18n.tr("Save")
20- enabled: newNoteTitleTextField.text.length > 0
21+ enabled: newNoteTitleTextField.text.length > 0 || newNoteTitleTextField.inputMethodComposing
22 onClicked: {
23- NotesStore.createNotebook(newNoteTitleTextField.text);
24+ NotesStore.createNotebook(newNoteTitleTextField.displayText);
25 newNoteTitleTextField.text = "";
26 contentColumn.newNotebook = false
27+ newNoteTitleTextField.focus = false;
28 }
29 }
30 }

Subscribers

People subscribed via source and target branches