A bunch of small GUI fixes for the filter editor.

svn path=/trunk/; revision=4866

9 files changed, 51 insertions, 16 deletions

diff --git a/filter/ChangeLog b/filter/ChangeLog
index fff445dcf6..39ff8bf6f7 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,31 @@
+2000-08-14  Ettore Perazzoli  <ettore@helixcode.com>
+
+	* vfolder-editor.c (rule_add): Add translation marks and use stock
+	buttons.
+	(rule_edit): Likewise.
+
+	* score-editor.c (rule_add): Add translation marks and use stock
+	buttons.
+	(rule_edit): Likewise.
+
+	* rule-context.c (rule_context_add_rule_gui): Add translation
+	marks and use stock buttons.
+
+	* filter-part.c (main): Add translation marks and use
+	stock buttons.
+
+	* filter-folder.c (button_clicked): Add translation marks and use
+	stock buttons.
+
+	* filter-editor.c (rule_add): Add translation marks and use stock
+	buttons.
+	(rule_edit): Likewise.
+
+	* filter-rule.c (get_widget): Add translation marks.
+
+	* filter-filter.c (get_widget): Add translation marks.  Add
+	padding to make it look like the buttons in `filter-rule.c'.
+
 2000-08-17  Peter Williams  <peterw@helixcode.com>
 
 	Implement filtering on demand.
diff --git a/filter/filter-editor.c b/filter/filter-editor.c
index 76fe9df704..9f4a0e1872 100644
--- a/filter/filter-editor.c
+++ b/filter/filter-editor.c
@@ -153,7 +153,7 @@ static void rule_add(GtkWidget *widget, struct _editor_data *data)
 	filter_filter_add_action(rule, filter_part_clone(part));
 
 	w = filter_rule_get_widget((FilterRule *)rule, data->f);
-	gd = (GnomeDialog *)gnome_dialog_new("Add Rule", "Ok", "Cancel", NULL);
+	gd = (GnomeDialog *)gnome_dialog_new(_("Add Rule"), GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL);
 	gtk_box_pack_start((GtkBox *)gd->vbox, w, FALSE, TRUE, 0);
 	gtk_widget_show((GtkWidget *)gd);
 	result = gnome_dialog_run_and_close(gd);
@@ -185,8 +185,9 @@ static void rule_edit(GtkWidget *widget, struct _editor_data *data)
 	d(printf("edit rule\n"));
 	rule = data->current;
 	w = filter_rule_get_widget(rule, data->f);
-	gd = (GnomeDialog *)gnome_dialog_new("Edit Rule", GNOME_STOCK_BUTTON_OK, 
-					     GNOME_STOCK_BUTTON_CANCEL, NULL);
+	gd = (GnomeDialog *)gnome_dialog_new(_("Edit Rule"),
+					     GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL,
+					     NULL);
 	gtk_box_pack_start((GtkBox *)gd->vbox, w, FALSE, TRUE, 0);
 	gtk_widget_show((GtkWidget *)gd);
 	result = gnome_dialog_run_and_close(gd);
diff --git a/filter/filter-filter.c b/filter/filter-filter.c
index db974ef029..b0699ce827 100644
--- a/filter/filter-filter.c
+++ b/filter/filter-filter.c
@@ -394,12 +394,12 @@ static GtkWidget *get_widget(FilterRule *fr, struct _RuleContext *f)
 	gtk_box_pack_start((GtkBox *)inframe, (GtkWidget *)parts, FALSE, FALSE, 3);
 	
 	hbox = (GtkHBox *)gtk_hbox_new(FALSE, 3);
-	w = gtk_button_new_with_label("Less");
+	w = gtk_button_new_with_label(_("Less"));
 	gtk_signal_connect((GtkObject *)w, "clicked", less_parts, data);
-	gtk_box_pack_end((GtkBox *)hbox, (GtkWidget *)w, FALSE, FALSE, 0);
-	w = gtk_button_new_with_label("More");
+	gtk_box_pack_end((GtkBox *)hbox, (GtkWidget *)w, FALSE, FALSE, 3);
+	w = gtk_button_new_with_label(_("More"));
 	gtk_signal_connect((GtkObject *)w, "clicked", more_parts, data);
-	gtk_box_pack_end((GtkBox *)hbox, (GtkWidget *)w, FALSE, FALSE, 0);
+	gtk_box_pack_end((GtkBox *)hbox, (GtkWidget *)w, FALSE, FALSE, 3);
 	gtk_box_pack_start((GtkBox *)inframe, (GtkWidget *)hbox, FALSE, FALSE, 3);
 
 	gtk_widget_show_all((GtkWidget *)frame);
diff --git a/filter/filter-folder.c b/filter/filter-folder.c
index 85363f7caa..60212086ee 100644
--- a/filter/filter-folder.c
+++ b/filter/filter-folder.c
@@ -202,7 +202,9 @@ static void button_clicked(GtkButton *button, FilterFolder *ff)
 	GtkEntry *entry;
 	char *uri, *str;
 
-	gd = (GnomeDialog *)gnome_dialog_new("Enter folder URI", "Ok", "Cancel", 0);
+	gd = (GnomeDialog *)gnome_dialog_new(_("Enter folder URI"),
+					     GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL,
+					     NULL);
 	entry = (GtkEntry *)gtk_entry_new();
 	if (ff->uri) {
 		gtk_entry_set_text(entry, ff->uri);
diff --git a/filter/filter-part.c b/filter/filter-part.c
index b38cc8e20f..31394b63fd 100644
--- a/filter/filter-part.c
+++ b/filter/filter-part.c
@@ -417,7 +417,7 @@ int main(int argc, char **argv)
 
 	w = filter_part_get_widget(ff);
 
-	gd = (GnomeDialog *)gnome_dialog_new("Test", "Ok", NULL);
+	gd = (GnomeDialog *)gnome_dialog_new(_("Test"), GNOME_STOCK_BUTTON_OK, NULL);
 	gtk_box_pack_start((GtkBox *)gd->vbox, w, FALSE, TRUE, 0);
 	gtk_widget_show((GtkWidget *)gd);
 
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 58a2d76518..39012b9e54 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -531,10 +531,10 @@ static GtkWidget *get_widget(FilterRule *fr, struct _RuleContext *f)
 	gtk_box_pack_start((GtkBox *)inframe, (GtkWidget *)parts, FALSE, FALSE, 3);
 
 	hbox = (GtkHBox *)gtk_hbox_new(FALSE, 3);
-	w = gtk_button_new_with_label("Less");
+	w = gtk_button_new_with_label(_("Less"));
 	gtk_signal_connect((GtkObject *)w, "clicked", less_parts, data);
 	gtk_box_pack_end((GtkBox *)hbox, (GtkWidget *)w, FALSE, FALSE, 3);
-	w = gtk_button_new_with_label("More");
+	w = gtk_button_new_with_label(_("More"));
 	gtk_signal_connect((GtkObject *)w, "clicked", more_parts, data);
 	gtk_box_pack_end((GtkBox *)hbox, (GtkWidget *)w, FALSE, FALSE, 3);
 	gtk_box_pack_start((GtkBox *)inframe, (GtkWidget *)hbox, FALSE, FALSE, 3);
diff --git a/filter/rule-context.c b/filter/rule-context.c
index 8114d34197..653627a550 100644
--- a/filter/rule-context.c
+++ b/filter/rule-context.c
@@ -381,7 +381,7 @@ void		rule_context_add_rule_gui(RuleContext *f, FilterRule *rule, const char *ti
 	GnomeDialog *gd;
 
 	w = filter_rule_get_widget(rule, f);
-	gd = (GnomeDialog *)gnome_dialog_new(title, "Ok", "Cancel", NULL);
+	gd = (GnomeDialog *)gnome_dialog_new(title, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL);
 	gtk_box_pack_start((GtkBox *)gd->vbox, w, FALSE, TRUE, 0);
 	gtk_widget_show((GtkWidget *)gd);
 	gtk_object_set_data_full((GtkObject *)gd, "rule", rule, (GtkDestroyNotify)gtk_object_unref);
diff --git a/filter/score-editor.c b/filter/score-editor.c
index 20c5ba78de..6598cd9e33 100644
--- a/filter/score-editor.c
+++ b/filter/score-editor.c
@@ -123,7 +123,9 @@ static void rule_add(GtkWidget *widget, struct _editor_data *data)
 	filter_rule_add_part((FilterRule *)rule, filter_part_clone(part));
 
 	w = filter_rule_get_widget((FilterRule *)rule, data->f);
-	gd = (GnomeDialog *)gnome_dialog_new("Add Rule", "Ok", "Cancel", NULL);
+	gd = (GnomeDialog *)gnome_dialog_new(_("Add Rule"),
+					     GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL,
+					     NULL);
 	gtk_box_pack_start((GtkBox *)gd->vbox, w, FALSE, TRUE, 0);
 	gtk_widget_show((GtkWidget *)gd);
 	result = gnome_dialog_run_and_close(gd);
@@ -155,7 +157,7 @@ static void rule_edit(GtkWidget *widget, struct _editor_data *data)
 	d(printf("edit rule\n"));
 	rule = data->current;
 	w = filter_rule_get_widget(rule, data->f);
-	gd = (GnomeDialog *)gnome_dialog_new("Edit Score Rule", "Ok", NULL);
+	gd = (GnomeDialog *)gnome_dialog_new(_("Edit Score Rule"), GNOME_STOCK_BUTTON_OK, NULL);
 	gtk_box_pack_start((GtkBox *)gd->vbox, w, FALSE, TRUE, 0);
 	gtk_widget_show((GtkWidget *)gd);
 	result = gnome_dialog_run_and_close(gd);
diff --git a/filter/vfolder-editor.c b/filter/vfolder-editor.c
index 0d083c7c4f..c5bf378625 100644
--- a/filter/vfolder-editor.c
+++ b/filter/vfolder-editor.c
@@ -149,7 +149,9 @@ static void rule_add(GtkWidget *widget, struct _editor_data *data)
 	filter_rule_add_part(rule, filter_part_clone(part));
 
 	w = filter_rule_get_widget(rule, data->f);
-	gd = (GnomeDialog *)gnome_dialog_new("Add Rule", "Ok", "Cancel", NULL);
+	gd = (GnomeDialog *)gnome_dialog_new(_("Add Rule"),
+					     GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL,
+					     NULL);
 	gtk_box_pack_start((GtkBox *)gd->vbox, w, FALSE, TRUE, 0);
 	gtk_widget_show((GtkWidget *)gd);
 	result = gnome_dialog_run_and_close(gd);
@@ -181,7 +183,7 @@ static void rule_edit(GtkWidget *widget, struct _editor_data *data)
 	d(printf("edit rule\n"));
 	rule = data->current;
 	w = filter_rule_get_widget(rule, data->f);
-	gd = (GnomeDialog *)gnome_dialog_new("Edit VFolder Rule", "Ok", NULL);
+	gd = (GnomeDialog *)gnome_dialog_new(_("Edit VFolder Rule"), GNOME_STOCK_BUTTON_OK, NULL);
 	gtk_box_pack_start((GtkBox *)gd->vbox, w, FALSE, TRUE, 0);
 	gtk_widget_show((GtkWidget *)gd);
 	result = gnome_dialog_run_and_close(gd);