Add so I can go to the chillout hack room

svn path=/trunk/; revision=2264

12 files changed, 616 insertions, 178 deletions

diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog
index b96f8c07df..4d9b7308b1 100644
--- a/widgets/e-table/ChangeLog
+++ b/widgets/e-table/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-30  Miguel de Icaza  <miguel@gnu.org>
+
+	* Makefile.am (EXTRA_DIST): Added Glade files to the
+	distribution. 
+
 2000-03-28  Matt Loper  <matt@helixcode.com>
 
 	* e-table-text-model.c (e_table_text_model_destroy): made
diff --git a/widgets/e-table/Makefile.am b/widgets/e-table/Makefile.am
index 8780789977..74facae1e1 100644
--- a/widgets/e-table/Makefile.am
+++ b/widgets/e-table/Makefile.am
@@ -1,3 +1,13 @@
+
+gladedir = $(datadir)/evolution/glade
+glade_DATA = 					\
+	e-table-config.glade			\
+	e-table-group.glade
+
+glade_headers = 				\
+	e-table-config.glade.h			\
+	e-table-group.glade.h
+
 INCLUDES =					\
 	$(EXTRA_GNOME_CFLAGS)			\
 	$(GNOME_INCLUDEDIR)			\
@@ -89,9 +99,14 @@ table_example_2_LDADD =				\
 
 table_example_2_LDFLAGS = `gnome-config --libs gdk_pixbuf`
 
-EXTRA_DIST =			\
-	sample.table		\
+icons = 			\
 	add-col.xpm		\
 	check-empty.xpm		\
 	check-filled.xpm	\
 	remove-col.xpm
+
+EXTRA_DIST =			\
+	sample.table		\
+	$(icons)		\
+	$(glade_DATA)		\
+	$(glade_headers)
\ No newline at end of file
diff --git a/widgets/e-table/e-table-config.c b/widgets/e-table/e-table-config.c
new file mode 100644
index 0000000000..da7dde1990
--- /dev/null
+++ b/widgets/e-table/e-table-config.c
@@ -0,0 +1,41 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * E-table.c: A graphical view of a Table.
+ *
+ * Author:
+ *   Miguel de Icaza (miguel@gnu.org)
+ *
+ * Copyright 1999, Helix Code, Inc
+ */
+#include <config.h>
+#include <gnome.h>
+#inclued <glade/glade.h>
+#include "e-util/e-util.h"
+#include "e-util/e-xml-utils.h"
+#include "e-util/e-canvas.h"
+#include "e-table.h"
+#include "e-table-header-item.h"
+#include "e-table-subset.h"
+#include "e-table-item.h"
+#include "e-table-group.h"
+
+GtkWidget *
+e_table_gui_config (ETable *etable)
+{
+	GladeXML *gui;
+	GnomeDialog *dialog;
+		
+	gui = glade_xml_new (ETABLE_GLADEDIR "/e-table-config.glade");
+	if (!gui)
+		return NULL;
+
+	dialog = GNOME_DIALOG (glade_xml_get_widget (gui, "e-table-config"));
+}
+
+
+void
+e_table_do_gui_config (ETable *etable)
+{
+}
+
+	      
diff --git a/widgets/e-table/e-table-config.glade b/widgets/e-table/e-table-config.glade
index 2605faefb7..176a8c3ab7 100644
--- a/widgets/e-table/e-table-config.glade
+++ b/widgets/e-table/e-table-config.glade
@@ -26,115 +26,274 @@
 </project>
 
 <widget>
-  <class>GtkWindow</class>
+  <class>GnomeDialog</class>
   <name>e-table-config</name>
-  <title>window1</title>
+  <visible>False</visible>
   <type>GTK_WINDOW_TOPLEVEL</type>
   <position>GTK_WIN_POS_NONE</position>
   <modal>False</modal>
   <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
+  <allow_grow>False</allow_grow>
   <auto_shrink>False</auto_shrink>
+  <auto_close>False</auto_close>
+  <hide_on_close>False</hide_on_close>
 
   <widget>
-    <class>GtkFrame</class>
-    <name>top-frame</name>
-    <label></label>
-    <label_xalign>0</label_xalign>
-    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+    <class>GtkVBox</class>
+    <child_name>GnomeDialog:vbox</child_name>
+    <name>dialog-vbox2</name>
+    <homogeneous>False</homogeneous>
+    <spacing>0</spacing>
+    <child>
+      <padding>0</padding>
+      <expand>True</expand>
+      <fill>True</fill>
+    </child>
 
     <widget>
