add 'fast filter' for claws' filtering
[claws.git] / src / prefs_filtering.c
index 8a7faae8082eef4fe7ae70579c363379b95ccc34..cce549af1ad1055fede00656fb39d9c87bd62164 100644 (file)
@@ -25,6 +25,7 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
+#include <gtk/gtkoptionmenu.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -46,6 +47,9 @@
 #include "alertpanel.h"
 #include "folder.h"
 #include "filtering.h"
+#include "addr_compl.h"
+#include "colorlabel.h"
+
 #include "matcher_parser.h"
 
 static struct Filtering {
@@ -63,18 +67,20 @@ static struct Filtering {
        GtkWidget *exec_label;
        GtkWidget *exec_btn;
 
+       GtkWidget *color_label;
+       GtkWidget *color_optmenu;
+
        GtkWidget *cond_clist;
-} filtering;
 
-#define VSPACING               12
-#define VSPACING_NARROW                4
-#define DEFAULT_ENTRY_WIDTH    80
-#define PREFSBUFSIZE           1024
+       /* need this to make address completion entry work */
+       gint current_action;
+} filtering;
 
 /* widget creating functions */
 static void prefs_filtering_create             (void);
 
-static void prefs_filtering_set_dialog (void);
+static void prefs_filtering_set_dialog (const gchar *header,
+                                        const gchar *key);
 static void prefs_filtering_set_list   (void);
 
 /* callback functions */
@@ -102,10 +108,15 @@ static void prefs_filtering_condition_define      (void);
 static gint prefs_filtering_clist_set_row(gint row, FilteringProp * prop);
 static void prefs_filtering_select_dest(void);
 static void prefs_filtering_action_select(GtkList *list,
-                                         GtkWidget *widget,
+                                         GtkWidget *widget, 
                                          gpointer user_data);
+static void prefs_filtering_action_selection_changed(GtkList *list,
+                                                    gpointer user_data);
+                                         
 static void prefs_filtering_reset_dialog(void);
 
+static FolderItem * cur_item = NULL;
+
 enum {
        ACTION_MOVE = 0,
        ACTION_COPY = 1,
@@ -116,7 +127,10 @@ enum {
        ACTION_MARK_AS_UNREAD = 6,
        ACTION_FORWARD = 7,
        ACTION_FORWARD_AS_ATTACHMENT = 8,
-       ACTION_EXECUTE = 9
+       ACTION_BOUNCE = 9,
+       ACTION_EXECUTE = 10,
+       ACTION_COLOR = 11,
+       ACTION_DELETE_ON_SERVER = 12,
 };
 
 static gint get_sel_from_list(GtkList * list)
@@ -125,6 +139,9 @@ static gint get_sel_from_list(GtkList * list)
        void * sel;
        GList * child;
 
+       if (list->selection == NULL)
+               return -1;
+
        sel = list->selection->data;
        for(child = list->children ; child != NULL ;
            child = g_list_next(child)) {
@@ -188,25 +205,43 @@ static gint prefs_filtering_get_matching_from_action(gint action_id)
                return MATCHACTION_FORWARD;
        case ACTION_FORWARD_AS_ATTACHMENT:
                return MATCHACTION_FORWARD_AS_ATTACHMENT;
+       case ACTION_BOUNCE:
+               return MATCHACTION_BOUNCE;
        case ACTION_EXECUTE:
                return MATCHACTION_EXECUTE;
+       case ACTION_COLOR:
+               return MATCHACTION_COLOR;
+       case ACTION_DELETE_ON_SERVER:
+               return MATCHACTION_DELETE_ON_SERVER;
        default:
                return -1;
        }
 }
 
