Merge lp:~mhr3/unity-lens-applications/remove-ratings-filter into lp:unity-lens-applications

[Michal Hruby]

Remove ratings filter and ensure applications category has index 0

Remove ratings filter and ensure applications category has index 0.

[Paweł Stołowski (stolowski)]

Loooks good and works fine.

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-09-06 14:12:46 +0000
+++ src/daemon.vala	2012-09-13 11:24:27 +0000
@@ -277,8 +277,12 @@
       GLib.List<Unity.Category> categories = new GLib.List<Unity.Category> ();
       File icon_dir = File.new_for_path (ICON_PATH);
 
-      var cat = new Unity.Category (_("Recently Used"),
-                                    new FileIcon (icon_dir.get_child ("group-recent.svg")));
+      var cat = new Unity.Category (_("Applications"),
+                                    new FileIcon (icon_dir.get_child ("group-apps.svg")));
+      categories.append (cat);
+
+      cat = new Unity.Category (_("Recently Used"),
+                                new FileIcon (icon_dir.get_child ("group-recent.svg")));
       categories.append (cat);
 
       cat = new Unity.Category (_("Recent Apps"),
@@ -294,10 +298,6 @@
                                 Unity.CategoryRenderer.FLOW);
       categories.append (cat);
 
-      cat = new Unity.Category (_("Applications"),
-                                new FileIcon (icon_dir.get_child ("group-apps.svg")));
-      categories.append (cat);
-
       lens.categories = categories;
     }
 
@@ -327,12 +327,6 @@
         filters.append (filter);
       }
 
-      /* Rating filter */
-      {
-        var filter = new RatingsFilter("rating", _("Rating"));
-        filters.append (filter);
-      }
-
       lens.filters = filters;
     }
 
@@ -895,7 +889,6 @@
                                         uint max_add=0)
     {
       var appmanager = AppInfoManager.get_default();
-      var ratings_filter = scope.get_filter ("rating") as RatingsFilter;
       uint n_added = 0;
 
       foreach (var pkginfo in results.results)
@@ -953,19 +946,6 @@
           if (app != null)
             continue;
 
-          /* Filter by app rating in Software Center if enabled */
-          if (ratings != null && ratings_filter.rating > 0.00001)
-          {
-            Unity.Ratings.Result result;
-            if (ratings.query (pkginfo.package_name, out result))
-            {
-              if (result.average_rating < ratings_filter.rating * 5 - 0.2)
-                continue;
-            }
-            else
-              continue;
-          }
-
           /* Apps that are not installed, ie. in the Available category
            * use the 'unity-install://pkgname/Full App Name' URI scheme,
            * but only use that after we've de-duped the results.
 
=== modified file 'src/schemas.vala'
--- src/schemas.vala	2012-01-18 13:16:34 +0000
+++ src/schemas.vala	2012-09-13 11:24:27 +0000
@@ -31,11 +31,11 @@
   
  public enum Category
   {
+    APPLICATIONS,
     RECENT,
     RECENT_APPS,
     INSTALLED,
     AVAILABLE,
-    APPLICATIONS,
   }
   
   public enum RunnerCategory