-      <class>GtkTable</class>
-      <name>table1</name>
+      <class>GtkFrame</class>
+      <name>top-frame</name>
       <border_width>2</border_width>
-      <rows>4</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>2</row_spacing>
-      <column_spacing>0</column_spacing>
+      <label></label>
+      <label_xalign>0</label_xalign>
+      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+      <child>
+	<padding>0</padding>
+	<expand>True</expand>
+	<fill>True</fill>
+      </child>
 
       <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_focus>True</can_focus>
-	<label>Fields</label>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
+	<class>GtkTable</class>
+	<name>table1</name>
+	<border_width>2</border_width>
+	<rows>4</rows>
+	<columns>2</columns>
+	<homogeneous>False</homogeneous>
+	<row_spacing>2</row_spacing>
+	<column_spacing>4</column_spacing>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <name>button3</name>
+	  <can_focus>True</can_focus>
+	  <label>Fields</label>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>0</top_attach>
+	    <bottom_attach>1</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <name>button4</name>
+	  <can_focus>True</can_focus>
+	  <label>Grouping</label>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>1</top_attach>
+	    <bottom_attach>2</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <name>button5</name>
+	  <can_focus>True</can_focus>
+	  <label>Sort</label>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>2</top_attach>
+	    <bottom_attach>3</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <name>button6</name>
+	  <can_focus>True</can_focus>
+	  <label>Filter</label>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>3</top_attach>
+	    <bottom_attach>4</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>label1</name>
+	  <label></label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>0</top_attach>
+	    <bottom_attach>1</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
 
-      <widget>
-	<class>GtkButton</class>
-	<name>button4</name>
-	<can_focus>True</can_focus>
-	<label>Grouping</label>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>label2</name>
+	  <label></label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>1</top_attach>
+	    <bottom_attach>2</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>label3</name>
+	  <label></label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>2</top_attach>
+	    <bottom_attach>3</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>label4</name>
+	  <label></label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>3</top_attach>
+	    <bottom_attach>4</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</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>button5</name>
+	<name>button12</name>
+	<can_default>True</can_default>
 	<can_focus>True</can_focus>
-	<label>Sort</label>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
+	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
       </widget>
 
       <widget>
 	<class>GtkButton</class>
-	<name>button6</name>
+	<name>button14</name>
+	<can_default>True</can_default>
 	<can_focus>True</can_focus>
-	<label>Filter</label>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
+	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
       </widget>
     </widget>
   </widget>
diff --git a/widgets/e-table/e-table-config.glade.h b/widgets/e-table/e-table-config.glade.h
index 72bac8e22a..4dc2ec8d31 100644
--- a/widgets/e-table/e-table-config.glade.h
+++ b/widgets/e-table/e-table-config.glade.h
@@ -4,7 +4,6 @@
  * DO NOT compile it as part of your application.
  */
 
-gchar *s = N_("window1");
 gchar *s = N_("Fields");
 gchar *s = N_("Grouping");
 gchar *s = N_("Sort");
diff --git a/widgets/e-table/e-table-config.h b/widgets/e-table/e-table-config.h
new file mode 100644
index 0000000000..9bd16071a2
--- /dev/null
+++ b/widgets/e-table/e-table-config.h
@@ -0,0 +1,7 @@
+#ifndef _E_TABLE_CONFIG_H
+#define _E_TABLE_CONFIG_H
+
+GtkWidget *e_table_gui_config    (ETable *etable);
+void       e_table_do_gui_config (ETable *etable);
+
+#endif /* _E_TABLE_CONFIG_H */
diff --git a/widgets/e-table/e-table.h b/widgets/e-table/e-table.h
index ecdeec1e83..3cca3422b3 100644
--- a/widgets/e-table/e-table.h
+++ b/widgets/e-table/e-table.h
@@ -63,13 +63,16 @@ void       e_table_construct (ETable *e_table, ETableHeader *full_header, ETable
 			      const char *spec);
 GtkWidget *e_table_new       (ETableHeader *full_header, ETableModel *etm,
 			      const char *spec);
-void       e_table_construct_from_spec_file (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
-					     const char *filename);
-GtkWidget *e_table_new_from_spec_file (ETableHeader *full_header, ETableModel *etm,
-				       const char *filename);
-gchar     *e_table_get_specification  (ETable *e_table);
-void       e_table_save_specification (ETable *e_table, gchar *filename);
 
