Merge lp:~unity-team/unity/panel-fixes-2011-03-17 into lp:unity

[Neil J. Patel]

Bugs attached

[Jay Taoko (jaytaoko)]

Approved

review: Approve

=== modified file 'services/panel-main.c'
--- services/panel-main.c	2011-03-17 12:02:24 +0000
+++ services/panel-main.c	2011-03-17 14:17:24 +0000
@@ -89,6 +89,11 @@
   "     <arg type='s' name='entry_id' />"
   "    </signal>"
   ""
+  "    <signal name='EntryShowNowChanged'>"
+  "     <arg type='s' name='entry_id' />"
+  "     <arg type='b' name='show_now_state' />"
+  "    </signal>"
+  ""
   "  </interface>"
   "</node>";
 
@@ -278,6 +283,28 @@
 }
 
 static void
+on_service_entry_show_now_changed (PanelService    *service,
+                                   const gchar     *entry_id,
+                                   gboolean         show_now_state,
+                                   GDBusConnection *connection)
+{
+  GError *error = NULL;
+  g_dbus_connection_emit_signal (connection,
+                                 S_NAME,
+                                 S_PATH,
+                                 S_IFACE,
+                                 "EntryShowNowChanged",
+                                 g_variant_new ("(sb)", entry_id, show_now_state),
+                                 &error);
+
+  if (error)
+    {
+      g_warning ("Unable to emit EntryShowNowChanged signal: %s", error->message);
+      g_error_free (error);
+    }
+}
+
+static void
 on_bus_acquired (GDBusConnection *connection,
                  const gchar     *name,
                  gpointer         user_data)
@@ -300,6 +327,8 @@
                     G_CALLBACK (on_service_active_menu_pointer_motion), connection);
   g_signal_connect (service, "entry-activate-request",
                     G_CALLBACK (on_service_entry_activate_request), connection);
+  g_signal_connect (service, "entry-show-now-changed",
+                    G_CALLBACK (on_service_entry_show_now_changed), connection);
 
   g_debug ("%s", G_STRFUNC);
   g_assert (reg_id > 0);

=== modified file 'services/panel-marshal.list'
--- services/panel-marshal.list	2011-03-01 15:39:36 +0000
+++ services/panel-marshal.list	2011-03-17 14:17:24 +0000
@@ -1,1 +1,2 @@
 NONE:OBJECT,POINTER,INT,INT,INT,INT
+VOID:STRING,BOOLEAN

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2011-03-14 08:51:09 +0000
+++ services/panel-service.c	2011-03-17 14:17:24 +0000
@@ -28,6 +28,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
+#include "panel-marshal.h"
+
 G_DEFINE_TYPE (PanelService, panel_service, G_TYPE_OBJECT);
 
 #define GET_PRIVATE(o) \
@@ -68,6 +70,7 @@
   RE_SYNC,
   ACTIVE_MENU_POINTER_MOTION,
   ENTRY_ACTIVATE_REQUEST,
+  ENTRY_SHOW_NOW_CHANGED,
   GEOMETRIES_CHANGED,
 
   LAST_SIGNAL
@@ -192,6 +195,15 @@
 		  G_TYPE_OBJECT, G_TYPE_POINTER,
 		  G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
 
+ _service_signals[ENTRY_SHOW_NOW_CHANGED] =
+    g_signal_new ("entry-show-now-changed",
+                  G_OBJECT_CLASS_TYPE (obj_class),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL,
+                  panel_marshal_VOID__STRING_BOOLEAN,
+                  G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_BOOLEAN);
+
 
   g_type_class_add_private (obj_class, sizeof (PanelServicePrivate));
 }
@@ -540,6 +552,23 @@
 }
 
 static void
+on_indicator_menu_show_now_changed (IndicatorObject      *object,
+                                    IndicatorObjectEntry *entry,
+                                    gboolean              show_now_changed,
+                                    PanelService         *self)
+{
+  gchar *entry_id;
+  
+  g_return_if_fail (PANEL_IS_SERVICE (self));
+
+  entry_id = g_strdup_printf ("%p", entry);
+
+  g_signal_emit (self, _service_signals[ENTRY_SHOW_NOW_CHANGED], 0, entry_id, show_now_changed);
+
+  g_free (entry_id);
+}
+
+static void
 load_indicator (PanelService *self, IndicatorObject *object, const gchar *_name)
 {
   PanelServicePrivate *priv = self->priv;
@@ -563,6 +592,8 @@
                     G_CALLBACK (on_entry_moved), self);
   g_signal_connect (object, INDICATOR_OBJECT_SIGNAL_MENU_SHOW,
                     G_CALLBACK (on_indicator_menu_show), self);
