Merge lp:~unity-team/unity/dash-niceness-2011-03-24 into lp:unity

[Neil J. Patel]

Lots of dash fixes, bugs linked where I could find them, off the top of my head:

- Shows no-results stuff for the individual places
- Shows a spinner during search (this will go into timeoutmode if you don't ahve very latest place daemons and libunity)
- Protects against pressing enter before we have all the restuls, but if you get impatient it activates whatever is there
- Fixes blur!

Some other stuff, have fun :)

[Jay Taoko (jaytaoko)]

Approved

review: Approve

=== added file 'resources/search_clear_alone.png'
 Binary files resources/search_clear_alone.png	1970-01-01 00:00:00 +0000 and resources/search_clear_alone.png	2011-03-24 01:52:23 +0000 differ
=== added file 'resources/search_clear_spinner.png'
 Binary files resources/search_clear_spinner.png	1970-01-01 00:00:00 +0000 and resources/search_clear_spinner.png	2011-03-24 01:52:23 +0000 differ
=== modified file 'src/IconLoader.cpp'
--- src/IconLoader.cpp	2011-02-09 20:44:45 +0000
+++ src/IconLoader.cpp	2011-03-24 01:52:23 +0000
@@ -109,23 +109,46 @@
                               guint              size,
                               IconLoaderCallback slot)
 {
+  GFile *file;
+  gchar *uri;
+
+  g_return_if_fail (filename);
+  g_return_if_fail (size > 1);
+
+  if (_no_load)
+    return;
+
+  file = g_file_new_for_path (filename);
+  uri = g_file_get_uri (file);
+
+  LoadFromURI (uri, size, slot);
+
+  g_free (uri);
+  g_object_unref (file);
+}
+
+void
+IconLoader::LoadFromURI (const char        *uri,
+                         guint              size,
+                         IconLoaderCallback slot)
+{
   char      *key;
 
-  g_return_if_fail (filename);
+  g_return_if_fail (uri);
   g_return_if_fail (size > 1);
 
   if (_no_load)
     return;
 
-  key = Hash (filename, size);
+  key = Hash (uri, size);
 
-  if (CacheLookup (key, filename, size, slot))
+  if (CacheLookup (key, uri, size, slot))
   {
     g_free (key);
     return;
   }
 
-  QueueTask (key, filename, size, slot, REQUEST_TYPE_FILENAME);
+  QueueTask (key, uri, size, slot, REQUEST_TYPE_URI);
 
   g_free (key);
 }
@@ -207,9 +230,9 @@
   {
     task_complete = ProcessGIconTask (task);
   }
-  else if (task->type == REQUEST_TYPE_FILENAME)
+  else if (task->type == REQUEST_TYPE_URI)
   {
-    task_complete = ProcessFilenameTask (task);
+    task_complete = ProcessURITask (task);
   }
   else
   {
@@ -285,9 +308,9 @@
     file = g_file_icon_get_file (G_FILE_ICON (icon));
 
     g_free (task->data);
-    task->type = REQUEST_TYPE_FILENAME;
-    task->data = g_file_get_path (file);
-    ret = ProcessFilenameTask (task);
+    task->type = REQUEST_TYPE_URI;
+    task->data = g_file_get_uri (file);
+    ret = ProcessURITask (task);
 
     g_object_unref (icon);
 
@@ -362,11 +385,11 @@
 }
 
 bool
-IconLoader::ProcessFilenameTask (IconLoaderTask *task)
+IconLoader::ProcessURITask (IconLoaderTask *task)
 {
   GFile *file;
 
-  file = g_file_new_for_path (task->data);
+  file = g_file_new_for_uri (task->data);
 
   g_file_load_contents_async (file,
                               NULL,
@@ -378,7 +401,7 @@
 }
 
 void
-IconLoader::ProcessFilenameTaskReady (IconLoaderTask *task, char *contents, gsize length)
+IconLoader::ProcessURITaskReady (IconLoaderTask *task, char *contents, gsize length)
 {
   GdkPixbuf    *pixbuf = NULL;
   GInputStream *stream;
@@ -470,7 +493,7 @@
 
   if (g_file_load_contents_finish (G_FILE (obj), res, &contents, &length, NULL, &error))
   {
-    task->self->ProcessFilenameTaskReady (task, contents, length);
+    task->self->ProcessURITaskReady (task, contents, length);
 
     g_free (contents);
   }
 
=== modified file 'src/IconLoader.h'
--- src/IconLoader.h	2011-02-09 12:24:11 +0000
+++ src/IconLoader.h	2011-03-24 01:52:23 +0000
@@ -47,13 +47,17 @@
  void LoadFromFilename    (const char        *filename,
                            guint              size,
                            IconLoaderCallback slot);
+
+ void LoadFromURI         (const char        *uri,
+                           guint              size,
+                           IconLoaderCallback slot);
 private:
 
   enum IconLoaderRequestType
   {
     REQUEST_TYPE_ICON_NAME=0,
     REQUEST_TYPE_GICON_STRING,
-    REQUEST_TYPE_FILENAME
+    REQUEST_TYPE_URI,
   };
 
   struct IconLoaderTask
@@ -80,8 +84,8 @@
   bool   ProcessTask (IconLoaderTask *task);
   bool   ProcessIconNameTask (IconLoaderTask *task);
   bool   ProcessGIconTask (IconLoaderTask *task);
-  bool   ProcessFilenameTask (IconLoaderTask *task);
-  void   ProcessFilenameTaskReady (IconLoaderTask *task, char *contents, gsize length);
+  bool   ProcessURITask (IconLoaderTask *task);
+  void   ProcessURITaskReady (IconLoaderTask *task, char *contents, gsize length);
   bool   Iteration ();
   void   FreeTask (IconLoaderTask *task);
 
 
=== modified file 'src/IconTexture.cpp'
--- src/IconTexture.cpp	2011-03-13 19:01:59 +0000
+++ src/IconTexture.cpp	2011-03-24 01:52:23 +0000
@@ -113,6 +113,11 @@
                                                     sigc::mem_fun (this, &IconTexture::IconLoaded));
     g_object_unref (icon);
   }
