Merge lp:~unity-team/unity/more-dash-fixes-2011-02-24 into lp:unity

[Neil J. Patel]

- You'll need nux trunk
- Bugs linked
- Lots and lots of other stuff, this is branch 2/4 for the A3 release so, yeah, somethings still don't work :)

[Neil J. Patel (njpatel)]

Awesome, totally didn't realise that this branch was all about the features :) This is what should work:

- Groups have icons
- Search hint behind text entry
- text entry has big text
- you don't get the "Search for foo" thing anymore when a search fails (this is temporary)
- everything paints properly

=== modified file 'src/DeviceLauncherIcon.cpp'
--- src/DeviceLauncherIcon.cpp	2011-02-22 13:46:36 +0000
+++ src/DeviceLauncherIcon.cpp	2011-02-24 15:01:07 +0000
@@ -60,42 +60,15 @@
   
   {
     GIcon *icon;
+    gchar *icon_string;
 
     icon = g_volume_get_icon (_volume);
-    if (G_IS_THEMED_ICON (icon))
-    {
-      const gchar * const *names;
-
-      names = g_themed_icon_get_names (G_THEMED_ICON (icon));
-
-      if (names)
-        SetIconName (names[0]);
-      else
-        SetIconName (DEFAULT_ICON);
-    }
-    else if (G_IS_FILE_ICON (icon))
-    {
-      GFile *file;
-
-      file = g_file_icon_get_file (G_FILE_ICON (icon));
-      if (file)
-      {
-        gchar *path;
-
-        path = g_file_get_path (file);
-        SetIconName (path);
-
-        g_free (path);
-      }
-      else
-        SetIconName (DEFAULT_ICON);
-    }
-    else
-    {
-      SetIconName (DEFAULT_ICON);
-    }
+    icon_string = g_icon_to_string (icon);
+
+    SetIconName (icon_string);
 
     g_object_unref (icon);
+    g_free (icon_string);
   }
   
   SetQuirk (QUIRK_VISIBLE, true);

=== modified file 'src/IconTexture.cpp'
--- src/IconTexture.cpp	2011-02-22 23:37:17 +0000
+++ src/IconTexture.cpp	2011-02-24 15:01:07 +0000
@@ -41,7 +41,8 @@
 {
   _icon_name = g_strdup (icon_name ? icon_name : DEFAULT_ICON);
 
-  LoadIcon ();
+  if (!g_strcmp0 (_icon_name, "") == 0)
+    LoadIcon ();
 }
 
 IconTexture::~IconTexture ()

=== modified file 'src/LauncherIcon.cpp'
--- src/LauncherIcon.cpp	2011-02-24 09:29:49 +0000
+++ src/LauncherIcon.cpp	2011-02-24 15:01:07 +0000
@@ -229,16 +229,27 @@
   GtkIconInfo *info;
   nux::BaseTexture *result;
   GError *error = NULL;
-  
-  theme = gtk_icon_theme_get_default ();
-      
+  GIcon *icon;
+
   if (!icon_name)
     icon_name = g_strdup (DEFAULT_ICON);
    
-  info = gtk_icon_theme_lookup_icon (theme,
-                                     icon_name,
-                                     size,
-                                     (GtkIconLookupFlags) 0);            
+  theme = gtk_icon_theme_get_default ();
+  icon = g_icon_new_for_string (icon_name, NULL);
+
+  if (G_IS_ICON (icon))
+  {
+    info = gtk_icon_theme_lookup_by_gicon (theme, icon, size, (GtkIconLookupFlags)0);
+    g_object_unref (icon);
+  }
+  else
+  {   
+    info = gtk_icon_theme_lookup_icon (theme,
+                                       icon_name,
+                                       size,
+                                       (GtkIconLookupFlags) 0);
+  }
+
   if (!info)
   {
     info = gtk_icon_theme_lookup_icon (theme,
@@ -249,13 +260,16 @@
         
   if (gtk_icon_info_get_filename (info) == NULL)
   {
+    gtk_icon_info_free (info);
+
     info = gtk_icon_theme_lookup_icon (theme,
                                        DEFAULT_ICON,
                                        size,
                                        (GtkIconLookupFlags) 0);
   }
-  
+
   pbuf = gtk_icon_info_load_icon (info, &error);
+  gtk_icon_info_free (info);
 
   if (GDK_IS_PIXBUF (pbuf))
   {

=== modified file 'src/PanelIndicatorObjectEntryView.cpp'
--- src/PanelIndicatorObjectEntryView.cpp	2011-02-15 16:45:30 +0000
+++ src/PanelIndicatorObjectEntryView.cpp	2011-02-24 15:01:07 +0000
@@ -212,7 +212,7 @@
 
   if (_proxy->GetPixbuf () && _proxy->icon_visible)
   {
-    gdk_cairo_set_source_pixbuf (cr, pixbuf, x, (height - gdk_pixbuf_get_height (pixbuf))/2);
+    gdk_cairo_set_source_pixbuf (cr, pixbuf, x, (int)((height - gdk_pixbuf_get_height (pixbuf))/2));
     cairo_paint_with_alpha (cr, _proxy->icon_sensitive ? 1.0 : 0.5);
 
     x += icon_width + SPACING;
@@ -230,7 +230,7 @@
                            textshadowcol.GetGreen (),
                            textshadowcol.GetBlue (),
                            1.0f - textshadowcol.GetRed ());
-    cairo_move_to (cr, x, ((height - text_height)/2)-1);
+    cairo_move_to (cr, x, (int)(((height - text_height)/2)+1));
     pango_cairo_show_layout (cr, layout);
     cairo_stroke (cr);
 
@@ -240,7 +240,7 @@
                            textcol.GetGreen (),
                            textcol.GetBlue (),
                            _proxy->label_sensitive ? 1.0f : 0.0f);
-    cairo_move_to (cr, x, (height - text_height)/2);
+    cairo_move_to (cr, x, (int)((height - text_height)/2));
     pango_cairo_show_layout (cr, layout);
     cairo_stroke (cr);
   }
@@ -295,7 +295,7 @@
   PanelStyle *style = PanelStyle::GetDefault ();
   nux::Color bgtop = style->GetBackgroundTop ();
   nux::Color bgbot = style->GetBackgroundBottom ();
-  nux::Color line = style->GetTextShadow ();
+  nux::Color line = style->GetLineColor ();
 
   cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
 

=== modified file 'src/PanelStyle.cpp'
--- src/PanelStyle.cpp	2011-02-17 09:56:22 +0000
+++ src/PanelStyle.cpp	2011-02-24 15:01:07 +0000
@@ -81,11 +81,16 @@
   _text.SetBlue ((float) style->text[0].blue / (float) 0xffff);
   _text.SetAlpha (1.0f);
 
-  _text_shadow.SetRed ((float) style->dark[0].red / (float) 0xffff);
-  _text_shadow.SetGreen ((float) style->dark[0].green / (float) 0xffff);
-  _text_shadow.SetBlue ((float) style->dark[0].blue / (float) 0xffff);
+  _text_shadow.SetRed ((float) style->text[3].red / (float) 0xffff);
+  _text_shadow.SetGreen ((float) style->text[3].green / (float) 0xffff);
+  _text_shadow.SetBlue ((float) style->text[3].blue / (float) 0xffff);
   _text_shadow.SetAlpha (1.0f);
 
+  _line.SetRed ((float) style->dark[0].red / (float) 0xffff);
+  _line.SetGreen ((float) style->dark[0].green / (float) 0xffff);
+  _line.SetBlue ((float) style->dark[0].blue / (float) 0xffff);
+  _line.SetAlpha (1.0f);
+
   _bg_top.SetRed ((float) style->bg[1].red / (float) 0xffff);
   _bg_top.SetGreen ((float) style->bg[1].green / (float) 0xffff);
   _bg_top.SetBlue ((float) style->bg[1].blue / (float) 0xffff);
@@ -123,6 +128,12 @@
   return _text_shadow;
 }
 
