Set the border widths on the dialog's vbox and action area to be

2004-04-09  Rodney Dawes  <dobey@ximian.com>

	* e-timezone-dialog/e-timezone-dialog.c
	(e_timezone_dialog_construct): Set the border widths on the dialog's
	vbox and action area to be HIG-complaint
	Get rid of the timezone preview widget in here
	Point the internal 'table' to the right widget
	(on_map_motion): Get rid of the extra-hacky code to set the preview
	widget's label to the timezone, now that that widget is gone
	(on_map_leave): Update the comment to not reference the preview
	widget that is now gone
	Get rid of the code to set the preview widget's label to empty string
	* e-timezone-dialog/e-timezone-dialog.glade: Update for HIG-compliance

2004-04-09  Rodney Dawes  <dobey@ximian.com>

	* e-charset-picker.c: Include gtkhbox.h in here to avoid the warnings
	(activate_other):
	(e_charset_picker_dialog): Make these dialogs be more HIG-compliant
	* e-filter-bar.c (do_advanced):
	(menubar_activated): Make these dialogs be more HIG-compliant

svn path=/trunk/; revision=25468

3 files changed, 64 insertions, 12 deletions

diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 7afc41686b..7418952b54 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-09  Rodney Dawes  <dobey@ximian.com>
+
+	* e-charset-picker.c: Include gtkhbox.h in here to avoid the warnings
+	(activate_other):
+	(e_charset_picker_dialog): Make these dialogs be more HIG-compliant
+	* e-filter-bar.c (do_advanced):
+	(menubar_activated): Make these dialogs be more HIG-compliant
+
 2004-04-08  Not Zed  <NotZed@Ximian.com>
 
 	* e-info-label.c (e_info_label_set_info): ugh, fix some last
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index c15365da51..15f50b7921 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <iconv.h>
 
+#include <gtk/gtkhbox.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkentry.h>
 #include <gtk/gtkstock.h>
@@ -202,7 +203,7 @@ activate_entry (GtkWidget *entry, GtkDialog *dialog)
 static void
 activate_other (GtkWidget *item, gpointer menu)
 {
-	GtkWidget *window, *entry, *label;
+	GtkWidget *window, *entry, *label, *vbox, *hbox;
 	char *old_charset, *new_charset;
 	GtkDialog *dialog;
 
@@ -219,22 +220,39 @@ activate_other (GtkWidget *item, gpointer menu)
 							  GTK_STOCK_OK, GTK_RESPONSE_OK,
 							  NULL));
 
+	gtk_dialog_set_has_separator (dialog, FALSE);
 	gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
 
+	vbox = gtk_vbox_new (FALSE, 6);
+	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+	gtk_box_pack_start (GTK_BOX (dialog->vbox), vbox, TRUE, TRUE, 0);
+	gtk_widget_show (vbox);
+
 	label = gtk_label_new (_("Enter the character set to use"));
 	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
+	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+	gtk_widget_show (label);
+
+	hbox = gtk_hbox_new (FALSE, 12);
+	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+	gtk_widget_show (hbox);
+
+	label = gtk_label_new ("");
+	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 	gtk_widget_show (label);
 
 	entry = gtk_entry_new ();
+	gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+	gtk_widget_show (entry);
+
 	if (old_charset)
 		gtk_entry_set_text (GTK_ENTRY (entry), old_charset);
 	g_signal_connect (entry, "activate",
 			  G_CALLBACK (activate_entry), dialog);
 	
-	gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 6);
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), label, FALSE, FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), entry, FALSE, FALSE, 6);
+	gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 0);
+	gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 12);
 
 	gtk_widget_show_all (GTK_WIDGET (dialog));
 
@@ -366,7 +384,7 @@ e_charset_picker_dialog (const char *title, const char *prompt,
 			 const char *default_charset, GtkWindow *parent)
 {
 	GtkDialog *dialog;
-	GtkWidget *label, *omenu, *picker;
+	GtkWidget *label, *omenu, *picker, *vbox, *hbox;
 	char *charset = NULL;
 
 	dialog = GTK_DIALOG (gtk_dialog_new_with_buttons (title,
@@ -376,19 +394,36 @@ e_charset_picker_dialog (const char *title, const char *prompt,
 							  GTK_STOCK_OK, GTK_RESPONSE_OK,
 							  NULL));
 
+	gtk_dialog_set_has_separator (dialog, FALSE);
 	gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
 
+	vbox = gtk_vbox_new (FALSE, 6);
+	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+	gtk_box_pack_start (GTK_BOX (dialog->vbox), vbox, FALSE, FALSE, 0);
+	gtk_widget_show (vbox);
+
 	label = gtk_label_new (prompt);
 	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
+	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+	gtk_widget_show (label);
+
+	hbox = gtk_hbox_new (FALSE, 12);
+	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+	gtk_widget_show (hbox);
+
+	label = gtk_label_new ("");
+	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+	gtk_widget_show (label);
 
 	picker = e_charset_picker_new (default_charset);
 	omenu = gtk_option_menu_new ();
 	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), picker);
+	gtk_box_pack_start (GTK_BOX (hbox), omenu, TRUE, TRUE, 0);
+	gtk_widget_show (omenu);
 
-	gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 6);
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), label, FALSE, FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), omenu, FALSE, FALSE, 6);
+	gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), 0);
+	gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 12);
 
 	gtk_widget_show_all (GTK_WIDGET (dialog));
 
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index afba3f2e58..f9d4d24ab1 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -150,6 +150,8 @@ do_advanced (ESearchBar *esb)
 		
 		w = filter_rule_get_widget (rule, efb->context);
 		filter_rule_set_source (rule, FILTER_SOURCE_INCOMING);
+		gtk_container_set_border_width (GTK_CONTAINER (w), 12);
+
 		/* FIXME: get the toplevel window... */
 		dialog = gtk_dialog_new_with_buttons (_("Advanced Search"), NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
 						      GTK_STOCK_SAVE, GTK_RESPONSE_APPLY,
@@ -157,12 +159,14 @@ do_advanced (ESearchBar *esb)
 						      GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
 		
 		efb->save_dialog = dialog;
+		gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 		
 		gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
 		gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 300);
-		gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
+		gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 0);
+		gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 12);
 		
-		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), w, TRUE, TRUE, 3);
+		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), w, TRUE, TRUE, 0);
 		
 		g_object_ref (rule);
 		g_object_set_data_full ((GObject *) dialog, "rule", rule, (GDestroyNotify) g_object_unref);
@@ -210,11 +214,16 @@ menubar_activated (ESearchBar *esb, int id, void *data)
 			
 			w = filter_rule_get_widget (rule, efb->context);
 			filter_rule_set_source (rule, FILTER_SOURCE_INCOMING);
+			gtk_container_set_border_width (GTK_CONTAINER (w), 12);
+
 			/* FIXME: get the toplevel window... */
 			dialog = gtk_dialog_new_with_buttons (_("Save Search"), NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
 							      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 							      GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
 			efb->save_dialog = dialog;
+			gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+			gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 0);
+			gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 12);
 			
 			gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 300);