+  else if (g_str_has_prefix (_icon_name, "http://"))
+  {
+    IconLoader::GetDefault ()->LoadFromURI (_icon_name,
+                                            _size, sigc::mem_fun (this, &IconTexture::IconLoaded));
+  }
   else
   {
     IconLoader::GetDefault ()->LoadFromIconName (_icon_name,
 
=== modified file 'src/PanelMenuView.cpp'
--- src/PanelMenuView.cpp	2011-03-23 16:43:07 +0000
+++ src/PanelMenuView.cpp	2011-03-24 01:52:23 +0000
@@ -458,6 +458,12 @@
 PanelMenuView::Refresh ()
 {
   nux::Geometry         geo = GetGeometry ();
+
+  // We can get into a race that causes the geometry to be wrong as there hasn't been a layout
+  // cycle before the first callback. This is to protect from that.
+  if (geo.width > _monitor_geo.width)
+    return;
+  
   char                 *label = GetActiveViewName ();
   PangoLayout          *layout = NULL;
   PangoFontDescription *desc = NULL;
@@ -1026,6 +1032,7 @@
 PanelMenuView::SetMonitor (int monitor)
 {
   _monitor = monitor;
+  _monitor_geo = UScreen::GetDefault ()->GetMonitorGeometry (_monitor);
 }
 
 bool
 
=== modified file 'src/PanelMenuView.h'
--- src/PanelMenuView.h	2011-03-22 16:56:41 +0000
+++ src/PanelMenuView.h	2011-03-24 01:52:23 +0000
@@ -139,5 +139,6 @@
   int  _monitor;
   guint32 _active_xid;
   guint32 _active_moved_id;
+  nux::Geometry _monitor_geo;
 };
 #endif
 
=== modified file 'src/PlaceEntry.h'
--- src/PlaceEntry.h	2011-03-15 10:39:09 +0000
+++ src/PlaceEntry.h	2011-03-24 01:52:23 +0000
@@ -162,6 +162,8 @@
   sigc::signal<void, PlaceEntry *, PlaceEntryGroup&>                    global_group_added;
   sigc::signal<void, PlaceEntry *, PlaceEntryGroup&, PlaceEntryResult&> global_result_added;
   sigc::signal<void, PlaceEntry *, PlaceEntryGroup&, PlaceEntryResult&> global_result_removed;
+
+  sigc::signal<void, const char *, guint32, std::map<const char *, const char *>&> search_finished;
 };
 
 #endif // PLACE_ENTRY_H
 
=== modified file 'src/PlaceEntryHome.cpp'
--- src/PlaceEntryHome.cpp	2011-03-17 13:56:52 +0000
+++ src/PlaceEntryHome.cpp	2011-03-24 01:52:23 +0000
@@ -62,7 +62,8 @@
 
 
 PlaceEntryHome::PlaceEntryHome (PlaceFactory *factory)
-: _factory (factory)
+: _factory (factory),
+  _n_searches_done (0)
 {
   LoadExistingEntries ();
   _factory->place_added.connect (sigc::mem_fun (this, &PlaceEntryHome::OnPlaceAdded));
@@ -117,10 +118,14 @@
 {
   PlaceEntryGroupHome group (entry);
 
+  if (!entry->ShowInGlobal ())
+    return;
+
   _entries.push_back (entry);
 
   entry->global_result_added.connect (sigc::mem_fun (this, &PlaceEntryHome::OnResultAdded));
   entry->global_result_removed.connect (sigc::mem_fun (this, &PlaceEntryHome::OnResultRemoved));
+  entry->search_finished.connect (sigc::mem_fun (this, &PlaceEntryHome::OnSearchFinished));
 
   group_added.emit (this, group);
 }
@@ -241,6 +246,9 @@
 {
   std::vector<PlaceEntry *>::iterator it, eit = _entries.end ();
 
+  _n_searches_done = 0;
+  _last_search = search;
+
   for (it = _entries.begin (); it != eit; ++it)
   {
     (*it)->SetGlobalSearch (search, hints);
@@ -313,3 +321,19 @@
     entry->ActivateGlobalResult (id);
   }
 }
+
+void
+PlaceEntryHome::OnSearchFinished (const char                           *search_string,
+                                  guint32                               section_id,
+                                  std::map<const char *, const char *>& hints)
+{
+  if (_last_search == search_string)
+  {
+    _n_searches_done++;
+    if (_n_searches_done == _entries.size ())
+    {
+      search_finished.emit (search_string, section_id, hints);
+    }
+  }
+}
+
 
=== modified file 'src/PlaceEntryHome.h'
--- src/PlaceEntryHome.h	2011-03-17 13:56:52 +0000
+++ src/PlaceEntryHome.h	2011-03-24 01:52:23 +0000
@@ -85,6 +85,9 @@
   void OnResultAdded (PlaceEntry *entry, PlaceEntryGroup& group, PlaceEntryResult& result);
   void OnResultRemoved (PlaceEntry *entry, PlaceEntryGroup& group, PlaceEntryResult& result);
   void OnForeachResult (PlaceEntry *entry, PlaceEntryGroup& group, PlaceEntryResult& result);
+  void OnSearchFinished (const char                           *search_string,
+                         guint32                               section_id,
+                         std::map<const char *, const char *>& hints);
 
 public:
   PlaceFactory *_factory;
@@ -94,6 +97,9 @@
   std::map<const void *, PlaceEntry *> _id_to_entry;
 
   ResultForeachCallback _foreach_callback;
+
+  guint       _n_searches_done;
+  std::string _last_search;
 };
 
 #endif // PLACE_ENTRY_HOME_H
 
=== modified file 'src/PlaceEntryRemote.cpp'
--- src/PlaceEntryRemote.cpp	2011-03-17 13:33:30 +0000
+++ src/PlaceEntryRemote.cpp	2011-03-24 01:52:23 +0000
@@ -1025,5 +1025,17 @@
 { 
   PlaceEntryRemote *self = static_cast<PlaceEntryRemote *> (user_data);  
 
-  g_debug ("%p: %s", self, sender_name);
+  if (g_strcmp0 (signal_name, "SearchFinished") == 0)
+  {
+    guint32       section = 0;
+    gchar        *search_string = NULL;
+    GVariantIter *iter;
+    std::map<const char *, const char*> hints;
+
+    g_variant_get (parameters, "(usa{ss})", &section, &search_string, &iter);
+    self->search_finished.emit (search_string, section, hints);
+    
+    g_free (search_string);
+    g_variant_iter_free (iter);
+  }
 }
 
=== added file 'src/PlacesEmptyView.cpp'
--- src/PlacesEmptyView.cpp	1970-01-01 00:00:00 +0000
+++ src/PlacesEmptyView.cpp	2011-03-24 01:52:23 +0000
@@ -0,0 +1,88 @@
+/*
+ * 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]>
+ */
+
+#include "PlacesEmptyView.h"
+
+#include "PlacesStyle.h"
+
+NUX_IMPLEMENT_OBJECT_TYPE (PlacesEmptyView);
+
+PlacesEmptyView::PlacesEmptyView ()
+: nux::View (NUX_TRACKER_LOCATION)
+{
+  SetLayout (new nux::HLayout (NUX_TRACKER_LOCATION));
+
+  _text = new nux::StaticCairoText ("");
+  _text->SetTextEllipsize (nux::StaticCairoText::NUX_ELLIPSIZE_END);
+  _text->SetTextAlignment (nux::StaticCairoText::NUX_ALIGN_CENTRE);
+  _text->SetTextVerticalAlignment (nux::StaticCairoText::NUX_ALIGN_CENTRE);
+  _text->SetTextColor (nux::Color (1.0f, 1.0f, 1.0f, 0.8f));
+
+  GetCompositionLayout ()->AddSpace (1, 1);
+  GetCompositionLayout ()->AddView (_text, 1, nux::eCenter, nux::eFix);
+  GetCompositionLayout ()->AddSpace (1, 1);
+}
+
+PlacesEmptyView::~PlacesEmptyView ()
+{
+
+}
+
+long
+PlacesEmptyView::ProcessEvent(nux::IEvent &ievent, long TraverseInfo, long ProcessEventInfo)
+{
+  return GetCompositionLayout ()->ProcessEvent (ievent, TraverseInfo, ProcessEventInfo);
+}
+
+void
+PlacesEmptyView::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+}
+
+void
+PlacesEmptyView::DrawContent (nux::GraphicsEngine &GfxContext, bool force_draw)
+{
+  GetCompositionLayout ()->ProcessDraw (GfxContext, force_draw);
+}
+
+void
+PlacesEmptyView::SetText (const char *text)
+{
+  char *clean;
+  char *markup;
+
+  clean = g_markup_escape_text (text, -1);
+  markup = g_strdup_printf ("<big>%s</big>", clean);
+
+  _text->SetText (markup);
+
+  g_free (clean);
+  g_free (markup);
+}
+
+const gchar*
+PlacesEmptyView::GetName ()
+{
+  return "PlacesEmptyView";
+}
+
+void
+PlacesEmptyView::AddProperties (GVariantBuilder *builder)
+{
+  
+}
 
