Remove unused variable
[claws.git] / src / prefs_actions.c
index 4351676c1e9ce5cc71d05dd6e45c50827bfaa86a..a925e42465dc18c6ad5ad317d647293392937ac0 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 1999-2013 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <stdio.h>
@@ -31,7 +33,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include "intl.h"
 #include "prefs_gtk.h"
 #include "inc.h"
 #include "utils.h"
 #include "prefs_actions.h"
 #include "action.h"
 #include "description_window.h"
+#include "gtkutils.h"
+#include "manual.h"
+#include "menu.h"
+#include "filtering.h"
+#include "prefs_filtering_action.h"
+#include "matcher_parser.h"
+#include "prefs_toolbar.h"
 
 enum {
        PREFS_ACTIONS_STRING,   /*!< string pointer managed by list store, 
@@ -60,27 +68,35 @@ static struct Actions
        GtkWidget *window;
 
        GtkWidget *ok_btn;
-
+       GtkWidget *filter_btn;
        GtkWidget *name_entry;
        GtkWidget *cmd_entry;
-
+       GtkWidget *info_btn;
+       GtkWidget *shell_radiobtn;
+       GtkWidget *filter_radiobtn;
+       
        GtkWidget *actions_list_view;
 } actions;
 
+static int modified = FALSE;
+static int modified_list = FALSE;
+
 /* widget creating functions */
 static void prefs_actions_create       (MainWindow *mainwin);
 static void prefs_actions_set_dialog   (void);
-static gint prefs_actions_clist_set_row        (GtkTreeIter *row);
+static gint prefs_actions_clist_set_row        (gint row);
 
 /* callback functions */
-static void prefs_actions_help_cb      (GtkWidget      *w,
-                                        gpointer        data);
+static void prefs_actions_info_cb      (GtkWidget      *w,
+                                        GtkWidget      *window);
 static void prefs_actions_register_cb  (GtkWidget      *w,
                                         gpointer        data);
 static void prefs_actions_substitute_cb        (GtkWidget      *w,
                                         gpointer        data);
-static void prefs_actions_delete_cb    (GtkWidget      *w,
-                                        gpointer        data);
+static void prefs_actions_delete_cb    (gpointer gtk_action, gpointer data);
+static void prefs_actions_delete_all_cb        (gpointer gtk_action, gpointer data);
+static void prefs_actions_clear_cb     (gpointer gtk_action, gpointer data);
+static void prefs_actions_duplicate_cb (gpointer gtk_action, gpointer data);
 static void prefs_actions_up           (GtkWidget      *w,
                                         gpointer        data);
 static void prefs_actions_down         (GtkWidget      *w,
@@ -91,25 +107,29 @@ static gint prefs_actions_deleted  (GtkWidget      *widget,
 static gboolean prefs_actions_key_pressed(GtkWidget    *widget,
                                          GdkEventKey   *event,
                                          gpointer       data);
+static gboolean prefs_actions_search_func_cb (GtkTreeModel *model, gint column, 
+                                               const gchar *key, GtkTreeIter *iter, 
+                                               gpointer search_data);
 static void prefs_actions_cancel       (GtkWidget      *w,
                                         gpointer        data);
 static void prefs_actions_ok           (GtkWidget      *w,
                                         gpointer        data);
 
-
 static GtkListStore* prefs_actions_create_data_store   (void);
 
 static void prefs_actions_list_view_insert_action      (GtkWidget *list_view,
-                                                        GtkTreeIter *row_iter,
+                                                        gint row,
                                                         gchar *action,
                                                         gboolean is_valid);
 static GtkWidget *prefs_actions_list_view_create       (void);
 static void prefs_actions_create_list_view_columns     (GtkWidget *list_view);
-static gboolean prefs_actions_selected                 (GtkTreeSelection *selector,
-                                                        GtkTreeModel *model, 
-                                                        GtkTreePath *path,
-                                                        gboolean currently_selected,
-                                                        gpointer data);
+static void prefs_actions_select_row(GtkTreeView *list_view, GtkTreePath *path);
+
+static void prefs_action_filter_radiobtn_cb(GtkWidget *widget, gpointer data);
+static void prefs_action_shell_radiobtn_cb(GtkWidget *widget, gpointer data);
+static void prefs_action_filterbtn_cb(GtkWidget *widget, gpointer data);
+static void prefs_action_define_filter_done(GSList * action_list);
+
 
 void prefs_actions_open(MainWindow *mainwin)
 {
@@ -124,24 +144,42 @@ void prefs_actions_open(MainWindow *mainwin)
        prefs_actions_set_dialog();
 
        gtk_widget_show(actions.window);
+       gtk_window_set_modal(GTK_WINDOW(actions.window), TRUE);
+}
+
+/*!
+ *\brief       Save Gtk object size to prefs dataset
+ */
+static void prefs_actions_size_allocate_cb(GtkWidget *widget,
+                                        GtkAllocation *allocation)
+{
+       cm_return_if_fail(allocation != NULL);
+
+       prefs_common.actionswin_width = allocation->width;
+       prefs_common.actionswin_height = allocation->height;
 }
 
 static void prefs_actions_create(MainWindow *mainwin)
 {
        GtkWidget *window;
        GtkWidget *vbox;
+       GtkWidget *filter_hbox;
+       GtkWidget *help_btn;
        GtkWidget *ok_btn;
        GtkWidget *cancel_btn;
        GtkWidget *confirm_area;
 
        GtkWidget *vbox1;
+       GtkWidget *table;
+
+       GtkWidget *shell_radiobtn;
+       GtkWidget *filter_radiobtn;
 
-       GtkWidget *entry_vbox;
-       GtkWidget *hbox;
        GtkWidget *name_label;
        GtkWidget *name_entry;
        GtkWidget *cmd_label;
        GtkWidget *cmd_entry;
+       GtkWidget *filter_btn;
 
        GtkWidget *reg_hbox;
        GtkWidget *btn_hbox;
@@ -149,33 +187,35 @@ static void prefs_actions_create(MainWindow *mainwin)
        GtkWidget *reg_btn;
        GtkWidget *subst_btn;
        GtkWidget *del_btn;
+       GtkWidget *clear_btn;
 
        GtkWidget *cond_hbox;
        GtkWidget *cond_scrolledwin;
        GtkWidget *cond_list_view;
 
-       GtkWidget *help_button;
+       GtkWidget *info_btn;
 
        GtkWidget *btn_vbox;
        GtkWidget *up_btn;
        GtkWidget *down_btn;
+       static GdkGeometry geometry;
 
        debug_print("Creating actions configuration window...\n");
 
-       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+       window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "prefs_actions");
 
        gtk_container_set_border_width(GTK_CONTAINER (window), 8);
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE);
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
-       gtk_window_set_default_size(GTK_WINDOW(window), 400, -1);
 
        vbox = gtk_vbox_new(FALSE, 6);
        gtk_widget_show(vbox);
        gtk_container_add(GTK_CONTAINER(window), vbox);
 
-       gtkut_button_set_create_stock(&confirm_area, &ok_btn, GTK_STOCK_OK,
-                                     &cancel_btn, GTK_STOCK_CANCEL, NULL, NULL);
+       gtkut_stock_button_set_create_with_help(&confirm_area, &help_btn,
+                       &cancel_btn, GTK_STOCK_CANCEL,
+                       &ok_btn, GTK_STOCK_OK,
+                       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);
@@ -183,6 +223,8 @@ static void prefs_actions_create(MainWindow *mainwin)
        gtk_window_set_title(GTK_WINDOW(window), _("Actions configuration"));
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(prefs_actions_deleted), NULL);
+       g_signal_connect(G_OBJECT(window), "size_allocate",
+                        G_CALLBACK(prefs_actions_size_allocate_cb), NULL);
        g_signal_connect(G_OBJECT(window), "key_press_event",
                         G_CALLBACK(prefs_actions_key_pressed), NULL);
        MANAGE_WINDOW_SIGNALS_CONNECT(window);
@@ -190,34 +232,76 @@ static void prefs_actions_create(MainWindow *mainwin)
                         G_CALLBACK(prefs_actions_ok), mainwin);
        g_signal_connect(G_OBJECT(cancel_btn), "clicked",
                         G_CALLBACK(prefs_actions_cancel), NULL);