-gchar * action_text [] = {
-       "Move", "Copy", "Delete",
-       "Mark", "Unmark", "Mark as read", "Mark as unread",
-       "Forward", "Forward as attachment", "Execute"
+static gchar * action_text [] = {
+       N_("Move"),     
+       N_("Copy"), 
+       N_("Delete"),
+       N_("Mark"), 
+       N_("Unmark"), 
+       N_("Mark as read"), 
+       N_("Mark as unread"),
+       N_("Forward"), 
+       N_("Forward as attachment"), 
+       N_("Bounce"), 
+       N_("Execute"),
+       N_("Color"),
+       N_("Delete on Server")
 };
 
-void prefs_filtering_open(void)
+void prefs_filtering_open(FolderItem * item,
+                         const gchar *header,
+                         const gchar *key)
 {
        if (prefs_rc_is_readonly(FILTERING_RC))
                return;
 
-       inc_autocheck_timer_remove();
+       inc_lock();
 
        if (!filtering.window) {
                prefs_filtering_create();
@@ -215,9 +250,22 @@ void prefs_filtering_open(void)
        manage_window_set_transient(GTK_WINDOW(filtering.window));
        gtk_widget_grab_focus(filtering.ok_btn);
 
-       prefs_filtering_set_dialog();
+       cur_item = item;
+
+       prefs_filtering_set_dialog(header, key);
 
        gtk_widget_show(filtering.window);
+
+       start_address_completion();
+}
+
+/* prefs_filtering_close() - just to have one common exit point */
+static void prefs_filtering_close(void)
+{
+       end_address_completion();
+       
+       gtk_widget_hide(filtering.window);
+       inc_unlock();
 }
 
 static void prefs_filtering_create(void)
@@ -248,6 +296,8 @@ static void prefs_filtering_create(void)
        GtkWidget *dest_entry;
        GtkWidget *dest_btn;
        GtkWidget *exec_btn;
+       GtkWidget *color_label;
+       GtkWidget *color_optmenu;
 
        GtkWidget *reg_btn;
        GtkWidget *subst_btn;
@@ -261,13 +311,15 @@ static void prefs_filtering_create(void)
        GtkWidget *up_btn;
        GtkWidget *down_btn;
 
+       GtkWidget *dummy;
+
        GList *combo_items;
        gint i;
 
        GList *accounts;
        GList * cur;
 
-       gchar *title[] = {_("Registered rules")};
+       gchar *title[1];
 
        debug_print(_("Creating filtering setting window...\n"));
 
@@ -293,10 +345,7 @@ static void prefs_filtering_create(void)
                            GTK_SIGNAL_FUNC(prefs_filtering_deleted), NULL);
        gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
                            GTK_SIGNAL_FUNC(prefs_filtering_key_pressed), NULL);
-       gtk_signal_connect (GTK_OBJECT(window), "focus_in_event",
-                           GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
-       gtk_signal_connect (GTK_OBJECT(window), "focus_out_event",
-                           GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+       MANAGE_WINDOW_SIGNALS_CONNECT (window);
        gtk_signal_connect (GTK_OBJECT(ok_btn), "clicked",
                            GTK_SIGNAL_FUNC(prefs_filtering_ok), NULL);
        gtk_signal_connect (GTK_OBJECT(cancel_btn), "clicked",
@@ -319,7 +368,6 @@ static void prefs_filtering_create(void)
 
        cond_entry = gtk_entry_new ();
        gtk_widget_show (cond_entry);
-       gtk_widget_set_usize (cond_entry, 300, -1);
        gtk_box_pack_start (GTK_BOX (hbox1), cond_entry, TRUE, TRUE, 0);
 
        cond_btn = gtk_button_new_with_label (_("Define ..."));
@@ -341,7 +389,6 @@ static void prefs_filtering_create(void)
 
        action_combo = gtk_combo_new ();
        gtk_widget_show (action_combo);
-       gtk_widget_set_usize (action_combo, 200, -1);
        gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(action_combo)->entry),
                               FALSE);
 
@@ -363,6 +410,10 @@ static void prefs_filtering_create(void)
                            GTK_SIGNAL_FUNC (prefs_filtering_action_select),
                            NULL);
 
+       gtk_signal_connect(GTK_OBJECT(action_list), "selection-changed",
+                          GTK_SIGNAL_FUNC(prefs_filtering_action_selection_changed),
+                          NULL);
+
        /* accounts */
 
        hbox1 = gtk_hbox_new (FALSE, VSPACING);
