1
=== modified file 'src/imports/Settings/SettingsPage.qml'
2
--- src/imports/Settings/SettingsPage.qml	2016-03-09 19:23:46 +0000
3
+++ src/imports/Settings/SettingsPage.qml	2016-04-26 00:49:02 +0000
4
@@ -27,7 +27,12 @@
5
27
27
6
28
    property var contactListModel
28
    property var contactListModel
7
29
29
9
30
    title: i18n.tr("Settings")
30
    header: PageHeader {
10
31
        id: pageHeader
11
32
12
33
        title: i18n.tr("Settings")
13
34
        flickable: null
14
35
    }
15
31
36
16
32
    ContactsUI.SIMList {
37
    ContactsUI.SIMList {
17
33
        id: simList
38
        id: simList
18
@@ -37,11 +42,15 @@
19
37
        id: myself
42
        id: myself
20
38
    }
43
    }
21
39
44
22
40
    flickable: null
23
41
    Flickable {
45
    Flickable {
24
42
        id: numberFlickable
46
        id: numberFlickable
25
43
        contentHeight: childrenRect.height
47
        contentHeight: childrenRect.height
27
44
        anchors.fill: parent
48
        anchors {
28
49
            top: pageHeader.bottom
29
50
            left: parent.left
30
51
            right: parent.right
31
52
            bottom: parent.bottom
32
53
        }
33
45
        clip: true
54
        clip: true
34
46
55
35
47
        Column {
56
        Column {
36
48
57
37
=== modified file 'src/imports/Ubuntu/Contacts/SIMCardImportPage.qml'
38
--- src/imports/Ubuntu/Contacts/SIMCardImportPage.qml	2016-02-04 14:15:10 +0000
39
+++ src/imports/Ubuntu/Contacts/SIMCardImportPage.qml	2016-04-26 00:49:02 +0000
40
@@ -33,7 +33,50 @@
41
33
33
42
34
    signal importCompleted()
34
    signal importCompleted()
43
35
35
45
36
    title: i18n.dtr("address-book-app", "SIM contacts")
36
    header: PageHeader {
46
37
        id: pageHeader
47
38
48
39
        title: i18n.dtr("address-book-app", "SIM contacts")
49
40
        flickable: contactList.view
50
41
        trailingActionBar {
51
42
            actions: [
52
43
                Action {
53
44
                    text: (contactList.selectedItems.count === contactList.count) ?
54
45
                              i18n.dtr("address-book-app", "Unselect All") :
55
46
                              i18n.dtr("address-book-app", "Select All")
56
47
                    iconName: "select"
57
48
                    onTriggered: {
58
49
                        if (contactList.selectedItems.count === contactList.count) {
59
50
                            contactList.clearSelection()
60
51
                        } else {
61
52
                            contactList.selectAll()
62
53
                        }
63
54
                    }
64
55
                    visible: (contactList.count > 0)
65
56
                },
66
57
                Action {
67
58
                    text: i18n.dtr("address-book-app", "Import")
68
59
                    objectName: "confirmImport"
69
60
70
61
                    iconName: "tick"
71
62
                    enabled: (contactList.selectedItems.count > 0)
72
63
                    onTriggered: {
73
64
                        root.state = "importing"
74
65
                        var contacts = []
75
66
                        var items = contactList.selectedItems
76
67
77
68
                        for (var i=0, iMax=items.count; i < iMax; i++) {
78
69
                            contacts.push(items.get(i).model.contact)
79
70
                        }
80
71
81
72
                        contactList.listModel.exportContacts(root.exportFile,
82
73
                                                             [],
83
74
                                                             contacts)
84
75
                    }
85
76
                }
86
77
            ]
87
78
        }
88
79
    }
89
37
80
90
38
    function lockedSIMCount()
81
    function lockedSIMCount()
91
39
    {
82
    {
92
@@ -197,42 +240,7 @@
93
197
        }
240
        }
94
198
    }
241
    }
95
199
242
132
200
    head.actions: [
243
97
201
        Action {
98
202
            text: (contactList.selectedItems.count === contactList.count) ?
99
203
                      i18n.dtr("address-book-app", "Unselect All") :
100
204
                      i18n.dtr("address-book-app", "Select All")
101
205
            iconName: "select"
102
206
            onTriggered: {
103
207
                if (contactList.selectedItems.count === contactList.count) {
104
208
                    contactList.clearSelection()
105
209
                } else {
106
210
                    contactList.selectAll()
107
211
                }
108
212
            }
109
213
            visible: (contactList.count > 0)
110
214
        },
111
215
        Action {
112
216
            text: i18n.dtr("address-book-app", "Import")
113
217
            objectName: "confirmImport"
114
218
115
219
            iconName: "tick"
116
220
            enabled: (contactList.selectedItems.count > 0)
117
221
            onTriggered: {
118
222
                root.state = "importing"
119
223
                var contacts = []
120
224
                var items = contactList.selectedItems
121
225
122
226
                for (var i=0, iMax=items.count; i < iMax; i++) {
123
227
                    contacts.push(items.get(i).model.contact)
124
228
                }
125
229
126
230
                contactList.listModel.exportContacts(root.exportFile,
127
231
                                                     [],
128
232
                                                     contacts)
129
233
            }
130
234
        }
131
235
    ]
133
236
244
134
237
    states: [
245
    states: [
135
238
        State {
246
        State {
Status:	Merged
Approved by:	Bill Filler on 2016-04-26
Approved revision:	577
Merged at revision:	577
Proposed branch:	lp:~renatofilho/address-book-app/fix-header-margin
Merge into:	lp:address-book-app
Diff against target:	135 lines (+57/-40) 2 files modified src/imports/Settings/SettingsPage.qml (+12/-3) src/imports/Ubuntu/Contacts/SIMCardImportPage.qml (+45/-37)
To merge this branch:	bzr merge lp:~renatofilho/address-book-app/fix-header-margin
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2016-04-26
Bill Filler (community)		2016-04-21	Needs Fixing on 2016-04-25
Review via email: mp+292464@code.launchpad.net