[libgda] Avoid using deprecated functions
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Avoid using deprecated functions
- Date: Mon, 1 Oct 2012 20:37:20 +0000 (UTC)
commit 44799648460c37dec0b510e88001c90ca10f5884
Author: Vivien Malerba <malerba gnome-db org>
Date: Mon Oct 1 22:36:56 2012 +0200
Avoid using deprecated functions
from GtkTable and g_value_set_char()
control-center/gdaui-dsn-editor.c | 41 +++----
testing/gdaui-test-data-entries.c | 118 ++++++++-----------
testing/gdaui-test-widget-entry.c | 22 ++--
tools/browser/browser-connections-list.c | 26 ++--
tools/browser/canvas-example.c | 15 +--
tools/browser/canvas/browser-canvas-print.c | 20 ++--
tools/browser/common/fk-declare.c | 31 +++---
tools/browser/common/gdaui-data-import.c | 38 +++---
tools/browser/connection-binding-properties.c | 15 +--
.../browser/data-manager/data-favorite-selector.c | 14 +-
tools/browser/ldap-browser/filter-editor.c | 26 ++--
.../browser/ldap-browser/ldap-favorite-selector.c | 14 +-
tools/browser/ldap-browser/vtable-dialog.c | 18 ++--
tools/browser/query-exec/query-favorite-selector.c | 18 ++--
tools/browser/schema-browser/table-preferences.c | 45 ++++----
15 files changed, 216 insertions(+), 245 deletions(-)
---
diff --git a/control-center/gdaui-dsn-editor.c b/control-center/gdaui-dsn-editor.c
index a09fd63..5118881 100644
--- a/control-center/gdaui-dsn-editor.c
+++ b/control-center/gdaui-dsn-editor.c
@@ -102,7 +102,7 @@ field_toggled_cb (G_GNUC_UNUSED GtkWidget *widget, GdauiDsnEditor *config)
static void
gdaui_dsn_editor_init (GdauiDsnEditor *config, G_GNUC_UNUSED GdauiDsnEditorClass *klass)
{
- GtkWidget *table;
+ GtkWidget *grid;
GtkWidget *label;
GtkWidget *exp;
gchar *str;
@@ -120,11 +120,11 @@ gdaui_dsn_editor_init (GdauiDsnEditor *config, G_GNUC_UNUSED GdauiDsnEditorClass
labels_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
/* set up widgets */
- table = gtk_table_new (8, 2, FALSE);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_widget_show (table);
- gtk_box_pack_start (GTK_BOX (config), table, TRUE, TRUE, 0);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_widget_show (grid);
+ gtk_box_pack_start (GTK_BOX (config), grid, TRUE, TRUE, 0);
str = g_strdup_printf ("%s <span foreground='red' weight='bold'>*</span>", _("Data source _name:"));
label = gtk_label_new ("");
@@ -135,7 +135,7 @@ gdaui_dsn_editor_init (GdauiDsnEditor *config, G_GNUC_UNUSED GdauiDsnEditorClass
gtk_size_group_add_widget (labels_size_group, label);
gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
config->priv->wname = gtk_entry_new ();
gtk_editable_set_editable (GTK_EDITABLE (config->priv->wname), FALSE);
g_object_set (G_OBJECT (config->priv->wname), "can-focus", FALSE, NULL);
@@ -146,20 +146,18 @@ gdaui_dsn_editor_init (GdauiDsnEditor *config, G_GNUC_UNUSED GdauiDsnEditorClass
gtk_editable_set_editable (GTK_EDITABLE (config->priv->wname), FALSE);
g_signal_connect (G_OBJECT (config->priv->wname), "changed",
G_CALLBACK (field_changed_cb), config);
- gtk_table_attach (GTK_TABLE (table), config->priv->wname, 1, 2, 0, 1,
- GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), config->priv->wname, 1, 0, 1, 1);
label = gtk_label_new_with_mnemonic (_("_System wide data source:"));
gtk_misc_set_alignment (GTK_MISC (label), 0, -1.);
gtk_size_group_add_widget (labels_size_group, label);
gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
config->priv->is_system = gtk_check_button_new ();
gtk_widget_show (config->priv->is_system);
g_signal_connect (G_OBJECT (config->priv->is_system), "toggled",
G_CALLBACK (field_toggled_cb), config);
- gtk_table_attach (GTK_TABLE (table), config->priv->is_system, 1, 2, 1, 2,
- GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), config->priv->is_system, 1, 1, 1, 1);
str = g_strdup_printf ("%s <span foreground='red' weight='bold'>*</span>", _("_Provider:"));
label = gtk_label_new ("");
@@ -169,20 +167,19 @@ gdaui_dsn_editor_init (GdauiDsnEditor *config, G_GNUC_UNUSED GdauiDsnEditorClass
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_size_group_add_widget (labels_size_group, label);
gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
config->priv->wprovider = gdaui_provider_selector_new ();
gtk_label_set_mnemonic_widget (GTK_LABEL (label), config->priv->wprovider);
gtk_widget_show (config->priv->wprovider);
g_signal_connect (G_OBJECT (config->priv->wprovider), "changed",
G_CALLBACK (field_changed_cb), config);
- gtk_table_attach (GTK_TABLE (table), config->priv->wprovider, 1, 2, 2, 3,
- GTK_FILL|GTK_EXPAND, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), config->priv->wprovider, 1, 2, 1, 1);
label = gtk_label_new_with_mnemonic (_("_Description:"));
gtk_misc_set_alignment (GTK_MISC (label), 0, -1.);
gtk_size_group_add_widget (labels_size_group, label);
gtk_widget_show (label);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1);
config->priv->wdesc = gtk_entry_new ();
gtk_editable_set_editable (GTK_EDITABLE (config->priv->wdesc), TRUE);
gtk_widget_show (config->priv->wdesc);
@@ -190,8 +187,7 @@ gdaui_dsn_editor_init (GdauiDsnEditor *config, G_GNUC_UNUSED GdauiDsnEditorClass
gtk_widget_show (config->priv->wdesc);
g_signal_connect (G_OBJECT (config->priv->wdesc), "changed",
G_CALLBACK (field_changed_cb), config);
- gtk_table_attach (GTK_TABLE (table), config->priv->wdesc, 1, 2, 3, 4,
- GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), config->priv->wdesc, 1, 3, 1, 1);
config->priv->warning = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (config->priv->warning),
@@ -200,15 +196,13 @@ gdaui_dsn_editor_init (GdauiDsnEditor *config, G_GNUC_UNUSED GdauiDsnEditorClass
gtk_misc_set_alignment (GTK_MISC (config->priv->warning), 0.5, -1);
gtk_label_set_justify (GTK_LABEL (config->priv->warning), GTK_JUSTIFY_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (config->priv->warning), TRUE);
- gtk_table_attach (GTK_TABLE (table), config->priv->warning, 0, 2, 8, 9,
- GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), config->priv->warning, 0, 8, 2, 1);
/* connection's spec */
exp = gtk_expander_new (_("Connection's parameters"));
config->priv->dsn_spec_expander = exp;
gtk_widget_show (exp);
- gtk_table_attach (GTK_TABLE (table), config->priv->dsn_spec_expander, 0, 2, 6, 7,
- GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), config->priv->dsn_spec_expander, 0, 6, 2, 1);
config->priv->dsn_spec = _gdaui_provider_spec_editor_new (gdaui_provider_selector_get_provider
(GDAUI_PROVIDER_SELECTOR (config->priv->wprovider)));
g_signal_connect (G_OBJECT (config->priv->dsn_spec), "changed",
@@ -222,8 +216,7 @@ gdaui_dsn_editor_init (GdauiDsnEditor *config, G_GNUC_UNUSED GdauiDsnEditorClass
exp = gtk_expander_new (_("Authentication"));
config->priv->dsn_auth_expander = exp;
gtk_widget_show (exp);
- gtk_table_attach (GTK_TABLE (table), config->priv->dsn_auth_expander, 0, 2, 7, 8,
- GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), config->priv->dsn_auth_expander, 0, 7, 2, 1);
config->priv->dsn_auth = _gdaui_provider_auth_editor_new (gdaui_provider_selector_get_provider
(GDAUI_PROVIDER_SELECTOR (config->priv->wprovider)));
g_signal_connect (G_OBJECT (config->priv->dsn_auth), "changed",
diff --git a/testing/gdaui-test-data-entries.c b/testing/gdaui-test-data-entries.c
index 158e102..6c4b0af 100644
--- a/testing/gdaui-test-data-entries.c
+++ b/testing/gdaui-test-data-entries.c
@@ -393,17 +393,17 @@ plugin_hash_foreach_func (const gchar *plugin_name, GdauiPlugin *plugin, GtkWidg
static void create_plugin_nb (GtkWidget *vbox, GdauiPlugin *plugin);
static void options_form_holder_changed_cb (GdauiBasicForm *form, GdaHolder *param, gboolean user_modif,
- GtkWidget *table);
+ GtkWidget *grid);
static GtkWidget *
build_test_for_plugin_struct (GdauiPlugin *plugin)
{
- GtkWidget *label, *table;
+ GtkWidget *label, *grid;
GString *string;
gchar *str, *txt = "";
g_assert (plugin);
- table = gtk_table_new (4, 2, FALSE);
+ grid = gtk_grid_new ();
/* explain top label */
if (plugin->plugin_file)
@@ -413,12 +413,12 @@ build_test_for_plugin_struct (GdauiPlugin *plugin)
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_label_set_markup (GTK_LABEL (label), str);
g_free (str);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
gtk_widget_show (label);
label = gtk_label_new (plugin->plugin_name);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1);
gtk_widget_show (label);
str = g_strdup_printf ("<b>%sDescription:</b>", txt);
@@ -426,12 +426,12 @@ build_test_for_plugin_struct (GdauiPlugin *plugin)
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_label_set_markup (GTK_LABEL (label), str);
g_free (str);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
gtk_widget_show (label);
label = gtk_label_new (plugin->plugin_descr);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 1, 1, 1, 1);
gtk_widget_show (label);
/* options */
@@ -441,7 +441,7 @@ build_test_for_plugin_struct (GdauiPlugin *plugin)
gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
gtk_label_set_markup (GTK_LABEL (label), string->str);
g_string_free (string, TRUE);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
gtk_widget_show (label);
if (plugin->options_xml_spec) {
@@ -454,7 +454,7 @@ build_test_for_plugin_struct (GdauiPlugin *plugin)
str = g_strdup_printf ("Cannot parse XML spec for %soptions: %s", txt,
error && error->message ? error->message : "No detail");
label = gtk_label_new (str);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 1, 2, 1, 1);
g_warning ("%s", str);
g_error_free (error);
}
@@ -463,31 +463,31 @@ build_test_for_plugin_struct (GdauiPlugin *plugin)
form = gdaui_basic_form_new (plist);
g_object_unref (plist);
- gtk_table_attach (GTK_TABLE (table), form, 1, 2, 2, 3, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), form, 1, 2, 1, 1);
gtk_widget_show (form);
- g_object_set_data (G_OBJECT (table), "options", form);
+ g_object_set_data (G_OBJECT (grid), "options", form);
g_signal_connect (G_OBJECT (form), "holder-changed",
- G_CALLBACK (options_form_holder_changed_cb), table);
+ G_CALLBACK (options_form_holder_changed_cb), grid);
}
}
else {
label = gtk_label_new ("None");
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, 2, 3, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 1, 2, 1, 1);
gtk_widget_show (label);
}
/* notebook */
- create_plugin_nb (table, plugin);
+ create_plugin_nb (grid, plugin);
- gtk_widget_show (table);
+ gtk_widget_show (grid);
- return table;
+ return grid;
}
-static void plugin_nb_page_changed_cb (GtkNotebook *nb, GtkWidget *page, gint pageno, GtkWidget *table);
+static void plugin_nb_page_changed_cb (GtkNotebook *nb, GtkWidget *page, gint pageno, GtkWidget *grid);
static void vbox_destroyed_cb (GtkWidget *widget, gpointer data);
static void
-create_plugin_nb (GtkWidget *table, GdauiPlugin *plugin)
+create_plugin_nb (GtkWidget *grid, GdauiPlugin *plugin)
{
GtkWidget *wid, *nb, *label;
gsize i;
@@ -496,13 +496,13 @@ create_plugin_nb (GtkWidget *table, GdauiPlugin *plugin)
nb = gtk_notebook_new ();
gtk_notebook_set_tab_pos (GTK_NOTEBOOK (nb), GTK_POS_LEFT);
- gtk_table_attach_defaults (GTK_TABLE (table), nb, 0, 2, 3, 4);
+ gtk_grid_attach (GTK_GRID (grid), nb, 0, 1, 2, 1);
gtk_widget_show (nb);
g_signal_connect (G_OBJECT (nb), "switch-page",
- G_CALLBACK (plugin_nb_page_changed_cb), table);
+ G_CALLBACK (plugin_nb_page_changed_cb), grid);
- g_object_set_data (G_OBJECT (table), "nb", nb);
- g_object_set_data (G_OBJECT (table), "plugin", plugin);
+ g_object_set_data (G_OBJECT (grid), "nb", nb);
+ g_object_set_data (G_OBJECT (grid), "plugin", plugin);
if (plugin->nb_g_types > 0) {
for (i = 0; i < plugin->nb_g_types; i++) {
@@ -517,7 +517,7 @@ create_plugin_nb (GtkWidget *table, GdauiPlugin *plugin)
tdata->type = type;
tdata->dh = dh;
tdata->plugin = plugin;
- tdata->options = g_object_get_data (G_OBJECT (table), "options");
+ tdata->options = g_object_get_data (G_OBJECT (grid), "options");
g_hash_table_insert (mainconf.tests_hash, wid, tdata);
gtk_widget_show (wid);
@@ -542,7 +542,7 @@ create_plugin_nb (GtkWidget *table, GdauiPlugin *plugin)
tdata->type = type;
tdata->dh = dh;
tdata->plugin = plugin;
- tdata->options = g_object_get_data (G_OBJECT (table), "options");
+ tdata->options = g_object_get_data (G_OBJECT (grid), "options");
g_hash_table_insert (mainconf.tests_hash, wid, tdata);
gtk_widget_show (wid);
@@ -567,7 +567,7 @@ static GtkWidget *build_grid_test_for_gtype (GdaDataHandler *dh, GType type, con
static void
plugin_nb_page_changed_cb (GtkNotebook *nb, G_GNUC_UNUSED GtkWidget *page, gint pageno,
- G_GNUC_UNUSED GtkWidget *table)
+ G_GNUC_UNUSED GtkWidget *grid)
{
GtkWidget *vbox;
TestWidgetData *tdata;
@@ -648,19 +648,19 @@ build_test_widget (TestWidgetData *tdata)
static void
options_form_holder_changed_cb (G_GNUC_UNUSED GdauiBasicForm *form, G_GNUC_UNUSED GdaHolder *param,
- G_GNUC_UNUSED gboolean user_modif, GtkWidget *table)
+ G_GNUC_UNUSED gboolean user_modif, GtkWidget *grid)
{
GtkWidget *nb;
GdauiPlugin *plugin;
- nb = g_object_get_data (G_OBJECT (table), "nb");
- plugin = g_object_get_data (G_OBJECT (table), "plugin");
+ nb = g_object_get_data (G_OBJECT (grid), "nb");
+ plugin = g_object_get_data (G_OBJECT (grid), "plugin");
g_assert (plugin);
if (nb)
gtk_widget_destroy (nb);
- g_object_set_data (G_OBJECT (table), "nb", NULL);
- create_plugin_nb (table, plugin);
+ g_object_set_data (G_OBJECT (grid), "nb", NULL);
+ create_plugin_nb (grid, plugin);
}
@@ -677,16 +677,15 @@ void default_clicked_cb (GtkButton *button, GtkWidget *entry);
static GtkWidget *
build_basic_test_for_gtype (GdaDataHandler *dh, GType type, const gchar *plugin_name)
{
- GtkWidget *wid, *label, *table, *button, *bbox, *entry, *vbox;
+ GtkWidget *wid, *label, *grid, *button, *bbox, *entry, *vbox;
GString *string;
- gboolean expand;
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- table = gtk_table_new (7, 3, FALSE);
- gtk_container_set_border_width (GTK_CONTAINER (table), 5);
- gtk_table_set_row_spacings (GTK_TABLE (table), 5);
- gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
+ grid = gtk_grid_new ();
+ gtk_container_set_border_width (GTK_CONTAINER (grid), 5);
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 5);
+ gtk_box_pack_start (GTK_BOX (vbox), grid, TRUE, TRUE, 0);
/* explain top label */
string = g_string_new ("");
@@ -700,40 +699,36 @@ build_basic_test_for_gtype (GdaDataHandler *dh, GType type, const gchar *plugin_
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_label_set_markup (GTK_LABEL (label), string->str);
g_string_free (string, TRUE);
- gtk_table_attach (GTK_TABLE (table), label, 0, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 2, 1);
gtk_widget_show (label);
/* widget being tested */
wid = GTK_WIDGET (gdaui_new_data_entry (type, plugin_name));
g_object_set (G_OBJECT (wid), "handler", dh, NULL);
- expand = gdaui_data_entry_can_expand (GDAUI_DATA_ENTRY (wid), FALSE);
- if (expand)
- gtk_table_attach_defaults (GTK_TABLE (table), wid, 0, 3, 1, 2);
- else
- gtk_table_attach (GTK_TABLE (table), wid, 0, 3, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), wid, 0, 1, 3, 1);
gtk_widget_show (wid);
/* Other widgets */
label = gtk_label_new ("Current flags: ");
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
gtk_widget_show (label);
label = gtk_label_new ("--");
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 3, 2, 3, 0, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 1, 2, 2, 1);
g_object_set_data (G_OBJECT (wid), "flags", label);
gtk_widget_show (label);
label = gtk_label_new ("Current value: ");
gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1);
gtk_widget_show (label);
label = gtk_label_new ("");
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 1, 3, 3, 4, 0, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 1, 3, 1, 1);
g_object_set_data (G_OBJECT (wid), "value", label);
g_signal_connect (G_OBJECT (wid), "contents-modified",
G_CALLBACK (entry_contents_modified), NULL);
@@ -742,7 +737,7 @@ build_basic_test_for_gtype (GdaDataHandler *dh, GType type, const gchar *plugin_
entry_contents_modified (wid, GTK_LABEL (label));
bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_table_attach (GTK_TABLE (table), bbox, 0, 3, 4, 5, 0, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), bbox, 0, 4, 3, 1);
button = gtk_toggle_button_new_with_label ("NULL ok");
g_signal_connect (G_OBJECT (button), "toggled",
@@ -780,14 +775,11 @@ build_basic_test_for_gtype (GdaDataHandler *dh, GType type, const gchar *plugin_
entry = GTK_WIDGET (gdaui_new_data_entry (type, plugin_name));
g_object_set (G_OBJECT (entry), "handler", dh, NULL);
- if (expand)
- gtk_table_attach_defaults (GTK_TABLE (table), entry, 0, 2, 5, 6);
- else
- gtk_table_attach (GTK_TABLE (table), entry, 0, 2, 5, 6, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 0, 5, 2, 1);
gtk_widget_show (entry);
button = gtk_button_new_with_label ("Set as original");
g_object_set_data (G_OBJECT (button), "entry", entry);
- gtk_table_attach (GTK_TABLE (table), button, 2, 3, 5, 6, 0, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), button, 2, 5, 1, 1);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (orig_clicked_cb), wid);
@@ -796,26 +788,16 @@ build_basic_test_for_gtype (GdaDataHandler *dh, GType type, const gchar *plugin_
entry = GTK_WIDGET (gdaui_new_data_entry (type, plugin_name));
g_object_set (G_OBJECT (entry), "handler", dh, NULL);
- if (expand)
- gtk_table_attach_defaults (GTK_TABLE (table), entry, 0, 2, 6, 7);
- else
- gtk_table_attach (GTK_TABLE (table), entry, 0, 2, 6, 7, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 0, 6, 2, 1);
gtk_widget_show (entry);
button = gtk_button_new_with_label ("Set as default");
g_object_set_data (G_OBJECT (button), "entry", entry);
- gtk_table_attach (GTK_TABLE (table), button, 2, 3, 6, 7, 0, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), button, 2, 6, 1, 1);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (default_clicked_cb), wid);
- gtk_widget_show (table);
-
- if (!expand) {
- label = gtk_label_new ("");
- gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
- gtk_widget_show (label);
- }
-
+ gtk_widget_show (grid);
gtk_widget_show (vbox);
return vbox;
@@ -1198,13 +1180,13 @@ fill_tested_models (void)
gda_data_model_set_column_title (model, 0, "CHAR value");
row = gda_data_model_append_row (model, NULL);
- g_value_set_char ((value = gda_value_new (G_TYPE_CHAR)), -128);
+ g_value_set_schar ((value = gda_value_new (G_TYPE_CHAR)), (gint8) -128);
gda_data_model_set_value_at (model, 0, row, value, NULL); gda_value_free (value);
row = gda_data_model_append_row (model, NULL);
- g_value_set_char ((value = gda_value_new (G_TYPE_CHAR)), 0);
+ g_value_set_schar ((value = gda_value_new (G_TYPE_CHAR)), (gint8) 0);
gda_data_model_set_value_at (model, 0, row, value, NULL); gda_value_free (value);
row = gda_data_model_append_row (model, NULL);
- g_value_set_char ((value = gda_value_new (G_TYPE_CHAR)), 127);
+ g_value_set_schar ((value = gda_value_new (G_TYPE_CHAR)), (gint8) 127);
gda_data_model_set_value_at (model, 0, row, value, NULL); gda_value_free (value);
/* G_TYPE_UCHAR */
diff --git a/testing/gdaui-test-widget-entry.c b/testing/gdaui-test-widget-entry.c
index 0b67dc4..ea36040 100644
--- a/testing/gdaui-test-widget-entry.c
+++ b/testing/gdaui-test-widget-entry.c
@@ -107,7 +107,7 @@ int
main (int argc, char* argv[])
{
GtkWidget *entry, *label, *button;
- GtkWidget *window, *hbox, *vbox, *table, *top_vbox;
+ GtkWidget *window, *hbox, *vbox, *grid, *top_vbox;
gint index = 0;
gchar *tmp;
@@ -393,31 +393,31 @@ main (int argc, char* argv[])
gtk_label_set_markup (GTK_LABEL (label), "<b>Common properties:</b>");
gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
gtk_box_pack_start (GTK_BOX (top_vbox), label, FALSE, FALSE, 10);
- table = gtk_table_new (2, 3, FALSE);
- gtk_box_pack_start (GTK_BOX (top_vbox), table, TRUE, TRUE, 0);
+ grid = gtk_grid_new ();
+ gtk_box_pack_start (GTK_BOX (top_vbox), grid, TRUE, TRUE, 0);
label = gtk_label_new ("MaxLen:");
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, 0, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
entry = gdaui_entry_new (NULL, NULL); /* FIXME: use a gint data entry */
- gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, 0, 1);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 0, 1, 1);
button = gtk_button_new_with_label ("Set");
- gtk_table_attach (GTK_TABLE (table), button, 2, 3, 0, 1, 0, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), button, 2, 0, 1, 1);
g_signal_connect (button, "clicked",
G_CALLBACK (prop_length_set_cb), entry);
label = gtk_label_new ("Force text:");
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, 0, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
entry = gdaui_entry_new (NULL, NULL);
- gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, 1, 2);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 1, 1, 1);
button = gtk_button_new_with_label ("Set");
- gtk_table_attach (GTK_TABLE (table), button, 2, 3, 1, 2, 0, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), button, 2, 1, 1, 1);
g_signal_connect (button, "clicked",
G_CALLBACK (prop_text_set_cb), entry);
label = gtk_label_new ("Force text to NULL:");
- gtk_table_attach (GTK_TABLE (table), label, 0, 2, 2, 3, 0, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 2, 1);
button = gtk_button_new_with_label ("Set");
- gtk_table_attach (GTK_TABLE (table), button, 2, 3, 2, 3, 0, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), button, 2, 2, 1, 1);
g_signal_connect (button, "clicked",
G_CALLBACK (prop_text_null_cb), entry);
diff --git a/tools/browser/browser-connections-list.c b/tools/browser/browser-connections-list.c
index 2c8820d..f5d3248 100644
--- a/tools/browser/browser-connections-list.c
+++ b/tools/browser/browser-connections-list.c
@@ -41,7 +41,7 @@ static void connection_removed_cb (BrowserCore *bcore, BrowserConnection *bcnc,
struct _BrowserConnectionsListPrivate
{
- GtkTable *layout_table;
+ GtkGrid *layout_grid;
GtkTreeView *treeview;
gulong cnc_added_sigid;
gulong cnc_removed_sigid;
@@ -230,7 +230,7 @@ selection_changed_cb (GtkTreeSelection *select, BrowserConnectionsList *clist)
wid = gdaui_basic_form_new (dset);
g_object_set ((GObject*) wid, "show-actions", FALSE, NULL);
gdaui_basic_form_entry_set_editable (GDAUI_BASIC_FORM (wid), NULL, FALSE);
- gtk_table_attach_defaults (clist->priv->layout_table, wid, 1, 2, 2, 3);
+ gtk_grid_attach (clist->priv->layout_grid, wid, 1, 2, 1, 1);
gtk_widget_show (wid);
clist->priv->cnc_params_editor = wid;
@@ -319,7 +319,7 @@ void
browser_connections_list_show (BrowserConnection *current)
{
if (!_clist) {
- GtkWidget *clist, *sw, *table, *treeview, *label, *wid;
+ GtkWidget *clist, *sw, *grid, *treeview, *label, *wid;
gchar *str;
clist = GTK_WIDGET (g_object_new (BROWSER_TYPE_CONNECTIONS_LIST,
NULL));
@@ -335,16 +335,16 @@ browser_connections_list_show (BrowserConnection *current)
g_free (str);
/* table layout */
- table = gtk_table_new (4, 2, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 10);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_container_add (GTK_CONTAINER (clist), table);
- _clist->priv->layout_table = GTK_TABLE (table);
+ grid = gtk_grid_new ();
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 10);
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_container_add (GTK_CONTAINER (clist), grid);
+ _clist->priv->layout_grid = GTK_GRID (grid);
/* image and explaining label */
GtkWidget *hbox;
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
- gtk_table_attach (GTK_TABLE (table), hbox, 0, 3, 0, 1, GTK_EXPAND | GTK_FILL, 0, 0, 6);
+ gtk_grid_attach (GTK_GRID (grid), hbox, 0, 0, 3, 1);
str = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "pixmaps", "gda-browser-connected-big.png", NULL);
wid = gtk_image_new_from_file (str);
@@ -366,7 +366,7 @@ browser_connections_list_show (BrowserConnection *current)
gtk_label_set_markup (GTK_LABEL (label), str);
g_free (str);
gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
@@ -374,7 +374,7 @@ browser_connections_list_show (BrowserConnection *current)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
- gtk_table_attach (GTK_TABLE (table), sw, 0, 1, 2, 4, 0, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), sw, 0, 2, 1, 2);
/* connection's properties */
label = gtk_label_new ("");
@@ -382,12 +382,12 @@ browser_connections_list_show (BrowserConnection *current)
gtk_label_set_markup (GTK_LABEL (label), str);
g_free (str);
gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 1, 1, 1, 1);
/* buttons at the bottom*/
GtkWidget *bbox, *button;
bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_table_attach (GTK_TABLE (table), bbox, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, 0, 0, 6);
+ gtk_grid_attach (GTK_GRID (grid), bbox, 1, 3, 1, 1);
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
button = gtk_button_new_with_label (_("Close connection"));
gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
diff --git a/tools/browser/canvas-example.c b/tools/browser/canvas-example.c
index e79b73b..fe40420 100644
--- a/tools/browser/canvas-example.c
+++ b/tools/browser/canvas-example.c
@@ -77,25 +77,24 @@ main (int argc, char *argv[])
GDA_META_STRUCT_FEATURE_ALL);
/* UI Part */
- GtkWidget *window, *table, *canvas;
+ GtkWidget *window, *grid, *canvas;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_default_size (GTK_WINDOW (window), 640, 600);
g_signal_connect (window, "delete-event", G_CALLBACK (on_delete_event),
NULL);
- table = gtk_table_new (3, 1, FALSE);
- gtk_container_set_border_width (GTK_CONTAINER (table), 15);
- gtk_container_add (GTK_CONTAINER (window), table);
+ grid = gtk_grid_new ();
+ gtk_container_set_border_width (GTK_CONTAINER (grid), 15);
+ gtk_container_add (GTK_CONTAINER (window), grid);
canvas = browser_canvas_db_relations_new (mstruct);
g_object_unref (mstruct);
- gtk_table_attach_defaults (GTK_TABLE (table), canvas,
- 0, 1, 0, 1);
+ gtk_grid_attach (GTK_GRID (grid), canvas, 0, 0, 1, 1);
GtkWidget *bbox, *button;
bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_table_attach (GTK_TABLE (table), bbox, 0, 1, 1, 2, 0, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), bbox, 0, 1, 1, 1);
button = gtk_button_new_with_label ("Auto layout");
g_signal_connect (button, "clicked",
G_CALLBACK (auto_layout_cb), canvas);
@@ -110,7 +109,7 @@ main (int argc, char *argv[])
{ "application/x-rootwindow-drop", 0, 2 }
};
wid = gtk_label_new ("\nDROP ZONE\n(hold SHIFT to drag and drop)\n");
- gtk_table_attach (GTK_TABLE (table), wid, 0, 1, 2, 3, 0, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), wid, 0, 2, 1, 1);
gtk_drag_dest_set (wid,
GTK_DEST_DEFAULT_ALL,
dbo_table, G_N_ELEMENTS (dbo_table),
diff --git a/tools/browser/canvas/browser-canvas-print.c b/tools/browser/canvas/browser-canvas-print.c
index 4c5f312..610feae 100644
--- a/tools/browser/canvas/browser-canvas-print.c
+++ b/tools/browser/canvas/browser-canvas-print.c
@@ -221,7 +221,7 @@ static void print_page_numbers_toggled_cb (GtkToggleButton *toggle, PrintCustomD
static GObject *
print_create_custom_widget_cb (G_GNUC_UNUSED GtkPrintOperation *operation, PrintPageData *pdata)
{
- GtkWidget *vbox, *bbox, *button, *label, *hbox, *table, *entry;
+ GtkWidget *vbox, *bbox, *button, *label, *hbox, *grid, *entry;
PrintCustomData *cdata;
cdata = g_new0 (PrintCustomData, 1);
@@ -250,42 +250,42 @@ print_create_custom_widget_cb (G_GNUC_UNUSED GtkPrintOperation *operation, Print
label = gtk_label_new (" ");
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- table = gtk_table_new (3, 3, FALSE);
- gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE, 0);
+ grid = gtk_grid_new ();
+ gtk_box_pack_start (GTK_BOX (hbox), grid, TRUE, TRUE, 0);
label = gtk_label_new (_("Number of pages used:"));
gtk_misc_set_alignment (GTK_MISC (label), 0., 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 2, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
entry = gtk_spin_button_new_with_range (1., 100., 1.);
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (entry), 0);
- gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 0, 1, GTK_FILL, 0, 5, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 0, 1, 1);
cdata->h_npages = (GtkSpinButton*) entry;
g_signal_connect (entry, "value-changed",
G_CALLBACK (print_h_npages_value_changed_cb), cdata);
label = gtk_label_new (_("horizontally"));
gtk_misc_set_alignment (GTK_MISC (label), 0., 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 2, 3, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 2, 0, 1, 1);
entry = gtk_spin_button_new_with_range (1., 100., 1.);
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (entry), 0);
- gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_FILL, 0, 5, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 1, 1, 1);
cdata->v_npages = (GtkSpinButton*) entry;
g_signal_connect (entry, "value-changed",
G_CALLBACK (print_v_npages_value_changed_cb), cdata);
label = gtk_label_new (_("vertically"));
gtk_misc_set_alignment (GTK_MISC (label), 0., 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 2, 3, 1, 2, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 2, 1, 1, 1);
label = gtk_label_new (_("Zoom factor:"));
gtk_misc_set_alignment (GTK_MISC (label), 0., 0.5);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
entry = gtk_spin_button_new_with_range (.1, 10., .05);
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (entry), 2);
- gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 2, 3, GTK_FILL, 0, 5, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 2, 1, 1);
cdata->zoom = (GtkSpinButton*) entry;
g_signal_connect (entry, "value-changed",
G_CALLBACK (print_zoom_value_changed_cb), cdata);
diff --git a/tools/browser/common/fk-declare.c b/tools/browser/common/fk-declare.c
index 1a6e52b..b167d5d 100644
--- a/tools/browser/common/fk-declare.c
+++ b/tools/browser/common/fk-declare.c
@@ -171,10 +171,10 @@ static void column_selection_changed_cb (GtkComboBox *cbox, FkDeclare *decl);
static void
create_internal_layout (FkDeclare *decl)
{
- GtkWidget *label, *table, *cbox, *entry;
+ GtkWidget *label, *grid, *cbox, *entry;
char *markup, *str;
GtkWidget *dcontents;
- gint i, nrows;
+ gint i;
GSList *list;
dcontents = gtk_dialog_get_content_area (GTK_DIALOG (decl));
@@ -198,21 +198,20 @@ create_internal_layout (FkDeclare *decl)
gtk_widget_show_all (label);
/* GtkTable to hold contents */
- nrows = g_slist_length (decl->priv->mtable->columns);
- table = gtk_table_new (nrows + 3, 2, FALSE);
- gtk_box_pack_start (GTK_BOX (dcontents), table, TRUE, TRUE, 0);
- gtk_table_set_col_spacing (GTK_TABLE (table), 0, 5);
- gtk_table_set_row_spacing (GTK_TABLE (table), 1, 5);
+ grid = gtk_grid_new ();
+ gtk_box_pack_start (GTK_BOX (dcontents), grid, TRUE, TRUE, 0);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 5);
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 5);
/* FK name */
gfloat yalign;
label = gtk_label_new (_("Foreign key name:"));
gtk_misc_get_alignment (GTK_MISC (label), NULL, &yalign);
gtk_misc_set_alignment (GTK_MISC (label), 0., yalign);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
entry = gtk_entry_new ();
decl->priv->fk_name = entry;
- gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, 0, 1);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 0, 1, 1);
g_signal_connect (entry, "changed",
G_CALLBACK (fk_name_changed_cb), decl);
@@ -220,7 +219,7 @@ create_internal_layout (FkDeclare *decl)
label = gtk_label_new (_("Referenced table:"));
gtk_misc_get_alignment (GTK_MISC (label), NULL, &yalign);
gtk_misc_set_alignment (GTK_MISC (label), 0., yalign);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
GtkTreeModel *model;
GtkCellRenderer *renderer;
@@ -249,7 +248,7 @@ create_internal_layout (FkDeclare *decl)
renderer,
is_node_sensitive,
NULL, NULL);
- gtk_table_attach_defaults (GTK_TABLE (table), cbox, 1, 2, 1, 2);
+ gtk_grid_attach (GTK_GRID (grid), cbox, 1, 1, 1, 1);
/* more labels */
label = gtk_label_new ("");
@@ -257,14 +256,14 @@ create_internal_layout (FkDeclare *decl)
gtk_label_set_markup (GTK_LABEL (label), markup);
g_free (markup);
gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
label = gtk_label_new ("");
markup = g_strdup_printf ("<b>%s:</b>", _("Referenced column"));
gtk_label_set_markup (GTK_LABEL (label), markup);
g_free (markup);
gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 1, 2, 1, 1);
/* columns */
decl->priv->n_cols = g_slist_length (decl->priv->mtable->columns);
@@ -276,7 +275,7 @@ create_internal_layout (FkDeclare *decl)
assoc->column = column;
label = gtk_check_button_new_with_label (column->column_name);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, i, i+1, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, i, 1, 1);
assoc->checkbox = label;
g_signal_connect (label, "toggled",
G_CALLBACK (column_toggled_cb), decl);
@@ -293,13 +292,13 @@ create_internal_layout (FkDeclare *decl)
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (cbox), renderer,
"text", MODEL_COLUMNS_COLUMN_STRING,
NULL);
- gtk_table_attach_defaults (GTK_TABLE (table), cbox, 1, 2, i, i+1);
+ gtk_grid_attach (GTK_GRID (grid), cbox, 1, i, 1, 1);
assoc->cbox = GTK_COMBO_BOX (cbox);
g_signal_connect (cbox, "changed",
G_CALLBACK (column_selection_changed_cb), decl);
gtk_widget_set_sensitive (cbox, FALSE);
}
- gtk_widget_show_all (table);
+ gtk_widget_show_all (grid);
}
static void
diff --git a/tools/browser/common/gdaui-data-import.c b/tools/browser/common/gdaui-data-import.c
index 8b90093..6ae161e 100644
--- a/tools/browser/common/gdaui-data-import.c
+++ b/tools/browser/common/gdaui-data-import.c
@@ -102,7 +102,7 @@ gdaui_data_import_init (GdauiDataImport * import)
{
GtkWidget *label, *vbox, *hbox;
gchar *str;
- GtkWidget *table, *entry;
+ GtkWidget *grid, *entry;
GtkFileFilter *filter;
GdaDataModel *encs;
GSList *encs_errors;
@@ -131,15 +131,15 @@ gdaui_data_import_init (GdauiDataImport * import)
label = gtk_label_new (" ");
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- table = gtk_table_new (7, 4, FALSE);
- gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE, 0);
- gtk_table_set_col_spacings (GTK_TABLE (table), 5);
- gtk_table_set_row_spacings (GTK_TABLE (table), 5);
+ grid = gtk_grid_new ();
+ gtk_box_pack_start (GTK_BOX (hbox), grid, TRUE, TRUE, 0);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 5);
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 5);
/* file to import from */
label = gtk_label_new (_("File to import from:"));
gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_SHRINK | GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
entry = gtk_file_chooser_button_new (_("File to import data from"), GTK_FILE_CHOOSER_ACTION_OPEN);
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (entry), gdaui_get_default_path ());
@@ -157,14 +157,14 @@ gdaui_data_import_init (GdauiDataImport * import)
gtk_file_filter_set_name (filter, _("All files"));
gtk_file_filter_add_pattern (filter, "*");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (entry), filter);
- gtk_table_attach (GTK_TABLE (table), entry, 1, 4, 0, 1, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 0, 3, 1);
g_signal_connect (G_OBJECT (entry), "selection-changed",
G_CALLBACK (spec_changed_cb), import);
/* Encoding */
label = gtk_label_new (_("Encoding:"));
gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_SHRINK | GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
gchar *fname = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "import_encodings.xml", NULL);
encs = gda_data_model_import_new_file (fname, TRUE, NULL);
@@ -184,64 +184,64 @@ gdaui_data_import_init (GdauiDataImport * import)
import->priv->encoding_combo = entry;
}
g_object_unref (encs);
- gtk_table_attach (GTK_TABLE (table), entry, 1, 4, 1, 2, GTK_EXPAND | GTK_SHRINK | GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 1, 3, 1);
g_signal_connect (G_OBJECT (entry), "changed",
G_CALLBACK (spec_changed_cb), import);
/* first line as title */
label = gtk_label_new (_("First line as title:"));
gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_SHRINK | GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
entry = gtk_check_button_new ();
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (entry), TRUE);
- import->priv->first_line_check = entry,
- gtk_table_attach (GTK_TABLE (table), entry, 1, 3, 2, 3, GTK_SHRINK | GTK_FILL, 0, 0, 0);
+ import->priv->first_line_check = entry;
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 2, 2, 1);
g_signal_connect (G_OBJECT (entry), "toggled",
G_CALLBACK (spec_changed_cb), import);
/* separator */
label = gtk_label_new (_("Separator:"));
gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_SHRINK | GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1);
entry = gtk_radio_button_new_with_label (NULL, _("Comma"));
import->priv->sep_array [SEP_COMMA] = entry;
- gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 3, 4, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 3, 1, 1);
g_object_set_data (G_OBJECT (entry), "_sep", ",");
g_signal_connect (G_OBJECT (entry), "toggled",
G_CALLBACK (spec_changed_cb), import);
entry = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (entry), _("Semi colon"));
import->priv->sep_array [SEP_SEMICOL] = entry;
- gtk_table_attach (GTK_TABLE (table), entry, 2, 3, 3, 4, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 2, 3, 1, 1);
g_object_set_data (G_OBJECT (entry), "_sep", ";");
g_signal_connect (G_OBJECT (entry), "toggled",
G_CALLBACK (spec_changed_cb), import);
entry = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (entry), _("Tab"));
import->priv->sep_array [SEP_TAB] = entry;
- gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 4, 5, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 4, 1, 1);
g_object_set_data (G_OBJECT (entry), "_sep", "\t");
g_signal_connect (G_OBJECT (entry), "toggled",
G_CALLBACK (spec_changed_cb), import);
entry = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (entry), _("Space"));
import->priv->sep_array [SEP_SPACE] = entry;
- gtk_table_attach (GTK_TABLE (table), entry, 2, 3, 4, 5, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 2, 4, 1, 1);
g_object_set_data (G_OBJECT (entry), "_sep", " ");
g_signal_connect (G_OBJECT (entry), "toggled",
G_CALLBACK (spec_changed_cb), import);
entry = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (entry), _("Pipe"));
import->priv->sep_array [SEP_PIPE] = entry;
- gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 5, 6, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 5, 1, 1);
g_object_set_data (G_OBJECT (entry), "_sep", "|");
g_signal_connect (G_OBJECT (entry), "toggled",
G_CALLBACK (spec_changed_cb), import);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_table_attach (GTK_TABLE (table), hbox, 2, 3, 5, 6, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), hbox, 2, 5, 1, 1);
entry = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (entry), _("Other:"));
import->priv->sep_array [SEP_OTHER] = entry;
gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0);
diff --git a/tools/browser/connection-binding-properties.c b/tools/browser/connection-binding-properties.c
index 5e864c1..9fa6895 100644
--- a/tools/browser/connection-binding-properties.c
+++ b/tools/browser/connection-binding-properties.c
@@ -42,7 +42,7 @@ static void update_display (ConnectionBindingProperties *cprop);
struct _ConnectionBindingPropertiesPrivate
{
BrowserVirtualConnectionSpecs *specs;
- GtkTable *layout_table;
+ GtkGrid *layout_grid;
GtkWidget *menu;
};
@@ -228,8 +228,8 @@ create_layout (ConnectionBindingProperties *cprop)
label = gtk_label_new (" ");
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- cprop->priv->layout_table = GTK_TABLE (gtk_table_new (2, 2, FALSE));
- gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (cprop->priv->layout_table), TRUE, TRUE, 0);
+ cprop->priv->layout_grid = GTK_GRID (gtk_grid_new ());
+ gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (cprop->priv->layout_grid), TRUE, TRUE, 0);
gtk_widget_show_all (dcontents);
@@ -247,7 +247,7 @@ static void
update_display (ConnectionBindingProperties *cprop)
{
/* clear any previous setting */
- gtk_container_foreach (GTK_CONTAINER (cprop->priv->layout_table), (GtkCallback) gtk_widget_destroy, NULL);
+ gtk_container_foreach (GTK_CONTAINER (cprop->priv->layout_grid), (GtkCallback) gtk_widget_destroy, NULL);
/* new contents */
gint top = 0;
@@ -270,8 +270,7 @@ update_display (ConnectionBindingProperties *cprop)
g_assert_not_reached ();
}
- gtk_table_attach (cprop->priv->layout_table, display, 0, 1, top, top + 1,
- GTK_EXPAND | GTK_FILL, 0, 0, 10);
+ gtk_grid_attach (cprop->priv->layout_grid, display, 0, top, 1, 1);
}
}
@@ -283,11 +282,11 @@ update_display (ConnectionBindingProperties *cprop)
arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
gtk_box_pack_start (GTK_BOX (label), arrow, FALSE, FALSE, 0);
g_object_set (G_OBJECT (button), "relief", GTK_RELIEF_NONE, NULL);
- gtk_table_attach (cprop->priv->layout_table, button, 0, 2, top, top + 1, GTK_EXPAND | GTK_FILL, 0, 0, 10);
+ gtk_grid_attach (cprop->priv->layout_grid, button, 0, top, 2, 1);
g_signal_connect (button, "clicked",
G_CALLBACK (add_part_clicked_cb), cprop);
- gtk_widget_show_all ((GtkWidget*) cprop->priv->layout_table);
+ gtk_widget_show_all ((GtkWidget*) cprop->priv->layout_grid);
update_buttons_sensitiveness (cprop);
}
diff --git a/tools/browser/data-manager/data-favorite-selector.c b/tools/browser/data-manager/data-favorite-selector.c
index 5f61b4b..35e4139 100644
--- a/tools/browser/data-manager/data-favorite-selector.c
+++ b/tools/browser/data-manager/data-favorite-selector.c
@@ -278,7 +278,7 @@ static void
properties_activated_cb (GtkMenuItem *mitem, DataFavoriteSelector *tsel)
{
if (! tsel->priv->popup_properties) {
- GtkWidget *pcont, *vbox, *hbox, *label, *entry, *text, *table;
+ GtkWidget *pcont, *vbox, *hbox, *label, *entry, *text, *grid;
gchar *str;
pcont = popup_container_new (GTK_WIDGET (mitem));
@@ -297,25 +297,25 @@ properties_activated_cb (GtkMenuItem *mitem, DataFavoriteSelector *tsel)
label = gtk_label_new (" ");
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- table = gtk_table_new (2, 2, FALSE);
- gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE, 0);
+ grid = gtk_grid_new ();
+ gtk_box_pack_start (GTK_BOX (hbox), grid, TRUE, TRUE, 0);
label = gtk_label_new ("");
str = g_strdup_printf ("<b>%s:</b>", _("Name"));
gtk_label_set_markup (GTK_LABEL (label), str);
g_free (str);
gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
label = gtk_label_new ("");
str = g_strdup_printf ("<b>%s:</b>", _("Specifications"));
gtk_label_set_markup (GTK_LABEL (label), str);
g_free (str);
gtk_misc_set_alignment (GTK_MISC (label), 0., 0.);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
entry = gtk_entry_new ();
- gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 0, 1, 1);
tsel->priv->properties_name = entry;
g_signal_connect (entry, "changed",
G_CALLBACK (property_changed_cb), tsel);
@@ -336,7 +336,7 @@ properties_activated_cb (GtkMenuItem *mitem, DataFavoriteSelector *tsel)
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_table_attach_defaults (GTK_TABLE (table), sw, 1, 2, 1, 2);
+ gtk_grid_attach (GTK_GRID (grid), sw, 1, 1, 1, 1);
gtk_container_add (GTK_CONTAINER (sw), text);
tsel->priv->properties_text = text;
g_signal_connect (gtk_text_view_get_buffer (GTK_TEXT_VIEW (text)), "changed",
diff --git a/tools/browser/ldap-browser/filter-editor.c b/tools/browser/ldap-browser/filter-editor.c
index 67d808f..3150755 100644
--- a/tools/browser/ldap-browser/filter-editor.c
+++ b/tools/browser/ldap-browser/filter-editor.c
@@ -134,7 +134,7 @@ GtkWidget *
filter_editor_new (BrowserConnection *bcnc)
{
FilterEditor *feditor;
- GtkWidget *table, *label, *entry;
+ GtkWidget *grid, *label, *entry;
GdaDataModel *model;
GList *values;
GValue *v1, *v2;
@@ -145,41 +145,41 @@ filter_editor_new (BrowserConnection *bcnc)
feditor = FILTER_EDITOR (g_object_new (FILTER_EDITOR_TYPE, NULL));
feditor->priv->bcnc = g_object_ref ((GObject*) bcnc);
- table = gtk_table_new (4, 2, FALSE);
- gtk_table_set_col_spacing (GTK_TABLE (table), 0, 5);
- gtk_box_pack_start (GTK_BOX (feditor), table, TRUE, TRUE, 0);
+ grid = gtk_grid_new ();
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 5);
+ gtk_box_pack_start (GTK_BOX (feditor), grid, TRUE, TRUE, 0);
label = gtk_label_new (_("Base DN:"));
gtk_misc_get_alignment (GTK_MISC (label), NULL, &ya);
gtk_misc_set_alignment (GTK_MISC (label), 0., ya);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
label = gtk_label_new (_("Filter expression:"));
gtk_misc_get_alignment (GTK_MISC (label), NULL, &ya);
gtk_misc_set_alignment (GTK_MISC (label), 0., ya);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
label = gtk_label_new (_("Attributes to fetch:"));
gtk_misc_get_alignment (GTK_MISC (label), NULL, &ya);
gtk_misc_set_alignment (GTK_MISC (label), 0., ya);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
label = gtk_label_new (_("Search scope:"));
gtk_misc_get_alignment (GTK_MISC (label), NULL, &ya);
gtk_misc_set_alignment (GTK_MISC (label), 0., ya);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1);
entry = gtk_entry_new ();
- gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, 0, 1);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 0, 1, 1);
feditor->priv->base_dn = entry;
g_signal_connect (entry, "activate",
G_CALLBACK (activated_cb), feditor);
entry = gtk_entry_new ();
- gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, 1, 2);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 1, 1, 1);
feditor->priv->filter = entry;
g_signal_connect (entry, "activate",
G_CALLBACK (activated_cb), feditor);
entry = gtk_entry_new ();
- gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, 2, 3);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 2, 1, 1);
feditor->priv->attributes = entry;
g_signal_connect (entry, "activate",
G_CALLBACK (activated_cb), feditor);
@@ -212,11 +212,11 @@ filter_editor_new (BrowserConnection *bcnc)
gint cols[] = {1};
entry = gdaui_combo_new_with_model (model, 1, cols);
g_object_unref (model);
- gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, 3, 4);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 3, 1, 1);
feditor->priv->scope = entry;
filter_editor_clear (feditor);
- gtk_widget_show_all (table);
+ gtk_widget_show_all (grid);
return (GtkWidget*) feditor;
}
diff --git a/tools/browser/ldap-browser/ldap-favorite-selector.c b/tools/browser/ldap-browser/ldap-favorite-selector.c
index 6813e40..02f84fd 100644
--- a/tools/browser/ldap-browser/ldap-favorite-selector.c
+++ b/tools/browser/ldap-browser/ldap-favorite-selector.c
@@ -271,7 +271,7 @@ static void
properties_activated_cb (GtkMenuItem *mitem, LdapFavoriteSelector *fsel)
{
if (! fsel->priv->popup_properties) {
- GtkWidget *pcont, *vbox, *hbox, *label, *entry, *table;
+ GtkWidget *pcont, *vbox, *hbox, *label, *entry, *grid;
gchar *str;
gfloat align;
@@ -292,8 +292,8 @@ properties_activated_cb (GtkMenuItem *mitem, LdapFavoriteSelector *fsel)
label = gtk_label_new (" ");
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- table = gtk_table_new (2, 2, FALSE);
- gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE, 0);
+ grid = gtk_grid_new ();
+ gtk_box_pack_start (GTK_BOX (hbox), grid, TRUE, TRUE, 0);
label = gtk_label_new ("");
str = g_strdup_printf ("<b>%s:</b>", _("Name"));
@@ -301,23 +301,23 @@ properties_activated_cb (GtkMenuItem *mitem, LdapFavoriteSelector *fsel)
g_free (str);
gtk_misc_get_alignment (GTK_MISC (label), NULL, &align);
gtk_misc_set_alignment (GTK_MISC (label), 0., align);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
label = gtk_label_new ("");
str = g_strdup_printf ("<b>%s:</b>", _("Description"));
gtk_label_set_markup (GTK_LABEL (label), str);
g_free (str);
gtk_misc_set_alignment (GTK_MISC (label), 0., 0.);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
entry = gtk_entry_new ();
gtk_editable_set_editable (GTK_EDITABLE (entry), FALSE);
- gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 0, 1, 1);
fsel->priv->properties_name = entry;
entry = gtk_entry_new ();
gtk_widget_set_size_request (entry, 200, -1);
- gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 1, 1, 1);
fsel->priv->properties_descr = entry;
g_signal_connect (entry, "changed",
G_CALLBACK (property_changed_cb), fsel);
diff --git a/tools/browser/ldap-browser/vtable-dialog.c b/tools/browser/ldap-browser/vtable-dialog.c
index 1a35919..8ff4995 100644
--- a/tools/browser/ldap-browser/vtable-dialog.c
+++ b/tools/browser/ldap-browser/vtable-dialog.c
@@ -116,7 +116,7 @@ vtable_dialog_new (GtkWindow *parent, BrowserConnection *bcnc)
gtk_window_set_title (GTK_WINDOW (dlg), _("Define LDAP search as a virtual table"));
GtkWidget *dcontents;
- GtkWidget *label, *entry, *table, *button;
+ GtkWidget *label, *entry, *grid, *button;
gchar *str;
dcontents = gtk_dialog_get_content_area (GTK_DIALOG (dlg));
label = gtk_label_new (NULL);
@@ -131,25 +131,25 @@ vtable_dialog_new (GtkWindow *parent, BrowserConnection *bcnc)
g_free (str);
gtk_box_pack_start (GTK_BOX (dcontents), label, FALSE, FALSE, SPACING);
- table = gtk_table_new (2, 2, FALSE);
- gtk_table_set_col_spacing (GTK_TABLE (table), 0, SPACING);
- gtk_table_set_row_spacing (GTK_TABLE (table), 0, SPACING);
- gtk_box_pack_start (GTK_BOX (dcontents), table, FALSE, FALSE, SPACING);
+ grid = gtk_grid_new ();
+ gtk_grid_set_column_spacing (GTK_GRID (grid), SPACING);
+ gtk_grid_set_row_spacing (GTK_GRID (grid), SPACING);
+ gtk_box_pack_start (GTK_BOX (dcontents), grid, FALSE, FALSE, SPACING);
label = gtk_label_new (_("Table name:"));
gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
entry = gtk_entry_new ();
- gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, 0, 1);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 0, 1, 1);
dlg->priv->tname_entry = entry;
label = gtk_label_new (_("Replace if exists:"));
gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
button = gtk_check_button_new ();
- gtk_table_attach_defaults (GTK_TABLE (table), button, 1, 2, 1, 2);
+ gtk_grid_attach (GTK_GRID (grid), button, 1, 1, 1, 1);
dlg->priv->tname_replace = button;
gtk_widget_show_all (dcontents);
diff --git a/tools/browser/query-exec/query-favorite-selector.c b/tools/browser/query-exec/query-favorite-selector.c
index 4c26053..bf88924 100644
--- a/tools/browser/query-exec/query-favorite-selector.c
+++ b/tools/browser/query-exec/query-favorite-selector.c
@@ -324,7 +324,7 @@ static void
properties_activated_cb (GtkMenuItem *mitem, QueryFavoriteSelector *tsel)
{
if (! tsel->priv->popup_properties) {
- GtkWidget *pcont, *vbox, *hbox, *label, *entry, *text, *table;
+ GtkWidget *pcont, *vbox, *hbox, *label, *entry, *text, *grid;
gchar *str;
gfloat align;
@@ -345,8 +345,8 @@ properties_activated_cb (GtkMenuItem *mitem, QueryFavoriteSelector *tsel)
label = gtk_label_new (" ");
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- table = gtk_table_new (3, 2, FALSE);
- gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE, 0);
+ grid = gtk_grid_new ();
+ gtk_box_pack_start (GTK_BOX (hbox), grid, TRUE, TRUE, 0);
label = gtk_label_new ("");
str = g_strdup_printf ("<b>%s:</b>", _("Name"));
@@ -354,14 +354,14 @@ properties_activated_cb (GtkMenuItem *mitem, QueryFavoriteSelector *tsel)
g_free (str);
gtk_misc_get_alignment (GTK_MISC (label), NULL, &align);
gtk_misc_set_alignment (GTK_MISC (label), 0., align);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
label = gtk_label_new ("");
str = g_strdup_printf ("<b>%s:</b>", _("SQL Code"));
gtk_label_set_markup (GTK_LABEL (label), str);
g_free (str);
gtk_misc_set_alignment (GTK_MISC (label), 0., 0.);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
label = gtk_label_new ("");
str = g_strdup_printf ("<b>%s:</b>", _("Is action"));
@@ -373,10 +373,10 @@ properties_activated_cb (GtkMenuItem *mitem, QueryFavoriteSelector *tsel)
"the query will be defined from the row selected in the grid"));
gtk_misc_get_alignment (GTK_MISC (label), NULL, &align);
gtk_misc_set_alignment (GTK_MISC (label), 0., align);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
entry = gtk_entry_new ();
- gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 0, 1, 1);
tsel->priv->properties_name = entry;
g_signal_connect (entry, "changed",
G_CALLBACK (property_changed_cb), tsel);
@@ -384,13 +384,13 @@ properties_activated_cb (GtkMenuItem *mitem, QueryFavoriteSelector *tsel)
text = query_editor_new ();
query_editor_show_tooltip (QUERY_EDITOR (text), FALSE);
gtk_widget_set_size_request (GTK_WIDGET (text), 400, 300);
- gtk_table_attach_defaults (GTK_TABLE (table), text, 1, 2, 1, 2);
+ gtk_grid_attach (GTK_GRID (grid), text, 1, 1, 1, 1);
tsel->priv->properties_text = text;
g_signal_connect (text, "changed",
G_CALLBACK (property_changed_cb), tsel);
entry = gtk_check_button_new ();
- gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), entry, 1, 2, 1, 1);
tsel->priv->properties_action = entry;
g_signal_connect (entry, "toggled",
G_CALLBACK (property_changed_cb), tsel);
diff --git a/tools/browser/schema-browser/table-preferences.c b/tools/browser/schema-browser/table-preferences.c
index 9fc6b49..25dc1f9 100644
--- a/tools/browser/schema-browser/table-preferences.c
+++ b/tools/browser/schema-browser/table-preferences.c
@@ -324,13 +324,13 @@ table_preferences_new (TableInfo *tinfo)
gtk_box_pack_start (GTK_BOX (tpref), top_vbox, TRUE, TRUE, 0);
/* Field's display properties */
- GtkWidget *table;
+ GtkWidget *grid;
- table = gtk_table_new (2, 2, FALSE);
- gtk_box_pack_start (GTK_BOX (top_vbox), table, TRUE, TRUE, 0);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_table_set_col_spacings (GTK_TABLE (table), 6);
- gtk_container_set_border_width (GTK_CONTAINER (table), 6);
+ grid = gtk_grid_new ();
+ gtk_box_pack_start (GTK_BOX (top_vbox), grid, TRUE, TRUE, 0);
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
+ gtk_container_set_border_width (GTK_CONTAINER (grid), 6);
/* left column */
GtkWidget *label;
@@ -340,7 +340,7 @@ table_preferences_new (TableInfo *tinfo)
gtk_label_set_markup (GTK_LABEL (label), str);
g_free (str);
gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
GtkWidget *sw, *treeview;
sw = gtk_scrolled_window_new (NULL, NULL);
@@ -349,7 +349,7 @@ table_preferences_new (TableInfo *tinfo)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
- gtk_table_attach (GTK_TABLE (table), sw, 0, 1, 1, 2, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), sw, 0, 1, 1, 1);
tpref->priv->columns_store = gtk_list_store_new (NUM_COLUMNS,
G_TYPE_POINTER, G_TYPE_GTYPE,
@@ -384,10 +384,10 @@ table_preferences_new (TableInfo *tinfo)
gtk_label_set_markup (GTK_LABEL (label), str);
g_free (str);
gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
- gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1);
tpref->priv->field_props = create_column_properties (tpref);
- gtk_table_attach_defaults (GTK_TABLE (table), tpref->priv->field_props, 1, 2, 1, 2);
+ gtk_grid_attach (GTK_GRID (grid), tpref->priv->field_props, 1, 1, 1, 1);
/* show all */
gtk_widget_show_all (top_vbox);
@@ -428,12 +428,12 @@ static void plugin_hash_foreach_func (const gchar *plugin_name, GdauiPlugin *plu
static GtkWidget *
create_column_properties (TablePreferences *tpref)
{
- GtkWidget *combo, *label, *table;
+ GtkWidget *combo, *label, *grid;
GtkCellRenderer *renderer;
- table = gtk_table_new (3, 2, FALSE);
- gtk_table_set_row_spacings (GTK_TABLE (table), 5);
- gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 5);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 5);
/* plugins combo */
tpref->priv->plugins_model = GTK_TREE_MODEL (gtk_list_store_new (PL_NUM_COLUMNS,
@@ -454,30 +454,29 @@ create_column_properties (TablePreferences *tpref)
g_signal_connect (G_OBJECT (combo), "changed",
G_CALLBACK (plugins_combo_changed_cb), tpref);
- gtk_table_attach (GTK_TABLE (table), combo,
- 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), combo, 1, 0, 1, 1);
label = gtk_label_new (_("Data entry type:"));
gtk_widget_set_tooltip_text (label, _("Defines how data for the selected column\n"
"will be displayed in forms. Leave 'Default' to have\n"
"the default display"));
gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
/* plugin options */
tpref->priv->options_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_table_attach (GTK_TABLE (table), tpref->priv->options_vbox, 1, 2, 1, 2, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), tpref->priv->options_vbox, 1, 1, 1, 1);
tpref->priv->options_none = gtk_label_new (_("none"));
gtk_misc_set_alignment (GTK_MISC (tpref->priv->options_none), 0., -1);
gtk_box_pack_start (GTK_BOX (tpref->priv->options_vbox), tpref->priv->options_none, FALSE, FALSE, 0);
label = gtk_label_new (_("Options:"));
gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
/* plugin preview */
tpref->priv->preview_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_table_attach (GTK_TABLE (table), tpref->priv->preview_vbox, 1, 2, 2, 3, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), tpref->priv->preview_vbox, 1, 2, 1, 1);
tpref->priv->preview_none = gtk_label_new (_("none"));
gtk_misc_set_alignment (GTK_MISC (tpref->priv->preview_none), 0., -1);
gtk_box_pack_start (GTK_BOX (tpref->priv->preview_vbox), tpref->priv->preview_none, FALSE, FALSE, 0);
@@ -486,11 +485,11 @@ create_column_properties (TablePreferences *tpref)
gtk_widget_set_tooltip_text (label, _("Free form to test the configured\n"
"data entry"));
gtk_misc_set_alignment (GTK_MISC (label), 0., -1);
- gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
- gtk_widget_show_all (table);
+ gtk_widget_show_all (grid);
- return table;
+ return grid;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
