Ubuntu UI Toolkit

Merge lp://qastaging/~gcollura/ubuntu-ui-toolkit/fix-1341814-and-1400297 into lp://qastaging/ubuntu-ui-toolkit/staging

fix-1341814-and-1400297
Merge into staging

Proposed by Giulio Collura on 2015-01-05

Status:

Superseded

Proposed branch:

lp://qastaging/~gcollura/ubuntu-ui-toolkit/fix-1341814-and-1400297

Merge into:

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

Diff against target:

1081 lines (+161/-142)

55 files modified

examples/ubuntu-ui-toolkit-gallery/po/es.po (+1/-1)
modules/Ubuntu/Components/PageHeadConfiguration.qml (+11/-0)
po/am.po (+2/-2)
po/ar.po (+2/-2)
po/ast.po (+2/-2)
po/az.po (+2/-2)
po/be.po (+2/-2)
po/bs.po (+2/-2)
po/ca.po (+3/-3)
po/ca@valencia.po (+2/-2)
po/ce.po (+2/-2)
po/cs.po (+2/-2)
po/da.po (+2/-2)
po/de.po (+2/-2)
po/el.po (+2/-2)
po/en_AU.po (+2/-2)
po/en_GB.po (+2/-2)
po/es.po (+1/-1)
po/eu.po (+2/-2)
po/fa.po (+1/-1)
po/fi.po (+2/-2)
po/fr.po (+4/-4)
po/fr_CA.po (+2/-2)
po/ga.po (+23/-16)
po/gd.po (+2/-2)
po/gl.po (+4/-4)
po/he.po (+2/-2)
po/hr.po (+2/-2)
po/hu.po (+2/-2)
po/id.po (+2/-2)
po/it.po (+2/-2)
po/ja.po (+2/-2)
po/km.po (+2/-2)
po/kn.po (+2/-2)
po/ko.po (+4/-4)
po/lv.po (+2/-2)
po/ms.po (+2/-2)
po/my.po (+2/-2)
po/nb.po (+4/-4)
po/nl.po (+2/-2)
po/oc.po (+2/-2)
po/pa.po (+2/-2)
po/pl.po (+2/-2)
po/pt.po (+4/-4)
po/pt_BR.po (+2/-2)
po/ro.po (+2/-2)
po/ru.po (+2/-2)
po/sq.po (+2/-2)
po/sr.po (+2/-2)
po/sv.po (+2/-2)
po/tr.po (+12/-11)
po/ug.po (+3/-3)
po/uk.po (+4/-4)
po/zh_CN.po (+2/-2)
po/zh_TW.po (+2/-2)

To merge this branch:

bzr merge lp://qastaging/~gcollura/ubuntu-ui-toolkit/fix-1341814-and-1400297

Related bugs:

Bug #1341814: Using search in the header can sometimes have a text field from a different tab	High	Fix Released
Bug #1400297: PageHeadState doens't correctly update head.contents	Undecided	Fix Released

Link a bug report

Reviewer	Date Requested	Status
Zoltan Balogh	2015-01-05	Pending
Riccardo Padovani	2015-01-05	Pending
Review via email: mp+245552@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-12-29.

This proposal has been superseded by a proposal from 2015-01-06.

Description of the change

This is a bugfix for bug #1341814 and bug #1400297. Essentially we have to force the removal of the previous 'contents' item by removing its parent. This way we ensure that the contents are correctly hidden, focused and removed, without destroying them.

Revision history for this message

Riccardo Padovani (rpadovani) wrote on 2014-12-29: Posted in a previous version of this proposal

Tested on desktop on vivid, it fixes both bugs.

Thanks Giulio!

review: Approve

Revision history for this message

Zoltan Balogh (bzoltan) wrote on 2015-01-05: Posted in a previous version of this proposal

Would you please target this MR to the staging branch? (lp:ubuntu-ui-toolkit/staging)

review: Needs Fixing

Revision history for this message

Tim Peeters (tpeeters) wrote on 2015-01-06:

Thanks a lot for the fix! Can you please rebase this with staging so that the changes from trunk don't show up in the diff?

Also,

29 + __oldContents.parent = null

add a semicolon at the end of that line, to use a consistent coding standard.

Revision history for this message

Tim Peeters (tpeeters) wrote on 2015-01-06:

21 + property Item __oldContents: null

Instead of that, I propose to introduce:

QtObject {
id: internal
property Item oldContents: null
}

and then use internal.oldContents instead of __oldContents in onContentsChanged. That way you really prevent developers using PageHeadStyle from accessing __oldContents.