2006-08-22 [colin] 2.4.0cvs73

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index 5f5fbedea8d6989f4a982cab9505fc346426a9b8..e905c13851e394417c8da634c616824f5821d0b6 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -65,6 +65,9 @@
 #include "partial_download.h"
 #include "prefs_folder_column.h"
 #include "filtering.h"
+#include "quicksearch.h"
+#include "manual.h"
+#include "timing.h"
 
 #define COL_FOLDER_WIDTH       150
 #define COL_NUM_WIDTH          32
@@ -289,12 +292,12 @@ static GtkItemFactoryEntry folderview_common_popup_entries[] =
 };
 
 static GtkItemFactoryEntry folder_view_trash_popup_entries[] = {
-       {N_("/------trashsep"),                 NULL, NULL, 0, "<Separator>"},
+       {"/------trashsep",             NULL, NULL, 0, "<Separator>"},
        {N_("/Empty _trash..."),        NULL, folderview_empty_trash_cb, 0, NULL},
 };
 
 static GtkItemFactoryEntry folder_view_queue_popup_entries[] = {
-       {N_("/------queuesep"),                 NULL, NULL, 0, "<Separator>"},
+       {"/------queuesep",     NULL, NULL, 0, "<Separator>"},
        {N_("/Send _queue..."), NULL, folderview_send_queue_cb, 0, NULL},
 };
 
@@ -777,6 +780,54 @@ void folderview_unselect(FolderView *folderview)
        folderview->selected = folderview->opened = NULL;
 }
 
+static GtkCTreeNode *folderview_find_next_marked(GtkCTree *ctree,
+                                                GtkCTreeNode *node)
+{
+       FolderItem *item;
+
+       if (node)
+               node = gtkut_ctree_node_next(ctree, node);
+       else
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+       for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
+               item = gtk_ctree_node_get_row_data(ctree, node);
+               if (item && item->marked_msgs > 0 && item->stype != F_TRASH)
+                       return node;
+       }
+
+       return NULL;
+}
+
+void folderview_select_next_marked(FolderView *folderview)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCTreeNode *node = NULL;
+       SelectOnEntry last_sel = prefs_common.select_on_entry;
+       gboolean last_open = prefs_common.always_show_msg;
+       
+       prefs_common.select_on_entry = SELECTONENTRY_MNU;
+       prefs_common.always_show_msg = TRUE;
+
+       if ((node = folderview_find_next_marked(ctree, folderview->opened))
+           != NULL) {
+               folderview_select_node(folderview, node);
+               goto out;
+       }
+
+       if (!folderview->opened ||
+           folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list)) {
+               goto out;
+       }
+       /* search again from the first node */
+       if ((node = folderview_find_next_marked(ctree, NULL)) != NULL)
+               folderview_select_node(folderview, node);
+
+out:
+       prefs_common.select_on_entry = last_sel;
+       prefs_common.always_show_msg = last_open;
+}
+
 static GtkCTreeNode *folderview_find_next_unread(GtkCTree *ctree,
                                                 GtkCTreeNode *node)
 {
@@ -800,19 +851,29 @@ void folderview_select_next_unread(FolderView *folderview)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node = NULL;
+       SelectOnEntry last_sel = prefs_common.select_on_entry;
+       gboolean last_open = prefs_common.always_show_msg;
+       
+       prefs_common.select_on_entry = SELECTONENTRY_UNM;
+       prefs_common.always_show_msg = TRUE;
 
        if ((node = folderview_find_next_unread(ctree, folderview->opened))
            != NULL) {
                folderview_select_node(folderview, node);
-               return;
+               goto out;
        }
 
        if (!folderview->opened ||
-           folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list))
-               return;
+           folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list)) {
+               goto out;
+       }
        /* search again from the first node */
        if ((node = folderview_find_next_unread(ctree, NULL)) != NULL)
                folderview_select_node(folderview, node);