+nux::Color&
+PanelStyle::GetLineColor ()
+{
+  return _line;
+}
+
 void
 PanelStyle::OnStyleChanged (GObject*    gobject,
                             GParamSpec* pspec,

=== modified file 'src/PanelStyle.h'
--- src/PanelStyle.h	2011-02-17 09:56:22 +0000
+++ src/PanelStyle.h	2011-02-24 15:01:07 +0000
@@ -52,6 +52,7 @@
     nux::Color& GetBackgroundTop ();
     nux::Color& GetBackgroundBottom ();
     nux::Color& GetTextShadow ();
+    nux::Color& GetLineColor ();
 
     GdkPixbuf * GetBackground (int width, int height);
 
@@ -74,6 +75,7 @@
     nux::Color         _bg_top;
     nux::Color         _bg_bottom;
     nux::Color         _text_shadow;
+    nux::Color         _line;
 };
 
 #endif // PANEL_STYLE_H

=== modified file 'src/PlaceEntry.h'
--- src/PlaceEntry.h	2011-02-22 13:14:15 +0000
+++ src/PlaceEntry.h	2011-02-24 15:01:07 +0000
@@ -86,6 +86,8 @@
   virtual DeeModel * GetResultsModel () = 0;
 
   virtual DeeModel * GetGlobalResultsModel () = 0;
+  virtual DeeModel * GetGlobalGroupsModel () = 0;
+
   // Signals
 
   sigc::signal<void, bool>                    active_changed;

=== modified file 'src/PlaceEntryHome.cpp'
--- src/PlaceEntryHome.cpp	2011-02-22 13:14:15 +0000
+++ src/PlaceEntryHome.cpp	2011-02-24 15:01:07 +0000
@@ -87,7 +87,7 @@
     iter = dee_model_append (_groups_model, "", text, entry->GetIcon ());
     _model_to_group[entry->GetGlobalResultsModel ()] = dee_model_get_position (_groups_model,
                                                                                iter);
-
+    _model_to_group_model[entry->GetGlobalResultsModel ()] = entry->GetGlobalGroupsModel ();
     g_signal_connect (entry->GetGlobalResultsModel (), "row-added",
                       (GCallback)&PlaceEntryHome::OnResultAdded, this);
     g_signal_connect (entry->GetGlobalResultsModel (), "row-removed",
@@ -110,6 +110,10 @@
 void
 PlaceEntryHome::OnResultAdded (DeeModel *model, DeeModelIter *iter, PlaceEntryHome *self)
 {
+  // FIXME: This is a hack
+  if (dee_model_get_uint32 (model, iter, RESULT_GROUP_ID) == 5)
+    return;
+
   dee_model_append (self->_results_model,
                     dee_model_get_string (model, iter, RESULT_URI),
                     dee_model_get_string (model, iter, RESULT_ICON),
@@ -126,6 +130,10 @@
   DeeModelIter *iter, *end;
   const char   *uri;
 
+  // FIXME: This is a hack
+  if (dee_model_get_uint32 (model, it, RESULT_GROUP_ID) == 5)
+    return;
+
   uri = dee_model_get_string (model, it, RESULT_URI);
 
   iter = dee_model_get_first_iter (self->_results_model);
@@ -152,7 +160,7 @@
 const gchar *
 PlaceEntryHome::GetName ()
 {
-  return _("Global Search");
+  return "";
 }
 
 const gchar *

=== modified file 'src/PlaceEntryHome.h'
--- src/PlaceEntryHome.h	2011-02-22 13:14:15 +0000
+++ src/PlaceEntryHome.h	2011-02-24 15:01:07 +0000
@@ -65,6 +65,7 @@
   DeeModel * GetResultsModel ();
 
   DeeModel * GetGlobalResultsModel () { return NULL; };
+  DeeModel * GetGlobalGroupsModel () { return NULL; };
 
 private:
   void LoadExistingEntries ();
@@ -85,6 +86,7 @@
   std::map<char *, gchar *> _hints;
 
   std::map<DeeModel *, int> _model_to_group;
+  std::map<DeeModel *, DeeModel *> _model_to_group_model;
   std::vector<PlaceEntry *> _entries;
 };
 

=== modified file 'src/PlaceEntryRemote.cpp'
--- src/PlaceEntryRemote.cpp	2011-02-22 13:14:15 +0000
+++ src/PlaceEntryRemote.cpp	2011-02-24 15:01:07 +0000
@@ -55,6 +55,7 @@
   _groups_model (NULL),
   _results_model (NULL),
   _global_results_model (NULL),
+  _global_groups_model (NULL),
   _previous_search (NULL),
   _previous_section (G_MAXUINT32)
 {
@@ -76,6 +77,7 @@
   g_object_unref (_groups_model);
   g_object_unref (_results_model);
   g_object_unref (_global_results_model);
+  g_object_unref (_global_groups_model);
 }
 
 void
@@ -331,6 +333,12 @@
   return _global_results_model;
 }
 
+DeeModel *
+PlaceEntryRemote::GetGlobalGroupsModel ()
+{
+  return _global_groups_model;
+}
+
 /* Other methods */
 bool
 PlaceEntryRemote::IsValid ()
@@ -379,7 +387,7 @@
     _state_changed = true;
   }
   