@@ -419,11 +470,20 @@ static void prefs_filtering_create(void)
        gtk_widget_show (exec_label);
        gtk_misc_set_alignment (GTK_MISC (exec_label), 0, 0.5);
        gtk_box_pack_start (GTK_BOX (hbox1), exec_label, FALSE, FALSE, 0);
+       
+       color_label = gtk_label_new (_("Color"));
+       gtk_widget_show(color_label);
+       gtk_misc_set_alignment(GTK_MISC(color_label), 0, 0.5);
+       gtk_box_pack_start(GTK_BOX(hbox1), color_label, FALSE, FALSE, 0);
 
        dest_entry = gtk_entry_new ();
        gtk_widget_show (dest_entry);
-       gtk_widget_set_usize (dest_entry, 300, -1);
        gtk_box_pack_start (GTK_BOX (hbox1), dest_entry, TRUE, TRUE, 0);
+       
+       color_optmenu = gtk_option_menu_new();
+       gtk_option_menu_set_menu(GTK_OPTION_MENU(color_optmenu),
+                                colorlabel_create_color_menu());
+       gtk_box_pack_start(GTK_BOX(hbox1), color_optmenu, TRUE, TRUE, 0);
 
        dest_btn = gtk_button_new_with_label (_("Select ..."));
        gtk_widget_show (dest_btn);
@@ -486,6 +546,7 @@ static void prefs_filtering_create(void)
                                        GTK_POLICY_AUTOMATIC,
                                        GTK_POLICY_AUTOMATIC);
 
+       title[0] = _("Registered rules");
        cond_clist = gtk_clist_new_with_titles(1, title);
        gtk_widget_show (cond_clist);
        gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_clist);
@@ -513,6 +574,8 @@ static void prefs_filtering_create(void)
        gtk_signal_connect (GTK_OBJECT (down_btn), "clicked",
                            GTK_SIGNAL_FUNC (prefs_filtering_down), NULL);
 
+       gtk_widget_set_usize(window, 500, -1);
+
        gtk_widget_show_all(window);
 
        filtering.window    = window;
@@ -530,6 +593,9 @@ static void prefs_filtering_create(void)
        filtering.exec_btn = exec_btn;
 
        filtering.cond_clist   = cond_clist;
+
+       filtering.color_label   = color_label;
+       filtering.color_optmenu = color_optmenu;
 }
 
 static void prefs_filtering_update_hscrollbar(void)
@@ -538,25 +604,140 @@ static void prefs_filtering_update_hscrollbar(void)
        gtk_clist_set_column_width(GTK_CLIST(filtering.cond_clist), 0, optwidth);
 }
 
