From 724b51b4ffaf280517052d7a2cbf51c31889aa20 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 11 Apr 2003 19:11:50 +0000 Subject: Fixes for bugs: #41149, #41150, #41151, #41152, #41153, #41155 and #41156. 2003-04-11 Jeffrey Stedfast Fixes for bugs: #41149, #41150, #41151, #41152, #41153, #41155 and #41156. * filter-filter.c (get_widget): Same as with filter-rule. * filter-rule.c (get_widget): Changed border widths of frame vboxes and other padding to comply with the HIG. * rule-editor.c (rule_add): Change window border and padding around the 'rules' widget to comply with the HIG. (rule_edit): Same. (rule_editor_construct): Same here as well. * filter.glade: Many HIG compliance fixes. svn path=/trunk/; revision=20823 --- filter/ChangeLog | 17 ++++++++++++ filter/filter-editor.c | 2 +- filter/filter-filter.c | 3 ++- filter/filter-rule.c | 11 ++++---- filter/filter.glade | 71 ++++++++++++++++++++++++++++--------------------- filter/filtertypes.xml | 5 ++++ filter/rule-editor.c | 9 ++++--- filter/vfolder-editor.c | 2 +- 8 files changed, 78 insertions(+), 42 deletions(-) diff --git a/filter/ChangeLog b/filter/ChangeLog index fecaf39274..ecec17d0aa 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,20 @@ +2003-04-11 Jeffrey Stedfast + + Fixes for bugs: #41149, #41150, #41151, #41152, #41153, #41155 and + #41156. + + * filter-filter.c (get_widget): Same as with filter-rule. + + * filter-rule.c (get_widget): Changed border widths of frame + vboxes and other padding to comply with the HIG. + + * rule-editor.c (rule_add): Change window border and padding + around the 'rules' widget to comply with the HIG. + (rule_edit): Same. + (rule_editor_construct): Same here as well. + + * filter.glade: Many HIG compliance fixes. + 2003-03-28 Not Zed * filter-datespec.c (button_clicked): cast warning. diff --git a/filter/filter-editor.c b/filter/filter-editor.c index 57c848d361..f6dc5700ec 100644 --- a/filter/filter-editor.c +++ b/filter/filter-editor.c @@ -110,7 +110,7 @@ filter_editor_new (FilterContext *fc, const char **source_names) gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "rule_editor", NULL); filter_editor_construct (fe, fc, gui, source_names); - w = glade_xml_get_widget (gui, "rule_frame"); + w = glade_xml_get_widget (gui, "rule_frame"); gtk_frame_set_label (GTK_FRAME (w), _("Filter Rules")); g_object_unref (gui); diff --git a/filter/filter-filter.c b/filter/filter-filter.c index eb9ad141c2..6719cb9ad4 100644 --- a/filter/filter-filter.c +++ b/filter/filter-filter.c @@ -491,6 +491,7 @@ get_widget (FilterRule *fr, RuleContext *rc) frame = gtk_frame_new (_("Then")); inframe = gtk_vbox_new (FALSE, 3); gtk_container_add (GTK_CONTAINER (frame), inframe); + gtk_container_set_border_width (GTK_CONTAINER (inframe), 6); rows = g_list_length (ff->actions); parts = gtk_table_new (rows, 2, FALSE); @@ -504,7 +505,7 @@ get_widget (FilterRule *fr, RuleContext *rc) add = gtk_button_new_from_stock (GTK_STOCK_ADD); /* gtk_button_set_relief (GTK_BUTTON (add), GTK_RELIEF_NONE); */ g_signal_connect (add, "clicked", G_CALLBACK (more_parts), data); - gtk_box_pack_start (GTK_BOX (hbox), add, FALSE, FALSE, 3); + gtk_box_pack_start (GTK_BOX (hbox), add, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (inframe), hbox, FALSE, FALSE, 3); diff --git a/filter/filter-rule.c b/filter/filter-rule.c index 22ab424f3c..87e6433167 100644 --- a/filter/filter-rule.c +++ b/filter/filter-rule.c @@ -772,6 +772,7 @@ get_widget (FilterRule *fr, struct _RuleContext *f) frame = gtk_frame_new (_("If")); inframe = gtk_vbox_new (FALSE, 3); gtk_container_add (GTK_CONTAINER (frame), inframe); + gtk_container_set_border_width (GTK_CONTAINER (inframe), 6); /* this is the parts table, it should probably be inside a scrolling list */ rows = g_list_length (fr->parts); @@ -793,12 +794,12 @@ get_widget (FilterRule *fr, struct _RuleContext *f) item = gtk_menu_item_new_with_label (_("if all criteria are met")); g_signal_connect (item, "activate", G_CALLBACK (match_all), fr); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show (item); item = gtk_menu_item_new_with_label (_("if any criteria are met")); g_signal_connect (item, "activate", G_CALLBACK (match_any), fr); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show (item); omenu = gtk_option_menu_new (); @@ -808,12 +809,12 @@ get_widget (FilterRule *fr, struct _RuleContext *f) add = gtk_button_new_from_stock (GTK_STOCK_ADD); g_signal_connect (add, "clicked", G_CALLBACK (more_parts), data); - gtk_box_pack_start (GTK_BOX (hbox), add, FALSE, FALSE, 3); + gtk_box_pack_start (GTK_BOX (hbox), add, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), omenu, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (inframe), hbox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (inframe), hbox, FALSE, FALSE, 3); l = fr->parts; while (l) { @@ -833,7 +834,7 @@ get_widget (FilterRule *fr, struct _RuleContext *f) gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), parts); - gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, TRUE, TRUE, 3); /*gtk_box_pack_start (GTK_BOX (inframe), parts, FALSE, FALSE, 3); */ diff --git a/filter/filter.glade b/filter/filter.glade index a5fa0f5ad1..973c7ea33c 100644 --- a/filter/filter.glade +++ b/filter/filter.glade @@ -4,6 +4,7 @@ + 6 True Edit Filters GTK_WINDOW_TOPLEVEL @@ -17,7 +18,7 @@ True False - 8 + 6 @@ -100,9 +101,10 @@ + 6 True False - 0 + 6 @@ -146,15 +148,15 @@ True GTK_BUTTONBOX_DEFAULT_STYLE - 0 + 6 True True True - _Add - True + gtk-add + True GTK_RELIEF_NORMAL @@ -175,8 +177,8 @@ True True True - _Delete - True + gtk-remove + True GTK_RELIEF_NORMAL @@ -249,6 +251,7 @@ + 6 True Edit VFolders GTK_WINDOW_TOPLEVEL @@ -310,9 +313,10 @@ + 6 True False - 0 + 6 @@ -356,15 +360,15 @@ True GTK_BUTTONBOX_DEFAULT_STYLE - 0 + 6 True True True - _Add - True + gtk-add + True GTK_RELIEF_NORMAL @@ -385,8 +389,8 @@ True True True - _Delete - True + gtk-remove + True GTK_RELIEF_NORMAL @@ -459,6 +463,7 @@ + 6 True GTK_WINDOW_TOPLEVEL @@ -532,9 +537,10 @@ + 6 True False - 0 + 6 @@ -591,7 +597,7 @@ True False - 0 + 6 @@ -629,21 +635,21 @@ True False - 0 + 1 True GTK_BUTTONBOX_DEFAULT_STYLE - 0 + 6 True True True - _Add - True + gtk-add + True GTK_RELIEF_NORMAL @@ -653,8 +659,8 @@ True True True - _Remove - True + gtk-remove + True GTK_RELIEF_NORMAL @@ -712,6 +718,7 @@ + 6 True window1 GTK_WINDOW_TOPLEVEL @@ -724,7 +731,7 @@ True False - 0 + 6 @@ -761,9 +768,10 @@ + 6 True False - 0 + 6 @@ -807,15 +815,15 @@ True GTK_BUTTONBOX_DEFAULT_STYLE - 0 + 6 True True True - _Add - True + gtk-add + True GTK_RELIEF_NORMAL @@ -836,8 +844,8 @@ True True True - _Delete - True + gtk-remove + True GTK_RELIEF_NORMAL @@ -910,6 +918,7 @@ + 6 True window1 GTK_WINDOW_TOPLEVEL @@ -922,14 +931,14 @@ True False - 3 + 6 4 True False - 3 + 6 @@ -1052,7 +1061,7 @@ the current time when filtering occurs. False - True + False diff --git a/filter/filtertypes.xml b/filter/filtertypes.xml index 55daf1000c..012ba62274 100644 --- a/filter/filtertypes.xml +++ b/filter/filtertypes.xml @@ -710,5 +710,10 @@ (shell "/bin/sh" "-c" ${command}) + + Pipe Message to Shell Command + (pipe-message "/bin/sh" "-c" ${command}) + + diff --git a/filter/rule-editor.c b/filter/rule-editor.c index 3fe268ac61..a4cfef2871 100644 --- a/filter/rule-editor.c +++ b/filter/rule-editor.c @@ -292,8 +292,9 @@ rule_add (GtkWidget *widget, RuleEditor *re) gtk_window_set_default_size (GTK_WINDOW (re->dialog), 650, 400); gtk_window_set_resizable (GTK_WINDOW (re->dialog), TRUE); gtk_window_set_transient_for ((GtkWindow *) re->dialog, (GtkWindow *) re); + gtk_container_set_border_width ((GtkContainer *) re->dialog, 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (re->dialog)->vbox), rules, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (re->dialog)->vbox), rules, TRUE, TRUE, 3); g_signal_connect (re->dialog, "response", G_CALLBACK (add_editor_response), re); g_object_weak_ref ((GObject *) re->dialog, (GWeakNotify) editor_destroy, re); @@ -373,8 +374,9 @@ rule_edit (GtkWidget *widget, RuleEditor *re) gtk_window_set_default_size (GTK_WINDOW (re->dialog), 650, 400); gtk_window_set_resizable (GTK_WINDOW (re->dialog), TRUE); gtk_widget_set_parent_window (GTK_WIDGET (re->dialog), GTK_WIDGET (re)->window); + gtk_container_set_border_width ((GtkContainer *) re->dialog, 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (re->dialog)->vbox), rules, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (re->dialog)->vbox), rules, TRUE, TRUE, 3); g_signal_connect (re->dialog, "response", G_CALLBACK (edit_editor_response), re); g_object_weak_ref ((GObject *) re->dialog, (GWeakNotify) editor_destroy, re); @@ -714,9 +716,10 @@ rule_editor_construct (RuleEditor *re, RuleContext *context, GladeXML *gui, cons gtk_window_set_resizable ((GtkWindow *) re, TRUE); gtk_window_set_default_size ((GtkWindow *) re, 350, 400); + gtk_container_set_border_width ((GtkContainer *) re, 6); w = glade_xml_get_widget (gui, "rule_editor"); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (re)->vbox), w, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (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); diff --git a/filter/vfolder-editor.c b/filter/vfolder-editor.c index 8653d1542f..3addc14bed 100644 --- a/filter/vfolder-editor.c +++ b/filter/vfolder-editor.c @@ -110,7 +110,7 @@ vfolder_editor_new (VfolderContext *vc) gui = glade_xml_new (FILTER_GLADEDIR "/filter.glade", "rule_editor", NULL); rule_editor_construct ((RuleEditor *) ve, (RuleContext *) vc, gui, NULL); - w = glade_xml_get_widget (gui, "rule_frame"); + w = glade_xml_get_widget (gui, "rule_frame"); gtk_frame_set_label ((GtkFrame *) w, _("Virtual Folders")); g_object_unref (gui); -- cgit v1.2.3