1
=== modified file 'src/imports/ContactList/CMakeLists.txt'
2
--- src/imports/ContactList/CMakeLists.txt	2013-07-12 00:13:01 +0000
3
+++ src/imports/ContactList/CMakeLists.txt	2013-07-12 23:49:26 +0000
4
@@ -1,5 +1,4 @@
5
1
set(CONTACT_LIST_QMLS
1
set(CONTACT_LIST_QMLS
6
2
    ContactList.js
7
3
    ContactList.qml
2
    ContactList.qml
8
4
)
3
)
9
5
4
10
6
5
11
=== removed file 'src/imports/ContactList/ContactList.js'
12
--- src/imports/ContactList/ContactList.js	2013-07-12 00:13:01 +0000
13
+++ src/imports/ContactList/ContactList.js	1970-01-01 00:00:00 +0000
14
@@ -1,45 +0,0 @@
15
1
/*
16
2
 * Copyright (C) 2012-2013 Canonical, Ltd.
17
3
 *
18
4
 * This program is free software; you can redistribute it and/or modify
19
5
 * it under the terms of the GNU General Public License as published by
20
6
 * the Free Software Foundation; version 3.
21
7
 *
22
8
 * This program is distributed in the hope that it will be useful,
23
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
25
11
 * GNU General Public License for more details.
26
12
 *
27
13
 * You should have received a copy of the GNU General Public License
28
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
29
15
 */
30
16
31
17
var sectionData = [];
32
18
var _sections = [];
33
19
34
20
function initSectionData(list) {
35
21
    if (!list || !list.model) {
36
22
        return;
37
23
    }
38
24
39
25
    sectionData = [];
40
26
    _sections = [];
41
27
42
28
    var current = "",
43
29
        prop = list.section.property,
44
30
        item;
45
31
46
32
    for (var i = 0, count = list.model.contacts.length; i < count; i++) {
47
33
        item = list.sectionValueForContact(list.model.contacts[i])
48
34
        if (item !== current) {
49
35
            current = item;
50
36
            _sections.push(current);
51
37
            sectionData.push({ index: i, header: current });
52
38
        }
53
39
    }
54
40
}
55
41
56
42
function getIndexFor(sectionName) {
57
43
    var val = sectionData[_sections.indexOf(sectionName)].index;
58
44
    return val === 0 || val > 0 ? val : -1;
59
45
}
60
46
0
61
=== modified file 'src/imports/ContactList/ContactList.qml'
62
--- src/imports/ContactList/ContactList.qml	2013-07-12 22:06:54 +0000
63
+++ src/imports/ContactList/ContactList.qml	2013-07-12 23:49:26 +0000
64
@@ -20,8 +20,6 @@
65
20
import Ubuntu.Components.ListItems 0.1 as ListItem
20
import Ubuntu.Components.ListItems 0.1 as ListItem
66
21
import Ubuntu.Components.Popups 0.1 as Popups
21
import Ubuntu.Components.Popups 0.1 as Popups
67
22
22
68
23
import "ContactList.js" as Sections
69
24
70
25
Page {
23
Page {
71
26
    id: mainPage
24
    id: mainPage
72
27
25
73
@@ -115,41 +113,15 @@
74
115
        }
113
        }
75
116
114
76
117
        delegate: ListItem.Subtitled {
115
        delegate: ListItem.Subtitled {
77
118
            property variant contactObject: contact
78
119
            property string contactId: contact.contactId
79
120
            property string sectionName: ListView.section
80
121
81
122
            icon: contact && contact.avatar && (contact.avatar.imageUrl != "") ?  Qt.resolvedUrl(contact.avatar.imageUrl) : "artwork:/avatar-default.png"
116
            icon: contact && contact.avatar && (contact.avatar.imageUrl != "") ?  Qt.resolvedUrl(contact.avatar.imageUrl) : "artwork:/avatar-default.png"
83
123
            text: contactListView.formatNameToDisplay(contactObject)
117
            text: contactListView.formatNameToDisplay(contact)
84
124
            subText: contact && contact.phoneNumber ? contact.phoneNumber.number : ""
118
            subText: contact && contact.phoneNumber ? contact.phoneNumber.number : ""
113
125
            selected: contactListView.currentIndex === index
119
114
126
120
            onClicked: {
115
127
            MouseArea {
121
                contactListView.currentIndex = index
116
128
                anchors.fill:  parent
122
                pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
117
129
                onClicked: {
123
                               {model: contactsModel, contactId: contact.contactId})
118
130
                    contactListView.currentIndex = index
124
91
131
                }
92
132
                onDoubleClicked: {
93
133
                    pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
94
134
                                   {model: contactsModel, contactId: contactListView.currentItem.contactObject.contactId})
95
135
                }
96
136
            }
97
137
        }
98
138
99
139
        UbuntuNumberAnimation { id: scroolToSectionAnimation; target: contactListView; property: "contentY"; }
100
140
        function scroolToSection(targetSection) {
101
141
            scroolToSectionAnimation.from = contactListView.contentY
102
142
            contactListView.positionViewAtIndex(Sections.getIndexFor(targetSection), ListView.Beginning)
103
143
            scroolToSectionAnimation.to = contactListView.contentY
104
144
            scroolToSectionAnimation.running = true
105
145
        }
106
146
107
147
        // function used to build the section cache by "ContactList.js"
108
148
        function sectionValueForContact(contact) {
109
149
            if (contact) {
110
150
                return contact.name && contact.name.firstName ? contact.name.firstName[0] : ""
111
151
            } else {
112
152
                return null
119
153
            }
125
            }
120
154
        }
126
        }
121
155
    }
127
    }
Reviewer	Review Type	Date Requested	Status
Bill Filler (community)		2013-07-12	Approve on 2013-07-13
PS Jenkins bot	continuous-integration		Approve on 2013-07-13
Review via email: mp+174312@code.launchpad.net