-  if (g_strcmp0 (_icon, icon) != 0)
+  if (g_strcmp0 ("", icon) != 0 && g_strcmp0 (_icon, icon) != 0)
   {
     g_free (_icon);
     _icon = g_strdup (icon);
@@ -449,7 +457,17 @@
   // FIXME: Spec says if global_renderer == "", then ShowInGlobal () == false, but currently
   //        both places return ""
 
-  // FIXME: Handle global groups model name
+  if (!DEE_IS_SHARED_MODEL (_global_groups_model) ||
+      g_strcmp0 (dee_shared_model_get_swarm_name (DEE_SHARED_MODEL (_global_groups_model)), global_groups_model) != 0)
+  {
+    if (DEE_IS_SHARED_MODEL (_global_groups_model))
+      g_object_unref (_global_groups_model);
+
+    _global_groups_model = dee_shared_model_new (global_groups_model);
+    dee_model_set_schema (_global_groups_model, "s", "s", "s", NULL);
+
+    _global_renderer_changed = true;
+  }
 
   if (!DEE_IS_SHARED_MODEL (_global_results_model) ||
       g_strcmp0 (dee_shared_model_get_swarm_name (DEE_SHARED_MODEL (_global_results_model)), global_results_model) != 0)

=== modified file 'src/PlaceEntryRemote.h'
--- src/PlaceEntryRemote.h	2011-02-22 13:14:15 +0000
+++ src/PlaceEntryRemote.h	2011-02-24 15:01:07 +0000
@@ -67,6 +67,7 @@
   DeeModel * GetResultsModel ();
 
   DeeModel * GetGlobalResultsModel ();
+  DeeModel * GetGlobalGroupsModel ();
 
   /* Other methods */
   bool          IsValid ();
@@ -119,6 +120,7 @@
   DeeModel *_results_model;
 
   DeeModel *_global_results_model;
+  DeeModel *_global_groups_model;
 
   gchar    *_previous_search;
   guint32   _previous_section;

=== modified file 'src/PlacesGroup.cpp'
--- src/PlacesGroup.cpp	2011-02-22 23:37:17 +0000
+++ src/PlacesGroup.cpp	2011-02-24 15:01:07 +0000
@@ -51,23 +51,22 @@
   //~ OnMouseEnter.connect (sigc::mem_fun (this, &PlacesGroup::RecvMouseEnter));
   //~ OnMouseLeave.connect (sigc::mem_fun (this, &PlacesGroup::RecvMouseLeave));
 
+  _icon_texture = new IconTexture ("", 24);
+  _icon_texture->SetMinimumSize (24, 24);
+
   _label = new nux::StaticCairoText ("", NUX_TRACKER_LOCATION);
-  _label->SetFont ("Ubuntu normal 11");
   _label->SetTextEllipsize (nux::StaticCairoText::NUX_ELLIPSIZE_END);
   _label->SetTextAlignment (nux::StaticCairoText::NUX_ALIGN_LEFT);
-  _label->SetMaximumWidth (320);
-  _label->SetMinimumWidth (1);
 
   _title = new nux::StaticCairoText ("", NUX_TRACKER_LOCATION);
-  _title->SetFont ("Ubuntu normal 11");
   _title->SetTextEllipsize (nux::StaticCairoText::NUX_ELLIPSIZE_END);
-  _title->SetTextAlignment (nux::StaticCairoText::NUX_ALIGN_RIGHT);
-  _title->SetMaximumWidth (320);
-  _title->SetMinimumWidth (1);
+  _title->SetTextAlignment (nux::StaticCairoText::NUX_ALIGN_LEFT);
 
   _header_layout = new nux::HLayout ("", NUX_TRACKER_LOCATION);
+  _header_layout->SetHorizontalInternalMargin (12);
 
-  _header_layout->AddView (_title, 0, nux::MINOR_POSITION_TOP, nux::MINOR_SIZE_FULL);
+  _header_layout->AddView (_icon_texture, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
+  _header_layout->AddView (_title, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FIX);
   _header_layout->AddSpace (1, 1);
 
   // FIXME: We don't want to show this as it does nothing right now
@@ -102,12 +101,15 @@
 
 void PlacesGroup::SetTitle (const char *title)
 {
-  _title_string = g_strdup (title);
+  const gchar *temp = "<big>%s</big>";
+
+  _title_string = g_strdup_printf (temp, title);
   UpdateTitle ();
 }
 
 void PlacesGroup::SetEmblem (const char *path_to_emblem)
 {
+  _icon_texture->SetByIconName (path_to_emblem, 24);
 }
 
 void PlacesGroup::AddLayout (nux::Layout *layout)

=== modified file 'src/PlacesGroup.h'
--- src/PlacesGroup.h	2011-02-21 23:00:30 +0000
+++ src/PlacesGroup.h	2011-02-24 15:01:07 +0000
@@ -36,6 +36,8 @@
 #include <sigc++/functors/ptr_fun.h>
 #include <sigc++/functors/mem_fun.h>
 
+#include "IconTexture.h"
+
 class PlacesGroup : public nux::View
 {
 public:
@@ -63,6 +65,7 @@
   unsigned int _visible_items;
 
   nux::Layout *_content;
+  IconTexture  *_icon_texture;
   nux::VLayout *_group_layout;
   nux::HLayout *_header_layout;
 

=== modified file 'src/PlacesResultsController.cpp'
--- src/PlacesResultsController.cpp	2011-02-22 23:37:17 +0000
+++ src/PlacesResultsController.cpp	2011-02-24 15:01:07 +0000
@@ -153,13 +153,14 @@
 }
 
 PlacesGroup *
-PlacesResultsController::CreateGroup (const char *groupname)
+PlacesResultsController::CreateGroup (const char *groupname, const char *icon)
 {
   PlacesSettings *settings = PlacesSettings::GetDefault ();
 
   PlacesGroup *newgroup = new PlacesGroup (NUX_TRACKER_LOCATION);
   newgroup->SinkReference ();
   newgroup->SetTitle (groupname);
+  newgroup->SetEmblem (icon);
   newgroup->SetRowHeight (92);
   newgroup->SetItemDetail (1, 100);
   newgroup->SetExpanded (true);

=== modified file 'src/PlacesResultsController.h'
--- src/PlacesResultsController.h	2011-02-09 20:44:45 +0000
+++ src/PlacesResultsController.h	2011-02-24 15:01:07 +0000
@@ -46,7 +46,8 @@
   void RemoveResultFromGroup (const char *groupname,
                               void       *_id);
   void Clear                 ();
-  PlacesGroup  *CreateGroup  (const char *groupname);
+  PlacesGroup  *CreateGroup  (const char *groupname,
+                              const char *icon="");
 protected:
   const gchar* GetName ();
   void AddProperties (GVariantBuilder *builder);

=== modified file 'src/PlacesResultsView.cpp'
--- src/PlacesResultsView.cpp	2011-02-22 11:32:01 +0000
+++ src/PlacesResultsView.cpp	2011-02-24 15:01:07 +0000
@@ -34,6 +34,8 @@
   _layout = new nux::VLayout ("", NUX_TRACKER_LOCATION);
 
   _layout->SetContentDistribution(nux::MAJOR_POSITION_TOP);
+  _layout->SetHorizontalExternalMargin (14);
+  _layout->SetVerticalInternalMargin (14);
 
   setBorder (12);
   EnableVerticalScrollBar (true);

=== modified file 'src/PlacesSearchBar.cpp'
--- src/PlacesSearchBar.cpp	2011-02-22 23:37:17 +0000
+++ src/PlacesSearchBar.cpp	2011-02-24 15:01:07 +0000
@@ -48,15 +48,35 @@
   _bg_layer = new nux::ColorLayer (nux::Color (0xff595853), true);
 
   _layout = new nux::HLayout (NUX_TRACKER_LOCATION);
+  _layout->SetHorizontalInternalMargin (12);
+
+  _search_icon = new IconTexture ("find", 32);
+  _layout->AddView (_search_icon, 0);
+
+  _layered_layout = new nux::LayeredLayout ();
+
+  _hint = new nux::StaticCairoText (" ");
+  _hint->SetTextColor (nux::Color (1.0f, 1.0f, 1.0f, 0.5f));
+  _layered_layout->AddLayer (_hint);
 
   _pango_entry = new nux::TextEntry ("", NUX_TRACKER_LOCATION);
   _pango_entry->sigTextChanged.connect (sigc::mem_fun (this, &PlacesSearchBar::OnSearchChanged));
-  _layout->AddView (_pango_entry, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  _pango_entry->SetMinimumHeight (30);
+  _layered_layout->AddLayer (_pango_entry);
+
+  _layered_layout->SetPaintAll (true);
+  _layered_layout->SetActiveLayerN (1);
+
+  _layout->AddView (_layered_layout, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
   _layout->SetVerticalExternalMargin (18);
   _layout->SetHorizontalExternalMargin (18);
   
   SetCompositionLayout (_layout);
+
+  g_signal_connect (gtk_settings_get_default (), "notify::gtk-font-name",
+                    G_CALLBACK (OnFontChanged), this);
+  OnFontChanged (NULL, NULL, this);
 }
 
 PlacesSearchBar::~PlacesSearchBar ()
@@ -123,19 +143,10 @@
 }
 
 void
-PlacesSearchBar::PreLayoutManagement ()
-{
-  nux::View::PreLayoutManagement ();
-}
-
-long
-PlacesSearchBar::PostLayoutManagement (long LayoutResult)
-{
-  return nux::View::PostLayoutManagement (LayoutResult);
-}
-
-void
-PlacesSearchBar::SetActiveEntry (PlaceEntry *entry, guint section_id, const char *search_string, bool ignore)
+PlacesSearchBar::SetActiveEntry (PlaceEntry *entry,
+                                 guint       section_id,
+                                 const char *search_string,
+                                 bool        ignore_search)
 {
    std::map<gchar *, gchar *> hints;
 
@@ -144,18 +155,25 @@
   if (_entry)
   {
     // i18n: This is for a dynamic place name i.e. "Search Files & Folders"
-    const gchar *search_template = _("Search %s");
+    const gchar *search_template = _("<span font_size='x-small' font_style='italic'>Search %s</span>");
     gchar       *res;
-
-    res = g_strdup_printf (search_template, _entry->GetName ());
-    
-    if (!ignore)
+    gchar       *tmp;
+
+    tmp = g_markup_escape_text (entry->GetName (), -1);
+    res = g_strdup_printf (search_template, tmp);
+
+    _hint->SetText (res);
+
+    if (!ignore_search)
     {
       _entry->SetActiveSection (section_id);
       _entry->SetSearch (search_string ? search_string : "", hints);
     }
+    
     _pango_entry->SetText (search_string ? search_string : "");
+    
     g_free (res);
+    g_free (tmp);
   }
   else
   {
@@ -166,6 +184,8 @@
 void
 PlacesSearchBar::OnSearchChanged (nux::TextEntry *text_entry)
 {
+  bool is_empty;
+
   if (_live_search_timeout)
     g_source_remove (_live_search_timeout);
   
@@ -175,6 +195,11 @@
 
   search_changed.emit (_pango_entry->GetText ().c_str ());
 
+
+  is_empty = g_strcmp0 (_pango_entry->GetText ().c_str (), "") == 0;
+  _hint->SetVisible (is_empty);
+
+  _hint->QueueDraw ();
   _pango_entry->QueueDraw ();
   QueueDraw ();
 }
@@ -199,6 +224,36 @@
   _live_search_timeout = 0;
 }
 
+void
+PlacesSearchBar::OnFontChanged (GObject *object, GParamSpec *pspec, PlacesSearchBar *self)
+{
+#define HOW_LARGE 10
+  GtkSettings          *settings;
+  gchar                *font_name = NULL;
+  PangoFontDescription *desc;
+  gint                  size;
+  gchar                *font_desc;
+
+  settings = gtk_settings_get_default ();
+  g_object_get (settings, "gtk-font-name", &font_name, NULL);
+
+  desc = pango_font_description_from_string (font_name);
+  self->_pango_entry->SetFontFamily (pango_font_description_get_family (desc));
+
+  size = pango_font_description_get_size (desc);
+  size /= pango_font_description_get_size_is_absolute (desc) ? 1 : PANGO_SCALE;
+  self->_pango_entry->SetFontSize ( size + HOW_LARGE);
+
+  self->_pango_entry->SetFontOptions (gdk_screen_get_font_options (gdk_screen_get_default ()));
+
+  font_desc = g_strdup_printf ("%s %d", pango_font_description_get_family (desc), size + HOW_LARGE);
+  self->_hint->SetFont (font_desc);
+
+  pango_font_description_free (desc);
+  g_free (font_name);
+  g_free (font_desc);
+}
+
 static void
 draw_rounded_rect (cairo_t* cr,
                    double   aspect,
@@ -253,6 +308,7 @@
                radius,
                180.0f * G_PI / 180.0f,
                270.0f * G_PI / 180.0f);
+  cairo_close_path (cr);
 }
 
 void
@@ -278,17 +334,27 @@
   cairo_translate (cr, 0.5, 0.5);
   cairo_set_line_width (cr, 1.0);
 
-  cairo_set_source_rgba (cr, 0.0f, 0.0f, 0.0f, 1.0f);
-
   draw_rounded_rect (cr, 1.0f, x, y, RADIUS, width, height);
 
-  cairo_close_path (cr);
-
+  cairo_set_source_rgba (cr, 0.0f, 0.0f, 0.0f, 0.8f);
   cairo_fill_preserve (cr);
 
   cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 0.8f);
   cairo_stroke (cr);
 
+  //FIXME: This is until we get proper glow
+  draw_rounded_rect (cr, 1.0f, x-1, y-1, RADIUS, width+2, height+2);
+  cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 0.4f);
+  cairo_stroke (cr);
+
+  draw_rounded_rect (cr, 1.0f, x-2, y-2, RADIUS, width+4, height+4);
+  cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 0.2f);
+  cairo_stroke (cr);
+
+  draw_rounded_rect (cr, 1.0f, x-3, y-3, RADIUS, width+6, height+6);
+  cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 0.1f);
+  cairo_stroke (cr);
+
   cairo_destroy (cr);
 
   nux::NBitmapData* bitmap =  cairo_graphics.GetBitmap();

