Merge lp:~stolowski/unity-scope-home/filters-no-empty-masters into lp:unity-scope-home

[Paweł Stołowski]

Don't add master scope to Categories filter if it has no scopes.

Don't add master scope to Categories filter if it has no scopes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:145
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/26

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/62/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Needs to handle remote scopes too...

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/27

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/63/rebuild

review: Approve (continuous-integration)

[lp:~stolowski/unity-scope-home/filters-no-empty-masters]

147. By Paweł Stołowski on 2013-08-21

Fix formatting.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:147
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/28

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/64/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Is there a simple way to add a test for this?

9 + public bool has_scopes (string master_scope_id)

Would be more expressive as "has_subscopes()".

review: Needs Information

[lp:~stolowski/unity-scope-home/filters-no-empty-masters]

148. By Paweł Stołowski on 2013-08-26

Renamed has_scopes to has_subscopes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:148
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/71/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-armhf-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-saucy-i386-ci/35

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/71/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

> Is there a simple way to add a test for this?
Simple - not. It would require changing populate_filters() implementation a bit to make it independent of HS, so that it's not necessary to create HS instance... And then mocking some stuff.

> 9 + public bool has_scopes (string master_scope_id)
>
> Would be more expressive as "has_subscopes()".
Renamed.

[Michal Hruby (mhr3)]

+1

review: Approve

=== modified file 'src/meta-scope-registry.vala'
--- src/meta-scope-registry.vala	2013-05-02 22:00:15 +0000
+++ src/meta-scope-registry.vala	2013-08-26 09:39:29 +0000
@@ -80,5 +80,12 @@
         return null;
       return scopes[master_scope_id];
     }
+
+    public bool has_subscopes (string master_scope_id)
+    {
+      if (!scopes.has_key (master_scope_id))
+        return false;
+      return scopes[master_scope_id].size > 0;
+    }
   }
 }

=== modified file 'src/scope.vala'
--- src/scope.vala	2013-07-24 16:35:40 +0000
+++ src/scope.vala	2013-08-26 09:39:29 +0000
@@ -33,7 +33,6 @@
 const int CATEGORY_REORDER_TIME_MS = 1500;
 const uint FLUSH_DELAY_MS = 1500;
 const string[] ALWAYS_REORDER_SCOPE_IDS = {"applications.scope", "files.scope"};
-
 public class HomeScope : Unity.AggregatorScope
 {
   private ScopeManager scope_mgr = new ScopeManager ();
@@ -299,9 +298,14 @@
 
     var src_filter = new Unity.CheckOptionFilter ("sources", _("Sources"));
     src_filter.sort_type = Unity.OptionsFilter.SortType.DISPLAY_NAME;
+
+    var meta_reg = MetaScopeRegistry.instance ();
+
     foreach (var node in reg.scopes)
     {
-      if (node.scope_info.visible)
+      // display master scope in Category filter only if it has subscopes
+      if (node.scope_info.visible && (
+            node.scope_info.is_master == false || meta_reg.has_subscopes (node.scope_info.id)))
       {
         debug ("Category filter add: %s", node.scope_info.id);
         cat_filter.add_option (node.scope_info.id, node.scope_info.name); //add master scope id to 'Categories'