+void       e_table_construct_from_spec_file (ETable *e_table,
+					     ETableHeader *full_header,
+					     ETableModel *etm,
+					     const char *filename);
+GtkWidget *e_table_new_from_spec_file       (ETableHeader *full_header,
+					     ETableModel *etm,
+					     const char *filename);
+gchar     *e_table_get_specification        (ETable *e_table);
+void       e_table_save_specification       (ETable *e_table, gchar *filename);
 
 END_GNOME_DECLS
 
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
new file mode 100644
index 0000000000..da7dde1990
--- /dev/null
+++ b/widgets/table/e-table-config.c
@@ -0,0 +1,41 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * E-table.c: A graphical view of a Table.
+ *
+ * Author:
+ *   Miguel de Icaza (miguel@gnu.org)
+ *
+ * Copyright 1999, Helix Code, Inc
+ */
+#include <config.h>
+#include <gnome.h>
+#inclued <glade/glade.h>
+#include "e-util/e-util.h"
+#include "e-util/e-xml-utils.h"
+#include "e-util/e-canvas.h"
+#include "e-table.h"
+#include "e-table-header-item.h"
+#include "e-table-subset.h"
+#include "e-table-item.h"
+#include "e-table-group.h"
+
+GtkWidget *
+e_table_gui_config (ETable *etable)
+{
+	GladeXML *gui;
+	GnomeDialog *dialog;
+		
+	gui = glade_xml_new (ETABLE_GLADEDIR "/e-table-config.glade");
+	if (!gui)
+		return NULL;
+
+	dialog = GNOME_DIALOG (glade_xml_get_widget (gui, "e-table-config"));
+}
+
+
+void
+e_table_do_gui_config (ETable *etable)
+{
+}
+
+	      
diff --git a/widgets/table/e-table-config.glade b/widgets/table/e-table-config.glade
index 2605faefb7..176a8c3ab7 100644
--- a/widgets/table/e-table-config.glade
+++ b/widgets/table/e-table-config.glade
@@ -26,115 +26,274 @@
 </project>
 
 <widget>
-  <class>GtkWindow</class>
+  <class>GnomeDialog</class>
   <name>e-table-config</name>
-  <title>window1</title>
+  <visible>False</visible>
   <type>GTK_WINDOW_TOPLEVEL</type>
   <position>GTK_WIN_POS_NONE</position>
   <modal>False</modal>
   <allow_shrink>False</allow_shrink>
-  <allow_grow>True</allow_grow>
+  <allow_grow>False</allow_grow>
   <auto_shrink>False</auto_shrink>
+  <auto_close>False</auto_close>
+  <hide_on_close>False</hide_on_close>
 
   <widget>
-    <class>GtkFrame</class>
-    <name>top-frame</name>
-    <label></label>
-    <label_xalign>0</label_xalign>
-    <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+    <class>GtkVBox</class>
+    <child_name>GnomeDialog:vbox</child_name>
+    <name>dialog-vbox2</name>
+    <homogeneous>False</homogeneous>
+    <spacing>0</spacing>
+    <child>
+      <padding>0</padding>
+      <expand>True</expand>
+      <fill>True</fill>
+    </child>
 
     <widget>
-      <class>GtkTable</class>
-      <name>table1</name>
+      <class>GtkFrame</class>
+      <name>top-frame</name>
       <border_width>2</border_width>
-      <rows>4</rows>
-      <columns>2</columns>
-      <homogeneous>False</homogeneous>
-      <row_spacing>2</row_spacing>
-      <column_spacing>0</column_spacing>
+      <label></label>
+      <label_xalign>0</label_xalign>
+      <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+      <child>
+	<padding>0</padding>
+	<expand>True</expand>
+	<fill>True</fill>
+      </child>
 
       <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_focus>True</can_focus>