+       g_signal_connect(G_OBJECT(help_btn), "clicked",
+                        G_CALLBACK(manual_open_with_anchor_cb),
+                        MANUAL_ANCHOR_ACTIONS);
 
-       vbox1 = gtk_vbox_new(FALSE, 8);
+       vbox1 = gtk_vbox_new(FALSE, VSPACING);
        gtk_widget_show(vbox1);
        gtk_box_pack_start(GTK_BOX(vbox), vbox1, TRUE, TRUE, 0);
-       gtk_container_set_border_width(GTK_CONTAINER(vbox1), 2);
-
-       entry_vbox = gtk_vbox_new(FALSE, 4);
-       gtk_box_pack_start(GTK_BOX(vbox1), entry_vbox, FALSE, FALSE, 0);
-
-       hbox = gtk_hbox_new(FALSE, 8);
-       gtk_box_pack_start(GTK_BOX(entry_vbox), hbox, FALSE, FALSE, 0);
-
-       name_label = gtk_label_new(_("Menu name:"));
-       gtk_box_pack_start(GTK_BOX(hbox), name_label, FALSE, FALSE, 0);
-
-       name_entry = gtk_entry_new();
-       gtk_box_pack_start(GTK_BOX(hbox), name_entry, TRUE, TRUE, 0);
-
-       hbox = gtk_hbox_new(FALSE, 8);
-       gtk_box_pack_start(GTK_BOX(entry_vbox), hbox, TRUE, TRUE, 0);
-
-       cmd_label = gtk_label_new(_("Command line:"));
-       gtk_box_pack_start(GTK_BOX(hbox), cmd_label, FALSE, FALSE, 0);
-
-       cmd_entry = gtk_entry_new();
-       gtk_box_pack_start(GTK_BOX(hbox), cmd_entry, TRUE, TRUE, 0);
-
-       gtk_widget_show_all(entry_vbox);
+       gtk_container_set_border_width(GTK_CONTAINER(vbox1), 2);        
+
+       table = gtk_table_new(3, 2, FALSE);
+       gtk_table_set_row_spacings (GTK_TABLE (table), VSPACING_NARROW_2);
+       gtk_table_set_col_spacings (GTK_TABLE (table), 4);
+       gtk_widget_show(table);
+       gtk_box_pack_start (GTK_BOX (vbox1), table, FALSE, FALSE, 0);
+
+       name_label = gtk_label_new (_("Menu name"));
+       gtk_widget_show (name_label);
+       gtk_misc_set_alignment (GTK_MISC (name_label), 1, 0.5);
+       gtk_table_attach (GTK_TABLE (table), name_label, 0, 1, 0, 1,
+                         (GtkAttachOptions) (GTK_FILL),
+                         (GtkAttachOptions) (0), 0, 0);
+
+       name_entry = gtk_entry_new ();
+       gtk_widget_show (name_entry);
+       gtk_table_attach (GTK_TABLE (table), name_entry, 1, 2, 0, 1,
+                         (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+                         (GtkAttachOptions) (0), 0, 0);
+
+       cmd_label = gtk_label_new (_("Command"));
+       gtk_widget_show (cmd_label);
+       gtk_misc_set_alignment (GTK_MISC (cmd_label), 1, 0.5);
+       gtk_table_attach (GTK_TABLE (table), cmd_label, 0, 1, 2, 3,
+                         (GtkAttachOptions) (GTK_FILL),
+                         (GtkAttachOptions) (0), 0, 0);
+
+       cmd_entry = gtk_entry_new ();
+       gtk_widget_show (cmd_entry);
+       gtk_table_attach (GTK_TABLE (table), cmd_entry, 1, 2, 2, 3,
+                         (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+                         (GtkAttachOptions) (0), 0, 0);
+
+       /* radio buttons for filter actions or shell */
+       filter_hbox = gtk_hbox_new(FALSE,4);
+       gtk_table_attach(GTK_TABLE(table), filter_hbox, 1, 2, 3, 4,
+                         (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+                         (GtkAttachOptions) (0), 0, 0);
+       gtk_widget_show(filter_hbox);
+
+       shell_radiobtn = gtk_radio_button_new_with_label(NULL, _("Shell command"));
+       gtk_box_pack_start(GTK_BOX(filter_hbox), shell_radiobtn, FALSE, FALSE, 0);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(shell_radiobtn), TRUE);
+       gtk_widget_show(shell_radiobtn);
+       
+       g_signal_connect(G_OBJECT(shell_radiobtn), "clicked",
+                        G_CALLBACK(prefs_action_shell_radiobtn_cb), NULL);
+
+       filter_radiobtn =
+               gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(shell_radiobtn), 
+                                                           _("Filter action"));
+       gtk_box_pack_start(GTK_BOX(filter_hbox), filter_radiobtn, FALSE, FALSE, 0);
+       gtk_widget_show(filter_radiobtn);
+       g_signal_connect(G_OBJECT(filter_radiobtn), "clicked",
+                        G_CALLBACK(prefs_action_filter_radiobtn_cb), NULL);
+
+       filter_btn = gtk_button_new_with_label(_("Edit filter action"));
+       gtk_box_pack_start(GTK_BOX(filter_hbox), filter_btn, FALSE, FALSE, 0);
+       gtk_widget_set_sensitive(filter_btn, FALSE);
+       g_signal_connect(G_OBJECT(filter_btn), "clicked",
+                        G_CALLBACK(prefs_action_filterbtn_cb), NULL);
+       gtk_widget_show(filter_btn);
 
        /* register / substitute / delete */
 
@@ -239,25 +323,44 @@ static void prefs_actions_create(MainWindow *mainwin)
        gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT(reg_btn), "clicked",
                         G_CALLBACK(prefs_actions_register_cb), NULL);
