Merge lp:~gerboland/unity-mir/appManV2-compat into lp:unity-mir

[Gerry Boland]

Update to use AppManagerV3 API. Bump package version to 1.1.0 to match library version

Update to use AppManagerV3 API

 * Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~gerboland/unity-api/appManVersion2/+merge/219403
https://code.launchpad.net/~gerboland/unity8/appManV2-compat/+merge/219673
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Y

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:224
http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/29/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/29/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/29/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:224
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/381/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/45/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/381/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/unity-mir-devel-ci/30/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-amd64-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-armhf-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-devel-utopic-i386-ci/30/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-devel-ci/30/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/382/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/46/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/382/rebuild

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

same here... I thought we were going to get rid of

bool requestFocusApplication(const QString &appId);

review: Needs Information

[Gerry Boland (gerboland)]

QtComp will get rid of requestFocusApplication, which is why I removed it from unity-api. But current shell still needs it.

This sequence of MRs is so that we can land the unity-api change separately and sooner, and qtcomp later.

This MR does not change any APIs, just ensures unity-mir builds against the updated unity-api.

Unmerged revisions

229. By Gerry Boland on 2014-06-24

debian: depend on unity-api version 7.90 or greater

228. By Gerry Boland on 2014-06-24

debian" bump to 1.1.0 to match library version

227. By Gerry Boland on 2014-06-24

Restore Application::screenshot and related APIs

226. By Gerry Boland on 2014-06-24

debian: libubuntu-app-launch2-dev build dependency restored

225. By Gerry Boland on 2014-06-24

debian package version to 0.5

224. By Gerry Boland on 2014-06-24

Merge trunk

223. By Gerry Boland on 2014-05-15

Debian/Control: libunity-mir1 provides unity-application-impl-3

222. By Gerry Boland on 2014-05-15

Bump library version and increase package version to match it

221. By Gerry Boland on 2014-05-15

Bump unity-api package dependency version

220. By Gerry Boland on 2014-05-13

Adopt to AppManV2 API defined in unity-api

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-11 03:40:49 +0000
+++ CMakeLists.txt	2014-06-24 23:01:00 +0000
@@ -53,7 +53,7 @@
 include(CTest)
 
 set(UNITY_MIR_VERSION_MAJOR 1)
-set(UNITY_MIR_VERSION_MINOR 0)
+set(UNITY_MIR_VERSION_MINOR 1)
 set(UNITY_MIR_VERSION_PATCH 0)
 
 find_package(PkgConfig REQUIRED)

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-18 19:28:51 +0000
+++ debian/changelog	2014-06-24 23:01:00 +0000
@@ -1,3 +1,9 @@
+unity-mir (1.1.0) UNRELEASED; urgency=medium
+
+  * Update ApplicationManager & Application APIs to match latest unity-api
+
+ -- Gerry Boland <[e-mail]>  Thu, 15 May 2014 11:19:54 +0100
+
 unity-mir (0.4+14.10.20140618.1-0ubuntu1) utopic; urgency=low
 
   [ Alberto Aguirre ]

=== modified file 'debian/control'
--- debian/control	2014-06-13 16:14:31 +0000
+++ debian/control	2014-06-24 23:01:00 +0000
@@ -9,11 +9,11 @@
                libboost-dev,
                libboost-system-dev,
                libubuntu-application-api-dev (>= 2.0.0),
+               libubuntu-app-launch2-dev,
                libmirserver-dev (>= 0.3.0),
                libmirclient-dev (>= 0.1.9),
                libprocess-cpp-dev,
-               libunity-api-dev (>= 7.80.6),
-               libubuntu-app-launch2-dev,
+               libunity-api-dev (>= 7.90),
                qt5-default,
                qtbase5-dev,
                qtdeclarative5-dev,
@@ -36,7 +36,7 @@
 Breaks: unity8 (<< 7.86)
 Provides: unity-mir,
           unity-application-impl,
-          unity-application-impl-2,
+          unity-application-impl-3,
 Description: Qt plugins for Unity specific Mir APIs
  Unity-Mir provides Qt bindings for Mir features that are not exposed 
  through the QtUbuntu QPA plugins but needed for shell functionality.

=== modified file 'src/modules/Unity/Application/application.cpp'
--- src/modules/Unity/Application/application.cpp	2014-05-26 15:54:44 +0000
+++ src/modules/Unity/Application/application.cpp	2014-06-24 23:01:00 +0000
@@ -113,6 +113,12 @@
     return m_stage;
 }
 
+Application::Stages Application::supportedStages() const
+{
+    // FIXME - need to query application for this
+    return Application::MainStage & Application::SideStage;
+}
+
 Application::State Application::state() const
 {
     return m_state;
@@ -182,13 +188,14 @@
     m_sessionName = name;
 }
 