=== added file 'src/PlacesEmptyView.h'
--- src/PlacesEmptyView.h	1970-01-01 00:00:00 +0000
+++ src/PlacesEmptyView.h	2011-03-24 01:52:23 +0000
@@ -0,0 +1,55 @@
+/*
+ * 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]>
+ */
+
+#ifndef PLACES_EMPTY_VIEW_H
+#define PLACES_EMPTY_VIEW_H
+
+#include <Nux/Nux.h>
+#include <Nux/View.h>
+#include <NuxGraphics/GraphicsEngine.h>
+#include <Nux/HLayout.h>
+#include <Nux/VLayout.h>
+#include "Introspectable.h"
+#include "StaticCairoText.h"
+
+class PlacesEmptyView : public nux::View, public Introspectable
+{
+  NUX_DECLARE_OBJECT_TYPE (PlacesEmptyView, nux::View);
+public:
+
+  PlacesEmptyView ();
+  ~PlacesEmptyView ();
+
+  // nux::View overrides
+  long ProcessEvent(nux::IEvent &ievent, long TraverseInfo, long ProcessEventInfo);
+  void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
+  void DrawContent (nux::GraphicsEngine &GfxContext, bool force_draw);
+
+  void SetText (const char *text);
+
+protected:
+
+  const gchar* GetName ();
+  void AddProperties (GVariantBuilder *builder);
+
+private:
+
+  nux::StaticCairoText *_text;
+};
+
+#endif // PLACES_EMPTY_VIEW_H
 
=== modified file 'src/PlacesGroupController.cpp'
--- src/PlacesGroupController.cpp	2011-03-23 17:55:51 +0000
+++ src/PlacesGroupController.cpp	2011-03-24 01:52:23 +0000
@@ -19,6 +19,7 @@
 #include "PlacesGroupController.h"
 
 #include <Nux/GridHLayout.h>
+#include <glib/gi18n-lib.h>
 
 #include "PlacesStyle.h"
 #include "PlacesSimpleTile.h"
@@ -55,12 +56,22 @@
 
   _group->expanded.connect (sigc::mem_fun (this, &PlacesGroupController::CheckTiles));
   style->columns_changed.connect (sigc::mem_fun (this, &PlacesGroupController::CheckTiles));
+
+  _more_tile = new PlacesSimpleTile ("gtk-add",
+                                     _("Load more results..."),
+                                     style->GetTileIconSize (),
+                                     false,
+                                     "more-tile");
+  _more_tile->Reference ();
+  _more_tile->sigClick.connect (sigc::mem_fun (this, &PlacesGroupController::MoreTileClicked));
 }
 
 PlacesGroupController::~PlacesGroupController ()
 {
   if (_check_tiles_id)
     g_source_remove (_check_tiles_id);
+  if (_more_tile)
+    _more_tile->UnReference ();
 }
 
 const void *
@@ -117,6 +128,13 @@
 }
 
 void
