move 'Mark all read' to folder view menu
[claws.git] / src / folderview.c
index d27cb30155fa6770666556c1ec04c9c12ed37f76..367505d6e375805e52b90cd65114474db55887af 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * 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
 #include "mainwindow.h"
 #include "folderview.h"
 #include "summaryview.h"
+#include "summary_search.h"
 #include "inputdialog.h"
 #include "grouplistdialog.h"
 #include "manage_window.h"
 #include "alertpanel.h"
 #include "menu.h"
+#include "stock_pixmap.h"
 #include "procmsg.h"
 #include "utils.h"
 #include "gtkutils.h"
 #include "prefs_account.h"
 #include "account.h"
 #include "folder.h"
-
-#include "pixmaps/inbox.xpm"
-#include "pixmaps/outbox.xpm"
-#include "pixmaps/dir-close.xpm"
-#include "pixmaps/dir-open.xpm"
-#include "pixmaps/trash.xpm"
+#include "inc.h"
 
 typedef enum
 {
@@ -95,17 +92,30 @@ static GtkStyle *normal_style;
 static GtkStyle *normal_color_style;
 static GtkStyle *bold_style;
 static GtkStyle *bold_color_style;
+static GtkStyle *bold_tgtfold_style;
 
 static GdkPixmap *inboxxpm;
 static GdkBitmap *inboxxpmmask;
+static GdkPixmap *inboxhrmxpm;
+static GdkBitmap *inboxhrmxpmmask;
 static GdkPixmap *outboxxpm;
 static GdkBitmap *outboxxpmmask;
+static GdkPixmap *outboxhrmxpm;
+static GdkBitmap *outboxhrmxpmmask;
 static GdkPixmap *folderxpm;
 static GdkBitmap *folderxpmmask;
 static GdkPixmap *folderopenxpm;
 static GdkBitmap *folderopenxpmmask;
+static GdkPixmap *folderopenhrmxpm;
+static GdkBitmap *folderopenhrmxpmmask;
 static GdkPixmap *trashxpm;
 static GdkBitmap *trashxpmmask;
+static GdkPixmap *trashhrmxpm;
+static GdkBitmap *trashhrmxpmmask;
+static GdkPixmap *newxpm;
+static GdkBitmap *newxpmmask;
+static GdkPixmap *unreadxpm;
+static GdkBitmap *unreadxpmmask;
 
 static void folderview_select_node      (FolderView    *folderview,
                                          GtkCTreeNode  *node);
@@ -156,6 +166,9 @@ static void folderview_update_tree_cb       (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void mark_all_read_cb            (FolderView    *folderview,
+                                         guint           action,
+                                         GtkWidget      *widget);
 static void folderview_new_folder_cb   (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -195,6 +208,10 @@ static void folderview_rm_news_server_cb(FolderView        *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
 
+static void folderview_search_cb       (FolderView     *folderview,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          GdkDragContext *context,
                                          gint            x,
@@ -215,6 +232,8 @@ static void folderview_drag_received_cb  (GtkWidget        *widget,
                                          FolderView       *folderview);
 static void folderview_scoring_cb(FolderView *folderview, guint action,
                                  GtkWidget *widget);
+static void folderview_processing_cb(FolderView *folderview, guint action,
+                                    GtkWidget *widget);
 static void folderview_property_cb(FolderView *folderview, guint action, GtkWidget *widget);
 
 static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
@@ -226,20 +245,28 @@ static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
        {N_("/Remove _mailbox"),        NULL, folderview_remove_mailbox_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Property..."),           NULL, NULL, 0, NULL},
+       {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
        {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 static GtkItemFactoryEntry folderview_mail_popup_entries[] =
 {
+       {N_("/Mark all _read"),         NULL, mark_all_read_cb, 0, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Create _new folder..."),  NULL, folderview_new_folder_cb,    0, NULL},
        {N_("/_Rename folder..."),      NULL, folderview_rename_folder_cb, 0, NULL},
        {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/_Update folder tree"),    NULL, folderview_update_tree_cb, 0, NULL},
+       {N_("/_Check for new messages"),
+                                       NULL, folderview_update_tree_cb, 0, NULL},
+       {N_("/R_escan folder tree"),    NULL, folderview_update_tree_cb, 1, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Remove _mailbox"),        NULL, folderview_remove_mailbox_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
+       {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
        {N_("/_Property..."),           NULL, folderview_property_cb, 0, NULL},
-       {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}
+       {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
+       {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 static GtkItemFactoryEntry folderview_imap_popup_entries[] =
@@ -248,11 +275,16 @@ static GtkItemFactoryEntry folderview_imap_popup_entries[] =
        {N_("/_Rename folder..."),      NULL, NULL, 0, NULL},
        {N_("/_Delete folder"),         NULL, folderview_rm_imap_folder_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
-       {N_("/_Update folder tree"),    NULL, folderview_update_tree_cb, 0, NULL},
+       {N_("/_Check for new messages"),
+                                       NULL, folderview_update_tree_cb, 0, NULL},
+       {N_("/R_escan folder tree"),    NULL, folderview_update_tree_cb, 1, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Remove _IMAP4 account"),  NULL, folderview_rm_imap_server_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
+       {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
        {N_("/_Property..."),           NULL, NULL, 0, NULL},
-       {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}
+       {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
+       {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 static GtkItemFactoryEntry folderview_news_popup_entries[] =
@@ -263,8 +295,10 @@ static GtkItemFactoryEntry folderview_news_popup_entries[] =
        {N_("/---"),                     NULL, NULL, 0, "<Separator>"},
        {N_("/Remove _news account"),    NULL, folderview_rm_news_server_cb, 0, NULL},
        {N_("/---"),                     NULL, NULL, 0, "<Separator>"},
+       {N_("/_Search folder..."),       NULL, folderview_search_cb, 0, NULL},
        {N_("/_Property..."),            NULL, NULL, 0, NULL},
-       {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}
+       {N_("/_Processing..."),          NULL, folderview_processing_cb, 0, NULL},
+       {N_("/S_coring..."),            NULL, folderview_scoring_cb, 0, NULL}
 };
 
 
@@ -298,12 +332,15 @@ FolderView *folderview_create(void)
                             prefs_common.folderview_height);
 
        ctree = gtk_ctree_new_with_titles(N_FOLDER_COLS, COL_FOLDER, titles);
+       
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
        gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
+#ifndef CLAWS /* text instead of pixmaps */
        gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_NEW,
                                           GTK_JUSTIFY_RIGHT);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_UNREAD,
                                           GTK_JUSTIFY_RIGHT);
+#endif                                    
        gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_TOTAL,
                                           GTK_JUSTIFY_RIGHT);
        gtk_clist_set_column_width(GTK_CLIST(ctree), COL_FOLDER,
@@ -390,7 +427,7 @@ FolderView *folderview_create(void)
        gtk_drag_dest_set(ctree, GTK_DEST_DEFAULT_ALL &
                          ~GTK_DEST_DEFAULT_HIGHLIGHT,
                          summary_drag_types, 1,
-                         GDK_ACTION_MOVE);
+                         GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT);
        gtk_signal_connect(GTK_OBJECT(ctree), "drag_motion",
                           GTK_SIGNAL_FUNC(folderview_drag_motion_cb),
                           folderview);
@@ -422,13 +459,52 @@ FolderView *folderview_create(void)
 void folderview_init(FolderView *folderview)
 {
        GtkWidget *ctree = folderview->ctree;
+       GtkWidget *label_new;
+       GtkWidget *label_unread;
+       GtkWidget *hbox_new;
+       GtkWidget *hbox_unread;
+
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX, &inboxxpm, &inboxxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX,
+                        &outboxxpm, &outboxxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_CLOSE,
+                        &folderxpm, &folderxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN,
+                        &folderopenxpm, &folderopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH, &trashxpm, &trashxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_HRM, 
+                        &inboxhrmxpm, &inboxhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_HRM, 
+                        &outboxhrmxpm, &outboxhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN_HRM, 
+                        &folderopenhrmxpm, &folderopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_HRM, 
+                        &trashhrmxpm, &trashhrmxpmmask);
+
+       /* CLAWS: titles for "New" and "Unread" show new & unread pixmaps
+        * instead text (text overflows making them unreadable and ugly) */
+        stock_pixmap_gdk(ctree, STOCK_PIXMAP_NEW,
+                        &newxpm, &newxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_UNREAD,
+                        &unreadxpm, &unreadxpmmask);
+               
+       label_new = gtk_pixmap_new(newxpm, newxpmmask);
+       label_unread = gtk_pixmap_new(unreadxpm, unreadxpmmask);
+
+       hbox_new = gtk_hbox_new(FALSE, 4);
+       hbox_unread = gtk_hbox_new(FALSE, 4);
+
+       /* left justified */
+       gtk_box_pack_start(GTK_BOX(hbox_new),label_new,FALSE,FALSE,0);
+       gtk_box_pack_start(GTK_BOX(hbox_unread),label_unread,FALSE,FALSE,0);
+
+       gtk_widget_show_all(hbox_new);
+       gtk_widget_show_all(hbox_unread);
+
+       gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_NEW,hbox_new);
+       gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_UNREAD,hbox_unread);
+                       
 
-       PIXMAP_CREATE(ctree, inboxxpm, inboxxpmmask, inbox_xpm);
-       PIXMAP_CREATE(ctree, outboxxpm, outboxxpmmask, outbox_xpm);
-       PIXMAP_CREATE(ctree, folderxpm, folderxpmmask, DIRECTORY_CLOSE_XPM);
-       PIXMAP_CREATE(ctree, folderopenxpm, folderopenxpmmask,
-                     DIRECTORY_OPEN_XPM);
-       PIXMAP_CREATE(ctree, trashxpm, trashxpmmask, trash_xpm);
 
        if (!normalfont)
                normalfont = gdk_fontset_load(NORMAL_FONT);
@@ -440,6 +516,9 @@ void folderview_init(FolderView *folderview)
                bold_style->font = boldfont;
                bold_color_style = gtk_style_copy(bold_style);
                bold_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
+
+               bold_tgtfold_style = gtk_style_copy(bold_style);
+               bold_tgtfold_style->fg[GTK_STATE_NORMAL] = folderview->color_op;
        }
        if (!normal_style) {
                normal_style = gtk_style_copy(gtk_widget_get_style(ctree));
@@ -447,7 +526,6 @@ void folderview_init(FolderView *folderview)
                normal_color_style = gtk_style_copy(normal_style);
                normal_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
        }
-
 }
 
 void folderview_set(FolderView *folderview)
@@ -498,6 +576,13 @@ void folderview_select(FolderView *folderview, FolderItem *item)
                folder_update_op_count();
 }
 
+static void mark_all_read_cb(FolderView *folderview, guint action,
+                             GtkWidget *widget)
+{
+       if (!folderview->selected) return;
+               summary_mark_all_read(folderview->summaryview);
+}
+
 static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
@@ -505,8 +590,8 @@ static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
        g_return_if_fail(node != NULL);
 
        folderview->open_folder = TRUE;
-       gtk_ctree_select(ctree, node);
        gtkut_ctree_set_focus_row(ctree, node);
+       gtk_ctree_select(ctree, node);
        if (folderview->summaryview->messages > 0)
                gtk_widget_grab_focus(folderview->summaryview->ctree);
        else
@@ -573,11 +658,19 @@ void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row,
 
        item = gtk_ctree_node_get_row_data(ctree, row);
        if (!item) return;
+
+       /* CLAWS: don't know why but this always seems to be true
+        * when deleting messages. Somewhere claws does a folder
+        * scan which sets all new, unread & total to the correct
+        * values. It then enters this function, but leaves it
+        * because new, unread and total are the same... */
+#ifndef CLAWS   
        if (prev_row     == row    &&
            item->new    == new    &&
            item->unread == unread &&
-           item->total  == total)
+           item->total  == total) 
                return;
+#endif         
 
        prev_row = row;
 
@@ -662,7 +755,8 @@ void folderview_update_tree(Folder *folder)
 
        if (!folder->scan_tree) return;
 
-       window = label_window_create(_("Updating folder tree..."));
+       inc_lock();
+       window = label_window_create(_("Rescanning folder tree..."));
 
        folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
        folder->scan_tree(folder);
@@ -672,6 +766,7 @@ void folderview_update_tree(Folder *folder)
        folderview_set_all();
 
        gtk_widget_destroy(window);
+       inc_unlock();
 }
 
 void folderview_update_all(void)
@@ -679,7 +774,8 @@ void folderview_update_all(void)
        GList *list;
        GtkWidget *window;
 
-       window = label_window_create(_("Updating all folders..."));
+       inc_lock();
+       window = label_window_create(_("Rescanning all folder trees..."));
 
        list = folder_get_list();
        for (; list != NULL; list = list->next) {
@@ -693,8 +789,8 @@ void folderview_update_all(void)
 
        folder_write_list();
        folderview_set_all();
-
        gtk_widget_destroy(window);
+       inc_unlock();
 }
 
 void folderview_update_all_node(void)
@@ -704,14 +800,15 @@ void folderview_update_all_node(void)
        FolderView *folderview;
        GtkCTree *ctree;
        GtkCTreeNode *node;
-       GtkWidget *window;
-
-       window = label_window_create(_("Updating all folders..."));
 
        for (list = folderview_list; list != NULL; list = list->next) {
                folderview = (FolderView *)list->data;
                ctree = GTK_CTREE(folderview->ctree);
 
+               inc_lock();
+               main_window_lock(folderview->mainwin);
+               gtk_widget_set_sensitive(folderview->ctree, FALSE);
+
                for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
                     node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                        item = gtk_ctree_node_get_row_data(ctree, node);
@@ -722,10 +819,13 @@ void folderview_update_all_node(void)
                        folder_item_scan(item);
                        folderview_update_node(folderview, node);
                }
+
+               gtk_widget_set_sensitive(folderview->ctree, TRUE);
+               main_window_unlock(folderview->mainwin);
+               inc_unlock();
        }
 
        folder_write_list();
-       gtk_widget_destroy(window);
 }
 
 static gboolean folderview_search_new_recursive(GtkCTree *ctree,
@@ -824,7 +924,6 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkStyle *style = NULL;
-       GtkCTreeNode *parent;
        FolderItem *item;
        GdkPixmap *xpm, *openxpm;
        GdkBitmap *mask, *openmask;
@@ -838,37 +937,75 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 
        switch (item->stype) {
        case F_INBOX:
-               xpm = openxpm = inboxxpm;
-               mask = openmask = inboxxpmmask;
+               xpm = inboxxpm;
+               mask = inboxxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = inboxhrmxpm;
+                       openmask = inboxhrmxpmmask;
+               } else {
+                       openxpm = inboxxpm;
+                       openmask = inboxxpmmask;
+               }
                name = g_strdup(_("Inbox"));
                break;
        case F_OUTBOX:
-               xpm = openxpm = outboxxpm;
-               mask = openmask = outboxxpmmask;
+               xpm = outboxxpm;
+               mask =outboxxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = outboxhrmxpm;
+                       openmask = outboxhrmxpmmask;
+               } else {
+                       openxpm = outboxxpm;
+                       openmask = outboxxpmmask;
+               }
                name = g_strdup(_("Outbox"));
                break;
        case F_QUEUE:
-               xpm = openxpm = outboxxpm;
-               mask = openmask = outboxxpmmask;
+               xpm = outboxxpm;
+               mask =outboxxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = outboxhrmxpm;
+                       openmask = outboxhrmxpmmask;
+               } else {
+                       openxpm = outboxxpm;
+                       openmask = outboxxpmmask;
+               }
                name = g_strdup(_("Queue"));
                break;
        case F_TRASH:
-               xpm = openxpm = trashxpm;
-               mask = openmask = trashxpmmask;
+               xpm = trashxpm;
+               mask = trashxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = trashhrmxpm;
+                       openmask = trashhrmxpmmask;
+               } else {
+                       openxpm = trashxpm;
+                       openmask = trashxpmmask;
+               }
                name = g_strdup(_("Trash"));
                break;
        case F_DRAFT:
                xpm = folderxpm;
                mask = folderxpmmask;
-               openxpm = folderopenxpm;
-               openmask = folderopenxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = folderopenhrmxpm;
+                       openmask = folderopenhrmxpmmask;
+               } else {
+                       openxpm = folderopenxpm;
+                       openmask = folderopenxpmmask;
+               }
                name = g_strdup(_("Draft"));
                break;
        default:
                xpm = folderxpm;
                mask = folderxpmmask;
-               openxpm = folderopenxpm;
-               openmask = folderopenxpmmask;
+               if (item->hide_read_msgs) {
+                       openxpm = folderopenhrmxpm;
+                       openmask = folderopenhrmxpmmask;
+               } else {
+                       openxpm = folderopenxpm;
+                       openmask = folderopenxpmmask;
+               }
                if (!item->parent) {
                        switch (item->folder->type) {
                        case F_MH:
@@ -929,8 +1066,8 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  itos(item->total));
        }
 
-       if (item->stype == F_TRASH) return;
-
+       if (item->stype == F_TRASH)
+               use_bold = use_color = FALSE;
        if (item->stype == F_QUEUE) {
                /* highlight queue folder if there are any messages */
                use_bold = use_color = (item->total > 0);
@@ -951,10 +1088,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        else if (use_bold) {
                style = bold_style;
                if (item->op_count > 0) {
-                       gtk_ctree_node_set_foreground(ctree, node,
-                                                     &folderview->color_op);
-               } else {
-                       style = bold_style;
+                       style = bold_tgtfold_style;
                }
        }
        else if (use_color) {
@@ -963,19 +1097,15 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                                              &folderview->color_new);
        }
        else if (item->op_count > 0) {
-               style = normal_color_style;
-               gtk_ctree_node_set_foreground(ctree, node,
-                                             &folderview->color_op);
+               style = bold_tgtfold_style;
        } else {
                style = normal_style;
        }
 
        gtk_ctree_node_set_row_style(ctree, node, style);
 
-       parent = node;
-       while ((parent = gtkut_ctree_find_collapsed_parent(ctree, parent))
-              != NULL)
-               folderview_update_node(folderview, parent);
+       if ((node = gtkut_ctree_find_collapsed_parent(ctree, node)) != NULL)
+               folderview_update_node(folderview, node);
 }
 
 void folderview_update_item(FolderItem *item, gboolean update_summary)
@@ -1188,6 +1318,18 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        gint prev_row = -1, row = -1, column = -1;
        FolderItem *item;
        Folder *folder;
+       GtkWidget *popup;
+       gboolean mark_all_read   = FALSE;
+       gboolean new_folder      = FALSE;
+       gboolean rename_folder   = FALSE;
+       gboolean delete_folder   = FALSE;
+       gboolean update_tree     = FALSE;
+       gboolean rescan_tree     = FALSE;
+       gboolean remove_tree     = FALSE;
+       gboolean folder_property = FALSE;
+       gboolean folder_processing  = FALSE;
+       gboolean folder_scoring  = FALSE;
+       gboolean search_folder = FALSE;
 
        if (!event) return;
 
@@ -1229,97 +1371,87 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        g_return_if_fail(item->folder != NULL);
        folder = item->folder;
 
-       menu_set_insensitive_all(GTK_MENU_SHELL(folderview->mail_popup));
-       menu_set_insensitive_all(GTK_MENU_SHELL(folderview->imap_popup));
-       menu_set_insensitive_all(GTK_MENU_SHELL(folderview->news_popup));
-       menu_set_insensitive_all(GTK_MENU_SHELL(folderview->mbox_popup));
-
-       if (FOLDER_IS_LOCAL(folder) && item->parent == NULL) {
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Update folder tree", TRUE);
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Remove mailbox", TRUE);
-       } else if (FOLDER_IS_LOCAL(folder) && item->stype != F_NORMAL) {
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Scoring...", TRUE);
-       } else if (FOLDER_IS_LOCAL(folder)) {
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Rename folder...", TRUE);
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Delete folder", TRUE);
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Scoring...", TRUE);
-               menu_set_sensitive(folderview->mail_factory,
-                                  "/Property...", TRUE);
-       } else if (folder->type == F_IMAP && item->parent == NULL) {
-               menu_set_sensitive(folderview->imap_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->imap_factory,
-                                  "/Update folder tree", TRUE);
-               menu_set_sensitive(folderview->imap_factory,
-                                  "/Remove IMAP4 account", TRUE);
-       } else if (folder->type == F_IMAP && item->stype != F_NORMAL) {
-               menu_set_sensitive(folderview->imap_factory,
-                                  "/Create new folder...", TRUE);
-       } else if (folder->type == F_IMAP) {
-               menu_set_sensitive(folderview->imap_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->imap_factory,
-                                  "/Delete folder", TRUE);
-               menu_set_sensitive(folderview->imap_factory,
-                                  "/Scoring...", TRUE);
-       } else if (folder->type == F_NEWS && item->parent == NULL) {
-               menu_set_sensitive(folderview->news_factory,
-                                  "/Subscribe to newsgroup...", TRUE);
-               menu_set_sensitive(folderview->news_factory,
-                                  "/Remove news account", TRUE);
-       } else if (folder->type == F_NEWS) {
-               menu_set_sensitive(folderview->news_factory,
-                                  "/Subscribe to newsgroup...", TRUE);
-               menu_set_sensitive(folderview->news_factory,
-                                  "/Remove newsgroup", TRUE);
-               menu_set_sensitive(folderview->news_factory,
-                                  "/Scoring...", TRUE);
-       }
-       if (folder->type == F_MBOX && item->parent == NULL) {
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Remove mailbox", TRUE);
-       } else if (folder->type == F_MBOX && item->stype != F_NORMAL) {
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Scoring...", TRUE);
-       } else if (folder->type == F_MBOX) {
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Create new folder...", TRUE);
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Rename folder...", TRUE);
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Delete folder", TRUE);
-               menu_set_sensitive(folderview->mbox_factory,
-                                  "/Scoring...", TRUE);
+       if (folderview->mainwin->lock_count == 0) {
+               new_folder = TRUE;
+               if (item->parent == NULL)
+                       update_tree = remove_tree = TRUE;
+               else
+                       mark_all_read = search_folder = TRUE;
+               if (FOLDER_IS_LOCAL(folder) || FOLDER_TYPE(folder) == F_IMAP || FOLDER_TYPE(folder) == F_MBOX) {
+                       if (item->parent == NULL)
+                               update_tree = rescan_tree = TRUE;
+                       else if (item->stype == F_NORMAL)
+                               rename_folder = delete_folder = folder_property = folder_scoring = folder_processing = TRUE;
+                       else if (item->stype == F_INBOX)
+                               folder_property = folder_scoring = folder_processing = TRUE;
+                       else if (item->stype == F_TRASH)
+                               folder_processing = TRUE;
+                       else if (item->stype == F_OUTBOX)
+                               folder_processing = TRUE;
+               } else if (FOLDER_TYPE(folder) == F_NEWS) {
+                       if (item->parent != NULL)
+                               delete_folder = folder_scoring = folder_processing = TRUE;
+               }
+               if (item->unread < 1) 
+                       mark_all_read = FALSE;
        }
 
-       if (FOLDER_IS_LOCAL(folder))
-               gtk_menu_popup(GTK_MENU(folderview->mail_popup), NULL, NULL,
-                              NULL, NULL, event->button, event->time);
-       else if (folder->type == F_IMAP)
-               gtk_menu_popup(GTK_MENU(folderview->imap_popup), NULL, NULL,
-                              NULL, NULL, event->button, event->time);
-       else if (folder->type == F_NEWS)
-               gtk_menu_popup(GTK_MENU(folderview->news_popup), NULL, NULL,
-                              NULL, NULL, event->button, event->time);
-       else if (folder->type == F_MBOX)
-               gtk_menu_popup(GTK_MENU(folderview->mbox_popup), NULL, NULL,
-                              NULL, NULL, event->button, event->time);
+#define SET_SENS(factory, name, sens) \
+       menu_set_sensitive(folderview->factory, name, sens)
+
+       if (FOLDER_IS_LOCAL(folder)) {
+               popup = folderview->mail_popup;
+               menu_set_insensitive_all(GTK_MENU_SHELL(popup));
+               SET_SENS(mail_factory, "/Mark all read", mark_all_read);
+               SET_SENS(mail_factory, "/Create new folder...", new_folder);
+               SET_SENS(mail_factory, "/Rename folder...", rename_folder);
+               SET_SENS(mail_factory, "/Delete folder", delete_folder);
+               SET_SENS(mail_factory, "/Check for new messages", update_tree);
+               SET_SENS(mail_factory, "/Rescan folder tree", rescan_tree);
+               SET_SENS(mail_factory, "/Remove mailbox", remove_tree);
+               SET_SENS(mail_factory, "/Property...", folder_property);
+               SET_SENS(mail_factory, "/Processing...", folder_processing);
+               SET_SENS(mail_factory, "/Scoring...", folder_scoring);
+               SET_SENS(mail_factory, "/Search folder...", search_folder);
+       } else if (FOLDER_TYPE(folder) == F_IMAP) {
+               popup = folderview->imap_popup;
+               menu_set_insensitive_all(GTK_MENU_SHELL(popup));
+               SET_SENS(imap_factory, "/Create new folder...", new_folder);
+               SET_SENS(imap_factory, "/Rename folder...", rename_folder);
+               SET_SENS(imap_factory, "/Delete folder", delete_folder);
+               SET_SENS(imap_factory, "/Check for new messages", update_tree);
+               SET_SENS(imap_factory, "/Rescan folder tree", rescan_tree);
+               SET_SENS(imap_factory, "/Remove IMAP4 account", remove_tree);
+               SET_SENS(imap_factory, "/Processing...", folder_processing);
+               SET_SENS(imap_factory, "/Scoring...", folder_scoring);
+               SET_SENS(imap_factory, "/Search folder...", search_folder);
+       } else if (FOLDER_TYPE(folder) == F_NEWS) {
+               popup = folderview->news_popup;
+               menu_set_insensitive_all(GTK_MENU_SHELL(popup));
+               SET_SENS(news_factory, "/Subscribe to newsgroup...", new_folder);
+               SET_SENS(news_factory, "/Remove newsgroup", delete_folder);
+#if 0
+               SET_SENS(news_factory, "/Check for new messages", update_tree);
+#endif
+               SET_SENS(news_factory, "/Remove news account", remove_tree);
+               SET_SENS(news_factory, "/Search folder...", search_folder);
+               SET_SENS(news_factory, "/Processing...", folder_processing);
+               SET_SENS(news_factory, "/Scoring...", folder_scoring);
+       } else if (FOLDER_TYPE(folder) == F_MBOX) {
+               popup = folderview->mbox_popup;
+               menu_set_insensitive_all(GTK_MENU_SHELL(popup));
+               SET_SENS(mbox_factory, "/Create new folder...", new_folder);
+               SET_SENS(mbox_factory, "/Rename folder...", rename_folder);
+               SET_SENS(mbox_factory, "/Delete folder", delete_folder);
+               SET_SENS(mbox_factory, "/Processing...", folder_processing);
+               SET_SENS(mbox_factory, "/Scoring...", folder_scoring);
+       } else
+               return;
+
+#undef SET_SENS
+
+       gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL,
+                      event->button, event->time);
 }
 
 static void folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
@@ -1329,9 +1461,9 @@ static void folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
 
        if (event->button == 1 && folderview->open_folder == FALSE &&
            folderview->opened != NULL) {
-               gtk_ctree_select(GTK_CTREE(ctree), folderview->opened);
                gtkut_ctree_set_focus_row(GTK_CTREE(ctree),
                                          folderview->opened);
+               gtk_ctree_select(GTK_CTREE(ctree), folderview->opened);
        }
 }
 
