Merge lp:~stolowski/unity-scopes-shell/activation-progress into lp:unity-scopes-shell

[Paweł Stołowski]

Show activation progress bar when activate is called on scope proxy.

Show activation progress bar when activate is called on scope proxy.

[Albert Astals Cid (aacid)]

Code looks good to me

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-11-30 09:23:32 +0000
+++ CMakeLists.txt	2016-01-29 11:02:44 +0000
@@ -51,7 +51,7 @@
 find_package(Boost COMPONENTS regex REQUIRED)
 
 pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=1.0.1)
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=9)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=10)
 
 pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
 pkg_check_modules(UBUNTU_LOCATION_SERVICE REQUIRED ubuntu-location-service)

=== modified file 'debian/control.in'
--- debian/control.in	2015-12-15 15:22:10 +0000
+++ debian/control.in	2016-01-29 11:02:44 +0000
@@ -8,7 +8,7 @@
                dh-python,
                libboost-python-dev,
                libboost-regex-dev,
-               libunity-api-dev (>= 7.105),
+               libunity-api-dev (>= 7.106),
                libunity-scopes-dev (>= 1.0.1~),
                libgsettings-qt-dev (>= 0.1),
                libqtdbustest1-dev (>= 0.2),
@@ -50,6 +50,7 @@
           unity-scopes-impl-7,
           unity-scopes-impl-8,
           unity-scopes-impl-9,
+          unity-scopes-impl-10,
 Breaks: unity8-private (<< 7.84),
         unity8 (<< 8.11)
 Replaces: unity8-private (<< 7.84)

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2015-11-30 09:23:32 +0000
+++ src/Unity/scope.cpp	2016-01-29 11:02:44 +0000
@@ -83,6 +83,7 @@
     , m_formFactor(QStringLiteral("phone"))
     , m_isActive(false)
     , m_searchInProgress(false)
+    , m_activationInProgress(false)
     , m_resultsDirty(false)
     , m_delayedSearchProcessing(false)
     , m_hasNavigation(false)
@@ -207,6 +208,8 @@
 
 void Scope::handleActivation(std::shared_ptr<scopes::ActivationResponse> const& response, scopes::Result::SPtr const& result, QString const& categoryId)
 {
+    setActivationInProgress(false);
+
     switch (response->status()) {
         case scopes::ActivationResponse::NotHandled:
             activateUri(QString::fromStdString(result->uri()));
@@ -675,6 +678,14 @@
     }
 }
 
+void Scope::setActivationInProgress(bool activationInProgress)
+{
+    if (m_activationInProgress != activationInProgress) {
+        m_activationInProgress = activationInProgress;
+        Q_EMIT activationInProgressChanged();
+    }
+}
+
 void Scope::setStatus(shell::scopes::ScopeInterface::Status status)
 {
     if (m_status != status) {
@@ -864,6 +875,11 @@
     return m_searchInProgress;
 }
 
+bool Scope::activationInProgress() const
+{
+    return m_activationInProgress;
+}
+
 unity::shell::scopes::ScopeInterface::Status Scope::status() const
 {
     return m_status;
@@ -1205,13 +1221,17 @@
                 scopes::ActivationListenerBase::SPtr listener(new ActivationReceiver(this, result));
                 m_activationController->setListener(listener);
 
+                setActivationInProgress(true);
+
                 auto proxy = proxy_for_result(result);
                 unity::scopes::ActionMetadata metadata(QLocale::system().name().toStdString(), m_formFactor.toStdString());
                 scopes::QueryCtrlProxy controller = proxy->activate(*(result.get()), metadata, listener);
                 m_activationController->setController(controller);
             } catch (std::exception& e) {
+                setActivationInProgress(false);
                 qWarning("Caught an error from activate(): %s", e.what());
             } catch (...) {
+                setActivationInProgress(false);
                 qWarning("Caught an error from activate()");
             }
         }

=== modified file 'src/Unity/scope.h'
--- src/Unity/scope.h	2015-11-30 09:23:32 +0000
+++ src/Unity/scope.h	2016-01-29 11:02:44 +0000
@@ -125,6 +125,7 @@
     bool favorite() const override;
     QString shortcut() const override;
     bool searchInProgress() const override;
+    bool activationInProgress() const override;
     unity::shell::scopes::ScopeInterface::Status status() const override;
     unity::shell::scopes::CategoriesInterface* categories() const override;
     unity::shell::scopes::SettingsModelInterface* settings() const override;
@@ -177,6 +178,7 @@
     void invalidateResults();
     virtual void dispatchSearch();
     void setSearchInProgress(bool searchInProgress);
+    void setActivationInProgress(bool activationInProgress);
 
 Q_SIGNALS:
     void resultsDirtyChanged();
@@ -230,6 +232,7 @@
     std::unique_ptr<unity::scopes::Variant> m_queryUserData;
     bool m_isActive;
     bool m_searchInProgress;
+    bool m_activationInProgress;
     bool m_resultsDirty;
     bool m_delayedSearchProcessing;
     bool m_hasNavigation;