-static void prefs_filtering_set_dialog(void)
+void prefs_filtering_rename_path(const gchar *old_path, const gchar *new_path)
+{
+       GSList *cur;
+       gchar *base;
+       gchar *prefix;
+       gchar *suffix;
+       gchar *dest_path;
+       gint destlen;
+       gint prefixlen;
+       gint oldpathlen;
+
+       g_return_if_fail(old_path != NULL);
+       g_return_if_fail(new_path != NULL);
+
+       oldpathlen = strlen(old_path);
+
+       for (cur = global_processing; cur != NULL; cur = cur->next) {
+               FilteringProp   *filtering = (FilteringProp *)cur->data;
+               FilteringAction *action = filtering->action;
+
+               if (!action->destination) continue;
+
+               destlen = strlen(action->destination);
+
+               if (destlen > oldpathlen) {
+                       prefixlen = destlen - oldpathlen;
+                       suffix = action->destination + prefixlen;
+
+                       if (!strncmp(old_path, suffix, oldpathlen)) {
+                               prefix = g_malloc0(prefixlen + 1);
+                               strncpy2(prefix, action->destination, prefixlen);
+
+                               base = suffix + oldpathlen;
+                               while (*base == G_DIR_SEPARATOR) base++;
+                               if (*base == '\0')
+                                       dest_path = g_strconcat(prefix,
+                                                               G_DIR_SEPARATOR_S,
+                                                               new_path, NULL);
+                               else
+                                       dest_path = g_strconcat(prefix,
+                                                               G_DIR_SEPARATOR_S,
+                                                               new_path,
+                                                               G_DIR_SEPARATOR_S,
+                                                               base, NULL);
+
+                               g_free(prefix);
+                               g_free(action->destination);
+                               action->destination = dest_path;
+                       }
+               }
+       }
+
+       prefs_matcher_write_config();
+}
+
+void prefs_filtering_delete_path(const gchar *path)
+{
+       GSList *cur;
+       GSList *next;
+       gchar *suffix;
+       gint destlen;
+       gint prefixlen;
+       gint pathlen;
+
+       g_return_if_fail(path != NULL);
+
+       pathlen = strlen(path);
+       for (cur = global_processing; cur != NULL; cur = next) {
+               FilteringProp *filtering = (FilteringProp *)cur->data;
+               FilteringAction *action = filtering->action;
+               next = cur->next;
+
+               if (!action->destination) continue;
+
+               destlen = strlen(action->destination);
+
+               if (destlen > pathlen) {
+                       prefixlen = destlen - pathlen;
+                       suffix = action->destination + prefixlen;
+
+                       if (suffix && !strncmp(path, suffix, pathlen)) {
+                               filteringprop_free(filtering);
+                               global_processing = 
+                                       g_slist_remove(global_processing, filtering);
+                       }
+               }
+       }
+
+       prefs_matcher_write_config();
+}
+
+static void prefs_filtering_set_dialog(const gchar *header, const gchar *key)
 {
        GtkCList *clist = GTK_CLIST(filtering.cond_clist);
        GSList *cur;
+       GSList * prefs_filtering;
+       gchar *cond_str[1];
+       gint row;
        
        gtk_clist_freeze(clist);
        gtk_clist_clear(clist);
 
-       prefs_filtering_clist_set_row(-1, NULL);
-       for(cur = global_filtering ; cur != NULL ; cur = g_slist_next(cur)) {
+       cond_str[0] = _("(New)");
+       row = gtk_clist_append(clist, cond_str);
+       gtk_clist_set_row_data(clist, row, NULL);
+
+       if (cur_item == NULL)
+               prefs_filtering = global_processing;
+       else
+               prefs_filtering = cur_item->prefs->processing;
+
+       for(cur = prefs_filtering ; cur != NULL ; cur = g_slist_next(cur)) {
                FilteringProp * prop = (FilteringProp *) cur->data;
 
-               prefs_filtering_clist_set_row(-1, prop);
+               cond_str[0] = filteringprop_to_string(prop);
+               subst_char(cond_str[0], '\t', ':');
+               row = gtk_clist_append(clist, cond_str);
+               gtk_clist_set_row_data(clist, row, prop);
+
+               g_free(cond_str[0]);
        }
 
        prefs_filtering_update_hscrollbar();
        gtk_clist_thaw(clist);
 
        prefs_filtering_reset_dialog();
+
+       if (header && key) {
+               gchar *match_str = g_strconcat(header, " ",
+                       get_matchparser_tab_str(MATCHTYPE_MATCHCASE),
+                       " \"", key, "\"", NULL);
+               gtk_entry_set_text(GTK_ENTRY(filtering.cond_entry), match_str);
+               g_free(match_str);
+       }
 }
 
 static void prefs_filtering_reset_dialog(void)
@@ -574,22 +755,34 @@ static void prefs_filtering_set_list(void)
        GSList * cur;
        gchar * filtering_str;
        gchar * tmp;
+       GSList * prefs_filtering;
+
+       if (cur_item == NULL)
+               prefs_filtering = global_processing;
+       else
+               prefs_filtering = cur_item->prefs->processing;
 
-       for(cur = global_filtering ; cur != NULL ; cur = g_slist_next(cur))
+       for(cur = prefs_filtering ; cur != NULL ; cur = g_slist_next(cur))
                filteringprop_free((FilteringProp *) cur->data);
-       g_slist_free(global_filtering);
-       global_filtering = NULL;
+       g_slist_free(prefs_filtering);
+       prefs_filtering = NULL;
 
        while (gtk_clist_get_text(GTK_CLIST(filtering.cond_clist),
                                  row, 0, &filtering_str)) {
                if (strcmp(filtering_str, _("(New)")) != 0) {
+                       /* tmp = filtering_str; */
                        prop = matcher_parser_get_filtering(filtering_str);
                        if (prop != NULL)
-                               global_filtering =
-                                       g_slist_append(global_filtering, prop);
+                               prefs_filtering =
+                                       g_slist_append(prefs_filtering, prop);
                }
                row++;
        }
+
+       if (cur_item == NULL)
+               global_processing = prefs_filtering;
+       else
+               cur_item->prefs->processing = prefs_filtering;
 }
 
 static gint prefs_filtering_clist_set_row(gint row, FilteringProp * prop)
