2007-10-05 [paul] 3.0.2cvs13
[claws.git] / src / prefs_actions.c
index 5a7bf676d9e86b5627ed7c4ebc2a0c13d9654422..a6eb2eed4525f73873f155bce9d5df846f88bd66 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto & The Sylpheed Claws Team
+ * Copyright (C) 1999-2007 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,
@@ -13,8 +13,8 @@
  * 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
@@ -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 "prefs_gtk.h"
 #include "inc.h"
 #include "utils.h"
@@ -43,6 +43,8 @@
 #include "prefs_actions.h"
 #include "action.h"
 #include "description_window.h"
+#include "gtkutils.h"
+#include "manual.h"
 
 enum {
        PREFS_ACTIONS_STRING,   /*!< string pointer managed by list store, 
@@ -67,14 +69,17 @@ static struct Actions
        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);
 
 /* 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,
@@ -126,18 +131,30 @@ void prefs_actions_open(MainWindow *mainwin)
        gtk_widget_show(actions.window);
 }
 
+/*!
+ *\brief       Save Gtk object size to prefs dataset
+ */
+static void prefs_actions_size_allocate_cb(GtkWidget *widget,
+                                        GtkAllocation *allocation)
+{
+       g_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 *help_btn;
        GtkWidget *ok_btn;
        GtkWidget *cancel_btn;
        GtkWidget *confirm_area;
 
        GtkWidget *vbox1;
+       GtkWidget *table;
 
-       GtkWidget *entry_vbox;
-       GtkWidget *hbox;
        GtkWidget *name_label;
        GtkWidget *name_entry;
        GtkWidget *cmd_label;
@@ -154,29 +171,30 @@ static void prefs_actions_create(MainWindow *mainwin)
        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_stock_button_set_create(&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);
@@ -184,6 +202,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);
@@ -191,34 +211,46 @@ 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);
+       table = gtk_table_new(2, 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 line"));
+       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, 1, 2,
+                         (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, 1, 2,
+                         (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+                         (GtkAttachOptions) (0), 0, 0);
 
        /* register / substitute / delete */
 
@@ -241,24 +273,28 @@ static void prefs_actions_create(MainWindow *mainwin)
        g_signal_connect(G_OBJECT(reg_btn), "clicked",
                         G_CALLBACK(prefs_actions_register_cb), NULL);
 
-       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);
 
-       del_btn = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
+       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);
        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);
+#if GTK_CHECK_VERSION(2, 8, 0)
+       info_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
+#else
+       info_btn = gtk_button_new_with_label(_("Info..."));
+#endif
+       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));
 
        cond_hbox = gtk_hbox_new(FALSE, 8);
        gtk_widget_show(cond_hbox);
@@ -293,6 +329,16 @@ static void prefs_actions_create(MainWindow *mainwin)
        g_signal_connect(G_OBJECT(down_btn), "clicked",
                         G_CALLBACK(prefs_actions_down), NULL);
 
+       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;
@@ -315,7 +361,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;
@@ -336,7 +382,7 @@ void prefs_actions_read_config(void)
 
                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\n");
                        tmp = g_strdup(buf);
                }
 
@@ -363,7 +409,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\n");
                g_free(rcpath);
                return;
        }
@@ -376,7 +422,7 @@ void prefs_actions_write_config(void)
 
                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\n");
                        act = g_strdup(act);
                }
 
@@ -410,7 +456,7 @@ static void prefs_actions_set_dialog(void)
        gtk_list_store_clear(store);
 
        prefs_actions_list_view_insert_action(actions.actions_list_view,
-                                             NULL, _("New"), FALSE);
+                                             NULL, _("(New)"), FALSE);
 
        for (cur = prefs_common.actions_list; cur != NULL; cur = cur->next) {
                gchar *action = (gchar *) cur->data;
@@ -429,7 +475,6 @@ static void prefs_actions_set_dialog(void)
 
 static void prefs_actions_set_list(void)
 {
-       gchar *action;
        GtkTreeIter iter;
        GtkListStore *store;
        
@@ -480,12 +525,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 */
@@ -510,8 +569,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(message);
+               g_free(message);
                return -1;
        }
 
@@ -531,6 +593,8 @@ 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);
+       modified = FALSE;
+       modified_list = TRUE;
 }
 
 static void prefs_actions_substitute_cb(GtkWidget *w, gpointer data)
@@ -555,6 +619,8 @@ static void prefs_actions_substitute_cb(GtkWidget *w, gpointer data)
 
        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)
@@ -570,7 +636,7 @@ static void prefs_actions_delete_cb(GtkWidget *w, gpointer data)
 
        if (alertpanel(_("Delete action"),
                       _("Do you really want to delete this action?"),
-                      GTK_STOCK_YES, GTK_STOCK_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 
@@ -582,22 +648,24 @@ 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_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;
@@ -626,21 +694,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;
@@ -658,6 +728,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,
@@ -672,11 +743,31 @@ static gboolean prefs_actions_key_pressed(GtkWidget *widget, GdkEventKey *event,
 {
        if (event && event->keyval == GDK_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 void prefs_actions_cancel(GtkWidget *w, gpointer data)
 {
+       if (modified && alertpanel(_("Entry not saved"),
+                                _("The entry was not saved. Close anyway?"),
+                                GTK_STOCK_CLOSE, _("+_Continue editing"),
+                                NULL) != G_ALERTDEFAULT) {
+               return;
+       } else if (modified_list && alertpanel(_("Actions list not saved"),
+                                _("The actions list has been modified. Close anyway?"),
+                                GTK_STOCK_CLOSE, _("+_Continue editing"), 
+                                NULL) != G_ALERTDEFAULT) {
+               return;
+       }
+       modified = FALSE;
+       modified_list = FALSE;
        prefs_actions_read_config();
        gtk_widget_hide(actions.window);
        inc_unlock();
@@ -690,6 +781,20 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data)
        MessageView *msgview;
        Compose *compose;
 
+       if (modified && alertpanel(_("Entry not saved"),
+                                _("The entry was not saved. Close anyway?"),
+                                GTK_STOCK_CLOSE, _("+_Continue editing"),
+                                NULL) != G_ALERTDEFAULT) {
+               return;
+       } else if (modified_list && alertpanel(_("Actions list not saved"),
+                                _("The actions list has been modified. Close anyway?"),
+                                GTK_STOCK_CLOSE, _("+_Continue editing"), 
+                                NULL) != G_ALERTDEFAULT) {
+               return;
+       }
+       modified = FALSE;
+       modified_list = FALSE;
+       prefs_actions_set_list();
        prefs_actions_write_config();
 
        /* Update mainwindow actions menu */
@@ -719,19 +824,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"),
@@ -739,20 +844,26 @@ 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,
+       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);
 }
 
@@ -808,8 +919,9 @@ 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);
-       
+       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,
@@ -873,7 +985,7 @@ static gboolean prefs_actions_selected(GtkTreeSelection *selector,
        if (cmd && cmd[2])
                ENTRY_SET_TEXT(actions.cmd_entry, &cmd[2]);
        else
-               return;
+               return TRUE;
 
        *cmd = 0x00;
        ENTRY_SET_TEXT(actions.name_entry, buf);