Fixed bug where scoring and filtering windows stopped autochecking.
[claws.git] / src / prefs_matcher.c
index 62e94149c3ff0db1c91f47a349c7041c23226688..e772c171ae5dff5057f320613cb7535e70aa4219 100644 (file)
@@ -46,6 +46,8 @@
 #include "alertpanel.h"
 #include "folder.h"
 
+#include "matcher_parser.h"
+
 static struct Matcher {
        GtkWidget *window;
 
@@ -70,6 +72,8 @@ static struct Matcher {
        GtkWidget *case_chkbtn;
        GtkWidget *regexp_chkbtn;
 
+       GtkWidget *exec_btn;
+
        GtkWidget *cond_clist;
 } matcher;
 
@@ -84,19 +88,27 @@ enum {
        CRITERIA_CC = 4,
        CRITERIA_TO_OR_CC = 5,
        CRITERIA_NEWSGROUPS = 6,
-       CRITERIA_AGE_GREATER = 7,
-       CRITERIA_AGE_LOWER = 8,
-       CRITERIA_HEADER = 9,
-       CRITERIA_HEADERS_PART = 10,
-       CRITERIA_BODY_PART = 11,
-       CRITERIA_MESSAGE = 12,
-
-       CRITERIA_UNREAD = 13,
-       CRITERIA_NEW = 14,
-       CRITERIA_MARKED = 15,
-       CRITERIA_DELETED = 16,
-       CRITERIA_REPLIED = 17,
-       CRITERIA_FORWARDED = 18
+       CRITERIA_INREPLYTO = 7,
+       CRITERIA_REFERENCES = 8,
+       CRITERIA_AGE_GREATER = 9,
+       CRITERIA_AGE_LOWER = 10,
+       CRITERIA_HEADER = 11,
+       CRITERIA_HEADERS_PART = 12,
+       CRITERIA_BODY_PART = 13,
+       CRITERIA_MESSAGE = 14,
+
+       CRITERIA_UNREAD = 15,
+       CRITERIA_NEW = 16,
+       CRITERIA_MARKED = 17,
+       CRITERIA_DELETED = 18,
+       CRITERIA_REPLIED = 19,
+       CRITERIA_FORWARDED = 20,
+
+       CRITERIA_SCORE_GREATER = 21,
+       CRITERIA_SCORE_LOWER = 22,
+       CRITERIA_SCORE_EQUAL = 23,
+
+       CRITERIA_EXECUTE = 24
 };
 
 enum {
@@ -105,7 +117,7 @@ enum {
 };
 
 gchar * bool_op_text [] = {
-       "or", "and"
+       N_("or"), N_("and")
 };
 
 enum {
@@ -114,7 +126,7 @@ enum {
 };
 
 gchar * predicate_text [] = {
-       "contains", "does not contain"
+       N_("contains"), N_("does not contain")
 };
 
 enum {
@@ -123,22 +135,25 @@ enum {
 };
 
 gchar * predicate_flag_text [] = {
-       "flag enabled", "flag disabled"
+       N_("yes"), N_("no")
 };
 
 gchar * criteria_text [] = {
-       "All messages", "Subject",
-       "From", "To", "Cc", "To or Cc",
-       "Newsgroups",
-       "Age greater than", "Age lower than",
-       "Header", "Headers part",
-       "Body part", "Whole message",
-       "Unread flag", "New flag",
-       "Marked flag", "Deleted flag",
-       "Replied flag", "Forwarded flag"
+       N_("All messages"), N_("Subject"),
+       N_("From"), N_("To"), N_("Cc"), N_("To or Cc"),
+       N_("Newsgroups"), N_("In reply to"), N_("References"),
+       N_("Age greater than"), N_("Age lower than"),
+       N_("Header"), N_("Headers part"),
+       N_("Body part"), N_("Whole message"),
+       N_("Unread flag"), N_("New flag"),
+       N_("Marked flag"), N_("Deleted flag"),
+       N_("Replied flag"), N_("Forwarded flag"),
+       N_("Score greater than"), N_("Score lower than"),
+       N_("Score equal to"),
+       N_("Execute")
 };
 
-gint get_sel_from_list(GtkList * list)
+static gint get_sel_from_list(GtkList * list)
 {
        gint row = 0;
        void * sel;
@@ -157,11 +172,6 @@ gint get_sel_from_list(GtkList * list)
 
 static PrefsMatcherSignal * matchers_callback;
 
-#define VSPACING               12
-#define VSPACING_NARROW                4
-#define DEFAULT_ENTRY_WIDTH    80
-#define PREFSBUFSIZE           1024
-
 /* widget creating functions */
 static void prefs_matcher_create       (void);
 
@@ -198,10 +208,11 @@ static void prefs_matcher_criteria_select(GtkList *list,
                                          GtkWidget *widget,
                                          gpointer user_data);
 static MatcherList * prefs_matcher_get_list(void);
+static void prefs_matcher_exec_info_create(void);
 
 void prefs_matcher_open(MatcherList * matchers, PrefsMatcherSignal * cb)
 {
-       inc_autocheck_timer_remove();
+       inc_lock();
 
        if (!matcher.window) {
                prefs_matcher_create();
@@ -267,6 +278,8 @@ static void prefs_matcher_create(void)
        GtkWidget *up_btn;
        GtkWidget *down_btn;
 
+       GtkWidget *exec_btn;
+
        GList *combo_items;
        gint i;
 
@@ -310,7 +323,7 @@ static void prefs_matcher_create(void)
        gtk_box_pack_start (GTK_BOX (vbox), vbox1, TRUE, TRUE, 0);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
 
-       table1 = gtk_table_new (2, 3, FALSE);
+       table1 = gtk_table_new (2, 4, FALSE);
        gtk_widget_show (table1);
 
        gtk_box_pack_start (GTK_BOX (vbox1), table1, FALSE, FALSE, 0);
@@ -385,6 +398,13 @@ static void prefs_matcher_create(void)
        gtk_table_attach (GTK_TABLE (table1), value_entry, 2, 3, 1, 2,
                          GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
 
+       exec_btn = gtk_button_new_with_label (_("Info ..."));
+       gtk_widget_show (exec_btn);
+       gtk_table_attach (GTK_TABLE (table1), exec_btn, 3, 4, 1, 2,
+                         GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
+       gtk_signal_connect (GTK_OBJECT (exec_btn), "clicked",
+                           GTK_SIGNAL_FUNC (prefs_matcher_exec_info),
+                           NULL);
 
        /* predicate */
 
@@ -574,6 +594,7 @@ static void prefs_matcher_create(void)
        matcher.case_chkbtn = case_chkbtn;
        matcher.regexp_chkbtn = regexp_chkbtn;
        matcher.bool_op_list = bool_op_list;
+       matcher.exec_btn = exec_btn;
 
        matcher.cond_clist   = cond_clist;
 }
@@ -608,11 +629,17 @@ static void prefs_matcher_reset_condition(void)
        gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), "");
 }
 
+static void prefs_matcher_update_hscrollbar(void)
+{
+       gint optwidth = gtk_clist_optimal_column_width(GTK_CLIST(matcher.cond_clist), 0);
+       gtk_clist_set_column_width(GTK_CLIST(matcher.cond_clist), 0, optwidth);
+}
+
 static void prefs_matcher_set_dialog(MatcherList * matchers)
 {
        GtkCList *clist = GTK_CLIST(matcher.cond_clist);
        GSList * cur;
-       gboolean bool_op = 0;
+       gboolean bool_op = 1;
 
        gtk_clist_freeze(clist);
        gtk_clist_clear(clist);
@@ -628,6 +655,8 @@ static void prefs_matcher_set_dialog(MatcherList * matchers)
 
                bool_op = matchers->bool_and;
        }
+       
+       prefs_matcher_update_hscrollbar();
 
        gtk_clist_thaw(clist);
 
@@ -652,10 +681,10 @@ static MatcherList * prefs_matcher_get_list(void)
                                  row, 0, &matcher_str)) {
 
                if (strcmp(matcher_str, _("(New)")) != 0) {
-                       tmp = matcher_str;
-                       prop = matcherprop_parse(&tmp);
+                       /* tmp = matcher_str; */
+                       prop = matcher_parser_get_prop(matcher_str);
                        
-                       if (tmp == NULL)
+                       if (prop == NULL)
                                break;
                        
                        matcher_list = g_slist_append(matcher_list, prop);
@@ -670,47 +699,139 @@ static MatcherList * prefs_matcher_get_list(void)
        return matchers;
 }
 
+static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
+{
+       switch(matching_id) {
+       case MATCHCRITERIA_ALL:
+               return CRITERIA_ALL;
+       case MATCHCRITERIA_NOT_UNREAD:
+       case MATCHCRITERIA_UNREAD:
+               return CRITERIA_UNREAD;
+       case MATCHCRITERIA_NOT_NEW:
+       case MATCHCRITERIA_NEW:
+               return CRITERIA_NEW;
+       case MATCHCRITERIA_NOT_MARKED:
+       case MATCHCRITERIA_MARKED:
+               return CRITERIA_MARKED;
+       case MATCHCRITERIA_NOT_DELETED:
+       case MATCHCRITERIA_DELETED:
+               return CRITERIA_DELETED;
+               break;
+       case MATCHCRITERIA_NOT_REPLIED:
+       case MATCHCRITERIA_REPLIED:
+               return CRITERIA_REPLIED;
+       case MATCHCRITERIA_NOT_FORWARDED:
+       case MATCHCRITERIA_FORWARDED:
+               return CRITERIA_FORWARDED;
+       case MATCHCRITERIA_NOT_SUBJECT:
+       case MATCHCRITERIA_SUBJECT:
+               return CRITERIA_SUBJECT;
+       case MATCHCRITERIA_NOT_FROM:
+       case MATCHCRITERIA_FROM:
+               return CRITERIA_FROM;
+       case MATCHCRITERIA_NOT_TO:
+       case MATCHCRITERIA_TO:
+               return CRITERIA_TO;
+       case MATCHCRITERIA_NOT_CC:
+       case MATCHCRITERIA_CC:
+               return CRITERIA_CC;
+       case MATCHCRITERIA_NOT_NEWSGROUPS:
+       case MATCHCRITERIA_NEWSGROUPS:
+               return CRITERIA_NEWSGROUPS;
+       case MATCHCRITERIA_NOT_INREPLYTO:
+       case MATCHCRITERIA_INREPLYTO:
+               return CRITERIA_INREPLYTO;
+       case MATCHCRITERIA_NOT_REFERENCES:
+       case MATCHCRITERIA_REFERENCES:
+               return CRITERIA_REFERENCES;
+       case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
+       case MATCHCRITERIA_TO_OR_CC:
+               return CRITERIA_TO_OR_CC;
+       case MATCHCRITERIA_NOT_BODY_PART:
+       case MATCHCRITERIA_BODY_PART:
+               return CRITERIA_BODY_PART;
+       case MATCHCRITERIA_NOT_MESSAGE:
+       case MATCHCRITERIA_MESSAGE:
+               return CRITERIA_MESSAGE;
+               break;
+       case MATCHCRITERIA_NOT_HEADERS_PART:
+       case MATCHCRITERIA_HEADERS_PART:
+               return CRITERIA_HEADERS_PART;
+       case MATCHCRITERIA_NOT_HEADER:
+       case MATCHCRITERIA_HEADER:
+               return CRITERIA_HEADER;
+       case MATCHCRITERIA_AGE_GREATER:
+               return CRITERIA_AGE_GREATER;
+       case MATCHCRITERIA_AGE_LOWER:
+               return CRITERIA_AGE_LOWER;
+       case MATCHCRITERIA_SCORE_GREATER:
+               return CRITERIA_SCORE_GREATER;
+       case MATCHCRITERIA_SCORE_LOWER:
+               return CRITERIA_SCORE_LOWER;
+       case MATCHCRITERIA_SCORE_EQUAL:
+               return CRITERIA_SCORE_EQUAL;
+       case MATCHCRITERIA_NOT_EXECUTE:
+       case MATCHCRITERIA_EXECUTE:
+               return CRITERIA_EXECUTE;
+               break;
+       default:
+               return -1;
+       }
+}
+
 static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
 {
        switch (criteria_id) {
        case CRITERIA_ALL:
-               return MATCHING_ALL;
+               return MATCHCRITERIA_ALL;
        case CRITERIA_UNREAD:
-               return MATCHING_UNREAD;
+               return MATCHCRITERIA_UNREAD;
        case CRITERIA_NEW:
-               return MATCHING_NEW;
+               return MATCHCRITERIA_NEW;
        case CRITERIA_MARKED:
-               return MATCHING_MARKED;
+               return MATCHCRITERIA_MARKED;
        case CRITERIA_DELETED:
-               return MATCHING_DELETED;
+               return MATCHCRITERIA_DELETED;
        case CRITERIA_REPLIED:
-               return MATCHING_REPLIED;
+               return MATCHCRITERIA_REPLIED;
        case CRITERIA_FORWARDED:
-               return MATCHING_FORWARDED;
+               return MATCHCRITERIA_FORWARDED;
        case CRITERIA_SUBJECT:
-               return MATCHING_SUBJECT;
+               return MATCHCRITERIA_SUBJECT;
        case CRITERIA_FROM:
-               return MATCHING_FROM;
+               return MATCHCRITERIA_FROM;
        case CRITERIA_TO:
-               return MATCHING_TO;
+               return MATCHCRITERIA_TO;
        case CRITERIA_CC:
-               return MATCHING_CC;
+               return MATCHCRITERIA_CC;
        case CRITERIA_TO_OR_CC:
-               return MATCHING_TO_OR_CC;
+               return MATCHCRITERIA_TO_OR_CC;
        case CRITERIA_NEWSGROUPS:
-               return MATCHING_NEWSGROUPS;
+               return MATCHCRITERIA_NEWSGROUPS;
+       case CRITERIA_INREPLYTO:
+               return MATCHCRITERIA_INREPLYTO;
+       case CRITERIA_REFERENCES:
+               return MATCHCRITERIA_REFERENCES;
        case CRITERIA_AGE_GREATER:
-               return MATCHING_AGE_GREATER;
+               return MATCHCRITERIA_AGE_GREATER;
        case CRITERIA_AGE_LOWER:
-               return MATCHING_AGE_LOWER;
+               return MATCHCRITERIA_AGE_LOWER;
+       case CRITERIA_SCORE_GREATER:
+               return MATCHCRITERIA_SCORE_GREATER;
+       case CRITERIA_SCORE_LOWER:
+               return MATCHCRITERIA_SCORE_LOWER;
+       case CRITERIA_SCORE_EQUAL:
+               return MATCHCRITERIA_SCORE_EQUAL;
        case CRITERIA_HEADER:
-               return MATCHING_HEADER;
+               return MATCHCRITERIA_HEADER;
        case CRITERIA_HEADERS_PART:
-               return MATCHING_HEADERS_PART;
+               return MATCHCRITERIA_HEADERS_PART;
        case CRITERIA_BODY_PART:
-               return MATCHING_BODY_PART;
+               return MATCHCRITERIA_BODY_PART;
        case CRITERIA_MESSAGE:
-               return MATCHING_MESSAGE;
+               return MATCHCRITERIA_MESSAGE;
+       case CRITERIA_EXECUTE:
+               return MATCHCRITERIA_EXECUTE;
        default:
                return -1;
        }
@@ -719,38 +840,44 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
 static gint prefs_matcher_not_criteria(gint matcher_criteria)
 {
        switch(matcher_criteria) {
-       case MATCHING_UNREAD:
-               return MATCHING_NOT_UNREAD;
-       case MATCHING_NEW:
-               return MATCHING_NOT_NEW;
-       case MATCHING_MARKED:
-               return MATCHING_NOT_MARKED;
-       case MATCHING_DELETED:
-               return MATCHING_NOT_DELETED;
-       case MATCHING_REPLIED:
-               return MATCHING_NOT_REPLIED;
-       case MATCHING_FORWARDED:
-               return MATCHING_NOT_FORWARDED;
-       case MATCHING_SUBJECT:
-               return MATCHING_NOT_SUBJECT;
-       case MATCHING_FROM:
-               return MATCHING_NOT_FROM;
-       case MATCHING_TO:
-               return MATCHING_NOT_TO;
-       case MATCHING_CC:
-               return MATCHING_NOT_CC;
-       case MATCHING_TO_OR_CC:
-               return MATCHING_NOT_TO_AND_NOT_CC;
-       case MATCHING_NEWSGROUPS:
-               return MATCHING_NOT_NEWSGROUPS;
-       case MATCHING_HEADER:
-               return MATCHING_NOT_HEADER;
-       case MATCHING_HEADERS_PART:
-               return MATCHING_NOT_HEADERS_PART;
-       case MATCHING_MESSAGE:
-               return MATCHING_NOT_MESSAGE;
-       case MATCHING_BODY_PART:
-               return MATCHING_NOT_BODY_PART;
+       case MATCHCRITERIA_UNREAD:
+               return MATCHCRITERIA_NOT_UNREAD;
+       case MATCHCRITERIA_NEW:
+               return MATCHCRITERIA_NOT_NEW;
+       case MATCHCRITERIA_MARKED:
+               return MATCHCRITERIA_NOT_MARKED;
+       case MATCHCRITERIA_DELETED:
+               return MATCHCRITERIA_NOT_DELETED;
+       case MATCHCRITERIA_REPLIED:
+               return MATCHCRITERIA_NOT_REPLIED;
+       case MATCHCRITERIA_FORWARDED:
+               return MATCHCRITERIA_NOT_FORWARDED;
+       case MATCHCRITERIA_SUBJECT:
+               return MATCHCRITERIA_NOT_SUBJECT;
+       case MATCHCRITERIA_FROM:
+               return MATCHCRITERIA_NOT_FROM;
+       case MATCHCRITERIA_TO:
+               return MATCHCRITERIA_NOT_TO;
+       case MATCHCRITERIA_CC:
+               return MATCHCRITERIA_NOT_CC;
+       case MATCHCRITERIA_TO_OR_CC:
+               return MATCHCRITERIA_NOT_TO_AND_NOT_CC;
+       case MATCHCRITERIA_NEWSGROUPS:
+               return MATCHCRITERIA_NOT_NEWSGROUPS;
+       case MATCHCRITERIA_INREPLYTO:
+               return MATCHCRITERIA_NOT_INREPLYTO;
+       case MATCHCRITERIA_REFERENCES:
+               return MATCHCRITERIA_NOT_REFERENCES;
+       case MATCHCRITERIA_HEADER:
+               return MATCHCRITERIA_NOT_HEADER;
+       case MATCHCRITERIA_HEADERS_PART:
+               return MATCHCRITERIA_NOT_HEADERS_PART;
+       case MATCHCRITERIA_MESSAGE:
+               return MATCHCRITERIA_NOT_MESSAGE;
+       case MATCHCRITERIA_EXECUTE:
+               return MATCHCRITERIA_NOT_EXECUTE;
+       case MATCHCRITERIA_BODY_PART:
+               return MATCHCRITERIA_NOT_BODY_PART;
        default:
                return matcher_criteria;
        }
@@ -768,8 +895,8 @@ static MatcherProp * prefs_matcher_dialog_to_matcher()
        gboolean case_sensitive;
        gchar * header;
        gchar * expr;
-       gint age;
-       gchar * age_str;
+       gint value;
+       gchar * value_str;
 
        value_criteria = get_sel_from_list(GTK_LIST(matcher.criteria_list));
 
@@ -797,9 +924,12 @@ static MatcherProp * prefs_matcher_dialog_to_matcher()
        case CRITERIA_CC:
        case CRITERIA_TO_OR_CC:
        case CRITERIA_NEWSGROUPS:
+       case CRITERIA_INREPLYTO:
+       case CRITERIA_REFERENCES:
        case CRITERIA_HEADERS_PART:
        case CRITERIA_BODY_PART:
        case CRITERIA_MESSAGE:
+       case CRITERIA_EXECUTE:
        case CRITERIA_AGE_GREATER:
        case CRITERIA_AGE_LOWER:
        case CRITERIA_HEADER:
@@ -810,20 +940,20 @@ static MatcherProp * prefs_matcher_dialog_to_matcher()
 
        if (use_regexp) {
                if (case_sensitive)
-                       matchtype = MATCHING_REGEXP;
+                       matchtype = MATCHTYPE_REGEXP;
                else
-                       matchtype = MATCHING_REGEXPCASE;
+                       matchtype = MATCHTYPE_REGEXPCASE;
        }
        else {
                if (case_sensitive)
-                       matchtype = MATCHING_MATCH;
+                       matchtype = MATCHTYPE_MATCH;
                else
-                       matchtype = MATCHING_MATCHCASE;
+                       matchtype = MATCHTYPE_MATCHCASE;
        }
 
        header = NULL;
        expr = NULL;
-       age = 0;
+       value = 0;
 
        switch (value_criteria) {
        case CRITERIA_ALL:
@@ -841,9 +971,12 @@ static MatcherProp * prefs_matcher_dialog_to_matcher()
        case CRITERIA_CC:
        case CRITERIA_TO_OR_CC:
        case CRITERIA_NEWSGROUPS:
+       case CRITERIA_INREPLYTO:
+       case CRITERIA_REFERENCES:
        case CRITERIA_HEADERS_PART:
        case CRITERIA_BODY_PART:
        case CRITERIA_MESSAGE:
+       case CRITERIA_EXECUTE:
                expr = gtk_entry_get_text(GTK_ENTRY(matcher.value_entry));
 
                /*
@@ -856,14 +989,17 @@ static MatcherProp * prefs_matcher_dialog_to_matcher()
 
        case CRITERIA_AGE_GREATER:
        case CRITERIA_AGE_LOWER:
-               age_str = gtk_entry_get_text(GTK_ENTRY(matcher.value_entry));
+       case CRITERIA_SCORE_GREATER:
+       case CRITERIA_SCORE_LOWER:
+       case CRITERIA_SCORE_EQUAL:
+               value_str = gtk_entry_get_text(GTK_ENTRY(matcher.value_entry));
 
-               if (*age_str == '\0') {
-                   alertpanel_error(_("Age is not set."));
+               if (*value_str == '\0') {
+                   alertpanel_error(_("Value is not set."));
                    return NULL;
                }
 
-               age = atoi(age_str);
+               value = atoi(value_str);
 
                break;
 
@@ -885,7 +1021,8 @@ static MatcherProp * prefs_matcher_dialog_to_matcher()
                break;
        }
 
-       matcherprop =  matcherprop_new(criteria, header, matchtype, expr, age);
+       matcherprop =  matcherprop_new(criteria, header, matchtype,
+                                      expr, value);
 
        return matcherprop;
 }
@@ -903,6 +1040,7 @@ static void prefs_matcher_register_cb(void)
        matcherprop_free(matcherprop);
 
        prefs_matcher_reset_condition();
+       prefs_matcher_update_hscrollbar();
 }
 
 static void prefs_matcher_substitute_cb(void)
@@ -924,6 +1062,8 @@ static void prefs_matcher_substitute_cb(void)
        matcherprop_free(matcherprop);
 
        prefs_matcher_reset_condition();
+       
+       prefs_matcher_update_hscrollbar();
 }
 
 static void prefs_matcher_delete_cb(void)
@@ -937,6 +1077,8 @@ static void prefs_matcher_delete_cb(void)
                return;
 
        gtk_clist_remove(clist, row);
+       
+       prefs_matcher_update_hscrollbar();
 }
 
 static void prefs_matcher_up(void)
@@ -947,8 +1089,12 @@ static void prefs_matcher_up(void)
        if (!clist->selection) return;
 
        row = GPOINTER_TO_INT(clist->selection->data);
-       if (row > 1)
+       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);
+               } 
+       }
 }
 
 static void prefs_matcher_down(void)
@@ -959,8 +1105,12 @@ static void prefs_matcher_down(void)
        if (!clist->selection) return;
 
        row = GPOINTER_TO_INT(clist->selection->data);
-       if (row >= 1 && row < clist->rows - 1)
+       if (row >= 1 && 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);
+               } 
+       }
 }
 
 static void prefs_matcher_select(GtkCList *clist, gint row, gint column,
@@ -970,6 +1120,7 @@ static void prefs_matcher_select(GtkCList *clist, gint row, gint column,
        gchar * tmp;
        MatcherProp * prop;
        gboolean negative_cond;
+       gint criteria;
 
        if (!gtk_clist_get_text(GTK_CLIST(matcher.cond_clist),
                                row, 0, &matcher_str))
@@ -982,172 +1133,78 @@ static void prefs_matcher_select(GtkCList *clist, gint row, gint column,
                return;
        }
 
-       tmp = matcher_str;
-       prop = matcherprop_parse(&tmp);
-       if (tmp == NULL)
+       //      tmp = matcher_str;
+       prop = matcher_parser_get_prop(matcher_str);
+       if (prop == NULL)
                return;
 
-       switch(prop->criteria) {
-       case MATCHING_ALL:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_ALL);
-               break;
-
-       case MATCHING_NOT_UNREAD:
-               negative_cond = TRUE;
-       case MATCHING_UNREAD:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_UNREAD);
-               break;
-
-       case MATCHING_NOT_NEW:
-               negative_cond = TRUE;
-       case MATCHING_NEW:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_NEW);
-               break;
-
-       case MATCHING_NOT_MARKED:
-               negative_cond = TRUE;
-       case MATCHING_MARKED:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_MARKED);
-               break;
-
-       case MATCHING_NOT_DELETED:
-               negative_cond = TRUE;
-       case MATCHING_DELETED:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_DELETED);
-               break;
-
-       case MATCHING_NOT_REPLIED:
-               negative_cond = TRUE;
-       case MATCHING_REPLIED:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_REPLIED);
-               break;
-
-       case MATCHING_NOT_FORWARDED:
-               negative_cond = TRUE;
-       case MATCHING_FORWARDED:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_FORWARDED);
-               break;
-
-       case MATCHING_NOT_SUBJECT:
-               negative_cond = TRUE;
-       case MATCHING_SUBJECT:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_SUBJECT);
-               break;
-
-       case MATCHING_NOT_FROM:
-               negative_cond = TRUE;
-       case MATCHING_FROM:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_FROM);
-               break;
-
-       case MATCHING_NOT_TO:
-               negative_cond = TRUE;
-       case MATCHING_TO:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_TO);
-               break;
-
-       case MATCHING_NOT_CC:
-               negative_cond = TRUE;
-       case MATCHING_CC:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_CC);
-               break;
-
-       case MATCHING_NOT_NEWSGROUPS:
-               negative_cond = TRUE;
-       case MATCHING_NEWSGROUPS:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_NEWSGROUPS);
-               break;
-
-       case MATCHING_NOT_TO_AND_NOT_CC:
-               negative_cond = TRUE;
-       case MATCHING_TO_OR_CC:
+       criteria = prefs_matcher_get_criteria_from_matching(prop->criteria);
+       if (criteria != -1)
                gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_TO_OR_CC);
-               break;
+                                    criteria);
 
-       case MATCHING_NOT_BODY_PART:
-               negative_cond = TRUE;
-       case MATCHING_BODY_PART:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_BODY_PART);
-               break;
-
-       case MATCHING_NOT_MESSAGE:
-               negative_cond = TRUE;
-       case MATCHING_MESSAGE:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_MESSAGE);
-               break;
-
-       case MATCHING_NOT_HEADERS_PART:
-               negative_cond = TRUE;
-       case MATCHING_HEADERS_PART:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_HEADERS_PART);
-               break;
-
-       case MATCHING_NOT_HEADER:
+       switch(prop->criteria) {
+       case MATCHCRITERIA_NOT_UNREAD:
+       case MATCHCRITERIA_NOT_NEW:
+       case MATCHCRITERIA_NOT_MARKED:
+       case MATCHCRITERIA_NOT_DELETED:
+       case MATCHCRITERIA_NOT_REPLIED:
+       case MATCHCRITERIA_NOT_FORWARDED:
+       case MATCHCRITERIA_NOT_SUBJECT:
+       case MATCHCRITERIA_NOT_FROM:
+       case MATCHCRITERIA_NOT_TO:
+       case MATCHCRITERIA_NOT_CC:
+       case MATCHCRITERIA_NOT_NEWSGROUPS:
+       case MATCHCRITERIA_NOT_INREPLYTO:
+       case MATCHCRITERIA_NOT_REFERENCES:
+       case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
+       case MATCHCRITERIA_NOT_BODY_PART:
+       case MATCHCRITERIA_NOT_MESSAGE:
+       case MATCHCRITERIA_NOT_HEADERS_PART:
+       case MATCHCRITERIA_NOT_HEADER:
                negative_cond = TRUE;
-       case MATCHING_HEADER:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_HEADER);
-               break;
-
-       case MATCHING_AGE_GREATER:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_AGE_GREATER);
-               break;
-
-       case MATCHING_AGE_LOWER:
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    CRITERIA_AGE_LOWER);
                break;
        }
        
        switch(prop->criteria) {
-       case MATCHING_ALL:
+       case MATCHCRITERIA_ALL:
                break;
 
-       case MATCHING_NOT_SUBJECT:
-       case MATCHING_NOT_FROM:
-       case MATCHING_NOT_TO:
-       case MATCHING_NOT_CC:
-       case MATCHING_NOT_TO_AND_NOT_CC:
-       case MATCHING_NOT_NEWSGROUPS:
-       case MATCHING_NOT_HEADERS_PART:
-       case MATCHING_NOT_BODY_PART:
-       case MATCHING_NOT_MESSAGE:
-       case MATCHING_SUBJECT:
-       case MATCHING_FROM:
-       case MATCHING_TO:
-       case MATCHING_CC:
-       case MATCHING_TO_OR_CC:
-       case MATCHING_NEWSGROUPS:
-       case MATCHING_HEADERS_PART:
-       case MATCHING_BODY_PART:
-       case MATCHING_MESSAGE:
+       case MATCHCRITERIA_NOT_SUBJECT:
+       case MATCHCRITERIA_NOT_FROM:
+       case MATCHCRITERIA_NOT_TO:
+       case MATCHCRITERIA_NOT_CC:
+       case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
+       case MATCHCRITERIA_NOT_NEWSGROUPS:
+       case MATCHCRITERIA_NOT_INREPLYTO:
+       case MATCHCRITERIA_NOT_REFERENCES:
+       case MATCHCRITERIA_NOT_HEADERS_PART:
+       case MATCHCRITERIA_NOT_BODY_PART:
+       case MATCHCRITERIA_NOT_MESSAGE:
+       case MATCHCRITERIA_SUBJECT:
+       case MATCHCRITERIA_FROM:
+       case MATCHCRITERIA_TO:
+       case MATCHCRITERIA_CC:
+       case MATCHCRITERIA_TO_OR_CC:
+       case MATCHCRITERIA_NEWSGROUPS:
+       case MATCHCRITERIA_INREPLYTO:
+       case MATCHCRITERIA_REFERENCES:
+       case MATCHCRITERIA_HEADERS_PART:
+       case MATCHCRITERIA_BODY_PART:
+       case MATCHCRITERIA_MESSAGE:
                gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), prop->expr);
                break;
 
-       case MATCHING_AGE_GREATER:
-       case MATCHING_AGE_LOWER:
-               gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), itos(prop->age));
+       case MATCHCRITERIA_AGE_GREATER:
+       case MATCHCRITERIA_AGE_LOWER:
+       case MATCHCRITERIA_SCORE_GREATER:
+       case MATCHCRITERIA_SCORE_LOWER:
+       case MATCHCRITERIA_SCORE_EQUAL:
+               gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), itos(prop->value));
                break;
 
-       case MATCHING_NOT_HEADER:
-       case MATCHING_HEADER:
+       case MATCHCRITERIA_NOT_HEADER:
+       case MATCHCRITERIA_HEADER:
                gtk_entry_set_text(GTK_ENTRY(matcher.header_entry), prop->header);
                gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), prop->expr);
                break;
@@ -1159,22 +1216,22 @@ static void prefs_matcher_select(GtkCList *clist, gint row, gint column,
                gtk_list_select_item(GTK_LIST(matcher.predicate_list), 0);
 
        switch(prop->matchtype) {
-       case MATCHING_MATCH:
+       case MATCHTYPE_MATCH:
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_chkbtn), FALSE);
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_chkbtn), TRUE);
                break;
 
-       case MATCHING_MATCHCASE:
+       case MATCHTYPE_MATCHCASE:
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_chkbtn), FALSE);
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_chkbtn), FALSE);
                break;
 
-       case MATCHING_REGEXP:
+       case MATCHTYPE_REGEXP:
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_chkbtn), TRUE);
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_chkbtn), TRUE);
                break;
 
-       case MATCHING_REGEXPCASE:
+       case MATCHTYPE_REGEXPCASE:
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.regexp_chkbtn), TRUE);
                gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(matcher.case_chkbtn), FALSE);
                break;
@@ -1202,6 +1259,7 @@ static void prefs_matcher_criteria_select(GtkList *list,
                gtk_widget_show(matcher.predicate_flag_combo);
                gtk_widget_set_sensitive(matcher.case_chkbtn, FALSE);
                gtk_widget_set_sensitive(matcher.regexp_chkbtn, FALSE);
+               gtk_widget_set_sensitive(matcher.exec_btn, FALSE);
                break;
 
        case CRITERIA_UNREAD:
@@ -1221,6 +1279,7 @@ static void prefs_matcher_criteria_select(GtkList *list,
                gtk_widget_show(matcher.predicate_flag_combo);
                gtk_widget_set_sensitive(matcher.case_chkbtn, FALSE);
                gtk_widget_set_sensitive(matcher.regexp_chkbtn, FALSE);
+               gtk_widget_set_sensitive(matcher.exec_btn, FALSE);
                break;
 
        case CRITERIA_SUBJECT:
@@ -1229,6 +1288,8 @@ static void prefs_matcher_criteria_select(GtkList *list,
        case CRITERIA_CC:
        case CRITERIA_TO_OR_CC:
        case CRITERIA_NEWSGROUPS:
+       case CRITERIA_INREPLYTO:
+       case CRITERIA_REFERENCES:
        case CRITERIA_HEADERS_PART:
        case CRITERIA_BODY_PART:
        case CRITERIA_MESSAGE:
@@ -1243,10 +1304,29 @@ static void prefs_matcher_criteria_select(GtkList *list,
                gtk_widget_hide(matcher.predicate_flag_combo);
                gtk_widget_set_sensitive(matcher.case_chkbtn, TRUE);
                gtk_widget_set_sensitive(matcher.regexp_chkbtn, TRUE);
+               gtk_widget_set_sensitive(matcher.exec_btn, FALSE);
+               break;
+
+       case CRITERIA_EXECUTE:
+               gtk_widget_set_sensitive(matcher.header_combo, FALSE);
+               gtk_widget_set_sensitive(matcher.header_label, FALSE);
+               gtk_widget_set_sensitive(matcher.value_label, TRUE);
+               gtk_widget_set_sensitive(matcher.value_entry, TRUE);
+               gtk_widget_set_sensitive(matcher.predicate_label, TRUE);
+               gtk_widget_set_sensitive(matcher.predicate_combo, FALSE);
+               gtk_widget_set_sensitive(matcher.predicate_flag_combo, TRUE);
+               gtk_widget_hide(matcher.predicate_combo);
+               gtk_widget_show(matcher.predicate_flag_combo);
+               gtk_widget_set_sensitive(matcher.case_chkbtn, FALSE);
+               gtk_widget_set_sensitive(matcher.regexp_chkbtn, FALSE);
+               gtk_widget_set_sensitive(matcher.exec_btn, TRUE);
                break;
 
        case CRITERIA_AGE_GREATER:
        case CRITERIA_AGE_LOWER:
+       case CRITERIA_SCORE_GREATER:
+       case CRITERIA_SCORE_LOWER:
+       case CRITERIA_SCORE_EQUAL:
                gtk_widget_set_sensitive(matcher.header_combo, FALSE);
                gtk_widget_set_sensitive(matcher.header_label, FALSE);
                gtk_widget_set_sensitive(matcher.value_label, TRUE);
@@ -1258,6 +1338,7 @@ static void prefs_matcher_criteria_select(GtkList *list,
                gtk_widget_hide(matcher.predicate_flag_combo);
                gtk_widget_set_sensitive(matcher.case_chkbtn, FALSE);
                gtk_widget_set_sensitive(matcher.regexp_chkbtn, FALSE);
+               gtk_widget_set_sensitive(matcher.exec_btn, FALSE);
                break;
 
        case CRITERIA_HEADER:
@@ -1272,6 +1353,7 @@ static void prefs_matcher_criteria_select(GtkList *list,
                gtk_widget_hide(matcher.predicate_flag_combo);
                gtk_widget_set_sensitive(matcher.case_chkbtn, TRUE);
                gtk_widget_set_sensitive(matcher.regexp_chkbtn, TRUE);
+               gtk_widget_set_sensitive(matcher.exec_btn, FALSE);
                break;
        }
 }
@@ -1286,6 +1368,7 @@ static void prefs_matcher_key_pressed(GtkWidget *widget, GdkEventKey *event,
 static void prefs_matcher_cancel(void)
 {
        gtk_widget_hide(matcher.window);
+       inc_unlock();
 }
 
 static void prefs_matcher_ok(void)
@@ -1293,15 +1376,13 @@ static void prefs_matcher_ok(void)
        MatcherList * matchers;
 
        matchers = prefs_matcher_get_list();
+       gtk_widget_hide(matcher.window);
+       inc_unlock();
        if (matchers != NULL) {
-               gtk_widget_hide(matcher.window);
                if (matchers_callback != NULL)
                        matchers_callback(matchers);
                matcherlist_free(matchers);
        }
-       else {
-               gtk_widget_hide(matcher.window);
-       }
 }
 
 static gint prefs_matcher_deleted(GtkWidget *widget, GdkEventAny *event,
@@ -1310,3 +1391,89 @@ static gint prefs_matcher_deleted(GtkWidget *widget, GdkEventAny *event,
        prefs_matcher_cancel();
        return TRUE;
 }
+
+static GtkWidget * exec_info_win;
+
+void prefs_matcher_exec_info(void)
+{
+       if (!exec_info_win)
+               prefs_matcher_exec_info_create();
+
+       gtk_widget_show(exec_info_win);
+       gtk_main();
+       gtk_widget_hide(exec_info_win);
+}
+
+static void prefs_matcher_exec_info_create(void)
+{
+       GtkWidget *vbox;
+       GtkWidget *hbox;
+       GtkWidget *hbbox;
+       GtkWidget *label;
+       GtkWidget *ok_btn;
+
+       exec_info_win = gtk_window_new(GTK_WINDOW_DIALOG);
+       gtk_window_set_title(GTK_WINDOW(exec_info_win),
+                            _("Description of symbols"));
+       gtk_container_set_border_width(GTK_CONTAINER(exec_info_win), 8);
+       gtk_window_set_position(GTK_WINDOW(exec_info_win), GTK_WIN_POS_CENTER);
+       gtk_window_set_modal(GTK_WINDOW(exec_info_win), TRUE);
+       gtk_window_set_policy(GTK_WINDOW(exec_info_win), FALSE, TRUE, FALSE);
+
+       vbox = gtk_vbox_new(FALSE, 8);
+       gtk_container_add(GTK_CONTAINER(exec_info_win), vbox);
+
+       hbox = gtk_hbox_new(FALSE, 4);
+       gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
+
+       label = gtk_label_new
+               ("%%:\n"
+                "%s:\n"
+                "%f:\n"
+                "%t:\n"
+                "%c:\n"
+                "%d:\n"
+                "%i:\n"
+                "%n:\n"
+                "%r:\n"
+                "%F:\n"
+                "\\n:\n"
+                "\\:\n"
+                "\\\":\n"
+                "%%:");
+
+       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+
+       label = gtk_label_new
+               (_("%\n"
+                  "Subject\n"
+                  "From\n"
+                  "To\n"
+                  "Cc\n"
+                  "Date\n"
+                  "Message-ID\n"
+                  "Newsgroups\n"
+                  "References\n"
+                  "Filename - should not be modified\n"
+                  "new line\n"
+                  "escape character for quotes\n"
+                  "quote character\n"
+                  "%"));
+
+       gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+       gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+
+       gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
+                               NULL, NULL, NULL, NULL);
+       gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
+
+       gtk_widget_grab_default(ok_btn);
+       gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
+                                 GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
+
+       gtk_signal_connect(GTK_OBJECT(exec_info_win), "delete_event",
+                                         GTK_SIGNAL_FUNC(gtk_main_quit), NULL);
+
+       gtk_widget_show_all(vbox);
+}