=== modified file 'src/PlacesSearchBar.h'
--- src/PlacesSearchBar.h	2011-02-20 13:23:09 +0000
+++ src/PlacesSearchBar.h	2011-02-24 15:01:07 +0000
@@ -20,8 +20,10 @@
 #ifndef PLACES_SEARCH_BAR_H
 #define PLACES_SEARCH_BAR_H
 
+#include <Nux/LayeredLayout.h>
+#include <Nux/TextureArea.h>
 #include <Nux/View.h>
-#include <Nux/TextureArea.h>
+
 #include <NuxGraphics/GraphicsEngine.h>
 
 #include "Introspectable.h"
@@ -31,6 +33,11 @@
 
 #include "PlaceEntry.h"
 
+#include <gtk/gtk.h>
+
+#include "IconTexture.h"
+#include "StaticCairoText.h"
+
 class PlacesSearchBar : public Introspectable, public nux::View
 {
   NUX_DECLARE_OBJECT_TYPE (PlacesSearchBar, nux::View);
@@ -42,10 +49,10 @@
   virtual void Draw (nux::GraphicsEngine& GfxContext, bool force_draw);
   virtual void DrawContent (nux::GraphicsEngine &GfxContext, bool force_draw);
 
-  virtual void PreLayoutManagement ();
-  virtual long PostLayoutManagement (long LayoutResult);
-
-  void SetActiveEntry (PlaceEntry *entry, guint section_id, const char *search_string, bool ignore=false);
+  void SetActiveEntry (PlaceEntry *entry,
+                       guint       section_id,
+                       const char *search_string,
+                       bool        ignore=false);
 
   sigc::signal<void, const char *> search_changed;
   
@@ -61,15 +68,19 @@
   void EmitLiveSearch ();
 
   static bool OnLiveSearchTimeout (PlacesSearchBar *self);
+  static void OnFontChanged (GObject *object, GParamSpec *pspec, PlacesSearchBar *self);
 
 private:
   nux::AbstractPaintLayer *_bg_layer;
   nux::HLayout            *_layout;
+  nux::LayeredLayout      *_layered_layout;
+  nux::StaticCairoText    *_hint;
   nux::TextEntry          *_pango_entry;
   int _last_width;
   int _last_height;
   PlaceEntry              *_entry;
   guint                    _live_search_timeout;
+  IconTexture             *_search_icon;
 };
 
 #endif

