Unity 8

Merge lp://staging/~mterry/unity8/unlock-sim-after-wizard into lp://staging/unity8

unlock-sim-after-wizard
Merge into trunk

Proposed by Michael Terry on 2015-03-03

Status:

Merged

Approved by:

Michał Sawicz on 2015-03-11

Approved revision:

1639

Merged at revision:

1666

Proposed branch:

lp://staging/~mterry/unity8/unlock-sim-after-wizard

Merge into:

lp://staging/unity8

Prerequisite:

lp://staging/~dandrader/unity8/unifyShellTests

Diff against target:

113 lines (+34/-6)

4 files modified

qml/Greeter/Greeter.qml (+0/-5)
qml/Shell.qml (+11/-0)
qml/Wizard/Wizard.qml (+6/-1)
tests/qmltests/tst_Shell.qml (+17/-0)

To merge this branch:

bzr merge lp://staging/~mterry/unity8/unlock-sim-after-wizard

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michał Sawicz	functional		Approve on 2015-03-11
Daniel d'Andrada (community)	code	2015-03-03	Approve on 2015-03-11
PS Jenkins bot (community)	continuous-integration	2015-03-03	Needs Fixing on 2015-03-10
Review via email: mp+251612@code.staging.launchpad.net

This proposal supersedes a proposal from 2015-02-25.

Commit message

Only call unlockAllModems once the wizard is done. (LP: #1425161)

Description of the change

Only call unlockAllModems once the wizard is done. (LP: #1425161)

This is only a problem in vivid because in RTM, the shell isn't running when the wizard is.

I never noticed this when testing because I'm a silly American.

== Checklist ==

* Are there any related MPs required for this MP to build/function as expected? Please list.
No

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
NA

* If you changed the UI, has there been a design review?
NA

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-25: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5362/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2015-03-03: Posted in a previous version of this proposal

Would you mind rebasing it on top of lp:~dandrader/unity8/unifyShellTests?

With unifyShellTests, tests functions have to load the shell explicitly using the loadShell(form-factor) helper function, which will be useful for your new test.

Besides, the two conflict anyway, so either of the MPs would have to do that in any case.

Revision history for this message

Michael Terry (mterry) wrote on 2015-03-03:

OK, rebased on unifyShellTests.

Revision history for this message

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5384/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2015-03-03:

"""
62 - readonly property alias active: loader.active
63 + readonly property bool active: loader.active
"""

Why is that needed?

review: Needs Information

Revision history for this message

Michael Terry (mterry) wrote on 2015-03-03:

> Why is that needed?

Because the loader's active property was emitting a changed signal during object creation as an alias. Having it cached as a property made it only emit a changed signal when it actually did change.

I figured it was some quirk of qml that I didn't understand. But it seemed like a harmless enough change.

lp://staging/~mterry/unity8/unlock-sim-after-wizard updated on 2015-03-10

1638. By Michael Terry on 2015-03-10: Merge from unifyShellTests

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-10:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5407/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2015-03-11:

> > Why is that needed?
>
> Because the loader's active property was emitting a changed signal during
> object creation as an alias. Having it cached as a property made it only emit
> a changed signal when it actually did change.
>
> I figured it was some quirk of qml that I didn't understand. But it seemed
> like a harmless enough change.

That's really odd. Certainly deserves a comment in the code. Specially if your code will misbehave in case it's changed to an alias back again.

lp://staging/~mterry/unity8/unlock-sim-after-wizard updated on 2015-03-11