Ubuntu Music App

Merge lp:~vthompson/music-app/remix-queue-list into lp:music-app/remix

  1. remix-queue-list
  2. Merge into remix
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 665
Merged at revision: 662
Proposed branch: lp:~vthompson/music-app/remix-queue-list
Merge into: lp:music-app/remix
Prerequisite: lp:~vthompson/music-app/remix-songs-tab
Diff against target: 689 lines (+120/-241)
2 files modified
MusicNowPlaying.qml (+34/-159)
po/com.ubuntu.music.pot (+86/-82)
To merge this branch: bzr merge lp:~vthompson/music-app/remix-queue-list
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Andrew Hayzen Approve
Review via email: mp+237525@code.launchpad.net

This proposal supersedes a proposal from 2014-10-08.

Commit message

Initial Now Playing queue list refactor

Description of the change

Initial Now Playing queue list refactor based on initial Songs tab redesign.

To post a comment you must log in.
Revision history for this message
Victor Thompson (vthompson) wrote :

#blocked on design

Revision history for this message
Victor Thompson (vthompson) wrote :

#unblocked designs are available

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:658
http://91.189.93.70:8080/job/music-app-remix-ci/52/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/782
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/782/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/52

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

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:659
http://91.189.93.70:8080/job/music-app-remix-ci/54/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/784
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/784/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/54

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

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:660
http://91.189.93.70:8080/job/music-app-remix-ci/55/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/785
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/785/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/55

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

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:662
http://91.189.93.70:8080/job/music-app-remix-ci/57/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/787
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/787/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/57

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

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Looks good so far.

