2005-09-14 [paul] 1.9.14cvs26
[claws.git] / src / prefs_matcher.c
index e6dcb05042ac7bd609abd97ba338d8af2eace357..e1da458a9bf8d282c8a898fc6b349e5ae7394ace 100644 (file)
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -31,7 +32,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "main.h"
 #include "prefs_gtk.h"
 #include "prefs_matcher.h"
 #include "matcher_parser.h"
 #include "colorlabel.h"
 
+enum {
+       PREFS_MATCHER_COND,
+       PREFS_MATCHER_COND_VALID,
+       N_PREFS_MATCHER_COLUMNS
+};
+
 /*!
  *\brief       UI data for matcher dialog
  */
@@ -78,9 +84,9 @@ static struct Matcher {
        GtkWidget *regexp_chkbtn;
        GtkWidget *color_optmenu;
 
-       GtkWidget *exec_btn;
+       GtkWidget *test_btn;
 
-       GtkWidget *cond_clist;
+       GtkWidget *cond_list_view;
 
        GtkWidget *criteria_table;
 
@@ -128,11 +134,13 @@ enum {
        CRITERIA_SCORE_LOWER = 25,
        CRITERIA_SCORE_EQUAL = 26,
 
-       CRITERIA_EXECUTE = 27,
+       CRITERIA_TEST = 27,
 
        CRITERIA_SIZE_GREATER = 28,
        CRITERIA_SIZE_SMALLER = 29,
-       CRITERIA_SIZE_EQUAL   = 30
+       CRITERIA_SIZE_EQUAL   = 30,
+       
+       CRITERIA_PARTIAL = 31
 };
 
 /*!
@@ -153,10 +161,11 @@ static const gchar *criteria_text [] = {
        N_("Ignore thread"),
        N_("Score greater than"), N_("Score lower than"),
        N_("Score equal to"),
-       N_("Execute"),
+       N_("Test"),
        N_("Size greater than"), 
        N_("Size smaller than"),
-       N_("Size exactly")
+       N_("Size exactly"),
+       N_("Partially downloaded")
 };
 
 /*!
@@ -219,7 +228,8 @@ static PrefsMatcherSignal *matchers_callback;
 static void prefs_matcher_create       (void);
 
 static void prefs_matcher_set_dialog   (MatcherList *matchers);
-static gint prefs_matcher_clist_set_row        (gint row, MatcherProp *prop);
+static void prefs_matcher_list_view_set_row    (GtkTreeIter *row, 
+                                                MatcherProp *prop);
 
 /* callback functions */
 
@@ -228,11 +238,7 @@ static void prefs_matcher_substitute_cb    (void);
 static void prefs_matcher_delete_cb    (void);
 static void prefs_matcher_up           (void);
 static void prefs_matcher_down         (void);
-static void prefs_matcher_select       (GtkCList       *clist,
-                                        gint            row,
-                                        gint            column,
-                                        GdkEvent       *event);
-static void prefs_matcher_key_pressed  (GtkWidget      *widget,
+static gboolean prefs_matcher_key_pressed(GtkWidget    *widget,
                                         GdkEventKey    *event,
                                         gpointer        data);
 static void prefs_matcher_ok           (void);
@@ -244,6 +250,22 @@ static void prefs_matcher_criteria_select  (GtkList   *list,
                                                 gpointer   user_data);
 static MatcherList *prefs_matcher_get_list     (void);
 
+static GtkListStore* prefs_matcher_create_data_store   (void);
+
+static void prefs_matcher_list_view_insert_matcher     (GtkWidget *list_view,
+                                                        GtkTreeIter *row_iter,
+                                                        const gchar *matcher,
+                                                        gboolean is_valid);
+
+static GtkWidget *prefs_matcher_list_view_create       (void);
+
+static void prefs_matcher_create_list_view_columns     (GtkWidget *list_view);
+
+static gboolean prefs_matcher_selected                 (GtkTreeSelection *selector,
+                                                        GtkTreeModel *model, 
+                                                        GtkTreePath *path,
+                                                        gboolean currently_selected,
+                                                        gpointer data);
 
 /*!
  *\brief       Find index of list selection 
@@ -340,50 +362,48 @@ static void prefs_matcher_create(void)
 
        GtkWidget *cond_hbox;
        GtkWidget *cond_scrolledwin;
-       GtkWidget *cond_clist;
+       GtkWidget *cond_list_view;
 
        GtkWidget *btn_vbox;
        GtkWidget *up_btn;
        GtkWidget *down_btn;
 
-       GtkWidget *exec_btn;
+       GtkWidget *test_btn;
 
        GtkWidget *color_optmenu;
 
        GList *combo_items;
        gint i;
 
-       gchar *title[1];
-
        debug_print("Creating matcher configuration window...\n");
 
-       window = gtk_window_new(GTK_WINDOW_DIALOG);
+       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-       gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+       gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
        gtk_window_set_modal(GTK_WINDOW(window), TRUE);
-       gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, FALSE);
+       gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 
        vbox = gtk_vbox_new(FALSE, 6);
        gtk_widget_show(vbox);
        gtk_container_add(GTK_CONTAINER(window), vbox);
 
-       gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
-                               &cancel_btn, _("Cancel"), NULL, NULL);
+       gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
+                                     &cancel_btn, GTK_STOCK_CANCEL, NULL, NULL);
        gtk_widget_show(confirm_area);
        gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
        gtk_widget_grab_default(ok_btn);
 
        gtk_window_set_title(GTK_WINDOW(window),
                             _("Condition configuration"));
-       gtk_signal_connect(GTK_OBJECT(window), "delete_event",
-                          GTK_SIGNAL_FUNC(prefs_matcher_deleted), NULL);
-       gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
-                          GTK_SIGNAL_FUNC(prefs_matcher_key_pressed), NULL);
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(prefs_matcher_deleted), NULL);
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(prefs_matcher_key_pressed), 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",
-                          GTK_SIGNAL_FUNC(prefs_matcher_cancel), NULL);
+       g_signal_connect(G_OBJECT(ok_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_ok), NULL);
+       g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_cancel), NULL);
 
        vbox1 = gtk_vbox_new(FALSE, VSPACING);
        gtk_widget_show(vbox1);
@@ -418,13 +438,13 @@ static void prefs_matcher_create(void)
 
        g_list_free(combo_items);
 
-       gtk_widget_set_usize(criteria_combo, 120, -1);
+       gtk_widget_set_size_request(criteria_combo, 120, -1);
        gtk_table_attach(GTK_TABLE(criteria_table), criteria_combo, 0, 1, 1, 2,
                          0, 0, 0, 0);
        criteria_list = GTK_COMBO(criteria_combo)->list;
-       gtk_signal_connect(GTK_OBJECT(criteria_list), "select-child",
-                          GTK_SIGNAL_FUNC(prefs_matcher_criteria_select),
-                          NULL);
+       g_signal_connect(G_OBJECT(criteria_list), "select-child",
+                        G_CALLBACK(prefs_matcher_criteria_select),
+                        NULL);
 
        gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(criteria_combo)->entry),
                               FALSE);
@@ -439,7 +459,7 @@ static void prefs_matcher_create(void)
 
        header_combo = gtk_combo_new();
        gtk_widget_show(header_combo);
-       gtk_widget_set_usize(header_combo, 96, -1);
+       gtk_widget_set_size_request(header_combo, 96, -1);
        gtkut_combo_set_items(GTK_COMBO (header_combo),
                              "Subject", "From", "To", "Cc", "Reply-To",
                              "Sender", "X-ML-Name", "X-List", "X-Sequence",
@@ -460,17 +480,17 @@ static void prefs_matcher_create(void)
 
        value_entry = gtk_entry_new();
        gtk_widget_show(value_entry);
-       gtk_widget_set_usize(value_entry, 200, -1);
+       gtk_widget_set_size_request(value_entry, 200, -1);
        gtk_table_attach(GTK_TABLE(criteria_table), 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 (criteria_table), exec_btn, 3, 4, 1, 2,
+       test_btn = gtk_button_new_with_label(_("Info ..."));
+       gtk_widget_show(test_btn);
+       gtk_table_attach(GTK_TABLE (criteria_table), test_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);
+       g_signal_connect(G_OBJECT (test_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_test_info),
+                        NULL);
 
        color_optmenu = gtk_option_menu_new();
        gtk_option_menu_set_menu(GTK_OPTION_MENU(color_optmenu),
@@ -493,7 +513,7 @@ static void prefs_matcher_create(void)
 
        predicate_combo = gtk_combo_new();
        gtk_widget_show(predicate_combo);
-       gtk_widget_set_usize(predicate_combo, 120, -1);
+       gtk_widget_set_size_request(predicate_combo, 120, -1);
        predicate_list = GTK_COMBO(predicate_combo)->list;
        gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(predicate_combo)->entry),
                               FALSE);
@@ -515,7 +535,7 @@ static void prefs_matcher_create(void)
 
        predicate_flag_combo = gtk_combo_new();
        gtk_widget_hide(predicate_flag_combo);
-       gtk_widget_set_usize(predicate_flag_combo, 120, -1);
+       gtk_widget_set_size_request(predicate_flag_combo, 120, -1);
        predicate_flag_list = GTK_COMBO(predicate_flag_combo)->list;
        gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(predicate_flag_combo)->entry), FALSE);
 
@@ -548,30 +568,30 @@ static void prefs_matcher_create(void)
        arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
        gtk_widget_show(arrow);
        gtk_box_pack_start(GTK_BOX(reg_hbox), arrow, FALSE, FALSE, 0);
-       gtk_widget_set_usize(arrow, -1, 16);
+       gtk_widget_set_size_request(arrow, -1, 16);
 
        btn_hbox = gtk_hbox_new(TRUE, 4);
        gtk_widget_show(btn_hbox);
        gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
 
-       reg_btn = gtk_button_new_with_label(_("Add"));
+       reg_btn = gtk_button_new_from_stock(GTK_STOCK_ADD);
        gtk_widget_show(reg_btn);
        gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
-       gtk_signal_connect(GTK_OBJECT(reg_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_matcher_register_cb), NULL);
+       g_signal_connect(G_OBJECT(reg_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_register_cb), NULL);
 
        subst_btn = gtk_button_new_with_label(_("  Replace  "));
        gtk_widget_show(subst_btn);
        gtk_box_pack_start(GTK_BOX(btn_hbox), subst_btn, FALSE, TRUE, 0);
-       gtk_signal_connect(GTK_OBJECT(subst_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_matcher_substitute_cb),
-                          NULL);
+       g_signal_connect(G_OBJECT(subst_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_substitute_cb),
+                        NULL);
 
-       del_btn = gtk_button_new_with_label(_("Delete"));
+       del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
        gtk_widget_show(del_btn);
        gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
-       gtk_signal_connect(GTK_OBJECT(del_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_matcher_delete_cb), NULL);
+       g_signal_connect(G_OBJECT(del_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_delete_cb), NULL);
 
        /* boolean operation */
 
@@ -583,7 +603,7 @@ static void prefs_matcher_create(void)
 
        bool_op_combo = gtk_combo_new();
        gtk_widget_show(bool_op_combo);
-       gtk_widget_set_usize(bool_op_combo, 50, -1);
+       gtk_widget_set_size_request(bool_op_combo, 50, -1);
        bool_op_list = GTK_COMBO(bool_op_combo)->list;
        gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(bool_op_combo)->entry),
                               FALSE);