=== modified file 'src/PlacesView.cpp'
--- src/PlacesView.cpp	2011-02-23 11:55:21 +0000
+++ src/PlacesView.cpp	2011-02-24 15:01:07 +0000
@@ -142,9 +142,6 @@
 void
 PlacesView::SetActiveEntry (PlaceEntry *entry, guint section_id, const char *search_string, bool signal)
 {
-  if ((!entry && _entry == _home_entry) && g_strcmp0 (search_string, "") == 0)
-    return;
-
   if (signal)
     entry_changed.emit (entry);
 
@@ -181,7 +178,11 @@
   {
     _results_controller->CreateGroup (dee_model_get_string (groups,
                                                             iter,
-                                                            PlaceEntry::GROUP_NAME));
+                                                            PlaceEntry::GROUP_NAME),
+                                      dee_model_get_string (groups,
+                                                            iter,
+                                                            PlaceEntry::GROUP_ICON));
+    g_debug ("%s", dee_model_get_string (groups, iter, PlaceEntry::GROUP_ICON));
     iter = dee_model_next (groups, iter);
   }
 
@@ -231,7 +232,12 @@
 void
 PlacesView::OnGroupAdded (DeeModel *model, DeeModelIter *iter, PlacesView *self)
 {
-  g_debug ("GroupAdded: %s", dee_model_get_string (model, iter, 1));
+  self->_results_controller->CreateGroup (dee_model_get_string (model,
+                                                                iter,
+                                                                PlaceEntry::GROUP_NAME),
+                                          dee_model_get_string (model,
+                                                                iter,
+                                                                PlaceEntry::GROUP_ICON));
 }
 
 