+  g_signal_connect (object, INDICATOR_OBJECT_SIGNAL_SHOW_NOW_CHANGED,
+                    G_CALLBACK (on_indicator_menu_show_now_changed), self);
 
   entries = indicator_object_get_entries (object);
   for (entry = entries; entry != NULL; entry = entry->next)

=== modified file 'src/DeviceLauncherIcon.cpp'
--- src/DeviceLauncherIcon.cpp	2011-03-07 21:15:07 +0000
+++ src/DeviceLauncherIcon.cpp	2011-03-17 14:17:24 +0000
@@ -284,6 +284,7 @@
 void
 DeviceLauncherIcon::OnRemoved (GVolume *volume, DeviceLauncherIcon *self)
 {
+  self->_volume = NULL;
   self->Remove ();
 }
 
@@ -315,6 +316,11 @@
 {
   GDrive *drive;
 
+  if (!self || !G_IS_VOLUME (self->_volume))
+  {
+    return;
+  }
+
   drive = g_volume_get_drive (self->_volume);
   g_drive_stop_finish (drive, result, NULL);
   g_object_unref (drive);

=== modified file 'src/IndicatorObjectEntryProxy.h'
--- src/IndicatorObjectEntryProxy.h	2011-01-11 15:48:03 +0000
+++ src/IndicatorObjectEntryProxy.h	2011-03-17 14:17:24 +0000
@@ -35,17 +35,19 @@
   virtual void         SetActive (bool active) = 0;
   virtual bool         GetActive () = 0;
   virtual void         ShowMenu (int x, int y, guint32 timestamp, guint32 button) = 0;
-  virtual void         Scroll (int delta) = 0; 
+  virtual void         Scroll (int delta) = 0;
 
   // Signals
   sigc::signal<void> updated;
   sigc::signal<void, bool> active_changed;
+  sigc::signal<void, bool> show_now_changed;
 
 public:
   bool label_visible;
   bool label_sensitive;
   bool icon_visible;
   bool icon_sensitive;
+  bool show_now;
 };
 
 #endif // INDICATOR_OBJECT_ENTRY_PROXY_H

=== modified file 'src/IndicatorObjectEntryProxyRemote.cpp'
--- src/IndicatorObjectEntryProxyRemote.cpp	2011-01-11 15:48:03 +0000
+++ src/IndicatorObjectEntryProxyRemote.cpp	2011-03-17 14:17:24 +0000
@@ -33,6 +33,7 @@
   label_sensitive = true;
   icon_visible = false;
   icon_sensitive = true;
+  show_now = false;
 }
 
 
@@ -146,6 +147,14 @@
   updated.emit ();
 }
 
+void
+IndicatorObjectEntryProxyRemote::OnShowNowChanged (bool show_now_state)
+{
+  show_now = show_now_state;
+  show_now_changed.emit (show_now_state);
+  updated.emit ();
+}
+
 const char *
 IndicatorObjectEntryProxyRemote::GetId ()
 {
@@ -162,4 +171,4 @@
 IndicatorObjectEntryProxyRemote::Scroll (int delta)
 {
   OnScroll.emit(_id, delta);
-}
\ No newline at end of file
+}

=== modified file 'src/IndicatorObjectEntryProxyRemote.h'
--- src/IndicatorObjectEntryProxyRemote.h	2011-01-11 15:48:03 +0000
+++ src/IndicatorObjectEntryProxyRemote.h	2011-03-17 14:17:24 +0000
@@ -58,6 +58,8 @@
                 bool        __image_sensitive,
                 bool        __image_visible);
 
+  void OnShowNowChanged (bool show_now_state);
+
   // Signals
   sigc::signal<void, const char *, int, int, guint32, guint32> OnShowMenuRequest;
   sigc::signal<void, const char *, int> OnScroll;

