Unity

Merge lp:~unity-team/unity/8.narrowMode into lp:unity/8.0

  1. 8.narrowMode
  2. Merge into 8.0
Proposed by Michał Sawicz
Status: Merged
Approved by: Michael Zanetti
Approved revision: no longer in the source branch.
Merged at revision: 7
Proposed branch: lp:~unity-team/unity/8.narrowMode
Merge into: lp:unity/8.0
Diff against target: 14 lines (+3/-1)
1 file modified
Greeter/GreeterContent.qml (+3/-1)
To merge this branch: bzr merge lp:~unity-team/unity/8.narrowMode
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michael Zanetti (community) Approve
Review via email: mp+167738@code.launchpad.net

This proposal supersedes a proposal from 2013-06-05.

Commit message

Show login list when not in narrow mode, instead of only when we have multiple users.

Description of the change

Show login list when not in narrow mode, instead of only when we have multiple users. This basically means that if the screen becomes big enough, we'll show login list.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:735
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1155/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/21
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1901/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1155/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote : Posted in a previous version of this proposal

As we all agree this is a intermediate solution it might classify for a //TODO or //FIXME to keep it in the radar whenever grepping for such stuff.

Revision history for this message
Michael Terry (mterry) wrote : Posted in a previous version of this proposal

Updated with a comment.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:736
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1164/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/1196/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1911

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1164/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:736
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/1165/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/1197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-saucy-i386-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1912

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/1165/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:4
http://jenkins.qa.ubuntu.com/job/unity-8.0-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests/1205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1923

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-8.0-ci/5/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Michael Zanetti (mzanetti) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-8.0-autolanding/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-autolanding/3
        deb: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-armhf-autolanding/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-8.0-saucy-i386-autolanding/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests/1230
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1997/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Greeter/GreeterContent.qml'
2--- Greeter/GreeterContent.qml 2013-06-05 22:03:08 +0000
3+++ Greeter/GreeterContent.qml 2013-06-06 11:11:25 +0000
4@@ -73,7 +73,9 @@
5 width: units.gu(29)
6 height: parent.height
7
8- source: greeter.multiUser ? "LoginList.qml" : ""
9+ // TODO: Once we have a system API for determining which mode we are
10+ // in, tablet/phone/desktop, that should be used instead of narrowMode.
11+ source: greeter.narrowMode ? "" : "LoginList.qml"
12
13 onLoaded: {
14 item.currentIndex = greeterContentLoader.currentIndex

Subscribers

People subscribed via source and target branches

to all changes: