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, 31 insertions, 281 deletions

diff --git a/filter/vfolder-editor.c b/filter/vfolder-editor.c
index caa9069ac5..7251de6bf7 100644
--- a/filter/vfolder-editor.c
+++ b/filter/vfolder-editor.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 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 vfolder_editor_class_init (VfolderEditorClass *class);
 static void vfolder_editor_init	(VfolderEditor *gspaper);
 static void vfolder_editor_finalise (GtkObject *obj);
@@ -40,7 +41,7 @@ static void vfolder_editor_finalise (GtkObject *obj);
 struct _VfolderEditorPrivate {
 };
 
-static GnomeDialogClass *parent_class;
+static RuleEditorClass *parent_class;
 
 enum {
 	LAST_SIGNAL
@@ -64,7 +65,7 @@ vfolder_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 @@ vfolder_editor_get_type (void)
 static void
 vfolder_editor_class_init (VfolderEditorClass *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 (rule_editor_get_type ());
 	
 	object_class->finalize = vfolder_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 @@ vfolder_editor_finalise(GtkObject *obj)
 {
 	VfolderEditor *o = (VfolderEditor *)obj;
 
+	g_free(o->priv);
+
         ((GtkObjectClass *)(parent_class))->finalize(obj);
 }
 
@@ -108,288 +113,33 @@ vfolder_editor_finalise(GtkObject *obj)
  * Return value: A new #VfolderEditor object.
  **/
 VfolderEditor *
-vfolder_editor_new(void)
+vfolder_editor_new(VfolderContext *f)
 {
+	GladeXML *gui;
 	VfolderEditor *o = (VfolderEditor *)gtk_type_new (vfolder_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];
-};
-
-static void set_sensitive (struct _editor_data *data);
-
-static void
-rule_add (GtkWidget *widget, struct _editor_data *data)
-{
-	FilterRule *rule;
-	int result;
-	GtkWidget *gd;
 	GtkWidget *w;
-	FilterPart *part;
-	
-	d(printf ("add rule\n"));
-	/* create a new rule with 1 match and 1 action */
-	rule = (FilterRule *) vfolder_rule_new ();
-	
-	part = rule_context_next_part (data->f, NULL);
-	filter_rule_add_part (rule, filter_part_clone (part));
-	
-	w = filter_rule_get_widget (rule, data->f);
-	gd = gnome_dialog_new (_("Add VFolder 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);
-	
-	result = gnome_dialog_run_and_close (GNOME_DIALOG (gd));
-	
-	if (result == 0) {
-		GtkWidget *item;
-		GList *l = NULL;
-		gchar *s;
-		
-		s = e_utf8_to_gtk_string (GTK_WIDGET (data->list), rule->name);
-		item = gtk_list_item_new_with_label (rule->name);
-		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 = rule;
-		rule_context_add_rule (data->f, rule);
-		
-		set_sensitive (data);
-	} else {
-		gtk_object_unref (GTK_OBJECT (rule));
-	}
-}
 
-static void
-rule_edit (GtkWidget *widget, struct _editor_data *data)
-{
-	GtkWidget *w;
-	int result;
-	GtkWidget *gd;
-	FilterRule *rule;
-	int pos;
-	
-	d(printf ("edit rule\n"));
-	rule = data->current;
-	w = filter_rule_get_widget (rule, data->f);
-	gd = gnome_dialog_new (_("Edit VFolder 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);
-	
-	result = gnome_dialog_run_and_close (GNOME_DIALOG (gd));
-	
-	if (result == 0) {
-		pos = rule_context_get_rank_rule (data->f, data->current, NULL);
-		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);
-		}
-	 }
-}
+	gui = glade_xml_new(FILTER_GLADEDIR "/filter.glade", "rule_editor");
+	rule_editor_construct((RuleEditor *)o, (RuleContext *)f, gui, NULL);
 
-static void
-rule_delete (GtkWidget *widget, struct _editor_data *data)
-{
-	int pos, len;
-	GList *l;
-	GtkListItem *item;
-	
-	d(printf ("delete rule\n"));
-	pos = rule_context_get_rank_rule (data->f, data->current, NULL);
-	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;
-		
-		/* select the item in the same position or 1-up */
-		len = g_list_length (data->list->children);
-		pos = pos >= len ? len - 1: pos;
-		gtk_list_select_item (data->list, pos);
-	}
-	
-	set_sensitive (data);
-}
+        w = glade_xml_get_widget(gui, "rule_frame");
+	gtk_frame_set_label((GtkFrame *)w, _("Virtual Folders"));
 
-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);
-	
-	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)
-{
-	int pos;
-	
-	d(printf ("up rule\n"));
-	pos = rule_context_get_rank_rule (data->f, data->current, NULL);
-	if (pos > 0) {
-		rule_move (data, pos, pos - 1);
-	}
-}
-
-static void
-rule_down (GtkWidget *widget, struct _editor_data *data)
-{
-	int pos;
-	
-	d(printf ("down rule\n"));
-	pos = rule_context_get_rank_rule (data->f, data->current, NULL);
-	rule_move (data, pos, pos + 1);
-}
-
-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 },
-};
-
-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, NULL))) {
-		if (rule == data->current)
-			index = count;
-		count++;
-	}
+	gtk_object_unref((GtkObject *)gui);
 	
-	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);
+	return o;
 }
 
-static void
-select_rule (GtkWidget *w, GtkWidget *child, struct _editor_data *data)
+static FilterRule *
+create_rule(RuleEditor *re)
 {
-	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);
-}
+	FilterRule *rule = filter_rule_new();
+	FilterPart *part;
 
-static void
-double_click (GtkWidget *widget, GdkEventButton *event, struct _editor_data *data)
-{
-	if (data->current && event->type == GDK_2BUTTON_PRESS)
-		rule_edit (widget, data);
-}
+	/* create a rule with 1 part in it */
+	rule = (FilterRule *)vfolder_rule_new ();
+	part = rule_context_next_part(re->context, NULL);
+	filter_rule_add_part(rule, filter_part_clone(part));
 
-GtkWidget *
-vfolder_editor_construct (struct _VfolderContext *f)
-{
-	GladeXML *gui;
-	GtkWidget *d, *w;
-	GList *l;
-	FilterRule *rule = NULL;
-	struct _editor_data *data;
-	int i;
-	
-	g_assert (IS_VFOLDER_CONTEXT (f));
-	
-	data = g_malloc0 (sizeof (*data));
-	data->f = (RuleContext *)f;
-	
-	gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "edit_vfolder");
-        d = glade_xml_get_widget (gui, "edit_vfolder");
-	gtk_object_set_data_full (GTK_OBJECT (d), "data", data, g_free);
-	
-	gtk_window_set_title (GTK_WINDOW (d), "Edit VFolders");
-	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, "rule_list");
-	data->list = GTK_LIST (w);
-	l = NULL;
-	while ((rule = rule_context_next_rule ((RuleContext *)f, rule, NULL))) {
-		GtkWidget *item;
-		
-		gchar *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));
-		l = g_list_append (l, GTK_LIST_ITEM (item));
-	}
-	
-	gtk_list_append_items (data->list, l);
-	gtk_signal_connect (GTK_OBJECT (w), "select_child", select_rule, data);
-	gtk_signal_connect (GTK_OBJECT (w), "button_press_event", double_click, data);
-	
-	set_sensitive (data);
-	
-	gtk_object_unref (GTK_OBJECT (gui));
-	
-	return d;
+	return rule;
 }