@@ -607,40 +627,32 @@ static void prefs_matcher_create(void)
 
        cond_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_widget_show(cond_scrolledwin);
-       gtk_widget_set_usize(cond_scrolledwin, -1, 150);
+       gtk_widget_set_size_request(cond_scrolledwin, -1, 150);
        gtk_box_pack_start(GTK_BOX(cond_hbox), cond_scrolledwin,
                           TRUE, TRUE, 0);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(cond_scrolledwin),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
 
-       title[0] = _("Current condition rules");
-       cond_clist = gtk_clist_new_with_titles(1, title);
-       gtk_widget_show(cond_clist);
-       gtk_container_add(GTK_CONTAINER(cond_scrolledwin), cond_clist);
-       gtk_clist_set_column_width(GTK_CLIST(cond_clist), 0, 80);
-       gtk_clist_set_selection_mode(GTK_CLIST(cond_clist),
-                                    GTK_SELECTION_BROWSE);
-       GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(cond_clist)->column[0].button,
-                              GTK_CAN_FOCUS);
-       gtk_signal_connect(GTK_OBJECT(cond_clist), "select_row",
-                          GTK_SIGNAL_FUNC(prefs_matcher_select), NULL);
+       cond_list_view = prefs_matcher_list_view_create();                                     
+       gtk_widget_show(cond_list_view);
+       gtk_container_add(GTK_CONTAINER(cond_scrolledwin), cond_list_view);
 
        btn_vbox = gtk_vbox_new(FALSE, 8);
        gtk_widget_show(btn_vbox);
        gtk_box_pack_start(GTK_BOX(cond_hbox), btn_vbox, FALSE, FALSE, 0);
 
-       up_btn = gtk_button_new_with_label(_("Up"));
+       up_btn = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
        gtk_widget_show(up_btn);
        gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 0);
-       gtk_signal_connect(GTK_OBJECT(up_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_matcher_up), NULL);
+       g_signal_connect(G_OBJECT(up_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_up), NULL);
 
-       down_btn = gtk_button_new_with_label(_("Down"));
+       down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
        gtk_widget_show(down_btn);
        gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0);
-       gtk_signal_connect(GTK_OBJECT(down_btn), "clicked",
-                          GTK_SIGNAL_FUNC(prefs_matcher_down), NULL);
+       g_signal_connect(G_OBJECT(down_btn), "clicked",
+                        G_CALLBACK(prefs_matcher_down), NULL);
 
        gtk_widget_show_all(window);
 
@@ -662,11 +674,11 @@ 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.test_btn = test_btn;
        matcher.color_optmenu = color_optmenu;
        matcher.criteria_table = criteria_table;
 
-       matcher.cond_clist = cond_clist;
+       matcher.cond_list_view = cond_list_view;
 }
 
 /*!
@@ -677,26 +689,26 @@ static void prefs_matcher_create(void)
  *
  *\return      gint Row index \a prop has been added
  */
-static gint prefs_matcher_clist_set_row(gint row, MatcherProp *prop)
+static void prefs_matcher_list_view_set_row(GtkTreeIter *row, MatcherProp *prop)
 {
-       GtkCList *clist = GTK_CLIST(matcher.cond_clist);
-       gchar *cond_str[1];
        gchar *matcher_str;
 
        if (prop == NULL) {
-               cond_str[0] = _("(New)");
-               return gtk_clist_append(clist, cond_str);
+               prefs_matcher_list_view_insert_matcher(matcher.cond_list_view,
+                                                      NULL, _("New"), FALSE);
+               return;                                                
        }
 
        matcher_str = matcherprop_to_string(prop);
-       cond_str[0] = matcher_str;
-       if (row < 0)
-               row = gtk_clist_append(clist, cond_str);
+       if (!row)
+               prefs_matcher_list_view_insert_matcher(matcher.cond_list_view,
+                                                      NULL, matcher_str,
+                                                      TRUE);
        else
-               gtk_clist_set_text(clist, row, 0, cond_str[0]);
+               prefs_matcher_list_view_insert_matcher(matcher.cond_list_view,
+                                                      row, matcher_str, 
+                                                      TRUE);
        g_free(matcher_str);
-
-       return row;
 }
 
 /*!
@@ -710,15 +722,6 @@ static void prefs_matcher_reset_condition(void)
        gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), "");
 }
 
-/*!
- *\brief       Update scrollbar
- */
-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);
-}
-
 /*!
  *\brief       Initializes dialog with a set of conditions
  *
@@ -726,29 +729,25 @@ static void prefs_matcher_update_hscrollbar(void)
  */
 static void prefs_matcher_set_dialog(MatcherList *matchers)
 {
-       GtkCList *clist = GTK_CLIST(matcher.cond_clist);
        GSList *cur;
        gboolean bool_op = 1;
+       GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model
+                               (GTK_TREE_VIEW(matcher.cond_list_view)));
 