+       CLAWS_SET_TIP(reg_btn,
+                       _("Append the new action above to the list"));
 
-       subst_btn = gtk_button_new_with_label(_(" Replace "));
+       subst_btn = gtkut_get_replace_btn(_("_Replace"));
        gtk_widget_show(subst_btn);
        gtk_box_pack_start(GTK_BOX(btn_hbox), subst_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT(subst_btn), "clicked",
-                        G_CALLBACK(prefs_actions_substitute_cb),
-                        NULL);
+                        G_CALLBACK(prefs_actions_substitute_cb), NULL);
+       CLAWS_SET_TIP(subst_btn,
+                       _("Replace the selected action in list with the action above"));
 
-       del_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
+       del_btn = gtk_button_new_with_mnemonic (_("D_elete"));
+       gtk_button_set_image(GTK_BUTTON(del_btn),
+                       gtk_image_new_from_stock(GTK_STOCK_REMOVE,GTK_ICON_SIZE_BUTTON));
        gtk_widget_show(del_btn);
        gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT(del_btn), "clicked",
                         G_CALLBACK(prefs_actions_delete_cb), NULL);
-
-       help_button = gtk_button_new_with_label(_(" Syntax help "));
-       gtk_widget_show(help_button);
-       gtk_box_pack_end(GTK_BOX(reg_hbox), help_button, FALSE, FALSE, 0);
-       g_signal_connect(G_OBJECT(help_button), "clicked",
-                        G_CALLBACK(prefs_actions_help_cb), NULL);
+       CLAWS_SET_TIP(del_btn,
+                       _("Delete the selected action from the list"));
+
+       clear_btn = gtk_button_new_with_mnemonic (_("C_lear"));
+       gtk_button_set_image(GTK_BUTTON(clear_btn),
+                       gtk_image_new_from_stock(GTK_STOCK_CLEAR,GTK_ICON_SIZE_BUTTON));
+       gtk_widget_show (clear_btn);
+       gtk_box_pack_start (GTK_BOX (btn_hbox), clear_btn, FALSE, TRUE, 0);
+       g_signal_connect(G_OBJECT (clear_btn), "clicked",
+                       G_CALLBACK(prefs_actions_clear_cb), NULL);
+       CLAWS_SET_TIP(clear_btn,
+                       _("Clear all the input fields in the dialog"));
+
+       info_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
+       gtk_widget_show(info_btn);
+       gtk_box_pack_end(GTK_BOX(reg_hbox), info_btn, FALSE, FALSE, 0);
+       g_signal_connect(G_OBJECT(info_btn), "clicked",
+                        G_CALLBACK(prefs_actions_info_cb), GTK_WINDOW(window));
+       CLAWS_SET_TIP(info_btn,
+                       _("Show information on configuring actions"));
 
        cond_hbox = gtk_hbox_new(FALSE, 8);
        gtk_widget_show(cond_hbox);
@@ -271,6 +374,8 @@ static void prefs_actions_create(MainWindow *mainwin)
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (cond_scrolledwin),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(cond_scrolledwin),
+                                           GTK_SHADOW_ETCHED_IN);
 
        cond_list_view = prefs_actions_list_view_create();                                     
        gtk_widget_show(cond_list_view);
@@ -285,24 +390,48 @@ static void prefs_actions_create(MainWindow *mainwin)
        gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(up_btn), "clicked",
                         G_CALLBACK(prefs_actions_up), NULL);
+       CLAWS_SET_TIP(up_btn,
+                       _("Move the selected action up"));
 
        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);
        g_signal_connect(G_OBJECT(down_btn), "clicked",
                         G_CALLBACK(prefs_actions_down), NULL);
+       CLAWS_SET_TIP(down_btn,
+                       _("Move selected action down"));
+
+       if (!geometry.min_height) {
+               geometry.min_width = 486;
+               geometry.min_height = 322;
+       }
+
+       gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+                                     GDK_HINT_MIN_SIZE);
+       gtk_widget_set_size_request(window, prefs_common.actionswin_width,
+                                   prefs_common.actionswin_height);
 
        gtk_widget_show(window);
 
        actions.window = window;
        actions.ok_btn = ok_btn;
+       actions.info_btn = info_btn;
 
        actions.name_entry = name_entry;
        actions.cmd_entry  = cmd_entry;
-
+       actions.filter_btn = filter_btn;
+       actions.shell_radiobtn = shell_radiobtn;
+       actions.filter_radiobtn = filter_radiobtn;
+       
        actions.actions_list_view = cond_list_view;
 }
 
