mention inherited processing rules also, as this is what happens

[claws.git] / src / imap_gtk.c

diff --git a/src/imap_gtk.c b/src/imap_gtk.c
index 11f2d1ff2effb3863dd0cc9be5cde280bf81633a..e7b4a2070163cfdbe9c61c5282c0bcf6596f259e 100644 (file)
--- a/src/imap_gtk.c
+++ b/src/imap_gtk.c
@@ -72,7 +72,7 @@ static GtkActionEntry imap_popup_entries[] =
        {"FolderViewPopup/DownloadMessages",    NULL, N_("Down_load messages"), NULL, NULL, G_CALLBACK(download_cb) },
 
 
-       {"FolderViewPopup/Subscriptions",       NULL, N_("S_ubscriptions") },
+       {"FolderViewPopup/Subscriptions",       NULL, N_("S_ubscriptions"), NULL, NULL, NULL },
        {"FolderViewPopup/Subscriptions/---",   NULL, "---", NULL, NULL, NULL }, 
        {"FolderViewPopup/Subscriptions/Subscribe",     NULL, N_("_Subscribe..."), NULL, NULL, G_CALLBACK(subscribe_cb) },
        {"FolderViewPopup/Subscriptions/Unsubscribe",   NULL, N_("_Unsubscribe..."), NULL, NULL, G_CALLBACK(unsubscribe_cb) },
@@ -84,7 +84,7 @@ static GtkActionEntry imap_popup_entries[] =
 
 static GtkToggleActionEntry imap_toggle_popup_entries[] =
 {
-       {"FolderViewPopup/Subscriptions/ShowOnlySubs",  NULL, N_("Show only subscribed _folders"), NULL, NULL, G_CALLBACK(subscribed_cb) }, 
+       {"FolderViewPopup/Subscriptions/ShowOnlySubs",  NULL, N_("Show only subscribed _folders"), NULL, NULL, G_CALLBACK(subscribed_cb), FALSE },
 };
 
 static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item);
@@ -195,7 +195,7 @@ static void new_folder_cb(GtkAction *action, gpointer data)
                   "(if you want to create a folder to store subfolders\n"
                   "only and no mail, append '/' to the folder name)"),
                 _("NewFolder"),
-                _("Inherit properties from parent folder"),
+                _("Inherit properties and processing rules from parent folder"),
                 &(prefs_common.inherit_folder_props));
 
        if (!new_folder) return;
@@ -308,12 +308,16 @@ static void move_folder_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
        FolderItem *from_folder = NULL, *to_folder = NULL;
+       gchar *msg;
 
        from_folder = folderview_get_selected_item(folderview);
        if (!from_folder || from_folder->folder->klass != imap_get_class())
                return;
 
-       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, TRUE);
+       msg = g_strdup_printf(_("Select folder to move folder '%s' to"),
+               from_folder->name);
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, TRUE, msg);
+       g_free(msg);
        if (!to_folder)
                return;
        
@@ -324,12 +328,16 @@ static void copy_folder_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
        FolderItem *from_folder = NULL, *to_folder = NULL;
+       gchar *msg;
 
        from_folder = folderview_get_selected_item(folderview);
        if (!from_folder || from_folder->folder->klass != imap_get_class())
                return;
 
-       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, TRUE);
+       msg = g_strdup_printf(_("Select folder to copy folder '%s' to"),
+               from_folder->name);
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, TRUE, msg);
+       g_free(msg);
        if (!to_folder)
                return;
        
@@ -358,8 +366,8 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
                   "Recovery will not be possible.\n\n"
                   "Do you really want to delete?"), name);
        avalue = alertpanel_full(_("Delete folder"), message,
-                                GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, FALSE,
-                                NULL, ALERT_WARNING, G_ALERTDEFAULT);
+                                GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, ALERTFOCUS_FIRST, FALSE,
+                                NULL, ALERT_WARNING);
        g_free(message);
        if (avalue != G_ALERTALTERNATE) return;
 
@@ -504,8 +512,8 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
                                G_CALLBACK(chk_update_val), &recurse);
 
                avalue = alertpanel_full(_("Subscriptions"), message,
-                                        GTK_STOCK_CANCEL, g_strconcat("+", _("_Search"), NULL),
-                                        NULL, FALSE, rec_chk, ALERT_QUESTION, G_ALERTDEFAULT);
+                                        GTK_STOCK_CANCEL, _("_Search"), NULL, ALERTFOCUS_SECOND,
+                                        FALSE, rec_chk, ALERT_QUESTION);
                g_free(message);
                if (avalue != G_ALERTALTERNATE) return;
                
@@ -563,9 +571,8 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
                        G_CALLBACK(chk_update_val), &recurse);
 
        avalue = alertpanel_full(_("Subscriptions"), message,
-                                GTK_STOCK_CANCEL, action?g_strconcat("+", _("_Subscribe"), NULL):
-                                g_strconcat("+", _("_Unsubscribe"), NULL), NULL, FALSE,
-                                rec_chk, ALERT_QUESTION, G_ALERTDEFAULT);
+                                GTK_STOCK_CANCEL, action?_("_Subscribe"):_("_Unsubscribe"), NULL,
+                                ALERTFOCUS_SECOND, FALSE, rec_chk, ALERT_QUESTION);
        g_free(message);
        if (avalue != G_ALERTALTERNATE) return;