Merge lp:~unity-team/unity/unity.remote-urgent into lp:unity

[Jason Smith]

[Jay Taoko (jaytaoko)]

review: Approve

[Mikkel Kamstrup Erlandsen (kamstrup)]

Can the emblem-related codepaths be removed before we merge this? Otherwise you can technically still put emblems on your launcher icon if you hack it over dbus.

review: Needs Fixing

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-03-31 21:54:24 +0000
+++ src/Launcher.cpp	2011-04-01 23:09:30 +0000
@@ -1187,10 +1187,20 @@
 
     // we dont need to show strays
     if (!icon->GetQuirk (LauncherIcon::QUIRK_RUNNING))
+    {
+      if (icon->GetQuirk (LauncherIcon::QUIRK_URGENT))
+      {
+        arg.running_arrow = true;
+        arg.window_indicators = 1;
+      }
+      else
         arg.window_indicators = 0;
+    }
     else
-        arg.window_indicators = icon->RelatedWindows ();
-
+    {
+      arg.window_indicators = icon->RelatedWindows ();
+    }
+    
     arg.backlight_intensity = IconBackgroundIntensity (icon, current);
     arg.shimmer_progress = IconShimmerProgress (icon, current);
 

=== modified file 'src/LauncherEntryRemote.cpp'
--- src/LauncherEntryRemote.cpp	2011-02-08 10:11:00 +0000
+++ src/LauncherEntryRemote.cpp	2011-04-01 23:09:30 +0000
@@ -49,6 +49,8 @@
   _count_visible = FALSE;
   _progress_visible = FALSE;
 
+  _urgent = FALSE;
+
   g_variant_ref_sink (val);
   g_variant_get (val, "(sa{sv})", &app_uri, &prop_iter);
 
@@ -159,6 +161,12 @@
   return _progress_visible;
 }
 
+gboolean
+LauncherEntryRemote::Urgent()
+{
+  return _urgent;
+}
+
 /**
  * Set the unique DBus name for the process owning the launcher entry.
  *
@@ -352,6 +360,16 @@
   progress_visible_changed.emit (this);
 }
 
+void
+LauncherEntryRemote::SetUrgent (gboolean urgent)
+{
+  if (_urgent == urgent)
+    return;
+  
+  _urgent = urgent;
+  urgent_changed.emit (this);
+}
+
 /**
  * Set all properties from 'other' on 'this'.
  */
@@ -366,6 +384,7 @@
   SetCount (other->Count ());
   SetProgress (other->Progress ());
   SetQuicklist (other->Quicklist());
+  SetUrgent (other->Urgent ());
 
   SetEmblemVisible (other->EmblemVisible ());
   SetCountVisible(other->CountVisible ());
@@ -402,6 +421,8 @@
         SetCountVisible (g_variant_get_boolean (prop_value));
       else if (g_str_equal ("progress-visible", prop_key))
         SetProgressVisible (g_variant_get_boolean (prop_value));
+      else if (g_str_equal ("urgent", prop_key))
+        SetUrgent (g_variant_get_boolean (prop_value));
       else if (g_str_equal ("quicklist", prop_key))
         {
           /* The value is the object path of the dbusmenu */

=== modified file 'src/LauncherEntryRemote.h'
--- src/LauncherEntryRemote.h	2011-02-03 17:31:47 +0000
+++ src/LauncherEntryRemote.h	2011-04-01 23:09:30 +0000
@@ -51,6 +51,7 @@
   gboolean EmblemVisible();
   gboolean CountVisible();
   gboolean ProgressVisible();
+  gboolean Urgent();
 
   sigc::signal<void, LauncherEntryRemote *, const gchar * > dbus_name_changed; // gives the old name as arg
   sigc::signal<void, LauncherEntryRemote *> emblem_changed;
@@ -61,6 +62,8 @@
   sigc::signal<void, LauncherEntryRemote *> emblem_visible_changed;
   sigc::signal<void, LauncherEntryRemote *> count_visible_changed;
   sigc::signal<void, LauncherEntryRemote *> progress_visible_changed;
+  
+  sigc::signal<void, LauncherEntryRemote *> urgent_changed;
 
 private:
 
@@ -76,6 +79,7 @@
   gboolean _emblem_visible;
   gboolean _count_visible;
   gboolean _progress_visible;
+  gboolean _urgent;
 
   void SetDBusName (const gchar *dbus_name);
   void SetEmblem (const gchar *emblem);
@@ -87,6 +91,8 @@
   void SetEmblemVisible (gboolean visible);
   void SetCountVisible (gboolean visible);
   void SetProgressVisible (gboolean visible);
+  
+  void SetUrgent (gboolean urgent);
 
   void Update (LauncherEntryRemote *other);
   void Update (GVariantIter *prop_iter);

=== modified file 'src/LauncherIcon.cpp'
--- src/LauncherIcon.cpp	2011-03-31 20:33:43 +0000
+++ src/LauncherIcon.cpp	2011-04-01 23:09:30 +0000
@@ -68,6 +68,7 @@
   _background_color = nux::Color::White;
   _glow_color = nux::Color::White;
   
+  _remote_urgent = false;
   _mouse_inside = false;
   _has_visible_window = false;
   _tooltip = new nux::Tooltip ();
@@ -905,6 +906,8 @@
   remote->count_visible_changed.connect    (sigc::mem_fun(this, &LauncherIcon::OnRemoteCountVisibleChanged));
   remote->progress_visible_changed.connect (sigc::mem_fun(this, &LauncherIcon::OnRemoteProgressVisibleChanged));
   
+  remote->urgent_changed.connect (sigc::mem_fun(this, &LauncherIcon::OnRemoteUrgentChanged));
+  
   
   if (remote->EmblemVisible ())
     OnRemoteEmblemVisibleChanged (remote);
@@ -914,6 +917,9 @@
     
   if (remote->ProgressVisible ())
     OnRemoteProgressVisibleChanged (remote);
+  
+  if (remote->Urgent ())
+    OnRemoteUrgentChanged (remote);
 }
 
 void 
@@ -926,6 +932,16 @@
   
   DeleteEmblem ();
   SetQuirk (QUIRK_PROGRESS, false);
+  
+  if (_remote_urgent)
+    SetQuirk (QUIRK_URGENT, false);
+}
+
+void
+LauncherIcon::OnRemoteUrgentChanged (LauncherEntryRemote *remote)
+{
+  _remote_urgent = remote->Urgent ();
+  SetQuirk (QUIRK_URGENT, remote->Urgent ());
 }
 
 void

=== modified file 'src/LauncherIcon.h'
--- src/LauncherIcon.h	2011-03-31 20:33:43 +0000
+++ src/LauncherIcon.h	2011-04-01 23:09:30 +0000
@@ -210,6 +210,8 @@
     void OnRemoteCountChanged     (LauncherEntryRemote *remote);
     void OnRemoteProgressChanged  (LauncherEntryRemote *remote);
     void OnRemoteQuicklistChanged (LauncherEntryRemote *remote);
+    
+    void OnRemoteUrgentChanged (LauncherEntryRemote *remote);
 
     void OnRemoteEmblemVisibleChanged   (LauncherEntryRemote *remote);
     void OnRemoteCountVisibleChanged    (LauncherEntryRemote *remote);
@@ -262,6 +264,7 @@
     guint            _time_delay_handle;
     bool             _quicklist_is_initialized;
     bool             _has_visible_window;
+    bool             _remote_urgent;
     
     gint64           _shortcut;