Changed the edit_filter to be a standalone window rather than a widget, so

2001-03-15  Not Zed  <NotZed@Ximian.com>

        * filter.glade: Changed the edit_filter to be a standalone window
        rather than a widget, so we can get the rule editor part out
        separately.  Same for vfolder editor, and new score, and basic rule
        editors.

        * score-editor.c (score_editor_new): Turned back on object
        stuff, subclass rule-editor, and removed most of the code.

        * filter-editor.c (filter_editor_new): Turned into an object,
        subclass rule-editor, removed most of the code.  Now we accept the
        source list during create, and plug that into the glade.

        * vfolder-editor.c (vfolder_editor_new): Turned back on object
        stuff, subclass rule-editor, and removed most of the code.

        * Makefile.am (libfilter_la_SOURCES): Added rule-editor.[ch].

        * filter-filter.c (validate): inherit the validate function and
        also validate the actions part of a filterfilter.

        * filter-rule.c (filter_rule_validate): New method so that filter
        rules can validate themselves.
        (validate): Default implementation, validates base rules.

        * rule-editor.h: New generic rule editor, to be used for filter
        editor/vfolder editor/score editor/saved searches editor.

svn path=/trunk/; revision=8729

1 files changed, 53 insertions, 368 deletions

diff --git a/filter/filter-editor.c b/filter/filter-editor.c
index 1c6c46291b..66891e0c2c 100644
--- a/filter/filter-editor.c
+++ b/filter/filter-editor.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000, 2001 Ximian Inc.
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *           Jeffrey Stedfast <fejj@helixcode.com>
@@ -30,7 +30,8 @@
 
 #define d(x)
 
-#if 0
+static FilterRule * create_rule(RuleEditor *re);
+
 static void filter_editor_class_init (FilterEditorClass *class);
 static void filter_editor_init (FilterEditor *gspaper);
 static void filter_editor_finalise (GtkObject *obj);
@@ -64,7 +65,7 @@ filter_editor_get_type (void)
 			(GtkArgGetFunc)NULL
 		};
 		
-		type = gtk_type_unique (gnome_dialog_get_type (), &type_info);
+		type = gtk_type_unique (rule_editor_get_type (), &type_info);
 	}
 	
 	return type;
