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, 7 insertions, 13 deletions

diff --git a/filter/filter-editor.h b/filter/filter-editor.h
index 20369a9536..44f99a7df6 100644
--- a/filter/filter-editor.h
+++ b/filter/filter-editor.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2000 Helix Code Inc.
+ *  Copyright (C) 2000, 2001 Ximian Inc.
  *
  *  Authors: Not Zed <notzed@lostzed.mmc.com.au>
  *
@@ -22,10 +22,7 @@
 #define _FILTER_EDITOR_H
 
 #include <gtk/gtk.h>
-#include <libgnomeui/gnome-dialog.h>
-
-#if 0
-/* NOTE: object stuff not used (yet?), this is just a holder file for a static factory */
+#include "rule-editor.h"
 
 #define FILTER_EDITOR(obj)	GTK_CHECK_CAST (obj, filter_editor_get_type (), FilterEditor)
 #define FILTER_EDITOR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, filter_editor_get_type (), FilterEditorClass)
@@ -35,27 +32,24 @@ typedef struct _FilterEditor	FilterEditor;
 typedef struct _FilterEditorClass	FilterEditorClass;
 
 struct _FilterEditor {
-	GnomeDialog parent;
+	RuleEditor parent;
 	struct _FilterEditorPrivate *priv;
 
 };
 
 struct _FilterEditorClass {
-	GnomeDialogClass parent_class;
+	RuleEditorClass parent_class;
 
 	/* virtual methods */
 
 	/* signals */
 };
 
-guint		filter_editor_get_type	(void);
-FilterEditor	*filter_editor_new	(void);
-#endif
-
 struct _FilterContext;
 
-/* methods */
-GtkWidget	*filter_editor_construct	(struct _FilterContext *f);
+guint		filter_editor_get_type	(void);
+FilterEditor    *filter_editor_new(struct _FilterContext *f, const char **source_names);
+void		filter_editor_construct(FilterEditor *fe, struct _FilterContext *fc, struct _GladeXML *gui, const char **source_names);
 
 #endif /* ! _FILTER_EDITOR_H */