Use Delete button instead of Remove (tooltips and other places already

[claws.git] / src / prefs_actions.c

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index eb1a5456fbe7a5aaf2261d4cbc21b6fd462bc956..6b232d99a615b31a1034478bfe723cd641a5bd20 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 Hiroyuki Yamamoto & The Claws Mail 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
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -325,7 +326,7 @@ static void prefs_actions_create(MainWindow *mainwin)
        CLAWS_SET_TIP(reg_btn,
                        _("Append the new action above to the list"));
 
-       subst_btn = gtkut_get_replace_btn(_("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",
@@ -333,7 +334,9 @@ static void prefs_actions_create(MainWindow *mainwin)
        CLAWS_SET_TIP(subst_btn,
                        _("Replace the selected action in list with the action above"));
 
-       del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+       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",
@@ -341,7 +344,9 @@ static void prefs_actions_create(MainWindow *mainwin)
        CLAWS_SET_TIP(del_btn,
                        _("Delete the selected action from the list"));
 
-       clear_btn = gtk_button_new_from_stock (GTK_STOCK_CLEAR);
+       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",
@@ -459,7 +464,7 @@ void prefs_actions_read_config(void)
 
                tmp = conv_codeset_strdup(buf, src_codeset, dest_codeset);
                if (!tmp) {
-                       g_warning("Failed to convert character set of action configuration\n");
+                       g_warning("Failed to convert character set of action configuration");
                        tmp = g_strdup(buf);
                }
 
@@ -486,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;
        }
@@ -499,7 +504,7 @@ void prefs_actions_write_config(void)
 
                act = conv_codeset_strdup(tmp, src_codeset, dest_codeset);
                if (!act) {
-                       g_warning("Failed to convert character set of action configuration\n");
+                       g_warning("Failed to convert character set of action configuration");
                        act = g_strdup(act);
                }
 
@@ -517,7 +522,7 @@ 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;
        }
 }
@@ -589,10 +594,6 @@ static gint prefs_actions_clist_set_row(gint row)
        gint len, action_nb;
        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') {
@@ -896,12 +897,12 @@ 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"),
+                                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, _("+_Continue editing"), 
+                                GTK_STOCK_CLOSE, g_strconcat("+", _("_Continue editing"), NULL),
                                 NULL) != G_ALERTDEFAULT) {
                return;
        }
@@ -919,15 +920,15 @@ static void prefs_actions_cancel(GtkWidget *w, gpointer data)
 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, _("+_Continue editing"),
+                                GTK_STOCK_CLOSE, g_strconcat("+", _("_Continue editing"), NULL),
                                 NULL) != G_ALERTDEFAULT) {
                return;
        } 
@@ -998,6 +999,7 @@ static gchar *actions_desc_strings[] = {
 static DescriptionWindow actions_desc_win = { 
        NULL,
        NULL,
+       TRUE,
        2,
        N_("Actions"),
        N_("The Actions feature is a way for the user to launch "
@@ -1181,15 +1183,8 @@ static GtkWidget *prefs_actions_list_view_create(void)
        list_view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(model));
        g_object_unref(model);  
        
-#ifndef MAEMO
        g_signal_connect(G_OBJECT(list_view), "popup-menu",
                         G_CALLBACK(prefs_actions_list_popup_menu), list_view);
-#else
-       gtk_widget_tap_and_hold_setup(GTK_WIDGET(list_view), NULL, NULL,
-                       GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
-       g_signal_connect(G_OBJECT(list_view), "tap-and-hold",
-                        G_CALLBACK(prefs_actions_list_popup_menu), list_view);
-#endif
        g_signal_connect(G_OBJECT(list_view), "button-press-event",
                        G_CALLBACK(prefs_actions_list_btn_pressed), list_view);