=== modified file 'src/IndicatorObjectFactoryRemote.cpp'
--- src/IndicatorObjectFactoryRemote.cpp	2011-03-17 09:28:30 +0000
+++ src/IndicatorObjectFactoryRemote.cpp	2011-03-17 14:17:24 +0000
@@ -246,14 +246,14 @@
 {
   std::vector<IndicatorObjectProxy*>::iterator it;
   
-  for (it = _indicators.begin(); it != _indicators.end(); it++)
+  for (it = _indicators.begin(); it != _indicators.end(); ++it)
   {
     IndicatorObjectProxyRemote *object = static_cast<IndicatorObjectProxyRemote *> (*it);
-    std::vector<IndicatorObjectEntryProxy*>::iterator it;
+    std::vector<IndicatorObjectEntryProxy*>::iterator it2;
   
-    for (it = object->GetEntries ().begin(); it != object->GetEntries ().end(); it++)
+    for (it2 = object->GetEntries ().begin(); it2 != object->GetEntries ().end(); ++it2)
     {
-      IndicatorObjectEntryProxyRemote *entry = static_cast<IndicatorObjectEntryProxyRemote *> (*it);
+      IndicatorObjectEntryProxyRemote *entry = static_cast<IndicatorObjectEntryProxyRemote *> (*it2);
 
       entry->SetActive (g_strcmp0 (entry_id, entry->GetId ()) == 0);
     }
@@ -268,6 +268,29 @@
   OnEntryActivateRequest.emit (entry_id);
 }
 
+void
+IndicatorObjectFactoryRemote::OnEntryShowNowChanged (const char *entry_id, bool show_now_state)
+{
+  std::vector<IndicatorObjectProxy*>::iterator it;
+  
+  for (it = _indicators.begin(); it != _indicators.end(); ++it)
+  {
+    IndicatorObjectProxyRemote *object = static_cast<IndicatorObjectProxyRemote *> (*it);
+    std::vector<IndicatorObjectEntryProxy*>::iterator it2;
+  
+    for (it2 = object->GetEntries ().begin(); it2 != object->GetEntries ().end(); ++it2)
+    {
+      IndicatorObjectEntryProxyRemote *entry = static_cast<IndicatorObjectEntryProxyRemote *> (*it2);
+
+      if (g_strcmp0 (entry_id, entry->GetId ()) == 0)
+      {
+        entry->OnShowNowChanged (show_now_state);
+        return;
+      }
+    }
+  }
+}
+
 IndicatorObjectProxyRemote *
 IndicatorObjectFactoryRemote::IndicatorForID (const char *id)
 {
@@ -498,13 +521,24 @@
                        remote);
   }
   else if (g_strcmp0 (signal_name, "ActiveMenuPointerMotion") == 0)
-    {
-      int x=0, y=0;
-
-      g_variant_get (parameters, "(ii)", &x, &y);
-
-      remote->OnMenuPointerMoved.emit (x, y);
-    }
+  {
+    int x=0, y=0;
+
+    g_variant_get (parameters, "(ii)", &x, &y);
+
+    remote->OnMenuPointerMoved.emit (x, y);
+  }
+  else if (g_strcmp0 (signal_name, "EntryShowNowChanged") == 0)
+  {
+    gchar *id = NULL;
+    bool   show_now_state;
+
+    g_variant_get (parameters, "(sb)", &id, &show_now_state);
+
+    remote->OnEntryShowNowChanged (id, show_now_state ? true : false);
+
+    g_free (id);
+  }
 }
 
 static void

=== modified file 'src/IndicatorObjectFactoryRemote.h'
--- src/IndicatorObjectFactoryRemote.h	2011-01-11 15:48:03 +0000
+++ src/IndicatorObjectFactoryRemote.h	2011-03-17 14:17:24 +0000
@@ -46,6 +46,7 @@
   void Sync (GVariant *args);
   void OnEntryActivateRequestReceived (const char *entry_id);
   void Reconnect ();
+  void OnEntryShowNowChanged (const char *entry_id, bool show_now_state);
 
   void AddProperties (GVariantBuilder *builder);
 

=== modified file 'src/IndicatorObjectProxyRemote.cpp'
--- src/IndicatorObjectProxyRemote.cpp	2011-01-11 15:48:03 +0000
+++ src/IndicatorObjectProxyRemote.cpp	2011-03-17 14:17:24 +0000
@@ -149,7 +149,7 @@
 
 void
 IndicatorObjectProxyRemote::OnScrollReceived (const char *entry_id,
-                                                          int        delta)
+                                              int        delta)
 {
   OnScroll.emit(entry_id, delta);
 }