-void Application::setStage(Application::Stage stage)
+bool Application::setStage(Application::Stage stage)
 {
     DLOG("Application::setStage (this=%p, stage=%d)", this, static_cast<int>(stage));
     if (m_stage != stage) {
         m_stage = stage;
         Q_EMIT stageChanged(stage);
     }
+    return true;
 }
 
 QImage Application::screenshotImage() const

=== modified file 'src/modules/Unity/Application/application.h'
--- src/modules/Unity/Application/application.h	2014-05-16 15:40:00 +0000
+++ src/modules/Unity/Application/application.h	2014-06-24 23:01:00 +0000
@@ -59,13 +59,14 @@
     QString comment() const override;
     QUrl icon() const override;
     Stage stage() const override;
+    Stages supportedStages() const override;
     State state() const override;
     bool focused() const override;
     QUrl screenshot() const override;
 
     bool visible() const;
 
-    void setStage(Stage stage);
+    bool setStage(Stage stage);
     void setVisible(const bool);
 
     QImage screenshotImage() const;
@@ -88,6 +89,7 @@
 
 Q_SIGNALS:
     void fullscreenChanged();
+    void screenshotChanged(QUrl uri);
     void stageChanged(Stage stage);
     void visibleChanged();
 

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2014-05-26 15:54:50 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2014-06-24 23:01:00 +0000
@@ -345,6 +345,16 @@
     }
 }
 
+bool ApplicationManager::suspendApplication(const QString &appId)
+{
+    Application *app = findApplication(appId);
+    if (app) {
+        return suspendApplication(app);
+    } else {
+        return false;
+    }
+}
+
 bool ApplicationManager::suspendApplication(Application *application)
 {
     if (application == nullptr)
@@ -363,6 +373,17 @@
     return true;
 }
 
+bool ApplicationManager::resumeApplication(const QString &appId)
+{
+    Application *app = findApplication(appId);
+    if (app) {
+        resumeApplication(app);
+        return true;
+    } else {
+        return false;
+    }
+}
+
 void ApplicationManager::resumeApplication(Application *application)
 {
     if (application == nullptr)

=== modified file 'src/modules/Unity/Application/application_manager.h'
--- src/modules/Unity/Application/application_manager.h	2014-05-26 15:54:44 +0000
+++ src/modules/Unity/Application/application_manager.h	2014-06-24 23:01:00 +0000
@@ -90,17 +90,22 @@
     void setSuspended(bool suspended);
     Q_INVOKABLE unitymir::Application* get(int index) const override;
     Q_INVOKABLE unitymir::Application* findApplication(const QString &appId) const override;
-    Q_INVOKABLE bool requestFocusApplication(const QString &appId) override;
-    Q_INVOKABLE bool focusApplication(const QString &appId) override;
-    Q_INVOKABLE void unfocusCurrentApplication() override;
+
     Q_INVOKABLE unitymir::Application* startApplication(const QString &appId, const QStringList &arguments) override;
     Q_INVOKABLE bool stopApplication(const QString &appId) override;
-    Q_INVOKABLE bool updateScreenshot(const QString &appId);
+    Q_INVOKABLE bool suspendApplication(const QString &appId) override;
+    Q_INVOKABLE bool resumeApplication(const QString &appId) override;
 
     // QAbstractListModel
     int rowCount(const QModelIndex & parent = QModelIndex()) const override;
     QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override;
 
+    Q_INVOKABLE bool requestFocusApplication(const QString &appId);
+    Q_INVOKABLE bool focusApplication(const QString &appId);
+    Q_INVOKABLE void unfocusCurrentApplication();
+
+    Q_INVOKABLE bool updateScreenshot(const QString &appId) override;
+
     Q_INVOKABLE unitymir::Application *startApplication(const QString &appId, ExecFlags flags,
                                                         const QStringList &arguments = QStringList());
     Q_INVOKABLE void move(int from, int to);
@@ -109,15 +114,13 @@
     unitymir::Application* findApplicationWithPid(const qint64 pid);
 
     // Internal helpers
-    bool suspendApplication(Application *application);
-    void resumeApplication(Application *application);
     int panelHeight();
     QSize displaySize() const { return m_displaySize; }
 
 public Q_SLOTS:
     void authorizeSession(const quint64 pid, bool &authorized);
     void placeSession(::mir::scene::Session const*, uint32_t &x, uint32_t &y);
-    
+
     void onSessionStarting(std::shared_ptr<::mir::scene::Session> const& session);
     void onSessionStopping(std::shared_ptr<::mir::scene::Session> const& session);
     void onSessionFocused(std::shared_ptr<::mir::scene::Session> const& session);
@@ -138,6 +141,8 @@
     void screenshotUpdated();
 
 private:
+    bool suspendApplication(Application *application);
+    void resumeApplication(Application *application);
     void setFocused(Application *application);
     void add(Application *application);
     void remove(Application* application);