Merge lp:~om26er/music-app/fix_settings_margins into lp:music-app/trusty

Proposed by Omer Akram
Status: Merged
Approved by: Daniel Holm
Approved revision: 156
Merged at revision: 156
Proposed branch: lp:~om26er/music-app/fix_settings_margins
Merge into: lp:music-app/trusty
Diff against target: 34 lines (+5/-0)
1 file modified
MusicSettings.qml (+5/-0)
To merge this branch: bzr merge lp:~om26er/music-app/fix_settings_margins
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Music App Developers Pending
Review via email: mp+189509@code.launchpad.net

Commit message

fixes a few of the alignments in the settings pane

Description of the change

fixes a few of the alignments in the settings pane

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MusicSettings.qml'
2--- MusicSettings.qml 2013-10-05 15:01:45 +0000
3+++ MusicSettings.qml 2013-10-06 18:54:47 +0000
4@@ -103,8 +103,10 @@
5 anchors.right: parent.right
6 anchors.bottom: shuffleRow.top
7 anchors.bottomMargin: units.gu(2)
8+ anchors.leftMargin: units.gu(2)
9 Label {
10 id: snapLabel
11+ anchors.verticalCenter: snapSwitch.verticalCenter
12 text: i18n.tr("Snap to current song \nwhen opening toolbar")
13 }
14 Switch {
15@@ -124,9 +126,11 @@
16 anchors.right: parent.right
17 anchors.bottom: accounts.top
18 anchors.bottomMargin: units.gu(2)
19+ anchors.leftMargin: units.gu(2)
20 width: parent.width
21 Label {
22 id: shuffleLabel
23+ anchors.verticalCenter: shuffleSwitch.verticalCenter
24 text: i18n.tr("Shuffle")
25 }
26 Switch {
27@@ -213,6 +217,7 @@
28 enabled: false // check if account is connected
29 anchors.left: parent.left
30 anchors.leftMargin: units.gu(2)
31+ anchors.verticalCenter: wifiSwitch.verticalCenter
32 }
33 Switch {
34 id: wifiSwitch

Subscribers

People subscribed via source and target branches

to status/vote changes: