Merge lp:~vthompson/music-app/music-uc1.3 into lp:music-app

Proposed by Victor Thompson on 2015-08-12
Status: Merged
Approved by: Andrew Hayzen on 2015-11-02
Approved revision: 909
Merged at revision: 932
Proposed branch: lp:~vthompson/music-app/music-uc1.3
Merge into: lp:music-app
Diff against target: 920 lines (+94/-84)
64 files modified
app/components/BlurredBackground.qml (+1/-1)
app/components/BlurredHeader.qml (+1/-1)
app/components/CoverGrid.qml (+1/-1)
app/components/Delegates/Card.qml (+1/-1)
app/components/Delegates/ListItemWithActions.qml (+1/-1)
app/components/Delegates/MusicListItem.qml (+1/-1)
app/components/Dialog/ContentHubErrorDialog.qml (+2/-2)
app/components/Dialog/ContentHubNotFoundDialog.qml (+2/-2)
app/components/Dialog/ContentHubWaitDialog.qml (+1/-2)
app/components/Dialog/EditPlaylistDialog.qml (+2/-2)
app/components/Dialog/NewPlaylistDialog.qml (+2/-2)
app/components/Dialog/RemovePlaylistDialog.qml (+2/-2)
app/components/Flickables/CardView.qml (+1/-1)
app/components/Flickables/MultiSelectListView.qml (+1/-1)
app/components/Flickables/MusicListView.qml (+1/-1)
app/components/HeadState/MultiSelectHeadState.qml (+1/-1)
app/components/HeadState/PlaylistsHeadState.qml (+2/-2)
app/components/HeadState/SearchHeadState.qml (+1/-1)
app/components/HeadState/SearchableHeadState.qml (+1/-1)
app/components/Helpers/ContentHubHelper.qml (+2/-2)
app/components/Helpers/UriHandlerHelper.qml (+1/-1)
app/components/Helpers/UserMetricsHelper.qml (+1/-1)
app/components/ListItemActions/AddToPlaylist.qml (+1/-1)
app/components/ListItemActions/AddToQueue.qml (+1/-1)
app/components/ListItemActions/CheckBox.qml (+1/-1)
app/components/ListItemActions/Remove.qml (+1/-2)
app/components/ListItemReorderComponent.qml (+1/-1)
app/components/LoadingSpinnerComponent.qml (+1/-1)
app/components/MusicPage.qml (+2/-2)
app/components/MusicRow.qml (+1/-1)
app/components/MusicToolbar.qml (+1/-1)
app/components/NowPlayingFullView.qml (+1/-1)
app/components/NowPlayingToolbar.qml (+1/-1)
app/components/PlaylistsEmptyState.qml (+1/-1)
app/components/Queue.qml (+1/-1)
app/components/Style.qml (+1/-1)
app/components/Themes/Ambiance/BubbleShape.qml (+1/-1)
app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml (+1/-1)
app/components/ViewButton/PlayAllButton.qml (+1/-1)
app/components/ViewButton/QueueAllButton.qml (+1/-1)
app/components/ViewButton/ShuffleButton.qml (+1/-1)
app/components/Walkthrough/FirstRunWalkthrough.qml (+1/-1)
app/components/Walkthrough/Slide1.qml (+1/-1)
app/components/Walkthrough/Slide2.qml (+1/-1)
app/components/Walkthrough/Slide3.qml (+1/-1)
app/components/Walkthrough/Walkthrough.qml (+7/-1)
app/components/WorkerWaiter.qml (+1/-1)
app/music-app.qml (+3/-2)
app/ui/AddToPlaylist.qml (+1/-2)
app/ui/Albums.qml (+1/-1)
app/ui/ArtistView.qml (+1/-2)
app/ui/Artists.qml (+1/-2)
app/ui/ContentHubExport.qml (+1/-1)
app/ui/Genres.qml (+1/-1)
app/ui/LibraryEmptyState.qml (+7/-1)
app/ui/NowPlaying.qml (+6/-3)
app/ui/Playlists.qml (+1/-2)
app/ui/Recent.qml (+1/-2)
app/ui/Songs.qml (+1/-1)
app/ui/SongsView.qml (+4/-4)
debian/changelog (+1/-0)
manifest.json.in (+1/-1)
music-app.qmltheme (+1/-1)
tests/autopilot/music_app/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~vthompson/music-app/music-uc1.3
Reviewer Review Type Date Requested Status
Andrew Hayzen 2015-08-12 Approve on 2015-11-02
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-10-31
Bartosz Kosiorek (community) Approve on 2015-10-23
Review via email: mp+267889@code.launchpad.net

Commit message

* Update app to use the Ubuntu Components version 1.3

Description of the change

Upgrade to Ubuntu Components 1.3. For now, this is mostly just useful to use as a springboard for testing the new AdaptivePageLayout and other convergence features in UC 1.3.

To post a comment you must log in.
Victor Thompson (vthompson) wrote :

If we upgrade to UC1.3 we get the new header and other goodies. Since OTA-6 has landed--should we land this update?

Victor Thompson (vthompson) wrote :

Note that this will break Vivid desktop.

PASSED: Continuous integration, rev:897
http://91.189.93.70:8080/job/music-app-ci/1369/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/221

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1369/rebuild

review: Approve (continuous-integration)
Andrew Hayzen (ahayzen) wrote :

This should bump the framework to 15.04.1 so then it doesn't appear on devices that don't support it :-)

review: Needs Fixing
lp:~vthompson/music-app/music-uc1.3 updated on 2015-10-18
898. By Victor Thompson on 2015-08-28

update changelog and 1 file.

899. By Victor Thompson on 2015-10-18

Merge of trunk and resolve conflict

900. By Victor Thompson on 2015-10-18

Update framework

PASSED: Continuous integration, rev:900
http://91.189.93.70:8080/job/music-app-ci/1387/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/239

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1387/rebuild