-       gtk_clist_freeze(clist);
-       gtk_clist_clear(clist);
+       gtk_list_store_clear(store);                            
 
-       prefs_matcher_clist_set_row(-1, NULL);
+       prefs_matcher_list_view_set_row(NULL, NULL);
        if (matchers != NULL) {
                for (cur = matchers->matchers; cur != NULL;
                     cur = g_slist_next(cur)) {
                        MatcherProp *prop;
                        prop = (MatcherProp *) cur->data;
-                       prefs_matcher_clist_set_row(-1, prop);
+                       prefs_matcher_list_view_set_row(NULL, prop);
                }
 
                bool_op = matchers->bool_and;
        }
        
-       prefs_matcher_update_hscrollbar();
-
-       gtk_clist_thaw(clist);
-
        gtk_list_select_item(GTK_LIST(matcher.bool_op_list), bool_op);
 
        prefs_matcher_reset_condition();
@@ -764,27 +763,36 @@ static MatcherList *prefs_matcher_get_list(void)
 {
        gchar *matcher_str;
        MatcherProp *prop;
-       gint row = 1;
        gboolean bool_and;
        GSList *matcher_list;
        MatcherList *matchers;
+       GtkTreeModel *model;
+       GtkTreeIter iter;
 
-       matcher_list = NULL;
+       model = gtk_tree_view_get_model(GTK_TREE_VIEW(matcher.cond_list_view));
+       if (!gtk_tree_model_get_iter_first(model, &iter))
+               return NULL;
 
-       while (gtk_clist_get_text(GTK_CLIST(matcher.cond_clist),
-                                 row, 0, &matcher_str)) {
+       matcher_list = NULL;
 
-               if (strcmp(matcher_str, _("(New)")) != 0) {
+       do {
+               gboolean is_valid;
+       
+               gtk_tree_model_get(model, &iter,
+                                  PREFS_MATCHER_COND, &matcher_str,
+                                  PREFS_MATCHER_COND_VALID, &is_valid,
+                                  -1);
+               
+               if (is_valid) {
                        /* tmp = matcher_str; */
                        prop = matcher_parser_get_prop(matcher_str);
-                       
+                       g_free(matcher_str);
                        if (prop == NULL)
                                break;
                        
                        matcher_list = g_slist_append(matcher_list, prop);
                }
-               row ++;
-       }
+       } while (gtk_tree_model_iter_next(model, &iter));
 
        bool_and = get_sel_from_list(GTK_LIST(matcher.bool_op_list));
 
@@ -828,6 +836,9 @@ static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
        case MATCHCRITERIA_LOCKED:
        case MATCHCRITERIA_NOT_LOCKED:
                return CRITERIA_LOCKED;
+       case MATCHCRITERIA_PARTIAL:
+       case MATCHCRITERIA_NOT_PARTIAL:
+               return CRITERIA_PARTIAL;
        case MATCHCRITERIA_COLORLABEL:
        case MATCHCRITERIA_NOT_COLORLABEL:
                return CRITERIA_COLORLABEL;
@@ -881,9 +892,9 @@ static gint prefs_matcher_get_criteria_from_matching(gint matching_id)
                return CRITERIA_SCORE_LOWER;
        case MATCHCRITERIA_SCORE_EQUAL:
                return CRITERIA_SCORE_EQUAL;
-       case MATCHCRITERIA_NOT_EXECUTE:
-       case MATCHCRITERIA_EXECUTE:
-               return CRITERIA_EXECUTE;
+       case MATCHCRITERIA_NOT_TEST:
+       case MATCHCRITERIA_TEST:
+               return CRITERIA_TEST;
        case MATCHCRITERIA_SIZE_GREATER:
                return CRITERIA_SIZE_GREATER;
        case MATCHCRITERIA_SIZE_SMALLER:
@@ -922,6 +933,8 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
                return MATCHCRITERIA_FORWARDED;
        case CRITERIA_LOCKED:
                return MATCHCRITERIA_LOCKED;
+       case CRITERIA_PARTIAL:
+               return MATCHCRITERIA_PARTIAL;
        case CRITERIA_COLORLABEL:
                return MATCHCRITERIA_COLORLABEL;
        case CRITERIA_IGNORE_THREAD:
@@ -960,8 +973,8 @@ static gint prefs_matcher_get_matching_from_criteria(gint criteria_id)
                return MATCHCRITERIA_BODY_PART;
        case CRITERIA_MESSAGE:
                return MATCHCRITERIA_MESSAGE;
-       case CRITERIA_EXECUTE:
-               return MATCHCRITERIA_EXECUTE;
+       case CRITERIA_TEST:
+               return MATCHCRITERIA_TEST;
        case CRITERIA_SIZE_GREATER:
                return MATCHCRITERIA_SIZE_GREATER;
        case CRITERIA_SIZE_SMALLER:
@@ -998,6 +1011,8 @@ static gint prefs_matcher_not_criteria(gint matcher_criteria)
                return MATCHCRITERIA_NOT_FORWARDED;
        case MATCHCRITERIA_LOCKED:
                return MATCHCRITERIA_NOT_LOCKED;
+       case MATCHCRITERIA_PARTIAL:
+               return MATCHCRITERIA_NOT_PARTIAL;
        case MATCHCRITERIA_COLORLABEL:
                return MATCHCRITERIA_NOT_COLORLABEL;
        case MATCHCRITERIA_IGNORE_THREAD:
@@ -1024,8 +1039,8 @@ static gint prefs_matcher_not_criteria(gint matcher_criteria)
                return MATCHCRITERIA_NOT_HEADERS_PART;
        case MATCHCRITERIA_MESSAGE:
                return MATCHCRITERIA_NOT_MESSAGE;
-       case MATCHCRITERIA_EXECUTE:
-               return MATCHCRITERIA_NOT_EXECUTE;
+       case MATCHCRITERIA_TEST:
+               return MATCHCRITERIA_NOT_TEST;
        case MATCHCRITERIA_BODY_PART:
                return MATCHCRITERIA_NOT_BODY_PART;
        default:
@@ -1049,10 +1064,10 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
        gint value_criteria;
        gboolean use_regexp;
        gboolean case_sensitive;
-       gchar *header;
-       gchar *expr;
+       const gchar *header;
+       const gchar *expr;
        gint value;
-       gchar *value_str;
+       const gchar *value_str;
 
        value_criteria = get_sel_from_list(GTK_LIST(matcher.criteria_list));
 
@@ -1072,7 +1087,8 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
        case CRITERIA_REPLIED:
        case CRITERIA_FORWARDED:
        case CRITERIA_LOCKED:
-       case CRITERIA_EXECUTE:
+       case CRITERIA_PARTIAL:
+       case CRITERIA_TEST:
        case CRITERIA_COLORLABEL:
        case CRITERIA_IGNORE_THREAD:
                if (value_pred_flag == PREDICATE_FLAG_DISABLED)
@@ -1123,6 +1139,7 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
        case CRITERIA_REPLIED:
        case CRITERIA_FORWARDED:
        case CRITERIA_LOCKED:
+       case CRITERIA_PARTIAL:
        case CRITERIA_IGNORE_THREAD:
                break;
 
@@ -1137,7 +1154,7 @@ static MatcherProp *prefs_matcher_dialog_to_matcher(void)
        case CRITERIA_HEADERS_PART:
        case CRITERIA_BODY_PART:
        case CRITERIA_MESSAGE:
-       case CRITERIA_EXECUTE:
+       case CRITERIA_TEST:
                expr = gtk_entry_get_text(GTK_ENTRY(matcher.value_entry));
                break;
 
@@ -1195,12 +1212,11 @@ static void prefs_matcher_register_cb(void)
        if (matcherprop == NULL)
                return;
 
-       prefs_matcher_clist_set_row(-1, matcherprop);
+       prefs_matcher_list_view_set_row(NULL, matcherprop);
 
        matcherprop_free(matcherprop);
 
        prefs_matcher_reset_condition();
-       prefs_matcher_update_hscrollbar();
 }
 
 /*!
@@ -1208,25 +1224,33 @@ static void prefs_matcher_register_cb(void)
  */
 static void prefs_matcher_substitute_cb(void)
 {
-       GtkCList *clist = GTK_CLIST(matcher.cond_clist);
-       gint row;
        MatcherProp *matcherprop;
+       GtkTreeIter row;
+       GtkTreeSelection *selection;
+       GtkTreeModel *model;
+       gboolean is_valid;
 
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row == 0)
+       selection = gtk_tree_view_get_selection
+                       (GTK_TREE_VIEW(matcher.cond_list_view));
+       
+       if (!gtk_tree_selection_get_selected(selection, &model, &row))
                return;
        
+       gtk_tree_model_get(model, &row, 
+                          PREFS_MATCHER_COND_VALID, &is_valid,
+                          -1);
+       if (!is_valid)
+               return;
+
        matcherprop = prefs_matcher_dialog_to_matcher();
        if (matcherprop == NULL)
                return;
 
-       prefs_matcher_clist_set_row(row, matcherprop);
+       prefs_matcher_list_view_set_row(&row, matcherprop);
 
        matcherprop_free(matcherprop);
 
        prefs_matcher_reset_condition();
-       
-       prefs_matcher_update_hscrollbar();
 }
 
 /*!
@@ -1234,17 +1258,27 @@ static void prefs_matcher_substitute_cb(void)
  */
 static void prefs_matcher_delete_cb(void)
 {
-       GtkCList *clist = GTK_CLIST(matcher.cond_clist);
-       gint row;
+       GtkTreeIter row;
+       GtkTreeSelection *selection;
+       GtkTreeModel *model;
+       gboolean is_valid;
 
-       if (!clist->selection) return;
-       row = GPOINTER_TO_INT(clist->selection->data);
-       if (row == 0)
+       selection = gtk_tree_view_get_selection
+                       (GTK_TREE_VIEW(matcher.cond_list_view));
+       
+       if (!gtk_tree_selection_get_selected(selection, &model, &row))
                return;
+               
+       gtk_tree_model_get(model, &row, 
+                          PREFS_MATCHER_COND_VALID, &is_valid,
+                          -1);
 
-       gtk_clist_remove(clist, row);
-       
-       prefs_matcher_update_hscrollbar();
+       if (!is_valid)
+               return;
+
+       gtk_list_store_remove(GTK_LIST_STORE(model), &row);             
+
+       prefs_matcher_reset_condition();
 }
 
 /*!
@@ -1252,17 +1286,42 @@ static void prefs_matcher_delete_cb(void)
  */
 static void prefs_matcher_up(void)
 {
-       GtkCList *clist = GTK_CLIST(matcher.cond_clist);
-       gint row;
-
-       if (!clist->selection) return;
+       GtkTreePath *prev, *sel, *try;
+       GtkTreeIter isel;
+       GtkListStore *store = NULL;
+       GtkTreeIter iprev;
+       
+       if (!gtk_tree_selection_get_selected
+               (gtk_tree_view_get_selection
+                       (GTK_TREE_VIEW(matcher.cond_list_view)),
+                (GtkTreeModel **)(GtkListStore *) store,       
+                &isel))
+               return;
 
-       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);
+       sel = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &isel);
+       if (!sel)
+               return;
+       
+       /* no move if we're at row 0 or 1, looks phony, but other
+        * solutions are more convoluted... */
+       try = gtk_tree_path_copy(sel);
+       if (!gtk_tree_path_prev(try) || !gtk_tree_path_prev(try)) {
+               gtk_tree_path_free(try);
+               gtk_tree_path_free(sel);
+               return;
+       }
+       gtk_tree_path_free(try);
+
+       prev = gtk_tree_path_copy(sel);         
+       if (gtk_tree_path_prev(prev)) {
+               gtk_tree_model_get_iter(GTK_TREE_MODEL(store),
+                                       &iprev, prev);
+               gtk_list_store_swap(store, &iprev, &isel);
+               /* XXX: GTK2 select row?? */
        }
