Merge lp:~laney/ubuntu-system-settings/background-no-toolbar-close into lp:ubuntu-system-settings

[Iain Lane]

background selector: lock the toolbar open, per the design

[lp:~laney/ubuntu-system-settings/background-no-toolbar-close]

644. By Iain Lane on 2014-03-06

locked too

[Sebastien Bacher (seb128)]

Thanks, bonus point if you --fixes lp:1288361 (you can probably uncommit, commit again and push --overwrite)

review: Approve

[Iain Lane (laney)]

On Thu, Mar 06, 2014 at 11:14:12AM -0000, Sebastien Bacher wrote:
> Review: Approve
>
> Thanks, bonus point if you --fixes lp:1288361 (you can probably uncommit, commit again and push --overwrite)

Oh yeah, I forgot (but I can just link the branch, it does the same
thing)

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Sebastien Bacher (seb128)]

> Oh yeah, I forgot (but I can just link the branch, it does the same thing)

is the CI release magic going to add the bug reference in the changelog as well if you do that?

[Sebastien Bacher (seb128)]

(seems it does, approving then)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:644
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/682/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3709
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3300
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/186
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3714
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3714/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3302
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3302/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5671
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4522

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/682/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/background/Wallpapers.qml'
--- plugins/background/Wallpapers.qml	2014-02-18 14:18:27 +0000
+++ plugins/background/Wallpapers.qml	2014-03-06 11:11:39 +0000
@@ -58,6 +58,8 @@
         ToolbarButton {
             action: selectDefaultPeer
         }
+        opened: true
+        locked: true
     }
 
     UbuntuBackgroundPanel {