+static void prefs_actions_reset_dialog(void)
+{
+       gtk_entry_set_text(GTK_ENTRY(actions.name_entry), "");
+       gtk_entry_set_text(GTK_ENTRY(actions.cmd_entry), "");
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(actions.shell_radiobtn), TRUE);
+}
 
 void prefs_actions_read_config(void)
 {
@@ -314,7 +443,7 @@ void prefs_actions_read_config(void)
        debug_print("Reading actions configurations...\n");
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACTIONS_RC, NULL);
-       if ((fp = fopen(rcpath, "rb")) == NULL) {
+       if ((fp = g_fopen(rcpath, "rb")) == NULL) {
                if (ENOENT != errno) FILE_OP_ERROR(rcpath, "fopen");
                g_free(rcpath);
                return;
@@ -329,13 +458,13 @@ void prefs_actions_read_config(void)
        }
 
        while (fgets(buf, sizeof(buf), fp) != NULL) {
-               const gchar *src_codeset = conv_get_current_charset_str();
+               const gchar *src_codeset = conv_get_locale_charset_str();
                const gchar *dest_codeset = CS_UTF_8;
                gchar *tmp;
 
                tmp = conv_codeset_strdup(buf, src_codeset, dest_codeset);
                if (!tmp) {
-                       g_warning("Faild to convert character set of action configuration\n");
+                       g_warning("Failed to convert character set of action configuration");
                        tmp = g_strdup(buf);
                }
 
@@ -362,7 +491,7 @@ void prefs_actions_write_config(void)
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACTIONS_RC, NULL);
        if ((pfile= prefs_write_open(rcpath)) == NULL) {
-               g_warning("failed to write configuration to file\n");
+               g_warning("failed to write configuration to file");
                g_free(rcpath);
                return;
        }
@@ -370,12 +499,12 @@ void prefs_actions_write_config(void)
        for (cur = prefs_common.actions_list; cur != NULL; cur = cur->next) {
                gchar *tmp = (gchar *)cur->data;
                const gchar *src_codeset = CS_UTF_8;
-               const gchar *dest_codeset = conv_get_current_charset_str();
+               const gchar *dest_codeset = conv_get_locale_charset_str();
                gchar *act;
 
                act = conv_codeset_strdup(tmp, src_codeset, dest_codeset);
                if (!act) {
-                       g_warning("Faild to convert character set of action configuration\n");
+                       g_warning("Failed to convert character set of action configuration");
                        act = g_strdup(act);
                }
 
@@ -383,6 +512,7 @@ void prefs_actions_write_config(void)
                    fputc('\n', pfile->fp) == EOF) {
                        FILE_OP_ERROR(rcpath, "fputs || fputc");
                        prefs_file_close_revert(pfile);
+                       g_free(act);
                        g_free(rcpath);
                        return;
                }
@@ -392,43 +522,40 @@ void prefs_actions_write_config(void)
        g_free(rcpath);
 
        if (prefs_file_close(pfile) < 0) {
-               g_warning("failed to write configuration to file\n");
+               g_warning("failed to write configuration to file");
                return;
        }
 }
 
+static void prefs_actions_clear_list(GtkListStore *list_store)
+{
+       gtk_list_store_clear(list_store);
+
+       prefs_actions_list_view_insert_action(actions.actions_list_view,
+                                             -1, _("(New)"), FALSE);
+}
+
 static void prefs_actions_set_dialog(void)
 {
        GtkListStore *store;
        GSList *cur;
-       GtkTreeSelection *selection;
-       GtkTreeIter iter;
 
        store = GTK_LIST_STORE(gtk_tree_view_get_model
                                (GTK_TREE_VIEW(actions.actions_list_view)));
-       gtk_list_store_clear(store);
 
-       prefs_actions_list_view_insert_action(actions.actions_list_view,
-                                             NULL, _("New"), FALSE);
+       prefs_actions_clear_list(store);        
+       prefs_actions_reset_dialog();
 
        for (cur = prefs_common.actions_list; cur != NULL; cur = cur->next) {
                gchar *action = (gchar *) cur->data;
                
                prefs_actions_list_view_insert_action(actions.actions_list_view,
-                                                     NULL, action, TRUE);
+                                                     -1, action, TRUE);
        }
