[ekiga] Ported the dialpad to be based on GtkGrid instead of GtkTable



commit 988b00e209a21f76f40454baaf9d5371ef189cea
Author: Julien Puydt <jpuydt free fr>
Date:   Tue Jun 18 10:53:53 2013 +0200

    Ported the dialpad to be based on GtkGrid instead of GtkTable

 lib/gui/dialpad.c |   18 ++++++++----------
 lib/gui/dialpad.h |    4 ++--
 2 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/lib/gui/dialpad.c b/lib/gui/dialpad.c
index 29df0f5..4ab4e47 100644
--- a/lib/gui/dialpad.c
+++ b/lib/gui/dialpad.c
@@ -82,7 +82,7 @@ enum
   PROP_ACCEL_GROUP
 };
 
-G_DEFINE_TYPE (EkigaDialpad, ekiga_dialpad, GTK_TYPE_TABLE);
+G_DEFINE_TYPE (EkigaDialpad, ekiga_dialpad, GTK_TYPE_GRID);
 
 static void
 ekiga_dialpad_get_property (GObject    *object,
@@ -147,9 +147,10 @@ ekiga_dialpad_init (EkigaDialpad *dialpad)
                                                EKIGA_TYPE_DIALPAD,
                                                EkigaDialpadPrivate);
 
-  gtk_table_set_col_spacings (GTK_TABLE (dialpad), 2);
-  gtk_table_set_row_spacings (GTK_TABLE (dialpad), 2);
-  gtk_table_set_homogeneous (GTK_TABLE (dialpad), TRUE);
+  gtk_grid_set_column_spacing (GTK_GRID (dialpad), 2);
+  gtk_grid_set_row_spacing (GTK_GRID (dialpad), 2);
+  gtk_grid_set_column_homogeneous (GTK_GRID (dialpad), TRUE);
+  gtk_grid_set_row_homogeneous (GTK_GRID (dialpad), TRUE);
 
   // the dialpad is LTR even for RTL languages
   gtk_widget_set_direction (GTK_WIDGET (dialpad), GTK_TEXT_DIR_LTR);
@@ -188,12 +189,9 @@ ekiga_dialpad_init (EkigaDialpad *dialpad)
 
     dialpad->priv->buttons[i] = button;
 
-    gtk_table_attach (GTK_TABLE (dialpad),  button,
-                      i % 3, i % 3 + 1,
-                      i / 3, i / 3 + 1,
-                      (GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
-                      (GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
-                      0, 0);
+    gtk_grid_attach (GTK_GRID (dialpad),  button,
+                    i % 3, i / 3,
+                    1, 1 );
 
     g_signal_connect (button, "clicked",
                       G_CALLBACK (on_dialpad_button_clicked), dialpad);
diff --git a/lib/gui/dialpad.h b/lib/gui/dialpad.h
index d862114..7620bc7 100644
--- a/lib/gui/dialpad.h
+++ b/lib/gui/dialpad.h
@@ -52,13 +52,13 @@ typedef struct _EkigaDialpadClass   EkigaDialpadClass;
 
 struct _EkigaDialpad
 {
-  GtkTable             parent;
+  GtkGrid             parent;
   EkigaDialpadPrivate *priv;
 };
 
 struct _EkigaDialpadClass
 {
-  GtkTableClass parent_class;
+  GtkGridClass parent_class;
 
   void (* button_clicked) (EkigaDialpad *dialpad, const gchar *button);
 };


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]