Merge lp:~stolowski/unity-api/activation-progress into lp:unity-api

[Paweł Stołowski]

Interface for activationInProgress flag.

Interface for activationInProgress flag.

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

PASSED: Continuous integration, rev:207
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-1-ci/9/
Executed test runs:

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:207
http://jenkins.qa.ubuntu.com/job/unity-api-ci/379/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/68
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/68/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/78
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/78/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/78

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Looks good

review: Approve

[lp:~stolowski/unity-api/activation-progress]

208. By Paweł Stołowski on 2016-02-03

Don't bump changelog

209. By Paweł Stołowski on 2016-02-22

Merged trunk

=== modified file 'include/unity/shell/scopes/CMakeLists.txt'
--- include/unity/shell/scopes/CMakeLists.txt	2015-11-30 09:18:57 +0000
+++ include/unity/shell/scopes/CMakeLists.txt	2016-02-22 11:54:09 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 9)
+set(VERSION 10)
 set(PKGCONFIG_NAME "unity-shell-scopes")
 set(PKGCONFIG_DESCRIPTION "Unity shell Scopes APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")

=== modified file 'include/unity/shell/scopes/ScopeInterface.h'
--- include/unity/shell/scopes/ScopeInterface.h	2015-10-05 12:54:22 +0000
+++ include/unity/shell/scopes/ScopeInterface.h	2016-02-22 11:54:09 +0000
@@ -74,6 +74,11 @@
     Q_PROPERTY(bool searchInProgress READ searchInProgress NOTIFY searchInProgressChanged)
 
     /**
+     * @brief Boolean specifying whether an activation request is currently running.
+     */
+    Q_PROPERTY(bool activationInProgress READ activationInProgress NOTIFY activationInProgressChanged)
+
+    /**
      * @brief Boolean specifying whether the scope is favourited.
      */
     Q_PROPERTY(bool favorite READ favorite WRITE setFavorite NOTIFY favoriteChanged)
@@ -173,6 +178,7 @@
     virtual QString searchHint() const = 0;
     virtual QString shortcut() const = 0;
     virtual bool searchInProgress() const = 0;
+    virtual bool activationInProgress() const = 0;
     virtual bool favorite() const = 0;
     virtual CategoriesInterface* categories() const = 0;
     virtual SettingsModelInterface* settings() const = 0;
@@ -256,6 +262,7 @@
     void descriptionChanged();
     void searchHintChanged();
     void searchInProgressChanged();
+    void activationInProgressChanged();
     void favoriteChanged();
     void shortcutChanged();
     void categoriesChanged();

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp	2015-10-05 12:54:22 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.cpp	2016-02-22 11:54:09 +0000
@@ -77,6 +77,10 @@
     return m_searching;
 }
 
+bool MockScope::activationInProgress() const {
+    return false;
+}
+
 unity::shell::scopes::CategoriesInterface* MockScope::categories() const {
     return m_categories;
 }

=== modified file 'test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.h'
--- test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.h	2015-10-05 12:54:22 +0000
+++ test/qmltest/mocks/plugins/Unity/Scopes/Mocks/MockScope.h	2016-02-22 11:54:09 +0000
@@ -36,6 +36,7 @@
     bool favorite() const override;
     QString shortcut() const override;
     bool searchInProgress() const override;
+    bool activationInProgress() const override;
     unity::shell::scopes::CategoriesInterface* categories() const override;
     unity::shell::scopes::SettingsModelInterface* settings() const override;
     QString searchQuery() const override;