Modified to use more intuitive naming

2000-09-18  Jeffrey Stedfast  <fejj@helixcode.com>

	* filtertypes.xml: Modified to use more intuitive naming

	* score-rule.c (xml_decode): Make sure the score is within our
	range
	(get_widget): Changed range to -3 to +3

	* filter-score.c (get_widget): Changed range to -3 to +3
	(xml_decode): Make sure the score is within our range

	* filter-rule.c (get_widget): Rearranged widgets.

	* filter-filter.c (get_widget): Rearranged widgets.

	* filter-editor.c (filter_editor_construct): Updated to allow for
	double-clicking on a rule to edit it.

svn path=/trunk/; revision=5492

1 files changed, 144 insertions, 121 deletions

diff --git a/filter/filter-editor.c b/filter/filter-editor.c
index c09160ee3f..cb3e879f04 100644
--- a/filter/filter-editor.c
+++ b/filter/filter-editor.c
@@ -30,9 +30,9 @@
 #define d(x)
 
 #if 0
-static void filter_editor_class_init	(FilterEditorClass *class);
-static void filter_editor_init	(FilterEditor *gspaper);
-static void filter_editor_finalise	(GtkObject *obj);
+static void filter_editor_class_init (FilterEditorClass *class);
+static void filter_editor_init (FilterEditor *gspaper);
+static void filter_editor_finalise (GtkObject *obj);
 
 #define _PRIVATE(x) (((FilterEditor *)(x))->priv)
 
@@ -92,7 +92,7 @@ filter_editor_init (FilterEditor *o)
 }
 
 static void
-filter_editor_finalise(GtkObject *obj)
+filter_editor_finalise (GtkObject *obj)
 {
 	FilterEditor *o = (FilterEditor *)obj;
 
@@ -107,7 +107,7 @@ filter_editor_finalise(GtkObject *obj)
  * Return value: A new #FilterEditor object.
  **/
 FilterEditor *
-filter_editor_new(void)
+filter_editor_new (void)
 {
 	FilterEditor *o = (FilterEditor *)gtk_type_new(filter_editor_get_type ());
 	return o;
@@ -133,72 +133,80 @@ struct _editor_data {
 	enum _filter_source_t current_source;
 };
 
-static void set_sensitive(struct _editor_data *data);
+static void set_sensitive (struct _editor_data *data);
 
-static void rule_add(GtkWidget *widget, struct _editor_data *data)
+static void
+rule_add (GtkWidget *widget, struct _editor_data *data)
 {
 	FilterFilter *rule;
 	int result;
-	GnomeDialog *gd;
+	GtkWidget *gd;
 	GtkWidget *w;
 	FilterPart *part;
-
-	d(printf("add rule\n"));
+	
+	d(printf ("add rule\n"));
 	/* create a new rule with 1 match and 1 action */
-	rule = filter_filter_new();
+	rule = filter_filter_new ();
 	((FilterRule *)rule)->source = data->current_source;
-
-	part = rule_context_next_part(data->f, NULL);
-	filter_rule_add_part((FilterRule *)rule, filter_part_clone(part));
-	part = filter_context_next_action((FilterContext *)data->f, NULL);
-	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"), 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);
+	
+	part = rule_context_next_part (data->f, NULL);
+	filter_rule_add_part ((FilterRule *)rule, filter_part_clone (part));
+	part = filter_context_next_action ((FilterContext *)data->f, NULL);
+	filter_filter_add_action (rule, filter_part_clone (part));
+	
+	w = filter_rule_get_widget ((FilterRule *)rule, data->f);
+	gd = gnome_dialog_new (_("Add Rule"), GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, NULL);
+	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, FALSE, TRUE, 0);
+	gtk_widget_show (gd);
+	
+	result = gnome_dialog_run_and_close (GNOME_DIALOG (gd));
+	
 	if (result == 0) {
 		GtkListItem *item;
 		GList *l = NULL;
-		gchar *s = e_utf8_to_gtk_string ((GtkWidget *) data->list, ((FilterRule *)rule)->name);
-		item = (GtkListItem *)gtk_list_item_new_with_label (s);
+		gchar *s = e_utf8_to_gtk_string (GTK_WIDGET (data->list), ((FilterRule *)rule)->name);
+		
+		item = (GtkListItem *) gtk_list_item_new_with_label (s);
 		g_free (s);
-		gtk_object_set_data((GtkObject *)item, "rule", rule);
-		gtk_widget_show((GtkWidget *)item);
-		l = g_list_append(l, item);
-		gtk_list_append_items(data->list, l);
-		gtk_list_select_child(data->list, (GtkWidget *)item);
+		
+		gtk_object_set_data (GTK_OBJECT (item), "rule", rule);
+		gtk_widget_show (GTK_WIDGET (item));
+		
+		l = g_list_append (l, item);
+		gtk_list_append_items (data->list, l);
+		gtk_list_select_child (data->list, GTK_WIDGET (item));
+		
 		data->current = (FilterRule *)rule;
-		rule_context_add_rule(data->f, (FilterRule *)rule);
-		set_sensitive(data);
+		rule_context_add_rule (data->f, (FilterRule *)rule);
+		set_sensitive (data);
 	} else {
-		gtk_object_unref((GtkObject *)rule);
+		gtk_object_unref (GTK_OBJECT (rule));
 	}
 }
 
-static void rule_edit(GtkWidget *widget, struct _editor_data *data)
+static void
+rule_edit (GtkWidget *widget, struct _editor_data *data)
 {
 	GtkWidget *w;
 	int result;
-	GnomeDialog *gd;
+	GtkWidget *gd;
 	FilterRule *rule;
 	int pos;
-
-	d(printf("edit rule\n"));
+	
+	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);
-	gtk_box_pack_start((GtkBox *)gd->vbox, w, FALSE, TRUE, 0);
-	gtk_widget_show((GtkWidget *)gd);
-	result = gnome_dialog_run_and_close(gd);
-
+	w = filter_rule_get_widget (rule, data->f);
+	gd = gnome_dialog_new (_("Edit Rule"),
+			       GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL,
+			       NULL);
+	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, FALSE, TRUE, 0);
+	gtk_widget_show (gd);
+	result = gnome_dialog_run_and_close (GNOME_DIALOG (gd));
+	
 	if (result == 0) {
 		pos = rule_context_get_rank_rule_with_source (data->f, data->current, data->current_source);
 		if (pos != -1) {
-			GtkListItem *item = g_list_nth_data(data->list->children, pos);
+			GtkListItem *item = g_list_nth_data (data->list->children, pos);
 			gchar *s = e_utf8_to_gtk_string ((GtkWidget *) item, data->current->name);
 			gtk_label_set_text((GtkLabel *)(((GtkBin *)item)->child), s);
 			g_free (s);
@@ -206,7 +214,8 @@ static void rule_edit(GtkWidget *widget, struct _editor_data *data)
 	 }
 }
 