-
-       /* select first entry */
-       selection = gtk_tree_view_get_selection
-               (GTK_TREE_VIEW(actions.actions_list_view));
-       if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store),
-                                         &iter))
-               gtk_tree_selection_select_iter(selection, &iter);
 }
 
 static void prefs_actions_set_list(void)
 {
-       gchar *action;
        GtkTreeIter iter;
        GtkListStore *store;
        
@@ -461,17 +588,12 @@ static void prefs_actions_set_list(void)
 #define GET_ENTRY(entry) \
        entry_text = gtk_entry_get_text(GTK_ENTRY(entry))
 
-static gint prefs_actions_clist_set_row(GtkTreeIter *row)
+static gint prefs_actions_clist_set_row(gint row)
 {
        const gchar *entry_text;
        gint len;
        gchar action[PREFSBUFSIZE];
        gchar *new_action;
-       GtkListStore *store;
-
-       store = GTK_LIST_STORE(gtk_tree_view_get_model
-                               (GTK_TREE_VIEW(actions.actions_list_view)));
-       
 
        GET_ENTRY(actions.name_entry);
        if (entry_text[0] == '\0') {
@@ -479,12 +601,26 @@ static gint prefs_actions_clist_set_row(GtkTreeIter *row)
                return -1;
        }
 
+       if (entry_text[0] == '/') {
+               alertpanel_error(_("A leading '/' is not allowed in the menu name."));
+               return -1;
+       }
+
        if (strchr(entry_text, ':')) {
                alertpanel_error(_("Colon ':' is not allowed in the menu name."));
                return -1;
        }
 
        strncpy(action, entry_text, PREFSBUFSIZE - 1);
+
+       while (strstr(action, "//")) {
+               char *to_move = strstr(action, "//")+1;
+               char *where = strstr(action, "//");
+               int old_len = strlen(action);
+               memmove(where, to_move, strlen(to_move));
+               action[old_len-1] = '\0';
+       }
+       
        g_strstrip(action);
 
        /* Keep space for the ': ' delimiter */
@@ -499,7 +635,7 @@ static gint prefs_actions_clist_set_row(GtkTreeIter *row)
        GET_ENTRY(actions.cmd_entry);
 
        if (entry_text[0] == '\0') {
-               alertpanel_error(_("Command line not set."));
+               alertpanel_error(_("Command-line not set."));
                return -1;
        }
 
@@ -509,8 +645,11 @@ static gint prefs_actions_clist_set_row(GtkTreeIter *row)
        }
 
        if (action_get_type(entry_text) == ACTION_ERROR) {
-               alertpanel_error(_("The command\n%s\nhas a syntax error."), 
-                                entry_text);
+               gchar *message;
+               message = g_markup_printf_escaped(_("The command\n%s\nhas a syntax error."),
+                                               entry_text);
+               alertpanel_error("%s", message);
+               g_free(message);
                return -1;
        }
 
@@ -529,38 +668,36 @@ static gint prefs_actions_clist_set_row(GtkTreeIter *row)
 
 static void prefs_actions_register_cb(GtkWidget *w, gpointer data)
 {
-       prefs_actions_clist_set_row(NULL);
+       prefs_actions_clist_set_row(-1);
+
+       modified = FALSE;
+       modified_list = TRUE;
 }
 
 static void prefs_actions_substitute_cb(GtkWidget *w, gpointer data)
 {
-       GtkTreeIter isel, inew;
-       GtkTreePath *path_sel, *path_new;
-       GtkTreeSelection *selection = gtk_tree_view_get_selection
-                                       (GTK_TREE_VIEW(actions.actions_list_view));
-       GtkTreeModel *model;                                    
+       gint row;
 
-       if (!gtk_tree_selection_get_selected(selection, &model, &isel))
+       row = gtkut_list_view_get_selected_row(actions.actions_list_view);
+       if (row <= 0)
                return;
-       if (!gtk_tree_model_get_iter_first(model, &inew))
-               return;
-
-       path_sel = gtk_tree_model_get_path(model, &isel);
-       path_new = gtk_tree_model_get_path(model, &inew);
 
-       if (path_sel && path_new 
-       &&  gtk_tree_path_compare(path_sel, path_new) != 0)
-               prefs_actions_clist_set_row(&isel);
+       prefs_actions_clist_set_row(row);
 
-       gtk_tree_path_free(path_sel);
-       gtk_tree_path_free(path_new);
+       modified = FALSE;
+       modified_list = TRUE;
 }
 
-static void prefs_actions_delete_cb(GtkWidget *w, gpointer data)
+static void prefs_actions_delete_cb(gpointer gtk_action, gpointer data)
 {
        GtkTreeIter sel;
        GtkTreeModel *model;
        gchar *action;
+       gint row;
+
+       row = gtkut_list_view_get_selected_row(actions.actions_list_view);
+       if (row <= 0) 
+               return; 
 
        if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection
                                (GTK_TREE_VIEW(actions.actions_list_view)),
@@ -569,7 +706,7 @@ static void prefs_actions_delete_cb(GtkWidget *w, gpointer data)
 
        if (alertpanel(_("Delete action"),
                       _("Do you really want to delete this action?"),
-                      _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+                      GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL) != G_ALERTALTERNATE)
                return;
 
        /* XXX: Here's the reason why we need to store the original 
@@ -581,22 +718,64 @@ static void prefs_actions_delete_cb(GtkWidget *w, gpointer data)
 
        prefs_common.actions_list = g_slist_remove(prefs_common.actions_list,
                                                   action);
+       modified_list = TRUE;
+}
+
+static void prefs_actions_delete_all_cb(gpointer gtk_action, gpointer data)
+{
+       GtkListStore *list_store;
+
+       if (alertpanel(_("Delete all actions"),
+                         _("Do you really want to delete all the actions?"),
+                         GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL) != G_ALERTDEFAULT)
+          return;
+
+       list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(actions.actions_list_view)));
+       prefs_actions_clear_list(list_store);
+       modified = FALSE;
+
+       prefs_actions_reset_dialog();
+       modified_list = TRUE;
+}
+
+static void prefs_actions_clear_cb(gpointer gtk_action, gpointer data)
+{
+       gint row;
+
+       prefs_actions_reset_dialog();
+       row = gtkut_list_view_get_selected_row(actions.actions_list_view);
+       if (row < 1)
+               modified = FALSE;
+       else
+               modified = TRUE;
+}
+
+static void prefs_actions_duplicate_cb(gpointer gtk_action, gpointer data)
+{
+       gint row;
+       
+       row = gtkut_list_view_get_selected_row(actions.actions_list_view);
+       if (row <= 0)
+               return;
+
+       modified_list = !prefs_actions_clist_set_row(-row-2);
 }
 
 static void prefs_actions_up(GtkWidget *w, gpointer data)
 {
        GtkTreePath *prev, *sel, *try;
        GtkTreeIter isel;
-       GtkListStore *store;
+       GtkListStore *store = NULL;
+       GtkTreeModel *model = NULL;
        GtkTreeIter iprev;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(actions.actions_list_view)),
-                (GtkTreeModel **) &store,      
+                &model,        
                 &isel))
                return;
-
+       store = (GtkListStore *)model;
        sel = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &isel);
        if (!sel)
                return;
@@ -625,21 +804,23 @@ static void prefs_actions_up(GtkWidget *w, gpointer data)
 
        gtk_list_store_swap(store, &iprev, &isel);
        prefs_actions_set_list();
+       modified_list = TRUE;
 }
 
 static void prefs_actions_down(GtkWidget *w, gpointer data)
 {
-       GtkListStore *store;
+       GtkListStore *store = NULL;
+       GtkTreeModel *model = NULL;
        GtkTreeIter next, sel;
        GtkTreePath *try;
        
        if (!gtk_tree_selection_get_selected
                (gtk_tree_view_get_selection
                        (GTK_TREE_VIEW(actions.actions_list_view)),
-                (GtkTreeModel **) &store,
+                &model,
                 &sel))
                return;
-
+       store = (GtkListStore *)model;
        try = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &sel);
        if (!try) 
                return;
@@ -657,6 +838,7 @@ static void prefs_actions_down(GtkWidget *w, gpointer data)
 
        gtk_list_store_swap(store, &next, &sel);
        prefs_actions_set_list();
+       modified_list = TRUE;
 }
 
 static gint prefs_actions_deleted(GtkWidget *widget, GdkEventAny *event,
@@ -669,26 +851,87 @@ static gint prefs_actions_deleted(GtkWidget *widget, GdkEventAny *event,
 static gboolean prefs_actions_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                          gpointer data)
 {
-       if (event && event->keyval == GDK_Escape)
+       if (event && event->keyval == GDK_KEY_Escape)
                prefs_actions_cancel(widget, data);
+       else {
+               GtkWidget *focused = gtkut_get_focused_child(
+                               GTK_CONTAINER(widget));
+               if (focused && GTK_IS_EDITABLE(focused))
+                       modified = TRUE;
+       }
        return FALSE;
 }
 
+static gboolean prefs_actions_search_func_cb (GtkTreeModel *model, gint column, const gchar *key, 
+                                               GtkTreeIter *iter, gpointer search_data) 
+{
+       gchar *store_string;
+       gboolean retval;
+       GtkTreePath *path;
+
+       gtk_tree_model_get (model, iter, column, &store_string, -1);
+
+       if (!store_string || !key)
+               return FALSE;
+
+
+       retval = (strncmp (key, store_string, strlen(key)) != 0);
+
+       g_free(store_string);
+       debug_print("selecting row\n");
+       path = gtk_tree_model_get_path(model, iter);
+       prefs_actions_select_row(GTK_TREE_VIEW(actions.actions_list_view), path);
+       gtk_tree_path_free(path);
+
+       return retval;
+}
 static void prefs_actions_cancel(GtkWidget *w, gpointer data)
 {
+       GtkListStore *store;
+
+       if (modified && alertpanel(_("Entry not saved"),
+                                _("The entry was not saved. Close anyway?"),
+                                GTK_STOCK_CLOSE, g_strconcat("+", _("_Continue editing"), NULL),
+                                NULL) != G_ALERTDEFAULT) {
+               return;
+       } else if (modified_list && alertpanel(_("Actions list not saved"),
+                                _("The actions list has been modified. Close anyway?"),
+                                GTK_STOCK_CLOSE, g_strconcat("+", _("_Continue editing"), NULL),
+                                NULL) != G_ALERTDEFAULT) {
+               return;
+       }
+       modified = FALSE;
+       modified_list = FALSE;
+       store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW
+                               (actions.actions_list_view)));
+       gtk_list_store_clear(store);
        prefs_actions_read_config();
        gtk_widget_hide(actions.window);
+       gtk_window_set_modal(GTK_WINDOW(actions.window), FALSE);
        inc_unlock();
 }
 
 static void prefs_actions_ok(GtkWidget *widget, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *) data;
-       GList *list;
-       GList *iter;
+       const GList *list;
+       const GList *iter;
        MessageView *msgview;
        Compose *compose;
+       GtkListStore *store;
 
+       if (modified && alertpanel(_("Entry not saved"),
+                                _("The entry was not saved. Close anyway?"),
+                                GTK_STOCK_CLOSE, g_strconcat("+", _("_Continue editing"), NULL),
+                                NULL) != G_ALERTDEFAULT) {
+               return;
+       } 
+       modified = FALSE;
+       modified_list = FALSE;
+       prefs_actions_set_list();
+       store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW
+                               (actions.actions_list_view)));
+       gtk_list_store_clear(store);
        prefs_actions_write_config();
 
        /* Update mainwindow actions menu */
@@ -708,7 +951,11 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data)
                compose_update_actions_menu(compose);
        }
 
