From 5482126d24861f1236c687cac5e8dc0240a2d28f Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Tue, 30 Mar 2004 22:20:39 +0000 Subject: Use the new "filter_editor" that has been added to the glade file Remove 2004-03-30 Rodney Dawes * filter-editor.c (filter_editor_new): Use the new "filter_editor" that has been added to the glade file * filter.glade: Remove an unused piece of UI definition and add a new "filter_editor" that is the same as rule_editor, only for the filter editor dialogs, and change "Filter Rules" to "Search Rules" in the rule_editor * rule-editor.c (rule_editor_new): Set the child widget of the editor dialog appropriately svn path=/trunk/; revision=25251 --- filter/ChangeLog | 11 + filter/filter-editor.c | 4 +- filter/filter.glade | 656 +++++++++++++++++++++++++++++-------------------- filter/rule-editor.c | 5 + 4 files changed, 402 insertions(+), 274 deletions(-) diff --git a/filter/ChangeLog b/filter/ChangeLog index cf2c93f341..a46bea6fda 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,14 @@ +2004-03-30 Rodney Dawes + + * filter-editor.c (filter_editor_new): Use the new "filter_editor" + that has been added to the glade file + * filter.glade: Remove an unused piece of UI definition and add a + new "filter_editor" that is the same as rule_editor, only for the + filter editor dialogs, and change "Filter Rules" to "Search Rules" + in the rule_editor + * rule-editor.c (rule_editor_new): Set the child widget of the editor + dialog appropriately + 2004-03-29 Rodney Dawes * filter-filter.c (get_widget): diff --git a/filter/filter-editor.c b/filter/filter-editor.c index 58d33a8a4d..f6cb323aec 100644 --- a/filter/filter-editor.c +++ b/filter/filter-editor.c @@ -107,9 +107,9 @@ filter_editor_new (FilterContext *fc, const char **source_names) GladeXML *gui; GtkWidget *w; - gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "rule_editor", NULL); + gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "filter_editor", NULL); - w = glade_xml_get_widget (gui, "rule_editor"); + w = glade_xml_get_widget (gui, "filter_editor"); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (fe)->vbox), w, TRUE, TRUE, 0); filter_editor_construct (fe, fc, gui, source_names); diff --git a/filter/filter.glade b/filter/filter.glade index 03585a5f7d..c34addfdc8 100644 --- a/filter/filter.glade +++ b/filter/filter.glade @@ -3,275 +3,6 @@ - - True - Edit Filters - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - False - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 12 - True - False - 6 - - - - True - True - 0 - - - - True - - - - True - Incoming - True - - - - - - True - Outgoing - True - - - - - - - 0 - False - False - - - - - - True - <b>Filter Rules</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 12 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - rule_editor_treeview_new - 0 - 0 - Thu, 12 Dec 2002 23:41:46 GMT - - - 0 - True - True - - - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_DEFAULT_STYLE - 6 - - - - True - True - True - gtk-add - True - GTK_RELIEF_NORMAL - - - - - - True - True - True - _Edit - True - GTK_RELIEF_NORMAL - - - - - - True - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - - - - - - True - True - True - gtk-go-up - True - GTK_RELIEF_NORMAL - - - - - - True - True - True - gtk-go-down - True - GTK_RELIEF_NORMAL - - - - - 0 - False - False - - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 3 - True - True - - - - - - True Edit VFolders @@ -835,7 +566,7 @@ True - <b>_Filter Rules</b> + <b>_Search Rules</b> True True GTK_JUSTIFY_LEFT @@ -929,9 +660,63 @@ True True True - _Edit - True GTK_RELIEF_NORMAL + + + + True + 0.5 + 0.5 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-properties + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Edit + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + @@ -1430,4 +1215,331 @@ a time relative to when filtering occurs. + + True + Filter Editor + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + False + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + -6 + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 12 + True + False + 6 + + + + True + 0 + + + + True + + + + True + Incoming + True + + + + + + + 0 + False + False + + + + + + True + False + 6 + + + + True + <b>_Filter Rules</b> + True + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 12 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 6 + + + + True + rule_editor_treeview_new + 0 + 0 + Thu, 12 Dec 2002 23:50:05 GMT + + + 0 + True + True + + + + + + True + False + 6 + + + + True + GTK_BUTTONBOX_DEFAULT_STYLE + 6 + + + + True + True + True + gtk-add + True + GTK_RELIEF_NORMAL + + + + + + True + True + True + GTK_RELIEF_NORMAL + + + + True + 0.5 + 0.5 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-properties + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Edit + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + + True + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + + + + + + True + True + True + gtk-go-up + True + GTK_RELIEF_NORMAL + + + + + + True + True + True + gtk-go-down + True + GTK_RELIEF_NORMAL + + + + + 0 + False + False + + + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 3 + True + True + + + + + 0 + True + True + + + + + + diff --git a/filter/rule-editor.c b/filter/rule-editor.c index f1a4606d98..d74e3aa76e 100644 --- a/filter/rule-editor.c +++ b/filter/rule-editor.c @@ -163,8 +163,13 @@ rule_editor_new (RuleContext *rc, const char *source) { RuleEditor *re = (RuleEditor *) g_object_new (RULE_TYPE_EDITOR, NULL); GladeXML *gui; + GtkWidget *w; gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "rule_editor", NULL); + + w = glade_xml_get_widget (gui, "rule_editor"); + gtk_box_pack_start ((GtkBox *) ((GtkDialog *)re)->vbox, w, TRUE, TRUE, 0); + rule_editor_construct (re, rc, gui, source); g_object_unref (gui); -- cgit v1.2.3