@@ -641,8 +834,10 @@ static void prefs_filtering_condition_define(void)
        cond_str = gtk_entry_get_text(GTK_ENTRY(filtering.cond_entry));
 
        if (*cond_str != '\0') {
+               gchar * tmp;
+               
+               /* tmp = cond_str; */
                matchers = matcher_parser_get_cond(cond_str);
-
                if (matchers == NULL)
                        alertpanel_error(_("Match string is not valid."));
        }
@@ -669,6 +864,7 @@ static FilteringProp * prefs_filtering_dialog_to_filtering(void)
        gint action_type;
        gint account_id;
        gchar * destination;
+       gint labelcolor;
        
        cond_str = gtk_entry_get_text(GTK_ENTRY(filtering.cond_entry));
        if (*cond_str == '\0') {
@@ -686,6 +882,7 @@ static FilteringProp * prefs_filtering_dialog_to_filtering(void)
        case ACTION_COPY:
        case ACTION_FORWARD:
        case ACTION_FORWARD_AS_ATTACHMENT:
+       case ACTION_BOUNCE:
        case ACTION_EXECUTE:
                destination = gtk_entry_get_text(GTK_ENTRY(filtering.dest_entry));
                if (*destination == '\0') {
@@ -693,12 +890,20 @@ static FilteringProp * prefs_filtering_dialog_to_filtering(void)
                        return NULL;
                }
                break;
+       case ACTION_COLOR:
+               labelcolor = colorlabel_get_color_menu_active_item(
+                       gtk_option_menu_get_menu(GTK_OPTION_MENU(filtering.color_optmenu)));
+               destination = NULL;     
+               break;
+       case ACTION_DELETE_ON_SERVER:
+               destination = NULL;
+               break;
        default:
                destination = NULL;
                break;
        }
        
-       action = filteringaction_new(action_type, account_id, destination);
+       action = filteringaction_new(action_type, account_id, destination, labelcolor);
 
        cond = matcher_parser_get_cond(cond_str);
 
@@ -777,6 +982,9 @@ static void prefs_filtering_up(void)
        row = GPOINTER_TO_INT(clist->selection->data);
        if (row > 1) {
                gtk_clist_row_move(clist, row, row - 1);
+               if(gtk_clist_row_is_visible(clist, row - 1) != GTK_VISIBILITY_FULL) {
+                       gtk_clist_moveto(clist, row - 1, 0, 0, 0);
+               } 
        }
 }
 
@@ -790,6 +998,9 @@ static void prefs_filtering_down(void)
        row = GPOINTER_TO_INT(clist->selection->data);
        if (row > 0 && row < clist->rows - 1) {
                gtk_clist_row_move(clist, row, row + 1);
+               if(gtk_clist_row_is_visible(clist, row + 1) != GTK_VISIBILITY_FULL) {
+                       gtk_clist_moveto(clist, row + 1, 0, 1, 0);
+               } 
        }
 }
 
@@ -810,10 +1021,9 @@ static void prefs_filtering_select_set(FilteringProp * prop)
        }
 
        gtk_entry_set_text(GTK_ENTRY(filtering.cond_entry), matcher_str);