@@ -73,14 +74,16 @@ filter_editor_get_type (void)
 static void
 filter_editor_class_init (FilterEditorClass *class)
 {
-	GtkObjectClass *object_class;
-	
-	object_class = (GtkObjectClass *)class;
-	parent_class = gtk_type_class (gnome_dialog_get_type ());
+	GtkObjectClass *object_class = (GtkObjectClass *)class;
+	RuleEditorClass *re_class = (RuleEditorClass *)class;
+
+	parent_class = gtk_type_class(gnome_dialog_get_type ());
 	
 	object_class->finalize = filter_editor_finalise;
+
 	/* override methods */
-	
+	re_class->create_rule = create_rule;
+
 	/* signals */
 	
 	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
@@ -97,6 +100,8 @@ filter_editor_finalise (GtkObject *obj)
 {
 	FilterEditor *o = (FilterEditor *)obj;
 
+	g_free(o->priv);
+
         ((GtkObjectClass *)(parent_class))->finalize(obj);
 }
 
@@ -108,388 +113,68 @@ filter_editor_finalise (GtkObject *obj)
  * Return value: A new #FilterEditor object.
  **/
 FilterEditor *
-filter_editor_new (void)
+filter_editor_new(FilterContext *f, const char **source_names)
 {
 	FilterEditor *o = (FilterEditor *)gtk_type_new (filter_editor_get_type ());
-	return o;
-}
-
-#endif
-
-
-enum {
-	BUTTON_ADD,
-	BUTTON_EDIT,
-	BUTTON_DELETE,
-	BUTTON_UP,
-	BUTTON_DOWN,
-	BUTTON_LAST
-};
-
-struct _editor_data {
-	RuleContext *f;
-	FilterRule *current;
-	GtkList *list;
-	GtkButton *buttons[BUTTON_LAST];
-	char *current_source;
-};
+	GladeXML *gui;
+	GtkWidget *w;
 
-static void set_sensitive (struct _editor_data *data);
+	gui = glade_xml_new(FILTER_GLADEDIR "/filter.glade", "rule_editor");
+	filter_editor_construct(o, f, gui, source_names);
 
-static void
-rule_add (GtkWidget *widget, struct _editor_data *data)
-{
-	FilterFilter *rule;
-	int result;
-	GtkWidget *gd;
-	GtkWidget *w;
-	FilterPart *part;
-	gboolean done = FALSE;
-	
-	d(printf ("add rule\n"));
-	/* create a new rule with 1 match and 1 action */
-	rule = filter_filter_new ();
-	filter_rule_set_source ((FilterRule *)rule, 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 = gnome_dialog_new (_("Add Filter Rule"),
-			       GNOME_STOCK_BUTTON_OK,
-			       GNOME_STOCK_BUTTON_CANCEL,
-			       NULL);
-	gtk_window_set_policy (GTK_WINDOW (gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, TRUE, TRUE, 0);
-	
-	gtk_widget_show (gd);
-	
-	while (!done) {
-		result = gnome_dialog_run (GNOME_DIALOG (gd));
-	
-		if (result == 0) {
-			GtkWidget *item;
-			GList *parts, *l = NULL;
-			gchar *s;
-			
-			done = TRUE;
-			
-			/* validate rule parts */
-			parts = ((FilterRule *)rule)->parts;
-			while (parts && done) {
-				done = filter_part_validate ((FilterPart *) parts->data);
-				parts = parts->next;
-			}
-			
-			/* validate action parts */
-			parts = rule->actions;
-			while (parts && done) {
-				done = filter_part_validate ((FilterPart *) parts->data);
-				parts = parts->next;
-			}
-			
-			if (done) {
-				s = e_utf8_to_gtk_string (GTK_WIDGET (data->list), ((FilterRule *)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 (item);
-				
-				l = g_list_append (l, GTK_LIST_ITEM (item));
-				
-				gtk_list_append_items (data->list, l);
-				gtk_list_select_child (data->list, item);
-				
-				data->current = (FilterRule *)rule;
-				rule_context_add_rule (data->f, (FilterRule *)rule);
-				
-				set_sensitive (data);
-				gtk_widget_destroy (gd);
-			}
-		} else {
-			gtk_widget_destroy (gd);
-			gtk_object_unref (GTK_OBJECT (rule));
-			done = TRUE;
-		}
-	}
-}
+        w = glade_xml_get_widget(gui, "rule_frame");
+	gtk_frame_set_label((GtkFrame *)w, _("Filter Rules"));
 
-static void
-rule_edit (GtkWidget *widget, struct _editor_data *data)
-{
-	GtkWidget *w;
-	int result;
-	GtkWidget *gd;
-	FilterRule *rule;
-	gboolean done = FALSE;
-	int pos;
-	
-	d(printf ("edit rule\n"));
-	rule = data->current;
-	w = filter_rule_get_widget (rule, data->f);
-	gd = gnome_dialog_new (_("Edit Filter Rule"),
-			       GNOME_STOCK_BUTTON_OK,
-			       GNOME_STOCK_BUTTON_CANCEL,
-			       NULL);
-	gtk_window_set_policy (GTK_WINDOW (gd), FALSE, TRUE, FALSE);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (gd)->vbox), w, TRUE, TRUE, 0);
-	
-	gtk_widget_show (gd);
-	
-	while (!done) {
-		result = gnome_dialog_run (GNOME_DIALOG (gd));
-		
-		if (result == 0) {
-			GList *parts;
-			
-			done = TRUE;
-			
-			/* validate rule parts */
-			parts = rule->parts;
-			while (parts && done) {
-				done = filter_part_validate ((FilterPart *) parts->data);
-				parts = parts->next;
-			}
-			
-			/* validate action parts */
-			parts = ((FilterFilter *)rule)->actions;
-			while (parts && done) {
-				done = filter_part_validate ((FilterPart *) parts->data);
-				parts = parts->next;
-			}
-			
-			if (done) {
-				pos = rule_context_get_rank_rule (data->f, data->current, data->current_source);
-				if (pos != -1) {
-					GtkListItem *item = g_list_nth_data (data->list->children, pos);
-					gchar *s = e_utf8_to_gtk_string (GTK_WIDGET (item), data->current->name);
-					gtk_label_set_text (GTK_LABEL (GTK_BIN (item)->child), s);
-					g_free (s);
-				}
-				gtk_widget_destroy (gd);
-			}
-		} else {
-			gtk_widget_destroy (gd);
-			done = TRUE;
-		}
-	}
-}
+	gtk_object_unref((GtkObject *)gui);
 
-static void
-rule_delete (GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-	GList *l;
-	GtkListItem *item;
-	
-	d(printf("delete rule\n"));
-	pos = rule_context_get_rank_rule(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 (GTK_OBJECT (data->current));
-		data->current = NULL;
-	}
-	
-	set_sensitive (data);
+	return o;
 }
 
 static void
-rule_move (struct _editor_data *data, int from, int to)
+select_source (GtkMenuItem *mi, FilterEditor *fe)
 {
-	GList *l;
-	GtkListItem *item;
-	
-	d(printf("moving %d to %d\n", from, to));
-	rule_context_rank_rule (data->f, data->current, to);
+	char *source;
 	
-	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);
-}
+	source = gtk_object_get_data(GTK_OBJECT(mi), "source");
+	g_assert(source);
 
-static void
-rule_up (GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-	
-	d(printf("up rule\n"));
-	pos = rule_context_get_rank_rule (data->f, data->current, data->current_source);
-	if (pos > 0) {
-		rule_move (data, pos, pos - 1);
-	}
+	rule_editor_set_source((RuleEditor *)fe, source);
 }
 
-static void
-rule_down (GtkWidget *widget, struct _editor_data *data)
+void
+filter_editor_construct(FilterEditor *fe, FilterContext *fc, GladeXML *gui, const char **source_names)
 {
-	int pos;
-	
-	d(printf ("down rule\n"));
-	pos = rule_context_get_rank_rule (data->f, data->current, data->current_source);
-	rule_move (data, pos, pos + 1);
-}
+	GtkWidget *menu, *item, *omenu;
+	int i;
 
-static struct {
-	char *name;
-	GtkSignalFunc func;
-} edit_buttons[] = {
-	{ "rule_add", rule_add },
-	{ "rule_edit", rule_edit },
-	{ "rule_delete", rule_delete },
-	{ "rule_up", rule_up },
-	{ "rule_down", rule_down },
-};
+        omenu = glade_xml_get_widget (gui, "filter_source");
+	menu = GTK_OPTION_MENU(omenu)->menu;
+	for (i=0;source_names[i];i++) {
+		item = gtk_menu_item_new_with_label(_(source_names[i]));
+		gtk_object_set_data_full(GTK_OBJECT(item), "source", g_strdup(source_names[i]), g_free);
+		gtk_menu_append(GTK_MENU(menu), item);
+		gtk_widget_show((GtkWidget *)item);
+		gtk_signal_connect(GTK_OBJECT(item), "activate", select_source, fe);
 
-static void
-set_sensitive (struct _editor_data *data)
-{
-	FilterRule *rule = NULL;
-	int index = -1, count = 0;
-	
-	while ((rule = rule_context_next_rule (data->f, rule, data->current_source))) {
-		if (rule == data->current)
-			index = count;
-		count++;
 	}
-	
-	d(printf ("index = %d count=%d\n", index, count));
-	
-	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);
-}
+	gtk_option_menu_set_menu(GTK_OPTION_MENU(omenu), menu);
+	gtk_widget_show((GtkWidget *)omenu);
 
-static void
-select_rule (GtkWidget *w, GtkWidget *child, struct _editor_data *data)
-{
-	data->current = gtk_object_get_data (GTK_OBJECT (child), "rule");
-	
-	if (data->current)
-		d(printf ("selected rule: %s\n", data->current->name));
-	else
-		d(printf ("bad data?\n"));
-	
-	set_sensitive (data);
+	rule_editor_construct((RuleEditor *)fe, (RuleContext *)fc, gui, source_names[0]);
 }
 
-static void
-double_click (GtkWidget *widget, GdkEventButton *event, struct _editor_data *data)
+static FilterRule *
+create_rule(RuleEditor *re)
 {
-	if (data->current && event->type == GDK_2BUTTON_PRESS)
-		rule_edit (widget, data);
-}
-
-/* FIXME: we need a way to change a rule from one source type
- * to a different type. Maybe keep the selected ones? 
- */
-
-static void
-select_source (GtkMenuItem *mi, struct _editor_data *data)
-{
-	FilterRule *rule = NULL;
-	GList *newitems = NULL;
-	char *source;
-	
-	source = gtk_object_get_data (GTK_OBJECT (mi), "source");
-	
-	gtk_list_clear_items (GTK_LIST (data->list), 0, -1);
-	
-	d(printf ("Checking for rules that are of type %d\n", source));
-	while ((rule = rule_context_next_rule (data->f, rule, source)) != NULL) {
-		GtkWidget *item;
-		char *s;
-		
-		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);
-}
+	FilterRule *rule = filter_rule_new();
+	FilterPart *part;
 
-/* these strings must not be internationalised!!!! */
-static char *source_names[] = {
-	"incoming",
-	/*"demand",*/
-	"outgoing"
-};
+	/* create a rule with 1 part & 1 action in it */
+	rule = (FilterRule *)filter_filter_new();
+	part = rule_context_next_part(re->context, NULL);
+	filter_rule_add_part(rule, filter_part_clone(part));
+	part = filter_context_next_action ((FilterContext *)re->context, NULL);
+	filter_filter_add_action((FilterFilter *)rule, filter_part_clone (part));
 
-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));
-	data->f = (RuleContext *)f;
-	
-	gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "edit_filter");
-        d = glade_xml_get_widget (gui, "edit_filter");
-	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 (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;
-	i = 0;
-	while (l) {
-		b = GTK_WIDGET (l->data);
-		
-		if (i == 0)
-			firstitem = b;
-		
-		/* make sure that the glade is in sync with the source list! */
-		if (i < sizeof (source_names) / sizeof (source_names[0])) {
-			gtk_object_set_data (GTK_OBJECT (b), "source", source_names[i]);
-		} else {
-			g_warning("Glade file " FILTER_GLADEDIR "/filter.glade out of sync with editor code");
-		}
-		gtk_signal_connect (GTK_OBJECT (b), "activate", select_source, data);
-		
-		i++;
-		l = l->next;
-	}
-	
-        w = glade_xml_get_widget (gui, "rule_list");
-	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);
-	
-	set_sensitive (data);
-	
-	gtk_object_unref (GTK_OBJECT (gui));
-	
-	return d;
+	return rule;
 }