Ubuntu Music App

Merge lp:~vthompson/music-app/fix-1417043 into lp:music-app/remix

  1. fix-1417043
  2. Merge into remix
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 828
Merged at revision: 826
Proposed branch: lp:~vthompson/music-app/fix-1417043
Merge into: lp:music-app/remix
Diff against target: 54 lines (+9/-1)
3 files modified
common/Walkthrough/Slide1.qml (+3/-1)
common/Walkthrough/Slide2.qml (+3/-0)
common/Walkthrough/Slide3.qml (+3/-0)
To merge this branch: bzr merge lp:~vthompson/music-app/fix-1417043
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Sebastien Bacher (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+248239@code.launchpad.net

Commit message

* Allow walkthrough titles to word wrap up to 2 lines and elide if over 2 lines.

Description of the change

* Allow walkthrough titles to word wrap up to 2 lines and elide if over 2 lines.

To post a comment you must log in.
lp:~vthompson/music-app/fix-1417043 updated
827. By Victor Thompson

Remove force flag

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

PASSED: Continuous integration, rev:827
http://91.189.93.70:8080/job/music-app-ci/1273/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/931
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/931/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/125

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

review: Approve (continuous-integration)
lp:~vthompson/music-app/fix-1417043 updated
828. By Victor Thompson

Remove height from Slide1 intro text to allow it to wrap.

Revision history for this message
Sebastien Bacher (seb128) wrote :

Looks good to me and works fine (tested on rtm 224)

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

LGTM, all the slides now wrap to 2 lines :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common/Walkthrough/Slide1.qml'
2--- common/Walkthrough/Slide1.qml 2015-01-22 01:04:27 +0000
3+++ common/Walkthrough/Slide1.qml 2015-02-02 14:03:24 +0000
4@@ -51,11 +51,13 @@
5 bottom: bodyText.top
6 bottomMargin: units.gu(4)
7 }
8+ elide: Text.ElideRight
9 fontSize: "x-large"
10- height: contentHeight
11 horizontalAlignment: Text.AlignHLeft
12+ maximumLineCount: 2
13 text: i18n.tr("Welcome to Music")
14 width: units.gu(36)
15+ wrapMode: Text.WordWrap
16 }
17
18 Label {
19
20=== modified file 'common/Walkthrough/Slide2.qml'
21--- common/Walkthrough/Slide2.qml 2015-01-22 01:04:27 +0000
22+++ common/Walkthrough/Slide2.qml 2015-02-02 14:03:24 +0000
23@@ -47,10 +47,13 @@
24 bottom: bodyText.top
25 bottomMargin: units.gu(4)
26 }
27+ elide: Text.ElideRight
28 fontSize: "x-large"
29 horizontalAlignment: Text.AlignHLeft
30+ maximumLineCount: 2
31 text: i18n.tr("Import your music")
32 width: units.gu(36)
33+ wrapMode: Text.WordWrap
34 }
35
36 Label {
37
38=== modified file 'common/Walkthrough/Slide3.qml'
39--- common/Walkthrough/Slide3.qml 2015-01-22 01:04:27 +0000
40+++ common/Walkthrough/Slide3.qml 2015-02-02 14:03:24 +0000
41@@ -47,10 +47,13 @@
42 bottom: finalMessage.top
43 bottomMargin: units.gu(4)
44 }
45+ elide: Text.ElideRight
46 fontSize: "x-large"
47 horizontalAlignment: Text.AlignHLeft
48+ maximumLineCount: 2
49 text: i18n.tr("Download new music")
50 width: units.gu(36)
51+ wrapMode: Text.WordWrap
52 }
53
54 Label {

Subscribers

People subscribed via source and target branches