From 588fd23c5c2a93f42e28df892eb8ab7f8078597b Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Wed, 21 Jun 2000 23:01:29 +0000 Subject: Made the Close button work. 2000-06-21 Christopher James Lahey * 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 --- widgets/e-table/ChangeLog | 7 +++++++ widgets/e-table/e-table-field-chooser-dialog.c | 12 ++++++++++++ widgets/e-table/e-table-field-chooser.glade | 20 +++++++++++++++++++- widgets/e-table/e-table-field-chooser.glade.h | 2 ++ widgets/table/e-table-field-chooser-dialog.c | 12 ++++++++++++ widgets/table/e-table-field-chooser.glade | 20 +++++++++++++++++++- widgets/table/e-table-field-chooser.glade.h | 2 ++ 7 files changed, 73 insertions(+), 2 deletions(-) (limited to 'widgets') 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,3 +1,10 @@ +2000-06-21 Christopher James Lahey + + * 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 * e-table-header-item.c: Changed this to move the cell to the 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,13 +75,31 @@ GtkVBox vbox-top False - 0 + 4 0 True True + + GtkLabel + label1 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + GtkScrolledWindow scrolledwindow1 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,13 +75,31 @@ GtkVBox vbox-top False - 0 + 4 0 True True + + GtkLabel + label1 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + GtkScrolledWindow scrolledwindow1 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."); -- cgit