-
+       
        if (action->destination)
-               gtk_entry_set_text(GTK_ENTRY(filtering.dest_entry),
-                                  action->destination);
+               gtk_entry_set_text(GTK_ENTRY(filtering.dest_entry), action->destination);
        else
                gtk_entry_set_text(GTK_ENTRY(filtering.dest_entry), "");
 
@@ -847,9 +1057,9 @@ static void prefs_filtering_select_set(FilteringProp * prop)
                                     ACTION_MARK_AS_UNREAD);
                break;
        case MATCHACTION_FORWARD:
+               list_id = get_list_id_from_account_id(action->account_id);
                gtk_list_select_item(GTK_LIST(filtering.action_list),
                                     ACTION_FORWARD);
-               list_id = get_list_id_from_account_id(action->account_id);
                gtk_list_select_item(GTK_LIST(filtering.account_list),
                                     list_id);
                break;
@@ -860,10 +1070,26 @@ static void prefs_filtering_select_set(FilteringProp * prop)
                gtk_list_select_item(GTK_LIST(filtering.account_list),
                                     list_id);
                break;
+       case MATCHACTION_BOUNCE:
+               list_id = get_list_id_from_account_id(action->account_id);
+               gtk_list_select_item(GTK_LIST(filtering.action_list),
+                                    ACTION_BOUNCE);
+               gtk_list_select_item(GTK_LIST(filtering.account_list),
+                                    list_id);
+               break;
        case MATCHACTION_EXECUTE:
                gtk_list_select_item(GTK_LIST(filtering.action_list),
                                     ACTION_EXECUTE);
                break;
+       case MATCHACTION_COLOR:
+               gtk_list_select_item(GTK_LIST(filtering.action_list),
+                                    ACTION_COLOR);
+               gtk_option_menu_set_history(GTK_OPTION_MENU(filtering.color_optmenu), action->labelcolor);     
+               break;
+       case MATCHACTION_DELETE_ON_SERVER:
+               gtk_list_select_item(GTK_LIST(filtering.action_list),
+                                    ACTION_DELETE_ON_SERVER);
+               break;
        }
 
        g_free(matcher_str);
@@ -899,7 +1125,7 @@ static void prefs_filtering_select_dest(void)
        FolderItem *dest;
        gchar * path;
 
-       dest = foldersel_folder_sel(NULL, NULL);
+       dest = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL);
        if (!dest) return;
 
        path = folder_item_get_identifier(dest);
@@ -908,6 +1134,27 @@ static void prefs_filtering_select_dest(void)
        g_free(path);
 }
 
+static void prefs_filtering_action_selection_changed(GtkList *list,
+                                                    gpointer user_data)
+{
+       gint value;
+
+       value = get_sel_from_list(GTK_LIST(filtering.action_list));
+
+       if (filtering.current_action != value) {
+               if (filtering.current_action == ACTION_FORWARD 
+               ||  filtering.current_action == ACTION_FORWARD_AS_ATTACHMENT) {
+                       debug_print("unregistering address completion entry\n");
+                       address_completion_unregister_entry(GTK_ENTRY(filtering.dest_entry));
+               }
+               if (value == ACTION_FORWARD || value == ACTION_FORWARD_AS_ATTACHMENT) {
+                       debug_print("registering address completion entry\n");
+                       address_completion_register_entry(GTK_ENTRY(filtering.dest_entry));
+               }
+               filtering.current_action = value;
+       }
+}
+
 static void prefs_filtering_action_select(GtkList *list,
                                          GtkWidget *widget,
                                          gpointer user_data)
