sync with 0.8.5cvs17
[claws.git] / src / folderview.c
index 5630097ce2e2057b101d2977c31bae9c3b249580..e92ddda54f6fd60f8bcebd150e8534489c2d01d1 100644 (file)
@@ -54,7 +54,6 @@
 #include "gtkutils.h"
 #include "prefs_common.h"
 #include "prefs_account.h"
-#include "prefs_filter.h"
 #include "prefs_filtering.h"
 #include "prefs_scoring.h"
 #include "prefs_folder_item.h"
@@ -62,7 +61,6 @@
 #include "folder.h"
 #include "inc.h"
 #include "statusbar.h"
-#include "toolbar.h"
 
 typedef enum
 {
@@ -277,7 +275,7 @@ static GtkItemFactoryEntry folderview_mail_popup_entries[] =
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {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_("/R_ebuild 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>"},
@@ -297,7 +295,7 @@ static GtkItemFactoryEntry folderview_imap_popup_entries[] =
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {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_("/R_ebuild 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>"},
@@ -539,9 +537,9 @@ void folderview_init(FolderView *folderview)
 
 
        if (!normalfont)
-               normalfont = gdk_fontset_load(NORMAL_FONT);
+               normalfont = gtkut_font_load(NORMAL_FONT);
        if (!boldfont)
-               boldfont = gdk_fontset_load(BOLD_FONT);
+               boldfont = gtkut_font_load(BOLD_FONT);
 
        if (!bold_style) {
                bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
@@ -786,21 +784,13 @@ static GtkWidget *label_window_create(const gchar *str)
 void folderview_rescan_tree(Folder *folder)
 {
        GtkWidget *window;
-       AlertValue avalue;
 
        g_return_if_fail(folder != NULL);
 
        if (!folder->scan_tree) return;
 
-       avalue = alertpanel
-               (_("Rescan folder tree"),
-                _("All previous settings for each folders will be lost.\n"
-                  "Continue?"),
-                _("Yes"), _("No"), NULL);
-       if (avalue != G_ALERTDEFAULT) return;
-
        inc_lock();
-       window = label_window_create(_("Rescanning folder tree..."));
+       window = label_window_create(_("Rebuilding folder tree..."));
 
        folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
        folder_scan_tree(folder);
@@ -1135,7 +1125,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                            item->path &&
                            !strcmp2(item->name, item->path) &&
                            prefs_common.ng_abbrev_len < strlen(item->path))
-                               name = get_abbrev_newsgroup_name(item->path);
+                               name = get_abbrev_newsgroup_name(item->path, prefs_common.ng_abbrev_len);
                        else
                                name = g_strdup(item->name);
                }
@@ -1218,7 +1208,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                GdkColor gdk_color;
 
                gtkut_convert_int_to_gdk_color(item->prefs->color, &gdk_color);
-               color_style = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(ctree)));
+               color_style = gtk_style_copy(normal_style);
                color_style->fg[GTK_STATE_NORMAL] = gdk_color;
                style = color_style;
        } else {
@@ -1227,6 +1217,8 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 
        gtk_ctree_node_set_row_style(ctree, node, style);
 
+       item->need_update = FALSE;
+
        if ((node = gtkut_ctree_find_collapsed_parent(ctree, node)) != NULL)
                folderview_update_node(folderview, node);
 }
@@ -1253,6 +1245,31 @@ void folderview_update_item(FolderItem *item, gboolean update_summary)
        }
 }
 
+void folderview_update_items_when_required(gboolean update_summary)
+{
+       GList *list;
+       FolderView *folderview;
+       GtkCTree *ctree;
+       GtkCTreeNode *node;
+       FolderItem *item;
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               folderview = (FolderView *)list->data;
+               ctree = GTK_CTREE(folderview->ctree);
+
+               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);
+
+                       if (item->need_update) {
+                               folderview_update_node(folderview, node);
+                               if (update_summary && folderview->opened == node)
+                                       summary_show(folderview->summaryview, item);
+                       }
+               }
+       }
+}
+
 static void folderview_update_item_foreach_func(gpointer key, gpointer val,
                                                gpointer data)
 {
@@ -1496,10 +1513,13 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
 
        if (folderview->mainwin->lock_count == 0) {
                new_folder = TRUE;
-               if (item->parent == NULL)
+               if (item->parent == NULL) {
                        update_tree = remove_tree = TRUE;
-               else
+                       if (folder->account)
+                               folder_property = TRUE;
+               } else
                        mark_all_read = search_folder = folder_property = 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;
@@ -1533,7 +1553,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                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, "/Rebuild folder tree", rescan_tree);
                SET_SENS(mail_factory, "/Remove mailbox", remove_tree);
                SET_SENS(mail_factory, "/Search folder...", search_folder);
                SET_SENS(mail_factory, "/Property...", folder_property);
@@ -1547,7 +1567,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                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, "/Rebuild folder tree", rescan_tree);
                SET_SENS(imap_factory, "/Remove IMAP4 account", remove_tree);
                SET_SENS(imap_factory, "/Search folder...", search_folder);
                SET_SENS(imap_factory, "/Property...", folder_property);
@@ -1659,6 +1679,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                
                olditem = gtk_ctree_node_get_row_data(ctree, folderview->opened);
                folder_item_write_cache(olditem);
