QtMir

Merge lp:~nick-dedekind/qtmir/side-stage-redesign into lp:qtmir

  1. side-stage-redesign
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Merged
Approved by: Daniel d'Andrada
Approved revision: 432
Merged at revision: 463
Proposed branch: lp:~nick-dedekind/qtmir/side-stage-redesign
Merge into: lp:qtmir
Prerequisite: lp:~mzanetti/qtmir/surfacemanager-getters
Diff against target: 489 lines (+50/-64) (has conflicts)
9 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+10/-0)
debian/control (+2/-2)
src/modules/Unity/Application/application.cpp (+2/-1)
src/modules/Unity/Application/application.h (+1/-3)
src/modules/Unity/Application/application_manager.cpp (+3/-14)
src/modules/Unity/Application/application_manager.h (+1/-11)
tests/framework/qtmir_test.cpp (+1/-1)
tests/modules/ApplicationManager/application_manager_test.cpp (+29/-31)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~nick-dedekind/qtmir/side-stage-redesign
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) Needs Fixing
Daniel d'Andrada (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity8 CI Bot (community) continuous-integration Needs Fixing
Review via email: mp+286191@code.launchpad.net

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

Commit message

Added setStage for sidestage redesign and removed ExecFlags

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~nick-dedekind/unity-api/side-stage-redesign/+merge/279308
https://code.launchpad.net/~nick-dedekind/unity8/side-stage-redesign/+merge/281522

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

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

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:425
http://jenkins.qa.ubuntu.com/job/qtmir-ci/624/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/318/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/320/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/200/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/355/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/357/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/200/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal

Please write a proper commit message and don't forget https://wiki.ubuntu.com/Process/Merges/Checklists/QtMir

Revision history for this message
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal

In src/modules/Unity/Application/application.cpp it seems you moved Application::setStage implementation around unnecessarily, polluting the diff and bzr history.

review: Needs Fixing
Revision history for this message
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal

You probably forgot to mention a unity-api branch that goes along with this one.

review: Needs Information
Revision history for this message
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal

Nice that we are getting rid of that ApplicationManager flag.

Revision history for this message
Gerry Boland (gerboland) wrote : Posted in a previous version of this proposal

Could reduce the diff by un-moving "Application::setStage"

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:425
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/4/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/4/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Nick Dedekind (nick-dedekind) wrote : Posted in a previous version of this proposal

> In src/modules/Unity/Application/application.cpp it seems you moved
> Application::setStage implementation around unnecessarily, polluting the diff
> and bzr history.

unmoved.

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:427
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/18/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/18/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

FAILED: Continuous integration, rev:427
http://jenkins.qa.ubuntu.com/job/qtmir-ci/642/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/336/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/338/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/218/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/373/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/375/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/218/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal

Code changes look ok. Didn't test yet.

review: Approve (code)
Revision history for this message
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal

Actually, you should bump unity-shell-application in CMakeLists.txt and unity-application-impl-12 in debian/control

review: Needs Fixing
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:428
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/66/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/468/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/491
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/509
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/509
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/505/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/505/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/505/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/505/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/505/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/505/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/66/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

FAILED: Continuous integration, rev:428
http://jenkins.qa.ubuntu.com/job/qtmir-ci/687/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/381/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/383/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/263/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/418/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/420/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/263/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:428
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/67/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/471/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/494
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/512
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/512
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/508/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/508/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/508/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/508/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/508/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/508/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/67/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:429
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/69/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/477/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/500
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/517
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/517
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/513/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/513/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/513/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/513/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/513/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/513/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/69/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

FAILED: Continuous integration, rev:429
http://jenkins.qa.ubuntu.com/job/qtmir-ci/689/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/383/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/385/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/265/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/420/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/422/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/265/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/689/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

FAILED: Continuous integration, rev:430
http://jenkins.qa.ubuntu.com/job/qtmir-ci/694/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/388/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/390/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/270/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/425/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/427/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/270/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:430
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/74/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/500/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/523/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/541/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/541/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/537/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/537/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/537/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/537/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/537/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/537/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/74/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