+
+       gtk_tree_path_free(sel);
+       gtk_tree_path_free(prev);
 }
 
 /*!
@@ -1270,160 +1329,29 @@ static void prefs_matcher_up(void)
  */
 static void prefs_matcher_down(void)
 {
-       GtkCList *clist = GTK_CLIST(matcher.cond_clist);
-       gint row;
-
-       if (!clist->selection) return;
-
-       row = GPOINTER_TO_INT(clist->selection->data);
-       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);
-       }
-}
-
-/*!
- *\brief       Signal handler for select row.
- *
- *\param       clist List widget
- *\param       row Selected row
- *\param       column Selected column
- *\param       event Event information
- */
-static void prefs_matcher_select(GtkCList *clist, gint row, gint column,
-                                GdkEvent *event)
-{
-       gchar *matcher_str;
-       MatcherProp *prop;
-       gboolean negative_cond;
-       gint criteria;
-
-       if (!gtk_clist_get_text(GTK_CLIST(matcher.cond_clist),
-                               row, 0, &matcher_str))
-               return;
-
-       negative_cond = FALSE;
-
-       if (row == 0) {
-               prefs_matcher_reset_condition();
+       GtkListStore *store = NULL;
+       GtkTreeIter next, sel;
+       GtkTreePath *try;
+       
+       if (!gtk_tree_selection_get_selected
+               (gtk_tree_view_get_selection
+                       (GTK_TREE_VIEW(matcher.cond_list_view)),
+                (GtkTreeModel **)(GtkListStore *) store,
+                &sel))
                return;
-       }
 
-       prop = matcher_parser_get_prop(matcher_str);
-       if (prop == NULL)
+       try = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &sel);
+       if (!try) 
                return;
