Unity 8

Merge lp:~nick-dedekind/unity8/lp1240756 into lp:unity8

  1. lp1240756
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 481
Merged at revision: 497
Proposed branch: lp:~nick-dedekind/unity8/lp1240756
Merge into: lp:unity8
Diff against target: 26 lines (+3/-2)
1 file modified
plugins/Unity/Indicators/qml/SliderMenuItem.qml (+3/-2)
To merge this branch: bzr merge lp:~nick-dedekind/unity8/lp1240756
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Andrea Cimitan (community) Approve
Review via email: mp+192939@code.launchpad.net

Commit message

Fixed indicator slider menu item alignment to label field and icon.

Description of the change

Fixed indicator slider menu item alignment to label field and icon.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:480
http://jenkins.qa.ubuntu.com/job/unity8-ci/1510/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/140/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/134/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/34
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/131/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/140
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/140/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/134
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/134/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2760
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2811/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/559
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/560

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1510/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

17 + visible: source != ""

What if we do visible: status === Image.Ready or something like that?

Revision history for this message
Andrea Cimitan (cimi) :
review: Needs Information
lp:~nick-dedekind/unity8/lp1240756 updated
481. By Nick Dedekind

Use image.status for visibility

Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

> 17 + visible: source != ""
>
> What if we do visible: status === Image.Ready or something like that?

Done.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:481
http://jenkins.qa.ubuntu.com/job/unity8-ci/1516/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/165
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/159/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/40/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/40
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/165
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/165/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/159
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/159/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2783/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2834/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/606
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/605

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1516/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

Thx

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Unity/Indicators/qml/SliderMenuItem.qml'
2--- plugins/Unity/Indicators/qml/SliderMenuItem.qml 2013-10-02 10:57:36 +0000
3+++ plugins/Unity/Indicators/qml/SliderMenuItem.qml 2013-10-29 19:01:34 +0000
4@@ -51,12 +51,12 @@
5
6 control: Item {
7 id: row
8- width: sliderMenu.text ? units.gu(20) : menuItem.width - (2 * menuItem.__contentsMargins)
9+ width: menuItem.text ? units.gu(20) : menuItem.width - (2 * menuItem.__contentsMargins)
10 height: slider.height
11
12 Image {
13 id: leftImage
14- visible: source != ""
15+ visible: status === Image.Ready
16 anchors.left: row.left
17 anchors.verticalCenter: row.verticalCenter
18 height: units.gu(4)
19@@ -96,6 +96,7 @@
20
21 Image {
22 id: rightImage
23+ visible: status === Image.Ready
24 anchors.right: row.right
25 anchors.verticalCenter: row.verticalCenter
26 height: units.gu(4)

Subscribers

People subscribed via source and target branches