Merge lp:~jamesh/unity-scope-scopes/scopes-api-0.3 into lp:unity-scope-scopes

[James Henstridge]

Port to unity-scopes-api 0.3.1

Update to support unity-scopes-api 0.3

[lp:~jamesh/unity-scope-scopes/scopes-api-0.3]

10. By James Henstridge on 2014-02-11

Require 0.3.1, since we reference the new *Metadata classes.

[Jussi Pakkanen (jpakkane)]

Looks good.

review: Approve

[lp:~jamesh/unity-scope-scopes/scopes-api-0.3]

11. By James Henstridge on 2014-02-11

Add activation support to scope, telling the shell to perform a query on
the chosen scope.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-05 06:47:24 +0000
+++ CMakeLists.txt	2014-02-11 09:52:10 +0000
@@ -5,7 +5,7 @@
 find_package(Threads REQUIRED)
 
 pkg_check_modules(UNITY REQUIRED
-  "libunity-scopes >= 0.2"
+  "libunity-scopes >= 0.3.1"
 )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wmissing-declarations -pedantic -std=c++11")

=== modified file 'debian/control'
--- debian/control	2014-02-06 10:28:02 +0000
+++ debian/control	2014-02-11 09:52:10 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake (>= 2.8),
                debhelper (>= 9),
-               libunity-scopes-dev (>= 0.2.0),
+               libunity-scopes-dev (>= 0.3.1),
                pkg-config,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/unity-scope-scopes

=== modified file 'src/scopes-scope.cpp'
--- src/scopes-scope.cpp	2014-02-06 12:08:57 +0000
+++ src/scopes-scope.cpp	2014-02-11 09:52:10 +0000
@@ -24,6 +24,7 @@
 #include <unity/scopes/PreviewWidget.h>
 #include <unity/scopes/Registry.h>
 #include <unity/scopes/ScopeExceptions.h>
+#include <unity/scopes/VariantBuilder.h>
 #include "scopes-scope.h"
 
 using namespace unity::scopes;
@@ -37,19 +38,29 @@
     registry.reset();
 }
 