@@ -1345,12 +1477,21 @@ static void folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
        switch (event->keyval) {
        case GDK_Return:
-       case GDK_space:
                if (folderview->selected) {
                        folderview_select_node(folderview,
                                               folderview->selected);
                }
                break;
+       case GDK_space:
+               if (folderview->selected) {
+                       if (folderview->opened == folderview->selected &&
+                           folderview->summaryview->messages == 0)
+                               folderview_select_next_unread(folderview);
+                       else
+                               folderview_select_node(folderview,
+                                                      folderview->selected);
+               }
+               break;
        case GDK_v:
        case GDK_V:
        case GDK_g:
@@ -1381,8 +1522,8 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        }
 
        if (!can_select) {
-               gtk_ctree_select(ctree, folderview->opened);
                gtkut_ctree_set_focus_row(ctree, folderview->opened);
+               gtk_ctree_select(ctree, folderview->opened);
                return;
        }
 
@@ -1393,6 +1534,14 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        can_select = FALSE;
 
+       /* CLAWS: set compose button type: news folder items 
+        * always have a news folder as parent */
+       if (item->folder) 
+               main_window_toolbar_set_compose_button
+                       (folderview->mainwin,
+                        item->folder->type == F_NEWS ? 
+                        COMPOSEBUTTON_NEWS : COMPOSEBUTTON_MAIL);
+        
        if (item->path)
                debug_print(_("Folder %s is selected\n"), item->path);
 
