Made the Close button work.

2000-06-21  Christopher James Lahey  <clahey@helixcode.com>

	* e-table-field-chooser-dialog.c: Made the Close button work.

	* e-table-field-chooser.glade, e-table-field-chooser.glade.h:
	Added a text description of this dialog.

svn path=/trunk/; revision=3685

7 files changed, 73 insertions, 2 deletions

diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog
index f21c68648b..9c78afd8ad 100644
--- a/widgets/e-table/ChangeLog
+++ b/widgets/e-table/ChangeLog
@@ -1,5 +1,12 @@
 2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
 
+	* e-table-field-chooser-dialog.c: Made the Close button work.
+
+	* e-table-field-chooser.glade, e-table-field-chooser.glade.h:
+	Added a text description of this dialog.
+
+2000-06-21  Christopher James Lahey  <clahey@helixcode.com>
+
 	* e-table-header-item.c: Changed this to move the cell to the
 	nearest edge instead of to the left of the column it's over.
 
diff --git a/widgets/e-table/e-table-field-chooser-dialog.c b/widgets/e-table/e-table-field-chooser-dialog.c
index b218f07c73..b54c57e80e 100644
--- a/widgets/e-table/e-table-field-chooser-dialog.c
+++ b/widgets/e-table/e-table-field-chooser-dialog.c
@@ -29,6 +29,7 @@ static void e_table_field_chooser_dialog_class_init	(ETableFieldChooserDialogCla
 static void e_table_field_chooser_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
 static void e_table_field_chooser_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
 static void e_table_field_chooser_dialog_destroy (GtkObject *object);
+static void e_table_field_chooser_dialog_clicked (GnomeDialog *dialog, gint button);
 
 static GnomeDialogClass *parent_class = NULL;
 
@@ -68,8 +69,10 @@ static void
 e_table_field_chooser_dialog_class_init (ETableFieldChooserDialogClass *klass)
 {
 	GtkObjectClass *object_class;
+	GnomeDialogClass *dialog_class;
 
 	object_class = (GtkObjectClass*) klass;
+	dialog_class = GNOME_DIALOG_CLASS (klass);
 
 	parent_class = gtk_type_class (gnome_dialog_get_type ());
 
@@ -77,6 +80,8 @@ e_table_field_chooser_dialog_class_init (ETableFieldChooserDialogClass *klass)
 	object_class->set_arg = e_table_field_chooser_dialog_set_arg;
 	object_class->get_arg = e_table_field_chooser_dialog_get_arg;
 
+	dialog_class->clicked = e_table_field_chooser_dialog_clicked;
+
 	gtk_object_add_arg_type ("ETableFieldChooserDialog::dnd_code", GTK_TYPE_STRING,
 				 GTK_ARG_READWRITE, ARG_DND_CODE);
 	gtk_object_add_arg_type ("ETableFieldChooserDialog::full_header", GTK_TYPE_OBJECT,
@@ -176,3 +181,10 @@ e_table_field_chooser_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_
 		break;
 	}
 }
+
+static void
+e_table_field_chooser_dialog_clicked (GnomeDialog *dialog, int button)
+{
+	if (button == 0)
+		gnome_dialog_close(dialog);
+}
diff --git a/widgets/e-table/e-table-field-chooser.glade b/widgets/e-table/e-table-field-chooser.glade
index e09b3a9f3a..a5cd37c2df 100644
--- a/widgets/e-table/e-table-field-chooser.glade
+++ b/widgets/e-table/e-table-field-chooser.glade
@@ -75,7 +75,7 @@
       <class>GtkVBox</class>
       <name>vbox-top</name>
       <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
+      <spacing>4</spacing>
       <child>
 	<padding>0</padding>
 	<expand>True</expand>
@@ -83,6 +83,24 @@
       </child>
 
       <widget>
+	<class>GtkLabel</class>
+	<name>label1</name>
+	<label>To add a column to your table, drag it into
+the location in which you want it to appear.</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
+	<child>
+	  <padding>0</padding>
+	  <expand>False</expand>
+	  <fill>False</fill>
+	</child>
+      </widget>
+
+      <widget>
 	<class>GtkScrolledWindow</class>
 	<name>scrolledwindow1</name>
 	<width>200</width>
diff --git a/widgets/e-table/e-table-field-chooser.glade.h b/widgets/e-table/e-table-field-chooser.glade.h
index 344535f180..a36bd6052c 100644
--- a/widgets/e-table/e-table-field-chooser.glade.h
+++ b/widgets/e-table/e-table-field-chooser.glade.h
@@ -5,3 +5,5 @@
  */
 
 gchar *s = N_("Field Chooser");
+gchar *s = N_("To add a column to your table, drag it into\n"
+              "the location in which you want it to appear.");
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
index b218f07c73..b54c57e80e 100644
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ b/widgets/table/e-table-field-chooser-dialog.c
@@ -29,6 +29,7 @@ static void e_table_field_chooser_dialog_class_init	(ETableFieldChooserDialogCla
 static void e_table_field_chooser_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
 static void e_table_field_chooser_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
 static void e_table_field_chooser_dialog_destroy (GtkObject *object);
+static void e_table_field_chooser_dialog_clicked (GnomeDialog *dialog, gint button);
 
 static GnomeDialogClass *parent_class = NULL;
 
@@ -68,8 +69,10 @@ static void
 e_table_field_chooser_dialog_class_init (ETableFieldChooserDialogClass *klass)
 {
 	GtkObjectClass *object_class;
+	GnomeDialogClass *dialog_class;
 
 	object_class = (GtkObjectClass*) klass;
+	dialog_class = GNOME_DIALOG_CLASS (klass);
 
 	parent_class = gtk_type_class (gnome_dialog_get_type ());
 
@@ -77,6 +80,8 @@ e_table_field_chooser_dialog_class_init (ETableFieldChooserDialogClass *klass)
 	object_class->set_arg = e_table_field_chooser_dialog_set_arg;
 	object_class->get_arg = e_table_field_chooser_dialog_get_arg;
 
+	dialog_class->clicked = e_table_field_chooser_dialog_clicked;
+
 	gtk_object_add_arg_type ("ETableFieldChooserDialog::dnd_code", GTK_TYPE_STRING,
 				 GTK_ARG_READWRITE, ARG_DND_CODE);
 	gtk_object_add_arg_type ("ETableFieldChooserDialog::full_header", GTK_TYPE_OBJECT,
@@ -176,3 +181,10 @@ e_table_field_chooser_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_
 		break;
 	}
 }
+
+static void
+e_table_field_chooser_dialog_clicked (GnomeDialog *dialog, int button)
+{
+	if (button == 0)
+		gnome_dialog_close(dialog);
+}
diff --git a/widgets/table/e-table-field-chooser.glade b/widgets/table/e-table-field-chooser.glade
index e09b3a9f3a..a5cd37c2df 100644
--- a/widgets/table/e-table-field-chooser.glade
+++ b/widgets/table/e-table-field-chooser.glade
@@ -75,7 +75,7 @@
       <class>GtkVBox</class>
       <name>vbox-top</name>
       <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
+      <spacing>4</spacing>
       <child>
 	<padding>0</padding>
 	<expand>True</expand>
@@ -83,6 +83,24 @@
       </child>
 
       <widget>
+	<class>GtkLabel</class>
+	<name>label1</name>
+	<label>To add a column to your table, drag it into
+the location in which you want it to appear.</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
+	<child>
+	  <padding>0</padding>
+	  <expand>False</expand>
+	  <fill>False</fill>
+	</child>
+      </widget>
+
+      <widget>
 	<class>GtkScrolledWindow</class>
 	<name>scrolledwindow1</name>
 	<width>200</width>
diff --git a/widgets/table/e-table-field-chooser.glade.h b/widgets/table/e-table-field-chooser.glade.h
index 344535f180..a36bd6052c 100644
--- a/widgets/table/e-table-field-chooser.glade.h
+++ b/widgets/table/e-table-field-chooser.glade.h
@@ -5,3 +5,5 @@
  */
 
 gchar *s = N_("Field Chooser");
+gchar *s = N_("To add a column to your table, drag it into\n"
+              "the location in which you want it to appear.");