From 64c16949b686b17d380c8e3cabf9fdf6ec58f40e Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Tue, 19 Nov 2002 00:27:08 +0000 Subject: take GCallback, not GtkSignalFunc. (configure_sort_dialog): show the 2002-11-18 Chris Toshok * e-table-config.c (connect_button): take GCallback, not GtkSignalFunc. (configure_sort_dialog): show the custom widget. (configure_group_dialog): same. (configure_fields_dialog): same, also pass G_CALLBACK (func), instead of GTK_SIGNAL_FUNC (func), to connect_button. (setup_gui): pass G_CALLBACK (func), instead of GTK_SIGNAL_FUNC (func), to connect_button. * Makefile.am (glade_DATA): remove e-table-group.glade, since we don't use it anyplace. svn path=/trunk/; revision=18832 --- widgets/table/e-table-config.c | 31 +++--- widgets/table/e-table-group.glade | 202 -------------------------------------- 2 files changed, 19 insertions(+), 214 deletions(-) delete mode 100644 widgets/table/e-table-group.glade (limited to 'widgets/table') diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c index b4eaf53beb..4894fdb6d8 100644 --- a/widgets/table/e-table-config.c +++ b/widgets/table/e-table-config.c @@ -574,13 +574,13 @@ configure_dialog (GladeXML *gui, const char *widget_name, ETableConfig *config) #endif static void -connect_button (ETableConfig *config, GladeXML *gui, const char *widget_name, GtkSignalFunc cback) +connect_button (ETableConfig *config, GladeXML *gui, const char *widget_name, GCallback cback) { GtkWidget *button = glade_xml_get_widget (gui, widget_name); if (button) { g_signal_connect (G_OBJECT (button), "clicked", - G_CALLBACK (cback), config); + cback, config); } } @@ -642,7 +642,7 @@ configure_sort_dialog (ETableConfig *config, GladeXML *gui) snprintf (buffer, sizeof (buffer), "sort-combo-%d", i + 1); config->sort [i].combo = GTK_COMBO_TEXT ( glade_xml_get_widget (gui, buffer)); - + gtk_widget_show (GTK_WIDGET (config->sort [i].combo)); gtk_combo_text_add_item (config->sort [i].combo, "", ""); snprintf (buffer, sizeof (buffer), "frame-sort-%d", i + 1); @@ -746,6 +746,7 @@ configure_group_dialog (ETableConfig *config, GladeXML *gui) snprintf (buffer, sizeof (buffer), "group-combo-%d", i + 1); config->group [i].combo = GTK_COMBO_TEXT ( glade_xml_get_widget (gui, buffer)); + gtk_widget_show (GTK_WIDGET (config->group [i].combo)); gtk_combo_text_add_item (config->group [i].combo, "", ""); @@ -961,20 +962,26 @@ config_button_down (GtkWidget *widget, ETableConfig *config) static void configure_fields_dialog (ETableConfig *config, GladeXML *gui) { - config->available = e_table_scrolled_get_table (E_TABLE_SCROLLED (glade_xml_get_widget (gui, "custom-available"))); + GtkWidget *scrolled; + + scrolled = glade_xml_get_widget (gui, "custom-available"); + config->available = e_table_scrolled_get_table (E_TABLE_SCROLLED (scrolled)); g_object_get (config->available, "model", &config->available_model, NULL); + gtk_widget_show_all (scrolled); - config->shown = e_table_scrolled_get_table (E_TABLE_SCROLLED (glade_xml_get_widget (gui, "custom-shown"))); + scrolled = glade_xml_get_widget (gui, "custom-shown"); + config->shown = e_table_scrolled_get_table (E_TABLE_SCROLLED (scrolled)); g_object_get (config->shown, "model", &config->shown_model, NULL); + gtk_widget_show_all (scrolled); - connect_button (config, gui, "button-add", GTK_SIGNAL_FUNC (config_button_add)); - connect_button (config, gui, "button-remove", GTK_SIGNAL_FUNC (config_button_remove)); - connect_button (config, gui, "button-up", GTK_SIGNAL_FUNC (config_button_up)); - connect_button (config, gui, "button-down", GTK_SIGNAL_FUNC (config_button_down)); + connect_button (config, gui, "button-add", G_CALLBACK (config_button_add)); + connect_button (config, gui, "button-remove", G_CALLBACK (config_button_remove)); + connect_button (config, gui, "button-up", G_CALLBACK (config_button_up)); + connect_button (config, gui, "button-down", G_CALLBACK (config_button_down)); setup_fields (config); } @@ -1021,9 +1028,9 @@ setup_gui (ETableConfig *config) config->fields_label = glade_xml_get_widget ( gui, "label-fields"); - connect_button (config, gui, "button-sort", GTK_SIGNAL_FUNC (config_button_sort)); - connect_button (config, gui, "button-group", GTK_SIGNAL_FUNC (config_button_group)); - connect_button (config, gui, "button-fields", GTK_SIGNAL_FUNC (config_button_fields)); + connect_button (config, gui, "button-sort", G_CALLBACK (config_button_sort)); + connect_button (config, gui, "button-group", G_CALLBACK (config_button_group)); + connect_button (config, gui, "button-fields", G_CALLBACK (config_button_fields)); configure_sort_dialog (config, gui); configure_group_dialog (config, gui); diff --git a/widgets/table/e-table-group.glade b/widgets/table/e-table-group.glade deleted file mode 100644 index 1b49a61522..0000000000 --- a/widgets/table/e-table-group.glade +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - window1 - GTK_WINDOW_TOPLEVEL - no - no - yes - GTK_WIN_POS_NONE - yes - - - - no - 0 - 0 - 3 - 3 - yes - - - - 4 - Available fields - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_NONE - yes - - - - yes - no - yes - - - - CList:title - label1 - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - - - - - - GTK_UPDATE_CONTINUOUS - yes - - - - - - GTK_UPDATE_CONTINUOUS - yes - - - - - - - 0 - 1 - 0 - 1 - 0 - 0 - expand|fill - expand|fill - - - - - - 4 - Show in this order - 0 - GTK_SHADOW_ETCHED_IN - yes - - - - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_NONE - yes - - - - yes - no - yes - - - - CList:title - label2 - GTK_JUSTIFY_CENTER - no - 0.5 - 0.5 - 0 - 0 - yes - - - - - - - - GTK_UPDATE_CONTINUOUS - yes - - - - - - GTK_UPDATE_CONTINUOUS - yes - - - - - - - 2 - 3 - 0 - 1 - 0 - 0 - expand|fill - fill - - - - - - 4 - no - 0 - yes - - - - 4 - yes - Add >> - yes - - - 0 - no - no - - - - - - 4 - yes - << Remove - yes - - - 0 - no - no - - - - - 1 - 2 - 0 - 1 - 4 - 4 - expand - fill - - - - - - -- cgit v1.2.3