FAILED: Continuous integration, rev:431
http://jenkins.qa.ubuntu.com/job/qtmir-ci/695/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/389/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/391/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/271/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/426/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/428/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/271/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:431
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/75/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/505/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/528/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/546/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/546/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/542/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/542/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/542/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/542/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/542/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/542/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/75/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:432
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/76/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/512/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/535
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/553
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/553
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/549/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/549/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/549/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/549/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/549/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/549/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/76/rebuild

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

FAILED: Continuous integration, rev:432
http://jenkins.qa.ubuntu.com/job/qtmir-ci/696/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/390/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/392/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/272/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/427/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/429/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/272/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Looks like some bitrotting happened overtime.

- run "make tryTabletStage"
- launch a bunch of apps
- go to spread
- tap on an application

during the animation to bring the selected application to foreground, the other apps in the spread are kept in front of that selected one (Z ordering issue).

------------------------

Some miscellaneous clean up (revisions 2217 to 2221):
lp:~dandrader/unity8/side-stage-redesign

review: Needs Fixing
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

> Looks like some bitrotting happened overtime.
>
> - run "make tryTabletStage"
> - launch a bunch of apps
> - go to spread
> - tap on an application
>
> during the animation to bring the selected application to foreground, the
> other apps in the spread are kept in front of that selected one (Z ordering
> issue).
>
> ------------------------
>
> Some miscellaneous clean up (revisions 2217 to 2221):
> lp:~dandrader/unity8/side-stage-redesign

Sorry, that was meant for the unity8 branch. This one is fine.

review: Approve
lp:~nick-dedekind/qtmir/side-stage-redesign updated
433. By Nick Dedekind

version bump

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Text conflict in debian/changelog