+       /* Update toolbars */
+       prefs_toolbar_update_action_btns();
+       
        gtk_widget_hide(actions.window);
+       gtk_window_set_modal(GTK_WINDOW(actions.window), FALSE);
        inc_unlock();
 }
 
@@ -718,19 +965,19 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data)
  * When adding new lines, remember to put one string for each line
  */
 static gchar *actions_desc_strings[] = {
-       N_("MENU NAME:"), NULL,
-       "      ",   N_("Use / in menu name to make submenus."),
+       N_("<span weight=\"bold\" underline=\"single\">Menu name:</span>"), NULL,
+       N_("Use / in menu name to make submenus."), NULL,
        "", NULL,
-       N_("COMMAND LINE:"), NULL,
-       N_("Begin with:"), NULL,
+       N_("<span weight=\"bold\" underline=\"single\">Command-line:</span>"), NULL,
+       N_("<span weight=\"bold\">Begin with:</span>"), NULL,
        "     |",   N_("to send message body or selection to command's standard input"),
-       "     >",   N_("to send user provided text to command's standard input"),
+       "     &gt;",   N_("to send user provided text to command's standard input"),
        "     *",   N_("to send user provided hidden text to command's standard input"),
-       N_("End with:"), NULL, 
+       N_("<span weight=\"bold\">End with:</span>"), NULL,
        "     |",   N_("to replace message body or selection with command's standard output"),
-       "     >",   N_("to insert command's standard output without replacing old text"),
-       "     &",   N_("to run command asynchronously"),
-       N_("Use:"), NULL, 
+       "     &gt;",   N_("to insert command's standard output without replacing old text"),
+       "     &amp;",   N_("to run command asynchronously"),
+       N_("<span weight=\"bold\">Use:</span>"), NULL, 
        "     %f",  N_("for the file of the selected message in RFC822/2822 format "),
        "     %F",  N_("for the list of the files of the selected messages in RFC822/2822 format"),
        "     %p",  N_("for the file of the selected decoded message MIME part"),
@@ -738,20 +985,27 @@ static gchar *actions_desc_strings[] = {
        "     %h",  N_("for a user provided hidden argument (e.g. password)"),
        "     %s",  N_("for the text selection"),
        "  %as{}",  N_("apply filtering actions between {} to selected messages"),
-       NULL
+       "     %%",  N_("for a literal %"),
+       NULL, NULL
 };
 
 
 static DescriptionWindow actions_desc_win = { 
-        NULL, 
-        2,
-        N_("Description of symbols"),
+       NULL,
+       NULL,
+       TRUE,
+       2,
+       N_("Actions"),
+       N_("The Actions feature is a way for the user to launch "
+          "external commands to process a complete message file or just "
+          "one of its parts."),
         actions_desc_strings
 };
 
 
-static void prefs_actions_help_cb(GtkWidget *w, gpointer data)
+static void prefs_actions_info_cb(GtkWidget *w, GtkWidget *window)
 {
+       actions_desc_win.parent = window;
        description_window_create(&actions_desc_win);
 }
 
@@ -765,15 +1019,31 @@ static GtkListStore* prefs_actions_create_data_store(void)
 }
 
 static void prefs_actions_list_view_insert_action(GtkWidget *list_view,
-                                                 GtkTreeIter *row_iter,
+                                                 gint row,
                                                  gchar *action,
                                                  gboolean is_valid) 
 {
        GtkTreeIter iter;
+       GtkTreeIter sibling;
        GtkListStore *list_store = GTK_LIST_STORE(gtk_tree_view_get_model
                                        (GTK_TREE_VIEW(list_view)));
 
-       if (row_iter == NULL) {
+/*     row -1 to add a new rule to store,
+       row >=0 to change an existing row
+       row <-1 insert a new row after (-row-2)
+*/
+       if (row >= 0 ) {
+               /* modify the existing */
+               if (!gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(list_store),
+                                                  &iter, NULL, row))
+                       row = -1;
+       } else if (row < -1 ) {
+               if (!gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(list_store),
+                                                  &sibling, NULL, -row-2))
+                       row = -1;               
+       }
+
+       if (row == -1 ) {
                /* append new */
                gtk_list_store_append(list_store, &iter);
                gtk_list_store_set(list_store, &iter,
@@ -781,22 +1051,122 @@ static void prefs_actions_list_view_insert_action(GtkWidget *list_view,
                                   PREFS_ACTIONS_DATA, action,
                                   PREFS_ACTIONS_VALID,  is_valid,
                                   -1);
+       } else if (row < -1) {
+               /* duplicate */
+               gtk_list_store_insert_after(list_store, &iter, &sibling);
+               gtk_list_store_set(list_store, &iter,
+                                  PREFS_ACTIONS_STRING, action,
+                                  PREFS_ACTIONS_DATA, action,
+                                  PREFS_ACTIONS_VALID,  is_valid,
+                                  -1);
        } else {
                /* change existing */
                gchar *old_action;
 
-               gtk_tree_model_get(GTK_TREE_MODEL(list_store), row_iter,
+               gtk_tree_model_get(GTK_TREE_MODEL(list_store), &iter,
                                   PREFS_ACTIONS_DATA, &old_action,
                                   -1);
-               
                g_free(old_action);                             
-               gtk_list_store_set(list_store, row_iter,
+
+               gtk_list_store_set(list_store, &iter,
                                   PREFS_ACTIONS_STRING, action,
                                   PREFS_ACTIONS_DATA, action,
                                   -1);
        }
 }
 
+static GtkActionGroup *prefs_actions_popup_action = NULL;
+static GtkWidget *prefs_actions_popup_menu = NULL;
+
+static GtkActionEntry prefs_actions_popup_entries[] =
+{
+       {"PrefsActionsPopup",                   NULL, "PrefsActionsPopup" },
+       {"PrefsActionsPopup/Delete",            NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(prefs_actions_delete_cb) },
+       {"PrefsActionsPopup/DeleteAll", NULL, N_("Delete _all"), NULL, NULL, G_CALLBACK(prefs_actions_delete_all_cb) },
+       {"PrefsActionsPopup/Duplicate", NULL, N_("D_uplicate"), NULL, NULL, G_CALLBACK(prefs_actions_duplicate_cb) },
+};
+
+static void prefs_actions_row_selected(GtkTreeSelection *selection, GtkTreeView *list_view)
+{
+       GtkTreePath *path;
+       GtkTreeIter iter;
+       GtkTreeModel *model;
+       
+       if (!gtk_tree_selection_get_selected(selection, &model, &iter))
+               return;
+       
+       path = gtk_tree_model_get_path(model, &iter);
+       prefs_actions_select_row(list_view, path);
+       gtk_tree_path_free(path);
+}
+
+static gint prefs_actions_list_btn_pressed(GtkWidget *widget, GdkEventButton *event,
+                                  GtkTreeView *list_view)
+{
+       if (event) {
+               /* left- or right-button click */
+               if (event->button == 1 || event->button == 3) {
+                       GtkTreePath *path = NULL;
+                       if (gtk_tree_view_get_path_at_pos( list_view, event->x, event->y,
+                                       &path, NULL, NULL, NULL)) {
+                               prefs_actions_select_row(list_view, path);
+               }
+               if (path)
+                       gtk_tree_path_free(path);
+               }
+
+               /* right-button click */
+               if (event->button == 3) {
+                       GtkTreeModel *model = gtk_tree_view_get_model(list_view);
+                       GtkTreeIter iter;
+                       gboolean non_empty;
+                       gint row;
+
+                       if (!prefs_actions_popup_menu) {
+                               prefs_actions_popup_action = cm_menu_create_action_group("PrefsActionsPopup",
+                                               prefs_actions_popup_entries, G_N_ELEMENTS(prefs_actions_popup_entries),
+                                               (gpointer)list_view);
+                               MENUITEM_ADDUI("/Menus", "PrefsActionsPopup", "PrefsActionsPopup", GTK_UI_MANAGER_MENU)
+                               MENUITEM_ADDUI("/Menus/PrefsActionsPopup", "Delete", "PrefsActionsPopup/Delete", GTK_UI_MANAGER_MENUITEM)
+                               MENUITEM_ADDUI("/Menus/PrefsActionsPopup", "DeleteAll", "PrefsActionsPopup/DeleteAll", GTK_UI_MANAGER_MENUITEM)
+                               MENUITEM_ADDUI("/Menus/PrefsActionsPopup", "Duplicate", "PrefsActionsPopup/Duplicate", GTK_UI_MANAGER_MENUITEM)
+                               prefs_actions_popup_menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
+                                               gtk_ui_manager_get_widget(gtkut_ui_manager(), "/Menus/PrefsActionsPopup")) );
+                       }
+
+                       /* grey out some popup menu items if there is no selected row */
+                       row = gtkut_list_view_get_selected_row(GTK_WIDGET(list_view));
+                       cm_menu_set_sensitive("PrefsActionsPopup/Delete", (row > 0));
+                       cm_menu_set_sensitive("PrefsActionsPopup/Duplicate", (row > 0));
+
+                       /* grey out seom popup menu items if there is no row
+                       (not counting the (New) one at row 0) */
+                       non_empty = gtk_tree_model_get_iter_first(model, &iter);
+                       if (non_empty)
+                               non_empty = gtk_tree_model_iter_next(model, &iter);
+                       cm_menu_set_sensitive("PrefsActionsPopup/DeleteAll", non_empty);
+
+                       gtk_menu_popup(GTK_MENU(prefs_actions_popup_menu), 
+                                       NULL, NULL, NULL, NULL, 
+                                       event->button, event->time);
+               }
+   }
+   return FALSE;
+}
+
+static gboolean prefs_actions_list_popup_menu(GtkWidget *widget, gpointer data)
+{
+   GtkTreeView *list_view = (GtkTreeView *)data;
+   GdkEventButton event;
+   
+   event.button = 3;
+   event.time = gtk_get_current_event_time();
+   
+   prefs_actions_list_btn_pressed(NULL, &event, list_view);
+
+   return TRUE;
+}
+
 static GtkWidget *prefs_actions_list_view_create(void)
 {
        GtkTreeView *list_view;
@@ -807,12 +1177,18 @@ static GtkWidget *prefs_actions_list_view_create(void)
        list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
        g_object_unref(model);  
        
-       gtk_tree_view_set_rules_hint(list_view, TRUE);
-       
+       g_signal_connect(G_OBJECT(list_view), "popup-menu",
+                        G_CALLBACK(prefs_actions_list_popup_menu), list_view);
+       g_signal_connect(G_OBJECT(list_view), "button-press-event",
+                       G_CALLBACK(prefs_actions_list_btn_pressed), list_view);
+
+       gtk_tree_view_set_rules_hint(list_view, prefs_common.use_stripes_everywhere);
+       gtk_tree_view_set_reorderable(list_view, TRUE);
+
        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_actions_selected,
-                                              NULL, NULL);
+       g_signal_connect(G_OBJECT(selector), "changed",
+                        G_CALLBACK(prefs_actions_row_selected), list_view);
 
        /* create the columns */
        prefs_actions_create_list_view_columns(GTK_WIDGET(list_view));
