[maemo-commits] [maemo-commits] r11921 - in projects/haf/trunk/hildon-desktop: . libhildondesktop

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-05-28 20:33:16 +0300 (Mon, 28 May 2007)
New Revision: 11921

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-window.c
Log:

2007-05-28  Johan Bilien  <johan.bilien at nokia.com>

	* libhildondesktop/hildon-home-window.c:
	- add "titlebar" property so it can be accessed for a11n



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-28 17:33:02 UTC (rev 11920)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-05-28 17:33:16 UTC (rev 11921)
@@ -1,5 +1,10 @@
 2007-05-28  Johan Bilien  <johan.bilien at nokia.com>
 
+	* libhildondesktop/hildon-home-window.c:
+	- add "titlebar" property so it can be accessed for a11n
+
+2007-05-28  Johan Bilien  <johan.bilien at nokia.com>
+
 	* libhildondesktop/hildon-home-area.c:
 	- emit "layout-changed" when applets are really added to the area
 	* src/hd-home-window.c:

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-window.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-window.c	2007-05-28 17:33:02 UTC (rev 11920)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-window.c	2007-05-28 17:33:16 UTC (rev 11921)
@@ -73,7 +73,8 @@
 
   PROP_WORK_AREA,
   PROP_TITLE,
-  PROP_MENU
+  PROP_MENU,
+  PROP_TITLEBAR
 };
 
 static void
@@ -112,11 +113,35 @@
                                               g_value_get_pointer (value));
           break;
       case PROP_TITLE:
-          g_debug ("Setting title %s", g_value_get_string (value));
           g_object_set (priv->titlebar,
                         "title", g_value_get_string (value),
                         NULL);
           break;
+      case PROP_TITLEBAR:
+            {
+              GtkWidget *titlebar = GTK_WIDGET (g_value_get_object (value));
+
+              if (GTK_IS_WIDGET (titlebar))
+                {
+                  if (priv->titlebar)
+                    g_object_unref (priv->titlebar);
+
+                  priv->titlebar = titlebar;
+
+                  gtk_widget_push_composite_child ();
+
+                  priv->titlebar = hildon_home_titlebar_new ();
+                  g_object_ref (priv->titlebar);
+                  gtk_object_sink (GTK_OBJECT (priv->titlebar));
+                  gtk_widget_set_parent (priv->titlebar,
+                                         GTK_WIDGET (gobject));
+                  gtk_widget_show (priv->titlebar);
+
+                  gtk_widget_pop_composite_child ();
+                }
+            }
+          break;
+
       default:
           G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
           break;
@@ -156,6 +181,10 @@
             }
           break;
 
+      case PROP_TITLEBAR:
+          g_value_set_object (value, priv->titlebar);
+          break;
+
       default:
           G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
           break;
@@ -351,6 +380,16 @@
                                    PROP_WORK_AREA,
                                    pspec);
 
+  pspec =  g_param_spec_object ("titlebar",
+                                "Titlebar",
+                                "Titlebar widget",
+                                GTK_TYPE_WIDGET,
+                                G_PARAM_READWRITE);
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_TITLEBAR,
+                                   pspec);
+
   pspec =  g_param_spec_object ("menu",
                                 "menu",
                                 "menu",