Merge lp:~unity-team/unity/more-places into lp:unity

[Neil J. Patel]

- Fixes some spacing
- Cleans up group-render implementation by moving the logic to the Tile class
- Adds support for loading icons
- Adds support for loading application icons
- Adds support for launching desktop files

This is mostly some polish for this release. I need to clean this up and separate out some of the pieces for next weeks release, including the new expanding group view and a pixbuf cache

[Mikkel Kamstrup Erlandsen (kamstrup)]

Approved!

It seems to be a bit heavy on the IO since you create all those GDesktopAppInfo's (which parses the keyfile each time I believe) but it works fine. I think we should address that later with some caching magic.

review: Approve

=== modified file 'unity-private/places/places-default-renderer-group.vala'
--- unity-private/places/places-default-renderer-group.vala	2010-06-22 12:37:45 +0000
+++ unity-private/places/places-default-renderer-group.vala	2010-06-24 14:39:27 +0000
@@ -84,6 +84,15 @@
       pack (renderer, true, true);
       renderer.show ();
 
+      unowned Dee.ModelIter iter = results.get_first_iter ();
+      while (!results.is_last (iter))
+        {
+          if (interesting (iter))
+            on_result_added (iter);
+
+          iter = results.next (iter);
+        }
+
       results.row_added.connect (on_result_added);
       results.row_removed.connect (on_result_removed);
     }
@@ -114,29 +123,15 @@
       if (!interesting (iter))
         return;
 
-      var button = new Tile ();
-      button.set_label (results.get_string (iter, 4));
-      unowned Ctk.Text text = button.get_text ();
-      text.ellipsize = Pango.EllipsizeMode.END;
-      button.get_image ().set_from_stock ("text-x-preview");
+      var button = new Tile (iter,
+                             results.get_string (iter, 0),
+                             results.get_string (iter, 1),
+                             results.get_string (iter, 3),
+                             results.get_string (iter, 4),
+                             results.get_string (iter, 5));
       renderer.add_actor (button);
       button.show ();
 
-      button.set_data<unowned Dee.ModelIter> ("model-iter", iter);
-      button.set_data<string> ("uri", "%s".printf (results.get_string (iter, 0)));
-      button.clicked.connect ((b) => {
-        unowned string uri = b.get_data<unowned string> ("uri");
-
-        print (@"Launching $uri\n");
-        try {
-          Gtk.show_uri (Gdk.Screen.get_default (),
-                        uri,
-                        0);
-         } catch (GLib.Error e) {
-           warning ("Unable to launch: %s", e.message);
-         }
-      });
-
       show ();
     }
 
@@ -148,10 +143,9 @@
       var children = renderer.get_children ();
       foreach (Clutter.Actor actor in children)
         {
-          unowned Dee.ModelIter i;
+          Tile tile = actor as Tile;
 
-          i = actor.get_data<unowned Dee.ModelIter> ("model-iter");
-          if (i == iter)
+          if (tile.iter == iter)
             {
               actor.destroy ();
               break;
@@ -170,9 +164,40 @@
 
   public class Tile : Ctk.Button
   {
-    public Tile ()
-    {
-      Object (orientation:Ctk.Orientation.VERTICAL);
+    public unowned Dee.ModelIter iter { get; construct; }
+
+    public string  display_name { get; construct; }
+    public string? icon_hint    { get; construct; }
+    public string  uri          { get; construct; }
+    public string? mimetype     { get; construct; }
+    public string? comment      { get; construct; }
+
+    public Tile (Dee.ModelIter iter,
+                 string        uri,
+                 string?       icon_hint,
+                 string?       mimetype,
+                 string        display_name,
+                 string?       comment)
+    {
+      Object (orientation:Ctk.Orientation.VERTICAL,
+              iter:iter,
+              display_name:display_name,
+              icon_hint:icon_hint,
+              uri:uri,
+              mimetype:mimetype,
+              comment:comment);
+    }
+
+    construct
+    {
+      set_label (display_name);
+
+      unowned Ctk.Text text = get_text ();
+      text.ellipsize = Pango.EllipsizeMode.END;
+
+      get_image ().set_from_stock ("text-x-preview");
+
+      Idle.add (load_icon);
     }
 
     private override void get_preferred_width (float for_height,
@@ -182,6 +207,78 @@
       mwidth = 160.0f;
       nwidth = 160.0f;
     }
+
+    private override void clicked ()
+    {
+      debug (@"Launching $uri");
+
+      if (uri.has_prefix ("application://"))
+        {
+          var id = uri.offset ("application://".length);
+
+          var info = new GLib.DesktopAppInfo (id);
+          if (info is GLib.DesktopAppInfo)
+            {
+              try {
+                info.launch (null,null);
+
+              } catch (Error e) {
+                warning ("Unable to launch desktop file %s: %s\n",
+                         id,
+                         e.message);
+              }
+            }
+          else
+            {
+              warning ("%s is an invalid DesktopAppInfo id\n", id);
+            }
+          return;
+        }
+
+      try {
+        Gtk.show_uri (Gdk.Screen.get_default (),
+                      uri,
+                      0);
+       } catch (GLib.Error e) {
+         warning ("Unable to launch: %s\n", e.message);
+       }
+    }
+
+    private bool load_icon ()
+    {
+      if (uri.has_prefix ("application://"))
+        {
+          var id = uri.offset ("application://".length);
+          var info = new GLib.DesktopAppInfo (id);
+
+          if (info is GLib.DesktopAppInfo)
+            {
+              var icon = info.get_icon ();
+              if (icon is GLib.ThemedIcon)
+                get_image ().set_from_gicon (icon);
+              else if (icon is GLib.FileIcon)
+                {
+                  var file = (icon as GLib.FileIcon).get_file ();
+                  get_image ().set_from_filename (file.get_path ());
+                }
+            }
+        }
+      else if (mimetype != null)
+        {
+          var icon = GLib.g_content_type_get_icon (mimetype) as ThemedIcon;
+          if (icon is GLib.ThemedIcon)
+            {
+              get_image ().set_from_gicon (icon);
+            }
+          else if (icon is GLib.FileIcon)
+            {
+              var file = (icon as GLib.FileIcon).get_file ();
+              get_image ().set_from_filename (file.get_path ());
+            }
+        }
+
+      return false;
+    }
   }
 }
 

=== modified file 'unity-private/places/places-default-renderer.vala'
--- unity-private/places/places-default-renderer.vala	2010-06-22 12:37:45 +0000
+++ unity-private/places/places-default-renderer.vala	2010-06-24 14:39:27 +0000
@@ -37,7 +37,7 @@
     {
       padding = { 0.0f, 0.0f, PADDING, 0.0f };
       box = new Ctk.VBox (SPACING);
-      box.padding = { PADDING, PADDING, PADDING , PADDING};
+      box.padding = { 0.0f, PADDING, PADDING , PADDING};
       box.homogeneous = false;
       add_actor (box);
       box.show ();
@@ -53,6 +53,14 @@
       groups_model = groups;
       results_model = results;
 
+      unowned Dee.ModelIter iter = groups.get_first_iter ();
+      while (!groups.is_last (iter))
+        {
+          on_group_added (groups, iter);
+
+          iter = groups.next (iter);
+        }
+
       groups_model.row_added.connect (on_group_added);
       groups_model.row_removed.connect (on_group_removed);
     }

=== modified file 'unity-private/places/places-place.vala'
--- unity-private/places/places-place.vala	2010-06-19 15:00:43 +0000
+++ unity-private/places/places-place.vala	2010-06-24 14:39:27 +0000
@@ -174,7 +174,7 @@
     private void on_service_entry_added (dynamic DBus.Object   dbus_object,
                                          ValueArray            info)
     {
-      debug (@"EntryAdded %s", info.get_nth (0).get_string ());
+      debug ("EntryAdded %s", info.get_nth (0).get_string ());
       /* This is a new entry */
       var entry = new PlaceEntry (dbus_name,
                                   info.get_nth (0).get_string ());
@@ -213,7 +213,7 @@
       var groups = file.get_groups ();
       foreach (string group in groups)
         {
-          if (group.has_prefix (ENTRY_PREFIX))
+          if (true == false) //group.has_prefix (ENTRY_PREFIX))
             {
               PlaceEntry? entry = load_entry_from_keyfile (file, group);
               if (entry is PlaceEntry)