-static void rule_delete(GtkWidget *widget, struct _editor_data *data)
+static void
+rule_delete (GtkWidget *widget, struct _editor_data *data)
 {
 	int pos;
 	GList *l;
@@ -215,53 +224,56 @@ static void rule_delete(GtkWidget *widget, struct _editor_data *data)
 	d(printf("ddelete rule\n"));
 	pos = rule_context_get_rank_rule_with_source (data->f, data->current, data->current_source);
 	if (pos != -1) {
-		rule_context_remove_rule(data->f, data->current);
-
-		item = g_list_nth_data(data->list->children, pos);
-		l = g_list_append(NULL, item);
-		gtk_list_remove_items(data->list, l);
-		g_list_free(l);
-
-		gtk_object_unref((GtkObject *)data->current);
+		rule_context_remove_rule (data->f, data->current);
+		
+		item = g_list_nth_data (data->list->children, pos);
+		l = g_list_append (NULL, item);
+		gtk_list_remove_items (data->list, l);
+		g_list_free (l);
+		
+		gtk_object_unref (GTK_OBJECT (data->current));
 		data->current = NULL;
 	}
-	set_sensitive(data);
+	set_sensitive (data);
 }
 
-static void rule_move(struct _editor_data *data, int from, int to)
+static void
+rule_move (struct _editor_data *data, int from, int to)
 {
 	GList *l;
 	GtkListItem *item;
-
+	
 	d(printf("moving %d to %d\n", from, to));
-	rule_context_rank_rule(data->f, data->current, to);
+	rule_context_rank_rule (data->f, data->current, to);
 	
-	item = g_list_nth_data(data->list->children, from);
-	l = g_list_append(NULL, item);
-	gtk_list_remove_items_no_unref(data->list, l);
-	gtk_list_insert_items(data->list, l, to);			      
-	gtk_list_select_child(data->list, (GtkWidget *)item);
-	set_sensitive(data);
+	item = g_list_nth_data (data->list->children, from);
+	l = g_list_append (NULL, item);
+	gtk_list_remove_items_no_unref (data->list, l);
+	gtk_list_insert_items (data->list, l, to);			      
+	gtk_list_select_child (data->list, GTK_WIDGET (item));
+	set_sensitive (data);
 }
 