-
-       criteria = prefs_matcher_get_criteria_from_matching(prop->criteria);
-       if (criteria != -1)
-               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
-                                    criteria);
-
-       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_LOCKED:
-       case MATCHCRITERIA_NOT_COLORLABEL:
-       case MATCHCRITERIA_NOT_IGNORE_THREAD:
-       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;
-               break;
-       }
        
-       switch(prop->criteria) {
-       case MATCHCRITERIA_ALL:
-               break;
-
-       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 MATCHCRITERIA_AGE_GREATER:
-       case MATCHCRITERIA_AGE_LOWER:
-       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;
-
-       case MATCHCRITERIA_NOT_COLORLABEL:
-       case MATCHCRITERIA_COLORLABEL:
-               gtk_option_menu_set_history(GTK_OPTION_MENU(matcher.color_optmenu),
-                                           prop->value);
-               break;
-
-       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;
-       }
-
-       if (negative_cond)
-               gtk_list_select_item(GTK_LIST(matcher.predicate_list), 1);
-       else
-               gtk_list_select_item(GTK_LIST(matcher.predicate_list), 0);
-
-       switch(prop->matchtype) {
-       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 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 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 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;
+       /* move when not at row 0 ... */
+       if (gtk_tree_path_prev(try)) {
+               next = sel;
+               if (gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &next))
+                       gtk_list_store_swap(store, &next, &sel);
        }
