1
=== modified file 'src/qml/ContactsPage/ContactsPage.qml'
2
--- src/qml/ContactsPage/ContactsPage.qml	2014-08-01 14:59:45 +0000
3
+++ src/qml/ContactsPage/ContactsPage.qml	2014-08-13 15:18:51 +0000
4
@@ -26,10 +26,12 @@
5
26
Page {
26
Page {
6
27
    id: contactsPage
27
    id: contactsPage
7
28
    objectName: "contactsPage"
28
    objectName: "contactsPage"
8
29
9
30
    property QtObject contact
10
31
11
29
    title: i18n.tr("Contacts")
32
    title: i18n.tr("Contacts")
12
30
    property QtObject contact
13
31
33
15
32
    __customHeaderContents: TextField {
34
    TextField {
16
33
        id: searchField
35
        id: searchField
17
34
36
18
35
        anchors {
37
        anchors {
19
@@ -44,6 +46,77 @@
20
44
        onTextChanged: contactList.currentIndex = -1
46
        onTextChanged: contactList.currentIndex = -1
21
45
        inputMethodHints: Qt.ImhNoPredictiveText
47
        inputMethodHints: Qt.ImhNoPredictiveText
22
46
        placeholderText: i18n.tr("Search...")
48
        placeholderText: i18n.tr("Search...")
23
49
        visible: false
24
50
    }
25
51
26
52
    state: "default"
27
53
    states: [
28
54
        PageHeadState {
29
55
            id: defaultState
30
56
31
57
            name: "default"
32
58
            actions: [
33
59
                Action {
34
60
                    text: i18n.tr("Search")
35
61
                    iconName: "search"
36
62
                    onTriggered: {
37
63
                        contactsPage.state = "searching"
38
64
                        searchField.forceActiveFocus()
39
65
                    }
40
66
                }
41
67
            ]
42
68
            PropertyChanges {
43
69
                target: contactsPage.head
44
70
                actions: defaultState.actions
45
71
                sections.model: [i18n.tr("All"), i18n.tr("Favorites")]
46
72
            }
47
73
            PropertyChanges {
48
74
                target: searchField
49
75
                text: ""
50
76
                visible: false
51
77
            }
52
78
        },
53
79
        PageHeadState {
54
80
            id: searchingState
55
81
56
82
            name: "searching"
57
83
            backAction: Action {
58
84
                iconName: "close"
59
85
                text: i18n.tr("Cancel")
60
86
                onTriggered: {
61
87
                    contactList.forceActiveFocus()
62
88
                    contactsPage.state = "default"
63
89
                }
64
90
            }
65
91
66
92
            PropertyChanges {
67
93
                target: contactsPage.head
68
94
                backAction: searchingState.backAction
69
95
                contents: searchField
70
96
            }
71
97
72
98
            PropertyChanges {
73
99
                target: searchField
74
100
                text: ""
75
101
                visible: true
76
102
            }
77
103
        }
78
104
    ]
79
105
80
106
    Connections {
81
107
        target: contactsPage.head.sections
82
108
        onSelectedIndexChanged: {
83
109
            switch (contactsPage.head.sections.selectedIndex) {
84
110
            case 0:
85
111
                contactList.showAllContacts()
86
112
                break;
87
113
            case 1:
88
114
                contactList.showFavoritesContacts()
89
115
                break;
90
116
            default:
91
117
                break;
92
118
            }
93
119
        }
94
47
    }
120
    }
95
48
121
96
49
    // background
122
    // background
97
@@ -61,6 +134,67 @@
98
61
            right: parent.right
134
            right: parent.right
99
62
            bottom: keyboardRect.top
135
            bottom: keyboardRect.top
100
63
        }
136
        }
101
137
102
138
103
139
        header: Item {
104
140
            id: addNewContactButton
105
141
            objectName: "addNewContact"
106
142
107
143
            anchors {
108
144
                left: parent.left
109
145
                right: parent.right
110
146
            }
111
147
            height: units.gu(8)
112
148
113
149
            Rectangle {
114
150
                anchors.fill: parent
115
151
                color: Theme.palette.selected.background
116
152
                opacity: addNewContactButtonArea.pressed ?  1.0 : 0.0
117
153
            }
118
154
119
155
            UbuntuShape {
120
156
                id: addIcon
121
157
122
158
                anchors {
123
159
                    left: parent.left
124
160
                    top: parent.top
125
161
                    bottom: parent.bottom
126
162
                    margins: units.gu(1)
127
163
                }
128
164
                width: height
129
165
                radius: "medium"
130
166
                color: Theme.palette.normal.overlay
131
167
                Image {
132
168
                    anchors.centerIn: parent
133
169
                    width: units.gu(2)
134
170
                    height: units.gu(2)
135
171
                    source: "image://theme/add"
136
172
                }
137
173
            }
138
174
139
175
            Label {
140
176
                id: name
141
177
142
178
                anchors {
143
179
                    left: addIcon.right
144
180
                    leftMargin: units.gu(2)
145
181
                    verticalCenter: parent.verticalCenter
146
182
                    right: parent.right
147
183
                    rightMargin: units.gu(2)
148
184
                }
149
185
                color: UbuntuColors.lightAubergine
150
186
                text: i18n.tr("+ Create New")
151
187
                elide: Text.ElideRight
152
188
            }
153
189
154
190
            MouseArea {
155
191
                id: addNewContactButtonArea
156
192
157
193
                anchors.fill: parent
158
194
                onClicked: mainView.createNewContactForPhone(" ")
159
195
            }
160
196
        }
161
197
162
64
        onInfoRequested: {
198
        onInfoRequested: {
163
65
           mainView.viewContact(contact.contactId)
199
           mainView.viewContact(contact.contactId)
164
66
        }
200
        }
165
67
201
166
=== modified file 'src/qml/dialer-app.qml'
167
--- src/qml/dialer-app.qml	2014-08-01 14:59:45 +0000
168
+++ src/qml/dialer-app.qml	2014-08-13 15:18:51 +0000
169
@@ -84,6 +84,11 @@
170
84
        return false;
84
        return false;
171
85
    }
85
    }
172
86
86
173
87
    function createNewContactForPhone(phoneNumber)
174
88
    {
175
89
        Qt.openUrlExternally("addressbook:///create?callback=dialer-app.desktop&phone=" + encodeURIComponent(phoneNumber))
176
90
    }
177
91
178
87
    function viewContact(contactId) {
92
    function viewContact(contactId) {
179
88
        Qt.openUrlExternally("addressbook:///contact?callback=dialer-app.desktop&id=" + encodeURIComponent(contactId))
93
        Qt.openUrlExternally("addressbook:///contact?callback=dialer-app.desktop&id=" + encodeURIComponent(contactId))
180
89
    }
94
    }
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-08-13
Gustavo Pichorim Boiko (community)		2014-08-12	Approve on 2014-08-13
Review via email: mp+230543@code.launchpad.net