[telepathy-doc/master] Make the UI nicer

Danielle Madeley danielle.madeley at collabora.co.uk
Tue Sep 22 23:11:21 PDT 2009


---
 docs/examples/gtk_presence_app/presence-widget.c |   25 +++++++++++----------
 docs/examples/gtk_presence_app/presence-widget.h |    4 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/docs/examples/gtk_presence_app/presence-widget.c b/docs/examples/gtk_presence_app/presence-widget.c
index ee852b3..28b0257 100644
--- a/docs/examples/gtk_presence_app/presence-widget.c
+++ b/docs/examples/gtk_presence_app/presence-widget.c
@@ -13,7 +13,7 @@
 
 #define GET_PRIVATE(obj)  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_PRESENCE_WIDGET, PresenceWidgetPrivate))
 
-G_DEFINE_TYPE (PresenceWidget, presence_widget, GTK_TYPE_TABLE);
+G_DEFINE_TYPE (PresenceWidget, presence_widget, GTK_TYPE_FRAME);
 
 typedef struct _PresenceWidgetPrivate PresenceWidgetPrivate;
 struct _PresenceWidgetPrivate
@@ -211,27 +211,28 @@ presence_widget_init (PresenceWidget *self)
 {
   PresenceWidgetPrivate *priv = GET_PRIVATE (self);
 
-  gtk_table_resize (GTK_TABLE (self), 2, 2);
-
   priv->enabled_check = gtk_check_button_new ();
-  gtk_table_attach (GTK_TABLE (self), priv->enabled_check,
-      0, 2, 0, 1,
-      GTK_FILL, GTK_FILL, 0, 0);
+  gtk_frame_set_label_widget (GTK_FRAME (self), priv->enabled_check);
   g_signal_connect_swapped (priv->enabled_check, "toggled",
       G_CALLBACK (_enabled_toggled), self);
 
+  GtkWidget *table = gtk_table_new (2, 2, FALSE);
+  gtk_container_add (GTK_CONTAINER (self), table);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 3);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 3);
+
   priv->status_icon = gtk_image_new ();
-  gtk_table_attach (GTK_TABLE (self), priv->status_icon,
-      0, 1, 1, 2,
+  gtk_table_attach (GTK_TABLE (table), priv->status_icon,
+      0, 1, 0, 1,
       GTK_FILL, GTK_FILL, 0, 0);
 
   priv->status_message = gtk_label_new ("");
-  gtk_table_attach (GTK_TABLE (self), priv->status_message,
-      1, 2, 1, 2,
+  gtk_table_attach (GTK_TABLE (table), priv->status_message,
+      1, 2, 0, 1,
       GTK_FILL, GTK_FILL, 0, 0);
 
-  gtk_widget_show_all (GTK_WIDGET (self));
-  gtk_widget_hide (GTK_WIDGET (self));
+  gtk_widget_show (priv->enabled_check);
+  gtk_widget_show_all (table);
 }
 
 GtkWidget *
diff --git a/docs/examples/gtk_presence_app/presence-widget.h b/docs/examples/gtk_presence_app/presence-widget.h
index 671b0c6..aedc4e8 100644
--- a/docs/examples/gtk_presence_app/presence-widget.h
+++ b/docs/examples/gtk_presence_app/presence-widget.h
@@ -28,12 +28,12 @@ typedef struct _PresenceWidgetClass PresenceWidgetClass;
 
 struct _PresenceWidget
 {
-  GtkTable parent;
+  GtkFrame parent;
 };
 
 struct _PresenceWidgetClass
 {
-  GtkTableClass parent_class;
+  GtkFrameClass parent_class;
 };
 
 GType presence_widget_get_type (void);
-- 
1.5.6.5




More information about the telepathy-commits mailing list