Ubuntu Music App

Merge lp:~ahayzen/music-app/refactor-bump-framework-1504 into lp:music-app

  1. refactor-bump-framework-1504
  2. Merge into trunk
Proposed by Andrew Hayzen on 2015-05-03
Status: Merged
Approved by: Victor Thompson on 2015-06-27
Approved revision: 869
Merged at revision: 875
Proposed branch: lp:~ahayzen/music-app/refactor-bump-framework-1504
Merge into: lp:music-app
Diff against target: 1201 lines (+168/-153)
70 files modified
app/components/BlurredBackground.qml (+3/-3)
app/components/BlurredHeader.qml (+3/-3)
app/components/ColumnFlow.qml (+1/-1)
app/components/CoverGrid.qml (+3/-3)
app/components/Delegates/Card.qml (+3/-3)
app/components/Delegates/ListItemWithActions.qml (+2/-2)
app/components/Delegates/MusicListItem.qml (+2/-2)
app/components/Dialog/ContentHubErrorDialog.qml (+2/-2)
app/components/Dialog/ContentHubNotFoundDialog.qml (+2/-2)
app/components/Dialog/ContentHubWaitDialog.qml (+2/-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 (+3/-3)
app/components/Flickables/MultiSelectListView.qml (+2/-2)
app/components/Flickables/MusicListView.qml (+2/-2)
app/components/HeadState/MultiSelectHeadState.qml (+2/-2)
app/components/HeadState/PlaylistsHeadState.qml (+2/-2)
app/components/HeadState/SearchHeadState.qml (+2/-2)
app/components/HeadState/SearchableHeadState.qml (+2/-2)
app/components/Helpers/ContentHubHelper.qml (+2/-2)
app/components/Helpers/UriHandlerHelper.qml (+2/-2)
app/components/Helpers/UserMetricsHelper.qml (+2/-2)
app/components/LibraryListModel.qml (+1/-1)
app/components/ListItemActions/AddToPlaylist.qml (+2/-2)
app/components/ListItemActions/AddToQueue.qml (+6/-5)
app/components/ListItemActions/CheckBox.qml (+3/-3)
app/components/ListItemActions/Remove.qml (+6/-5)
app/components/ListItemReorderComponent.qml (+2/-2)
app/components/LoadingSpinnerComponent.qml (+3/-3)
app/components/MusicPage.qml (+2/-2)
app/components/MusicRow.qml (+3/-3)
app/components/MusicToolbar.qml (+2/-2)
app/components/NowPlayingFullView.qml (+2/-2)
app/components/NowPlayingToolbar.qml (+2/-2)
app/components/Player.qml (+2/-2)
app/components/PlaylistsEmptyState.qml (+2/-2)
app/components/Queue.qml (+2/-2)
app/components/Style.qml (+2/-2)
app/components/Themes/Ambiance/BubbleShape.qml (+2/-2)
app/components/Themes/Ambiance/PartialColorize.qml (+1/-1)
app/components/Themes/Ambiance/PartialColorizeUbuntuShape.qml (+1/-1)
app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml (+2/-2)
app/components/ViewButton/PlayAllButton.qml (+2/-2)
app/components/ViewButton/QueueAllButton.qml (+2/-2)
app/components/ViewButton/ShuffleButton.qml (+2/-2)
app/components/Walkthrough/FirstRunWalkthrough.qml (+3/-3)
app/components/Walkthrough/Slide1.qml (+2/-2)
app/components/Walkthrough/Slide2.qml (+2/-2)
app/components/Walkthrough/Slide3.qml (+2/-2)
app/components/Walkthrough/Walkthrough.qml (+2/-2)
app/components/WorkerModelLoader.qml (+2/-2)
app/components/WorkerWaiter.qml (+2/-2)
app/music-app.qml (+6/-5)
app/ui/AddToPlaylist.qml (+2/-2)
app/ui/Albums.qml (+2/-2)
app/ui/ArtistView.qml (+3/-3)
app/ui/Artists.qml (+2/-2)
app/ui/Genres.qml (+2/-2)
app/ui/LibraryEmptyState.qml (+2/-2)
app/ui/NowPlaying.qml (+2/-2)
app/ui/Playlists.qml (+2/-2)
app/ui/Recent.qml (+3/-3)
app/ui/Songs.qml (+2/-2)
app/ui/SongsView.qml (+2/-2)
apparmor.json (+2/-2)
debian/changelog (+6/-0)
manifest.json.in (+2/-2)
music-app.qmltheme (+1/-1)
tests/autopilot/music_app/__init__.py (+8/-2)
To merge this branch: bzr merge lp:~ahayzen/music-app/refactor-bump-framework-1504
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-06-27
Victor Thompson 2015-05-03 Approve on 2015-06-27
Review via email: mp+258126@code.launchpad.net

Commit Message

* Bump framework to 15.04 and apparmor policy version
* Bump QtQuick to 2.4 and UITK components to 1.2
* Remove useDeprecatedToolbar as it does not exist anymore

Description of the Change

* Bump framework to 15.04 and apparmor policy version
* Bump QtQuick to 2.4 and UITK components to 1.2
* Remove useDeprecatedToolbar as it does not exist anymore

To post a comment you must log in.
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
lp:~ahayzen/music-app/refactor-bump-framework-1504 updated on 2015-05-03
858. By Andrew Hayzen on 2015-05-03

* Fixes for autopilot

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
lp:~ahayzen/music-app/refactor-bump-framework-1504 updated on 2015-05-03
859. By Andrew Hayzen on 2015-05-03

* Autopilot tweaks

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
lp:~ahayzen/music-app/refactor-bump-framework-1504 updated on 2015-05-03
860. By Andrew Hayzen on 2015-05-03

* Revert back to QtQuick2.3

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
lp:~ahayzen/music-app/refactor-bump-framework-1504 updated on 2015-05-03
861. By Andrew Hayzen on 2015-05-03

* Revert the Revert as jenkins is still on utopic so will fail anyway

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
lp:~ahayzen/music-app/refactor-bump-framework-1504 updated on 2015-05-03
862. By Andrew Hayzen on 2015-05-03

* Hacky solution to keep SDK autopilot helpers happy for now

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Nicholas Skaggs (nskaggs) wrote :

Due to https://bugs.launchpad.net/autopilot-qt/+bug/1341671 and https://bugs.launchpad.net/autopilot/+bug/1350532, it seems you need to select via objectname, and avoid making a class named MainView12.

lp:~ahayzen/music-app/refactor-bump-framework-1504 updated on 2015-05-04
863. By Andrew Hayzen on 2015-05-04

* 'Correct' autopilot changes to work around bug 1350532

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

This is barfing due to lack of qtquick 2.4
"file:///usr/share/music-app/app/music-app.qml:20 module "QtQuick" version 2.4 is not installed"

Andrew Hayzen (ahayzen) wrote :

This is due to jenkins using utopic and not vivid, and this mp moves to the vivid framework (it runs on a vivid desktop and device fine). We probably need to switch the jenkins tests to be run on vivid only when/as/if we land this.

Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

We have requested that jenkins move to vivid. Am chasing that up.

lp:~ahayzen/music-app/refactor-bump-framework-1504 updated on 2015-06-07
864. By Andrew Hayzen on 2015-06-07

* Merge of trunk

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:864
http://91.189.93.70:8080/job/music-app-ci/1313/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/165

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

review: Approve (continuous-integration)
Victor Thompson (vthompson) wrote :

Now that vivid has landed in stable we can work on getting this into trunk.

Before landing this, is it worth taking a cut of the branch for Utopic for historic reasons/for people who wanting to run from a PPA, etc? I suspect not.

Victor Thompson (vthompson) wrote :

Should we also refresh our upstream components in app/components/Themes to use the new Ubuntu.Components?

review: Needs Information
lp:~ahayzen/music-app/refactor-bump-framework-1504 updated on 2015-06-20
865. By Andrew Hayzen on 2015-06-20

* Also bump app/components/Themes/*

866. By Andrew Hayzen on 2015-06-20

* Merge of lp:music-app/refactor

Andrew Hayzen (ahayzen) wrote :

I believe every QML file has the same level of imports now, please rereview.

I also vote we just land this, if we need branch utopic we can just do $ bzr branch lp:music-app -r <revision-before-this-lands>

Then this, the listitems and the other fixes we have can be in OTA5.

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:866
http://91.189.93.70:8080/job/music-app-ci/1317/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/169

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

review: Approve (continuous-integration)
Victor Thompson (vthompson) wrote :

There are still instances with the old imports:

music-app.qmltheme:@qml-import(Ubuntu.Components 0.1);
app/components/ListItemActions/CheckBox.qml:import QtQuick 2.2

I say we remove the qmltheme file as it isn't being used.

review: Needs Fixing
lp:~ahayzen/music-app/refactor-bump-framework-1504 updated on 2015-06-27
867. By Andrew Hayzen on 2015-06-27

* Bump remaining files

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:867
http://91.189.93.70:8080/job/music-app-ci/1327/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/179

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

review: Approve (continuous-integration)
lp:~ahayzen/music-app/refactor-bump-framework-1504 updated on 2015-06-27
868. By Andrew Hayzen on 2015-06-27

* Bump app versions from 2.1 to 2.2

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:868
http://91.189.93.70:8080/job/music-app-ci/1328/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/180/console

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

review: Needs Fixing (continuous-integration)
lp:~ahayzen/music-app/refactor-bump-framework-1504 updated on 2015-06-27
869. By Andrew Hayzen on 2015-06-27

* Add changelog line

Victor Thompson (vthompson) wrote :

lgtm!

review: Approve
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

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-02-03 15:23:45 +0000
3+++ app/components/BlurredBackground.qml 2015-06-27 20:51:31 +0000
4@@ -1,5 +1,5 @@
5 /*
6- * Copyright (C) 2013, 2014
7+ * Copyright (C) 2013, 2014, 2015
8 * Andrew Hayzen <ahayzen@gmail.com>
9 * Daniel Holm <d.holmen@gmail.com>
10 * Victor Thompson <victor.thompson@gmail.com>
11@@ -17,8 +17,8 @@
12 * along with this program. If not, see <http://www.gnu.org/licenses/>.
13 */
14
15-import QtQuick 2.3
16-import Ubuntu.Components 1.1
17+import QtQuick 2.4
18+import Ubuntu.Components 1.2
19 import QtGraphicalEffects 1.0
20
21 // Blurred background
22
23=== modified file 'app/components/BlurredHeader.qml'
24--- app/components/BlurredHeader.qml 2015-04-28 17:37:33 +0000
25+++ app/components/BlurredHeader.qml 2015-06-27 20:51:31 +0000
26@@ -1,5 +1,5 @@
27 /*
28- * Copyright (C) 2014
29+ * Copyright (C) 2014, 2015
30 * Andrew Hayzen <ahayzen@gmail.com>
31 * Victor Thompson <victor.thompson@gmail.com>
32 *
33@@ -16,8 +16,8 @@
34 * along with this program. If not, see <http://www.gnu.org/licenses/>.
35 */
36
37-import QtQuick 2.3
38-import Ubuntu.Components 1.1
39+import QtQuick 2.4
40+import Ubuntu.Components 1.2
41 import Ubuntu.Components.ListItems 1.0 as ListItem
42
43 ListItem.Standard {
44
45=== modified file 'app/components/ColumnFlow.qml'
46--- app/components/ColumnFlow.qml 2015-05-02 17:43:03 +0000
47+++ app/components/ColumnFlow.qml 2015-06-27 20:51:31 +0000
48@@ -15,7 +15,7 @@
49 * along with this program. If not, see <http://www.gnu.org/licenses/>.
50 */
51
52-import QtQuick 2.3
53+import QtQuick 2.4
54
55 Item {
56 id: columnFlow
57
58=== modified file 'app/components/CoverGrid.qml'
59--- app/components/CoverGrid.qml 2015-02-03 15:23:45 +0000
60+++ app/components/CoverGrid.qml 2015-06-27 20:51:31 +0000
61@@ -1,5 +1,5 @@
62 /*
63- * Copyright (C) 2013, 2014
64+ * Copyright (C) 2013, 2014, 2015
65 * Andrew Hayzen <ahayzen@gmail.com>
66 * Nekhelesh Ramananthan <krnekhelesh@gmail.com>
67 * Victor Thompson <victor.thompson@gmail.com>
68@@ -17,8 +17,8 @@
69 * along with this program. If not, see <http://www.gnu.org/licenses/>.
70 */
71
72-import QtQuick 2.3
73-import Ubuntu.Components 1.1
74+import QtQuick 2.4
75+import Ubuntu.Components 1.2
76
77 Item {
78 id: coverGrid
79
80=== modified file 'app/components/Delegates/Card.qml'
81--- app/components/Delegates/Card.qml 2015-02-16 20:27:40 +0000
82+++ app/components/Delegates/Card.qml 2015-06-27 20:51:31 +0000
83@@ -1,5 +1,5 @@
84 /*
85- * Copyright (C) 2014
86+ * Copyright (C) 2014, 2015
87 * Andrew Hayzen <ahayzen@gmail.com>
88 *
89 * This program is free software; you can redistribute it and/or modify
90@@ -15,8 +15,8 @@
91 * along with this program. If not, see <http://www.gnu.org/licenses/>.
92 */
93
94-import QtQuick 2.3
95-import Ubuntu.Components 1.1
96+import QtQuick 2.4
97+import Ubuntu.Components 1.2
98 import "../"
99
100
101
102=== modified file 'app/components/Delegates/ListItemWithActions.qml'
103--- app/components/Delegates/ListItemWithActions.qml 2015-04-28 17:37:33 +0000
104+++ app/components/Delegates/ListItemWithActions.qml 2015-06-27 20:51:31 +0000
105@@ -14,8 +14,8 @@
106 * along with this program. If not, see <http://www.gnu.org/licenses/>.
107 */
108
109-import QtQuick 2.3
110-import Ubuntu.Components 1.1
111+import QtQuick 2.4
112+import Ubuntu.Components 1.2
113 import Ubuntu.Components.ListItems 1.0 as ListItem
114
115
116
117=== modified file 'app/components/Delegates/MusicListItem.qml'
118--- app/components/Delegates/MusicListItem.qml 2015-02-22 02:24:16 +0000
119+++ app/components/Delegates/MusicListItem.qml 2015-06-27 20:51:31 +0000
120@@ -17,8 +17,8 @@
121 * along with this program. If not, see <http://www.gnu.org/licenses/>.
122 */
123
124-import QtQuick 2.3
125-import Ubuntu.Components 1.1
126+import QtQuick 2.4
127+import Ubuntu.Components 1.2
128 import "../"
129
130
131
132=== modified file 'app/components/Dialog/ContentHubErrorDialog.qml'
133--- app/components/Dialog/ContentHubErrorDialog.qml 2015-02-04 20:26:23 +0000
134+++ app/components/Dialog/ContentHubErrorDialog.qml 2015-06-27 20:51:31 +0000
135@@ -17,8 +17,8 @@
136 * along with this program. If not, see <http://www.gnu.org/licenses/>.
137 */
138
139-import QtQuick 2.3
140-import Ubuntu.Components 1.1
141+import QtQuick 2.4
142+import Ubuntu.Components 1.2
143 import Ubuntu.Components.Popups 1.0
144
145 Dialog {
146
147=== modified file 'app/components/Dialog/ContentHubNotFoundDialog.qml'
148--- app/components/Dialog/ContentHubNotFoundDialog.qml 2015-02-04 20:26:23 +0000
149+++ app/components/Dialog/ContentHubNotFoundDialog.qml 2015-06-27 20:51:31 +0000
150@@ -17,8 +17,8 @@
151 * along with this program. If not, see <http://www.gnu.org/licenses/>.
152 */
153
154-import QtQuick 2.3
155-import Ubuntu.Components 1.1
156+import QtQuick 2.4
157+import Ubuntu.Components 1.2
158 import Ubuntu.Components.Popups 1.0
159
160 Dialog {
161
162=== modified file 'app/components/Dialog/ContentHubWaitDialog.qml'
163--- app/components/Dialog/ContentHubWaitDialog.qml 2015-02-05 22:49:12 +0000
164+++ app/components/Dialog/ContentHubWaitDialog.qml 2015-06-27 20:51:31 +0000
165@@ -17,8 +17,8 @@
166 * along with this program. If not, see <http://www.gnu.org/licenses/>.
167 */
168
169-import QtQuick 2.3
170-import Ubuntu.Components 1.1
171+import QtQuick 2.4
172+import Ubuntu.Components 1.2
173 import Ubuntu.Components.Popups 1.0
174 import "../"
175
176
177=== modified file 'app/components/Dialog/EditPlaylistDialog.qml'
178--- app/components/Dialog/EditPlaylistDialog.qml 2015-03-24 03:53:15 +0000
179+++ app/components/Dialog/EditPlaylistDialog.qml 2015-06-27 20:51:31 +0000
180@@ -17,8 +17,8 @@
181 * along with this program. If not, see <http://www.gnu.org/licenses/>.
182 */
183
184-import QtQuick 2.3
185-import Ubuntu.Components 1.1
186+import QtQuick 2.4
187+import Ubuntu.Components 1.2
188 import Ubuntu.Components.Popups 1.0
189 import QtQuick.LocalStorage 2.0
190 import "../../logic/meta-database.js" as Library
191
192=== modified file 'app/components/Dialog/NewPlaylistDialog.qml'
193--- app/components/Dialog/NewPlaylistDialog.qml 2015-03-24 03:53:15 +0000
194+++ app/components/Dialog/NewPlaylistDialog.qml 2015-06-27 20:51:31 +0000
195@@ -17,8 +17,8 @@
196 * along with this program. If not, see <http://www.gnu.org/licenses/>.
197 */
198
199-import QtQuick 2.3
200-import Ubuntu.Components 1.1
201+import QtQuick 2.4
202+import Ubuntu.Components 1.2
203 import Ubuntu.Components.Popups 1.0
204 import QtQuick.LocalStorage 2.0
205 import "../../logic/playlists.js" as Playlists
206
207=== modified file 'app/components/Dialog/RemovePlaylistDialog.qml'
208--- app/components/Dialog/RemovePlaylistDialog.qml 2015-04-28 17:57:13 +0000
209+++ app/components/Dialog/RemovePlaylistDialog.qml 2015-06-27 20:51:31 +0000
210@@ -17,8 +17,8 @@
211 * along with this program. If not, see <http://www.gnu.org/licenses/>.
212 */
213
214-import QtQuick 2.3
215-import Ubuntu.Components 1.1
216+import QtQuick 2.4
217+import Ubuntu.Components 1.2
218 import Ubuntu.Components.Popups 1.0
219 import QtQuick.LocalStorage 2.0
220 import "../../logic/meta-database.js" as Library
221
222=== modified file 'app/components/Flickables/CardView.qml'
223--- app/components/Flickables/CardView.qml 2015-02-08 04:06:28 +0000
224+++ app/components/Flickables/CardView.qml 2015-06-27 20:51:31 +0000
225@@ -1,5 +1,5 @@
226 /*
227- * Copyright (C) 2014
228+ * Copyright (C) 2014, 2015
229 * Andrew Hayzen <ahayzen@gmail.com>
230 *
231 * This program is free software; you can redistribute it and/or modify
232@@ -15,8 +15,8 @@
233 * along with this program. If not, see <http://www.gnu.org/licenses/>.
234 */
235
236-import QtQuick 2.3
237-import Ubuntu.Components 1.1
238+import QtQuick 2.4
239+import Ubuntu.Components 1.2
240 import "../"
241
242
243
244=== modified file 'app/components/Flickables/MultiSelectListView.qml'
245--- app/components/Flickables/MultiSelectListView.qml 2015-02-08 04:06:28 +0000
246+++ app/components/Flickables/MultiSelectListView.qml 2015-06-27 20:51:31 +0000
247@@ -17,8 +17,8 @@
248 * along with this program. If not, see <http://www.gnu.org/licenses/>.
249 */
250
251-import QtQuick 2.3
252-import Ubuntu.Components 1.1
253+import QtQuick 2.4
254+import Ubuntu.Components 1.2
255
256 MusicListView {
257 property var selectedItems: []
258
259=== modified file 'app/components/Flickables/MusicListView.qml'
260--- app/components/Flickables/MusicListView.qml 2015-02-08 04:06:28 +0000
261+++ app/components/Flickables/MusicListView.qml 2015-06-27 20:51:31 +0000
262@@ -17,8 +17,8 @@
263 * along with this program. If not, see <http://www.gnu.org/licenses/>.
264 */
265
266-import QtQuick 2.3
267-import Ubuntu.Components 1.1
268+import QtQuick 2.4
269+import Ubuntu.Components 1.2
270
271
272 ListView {
273
274=== modified file 'app/components/HeadState/MultiSelectHeadState.qml'
275--- app/components/HeadState/MultiSelectHeadState.qml 2015-06-27 18:25:50 +0000
276+++ app/components/HeadState/MultiSelectHeadState.qml 2015-06-27 20:51:31 +0000
277@@ -16,8 +16,8 @@
278 * along with this program. If not, see <http://www.gnu.org/licenses/>.
279 */
280
281-import QtQuick 2.3
282-import Ubuntu.Components 1.1
283+import QtQuick 2.4
284+import Ubuntu.Components 1.2
285
286 PageHeadState {
287 id: selectionState
288
289=== modified file 'app/components/HeadState/PlaylistsHeadState.qml'
290--- app/components/HeadState/PlaylistsHeadState.qml 2015-03-24 23:57:29 +0000
291+++ app/components/HeadState/PlaylistsHeadState.qml 2015-06-27 20:51:31 +0000
292@@ -16,8 +16,8 @@
293 * along with this program. If not, see <http://www.gnu.org/licenses/>.
294 */
295
296-import QtQuick 2.3
297-import Ubuntu.Components 1.1
298+import QtQuick 2.4
299+import Ubuntu.Components 1.2
300 import Ubuntu.Components.Popups 1.0
301
302
303
304=== modified file 'app/components/HeadState/SearchHeadState.qml'
305--- app/components/HeadState/SearchHeadState.qml 2015-02-04 19:54:19 +0000
306+++ app/components/HeadState/SearchHeadState.qml 2015-06-27 20:51:31 +0000
307@@ -16,8 +16,8 @@
308 * along with this program. If not, see <http://www.gnu.org/licenses/>.
309 */
310
311-import QtQuick 2.3
312-import Ubuntu.Components 1.1
313+import QtQuick 2.4
314+import Ubuntu.Components 1.2
315
316 PageHeadState {
317 id: headerState
318
319=== modified file 'app/components/HeadState/SearchableHeadState.qml'
320--- app/components/HeadState/SearchableHeadState.qml 2015-02-05 02:33:53 +0000
321+++ app/components/HeadState/SearchableHeadState.qml 2015-06-27 20:51:31 +0000
322@@ -16,8 +16,8 @@
323 * along with this program. If not, see <http://www.gnu.org/licenses/>.
324 */
325
326-import QtQuick 2.3
327-import Ubuntu.Components 1.1
328+import QtQuick 2.4
329+import Ubuntu.Components 1.2
330
331
332 PageHeadState {
333
334=== modified file 'app/components/Helpers/ContentHubHelper.qml'
335--- app/components/Helpers/ContentHubHelper.qml 2015-06-02 05:01:05 +0000
336+++ app/components/Helpers/ContentHubHelper.qml 2015-06-27 20:51:31 +0000
337@@ -17,8 +17,8 @@
338 * along with this program. If not, see <http://www.gnu.org/licenses/>.
339 */
340
341-import QtQuick 2.3
342-import Ubuntu.Components 1.1
343+import QtQuick 2.4
344+import Ubuntu.Components 1.2
345 import Ubuntu.Components.Popups 1.0
346 import Ubuntu.Content 0.1
347 import "../../logic/stored-request.js" as StoredRequest
348
349=== modified file 'app/components/Helpers/UriHandlerHelper.qml'
350--- app/components/Helpers/UriHandlerHelper.qml 2015-06-03 23:30:10 +0000
351+++ app/components/Helpers/UriHandlerHelper.qml 2015-06-27 20:51:31 +0000
352@@ -17,8 +17,8 @@
353 * along with this program. If not, see <http://www.gnu.org/licenses/>.
354 */
355
356-import QtQuick 2.3
357-import Ubuntu.Components 1.1
358+import QtQuick 2.4
359+import Ubuntu.Components 1.2
360 import "../"
361 import "../../logic/stored-request.js" as StoredRequest
362
363
364=== modified file 'app/components/Helpers/UserMetricsHelper.qml'
365--- app/components/Helpers/UserMetricsHelper.qml 2015-03-09 00:13:22 +0000
366+++ app/components/Helpers/UserMetricsHelper.qml 2015-06-27 20:51:31 +0000
367@@ -17,8 +17,8 @@
368 * along with this program. If not, see <http://www.gnu.org/licenses/>.
369 */
370
371-import QtQuick 2.3
372-import Ubuntu.Components 1.1
373+import QtQuick 2.4
374+import Ubuntu.Components 1.2
375 import UserMetrics 0.1
376
377
378
379=== modified file 'app/components/LibraryListModel.qml'
380--- app/components/LibraryListModel.qml 2015-02-03 23:00:14 +0000
381+++ app/components/LibraryListModel.qml 2015-06-27 20:51:31 +0000
382@@ -17,7 +17,7 @@
383 * along with this program. If not, see <http://www.gnu.org/licenses/>.
384 */
385
386-import QtQuick 2.3
387+import QtQuick 2.4
388 import QtQuick.LocalStorage 2.0
389 import "../logic/meta-database.js" as Library
390 import "../logic/playlists.js" as Playlists
391
392=== modified file 'app/components/ListItemActions/AddToPlaylist.qml'
393--- app/components/ListItemActions/AddToPlaylist.qml 2015-06-27 18:25:50 +0000
394+++ app/components/ListItemActions/AddToPlaylist.qml 2015-06-27 20:51:31 +0000
395@@ -17,8 +17,8 @@
396 * along with this program. If not, see <http://www.gnu.org/licenses/>.
397 */
398
399-import QtQuick 2.3
400-import Ubuntu.Components 1.1
401+import QtQuick 2.4
402+import Ubuntu.Components 1.2
403
404 Action {
405 iconName: "add-to-playlist"
406
407=== modified file 'app/components/ListItemActions/AddToQueue.qml'
408--- app/components/ListItemActions/AddToQueue.qml 2015-02-03 23:00:14 +0000
409+++ app/components/ListItemActions/AddToQueue.qml 2015-06-27 20:51:31 +0000
410@@ -1,7 +1,8 @@
411 /*
412- * Copyright (C) 2014 Andrew Hayzen <ahayzen@gmail.com>
413- * Daniel Holm <d.holmen@gmail.com>
414- * Victor Thompson <victor.thompson@gmail.com>
415+ * Copyright (C) 2014, 2015
416+ * Andrew Hayzen <ahayzen@gmail.com>
417+ * Daniel Holm <d.holmen@gmail.com>
418+ * Victor Thompson <victor.thompson@gmail.com>
419 *
420 * This program is free software; you can redistribute it and/or modify
421 * it under the terms of the GNU General Public License as published by
422@@ -16,9 +17,9 @@
423 * along with this program. If not, see <http://www.gnu.org/licenses/>.
424 */
425
426-import QtQuick 2.3
427+import QtQuick 2.4
428 import QtQuick.LocalStorage 2.0
429-import Ubuntu.Components 1.1
430+import Ubuntu.Components 1.2
431 import "../../logic/meta-database.js" as Library
432
433 Action {
434
435=== modified file 'app/components/ListItemActions/CheckBox.qml'
436--- app/components/ListItemActions/CheckBox.qml 2014-10-21 16:03:44 +0000
437+++ app/components/ListItemActions/CheckBox.qml 2015-06-27 20:51:31 +0000
438@@ -1,5 +1,5 @@
439 /*
440- * Copyright (C) 2012-2014 Canonical, Ltd.
441+ * Copyright (C) 2012-2015 Canonical, Ltd.
442 *
443 * This program is free software; you can redistribute it and/or modify
444 * it under the terms of the GNU General Public License as published by
445@@ -14,8 +14,8 @@
446 * along with this program. If not, see <http://www.gnu.org/licenses/>.
447 */
448
449-import QtQuick 2.2
450-import Ubuntu.Components 1.1
451+import QtQuick 2.4
452+import Ubuntu.Components 1.2
453
454 CheckBox {
455 checked: root.selected
456
457=== modified file 'app/components/ListItemActions/Remove.qml'
458--- app/components/ListItemActions/Remove.qml 2015-02-22 02:22:22 +0000
459+++ app/components/ListItemActions/Remove.qml 2015-06-27 20:51:31 +0000
460@@ -1,7 +1,8 @@
461 /*
462- * Copyright (C) 2014 Andrew Hayzen <ahayzen@gmail.com>
463- * Daniel Holm <d.holmen@gmail.com>
464- * Victor Thompson <victor.thompson@gmail.com>
465+ * Copyright (C) 2014, 2015
466+ * Andrew Hayzen <ahayzen@gmail.com>
467+ * Daniel Holm <d.holmen@gmail.com>
468+ * Victor Thompson <victor.thompson@gmail.com>
469 *
470 * This program is free software; you can redistribute it and/or modify
471 * it under the terms of the GNU General Public License as published by
472@@ -16,8 +17,8 @@
473 * along with this program. If not, see <http://www.gnu.org/licenses/>.
474 */
475
476-import QtQuick 2.3
477-import Ubuntu.Components 1.1
478+import QtQuick 2.4
479+import Ubuntu.Components 1.2
480 import Ubuntu.Components.Popups 1.0
481
482 Action {
483
484=== modified file 'app/components/ListItemReorderComponent.qml'
485--- app/components/ListItemReorderComponent.qml 2015-03-06 02:38:56 +0000
486+++ app/components/ListItemReorderComponent.qml 2015-06-27 20:51:31 +0000
487@@ -17,8 +17,8 @@
488 * along with this program. If not, see <http://www.gnu.org/licenses/>.
489 */
490
491-import QtQuick 2.3
492-import Ubuntu.Components 1.1
493+import QtQuick 2.4
494+import Ubuntu.Components 1.2
495
496
497 Item {
498
499=== modified file 'app/components/LoadingSpinnerComponent.qml'
500--- app/components/LoadingSpinnerComponent.qml 2014-09-20 10:50:45 +0000
501+++ app/components/LoadingSpinnerComponent.qml 2015-06-27 20:51:31 +0000
502@@ -1,5 +1,5 @@
503 /*
504- * Copyright (C) 2013 Canonical Ltd
505+ * Copyright (C) 2013, 2015 Canonical Ltd
506 *
507 * This program is free software: you can redistribute it and/or modify
508 * it under the terms of the GNU General Public License version 3 as
509@@ -17,8 +17,8 @@
510 * Martin Borho <martin@borho.net>
511 * Andrew Starr-Bochicchio <a.starr.b@gmail.com>
512 */
513-import QtQuick 2.3
514-import Ubuntu.Components 1.1
515+import QtQuick 2.4
516+import Ubuntu.Components 1.2
517
518 Item {
519 id: refresh
520
521=== modified file 'app/components/MusicPage.qml'
522--- app/components/MusicPage.qml 2015-03-24 23:57:29 +0000
523+++ app/components/MusicPage.qml 2015-06-27 20:51:31 +0000
524@@ -17,8 +17,8 @@
525 * along with this program. If not, see <http://www.gnu.org/licenses/>.
526 */
527
528-import QtQuick 2.3
529-import Ubuntu.Components 1.1
530+import QtQuick 2.4
531+import Ubuntu.Components 1.2
532 import Ubuntu.Components.Popups 1.0
533
534
535
536=== modified file 'app/components/MusicRow.qml'
537--- app/components/MusicRow.qml 2015-02-03 15:23:45 +0000
538+++ app/components/MusicRow.qml 2015-06-27 20:51:31 +0000
539@@ -1,5 +1,5 @@
540 /*
541- * Copyright (C) 2013, 2014
542+ * Copyright (C) 2013, 2014, 2015
543 * Andrew Hayzen <ahayzen@gmail.com>
544 * Nekhelesh Ramananthan <krnekhelesh@gmail.com>
545 * Victor Thompson <victor.thompson@gmail.com>
546@@ -17,8 +17,8 @@
547 * along with this program. If not, see <http://www.gnu.org/licenses/>.
548 */
549
550-import QtQuick 2.3
551-import Ubuntu.Components 1.1
552+import QtQuick 2.4
553+import Ubuntu.Components 1.2
554
555
556 Row {
557
558=== modified file 'app/components/MusicToolbar.qml'
559--- app/components/MusicToolbar.qml 2015-02-04 16:43:17 +0000
560+++ app/components/MusicToolbar.qml 2015-06-27 20:51:31 +0000
561@@ -17,9 +17,9 @@
562 * along with this program. If not, see <http://www.gnu.org/licenses/>.
563 */
564
565-import QtQuick 2.3
566+import QtQuick 2.4
567 import QtMultimedia 5.0
568-import Ubuntu.Components 1.1
569+import Ubuntu.Components 1.2
570
571 Rectangle {
572 anchors {
573
574=== modified file 'app/components/NowPlayingFullView.qml'
575--- app/components/NowPlayingFullView.qml 2015-02-14 18:35:11 +0000
576+++ app/components/NowPlayingFullView.qml 2015-06-27 20:51:31 +0000
577@@ -17,8 +17,8 @@
578 * along with this program. If not, see <http://www.gnu.org/licenses/>.
579 */
580
581-import QtQuick 2.3
582-import Ubuntu.Components 1.1
583+import QtQuick 2.4
584+import Ubuntu.Components 1.2
585 import Ubuntu.Thumbnailer 0.1
586 import "../components/Themes/Ambiance"
587
588
589=== modified file 'app/components/NowPlayingToolbar.qml'
590--- app/components/NowPlayingToolbar.qml 2015-02-14 18:35:11 +0000
591+++ app/components/NowPlayingToolbar.qml 2015-06-27 20:51:31 +0000
592@@ -18,8 +18,8 @@
593 */
594
595 import QtMultimedia 5.0
596-import QtQuick 2.3
597-import Ubuntu.Components 1.1
598+import QtQuick 2.4
599+import Ubuntu.Components 1.2
600
601
602 /* Full toolbar */
603
604=== modified file 'app/components/Player.qml'
605--- app/components/Player.qml 2015-06-04 01:47:01 +0000
606+++ app/components/Player.qml 2015-06-27 20:51:31 +0000
607@@ -1,5 +1,5 @@
608 /*
609- * Copyright (C) 2013, 2014
610+ * Copyright (C) 2013, 2014, 2015
611 * Andrew Hayzen <ahayzen@gmail.com>
612 * Daniel Holm <d.holmen@gmail.com>
613 * Victor Thompson <victor.thompson@gmail.com>
614@@ -17,7 +17,7 @@
615 * along with this program. If not, see <http://www.gnu.org/licenses/>.
616 */
617
618-import QtQuick 2.3
619+import QtQuick 2.4
620 import QtMultimedia 5.0
621 import QtQuick.LocalStorage 2.0
622 import Qt.labs.settings 1.0
623
624=== modified file 'app/components/PlaylistsEmptyState.qml'
625--- app/components/PlaylistsEmptyState.qml 2015-02-05 03:03:40 +0000
626+++ app/components/PlaylistsEmptyState.qml 2015-06-27 20:51:31 +0000
627@@ -17,8 +17,8 @@
628 * along with this program. If not, see <http://www.gnu.org/licenses/>.
629 */
630
631-import QtQuick 2.3
632-import Ubuntu.Components 1.1
633+import QtQuick 2.4
634+import Ubuntu.Components 1.2
635
636
637 Rectangle {
638
639=== modified file 'app/components/Queue.qml'
640--- app/components/Queue.qml 2015-06-27 18:25:50 +0000
641+++ app/components/Queue.qml 2015-06-27 20:51:31 +0000
642@@ -17,9 +17,9 @@
643 * along with this program. If not, see <http://www.gnu.org/licenses/>.
644 */
645
646-import QtQuick 2.3
647+import QtQuick 2.4
648 import QtQuick.LocalStorage 2.0
649-import Ubuntu.Components 1.1
650+import Ubuntu.Components 1.2
651 import "Delegates"
652 import "Flickables"
653 import "ListItemActions"
654
655=== modified file 'app/components/Style.qml'
656--- app/components/Style.qml 2015-02-03 23:00:14 +0000
657+++ app/components/Style.qml 2015-06-27 20:51:31 +0000
658@@ -17,8 +17,8 @@
659 * along with this program. If not, see <http://www.gnu.org/licenses/>.
660 */
661
662-import QtQuick 2.3
663-import Ubuntu.Components 1.1
664+import QtQuick 2.4
665+import Ubuntu.Components 1.2
666
667
668 QtObject {
669
670=== modified file 'app/components/Themes/Ambiance/BubbleShape.qml'
671--- app/components/Themes/Ambiance/BubbleShape.qml 2014-11-19 01:50:29 +0000
672+++ app/components/Themes/Ambiance/BubbleShape.qml 2015-06-27 20:51:31 +0000
673@@ -14,8 +14,8 @@
674 * along with this program. If not, see <http://www.gnu.org/licenses/>.
675 */
676
677-import QtQuick 2.0
678-import Ubuntu.Components 1.1
679+import QtQuick 2.4
680+import Ubuntu.Components 1.2
681
682 Item {
683 id: bubbleShape
684
685=== modified file 'app/components/Themes/Ambiance/PartialColorize.qml'
686--- app/components/Themes/Ambiance/PartialColorize.qml 2015-05-15 00:16:56 +0000
687+++ app/components/Themes/Ambiance/PartialColorize.qml 2015-06-27 20:51:31 +0000
688@@ -14,7 +14,7 @@
689 * along with this program. If not, see <http://www.gnu.org/licenses/>.
690 */
691
692-import QtQuick 2.0
693+import QtQuick 2.4
694
695 ShaderEffect {
696 id: partialColorize
697
698=== modified file 'app/components/Themes/Ambiance/PartialColorizeUbuntuShape.qml'
699--- app/components/Themes/Ambiance/PartialColorizeUbuntuShape.qml 2015-05-15 00:16:56 +0000
700+++ app/components/Themes/Ambiance/PartialColorizeUbuntuShape.qml 2015-06-27 20:51:31 +0000
701@@ -14,7 +14,7 @@
702 * along with this program. If not, see <http://www.gnu.org/licenses/>.
703 */
704
705-import QtQuick 2.0
706+import QtQuick 2.4
707
708 PartialColorize {
709 fragmentShader: "" +
710
711=== modified file 'app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml'
712--- app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml 2015-01-22 01:09:36 +0000
713+++ app/components/Themes/Ambiance/UbuntuBlueSliderStyle.qml 2015-06-27 20:51:31 +0000
714@@ -14,8 +14,8 @@
715 * along with this program. If not, see <http://www.gnu.org/licenses/>.
716 */
717
718-import QtQuick 2.0
719-import Ubuntu.Components 1.1
720+import QtQuick 2.4
721+import Ubuntu.Components 1.2
722
723 /*
724 The default slider style consists of a bar and a thumb shape.
725
726=== modified file 'app/components/ViewButton/PlayAllButton.qml'
727--- app/components/ViewButton/PlayAllButton.qml 2015-02-06 03:53:48 +0000
728+++ app/components/ViewButton/PlayAllButton.qml 2015-06-27 20:51:31 +0000
729@@ -17,8 +17,8 @@
730 * along with this program. If not, see <http://www.gnu.org/licenses/>.
731 */
732
733-import QtQuick 2.3
734-import Ubuntu.Components 1.1
735+import QtQuick 2.4
736+import Ubuntu.Components 1.2
737
738
739 Button {
740
741=== modified file 'app/components/ViewButton/QueueAllButton.qml'
742--- app/components/ViewButton/QueueAllButton.qml 2015-02-06 03:53:48 +0000
743+++ app/components/ViewButton/QueueAllButton.qml 2015-06-27 20:51:31 +0000
744@@ -17,8 +17,8 @@
745 * along with this program. If not, see <http://www.gnu.org/licenses/>.
746 */
747
748-import QtQuick 2.3
749-import Ubuntu.Components 1.1
750+import QtQuick 2.4
751+import Ubuntu.Components 1.2
752
753
754 Button {
755
756=== modified file 'app/components/ViewButton/ShuffleButton.qml'
757--- app/components/ViewButton/ShuffleButton.qml 2015-02-06 03:53:48 +0000
758+++ app/components/ViewButton/ShuffleButton.qml 2015-06-27 20:51:31 +0000
759@@ -17,8 +17,8 @@
760 * along with this program. If not, see <http://www.gnu.org/licenses/>.
761 */
762
763-import QtQuick 2.3
764-import Ubuntu.Components 1.1
765+import QtQuick 2.4
766+import Ubuntu.Components 1.2
767
768
769 Button {
770
771=== modified file 'app/components/Walkthrough/FirstRunWalkthrough.qml'
772--- app/components/Walkthrough/FirstRunWalkthrough.qml 2015-03-25 00:11:50 +0000
773+++ app/components/Walkthrough/FirstRunWalkthrough.qml 2015-06-27 20:51:31 +0000
774@@ -1,5 +1,5 @@
775 /*
776- * Copyright (C) 2014
777+ * Copyright (C) 2014, 2015
778 * Nekhelesh Ramananthan <nik90@ubuntu.com>
779 * Victor Thompson <victor.thompson@gmail.com>
780 *
781@@ -19,8 +19,8 @@
782 * https://github.com/krnekhelesh/flashback
783 */
784
785-import QtQuick 2.3
786-import Ubuntu.Components 1.1
787+import QtQuick 2.4
788+import Ubuntu.Components 1.2
789
790 // Initial Walkthrough tutorial
791 Walkthrough {
792
793=== modified file 'app/components/Walkthrough/Slide1.qml'
794--- app/components/Walkthrough/Slide1.qml 2015-02-03 15:23:45 +0000
795+++ app/components/Walkthrough/Slide1.qml 2015-06-27 20:51:31 +0000
796@@ -20,8 +20,8 @@
797 * https://github.com/krnekhelesh/flashback
798 */
799
800-import QtQuick 2.3
801-import Ubuntu.Components 1.1
802+import QtQuick 2.4
803+import Ubuntu.Components 1.2
804
805 // Slide 1
806 Component {
807
808=== modified file 'app/components/Walkthrough/Slide2.qml'
809--- app/components/Walkthrough/Slide2.qml 2015-02-03 15:23:45 +0000
810+++ app/components/Walkthrough/Slide2.qml 2015-06-27 20:51:31 +0000
811@@ -20,8 +20,8 @@
812 * https://github.com/krnekhelesh/flashback
813 */
814
815-import QtQuick 2.3
816-import Ubuntu.Components 1.1
817+import QtQuick 2.4
818+import Ubuntu.Components 1.2
819
820 // Walkthrough - Slide 2
821 Component {
822
823=== modified file 'app/components/Walkthrough/Slide3.qml'
824--- app/components/Walkthrough/Slide3.qml 2015-02-03 15:23:45 +0000
825+++ app/components/Walkthrough/Slide3.qml 2015-06-27 20:51:31 +0000
826@@ -20,8 +20,8 @@
827 * https://github.com/krnekhelesh/flashback
828 */
829
830-import QtQuick 2.3
831-import Ubuntu.Components 1.1
832+import QtQuick 2.4
833+import Ubuntu.Components 1.2
834
835 // Walkthrough - Slide 7
836 Component {
837
838=== modified file 'app/components/Walkthrough/Walkthrough.qml'
839--- app/components/Walkthrough/Walkthrough.qml 2015-02-03 15:23:45 +0000
840+++ app/components/Walkthrough/Walkthrough.qml 2015-06-27 20:51:31 +0000
841@@ -20,8 +20,8 @@
842 * https://github.com/krnekhelesh/flashback
843 */
844
845-import QtQuick 2.3
846-import Ubuntu.Components 1.1
847+import QtQuick 2.4
848+import Ubuntu.Components 1.2
849 import Ubuntu.Components.ListItems 1.0 as ListItem
850
851 Page {
852
853=== modified file 'app/components/WorkerModelLoader.qml'
854--- app/components/WorkerModelLoader.qml 2015-02-03 23:00:14 +0000
855+++ app/components/WorkerModelLoader.qml 2015-06-27 20:51:31 +0000
856@@ -1,5 +1,5 @@
857 /*
858- * Copyright (C) 2014
859+ * Copyright (C) 2014, 2015
860 * Andrew Hayzen <ahayzen@gmail.com>
861 * Victor Thompson <victor.thompson@gmail.com>
862 *
863@@ -16,7 +16,7 @@
864 * along with this program. If not, see <http://www.gnu.org/licenses/>.
865 */
866
867-import QtQuick 2.3
868+import QtQuick 2.4
869
870
871 WorkerScript {
872
873=== modified file 'app/components/WorkerWaiter.qml'
874--- app/components/WorkerWaiter.qml 2015-02-16 20:51:18 +0000
875+++ app/components/WorkerWaiter.qml 2015-06-27 20:51:31 +0000
876@@ -17,8 +17,8 @@
877 * along with this program. If not, see <http://www.gnu.org/licenses/>.
878 */
879
880-import QtQuick 2.3
881-import Ubuntu.Components 1.1
882+import QtQuick 2.4
883+import Ubuntu.Components 1.2
884
885
886 Timer { // A timer to wait for a worker to stop
887
888=== modified file 'app/music-app.qml'
889--- app/music-app.qml 2015-06-27 18:23:35 +0000
890+++ app/music-app.qml 2015-06-27 20:51:31 +0000
891@@ -17,8 +17,8 @@
892 * along with this program. If not, see <http://www.gnu.org/licenses/>.
893 */
894
895-import QtQuick 2.3
896-import Ubuntu.Components 1.1
897+import QtQuick 2.4
898+import Ubuntu.Components 1.2
899 import Ubuntu.Components.Popups 1.0
900 import Ubuntu.MediaScanner 0.1
901 import Qt.labs.settings 1.0
902@@ -33,14 +33,15 @@
903 import "ui"
904
905 MainView {
906- objectName: "music"
907+ objectName: "musicMainView"
908 applicationName: "com.ubuntu.music"
909 id: mainView
910- useDeprecatedToolbar: false
911
912 backgroundColor: styleMusic.mainView.backgroundColor
913 headerColor: styleMusic.mainView.headerColor
914
915+ property bool useDeprecatedToolbar: false // FIXME: keep SDK autopilot helpers happy
916+
917 // Startup settings
918 Settings {
919 id: startupSettings
920@@ -273,7 +274,7 @@
921
922 // VARIABLES
923 property string musicName: i18n.tr("Music")
924- property string appVersion: '2.1'
925+ property string appVersion: '2.2'
926 property bool toolbarShown: musicToolbar.visible
927 property bool selectedAlbum: false
928 property alias firstRun: startupSettings.firstRun
929
930=== modified file 'app/ui/AddToPlaylist.qml'
931--- app/ui/AddToPlaylist.qml 2015-06-27 18:25:50 +0000
932+++ app/ui/AddToPlaylist.qml 2015-06-27 20:51:31 +0000
933@@ -18,8 +18,8 @@
934 */
935
936 import QtMultimedia 5.0
937-import QtQuick 2.3
938-import Ubuntu.Components 1.1
939+import QtQuick 2.4
940+import Ubuntu.Components 1.2
941 import Ubuntu.Components.ListItems 1.0 as ListItem
942 import Ubuntu.Components.Popups 1.0
943 import QtQuick.LocalStorage 2.0
944
945=== modified file 'app/ui/Albums.qml'
946--- app/ui/Albums.qml 2015-02-16 20:27:40 +0000
947+++ app/ui/Albums.qml 2015-06-27 20:51:31 +0000
948@@ -17,8 +17,8 @@
949 * along with this program. If not, see <http://www.gnu.org/licenses/>.
950 */
951
952-import QtQuick 2.3
953-import Ubuntu.Components 1.1
954+import QtQuick 2.4
955+import Ubuntu.Components 1.2
956 import Ubuntu.MediaScanner 0.1
957 import "../components"
958 import "../components/Delegates"
959
960=== modified file 'app/ui/ArtistView.qml'
961--- app/ui/ArtistView.qml 2015-04-28 17:37:33 +0000
962+++ app/ui/ArtistView.qml 2015-06-27 20:51:31 +0000
963@@ -1,5 +1,5 @@
964 /*
965- * Copyright (C) 2013, 2014
966+ * Copyright (C) 2013, 2014, 2015
967 * Andrew Hayzen <ahayzen@gmail.com>
968 * Daniel Holm <d.holmen@gmail.com>
969 * Victor Thompson <victor.thompson@gmail.com>
970@@ -17,8 +17,8 @@
971 * along with this program. If not, see <http://www.gnu.org/licenses/>.
972 */
973
974-import QtQuick 2.3
975-import Ubuntu.Components 1.1
976+import QtQuick 2.4
977+import Ubuntu.Components 1.2
978 import Ubuntu.Components.Popups 1.0
979 import Ubuntu.Components.ListItems 1.0 as ListItem
980 import Ubuntu.MediaScanner 0.1
981
982=== modified file 'app/ui/Artists.qml'
983--- app/ui/Artists.qml 2015-02-16 20:27:40 +0000
984+++ app/ui/Artists.qml 2015-06-27 20:51:31 +0000
985@@ -17,8 +17,8 @@
986 * along with this program. If not, see <http://www.gnu.org/licenses/>.
987 */
988
989-import QtQuick 2.3
990-import Ubuntu.Components 1.1
991+import QtQuick 2.4
992+import Ubuntu.Components 1.2
993 import Ubuntu.Components.Popups 1.0
994 import Ubuntu.Components.ListItems 1.0 as ListItem
995 import Ubuntu.MediaScanner 0.1
996
997=== modified file 'app/ui/Genres.qml'
998--- app/ui/Genres.qml 2015-02-16 20:27:40 +0000
999+++ app/ui/Genres.qml 2015-06-27 20:51:31 +0000
1000@@ -17,8 +17,8 @@
1001 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1002 */
1003
1004-import QtQuick 2.3
1005-import Ubuntu.Components 1.1
1006+import QtQuick 2.4
1007+import Ubuntu.Components 1.2
1008 import Ubuntu.MediaScanner 0.1
1009 import "../components"
1010 import "../components/Delegates"
1011
1012=== modified file 'app/ui/LibraryEmptyState.qml'
1013--- app/ui/LibraryEmptyState.qml 2015-02-05 03:12:47 +0000
1014+++ app/ui/LibraryEmptyState.qml 2015-06-27 20:51:31 +0000
1015@@ -17,8 +17,8 @@
1016 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1017 */
1018
1019-import QtQuick 2.3
1020-import Ubuntu.Components 1.1
1021+import QtQuick 2.4
1022+import Ubuntu.Components 1.2
1023
1024 Page {
1025 id: libraryEmptyPage
1026
1027=== modified file 'app/ui/NowPlaying.qml'
1028--- app/ui/NowPlaying.qml 2015-06-27 18:25:50 +0000
1029+++ app/ui/NowPlaying.qml 2015-06-27 20:51:31 +0000
1030@@ -17,9 +17,9 @@
1031 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1032 */
1033
1034-import QtQuick 2.3
1035+import QtQuick 2.4
1036 import QtQuick.LocalStorage 2.0
1037-import Ubuntu.Components 1.1
1038+import Ubuntu.Components 1.2
1039 import "../components"
1040 import "../components/HeadState"
1041 import "../logic/meta-database.js" as Library
1042
1043=== modified file 'app/ui/Playlists.qml'
1044--- app/ui/Playlists.qml 2015-06-27 18:23:35 +0000
1045+++ app/ui/Playlists.qml 2015-06-27 20:51:31 +0000
1046@@ -18,8 +18,8 @@
1047 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1048 */
1049
1050-import QtQuick 2.3
1051-import Ubuntu.Components 1.1
1052+import QtQuick 2.4
1053+import Ubuntu.Components 1.2
1054 import Ubuntu.Components.Popups 1.0
1055 import QtMultimedia 5.0
1056 import QtQuick.LocalStorage 2.0
1057
1058=== modified file 'app/ui/Recent.qml'
1059--- app/ui/Recent.qml 2015-06-27 18:23:35 +0000
1060+++ app/ui/Recent.qml 2015-06-27 20:51:31 +0000
1061@@ -1,5 +1,5 @@
1062 /*
1063- * Copyright (C) 2013, 2014
1064+ * Copyright (C) 2013, 2014, 2015
1065 * Andrew Hayzen <ahayzen@gmail.com>
1066 * Daniel Holm <d.holmen@gmail.com>
1067 * Victor Thompson <victor.thompson@gmail.com>
1068@@ -17,8 +17,8 @@
1069 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1070 */
1071
1072-import QtQuick 2.3
1073-import Ubuntu.Components 1.1
1074+import QtQuick 2.4
1075+import Ubuntu.Components 1.2
1076 import Ubuntu.Components.Popups 1.0
1077 import Ubuntu.Components.ListItems 1.0 as ListItem
1078 import Ubuntu.MediaScanner 0.1
1079
1080=== modified file 'app/ui/Songs.qml'
1081--- app/ui/Songs.qml 2015-06-27 18:25:50 +0000
1082+++ app/ui/Songs.qml 2015-06-27 20:51:31 +0000
1083@@ -17,8 +17,8 @@
1084 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1085 */
1086
1087-import QtQuick 2.3
1088-import Ubuntu.Components 1.1
1089+import QtQuick 2.4
1090+import Ubuntu.Components 1.2
1091 import Ubuntu.MediaScanner 0.1
1092 import Ubuntu.Thumbnailer 0.1
1093 import QtMultimedia 5.0
1094
1095=== modified file 'app/ui/SongsView.qml'
1096--- app/ui/SongsView.qml 2015-06-27 19:01:13 +0000
1097+++ app/ui/SongsView.qml 2015-06-27 20:51:31 +0000
1098@@ -17,8 +17,8 @@
1099 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1100 */
1101
1102-import QtQuick 2.3
1103-import Ubuntu.Components 1.1
1104+import QtQuick 2.4
1105+import Ubuntu.Components 1.2
1106 import Ubuntu.Components.ListItems 1.0 as ListItem
1107 import Ubuntu.Components.Popups 1.0
1108 import Ubuntu.MediaScanner 0.1
1109
1110=== modified file 'apparmor.json'
1111--- apparmor.json 2015-01-28 17:45:43 +0000
1112+++ apparmor.json 2015-06-27 20:51:31 +0000
1113@@ -1,5 +1,5 @@
1114 {
1115- "policy_version": 1.2,
1116+ "policy_version": 1.3,
1117 "policy_groups": [
1118 "audio",
1119 "content_exchange",
1120@@ -15,4 +15,4 @@
1121 "write_path": [
1122 "@{HOME}/Music/Imported/"
1123 ]
1124-}
1125+}
1126\ No newline at end of file
1127
1128=== modified file 'debian/changelog'
1129--- debian/changelog 2015-05-10 00:34:24 +0000
1130+++ debian/changelog 2015-06-27 20:51:31 +0000
1131@@ -1,3 +1,9 @@
1132+music-app (2.2) vivid; urgency=medium
1133+ [ Andrew Hayzen ]
1134+ * Bump framework to 15.04
1135+
1136+ -- Andrew Hayzen <ahayzen@gmail.com> Sat, 27 Jun 2015 21:30:23 +0100
1137+
1138 music-app (2.1) vivid; urgency=medium
1139
1140 [ Andrew Hayzen ]
1141
1142=== modified file 'manifest.json.in'
1143--- manifest.json.in 2015-05-10 00:34:24 +0000
1144+++ manifest.json.in 2015-06-27 20:51:31 +0000
1145@@ -1,7 +1,7 @@
1146 {
1147 "architecture": "all",
1148 "description": "A music application for ubuntu",
1149- "framework": "ubuntu-sdk-14.10-qml",
1150+ "framework": "ubuntu-sdk-15.04-qml",
1151 "hooks": {
1152 "music": {
1153 "apparmor": "apparmor.json",
1154@@ -14,7 +14,7 @@
1155 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
1156 "name": "@PROJECT_NAME@",
1157 "title": "Music",
1158- "version": "2.1.@BZR_REVNO@",
1159+ "version": "2.2.@BZR_REVNO@",
1160 "x-source": {
1161 "vcs-bzr": "@BZR_SOURCE@",
1162 "vcs-bzr-revno": "@BZR_REVNO@"
1163
1164=== modified file 'music-app.qmltheme'
1165--- music-app.qmltheme 2013-06-03 17:43:53 +0000
1166+++ music-app.qmltheme 2015-06-27 20:51:31 +0000
1167@@ -1,5 +1,5 @@
1168 @qml-mapping(.frame, , FrameDelegate);
1169-@qml-import(Ubuntu.Components 0.1);
1170+@qml-import(Ubuntu.Components 1.2);
1171
1172 .button {
1173 color: "#c94212";
1174
1175=== modified file 'tests/autopilot/music_app/__init__.py'
1176--- tests/autopilot/music_app/__init__.py 2015-04-28 18:16:43 +0000
1177+++ tests/autopilot/music_app/__init__.py 2015-06-27 20:51:31 +0000
1178@@ -48,7 +48,10 @@
1179
1180 def __init__(self, app_proxy):
1181 self.app = app_proxy
1182- self.main_view = self.app.wait_select_single(MainView)
1183+
1184+ # Use only objectName due to bug 1350532 as it is MainView12
1185+ self.main_view = self.app.wait_select_single(
1186+ objectName="musicMainView")
1187 self.player = self.app.select_single(Player, objectName='player')
1188
1189 def get_add_to_playlist_page(self):
1190@@ -137,7 +140,10 @@
1191 super(Page, self).__init__(*args)
1192 # XXX we need a better way to keep reference to the main view.
1193 # --elopio - 2014-01-31
1194- self.main_view = self.get_root_instance().select_single(MainView)
1195+
1196+ # Use only objectName due to bug 1350532 as it is MainView12
1197+ self.main_view = self.get_root_instance().select_single(
1198+ objectName="musicMainView")
1199
1200
1201 class MusicPage(Page):

Subscribers

People subscribed via source and target branches