Needs merging trunk and resubmitting imo

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-02-12 00:07:20 +0000
3+++ CMakeLists.txt 2016-03-11 12:52:16 +0000
4@@ -75,7 +75,7 @@
5 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
6 pkg_check_modules(QTDBUSTEST libqtdbustest-1 REQUIRED)
7 pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED)
8-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=13)
9+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=14)
10
11 include_directories(${APPLICATION_API_INCLUDE_DIRS})
12
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2016-02-19 10:41:19 +0000
16+++ debian/changelog 2016-03-11 12:52:16 +0000
17@@ -1,9 +1,19 @@
18+<<<<<<< TREE
19 qtmir (0.4.7+16.04.20160219-0ubuntu1) xenial; urgency=medium
20
21 * Mir 0.20 Release
22
23 -- Alan Griffiths <ci-train-bot@canonical.com> Fri, 19 Feb 2016 10:41:19 +0000
24
25+=======
26+qtmir (0.4.8-0ubuntu1) UNRELEASED; urgency=medium
27+
28+ [ Nick Dedekind ]
29+ * Added Application::setStage
30+
31+ -- Nick Dedekind <nick.dedekind@canonical.com> Thu, 03 Dec 2015 09:05:41 +0000
32+
33+>>>>>>> MERGE-SOURCE
34 qtmir (0.4.7+16.04.20160212-0ubuntu1) xenial; urgency=medium
35
36 [ Albert Astals Cid ]
37
38=== modified file 'debian/control'
39--- debian/control 2016-02-03 16:40:09 +0000
40+++ debian/control 2016-03-11 12:52:16 +0000
41@@ -22,7 +22,7 @@
42 libubuntu-app-launch2-dev,
43 libubuntu-application-api-dev (>= 2.1.0),
44 libudev-dev,
45- libunity-api-dev (>= 7.106),
46+ libunity-api-dev (>= 7.108),
47 liburl-dispatcher1-dev,
48 libxkbcommon-dev,
49 libxrender-dev,
50@@ -93,7 +93,7 @@
51 Conflicts: libqtmir,
52 libunity-mir1,
53 Provides: unity-application-impl,
54- unity-application-impl-13,
55+ unity-application-impl-14,
56 Description: Qt plugin for Unity specific Mir APIs
57 QtMir provides Qt/QML bindings for Mir features that are exposed through the
58 qtmir-desktop or qtmir-android QPA plugin such as Application management
59
60=== modified file 'src/modules/Unity/Application/application.cpp'
61--- src/modules/Unity/Application/application.cpp 2016-02-12 00:07:09 +0000
62+++ src/modules/Unity/Application/application.cpp 2016-03-11 12:52:16 +0000
63@@ -46,6 +46,7 @@
64 , m_desktopData(desktopFileReader)
65 , m_pid(0)
66 , m_stage((desktopFileReader->stageHint() == "SideStage") ? Application::SideStage : Application::MainStage)
67+ , m_supportedStages(Application::MainStage|Application::SideStage)
68 , m_state(InternalState::Starting)
69 , m_focused(false)
70 , m_arguments(arguments)
71@@ -513,7 +514,7 @@
72 qCDebug(QTMIR_APPLICATIONS) << "Application::setStage - appId=" << appId() << "stage=" << stage;
73
74 if (m_stage != stage) {
75- if (stage | m_supportedStages) {
76+ if ((stage | m_supportedStages) == 0) {
77 return;
78 }
79
80
81=== modified file 'src/modules/Unity/Application/application.h'
82--- src/modules/Unity/Application/application.h 2016-02-11 11:54:59 +0000
83+++ src/modules/Unity/Application/application.h 2016-03-11 12:52:16 +0000
84@@ -52,7 +52,6 @@
85 Q_PROPERTY(QString desktopFile READ desktopFile CONSTANT)
86 Q_PROPERTY(QString exec READ exec CONSTANT)
87 Q_PROPERTY(bool fullscreen READ fullscreen NOTIFY fullscreenChanged)
88- Q_PROPERTY(Stage stage READ stage WRITE setStage NOTIFY stageChanged)
89 Q_PROPERTY(SessionInterface* session READ session NOTIFY sessionChanged DESIGNABLE false)
90
91 public:
92@@ -93,6 +92,7 @@
93 QString comment() const override;
94 QUrl icon() const override;
95 Stage stage() const override;
96+ void setStage(Stage stage) override;
97 State state() const override;
98 RequestedState requestedState() const override;
99 void setRequestedState(RequestedState) override;
100@@ -111,8 +111,6 @@
101 QSize initialSurfaceSize() const override;
102 void setInitialSurfaceSize(const QSize &size) override;
103
104- void setStage(Stage stage);
105-
106 ProcessState processState() const { return m_processState; }
107 void setProcessState(ProcessState value);
108
109
110=== modified file 'src/modules/Unity/Application/application_manager.cpp'
111--- src/modules/Unity/Application/application_manager.cpp 2016-02-11 11:54:59 +0000
112+++ src/modules/Unity/Application/application_manager.cpp 2016-03-11 12:52:16 +0000
113@@ -337,13 +337,7 @@
114 * @param arguments Command line arguments to pass to the application to be launched
115 * @return Pointer to Application object representing the launched process. If process already running, return nullptr
116 */
117-Application* ApplicationManager::startApplication(const QString &appId,
118- const QStringList &arguments)
119-{
120- return startApplication(appId, NoFlag, arguments);
121-}
122-
123-Application *ApplicationManager::startApplication(const QString &inputAppId, ExecFlags flags,
124+Application* ApplicationManager::startApplication(const QString &inputAppId,
125 const QStringList &arguments)
126 {
127 tracepoint(qtmir, startApplication);
128@@ -364,10 +358,10 @@
129 if (application) {
130 m_queuedStartApplications.append(inputAppId);
131 qWarning() << "ApplicationManager::startApplication - application appId=" << appId << " is closing. Queuing start";
132- connect(application, &QObject::destroyed, this, [this, application, inputAppId, flags, arguments]() {
133+ connect(application, &QObject::destroyed, this, [this, application, inputAppId, arguments]() {
134 m_queuedStartApplications.removeAll(inputAppId);
135 // start the app.
136- startApplication(inputAppId, flags, arguments);
137+ startApplication(inputAppId, arguments);
138 }, Qt::QueuedConnection); // Queued so that we finish the app removal before starting again.
139 return nullptr;
140 }
141@@ -394,11 +388,6 @@
142 return nullptr;
143 }
144
145- // override stage if necessary
146- if (application->stage() == Application::SideStage && flags.testFlag(ApplicationManager::ForceMainStage)) {
147- application->setStage(Application::MainStage);
148- }
149-
150 add(application);
151 }
152 return application;
153
154=== modified file 'src/modules/Unity/Application/application_manager.h'
155--- src/modules/Unity/Application/application_manager.h 2016-02-11 11:54:59 +0000
156+++ src/modules/Unity/Application/application_manager.h 2016-03-11 12:52:16 +0000
157@@ -54,7 +54,6 @@
158 {
159 Q_OBJECT
160 Q_ENUMS(MoreRoles)
161- Q_FLAGS(ExecFlags)
162
163 // TODO: Move to unity::shell::application::ApplicationManagerInterface
164 Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged)
165@@ -72,13 +71,6 @@
166 RoleFullscreen,
167 };
168
169- // Mapping enums to Ubuntu Platform API enums.
170- enum Flag {
171- NoFlag = 0x0,
172- ForceMainStage = 0x1,
173- };
174- Q_DECLARE_FLAGS(ExecFlags, Flag)
175-
176 static ApplicationManager* singleton();
177
178 explicit ApplicationManager(
179@@ -98,15 +90,13 @@
180 Q_INVOKABLE bool requestFocusApplication(const QString &appId) override;
181 Q_INVOKABLE bool focusApplication(const QString &appId) override;
182 Q_INVOKABLE void unfocusCurrentApplication() override;
183- Q_INVOKABLE qtmir::Application* startApplication(const QString &appId, const QStringList &arguments) override;
184+ Q_INVOKABLE qtmir::Application* startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
185 Q_INVOKABLE bool stopApplication(const QString &appId) override;
186
187 // QAbstractListModel
188 int rowCount(const QModelIndex & parent = QModelIndex()) const override;
189 QVariant data(const QModelIndex & index, int role) const override;
190
191- Q_INVOKABLE qtmir::Application *startApplication(const QString &appId, ExecFlags flags,
192- const QStringList &arguments = QStringList());
193 Q_INVOKABLE void move(int from, int to);
194
195 bool isEmpty() const { return rowCount() == 0; }
196
197=== modified file 'tests/framework/qtmir_test.cpp'
198--- tests/framework/qtmir_test.cpp 2016-02-11 11:52:06 +0000
199+++ tests/framework/qtmir_test.cpp 2016-03-11 12:52:16 +0000
200@@ -155,7 +155,7 @@
201 .Times(1)
202 .WillOnce(Return(true));
203
204- auto application = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
205+ auto application = applicationManager.startApplication(appId);
206 applicationManager.onProcessStarting(appId);
207
208 bool authed = false;
209
210=== modified file 'tests/modules/ApplicationManager/application_manager_test.cpp'
211--- tests/modules/ApplicationManager/application_manager_test.cpp 2016-02-12 00:07:09 +0000
212+++ tests/modules/ApplicationManager/application_manager_test.cpp 2016-03-11 12:52:16 +0000
213@@ -158,7 +158,6 @@
214
215 auto application = applicationManager.startApplication(
216 shortAppId,
217- ApplicationManager::NoFlag,
218 QStringList());
219
220 EXPECT_EQ(shortAppId, application->appId());
221@@ -178,7 +177,6 @@
222
223 auto application = applicationManager.startApplication(
224 longAppId,
225- ApplicationManager::NoFlag,
226 QStringList());
227
228 EXPECT_EQ(shortAppId, application->appId());
229@@ -488,7 +486,7 @@
230 QSignalSpy addedSpy(&applicationManager, SIGNAL(applicationAdded(const QString &)));
231
232 // start the application
233- Application *theApp = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
234+ Application *theApp = applicationManager.startApplication(appId);
235
236 // check application data
237 EXPECT_EQ(Application::Starting, theApp->state());
238@@ -687,7 +685,7 @@
239 ));
240
241 // start the application
242- Application *theApp = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
243+ Application *theApp = applicationManager.startApplication(appId);
244
245 // check application data
246 EXPECT_EQ(theApp->state(), Application::Starting);
247@@ -761,7 +759,7 @@
248 .Times(1)
249 .WillOnce(Return(true));
250
251- applicationManager.startApplication(appId, ApplicationManager::NoFlag);
252+ applicationManager.startApplication(appId);
253
254 QSignalSpy countSpy(&applicationManager, SIGNAL(countChanged()));
255 QSignalSpy addedSpy(&applicationManager, SIGNAL(applicationAdded(const QString &)));
256@@ -799,7 +797,7 @@
257 .Times(1)
258 .WillOnce(Return(true));
259
260- applicationManager.startApplication(appId, ApplicationManager::NoFlag);
261+ applicationManager.startApplication(appId);
262 applicationManager.onProcessStarting(appId);
263
264 QSignalSpy countSpy(&applicationManager, SIGNAL(countChanged()));
265@@ -843,7 +841,7 @@
266 .Times(1)
267 .WillOnce(Return(true));
268
269- applicationManager.startApplication(appId, ApplicationManager::NoFlag);
270+ applicationManager.startApplication(appId);
271 applicationManager.onProcessStarting(appId);
272
273 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
274@@ -884,7 +882,7 @@
275 .Times(1)
276 .WillOnce(Return(true));
277
278- applicationManager.startApplication(appId, ApplicationManager::NoFlag);
279+ applicationManager.startApplication(appId);
280 applicationManager.onProcessStarting(appId);
281 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
282 bool authed = true;
283@@ -927,7 +925,7 @@
284 .Times(1)
285 .WillOnce(Return(true));
286
287- applicationManager.startApplication(appId, ApplicationManager::NoFlag);
288+ applicationManager.startApplication(appId);
289 applicationManager.onProcessStarting(appId);
290 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
291 bool authed = true;
292@@ -970,7 +968,7 @@
293 .Times(1)
294 .WillOnce(Return(true));
295
296- Application *application = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
297+ Application *application = applicationManager.startApplication(appId);
298 applicationManager.onProcessStarting(appId);
299 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
300 bool authed = true;
301@@ -1016,7 +1014,7 @@
302 .Times(1)
303 .WillOnce(Return(true));
304
305- applicationManager.startApplication(appId, ApplicationManager::NoFlag);
306+ applicationManager.startApplication(appId);
307 applicationManager.onProcessStarting(appId);
308 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
309 bool authed = true;
310@@ -1061,7 +1059,7 @@
311 .Times(1)
312 .WillOnce(Return(true));
313
314- applicationManager.startApplication(appId, ApplicationManager::NoFlag);
315+ applicationManager.startApplication(appId);
316 applicationManager.onProcessStarting(appId);
317 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
318 bool authed = true;
319@@ -1112,7 +1110,7 @@
320 .Times(1)
321 .WillOnce(Return(true));
322
323- Application *app = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
324+ Application *app = applicationManager.startApplication(appId);
325 applicationManager.onProcessStarting(appId);
326 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
327 bool authed = true;
328@@ -1170,7 +1168,7 @@
329 .Times(1)
330 .WillOnce(Return(true));
331
332- Application *app = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
333+ Application *app = applicationManager.startApplication(appId);
334 applicationManager.onProcessStarting(appId);
335 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
336 bool authed = true;
337@@ -1223,7 +1221,7 @@
338 .Times(1)
339 .WillOnce(Return(true));
340
341- applicationManager.startApplication(appId, ApplicationManager::NoFlag);
342+ applicationManager.startApplication(appId);
343 applicationManager.onProcessStarting(appId);
344 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
345 bool authed = true;
346@@ -1262,7 +1260,7 @@
347 .Times(1)
348 .WillOnce(Return(true));
349
350- applicationManager.startApplication(appId, ApplicationManager::NoFlag);
351+ applicationManager.startApplication(appId);
352 applicationManager.onProcessStarting(appId);
353 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
354 bool authed = true;
355@@ -1358,7 +1356,7 @@
356 .Times(1)
357 .WillOnce(Return(true));
358
359- Application *app = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
360+ Application *app = applicationManager.startApplication(appId);
361 applicationManager.onProcessStarting(appId);
362 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
363 bool authed = true;
364@@ -1418,7 +1416,7 @@
365 .Times(1)
366 .WillOnce(Return(true));
367
368- applicationManager.startApplication(appId, ApplicationManager::NoFlag);
369+ applicationManager.startApplication(appId);
370 applicationManager.onProcessStarting(appId);
371 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
372 bool authed = true;
373@@ -1475,7 +1473,7 @@
374 .Times(1)
375 .WillOnce(Return(true));
376
377- applicationManager.startApplication(appId, ApplicationManager::NoFlag);
378+ applicationManager.startApplication(appId);
379 applicationManager.onProcessStarting(appId);
380 std::shared_ptr<mir::scene::Session> session1 = std::make_shared<MockSession>("", procId1);
381 std::shared_ptr<mir::scene::Session> session2 = std::make_shared<MockSession>("", procId2);
382@@ -1535,7 +1533,7 @@
383 .Times(1)
384 .WillOnce(Return(true));
385
386- Application *app = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
387+ Application *app = applicationManager.startApplication(appId);
388 applicationManager.onProcessStarting(appId);
389 std::shared_ptr<mir::scene::Session> session1 = std::make_shared<MockSession>("", procId1);
390 std::shared_ptr<mir::scene::Session> session2 = std::make_shared<MockSession>("", procId2);
391@@ -1593,7 +1591,7 @@
392 .Times(1)
393 .WillOnce(Return(true));
394
395- Application *app = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
396+ Application *app = applicationManager.startApplication(appId);
397 applicationManager.onProcessStarting(appId);
398 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
399 bool authed = true;
400@@ -1647,7 +1645,7 @@
401 .Times(1)
402 .WillOnce(Return(true));
403
404- applicationManager.startApplication(appId, ApplicationManager::NoFlag);
405+ applicationManager.startApplication(appId);
406 applicationManager.onProcessStarting(appId);
407 auto session = std::make_shared<MockSession>("", procId);
408 bool authed = true;
409@@ -1763,7 +1761,7 @@
410 .Times(1)
411 .WillOnce(Return(true));
412
413- auto the_app = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
414+ auto the_app = applicationManager.startApplication(appId);
415 applicationManager.onProcessStarting(appId);
416 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
417 bool authed = true;
418@@ -1831,7 +1829,7 @@
419 .Times(1)
420 .WillOnce(Return(true));
421
422- auto application = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
423+ auto application = applicationManager.startApplication(appId);
424 applicationManager.onProcessStarting(appId);
425 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
426 bool authed = true;
427@@ -1874,7 +1872,7 @@
428 .Times(1)
429 .WillOnce(Return(true));
430
431- applicationManager.startApplication(appId, ApplicationManager::NoFlag);
432+ applicationManager.startApplication(appId);
433 applicationManager.onProcessStarting(appId);
434 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
435 bool authed = true;
436@@ -1918,7 +1916,7 @@
437 .Times(1)
438 .WillOnce(Return(true));
439
440- Application *the_app = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
441+ Application *the_app = applicationManager.startApplication(appId);
442 applicationManager.onProcessStarting(appId);
443 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
444 bool authed = true;
445@@ -1967,7 +1965,7 @@
446 .Times(1)
447 .WillOnce(Return(true));
448
449- Application *the_app = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
450+ Application *the_app = applicationManager.startApplication(appId);
451 applicationManager.onProcessStarting(appId);
452 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
453 bool authed = true;
454@@ -2043,7 +2041,7 @@
455 .Times(1)
456 .WillOnce(Return(true));
457
458- auto app = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
459+ auto app = applicationManager.startApplication(appId);
460 applicationManager.onProcessStarting(appId);
461 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
462 bool authed = true;
463@@ -2094,7 +2092,7 @@
464 .Times(1)
465 .WillOnce(Return(true));
466
467- auto app = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
468+ auto app = applicationManager.startApplication(appId);
469 applicationManager.onProcessStarting(appId);
470 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
471 bool authed = true;
472@@ -2126,7 +2124,7 @@
473
474 // Trying to start a new instance of this app while we are still waiting for its current
475 // instance to end yields no immediate result. This command gets queued instead.
476- EXPECT_EQ(nullptr, applicationManager.startApplication(appId, ApplicationManager::NoFlag));
477+ EXPECT_EQ(nullptr, applicationManager.startApplication(appId));
478
479 QSignalSpy appAddedSpy(&applicationManager, SIGNAL(applicationAdded(const QString&)));
480
481@@ -2191,7 +2189,7 @@
482 [](const QString &appId, const QFileInfo&) { return new FakeDesktopFileReader(appId); }
483 ));
484
485- auto app = applicationManager.startApplication(appId, ApplicationManager::NoFlag);
486+ auto app = applicationManager.startApplication(appId);
487 applicationManager.onProcessStarting(appId);
488 std::shared_ptr<mir::scene::Session> session = std::make_shared<MockSession>("", procId);
489 bool authed = true;

Subscribers

People subscribed via source and target branches