Merge lp:~canonical-dx-team/unity/unity.launcher-introspection into lp:unity

[Jason Smith]

[Neil J. Patel (njpatel)]

Approved pending:

- Add BamfLauncherIcon props, chaining up to LauncherIcon for the standard props
- s/\_/\-/

review: Approve

[Alex Launi (alexlauni)]

I would remove the preceeding _ from the properties in LauncherIcon.cpp.

review: Approve

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2010-12-01 22:28:50 +0000
+++ src/Launcher.cpp	2010-12-02 14:59:27 +0000
@@ -269,6 +269,29 @@
 
 }
 
+/* Introspection */
+const gchar *
+Launcher::GetName ()
+{
+  return "Launcher";
+}
+
+void
+Launcher::AddProperties (GVariantBuilder *builder)
+{
+  g_variant_builder_add (builder, "{sv}", "hover_progress", g_variant_new_double ((double) GetHoverProgress ()));
+  g_variant_builder_add (builder, "{sv}", "dnd_exit_progress", g_variant_new_double ((double) DnDExitProgress ()));
+  g_variant_builder_add (builder, "{sv}", "autohide_progress", g_variant_new_double ((double) AutohideProgress ()));
+  
+  g_variant_builder_add (builder, "{sv}", "dnd_delta", g_variant_new_int32 (_dnd_delta));
+  g_variant_builder_add (builder, "{sv}", "floating", g_variant_new_boolean (_floating));
+  g_variant_builder_add (builder, "{sv}", "hovered", g_variant_new_boolean (_hovered));
+  g_variant_builder_add (builder, "{sv}", "autohide", g_variant_new_boolean (_autohide));
+  g_variant_builder_add (builder, "{sv}", "hidden", g_variant_new_boolean (_hidden));
+  g_variant_builder_add (builder, "{sv}", "autohide", g_variant_new_boolean (_autohide));
+  g_variant_builder_add (builder, "{sv}", "mouse_inside_launcher", g_variant_new_boolean (_mouse_inside_launcher));
+}
+
 /* Render Layout Logic */
 
 float Launcher::GetHoverProgress ()
@@ -917,6 +940,8 @@
     
     // needs to be disconnected
     icon->needs_redraw.connect (sigc::mem_fun(this, &Launcher::OnIconNeedsRedraw));
+    
+    AddChild (icon);
 }
 
 void Launcher::OnIconRemoved (void *icon_pointer)
@@ -925,6 +950,8 @@
     icon->UnReference ();
     
     EnsureAnimation();
+    
+    RemoveChild (icon);
 }
 
 void Launcher::OnOrderChanged ()
@@ -1484,15 +1511,6 @@
 {
 }
 
-const gchar* Launcher::GetName ()
-{
-	return "Launcher";
-}
-
-void Launcher::AddProperties (GVariantBuilder *builder)
-{
-}
-
 void Launcher::EventLogic ()
 { 
   if (_launcher_action_state == ACTION_DRAG_LAUNCHER)

=== modified file 'src/Launcher.h'
--- src/Launcher.h	2010-12-01 22:28:50 +0000
+++ src/Launcher.h	2010-12-02 14:59:27 +0000
@@ -45,7 +45,7 @@
 
     LauncherIcon* GetActiveTooltipIcon() {return m_ActiveTooltipIcon;}
     LauncherIcon* GetActiveMenuIcon() {return m_ActiveMenuIcon;}
-
+    
     bool TooltipNotify(LauncherIcon* Icon);
     bool MenuNotify(LauncherIcon* Icon);
     

=== modified file 'src/LauncherIcon.cpp'
--- src/LauncherIcon.cpp	2010-12-01 22:28:50 +0000
+++ src/LauncherIcon.cpp	2010-12-02 14:59:27 +0000
@@ -88,6 +88,26 @@
   _center_stabilize_handle = 0;
 }
 
+const gchar *
+LauncherIcon::GetName ()
+{
+  return m_TooltipText.GetTCharPtr ();
+}
+
+void
+LauncherIcon::AddProperties (GVariantBuilder *builder)
+{
+  g_variant_builder_add (builder, "{sv}", "related_windows", g_variant_new_int32 (_related_windows));
+  g_variant_builder_add (builder, "{sv}", "_icon_type", g_variant_new_int32 (_icon_type));
+  
+  g_variant_builder_add (builder, "{sv}", "_sort_priority", g_variant_new_int32 (_sort_priority));
+  g_variant_builder_add (builder, "{sv}", "_quirk_active", g_variant_new_int32 (GetQuirk (LAUNCHER_ICON_QUIRK_ACTIVE)));
+  g_variant_builder_add (builder, "{sv}", "_quirk_visible", g_variant_new_int32 (GetQuirk (LAUNCHER_ICON_QUIRK_VISIBLE)));
+  g_variant_builder_add (builder, "{sv}", "_quirk_urgent", g_variant_new_int32 (GetQuirk (LAUNCHER_ICON_QUIRK_URGENT)));
+  g_variant_builder_add (builder, "{sv}", "_quirk_running", g_variant_new_int32 (GetQuirk (LAUNCHER_ICON_QUIRK_RUNNING)));
+  g_variant_builder_add (builder, "{sv}", "_quirk_presented", g_variant_new_int32 (GetQuirk (LAUNCHER_ICON_QUIRK_PRESENTED)));
+}
+
 nux::Color LauncherIcon::BackgroundColor ()
 {
   return _background_color;

=== modified file 'src/LauncherIcon.h'
--- src/LauncherIcon.h	2010-12-01 22:28:50 +0000
+++ src/LauncherIcon.h	2010-12-02 14:59:27 +0000
@@ -35,6 +35,7 @@
 
 #include "Tooltip.h"
 #include "QuicklistView.h"
+#include "Introspectable.h"
 
 class Launcher;
 class QuicklistView;
@@ -64,7 +65,7 @@
   LAUNCHER_ICON_QUIRK_LAST,
 } LauncherIconQuirk;
 
-class LauncherIcon : public nux::InitiallyUnownedObject, public sigc::trackable
+class LauncherIcon : public Introspectable, public nux::InitiallyUnownedObject, public sigc::trackable
 {
 public:
     LauncherIcon(Launcher* launcher);
@@ -116,6 +117,9 @@
     sigc::signal<void, void *> remove;
     sigc::signal<void, void *> needs_redraw;
 protected:
+    const gchar * GetName ();
+    void AddProperties (GVariantBuilder *builder);
+
     void SetQuirk (LauncherIconQuirk quirk, bool value);
 
     void UpdateQuirkTimeDelayed (guint ms, LauncherIconQuirk quirk);