Merge lp://staging/~tpeeters/ubuntu-ui-toolkit/70-headerContents into lp://staging/ubuntu-ui-toolkit/staging
Proposed by
Tim Peeters
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Tim Peeters | ||||
Approved revision: | 1045 | ||||
Merged at revision: | 1043 | ||||
Proposed branch: | lp://staging/~tpeeters/ubuntu-ui-toolkit/70-headerContents | ||||
Merge into: | lp://staging/ubuntu-ui-toolkit/staging | ||||
Prerequisite: | lp://staging/~tpeeters/ubuntu-ui-toolkit/60-back-override | ||||
Diff against target: |
184 lines (+101/-5) 6 files modified
components.api (+1/-0) modules/Ubuntu/Components/Header.qml (+0/-3) modules/Ubuntu/Components/MainView.qml (+3/-0) modules/Ubuntu/Components/Page.qml (+7/-0) modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml (+24/-2) tests/resources/toolbar/headerTextInput.qml (+66/-0) |
||||
To merge this branch: | bzr merge lp://staging/~tpeeters/ubuntu-ui-toolkit/70-headerContents | ||||
Related bugs: |
|
||||
Related blueprints: |
New header and bottom edge
(Essential)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Ubuntu SDK team | Pending | ||
Review via email: mp+218436@code.staging.launchpad.net |
Description of the change
Make it possible to replace the title in the header with a custom Item.
To post a comment you must log in.
PASSED: Continuous integration, rev:1039 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/172/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/24 jenkins. qa.ubuntu. com/job/ generic- mediumtests- utopic/ 17 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- amd64-ci/ 4 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- armhf-ci/ 4 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- armhf-ci/ 4/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- utopic- i386-ci/ 4 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/535 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/102 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/102/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 6820 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-utopic/ 18 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/33 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/33/ artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/172/ rebuild
http://