@@ -1412,8 +1561,8 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        opened = summary_show(folderview->summaryview, item, FALSE);
 
        if (!opened) {
-               gtk_ctree_select(ctree, folderview->opened);
                gtkut_ctree_set_focus_row(ctree, folderview->opened);
+               gtk_ctree_select(ctree, folderview->opened);
        } else
                folderview->opened = row;
 
@@ -1448,9 +1597,9 @@ static void folderview_popup_close(GtkMenuShell *menu_shell,
 {
        if (!folderview->opened) return;
 
-       gtk_ctree_select(GTK_CTREE(folderview->ctree), folderview->opened);
        gtkut_ctree_set_focus_row(GTK_CTREE(folderview->ctree),
                                  folderview->opened);
+       gtk_ctree_select(GTK_CTREE(folderview->ctree), folderview->opened);
 }
 
 static void folderview_col_resized(GtkCList *clist, gint column, gint width,
@@ -1510,7 +1659,10 @@ static void folderview_update_tree_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       folderview_update_tree(item->folder);
+       if (action == 0)
+               folderview_update_all_node();
+       else
+               folderview_update_tree(item->folder);
 }
 
 static void folderview_new_folder_cb(FolderView *folderview, guint action,
@@ -1534,11 +1686,13 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
                                  _("NewFolder"));
        if (!new_folder) return;
 
-       if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
-               alertpanel_error(_("`%c' can't be included in folder name."),
-                                G_DIR_SEPARATOR);
-               g_free(new_folder);
-               return;
+       if (item->folder->type != F_MBOX) {
+               if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
+                       alertpanel_error(_("`%c' can't be included in folder name."),
+                                        G_DIR_SEPARATOR);
+                       g_free(new_folder);
+                       return;
+               }
        }
 
        /* find whether the directory already exists */
