Merge lp:~unity-team/unity/browse-in-nautilus into lp:unity

[Mikkel Kamstrup Erlandsen]

Please note the FIXME at the bottom here. Also note that you'll need latest lp:unity-place-files and lp:unity-asset-pool in order to test this:

Adds support for the UnityExtraAction hint. Which can be used for place daemons to register a small icon that launches some extra feature for the currently displayed dataset.

In particular this is used by the files daemon to show a small "Browse current folder in Nautilus" button when in folder browsing mode.

NJPATEL FIXME: The ExtraAction widget which I am are packing in the search bar needs to be right aligned. I could not figure out how to do that.

[Neil J. Patel (njpatel)]

Approved pending the inclusion of the hide_unity call

=== modified file 'unity-private/Makefile.am'
--- unity-private/Makefile.am	2010-09-13 15:09:55 +0000
+++ unity-private/Makefile.am	2010-09-16 14:37:48 +0000
@@ -107,6 +107,7 @@
   places/places-place.vala \
   places/places-place-search-bar.vala \
   places/places-place-search-entry.vala \
+  places/places-place-search-extra-action.vala \
   places/places-place-search-navigation.vala \
   places/places-place-search-sections-bar.vala \
   places/places-trash-controller.vala \

=== modified file 'unity-private/places/places-place-search-bar.vala'
--- unity-private/places/places-place-search-bar.vala	2010-09-13 22:00:38 +0000
+++ unity-private/places/places-place-search-bar.vala	2010-09-16 14:37:48 +0000
@@ -32,6 +32,7 @@
     private PlaceSearchNavigation  navigation;
     public  PlaceSearchEntry       entry;
     public  PlaceSearchSectionsBar sections;
+    public  PlaceSearchExtraAction extra_action;
 
     public PlaceSearchBar ()
     {
@@ -63,7 +64,17 @@
 
       sections = new PlaceSearchSectionsBar ();
       pack (sections, false, true);
-      entry.show ();
+      sections.show ();
+
+      /* We need a dummy to be able to space the action label */
+      var space = new Clutter.Rectangle.with_color ({255, 255, 255, 0});
+      pack (space, true, true);
+      space.show ();
+      
+      extra_action = new PlaceSearchExtraAction ();
+      pack (extra_action, false, true);
+      extra_action.hide (); /* hidden by default */
+      extra_action.activated.connect (on_extra_action_activated);
 
       bg = new PlaceSearchBarBackground (navigation, entry);
       set_background (bg);
@@ -126,6 +137,30 @@
           active_entry.set_search (text, hints);
         }
     }