-static void rule_up(GtkWidget *widget, struct _editor_data *data)
+static void
+rule_up (GtkWidget *widget, struct _editor_data *data)
 {
 	int pos;
-
+	
 	d(printf("up rule\n"));
-	pos = rule_context_get_rank_rule_with_source(data->f, data->current, data->current_source);
-	if (pos>0) {
-		rule_move(data, pos, pos-1);
+	pos = rule_context_get_rank_rule_with_source (data->f, data->current, data->current_source);
+	if (pos > 0) {
+		rule_move (data, pos, pos-1);
 	}
 }
 
-static void rule_down(GtkWidget *widget, struct _editor_data *data)
+static void
+rule_down (GtkWidget *widget, struct _editor_data *data)
 {
 	int pos;
-
-	d(printf("down rule\n"));
-	pos = rule_context_get_rank_rule_with_source(data->f, data->current, data->current_source);
-	rule_move(data, pos, pos+1);
+	
+	d(printf ("down rule\n"));
+	pos = rule_context_get_rank_rule_with_source (data->f, data->current, data->current_source);
+	rule_move (data, pos, pos+1);
 }
 
 static struct {
@@ -276,33 +288,42 @@ static struct {
 };
 
 static void
-set_sensitive(struct _editor_data *data)
+set_sensitive (struct _editor_data *data)
 {
 	FilterRule *rule = NULL;
-	int index=-1, count=0;
-
-	while ((rule = rule_context_next_rule(data->f, rule))) {
+	int index = -1, count = 0;
+	
+	while ((rule = rule_context_next_rule (data->f, rule))) {
 		if (rule == data->current)
 			index=count;
 		count++;
 	}
-	d(printf("index = %d count=%d\n", index, count));
+	d(printf ("index = %d count=%d\n", index, count));
 	count--;
-	gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_EDIT], index != -1);
-	gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_DELETE], index != -1);
-	gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_UP], index > 0);
-	gtk_widget_set_sensitive((GtkWidget *)data->buttons[BUTTON_DOWN], index >=0 && index<count);
+	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_EDIT]), index != -1);
+	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_DELETE]), index != -1);
+	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_UP]), index > 0);
+	gtk_widget_set_sensitive (GTK_WIDGET (data->buttons[BUTTON_DOWN]), index >= 0 && index < count);
 }
 
 static void