@@ -832,41 +1208,40 @@ static void prefs_actions_create_list_view_columns(GtkWidget *list_view)
                 "text", PREFS_ACTIONS_STRING,
                 NULL);
        gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);          
+       gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(list_view), prefs_actions_search_func_cb , NULL, NULL);
 }
 
 #define ENTRY_SET_TEXT(entry, str) \
        gtk_entry_set_text(GTK_ENTRY(entry), str ? str : "")
 
-static gboolean prefs_actions_selected(GtkTreeSelection *selector,
-                                      GtkTreeModel *model, 
-                                      GtkTreePath *path,
-                                      gboolean currently_selected,
-                                      gpointer data)
+static void prefs_actions_select_row(GtkTreeView *list_view, GtkTreePath *path)
 {
+       GtkTreeModel *model = gtk_tree_view_get_model(list_view);
+       GtkTreeSelection *selection;
        gchar *action;
        gchar *cmd;
        gchar buf[PREFSBUFSIZE];
        GtkTreeIter iter;
        gboolean is_valid;
 
-       if (currently_selected)
-               return TRUE;
+       if (!model || !path || !gtk_tree_model_get_iter(model, &iter, path))
+               return;
 
-       if (!gtk_tree_model_get_iter(model, &iter, path))
-               return TRUE;
+       /* select row */
+       selection = gtk_tree_view_get_selection(list_view);
+       gtk_tree_selection_select_path(selection, path);
 
        gtk_tree_model_get(model, &iter, 
                           PREFS_ACTIONS_VALID,  &is_valid,
                           PREFS_ACTIONS_DATA, &action,
                           -1);
        if (!is_valid) {
-               ENTRY_SET_TEXT(actions.name_entry, "");
-               ENTRY_SET_TEXT(actions.cmd_entry, "");
-               return TRUE;
+               prefs_actions_reset_dialog();
+               return;
        }
        
        strncpy(buf, action, PREFSBUFSIZE - 1);
-       buf[PREFSBUFSIZE - 1] = 0x00;
+       buf[PREFSBUFSIZE - 1] = '\0';
        cmd = strstr(buf, ": ");
 
        if (cmd && cmd[2])
@@ -874,9 +1249,140 @@ static gboolean prefs_actions_selected(GtkTreeSelection *selector,
        else
                return;
 
-       *cmd = 0x00;
-       ENTRY_SET_TEXT(actions.name_entry, buf);
+       *cmd = '\0';
+       gtk_entry_set_text(GTK_ENTRY(actions.name_entry), buf);
 
-       return TRUE;
+       if (g_str_has_prefix(&cmd[2], "%as{") == TRUE)
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
+                                               actions.filter_radiobtn), TRUE);
+       else
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(
+                                               actions.shell_radiobtn), TRUE);
+
+       return;
+}
+
+static void prefs_action_filter_radiobtn_cb(GtkWidget *widget, gpointer data)
+{
+       if (actions.filter_btn)
+               gtk_widget_set_sensitive(actions.filter_btn, TRUE);
+       if (actions.cmd_entry)
+               gtk_widget_set_sensitive(actions.cmd_entry, FALSE);
+       if (actions.info_btn)
+               gtk_widget_set_sensitive(actions.info_btn, FALSE);
 }
 
