From a4606615f6dadb9b91ab9c501bca405ca6728421 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 31 Mar 2004 10:05:34 +0000 Subject: renamed filter_label to rule_label, and removed the vfolder-editor and 2004-03-31 Not Zed * filter.glade: renamed filter_label to rule_label, and removed the vfolder-editor and filter-editor windows. * rule-editor.c (rule_editor_new): hide the source widget. * vfolder-editor.c (vfolder_editor_new): hide the source widget. * rule-editor.c (rule_editor_new): add a label argument. * vfolder-editor.c (vfolder_editor_new): ditto below. * filter-editor.c (filter_editor_new): dont add any label here. * rule-editor.c (rule_editor_construct): Put the widget back in the dialogue box here. Add an argument for the area label. ** Revert Rodney's last patch. svn path=/trunk/; revision=25257 --- filter/ChangeLog | 20 ++ filter/filter-editor.c | 10 +- filter/filter.glade | 624 +----------------------------------------------- filter/rule-editor.c | 25 +- filter/rule-editor.h | 13 +- filter/score-editor.c | 7 +- filter/vfolder-editor.c | 11 +- 7 files changed, 51 insertions(+), 659 deletions(-) diff --git a/filter/ChangeLog b/filter/ChangeLog index a46bea6fda..529ce0998e 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,23 @@ +2004-03-31 Not Zed + + * filter.glade: renamed filter_label to rule_label, and removed + the vfolder-editor and filter-editor windows. + + * rule-editor.c (rule_editor_new): hide the source widget. + + * vfolder-editor.c (vfolder_editor_new): hide the source widget. + + * rule-editor.c (rule_editor_new): add a label argument. + + * vfolder-editor.c (vfolder_editor_new): ditto below. + + * filter-editor.c (filter_editor_new): dont add any label here. + + * rule-editor.c (rule_editor_construct): Put the widget back in + the dialogue box here. Add an argument for the area label. + + ** Revert Rodney's last patch. + 2004-03-30 Rodney Dawes * filter-editor.c (filter_editor_new): Use the new "filter_editor" diff --git a/filter/filter-editor.c b/filter/filter-editor.c index f6cb323aec..884721f862 100644 --- a/filter/filter-editor.c +++ b/filter/filter-editor.c @@ -105,15 +105,9 @@ filter_editor_new (FilterContext *fc, const char **source_names) { FilterEditor *fe = (FilterEditor *) g_object_new (FILTER_TYPE_EDITOR, NULL); GladeXML *gui; - GtkWidget *w; - - gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "filter_editor", NULL); - - w = glade_xml_get_widget (gui, "filter_editor"); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (fe)->vbox), w, TRUE, TRUE, 0); + gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "rule_editor", NULL); filter_editor_construct (fe, fc, gui, source_names); - g_object_unref (gui); return fe; @@ -150,7 +144,7 @@ filter_editor_construct (FilterEditor *fe, FilterContext *fc, GladeXML *gui, con gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu); gtk_widget_show (omenu); - rule_editor_construct ((RuleEditor *) fe, (RuleContext *) fc, gui, source_names[0]); + rule_editor_construct ((RuleEditor *) fe, (RuleContext *) fc, gui, source_names[0], _("_Filter Rules")); } static FilterRule * diff --git a/filter/filter.glade b/filter/filter.glade index c34addfdc8..7d9ee76d13 100644 --- a/filter/filter.glade +++ b/filter/filter.glade @@ -2,240 +2,7 @@ - - - True - Edit VFolders - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - False - - - - True - False - 8 - - - - 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 - <b>Virtual _Folders</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 - Fri, 13 Dec 2002 00:15:04 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 - - - - - + 6 @@ -564,9 +331,9 @@ 6 - + True - <b>_Search Rules</b> + <b>_Filter Rules</b> True True GTK_JUSTIFY_LEFT @@ -660,63 +427,9 @@ 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 - - - - - - @@ -1215,331 +928,4 @@ 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 d74e3aa76e..a868e25d73 100644 --- a/filter/rule-editor.c +++ b/filter/rule-editor.c @@ -159,19 +159,14 @@ rule_editor_destroy (GtkObject *obj) * Return value: A new #RuleEditor object. **/ RuleEditor * -rule_editor_new (RuleContext *rc, const char *source) +rule_editor_new (RuleContext *rc, const char *source, const char *label) { 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); - + rule_editor_construct (re, rc, gui, source, label); + gtk_widget_hide(glade_xml_get_widget (gui, "filter_source")); g_object_unref (gui); return re; @@ -719,20 +714,23 @@ rule_editor_treeview_new (char *widget_name, char *string1, char *string2, int i } void -rule_editor_construct (RuleEditor *re, RuleContext *context, GladeXML *gui, const char *source) +rule_editor_construct (RuleEditor *re, RuleContext *context, GladeXML *gui, const char *source, const char *label) { GtkWidget *w; int i; + char *tmp; re->context = context; g_object_ref (context); gtk_window_set_resizable ((GtkWindow *) re, TRUE); gtk_window_set_default_size ((GtkWindow *) re, 350, 400); - gtk_widget_realize ((GtkWidget *) re); gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *) re)->action_area, 12); - + + w = glade_xml_get_widget(gui, "rule_editor"); + gtk_box_pack_start((GtkBox *)((GtkDialog *)re)->vbox, w, TRUE, TRUE, 3); + for (i = 0; i < BUTTON_LAST; i++) { re->priv->buttons[i] = (GtkButton *) w = glade_xml_get_widget (gui, edit_buttons[i].name); g_signal_connect (w, "clicked", edit_buttons[i].func, re); @@ -745,7 +743,10 @@ rule_editor_construct (RuleEditor *re, RuleContext *context, GladeXML *gui, cons g_signal_connect (re->list, "cursor-changed", G_CALLBACK (cursor_changed), re); g_signal_connect (re->list, "row-activated", G_CALLBACK (double_click), re); - w = glade_xml_get_widget (gui, "filter_label"); + w = glade_xml_get_widget (gui, "rule_label"); + tmp = alloca(strlen(label)+8); + sprintf(tmp, "%s", label); + gtk_label_set_label((GtkLabel *)w, tmp); gtk_label_set_mnemonic_widget ((GtkLabel *) w, (GtkWidget *) re->list); g_signal_connect (re, "response", G_CALLBACK (editor_response), re); diff --git a/filter/rule-editor.h b/filter/rule-editor.h index d2e9797e46..be216edf73 100644 --- a/filter/rule-editor.h +++ b/filter/rule-editor.h @@ -89,15 +89,16 @@ struct _RuleEditorUndo { int newrank; }; -GtkType rule_editor_get_type (void); -RuleEditor *rule_editor_new (struct _RuleContext *, const char *source); -void rule_editor_construct (RuleEditor *re, RuleContext *context, GladeXML *gui, const char *source); +GtkType rule_editor_get_type(void); +RuleEditor *rule_editor_new(RuleContext *rc, const char *source, const char *label); + +void rule_editor_construct(RuleEditor *re, RuleContext *context, GladeXML *gui, const char *source, const char *label); /* methods */ -void rule_editor_set_source (RuleEditor *re, const char *source); +void rule_editor_set_source(RuleEditor *re, const char *source); /* calculates the sensitivity of the editor */ -void rule_editor_set_sensitive (RuleEditor *re); +void rule_editor_set_sensitive(RuleEditor *re); /* used internally to create a new rule appropriate for the editor */ -struct _FilterRule *rule_editor_create_rule (RuleEditor *re); +struct _FilterRule *rule_editor_create_rule(RuleEditor *re); #endif /* ! _RULE_EDITOR_H */ diff --git a/filter/score-editor.c b/filter/score-editor.c index 9a8c0a626c..e52edf7c02 100644 --- a/filter/score-editor.c +++ b/filter/score-editor.c @@ -105,14 +105,9 @@ score_editor_new (ScoreContext *sc) { ScoreEditor *se = (ScoreEditor *) g_object_new (SCORE_TYPE_EDITOR, NULL); GladeXML *gui; - GtkWidget *w; gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "rule_editor", NULL); - rule_editor_construct ((RuleEditor *) se, (RuleContext *) sc, gui, NULL); - - w = glade_xml_get_widget (gui, "rule_frame"); - gtk_frame_set_label ((GtkFrame *) w, _("Score Rules")); - + rule_editor_construct ((RuleEditor *) se, (RuleContext *) sc, gui, NULL, _("_Score Rules")); g_object_unref (gui); return se; diff --git a/filter/vfolder-editor.c b/filter/vfolder-editor.c index 4280d8cd2f..84ebbc0f94 100644 --- a/filter/vfolder-editor.c +++ b/filter/vfolder-editor.c @@ -103,15 +103,10 @@ vfolder_editor_new (VfolderContext *vc) { VfolderEditor *ve = (VfolderEditor *) g_object_new (VFOLDER_TYPE_EDITOR, NULL); GladeXML *gui; - GtkWidget *w; - gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "vfolder_editor", NULL); - - w = glade_xml_get_widget (gui, "vfolder_editor"); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (ve)->vbox), w, TRUE, TRUE, 0); - - rule_editor_construct ((RuleEditor *) ve, (RuleContext *) vc, gui, NULL); - + gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "rule_editor", NULL); + rule_editor_construct ((RuleEditor *) ve, (RuleContext *) vc, gui, NULL, _("Virtual _Folders")); + gtk_widget_hide(glade_xml_get_widget (gui, "filter_source")); g_object_unref (gui); return ve; -- cgit v1.2.3