+               
+       gtk_tree_path_free(try);
 }
 
 /*!
@@ -1443,7 +1371,7 @@ static void prefs_matcher_set_value_widget(GtkWidget *old_widget,
        gtk_widget_ref(old_widget);
        gtkut_container_remove(GTK_CONTAINER(matcher.criteria_table), old_widget);
        gtk_widget_show(new_widget);
-       gtk_widget_set_usize(new_widget, 200, -1);
+       gtk_widget_set_size_request(new_widget, 200, -1);
        gtk_table_attach(GTK_TABLE(matcher.criteria_table), new_widget, 
                         2, 3, 1, 2, 
                         GTK_FILL | GTK_SHRINK | GTK_EXPAND, 
@@ -1490,7 +1418,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);
+               gtk_widget_set_sensitive(matcher.test_btn, FALSE);
                break;
 
        case CRITERIA_UNREAD:
@@ -1500,6 +1428,7 @@ static void prefs_matcher_criteria_select(GtkList *list,
        case CRITERIA_REPLIED:
        case CRITERIA_FORWARDED:
        case CRITERIA_LOCKED:
+       case CRITERIA_PARTIAL:
        case CRITERIA_IGNORE_THREAD:
                gtk_widget_set_sensitive(matcher.header_combo, FALSE);
                gtk_widget_set_sensitive(matcher.header_label, FALSE);
@@ -1512,7 +1441,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);
+               gtk_widget_set_sensitive(matcher.test_btn, FALSE);
                break;
                
        case CRITERIA_COLORLABEL:
@@ -1526,7 +1455,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);
+               gtk_widget_set_sensitive(matcher.test_btn, FALSE);
                break;
 
        case CRITERIA_SUBJECT:
@@ -1551,10 +1480,10 @@ 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);
+               gtk_widget_set_sensitive(matcher.test_btn, FALSE);
                break;
 
-       case CRITERIA_EXECUTE:
+       case CRITERIA_TEST:
                gtk_widget_set_sensitive(matcher.header_combo, FALSE);
                gtk_widget_set_sensitive(matcher.header_label, FALSE);
                gtk_widget_set_sensitive(matcher.value_label, TRUE);
@@ -1566,7 +1495,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, TRUE);
+               gtk_widget_set_sensitive(matcher.test_btn, TRUE);
                break;
 
        case CRITERIA_AGE_GREATER:
@@ -1588,7 +1517,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);
+               gtk_widget_set_sensitive(matcher.test_btn, FALSE);
                break;
 
        case CRITERIA_HEADER:
@@ -1603,7 +1532,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);
+               gtk_widget_set_sensitive(matcher.test_btn, FALSE);
                break;
        }
 }
@@ -1615,11 +1544,14 @@ static void prefs_matcher_criteria_select(GtkList *list,
  *\param       event Key event
  *\param       data User data
  */
-static void prefs_matcher_key_pressed(GtkWidget *widget, GdkEventKey *event,
+static gboolean prefs_matcher_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                     gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_Escape) {
                prefs_matcher_cancel();
+               return TRUE;            
+       }
+       return FALSE;
 }
 
 /*!
@@ -1639,11 +1571,11 @@ static void prefs_matcher_ok(void)
        MatcherList *matchers;
        MatcherProp *matcherprop;
        AlertValue val;
-       gint criteria;
-       gint value_criteria;
-       gchar *matcher_str;
-       gchar *str;
+       gchar *matcher_str = NULL;
+       gchar *str = NULL;
        gint row = 1;
+       GtkTreeModel *model;
+       GtkTreeIter iter;
 
        matchers = prefs_matcher_get_list();
 
@@ -1651,21 +1583,33 @@ static void prefs_matcher_ok(void)
                matcherprop = prefs_matcher_dialog_to_matcher();
                if (matcherprop != NULL) {
                        str = matcherprop_to_string(matcherprop);
-                       if(strcmp(str, "all") != 0) {
-                               while (gtk_clist_get_text(GTK_CLIST(matcher.cond_clist),
-                                                 row, 0, &matcher_str)) {
-                                       if (strcmp(matcher_str, str) == 0) break;
+                       matcherprop_free(matcherprop);
+                       if (strcmp(str, "all") != 0) {
+                               model = gtk_tree_view_get_model(GTK_TREE_VIEW
+                                               (matcher.cond_list_view));
+
+                               while (gtk_tree_model_iter_nth_child(model, &iter, NULL, row)) {
+                                       gtk_tree_model_get(model, &iter,
+                                                          PREFS_MATCHER_COND, &matcher_str,
+                                                          -1);
+                                       if (matcher_str && strcmp(matcher_str, str) == 0) 
+                                               break;
                                        row++;
+                                       g_free(matcher_str);
+                                       matcher_str = NULL;
                                }
-                               if (strcmp(matcher_str, str) != 0) {
-                                       val = alertpanel(_("Entry not saved"),
-                                                _("The entry was not saved\nHave you really finished?"),
-                                                _("Yes"), _("No"), NULL);
-                                       if (G_ALERTDEFAULT != val) {
+
+                               if (!matcher_str || strcmp(matcher_str, str) != 0) {
+                                       val = alertpanel(_("Entry not saved"),
+                                                        _("The entry was not saved\nHave you really finished?"),
+                                                        GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+                                       if (G_ALERTDEFAULT != val) {
+                                               g_free(matcher_str);                                             
                                                g_free(str);
-                                               return;
-                                       }
+                                               return;
+                                       }
                                }
+                               g_free(matcher_str);
                        }
                }
                 g_free(str);
@@ -1694,11 +1638,15 @@ static gint prefs_matcher_deleted(GtkWidget *widget, GdkEventAny *event,
 }
 
 /*
- * Strings describing exec format strings
+ * Strings describing test format strings
  * 
  * When adding new lines, remember to put 2 strings for each line
  */