+               summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
        }
 
        /* CLAWS: set compose button type: news folder items 
@@ -1821,6 +1842,12 @@ static void folderview_update_tree_cb(FolderView *folderview, guint action,
                folderview_check_new(item->folder);
        else
                folderview_rescan_tree(item->folder);
+       
+       if (folderview->opened) {
+               item = gtk_ctree_node_get_row_data(ctree, folderview->opened);
+               if (item)
+                       folderview_update_item(item, TRUE);
+       }
 }
 
 static void folderview_new_folder_cb(FolderView *folderview, guint action,
@@ -1865,7 +1892,7 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
-       new_item = item->folder->create_folder(item->folder, item, new_folder);
+       new_item = folder_create_folder(item, new_folder);
        if (!new_item) {
                alertpanel_error(_("Can't create the folder `%s'."), name);
                g_free(new_folder);
@@ -1883,6 +1910,8 @@ static void folderview_new_folder_cb(FolderView *folderview, guint action,
                                     FALSE, FALSE);
        gtk_ctree_expand(ctree, folderview->selected);
        gtk_ctree_node_set_row_data(ctree, node, new_item);
+       if (normal_style)
+               gtk_ctree_node_set_row_style(ctree, node, normal_style);
        folderview_sort_folders(folderview, folderview->selected, item->folder);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
@@ -1919,7 +1948,7 @@ static void folderview_new_mbox_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
-       new_item = item->folder->create_folder(item->folder, item, new_folder);
+       new_item = folder_create_folder(item, new_folder);
        g_free(new_folder);
        if (!new_item) return;
 
@@ -1933,6 +1962,8 @@ static void folderview_new_mbox_folder_cb(FolderView *folderview, guint action,
                                     FALSE, FALSE);
        gtk_ctree_expand(ctree, folderview->selected);
        gtk_ctree_node_set_row_data(ctree, node, new_item);
+       if (normal_style)
+               gtk_ctree_node_set_row_style(ctree, node, normal_style);
        folderview_sort_folders(folderview, folderview->selected, item->folder);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
@@ -1995,17 +2026,11 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
        }
        g_free(new_folder);
 
-       if (prefs_common.fltlist) {
-               if (folder_get_default_folder() == item->folder)
-                       prefs_filter_rename_path(old_path, item->path);
-               new_id = folder_item_get_identifier(item);
-               prefs_filter_rename_path(old_id, new_id);
-       } else {
-               if (FOLDER_TYPE(item->folder) == F_MH)
-                       prefs_filtering_rename_path(old_path, item->path);
-               new_id = folder_item_get_identifier(item);
-               prefs_filtering_rename_path(old_id, new_id);
-       }
+       if (FOLDER_TYPE(item->folder) == F_MH)
+               prefs_filtering_rename_path(old_path, item->path);
+       new_id = folder_item_get_identifier(item);
+       prefs_filtering_rename_path(old_id, new_id);
+
        g_free(old_id);
        g_free(new_id);
 
@@ -2124,17 +2149,11 @@ static void folderview_delete_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
-       if (prefs_common.fltlist) {
-               if (folder_get_default_folder() == item->folder)
-                       prefs_filter_delete_path(old_path);
-               prefs_filter_delete_path(old_id);
-               g_free(old_id);
-       } else {
-               if (FOLDER_TYPE(item->folder) == F_MH)
-                       prefs_filtering_delete_path(old_path);
-               prefs_filtering_delete_path(old_id);
-               g_free(old_id);
-       }
+       if (FOLDER_TYPE(item->folder) == F_MH)
+               prefs_filtering_delete_path(old_path);
+       prefs_filtering_delete_path(old_id);
+       g_free(old_id);
+
        if (folderview->opened == folderview->selected ||
            gtk_ctree_is_ancestor(ctree,
                                  folderview->selected,
@@ -2229,7 +2248,7 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
                return;
        }
 
-       new_item = item->folder->create_folder(item->folder, item, new_folder);
+       new_item = folder_create_folder(item, new_folder);
        if (!new_item) {
                alertpanel_error(_("Can't create the folder `%s'."), name);
                g_free(new_folder);
@@ -2247,6 +2266,8 @@ static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
                                     FALSE, FALSE);
        gtk_ctree_expand(ctree, folderview->selected);
        gtk_ctree_node_set_row_data(ctree, node, new_item);
+       if (normal_style)
+               gtk_ctree_node_set_row_style(ctree, node, normal_style);
        folderview_sort_folders(folderview, folderview->selected, item->folder);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
@@ -2259,6 +2280,7 @@ static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
+       PrefsAccount *account;
        gchar *name, *name_;
        gchar *message;
        AlertValue avalue;
@@ -2289,8 +2311,9 @@ static void folderview_rm_imap_server_cb(FolderView *folderview, guint action,
                folderview->opened = NULL;
        }
 
-       account_destroy(item->folder->account);
+       account = item->folder->account;
        folder_destroy(item->folder);
+       account_destroy(account);
        gtk_ctree_remove_node(ctree, folderview->selected);
        account_set_menu();
        main_window_reflect_prefs_all();
@@ -2429,6 +2452,7 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
+       PrefsAccount *account;
        gchar *name, *name_;
        gchar *message;
        AlertValue avalue;
@@ -2459,8 +2483,9 @@ static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
                folderview->opened = NULL;
        }
 
-       account_destroy(item->folder->account);
-       folder_destroy(item->folder);
+       account = item->folder->account;
+       folder_destroy(item->folder);
+       account_destroy(account);
        gtk_ctree_remove_node(ctree, folderview->selected);
        account_set_menu();
        main_window_reflect_prefs_all();
@@ -2491,7 +2516,10 @@ static void folderview_property_cb(FolderView *folderview, guint action,
        /*
         * CLAWS: wait till Hiro has completed his stuff
         */
-       prefs_folder_item_open(item);
+       if (item->parent == NULL && item->folder->account)
+               account_open(item->folder->account);
+       else
+               prefs_folder_item_open(item);
 #endif 
 }