Merge lp:~mhr3/unity-lens-applications/separate-scope-category into lp:unity-lens-applications

[Michal Hruby]

Move scopes into a separate scopes category.

Move scopes into a separate scopes category.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:357
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/32/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

90 - filter.add_option ("scopes", _("Search plugins"));

Why is this filter removed?

review: Needs Information

[Michal Hruby (mhr3)]

> 90 - filter.add_option ("scopes", _("Search plugins"));
>
> Why is this filter removed?

Cause there's now a separate category for it.

[lp:~mhr3/unity-lens-applications/separate-scope-category]

358. By Michal Hruby on 2013-08-08

Undo the filter removal

=== modified file 'data/scopes.scope.in.in'
--- data/scopes.scope.in.in	2013-08-05 09:53:58 +0000
+++ data/scopes.scope.in.in	2013-08-08 16:22:22 +0000
@@ -4,11 +4,11 @@
 Module=@libdir@/unity/unity-scope-applications.so
 ModuleType=C
 Icon=@prefix@/share/unity/icons/lens-nav-app.svg
-_Name=Scopes
-_Description=This is an Ubuntu search plugin that enables information from available search plugins to be searched and displayed in the Dash underneath the Applications header. If you do not wish to search this content source, you can disable this search plugin.
+_Name=Dash plugins
+_Description=This is an Ubuntu search plugin that enables information from available search plugins to be searched and displayed in the Dash underneath the Dash plugins header. If you do not wish to search this content source, you can disable this search plugin.
 Type=applications
 _SearchHint=Search search plugins
-OptionalMetadata=is_scope[u]
+OptionalMetadata=scope_disabled[u]
 
 [Desktop Entry]
 X-Ubuntu-Gettext-Domain=unity-lens-applications

