add 'fast filter' for claws' filtering

[claws.git] / src / prefs_matcher.c

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 2bdd7689ba4cee44a39f19ad69bc4d5cf6b4e093..d2a1b5a109b072c55f5c8f856cee1b0a51f0f192 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -108,7 +108,11 @@ enum {
        CRITERIA_SCORE_LOWER = 22,
        CRITERIA_SCORE_EQUAL = 23,
 
-       CRITERIA_EXECUTE = 24
+       CRITERIA_EXECUTE = 24,
+
+       CRITERIA_SIZE_GREATER = 25,
+       CRITERIA_SIZE_SMALLER = 26,
+       CRITERIA_SIZE_EQUAL   = 27
 };
 
 enum {
@@ -150,7 +154,10 @@ gchar * criteria_text [] = {
        N_("Replied flag"), N_("Forwarded flag"),
        N_("Score greater than"), N_("Score lower than"),
        N_("Score equal to"),
-       N_("Execute")
+       N_("Execute"),
+       N_("Size greater than"), 
+       N_("Size smaller than"),
+       N_("Size exactly")
 };
 
 static gint get_sel_from_list(GtkList * list)
@@ -212,7 +219,7 @@ 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();
@@ -283,7 +290,7 @@ static void prefs_matcher_create(void)
        GList *combo_items;
        gint i;
 
-       gchar *title[] = {_("Registered rules")};
+       gchar *title[1];
 
        debug_print(_("Creating matcher setting window...\n"));
 
@@ -309,10 +316,7 @@ static void prefs_matcher_create(void)
                            GTK_SIGNAL_FUNC(prefs_matcher_deleted), NULL);
        gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
                            GTK_SIGNAL_FUNC(prefs_matcher_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_matcher_ok), NULL);
        gtk_signal_connect (GTK_OBJECT(cancel_btn), "clicked",
@@ -377,7 +381,7 @@ static void prefs_matcher_create(void)
        gtkut_combo_set_items (GTK_COMBO (header_combo),
                               "Subject", "From", "To", "Cc", "Reply-To",
                               "Sender", "X-ML-Name", "X-List", "X-Sequence",
-                              "X-Mailer",
+                              "X-Mailer","X-BeenThere",
                               NULL);
        gtk_table_attach (GTK_TABLE (table1), header_combo, 1, 2, 1, 2,
                          0, 0, 0, 0);
@@ -547,6 +551,7 @@ static void prefs_matcher_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);
@@ -773,7 +778,12 @@ static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
        case MATCHCRITERIA_NOT_EXECUTE:
        case MATCHCRITERIA_EXECUTE:
                return CRITERIA_EXECUTE;
-               break;
+       case MATCHCRITERIA_SIZE_GREATER:
+               return CRITERIA_SIZE_GREATER;
+       case MATCHCRITERIA_SIZE_SMALLER:
+               return CRITERIA_SIZE_SMALLER;
+       case MATCHCRITERIA_SIZE_EQUAL:
+               return CRITERIA_SIZE_EQUAL;
        default:
                return -1;
        }
@@ -832,6 +842,12 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
                return MATCHCRITERIA_MESSAGE;
        case CRITERIA_EXECUTE:
                return MATCHCRITERIA_EXECUTE;
+       case CRITERIA_SIZE_GREATER:
+               return MATCHCRITERIA_SIZE_GREATER;
+       case CRITERIA_SIZE_SMALLER:
+               return MATCHCRITERIA_SIZE_SMALLER;
+       case CRITERIA_SIZE_EQUAL:
+               return MATCHCRITERIA_SIZE_EQUAL;
        default:
                return -1;
        }
@@ -992,6 +1008,9 @@ static MatcherProp * prefs_matcher_dialog_to_matcher()
        case CRITERIA_SCORE_GREATER:
        case CRITERIA_SCORE_LOWER:
        case CRITERIA_SCORE_EQUAL:
+       case CRITERIA_SIZE_GREATER:
+       case CRITERIA_SIZE_SMALLER:
+       case CRITERIA_SIZE_EQUAL:
                value_str = gtk_entry_get_text(GTK_ENTRY(matcher.value_entry));
 
                if (*value_str == '\0') {
@@ -1200,6 +1219,9 @@ static void prefs_matcher_select(GtkCList *clist, gint row, gint column,
        case MATCHCRITERIA_SCORE_GREATER:
        case MATCHCRITERIA_SCORE_LOWER:
        case MATCHCRITERIA_SCORE_EQUAL:
+       case MATCHCRITERIA_SIZE_GREATER:
+       case MATCHCRITERIA_SIZE_SMALLER:
+       case MATCHCRITERIA_SIZE_EQUAL:
                gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), itos(prop->value));
                break;
 
@@ -1327,6 +1349,9 @@ static void prefs_matcher_criteria_select(GtkList *list,
        case CRITERIA_SCORE_GREATER:
        case CRITERIA_SCORE_LOWER:
        case CRITERIA_SCORE_EQUAL:
+       case CRITERIA_SIZE_GREATER:
+       case CRITERIA_SIZE_SMALLER:
+       case CRITERIA_SIZE_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);
@@ -1368,6 +1393,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)
@@ -1375,15 +1401,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,