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
25
    protocol-qq.png
25
    protocol-qq.png
6
26
    protocol-skype.png
26
    protocol-skype.png
7
27
    protocol-yahoo.png
27
    protocol-yahoo.png
8
28
    save.png
9
28
    settings.png
29
    settings.png
10
29
)
30
)
11
30
31
12
31
32
13
=== added file 'src/artwork/save.png'
14
32
Binary 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
33
Binary 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
151
    }
151
    }
20
152
152
21
153
    tools: ToolbarItems {
153
    tools: ToolbarItems {
22
154
        locked: true
23
155
        opened: true
24
154
        ToolbarButton {
156
        ToolbarButton {
25
155
            action: Action {
157
            action: Action {
28
156
                text: i18n.tr("Save")
158
                text: i18n.tr("Done")
29
157
                iconSource: "artwork:/edit.png"
159
                iconSource: "artwork:/save.png"
30
158
                onTriggered: {
160
                onTriggered: {
31
159
                    // wait for contact to be saved or cause a error
161
                    // wait for contact to be saved or cause a error
32
160
                    contactSaveLock.saving = true
162
                    contactSaveLock.saving = true
33
161
                    contactEditor.save()
163
                    contactEditor.save()
34
162
                }
164
                }
35
163
36
164
            }
165
            }
37
165
        }
166
        }
38
166
    }
167
    }
39
167
168
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
29
29
45
30
        anchors {
30
        anchors {
46
31
            fill: parent
31
            fill: parent
47
32
            bottomMargin: Qt.inputMethod.visible ? (Qt.inputMethod.keyboardRectangle.height - mainView.anchors.bottomMargin) + units.gu(2) : 0
48
33
            Behavior on bottomMargin {
32
            Behavior on bottomMargin {
49
34
                NumberAnimation {
33
                NumberAnimation {
50
35
                    duration: 175
34
                    duration: 175
51
36
                    easing.type: Easing.OutQuad
35
                    easing.type: Easing.OutQuad
52
37
                }
36
                }
53
38
            }
37
            }
54
38
55
39
            // make the page full visible if the inputMethod appears
56
40
            bottomMargin: Qt.inputMethod.visible ? toolbar.height + Qt.inputMethod.keyboardRectangle.height + units.gu(2) : 0
57
39
            //TODO: waiting for final design to correct implementation
41
            //TODO: waiting for final design to correct implementation
58
40
            onBottomMarginChanged: console.debug("TODO: implement scroll to correct position")
42
            onBottomMarginChanged: console.debug("TODO: implement scroll to correct position")
59
41
        }
43
        }
60
42
    }
44
    }
61
43
45
62
46
    // Make the toolbar visible if it is locked and the inputMethod appears
63
47
    Binding {
64
48
        target: toolbar
65
49
        property: "anchors.bottomMargin"
66
50
        value: Qt.inputMethod.visible && toolbar.locked ? Qt.inputMethod.keyboardRectangle.height : 0
67
51
        when: toolbar
68
52
    }
69
53
70
44
    Component.onCompleted: {
54
    Component.onCompleted: {
71
45
        mainStack.push(Qt.createComponent("ContactList/ContactList.qml"))
55
        mainStack.push(Qt.createComponent("ContactList/ContactList.qml"))
72
46
    }
56
    }
Reviewer	Review Type	Date Requested	Status
Bill Filler (community)		2013-07-12	Approve on 2013-07-12
PS Jenkins bot	continuous-integration		Approve on 2013-07-12
Review via email: mp+174428@code.launchpad.net