@@ -919,83 +1166,147 @@ static void prefs_filtering_action_select(GtkList *list,
        switch (value) {
        case ACTION_MOVE:
                gtk_widget_set_sensitive(filtering.account_combo, FALSE);
+               gtk_widget_show(filtering.dest_entry);
                gtk_widget_set_sensitive(filtering.dest_entry, TRUE);
                gtk_widget_show(filtering.dest_btn);
                gtk_widget_show(filtering.dest_label);
                gtk_widget_hide(filtering.exec_label);
                gtk_widget_hide(filtering.exec_btn);
+               gtk_widget_hide(filtering.color_optmenu);
+               gtk_widget_hide(filtering.color_label);
                break;
        case ACTION_COPY:
                gtk_widget_set_sensitive(filtering.account_combo, FALSE);
+               gtk_widget_show(filtering.dest_entry);
                gtk_widget_set_sensitive(filtering.dest_entry, TRUE);
                gtk_widget_show(filtering.dest_btn);
                gtk_widget_show(filtering.dest_label);
                gtk_widget_hide(filtering.exec_label);
                gtk_widget_hide(filtering.exec_btn);
+               gtk_widget_hide(filtering.color_optmenu);
+               gtk_widget_hide(filtering.color_label);
                break;
        case ACTION_DELETE:
                gtk_widget_set_sensitive(filtering.account_combo, FALSE);
+               gtk_widget_show(filtering.dest_entry);
                gtk_widget_set_sensitive(filtering.dest_entry, FALSE);
                gtk_widget_hide(filtering.dest_btn);
                gtk_widget_show(filtering.dest_label);
                gtk_widget_hide(filtering.exec_label);
                gtk_widget_hide(filtering.exec_btn);
+               gtk_widget_hide(filtering.color_optmenu);
+               gtk_widget_hide(filtering.color_label);
                break;
        case ACTION_MARK:
                gtk_widget_set_sensitive(filtering.account_combo, FALSE);
+               gtk_widget_show(filtering.dest_entry);
                gtk_widget_set_sensitive(filtering.dest_entry, FALSE);
                gtk_widget_hide(filtering.dest_btn);
                gtk_widget_show(filtering.dest_label);
                gtk_widget_hide(filtering.exec_label);
                gtk_widget_hide(filtering.exec_btn);
+               gtk_widget_hide(filtering.color_optmenu);
+               gtk_widget_hide(filtering.color_label);
                break;
        case ACTION_UNMARK:
                gtk_widget_set_sensitive(filtering.account_combo, FALSE);
+               gtk_widget_show(filtering.dest_entry);
                gtk_widget_set_sensitive(filtering.dest_entry, FALSE);
                gtk_widget_hide(filtering.dest_btn);
                gtk_widget_show(filtering.dest_label);
                gtk_widget_hide(filtering.exec_label);
                gtk_widget_hide(filtering.exec_btn);
+               gtk_widget_hide(filtering.color_optmenu);
+               gtk_widget_hide(filtering.color_label);
                break;
        case ACTION_MARK_AS_READ:
                gtk_widget_set_sensitive(filtering.account_combo, FALSE);
+               gtk_widget_show(filtering.dest_entry);
                gtk_widget_set_sensitive(filtering.dest_entry, FALSE);
                gtk_widget_hide(filtering.dest_btn);
                gtk_widget_show(filtering.dest_label);
                gtk_widget_hide(filtering.exec_label);
                gtk_widget_hide(filtering.exec_btn);
+               gtk_widget_hide(filtering.color_optmenu);
+               gtk_widget_hide(filtering.color_label);
                break;
        case ACTION_MARK_AS_UNREAD:
                gtk_widget_set_sensitive(filtering.account_combo, FALSE);
+               gtk_widget_show(filtering.dest_entry);
                gtk_widget_set_sensitive(filtering.dest_entry, FALSE);
                gtk_widget_hide(filtering.dest_btn);
                gtk_widget_show(filtering.dest_label);
                gtk_widget_hide(filtering.exec_label);
                gtk_widget_hide(filtering.exec_btn);
+               gtk_widget_hide(filtering.color_optmenu);
+               gtk_widget_hide(filtering.color_label);
                break;
        case ACTION_FORWARD:
                gtk_widget_set_sensitive(filtering.account_combo, TRUE);
+               gtk_widget_show(filtering.dest_entry);
                gtk_widget_set_sensitive(filtering.dest_entry, TRUE);
                gtk_widget_hide(filtering.dest_btn);
                gtk_widget_show(filtering.dest_label);
                gtk_widget_hide(filtering.exec_label);
                gtk_widget_hide(filtering.exec_btn);
+               gtk_widget_hide(filtering.color_optmenu);
+               gtk_widget_hide(filtering.color_label);
                break;
        case ACTION_FORWARD_AS_ATTACHMENT:
                gtk_widget_set_sensitive(filtering.account_combo, TRUE);
+               gtk_widget_show(filtering.dest_entry);
                gtk_widget_set_sensitive(filtering.dest_entry, TRUE);
                gtk_widget_hide(filtering.dest_btn);
                gtk_widget_show(filtering.dest_label);
                gtk_widget_hide(filtering.exec_label);
                gtk_widget_hide(filtering.exec_btn);
+               gtk_widget_hide(filtering.color_optmenu);
+               gtk_widget_hide(filtering.color_label);
+               break;
+       case ACTION_BOUNCE:
+               gtk_widget_set_sensitive(filtering.account_combo, TRUE);
+               gtk_widget_show(filtering.dest_entry);
+               gtk_widget_set_sensitive(filtering.dest_entry, TRUE);
+               gtk_widget_hide(filtering.dest_btn);
+               gtk_widget_show(filtering.dest_label);
+               gtk_widget_hide(filtering.exec_label);
+               gtk_widget_hide(filtering.exec_btn);
+               gtk_widget_hide(filtering.color_optmenu);
+               gtk_widget_hide(filtering.color_label);
                break;
        case ACTION_EXECUTE:
                gtk_widget_set_sensitive(filtering.account_combo, FALSE);
+               gtk_widget_show(filtering.dest_entry);
                gtk_widget_set_sensitive(filtering.dest_entry, TRUE);
                gtk_widget_hide(filtering.dest_btn);
                gtk_widget_hide(filtering.dest_label);
                gtk_widget_show(filtering.exec_label);
+               gtk_widget_set_sensitive(filtering.exec_btn, TRUE);
                gtk_widget_show(filtering.exec_btn);
+               gtk_widget_hide(filtering.color_optmenu);
+               gtk_widget_hide(filtering.color_label);
+               break;
+       case ACTION_COLOR:
+               gtk_widget_set_sensitive(filtering.account_combo, FALSE);
+               gtk_widget_hide(filtering.dest_entry);
+               gtk_widget_hide(filtering.dest_btn);
+               gtk_widget_hide(filtering.dest_label);
+               gtk_widget_hide(filtering.exec_label);
+               gtk_widget_show(filtering.exec_btn);
+               gtk_widget_set_sensitive(filtering.exec_btn, FALSE);
+               gtk_widget_show(filtering.color_optmenu);
+               gtk_widget_show(filtering.color_label);
+               break;
+       case ACTION_DELETE_ON_SERVER:
+               gtk_widget_set_sensitive(filtering.account_combo, FALSE);
+               gtk_widget_hide(filtering.dest_entry);
+               gtk_widget_hide(filtering.dest_btn);
+               gtk_widget_hide(filtering.dest_label);
+               gtk_widget_hide(filtering.exec_label);
+               gtk_widget_show(filtering.exec_btn);
+               gtk_widget_hide(filtering.exec_btn);
+               gtk_widget_hide(filtering.color_optmenu);
+               gtk_widget_hide(filtering.color_label);
                break;
        }
 }
@@ -1017,12 +1328,12 @@ static void prefs_filtering_key_pressed(GtkWidget *widget, GdkEventKey *event,
 static void prefs_filtering_ok(void)
 {
        prefs_filtering_set_list();
-       prefs_filtering_write_config();
-       gtk_widget_hide(filtering.window);
+       prefs_matcher_write_config();
+       prefs_filtering_close();
 }
 
 static void prefs_filtering_cancel(void)
 {
-       prefs_filtering_read_config();
-       gtk_widget_hide(filtering.window);
+       prefs_matcher_read_config();
+       prefs_filtering_close();
 }