Hide the separators on these dialogs Re-pack the rule_editor widget in

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

	* filter-datespec.c (validate):
	(button_clicked): Hide the separators on these dialogs
	* filter-editor.c (filter_editor_new): Re-pack the rule_editor widget
	in here, and get rid of the GtkFrame-related code
	* filter-file.c (validate): Hide the separators on these dialogs
	* filter-filter.c (get_widget): Get rid of the GtkFrame, and relayout
	the widgets to be HIG-compliant
	* filter-folder.c (validate): Hide the separator on this dialog
	* filter-input.c (validate): Hide the separator on this dialog
	* filter-part.c (main): Hide the separator on this dialog
	* filter-rule.c (validate): Hide the separator on this dialog
	(get_widget): Get rid of the GtkFrame, and relayout the widgets to be
	HIG-compliant
	* filter.glade: Make the widget layouts here be HIG-compliant
	* rule-context.c (new_rule_response):
	(rule_context_add_rule_gui): Hide the separators on these dialogs
	* rule-editor.c (rule_editor_new): Get rid of the GtkFrame-related code
	(add_editor_response): Hide the dialog separator here
	(rule_add): Hide the dialog separator here
	(edit_editor_response): Hide the dialog separator here
	(rule_edit): Hide the dialog separator here
	(rule_editor_construct): Remove the rule_editor repacking code
	Set the dialog vbox's border width to 12
	Set the mnemonic for the filter label here
	Hide the dialog separator on the filter editor dialog
	* vfolder-editor.c (vfolder_editor_new): Re-pack the appropriate
	editor widget in here
	Get rid of the GtkFrame-related code
	* vfolder-rule.c (validate): Hide the dialog separators here

svn path=/trunk/; revision=25083

1 files changed, 29 insertions, 14 deletions

diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 87e6433167..fdf59a5c6f 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -218,6 +218,7 @@ validate (FilterRule *fr)
 						 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
 						 "%s", _("You must name this filter."));
 		
+		gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
 		gtk_dialog_run ((GtkDialog *) dialog);
 		gtk_widget_destroy (dialog);
 		
@@ -735,7 +736,7 @@ static GtkWidget *
 get_widget (FilterRule *fr, struct _RuleContext *f)
 {
 	GtkWidget *hbox, *vbox, *parts, *inframe;
-	GtkWidget *add, *frame, *label, *name, *w;
+	GtkWidget *add, *label, *name, *w;
 	GtkWidget *omenu, *menu, *item;
 	GtkWidget *scrolledwindow;
 	GtkObject *hadj, *vadj;
@@ -746,9 +747,9 @@ get_widget (FilterRule *fr, struct _RuleContext *f)
 	
 	/* this stuff should probably be a table, but the
 	   rule parts need to be a vbox */
-	vbox = gtk_vbox_new (FALSE, 3);
-	
-	label = gtk_label_new (_("Rule name: "));
+	vbox = gtk_vbox_new (FALSE, 6);
+
+	label = gtk_label_new (_("Rule name:"));
 	name = gtk_entry_new ();
 	
 	if (!fr->name) {
@@ -763,16 +764,34 @@ get_widget (FilterRule *fr, struct _RuleContext *f)
 	/* evil kludgy hack because gtk sucks */
 	g_signal_connect (name, "realize", G_CALLBACK (grab_focus), name);
 	
-	hbox = gtk_hbox_new (FALSE, 3);
+	hbox = gtk_hbox_new (FALSE, 12);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (hbox), name, TRUE, TRUE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 	g_signal_connect (name, "changed", G_CALLBACK (name_changed), fr);
-	
-	frame = gtk_frame_new (_("If"));
-	inframe = gtk_vbox_new (FALSE, 3);
-	gtk_container_add (GTK_CONTAINER (frame), inframe);
-	gtk_container_set_border_width (GTK_CONTAINER (inframe), 6);
+	gtk_widget_show (label);
+	gtk_widget_show (hbox);
+
+	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 (_("<b>If</b>"));
+	gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
+	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+	gtk_box_pack_start (GTK_BOX (hbox), 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);
+
+	inframe = gtk_vbox_new (FALSE, 6);
+	gtk_box_pack_start (GTK_BOX (hbox), inframe, TRUE, TRUE, 0);
 	
 	/* this is the parts table, it should probably be inside a scrolling list */
 	rows = g_list_length (fr->parts);
@@ -836,10 +855,6 @@ get_widget (FilterRule *fr, struct _RuleContext *f)
 	
 	gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, TRUE, TRUE, 3);
 	
-	/*gtk_box_pack_start (GTK_BOX (inframe), parts, FALSE, FALSE, 3); */
-	
-	gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
-	
 	gtk_widget_show_all (vbox);
 	
 	return vbox;