+static void prefs_action_shell_radiobtn_cb(GtkWidget *widget, gpointer data)
+{
+       if (actions.filter_btn)
+               gtk_widget_set_sensitive(actions.filter_btn, FALSE);
+       if (actions.cmd_entry)
+               gtk_widget_set_sensitive(actions.cmd_entry, TRUE);
+       if (actions.info_btn)
+               gtk_widget_set_sensitive(actions.info_btn, TRUE);
+}
+
+static void prefs_action_filterbtn_cb(GtkWidget *widget, gpointer data)
+{
+       gchar *action_str, **tokens;
+       GSList *action_list = NULL, *cur;
+
+/* I think this warning is useless - it's logical to clear the field when
+   changing its type.
+
+       if(modified && alertpanel(_("Entry was modified"),
+                       _("Opening the filter action dialog will clear current modifications "
+                       "of the command line."),
+                       GTK_STOCK_CANCEL, _("+_Continue editing"), NULL) != G_ALERTDEFAULT)
+               return;
+*/
+       action_str = gtk_editable_get_chars(GTK_EDITABLE(actions.cmd_entry), 0, -1);
+       tokens = g_strsplit_set(action_str, "{}", 5);
+
+       if (tokens[0] && tokens[1] && *tokens[1] != '\0') {
+               action_list = matcher_parser_get_action_list(tokens[1]);
+               if (action_list == NULL)
+                       alertpanel_error(_("Action string is not valid."));
+       }
+               
+       prefs_filtering_action_open(action_list, prefs_action_define_filter_done);
+
+       if (action_list != NULL) {
+               for(cur = action_list ; cur != NULL ; cur = cur->next)
+                        filteringaction_free(cur->data);
+        }
+        
+       g_free(action_str);
+       g_strfreev(tokens);
+}
+
+static void prefs_action_define_filter_done(GSList * action_list)
+{
+       gchar *str;
+
+       if (action_list == NULL)
+               return;
+
+       action_list = filtering_action_list_sort(action_list);
+       str = filteringaction_list_to_string(action_list);
+
+       if (str != NULL) {
+               gchar *cmd;
+               cmd = g_strdup_printf("%%as{%s}",str);
+               g_free(str);
+               gtk_entry_set_text(GTK_ENTRY(actions.cmd_entry), cmd);
+               g_free(cmd);
+               modified = TRUE;
+       }
+}
+
+void prefs_actions_rename_path(const gchar *old_path, const gchar *new_path)
+{
+       gchar **tokens, *action_str;
+       GSList *action, *action_list;
+       
+       for (action = prefs_common.actions_list; action != NULL;
+                       action = action->next) {
+               action_str = (gchar *)action->data;
+               tokens = g_strsplit_set(action_str, "{}", 5);
+               
+               if (tokens[0] && tokens[1] && *tokens[1] != '\0')
+                       action_list = matcher_parser_get_action_list(tokens[1]);
+               else
+                       action_list = NULL;
+
+               if (action_list &&
+                   filtering_action_list_rename_path(action_list,
+                                               old_path, new_path)) {
+                       g_free(action->data);
+                       action->data = g_strconcat(tokens[0], "{",
+                               filteringaction_list_to_string(action_list),
+                               "}", NULL);
+               }
+
+               g_strfreev(tokens);
+       }
+}
+
+gint prefs_actions_find_by_name(const gchar *name)
+{
+       GSList *act = prefs_common.actions_list;
+       gchar *action_name, *action_p;
+       gint action_nb = 0;
+       
+       for (; act != NULL; act = act->next) {
+               action_name = g_strdup((gchar *)act->data);
+               action_p = strstr(action_name, ": ");
+               action_p[0] = 0x00;
+
+               if (g_utf8_collate(name, action_name) == 0) {
+                       g_free(action_name);
+                       return action_nb;
+               }
+
+               g_free(action_name);
+               action_nb++;
+       }
+
+       return -1;
+}