Merge lp:~dandrader/unity-api/detachPromptSurfaces into lp:unity-api

[Daniel d'Andrada]

Moved prompt surfaces to ApplicationInfo and added MirSurfaceListInterface::first

- Moved promptSurfaceList from MirSurfaceInterface to ApplicationInfoInterface
- Added MirSurfaceListInterface::first property

Needed by:
https://code.launchpad.net/~dandrader/qtmir/detachPromptSurfaces/+merge/294954
https://code.launchpad.net/~dandrader/unity8/detachPromptSurfaces/+merge/294959

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:231
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/77/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1651/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/77/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dandrader/unity-api/detachPromptSurfaces]

232. By Daniel d'Andrada on 2016-05-17

update application version

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:232
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/78/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1654/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/78/rebuild

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

Don't really like you adding the "first" property just for one usage; but I guess I see the merit.

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:232
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/79/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1661
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1612
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1612
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1605
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1605/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1605
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1605/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1605
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1605/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1605
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1605/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1605
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1605/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1605
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1605/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/79/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-26 15:31:50 +0000
+++ debian/changelog	2016-05-17 19:40:32 +0000
@@ -1,3 +1,10 @@
+unity-api (7.112) UNRELEASED; urgency=medium
+
+  * Move promptSurfaceList from MirSurfaceInterface to ApplicationInfoInterface
+  * Added MirSurfaceListInterface::first property
+
+ -- Daniel d'Andrada <[e-mail]>  Tue, 17 May 2016 09:54:25 -0300
+
 unity-api (7.111+16.04.20160426.2-0ubuntu1) xenial; urgency=medium
 
   [ Pawel Stolowski ]

=== modified file 'include/unity/shell/application/ApplicationInfoInterface.h'
--- include/unity/shell/application/ApplicationInfoInterface.h	2016-04-13 16:47:27 +0000
+++ include/unity/shell/application/ApplicationInfoInterface.h	2016-05-17 19:40:32 +0000
@@ -224,6 +224,11 @@
      */
     Q_PROPERTY(unity::shell::application::MirSurfaceListInterface* surfaceList READ surfaceList CONSTANT)
 
+    /**
+     * @brief The list of top-level prompt surfaces for this application
+     */
+    Q_PROPERTY(unity::shell::application::MirSurfaceListInterface* promptSurfaceList READ promptSurfaceList CONSTANT)
+
 protected:
     /// @cond
     ApplicationInfoInterface(const QString &appId, QObject* parent = 0): QObject(parent) { Q_UNUSED(appId) }
@@ -301,6 +306,7 @@
     virtual QSize initialSurfaceSize() const = 0;
     virtual void setInitialSurfaceSize(const QSize &size) = 0;
     virtual MirSurfaceListInterface* surfaceList() = 0;
+    virtual MirSurfaceListInterface* promptSurfaceList() = 0;
     /// @endcond
 
 Q_SIGNALS:

=== modified file 'include/unity/shell/application/CMakeLists.txt'
--- include/unity/shell/application/CMakeLists.txt	2016-04-13 16:40:06 +0000
+++ include/unity/shell/application/CMakeLists.txt	2016-05-17 19:40:32 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 15)
+set(VERSION 16)
 set(PKGCONFIG_NAME "unity-shell-application")
 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")

=== modified file 'include/unity/shell/application/MirSurfaceInterface.h'
--- include/unity/shell/application/MirSurfaceInterface.h	2016-04-13 16:47:27 +0000
+++ include/unity/shell/application/MirSurfaceInterface.h	2016-05-17 19:40:32 +0000
@@ -134,11 +134,6 @@
      */
     Q_PROPERTY(bool focused READ focused NOTIFY focusedChanged)
 
-    /**
-     * @brief The list of prompt surfaces under this one
-     */
-    Q_PROPERTY(unity::shell::application::MirSurfaceListInterface* promptSurfaceList READ promptSurfaceList CONSTANT)
-
 public:
     /// @cond
     MirSurfaceInterface(QObject *parent = nullptr) : QObject(parent) {}
@@ -175,8 +170,6 @@
     virtual Mir::ShellChrome shellChrome() const = 0;
 
     virtual bool focused() const = 0;
-
-    virtual MirSurfaceListInterface* promptSurfaceList() = 0;
     /// @endcond
 
     /**

=== modified file 'include/unity/shell/application/MirSurfaceListInterface.h'
--- include/unity/shell/application/MirSurfaceListInterface.h	2016-04-13 16:47:27 +0000
+++ include/unity/shell/application/MirSurfaceListInterface.h	2016-05-17 19:40:32 +0000
@@ -39,6 +39,14 @@
      * This is the same as rowCount, added in order to keep compatibility with QML ListModels.
      */
     Q_PROPERTY(int count READ count NOTIFY countChanged)
+
+    /**
+     * @brief The first (index 0) surface in this model
+     *
+     * Will always match the result of get(0). But being a property, it's more appropriate
+     * for use in qml bindinds (JS expression gets reevaluated when it changes)
+     */
+    Q_PROPERTY(unity::shell::application::MirSurfaceInterface* first READ first NOTIFY firstChanged)
 public:
     /**
      * @brief The Roles supported by the model
@@ -69,11 +77,20 @@
     }
 
     int count() const { return rowCount(); }
+
+    MirSurfaceInterface *first() {
+        if (rowCount() > 0) {
+            return get(0);
+        } else {
+            return nullptr;
+        }
+    }
     /// @endcond
 
 Q_SIGNALS:
     /// @cond
     void countChanged();
+    void firstChanged();
     /// @endcond
 };
 

=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h'
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h	2016-04-13 16:47:27 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h	2016-05-17 19:40:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013,2015 Canonical Ltd.
+ * Copyright 2013,2015,2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -63,6 +63,7 @@
     void setInitialSurfaceSize(const QSize &) override {}
 
     MirSurfaceListInterface* surfaceList() override { return nullptr; }
+    MirSurfaceListInterface* promptSurfaceList() override { return nullptr; }
 
 private:
     QString m_appId;