+PlacesGroupController::MoreTileClicked (PlacesTile *tile)
+{
+  if (!_check_tiles_id)
+    _check_tiles_id = g_timeout_add (150, (GSourceFunc)CheckTilesTimeout, this);
+}
+
+void
 PlacesGroupController::AddResult (PlaceEntryGroup& group, PlaceEntryResult& result)
 {
   PlacesStyle *style = PlacesStyle::GetDefault ();
@@ -178,6 +196,9 @@
   else
     n_to_show = style->GetDefaultNColumns ();
 
+  if (_more_tile->GetParentObject ())
+    _group->GetChildLayout ()->RemoveChildObject (_more_tile);
+
   if (_id_to_tile.size () == n_to_show)
   {
     // Hoorah
@@ -185,6 +206,9 @@
   else if (_id_to_tile.size () < n_to_show)
   {
     std::vector<const void *>::iterator it = _queue.begin ();
+    int max_rows_to_add = style->GetDefaultNColumns () * 15;
+    int max_rows_per_click = max_rows_to_add * 3;
+    int n_tiles = _id_to_tile.size ();
 
     if (_queue.size () >= n_to_show)
     {
@@ -194,6 +218,33 @@
       {
         _entry->GetResult ((*it), sigc::mem_fun (this, &PlacesGroupController::AddTile));
         it++;
+        n_tiles++;
+
+        if (n_tiles % max_rows_to_add == 0)
+        {
+          // What we do over here is add a "Load more results..." button which will then kick off
+          // another fill cycle. Generally the user will never need to see this, but in the case
+          // of large results sets, this gives us a chance of not blocking the entire WM for
+          // 20 secs as we load in 2000+ results.
+          if (n_tiles % max_rows_per_click == 0)
+          {
+            _group->GetChildLayout ()->AddView (_more_tile);
+          }
+          else
+          {
+            // The idea here is that we increase the timeouts of adding tiles in relation to
+            // how big the view is getting. In theory it shouldn't be needed but in reality with
+            // Nux having to do so many calculations it is needed. Ideally we'd be rendering
+            // the entire results view as a scene with re-usable tiles but that would have been
+            // too difficult to get right with a11y, so instead we need to just deal with this
+            // the best way we can.
+            if (!_check_tiles_id)
+              _check_tiles_id = g_timeout_add (350 * n_tiles/max_rows_to_add,
+                                               (GSourceFunc)CheckTilesTimeout,
+                                               this);
+          }
+          return;
+        }
       }
     }
   }
 
=== modified file 'src/PlacesGroupController.h'
--- src/PlacesGroupController.h	2011-03-13 21:22:04 +0000
+++ src/PlacesGroupController.h	2011-03-24 01:52:23 +0000
@@ -54,6 +54,7 @@
   void CheckTiles ();
   static gboolean CheckTilesTimeout (PlacesGroupController *self);
   void TileClicked (PlacesTile *tile);
+  void MoreTileClicked (PlacesTile *tile);
 
 private:
   PlaceEntry  *_entry;
@@ -62,6 +63,7 @@
   std::map<const void *, PlacesTile *>  _id_to_tile;
   guint _check_tiles_id;
   std::vector<const void *> _queue;
+  PlacesTile *_more_tile;
 };
 
 #endif // PLACES_GROUP_CONTROLLER_H
 
=== modified file 'src/PlacesSearchBar.cpp'
--- src/PlacesSearchBar.cpp	2011-03-23 15:44:45 +0000
+++ src/PlacesSearchBar.cpp	2011-03-24 01:52:23 +0000
@@ -60,12 +60,12 @@
   _layout = new nux::HLayout (NUX_TRACKER_LOCATION);
   _layout->SetHorizontalInternalMargin (12);
 
-  _search_icon = new nux::TextureArea (NUX_TRACKER_LOCATION);
-  _search_icon->SetTexture (icon);
-  _search_icon->SetMinMaxSize (icon->GetWidth (), icon->GetHeight ());
-  _layout->AddView (_search_icon, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
-  _search_icon->OnMouseClick.connect (sigc::mem_fun (this, &PlacesSearchBar::OnClearClicked));
-  _search_icon->SetCanFocus (false);
+  _spinner = new PlacesSearchBarSpinner ();
+  _spinner->SetMinMaxSize (icon->GetWidth (), icon->GetHeight ());
+  //_spinner->SetMaximumWidth (icon->GetWidth ());
+  _layout->AddView (_spinner, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  _spinner->OnMouseClick.connect (sigc::mem_fun (this, &PlacesSearchBar::OnClearClicked));
+  _spinner->SetCanFocus (false);
 
   _layered_layout = new nux::LayeredLayout ();
 
@@ -243,8 +243,7 @@
 void
 PlacesSearchBar::OnSearchChanged (nux::TextEntry *text_entry)
 {
-  PlacesStyle *style = PlacesStyle::GetDefault ();
-  bool         is_empty;
+  bool is_empty;
 
   if (_live_search_timeout)
     g_source_remove (_live_search_timeout);
@@ -259,7 +258,7 @@
 
   is_empty = g_strcmp0 (_pango_entry->GetText ().c_str (), "") == 0;
   _hint->SetVisible (is_empty);
-  _search_icon->SetTexture (is_empty ? style->GetSearchReadyIcon () : style->GetSearchClearIcon ());
+  _spinner->SetState (is_empty ? STATE_READY : STATE_SEARCHING);
 
   _hint->QueueDraw ();
   _pango_entry->QueueDraw ();
@@ -292,7 +291,7 @@
   if (_pango_entry->GetText () != "")
   {
     _pango_entry->SetText ("");
-    _search_icon->SetTexture (PlacesStyle::GetDefault ()->GetSearchReadyIcon ());
+    _spinner->SetState (STATE_READY);
     EmitLiveSearch ();
   }
 }
@@ -310,6 +309,12 @@
 }
 
 void
+PlacesSearchBar::OnSearchFinished ()
+{
+  _spinner->SetState (STATE_CLEAR);
+}
+
+void
 PlacesSearchBar::OnFontChanged (GObject *object, GParamSpec *pspec, PlacesSearchBar *self)
 {
 #define HOW_LARGE 8
 
=== modified file 'src/PlacesSearchBar.h'
--- src/PlacesSearchBar.h	2011-03-15 14:23:03 +0000
+++ src/PlacesSearchBar.h	2011-03-24 01:52:23 +0000
@@ -32,6 +32,8 @@
 #include "Nux/EditTextBox.h"
 #include "Nux/TextEntry.h"
 
+#include "PlacesSearchBarSpinner.h"
+
 #include "PlaceEntry.h"
 
 class PlacesView;
@@ -53,6 +55,7 @@
   void SetActiveEntry (PlaceEntry *entry,
                        guint       section_id,
                        const char *search_string);
+  void OnSearchFinished ();
 
   sigc::signal<void, const char *> search_changed;
   sigc::signal<void> activated;
@@ -89,7 +92,7 @@
   guint                    _live_search_timeout;
 
   friend class PlacesView;
-  nux::TextureArea        *_search_icon;
+  PlacesSearchBarSpinner  *_spinner;
   nux::ComboBoxSimple     *_combo;
 };
 
 
=== added file 'src/PlacesSearchBarSpinner.cpp'
--- src/PlacesSearchBarSpinner.cpp	1970-01-01 00:00:00 +0000
+++ src/PlacesSearchBarSpinner.cpp	2011-03-24 01:52:23 +0000
@@ -0,0 +1,183 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2011 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]>
+ */
+
+#include "PlacesSearchBarSpinner.h"
+
+#include <Nux/VLayout.h>
+
+#include "PlacesStyle.h"
+
+NUX_IMPLEMENT_OBJECT_TYPE (PlacesSearchBarSpinner);
+
+PlacesSearchBarSpinner::PlacesSearchBarSpinner ()
+: nux::View (NUX_TRACKER_LOCATION),
+  _state (STATE_READY),
+  _rotation (0.0f),
+  _spinner_timeout (0)
+{
+  PlacesStyle *style = PlacesStyle::GetDefault ();
+
+  _search_ready = style->GetSearchReadyIcon ();
+  _clear_full = style->GetSearchClearIcon ();
+  _clear_alone = style->GetSearchClearAloneIcon ();
+  _clear_spinner = style->GetSearchClearSpinnerIcon ();
+
+  _2d_rotate.Identity ();
+  _2d_rotate.Rotate_z (0.0);
+}
+
+PlacesSearchBarSpinner::~PlacesSearchBarSpinner ()
+{
+
+}
+
+long
+PlacesSearchBarSpinner::ProcessEvent (nux::IEvent &ievent, long TraverseInfo, long ProcessEventInfo)
+{
+  return PostProcessEvent2 (ievent, TraverseInfo, ProcessEventInfo);
+}
+
+void
+PlacesSearchBarSpinner::Draw (nux::GraphicsEngine& GfxContext, bool force_draw)
+{
+  nux::Geometry geo = GetGeometry ();
+  nux::TexCoordXForm texxform;
+
+  GfxContext.PushClippingRectangle (geo);
+
+  nux::GetPainter ().PaintBackground (GfxContext, geo);
+
+  texxform.SetTexCoordType (nux::TexCoordXForm::OFFSET_COORD);
+  texxform.SetWrap (nux::TEXWRAP_REPEAT, nux::TEXWRAP_REPEAT);
+  texxform.min_filter = nux::TEXFILTER_LINEAR;
+  texxform.mag_filter = nux::TEXFILTER_LINEAR;
+
+  if (_state == STATE_READY)
+  {
+    GfxContext.QRP_1Tex (geo.x + ((geo.width - _search_ready->GetWidth ())/2),
+                         geo.y + ((geo.height - _search_ready->GetHeight ())/2),
+                         _search_ready->GetWidth (),
+                         _search_ready->GetHeight (),
+                         _search_ready->GetDeviceTexture (),
+                         texxform,
+                         nux::Color::White);
+  }
+  else if (_state == STATE_SEARCHING)
+  {
+    nux::Geometry clear_geo (geo.x + ((geo.width - _clear_spinner->GetWidth ())/2),
+                             geo.y + ((geo.height - _clear_spinner->GetHeight ())/2),
+                             _clear_spinner->GetWidth (),
+                             _clear_spinner->GetHeight ());
+
+    GfxContext.PushModelViewMatrix (nux::Matrix4::TRANSLATE(-clear_geo.x - clear_geo.width / 2,
+                                    -clear_geo.y - clear_geo.height / 2, 0));
+    GfxContext.PushModelViewMatrix (_2d_rotate);    
+    GfxContext.PushModelViewMatrix (nux::Matrix4::TRANSLATE(clear_geo.x + clear_geo.width/ 2,
+                                    clear_geo.y + clear_geo.height / 2, 0));
+
+    GfxContext.QRP_1Tex (clear_geo.x,
+                         clear_geo.y,
+                         clear_geo.width,
+                         clear_geo.height,
+                         _clear_spinner->GetDeviceTexture (),
+                         texxform,
+                         nux::Color::White);
+
+    GfxContext.PopModelViewMatrix ();
+    GfxContext.PopModelViewMatrix ();
+    GfxContext.PopModelViewMatrix ();
+
+    GfxContext.QRP_1Tex (geo.x + ((geo.width - _clear_alone->GetWidth ())/2),
+                         geo.y + ((geo.height - _clear_alone->GetHeight ())/2),
+                         _clear_alone->GetWidth (),
+                         _clear_alone->GetHeight (),
+                         _clear_alone->GetDeviceTexture (),
+                         texxform,
+                         nux::Color::White);
+  }
+  else
+  {
+    GfxContext.QRP_1Tex (geo.x + ((geo.width - _clear_full->GetWidth ())/2),
+                         geo.y + ((geo.height - _clear_full->GetHeight ())/2),
+                         _clear_full->GetWidth (),
+                         _clear_full->GetHeight (),
+                         _clear_full->GetDeviceTexture (),
+                         texxform,
+                         nux::Color::White);
+  }
+
+  GfxContext.PopClippingRectangle ();
+}
+
+void
+PlacesSearchBarSpinner::DrawContent (nux::GraphicsEngine &GfxContext, bool force_draw)
+{
+}
+
+gboolean
+PlacesSearchBarSpinner::OnFrame (PlacesSearchBarSpinner *self)
+{
+  self->_rotation += 0.1f;
+
+  if (self->_rotation >= 360.0f)
+    self->_rotation = 0.0f;
+
+  self->_2d_rotate.Rotate_z (self->_rotation);
+
+  self->QueueDraw ();
+
+  return TRUE;
+}
+
+void
+PlacesSearchBarSpinner::SetState (SpinnerState state)
+{
+  if (_state == state)
+    return;
+
+  _state = state;
+
+  if (_spinner_timeout)
+    g_source_remove (_spinner_timeout);
+  _2d_rotate.Rotate_z (0.0f);
+  _rotation = 0.0f;
+
+  if (_state == STATE_SEARCHING)
+  {
+    _spinner_timeout = g_timeout_add (15, (GSourceFunc)PlacesSearchBarSpinner::OnFrame, this);
+  }
+
+  QueueDraw ();
+}
+
+const gchar*
+PlacesSearchBarSpinner::GetName ()
+{
+	return "PlacesSearchBarSpinner";
+}
+
+void PlacesSearchBarSpinner::AddProperties (GVariantBuilder *builder)
+{
+  nux::Geometry geo = GetGeometry ();
+
+  g_variant_builder_add (builder, "{sv}", "x", g_variant_new_int32 (geo.x));
+  g_variant_builder_add (builder, "{sv}", "y", g_variant_new_int32 (geo.y));
+  g_variant_builder_add (builder, "{sv}", "width", g_variant_new_int32 (geo.width));
+  g_variant_builder_add (builder, "{sv}", "height", g_variant_new_int32 (geo.height));
+}
 
=== added file 'src/PlacesSearchBarSpinner.h'
--- src/PlacesSearchBarSpinner.h	1970-01-01 00:00:00 +0000
+++ src/PlacesSearchBarSpinner.h	2011-03-24 01:52:23 +0000
@@ -0,0 +1,72 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2011 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]>
+ */
+
+#ifndef PLACES_SEARCH_BAR_SPINNER_H
+#define PLACES_SEARCH_BAR_SPINNER_H
+
+#include <Nux/Nux.h>
+#include <Nux/View.h>
+#include <NuxGraphics/GraphicsEngine.h>
+#include <Nux/TextureArea.h>
+#include <NuxCore/Math/Matrix4.h>
+#include "Introspectable.h"
+
+enum SpinnerState
+{
+  STATE_READY,
+  STATE_SEARCHING,
+  STATE_CLEAR
+};
+
+class PlacesSearchBarSpinner : public Introspectable, public nux::View
+{
+  NUX_DECLARE_OBJECT_TYPE (PlacesSearchBarSpinner, nux::View);
+public:
+  PlacesSearchBarSpinner ();
+  ~PlacesSearchBarSpinner ();
+
+  long ProcessEvent (nux::IEvent &ievent, long TraverseInfo, long ProcessEventInfo);
+  void Draw (nux::GraphicsEngine& GfxContext, bool force_draw);
+  void DrawContent (nux::GraphicsEngine &GfxContext, bool force_draw);
+
+  void SetState (SpinnerState state);
+
+protected:
+  // Introspectable methods
+  const gchar * GetName ();
+  void AddProperties (GVariantBuilder *builder);
+  static gboolean OnFrame (PlacesSearchBarSpinner *self);
+
+private:
+
+private:
+  SpinnerState      _state;
+
+  nux::BaseTexture *_search_ready;
+  nux::BaseTexture *_clear_full;
+  nux::BaseTexture *_clear_alone;
+  nux::BaseTexture *_clear_spinner;
+
+  nux::Matrix4 _2d_rotate;
+  float        _rotation;
+
+  guint32 _spinner_timeout;
+};
+
+#endif
 
