diff options
Diffstat (limited to 'widgets/e-table')
| -rw-r--r-- | widgets/e-table/e-table-config.c | 4 | ||||
| -rw-r--r-- | widgets/e-table/e-table-config.glade | 78 | ||||
| -rw-r--r-- | widgets/e-table/test-table.c | 2 |
3 files changed, 48 insertions, 36 deletions
diff --git a/widgets/e-table/e-table-config.c b/widgets/e-table/e-table-config.c index 1345bed88f..c81eeecca0 100644 --- a/widgets/e-table/e-table-config.c +++ b/widgets/e-table/e-table-config.c @@ -132,6 +132,7 @@ e_table_gui_config (ETable *etable) GnomeDialog *dialog; ConfigData *config_data; + glade_gnome_init (); gui = glade_xml_new (ETABLE_GLADEDIR "/e-table-config.glade", NULL); if (!gui) return NULL; @@ -205,6 +206,9 @@ e_table_do_gui_config (GtkWidget *parent, ETable *etable) e_table_gui_config_cancel (GTK_WIDGET (dialog), etable); else e_table_gui_config_accept (GTK_WIDGET (dialog), etable); + + if (r != -1) + gtk_object_destroy (GTK_OBJECT (dialog)); } diff --git a/widgets/e-table/e-table-config.glade b/widgets/e-table/e-table-config.glade index 8affa8cefa..15223f21f1 100644 --- a/widgets/e-table/e-table-config.glade +++ b/widgets/e-table/e-table-config.glade @@ -10,9 +10,17 @@ <language>C</language> <gnome_support>True</gnome_support> <gettext_support>True</gettext_support> + <use_widget_names>False</use_widget_names> <output_main_file>False</output_main_file> <output_support_files>False</output_support_files> <output_build_files>False</output_build_files> + <backup_source_files>True</backup_source_files> + <main_source_file>interface.c</main_source_file> + <main_header_file>interface.h</main_header_file> + <handler_source_file>callbacks.c</handler_source_file> + <handler_header_file>callbacks.h</handler_header_file> + <support_source_file>support.c</support_source_file> + <support_header_file>support.h</support_header_file> <output_translatable_strings>True</output_translatable_strings> <translatable_strings_file>e-table-config.glade.h</translatable_strings_file> </project> @@ -43,40 +51,6 @@ </child> <widget> - <class>GtkHButtonBox</class> - <child_name>GnomeDialog:action_area</child_name> - <name>dialog-action_area2</name> - <layout_style>GTK_BUTTONBOX_END</layout_style> - <spacing>0</spacing> - <child_min_width>85</child_min_width> - <child_min_height>27</child_min_height> - <child_ipad_x>7</child_ipad_x> - <child_ipad_y>0</child_ipad_y> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - <pack>GTK_PACK_END</pack> - </child> - - <widget> - <class>GtkButton</class> - <name>button12</name> - <can_default>True</can_default> - <can_focus>True</can_focus> - <stock_button>GNOME_STOCK_BUTTON_OK</stock_button> - </widget> - - <widget> - <class>GtkButton</class> - <name>button14</name> - <can_default>True</can_default> - <can_focus>True</can_focus> - <stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button> - </widget> - </widget> - - <widget> <class>GtkFrame</class> <name>top-frame</name> <border_width>2</border_width> @@ -122,7 +96,7 @@ <widget> <class>GtkButton</class> - <name>button-groups</name> + <name>button-grouping</name> <can_focus>True</can_focus> <label>Grouping</label> <child> @@ -288,6 +262,40 @@ </widget> </widget> </widget> + + <widget> + <class>GtkHButtonBox</class> + <child_name>GnomeDialog:action_area</child_name> + <name>dialog-action_area2</name> + <layout_style>GTK_BUTTONBOX_END</layout_style> + <spacing>0</spacing> + <child_min_width>85</child_min_width> + <child_min_height>27</child_min_height> + <child_ipad_x>7</child_ipad_x> + <child_ipad_y>0</child_ipad_y> + <child> + <padding>0</padding> + <expand>False</expand> + <fill>True</fill> + <pack>GTK_PACK_END</pack> + </child> + + <widget> + <class>GtkButton</class> + <name>button12</name> + <can_default>True</can_default> + <can_focus>True</can_focus> + <stock_button>GNOME_STOCK_BUTTON_OK</stock_button> + </widget> + + <widget> + <class>GtkButton</class> + <name>button14</name> + <can_default>True</can_default> + <can_focus>True</can_focus> + <stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button> + </widget> + </widget> </widget> </widget> diff --git a/widgets/e-table/test-table.c b/widgets/e-table/test-table.c index beae0b7707..00ff6089c9 100644 --- a/widgets/e-table/test-table.c +++ b/widgets/e-table/test-table.c @@ -346,7 +346,7 @@ do_e_table_demo (const char *spec) gtk_widget_show (window); if (getenv ("TEST")){ - e_config_do_gui_config (NULL, e_table); + e_table_do_gui_config (NULL, e_table); } } |