-select_rule(GtkWidget *w, GtkWidget *child, struct _editor_data *data)
+select_rule (GtkWidget *w, GtkWidget *child, struct _editor_data *data)
 {
-	data->current = gtk_object_get_data((GtkObject *)child, "rule");
+	data->current = gtk_object_get_data (GTK_OBJECT (child), "rule");
+	
 	if (data->current)
-		d(printf("seledct rule: %s\n", data->current->name));
+		d(printf ("seledct rule: %s\n", data->current->name));
 	else
-		d(printf("bad data?\n"));
-	set_sensitive(data);
+		d(printf ("bad data?\n"));
+	
+	set_sensitive (data);
+}
+
+static void
+double_click (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
+{
+	if (event->type == GDK_2BUTTON_PRESS)
+		rule_edit (widget, user_data);
 }
 
 /* FIXME: we need a way to change a rule from one source type
@@ -315,83 +336,85 @@ select_source (GtkMenuItem *mi, struct _editor_data *data)
 	FilterRule *rule = NULL;
 	GList *newitems = NULL;
 	enum _filter_source_t source;
-
+	
 	source = (enum _filter_source_t) GPOINTER_TO_INT (
 		gtk_object_get_data (GTK_OBJECT (mi), "number"));
-
+	
 	gtk_list_clear_items (GTK_LIST (data->list), 0, -1);
-
-	d(printf("Checking for rules that are of type %d\n", source));
+	
+	d(printf ("Checking for rules that are of type %d\n", source));
 	while ((rule = rule_context_next_rule (data->f, rule)) != NULL) {
 		GtkWidget *item;
 		gchar *s;
-
+		
 		if (rule->source != source) {
-			d(printf("   skipping %s: %d != %d\n", rule->name, rule->source, source));
+			d(printf ("   skipping %s: %d != %d\n", rule->name, rule->source, source));
 			continue;
 		}
-
-		d(printf("   hit %s (%d)\n", rule->name, source));
-		s = e_utf8_to_gtk_string ((GtkWidget *) data->list, rule->name);
+		
+		d(printf ("   hit %s (%d)\n", rule->name, source));
+		s = e_utf8_to_gtk_string (GTK_WIDGET (data->list), rule->name);
 		item = gtk_list_item_new_with_label (s);
 		g_free (s);
 		gtk_object_set_data (GTK_OBJECT (item), "rule", rule);
 		gtk_widget_show (GTK_WIDGET (item));
 		newitems = g_list_append (newitems, item);
 	}
-
+	
 	gtk_list_append_items (data->list, newitems);
 	data->current_source = source;
 	data->current = NULL;
 	set_sensitive (data);
 }
 
-GtkWidget	*filter_editor_construct	(struct _FilterContext *f)
+GtkWidget *
+filter_editor_construct (struct _FilterContext *f)
 {
 	GladeXML *gui;
 	GtkWidget *d, *w, *b, *firstitem = NULL;
 	GList *l;
 	struct _editor_data *data;
 	int i;
-
-	g_assert(IS_FILTER_CONTEXT(f));
-
-	data = g_malloc0(sizeof(*data));
+	
+	g_assert (IS_FILTER_CONTEXT (f));
+	
+	data = g_malloc0 (sizeof (*data));
 	data->f = (RuleContext *)f;
-
-	gui = glade_xml_new(FILTER_GLADEDIR "/filter.glade", "edit_filter");
+	
+	gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "edit_filter");
         d = glade_xml_get_widget (gui, "edit_filter");
-	gtk_object_set_data_full((GtkObject *)d, "data", data, g_free);
-
-	gtk_window_set_title((GtkWindow *)d, "Edit Filters");
-	for (i=0;i<BUTTON_LAST;i++) {
+	gtk_object_set_data_full (GTK_OBJECT (d), "data", data, g_free);
+	
+	gtk_window_set_title (GTK_WINDOW (d), "Edit Filters");
+	for (i = 0; i < BUTTON_LAST; i++) {
 		data->buttons[i] = (GtkButton *)w = glade_xml_get_widget (gui, edit_buttons[i].name);
-		gtk_signal_connect((GtkObject *)w, "clicked", edit_buttons[i].func, data);
+		gtk_signal_connect (GTK_OBJECT (w), "clicked", edit_buttons[i].func, data);
 	}
-
+	
         w = glade_xml_get_widget (gui, "filter_source");
-	l = GTK_MENU_SHELL(GTK_OPTION_MENU(w)->menu)->children;
+	l = GTK_MENU_SHELL (GTK_OPTION_MENU (w)->menu)->children;
 	i = 0;
 	while (l) {
 		b = GTK_WIDGET (l->data);
-
+		
 		if (i == 0)
 			firstitem = b;
-
+		
 		/* make sure that the glade is in sync with enum _filter_source_t! */
 		gtk_object_set_data (GTK_OBJECT (b), "number", GINT_TO_POINTER (i));
 		gtk_signal_connect (GTK_OBJECT (b), "activate", select_source, data);
-
+		
 		i++;
 		l = l->next;
 	}
-
+	
         w = glade_xml_get_widget (gui, "rule_list");
-	data->list = (GtkList *)w;
-	gtk_signal_connect((GtkObject *)w, "select_child", select_rule, data);
+	data->list = GTK_LIST (w);
+	gtk_signal_connect (GTK_OBJECT (w), "select_child", select_rule, data);
+	gtk_signal_connect (GTK_OBJECT (w), "button_press_event", double_click, data);
 	select_source (GTK_MENU_ITEM (firstitem), data);
-
-	gtk_object_unref((GtkObject *)gui);
-
+	
+	gtk_object_unref (GTK_OBJECT (gui));
+	
 	return d;
 }