Load frames.

2001-01-16  Miguel de Icaza  <miguel@gnu.org>

	* e-table-config.c (configure_sort_dialog): Load frames.

	* Kill e-table-config-field.c

	* e-table-specification.c (e_table_specification_save_to_file):
	Specify version to xmlNewDoc.

	* e-table-state.c (e_table_state_save_to_string): Specify version
	to xmlNewDoc.

	* e-table-config.c (config_destroy): Destroy the copies.  Unref
	the originals.
	(e_table_config_construct): Duplicate values of configuration
	here.
	(configure_sort_dialog): New function that populates the sort gtk
	combo boxes.

	* e-table.c (et_col_spec_to_col): Fixup use of title here.  Do the
	actual translation here.

	* e-table-column-specification.c: Remove title_, it is now called
	title.  Translation needs to take place elsewhere, not here

	* e-table-specification.c (e_table_specification_duplicate): Add
	preconditions here.
	(e_table_specification_save_to_node): ditto.
	(e_table_specification_save_to_string): ditto.
	(e_table_specification_save_to_file): ditto.

	* e-table-state.c (e_table_state_duplicate): Implement.

	* e-table-config.glade (dialog_sort): Change drop down menus to
	use GtkComboText widgets.

	* e-table-config.c (configure_dialog): New function, used to set
	up dialogs.

svn path=/trunk/; revision=7563

1 files changed, 5 insertions, 7 deletions

diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h
index 4b444636d7..fcf6eff9cc 100644
--- a/widgets/table/e-table-config.h
+++ b/widgets/table/e-table-config.h
@@ -5,6 +5,7 @@
 #include <gnome.h>
 #include <gal/e-table/e-table-sort-info.h>
 #include <gal/e-table/e-table-specification.h>
+#include <gal/widgets/gtk-combo-text.h>
 
 #define E_TABLE_CONFIG_TYPE        (e_table_config_get_type ())
 #define E_TABLE_CONFIG(o)          (GTK_CHECK_CAST ((o), E_TABLE_CONFIG_TYPE, ETableConfig))
@@ -26,18 +27,15 @@ typedef struct {
 	/*
 	 * The state we manipulate
 	 */
-	ETableSpecification *spec;
-	ETableState         *state;
+	ETableSpecification *source_spec,  *spec;
+	ETableState         *source_state, *state;
 
 	GtkWidget *sort_label;
 	GtkWidget *group_label;
 	GtkWidget *fields_label;
 	
-	GtkWidget *sort_dialog;
-	GtkWidget *group_dialog;
-
-	int sorting_changed_id;
-	int grouping_changed_id;
+	GtkComboText *sort_combos [4];
+	GtkWidget    *frames [4];
 } ETableConfig;
 
 typedef struct {