Merge lp:~kamstrup/unity-lens-applications/expand-avail-apps into lp:unity-lens-applications

[Mikkel Kamstrup Erlandsen]

See discussion in linked bug

Unmerged revisions

206. By Mikkel Kamstrup Erlandsen on 2011-04-08

When displaying random apps available for download add a first hit "Show all" that clears the *Sample* Apps Available for Download group and Populates the Apps Available for Download group (now without the "Sample" prefix) with all apps from that category sorted alphabetically (according to locale rules)

205. By Mikkel Kamstrup Erlandsen on 2011-04-08

When showing random apps change the group header to "Sample Apps Available for Download"

=== modified file 'applications.place.in.in'
--- applications.place.in.in	2011-04-01 14:54:26 +0000
+++ applications.place.in.in	2011-04-08 13:53:23 +0000
@@ -18,7 +18,7 @@
 ShowEntry=false
 
 [Activation]
-URIPattern=unity-(install|runner)://.+
+URIPattern=unity-(install|runner|available-apps)://.+
 MimetypePattern=application/x-unity-available-application
 Priority=0
 
 
=== modified file 'src/daemon.vala'
--- src/daemon.vala	2011-04-07 09:37:36 +0000
+++ src/daemon.vala	2011-04-08 13:53:23 +0000
@@ -282,6 +282,9 @@
       groups.append ("UnityDefaultRenderer",
                      _("Apps Available for Download"),
                      ICON_PATH + "group-available.svg");
+      groups.append ("UnityDefaultRenderer",
+                     _("Sample Apps Available for Download"),
+                     ICON_PATH + "group-available.svg");
       groups.append ("UnityEmptySearchRenderer",
                      "No search results", // No i18n, should never be rendered
                      "");
@@ -483,11 +486,12 @@
       else if (pkgsearcher != null)
         {
           timer.start ();
+          add_show_all_apps_result (model, prepare_pkg_search_string (null, section));
           string? category = (section == Section.ALL_APPLICATIONS ?
                                            null : section_queries.get(section));
           var random_pkgresults = pkgsearcher.get_random_apps (category, 12);
           add_pkg_search_result (random_pkgresults, installed_uris, available_uris,
-                                 model, Group.AVAILABLE, 6);
+                                 model, Group.AVAILABLE_SAMPLE, 5);
           timer.stop ();
           debug ("Entry search listed %i random Available apps in %fms",
                  random_pkgresults.num_hits, timer.elapsed ()*1000);
@@ -578,6 +582,17 @@
         search.finished ();
     }
     
+    private void add_show_all_apps_result (Dee.Model results_model,
+                                           string    query)
+    {
+      results_model.append (@"unity-available-apps://$query",
+                            Config.DATADIR + "/unity/themes/applications.png",
+                            Group.AVAILABLE_SAMPLE,
+                            "", // mime
+                            _("Show all"),
+                            _("Show All Apps Available for Download"));
+    }
+    
     private string prepare_pkg_search_string (PlaceSearch? search, Section section)
     {       
       if (Utils.search_is_invalid (search))
@@ -707,6 +722,7 @@
             comment = app.get_description ();
             break;
           case Group.AVAILABLE:
+          case Group.AVAILABLE_SAMPLE:
             available_uris.add (uri);
             display_name = pkginfo.application_name;
             comment = "";
@@ -789,6 +805,36 @@
           }
           this.runner.add_history (orig);
         }
+      else if (uri.has_prefix ("unity-available-apps://"))
+        { 
+          /* Clear the group */
+          Dee.Model results_model = applications.entry_renderer_info.results_model;
+          unowned Dee.ModelIter dum, iter = results_model.get_first_iter ();
+          unowned Dee.ModelIter end = results_model.get_last_iter ();
+          while (iter != end)
+            {
+              if (results_model.get_uint32 (iter, ResultsColumn.GROUP_ID) == Group.AVAILABLE_SAMPLE)
+                {
+                  dum = iter;
+                  iter = results_model.next (iter);
+                  results_model.remove (dum);
+                }
+              else
+                {
+                  iter = results_model.next (iter);
+                }
+            }
+          
+          /* Reload query results for the group */
+          var query = uri.offset (23);
+          var results = pkgsearcher.search (query, -1,
+                                            Unity.Package.SearchType.EXACT,
+                                            Unity.Package.Sort.BY_NAME);
+          add_pkg_search_result (results,
+                                 new HashSet<string>(), new HashSet<string>(),
+                                 results_model, Group.AVAILABLE);
+          return ActivationStatus.ACTIVATED_SHOW_DASH;
+        }
       else
         {
           debug ("Declined activation of URI '%s': Expected URI scheme unity-install:// or unity-runner://", uri);
 
=== modified file 'src/schemas.vala'
--- src/schemas.vala	2011-03-10 10:56:46 +0000
+++ src/schemas.vala	2011-04-08 13:53:23 +0000
@@ -65,6 +65,7 @@
     MOST_USED,
     INSTALLED,
     AVAILABLE,
+    AVAILABLE_SAMPLE,
     EMPTY_SEARCH,
     EMPTY_SECTION
   }