mediaplayer-app

Merge lp:~om26er/mediaplayer-app/disable_settings_button into lp:mediaplayer-app

  1. disable_settings_button
  2. Merge into trunk
Proposed by Omer Akram
Status: Merged
Merged at revision: 162
Proposed branch: lp:~om26er/mediaplayer-app/disable_settings_button
Merge into: lp:mediaplayer-app
Diff against target: 12 lines (+2/-0)
1 file modified
src/qml/player/Controls.qml (+2/-0)
To merge this branch: bzr merge lp:~om26er/mediaplayer-app/disable_settings_button
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ugo Riboni (community) Approve
Review via email: mp+190904@code.launchpad.net

Commit message

disable the settings button as there are no settings

Description of the change

disable the settings button as there are no settings

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

FAILED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/135/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2897
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/71
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/71/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2899
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2899/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2410
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2453

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mediaplayer-app-ci/135/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ugo Riboni (uriboni) wrote :

Code looks fine, feel free to top-approve when jenkins is ok with it

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-autolanding/66/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2909
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-autolanding/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-autolanding/42
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-autolanding/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-autolanding/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2911
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2911/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2420
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2463

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-autolanding/68/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2937
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-autolanding/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-autolanding/44
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-autolanding/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-autolanding/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2939
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2939/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2446
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2489

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-autolanding/69/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2941
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-autolanding/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-autolanding/45
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-autolanding/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-autolanding/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2943
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2943/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2450
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2493

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/player/Controls.qml'
2--- src/qml/player/Controls.qml 2013-09-30 21:48:25 +0000
3+++ src/qml/player/Controls.qml 2013-10-14 09:58:59 +0000
4@@ -254,6 +254,8 @@
5
6 width: units.gu(9)
7 height: units.gu(3)
8+ enabled: false
9+ opacity: 0.2
10
11 onClicked: settingsClicked()
12 }

Subscribers

People subscribed via source and target branches