=== modified file 'src/PlacesSimpleTile.cpp'
--- src/PlacesSimpleTile.cpp	2011-03-23 10:54:22 +0000
+++ src/PlacesSimpleTile.cpp	2011-03-24 01:52:23 +0000
@@ -40,10 +40,6 @@
   _icon (NULL),
   _uri (NULL)
 {
-  //GtkSettings *settings = gtk_settings_get_default ();
-  //gchar *font = NULL;
-  //gchar *fontstring = NULL;
-  
   nux::VLayout *layout = new nux::VLayout ("", NUX_TRACKER_LOCATION);
 
   _label = g_strdup (label);
@@ -57,10 +53,6 @@
   _cairotext = new nux::StaticCairoText (_label);
   _cairotext->SinkReference ();
 
-  //g_object_get (settings, "gtk-font-name", &font, NULL);
-  //fontstring = g_strdup_printf ("%s normal 10", font);
-  
-  //_cairotext->SetFont (fontstring);
   _cairotext->SetTextEllipsize (nux::StaticCairoText::NUX_ELLIPSIZE_START);
   _cairotext->SetTextAlignment (nux::StaticCairoText::NUX_ALIGN_CENTRE);
   _cairotext->SetMaximumWidth (140);
@@ -75,9 +67,6 @@
   SetLayout (layout);
 
   SetDndEnabled (true, false);
-
-  //g_free (font);
-  //g_free (fontstring);
 }
 
 
 