=== modified file 'src/commands-scope.vala'
--- src/commands-scope.vala	2013-07-25 08:18:39 +0000
+++ src/commands-scope.vala	2013-08-08 16:22:22 +0000
@@ -224,10 +224,10 @@
 
     public override void run_async (Unity.ScopeSearchBaseCallback async_callback)
     {
-      update_search.begin (
-        () => {
-          async_callback (this);
-        });
+      update_search.begin (() =>
+      {
+        async_callback (this);
+      });
     }
 
     private void add_result (Unity.ResultSet result_set, string uri,

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-07-25 12:36:20 +0000
+++ src/daemon.vala	2013-08-08 16:22:22 +0000
@@ -816,10 +816,10 @@
 
     public override void run_async (Unity.ScopeSearchBaseCallback async_callback)
     {
-      dispatch_search.begin (
-        () => {
-          async_callback (this);
-        });
+      dispatch_search.begin (() =>
+      {
+        async_callback (this);
+      });
     }
 
     private async void dispatch_search ()

=== modified file 'src/scopes-scope.vala'
--- src/scopes-scope.vala	2013-08-05 09:53:58 +0000
+++ src/scopes-scope.vala	2013-08-08 16:22:22 +0000
@@ -34,8 +34,10 @@
     {
       this.appscope = appscope;
       // Track the remote scopes
-      remote_scopes_model = new Dee.SharedModel ("com.canonical.Unity.SmartScopes.RemoteScopesModel");
-      remote_scopes_model.set_schema ("s", "s", "s", "s", "s", "as");
+      var shared_model = new Dee.SharedModel ("com.canonical.Unity.SmartScopes.RemoteScopesModel");
+      shared_model.set_schema ("s", "s", "s", "s", "s", "as");
+      shared_model.end_transaction.connect (this.remote_scopes_changed);
+      remote_scopes_model = shared_model;
 
       scopes_index = Utils.prepare_index (remote_scopes_model,
                                           RemoteScopesColumn.NAME,
@@ -53,6 +55,11 @@
       build_scope_index.begin ();
     }
 
+    private void remote_scopes_changed (uint64 begin_seqnum, uint64 end_seqnum)
+    {
+      this.results_invalidated (SearchType.DEFAULT);
+    }
+
     private void update_disabled_scopes_hash ()
     {
       disabled_scope_ids.remove_all ();
@@ -150,24 +157,8 @@
       Unity.CategorySet categories = new Unity.CategorySet ();
       File icon_dir = File.new_for_path (ICON_PATH);
 
-      var cat = new Unity.Category ("apps", _("Applications"),
-                                    new FileIcon (icon_dir.get_child ("group-apps.svg")));
-      categories.add (cat);
-
-      cat = new Unity.Category ("recently-used", _("Recently used"),
-                                new FileIcon (icon_dir.get_child ("group-recent.svg")));
-      categories.add (cat);
-
-      cat = new Unity.Category ("recent", _("Recent apps"),
-                                new FileIcon (icon_dir.get_child ("group-apps.svg")));
-      categories.add (cat);
-
-      cat = new Unity.Category ("installed", _("Installed"),
-                                new FileIcon (icon_dir.get_child ("group-installed.svg")));
-      categories.add (cat);
-
-      cat = new Unity.Category ("more", _("More suggestions"),
-                                new FileIcon (icon_dir.get_child ("group-treat-yourself.svg")));
+      var cat = new Unity.Category ("scopes", _("Dash plugins"),
+                                    new FileIcon (icon_dir.get_child ("group-installed.svg")));
       categories.add (cat);
 
       return categories;
@@ -176,7 +167,7 @@
     public override Unity.Schema get_schema ()
     {
       var schema = new Unity.Schema ();
-      schema.add_field ("is_scope", "u", Schema.FieldType.OPTIONAL);
+      schema.add_field ("scope_disabled", "u", Schema.FieldType.OPTIONAL);
       return schema;
     }
 
@@ -262,6 +253,13 @@
       add_remote_results (context.search_query, context.result_set);
     }
 
+    public override void run_async (ScopeSearchBaseCallback callback)
+    {
+      // just run the matching in the origin thread, it's cheap
+      run ();
+      callback (this);
+    }
+
     private void add_local_results (string search_query, Unity.ResultSet result_set)
     {
       bool has_search = !Utils.is_search_empty (search_query);
@@ -283,8 +281,7 @@
 
         var result = Unity.ScopeResult ();
         result.uri = @"scope://$(info.desktop_file)";
-        result.category = info.desktop_file in scope.disabled_scope_ids ?
-          Category.AVAILABLE : Category.INSTALLED;
+        result.category = 0;
         result.result_type = Unity.ResultType.DEFAULT;
         result.mimetype = "application/x-unity-scope";
         result.title = info.application_name;
@@ -293,7 +290,7 @@
         result.comment = "";
         result.dnd_uri = "";
         result.metadata = new HashTable<string, Variant> (str_hash, str_equal);
-        result.metadata["is_scope"] = new Variant.uint32 (1);
+        result.metadata["scope_disabled"] = new Variant.uint32 (info.desktop_file in scope.disabled_scope_ids ? 1 : 0);
 
         var icon_hint = info.icon;
         try
@@ -324,8 +321,7 @@
         unowned string scope_id =
           scope.remote_scopes_model.get_string (iter, RemoteScopesColumn.SCOPE_ID);
         result.uri = @"scope://$(scope_id)";
-        result.category = scope_id in scope.disabled_scope_ids ?
-          Category.AVAILABLE : Category.INSTALLED;
+        result.category = 0;
         result.result_type = Unity.ResultType.DEFAULT;
         result.mimetype = "application/x-unity-scope";
         result.title =
@@ -333,7 +329,7 @@
         result.comment = "";
         result.dnd_uri = "";
         result.metadata = new HashTable<string, Variant> (str_hash, str_equal);
-        result.metadata["is_scope"] = new Variant.uint32 (1);
+        result.metadata["scope_disabled"] = new Variant.uint32 (scope_id in scope.disabled_scope_ids ? 1 : 0);
 
         var icon_hint =
           scope.remote_scopes_model.get_string (iter, RemoteScopesColumn.ICON_HINT);
@@ -383,10 +379,10 @@
     public override void run_async (Unity.AbstractPreviewCallback callback)
     {
       make_preview.begin ((obj, res) =>
-        {
-          var preview = make_preview.end (res);
-          callback (this, preview);
-        });
+      {
+        var preview = make_preview.end (res);
+        callback (this, preview);
+      });
     }
 
     private async Unity.AbstractPreview? make_preview ()