2005-07-19 [colin] 1.9.12cvs81
[claws.git] / src / summaryview.c
index c8e68e5297f914de31443e30a8ff61f3313cae79..9dc4205a5e4cd70def54004841aa05ecab386b23 100644 (file)
@@ -86,6 +86,7 @@
 #include "quicksearch.h"
 #include "partial_download.h"
 #include "timing.h"
+#include "gedit-print.h"
 
 #define SUMMARY_COL_MARK_WIDTH         10
 #define SUMMARY_COL_STATUS_WIDTH       13
@@ -404,7 +405,8 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/M_ove..."),               "<control>O", summary_move_to,  0, NULL},
        {N_("/_Copy..."),               "<shift><control>O", summary_copy_to,   0, NULL},
-       {N_("/_Delete"),                "<control>D", summary_delete,   0, NULL},
+       {N_("/Move to _trash"),         "<control>D", summary_delete_trash,     0, NULL},
+       {N_("/_Delete..."),             NULL, summary_delete, 0, NULL},
        {N_("/Cancel a news message"),  NULL, summary_cancel,   0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Mark"),                  NULL, NULL,             0, "<Branch>"},
@@ -886,13 +888,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        main_window_cursor_wait(summaryview->mainwin);
 
-/*
-       mlist = item->folder->get_msg_list(item->folder, item, !update_cache);
-
-       !!! NEW !!!
-       USE LIST FROM CACHE, WILL NOT DISPLAY ANY MESSAGES DROPED
-       BY OTHER PROGRAMS TO THE FOLDER
-*/
        mlist = folder_item_get_msg_list(item);
 
        if (summaryview->folder_item->hide_read_msgs) {
@@ -1029,7 +1024,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                            TRUE);
                        summary_lock(summaryview);
                } else {
-                       summary_select_node(summaryview, node, FALSE, TRUE);
+                       summary_unlock(summaryview);
+                       summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
+                       summary_lock(summaryview);
                }
        }
 
@@ -1050,6 +1047,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
 #undef CURRENTLY_DISPLAYED
 