=== modified file 'src/PanelIndicatorObjectEntryView.cpp'
--- src/PanelIndicatorObjectEntryView.cpp	2011-03-10 13:39:09 +0000
+++ src/PanelIndicatorObjectEntryView.cpp	2011-03-17 14:17:24 +0000
@@ -126,9 +126,10 @@
 PanelIndicatorObjectEntryView::Refresh ()
 {
   GdkPixbuf            *pixbuf = _proxy->GetPixbuf ();
-  char                 *label = fix_string (_proxy->GetLabel ());
+  char                 *label = NULL;
   PangoLayout          *layout = NULL;
   PangoFontDescription *desc = NULL;
+  PangoAttrList        *attrs = NULL;
   GtkSettings          *settings = gtk_settings_get_default ();
   cairo_t              *cr;
   char                 *font_description = NULL;
@@ -147,6 +148,25 @@
   nux::Color  textcol = style->GetTextColor ();
   nux::Color  textshadowcol = style->GetTextShadow ();
 
+  if (_proxy->show_now)
+  {
+    if (!pango_parse_markup (_proxy->GetLabel (),
+                             -1,
+                             '_',
+                             &attrs,
+                             &label,
+                             NULL,
+                             NULL))
+    {
+      label = g_strdup (_proxy->GetLabel ());
+      g_debug ("failed");
+    }
+  }
+  else
+  {
+    label = fix_string (_proxy->GetLabel ());
+  }
+
   // First lets figure out our size
   if (pixbuf && _proxy->icon_visible)
   {
@@ -169,6 +189,12 @@
     pango_font_description_set_weight (desc, PANGO_WEIGHT_NORMAL);
 
     layout = pango_cairo_create_layout (cr);
+    if (attrs)
+    {
+      pango_layout_set_attributes (layout, attrs);
+      pango_attr_list_unref (attrs);
+    }
+
     pango_layout_set_font_description (layout, desc);
     pango_layout_set_text (layout, label, -1);
     
@@ -395,3 +421,9 @@
 
   g_variant_builder_add (builder, "{sv}", "active", g_variant_new_boolean (_proxy->GetActive ()));
 }
+
+bool
+PanelIndicatorObjectEntryView::GetShowNow ()
+{
+  return _proxy ? _proxy->show_now : false;
+}

=== modified file 'src/PanelIndicatorObjectEntryView.h'
--- src/PanelIndicatorObjectEntryView.h	2011-01-25 15:35:00 +0000
+++ src/PanelIndicatorObjectEntryView.h	2011-03-17 14:17:24 +0000
@@ -43,6 +43,7 @@
   void OnMouseWheel (int x, int y, int delta, unsigned long mouse_state, unsigned long key_state);
   void Activate ();
   void OnActiveChanged (bool is_active);
+  bool GetShowNow ();
 
   const gchar * GetName ();
   void          AddProperties (GVariantBuilder *builder);

=== modified file 'src/PanelMenuView.cpp'
--- src/PanelMenuView.cpp	2011-03-13 21:40:17 +0000
+++ src/PanelMenuView.cpp	2011-03-17 14:17:24 +0000
@@ -65,7 +65,8 @@
   _last_active_view (NULL),
   _last_width (0),
   _last_height (0),
-  _places_showing (false)
+  _places_showing (false),
+  _show_now_activated (false)
 {
   WindowManager *win_manager;
 
@@ -255,12 +256,12 @@
   }
   else if (_is_maximized)
   {
-    if (!_is_inside && !_last_active_view)
+    if (!_is_inside && !_last_active_view && !_show_now_activated)
       gPainter.PushDrawLayer (GfxContext, GetGeometry (), _title_layer);
   }
   else
   {
-    if ((_is_inside || _last_active_view) && _entries.size ())
+    if ((_is_inside || _last_active_view || _show_now_activated) && _entries.size ())
     {
       if (_gradient_texture == NULL)
       {
@@ -349,7 +350,7 @@
 
   if (!_is_own_window && !_places_showing)
   {
-    if (_is_inside || _last_active_view)
+    if (_is_inside || _last_active_view || _show_now_activated)
     {
       _layout->ProcessDraw (GfxContext, force_draw);
     }
@@ -603,6 +604,7 @@
   PanelIndicatorObjectEntryView *view = new PanelIndicatorObjectEntryView (proxy, 6);
   view->active_changed.connect (sigc::mem_fun (this, &PanelMenuView::OnActiveChanged));
   view->refreshed.connect (sigc::mem_fun (this, &PanelMenuView::OnEntryRefreshed));
+  proxy->show_now_changed.connect (sigc::mem_fun (this, &PanelMenuView::UpdateShowNow));
   _menu_layout->AddView (view, 0, nux::eCenter, nux::eFull);
   _menu_layout->SetContentDistribution (nux::eStackLeft);
 
@@ -914,3 +916,19 @@
   self->QueueDraw ();
 }
 
+void
+PanelMenuView::UpdateShowNow (bool ignore)
+{
+  std::vector<PanelIndicatorObjectEntryView *>::iterator it;
+  _show_now_activated = false;
+  
+  for (it = _entries.begin(); it != _entries.end(); it++)
+  {
+    PanelIndicatorObjectEntryView *view = static_cast<PanelIndicatorObjectEntryView *> (*it);
+    if (view->GetShowNow ())
+      _show_now_activated = true;
+
+  }
+  QueueDraw ();
+}
+

=== modified file 'src/PanelMenuView.h'
--- src/PanelMenuView.h	2011-03-13 21:40:17 +0000
+++ src/PanelMenuView.h	2011-03-17 14:17:24 +0000
@@ -95,6 +95,7 @@
   gchar * GetActiveViewName ();
   static void OnPlaceViewShown (GVariant *data, PanelMenuView *self);
   static void OnPlaceViewHidden (GVariant *data, PanelMenuView *self);
+  void UpdateShowNow (bool ignore);
   
 private:
   BamfMatcher* _matcher;
@@ -123,5 +124,6 @@
   int _last_height;
 
   bool _places_showing;
+  bool _show_now_activated;
 };
 #endif

=== modified file 'src/PlaceEntryHome.cpp'
--- src/PlaceEntryHome.cpp	2011-03-15 10:39:09 +0000
+++ src/PlaceEntryHome.cpp	2011-03-17 14:17:24 +0000
@@ -21,6 +21,7 @@
 #include "PlaceEntryHome.h"
 
 #include <glib/gi18n-lib.h>
+#include <algorithm>
 
 class PlaceEntryGroupHome : public PlaceEntryGroup
 {
@@ -95,6 +96,20 @@
     PlaceEntry *entry = static_cast<PlaceEntry *> (*i);
     OnPlaceEntryAdded (entry);
   }
+
+  place->entry_removed.connect (sigc::mem_fun (this, &PlaceEntryHome::OnPlaceEntryRemoved));
+}
+
+void
+PlaceEntryHome::OnPlaceEntryRemoved (PlaceEntry *entry)
+{
+  std::vector<PlaceEntry *>::iterator it;
+
+  it = std::find (_entries.begin (), _entries.end (), entry);
+  if (it != _entries.end ())
+  {
+    _entries.erase (it);
+  }
 }
 
 void

=== modified file 'src/PlaceEntryHome.h'
--- src/PlaceEntryHome.h	2011-03-15 10:39:09 +0000
+++ src/PlaceEntryHome.h	2011-03-17 14:17:24 +0000
@@ -79,6 +79,7 @@
   void LoadExistingEntries ();
   void OnPlaceAdded (Place *place);
   void OnPlaceEntryAdded (PlaceEntry *entry);
+  void OnPlaceEntryRemoved (PlaceEntry *entry);
   void RefreshEntry (PlaceEntry *entry);
 
   void OnResultAdded (PlaceEntry *entry, PlaceEntryGroup& group, PlaceEntryResult& result);

=== modified file 'src/PlaceEntryRemote.cpp'
--- src/PlaceEntryRemote.cpp	2011-03-15 10:39:09 +0000
+++ src/PlaceEntryRemote.cpp	2011-03-17 14:17:24 +0000
@@ -605,6 +605,9 @@
   DeeModelIter *iter = (DeeModelIter *)id;
   DeeModelIter *group_iter;
 
+  if (iter == NULL || dee_model_is_last (_results_model, iter))
+    return;
+
   n_group = dee_model_get_uint32 (_results_model, iter, RESULT_GROUP_ID);
   group_iter = dee_model_get_iter_at_row (_groups_model, n_group);