Ubuntu Music App

Merge lp:~vthompson/music-app/do-not-ask-to-restart-app into lp:music-app/trusty

  1. do-not-ask-to-restart-app
  2. Merge into trusty
Proposed by Victor Thompson
Status: Merged
Approved by: David Planella
Approved revision: 573
Merged at revision: 574
Proposed branch: lp:~vthompson/music-app/do-not-ask-to-restart-app
Merge into: lp:music-app/trusty
Diff against target: 106 lines (+15/-15)
2 files modified
music-app.qml (+1/-1)
po/com.ubuntu.music.pot (+14/-14)
To merge this branch: bzr merge lp:~vthompson/music-app/do-not-ask-to-restart-app
Reviewer Review Type Date Requested Status
David Planella Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+231056@code.launchpad.net

Commit message

* Do not tell the user to restart the app.

Description of the change

Currently the models used by mediascanner2 refresh when new media is added. Thus, when new tracks are added the app's models will populate. This means the app does not need to be restarted.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:573
http://91.189.93.70:8080/job/music-app-ci/1025/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1554
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1554/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-utopic-amd64-ci/249

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

review: Approve (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

LGTM!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'music-app.qml'
2--- music-app.qml 2014-08-12 16:14:16 +0000
3+++ music-app.qml 2014-08-16 03:16:14 +0000
4@@ -946,7 +946,7 @@
5 anchors.horizontalCenter: parent.horizontalCenter
6 color: styleMusic.libraryEmpty.labelColor
7 fontSize: "medium"
8- text: i18n.tr("Please import music and restart the app")
9+ text: i18n.tr("Please import music")
10 }
11 }
12 }
13
14=== modified file 'po/com.ubuntu.music.pot'
15--- po/com.ubuntu.music.pot 2014-08-12 23:22:51 +0000
16+++ po/com.ubuntu.music.pot 2014-08-16 03:16:14 +0000
17@@ -8,7 +8,7 @@
18 msgstr ""
19 "Project-Id-Version: music-app\n"
20 "Report-Msgid-Bugs-To: \n"
21-"POT-Creation-Date: 2014-08-13 00:21+0100\n"
22+"POT-Creation-Date: 2014-08-15 22:10-0500\n"
23 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
24 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
25 "Language-Team: LANGUAGE <LL@li.org>\n"
26@@ -54,12 +54,12 @@
27 msgid "You forgot to set your username and/or password"
28 msgstr ""
29
30-#: ../MusicAlbums.qml:37 ../MusicStart.qml:378
31+#: ../MusicAlbums.qml:37 ../MusicStart.qml:384
32 msgid "Albums"
33 msgstr ""
34
35-#: ../MusicAlbums.qml:155 ../MusicStart.qml:202 ../MusicStart.qml:440
36-#: ../common/AlbumsPage.qml:276
37+#: ../MusicAlbums.qml:153 ../MusicStart.qml:202 ../MusicStart.qml:446
38+#: ../common/AlbumsPage.qml:274
39 msgid "Album"
40 msgstr ""
41
42@@ -74,8 +74,8 @@
43 msgstr[0] ""
44 msgstr[1] ""
45
46-#: ../MusicArtists.qml:113 ../MusicPlaylists.qml:174 ../MusicStart.qml:359
47-#: ../MusicaddtoPlaylist.qml:102 ../common/SongsPage.qml:123
48+#: ../MusicArtists.qml:113 ../MusicPlaylists.qml:178 ../MusicStart.qml:365
49+#: ../MusicaddtoPlaylist.qml:106 ../common/SongsPage.qml:123
50 #, qt-format
51 msgid "%1 song"
52 msgid_plural "%1 songs"
53@@ -233,19 +233,19 @@
54 msgid "Clear History"
55 msgstr ""
56
57-#: ../MusicStart.qml:224
58+#: ../MusicStart.qml:227
59 msgid "Genres"
60 msgstr ""
61
62-#: ../MusicStart.qml:309
63+#: ../MusicStart.qml:312
64 msgid "Genre"
65 msgstr ""
66
67-#: ../MusicToolbar.qml:756
68+#: ../MusicToolbar.qml:757
69 msgid "No songs queued"
70 msgstr ""
71
72-#: ../MusicToolbar.qml:766
73+#: ../MusicToolbar.qml:767
74 msgid "Tap play or any item to start"
75 msgstr ""
76
77@@ -257,17 +257,17 @@
78 msgid "Select playlist"
79 msgstr ""
80
81-#: ../common/AlbumsPage.qml:165 ../common/AlbumsPage.qml:357
82+#: ../common/AlbumsPage.qml:165 ../common/AlbumsPage.qml:358
83 #: ../common/SongsPage.qml:152
84 msgid "Play all"
85 msgstr ""
86
87-#: ../common/AlbumsPage.qml:209 ../common/AlbumsPage.qml:397
88+#: ../common/AlbumsPage.qml:209 ../common/AlbumsPage.qml:398
89 #: ../common/SongsPage.qml:199 ../music-app.qml:665
90 msgid "Add to queue"
91 msgstr ""
92
93-#: ../common/AlbumsPage.qml:327 ../common/SongsPage.qml:122
94+#: ../common/AlbumsPage.qml:328 ../common/SongsPage.qml:122
95 #, qt-format
96 msgid " | %1 song"
97 msgid_plural " | %1 songs"
98@@ -402,7 +402,7 @@
99 msgstr ""
100
101 #: ../music-app.qml:949
102-msgid "Please import music and restart the app"
103+msgid "Please import music"
104 msgstr ""
105
106 #: com.ubuntu.music_music.desktop.in.in.h:2

Subscribers

People subscribed via source and target branches

to status/vote changes: