/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 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 "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"
#include "account.h"
#include "folder.h"
+#include "foldersel.h"
#include "inc.h"
+#include "statusbar.h"
+#include "hooks.h"
typedef enum
{
#define COL_FOLDER_WIDTH 150
#define COL_NUM_WIDTH 32
-#define STATUSBAR_PUSH(mainwin, str) \
-{ \
- gtk_statusbar_push(GTK_STATUSBAR(mainwin->statusbar), \
- mainwin->folderview_cid, str); \
- gtkut_widget_wait_for_draw(mainwin->hbox_stat); \
-}
-
-#define STATUSBAR_POP(mainwin) \
-{ \
- gtk_statusbar_pop(GTK_STATUSBAR(mainwin->statusbar), \
- mainwin->folderview_cid); \
-}
-
static GList *folderview_list = NULL;
static GdkFont *normalfont;
static GdkBitmap *newxpmmask;
static GdkPixmap *unreadxpm;
static GdkBitmap *unreadxpmmask;
+static GdkPixmap *draftsxpm;
+static GdkBitmap *draftsxpmmask;
+static GdkPixmap *draftsopenxpm;
+static GdkBitmap *draftsopenxpmmask;
static void folderview_select_node (FolderView *folderview,
GtkCTreeNode *node);
guint info,
guint time,
FolderView *folderview);
+static void folderview_start_drag (GtkWidget *widget, gint button, GdkEvent *event,
+ FolderView *folderview);
+static void folderview_drag_data_get (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time,
+ FolderView *folderview);
+static void folderview_drag_end_cb (GtkWidget *widget,
+ GdkDragContext *drag_context,
+ FolderView *folderview);
+
+void folderview_create_folder_node (FolderView *folderview,
+ FolderItem *item);
+gboolean folderview_update_folder (gpointer source,
+ gpointer userdata);
+gboolean folderview_update_item (gpointer source,
+ gpointer data);
+
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_move_to(FolderView *folderview, FolderItem *from_folder,
+ FolderItem *to_folder);
+static void folderview_move_to_cb(FolderView *folderview);
static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
{
{N_("/Create _new folder..."), NULL, folderview_new_mbox_folder_cb, 0, NULL},
{N_("/_Rename folder..."), NULL, folderview_rename_mbox_folder_cb, 0, NULL},
+ {N_("/M_ove folder..."), NULL, folderview_move_to_cb, 0, NULL},
{N_("/_Delete folder"), NULL, folderview_delete_folder_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Remove _mailbox"), NULL, folderview_remove_mailbox_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Property..."), NULL, NULL, 0, NULL},
+ {N_("/_Properties..."), NULL, NULL, 0, NULL},
{N_("/_Processing..."), NULL, folderview_processing_cb, 0, NULL},
{N_("/_Scoring..."), NULL, folderview_scoring_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_("/M_ove folder..."), NULL, folderview_move_to_cb, 0, NULL},
{N_("/_Delete folder"), NULL, folderview_delete_folder_cb, 0, NULL},
{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>"},
{N_("/_Search folder..."), NULL, folderview_search_cb, 0, NULL},
- {N_("/_Property..."), NULL, folderview_property_cb, 0, NULL},
+ {N_("/_Properties..."), NULL, folderview_property_cb, 0, NULL},
{N_("/_Processing..."), NULL, folderview_processing_cb, 0, NULL},
{N_("/S_coring..."), NULL, folderview_scoring_cb, 0, NULL}
};
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Create _new folder..."), NULL, folderview_new_imap_folder_cb, 0, NULL},
{N_("/_Rename folder..."), NULL, folderview_rename_folder_cb, 0, NULL},
+ {N_("/M_ove folder..."), NULL, folderview_move_to_cb, 0, NULL},
{N_("/_Delete folder"), NULL, folderview_delete_folder_cb, 0, NULL},
{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>"},
{N_("/_Search folder..."), NULL, folderview_search_cb, 0, NULL},
- {N_("/_Property..."), NULL, folderview_property_cb, 0, NULL},
+ {N_("/_Properties..."), NULL, folderview_property_cb, 0, NULL},
{N_("/_Processing..."), NULL, folderview_processing_cb, 0, NULL},
{N_("/S_coring..."), NULL, folderview_scoring_cb, 0, NULL}
};
{N_("/Mark all _read"), NULL, mark_all_read_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Subscribe to newsgroup..."),
- NULL, folderview_new_news_group_cb, 0, NULL},
- {N_("/_Remove newsgroup"), NULL, folderview_rm_news_group_cb, 0, NULL},
- {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, folderview_property_cb, 0, NULL},
- {N_("/_Processing..."), NULL, folderview_processing_cb, 0, NULL},
+ NULL, folderview_new_news_group_cb, 0, NULL},
+ {N_("/_Remove newsgroup"), NULL, folderview_rm_news_group_cb, 0, NULL},
+ {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Check for new messages"),
+ NULL, folderview_update_tree_cb, 0, NULL},
+ {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_("/_Properties..."), NULL, folderview_property_cb, 0, NULL},
+ {N_("/_Processing..."), NULL, folderview_processing_cb, 0, NULL},
{N_("/S_coring..."), NULL, folderview_scoring_cb, 0, NULL}
};
+GtkTargetEntry folderview_drag_types[] =
+{
+ {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+};
FolderView *folderview_create(void)
{
gint n_entries;
gint i;
- debug_print(_("Creating folder view...\n"));
+ debug_print("Creating folder view...\n");
folderview = g_new0(FolderView, 1);
titles[COL_FOLDER] = _("Folder");
prefs_common.folderview_width,
prefs_common.folderview_height);
- ctree = gtk_ctree_new_with_titles(N_FOLDER_COLS, COL_FOLDER, titles);
+ ctree = gtk_sctree_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);
sizeof(folderview_mbox_popup_entries[0]);
mbox_popup = menu_create_items(folderview_mbox_popup_entries,
n_entries,
- "<MailFolder>", &mbox_factory,
+ "<MboxFolder>", &mbox_factory,
folderview);
gtk_signal_connect(GTK_OBJECT(ctree), "key_press_event",
folderview);
gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
GTK_SIGNAL_FUNC(folderview_selected), folderview);
+ gtk_signal_connect(GTK_OBJECT(ctree), "start_drag",
+ GTK_SIGNAL_FUNC(folderview_start_drag), folderview);
+ gtk_signal_connect(GTK_OBJECT(ctree), "drag_data_get",
+ GTK_SIGNAL_FUNC(folderview_drag_data_get),
+ folderview);
gtk_signal_connect_after(GTK_OBJECT(ctree), "tree_expand",
GTK_SIGNAL_FUNC(folderview_tree_expanded),
folderview);
/* drop callback */
- gtk_drag_dest_set(ctree, GTK_DEST_DEFAULT_ALL &
- ~GTK_DEST_DEFAULT_HIGHLIGHT,
+ gtk_drag_dest_set(ctree, GTK_DEST_DEFAULT_ALL & ~GTK_DEST_DEFAULT_HIGHLIGHT,
summary_drag_types, 1,
- GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT);
+ 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);
gtk_signal_connect(GTK_OBJECT(ctree), "drag_data_received",
GTK_SIGNAL_FUNC(folderview_drag_received_cb),
folderview);
+ gtk_signal_connect(GTK_OBJECT(ctree), "drag_end",
+ GTK_SIGNAL_FUNC(folderview_drag_end_cb),
+ folderview);
folderview->scrolledwin = scrolledwin;
folderview->ctree = ctree;
folderview->mbox_popup = mbox_popup;
folderview->mbox_factory = mbox_factory;
+ folderview->folder_update_callback_id =
+ hooks_register_hook(FOLDER_UPDATE_HOOKLIST, folderview_update_folder, (gpointer) folderview);
+ folderview->folder_item_update_callback_id =
+ hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item, (gpointer) folderview);
+
gtk_widget_show_all(scrolledwin);
+ folderview->target_list = gtk_target_list_new(folderview_drag_types, 1);
folderview_list = g_list_append(folderview_list, folderview);
return folderview;
stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE_HRM, &queuehrmxpm, &queuehrmxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN, &queueopenxpm, &queueopenxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN_HRM, &queueopenhrmxpm, &queueopenhrmxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_CLOSE, &draftsxpm, &draftsxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_OPEN, &draftsopenxpm, &draftsopenxpmmask);
/* CLAWS: titles for "New" and "Unread" show new & unread pixmaps
* instead text (text overflows making them unreadable and ugly) */
gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_NEW,hbox_new);
gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_UNREAD,hbox_unread);
-
-
- if (!normalfont)
- normalfont = gdk_fontset_load(NORMAL_FONT);
- if (!boldfont)
- boldfont = gdk_fontset_load(BOLD_FONT);
-
+ if (!normalfont) {
+ if (gtkut_font_load(NORMAL_FONT) == NULL) {
+ GtkStyle *style = gtk_style_new();
+ normalfont = style->font;
+ gdk_font_ref(normalfont);
+ gtk_style_unref(style);
+ }
+ else
+ normalfont = gtkut_font_load(NORMAL_FONT);
+ }
+
+ if (!boldfont) {
+ if (gtkut_font_load(BOLD_FONT) == NULL) {
+ GtkStyle *style = gtk_style_new();
+ boldfont = style->font;
+ gdk_font_ref(boldfont);
+ gtk_style_unref(style);
+ }
+ else
+ boldfont = gtkut_font_load(BOLD_FONT);
+ }
+
if (!bold_style) {
bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
bold_style->font = boldfont;
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
MainWindow *mainwin = folderview->mainwin;
- debug_print(_("Setting folder info...\n"));
+ debug_print("Setting folder info...\n");
STATUSBAR_PUSH(mainwin, _("Setting folder info..."));
main_window_cursor_wait(mainwin);
for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
item = gtk_ctree_node_get_row_data(ctree, node);
- if (item && item->unread > 0 && item->stype != F_TRASH)
+ if (item && item->unread_msgs > 0 && item->stype != F_TRASH)
return node;
}
unread = atoi(unread_str);
total = atoi(total_str);
- /* 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)
- return;
-#endif
-
prev_row = row;
folderview_update_node(folderview, row);
gpointer data)
{
GList *list;
- gchar *rootpath;
-
- if (FOLDER_IS_LOCAL(folder))
- rootpath = LOCAL_FOLDER(folder)->rootpath;
- else if (folder->type == F_IMAP && folder->account &&
- folder->account->recv_server)
- rootpath = folder->account->recv_server;
- else
- return;
for (list = folderview_list; list != NULL; list = list->next) {
FolderView *folderview = (FolderView *)list->data;
if (item->path)
str = g_strdup_printf(_("Scanning folder %s%c%s ..."),
- rootpath, G_DIR_SEPARATOR,
+ item->folder->name, G_DIR_SEPARATOR,
item->path);
else
str = g_strdup_printf(_("Scanning folder %s ..."),
- rootpath);
+ item->folder->name);
STATUSBAR_PUSH(mainwin, str);
STATUSBAR_POP(mainwin);
g_return_if_fail(folder != NULL);
- if (!folder->scan_tree) return;
+ if (!folder->klass->scan_tree) 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);
+ folder_scan_tree(folder);
folder_set_ui_func(folder, NULL, NULL);
- folder_write_list();
folderview_set_all();
- folderview_check_new(folder);
-
gtk_widget_destroy(window);
inc_unlock();
}
-void folderview_rescan_all(void)
-{
- GList *list;
- GtkWidget *window;
-
- inc_lock();
- window = label_window_create(_("Rescanning all folder trees..."));
-
- list = folder_get_list();
- for (; list != NULL; list = list->next) {
- Folder *folder = list->data;
-
- if (!folder->scan_tree) continue;
- folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
- folder->scan_tree(folder);
- folder_set_ui_func(folder, NULL, NULL);
- }
-
- folder_write_list();
- folderview_set_all();
-
- list = folder_get_list();
- for (; list != NULL; list = list->next) {
- Folder *folder = list->data;
-
- folderview_check_new(folder);
- }
-
- gtk_widget_destroy(window);
- inc_unlock();
-}
-
-void folderview_check_new(Folder *folder)
+/** folderview_check_new()
+ * Scan and update the folder and return the
+ * count the number of new messages since last check.
+ * \param folder the folder to check for new messages
+ * \return the number of new messages since last check
+ */
+gint folderview_check_new(Folder *folder)
{
GList *list;
FolderItem *item;
FolderView *folderview;
GtkCTree *ctree;
GtkCTreeNode *node;
+ gint new_msgs = 0;
+ gint former_new_msgs = 0;
+ gint former_new = 0;
for (list = folderview_list; list != NULL; list = list->next) {
folderview = (FolderView *)list->data;
if (!folder && !FOLDER_IS_LOCAL(item->folder)) continue;
folderview_scan_tree_func(item->folder, item, NULL);
+ former_new = item->new_msgs;
if (folder_item_scan(item) < 0) {
if (folder && !FOLDER_IS_LOCAL(folder))
break;
}
folderview_update_node(folderview, node);
+ new_msgs += item->new_msgs;
+ former_new_msgs += former_new;
}
gtk_widget_set_sensitive(folderview->ctree, TRUE);
}
folder_write_list();
+ /* Number of new messages since last check is the just the difference
+ * between former_new_msgs and new_msgs. If new_msgs is less than
+ * former_new_msgs, that would mean another session accessed the folder
+ * and the result is not well defined.
+ */
+ new_msgs = (former_new_msgs < new_msgs ? new_msgs - former_new_msgs : 0);
+ return new_msgs;
+}
+
+void folderview_check_new_all(void)
+{
+ GList *list;
+ GtkWidget *window;
+ FolderView *folderview;
+
+ folderview = (FolderView *)folderview_list->data;
+
+ inc_lock();
+ main_window_lock(folderview->mainwin);
+ window = label_window_create
+ (_("Checking for new messages in all folders..."));
+
+ list = folder_get_list();
+ for (; list != NULL; list = list->next) {
+ Folder *folder = list->data;
+
+ folderview_check_new(folder);
+ }
+
+ folder_write_list();
+ folderview_set_all();
+
+ gtk_widget_destroy(window);
+ main_window_unlock(folderview->mainwin);
+ inc_unlock();
}
static gboolean folderview_search_new_recursive(GtkCTree *ctree,
if (node) {
item = gtk_ctree_node_get_row_data(ctree, node);
if (item) {
- if (item->new > 0 ||
- (item->stype == F_QUEUE && item->total > 0))
+ if (item->new_msgs > 0 ||
+ (item->stype == F_QUEUE && item->total_msgs > 0))
return TRUE;
}
node = GTK_CTREE_ROW(node)->children;
if (node) {
item = gtk_ctree_node_get_row_data(ctree, node);
if (item) {
- if (item->unread > 0 ||
- (item->stype == F_QUEUE && item->total > 0))
+ if (item->unread_msgs > 0 ||
+ (item->stype == F_QUEUE && item->total_msgs > 0))
return TRUE;
}
node = GTK_CTREE_ROW(node)->children;
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
GtkStyle *style = NULL;
+ GtkStyle *color_style = NULL;
FolderItem *item;
GdkPixmap *xpm, *openxpm;
GdkBitmap *mask, *openmask;
openxpm = inboxopenxpm;
openmask = inboxopenxpmmask;
}
- name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
- !strcmp2(item->name, INBOX_DIR) ? _("Inbox") :
- item->name);
break;
case F_OUTBOX:
if (item->hide_read_msgs) {
openxpm = outboxopenxpm;
openmask = outboxopenxpmmask;
}
- name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
- !strcmp2(item->name, OUTBOX_DIR) ? _("Sent") :
- item->name);
break;
case F_QUEUE:
if (item->hide_read_msgs) {
openxpm = queueopenxpm;
openmask = queueopenxpmmask;
}
- name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
- !strcmp2(item->name, QUEUE_DIR) ? _("Queue") :
- item->name);
break;
case F_TRASH:
if (item->hide_read_msgs) {
openxpm = trashopenxpm;
openmask = trashopenxpmmask;
}
- name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
- !strcmp2(item->name, TRASH_DIR) ? _("Trash") :
- item->name);
break;
case F_DRAFT:
- xpm = folderxpm;
- mask = folderxpmmask;
- if (item->hide_read_msgs) {
- openxpm = folderopenhrmxpm;
- openmask = folderopenhrmxpmmask;
- } else {
- openxpm = folderopenxpm;
- openmask = folderopenxpmmask;
- }
- name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
- !strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
- item->name);
+ xpm = draftsxpm;
+ mask = draftsxpmmask;
+ openxpm = draftsopenxpm;
+ openmask = draftsopenxpmmask;
break;
default:
if (item->hide_read_msgs) {
openxpm = folderopenxpm;
openmask = folderopenxpmmask;
}
- if (!item->parent) {
- switch (item->folder->type) {
- case F_MH:
- name = " (MH)"; break;
- case F_MBOX:
- name = " (mbox)"; break;
- case F_IMAP:
- name = " (IMAP4)"; break;
- case F_NEWS:
- name = " (News)"; break;
- default:
- name = "";
- }
- name = g_strconcat(item->name, name, NULL);
- } else {
- if (item->folder->type == F_NEWS &&
- item->path &&
- !strcmp2(item->name, item->path) &&
- prefs_common.ng_abbrev_len < strlen(item->path))
- name = get_abbrev_newsgroup_name(item->path);
- else
- name = g_strdup(item->name);
- }
}
+ name = folder_item_get_name(item);
if (!GTK_CTREE_ROW(node)->expanded &&
folderview_have_unread_children(folderview, node))
else
add_unread_mark = FALSE;
- if (item->stype == F_QUEUE && item->total > 0 &&
+ if (item->stype == F_QUEUE && item->total_msgs > 0 &&
prefs_common.display_folder_unread) {
- str = g_strdup_printf("%s (%d%s)", name, item->total,
+ str = g_strdup_printf("%s (%d%s)", name, item->total_msgs,
add_unread_mark ? "+" : "");
gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
xpm, mask, openxpm, openmask,
FALSE, GTK_CTREE_ROW(node)->expanded);
g_free(str);
- } else if ((item->unread > 0 || add_unread_mark) &&
+ } else if ((item->unread_msgs > 0 || add_unread_mark) &&
prefs_common.display_folder_unread) {
- if (item->unread > 0)
- str = g_strdup_printf("%s (%d%s)", name, item->unread,
- add_unread_mark ? "+" : "");
+ if (item->unread_msgs > 0)
+ str = g_strdup_printf("%s (%d%s%s)", name, item->unread_msgs,
+ add_unread_mark ? "+" : "",
+ item->unreadmarked_msgs > 0 ? "!":"");
else
str = g_strdup_printf("%s (+)", name);
gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
xpm, mask, openxpm, openmask,
FALSE, GTK_CTREE_ROW(node)->expanded);
g_free(str);
- } else
- gtk_ctree_set_node_info(ctree, node, name, FOLDER_SPACING,
+ } else {
+ str = g_strdup_printf("%s%s", name,
+ item->unreadmarked_msgs > 0 ? " (!)":"");
+
+ gtk_ctree_set_node_info(ctree, node, str, FOLDER_SPACING,
xpm, mask, openxpm, openmask,
FALSE, GTK_CTREE_ROW(node)->expanded);
+ g_free(str);
+ }
g_free(name);
if (!item->parent) {
gtk_ctree_node_set_text(ctree, node, COL_UNREAD, "-");
gtk_ctree_node_set_text(ctree, node, COL_TOTAL, "-");
} else {
- gtk_ctree_node_set_text(ctree, node, COL_NEW, itos(item->new));
- gtk_ctree_node_set_text(ctree, node, COL_UNREAD, itos(item->unread));
- gtk_ctree_node_set_text(ctree, node, COL_TOTAL, itos(item->total));
+ gtk_ctree_node_set_text(ctree, node, COL_NEW, itos(item->new_msgs));
+ gtk_ctree_node_set_text(ctree, node, COL_UNREAD, itos(item->unread_msgs));
+ gtk_ctree_node_set_text(ctree, node, COL_TOTAL, itos(item->total_msgs));
}
if (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
use_bold = use_color = FALSE;
} else if (item->stype == F_QUEUE) {
/* highlight queue folder if there are any messages */
- use_bold = use_color = (item->total > 0);
+ use_bold = use_color = (item->total_msgs > 0);
} else {
/* if unread messages exist, print with bold font */
- use_bold = (item->unread > 0) || add_unread_mark;
+ use_bold = (item->unread_msgs > 0) || add_unread_mark;
/* if new messages exist, print with colored letter */
use_color =
- (item->new > 0) ||
+ (item->new_msgs > 0) ||
(add_unread_mark &&
- folderview_have_new_children(folderview, node));
+ folderview_have_new_children(folderview, node));
}
gtk_ctree_node_set_foreground(ctree, node, NULL);
- if (use_bold && use_color)
+ if (use_bold && use_color) {
style = bold_color_style;
- else if (use_bold) {
+ } else if (use_bold) {
style = bold_style;
if (item->op_count > 0) {
style = bold_tgtfold_style;
}
- }
- else if (use_color) {
+ } else if (use_color) {
style = normal_color_style;
gtk_ctree_node_set_foreground(ctree, node,
&folderview->color_new);
- }
- else if (item->op_count > 0) {
+ } else if (item->op_count > 0) {
style = bold_tgtfold_style;
+ } else if (item->prefs->color > 0) {
+ GdkColor gdk_color;
+
+ gtkut_convert_int_to_gdk_color(item->prefs->color, &gdk_color);
+ color_style = gtk_style_copy(normal_style);
+ color_style->fg[GTK_STATE_NORMAL] = gdk_color;
+ style = color_style;
} else {
style = normal_style;
}
folderview_update_node(folderview, node);
}
-void folderview_update_item(FolderItem *item, gboolean update_summary)
+gboolean folderview_update_item(gpointer source, gpointer data)
{
- GList *list;
- FolderView *folderview;
+ FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
+ FolderView *folderview = (FolderView *)data;
GtkCTree *ctree;
GtkCTreeNode *node;
- g_return_if_fail(item != NULL);
+ g_return_val_if_fail(update_info != NULL, TRUE);
+ g_return_val_if_fail(update_info->item != NULL, TRUE);
+ g_return_val_if_fail(folderview != NULL, FALSE);
- for (list = folderview_list; list != NULL; list = list->next) {
- folderview = (FolderView *)list->data;
- ctree = GTK_CTREE(folderview->ctree);
+ ctree = GTK_CTREE(folderview->ctree);
- node = gtk_ctree_find_by_row_data(ctree, NULL, item);
- if (node) {
+ node = gtk_ctree_find_by_row_data(ctree, NULL, update_info->item);
+ if (node) {
+ if (update_info->update_flags & F_ITEM_UPDATE_MSGCNT)
folderview_update_node(folderview, node);
- if (update_summary && folderview->opened == node)
- summary_show(folderview->summaryview,
- item, FALSE);
- }
+ if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && (folderview->opened == node))
+ summary_show(folderview->summaryview, update_info->item);
}
-}
-
-static void folderview_update_item_foreach_func(gpointer key, gpointer val,
- gpointer data)
-{
- folderview_update_item((FolderItem *)key, FALSE);
-}
-
-void folderview_update_item_foreach(GHashTable *table)
-{
- g_hash_table_foreach(table, folderview_update_item_foreach_func, NULL);
+
+ return FALSE;
}
static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
GtkCTreeNode *prev = NULL;
- gtk_ctree_sort_recursive(ctree, root);
+ gtk_sctree_sort_recursive(ctree, root);
if (GTK_CTREE_ROW(root)->parent) return;
g_return_if_fail(item != NULL);
g_return_if_fail(item->folder != NULL);
- switch (item->folder->type) {
+ switch (FOLDER_TYPE(item->folder)) {
case F_MBOX:
folderview_new_mbox_folder_cb(folderview, 0, NULL);
break;
if (!item->path) return;
if (item->stype != F_NORMAL) return;
- switch (item->folder->type) {
+ switch (FOLDER_TYPE(item->folder)) {
case F_MBOX:
folderview_rename_mbox_folder_cb(folderview, 0, NULL);
+ break;
case F_MH:
case F_MAILDIR:
case F_IMAP:
if (!item->path) return;
if (item->stype != F_NORMAL) return;
- switch (item->folder->type) {
+ switch (FOLDER_TYPE(item->folder)) {
case F_MH:
case F_MBOX:
case F_MAILDIR:
gboolean mark_all_read = FALSE;
gboolean new_folder = FALSE;
gboolean rename_folder = FALSE;
+ gboolean move_folder = FALSE;
gboolean delete_folder = FALSE;
gboolean update_tree = FALSE;
gboolean rescan_tree = FALSE;
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;
else if (item->stype == F_NORMAL)
- rename_folder = delete_folder = folder_scoring = folder_processing = TRUE;
+ move_folder = rename_folder = delete_folder = folder_scoring = folder_processing = TRUE;
else if (item->stype == F_INBOX)
folder_scoring = folder_processing = TRUE;
else if (item->stype == F_TRASH)
if (item->parent != NULL)
delete_folder = folder_scoring = folder_processing = TRUE;
}
- if (item->unread < 1)
+ if (item->unread_msgs < 1)
mark_all_read = FALSE;
}
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, "/Move folder...", move_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);
+ SET_SENS(mail_factory, "/Properties...", folder_property);
SET_SENS(mail_factory, "/Processing...", folder_processing);
SET_SENS(mail_factory, "/Scoring...", folder_scoring);
} else if (FOLDER_TYPE(folder) == F_IMAP) {
SET_SENS(imap_factory, "/Mark all read", mark_all_read);
SET_SENS(imap_factory, "/Create new folder...", new_folder);
SET_SENS(imap_factory, "/Rename folder...", rename_folder);
+ SET_SENS(imap_factory, "/Move folder...", move_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);
+ SET_SENS(imap_factory, "/Properties...", folder_property);
SET_SENS(imap_factory, "/Processing...", folder_processing);
SET_SENS(imap_factory, "/Scoring...", folder_scoring);
} else if (FOLDER_TYPE(folder) == F_NEWS) {
SET_SENS(news_factory, "/Mark all read", mark_all_read);
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, "/Property...", folder_property);
+ SET_SENS(news_factory, "/Properties...", folder_property);
SET_SENS(news_factory, "/Processing...", folder_processing);
SET_SENS(news_factory, "/Scoring...", folder_scoring);
} else if (FOLDER_TYPE(folder) == F_MBOX) {
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, "/Move folder...", move_folder);
SET_SENS(mbox_factory, "/Delete folder", delete_folder);
- SET_SENS(news_factory, "/Property...", folder_property);
+ SET_SENS(news_factory, "/Properties...", folder_property);
SET_SENS(mbox_factory, "/Processing...", folder_processing);
SET_SENS(mbox_factory, "/Scoring...", folder_scoring);
} else
static gboolean can_select = TRUE; /* exclusive lock */
gboolean opened;
FolderItem *item;
+ gchar *buf;
folderview->selected = row;
can_select = FALSE;
+ /* Save cache for old folder */
+ /* We don't want to lose all caches if sylpheed crashed */
+ if (folderview->opened) {
+ FolderItem *olditem;
+
+ olditem = gtk_ctree_node_get_row_data(ctree, folderview->opened);
+ if (olditem) {
+ /* will be null if we just moved the previously opened folder */
+ summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
+ folder_item_close(olditem);
+ }
+ }
+
/* 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 ?
+ toolbar_set_compose_button
+ (folderview->mainwin->toolbar,
+ FOLDER_TYPE(item->folder) == F_NEWS ?
COMPOSEBUTTON_NEWS : COMPOSEBUTTON_MAIL);
if (item->path)
- debug_print(_("Folder %s is selected\n"), item->path);
+ debug_print("Folder %s is selected\n", item->path);
if (!GTK_CTREE_ROW(row)->children)
gtk_ctree_expand(ctree, row);
gdk_pointer_ungrab(GDK_CURRENT_TIME);
}
- if((item->folder->type == F_IMAP) || (item->folder->type == F_NEWS)) {
- folder_item_scan(item);
- }
+ /* Open Folder */
+ buf = g_strdup_printf(_("Opening Folder %s..."), item->path ?
+ item->path : "(null)");
+ debug_print("%s\n", buf);
+ STATUSBAR_PUSH(folderview->mainwin, buf);
+ g_free(buf);
- opened = summary_show(folderview->summaryview, item, FALSE);
+ main_window_cursor_wait(folderview->mainwin);
- folder_clean_cache_memory();
+ if (folder_item_open(item) != 0) {
+ main_window_cursor_normal(folderview->mainwin);
+ STATUSBAR_POP(folderview->mainwin);
+
+ alertpanel_error(_("Folder could not be opened."));
+
+ return;
+ }
+
+ main_window_cursor_normal(folderview->mainwin);
+
+ /* Show messages */
+ summary_set_prefs_from_folderitem(folderview->summaryview, item);
+ opened = summary_show(folderview->summaryview, item);
+ folder_clean_cache_memory();
+
if (!opened) {
gtkut_ctree_set_focus_row(ctree, folderview->opened);
gtk_ctree_select(ctree, folderview->opened);
gtk_ctree_node_moveto(ctree, row, -1, 0.5, 0);
}
+ STATUSBAR_POP(folderview->mainwin);
+
folderview->open_folder = FALSE;
can_select = TRUE;
}
if (!folderview->selected) return;
- summary_show(folderview->summaryview, NULL, FALSE);
+ summary_show(folderview->summaryview, NULL);
item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
g_return_if_fail(item != NULL);
folderview_rescan_tree(item->folder);
}
+void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem *item)
+{
+ GNode *srcnode;
+
+ folderview_create_folder_node(folderview, item);
+
+ srcnode = item->folder->node;
+ srcnode = g_node_find(srcnode, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+ srcnode = srcnode->children;
+ while (srcnode != NULL) {
+ if (srcnode && srcnode->data) {
+ FolderItem *next_item = (FolderItem*) srcnode->data;
+ folderview_create_folder_node_recursive(folderview, next_item);
+ }
+ srcnode = srcnode->next;
+ }
+}
+
+void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
+{
+ GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+ gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
+ GtkCTreeNode *node, *parent_node;
+
+ parent_node = gtk_ctree_find_by_row_data(ctree, NULL, item->parent);
+
+ gtk_clist_freeze(GTK_CLIST(ctree));
+
+ text[COL_FOLDER] = item->name;
+ node = gtk_ctree_insert_node(ctree, parent_node, NULL, text,
+ FOLDER_SPACING,
+ folderxpm, folderxpmmask,
+ folderopenxpm, folderopenxpmmask,
+ FALSE, FALSE);
+ gtk_ctree_expand(ctree, parent_node);
+ gtk_ctree_node_set_row_data(ctree, node, 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));
+}
+
static void folderview_new_folder_cb(FolderView *folderview, guint action,
GtkWidget *widget)
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
- gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
FolderItem *item;
FolderItem *new_item;
gchar *new_folder;
gchar *name, *name_;
- GtkCTreeNode *node;
if (!folderview->selected) return;
_("NewFolder"));
if (!new_folder) return;
- if (item->folder->type != F_MBOX) {
+ if (FOLDER_TYPE(item->folder) != F_MBOX) {
if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
alertpanel_error(_("`%c' can't be included in folder name."),
G_DIR_SEPARATOR);
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);
}
g_free(new_folder);
- gtk_clist_freeze(GTK_CLIST(ctree));
-
- text[COL_FOLDER] = new_item->name;
- node = gtk_ctree_insert_node(ctree, folderview->selected, NULL, text,
- FOLDER_SPACING,
- folderxpm, folderxpmmask,
- folderopenxpm, folderopenxpmmask,
- FALSE, FALSE);
- gtk_ctree_expand(ctree, folderview->selected);
- gtk_ctree_node_set_row_data(ctree, node, new_item);
- folderview_sort_folders(folderview, folderview->selected, item->folder);
-
- gtk_clist_thaw(GTK_CLIST(ctree));
+ folderview_create_folder_node(folderview, new_item);
folder_write_list();
}
GtkWidget *widget)
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
- gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
FolderItem *item;
FolderItem *new_item;
gchar *new_folder;
- GtkCTreeNode *node;
if (!folderview->selected) return;
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;
- gtk_clist_freeze(GTK_CLIST(ctree));
-
- text[COL_FOLDER] = new_item->name;
- node = gtk_ctree_insert_node(ctree, folderview->selected, NULL, text,
- FOLDER_SPACING,
- folderxpm, folderxpmmask,
- folderopenxpm, folderopenxpmmask,
- FALSE, FALSE);
- gtk_ctree_expand(ctree, folderview->selected);
- gtk_ctree_node_set_row_data(ctree, node, new_item);
- folderview_sort_folders(folderview, folderview->selected, item->folder);
-
- gtk_clist_thaw(GTK_CLIST(ctree));
+ folderview_create_folder_node(folderview, new_item);
folder_write_list();
}
Xstrdup_a(old_path, item->path, {g_free(new_folder); return;});
old_id = folder_item_get_identifier(item);
- if (item->folder->rename_folder(item->folder, item, new_folder) < 0) {
+ if (item->folder->klass->rename_folder(item->folder, item, new_folder) < 0) {
g_free(old_id);
g_free(new_folder);
return;
}
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);
return;
}
- if (item->folder->rename_folder(item->folder, item, new_folder) < 0) {
+ if (item->folder->klass->rename_folder(item->folder, item, new_folder) < 0) {
g_free(new_folder);
return;
}
if (folderview->opened == folderview->selected) {
if (!GTK_CTREE_ROW(folderview->opened)->children)
gtk_ctree_expand(ctree, folderview->opened);
- summary_show(folderview->summaryview, item, FALSE);
+ summary_show(folderview->summaryview, item);
}
gtk_clist_thaw(GTK_CLIST(ctree));
Xstrdup_a(old_path, item->path, return);
old_id = folder_item_get_identifier(item);
- if (item->folder->remove_folder(item->folder, item) < 0) {
+ if (item->folder->klass->remove_folder(item->folder, item) < 0) {
alertpanel_error(_("Can't remove the folder `%s'."), name);
if (folderview->opened == folderview->selected)
summary_show(folderview->summaryview,
- folderview->summaryview->folder_item,
- FALSE);
+ folderview->summaryview->folder_item);
g_free(old_id);
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); */
+
if (folderview->opened == folderview->selected ||
gtk_ctree_is_ancestor(ctree,
folderview->selected,
gtk_ctree_remove_node(ctree, folderview->selected);
folder_write_list();
+
+ prefs_filtering_delete_path(old_id);
+ g_free(old_id);
+
}
static void folderview_remove_mailbox_cb(FolderView *folderview, guint action,
GtkWidget *widget)
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
- gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
- GtkCTreeNode *node;
FolderItem *item;
FolderItem *new_item;
gchar *new_folder;
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_IMAP);
+ g_return_if_fail(FOLDER_TYPE(item->folder) == F_IMAP);
g_return_if_fail(item->folder->account != NULL);
new_folder = input_dialog
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);
}
g_free(new_folder);
- gtk_clist_freeze(GTK_CLIST(ctree));
-
- text[COL_FOLDER] = new_item->name;
- node = gtk_ctree_insert_node(ctree, folderview->selected, NULL, text,
- FOLDER_SPACING,
- folderxpm, folderxpmmask,
- folderopenxpm, folderopenxpmmask,
- FALSE, FALSE);
- gtk_ctree_expand(ctree, folderview->selected);
- gtk_ctree_node_set_row_data(ctree, node, new_item);
- folderview_sort_folders(folderview, folderview->selected, item->folder);
-
- gtk_clist_thaw(GTK_CLIST(ctree));
+ folderview_create_folder_node(folderview, new_item);
folder_write_list();
}
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
FolderItem *item;
+ PrefsAccount *account;
gchar *name, *name_;
gchar *message;
AlertValue avalue;
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_IMAP);
+ g_return_if_fail(FOLDER_TYPE(item->folder) == F_IMAP);
g_return_if_fail(item->folder->account != NULL);
name_ = trim_string(item->folder->name, 32);
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();
g_return_if_fail(item != NULL);
folder = item->folder;
g_return_if_fail(folder != NULL);
- g_return_if_fail(folder->type == F_NEWS);
+ g_return_if_fail(FOLDER_TYPE(folder) == F_NEWS);
g_return_if_fail(folder->account != NULL);
if (GTK_CTREE_ROW(folderview->selected)->parent != NULL)
FALSE, FALSE);
gtk_ctree_expand(ctree, servernode);
- newitem = folder_item_new(name, name);
+ newitem = folder_item_new(folder, name, name);
folder_item_append(rootitem, newitem);
gtk_ctree_node_set_row_data(ctree, node, newitem);
}
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(FOLDER_TYPE(item->folder) == F_NEWS);
g_return_if_fail(item->folder->account != NULL);
name_ = trim_string(item->path, 32);
folder_item_remove(item);
gtk_ctree_remove_node(ctree, folderview->selected);
folder_write_list();
+
+ prefs_filtering_delete_path(name);
}
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;
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(FOLDER_TYPE(item->folder) == F_NEWS);
g_return_if_fail(item->folder->account != NULL);
name_ = trim_string(item->folder->name, 32);
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();
g_return_if_fail(item != NULL);
g_return_if_fail(item->folder != NULL);
-#if CLAWS
- prefs_folder_item_create(folderview, item);
-#else
- /*
- * CLAWS: wait till Hiro has completed his stuff
- */
- prefs_folder_item_open(item);
-#endif
+ if (item->parent == NULL && item->folder->account)
+ account_open(item->folder->account);
+ else {
+ summary_save_prefs_to_folderitem(folderview->summaryview, item);
+ prefs_folder_item_create(folderview, item);
+ }
}
-static gboolean folderview_drag_motion_cb(GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- guint time,
- FolderView *folderview)
+static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *node)
{
- gint row, column;
- FolderItem *item, *src_item;
- GtkCTreeNode *node = NULL;
- gboolean acceptable = FALSE;
-
- if (gtk_clist_get_selection_info
- (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
- node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
- item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
- src_item = folderview->summaryview->folder_item;
- if (item && item->folder && item->path &&
- src_item && src_item != item) {
- switch (item->folder->type) {
- case F_MH:
- case F_IMAP:
- acceptable = TRUE;
- break;
- default:
- break;
- }
+ GSList *list = NULL;
+ GSList *done = NULL;
+ GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+
+ for (list = folderview->nodes_to_recollapse; list != NULL; list = g_slist_next(list)) {
+ if (!gtkut_ctree_node_is_parent(GTK_CTREE_NODE(list->data), node)
+ && list->data != node) {
+ gtk_ctree_collapse(ctree, GTK_CTREE_NODE(list->data));
+ done = g_slist_append(done, GTK_CTREE_NODE(list->data));
}
}
-
- if (acceptable) {
- gtk_signal_handler_block_by_func
- (GTK_OBJECT(widget),
- GTK_SIGNAL_FUNC(folderview_selected), folderview);
- gtk_ctree_select(GTK_CTREE(widget), node);
- 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);
+ for (list = done; list != NULL; list = g_slist_next(list)) {
+ folderview->nodes_to_recollapse = g_slist_remove(folderview->nodes_to_recollapse,
+ list->data);
}
-
- return acceptable;
+ g_slist_free(done);
}
-static void folderview_drag_leave_cb(GtkWidget *widget,
- GdkDragContext *context,
- guint time,
- FolderView *folderview)
+static void folderview_move_to_cb(FolderView *folderview)
{
- gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
-}
+ FolderItem *from_folder = NULL, *to_folder = NULL;
-static void folderview_drag_received_cb(GtkWidget *widget,
- GdkDragContext *drag_context,
- gint x,
- gint y,
- GtkSelectionData *data,
- guint info,
- guint time,
- FolderView *folderview)
-{
- gint row, column;
- FolderItem *item, *src_item;
- GtkCTreeNode *node;
+ if (folderview->selected)
+ from_folder = gtk_ctree_node_get_row_data(GTK_CTREE(folderview->ctree), folderview->selected);
+ if (!from_folder || FOLDER_TYPE(from_folder->folder) == F_NEWS)
+ return;
- if (gtk_clist_get_selection_info
- (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0)
+ to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL);
+
+ if (!to_folder || FOLDER_TYPE(to_folder->folder) == F_NEWS)
return;
- node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
- item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
- src_item = folderview->summaryview->folder_item;
- if (item && src_item) {
- 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:
- if (src_item->folder->type != item->folder->type ||
- (item->folder->type == F_IMAP &&
- src_item->folder != item->folder))
- summary_copy_selected_to(folderview->summaryview, item);
- else
- summary_move_selected_to(folderview->summaryview, item);
- gtk_drag_finish(drag_context, TRUE, TRUE, time);
+ folderview_move_to(folderview, from_folder, to_folder);
+}
+
+static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
+ FolderItem *to_folder)
+{
+ FolderItem *from_parent = NULL;
+ FolderItem *new_folder = NULL;
+ GtkCTreeNode *src_node = NULL;
+ gchar *buf;
+ gint status;
+
+ src_node = gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), NULL, from_folder);
+ from_parent = from_folder->parent;
+ buf = g_strdup_printf(_("Moving %s to %s..."), from_folder->name, to_folder->name);
+ STATUSBAR_PUSH(folderview->mainwin, buf);
+ g_free(buf);
+ summary_clear_all(folderview->summaryview);
+ folderview->opened = NULL;
+ folderview->selected = NULL;
+ gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), FALSE);
+ inc_lock();
+ main_window_cursor_wait(folderview->mainwin);
+ statusbar_verbosity_set(TRUE);
+ folder_item_update_freeze();
+ if ((status = folder_item_move_to(from_folder, to_folder, &new_folder)) == F_MOVE_OK) {
+ statusbar_verbosity_set(FALSE);
+ main_window_cursor_normal(folderview->mainwin);
+ STATUSBAR_POP(folderview->mainwin);
+ folder_item_update_thaw();
+ if (src_node)
+ gtk_ctree_remove_node(GTK_CTREE(folderview->ctree), src_node);
+ else
+ debug_print("can't remove src node: is null\n");
+
+ folderview_create_folder_node_recursive(folderview, new_folder);
+
+ folder_item_update_recursive(new_folder, F_ITEM_UPDATE_MSGCNT);
+
+ folderview_sort_folders(folderview,
+ gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree),
+ NULL, new_folder->parent), new_folder->folder);
+ folderview_select(folderview, new_folder);
+ } else {
+ statusbar_verbosity_set(FALSE);
+ main_window_cursor_normal(folderview->mainwin);
+ STATUSBAR_POP(folderview->mainwin);
+ folder_item_update_thaw();
+ switch (status) {
+ case F_MOVE_FAILED_DEST_IS_PARENT:
+ alertpanel_error(_("Source and destination are the same."));
+ break;
+ case F_MOVE_FAILED_DEST_IS_CHILD:
+ alertpanel_error(_("Can't move a folder to one of its children."));
+ break;
+ case F_MOVE_FAILED_DEST_OUTSIDE_MAILBOX:
+ alertpanel_error(_("Folder moving cannot be done between different mailboxes."));
+ break;
+ default:
+ alertpanel_error(_("Move failed!"));
+ break;
}
- } else
- gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ }
+ inc_unlock();
+ gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), TRUE);
}
static gint folderview_clist_compare(GtkCList *clist,
folderview_init(folderview);
folderview_set_all();
}
+
+static void drag_state_stop(FolderView *folderview)
+{
+ if (folderview->drag_timer)
+ gtk_timeout_remove(folderview->drag_timer);
+ folderview->drag_timer = 0;
+ folderview->drag_node = NULL;
+}
+
+static gint folderview_defer_expand(FolderView *folderview)
+{
+ if (folderview->drag_node) {
+ folderview_recollapse_nodes(folderview, folderview->drag_node);
+ if (folderview->drag_item->collapsed) {
+ gtk_ctree_expand(GTK_CTREE(folderview->ctree), folderview->drag_node);
+ folderview->nodes_to_recollapse = g_slist_append
+ (folderview->nodes_to_recollapse, folderview->drag_node);
+ }
+ }
+ folderview->drag_item = NULL;
+ folderview->drag_timer = 0;
+ return FALSE;
+}
+
+static void drag_state_start(FolderView *folderview, GtkCTreeNode *node, FolderItem *item)
+{
+ /* the idea is that we call drag_state_start() whenever we want expansion to
+ * start after 'prefs_common.hover_time' msecs. if we want to cancel expansion,
+ * we need to call drag_state_stop() */
+ drag_state_stop(folderview);
+ /* request expansion */
+ if (0 != (folderview->drag_timer = gtk_timeout_add
+ (prefs_common.hover_timeout,
+ (GtkFunction)folderview_defer_expand,
+ folderview))) {
+ folderview->drag_node = node;
+ folderview->drag_item = item;
+ }
+}
+
+static void folderview_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
+ FolderView *folderview)
+{
+ GdkDragContext *context;
+
+ g_return_if_fail(folderview != NULL);
+ if (folderview->selected == NULL) return;
+
+ folderview->nodes_to_recollapse = NULL; /* in case the last drag has been cancelled */
+
+ context = gtk_drag_begin(widget, folderview->target_list,
+ GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
+ gtk_drag_set_icon_default(context);
+}
+
+static void folderview_drag_data_get(GtkWidget *widget,
+ GdkDragContext *drag_context,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time,
+ FolderView *folderview)
+{
+ FolderItem *item;
+ GList *cur;
+ gchar *source=NULL;
+
+ for (cur = GTK_CLIST(folderview->ctree)->selection;
+ cur != NULL; cur = cur->next) {
+ item = gtk_ctree_node_get_row_data
+ (GTK_CTREE(folderview->ctree),
+ GTK_CTREE_NODE(cur->data));
+ if (item) {
+ source = g_strdup_printf ("FROM_OTHER_FOLDER%s", folder_item_get_identifier(item));
+ gtk_selection_data_set(selection_data,
+ selection_data->target, 8,
+ source, strlen(source));
+ break;
+ } else
+ return;
+ }
+}
+
+gboolean folderview_update_folder(gpointer source, gpointer userdata)
+{
+ FolderUpdateData *hookdata;
+ FolderView *folderview;
+ GtkWidget *ctree;
+
+ hookdata = source;
+ folderview = (FolderView *) userdata;
+ g_return_val_if_fail(hookdata != NULL, FALSE);
+ g_return_val_if_fail(folderview != NULL, FALSE);
+
+ ctree = folderview->ctree;
+ g_return_val_if_fail(ctree != NULL, FALSE);
+
+ if (hookdata->update_flags & FOLDER_TREE_CHANGED) {
+ folderview_set(folderview);
+ }
+
+ return FALSE;
+}
+
+static gboolean folderview_drag_motion_cb(GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time,
+ FolderView *folderview)
+{
+ gint row, column;
+ FolderItem *item, *src_item = NULL;
+ GtkCTreeNode *node = NULL;
+ gboolean acceptable = FALSE;
+ gint height = folderview->ctree->allocation.height;
+ gint total_height = folderview->ctree->requisition.height;
+ GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
+ GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+ gfloat vpos = pos->value;
+
+ if (gtk_clist_get_selection_info
+ (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
+ if (y > height - 24 && height + vpos < total_height)
+ gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
+
+ if (y < 24 && y > 0)
+ gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
+
+ node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
+ item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
+ src_item = folderview->summaryview->folder_item;
+
+ if (item && item->folder && item->path &&
+ src_item && src_item != item) {
+ switch (FOLDER_TYPE(item->folder)) {
+ case F_MH:
+ case F_MBOX:
+ case F_IMAP:
+ acceptable = TRUE;
+ break;
+ default:
+ break;
+ }
+ } else if (item && item->folder && folder_item_get_path(item) &&
+ src_item && src_item != item) {
+ /* a root folder - acceptable only from folderview */
+ if (FOLDER_TYPE(item->folder) == F_MH || FOLDER_TYPE(item->folder) == F_IMAP)
+ acceptable = TRUE;
+ }
+
+ }
+
+ if (acceptable || (src_item && src_item == item))
+ drag_state_start(folderview, node, item);
+
+ if (acceptable) {
+ gtk_signal_handler_block_by_func
+ (GTK_OBJECT(widget),
+ GTK_SIGNAL_FUNC(folderview_selected), folderview);
+ gtk_ctree_select(GTK_CTREE(widget), node);
+ 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);
+ }
+
+ return acceptable;
+}
+
+static void folderview_drag_leave_cb(GtkWidget *widget,
+ GdkDragContext *context,
+ guint time,
+ FolderView *folderview)
+{
+ drag_state_stop(folderview);
+ gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
+}
+
+static void folderview_drag_received_cb(GtkWidget *widget,
+ GdkDragContext *drag_context,
+ gint x,
+ gint y,
+ GtkSelectionData *data,
+ guint info,
+ guint time,
+ FolderView *folderview)
+{
+ gint row, column;
+ FolderItem *item, *src_item;
+ GtkCTreeNode *node;
+
+ drag_state_stop(folderview);
+ if ((void *)strstr(data->data, "FROM_OTHER_FOLDER") != (void *)data->data) {
+ /* comes from summaryview */
+ if (gtk_clist_get_selection_info
+ (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0)
+ return;
+
+ node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
+ item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
+ src_item = folderview->summaryview->folder_item;
+
+ /* re-check (due to acceptable possibly set for folder moves */
+ if (!(item && item->folder && item->path &&
+ src_item && src_item != item &&
+ (FOLDER_TYPE(item->folder) == F_MH || FOLDER_TYPE(item->folder) == F_IMAP))) {
+ return;
+ }
+ if (item && src_item) {
+ 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:
+ if (FOLDER_TYPE(src_item->folder) != FOLDER_TYPE(item->folder) ||
+ (FOLDER_TYPE(item->folder) == F_IMAP &&
+ src_item->folder != item->folder))
+ summary_copy_selected_to(folderview->summaryview, item);
+ else
+ summary_move_selected_to(folderview->summaryview, item);
+ gtk_drag_finish(drag_context, TRUE, TRUE, time);
+ }
+ } else
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ } else {
+ /* comes from folderview */
+ char *source;
+
+ source = data->data + 17;
+ if (gtk_clist_get_selection_info
+ (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0
+ || *source == 0) {
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ return;
+ }
+ node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
+ item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
+ src_item = folder_find_item_from_identifier(source);
+
+ if (!item || !src_item || src_item->stype != F_NORMAL) {
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ return;
+ }
+
+ folderview_move_to(folderview, src_item, item);
+ gtk_drag_finish(drag_context, TRUE, TRUE, time);
+ }
+ folderview->nodes_to_recollapse = NULL;
+}
+
+static void folderview_drag_end_cb(GtkWidget *widget,
+ GdkDragContext *drag_context,
+ FolderView *folderview)
+{
+ drag_state_stop(folderview);
+}
+
projects / claws.git / blobdiff