-QueryBase::UPtr ScopesScope::create_query(std::string const &q,
-                                          VariantMap const &hints) {
+QueryBase::UPtr ScopesScope::create_query(Query const &q,
+                                          SearchMetadata const &hints) {
     QueryBase::UPtr query(new ScopesQuery(*this, q));
     return query;
 }
 
 QueryBase::UPtr ScopesScope::preview(Result const &result,
-                                     VariantMap const &hints) {
+                                     ActionMetadata const &hints) {
     QueryBase::UPtr previewer(new ScopesPreview(*this, result));
     return previewer;
 }
 
-ScopesQuery::ScopesQuery(ScopesScope &scope, std::string const &query)
+ActivationBase::UPtr ScopesScope::activate(Result const &result, ActionMetadata const& hints) {
+    ActivationBase::UPtr activation(new ScopesActivation(result));
+    return activation;
+}
+
+ActivationBase::UPtr ScopesScope::perform_action(Result const &result, ActionMetadata const& hints, std::string const &widget_id, std::string const &action_id) {
+    ActivationBase::UPtr activation(new ScopesActivation(result));
+    return activation;
+}
+
+ScopesQuery::ScopesQuery(ScopesScope &scope, Query const &query)
     : scope(scope), query(query) {
 }
 
@@ -64,7 +75,7 @@
 void ScopesQuery::run(SearchReplyProxy const &reply) {
     auto cat = reply->register_category("scopes", "Scopes", "");
 
-    std::string term = lowercase(this->query);
+    std::string term = lowercase(query.query_string());
     const auto matches = scope.registry->list_if(
         [term](ScopeMetadata const &item) -> bool {
             std::string display_name, description;
@@ -118,13 +129,13 @@
 
 void ScopesPreview::run(PreviewReplyProxy const &reply) {
     ColumnLayout layout1col(1), layout2col(2), layout3col(3);
-    layout1col.add_column({"header", "screenshot", "description"});
-
-    layout2col.add_column({"header", "screenshot"});
-    layout2col.add_column({"description"});
-
-    layout3col.add_column({"header", "screenshot"});
-    layout3col.add_column({"description"});
+    layout1col.add_column({"screenshot", "header", "actions", "description"});
+
+    layout2col.add_column({"screenshot", "header"});
+    layout2col.add_column({"actions", "description"});
+
+    layout3col.add_column({"screenshot", "header"});
+    layout3col.add_column({"actions", "description"});
     layout3col.add_column({});
     reply->register_layout({layout1col, layout2col, layout3col});
 
@@ -137,7 +148,26 @@
     PreviewWidget description("description", "text");
     description.add_attribute("text", result["description"]);
 
-    reply->push({header, screenshot, description});
+    PreviewWidget actions("actions", "actions");
+    {
+        VariantBuilder builder;
+        builder.add_tuple({
+                {"id", Variant("search")},
+                {"label", Variant("Search")}
+            });
+        actions.add_attribute("actions", builder.end());
+    }
+
+    reply->push({header, screenshot, description, actions});
+}
+
+ScopesActivation::ScopesActivation(Result const &result)
+    : result(result) {
+}
+
+ActivationResponse ScopesActivation::activate() {
+    Query query(result["scope_name"].get_string(), "", "");
+    return ActivationResponse(query);
 }
 
 extern "C" ScopeBase *UNITY_SCOPE_CREATE_FUNCTION() {

=== modified file 'src/scopes-scope.h'
--- src/scopes-scope.h	2014-02-06 06:17:18 +0000
+++ src/scopes-scope.h	2014-02-11 09:52:10 +0000
@@ -29,8 +29,12 @@
 public:
     virtual int start(std::string const&, unity::scopes::RegistryProxy const&) override;
     virtual void stop() override;
-    virtual unity::scopes::QueryBase::UPtr create_query(std::string const &q, unity::scopes::VariantMap const& hints) override;
-    virtual unity::scopes::QueryBase::UPtr preview(unity::scopes::Result const& result, unity::scopes::VariantMap const& hints) override;
+
+    virtual unity::scopes::QueryBase::UPtr create_query(unity::scopes::Query const &q, unity::scopes::SearchMetadata const& hints) override;
+    virtual unity::scopes::QueryBase::UPtr preview(unity::scopes::Result const& result, unity::scopes::ActionMetadata const& hints) override;
+
+    virtual unity::scopes::ActivationBase::UPtr activate(unity::scopes::Result const &result, unity::scopes::ActionMetadata const& hints) override;
+    virtual unity::scopes::ActivationBase::UPtr perform_action(unity::scopes::Result const &result, unity::scopes::ActionMetadata const& hints, std::string const &widget_id, std::string const &action_id) override;
 
 private:
     unity::scopes::RegistryProxy registry;
@@ -39,13 +43,13 @@
 class ScopesQuery : public unity::scopes::SearchQuery
 {
 public:
-    ScopesQuery(ScopesScope &scope, std::string const& query);
+    ScopesQuery(ScopesScope &scope, unity::scopes::Query const& query);
     virtual void cancelled() override;
     virtual void run(unity::scopes::SearchReplyProxy const&reply) override;
 
 private:
     const ScopesScope &scope;
-    const std::string query;
+    const unity::scopes::Query query;
 };
 
 class ScopesPreview : public unity::scopes::PreviewQuery
@@ -60,5 +64,14 @@
     const unity::scopes::Result result;
 };
 
+class ScopesActivation : public unity::scopes::ActivationBase
+{
+public:
+    ScopesActivation(unity::scopes::Result const &result);
+    virtual unity::scopes::ActivationResponse activate() override;
+private:
+    const unity::scopes::Result result;
+};
+
 
 #endif