+
+out:
+       prefs_common.select_on_entry = last_sel;
+       prefs_common.always_show_msg = last_open;
 }
 
 static GtkCTreeNode *folderview_find_next_new(GtkCTree *ctree,
@@ -838,19 +899,29 @@ void folderview_select_next_new(FolderView *folderview)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node = NULL;
+       SelectOnEntry last_sel = prefs_common.select_on_entry;
+       gboolean last_open = prefs_common.always_show_msg;
+       
+       prefs_common.select_on_entry = SELECTONENTRY_NUM;
+       prefs_common.always_show_msg = TRUE;
 
        if ((node = folderview_find_next_new(ctree, folderview->opened))
            != NULL) {
                folderview_select_node(folderview, node);
-               return;
+               goto out;
        }
 
        if (!folderview->opened ||
-           folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list))
-               return;
+           folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list)) {
+               goto out;
+       }
        /* search again from the first node */
        if ((node = folderview_find_next_new(ctree, NULL)) != NULL)
                folderview_select_node(folderview, node);
+
+out:
+       prefs_common.select_on_entry = last_sel;
+       prefs_common.always_show_msg = last_open;
 }
 
 FolderItem *folderview_get_selected_item(FolderView *folderview)
@@ -1061,7 +1132,7 @@ gint folderview_check_new(Folder *folder)
                        str = get_scan_str(item);
 
                        STATUSBAR_PUSH(folderview->mainwin, str);
-
+                       GTK_EVENTS_FLUSH();
                        g_free(str);
 
                        folderview_scan_tree_func(item->folder, item, NULL);
@@ -1596,7 +1667,8 @@ gboolean folderview_update_item_claws(gpointer source, gpointer data)
                if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME))
                        folderview_update_node(folderview, node);
                if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && (folderview->opened == node))
-                       summary_show(folderview->summaryview, update_info->item);
+                       if (!quicksearch_is_active(folderview->summaryview->quicksearch))
+                               summary_show(folderview->summaryview, update_info->item);
        }
        
        return FALSE;
@@ -1929,11 +2001,12 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        FolderItem *item;
        gchar *buf;
        int res = 0;
-
+       START_TIMING("--- folderview_selected");
        folderview->selected = row;
 
        if (folderview->opened == row) {
                folderview->open_folder = FALSE;
+               END_TIMING();
                return;
        }
        
@@ -1942,13 +2015,19 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                        gtkut_ctree_set_focus_row(ctree, folderview->opened);
                        gtk_ctree_select(ctree, folderview->opened);
                }
+               END_TIMING();
                return;
        }
 
-       if (!folderview->open_folder) return;
-
+       if (!folderview->open_folder) {
+               END_TIMING();
+               return;
+       }
        item = gtk_ctree_node_get_row_data(ctree, row);
-       if (!item || item->no_select) return;
+       if (!item || item->no_select) {
+               END_TIMING();
+               return;
+       }
 
        can_select = FALSE;
 
@@ -1959,10 +2038,17 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                
                olditem = gtk_ctree_node_get_row_data(ctree, folderview->opened);
                if (olditem) {
+                       buf = g_strdup_printf(_("Closing Folder %s..."), 
+                               olditem->path ? olditem->path:olditem->name);
                        /* will be null if we just moved the previously opened folder */
+                       STATUSBAR_PUSH(folderview->mainwin, buf);
+                       main_window_cursor_wait(folderview->mainwin);
+                       g_free(buf);
                        summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
                        summary_show(folderview->summaryview, NULL);
                        folder_item_close(olditem);
+                       main_window_cursor_normal(folderview->mainwin);
+                       STATUSBAR_POP(folderview->mainwin);
                }
        }
 
@@ -2008,7 +2094,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
                folderview->open_folder = FALSE;
                can_select = TRUE;
-
+               END_TIMING();
                return;
         } else if (res == -2) {
                PostponedSelectData *data = g_new0(PostponedSelectData, 1);
@@ -2021,6 +2107,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                folderview->open_folder = FALSE;
                can_select = TRUE;
                g_timeout_add(500, postpone_select, data);
+               END_TIMING();
                return;
        }
        
@@ -2046,6 +2133,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        folderview->open_folder = FALSE;
        can_select = TRUE;
+       END_TIMING();
 }
 
 static void folderview_tree_expanded(GtkCTree *ctree, GtkCTreeNode *node,
@@ -2392,7 +2480,8 @@ static void folderview_processing_cb(FolderView *folderview, guint action,
        title = g_strdup_printf (_("Processing configuration for folder %s"), id);
        g_free (id);
 
-       prefs_filtering_open(&item->prefs->processing, title, NULL, NULL);
+       prefs_filtering_open(&item->prefs->processing, title,
+                       MANUAL_ANCHOR_PROCESSING, NULL, NULL, FALSE);
        g_free (title);
 }