=== modified file 'src/StaticCairoText.cpp'
--- src/StaticCairoText.cpp	2011-02-22 23:37:17 +0000
+++ src/StaticCairoText.cpp	2011-02-24 15:01:07 +0000
@@ -162,13 +162,21 @@
   gfxContext.GetRenderStates ().GetBlend (alpha, src, dest);
   gfxContext.GetRenderStates ().SetBlend (true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
+  Color col = Color::Black;
+  col.SetAlpha (0.0f);
+  gfxContext.QRP_Color (base.x,
+      base.y,
+      base.width,
+      base.height,
+      col);
+
   gfxContext.QRP_1Tex (base.x,
-                        base.y,
-                        base.width,
-                        base.height,
-                        _texture2D->GetDeviceTexture(),
-                        texxform,
-                        _textColor);
+                       base.y + ((base.height - _cached_extent_height)/2),
+                       base.width,
+                       base.height,
+                       _texture2D->GetDeviceTexture(),
+                       texxform,
+                       _textColor);
   
   gfxContext.GetRenderStates ().SetBlend (alpha, src, dest);
   
@@ -223,6 +231,7 @@
   int width = 0;
   int height = 0;
   GetTextExtents (width, height);
+  SetMinimumHeight (height);
   NeedRedraw ();
   sigFontChanged.emit (this);
 }

=== modified file 'src/StaticCairoText.h'
--- src/StaticCairoText.h	2011-02-21 23:00:30 +0000
+++ src/StaticCairoText.h	2011-02-24 15:01:07 +0000
@@ -106,7 +106,7 @@
 
       int            _pre_layout_width;
       int            _pre_layout_height;
-
+      
       void GetTextExtents (const TCHAR* font,
                            int&         width,
                            int&         height);