From e8fad70e9ff924c66434cab62775478617550476 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Thu, 15 Mar 2001 06:55:22 +0000 Subject: Changed the edit_filter to be a standalone window rather than a widget, so 2001-03-15 Not Zed * 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 --- filter/vfolder-editor.h | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'filter/vfolder-editor.h') diff --git a/filter/vfolder-editor.h b/filter/vfolder-editor.h index 2ff2b261dc..115ebdbc74 100644 --- a/filter/vfolder-editor.h +++ b/filter/vfolder-editor.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 Helix Code Inc. + * Copyright (C) 2000, 2001 Ximian Inc. * * Authors: Not Zed * @@ -22,10 +22,7 @@ #define _VFOLDER_EDITOR_H #include -#include - -#if 0 -/* NOTE: object stuff not used (yet?), this is just a holder file for a static factory */ +#include "rule-editor.h" #define VFOLDER_EDITOR(obj) GTK_CHECK_CAST (obj, vfolder_editor_get_type (), VfolderEditor) #define VFOLDER_EDITOR_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, vfolder_editor_get_type (), VfolderEditorClass) @@ -35,27 +32,24 @@ typedef struct _VfolderEditor VfolderEditor; typedef struct _VfolderEditorClass VfolderEditorClass; struct _VfolderEditor { - GnomeDialog parent; + RuleEditor parent; + struct _VfolderEditorPrivate *priv; }; struct _VfolderEditorClass { - GnomeDialogClass parent_class; + RuleEditorClass parent_class; /* virtual methods */ /* signals */ }; -guint vfolder_editor_get_type (void); -VfolderEditor *vfolder_editor_new (void); -#endif - struct _VfolderContext; -/* methods */ -GtkWidget *vfolder_editor_construct (struct _VfolderContext *f); +guint vfolder_editor_get_type (void); +VfolderEditor *vfolder_editor_new (struct _VfolderContext *); #endif /* ! _VFOLDER_EDITOR_H */ -- cgit v1.2.3