=== modified file 'src/PlacesStyle.cpp'
--- src/PlacesStyle.cpp	2011-02-28 15:56:44 +0000
+++ src/PlacesStyle.cpp	2011-03-24 01:52:23 +0000
@@ -40,6 +40,8 @@
   _dash_fullscreen_icon (NULL),
   _search_ready_texture (NULL),
   _search_clear_texture (NULL),
+  _search_clear_alone_texture (NULL),
+  _search_clear_spinner_texture (NULL),
   _group_unexpand_texture (NULL),
   _group_expand_texture (NULL)
 {
@@ -65,6 +67,10 @@
     _search_ready_texture->UnReference ();
   if (_search_clear_texture)
     _search_clear_texture->UnReference ();
+  if (_search_clear_alone_texture)
+    _search_clear_alone_texture->UnReference ();
+  if (_search_clear_spinner_texture)
+    _search_clear_spinner_texture->UnReference ();
   if (_group_unexpand_texture)
     _group_unexpand_texture->UnReference ();
   if (_group_expand_texture)
@@ -186,6 +192,22 @@
 }
 
 nux::BaseTexture *
+PlacesStyle::GetSearchClearAloneIcon ()
+{
+  if (!_search_clear_alone_texture)
+    _search_clear_alone_texture = TextureFromFilename (PKGDATADIR"/search_clear_alone.png");
+  return _search_clear_alone_texture;
+}
+
+nux::BaseTexture *
+PlacesStyle::GetSearchClearSpinnerIcon ()
+{
+  if (!_search_clear_spinner_texture)
+    _search_clear_spinner_texture = TextureFromFilename (PKGDATADIR"/search_clear_spinner.png");
+  return _search_clear_spinner_texture;
+}
+
+nux::BaseTexture *
 PlacesStyle::GetGroupUnexpandIcon ()
 {
   if (!_group_unexpand_texture)
 
=== modified file 'src/PlacesStyle.h'
--- src/PlacesStyle.h	2011-02-28 15:56:44 +0000
+++ src/PlacesStyle.h	2011-03-24 01:52:23 +0000
@@ -52,6 +52,8 @@
 
   nux::BaseTexture * GetSearchReadyIcon ();
   nux::BaseTexture * GetSearchClearIcon ();
+  nux::BaseTexture * GetSearchClearAloneIcon ();
+  nux::BaseTexture * GetSearchClearSpinnerIcon ();
 
   nux::BaseTexture * GetGroupUnexpandIcon ();
   nux::BaseTexture * GetGroupExpandIcon ();
@@ -80,6 +82,8 @@
 
   nux::BaseTexture *_search_ready_texture;
   nux::BaseTexture *_search_clear_texture;
+  nux::BaseTexture *_search_clear_alone_texture;
+  nux::BaseTexture *_search_clear_spinner_texture;
 
   nux::BaseTexture *_group_unexpand_texture;
   nux::BaseTexture *_group_expand_texture;
 
=== modified file 'src/PlacesView.cpp'
--- src/PlacesView.cpp	2011-03-24 01:09:42 +0000
+++ src/PlacesView.cpp	2011-03-24 01:52:23 +0000
@@ -14,11 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Gordon Allott <[e-mail]>
+ *              Neil Jagdish Patel <[e-mail]>
  */
 
 #include "config.h"
 
 #include "Nux/Nux.h"
+#include "Nux/ColorArea.h"
 #include "NuxGraphics/GLThread.h"
 #include "UBusMessages.h"
 
@@ -46,7 +48,9 @@
   _target_height (1),
   _actual_height (1),
   _resize_id (0),
-  _alt_f2_entry (NULL)
+  _alt_f2_entry (NULL),
+  _searching_timeout (0),
+  _pending_activation (false)
 {
   LoadPlaces ();
   _factory->place_added.connect (sigc::mem_fun (this, &PlacesView::OnPlaceAdded));
@@ -93,6 +97,9 @@
   _layered_layout->AddLayer (_results_view);
   _results_view->GetLayout ()->OnGeometryChanged.connect (sigc::mem_fun (this, &PlacesView::OnResultsViewGeometryChanged));
 
+  _empty_view = new PlacesEmptyView ();
+  _layered_layout->AddLayer (_empty_view);
+
   _layered_layout->SetActiveLayer (_home_view);
 
   SetLayout (_layout);
@@ -123,8 +130,6 @@
   _icon_loader = IconLoader::GetDefault ();
 
   SetActiveEntry (_home_entry, 0, "");
-
-  //_layout->SetFocused (true);
 }
 
 PlacesView::~PlacesView ()
@@ -182,6 +187,7 @@
   nux::Geometry geo_absolute = GetAbsoluteGeometry ();
   PlacesSettings::DashBlurType type = PlacesSettings::GetDefault ()->GetDashBlurType ();
   bool paint_blur = type != PlacesSettings::NO_BLUR;
+  nux::BaseTexture *corner = style->GetDashCorner ();
 
   GfxContext.PushClippingRectangle (geo);
 
@@ -190,7 +196,6 @@
   GfxContext.GetRenderStates ().SetBlend (true);
   GfxContext.GetRenderStates ().SetPremultipliedBlend (nux::SRC_OVER);
 
-  geo.height = _actual_height;
   _bg_blur_geo = geo;
 
   if ((_size_mode == SIZE_MODE_HOVER))
@@ -237,17 +242,25 @@
     rop.SrcBlend = GL_ONE;
     rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
 
+    nux::Geometry bg_clip = geo;
+    bg_clip.width -= corner->GetWidth ();
+    bg_clip.height = _actual_height - corner->GetHeight ();
+
+    GfxContext.PushClippingRectangle (bg_clip);
+
     gPainter.PushDrawTextureLayer (GfxContext, _bg_blur_geo,
                                    _bg_blur_texture,
                                    texxform_blur__bg,
                                    nux::Color::White,
                                    true,
                                    rop);
+  
+    GfxContext.PopClippingRectangle ();
   }
