Ubuntu UI Toolkit

Merge lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader into lp://staging/ubuntu-ui-toolkit

optIn-newHeader
Merge into trunk

Proposed by Tim Peeters on 2014-02-27

Status:

Merged

Approved by:

Zsombor Egri on 2014-03-27

Approved revision:

949

Merged at revision:

988

Proposed branch:

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader

Merge into:

lp://staging/ubuntu-ui-toolkit

Diff against target:

304 lines (+45/-83)

5 files modified

components.api (+1/-0)
modules/Ubuntu/Components/MainView.qml (+42/-16)
modules/Ubuntu/Components/Toolbar.qml (+1/-1)
tests/unit/tst_components/tst_toolbaritems.qml (+1/-2)
tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml (+0/-64)

To merge this branch:

bzr merge lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader

Related bugs:

Bug #1273184: Remove toolbar

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-03-26
Zsombor Egri		2014-02-27	Approve on 2014-03-10
Review via email: mp+208662@code.staging.launchpad.net

Commit message

Add useDeprecatedToolbar property to MainView which can be used to disable the current toolbar. Unsetting that property will in future also enable new features in the header.

Description of the change

Add bool to MainView to disable the old toolbar and use the new header functionality when it is done. Also add a position property to the Panel to make it more useful for implementing new bottom-edge behavior.

We need this so that app developers can disable the toolbar and implement their own new bottom-edge behavior, see http://design.canonical.com/2014/03/loving-the-bottom-edge/

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-02-27:

Check out https://code.launchpad.net/~tpeeters/+junk/vscale to see an example of how the Panel can be used.

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-02-27

924. By Tim Peeters on 2014-02-27: update components.api

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-27:

FAILED: Continuous integration, rev:923
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1803/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3566/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3177/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/751/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/751/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3570/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3179/console

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

review: Needs Fixing (continuous-integration)

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-02-27

925. By Tim Peeters on 2014-02-27: rename useOldToolbar to useDeprecatedToolbar
926. By Tim Peeters on 2014-02-27: only load toolbar when it is used
927. By Tim Peeters on 2014-02-27: update components.api
928. By Tim Peeters on 2014-02-27: toolbar always visible when loaded

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-27:

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-27:

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

review: Needs Fixing (continuous-integration)

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-02-28

929. By Tim Peeters on 2014-02-28: remove initialization test that was only correct by luck/good timing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-28:

FAILED: Continuous integration, rev:929
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1808/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3586
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3199/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/756
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/756
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/756/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3590
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3590/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3201
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3201/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5583/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4380

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

review: Needs Fixing (continuous-integration)

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-02-28

930. By Tim Peeters on 2014-02-28: empty

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-28:

FAILED: Continuous integration, rev:930
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1813/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3606
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3217/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/761
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/761
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/761/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3610
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3610/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3219
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3219/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5598/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4402

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

review: Needs Fixing (continuous-integration)

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-04

931. By Tim Peeters on 2014-03-04: merge trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-04:

FAILED: Continuous integration, rev:931
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1825/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3643
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3248/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/773
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/773
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/773/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3647
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3647/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3250
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3250/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5626/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4444

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

review: Needs Fixing (continuous-integration)

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-04

932. By Tim Peeters on 2014-03-04: huh? Why did jenkisn fail?

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-04:

FAILED: Continuous integration, rev:932
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1828/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3653
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3258/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/776
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/776
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/776/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3212
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3657
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3657/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3260
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3260/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5634/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4454

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

review: Needs Fixing (continuous-integration)

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-04

933. By Tim Peeters on 2014-03-04: stop Loader from eating events

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-04:

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

review: Needs Fixing (continuous-integration)

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-06

934. By Tim Peeters on 2014-03-06: fix typo in Toolbar.qml comment
935. By Tim Peeters on 2014-03-06: fix parentage of toolbar
936. By Tim Peeters on 2014-03-06: merge trunk
937. By Tim Peeters on 2014-03-06: fix typo properly

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-06:

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-06:

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

review: Approve (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-03-06:

Some failures in CI@home for unity8 and system settings: http://paste.ubuntu.com/7044989/
There is a bug in unity8 with qt5 that can cause these. Should be fixed with qt5.2.

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-09

938. By Tim Peeters on 2014-03-09: link bug
939. By Tim Peeters on 2014-03-09: merge trunk (translations only)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-09:

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

review: Approve (continuous-integration)

Revision history for this message

Zsombor Egri (zsombi) wrote on 2014-03-10:

Things look good.

review: Approve

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-14

940. By Tim Peeters on 2014-03-14: merge trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-14:

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

review: Needs Fixing (continuous-integration)

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-17

941. By Tim Peeters on 2014-03-17: merge trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

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

review: Needs Fixing (continuous-integration)

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-17

942. By Tim Peeters on 2014-03-17: merge trunk
943. By Tim Peeters on 2014-03-17: merge ima-bug1288876. See if jenkins CI passes now.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17:

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

review: Approve (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-03-17:

CI@home results:
- Several failures in music-app
- Several failures in ubuntu-clock-app
- Several failures in dialer-app: StateNotFoundError: Object not found with name '*' and properties {'objectName': 'historyList'}. (phone didn't have sim-card while testing)
- One error in unity8: unity8.indicators.tests.test_indicators.IndicatorTestCase.test_indicator_exists(Bluetooth) (phone has bluetooth disabled)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-03-17:

CI@home full results: http://paste.ubuntu.com/7111217/

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-18

944. By Tim Peeters on 2014-03-18: revert ima-bug1288876 merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

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

review: Needs Fixing (continuous-integration)

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-18

945. By Tim Peeters on 2014-03-18: retry

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-03-18:

previous CI failed because device screen unlock failed because the device was not 'clean' (left-over installed packages from another MR were there).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

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

review: Needs Fixing (continuous-integration)

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-18

946. By Tim Peeters on 2014-03-18: CI jobs fixed. retry

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

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

review: Approve (continuous-integration)

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-24

947. By Tim Peeters on 2014-03-24: merge trunk
948. By Tim Peeters on 2014-03-24: re-adding InverseMouseAreaInListView.qml which got lost in the previous trunk merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-24:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-24:

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

review: Approve (continuous-integration)

lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-26

949. By Tim Peeters on 2014-03-26: merge translations from trunk

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-03-26:

I don't know why the diff lists
237 === removed file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml'
238 --- tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml 2014-03-20 15:30:06 +0000
239 +++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml 1970-01-01 00:00:00 +0000

and

168 === added file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml'
169 --- tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml 1970-01-01 00:00:00 +0000
170 +++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml 2014-03-26 17:43:24 +0000