As discussed the X button will actually clear the queue (we'll be getting a better icon soon). The back button will then go back to the now playing. Therefore it seems reasonable to make the Queue section a separate Page and file, which then allows for the flickable hack to be removed.

review: Needs Fixing
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:663
http://91.189.93.70:8080/job/music-app-remix-ci/63/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/835
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/835/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/63

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Victor Thompson (vthompson) wrote :

#blocked on design. Need to get clarification of Now Playing and Queue.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:664
http://91.189.93.70:8080/job/music-app-remix-ci/66/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/838
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/838/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/66

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

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

LGTM, as discussed we'll figure out the exact design pattern in a future mp.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/music-app-remix-autolanding/16/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/854
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/854/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-autolanding/16

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:665
http://91.189.93.70:8080/job/music-app-remix-ci/67/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/855
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/855/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/67

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MusicNowPlaying.qml'
2--- MusicNowPlaying.qml 2014-10-10 14:27:45 +0000
3+++ MusicNowPlaying.qml 2014-10-10 16:58:52 +0000
4@@ -30,7 +30,7 @@
5 id: nowPlaying
6 flickable: isListView ? queuelist : null // Ensures that the header is shown in fullview
7 objectName: "nowPlayingPage"
8- title: i18n.tr("Now Playing")
9+ title: isListView ? i18n.tr("Queue") : i18n.tr("Now playing")
10 visible: false
11
12 property int ensureVisibleIndex: 0 // ensure first index is visible at startup
13@@ -52,7 +52,7 @@
14 actions: [
15 Action {
16 objectName: "toggleView"
17- iconName: "media-playlist"
18+ iconName: isListView ? "clear" : "media-playlist"
19 onTriggered: {
20 isListView = !isListView
21 }
22@@ -395,13 +395,20 @@
23 id: queuelist
24 anchors {
25 fill: parent
26+ topMargin: units.gu(2)
27 }
28 delegate: queueDelegate
29 footer: Item {
30 height: mainView.height - (styleMusic.common.expandHeight + queuelist.currentHeight) + units.gu(8)
31 }
32- highlightFollowsCurrentItem: false
33 model: trackQueue.model
34+ highlightFollowsCurrentItem: true
35+ highlightMoveDuration: 0
36+ highlight: Rectangle {
37+ color: "#2c2c34"
38+ focus: true
39+ }
40+
41 objectName: "nowPlayingQueueList"
42 state: "normal"
43 states: [
44@@ -422,8 +429,7 @@
45 ]
46 visible: isListView
47
48- property int normalHeight: units.gu(12)
49- property int currentHeight: units.gu(40)
50+ property int normalHeight: units.gu(6)
51 property int transitionDuration: 250 // transition length of animations
52
53 onCountChanged: {
54@@ -437,7 +443,8 @@
55 color: "transparent"
56 height: queuelist.normalHeight
57 objectName: "nowPlayingListItem" + index
58- state: queuelist.currentIndex == index && !reordering ? "current" : ""
59+ showDivider: false
60+ state: ""
61
62 leftSideAction: Remove {
63 onTriggered: {
64@@ -493,7 +500,6 @@
65 id: trackContainer;
66 anchors {
67 fill: parent
68- margins: units.gu(1)
69 }
70 color: "transparent"
71
72@@ -513,159 +519,28 @@
73 to: units.gu(0.5)
74 }
75
76- CoverRow {
77- id: trackImage
78-
79- anchors {
80- top: parent.top
81- left: parent.left
82- leftMargin: units.gu(1.5)
83- }
84- count: 1
85- size: (queueListItem.state === "current"
86- ? (mainView.wideAspect
87- ? queuelist.currentHeight
88- : mainView.width - (trackImage.anchors.leftMargin * 2))
89- : queuelist.normalHeight) - units.gu(2)
90+ MusicRow {
91+ id: musicRow
92 covers: [{art: model.art, album: model.album, author: model.author}]
93-
94- spacing: units.gu(2)
95-
96- Item { // Background so can see text in current state
97- id: albumBg
98- visible: false
99- anchors {
100- bottom: parent.bottom
101- left: parent.left
102- right: parent.right
103- }
104- height: units.gu(9)
105- clip: true
106- UbuntuShape{
107- anchors {
108- bottom: parent.bottom
109- left: parent.left
110- right: parent.right
111- }
112- height: trackImage.height
113- radius: "medium"
114- color: styleMusic.common.black
115- opacity: 0.6
116- }
117- }
118-
119- function calcAnchors() {
120- if (trackImage.height > queuelist.normalHeight && mainView.wideAspect) {
121- trackImage.anchors.left = undefined
122- trackImage.anchors.horizontalCenter = trackImage.parent.horizontalCenter
123- } else {
124- trackImage.anchors.left = trackImage.parent.left
125- trackImage.anchors.horizontalCenter = undefined
126- }
127-
128- trackImage.width = trackImage.height; // force width to match height
129- }
130-
131- Connections {
132- target: mainView
133- onWideAspectChanged: trackImage.calcAnchors()
134- }
135-
136- onHeightChanged: {
137- calcAnchors()
138- }
139- Behavior on height {
140- NumberAnimation {
141- target: trackImage;
142- property: "height";
143- duration: queuelist.transitionDuration;
144- }
145- }
146- }
147- Label {
148- id: nowPlayingArtist
149- objectName: "artistLabel"
150- color: styleMusic.nowPlaying.labelSecondaryColor
151- elide: Text.ElideRight
152- height: units.gu(1)
153- text: model.author
154- fontSize: 'small'
155- width: parent.width - trackImage.width - units.gu(3.5)
156- x: trackImage.x + trackImage.width + units.gu(1)
157- y: trackImage.y + units.gu(1)
158- }
159- Label {
160- id: nowPlayingTitle
161- objectName: "titleLabel"
162- color: styleMusic.common.white
163- elide: Text.ElideRight
164- height: units.gu(1)
165- text: model.title
166- fontSize: 'medium'
167- width: parent.width - trackImage.width - units.gu(3.5)
168- x: trackImage.x + trackImage.width + units.gu(1)
169- y: nowPlayingArtist.y + nowPlayingArtist.height + units.gu(1.25)
170- }
171- Label {
172- id: nowPlayingAlbum
173- objectName: "albumLabel"
174- color: styleMusic.nowPlaying.labelSecondaryColor
175- elide: Text.ElideRight
176- height: units.gu(1)
177- text: model.album
178- fontSize: 'x-small'
179- width: parent.width - trackImage.width - units.gu(3.5)
180- x: trackImage.x + trackImage.width + units.gu(1)
181- y: nowPlayingTitle.y + nowPlayingTitle.height + units.gu(1.25)
182- }
183- }
184-
185- states: State {
186- name: "current"
187- PropertyChanges {
188- target: queueListItem
189- height: trackImage.size + (trackContainer.anchors.margins * 2)
190- }
191- PropertyChanges {
192- target: nowPlayingArtist
193- width: trackImage.width - units.gu(4)
194- x: trackImage.x + units.gu(2)
195- y: trackImage.y + trackImage.height - albumBg.height + units.gu(1)
196- color: styleMusic.common.white
197- }
198- PropertyChanges {
199- target: nowPlayingTitle
200- width: trackImage.width - units.gu(4)
201- x: trackImage.x + units.gu(2)
202- y: nowPlayingArtist.y + nowPlayingArtist.height + units.gu(1.25)
203- color: styleMusic.common.white
204- font.weight: Font.DemiBold
205- }
206- PropertyChanges {
207- target: nowPlayingAlbum
208- width: trackImage.width - units.gu(4)
209- x: trackImage.x + units.gu(2)
210- y: nowPlayingTitle.y + nowPlayingTitle.height + units.gu(1.25)
211- color: styleMusic.common.white
212- }
213- PropertyChanges {
214- target: albumBg
215- visible: true
216- }
217- }
218- transitions: Transition {
219- from: ",current"
220- to: "current,"
221- NumberAnimation {
222- duration: queuelist.transitionDuration
223- properties: "height,opacity,width,x,y"
224- }
225-
226- onRunningChanged: {
227- if (running === false && ensureVisibleIndex != -1)
228- {
229- queuelist.positionViewAtIndex(ensureVisibleIndex, ListView.Beginning);
230- ensureVisibleIndex = -1;
231+ showCovers: false
232+ coverSize: units.gu(6)
233+ column: Column {
234+ Label {
235+ id: trackTitle
236+ color: queuelist.currentIndex === index ? UbuntuColors.blue
237+ : styleMusic.common.music
238+ fontSize: "small"
239+ objectName: "titleLabel"
240+ text: model.title
241+ }
242+
243+ Label {
244+ id: trackArtist
245+ color: styleMusic.common.subtitle
246+ fontSize: "x-small"
247+ objectName: "artistLabel"
248+ text: model.author
249+ }
250 }
251 }
252 }
253
254=== modified file 'po/com.ubuntu.music.pot'
255--- po/com.ubuntu.music.pot 2014-10-03 01:41:35 +0000
256+++ po/com.ubuntu.music.pot 2014-10-10 16:58:52 +0000
257@@ -8,7 +8,7 @@
258 msgstr ""
259 "Project-Id-Version: music-app\n"
260 "Report-Msgid-Bugs-To: \n"
261-"POT-Creation-Date: 2014-10-02 20:40-0500\n"
262+"POT-Creation-Date: 2014-10-08 20:48-0500\n"
263 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
264 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
265 "Language-Team: LANGUAGE <LL@li.org>\n"
266@@ -18,7 +18,7 @@
267 "Content-Transfer-Encoding: 8bit\n"
268 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
269
270-#: ../LoginLastFM.qml:48 ../MusicSettings.qml:145 ../MusicSettings.qml:153
271+#: ../LoginLastFM.qml:48 ../MusicSettings.qml:134 ../MusicSettings.qml:142
272 msgid "Last.fm"
273 msgstr ""
274
275@@ -54,12 +54,12 @@
276 msgid "You forgot to set your username and/or password"
277 msgstr ""
278
279-#: ../MusicAlbums.qml:35 ../MusicStart.qml:392
280+#: ../MusicAlbums.qml:29 ../MusicStart.qml:392
281 msgid "Albums"
282 msgstr ""
283
284-#: ../MusicAlbums.qml:152 ../MusicStart.qml:200 ../MusicStart.qml:454
285-#: ../common/AlbumsPage.qml:264
286+#: ../MusicAlbums.qml:57 ../MusicStart.qml:200 ../MusicStart.qml:454
287+#: ../common/AlbumsPage.qml:262
288 msgid "Album"
289 msgstr ""
290
291@@ -67,28 +67,32 @@
292 msgid "Artists"
293 msgstr ""
294
295-#: ../MusicArtists.qml:107 ../common/AlbumsPage.qml:112
296+#: ../MusicArtists.qml:108 ../common/AlbumsPage.qml:110
297 #, qt-format
298 msgid "%1 album"
299 msgid_plural "%1 albums"
300 msgstr[0] ""
301 msgstr[1] ""
302
303-#: ../MusicArtists.qml:113 ../MusicPlaylists.qml:180 ../MusicStart.qml:371
304-#: ../MusicaddtoPlaylist.qml:106 ../common/AlbumsPage.qml:331
305-#: ../common/SongsPage.qml:138 ../common/SongsPage.qml:139
306+#: ../MusicArtists.qml:114 ../MusicPlaylists.qml:181 ../MusicStart.qml:371
307+#: ../MusicaddtoPlaylist.qml:105 ../common/AlbumsPage.qml:329
308+#: ../common/SongsPage.qml:142 ../common/SongsPage.qml:143
309 #, qt-format
310 msgid "%1 song"
311 msgid_plural "%1 songs"
312 msgstr[0] ""
313 msgstr[1] ""
314
315-#: ../MusicArtists.qml:123
316+#: ../MusicArtists.qml:124
317 msgid "Artist"
318 msgstr ""
319
320 #: ../MusicNowPlaying.qml:33
321-msgid "Now Playing"
322+msgid "Queue"
323+msgstr ""
324+
325+#: ../MusicNowPlaying.qml:33
326+msgid "Now playing"
327 msgstr ""
328
329 #. TRANSLATORS: this is the name of the playlists page shown in the tab header.
330@@ -114,118 +118,118 @@
331 msgid "Change"
332 msgstr ""
333
334-#: ../MusicPlaylists.qml:96 ../music-app.qml:962
335+#: ../MusicPlaylists.qml:96 ../music-app.qml:945
336 msgid "Playlist already exists"
337 msgstr ""
338
339-#: ../MusicPlaylists.qml:100 ../music-app.qml:967
340+#: ../MusicPlaylists.qml:100 ../music-app.qml:950
341 msgid "Please type in a name."
342 msgstr ""
343
344-#: ../MusicPlaylists.qml:105 ../music-app.qml:492 ../music-app.qml:973
345+#: ../MusicPlaylists.qml:105 ../music-app.qml:486 ../music-app.qml:956
346 msgid "Cancel"
347 msgstr ""
348
349-#: ../MusicPlaylists.qml:159 ../MusicPlaylists.qml:163 ../MusicStart.qml:118
350+#: ../MusicPlaylists.qml:160 ../MusicPlaylists.qml:164 ../MusicStart.qml:118
351 #: ../MusicStart.qml:200 ../common/SongsPage.qml:114
352-#: ../common/SongsPage.qml:171 ../common/SongsPage.qml:228
353-#: ../common/SongsPage.qml:250 ../common/SongsPage.qml:252
354-#: ../common/SongsPage.qml:270
355+#: ../common/SongsPage.qml:175 ../common/SongsPage.qml:232
356+#: ../common/SongsPage.qml:254 ../common/SongsPage.qml:256
357+#: ../common/SongsPage.qml:274
358 msgid "Playlist"
359 msgstr ""
360
361-#: ../MusicSearch.qml:44 ../MusicSearch.qml:75 ../MusicToolbar.qml:522
362-#: ../music-app.qml:92 ../music-app.qml:140 ../music-app.qml:146
363+#: ../MusicSearch.qml:44 ../MusicSearch.qml:75 ../music-app.qml:88
364+#: ../music-app.qml:134 ../music-app.qml:140
365 msgid "Search"
366 msgstr ""
367
368-#: ../MusicSettings.qml:30 ../music-app.qml:190
369+#: ../MusicSettings.qml:30 ../music-app.qml:184
370 msgid "Settings"
371 msgstr ""
372
373-#: ../MusicSettings.qml:81
374+#: ../MusicSettings.qml:70
375 msgid "Equaliser"
376 msgstr ""
377
378-#: ../MusicSettings.qml:82
379+#: ../MusicSettings.qml:71
380 msgid "Default"
381 msgstr ""
382
383-#: ../MusicSettings.qml:83
384+#: ../MusicSettings.qml:72
385 msgid "Acoustic"
386 msgstr ""
387
388-#: ../MusicSettings.qml:84
389+#: ../MusicSettings.qml:73
390 msgid "Classical"
391 msgstr ""
392
393-#: ../MusicSettings.qml:85
394+#: ../MusicSettings.qml:74
395 msgid "Electronic"
396 msgstr ""
397
398-#: ../MusicSettings.qml:86
399+#: ../MusicSettings.qml:75
400 msgid "Flat"
401 msgstr ""
402
403-#: ../MusicSettings.qml:87
404+#: ../MusicSettings.qml:76
405 msgid "Hip Hop"
406 msgstr ""
407
408-#: ../MusicSettings.qml:88
409+#: ../MusicSettings.qml:77
410 msgid "Jazz"
411 msgstr ""
412
413-#: ../MusicSettings.qml:89
414+#: ../MusicSettings.qml:78
415 msgid "Metal"
416 msgstr ""
417
418-#: ../MusicSettings.qml:90
419+#: ../MusicSettings.qml:79
420 msgid "Pop"
421 msgstr ""
422
423-#: ../MusicSettings.qml:91
424+#: ../MusicSettings.qml:80
425 msgid "Rock"
426 msgstr ""
427
428-#: ../MusicSettings.qml:92
429+#: ../MusicSettings.qml:81
430 msgid "Custom"
431 msgstr ""
432
433-#: ../MusicSettings.qml:112
434+#: ../MusicSettings.qml:101
435 msgid ""
436 "Snap to current song \n"
437 "when opening toolbar"
438 msgstr ""
439
440-#: ../MusicSettings.qml:132
441+#: ../MusicSettings.qml:121
442 msgid "Accounts"
443 msgstr ""
444
445-#: ../MusicSettings.qml:146
446+#: ../MusicSettings.qml:135
447 msgid "Login to scrobble and import playlists"
448 msgstr ""
449
450-#: ../MusicSettings.qml:169
451+#: ../MusicSettings.qml:158
452 msgid "Music Streaming"
453 msgstr ""
454
455-#: ../MusicSettings.qml:179
456+#: ../MusicSettings.qml:168
457 msgid "Ubuntu One"
458 msgstr ""
459
460-#: ../MusicSettings.qml:180
461+#: ../MusicSettings.qml:169
462 msgid "Sign in to stream your cloud music"
463 msgstr ""
464
465-#: ../MusicSettings.qml:196
466+#: ../MusicSettings.qml:185
467 msgid "Stream only on Wi-Fi"
468 msgstr ""
469
470-#: ../MusicSettings.qml:230
471+#: ../MusicSettings.qml:219
472 msgid "Clean everything!"
473 msgstr ""
474
475-#: ../MusicStart.qml:35 ../music-app.qml:588 ../music-app.qml:1156
476+#: ../MusicStart.qml:35 ../music-app.qml:576 ../music-app.qml:1141
477 #: com.ubuntu.music_music.desktop.in.in.h:1
478 msgid "Music"
479 msgstr ""
480@@ -243,12 +247,12 @@
481 msgstr ""
482
483 #: ../MusicStart.qml:316 ../MusicStart.qml:318 ../common/SongsPage.qml:115
484-#: ../common/SongsPage.qml:138 ../common/SongsPage.qml:167
485-#: ../common/SongsPage.qml:224 ../common/SongsPage.qml:266
486+#: ../common/SongsPage.qml:142 ../common/SongsPage.qml:171
487+#: ../common/SongsPage.qml:228 ../common/SongsPage.qml:270
488 msgid "Genre"
489 msgstr ""
490
491-#: ../MusicToolbar.qml:767
492+#: ../MusicToolbar.qml:150
493 msgid "Tap to shuffle music"
494 msgstr ""
495
496@@ -260,17 +264,17 @@
497 msgid "Select playlist"
498 msgstr ""
499
500-#: ../common/AlbumsPage.qml:167 ../common/AlbumsPage.qml:360
501-#: ../common/SongsPage.qml:218
502+#: ../common/AlbumsPage.qml:165 ../common/AlbumsPage.qml:358
503+#: ../common/SongsPage.qml:222
504 msgid "Play all"
505 msgstr ""
506
507-#: ../common/AlbumsPage.qml:211 ../common/AlbumsPage.qml:400
508-#: ../music-app.qml:894
509+#: ../common/AlbumsPage.qml:209 ../common/AlbumsPage.qml:398
510+#: ../music-app.qml:877
511 msgid "Add to queue"
512 msgstr ""
513
514-#: ../common/ListItemActions/AddToPlaylist.qml:25 ../music-app.qml:908
515+#: ../common/ListItemActions/AddToPlaylist.qml:25 ../music-app.qml:891
516 msgid "Add to playlist"
517 msgstr ""
518
519@@ -296,11 +300,11 @@
520 msgid "Loading..."
521 msgstr ""
522
523-#: ../common/SongsPage.qml:160
524+#: ../common/SongsPage.qml:164
525 msgid "Shuffle"
526 msgstr ""
527
528-#: ../common/SongsPage.qml:197
529+#: ../common/SongsPage.qml:201
530 msgid "Queue all"
531 msgstr ""
532
533@@ -316,127 +320,127 @@
534 msgid "Unknown Artist"
535 msgstr ""
536
537-#: ../music-app.qml:141
538+#: ../music-app.qml:135
539 msgid "Search Track"
540 msgstr ""
541
542-#: ../music-app.qml:153
543+#: ../music-app.qml:147
544 msgid "Next"
545 msgstr ""
546
547-#: ../music-app.qml:154
548+#: ../music-app.qml:148
549 msgid "Next Track"
550 msgstr ""
551
552-#: ../music-app.qml:160
553+#: ../music-app.qml:154
554 msgid "Pause"
555 msgstr ""
556
557-#: ../music-app.qml:160
558+#: ../music-app.qml:154
559 msgid "Play"
560 msgstr ""
561
562-#: ../music-app.qml:162
563+#: ../music-app.qml:156
564 msgid "Pause Playback"
565 msgstr ""
566
567-#: ../music-app.qml:162
568+#: ../music-app.qml:156
569 msgid "Continue or start playback"
570 msgstr ""
571
572-#: ../music-app.qml:167
573+#: ../music-app.qml:161
574 msgid "Back"
575 msgstr ""
576
577-#: ../music-app.qml:168
578+#: ../music-app.qml:162
579 msgid "Go back to last page"
580 msgstr ""
581
582-#: ../music-app.qml:176
583+#: ../music-app.qml:170
584 msgid "Previous"
585 msgstr ""
586
587-#: ../music-app.qml:177
588+#: ../music-app.qml:171
589 msgid "Previous Track"
590 msgstr ""
591
592-#: ../music-app.qml:182
593+#: ../music-app.qml:176
594 msgid "Stop"
595 msgstr ""
596
597-#: ../music-app.qml:183
598+#: ../music-app.qml:177
599 msgid "Stop Playback"
600 msgstr ""
601
602-#: ../music-app.qml:191
603+#: ../music-app.qml:185
604 msgid "Music Settings"
605 msgstr ""
606
607 #. TRANSLATORS: This string represents that the target destination filepath does not start with ~/Music/Imported/
608-#: ../music-app.qml:337
609+#: ../music-app.qml:331
610 msgid "Filepath must start with"
611 msgstr ""
612
613 #. TRANSLATORS: This string represents that a blank filepath destination has been used
614-#: ../music-app.qml:363
615+#: ../music-app.qml:357
616 msgid "Filepath must be a file"
617 msgstr ""
618
619 #. TRANSLATORS: This string represents that there was failure moving the file to the target destination
620-#: ../music-app.qml:369
621+#: ../music-app.qml:363
622 msgid "Failed to move file"
623 msgstr ""
624
625-#: ../music-app.qml:446
626+#: ../music-app.qml:440
627 msgid "Waiting for file(s)..."
628 msgstr ""
629
630-#: ../music-app.qml:465
631+#: ../music-app.qml:459
632 msgid "OK"
633 msgstr ""
634
635-#: ../music-app.qml:478
636+#: ../music-app.qml:472
637 msgid "Imported file not found"
638 msgstr ""
639
640-#: ../music-app.qml:482
641+#: ../music-app.qml:476
642 msgid "Wait"
643 msgstr ""
644
645 #. TRANSLATORS: this refers to a number of songs greater than one. The actual number will be prepended to the string automatically (plural forms are not yet fully supported in usermetrics, the library that displays that string)
646-#: ../music-app.qml:503
647+#: ../music-app.qml:497
648 msgid "songs played today"
649 msgstr ""
650
651-#: ../music-app.qml:504
652+#: ../music-app.qml:498
653 msgid "No songs played today"
654 msgstr ""
655
656-#: ../music-app.qml:612
657+#: ../music-app.qml:599
658 msgid "Debug: "
659 msgstr ""
660
661-#: ../music-app.qml:931
662+#: ../music-app.qml:914
663 msgid "New Playlist"
664 msgstr ""
665
666-#: ../music-app.qml:932
667+#: ../music-app.qml:915
668 msgid "Name your playlist."
669 msgstr ""
670
671-#: ../music-app.qml:936
672+#: ../music-app.qml:919
673 msgid "Name"
674 msgstr ""
675
676-#: ../music-app.qml:946
677+#: ../music-app.qml:929
678 msgid "Create"
679 msgstr ""
680
681-#: ../music-app.qml:1182
682+#: ../music-app.qml:1167
683 msgid "No music found"
684 msgstr ""
685
686-#: ../music-app.qml:1189
687+#: ../music-app.qml:1174
688 msgid "Please import music"
689 msgstr ""
690

Subscribers

People subscribed via source and target branches