Ubuntu Music App

Merge lp:~vthompson/music-app/refactor-fix-1417823-prevent-infinite-pages into lp:music-app

  1. refactor-fix-1417823-prevent-infinite-pages
  2. Merge into trunk
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 830
Merged at revision: 830
Proposed branch: lp:~vthompson/music-app/refactor-fix-1417823-prevent-infinite-pages
Merge into: lp:music-app
Diff against target: 26 lines (+3/-2)
2 files modified
app/music-app.qml (+1/-0)
po/zh_CN.po (+2/-2)
To merge this branch: bzr merge lp:~vthompson/music-app/refactor-fix-1417823-prevent-infinite-pages
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+248469@code.launchpad.net

Commit message

* Do not show toolbar in the 'Select playlist' view. Fixes: https://bugs.launchpad.net/bugs/1417823.
Launchpad automatic translations update.

Description of the change

* Do not show toolbar in the 'Select playlist' view. Fixes: https://bugs.launchpad.net/bugs/1417823.
Launchpad automatic translations update.

This is a merge of trunk that pulls in revisions 828 and 829.

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:830
http://91.189.93.70:8080/job/music-app-refactor-ci/14/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/970
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/970/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-vivid-amd64-ci/14

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

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

LGTM :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/music-app.qml'
2--- app/music-app.qml 2015-02-03 01:49:27 +0000
3+++ app/music-app.qml 2015-02-04 02:00:00 +0000
4@@ -1086,6 +1086,7 @@
5 id: musicToolbar
6 visible: mainPageStack.currentPage.title !== i18n.tr("Now playing") &&
7 mainPageStack.currentPage.title !== i18n.tr("Queue") &&
8+ mainPageStack.currentPage.title !== i18n.tr("Select playlist") &&
9 !firstRun
10 objectName: "musicToolbarObject"
11 z: 200 // put on top of everything else
12
13=== modified file 'po/zh_CN.po'
14--- po/zh_CN.po 2015-02-02 06:58:52 +0000
15+++ po/zh_CN.po 2015-02-04 02:00:00 +0000
16@@ -15,8 +15,8 @@
17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=1; plural=0;\n"
20-"X-Launchpad-Export-Date: 2015-02-02 06:58+0000\n"
21-"X-Generator: Launchpad (build 17306)\n"
22+"X-Launchpad-Export-Date: 2015-02-03 08:08+0000\n"
23+"X-Generator: Launchpad (build 17330)\n"
24
25 #: ../MusicAlbums.qml:29
26 msgid "Albums"

Subscribers

People subscribed via source and target branches