review: Approve (continuous-integration)
lp:~vthompson/music-app/music-uc1.3 updated on 2015-10-21
901. By Victor Thompson on 2015-10-21

Change to SuruDark theme to resolve theme issues for now

PASSED: Continuous integration, rev:901
http://91.189.93.70:8080/job/music-app-ci/1390/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/242

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1390/rebuild

review: Approve (continuous-integration)
Bartosz Kosiorek (gang65) wrote :

Some inline comments

review: Needs Fixing
Andrew Hayzen (ahayzen) wrote :

@Bartosz, Listitems are in a separate branch [0] which we will land at the same time, same story for weather.

Also as a note I'm trying to sort out header.height issues in that branch as well, so this should not land in trunk until the listitems one is ready.

0 - https://code.launchpad.net/~ahayzen/music-app/refactor-use-sdk-listitems/+merge/274829

lp:~vthompson/music-app/music-uc1.3 updated on 2015-10-23
902. By Victor Thompson on 2015-10-23

Update Popups.

Victor Thompson (vthompson) wrote :

I'll update the popups, but leave the list items to be updated.

PASSED: Continuous integration, rev:902
http://91.189.93.70:8080/job/music-app-ci/1393/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/245

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1393/rebuild

review: Approve (continuous-integration)
Bartosz Kosiorek (gang65) wrote :

You could also update debian/changelog file with ticket number (LP: #1508363)

Besides that it is perfectly fine.

review: Approve
Andrew Hayzen (ahayzen) wrote :

We need to check that the header.height and header.width issues are all resolved in either this or the second branch before landing. I will hopefully be on this later today.

review: Needs Fixing
lp:~vthompson/music-app/music-uc1.3 updated on 2015-10-23
903. By Victor Thompson on 2015-10-23

Fix for SongsView

PASSED: Continuous integration, rev:903
http://91.189.93.70:8080/job/music-app-ci/1394/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/246

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1394/rebuild

review: Approve (continuous-integration)
lp:~vthompson/music-app/music-uc1.3 updated on 2015-10-23
904. By Victor Thompson on 2015-10-23

Hardcode header height.

PASSED: Continuous integration, rev:904
http://91.189.93.70:8080/job/music-app-ci/1395/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/247

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1395/rebuild

review: Approve (continuous-integration)
lp:~vthompson/music-app/music-uc1.3 updated on 2015-10-24
905. By Victor Thompson on 2015-10-24

Hide the header in the Walkthrough and the LibraryEmptyState.

906. By Victor Thompson on 2015-10-24

Update changelog

PASSED: Continuous integration, rev:906
http://91.189.93.70:8080/job/music-app-ci/1396/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/248

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1396/rebuild

review: Approve (continuous-integration)
lp:~vthompson/music-app/music-uc1.3 updated on 2015-10-24
907. By Victor Thompson on 2015-10-24

Fix changelog

PASSED: Continuous integration, rev:907
http://91.189.93.70:8080/job/music-app-ci/1397/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/249

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1397/rebuild

review: Approve (continuous-integration)
lp:~vthompson/music-app/music-uc1.3 updated on 2015-10-31
908. By Victor Thompson on 2015-10-31

Fix walkthrough AP issue.

PASSED: Continuous integration, rev:908
http://91.189.93.70:8080/job/music-app-ci/1403/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/255

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1403/rebuild

review: Approve (continuous-integration)
lp:~vthompson/music-app/music-uc1.3 updated on 2015-10-31
909. By Victor Thompson on 2015-10-31

More AP tweaks

PASSED: Continuous integration, rev:909
http://91.189.93.70:8080/job/music-app-ci/1404/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/256

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1404/rebuild

review: Approve (continuous-integration)
Andrew Hayzen (ahayzen) wrote :

AP is passing on the listitems branch [1] now, so once that branch is approved, they can land together.

1 - https://code.launchpad.net/~ahayzen/music-app/refactor-use-sdk-listitems/+merge/274829

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/components/BlurredBackground.qml'
2--- app/components/BlurredBackground.qml 2015-05-03 16:22:31 +0000
3+++ app/components/BlurredBackground.qml 2015-10-31 19:22:26 +0000
4@@ -18,7 +18,7 @@
5 */
6
7 import QtQuick 2.4
8-import Ubuntu.Components 1.2
9+import Ubuntu.Components 1.3
10 import QtGraphicalEffects 1.0
11
12 // Blurred background
13
14=== modified file 'app/components/BlurredHeader.qml'
15--- app/components/BlurredHeader.qml 2015-05-03 16:22:31 +0000
16+++ app/components/BlurredHeader.qml 2015-10-31 19:22:26 +0000
17@@ -17,7 +17,7 @@
18 */
19
20 import QtQuick 2.4
21-import Ubuntu.Components 1.2
22+import Ubuntu.Components 1.3
23 import Ubuntu.Components.ListItems 1.0 as ListItem
24
25 ListItem.Standard {
26
27=== modified file 'app/components/CoverGrid.qml'
28--- app/components/CoverGrid.qml 2015-05-03 16:22:31 +0000
29+++ app/components/CoverGrid.qml 2015-10-31 19:22:26 +0000
30@@ -18,7 +18,7 @@
31 */
32
33 import QtQuick 2.4
34-import Ubuntu.Components 1.2
35+import Ubuntu.Components 1.3
36
37 Item {
38 id: coverGrid
39
40=== modified file 'app/components/Delegates/Card.qml'
41--- app/components/Delegates/Card.qml 2015-05-03 16:22:31 +0000
42+++ app/components/Delegates/Card.qml 2015-10-31 19:22:26 +0000
43@@ -16,7 +16,7 @@
44 */
45
46 import QtQuick 2.4
47-import Ubuntu.Components 1.2
48+import Ubuntu.Components 1.3
49 import "../"
50
51
52
53=== modified file 'app/components/Delegates/ListItemWithActions.qml'
54--- app/components/Delegates/ListItemWithActions.qml 2015-05-03 16:22:31 +0000
55+++ app/components/Delegates/ListItemWithActions.qml 2015-10-31 19:22:26 +0000
56@@ -15,7 +15,7 @@
57 */
58
59 import QtQuick 2.4
60-import Ubuntu.Components 1.2
61+import Ubuntu.Components 1.3
62 import Ubuntu.Components.ListItems 1.0 as ListItem
63
64
65
66=== modified file 'app/components/Delegates/MusicListItem.qml'
67--- app/components/Delegates/MusicListItem.qml 2015-05-03 16:22:31 +0000
68+++ app/components/Delegates/MusicListItem.qml 2015-10-31 19:22:26 +0000
69@@ -18,7 +18,7 @@
70 */
71
72 import QtQuick 2.4
73-import Ubuntu.Components 1.2
74+import Ubuntu.Components 1.3
75 import "../"
76
77
78
79=== modified file 'app/components/Dialog/ContentHubErrorDialog.qml'
80--- app/components/Dialog/ContentHubErrorDialog.qml 2015-05-03 16:22:31 +0000
81+++ app/components/Dialog/ContentHubErrorDialog.qml 2015-10-31 19:22:26 +0000
82@@ -18,8 +18,8 @@
83 */
84
85 import QtQuick 2.4
86-import Ubuntu.Components 1.2
87-import Ubuntu.Components.Popups 1.0
88+import Ubuntu.Components 1.3
89+import Ubuntu.Components.Popups 1.3
90
91 Dialog {
92 id: dialogContentHubError
93
94=== modified file 'app/components/Dialog/ContentHubNotFoundDialog.qml'
95--- app/components/Dialog/ContentHubNotFoundDialog.qml 2015-05-03 16:22:31 +0000
96+++ app/components/Dialog/ContentHubNotFoundDialog.qml 2015-10-31 19:22:26 +0000
97@@ -18,8 +18,8 @@
98 */
99
100 import QtQuick 2.4
101-import Ubuntu.Components 1.2
102-import Ubuntu.Components.Popups 1.0
103+import Ubuntu.Components 1.3
104+import Ubuntu.Components.Popups 1.3
105
106 Dialog {
107 id: dialogContentHubNotFound
108
109=== modified file 'app/components/Dialog/ContentHubWaitDialog.qml'
110--- app/components/Dialog/ContentHubWaitDialog.qml 2015-05-03 16:22:31 +0000
111+++ app/components/Dialog/ContentHubWaitDialog.qml 2015-10-31 19:22:26 +0000
112@@ -18,8 +18,7 @@
113 */
114
115 import QtQuick 2.4
116-import Ubuntu.Components 1.2
117-import Ubuntu.Components.Popups 1.0
118+import Ubuntu.Components 1.3
119 import "../"
120
121 Dialog {
122
123=== modified file 'app/components/Dialog/EditPlaylistDialog.qml'
124--- app/components/Dialog/EditPlaylistDialog.qml 2015-05-03 16:22:31 +0000
125+++ app/components/Dialog/EditPlaylistDialog.qml 2015-10-31 19:22:26 +0000
126@@ -18,8 +18,8 @@
127 */
128
129 import QtQuick 2.4
130-import Ubuntu.Components 1.2
131-import Ubuntu.Components.Popups 1.0
132+import Ubuntu.Components 1.3
133+import Ubuntu.Components.Popups 1.3
134 import QtQuick.LocalStorage 2.0
135 import "../../logic/meta-database.js" as Library
136 import "../../logic/playlists.js" as Playlists
137
138=== modified file 'app/components/Dialog/NewPlaylistDialog.qml'
139--- app/components/Dialog/NewPlaylistDialog.qml 2015-05-03 16:22:31 +0000
140+++ app/components/Dialog/NewPlaylistDialog.qml 2015-10-31 19:22:26 +0000
141@@ -18,8 +18,8 @@
142 */
143
144 import QtQuick 2.4
145-import Ubuntu.Components 1.2
146-import Ubuntu.Components.Popups 1.0
147+import Ubuntu.Components 1.3
148+import Ubuntu.Components.Popups 1.3
149 import QtQuick.LocalStorage 2.0
150 import "../../logic/playlists.js" as Playlists
151
152
153=== modified file 'app/components/Dialog/RemovePlaylistDialog.qml'
154--- app/components/Dialog/RemovePlaylistDialog.qml 2015-05-03 16:22:31 +0000
155+++ app/components/Dialog/RemovePlaylistDialog.qml 2015-10-31 19:22:26 +0000
156@@ -18,8 +18,8 @@
157 */
158
159 import QtQuick 2.4
160-import Ubuntu.Components 1.2
161-import Ubuntu.Components.Popups 1.0
162+import Ubuntu.Components 1.3
163+import Ubuntu.Components.Popups 1.3
164 import QtQuick.LocalStorage 2.0
165 import "../../logic/meta-database.js" as Library
166 import "../../logic/playlists.js" as Playlists
167
168=== modified file 'app/components/Flickables/CardView.qml'
169--- app/components/Flickables/CardView.qml 2015-07-02 18:16:05 +0000
170+++ app/components/Flickables/CardView.qml 2015-10-31 19:22:26 +0000
171@@ -16,7 +16,7 @@
172 */
173
174 import QtQuick 2.4
175-import Ubuntu.Components 1.2
176+import Ubuntu.Components 1.3
177 import "../"
178
179
180
181=== modified file 'app/components/Flickables/MultiSelectListView.qml'
182--- app/components/Flickables/MultiSelectListView.qml 2015-05-03 16:22:31 +0000
183+++ app/components/Flickables/MultiSelectListView.qml 2015-10-31 19:22:26 +0000
184@@ -18,7 +18,7 @@
185 */
186
187 import QtQuick 2.4
188-import Ubuntu.Components 1.2
189+import Ubuntu.Components 1.3
190
191 MusicListView {
192 property var selectedItems: []
193
194=== modified file 'app/components/Flickables/MusicListView.qml'
195--- app/components/Flickables/MusicListView.qml 2015-05-03 16:22:31 +0000
196+++ app/components/Flickables/MusicListView.qml 2015-10-31 19:22:26 +0000
197@@ -18,7 +18,7 @@
198 */
199
200 import QtQuick 2.4
201-import Ubuntu.Components 1.2
202+import Ubuntu.Components 1.3
203
204
205 ListView {
206
207=== modified file 'app/components/HeadState/MultiSelectHeadState.qml'
208--- app/components/HeadState/MultiSelectHeadState.qml 2015-06-27 21:06:26 +0000
209+++ app/components/HeadState/MultiSelectHeadState.qml 2015-10-31 19:22:26 +0000
210@@ -17,7 +17,7 @@
211 */
212
213 import QtQuick 2.4
214-import Ubuntu.Components 1.2
215+import Ubuntu.Components 1.3
216
217 PageHeadState {
218 id: selectionState
219
220=== modified file 'app/components/HeadState/PlaylistsHeadState.qml'
221--- app/components/HeadState/PlaylistsHeadState.qml 2015-05-03 16:22:31 +0000
222+++ app/components/HeadState/PlaylistsHeadState.qml 2015-10-31 19:22:26 +0000
223@@ -17,8 +17,8 @@
224 */
225
226 import QtQuick 2.4
227-import Ubuntu.Components 1.2
228-import Ubuntu.Components.Popups 1.0
229+import Ubuntu.Components 1.3
230+import Ubuntu.Components.Popups 1.3
231
232
233 PageHeadState {
234
235=== modified file 'app/components/HeadState/SearchHeadState.qml'
236--- app/components/HeadState/SearchHeadState.qml 2015-05-03 16:22:31 +0000
237+++ app/components/HeadState/SearchHeadState.qml 2015-10-31 19:22:26 +0000
238@@ -17,7 +17,7 @@
239 */
240
241 import QtQuick 2.4
242-import Ubuntu.Components 1.2
243+import Ubuntu.Components 1.3
244
245 PageHeadState {
246 id: headerState
247
248=== modified file 'app/components/HeadState/SearchableHeadState.qml'
249--- app/components/HeadState/SearchableHeadState.qml 2015-05-03 16:22:31 +0000
250+++ app/components/HeadState/SearchableHeadState.qml 2015-10-31 19:22:26 +0000
251@@ -17,7 +17,7 @@
252 */
253
254 import QtQuick 2.4
255-import Ubuntu.Components 1.2
256+import Ubuntu.Components 1.3
257
258
259 PageHeadState {
260
261=== modified file 'app/components/Helpers/ContentHubHelper.qml'
262--- app/components/Helpers/ContentHubHelper.qml 2015-08-18 21:08:05 +0000
263+++ app/components/Helpers/ContentHubHelper.qml 2015-10-31 19:22:26 +0000
264@@ -18,8 +18,8 @@
265 */
266
267 import QtQuick 2.4
268-import Ubuntu.Components 1.2
269-import Ubuntu.Components.Popups 1.0
270+import Ubuntu.Components 1.3
271+import Ubuntu.Components.Popups 1.3
272 import Ubuntu.Content 1.1
273 import "../../logic/stored-request.js" as StoredRequest
274
275
276=== modified file 'app/components/Helpers/UriHandlerHelper.qml'
277--- app/components/Helpers/UriHandlerHelper.qml 2015-06-28 03:06:49 +0000
278+++ app/components/Helpers/UriHandlerHelper.qml 2015-10-31 19:22:26 +0000
279@@ -18,7 +18,7 @@
280 */
281
282 import QtQuick 2.4
283-import Ubuntu.Components 1.2
284+import Ubuntu.Components 1.3
285 import "../"
286 import "../../logic/stored-request.js" as StoredRequest
287
288
289=== modified file 'app/components/Helpers/UserMetricsHelper.qml'
290--- app/components/Helpers/UserMetricsHelper.qml 2015-05-03 16:22:31 +0000
291+++ app/components/Helpers/UserMetricsHelper.qml 2015-10-31 19:22:26 +0000
292@@ -18,7 +18,7 @@
293 */
294
295 import QtQuick 2.4
296-import Ubuntu.Components 1.2
297+import Ubuntu.Components 1.3
298 import UserMetrics 0.1
299
300
301
302=== modified file 'app/components/ListItemActions/AddToPlaylist.qml'
303--- app/components/ListItemActions/AddToPlaylist.qml 2015-06-27 21:06:26 +0000
304+++ app/components/ListItemActions/AddToPlaylist.qml 2015-10-31 19:22:26 +0000
305@@ -18,7 +18,7 @@
306 */
307
308 import QtQuick 2.4
309-import Ubuntu.Components 1.2
310+import Ubuntu.Components 1.3
311
312 Action {
313 iconName: "add-to-playlist"
314
315=== modified file 'app/components/ListItemActions/AddToQueue.qml'
316--- app/components/ListItemActions/AddToQueue.qml 2015-05-03 16:22:31 +0000
317+++ app/components/ListItemActions/AddToQueue.qml 2015-10-31 19:22:26 +0000
318@@ -19,7 +19,7 @@
319
320 import QtQuick 2.4
321 import QtQuick.LocalStorage 2.0
322-import Ubuntu.Components 1.2
323+import Ubuntu.Components 1.3
324 import "../../logic/meta-database.js" as Library
325
326 Action {
327
328=== modified file 'app/components/ListItemActions/CheckBox.qml'
329--- app/components/ListItemActions/CheckBox.qml 2015-06-27 20:18:02 +0000
330+++ app/components/ListItemActions/CheckBox.qml 2015-10-31 19:22:26 +0000
331@@ -15,7 +15,7 @@
332 */
333
334 import QtQuick 2.4
335-import Ubuntu.Components 1.2
336+import Ubuntu.Components 1.3
337
338 CheckBox {
339 checked: root.selected
340
341=== modified file 'app/components/ListItemActions/Remove.qml'
342--- app/components/ListItemActions/Remove.qml 2015-05-03 16:22:31 +0000
343+++ app/components/ListItemActions/Remove.qml 2015-10-31 19:22:26 +0000
344@@ -18,8 +18,7 @@
345 */
346
347 import QtQuick 2.4
348-import Ubuntu.Components 1.2
349-import Ubuntu.Components.Popups 1.0
350+import Ubuntu.Components 1.3
351
352 Action {
353 id: removeAction
354
355=== modified file 'app/components/ListItemReorderComponent.qml'
356--- app/components/ListItemReorderComponent.qml 2015-05-03 16:22:31 +0000
357+++ app/components/ListItemReorderComponent.qml 2015-10-31 19:22:26 +0000
358@@ -18,7 +18,7 @@
359 */
360
361 import QtQuick 2.4
362-import Ubuntu.Components 1.2
363+import Ubuntu.Components 1.3
364
365
366 Item {
367
368=== modified file 'app/components/LoadingSpinnerComponent.qml'
369--- app/components/LoadingSpinnerComponent.qml 2015-05-03 16:22:31 +0000
370+++ app/components/LoadingSpinnerComponent.qml 2015-10-31 19:22:26 +0000
371@@ -18,7 +18,7 @@
372 * Andrew Starr-Bochicchio <a.starr.b@gmail.com>
373 */
374 import QtQuick 2.4
375-import Ubuntu.Components 1.2
376+import Ubuntu.Components 1.3
377
378 Item {
379 id: refresh
380
381=== modified file 'app/components/MusicPage.qml'
382--- app/components/MusicPage.qml 2015-08-19 14:03:16 +0000
383+++ app/components/MusicPage.qml 2015-10-31 19:22:26 +0000
384@@ -18,8 +18,8 @@
385 */
386
387 import QtQuick 2.4
388-import Ubuntu.Components 1.2
389-import Ubuntu.Components.Popups 1.0
390+import Ubuntu.Components 1.3
391+import Ubuntu.Components.Popups 1.3
392
393
394 // generic page for music, could be useful for bottomedge implementation
395
396=== modified file 'app/components/MusicRow.qml'
397--- app/components/MusicRow.qml 2015-05-03 16:22:31 +0000
398+++ app/components/MusicRow.qml 2015-10-31 19:22:26 +0000
399@@ -18,7 +18,7 @@
400 */
401
402 import QtQuick 2.4
403-import Ubuntu.Components 1.2
404+import Ubuntu.Components 1.3
405
406
407 Row {
408
409=== modified file 'app/components/MusicToolbar.qml'
410--- app/components/MusicToolbar.qml 2015-07-29 01:23:11 +0000
411+++ app/components/MusicToolbar.qml 2015-10-31 19:22:26 +0000
412@@ -19,7 +19,7 @@
413
414 import QtQuick 2.4
415 import QtMultimedia 5.0
416-import Ubuntu.Components 1.2
417+import Ubuntu.Components 1.3
418
419 Rectangle {
420 anchors {
421
422=== modified file 'app/components/NowPlayingFullView.qml'
423--- app/components/NowPlayingFullView.qml 2015-08-28 04:48:28 +0000
424+++ app/components/NowPlayingFullView.qml 2015-10-31 19:22:26 +0000
425@@ -18,7 +18,7 @@
426 */
427
428 import QtQuick 2.4
429-import Ubuntu.Components 1.2
430+import Ubuntu.Components 1.3
431 import Ubuntu.Thumbnailer 0.1
432 import "../components/Themes/Ambiance"
433
434
435=== modified file 'app/components/NowPlayingToolbar.qml'
436--- app/components/NowPlayingToolbar.qml 2015-07-29 01:23:11 +0000
437+++ app/components/NowPlayingToolbar.qml 2015-10-31 19:22:26 +0000
438@@ -19,7 +19,7 @@
439
440 import QtMultimedia 5.0
441 import QtQuick 2.4
442-import Ubuntu.Components 1.2
443+import Ubuntu.Components 1.3
444
445
446 /* Full toolbar */
447
448=== modified file 'app/components/PlaylistsEmptyState.qml'
449--- app/components/PlaylistsEmptyState.qml 2015-05-03 16:22:31 +0000
450+++ app/components/PlaylistsEmptyState.qml 2015-10-31 19:22:26 +0000
451@@ -18,7 +18,7 @@
452 */
453
454 import QtQuick 2.4
455-import Ubuntu.Components 1.2
456+import Ubuntu.Components 1.3
457
458
459 Rectangle {
460
461=== modified file 'app/components/Queue.qml'
462--- app/components/Queue.qml 2015-06-27 21:06:26 +0000
463+++ app/components/Queue.qml 2015-10-31 19:22:26 +0000
464@@ -19,7 +19,7 @@
465
466 import QtQuick 2.4
467 import QtQuick.LocalStorage 2.0
468-import Ubuntu.Components 1.2
469+import Ubuntu.Components 1.3
470 import "Delegates"
471 import "Flickables"
472 import "ListItemActions"
473
474=== modified file 'app/components/Style.qml'
475--- app/components/Style.qml 2015-05-03 16:22:31 +0000
476+++ app/components/Style.qml 2015-10-31 19:22:26 +0000
477@@ -18,7 +18,7 @@
478 */
479
480 import QtQuick 2.4
481-import Ubuntu.Components 1.2
482+import Ubuntu.Components 1.3
483
484
485 QtObject {
486
487=== modified file 'app/components/Themes/Ambiance/BubbleShape.qml'
488--- app/components/Themes/Ambiance/BubbleShape.qml 2015-09-25 08:11:22 +0000
489+++ app/components/Themes/Ambiance/BubbleShape.qml 2015-10-31 19:22:26 +0000
490@@ -15,7 +15,7 @@
491 */
492
493 import QtQuick 2.4
494-import Ubuntu.Components 1.2
495+import Ubuntu.Components 1.3
496
497 Item {
498 id: bubbleShape
499
500=== modified file 'app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml'
501--- app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml 2015-06-20 17:49:57 +0000
502+++ app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml 2015-10-31 19:22:26 +0000
503@@ -15,7 +15,7 @@
504 */
505
506 import QtQuick 2.4
507-import Ubuntu.Components 1.2
508+import Ubuntu.Components 1.3
509
510 /*
511 The default slider style consists of a bar and a thumb shape.
512
513=== modified file 'app/components/ViewButton/PlayAllButton.qml'
514--- app/components/ViewButton/PlayAllButton.qml 2015-05-03 16:22:31 +0000
515+++ app/components/ViewButton/PlayAllButton.qml 2015-10-31 19:22:26 +0000
516@@ -18,7 +18,7 @@
517 */
518
519 import QtQuick 2.4
520-import Ubuntu.Components 1.2
521+import Ubuntu.Components 1.3
522
523
524 Button {
525
526=== modified file 'app/components/ViewButton/QueueAllButton.qml'
527--- app/components/ViewButton/QueueAllButton.qml 2015-05-03 16:22:31 +0000
528+++ app/components/ViewButton/QueueAllButton.qml 2015-10-31 19:22:26 +0000
529@@ -18,7 +18,7 @@
530 */
531
532 import QtQuick 2.4
533-import Ubuntu.Components 1.2
534+import Ubuntu.Components 1.3
535
536
537 Button {
538
539=== modified file 'app/components/ViewButton/ShuffleButton.qml'
540--- app/components/ViewButton/ShuffleButton.qml 2015-05-03 16:22:31 +0000
541+++ app/components/ViewButton/ShuffleButton.qml 2015-10-31 19:22:26 +0000
542@@ -18,7 +18,7 @@
543 */
544
545 import QtQuick 2.4
546-import Ubuntu.Components 1.2
547+import Ubuntu.Components 1.3
548
549
550 Button {
551
552=== modified file 'app/components/Walkthrough/FirstRunWalkthrough.qml'
553--- app/components/Walkthrough/FirstRunWalkthrough.qml 2015-05-03 16:22:31 +0000
554+++ app/components/Walkthrough/FirstRunWalkthrough.qml 2015-10-31 19:22:26 +0000
555@@ -20,7 +20,7 @@
556 */
557
558 import QtQuick 2.4
559-import Ubuntu.Components 1.2
560+import Ubuntu.Components 1.3
561
562 // Initial Walkthrough tutorial
563 Walkthrough {
564
565=== modified file 'app/components/Walkthrough/Slide1.qml'
566--- app/components/Walkthrough/Slide1.qml 2015-09-25 08:11:22 +0000
567+++ app/components/Walkthrough/Slide1.qml 2015-10-31 19:22:26 +0000
568@@ -21,7 +21,7 @@
569 */
570
571 import QtQuick 2.4
572-import Ubuntu.Components 1.2
573+import Ubuntu.Components 1.3
574
575 // Slide 1
576 Component {
577
578=== modified file 'app/components/Walkthrough/Slide2.qml'
579--- app/components/Walkthrough/Slide2.qml 2015-05-03 16:22:31 +0000
580+++ app/components/Walkthrough/Slide2.qml 2015-10-31 19:22:26 +0000
581@@ -21,7 +21,7 @@
582 */
583
584 import QtQuick 2.4
585-import Ubuntu.Components 1.2
586+import Ubuntu.Components 1.3
587
588 // Walkthrough - Slide 2
589 Component {
590
591=== modified file 'app/components/Walkthrough/Slide3.qml'
592--- app/components/Walkthrough/Slide3.qml 2015-05-03 16:22:31 +0000
593+++ app/components/Walkthrough/Slide3.qml 2015-10-31 19:22:26 +0000
594@@ -21,7 +21,7 @@
595 */
596
597 import QtQuick 2.4
598-import Ubuntu.Components 1.2
599+import Ubuntu.Components 1.3
600
601 // Walkthrough - Slide 7
602 Component {
603
604=== modified file 'app/components/Walkthrough/Walkthrough.qml'
605--- app/components/Walkthrough/Walkthrough.qml 2015-08-27 23:19:48 +0000
606+++ app/components/Walkthrough/Walkthrough.qml 2015-10-31 19:22:26 +0000
607@@ -21,7 +21,7 @@
608 */
609
610 import QtQuick 2.4
611-import Ubuntu.Components 1.2
612+import Ubuntu.Components 1.3
613 import Ubuntu.Components.ListItems 1.0 as ListItem
614
615 Page {
616@@ -38,6 +38,12 @@
617
618 // Property to signal walkthrough completion
619 signal finished
620+
621+ // Do not show the Page Header
622+ head {
623+ visible: false
624+ locked: true
625+ }
626
627 // Global keyboard shortcuts
628 focus: true
629
630=== modified file 'app/components/WorkerWaiter.qml'
631--- app/components/WorkerWaiter.qml 2015-05-03 16:22:31 +0000
632+++ app/components/WorkerWaiter.qml 2015-10-31 19:22:26 +0000
633@@ -18,7 +18,7 @@
634 */
635
636 import QtQuick 2.4
637-import Ubuntu.Components 1.2
638+import Ubuntu.Components 1.3
639
640
641 Timer { // A timer to wait for a worker to stop
642
643=== modified file 'app/music-app.qml'
644--- app/music-app.qml 2015-09-08 08:12:31 +0000
645+++ app/music-app.qml 2015-10-31 19:22:26 +0000
646@@ -18,8 +18,8 @@
647 */
648
649 import QtQuick 2.4
650-import Ubuntu.Components 1.2
651-import Ubuntu.Components.Popups 1.0
652+import Ubuntu.Components 1.3
653+import Ubuntu.Components.Popups 1.3
654 import Ubuntu.MediaScanner 0.1
655 import Qt.labs.settings 1.0
656 import QtMultimedia 5.0
657@@ -39,6 +39,7 @@
658
659 backgroundColor: styleMusic.mainView.backgroundColor
660 headerColor: styleMusic.mainView.headerColor
661+ theme.name: "Ubuntu.Components.Themes.SuruDark"
662
663 property bool useDeprecatedToolbar: false // FIXME: keep SDK autopilot helpers happy
664
665
666=== modified file 'app/ui/AddToPlaylist.qml'
667--- app/ui/AddToPlaylist.qml 2015-08-19 14:03:16 +0000
668+++ app/ui/AddToPlaylist.qml 2015-10-31 19:22:26 +0000
669@@ -19,9 +19,8 @@
670
671 import QtMultimedia 5.0
672 import QtQuick 2.4
673-import Ubuntu.Components 1.2
674+import Ubuntu.Components 1.3
675 import Ubuntu.Components.ListItems 1.0 as ListItem
676-import Ubuntu.Components.Popups 1.0
677 import QtQuick.LocalStorage 2.0
678 import "../logic/meta-database.js" as Library
679 import "../logic/playlists.js" as Playlists
680
681=== modified file 'app/ui/Albums.qml'
682--- app/ui/Albums.qml 2015-05-03 16:22:31 +0000
683+++ app/ui/Albums.qml 2015-10-31 19:22:26 +0000
684@@ -18,7 +18,7 @@
685 */
686
687 import QtQuick 2.4
688-import Ubuntu.Components 1.2
689+import Ubuntu.Components 1.3
690 import Ubuntu.MediaScanner 0.1
691 import "../components"
692 import "../components/Delegates"
693
694=== modified file 'app/ui/ArtistView.qml'
695--- app/ui/ArtistView.qml 2015-05-03 16:22:31 +0000
696+++ app/ui/ArtistView.qml 2015-10-31 19:22:26 +0000
697@@ -18,8 +18,7 @@
698 */
699
700 import QtQuick 2.4
701-import Ubuntu.Components 1.2
702-import Ubuntu.Components.Popups 1.0
703+import Ubuntu.Components 1.3
704 import Ubuntu.Components.ListItems 1.0 as ListItem
705 import Ubuntu.MediaScanner 0.1
706 import Ubuntu.Thumbnailer 0.1
707
708=== modified file 'app/ui/Artists.qml'
709--- app/ui/Artists.qml 2015-05-03 16:22:31 +0000
710+++ app/ui/Artists.qml 2015-10-31 19:22:26 +0000
711@@ -18,8 +18,7 @@
712 */
713
714 import QtQuick 2.4
715-import Ubuntu.Components 1.2
716-import Ubuntu.Components.Popups 1.0
717+import Ubuntu.Components 1.3
718 import Ubuntu.Components.ListItems 1.0 as ListItem
719 import Ubuntu.MediaScanner 0.1
720 import Ubuntu.Thumbnailer 0.1
721
722=== modified file 'app/ui/ContentHubExport.qml'
723--- app/ui/ContentHubExport.qml 2015-08-24 12:28:16 +0000
724+++ app/ui/ContentHubExport.qml 2015-10-31 19:22:26 +0000
725@@ -17,7 +17,7 @@
726 */
727
728 import QtQuick 2.4
729-import Ubuntu.Components 1.2
730+import Ubuntu.Components 1.3
731 import Ubuntu.Content 1.1
732 import Ubuntu.MediaScanner 0.1
733 import Ubuntu.Thumbnailer 0.1
734
735=== modified file 'app/ui/Genres.qml'
736--- app/ui/Genres.qml 2015-05-03 16:22:31 +0000
737+++ app/ui/Genres.qml 2015-10-31 19:22:26 +0000
738@@ -18,7 +18,7 @@
739 */
740
741 import QtQuick 2.4
742-import Ubuntu.Components 1.2
743+import Ubuntu.Components 1.3
744 import Ubuntu.MediaScanner 0.1
745 import "../components"
746 import "../components/Delegates"
747
748=== modified file 'app/ui/LibraryEmptyState.qml'
749--- app/ui/LibraryEmptyState.qml 2015-09-07 09:52:21 +0000
750+++ app/ui/LibraryEmptyState.qml 2015-10-31 19:22:26 +0000
751@@ -18,7 +18,7 @@
752 */
753
754 import QtQuick 2.4
755-import Ubuntu.Components 1.2
756+import Ubuntu.Components 1.3
757
758 Page {
759 id: libraryEmptyPage
760@@ -26,6 +26,12 @@
761 fill: parent
762 }
763
764+ // Do not show the Page Header
765+ head {
766+ visible: false
767+ locked: true
768+ }
769+
770 // Overlay to show when no tracks detected on the device
771 Rectangle {
772 id: libraryEmpty
773
774=== modified file 'app/ui/NowPlaying.qml'
775--- app/ui/NowPlaying.qml 2015-08-19 14:03:16 +0000
776+++ app/ui/NowPlaying.qml 2015-10-31 19:22:26 +0000
777@@ -19,7 +19,7 @@
778
779 import QtQuick 2.4
780 import QtQuick.LocalStorage 2.0
781-import Ubuntu.Components 1.2
782+import Ubuntu.Components 1.3
783 import "../components"
784 import "../components/HeadState"
785 import "../logic/meta-database.js" as Library
786@@ -138,9 +138,12 @@
787 left: parent.left
788 right: parent.right
789 top: parent.top
790- topMargin: mainView.header.height
791+ topMargin: headerHeight
792 }
793- height: parent.height - mainView.header.height - units.gu(9.5)
794+
795+ property real headerHeight: units.gu(6)
796+
797+ height: parent.height - headerHeight - units.gu(9.5)
798 source: "../components/NowPlayingFullView.qml"
799 visible: !isListView
800 }
801
802=== modified file 'app/ui/Playlists.qml'
803--- app/ui/Playlists.qml 2015-06-27 21:06:26 +0000
804+++ app/ui/Playlists.qml 2015-10-31 19:22:26 +0000
805@@ -19,8 +19,7 @@
806 */
807
808 import QtQuick 2.4
809-import Ubuntu.Components 1.2
810-import Ubuntu.Components.Popups 1.0
811+import Ubuntu.Components 1.3
812 import QtMultimedia 5.0
813 import QtQuick.LocalStorage 2.0
814 import "../logic/playlists.js" as Playlists
815
816=== modified file 'app/ui/Recent.qml'
817--- app/ui/Recent.qml 2015-06-27 21:06:26 +0000
818+++ app/ui/Recent.qml 2015-10-31 19:22:26 +0000
819@@ -18,8 +18,7 @@
820 */
821
822 import QtQuick 2.4
823-import Ubuntu.Components 1.2
824-import Ubuntu.Components.Popups 1.0
825+import Ubuntu.Components 1.3
826 import Ubuntu.Components.ListItems 1.0 as ListItem
827 import Ubuntu.MediaScanner 0.1
828 import Ubuntu.Thumbnailer 0.1
829
830=== modified file 'app/ui/Songs.qml'
831--- app/ui/Songs.qml 2015-06-27 21:06:26 +0000
832+++ app/ui/Songs.qml 2015-10-31 19:22:26 +0000
833@@ -18,7 +18,7 @@
834 */
835
836 import QtQuick 2.4
837-import Ubuntu.Components 1.2
838+import Ubuntu.Components 1.3
839 import Ubuntu.MediaScanner 0.1
840 import Ubuntu.Thumbnailer 0.1
841 import QtMultimedia 5.0
842
843=== modified file 'app/ui/SongsView.qml'
844--- app/ui/SongsView.qml 2015-07-26 22:43:31 +0000
845+++ app/ui/SongsView.qml 2015-10-31 19:22:26 +0000
846@@ -18,9 +18,9 @@
847 */
848
849 import QtQuick 2.4
850-import Ubuntu.Components 1.2
851+import Ubuntu.Components 1.3
852 import Ubuntu.Components.ListItems 1.0 as ListItem
853-import Ubuntu.Components.Popups 1.0
854+import Ubuntu.Components.Popups 1.3
855 import Ubuntu.MediaScanner 0.1
856 import Ubuntu.Thumbnailer 0.1
857 import QtQuick.LocalStorage 2.0
858@@ -229,11 +229,11 @@
859 }
860 }
861 }
862- property int baseHeight: header.width > units.gu(60) ? units.gu(33.5) : ((header.width - units.gu(5)) / 2) + units.gu(12)
863+ property int baseHeight: songStackPage.width > units.gu(60) ? units.gu(33.5) : ((songStackPage.width - units.gu(5)) / 2) + units.gu(12)
864 coverSources: songStackPage.covers
865 height: songStackPage.line1 !== i18n.tr("Playlist") &&
866 songStackPage.line1 !== i18n.tr("Genre") &&
867- header.width <= units.gu(60) ?
868+ songStackPage.width <= units.gu(60) ?
869 baseHeight + units.gu(3) : baseHeight
870 bottomColumn: Column {
871 Label {
872
873=== modified file 'debian/changelog'
874--- debian/changelog 2015-09-25 08:11:22 +0000
875+++ debian/changelog 2015-10-31 19:22:26 +0000
876@@ -5,6 +5,7 @@
877
878 [ Victor Thompson ]
879 * Remove some deprecated code for the UbuntuShape image property.
880+ * Update app to use the Ubuntu Components version 1.3 (LP: #1508363)
881
882 -- Bartosz Kosiorek <gang65@poczta.onet.pl> Tue, 08 Sep 2015 10:08:49 +0200
883
884
885=== modified file 'manifest.json.in'
886--- manifest.json.in 2015-09-08 08:12:31 +0000
887+++ manifest.json.in 2015-10-31 19:22:26 +0000
888@@ -1,7 +1,7 @@
889 {
890 "architecture": "all",
891 "description": "A music application for ubuntu",
892- "framework": "ubuntu-sdk-15.04-qml",
893+ "framework": "ubuntu-sdk-15.04.1-qml",
894 "hooks": {
895 "music": {
896 "apparmor": "apparmor.json",
897
898=== modified file 'music-app.qmltheme'
899--- music-app.qmltheme 2015-06-27 20:18:02 +0000
900+++ music-app.qmltheme 2015-10-31 19:22:26 +0000
901@@ -1,5 +1,5 @@
902 @qml-mapping(.frame, , FrameDelegate);
903-@qml-import(Ubuntu.Components 1.2);
904+@qml-import(Ubuntu.Components 1.3);
905
906 .button {
907 color: "#c94212";
908
909=== modified file 'tests/autopilot/music_app/__init__.py'
910--- tests/autopilot/music_app/__init__.py 2015-05-04 14:07:05 +0000
911+++ tests/autopilot/music_app/__init__.py 2015-10-31 19:22:26 +0000
912@@ -160,7 +160,7 @@
913
914 @click_object
915 def skip(self):
916- return self.wait_select_single("Label", objectName="skipLabel")
917+ return self.wait_select_single("UCLabel", objectName="skipLabel")
918
919
920 class Albums(MusicPage):

Subscribers

People subscribed via source and target branches