+    
+    private void on_extra_action_activated ()
+    {
+      if (active_entry is PlaceEntry)
+        {
+          /* The UnityExtraAction spec mandates that we send the special URI
+           * "." when the extra action is triggered */
+          ActivationStatus result = active_entry.parent.activate (".", "");
+      
+          switch (result)
+          {
+            case ActivationStatus.ACTIVATED_SHOW_DASH:
+              break;
+            case ActivationStatus.NOT_ACTIVATED:
+            case ActivationStatus.ACTIVATED_HIDE_DASH:          
+            case ActivationStatus.ACTIVATED_FALLBACK:
+              global_shell.hide_unity ();
+              break;
+            default:
+              warning ("Unexpected activation status: %u", result);
+              break;
+          }
+        }
+    }
 
     /*
      * Public Methods
@@ -146,6 +181,18 @@
       navigation.set_active_entry (entry);
       this.entry.set_active_entry (entry);
       this.entry.text.grab_key_focus ();
+      
+      if (entry.hints != null)
+        {
+          if (entry.hints["UnityExtraAction"] != null)
+            {
+              extra_action.set_icon_from_gicon_string (
+                                               entry.hints["UnityExtraAction"]);
+              extra_action.show ();
+            }
+          else
+            extra_action.hide ();
+        }
     }
   }
 

=== added file 'unity-private/places/places-place-search-extra-action.vala'
--- unity-private/places/places-place-search-extra-action.vala	1970-01-01 00:00:00 +0000
+++ unity-private/places/places-place-search-extra-action.vala	2010-09-16 14:37:48 +0000
@@ -0,0 +1,220 @@
+/*
+ * Copyright (C) 2010 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by
+ *               Neil Jagdish Patel <[e-mail]>
+ *               Mikkel Kamstrup Erlandsen <[e-mail]>
+ *
+ */
+
+using Unity;
+
+namespace Unity.Places
+{
+  public class PlaceSearchExtraAction : Ctk.Bin
+  {
+    static const float PADDING = 4.0f;
+
+    private CairoCanvas    bg;
+    public  Ctk.Image      image;
+    private Clutter.Color  color;
+    private Ctk.EffectGlow glow;
+
+    public float destroy_factor {
+        get { return _destroy_factor; }
+        set { _destroy_factor = value; queue_relayout (); }
+    }
+
+    public float resize_factor {
+        get { return _resize_factor; }
+        set { _resize_factor = value; queue_relayout (); }
+    }
+
+    public signal void activated ();
+
+    private float _destroy_factor = 1.0f;
+    private float _resize_factor = 1.0f;
+    private float _last_width = 0.0f;
+    private float _resize_width = 0.0f;
+
+    public PlaceSearchExtraAction ()
+    {
+      Object (reactive:true);
+    }
+
+    construct
+    {
+      color.alpha = 255;
+
+      padding = { PADDING, PADDING, PADDING, PADDING };
+
+      bg = new CairoCanvas (paint_bg);
+      set_background (bg);
+      bg.show ();
+
+      glow = new Ctk.EffectGlow ();
+      glow.set_color ({ 255, 255, 255, 255 });
+      glow.set_factor (1.0f);
+      glow.set_margin (5);
+      //add_effect (glow);
+
+      image = new Ctk.Image (22);
+      add_actor (image);
+      image.show ();
+    }
+
+    public void set_icon_from_gicon_string (string icon_string)
+    {
+      PixbufCache.get_default ().set_image_from_gicon_string (image,
+                                                              icon_string,
+                                                              22);
+      glow.set_invalidate_effect_cache (true);
+    }
+
+    private override void get_preferred_width (float     for_height,
+                                               out float min_width,
+                                               out float nat_width)
+    {
+     float mw, nw;
+
+     base.get_preferred_width (for_height, out mw, out nw);
+
+     min_width = (mw + padding.right + padding.left) * _destroy_factor;
+     nat_width = (nw + padding.right + padding.left) * _destroy_factor;
+
+     if (_last_width ==0.0f)
+       _last_width = nat_width;
+
+     if (_last_width != nat_width  && _resize_factor == 1.0)
+       {
+         _resize_factor = 0.0f;
+         animate (Clutter.AnimationMode.EASE_OUT_QUAD, 100,
+                  "resize_factor", 1.0f);
+
+        _resize_width = _last_width;
+        _last_width = nat_width;
+       }
+
+     if (_resize_factor != 1.0f)
+       {
+         min_width = _resize_width + ((min_width - _resize_width) * _resize_factor);
+         nat_width = _resize_width + ((nat_width - _resize_width) * _resize_factor);
+       }
+    }
+
+    private override bool enter_event (Clutter.Event e)
+    {
+      state = Ctk.ActorState.STATE_PRELIGHT;
+      bg.update ();
+      return true;
+    }
+
+    private override bool leave_event (Clutter.Event e)
+    {
+      state = Ctk.ActorState.STATE_NORMAL;
+      bg.update ();
+      return true;
+    }
+
+    private override bool button_press_event (Clutter.Event e)
+    {
+      state = Ctk.ActorState.STATE_SELECTED;
+      bg.update ();
+      return false;
+    }
+
+    private override bool button_release_event (Clutter.Event e)
+    {
+      state = Ctk.ActorState.STATE_PRELIGHT;
+      bg.update ();
+      activated ();
+      return false;
+    }
+
+    private void paint_bg (Cairo.Context cr, int width, int height)
+    {
+      cr.set_operator (Cairo.Operator.CLEAR);
+      cr.paint ();
+
+      cr.set_operator (Cairo.Operator.OVER);
+      cr.set_line_width (1.5);
+      cr.set_source_rgba (1.0, 1.0, 1.0, 0.0);
+
+      cr.translate (0.5, 0.5);
+
+      var x = 0;
+      var y = 0;
+      width -= 1;
+      height -= 1;
+      var radius = 10;
+
+      cr.move_to  (x, y + radius);
+      cr.curve_to (x, y,
+                   x, y,
+                   x + radius, y);
+      cr.line_to  (width - radius, y);
+      cr.curve_to (width, y,
+                   width, y,
+                   width, y + radius);
+      cr.line_to  (width, height - radius);
+      cr.curve_to (width, height,
+                   width, height,
+                   width - radius, height);
+      cr.line_to  (x + radius, height);
+      cr.curve_to (x, height,
+                   x, height,
+                   x, height - radius);
+      cr.close_path ();
+
+      if (state == Ctk.ActorState.STATE_SELECTED)
+        {
+          cr.set_source_rgba (1.0, 1.0, 1.0, 1.0);
+        }
+      else if (state == Ctk.ActorState.STATE_PRELIGHT)
+        {
+          var pattern = new Cairo.Surface.similar (cr.get_target (),
+                                                   Cairo.Content.COLOR_ALPHA,
+                                                   4, 4);
+          var context = new Cairo.Context (pattern);
+          
+          context.set_operator (Cairo.Operator.CLEAR);
+          context.paint ();
+
+          context.set_line_width (0.2);
+          context.set_operator (Cairo.Operator.OVER);
+          context.set_source_rgba (1.0, 1.0, 1.0, 0.85);
+
+          context.move_to (0, 0);
+          context.line_to (4, 4);
+
+          context.stroke ();
+
+          var pat = new Cairo.Pattern.for_surface (pattern);
+          pat.set_extend (Cairo.Extend.REPEAT);
+          cr.set_source (pat);
+        }
+      else
+        {
+          cr.set_source_rgba (1.0, 1.0, 1.0, 0.0);
+        }
+
+      cr.fill_preserve ();
+
+      cr.set_source_rgba (1.0, 1.0, 1.0,
+                          state == Ctk.ActorState.STATE_NORMAL ? 0.0 : 0.5);
+      cr.stroke ();            
+    }
+  }
+}

=== modified file 'unity-private/places/places-place.vala'
--- unity-private/places/places-place.vala	2010-09-14 15:47:48 +0000
+++ unity-private/places/places-place.vala	2010-09-16 14:37:48 +0000
@@ -217,7 +217,9 @@
     {
       bool remote_activation = false;
     
-      if (uri_regex != null && uri_regex.match (uri))
+      if (uri == ".")
+        remote_activation = true;
+      else if (uri_regex != null && uri_regex.match (uri))
         remote_activation = true;
       else if (mime_regex != null && mime_regex.match (mimetype))
         remote_activation = true;