+  geo.height = _actual_height;
 
   if (_size_mode == SIZE_MODE_HOVER)
   {
-    nux::BaseTexture *corner = style->GetDashCorner ();
     nux::BaseTexture *bottom = style->GetDashBottomTile ();
     nux::BaseTexture *right = style->GetDashRightTile ();
     nux::BaseTexture *icon = style->GetDashFullscreenIcon ();
@@ -412,8 +425,11 @@
     _group_added_conn.disconnect ();
     _result_added_conn.disconnect ();
     _result_removed_conn.disconnect ();
+    _search_finished_conn.disconnect ();
 
     _results_controller->Clear ();
+
+    _n_results = 0;
   }
 
   _entry = entry;
@@ -427,6 +443,7 @@
   _group_added_conn = _entry->group_added.connect (sigc::mem_fun (this, &PlacesView::OnGroupAdded));
   _result_added_conn = _entry->result_added.connect (sigc::mem_fun (this, &PlacesView::OnResultAdded));
   _result_removed_conn = _entry->result_removed.connect (sigc::mem_fun (this, &PlacesView::OnResultRemoved));
+  _search_finished_conn = _entry->search_finished.connect (sigc::mem_fun (this, &PlacesView::OnSearchFinished));
   
   if (_entry == _home_entry && (g_strcmp0 (search_string, "") == 0))
     _layered_layout->SetActiveLayer (_home_view);
@@ -586,12 +603,32 @@
 void
 PlacesView::OnResultAdded (PlaceEntry *entry, PlaceEntryGroup& group, PlaceEntryResult& result)
 {
+  _n_results++;
+
+  if (_n_results <= 2
+      && (g_strcmp0 (group.GetRenderer (), "UnityEmptySearchRenderer") == 0
+          || g_strcmp0 (group.GetRenderer (), "UnityEmptySectionRenderer") == 0))
+  {
+    if (_n_results == 1)
+      _empty_view->SetText (result.GetName ());
+    _layered_layout->SetActiveLayerN (2);
+  }
+
   _results_controller->AddResult (entry, group, result);
 }
 
 void
 PlacesView::OnResultRemoved (PlaceEntry *entry, PlaceEntryGroup& group, PlaceEntryResult& result)
 {
+  _n_results--;
+
+  if (_n_results <= 1
+      && (g_strcmp0 (group.GetRenderer (), "UnityEmptySearchRenderer") == 0
+          || g_strcmp0 (group.GetRenderer (), "UnityEmptySectionRenderer") == 0))
+  {
+    _layered_layout->SetActiveLayerN (1);
+  }
+
   _results_controller->RemoveResult (entry, group, result);
 }
 
@@ -694,6 +731,26 @@
     _layered_layout->QueueDraw ();
     QueueDraw ();
   }
+
+  if (_searching_timeout)
+    g_source_remove (_searching_timeout);
+  _searching_timeout = 0;
+
+  if (g_strcmp0 (search_string, ""))
+  {
+    _searching_timeout = g_timeout_add (5000, (GSourceFunc)PlacesView::OnSearchTimedOut, this);
+  }
+}
+
+gboolean
+PlacesView::OnSearchTimedOut (PlacesView *view)
+{
+  std::map <const char *, const char *> hints;
+
+  view->_searching_timeout = 0;
+  view->OnSearchFinished ( "", 0, hints);
+
+  return FALSE;
 }
 
 //
