Unity 8

Merge lp:~mhr3/unity8/scopes-send-form-factor into lp:unity8

  1. scopes-send-form-factor
  2. Merge into trunk
Proposed by Michal Hruby
Status: Merged
Approved by: Michał Sawicz
Approved revision: 168
Merged at revision: 179
Proposed branch: lp:~mhr3/unity8/scopes-send-form-factor
Merge into: lp:unity8
Diff against target: 36 lines (+5/-3)
2 files modified
Dash/ScopeView.qml (+2/-1)
plugins/Unity/scope.cpp (+3/-2)
To merge this branch: bzr merge lp:~mhr3/unity8/scopes-send-form-factor
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+178576@code.launchpad.net

Commit message

Set phone form factor for scope requests.

Description of the change

Set phone form factor for scope requests. (hardcoded to "phone" since there's no dynamic way to determine the form factor for now)

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

PASSED: Continuous integration, rev:164
http://jenkins.qa.ubuntu.com/job/unity8-ci/493/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1885
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/914
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/494
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/494/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/493
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1890
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1890/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1609

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

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
Michał Sawicz (saviq) wrote :

Actually... After a short discussion:

* drop the Binding
* just initialise formFactor to "phone" in Scope c'tor
* re-search onFormFactorChanged

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

FAILED: Continuous integration, rev:167
http://jenkins.qa.ubuntu.com/job/unity8-ci/528/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1976
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/955
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/529
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/529/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/528
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1981
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1981/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1692

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

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

FAILED: Continuous integration, rev:167
http://jenkins.qa.ubuntu.com/job/unity8-ci/544/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2007
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/971/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/545
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/545/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/544
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2012
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2012/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1716

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

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

FAILED: Continuous integration, rev:167
http://jenkins.qa.ubuntu.com/job/unity8-ci/556/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2046
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/991
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/557
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/557/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/556
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2051
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2051/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1744

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

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

FAILED: Continuous integration, rev:167
http://jenkins.qa.ubuntu.com/job/unity8-ci/559/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2051
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/994
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/560
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/560/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/559
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2056
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2056/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1749

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

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

PASSED: Continuous integration, rev:168
http://jenkins.qa.ubuntu.com/job/unity8-ci/562/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2056
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/998
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/563
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/563/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/562
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2061
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2061/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1754

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

review: Approve (continuous-integration)
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/unity8-autolanding/178/
Executed test runs:
    None: http://s-jenkins:8080/job/generic-cleanup-mbs/1335/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2064
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1002
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/177
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/177/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2069
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2069/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1761

review: Needs Fixing (continuous-integration)
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/unity8-autolanding/179/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1336
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2070
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1004/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/178
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2075
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2075/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1766

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 'Dash/ScopeView.qml'
2--- Dash/ScopeView.qml 2013-06-12 12:52:35 +0000
3+++ Dash/ScopeView.qml 2013-08-09 09:29:16 +0000
4@@ -28,7 +28,8 @@
5 signal movementStarted
6 signal positionedAtBeginning
7
8- // FIXME delay the search so that daemons have time to settle
9+ // FIXME delay the search so that daemons have time to settle, note that
10+ // removing this will break ScopeView::test_changeScope
11 onScopeChanged: timer.restart()
12
13 Timer {
14
15=== modified file 'plugins/Unity/scope.cpp'
16--- plugins/Unity/scope.cpp 2013-07-04 11:26:17 +0000
17+++ plugins/Unity/scope.cpp 2013-08-09 09:29:16 +0000
18@@ -36,8 +36,8 @@
19
20 #include <libintl.h>
21
22-Scope::Scope(QObject *parent) :
23- QObject(parent)
24+Scope::Scope(QObject *parent) : QObject(parent)
25+ , m_formFactor("phone")
26 {
27 m_categories.reset(new Categories(this));
28 }
29@@ -128,6 +128,7 @@
30 m_formFactor = form_factor;
31 if (m_unityScope) {
32 m_unityScope->form_factor = m_formFactor.toStdString();
33+ synchronizeStates(); // will trigger a re-search
34 }
35 Q_EMIT formFactorChanged();
36 }

Subscribers

People subscribed via source and target branches