-	<label>Fields</label>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>0</top_attach>
-	  <bottom_attach>1</bottom_attach>
+	<class>GtkTable</class>
+	<name>table1</name>
+	<border_width>2</border_width>
+	<rows>4</rows>
+	<columns>2</columns>
+	<homogeneous>False</homogeneous>
+	<row_spacing>2</row_spacing>
+	<column_spacing>4</column_spacing>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <name>button3</name>
+	  <can_focus>True</can_focus>
+	  <label>Fields</label>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>0</top_attach>
+	    <bottom_attach>1</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <name>button4</name>
+	  <can_focus>True</can_focus>
+	  <label>Grouping</label>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>1</top_attach>
+	    <bottom_attach>2</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <name>button5</name>
+	  <can_focus>True</can_focus>
+	  <label>Sort</label>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>2</top_attach>
+	    <bottom_attach>3</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <name>button6</name>
+	  <can_focus>True</can_focus>
+	  <label>Filter</label>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>3</top_attach>
+	    <bottom_attach>4</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>label1</name>
+	  <label></label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
-      </widget>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>0</top_attach>
+	    <bottom_attach>1</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
 
-      <widget>
-	<class>GtkButton</class>
-	<name>button4</name>
-	<can_focus>True</can_focus>
-	<label>Grouping</label>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>1</top_attach>
-	  <bottom_attach>2</bottom_attach>
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>label2</name>
+	  <label></label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>1</top_attach>
+	    <bottom_attach>2</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>label3</name>
+	  <label></label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>2</top_attach>
+	    <bottom_attach>3</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>label4</name>
+	  <label></label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0</xalign>
+	  <yalign>0.5</yalign>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>3</top_attach>
+	    <bottom_attach>4</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>False</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>False</yfill>
+	  </child>
+	</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>button5</name>
+	<name>button12</name>
+	<can_default>True</can_default>
 	<can_focus>True</can_focus>
-	<label>Sort</label>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>2</top_attach>
-	  <bottom_attach>3</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
+	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
       </widget>
 
       <widget>
 	<class>GtkButton</class>
-	<name>button6</name>
+	<name>button14</name>
+	<can_default>True</can_default>
 	<can_focus>True</can_focus>
-	<label>Filter</label>
-	<child>
-	  <left_attach>0</left_attach>
-	  <right_attach>1</right_attach>
-	  <top_attach>3</top_attach>
-	  <bottom_attach>4</bottom_attach>
-	  <xpad>0</xpad>
-	  <ypad>0</ypad>
-	  <xexpand>False</xexpand>
-	  <yexpand>False</yexpand>
-	  <xshrink>False</xshrink>
-	  <yshrink>False</yshrink>
-	  <xfill>True</xfill>
-	  <yfill>True</yfill>
-	</child>
+	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
       </widget>
     </widget>
   </widget>
diff --git a/widgets/table/e-table-config.glade.h b/widgets/table/e-table-config.glade.h
index 72bac8e22a..4dc2ec8d31 100644
--- a/widgets/table/e-table-config.glade.h
+++ b/widgets/table/e-table-config.glade.h
@@ -4,7 +4,6 @@
  * DO NOT compile it as part of your application.
  */
 
-gchar *s = N_("window1");
 gchar *s = N_("Fields");
 gchar *s = N_("Grouping");
 gchar *s = N_("Sort");
diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h
new file mode 100644
index 0000000000..9bd16071a2
--- /dev/null
+++ b/widgets/table/e-table-config.h
@@ -0,0 +1,7 @@
+#ifndef _E_TABLE_CONFIG_H
+#define _E_TABLE_CONFIG_H
+
+GtkWidget *e_table_gui_config    (ETable *etable);
+void       e_table_do_gui_config (ETable *etable);
+
+#endif /* _E_TABLE_CONFIG_H */
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index ecdeec1e83..3cca3422b3 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -63,13 +63,16 @@ void       e_table_construct (ETable *e_table, ETableHeader *full_header, ETable
 			      const char *spec);
 GtkWidget *e_table_new       (ETableHeader *full_header, ETableModel *etm,
 			      const char *spec);
-void       e_table_construct_from_spec_file (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
-					     const char *filename);
-GtkWidget *e_table_new_from_spec_file (ETableHeader *full_header, ETableModel *etm,
-				       const char *filename);
-gchar     *e_table_get_specification  (ETable *e_table);
-void       e_table_save_specification (ETable *e_table, gchar *filename);
 
+void       e_table_construct_from_spec_file (ETable *e_table,
+					     ETableHeader *full_header,
+					     ETableModel *etm,
+					     const char *filename);
+GtkWidget *e_table_new_from_spec_file       (ETableHeader *full_header,
+					     ETableModel *etm,
+					     const char *filename);
+gchar     *e_table_get_specification        (ETable *e_table);
+void       e_table_save_specification       (ETable *e_table, gchar *filename);
 
 END_GNOME_DECLS