@@ -1550,8 +1704,13 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
        }
 
        new_item = item->folder->create_folder(item->folder, item, new_folder);
+       if (!new_item) {
+               alertpanel_error(_("The folder `%s' could not be created."), 
+                                new_folder);
+               g_free(new_folder);
+               return;
+       } 
        g_free(new_folder);
-       if (!new_item) return;
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
@@ -1970,55 +2129,88 @@ static void folderview_new_news_group_cb(FolderView *folderview, guint action,
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
        GtkCTreeNode *servernode, *node;
+       Folder *folder;
        FolderItem *item;
+       FolderItem *rootitem;
        FolderItem *newitem;
-       gchar *new_group;
-       const gchar *server;
+       GSList *new_subscr;
+       GSList *cur;
+       GNode *gnode;
 
        if (!folderview->selected) return;
 
        item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->folder->type == F_NEWS);
-       g_return_if_fail(item->folder->account != NULL);
-
-       new_group = grouplist_dialog(item->folder);
-       if (!new_group) return;
+       folder = item->folder;
+       g_return_if_fail(folder != NULL);
+       g_return_if_fail(folder->type == F_NEWS);
+       g_return_if_fail(folder->account != NULL);
 
        if (GTK_CTREE_ROW(folderview->selected)->parent != NULL)
                servernode = GTK_CTREE_ROW(folderview->selected)->parent;
        else
                servernode = folderview->selected;
 
-       if (folderview_find_by_name(ctree, servernode, new_group)) {
-               alertpanel_error(_("The newsgroup `%s' already exists."),
-                                new_group);
-               g_free(new_group);
-               return;
+       rootitem = gtk_ctree_node_get_row_data(ctree, servernode);
+
+       new_subscr = grouplist_dialog(folder);
+
+       /* remove unsubscribed newsgroups */
+       for (gnode = folder->node->children; gnode != NULL; ) {
+               GNode *next = gnode->next;
+
+               item = FOLDER_ITEM(gnode->data);
+               if (g_slist_find_custom(new_subscr, item->path,
+                                       (GCompareFunc)g_strcasecmp) != NULL) {
+                       gnode = next;
+                       continue;
+               }
+
+               node = gtk_ctree_find_by_row_data(ctree, servernode, item);
+               if (!node) {
+                       gnode = next;
+                       continue;
+               }
+
+               if (folderview->opened == node) {
+                       summary_clear_all(folderview->summaryview);
+                       folderview->opened = NULL;
+               }
+
+               folder_item_remove(item);
+               gtk_ctree_remove_node(ctree, node);
+
+               gnode = next;
        }
 
        gtk_clist_freeze(GTK_CLIST(ctree));
 
-       text[COL_FOLDER] = new_group;
-       node = gtk_ctree_insert_node(ctree, servernode, NULL, text,
-                                    FOLDER_SPACING,
-                                    folderxpm, folderxpmmask,
-                                    folderopenxpm, folderopenxpmmask,
-                                    FALSE, FALSE);
-       gtk_ctree_expand(ctree, servernode);
+       /* add subscribed newsgroups */
+       for (cur = new_subscr; cur != NULL; cur = cur->next) {
+               gchar *name = (gchar *)cur->data;
 
-       item = gtk_ctree_node_get_row_data(ctree, servernode);
-       server = item->folder->account->nntp_server;
+               if (folderview_find_by_name(ctree, servernode, name) != NULL)
+                       continue;
 
-       newitem = folder_item_new(new_group, new_group);
-       g_free(new_group);
-       folder_item_append(item, newitem);
-       gtk_ctree_node_set_row_data(ctree, node, newitem);
-       gtk_ctree_sort_node(ctree, servernode);
+               text[COL_FOLDER] = name;
+               node = gtk_ctree_insert_node(ctree, servernode, NULL, text,
+                                            FOLDER_SPACING,
+                                            folderxpm, folderxpmmask,
+                                            folderopenxpm, folderopenxpmmask,
+                                            FALSE, FALSE);
+               gtk_ctree_expand(ctree, servernode);
 
+               newitem = folder_item_new(name, name);
+               folder_item_append(rootitem, newitem);
+               gtk_ctree_node_set_row_data(ctree, node, newitem);
+       }
+
+       gtk_ctree_sort_node(ctree, servernode);
        gtk_clist_thaw(GTK_CLIST(ctree));
 
+       slist_free_strings(new_subscr);
+       g_slist_free(new_subscr);
+
        folder_write_list();
 }
 
