Merge lp:~mzanetti/unity-api/dashActive into lp:unity-api

[Michael Zanetti]

add a dashActive property to the application API

 * Are there any related MPs required for this MP to build/function as expected? Please list.

https://code.launchpad.net/~unity-team/qtmir/fix-some-lifecycle-bugs/+merge/234087
https://code.launchpad.net/~mzanetti/unity8/async-dashcommunicator/+merge/235272

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 * Did you make sure that your branch does not contain spurious tags?
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 * If you changed the UI, has there been a design review?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:157
http://jenkins.qa.ubuntu.com/job/unity-api-ci/270/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-amd64-ci/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/105
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-armhf-ci/105/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-utopic-i386-ci/105

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

review: Approve

[lp:~mzanetti/unity-api/dashActive]

158. By Michael Zanetti on 2014-09-29

merge trunk

159. By Michael Zanetti on 2014-09-29

dashActive -> forceDashActive

160. By Michael Zanetti on 2014-09-29

update mock and test

161. By Michael Zanetti on 2014-09-29

improve comment

[Albert Astals Cid (aacid)]

Looks good

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-22 17:35:28 +0000
+++ debian/changelog	2014-09-29 13:39:19 +0000
@@ -1,3 +1,9 @@
+unity-api (7.92+14.10.20140929-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Add dashActive property to application api
+
+ -- Michael Zanetti <[e-mail]>  Fri, 29 Sep 2014 13:19:32 +0200
+
 unity-api (7.91+14.10.20140922.1-0ubuntu1) utopic; urgency=medium
 
   [ Daniel d'Andrada ]

=== modified file 'include/unity/shell/application/ApplicationManagerInterface.h'
--- include/unity/shell/application/ApplicationManagerInterface.h	2014-08-13 18:05:37 +0000
+++ include/unity/shell/application/ApplicationManagerInterface.h	2014-09-29 13:39:19 +0000
@@ -66,6 +66,13 @@
      */
     Q_PROPERTY(bool suspended READ suspended WRITE setSuspended NOTIFY suspendedChanged)
 
+    /**
+     * @brief Activate the dash, regardless of its focused state.
+     *
+     * If this is set to true, the dash will not be put to suspend or will be woken up from suspend.
+     */
+    Q_PROPERTY(bool forceDashActive READ forceDashActive WRITE setForceDashActive NOTIFY forceDashActiveChanged)
+
 protected:
     /// @cond
     ApplicationManagerInterface(QObject* parent = 0): QAbstractListModel(parent)
@@ -117,6 +124,9 @@
 
     virtual bool suspended() const = 0;
     virtual void setSuspended(bool suspended) = 0;
+
+    virtual bool forceDashActive() const = 0;
+    virtual void setForceDashActive(bool forceDashActive) = 0;
     /// @endcond
 
     /**
@@ -207,6 +217,11 @@
     void suspendedChanged();
 
     /**
+     * @brief Will be emitted when the forceDashActive property changes.
+     */
+    void forceDashActiveChanged();
+
+    /**
      * @brief Will be emitted when an application was added to the model.
      *
      * @param appId The appId of the application that was added.

=== modified file 'include/unity/shell/application/CMakeLists.txt'
--- include/unity/shell/application/CMakeLists.txt	2014-09-03 22:59:26 +0000
+++ include/unity/shell/application/CMakeLists.txt	2014-09-29 13:39:19 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 4)
+set(VERSION 5)
 set(PKGCONFIG_NAME "unity-shell-application")
 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")

=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp'
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp	2014-08-13 18:05:37 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp	2014-09-29 13:39:19 +0000
@@ -108,6 +108,16 @@
     Q_UNUSED(suspended)
 }
 
+bool MockApplicationManager::forceDashActive() const
+{
+    return false;
+}
+
+void MockApplicationManager::setForceDashActive(bool forceDashActive)
+{
+    Q_UNUSED(forceDashActive)
+}
+
 bool MockApplicationManager::requestFocusApplication(const QString &appId)
 {
     Q_UNUSED(appId)

=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h'
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h	2014-08-13 18:05:37 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h	2014-09-29 13:39:19 +0000
@@ -43,6 +43,9 @@
     bool suspended() const;
     void setSuspended(bool suspended);
 
+    bool forceDashActive() const override;
+    void setForceDashActive(bool forceDashActive) override;
+
     Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *get(const int index) const;
 
     Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *findApplication(const QString &appId) const;

=== modified file 'test/qmltest/unity/shell/application/tst_Application.qml'
--- test/qmltest/unity/shell/application/tst_Application.qml	2014-09-09 15:20:36 +0000
+++ test/qmltest/unity/shell/application/tst_Application.qml	2014-09-29 13:39:19 +0000
@@ -125,6 +125,7 @@
                 { tag: "ApplicationManager.count", property: "count", type: "number" },
                 { tag: "ApplicationManager.focusedApplicationId", property: "focusedApplicationId", type: "string" },
                 { tag: "ApplicationManager.suspended", property: "suspended", type: "boolean" },
+                { tag: "ApplicationManager.forceDashActive", property: "forceDashActive", type: "boolean" },
             ];
         }