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

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Bill Filler
Approved revision: 12
Merged at revision: 12
Proposed branch: lp:~renatofilho/address-book-app/fix-1199122
Merge into: lp:address-book-app
Prerequisite: lp:~renatofilho/address-book-app/fix-1200397
Diff against target: 72 lines (+16/-4)
3 files modified
src/artwork/CMakeLists.txt (+1/-0)
src/imports/ContactEdit/ContactEditor.qml (+4/-3)
src/imports/main.qml (+11/-1)
To merge this branch: bzr merge lp:~renatofilho/address-book-app/fix-1199122
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+174428@code.launchpad.net

Commit message

Make sure that the toolbar is always visible when in edit mode.

To post a comment you must log in.
10. By Renato Araujo Oliveira Filho

Make sure that the toolbar is always visible when in edit mode.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
11. By Renato Araujo Oliveira Filho

Added save icon.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
12. By Renato Araujo Oliveira Filho

Make sure that the toolbar is visible when it is locked and the input method appears

Revision history for this message
Bill Filler (bfiller) wrote :

approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/artwork/CMakeLists.txt'
2--- src/artwork/CMakeLists.txt 2013-07-05 16:56:13 +0000
3+++ src/artwork/CMakeLists.txt 2013-07-12 20:37:29 +0000
4@@ -25,6 +25,7 @@
5 protocol-qq.png
6 protocol-skype.png
7 protocol-yahoo.png
8+ save.png
9 settings.png
10 )
11
12
13=== added file 'src/artwork/save.png'
14Binary files src/artwork/save.png 1970-01-01 00:00:00 +0000 and src/artwork/save.png 2013-07-12 20:37:29 +0000 differ
15=== modified file 'src/imports/ContactEdit/ContactEditor.qml'
16--- src/imports/ContactEdit/ContactEditor.qml 2013-07-12 20:37:29 +0000
17+++ src/imports/ContactEdit/ContactEditor.qml 2013-07-12 20:37:29 +0000
18@@ -151,16 +151,17 @@
19 }
20
21 tools: ToolbarItems {
22+ locked: true
23+ opened: true
24 ToolbarButton {
25 action: Action {
26- text: i18n.tr("Save")
27- iconSource: "artwork:/edit.png"
28+ text: i18n.tr("Done")
29+ iconSource: "artwork:/save.png"
30 onTriggered: {
31 // wait for contact to be saved or cause a error
32 contactSaveLock.saving = true
33 contactEditor.save()
34 }
35-
36 }
37 }
38 }
39
40=== modified file 'src/imports/main.qml'
41--- src/imports/main.qml 2013-07-12 20:37:29 +0000
42+++ src/imports/main.qml 2013-07-12 20:37:29 +0000
43@@ -29,18 +29,28 @@
44
45 anchors {
46 fill: parent
47- bottomMargin: Qt.inputMethod.visible ? (Qt.inputMethod.keyboardRectangle.height - mainView.anchors.bottomMargin) + units.gu(2) : 0
48 Behavior on bottomMargin {
49 NumberAnimation {
50 duration: 175
51 easing.type: Easing.OutQuad
52 }
53 }
54+
55+ // make the page full visible if the inputMethod appears
56+ bottomMargin: Qt.inputMethod.visible ? toolbar.height + Qt.inputMethod.keyboardRectangle.height + units.gu(2) : 0
57 //TODO: waiting for final design to correct implementation
58 onBottomMarginChanged: console.debug("TODO: implement scroll to correct position")
59 }
60 }
61
62+ // Make the toolbar visible if it is locked and the inputMethod appears
63+ Binding {
64+ target: toolbar
65+ property: "anchors.bottomMargin"
66+ value: Qt.inputMethod.visible && toolbar.locked ? Qt.inputMethod.keyboardRectangle.height : 0
67+ when: toolbar
68+ }
69+
70 Component.onCompleted: {
71 mainStack.push(Qt.createComponent("ContactList/ContactList.qml"))
72 }

Subscribers

People subscribed via source and target branches