Ubuntu UI Toolkit

Merge lp://qastaging/~tpeeters/ubuntu-ui-toolkit/pageHead-sectionsIndex into lp://qastaging/ubuntu-ui-toolkit/staging

pageHead-sectionsIndex
Merge into staging

Proposed by Tim Peeters on 2015-12-07

Status:

Merged

Approved by:

Cris Dywan on 2015-12-10

Approved revision:

1753

Merged at revision:

1751

Proposed branch:

lp://qastaging/~tpeeters/ubuntu-ui-toolkit/pageHead-sectionsIndex

Merge into:

lp://qastaging/ubuntu-ui-toolkit/staging

Diff against target:

287 lines (+163/-10)

7 files modified

src/Ubuntu/Components/1.3/Sections.qml (+38/-5)
src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml (+1/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsForPageHead.qml (+46/-0)
src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro (+1/-0)
src/Ubuntu/Components/Themes/Ambiance/qmldir (+1/-0)
tests/unit_x11/tst_components/tst_pagehead_sections.qml (+8/-2)
tests/unit_x11/tst_components/tst_sections.qml (+68/-2)

To merge this branch:

bzr merge lp://qastaging/~tpeeters/ubuntu-ui-toolkit/pageHead-sectionsIndex

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Cris Dywan		2015-12-07	Approve on 2015-12-10
PS Jenkins bot	continuous-integration		Approve on 2015-12-09
Review via email: mp+279834@code.qastaging.launchpad.net

Commit message

To prevent an invalid sectionIndex, reset the value of sectionIndex to -1 when the model of Sections is changed.

Revision history for this message

Tim Peeters (tpeeters) wrote on 2015-12-07:

Here https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1511839 it is requested NOT to change the sectionIndex when it was -1. This MR would break that, so we need a more complex solution.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-12-07:

FAILED: Continuous integration, rev:1744
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2575/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1303
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1305
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1305/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1302

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2575/rebuild

review: Needs Fixing (continuous-integration)

lp://qastaging/~tpeeters/ubuntu-ui-toolkit/pageHead-sectionsIndex updated on 2015-12-08

1746. By Tim Peeters on 2015-12-08: documentation

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-12-08:

FAILED: Continuous integration, rev:1746
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2579/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1307
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1309
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1309/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1306

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2579/rebuild

review: Needs Fixing (continuous-integration)

lp://qastaging/~tpeeters/ubuntu-ui-toolkit/pageHead-sectionsIndex updated on 2015-12-08

1747. By Tim Peeters on 2015-12-08: update unit test
1748. By Tim Peeters on 2015-12-08: clean

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-12-08:

PASSED: Continuous integration, rev:1747
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2581/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1309
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1311
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1311/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1308

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2581/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-12-08:

PASSED: Continuous integration, rev:1748
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2583/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1311
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1313
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1313/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1310

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2583/rebuild

review: Approve (continuous-integration)

lp://qastaging/~tpeeters/ubuntu-ui-toolkit/pageHead-sectionsIndex updated on 2015-12-08

1749. By Tim Peeters on 2015-12-08: select index 0 by default, and trigger selected action.
1750. By Tim Peeters on 2015-12-08: deal with invalid model
1751. By Tim Peeters on 2015-12-08: don't regress bug 1511839

Revision history for this message

Tim Peeters (tpeeters) wrote on 2015-12-08:

Automatically setting the index when the model changes regresses bug 1511839. To work around that, I use the older copy of Sections inside the AppHeader that is configured using Page.head.sections. That means to get the automatic updates to selectedIndex when changing the model, the app must update to use the new PageHeader instead of the old Page.head.sections. See also comment #4 on bug 1513933.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-12-08:

FAILED: Continuous integration, rev:1749
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2589/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1317
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1319/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1316

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2589/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-12-08:

FAILED: Continuous integration, rev:1751
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2590/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1318
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1320/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1317

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2590/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Cris Dywan (kalikiana) wrote on 2015-12-09:

> Automatically setting the index when the model changes regresses bug 1511839.
> To work around that, I use the older copy of Sections inside the AppHeader
> that is configured using Page.head.sections. That means to get the automatic
> updates to selectedIndex when changing the model, the app must update to use
> the new PageHeader instead of the old Page.head.sections. See also comment #4
> on bug 1513933.

Will setting -1 be explicitly supported with PageHeader then? I feel having different behavior between these might be both hard to support and use..

review: Needs Information

lp://qastaging/~tpeeters/ubuntu-ui-toolkit/pageHead-sectionsIndex updated on 2015-12-09

1752. By Tim Peeters on 2015-12-09: kick jenkins

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-12-09:

FAILED: Continuous integration, rev:1752
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2591/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1319
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1321/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1318

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2591/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2015-12-09:

To summarize: The desired behavior is implemented in Sections (and can be used in the new PageTreeNode), and if you use Page.head.sections, you still get the old behavior because changing that would break the fix for this bug: https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1511839

I discussed this with Zsombor and Christian and we agree that this is the best solution. Apps will have to update to use the new PageHeader if they require the new automatic behavior.

lp://qastaging/~tpeeters/ubuntu-ui-toolkit/pageHead-sectionsIndex updated on 2015-12-09