Ubuntu UI Toolkit

Merge lp:~osomon/ubuntu-ui-toolkit/fix-typo-in-panel into lp:ubuntu-ui-toolkit

  1. fix-typo-in-panel
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 726
Merged at revision: 726
Proposed branch: lp:~osomon/ubuntu-ui-toolkit/fix-typo-in-panel
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 23 lines (+3/-3)
1 file modified
modules/Ubuntu/Components/Panel.qml (+3/-3)
To merge this branch: bzr merge lp:~osomon/ubuntu-ui-toolkit/fix-typo-in-panel
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zsombor Egri Approve
Review via email: mp+182884@code.launchpad.net

Commit message

Fix a typo in Panel.qml.

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

PASSED: Continuous integration, rev:726
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/581/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2787
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/438
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/438
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/438/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2793
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2793/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2364

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/581/rebuild

review: Approve (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

thanks for fixing 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/ubuntu-ui-toolkit-autolanding/237/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-autolanding/163
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-autolanding/163/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2797
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2797/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2367

review: Needs Fixing (continuous-integration)
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 'modules/Ubuntu/Components/Panel.qml'
2--- modules/Ubuntu/Components/Panel.qml 2013-08-21 17:06:42 +0000
3+++ modules/Ubuntu/Components/Panel.qml 2013-08-29 11:54:45 +0000
4@@ -299,7 +299,7 @@
5
6 // Used for recovering the state from before
7 // bottomBarVisibilityCommunicator forced the toolbar to hide.
8- property bool savedlocked: panel.locked
9+ property bool savedLocked: panel.locked
10 property bool savedOpened: panel.opened
11
12 // Convert from Qt.AlignLeading to Qt.AlignTrailing to Qt.AlignLeft and Qt.AlignRight
13@@ -335,8 +335,8 @@
14 panel.opened = false;
15 panel.locked = true;
16 } else { // don't force hidden
17- panel.locked = internal.savedlocked;
18- if (internal.savedlocked) panel.opened = internal.savedOpened;
19+ panel.locked = internal.savedLocked;
20+ if (internal.savedLocked) panel.opened = internal.savedOpened;
21 // if the panel was locked, do not slide it back in
22 // until the user performs an edge swipe.
23 }

Subscribers

People subscribed via source and target branches

to status/vote changes: