#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
{
void folderview_create_folder_node (FolderView *folderview,
FolderItem *item);
+void 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_("/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"),
{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"),
{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_("/_Properties..."), 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}
};
folderview->mbox_popup = mbox_popup;
folderview->mbox_factory = mbox_factory;
+ folderview->folder_item_update_callback_id =
+ hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item, (gpointer) folderview);
+
gtk_widget_show_all(scrolledwin);
folderview_list = g_list_append(folderview_list, folderview);
folder_scan_tree(folder);
folder_set_ui_func(folder, NULL, NULL);
- folder_write_list();
folderview_set_all();
folderview_check_new(folder);
prefs_common.display_folder_unread) {
if (item->unread > 0)
- str = g_strdup_printf("%s (%d%s)", name, item->unread,
- add_unread_mark ? "+" : "");
+ str = g_strdup_printf("%s (%d%s%s)", name, item->unread,
+ add_unread_mark ? "+" : "",
+ item->unreadmarked > 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 > 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) {
use_color =
(item->new > 0) ||
(add_unread_mark &&
- folderview_have_new_children(folderview, node));
+ folderview_have_new_children(folderview, node));
}
gtk_ctree_node_set_foreground(ctree, node, NULL);
folderview_update_node(folderview, node);
}
-void folderview_update_item(FolderItem *item, gboolean update_summary)
-{
- GList *list;
- FolderView *folderview;
- GtkCTree *ctree;
- GtkCTreeNode *node;
-
- g_return_if_fail(item != NULL);
-
- for (list = folderview_list; list != NULL; list = list->next) {
- folderview = (FolderView *)list->data;
- ctree = GTK_CTREE(folderview->ctree);
-
- node = gtk_ctree_find_by_row_data(ctree, NULL, item);
- if (node) {
- folderview_update_node(folderview, node);
- if (update_summary && folderview->opened == node)
- summary_show(folderview->summaryview, item);
- }
- }
-}
-
-static void folderview_update_item_recursive (FolderItem *item, gboolean update_summary)
+void folderview_update_item(gpointer source, gpointer data)
{
- GNode *node = item->folder->node;
- node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
- node = node->children;
- folderview_update_item(item, update_summary);
- while (node != NULL) {
- if (node && node->data) {
- FolderItem *next_item = (FolderItem*) node->data;
- folderview_update_item(next_item, update_summary);
- }
- node = node->next;
- }
-}
-
-void folderview_update_items_when_required(gboolean update_summary)
-{
- GList *list;
- FolderView *folderview;
+ FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
+ FolderView *folderview = (FolderView *)data;
GtkCTree *ctree;
GtkCTreeNode *node;
- FolderItem *item;
- for (list = folderview_list; list != NULL; list = list->next) {
- folderview = (FolderView *)list->data;
- ctree = GTK_CTREE(folderview->ctree);
+ g_return_if_fail(update_info != NULL);
+ g_return_if_fail(update_info->item != NULL);
+ g_return_if_fail(folderview != NULL);
- 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);
+ ctree = GTK_CTREE(folderview->ctree);
- if (item->need_update) {
- folderview_update_node(folderview, node);
- if (update_summary && folderview->opened == node)
- summary_show(folderview->summaryview, item);
- }
- }
+ node = gtk_ctree_find_by_row_data(ctree, NULL, update_info->item);
+ if (node) {
+ folderview_update_node(folderview, node);
+ if (update_info->content_change && 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, (gboolean)data);
-}
-
-void folderview_update_item_foreach(GHashTable *table, gboolean update_summary)
-{
- g_hash_table_foreach(table, folderview_update_item_foreach_func,
- (gpointer)update_summary);
-}
-
static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
GNode *gnode, GtkCTreeNode *cnode,
gpointer data)
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 (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)
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, "/Rebuild folder tree", rescan_tree);
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, "/Rebuild folder tree", rescan_tree);
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, "/Properties...", folder_property);
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, "/Properties...", folder_property);
SET_SENS(mbox_factory, "/Processing...", folder_processing);
static gboolean can_select = TRUE; /* exclusive lock */
gboolean opened;
FolderItem *item;
+ gchar *buf;
folderview->selected = row;
olditem = gtk_ctree_node_get_row_data(ctree, folderview->opened);
if (olditem) {
/* will be null if we just moved the previously opened folder */
- folder_item_write_cache(olditem);
summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
+ folder_item_close(olditem);
}
}
gdk_pointer_ungrab(GDK_CURRENT_TIME);
}
- if(((item->folder->type == F_IMAP) && !item->no_select) || (item->folder->type == F_NEWS)) {
- folder_item_scan(item);
- }
+ /* Open Folder */
+ buf = g_strdup_printf(_("Opening Folder %s..."), item->path);
+ debug_print("%s\n", buf);
+ STATUSBAR_PUSH(folderview->mainwin, buf);
+ g_free(buf);
- /* Processing */
- if(item->prefs->processing != NULL) {
- gchar *buf;
-
- buf = g_strdup_printf(_("Processing (%s)..."), item->path);
- debug_print("%s\n", buf);
- STATUSBAR_PUSH(folderview->mainwin, buf);
- g_free(buf);
-
- main_window_cursor_wait(folderview->mainwin);
-
- folder_item_apply_processing(item);
+ main_window_cursor_wait(folderview->mainwin);
- debug_print("done.\n");
- STATUSBAR_POP(folderview->mainwin);
+ 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);
gtk_ctree_node_moveto(ctree, row, -1, 0.5, 0);
}
+ STATUSBAR_POP(folderview->mainwin);
+
folderview->open_folder = FALSE;
can_select = TRUE;
}
if (folderview->opened) {
item = gtk_ctree_node_get_row_data(ctree, folderview->opened);
if (item)
- folderview_update_item(item, TRUE);
+ folder_update_item(item, TRUE);
}
}
}
g_free(new_folder);
- if (FOLDER_TYPE(item->folder) == F_MH)
- prefs_filtering_rename_path(old_path, item->path);
+ /* 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);
return;
}
- 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,
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,
#endif
}
+static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *node)
+{
+ 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));
+ }
+ }
+ for (list = done; list != NULL; list = g_slist_next(list)) {
+ folderview->nodes_to_recollapse = g_slist_remove(folderview->nodes_to_recollapse,
+ list->data);
+ }
+ g_slist_free(done);
+}
+
+static void folderview_move_to_cb(FolderView *folderview)
+{
+ FolderItem *from_folder = NULL, *to_folder = NULL;
+
+ if (folderview->selected)
+ from_folder = gtk_ctree_node_get_row_data(GTK_CTREE(folderview->ctree), folderview->selected);
+ if (!from_folder || from_folder->folder->type == F_NEWS)
+ return;
+
+ to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL);
+
+ if (!to_folder || to_folder->folder->type == F_NEWS)
+ return;
+
+ 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);
+ if ((status = folder_item_move_to(from_folder, to_folder, &new_folder)) == F_MOVE_OK) {
+ main_window_cursor_normal(folderview->mainwin);
+ STATUSBAR_POP(folderview->mainwin);
+ 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_update_item(from_parent, TRUE);
+ folder_update_item_recursive(new_folder, TRUE);
+ 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 {
+ main_window_cursor_normal(folderview->mainwin);
+ STATUSBAR_POP(folderview->mainwin);
+ 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;
+ }
+ }
+ inc_unlock();
+ gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), TRUE);
+}
+
static gboolean folderview_drag_motion_cb(GtkWidget *widget,
GdkDragContext *context,
gint x,
FolderItem *item, *src_item;
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;
src_item && src_item != item) {
switch (item->folder->type) {
case F_MH:
+ case F_MBOX:
case F_IMAP:
acceptable = TRUE;
break;
}
+ if (acceptable || (src_item && src_item == item)) {
+ folderview_recollapse_nodes(folderview, node);
+ if (item->collapsed) {
+ gtk_ctree_expand(GTK_CTREE(widget), node);
+ folderview->nodes_to_recollapse = g_slist_append(
+ folderview->nodes_to_recollapse,
+ node);
+ }
+ }
+
if (acceptable) {
gtk_signal_handler_block_by_func
(GTK_OBJECT(widget),
} else {
/* comes from folderview */
char *source;
- char *buf;
- GtkCTreeNode *src_node;
- FolderItem *new_item, *src_parent;
source = data->data + 17;
if (gtk_clist_get_selection_info
}
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_path(source);
+ src_item = folder_find_item_from_identifier(source);
- if (!src_item || src_item->stype != F_NORMAL) {
+ if (!item || !src_item || src_item->stype != F_NORMAL) {
gtk_drag_finish(drag_context, FALSE, FALSE, time);
return;
}
- src_parent = src_item->parent;
- src_node = gtk_ctree_find_by_row_data(GTK_CTREE(widget), NULL, src_item);
-
- buf = g_strdup_printf(_("Moving %s to %s..."), src_item->name, item->name);
- STATUSBAR_PUSH(folderview->mainwin, buf);
- g_free(buf);
- main_window_cursor_wait(folderview->mainwin);
- if ((new_item = folder_item_move_to(src_item, item)) != NULL) {
- gtk_drag_finish(drag_context, TRUE, TRUE, time);
-
- if (src_node)
- gtk_ctree_remove_node(GTK_CTREE(widget), src_node);
- else
- debug_print("can't remove src node: is null\n");
-
- folderview_create_folder_node_recursive(folderview, new_item);
- folderview_update_item(src_parent, TRUE);
- folderview_update_item_recursive(new_item, TRUE);
- folderview_sort_folders(folderview,
- gtk_ctree_find_by_row_data(GTK_CTREE(widget),
- NULL, new_item->parent), new_item->folder);
- STATUSBAR_PUSH(folderview->mainwin, _("Done."));
- main_window_cursor_normal(folderview->mainwin);
- summary_clear_all(folderview->summaryview);
- folderview->opened = NULL;
- folderview->selected = NULL;
- folderview_select(folderview, new_item);
- } else {
- gtk_drag_finish(drag_context, FALSE, FALSE, time);
- STATUSBAR_PUSH(folderview->mainwin, _("Done."));
- main_window_cursor_normal(folderview->mainwin);
- }
+
+ folderview_move_to(folderview, src_item, item);
+ gtk_drag_finish(drag_context, TRUE, TRUE, time);
}
+ folderview->nodes_to_recollapse = NULL;
}
static gint folderview_clist_compare(GtkCList *clist,
list = gtk_target_list_new(folderview_drag_types, 1);
+ folderview->nodes_to_recollapse = NULL; /* in case the last drag has been cancelled */
+
context = gtk_drag_begin(widget, list,
GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_DEFAULT, button, event);
gtk_drag_set_icon_default(context);
(GTK_CTREE(folderview->ctree),
GTK_CTREE_NODE(cur->data));
if (item) {
- source = g_strdup_printf ("FROM_OTHER_FOLDER%s", item->path);
+ 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));
projects / claws.git / blobdiff