Merge lp:~fboucault/address-book-app/toolkit13 into lp:address-book-app
- toolkit13
- Merge into trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Renato Araujo Oliveira Filho | ||||
Approved revision: | 472 | ||||
Merged at revision: | 490 | ||||
Proposed branch: | lp:~fboucault/address-book-app/toolkit13 | ||||
Merge into: | lp:address-book-app | ||||
Diff against target: |
881 lines (+94/-92) 58 files modified
src/imports/ABContactEditorPage.qml (+1/-1) src/imports/ABContactListPage.qml (+3/-3) src/imports/ABContactViewPage.qml (+2/-2) src/imports/MainWindow.qml (+2/-2) src/imports/Settings/SettingsPage.qml (+2/-2) src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml (+1/-1) src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml (+1/-1) src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml (+2/-2) src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml (+2/-2) src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml (+2/-2) src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml (+2/-2) src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml (+2/-2) src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml (+2/-2) src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml (+1/-1) src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml (+2/-2) src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml (+1/-1) src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml (+3/-3) src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml (+1/-1) src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml (+1/-1) src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml (+1/-1) src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml (+1/-1) src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml (+1/-1) src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml (+1/-1) src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml (+1/-1) src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml (+1/-1) src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml (+2/-2) src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml (+1/-1) src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml (+1/-1) src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml (+1/-1) src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml (+1/-1) src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml (+1/-1) src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml (+2/-2) src/imports/Ubuntu/AddressBook/ContactView/ContactHeaderView.qml (+2/-2) src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml (+2/-2) src/imports/Ubuntu/Contacts/ActionButton.qml (+1/-1) src/imports/Ubuntu/Contacts/ContactAvatar.qml (+3/-3) src/imports/Ubuntu/Contacts/ContactDelegate.qml (+2/-2) src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml (+1/-1) src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml (+3/-3) src/imports/Ubuntu/Contacts/ContactListView.qml (+3/-3) src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+2/-2) src/imports/Ubuntu/Contacts/FastScroll.qml (+1/-1) src/imports/Ubuntu/Contacts/ListItemWithActions.qml (+1/-1) src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml (+1/-1) src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml (+2/-2) src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml (+1/-1) src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml (+2/-2) src/imports/Ubuntu/Contacts/SIMCardImportPage.qml (+2/-2) src/imports/Ubuntu/Contacts/SectionDelegate.qml (+2/-2) src/imports/Ubuntu/Contacts/SubtitledWithColors.qml (+1/-1) src/imports/VCardImportDialog.qml (+2/-2) tests/autopilot/address_book_app/__init__.py (+3/-1) tests/qml/tst_ContactEditor.qml (+4/-4) tests/qml/tst_ContactList.qml (+1/-1) tests/qml/tst_ContactListModel.qml (+1/-1) tests/qml/tst_ContactListView.qml (+1/-1) tests/qml/tst_ContactPreviewPage.qml (+1/-1) tests/qml/tst_ListWithActions.qml (+1/-1) |
||||
To merge this branch: | bzr merge lp:~fboucault/address-book-app/toolkit13 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Victor Thompson (community) | Needs Information | ||
Renato Araujo Oliveira Filho (community) | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Florian Boucault (community) | Needs Fixing | ||
Review via email: mp+270111@code.launchpad.net |
Commit message
Upgraded all imports of toolkit to version 1.3.
Removed use of former MainView.
Fixed deprecation warnings related to UbuntuShape in toolkit 1.3.
Description of the change
There is another branch to fix all autopilot: https:/
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:469
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
- 470. By Florian Boucault
-
Fixed QML test ContactEditor: header buttons objectNames have changed.
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:470
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 471. By Florian Boucault
-
Fix AP tests
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:471
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 472. By Florian Boucault
-
Merged with trunk
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:472
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Renato Araujo Oliveira Filho (renatofilho) wrote : | # |
Looks good.
Victor Thompson (vthompson) wrote : | # |
Should this also be updated to use QtQuick 2.4, as that is what the SDK uses?
Preview Diff
1 | === modified file 'src/imports/ABContactEditorPage.qml' | |||
2 | --- src/imports/ABContactEditorPage.qml 2015-08-17 18:47:15 +0000 | |||
3 | +++ src/imports/ABContactEditorPage.qml 2015-10-16 13:35:13 +0000 | |||
4 | @@ -17,7 +17,7 @@ | |||
5 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
6 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
7 | 19 | 19 | ||
9 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
10 | 21 | 21 | ||
11 | 22 | import Ubuntu.AddressBook.ContactEditor 0.1 | 22 | import Ubuntu.AddressBook.ContactEditor 0.1 |
12 | 23 | 23 | ||
13 | 24 | 24 | ||
14 | === modified file 'src/imports/ABContactListPage.qml' | |||
15 | --- src/imports/ABContactListPage.qml 2015-09-16 01:08:07 +0000 | |||
16 | +++ src/imports/ABContactListPage.qml 2015-10-16 13:35:13 +0000 | |||
17 | @@ -17,9 +17,9 @@ | |||
18 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
19 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
20 | 19 | 19 | ||
24 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
25 | 21 | import Ubuntu.Components.ListItems 1.0 as ListItem | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem |
26 | 22 | import Ubuntu.Components.Popups 1.0 as Popups | 22 | import Ubuntu.Components.Popups 1.3 as Popups |
27 | 23 | import Ubuntu.Contacts 0.1 as ContactsUI | 23 | import Ubuntu.Contacts 0.1 as ContactsUI |
28 | 24 | import Ubuntu.Content 1.1 as ContentHub | 24 | import Ubuntu.Content 1.1 as ContentHub |
29 | 25 | 25 | ||
30 | 26 | 26 | ||
31 | === modified file 'src/imports/ABContactViewPage.qml' | |||
32 | --- src/imports/ABContactViewPage.qml 2015-08-17 18:47:15 +0000 | |||
33 | +++ src/imports/ABContactViewPage.qml 2015-10-16 13:35:13 +0000 | |||
34 | @@ -15,8 +15,8 @@ | |||
35 | 15 | */ | 15 | */ |
36 | 16 | 16 | ||
37 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
40 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
41 | 19 | import Ubuntu.Components.Popups 1.0 as Popups | 19 | import Ubuntu.Components.Popups 1.3 as Popups |
42 | 20 | import Ubuntu.Contacts 0.1 | 20 | import Ubuntu.Contacts 0.1 |
43 | 21 | 21 | ||
44 | 22 | import Ubuntu.AddressBook.Base 0.1 | 22 | import Ubuntu.AddressBook.Base 0.1 |
45 | 23 | 23 | ||
46 | === modified file 'src/imports/MainWindow.qml' | |||
47 | --- src/imports/MainWindow.qml 2015-08-18 12:56:06 +0000 | |||
48 | +++ src/imports/MainWindow.qml 2015-10-16 13:35:13 +0000 | |||
49 | @@ -15,8 +15,8 @@ | |||
50 | 15 | */ | 15 | */ |
51 | 16 | 16 | ||
52 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
55 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
56 | 19 | import Ubuntu.Components.Popups 1.0 as Popups | 19 | import Ubuntu.Components.Popups 1.3 as Popups |
57 | 20 | 20 | ||
58 | 21 | MainView { | 21 | MainView { |
59 | 22 | id: mainWindow | 22 | id: mainWindow |
60 | 23 | 23 | ||
61 | === modified file 'src/imports/Settings/SettingsPage.qml' | |||
62 | --- src/imports/Settings/SettingsPage.qml 2015-08-17 18:47:15 +0000 | |||
63 | +++ src/imports/Settings/SettingsPage.qml 2015-10-16 13:35:13 +0000 | |||
64 | @@ -17,8 +17,8 @@ | |||
65 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
66 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
67 | 19 | 19 | ||
70 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
71 | 21 | import Ubuntu.Components.ListItems 1.0 as ListItem | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem |
72 | 22 | import Ubuntu.Contacts 0.1 as ContactsUI | 22 | import Ubuntu.Contacts 0.1 as ContactsUI |
73 | 23 | 23 | ||
74 | 24 | Page { | 24 | Page { |
75 | 25 | 25 | ||
76 | === modified file 'src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml' | |||
77 | --- src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml 2015-05-14 18:12:33 +0000 | |||
78 | +++ src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml 2015-10-16 13:35:13 +0000 | |||
79 | @@ -16,7 +16,7 @@ | |||
80 | 16 | 16 | ||
81 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
82 | 18 | import QtContacts 5.0 as QtContacts | 18 | import QtContacts 5.0 as QtContacts |
84 | 19 | import Ubuntu.Components.ListItems 1.0 as ListItem | 19 | import Ubuntu.Components.ListItems 1.3 as ListItem |
85 | 20 | 20 | ||
86 | 21 | ListItem.Empty { | 21 | ListItem.Empty { |
87 | 22 | id: root | 22 | id: root |
88 | 23 | 23 | ||
89 | === modified file 'src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml' | |||
90 | --- src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml 2015-08-17 18:47:15 +0000 | |||
91 | +++ src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml 2015-10-16 13:35:13 +0000 | |||
92 | @@ -16,7 +16,7 @@ | |||
93 | 16 | 16 | ||
94 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
95 | 18 | 18 | ||
97 | 19 | import Ubuntu.Components 1.2 | 19 | import Ubuntu.Components 1.3 |
98 | 20 | import Ubuntu.Contacts 0.1 | 20 | import Ubuntu.Contacts 0.1 |
99 | 21 | 21 | ||
100 | 22 | ContactDetailBase { | 22 | ContactDetailBase { |
101 | 23 | 23 | ||
102 | === modified file 'src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml' | |||
103 | --- src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml 2015-08-17 18:47:15 +0000 | |||
104 | +++ src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml 2015-10-16 13:35:13 +0000 | |||
105 | @@ -17,9 +17,9 @@ | |||
106 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
107 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
108 | 19 | 19 | ||
110 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
111 | 21 | import Ubuntu.Content 1.1 | 21 | import Ubuntu.Content 1.1 |
113 | 22 | import Ubuntu.Components.Popups 1.0 | 22 | import Ubuntu.Components.Popups 1.3 |
114 | 23 | 23 | ||
115 | 24 | Item { | 24 | Item { |
116 | 25 | id: root | 25 | id: root |
117 | 26 | 26 | ||
118 | === modified file 'src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml' | |||
119 | --- src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml 2015-08-17 18:47:15 +0000 | |||
120 | +++ src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml 2015-10-16 13:35:13 +0000 | |||
121 | @@ -15,8 +15,8 @@ | |||
122 | 15 | */ | 15 | */ |
123 | 16 | 16 | ||
124 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
127 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
128 | 19 | import Ubuntu.Components.Popups 1.0 | 19 | import Ubuntu.Components.Popups 1.3 |
129 | 20 | 20 | ||
130 | 21 | Dialog { | 21 | Dialog { |
131 | 22 | objectName: "removeContactsDialog" | 22 | objectName: "removeContactsDialog" |
132 | 23 | 23 | ||
133 | === modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml' | |||
134 | --- src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml 2015-08-17 18:47:15 +0000 | |||
135 | +++ src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml 2015-10-16 13:35:13 +0000 | |||
136 | @@ -16,8 +16,8 @@ | |||
137 | 16 | 16 | ||
138 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
139 | 18 | 18 | ||
142 | 19 | import Ubuntu.Components 1.2 | 19 | import Ubuntu.Components 1.3 |
143 | 20 | import Ubuntu.Components.Popups 1.0 | 20 | import Ubuntu.Components.Popups 1.3 |
144 | 21 | import Ubuntu.Content 0.1 | 21 | import Ubuntu.Content 0.1 |
145 | 22 | 22 | ||
146 | 23 | Item { | 23 | Item { |
147 | 24 | 24 | ||
148 | === modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml' | |||
149 | --- src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml 2015-08-17 18:47:15 +0000 | |||
150 | +++ src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml 2015-10-16 13:35:13 +0000 | |||
151 | @@ -17,8 +17,8 @@ | |||
152 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
153 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
154 | 19 | 19 | ||
157 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
158 | 21 | import Ubuntu.Components.ListItems 1.0 | 21 | import Ubuntu.Components.ListItems 1.3 |
159 | 22 | 22 | ||
160 | 23 | ComboButton { | 23 | ComboButton { |
161 | 24 | id: root | 24 | id: root |
162 | 25 | 25 | ||
163 | === modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml' | |||
164 | --- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml 2015-08-17 18:47:15 +0000 | |||
165 | +++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml 2015-10-16 13:35:13 +0000 | |||
166 | @@ -17,7 +17,7 @@ | |||
167 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
168 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
169 | 19 | 19 | ||
171 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
172 | 21 | 21 | ||
173 | 22 | import Ubuntu.Contacts 0.1 | 22 | import Ubuntu.Contacts 0.1 |
174 | 23 | import Ubuntu.AddressBook.Base 0.1 | 23 | import Ubuntu.AddressBook.Base 0.1 |
175 | @@ -72,7 +72,7 @@ | |||
176 | 72 | 72 | ||
177 | 73 | radius: "medium" | 73 | radius: "medium" |
178 | 74 | anchors.fill: parent | 74 | anchors.fill: parent |
180 | 75 | image: avatarImage.source != defaultAvatar ? avatarImage : null | 75 | source: avatarImage.source != defaultAvatar ? avatarImage : null |
181 | 76 | 76 | ||
182 | 77 | Image { | 77 | Image { |
183 | 78 | id: avatarImage | 78 | id: avatarImage |
184 | 79 | 79 | ||
185 | === modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml' | |||
186 | --- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml 2015-08-17 18:47:15 +0000 | |||
187 | +++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml 2015-10-16 13:35:13 +0000 | |||
188 | @@ -17,8 +17,8 @@ | |||
189 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
190 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
191 | 19 | 19 | ||
194 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
195 | 21 | import Ubuntu.Components.ListItems 1.0 | 21 | import Ubuntu.Components.ListItems 1.3 |
196 | 22 | import Ubuntu.Contacts 0.1 | 22 | import Ubuntu.Contacts 0.1 |
197 | 23 | 23 | ||
198 | 24 | import Ubuntu.AddressBook.Base 0.1 | 24 | import Ubuntu.AddressBook.Base 0.1 |
199 | 25 | 25 | ||
200 | === modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml' | |||
201 | --- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml 2015-08-17 18:47:15 +0000 | |||
202 | +++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml 2015-10-16 13:35:13 +0000 | |||
203 | @@ -17,7 +17,7 @@ | |||
204 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
205 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
206 | 19 | 19 | ||
208 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
209 | 21 | 21 | ||
210 | 22 | import Ubuntu.AddressBook.Base 0.1 | 22 | import Ubuntu.AddressBook.Base 0.1 |
211 | 23 | 23 | ||
212 | 24 | 24 | ||
213 | === modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml' | |||
214 | --- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml 2015-09-30 04:57:26 +0000 | |||
215 | +++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml 2015-10-16 13:35:13 +0000 | |||
216 | @@ -17,8 +17,8 @@ | |||
217 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
218 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
219 | 19 | 19 | ||
222 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
223 | 21 | import Ubuntu.Components.ListItems 1.0 | 21 | import Ubuntu.Components.ListItems 1.3 |
224 | 22 | 22 | ||
225 | 23 | import Ubuntu.Contacts 0.1 | 23 | import Ubuntu.Contacts 0.1 |
226 | 24 | import Ubuntu.AddressBook.Base 0.1 | 24 | import Ubuntu.AddressBook.Base 0.1 |
227 | 25 | 25 | ||
228 | === modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml' | |||
229 | --- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml 2015-08-17 18:47:15 +0000 | |||
230 | +++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml 2015-10-16 13:35:13 +0000 | |||
231 | @@ -17,7 +17,7 @@ | |||
232 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
233 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
234 | 19 | 19 | ||
236 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
237 | 21 | 21 | ||
238 | 22 | import Ubuntu.Contacts 0.1 | 22 | import Ubuntu.Contacts 0.1 |
239 | 23 | import Ubuntu.AddressBook.Base 0.1 | 23 | import Ubuntu.AddressBook.Base 0.1 |
240 | 24 | 24 | ||
241 | === modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml' | |||
242 | --- src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml 2015-09-29 19:03:44 +0000 | |||
243 | +++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml 2015-10-16 13:35:13 +0000 | |||
244 | @@ -17,9 +17,9 @@ | |||
245 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
246 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
247 | 19 | 19 | ||
251 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
252 | 21 | import Ubuntu.Components.ListItems 1.0 | 21 | import Ubuntu.Components.ListItems 1.3 |
253 | 22 | import Ubuntu.Components.Popups 1.0 | 22 | import Ubuntu.Components.Popups 1.3 |
254 | 23 | import Ubuntu.Contacts 0.1 as ContactsUI | 23 | import Ubuntu.Contacts 0.1 as ContactsUI |
255 | 24 | 24 | ||
256 | 25 | import Ubuntu.AddressBook.Base 0.1 | 25 | import Ubuntu.AddressBook.Base 0.1 |
257 | 26 | 26 | ||
258 | === modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml' | |||
259 | --- src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml 2015-08-19 19:40:36 +0000 | |||
260 | +++ src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml 2015-10-16 13:35:13 +0000 | |||
261 | @@ -15,7 +15,7 @@ | |||
262 | 15 | */ | 15 | */ |
263 | 16 | 16 | ||
264 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
266 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
267 | 19 | import Ubuntu.Keyboard 0.1 | 19 | import Ubuntu.Keyboard 0.1 |
268 | 20 | import Ubuntu.Telephony.PhoneNumber 0.1 | 20 | import Ubuntu.Telephony.PhoneNumber 0.1 |
269 | 21 | 21 | ||
270 | 22 | 22 | ||
271 | === modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml' | |||
272 | --- src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml 2015-08-17 18:47:15 +0000 | |||
273 | +++ src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml 2015-10-16 13:35:13 +0000 | |||
274 | @@ -15,7 +15,7 @@ | |||
275 | 15 | */ | 15 | */ |
276 | 16 | 16 | ||
277 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
279 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
280 | 19 | 19 | ||
281 | 20 | Item { | 20 | Item { |
282 | 21 | id: root | 21 | id: root |
283 | 22 | 22 | ||
284 | === modified file 'src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml' | |||
285 | --- src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml 2015-08-17 18:47:15 +0000 | |||
286 | +++ src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml 2015-10-16 13:35:13 +0000 | |||
287 | @@ -17,7 +17,7 @@ | |||
288 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
289 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
290 | 19 | 19 | ||
292 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
293 | 21 | import Ubuntu.Content 1.1 as ContentHub | 21 | import Ubuntu.Content 1.1 as ContentHub |
294 | 22 | 22 | ||
295 | 23 | import Ubuntu.AddressBook.Base 0.1 | 23 | import Ubuntu.AddressBook.Base 0.1 |
296 | 24 | 24 | ||
297 | === modified file 'src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml' | |||
298 | --- src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml 2015-08-17 18:47:15 +0000 | |||
299 | +++ src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml 2015-10-16 13:35:13 +0000 | |||
300 | @@ -15,7 +15,7 @@ | |||
301 | 15 | */ | 15 | */ |
302 | 16 | 16 | ||
303 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
305 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
306 | 19 | 19 | ||
307 | 20 | AbstractButton { | 20 | AbstractButton { |
308 | 21 | id: root | 21 | id: root |
309 | 22 | 22 | ||
310 | === modified file 'src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml' | |||
311 | --- src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml 2015-08-17 18:47:15 +0000 | |||
312 | +++ src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml 2015-10-16 13:35:13 +0000 | |||
313 | @@ -15,7 +15,7 @@ | |||
314 | 15 | */ | 15 | */ |
315 | 16 | 16 | ||
316 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
318 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
319 | 19 | 19 | ||
320 | 20 | Item { | 20 | Item { |
321 | 21 | id: root | 21 | id: root |
322 | 22 | 22 | ||
323 | === modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml' | |||
324 | --- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml 2015-08-17 18:47:15 +0000 | |||
325 | +++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml 2015-10-16 13:35:13 +0000 | |||
326 | @@ -16,7 +16,7 @@ | |||
327 | 16 | 16 | ||
328 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
329 | 18 | import QtContacts 5.0 as QtContacts | 18 | import QtContacts 5.0 as QtContacts |
331 | 19 | import Ubuntu.Components 1.2 | 19 | import Ubuntu.Components 1.3 |
332 | 20 | 20 | ||
333 | 21 | ContactDetailGroupWithTypeView { | 21 | ContactDetailGroupWithTypeView { |
334 | 22 | id: root | 22 | id: root |
335 | 23 | 23 | ||
336 | === modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml' | |||
337 | --- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml 2015-08-17 18:47:15 +0000 | |||
338 | +++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml 2015-10-16 13:35:13 +0000 | |||
339 | @@ -17,7 +17,7 @@ | |||
340 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
341 | 18 | import QtGraphicalEffects 1.0 | 18 | import QtGraphicalEffects 1.0 |
342 | 19 | import QtContacts 5.0 | 19 | import QtContacts 5.0 |
344 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
345 | 21 | 21 | ||
346 | 22 | import Ubuntu.Contacts 0.1 | 22 | import Ubuntu.Contacts 0.1 |
347 | 23 | import Ubuntu.AddressBook.Base 0.1 | 23 | import Ubuntu.AddressBook.Base 0.1 |
348 | 24 | 24 | ||
349 | === modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml' | |||
350 | --- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml 2015-08-17 18:47:15 +0000 | |||
351 | +++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml 2015-10-16 13:35:13 +0000 | |||
352 | @@ -16,7 +16,7 @@ | |||
353 | 16 | 16 | ||
354 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
355 | 18 | import QtContacts 5.0 as QtContacts | 18 | import QtContacts 5.0 as QtContacts |
357 | 19 | import Ubuntu.Components 1.2 | 19 | import Ubuntu.Components 1.3 |
358 | 20 | 20 | ||
359 | 21 | ContactDetailGroupWithTypeView { | 21 | ContactDetailGroupWithTypeView { |
360 | 22 | id: root | 22 | id: root |
361 | 23 | 23 | ||
362 | === modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml' | |||
363 | --- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml 2015-08-17 18:47:15 +0000 | |||
364 | +++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml 2015-10-16 13:35:13 +0000 | |||
365 | @@ -17,8 +17,8 @@ | |||
366 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
367 | 18 | import QtContacts 5.0 as QtContacts | 18 | import QtContacts 5.0 as QtContacts |
368 | 19 | 19 | ||
371 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
372 | 21 | import Ubuntu.Components.ListItems 1.0 as ListItem | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem |
373 | 22 | 22 | ||
374 | 23 | import Ubuntu.AddressBook.Base 0.1 | 23 | import Ubuntu.AddressBook.Base 0.1 |
375 | 24 | 24 | ||
376 | 25 | 25 | ||
377 | === modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml' | |||
378 | --- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml 2015-08-17 18:47:15 +0000 | |||
379 | +++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml 2015-10-16 13:35:13 +0000 | |||
380 | @@ -15,7 +15,7 @@ | |||
381 | 15 | */ | 15 | */ |
382 | 16 | 16 | ||
383 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
385 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
386 | 19 | import QtContacts 5.0 | 19 | import QtContacts 5.0 |
387 | 20 | 20 | ||
388 | 21 | import Ubuntu.AddressBook.Base 0.1 | 21 | import Ubuntu.AddressBook.Base 0.1 |
389 | 22 | 22 | ||
390 | === modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml' | |||
391 | --- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml 2015-08-17 18:47:15 +0000 | |||
392 | +++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml 2015-10-16 13:35:13 +0000 | |||
393 | @@ -17,7 +17,7 @@ | |||
394 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
395 | 18 | import QtContacts 5.0 as QtContacts | 18 | import QtContacts 5.0 as QtContacts |
396 | 19 | 19 | ||
398 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
399 | 21 | import Ubuntu.Contacts 0.1 | 21 | import Ubuntu.Contacts 0.1 |
400 | 22 | 22 | ||
401 | 23 | ContactDetailGroupWithTypeView { | 23 | ContactDetailGroupWithTypeView { |
402 | 24 | 24 | ||
403 | === modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml' | |||
404 | --- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml 2015-08-17 18:47:15 +0000 | |||
405 | +++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml 2015-10-16 13:35:13 +0000 | |||
406 | @@ -18,7 +18,7 @@ | |||
407 | 18 | import QtContacts 5.0 as QtContacts | 18 | import QtContacts 5.0 as QtContacts |
408 | 19 | 19 | ||
409 | 20 | import Ubuntu.Contacts 0.1 | 20 | import Ubuntu.Contacts 0.1 |
411 | 21 | import Ubuntu.Components 1.2 | 21 | import Ubuntu.Components 1.3 |
412 | 22 | 22 | ||
413 | 23 | ContactDetailGroupWithTypeView { | 23 | ContactDetailGroupWithTypeView { |
414 | 24 | id: root | 24 | id: root |
415 | 25 | 25 | ||
416 | === modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml' | |||
417 | --- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml 2015-08-17 18:47:15 +0000 | |||
418 | +++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml 2015-10-16 13:35:13 +0000 | |||
419 | @@ -15,7 +15,7 @@ | |||
420 | 15 | */ | 15 | */ |
421 | 16 | 16 | ||
422 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
424 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
425 | 19 | import QtContacts 5.0 | 19 | import QtContacts 5.0 |
426 | 20 | import Ubuntu.Contacts 0.1 | 20 | import Ubuntu.Contacts 0.1 |
427 | 21 | 21 | ||
428 | 22 | 22 | ||
429 | === modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml' | |||
430 | --- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml 2015-08-17 18:47:15 +0000 | |||
431 | +++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml 2015-10-16 13:35:13 +0000 | |||
432 | @@ -17,7 +17,7 @@ | |||
433 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
434 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
435 | 19 | 19 | ||
437 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
438 | 21 | import Ubuntu.AddressBook.Base 0.1 | 21 | import Ubuntu.AddressBook.Base 0.1 |
439 | 22 | 22 | ||
440 | 23 | ContactDetailBase { | 23 | ContactDetailBase { |
441 | 24 | 24 | ||
442 | === modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml' | |||
443 | --- src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml 2015-08-17 18:47:15 +0000 | |||
444 | +++ src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml 2015-10-16 13:35:13 +0000 | |||
445 | @@ -15,8 +15,8 @@ | |||
446 | 15 | */ | 15 | */ |
447 | 16 | 16 | ||
448 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
451 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
452 | 19 | import Ubuntu.Components.Popups 1.0 | 19 | import Ubuntu.Components.Popups 1.3 |
453 | 20 | 20 | ||
454 | 21 | Component { | 21 | Component { |
455 | 22 | Dialog { | 22 | Dialog { |
456 | 23 | 23 | ||
457 | === modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactHeaderView.qml' | |||
458 | --- src/imports/Ubuntu/AddressBook/ContactView/ContactHeaderView.qml 2014-07-20 20:23:20 +0000 | |||
459 | +++ src/imports/Ubuntu/AddressBook/ContactView/ContactHeaderView.qml 2015-10-16 13:35:13 +0000 | |||
460 | @@ -15,8 +15,8 @@ | |||
461 | 15 | */ | 15 | */ |
462 | 16 | 16 | ||
463 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
466 | 18 | import Ubuntu.Components 1.1 | 18 | import Ubuntu.Components 1.3 |
467 | 19 | import Ubuntu.Components.ListItems 1.0 as ListItem | 19 | import Ubuntu.Components.ListItems 1.3 as ListItem |
468 | 20 | 20 | ||
469 | 21 | FocusScope { | 21 | FocusScope { |
470 | 22 | id: contactHeader | 22 | id: contactHeader |
471 | 23 | 23 | ||
472 | === modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml' | |||
473 | --- src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml 2015-08-17 18:47:15 +0000 | |||
474 | +++ src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml 2015-10-16 13:35:13 +0000 | |||
475 | @@ -17,8 +17,8 @@ | |||
476 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
477 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
478 | 19 | 19 | ||
481 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
482 | 21 | import Ubuntu.Components.Popups 1.0 | 21 | import Ubuntu.Components.Popups 1.3 |
483 | 22 | import Ubuntu.Contacts 0.1 | 22 | import Ubuntu.Contacts 0.1 |
484 | 23 | 23 | ||
485 | 24 | Page { | 24 | Page { |
486 | 25 | 25 | ||
487 | === modified file 'src/imports/Ubuntu/Contacts/ActionButton.qml' | |||
488 | --- src/imports/Ubuntu/Contacts/ActionButton.qml 2015-08-17 18:47:15 +0000 | |||
489 | +++ src/imports/Ubuntu/Contacts/ActionButton.qml 2015-10-16 13:35:13 +0000 | |||
490 | @@ -15,7 +15,7 @@ | |||
491 | 15 | */ | 15 | */ |
492 | 16 | 16 | ||
493 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
495 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
496 | 19 | 19 | ||
497 | 20 | AbstractButton { | 20 | AbstractButton { |
498 | 21 | id: root | 21 | id: root |
499 | 22 | 22 | ||
500 | === modified file 'src/imports/Ubuntu/Contacts/ContactAvatar.qml' | |||
501 | --- src/imports/Ubuntu/Contacts/ContactAvatar.qml 2015-08-17 18:47:15 +0000 | |||
502 | +++ src/imports/Ubuntu/Contacts/ContactAvatar.qml 2015-10-16 13:35:13 +0000 | |||
503 | @@ -16,7 +16,7 @@ | |||
504 | 16 | 16 | ||
505 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
506 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
508 | 19 | import Ubuntu.Components 1.2 | 19 | import Ubuntu.Components 1.3 |
509 | 20 | import Ubuntu.Contacts 0.1 | 20 | import Ubuntu.Contacts 0.1 |
510 | 21 | import "Contacts.js" as ContactsJS | 21 | import "Contacts.js" as ContactsJS |
511 | 22 | 22 | ||
512 | @@ -41,7 +41,7 @@ | |||
513 | 41 | } | 41 | } |
514 | 42 | 42 | ||
515 | 43 | radius: "medium" | 43 | radius: "medium" |
517 | 44 | color: Theme.palette.normal.overlay | 44 | backgroundColor: Theme.palette.normal.overlay |
518 | 45 | 45 | ||
519 | 46 | Label { | 46 | Label { |
520 | 47 | id: initialsLabel | 47 | id: initialsLabel |
521 | @@ -56,7 +56,7 @@ | |||
522 | 56 | visible: (img.status != Image.Ready) | 56 | visible: (img.status != Image.Ready) |
523 | 57 | } | 57 | } |
524 | 58 | 58 | ||
526 | 59 | image: !img.visible ? img : null | 59 | source: !img.visible ? img : null |
527 | 60 | 60 | ||
528 | 61 | Image { | 61 | Image { |
529 | 62 | id: img | 62 | id: img |
530 | 63 | 63 | ||
531 | === modified file 'src/imports/Ubuntu/Contacts/ContactDelegate.qml' | |||
532 | --- src/imports/Ubuntu/Contacts/ContactDelegate.qml 2015-08-17 18:47:15 +0000 | |||
533 | +++ src/imports/Ubuntu/Contacts/ContactDelegate.qml 2015-10-16 13:35:13 +0000 | |||
534 | @@ -16,8 +16,8 @@ | |||
535 | 16 | 16 | ||
536 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
537 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
540 | 19 | import Ubuntu.Components 1.2 | 19 | import Ubuntu.Components 1.3 |
541 | 20 | import Ubuntu.Components.ListItems 1.0 as ListItem | 20 | import Ubuntu.Components.ListItems 1.3 as ListItem |
542 | 21 | import "Contacts.js" as ContactsJS | 21 | import "Contacts.js" as ContactsJS |
543 | 22 | 22 | ||
544 | 23 | ListItemWithActions { | 23 | ListItemWithActions { |
545 | 24 | 24 | ||
546 | === modified file 'src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml' | |||
547 | --- src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml 2015-08-17 18:47:15 +0000 | |||
548 | +++ src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml 2015-10-16 13:35:13 +0000 | |||
549 | @@ -15,7 +15,7 @@ | |||
550 | 15 | */ | 15 | */ |
551 | 16 | 16 | ||
552 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
554 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
555 | 19 | import QtContacts 5.0 as QtContacts | 19 | import QtContacts 5.0 as QtContacts |
556 | 20 | 20 | ||
557 | 21 | Item { | 21 | Item { |
558 | 22 | 22 | ||
559 | === modified file 'src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml' | |||
560 | --- src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml 2015-08-17 18:47:15 +0000 | |||
561 | +++ src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml 2015-10-16 13:35:13 +0000 | |||
562 | @@ -15,7 +15,7 @@ | |||
563 | 15 | */ | 15 | */ |
564 | 16 | 16 | ||
565 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.0 |
567 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
568 | 19 | 19 | ||
569 | 20 | Item { | 20 | Item { |
570 | 21 | id: root | 21 | id: root |
571 | @@ -49,8 +49,8 @@ | |||
572 | 49 | } | 49 | } |
573 | 50 | width: height | 50 | width: height |
574 | 51 | radius: "medium" | 51 | radius: "medium" |
577 | 52 | color: Theme.palette.normal.overlay | 52 | backgroundColor: Theme.palette.normal.overlay |
578 | 53 | image: Image { | 53 | source: Image { |
579 | 54 | source: root.expandIcon ? root.iconSource : "" | 54 | source: root.expandIcon ? root.iconSource : "" |
580 | 55 | } | 55 | } |
581 | 56 | Image { | 56 | Image { |
582 | 57 | 57 | ||
583 | === modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml' | |||
584 | --- src/imports/Ubuntu/Contacts/ContactListView.qml 2015-09-18 13:18:40 +0000 | |||
585 | +++ src/imports/Ubuntu/Contacts/ContactListView.qml 2015-10-16 13:35:13 +0000 | |||
586 | @@ -17,9 +17,9 @@ | |||
587 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
588 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
589 | 19 | 19 | ||
593 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
594 | 21 | import Ubuntu.Components.ListItems 1.0 as ListItem | 21 | import Ubuntu.Components.ListItems 1.3 as ListItem |
595 | 22 | import Ubuntu.Components.Popups 1.0 | 22 | import Ubuntu.Components.Popups 1.3 |
596 | 23 | import Ubuntu.Contacts 0.1 as Contacts | 23 | import Ubuntu.Contacts 0.1 as Contacts |
597 | 24 | import Buteo 0.1 | 24 | import Buteo 0.1 |
598 | 25 | 25 | ||
599 | 26 | 26 | ||
600 | === modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml' | |||
601 | --- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml 2015-08-17 18:47:15 +0000 | |||
602 | +++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml 2015-10-16 13:35:13 +0000 | |||
603 | @@ -16,8 +16,8 @@ | |||
604 | 16 | 16 | ||
605 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
606 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
609 | 19 | import Ubuntu.Components 1.2 | 19 | import Ubuntu.Components 1.3 |
610 | 20 | import Ubuntu.Components.ListItems 1.0 as ListItem | 20 | import Ubuntu.Components.ListItems 1.3 as ListItem |
611 | 21 | 21 | ||
612 | 22 | import "ContactList.js" as Sections | 22 | import "ContactList.js" as Sections |
613 | 23 | 23 | ||
614 | 24 | 24 | ||
615 | === modified file 'src/imports/Ubuntu/Contacts/FastScroll.qml' | |||
616 | --- src/imports/Ubuntu/Contacts/FastScroll.qml 2015-08-17 18:47:15 +0000 | |||
617 | +++ src/imports/Ubuntu/Contacts/FastScroll.qml 2015-10-16 13:35:13 +0000 | |||
618 | @@ -41,7 +41,7 @@ | |||
619 | 41 | 41 | ||
620 | 42 | // FastScroll.qml | 42 | // FastScroll.qml |
621 | 43 | import QtQuick 2.2 | 43 | import QtQuick 2.2 |
623 | 44 | import Ubuntu.Components 1.2 | 44 | import Ubuntu.Components 1.3 |
624 | 45 | import "FastScroll.js" as Sections | 45 | import "FastScroll.js" as Sections |
625 | 46 | 46 | ||
626 | 47 | Item { | 47 | Item { |
627 | 48 | 48 | ||
628 | === modified file 'src/imports/Ubuntu/Contacts/ListItemWithActions.qml' | |||
629 | --- src/imports/Ubuntu/Contacts/ListItemWithActions.qml 2015-08-17 18:47:15 +0000 | |||
630 | +++ src/imports/Ubuntu/Contacts/ListItemWithActions.qml 2015-10-16 13:35:13 +0000 | |||
631 | @@ -15,7 +15,7 @@ | |||
632 | 15 | */ | 15 | */ |
633 | 16 | 16 | ||
634 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
636 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
637 | 19 | 19 | ||
638 | 20 | Item { | 20 | Item { |
639 | 21 | id: root | 21 | id: root |
640 | 22 | 22 | ||
641 | === modified file 'src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml' | |||
642 | --- src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml 2015-08-17 18:47:15 +0000 | |||
643 | +++ src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml 2015-10-16 13:35:13 +0000 | |||
644 | @@ -15,7 +15,7 @@ | |||
645 | 15 | */ | 15 | */ |
646 | 16 | 16 | ||
647 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
649 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
650 | 19 | 19 | ||
651 | 20 | CheckBox { | 20 | CheckBox { |
652 | 21 | checked: root.selected | 21 | checked: root.selected |
653 | 22 | 22 | ||
654 | === modified file 'src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml' | |||
655 | --- src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml 2015-08-17 18:47:15 +0000 | |||
656 | +++ src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml 2015-10-16 13:35:13 +0000 | |||
657 | @@ -15,8 +15,8 @@ | |||
658 | 15 | */ | 15 | */ |
659 | 16 | 16 | ||
660 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
663 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
664 | 19 | import Ubuntu.Components.Popups 1.0 as Popups | 19 | import Ubuntu.Components.Popups 1.3 as Popups |
665 | 20 | 20 | ||
666 | 21 | /*! | 21 | /*! |
667 | 22 | \qmltype ContactSimpleListView | 22 | \qmltype ContactSimpleListView |
668 | 23 | 23 | ||
669 | === modified file 'src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml' | |||
670 | --- src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml 2015-08-17 18:47:15 +0000 | |||
671 | +++ src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml 2015-10-16 13:35:13 +0000 | |||
672 | @@ -15,7 +15,7 @@ | |||
673 | 15 | */ | 15 | */ |
674 | 16 | 16 | ||
675 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
677 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
678 | 19 | import Ubuntu.OnlineAccounts 0.1 | 19 | import Ubuntu.OnlineAccounts 0.1 |
679 | 20 | import Ubuntu.OnlineAccounts.Client 0.1 | 20 | import Ubuntu.OnlineAccounts.Client 0.1 |
680 | 21 | 21 | ||
681 | 22 | 22 | ||
682 | === modified file 'src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml' | |||
683 | --- src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml 2015-08-17 18:47:15 +0000 | |||
684 | +++ src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml 2015-10-16 13:35:13 +0000 | |||
685 | @@ -63,7 +63,7 @@ | |||
686 | 63 | */ | 63 | */ |
687 | 64 | 64 | ||
688 | 65 | import QtQuick 2.2 | 65 | import QtQuick 2.2 |
690 | 66 | import Ubuntu.Components 1.2 | 66 | import Ubuntu.Components 1.3 |
691 | 67 | 67 | ||
692 | 68 | Page { | 68 | Page { |
693 | 69 | id: page | 69 | id: page |
694 | @@ -170,7 +170,7 @@ | |||
695 | 170 | z: 1 | 170 | z: 1 |
696 | 171 | width: tipLabel.paintedWidth + units.gu(6) | 171 | width: tipLabel.paintedWidth + units.gu(6) |
697 | 172 | height: bottomEdge.tipHeight + units.gu(1) | 172 | height: bottomEdge.tipHeight + units.gu(1) |
699 | 173 | color: Theme.palette.normal.overlay | 173 | backgroundColor: Theme.palette.normal.overlay |
700 | 174 | Label { | 174 | Label { |
701 | 175 | id: tipLabel | 175 | id: tipLabel |
702 | 176 | 176 | ||
703 | 177 | 177 | ||
704 | === modified file 'src/imports/Ubuntu/Contacts/SIMCardImportPage.qml' | |||
705 | --- src/imports/Ubuntu/Contacts/SIMCardImportPage.qml 2015-08-17 18:47:15 +0000 | |||
706 | +++ src/imports/Ubuntu/Contacts/SIMCardImportPage.qml 2015-10-16 13:35:13 +0000 | |||
707 | @@ -17,9 +17,9 @@ | |||
708 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
709 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
710 | 19 | 19 | ||
712 | 20 | import Ubuntu.Components 1.2 | 20 | import Ubuntu.Components 1.3 |
713 | 21 | import Ubuntu.Contacts 0.1 | 21 | import Ubuntu.Contacts 0.1 |
715 | 22 | import Ubuntu.Components.ListItems 1.0 as ListItem | 22 | import Ubuntu.Components.ListItems 1.3 as ListItem |
716 | 23 | 23 | ||
717 | 24 | import MeeGo.QOfono 0.2 | 24 | import MeeGo.QOfono 0.2 |
718 | 25 | 25 | ||
719 | 26 | 26 | ||
720 | === modified file 'src/imports/Ubuntu/Contacts/SectionDelegate.qml' | |||
721 | --- src/imports/Ubuntu/Contacts/SectionDelegate.qml 2015-08-17 18:47:15 +0000 | |||
722 | +++ src/imports/Ubuntu/Contacts/SectionDelegate.qml 2015-10-16 13:35:13 +0000 | |||
723 | @@ -15,8 +15,8 @@ | |||
724 | 15 | */ | 15 | */ |
725 | 16 | 16 | ||
726 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
729 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
730 | 19 | import Ubuntu.Components.ListItems 1.0 | 19 | import Ubuntu.Components.ListItems 1.3 |
731 | 20 | 20 | ||
732 | 21 | Rectangle { | 21 | Rectangle { |
733 | 22 | property alias text: title.text | 22 | property alias text: title.text |
734 | 23 | 23 | ||
735 | === modified file 'src/imports/Ubuntu/Contacts/SubtitledWithColors.qml' | |||
736 | --- src/imports/Ubuntu/Contacts/SubtitledWithColors.qml 2015-08-17 18:47:15 +0000 | |||
737 | +++ src/imports/Ubuntu/Contacts/SubtitledWithColors.qml 2015-10-16 13:35:13 +0000 | |||
738 | @@ -15,7 +15,7 @@ | |||
739 | 15 | */ | 15 | */ |
740 | 16 | 16 | ||
741 | 17 | import QtQuick 2.0 | 17 | import QtQuick 2.0 |
743 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
744 | 19 | 19 | ||
745 | 20 | MouseArea { | 20 | MouseArea { |
746 | 21 | id: subtitledListItem | 21 | id: subtitledListItem |
747 | 22 | 22 | ||
748 | === modified file 'src/imports/VCardImportDialog.qml' | |||
749 | --- src/imports/VCardImportDialog.qml 2015-08-17 18:47:15 +0000 | |||
750 | +++ src/imports/VCardImportDialog.qml 2015-10-16 13:35:13 +0000 | |||
751 | @@ -16,8 +16,8 @@ | |||
752 | 16 | 16 | ||
753 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
754 | 18 | import QtContacts 5.0 | 18 | import QtContacts 5.0 |
757 | 19 | import Ubuntu.Components 1.2 | 19 | import Ubuntu.Components 1.3 |
758 | 20 | import Ubuntu.Components.Popups 1.0 as Popups | 20 | import Ubuntu.Components.Popups 1.3 as Popups |
759 | 21 | 21 | ||
760 | 22 | Item { | 22 | Item { |
761 | 23 | id: root | 23 | id: root |
762 | 24 | 24 | ||
763 | === modified file 'tests/autopilot/address_book_app/__init__.py' | |||
764 | --- tests/autopilot/address_book_app/__init__.py 2015-06-10 17:25:15 +0000 | |||
765 | +++ tests/autopilot/address_book_app/__init__.py 2015-10-16 13:35:13 +0000 | |||
766 | @@ -124,7 +124,9 @@ | |||
767 | 124 | objectName="contactListView") | 124 | objectName="contactListView") |
768 | 125 | 125 | ||
769 | 126 | def get_button(self, buttonName): | 126 | def get_button(self, buttonName): |
771 | 127 | return self.get_header()._get_action_button(buttonName) | 127 | actionbar = self.select_single('ActionBar', objectName='headerActionBar') |
772 | 128 | return actionbar._get_action_button(buttonName) | ||
773 | 129 | |||
774 | 128 | 130 | ||
775 | 129 | def open_header(self): | 131 | def open_header(self): |
776 | 130 | header = self.get_header() | 132 | header = self.get_header() |
777 | 131 | 133 | ||
778 | === modified file 'tests/qml/tst_ContactEditor.qml' | |||
779 | --- tests/qml/tst_ContactEditor.qml 2015-08-17 18:47:15 +0000 | |||
780 | +++ tests/qml/tst_ContactEditor.qml 2015-10-16 13:35:13 +0000 | |||
781 | @@ -16,7 +16,7 @@ | |||
782 | 16 | 16 | ||
783 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
784 | 18 | import QtTest 1.0 | 18 | import QtTest 1.0 |
786 | 19 | import Ubuntu.Components 1.2 | 19 | import Ubuntu.Components 1.3 |
787 | 20 | import Ubuntu.Test 0.1 | 20 | import Ubuntu.Test 0.1 |
788 | 21 | import Ubuntu.Contacts 0.1 | 21 | import Ubuntu.Contacts 0.1 |
789 | 22 | 22 | ||
790 | @@ -69,7 +69,7 @@ | |||
791 | 69 | 69 | ||
792 | 70 | function init() { | 70 | function init() { |
793 | 71 | waitForRendering(contactEditor); | 71 | waitForRendering(contactEditor); |
795 | 72 | var saveButton = findChild(root, 'save_header_button'); | 72 | var saveButton = findChild(root, 'save_action_button'); |
796 | 73 | compare(saveButton.enabled, false); | 73 | compare(saveButton.enabled, false); |
797 | 74 | } | 74 | } |
798 | 75 | 75 | ||
799 | @@ -113,7 +113,7 @@ | |||
800 | 113 | function test_fillRequiredFieldsMustEnableSaveButton(data) { | 113 | function test_fillRequiredFieldsMustEnableSaveButton(data) { |
801 | 114 | var textField = findChild(root, data.objectName); | 114 | var textField = findChild(root, data.objectName); |
802 | 115 | textField.text = 'test' | 115 | textField.text = 'test' |
804 | 116 | var saveButton = findChild(root, 'save_header_button'); | 116 | var saveButton = findChild(root, 'save_action_button'); |
805 | 117 | tryCompare(saveButton, 'enabled', true); | 117 | tryCompare(saveButton, 'enabled', true); |
806 | 118 | } | 118 | } |
807 | 119 | 119 | ||
808 | @@ -125,7 +125,7 @@ | |||
809 | 125 | function test_fillOptionalFieldsMustNotEnableSaveButton(data) { | 125 | function test_fillOptionalFieldsMustNotEnableSaveButton(data) { |
810 | 126 | var textField = findChild(root, data.objectName); | 126 | var textField = findChild(root, data.objectName); |
811 | 127 | textField.text = 'test' | 127 | textField.text = 'test' |
813 | 128 | var saveButton = findChild(root, 'save_header_button'); | 128 | var saveButton = findChild(root, 'save_action_button'); |
814 | 129 | tryCompare(saveButton, 'enabled', false); | 129 | tryCompare(saveButton, 'enabled', false); |
815 | 130 | } | 130 | } |
816 | 131 | 131 | ||
817 | 132 | 132 | ||
818 | === modified file 'tests/qml/tst_ContactList.qml' | |||
819 | --- tests/qml/tst_ContactList.qml 2015-08-17 18:47:15 +0000 | |||
820 | +++ tests/qml/tst_ContactList.qml 2015-10-16 13:35:13 +0000 | |||
821 | @@ -16,7 +16,7 @@ | |||
822 | 16 | 16 | ||
823 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
824 | 18 | import QtTest 1.0 | 18 | import QtTest 1.0 |
826 | 19 | import Ubuntu.Components 1.2 | 19 | import Ubuntu.Components 1.3 |
827 | 20 | import Ubuntu.Test 0.1 | 20 | import Ubuntu.Test 0.1 |
828 | 21 | import Ubuntu.Contacts 0.1 | 21 | import Ubuntu.Contacts 0.1 |
829 | 22 | 22 | ||
830 | 23 | 23 | ||
831 | === modified file 'tests/qml/tst_ContactListModel.qml' | |||
832 | --- tests/qml/tst_ContactListModel.qml 2015-08-17 18:47:15 +0000 | |||
833 | +++ tests/qml/tst_ContactListModel.qml 2015-10-16 13:35:13 +0000 | |||
834 | @@ -16,7 +16,7 @@ | |||
835 | 16 | 16 | ||
836 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
837 | 18 | import QtTest 1.0 | 18 | import QtTest 1.0 |
839 | 19 | import Ubuntu.Components 1.2 | 19 | import Ubuntu.Components 1.3 |
840 | 20 | import Ubuntu.Test 0.1 | 20 | import Ubuntu.Test 0.1 |
841 | 21 | import Ubuntu.Contacts 0.1 | 21 | import Ubuntu.Contacts 0.1 |
842 | 22 | 22 | ||
843 | 23 | 23 | ||
844 | === modified file 'tests/qml/tst_ContactListView.qml' | |||
845 | --- tests/qml/tst_ContactListView.qml 2015-08-17 18:47:15 +0000 | |||
846 | +++ tests/qml/tst_ContactListView.qml 2015-10-16 13:35:13 +0000 | |||
847 | @@ -16,7 +16,7 @@ | |||
848 | 16 | 16 | ||
849 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
850 | 18 | import QtTest 1.0 | 18 | import QtTest 1.0 |
852 | 19 | import Ubuntu.Components 1.2 | 19 | import Ubuntu.Components 1.3 |
853 | 20 | import Ubuntu.Test 0.1 | 20 | import Ubuntu.Test 0.1 |
854 | 21 | import Ubuntu.Contacts 0.1 | 21 | import Ubuntu.Contacts 0.1 |
855 | 22 | 22 | ||
856 | 23 | 23 | ||
857 | === modified file 'tests/qml/tst_ContactPreviewPage.qml' | |||
858 | --- tests/qml/tst_ContactPreviewPage.qml 2015-08-17 18:47:15 +0000 | |||
859 | +++ tests/qml/tst_ContactPreviewPage.qml 2015-10-16 13:35:13 +0000 | |||
860 | @@ -19,7 +19,7 @@ | |||
861 | 19 | import Ubuntu.Test 0.1 | 19 | import Ubuntu.Test 0.1 |
862 | 20 | import QtContacts 5.0 | 20 | import QtContacts 5.0 |
863 | 21 | 21 | ||
865 | 22 | import Ubuntu.Components 1.2 | 22 | import Ubuntu.Components 1.3 |
866 | 23 | import Ubuntu.Contacts 0.1 | 23 | import Ubuntu.Contacts 0.1 |
867 | 24 | import Ubuntu.AddressBook.ContactView 0.1 | 24 | import Ubuntu.AddressBook.ContactView 0.1 |
868 | 25 | 25 | ||
869 | 26 | 26 | ||
870 | === modified file 'tests/qml/tst_ListWithActions.qml' | |||
871 | --- tests/qml/tst_ListWithActions.qml 2015-08-17 18:47:15 +0000 | |||
872 | +++ tests/qml/tst_ListWithActions.qml 2015-10-16 13:35:13 +0000 | |||
873 | @@ -15,7 +15,7 @@ | |||
874 | 15 | */ | 15 | */ |
875 | 16 | 16 | ||
876 | 17 | import QtQuick 2.2 | 17 | import QtQuick 2.2 |
878 | 18 | import Ubuntu.Components 1.2 | 18 | import Ubuntu.Components 1.3 |
879 | 19 | import QtTest 1.0 | 19 | import QtTest 1.0 |
880 | 20 | import Ubuntu.Test 0.1 | 20 | import Ubuntu.Test 0.1 |
881 | 21 | import Ubuntu.Contacts 0.1 | 21 | import Ubuntu.Contacts 0.1 |
Caveat: ContentPeerPicker with Toolkit 1.3 shows a double header.