+
 void summary_clear_list(SummaryView *summaryview)
 {
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
@@ -1215,7 +1213,8 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
 
                {"/Move..."                     , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
                {"/Copy..."                     , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Delete"                      , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+               {"/Move to trash"               , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+               {"/Delete..."                   , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
                {"/Cancel a news message"       , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
 
                {"/Mark"                        , M_TARGET_EXIST},
@@ -1285,7 +1284,7 @@ void summary_select_prev_unread(SummaryView *summaryview)
                        case NEXTUNREADMSGDIALOG_ALWAYS:
                                val = alertpanel(_("No more unread messages"),
                                                 _("No unread message found. "
-                                                  "Search from the end?"),
+                                                  "_Search from the end?"),
                                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_YES:
@@ -1378,7 +1377,7 @@ void summary_select_prev_new(SummaryView *summaryview)
 
                val = alertpanel(_("No more new messages"),
                                 _("No new message found. "
-                                  "Search from the end?"),
+                                  "_Search from the end?"),
                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
@@ -1403,7 +1402,7 @@ void summary_select_next_new(SummaryView *summaryview)
                val = alertpanel(_("No more new messages"),
                                 _("No new message found. "
                                   "Go to next folder?"),
-                                GTK_STOCK_YES, _("Search again"),
+                                GTK_STOCK_YES, _("_Search again"),
                                 GTK_STOCK_NO);
                if (val == G_ALERTDEFAULT) {
                        g_signal_stop_emission_by_name(G_OBJECT(ctree),"key_press_event");
@@ -1431,7 +1430,7 @@ void summary_select_prev_marked(SummaryView *summaryview)
 
                val = alertpanel(_("No more marked messages"),
                                 _("No marked message found. "
-                                  "Search from the end?"),
+                                  "_Search from the end?"),
                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
@@ -1456,7 +1455,7 @@ void summary_select_next_marked(SummaryView *summaryview)
 
                val = alertpanel(_("No more marked messages"),
                                 _("No marked message found. "
-                                  "Search from the beginning?"),
+                                  "_Search from the beginning?"),
                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_next_flagged_msg(summaryview, NULL,
@@ -1481,7 +1480,7 @@ void summary_select_prev_labeled(SummaryView *summaryview)
 
                val = alertpanel(_("No more labeled messages"),
                                 _("No labeled message found. "
-                                  "Search from the end?"),
+                                  "_Search from the end?"),
                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_prev_flagged_msg(summaryview, NULL,
@@ -1506,7 +1505,7 @@ void summary_select_next_labeled(SummaryView *summaryview)
 
                val = alertpanel(_("No more labeled messages"),
                                 _("No labeled message found. "
-                                  "Search from the beginning?"),
+                                  "_Search from the beginning?"),
                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
                if (val != G_ALERTDEFAULT) return;
                node = summary_find_next_flagged_msg(summaryview, NULL,
@@ -1551,7 +1550,7 @@ void summary_select_node(SummaryView *summaryview, GtkCTreeNode *node,
                        gtk_widget_grab_focus(GTK_WIDGET(ctree));
                        gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
                }
-               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+               summary_unselect_all(summaryview);
                if (display_msg && summaryview->displayed == node)
                        summaryview->displayed = NULL;
                summaryview->display_msg = display_msg;
@@ -2538,7 +2537,6 @@ gboolean summary_step(SummaryView *summaryview, GtkScrollType type)
        GtkCTreeNode *node;
 
        if (summary_is_locked(summaryview)) return FALSE;
-
        if (type == GTK_SCROLL_STEP_FORWARD) {
                node = gtkut_ctree_node_next(ctree, summaryview->selected);
                if (node)
@@ -2759,7 +2757,6 @@ static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->moved--;
        if (MSG_IS_COPY(msginfo->flags))
                summaryview->copied--;
-       procmsg_update_unread_children (msginfo, TRUE);
 
        procmsg_msginfo_set_to_folder(msginfo, NULL);
        procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
@@ -3015,7 +3012,6 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->moved--;
        if (MSG_IS_COPY(msginfo->flags))
                summaryview->copied--;
-       procmsg_update_unread_children (msginfo, FALSE);
 
        procmsg_msginfo_set_to_folder(msginfo, NULL);
        procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, MSG_MOVE | MSG_COPY);
@@ -3065,30 +3061,28 @@ void summary_delete(SummaryView *summaryview)
        GList *cur;
        GtkCTreeNode *sel_last = NULL;
        GtkCTreeNode *node;
+       AlertValue aval;
+       MsgInfo *msginfo;
 
        if (!item) return;
 
        if (summary_is_locked(summaryview)) return;
 
-       /* if current folder is trash, ask for confirmation */
-       if (item->stype == F_TRASH) {
-               AlertValue aval;
-               MsgInfo *msginfo;
+       if (!summaryview->folder_item ||
+           FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
 
-               aval = alertpanel(_("Delete message(s)"),
-                                 _("Do you really want to delete message(s) from the trash?"),
-                                 GTK_STOCK_YES, GTK_STOCK_NO, NULL);
-               if (aval != G_ALERTDEFAULT) return;
-
-               for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
-                    cur = cur->next) {
-                       GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
-                       msginfo = gtk_ctree_node_get_row_data(ctree, row);
-                       if (msginfo->total_size != 0 && 
-                           msginfo->size != (off_t)msginfo->total_size)
-                               partial_mark_for_delete(msginfo);
-               }
-       
+       aval = alertpanel(_("Delete message(s)"),
+                         _("Do you really want to delete selected message(s)?"),
+                         GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+       if (aval != G_ALERTDEFAULT) return;
+
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
+            cur = cur->next) {
+               GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
+               msginfo = gtk_ctree_node_get_row_data(ctree, row);
+               if (msginfo->total_size != 0 && 
+                   msginfo->size != (off_t)msginfo->total_size)
+                       partial_mark_for_delete(msginfo);
        }
 
        main_window_cursor_wait(summaryview->mainwin);
@@ -3110,7 +3104,7 @@ void summary_delete(SummaryView *summaryview)
        if (!node)
                node = summary_find_prev_msg(summaryview, sel_last);
 
-       summary_select_node(summaryview, node, FALSE, FALSE);
+       summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
        
        if (prefs_common.immediate_exec || item->stype == F_TRASH) {
                summary_execute(summaryview);
@@ -3123,6 +3117,22 @@ void summary_delete(SummaryView *summaryview)
        main_window_cursor_normal(summaryview->mainwin);
 }
 
+void summary_delete_trash(SummaryView *summaryview)
+{
+       FolderItem *to_folder;
+
+       if (!summaryview->folder_item ||
+           FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
+
+       to_folder = summaryview->folder_item->folder->trash;
+       
+       if (to_folder == NULL || to_folder == summaryview->folder_item)
+               summary_delete(summaryview);
+       else
+               summary_move_selected_to(summaryview, to_folder);
+}
+
+
 static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -3135,7 +3145,6 @@ static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->moved--;
        if (MSG_IS_COPY(msginfo->flags))
                summaryview->copied--;
-       procmsg_update_unread_children (msginfo, FALSE);
 
        procmsg_msginfo_set_to_folder(msginfo, NULL);
        procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE | MSG_COPY);
@@ -3215,11 +3224,9 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
 
        END_LONG_OPERATION(summaryview);
 
-       summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
-
-       if (prefs_common.immediate_exec)
+       if (prefs_common.immediate_exec) {
                summary_execute(summaryview);
-       else {
+       else {
                summary_status_show(summaryview);
        }
        
@@ -3227,7 +3234,7 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                GtkCTreeNode *node = gtk_ctree_node_nth (GTK_CTREE(summaryview->ctree), 
                                                         GTK_CLIST(summaryview->ctree)->rows - 1);
                if (node)
-                       summary_select_node(summaryview, node, TRUE, TRUE);
+                       summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
        }
 
 }
@@ -3296,8 +3303,6 @@ void summary_copy_selected_to(SummaryView *summaryview, FolderItem *to_folder)
 
        END_LONG_OPERATION(summaryview);
 
-       summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
-
        if (prefs_common.immediate_exec)
                summary_execute(summaryview);
        else {
@@ -3335,23 +3340,18 @@ void summary_select_all(SummaryView *summaryview)
 {
        if (!summaryview->folder_item) return;
 
-       if (summaryview->folder_item->total_msgs >= 500) {
-               STATUSBAR_PUSH(summaryview->mainwin,
-                              _("Selecting all messages..."));
-               main_window_cursor_wait(summaryview->mainwin);
-       }
-
+       summary_lock(summaryview);
        gtk_clist_select_all(GTK_CLIST(summaryview->ctree));
-
-       if (summaryview->folder_item->total_msgs >= 500) {
-               STATUSBAR_POP(summaryview->mainwin);
-               main_window_cursor_normal(summaryview->mainwin);
-       }
+       summary_unlock(summaryview);
+       summary_status_show(summaryview);
 }
 
 void summary_unselect_all(SummaryView *summaryview)
 {
+       summary_lock(summaryview);
        gtk_sctree_unselect_all(GTK_SCTREE(summaryview->ctree));
+       summary_unlock(summaryview);
+       summary_status_show(summaryview);
 }
 
 void summary_select_thread(SummaryView *summaryview)
@@ -3423,10 +3423,10 @@ void summary_save_as(SummaryView *summaryview)
 
        if ( aval==0 ) { /* append */
                if (append_file(src, dest, TRUE) < 0) 
-                       alertpanel_error(_("Can't save the file `%s'."), tmp);
+                       alertpanel_error(_("Can't save the file '%s'."), tmp);
        } else { /* overwrite */
                if (copy_file(src, dest, TRUE) < 0)
-                       alertpanel_error(_("Can't save the file `%s'."), tmp);
+                       alertpanel_error(_("Can't save the file '%s'."), tmp);
        }
        g_free(src);
        
@@ -3441,7 +3441,7 @@ void summary_save_as(SummaryView *summaryview)
                        if (!msginfo) break;
                        src = procmsg_get_message_file(msginfo);
                        if (append_file(src, dest, TRUE) < 0)
-                               alertpanel_error(_("Can't save the file `%s'."), tmp);
+                               alertpanel_error(_("Can't save the file '%s'."), tmp);
                }
                g_free(src);
        }
@@ -3451,28 +3451,32 @@ void summary_save_as(SummaryView *summaryview)
 
 void summary_print(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCList *clist = GTK_CLIST(summaryview->ctree);
+#ifndef USE_GNOMEPRINT
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
-       GList *cur;
-       gchar *cmdline;
+       gchar *cmdline = NULL;
        gchar *p;
+#else
+       gboolean first = TRUE;
+       GList *tmplist;
+#endif
+       GList *cur;
 
        if (clist->selection == NULL) return;
-
+#ifndef USE_GNOMEPRINT
        cmdline = input_dialog(_("Print"),
                               _("Enter the print command line:\n"
-                                "(`%s' will be replaced with file name)"),
+                                "('%s' will be replaced with file name)"),
                               prefs_common.print_cmd);
        if (!cmdline) return;
        if (!(p = strchr(cmdline, '%')) || *(p + 1) != 's' ||
            strchr(p + 2, '%')) {
-               alertpanel_error(_("Print command line is invalid:\n`%s'"),
+               alertpanel_error(_("Print command line is invalid:\n'%s'"),
                                 cmdline);
                g_free(cmdline);
                return;
        }
-
        for (cur = clist->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
                msginfo = gtk_ctree_node_get_row_data
                        (ctree, GTK_CTREE_NODE(cur->data));
@@ -3480,6 +3484,30 @@ void summary_print(SummaryView *summaryview)
        }
 
        g_free(cmdline);
+       
+#else
+       tmplist = g_list_copy(clist->selection);
+       summary_unselect_all(summaryview);
+       for (cur = tmplist; cur != NULL && cur->data != NULL; cur = cur->next) {
+               GtkCTreeNode *node = GTK_CTREE_NODE(cur->data);
+               summary_select_node(summaryview, node, TRUE, TRUE);
+               if (!summaryview->messageview->mimeview 
+               ||  !summaryview->messageview->mimeview->textview
+               ||  !summaryview->messageview->mimeview->textview->text)
+                       alertpanel_warning(_("Cannot print: the message doesn't "
+                                            "contain text."));
+               gedit_print(
+                       GTK_TEXT_VIEW(summaryview->messageview->mimeview
+                                       ->textview->text));
+       }
+       for (cur = tmplist; cur != NULL && cur->data != NULL; cur = cur->next) {
+               GtkCTreeNode *node = GTK_CTREE_NODE(cur->data);
+               gtk_sctree_select_with_state(
+                       GTK_SCTREE(clist), node, first ? 0:GDK_CONTROL_MASK);
+               first = FALSE;
+       }
+       g_list_free(tmplist);
+#endif
 }
 
 gboolean summary_execute(SummaryView *summaryview)
@@ -3500,7 +3528,6 @@ gboolean summary_execute(SummaryView *summaryview)
                summary_unthread_for_exec(summaryview);
 
        folder_item_update_freeze();
-       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
        summary_execute_move(summaryview);
        summary_execute_copy(summaryview);
        summary_execute_delete(summaryview);
@@ -3523,7 +3550,7 @@ gboolean summary_execute(SummaryView *summaryview)
 
                if (!new_selected &&
                    gtkut_ctree_node_is_selected(ctree, node)) {
-                       gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+                       summary_unselect_all(summaryview);
                        new_selected = summary_find_next_msg(summaryview, node);
                        if (!new_selected)
                                new_selected = summary_find_prev_msg
@@ -3534,14 +3561,20 @@ gboolean summary_execute(SummaryView *summaryview)
        }
 
        if (new_selected) {
+               summary_unlock(summaryview);
                gtk_sctree_select
                        (GTK_SCTREE(ctree),
                         summaryview->displayed ? summaryview->displayed
                         : new_selected);
+               summary_lock(summaryview);
        }
 
-       if (summaryview->threaded)
+       if (summaryview->threaded) {
+               gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
                summary_thread_build(summaryview);
+               summary_thread_init(summaryview);
+               gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+       }
 
        summaryview->selected = clist->selection ?
                GTK_CTREE_NODE(clist->selection->data) : NULL;
@@ -3558,8 +3591,6 @@ gboolean summary_execute(SummaryView *summaryview)
 
        gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
 
-       gtk_clist_thaw(clist);
-
        summary_unlock(summaryview);
        return TRUE;
 }
@@ -3641,22 +3672,16 @@ static void summary_execute_copy_func(GtkCTree *ctree, GtkCTreeNode *node,
 static void summary_execute_delete(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       FolderItem *trash;
        GSList *cur;
 
-       trash = summaryview->folder_item->folder->trash;
-
        /* search deleting messages and execute */
        gtk_ctree_pre_recursive
                (ctree, NULL, summary_execute_delete_func, summaryview);
 
        if (!summaryview->mlist) return;
 
-       if (trash == NULL || summaryview->folder_item == trash)
-               folder_item_remove_msgs(summaryview->folder_item,
-                                       summaryview->mlist);
-       else
-               folder_item_move_msgs(trash, summaryview->mlist);
+       folder_item_remove_msgs(summaryview->folder_item,
+                               summaryview->mlist);
 
        for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
                procmsg_msginfo_free((MsgInfo *)cur->data);
@@ -4532,7 +4557,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                break;
        case GDK_Delete:
                BREAK_ON_MODIFIER_KEY();
-               summary_delete(summaryview);
+               summary_delete_trash(summaryview);
                break;
        default:
                break;
@@ -4596,15 +4621,12 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        MsgInfo *msginfo;
        gboolean marked_unread = FALSE;
 
-       if (summary_is_locked(summaryview))
+       if (summary_is_locked(summaryview)) {
                return;
-
-       if (column == -1 && GTK_CLIST(ctree)->selection
-        && GTK_CLIST(ctree)->selection->next) {
-               /* multiple selection */
-               summary_status_show(summaryview);
        }
 
+       summary_status_show(summaryview);
+
        if (GTK_CLIST(ctree)->selection &&
            GTK_CLIST(ctree)->selection->next) {
                summaryview->display_msg = FALSE;
@@ -5448,6 +5470,10 @@ void summaryview_export_mbox_list(SummaryView *summaryview)
 
 void summaryview_lock(SummaryView *summaryview, FolderItem *item)
 {
+       if (!summaryview || !summaryview->folder_item || !item) {
+               return;
+       }
+
        if (summaryview->folder_item->folder == item->folder) {
                gtk_widget_set_sensitive(summaryview->ctree, FALSE);
        }