Ubuntu UI Toolkit

Merge lp://staging/~bzoltan/ubuntu-ui-toolkit/lp1379832 into lp://staging/ubuntu-ui-toolkit

  1. lp1379832
  2. Merge into trunk
Proposed by Zoltan Balogh
Status: Rejected
Rejected by: Tim Peeters
Proposed branch: lp://staging/~bzoltan/ubuntu-ui-toolkit/lp1379832
Merge into: lp://staging/ubuntu-ui-toolkit
Diff against target: 1020 lines (+321/-173)
17 files modified
debian/changelog (+8/-0)
examples/ubuntu-ui-toolkit-gallery/Icons.qml (+3/-2)
examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml (+1/-1)
modules/Ubuntu/Components/ListItems/Empty.qml (+1/-1)
modules/Ubuntu/Components/Popups/Dialog.qml (+40/-37)
modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+4/-2)
modules/Ubuntu/Components/ToolbarItems.qml (+1/-1)
modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp (+35/-50)
modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h (+2/-1)
modules/Ubuntu/Components/plugin/alarmmanager_p.cpp (+5/-0)
modules/Ubuntu/Components/plugin/alarmmanager_p.h (+20/-18)
modules/Ubuntu/Components/plugin/alarmmanager_p_p.h (+2/-0)
modules/Ubuntu/Test/UbuntuTestCase.qml (+23/-22)
tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py (+51/-0)
tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.qml (+70/-0)
tests/unit/tst_alarms/tst_alarms.cpp (+54/-37)
tests/unit/tst_i18n/src/LocalizedApp.qml (+1/-1)
To merge this branch: bzr merge lp://staging/~bzoltan/ubuntu-ui-toolkit/lp1379832
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu SDK team Pending
Review via email: mp+238147@code.staging.launchpad.net

Commit message

Fix width of header contents. Don't add up margins for actionsContainer if it's not there. Fixes LP: #1379832

Description of the change

Fix width of header contents. Don't add up margins for actionsContainer if it's not there. Fixes LP: #1379832

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

FAILED: Continuous integration, rev:1115
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2168/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5867
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4055
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-amd64-ci/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-utopic-armhf-ci/114/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5515
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7119
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7119/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14586
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3421
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4384
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4384/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

This MR also got the changes that we have in staging when merging fix-pagestyle-width, see

http://bazaar.launchpad.net/~bzoltan/ubuntu-ui-toolkit/lp1379832/revision/1114
compare with what the diff should be:
https://code.launchpad.net/~aacid/ubuntu-ui-toolkit/fix-pageheadstyle-width/+merge/238115

Revision history for this message
Tim Peeters (tpeeters) wrote :

correct MR is here: https://code.launchpad.net/~tpeeters/ubuntu-ui-toolkit/fixSearchBoxSize/+merge/238308

Unmerged revisions

1115. By Zoltan Balogh

fix changelog

1114. By Zoltan Balogh

lp:~aacid/ubuntu-ui-toolkit/fix-pageheadstyle-width

1113. By Zoltan Balogh

lp:~tpeeters/ubuntu-ui-toolkit/headFill

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: