Merge lp:~unity-team/unity/njpatel-fixes-2010-09-14 into lp:unity

[Neil J. Patel]

Bugs linked

[Mirco Müller (macslow)]

Looking good, compiled, runs... approved.

review: Approve

=== modified file 'unity-private/places/places-default-renderer-group.vala'
--- unity-private/places/places-default-renderer-group.vala	2010-09-09 09:03:46 +0000
+++ unity-private/places/places-default-renderer-group.vala	2010-09-14 15:01:01 +0000
@@ -64,7 +64,7 @@
     private MoreResultsButton? more_results_button;
 
     /* Some caching to speed up lookups */
-    private uint          n_results = 0;
+    public  uint          n_results = 0;
     private bool          dirty = false;
 
     private bool          allow_expand = true;

=== modified file 'unity-private/places/places-default-renderer.vala'
--- unity-private/places/places-default-renderer.vala	2010-09-03 11:15:21 +0000
+++ unity-private/places/places-default-renderer.vala	2010-09-14 15:01:01 +0000
@@ -341,6 +341,31 @@
 
     }
 
+    private void activate_default ()
+    {
+      var children = box.get_children ();
+      foreach (Clutter.Actor child in children)
+        {
+          DefaultRendererGroup group = child as DefaultRendererGroup;
+
+          if (group.n_results > 0)
+            {
+              unowned Dee.ModelIter iter = results_model.get_first_iter ();
+              while (!results_model.is_last (iter))
+                {
+                  if (results_model.get_uint (iter, 2) == group.group_id)
+                    {
+                      activated (results_model.get_string (iter, 0),
+                                 results_model.get_string (iter, 3));
+                      break;
+                    }
+                  iter = results_model.next (iter);
+                }
+              break;
+            }
+        }
+    }
+
     private void on_group_added (Dee.Model model, Dee.ModelIter iter)
     {
       string renderer = model.get_string (iter, 0);

=== modified file 'unity-private/places/places-folder-browser-renderer.vala'
--- unity-private/places/places-folder-browser-renderer.vala	2010-07-28 22:48:11 +0000
+++ unity-private/places/places-folder-browser-renderer.vala	2010-09-14 15:01:01 +0000
@@ -26,6 +26,7 @@
 
     private Ctk.VBox box;
     private Dee.Model results_model;
+    private DefaultRendererGroup group;
 
     public FolderBrowserRenderer ()
     {
@@ -51,14 +52,24 @@
     {
       results_model = results;
 
-      var group = new DefaultRendererGroup (0,
-                                            "UnityFolderGroupRenderer",
-                                            "__you_cant_see_me__",
-                                            "gtk-apply",
-                                            results);
+      group = new DefaultRendererGroup (0,
+                                        "UnityFolderGroupRenderer",
+                                        "__you_cant_see_me__",
+                                        "gtk-apply",
+                                        results);
 
       group.activated.connect ((u, m) => { activated (u, m); } );
       box.pack (group, false, true);
     }
+
+    public void activate_default ()
+    {
+      if (group.n_results > 0)
+        {
+          unowned Dee.ModelIter iter = results_model.get_first_iter ();
+          activated (results_model.get_string (iter, 0),
+                     results_model.get_string (iter, 3));
+        }
+    }
   }
 }

=== modified file 'unity-private/places/places-place-home-renderer.vala'
--- unity-private/places/places-place-home-renderer.vala	2010-09-02 19:19:10 +0000
+++ unity-private/places/places-place-home-renderer.vala	2010-09-14 15:01:01 +0000
@@ -128,6 +128,11 @@
 
     }
 
+    public void activate_default ()
+    {
+
+    }
+
     /*
      * Private Methods
      */

=== modified file 'unity-private/places/places-place-search-bar.vala'
--- unity-private/places/places-place-search-bar.vala	2010-08-26 06:57:58 +0000
+++ unity-private/places/places-place-search-bar.vala	2010-09-14 15:01:01 +0000
@@ -30,8 +30,8 @@
     private PlaceSearchBarBackground bg;
 
     private PlaceSearchNavigation  navigation;
-    private PlaceSearchEntry       entry;
-    private PlaceSearchSectionsBar sections;
+    public  PlaceSearchEntry       entry;
+    public  PlaceSearchSectionsBar sections;
 
     public PlaceSearchBar ()
     {

=== modified file 'unity-private/places/places-place-search-sections-bar.vala'
--- unity-private/places/places-place-search-sections-bar.vala	2010-08-26 07:52:44 +0000
+++ unity-private/places/places-place-search-sections-bar.vala	2010-09-14 15:01:01 +0000
@@ -47,6 +47,7 @@
 
     private PlaceEntry? active_entry = null;
     private Section?    active_section = null;
+    public  uint        active_section_n = 0;
     private CairoCanvas bg;
 
     private unowned Dee.Model? sections_model = null;
@@ -81,7 +82,10 @@
       unowned Section? section = list.nth_data<unowned Clutter.Actor>(section_id) as Section;
 
       if (section is Section)
-        on_section_clicked_real (section);
+        {
+          on_section_clicked_real (section);
+          active_section_n = section_id;
+        }
     }
 
     public void set_active_entry (PlaceEntry entry)
@@ -190,6 +194,7 @@
           active_section = section;
           section.active = true;
           active_entry.set_active_section (0);
+          active_section_n = 0;
         }
   
       sort_children ((CompareFunc)sort_sections);
@@ -222,6 +227,7 @@
             {
               active_section = get_section_for_iter (model.get_first_iter ());
               active_entry.set_active_section (0);
+              active_section_n = 0;
             }
           section.start_destroy ();
         }
@@ -234,6 +240,7 @@
       active_section.active = true;
       var pos = active_section.model.get_position (active_section.iter);
       active_entry.set_active_section (pos);
+      active_section_n = pos;
 
       bg.update ();
     }

=== modified file 'unity-private/places/places-place.vala'
--- unity-private/places/places-place.vala	2010-09-14 12:00:51 +0000
+++ unity-private/places/places-place.vala	2010-09-14 15:01:01 +0000
@@ -253,8 +253,7 @@
       }
     }
 
-    /* Private Methods */
-    private async void activate_fallback (string uri)
+    public static async void activate_fallback (string uri)
     {
       if (uri.has_prefix ("application://"))
         {
@@ -298,7 +297,8 @@
          warning ("Unable to launch: %s\n", eee.message);
        }
     }
-    
+   
+    /* Private Methods */
     private void on_service_entry_added (dynamic DBus.Object   dbus_object,
                                          ValueArray            info)
     {

=== modified file 'unity-private/places/places-view.vala'
--- unity-private/places/places-view.vala	2010-09-02 19:19:10 +0000
+++ unity-private/places/places-view.vala	2010-09-14 15:01:01 +0000
@@ -47,6 +47,8 @@
     construct
     {
       about_to_show ();
+
+      shell.get_stage ().captured_event.connect (on_stage_event_captured);
     }
 
     public void about_to_show ()
@@ -71,6 +73,11 @@
       search_bar = new PlaceSearchBar ();
       content_box.pack (search_bar, false, true);
       search_bar.show ();
+      search_bar.entry.text.captured_event.connect (on_stage_event_captured);
+      search_bar.entry.text.activatable = true;
+      search_bar.entry.text.activate.connect (() => {
+        renderer.activate_default ();                                        
+      });
 
       layered_bin = new LayeredBin ();
       content_box.pack (layered_bin, true, true);
@@ -176,6 +183,13 @@
 
     private void on_result_activated (string uri, string mimetype)
     {
+      if (active_entry.parent is Place == false)
+        {
+          Place.activate_fallback.begin (uri);
+          global_shell.hide_unity ();
+          return;
+        }
+
       ActivationStatus result = active_entry.parent.activate (uri, mimetype);
       
       switch (result)
@@ -192,6 +206,30 @@
           break;
       }
     }
+
+    private bool on_stage_event_captured (Clutter.Event event)
+    {
+      if (event.type == Clutter.EventType.KEY_PRESS)
+        {
+          var ev = event.key;
+
+          if (ev.keyval == 0xff1b) /* Escape */
+            {
+              /* Try and do a context pop */
+              if (search_bar.sections.active_section_n != 0)
+                {
+                  search_bar.sections.set_active_section (0);
+                }
+              else
+                {
+                  shell.hide_unity ();
+                }
+              return true;
+            }
+        }
+
+      return false;
+    }
   }
 }
 

=== modified file 'unity/unity-place-renderer.vala'
--- unity/unity-place-renderer.vala	2010-07-28 22:48:11 +0000
+++ unity/unity-place-renderer.vala	2010-09-14 15:01:01 +0000
@@ -30,6 +30,8 @@
                                      Dee.Model                   results,
                                      Gee.HashMap<string, string> hints);
 
+    public abstract void activate_default ();
+
     public signal void activated (string uri, string mimetype);
   }
 }