@@ -759,8 +816,17 @@
 void
 PlacesView::OnEntryActivated ()
 {
-  if (!_results_controller->ActivateFirst ())
-    g_debug ("Cannot activate anything");
+  if (_searching_timeout && !_pending_activation)
+  {
+    _pending_activation = true;
+  }
+  else
+  {
+    if (!_results_controller->ActivateFirst ())
+      g_debug ("Cannot activate anything");
+
+    _pending_activation = false;
+  }
 }
 
 void
@@ -818,6 +884,25 @@
   OnResultsViewGeometryChanged (_results_view, geo);
 }
 
+void
+PlacesView::OnSearchFinished (const char *search_string,
+                              guint32     section_id,
+                              std::map<const char *, const char *>& hints)
+{
+  if (_pending_activation)
+  {
+    if (!_results_controller->ActivateFirst ())
+      g_debug ("Cannot activate anything");
+  }
+  _pending_activation = false;
+
+  if (_searching_timeout)
+    g_source_remove (_searching_timeout);
+  _searching_timeout = 0;
+
+  _search_bar->OnSearchFinished ();
+}
+
 //
 // Introspection
 //
 
=== modified file 'src/PlacesView.h'
--- src/PlacesView.h	2011-03-13 14:52:14 +0000
+++ src/PlacesView.h	2011-03-24 01:52:23 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Gordon Allott <[e-mail]>
+ *              Neil Jagdish Patel <[e-mail]>
  */
 
 #ifndef PLACES_VIEW_H
@@ -36,6 +37,7 @@
 
 #include "PlacesSearchBar.h"
 #include "PlacesHomeView.h"
+#include "PlacesEmptyView.h"
 
 #include "PlacesResultsController.h"
 #include "PlacesResultsView.h"
@@ -121,17 +123,25 @@
 
   static gboolean OnResizeFrame (PlacesView *self);
 
+  void OnSearchFinished (const char *search_string,
+                         guint32     section_id,
+                         std::map<const char *, const char *>& hints);
+
+  static gboolean OnSearchTimedOut (PlacesView *view);
+
 private:
   PlaceFactory       *_factory;
   nux::HLayout       *_layout;
   nux::LayeredLayout *_layered_layout;
   PlacesSearchBar    *_search_bar;
   PlacesHomeView     *_home_view;
+  PlacesEmptyView    *_empty_view;
   PlaceEntryHome     *_home_entry;
   PlaceEntry         *_entry;
   sigc::connection    _group_added_conn;
   sigc::connection    _result_added_conn;
   sigc::connection    _result_removed_conn;
+  sigc::connection    _search_finished_conn;
 
   PlacesResultsController *_results_controller;
   PlacesResultsView       *_results_view;
@@ -154,6 +164,10 @@
   gint64 _resize_start_time;
 
   PlaceEntry *_alt_f2_entry;
+
+  guint _n_results;
+  guint _searching_timeout;
+  bool  _pending_activation;
 };
 
 #endif // PANEL_HOME_BUTTON_H
 
=== modified file 'src/StaticCairoText.cpp'
--- src/StaticCairoText.cpp	2011-03-21 10:20:57 +0000
+++ src/StaticCairoText.cpp	2011-03-24 01:52:23 +0000
@@ -49,6 +49,7 @@
   SetMinimumSize (1, 1);
   _ellipsize = NUX_ELLIPSIZE_END;
   _align = NUX_ALIGN_LEFT;
+  _valign = NUX_ALIGN_TOP;
   _fontstring = NULL;
   SetCanFocus (false);
 }
@@ -80,6 +81,13 @@
   NeedRedraw ();
 }
 
+void
+StaticCairoText::SetTextVerticalAlignment (AlignState state)
+{
+  _valign = state;
+  QueueDraw ();
+}
+
 void StaticCairoText::PreLayoutManagement ()
 {
   int textWidth  = 0;
@@ -169,10 +177,10 @@
   Color col = Color::Black;
   col.SetAlpha (0.0f);
   gfxContext.QRP_Color (base.x,
-      base.y,
-      base.width,
-      base.height,
-      col);
+                        base.y,
+                        base.width,
+                        base.height,
+                        col);
 
   gfxContext.QRP_1Tex (base.x,
                        base.y + ((base.height - _cached_extent_height)/2),
 
=== modified file 'src/StaticCairoText.h'
--- src/StaticCairoText.h	2011-03-10 12:42:07 +0000
+++ src/StaticCairoText.h	2011-03-24 01:52:23 +0000
@@ -54,6 +54,8 @@
         NUX_ALIGN_LEFT,
         NUX_ALIGN_CENTRE,
         NUX_ALIGN_RIGHT,
+        NUX_ALIGN_TOP = NUX_ALIGN_LEFT,
+        NUX_ALIGN_BOTTOM = NUX_ALIGN_RIGHT
       } AlignState;
 
       StaticCairoText (const TCHAR* text, NUX_FILE_LINE_PROTO);
@@ -82,6 +84,7 @@
       void SetTextColor (Color textColor);
       void SetTextEllipsize (EllipsizeState state);
       void SetTextAlignment (AlignState state);
+      void SetTextVerticalAlignment (AlignState state);
       void SetFont (const char *fontstring);
 
       void GetTextExtents (int &width, int &height);
@@ -99,6 +102,7 @@
       Color          _textColor;
       EllipsizeState _ellipsize;
       AlignState     _align;
+      AlignState     _valign;
       char*           _fontstring;
 
       CairoGraphics* _cairoGraphics;
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2011-03-24 00:35:26 +0000
+++ tests/CMakeLists.txt	2011-03-24 01:52:23 +0000
@@ -153,10 +153,19 @@
 add_executable (test-places
                 TestPlaces.cpp
                 ${PLACES_COMMON_SOURCE}
+<<<<<<< TREE
+=======
+                ../src/PlacesController.cpp
+                ../src/PlacesController.h
+                ../src/PlacesEmptyView.cpp
+                ../src/PlacesEmptyView.h
+>>>>>>> MERGE-SOURCE
                 ../src/PlacesHomeView.cpp
                 ../src/PlacesHomeView.h
                 ../src/PlacesSearchBar.cpp
                 ../src/PlacesSearchBar.h
+                ../src/PlacesSearchBarSpinner.cpp
+                ../src/PlacesSearchBarSpinner.h
                 ../src/PlacesResultsController.cpp
                 ../src/PlacesResultsController.h
                 ../src/PlacesResultsView.h