Ubuntu Music App

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

  1. fix-1416115
  2. Merge into remix
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 820
Merged at revision: 820
Proposed branch: lp:~vthompson/music-app/fix-1416115
Merge into: lp:music-app/remix
Diff against target: 63 lines (+20/-0)
2 files modified
common/AlbumsPage.qml (+10/-0)
common/SongsPage.qml (+10/-0)
To merge this branch: bzr merge lp:~vthompson/music-app/fix-1416115
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+248071@code.launchpad.net

Commit message

* Make stroked buttons elide text

Description of the change

* Make stroked buttons elide text

To test, either change the displayed text for the top 2 buttons in common/SongsPage.qml and common/AlbumsPage.qml, or change your device's language to German to witness the elide on the middle button.

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

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

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

Allows the buttons in the 'header' of the listview to elide for both AlbumsPage and SongPage :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common/AlbumsPage.qml'
2--- common/AlbumsPage.qml 2015-01-28 02:32:24 +0000
3+++ common/AlbumsPage.qml 2015-01-30 01:25:53 +0000
4@@ -60,8 +60,13 @@
5 centerIn: parent
6 }
7 color: "white"
8+ elide: Text.ElideRight
9+ height: parent.height
10+ horizontalAlignment: Text.AlignHCenter
11 // TRANSLATORS: this appears in a button with limited space (around 14 characters)
12 text: i18n.tr("Shuffle")
13+ verticalAlignment: Text.AlignVCenter
14+ width: parent.width - units.gu(2)
15 }
16 onClicked: shuffleModel(songArtistModel)
17 }
18@@ -75,8 +80,13 @@
19 centerIn: parent
20 }
21 color: "white"
22+ elide: Text.ElideRight
23+ height: parent.height
24+ horizontalAlignment: Text.AlignHCenter
25 // TRANSLATORS: this appears in a button with limited space (around 14 characters)
26 text: i18n.tr("Queue all")
27+ verticalAlignment: Text.AlignVCenter
28+ width: parent.width - units.gu(2)
29 }
30 onClicked: addQueueFromModel(songArtistModel)
31 }
32
33=== modified file 'common/SongsPage.qml'
34--- common/SongsPage.qml 2015-01-28 02:27:52 +0000
35+++ common/SongsPage.qml 2015-01-30 01:25:53 +0000
36@@ -308,8 +308,13 @@
37 centerIn: parent
38 }
39 color: "white"
40+ elide: Text.ElideRight
41+ height: parent.height
42+ horizontalAlignment: Text.AlignHCenter
43 // TRANSLATORS: this appears in a button with limited space (around 14 characters)
44 text: i18n.tr("Shuffle")
45+ verticalAlignment: Text.AlignVCenter
46+ width: parent.width - units.gu(2)
47 }
48 onClicked: {
49 shuffleModel(albumtrackslist.model) // play track
50@@ -335,8 +340,13 @@
51 centerIn: parent
52 }
53 color: "white"
54+ elide: Text.ElideRight
55+ height: parent.height
56+ horizontalAlignment: Text.AlignHCenter
57 // TRANSLATORS: this appears in a button with limited space (around 14 characters)
58 text: i18n.tr("Queue all")
59+ verticalAlignment: Text.AlignVCenter
60+ width: parent.width - units.gu(2)
61 }
62 onClicked: addQueueFromModel(albumtrackslist.model)
63 }

Subscribers

People subscribed via source and target branches