@@ -2095,6 +2287,12 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
        folder_write_list();
 }
 
+static void folderview_search_cb(FolderView *folderview, guint action,
+                                GtkWidget *widget)
+{
+       summary_search(folderview->summaryview);
+}
+
 static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          GdkDragContext *context,
                                          gint            x,
@@ -2131,8 +2329,12 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
        }
 
        if (acceptable) {
+               gtk_signal_handler_block_by_func(GTK_OBJECT(widget),GTK_SIGNAL_FUNC(folderview_selected), folderview);
                gtk_ctree_select(GTK_CTREE(widget), node);
-               gdk_drag_status(context, context->suggested_action, time);
+               gtk_signal_handler_unblock_by_func(GTK_OBJECT(widget),GTK_SIGNAL_FUNC(folderview_selected), folderview);
+               gdk_drag_status(context, 
+                                       (context->actions == GDK_ACTION_COPY ?
+                                       GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
        } else {
                gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
                gdk_drag_status(context, 0, time);
@@ -2169,8 +2371,18 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
        node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
        item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
        if (item != NULL) {
-               summary_move_selected_to(folderview->summaryview, item);
-               gtk_drag_finish(drag_context, TRUE, TRUE, time);
+               switch (drag_context->action) {
+                       case GDK_ACTION_COPY:
+                               summary_copy_selected_to(folderview->summaryview, item);
+                               gtk_drag_finish(drag_context, TRUE, FALSE, time);
+                               break;
+                       case GDK_ACTION_MOVE:
+                       case GDK_ACTION_DEFAULT:
+                       default:
+                               summary_move_selected_to(folderview->summaryview, item);
+                               gtk_drag_finish(drag_context, TRUE, TRUE, time);
+                               break;
+               }
        } else
                gtk_drag_finish(drag_context, FALSE, FALSE, time);
 }
@@ -2199,7 +2411,9 @@ static void folderview_scoring_cb(FolderView *folderview, guint action,
        prefs_scoring_open(item);
 }
 
-static void folderview_property_cb(FolderView *folderview, guint action, GtkWidget *widget) {
+static void folderview_processing_cb(FolderView *folderview, guint action,
+                                    GtkWidget *widget)
+{
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
 
@@ -2209,15 +2423,37 @@ static void folderview_property_cb(FolderView *folderview, guint action, GtkWidg
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       prefs_folder_item_create(item);
+       prefs_filtering_open(item);
 }
 
-void folderview_set_target_folder_color(gint color_op) {
+static void folderview_property_cb(FolderView *folderview, guint action, 
+                                  GtkWidget *widget) 
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderItem *item;
+
+       if (!folderview->selected) return;
+
+       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+
+       prefs_folder_item_create(folderview, item);
+}
+
+void folderview_set_target_folder_color(gint color_op) 
+{
+       gint firstone = 1;
        GList *list;
        FolderView *folderview;
 
        for (list = folderview_list; list != NULL; list = list->next) {
                folderview = (FolderView *)list->data;
                gtkut_convert_int_to_gdk_color(color_op, &folderview->color_op);
+               if (firstone) {
+                       bold_tgtfold_style->fg[GTK_STATE_NORMAL] =
+                               folderview->color_op;
+                       firstone = 0;
+               }
        }
 }