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, 12 deletions

diff --git a/filter/score-editor.h b/filter/score-editor.h
index cb78d465f0..686963c879 100644
--- a/filter/score-editor.h
+++ b/filter/score-editor.h
@@ -22,10 +22,7 @@
 #define _SCORE_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 SCORE_EDITOR(obj)	GTK_CHECK_CAST (obj, score_editor_get_type (), ScoreEditor)
 #define SCORE_EDITOR_CLASS(klass)	GTK_CHECK_CLASS_CAST (klass, score_editor_get_type (), ScoreEditorClass)
@@ -35,25 +32,23 @@ typedef struct _ScoreEditor	ScoreEditor;
 typedef struct _ScoreEditorClass	ScoreEditorClass;
 
 struct _ScoreEditor {
-	GnomeDialog parent;
+	RuleEditor parent;
+
+	struct _ScoreEditorPrivate *priv;
 };
 
 struct _ScoreEditorClass {
-	GnomeDialogClass parent_class;
+	RuleEditorClass parent_class;
 
 	/* virtual methods */
 
 	/* signals */
 };
 
-guint		score_editor_get_type	(void);
-ScoreEditor	*score_editor_new	(void);
-#endif
-
 struct _ScoreContext;
 
-/* methods */
-GtkWidget	*score_editor_construct	(struct _ScoreContext *f);
+guint		score_editor_get_type	(void);
+ScoreEditor	*score_editor_new	(struct _ScoreContext *f);
 
 #endif /* ! _SCORE_EDITOR_H */