-static gchar *exec_desc_strings[] = {
+static gchar *test_desc_strings[] = {
+       N_("'Test' allows you to test a message or message element"), NULL,
+       N_("using an external program or script. The program will"), NULL,
+       N_("return either 0 or 1"), NULL,
+       N_("The following symbols can be used:"), NULL,
        "%%",   "%",
        "%s",   N_("Subject"),
        "%f",   N_("From"),
@@ -1711,24 +1659,251 @@ static gchar *exec_desc_strings[] = {
        "%F",   N_("Filename - should not be modified"),
        "\\n",  N_("new line"),
        "\\",   N_("escape character for quotes"),
-       "\\\"",N_("quote character"),
-       NULL, NULL
+       "\\\"", N_("quote character"),
+       NULL,   NULL
 };
 
-static DescriptionWindow exec_desc_win = { 
+static DescriptionWindow test_desc_win = { 
         NULL, 
         2,
-        N_("Description of symbols"),
-        exec_desc_strings
+        N_("Match Type: 'Test'"),
+        test_desc_strings
 };
 
 
 
 /*!
- *\brief       Show Execute action's info
+ *\brief       Show Test action's info
+ */
+void prefs_matcher_test_info(void)
+{
+       description_window_create(&test_desc_win);
+}
+
+/*
+ * list view
  */
-void prefs_matcher_exec_info(void)
+
+static GtkListStore* prefs_matcher_create_data_store(void)
+{
+       return gtk_list_store_new(N_PREFS_MATCHER_COLUMNS,
+                                 G_TYPE_STRING,        
+                                 G_TYPE_BOOLEAN,
+                                 -1);
+}
+
+static void prefs_matcher_list_view_insert_matcher(GtkWidget *list_view,
+                                                  GtkTreeIter *row_iter,
+                                                  const gchar *matcher,
+                                                  gboolean is_valid) 
 {
-       description_window_create(&exec_desc_win);
+       GtkTreeIter iter;
+       GtkListStore *list_store = GTK_LIST_STORE(gtk_tree_view_get_model
+                                       (GTK_TREE_VIEW(list_view)));
+
+       if (row_iter == NULL) {
+               /* append new */
+               gtk_list_store_append(list_store, &iter);
+       } else {
+               /* change existing */
+               iter = *row_iter;
+       }
+
+       gtk_list_store_set(list_store, &iter,
+                          PREFS_MATCHER_COND, matcher,
+                          PREFS_MATCHER_COND_VALID, is_valid,
+                          -1);
+}
+
+static GtkWidget *prefs_matcher_list_view_create(void)
+{
+       GtkTreeView *list_view;
+       GtkTreeSelection *selector;
+       GtkTreeModel *model;
+
+       model = GTK_TREE_MODEL(prefs_matcher_create_data_store());
+       list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
+       g_object_unref(model);  
+       
+       gtk_tree_view_set_rules_hint(list_view, prefs_common.enable_rules_hint);
+       
+       selector = gtk_tree_view_get_selection(list_view);
+       gtk_tree_selection_set_mode(selector, GTK_SELECTION_BROWSE);
+       gtk_tree_selection_set_select_function(selector, prefs_matcher_selected,
+                                              NULL, NULL);
+
+       /* create the columns */
+       prefs_matcher_create_list_view_columns(GTK_WIDGET(list_view));
+
+       return GTK_WIDGET(list_view);
+}
+
+static void prefs_matcher_create_list_view_columns(GtkWidget *list_view)
+{
+       GtkTreeViewColumn *column;
+       GtkCellRenderer *renderer;
+
+       renderer = gtk_cell_renderer_text_new();
+       column = gtk_tree_view_column_new_with_attributes
+               (_("Current condition rules"),
+                renderer,
+                "text", PREFS_MATCHER_COND,
+                NULL);
+       gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);          
+}
+
+static gboolean prefs_matcher_selected(GtkTreeSelection *selector,
+                                      GtkTreeModel *model, 
+                                      GtkTreePath *path,
+                                      gboolean currently_selected,
+                                      gpointer data)
+{
+       gchar *matcher_str;
+       MatcherProp *prop;
+       gboolean negative_cond;
+       gint criteria;
+       GtkTreeIter iter;
+       gboolean is_valid;
+
+       if (currently_selected)
+               return TRUE;
+
+       if (!gtk_tree_model_get_iter(model, &iter, path))
+               return TRUE;
+
+       gtk_tree_model_get(model, &iter, 
+                          PREFS_MATCHER_COND_VALID,  &is_valid,
+                          PREFS_MATCHER_COND, &matcher_str,
+                          -1);
+       
+       if (!is_valid) {
+               g_free(matcher_str);
+               prefs_matcher_reset_condition();
+               return TRUE;
+       }
+
+       negative_cond = FALSE;
+
+       prop = matcher_parser_get_prop(matcher_str);
+       if (prop == NULL) {
+               g_free(matcher_str);
+               return TRUE;
+       }               
+
+       criteria = prefs_matcher_get_criteria_from_matching(prop->criteria);
+       if (criteria != -1)
+               gtk_list_select_item(GTK_LIST(matcher.criteria_list),
+                                    criteria);
+
+       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_LOCKED:
+       case MATCHCRITERIA_NOT_PARTIAL:
+       case MATCHCRITERIA_NOT_COLORLABEL:
+       case MATCHCRITERIA_NOT_IGNORE_THREAD:
+       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;
+               break;
+       }
+       
+       switch(prop->criteria) {
+       case MATCHCRITERIA_ALL:
+               break;
+
+       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:
+       case MATCHCRITERIA_TEST:
+               gtk_entry_set_text(GTK_ENTRY(matcher.value_entry), prop->expr);
+               break;
+
+       case MATCHCRITERIA_AGE_GREATER:
+       case MATCHCRITERIA_AGE_LOWER:
+       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;
+
+       case MATCHCRITERIA_NOT_COLORLABEL:
+       case MATCHCRITERIA_COLORLABEL:
+               gtk_option_menu_set_history(GTK_OPTION_MENU(matcher.color_optmenu),
+                                           prop->value);
+               break;
+
+       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;
+       }
+
+       if (negative_cond)
+               gtk_list_select_item(GTK_LIST(matcher.predicate_list), 1);
+       else
+               gtk_list_select_item(GTK_LIST(matcher.predicate_list), 0);
+
+       switch(prop->matchtype) {
+       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 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 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 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;
+       }
+
+       g_free(matcher_str);
+       return TRUE;
 }