/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
*
* 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 "quicksearch.h"
#include "manual.h"
#include "timing.h"
+#include "log.h"
#define COL_FOLDER_WIDTH 150
#define COL_NUM_WIDTH 32
static GdkPixmap *readxpm;
static GdkBitmap *readxpmmask;
-
static void folderview_select_node (FolderView *folderview,
GtkCTreeNode *node);
static void folderview_set_folders (FolderView *folderview);
GdkDragContext *drag_context,
FolderView *folderview);
-void folderview_create_folder_node (FolderView *folderview,
+static void folderview_create_folder_node (FolderView *folderview,
FolderItem *item);
-gboolean folderview_update_folder (gpointer source,
+static gboolean folderview_update_folder (gpointer source,
gpointer userdata);
-gboolean folderview_update_item_claws (gpointer source,
+static gboolean folderview_update_item_claws (gpointer source,
gpointer data);
static void folderview_processing_cb(FolderView *folderview, guint action,
GtkWidget *widget);
static GtkItemFactoryEntry folderview_common_popup_entries[] =
{
{N_("/Mark all re_ad"), NULL, mark_all_read_cb, 0, NULL},
+ {"/---", NULL, NULL, 0, "<Separator>"},
{N_("/_Search folder..."), NULL, folderview_search_cb, 0, NULL},
{N_("/_Properties..."), NULL, folderview_property_cb, 0, NULL},
{N_("/Process_ing..."), NULL, folderview_processing_cb, 0, NULL},
GtkTargetEntry folderview_drag_types[] =
{
- {"sylpheed-claws/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY},
+ {"claws-mail/internal", GTK_TARGET_SAME_APP, TARGET_DUMMY},
{"text/uri-list", 0, TARGET_MAIL_URI_LIST}
};
GtkWidget *hbox_unread;
GtkWidget *hbox_total;
gint *col_pos = folderview->col_pos;
-
+
debug_print("setting titles...\n");
gtk_widget_realize(folderview->ctree);
gtk_widget_show_all(folderview->scrolledwin);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_READ,
&readxpm, &readxpmmask);
- label_new = gtk_pixmap_new(newxpm, newxpmmask);
- label_unread = gtk_pixmap_new(unreadxpm, unreadxpmmask);
- label_total = gtk_pixmap_new(readxpm, readxpmmask);
-
+ label_new = gtk_image_new_from_pixmap(newxpm, newxpmmask);
+ label_unread = gtk_image_new_from_pixmap(unreadxpm, unreadxpmmask);
+ label_total = gtk_image_new_from_pixmap(readxpm, readxpmmask);
+
+ gtk_clist_column_titles_active(GTK_CLIST(ctree));
+
hbox_new = gtk_hbox_new(FALSE, 4);
hbox_unread = gtk_hbox_new(FALSE, 4);
hbox_total = gtk_hbox_new(FALSE, 4);
gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_NEW],hbox_new);
gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_UNREAD],hbox_unread);
gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_TOTAL],hbox_total);
+
+ gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_NEW], _("New"));
+ gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_UNREAD], _("Unread"));
+ gtk_sctree_set_column_tooltip(GTK_SCTREE(ctree), col_pos[F_COL_TOTAL], _("Total"));
}
static gboolean folderview_popup_menu(GtkWidget *widget, gpointer data)
}
-GtkWidget *folderview_ctree_create(FolderView *folderview)
+static GtkWidget *folderview_ctree_create(FolderView *folderview)
{
GtkWidget *ctree;
gint *col_pos;
}
gtk_sctree_set_stripes(GTK_SCTREE(ctree), prefs_common.use_stripes_in_summaries);
+ gtk_sctree_set_recursive_expand(GTK_SCTREE(ctree), FALSE);
gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
gtk_clist_set_compare_func(GTK_CLIST(ctree), folderview_clist_compare);
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
MainWindow *mainwin = folderview->mainwin;
+ FolderItem *sel_item = NULL, *op_item = NULL;
if (!mainwin)
return;
main_window_cursor_wait(mainwin);
+ if (folderview->selected)
+ sel_item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+ if (folderview->opened)
+ op_item = gtk_ctree_node_get_row_data(ctree, folderview->opened);
+
folderview->selected = NULL;
folderview->opened = NULL;
gtk_clist_freeze(GTK_CLIST(ctree));
gtk_clist_clear(GTK_CLIST(ctree));
- gtk_clist_thaw(GTK_CLIST(ctree));
- gtk_clist_freeze(GTK_CLIST(ctree));
folderview_set_folders(folderview);
+ if (sel_item)
+ folderview->selected = gtk_ctree_find_by_row_data(ctree, NULL, sel_item);
+ if (op_item)
+ folderview->opened = gtk_ctree_find_by_row_data(ctree, NULL, op_item);
+
gtk_clist_thaw(GTK_CLIST(ctree));
main_window_cursor_normal(mainwin);
STATUSBAR_POP(mainwin);
summary_lock(folderview->summaryview);
folder_item_update_freeze();
if (folderview->summaryview->folder_item == item)
- gtk_clist_freeze(GTK_CLIST(folderview->summaryview->ctree));
+ summary_freeze(folderview->summaryview);
folderutils_mark_all_read(item);
if (folderview->summaryview->folder_item == item)
- gtk_clist_thaw(GTK_CLIST(folderview->summaryview->ctree));
+ summary_thaw(folderview->summaryview);
folder_item_update_thaw();
summary_unlock(folderview->summaryview);
}
gtk_ctree_select(ctree, node);
if (folderview->summaryview->folder_item &&
folderview->summaryview->folder_item->total_msgs > 0)
- gtk_widget_grab_focus(folderview->summaryview->ctree);
+ summary_grab_focus(folderview->summaryview);
else
gtk_widget_grab_focus(folderview->ctree);
return gtk_ctree_node_get_row_data(ctree, folderview->selected);
}
-void folderview_update_msg_num(FolderView *folderview, GtkCTreeNode *row)
-{
- GtkCTree *ctree = GTK_CTREE(folderview->ctree);
- static GtkCTreeNode *prev_row = NULL;
- FolderItem *item;
- gint new, unread, total;
- gchar *new_str, *unread_str, *total_str;
- gint *col_pos = folderview->col_pos;
-
- if (!row) return;
-
- item = gtk_ctree_node_get_row_data(ctree, row);
- if (!item) return;
-
- gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_NEW], &new_str);
- gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_UNREAD], &unread_str);
- gtk_ctree_node_get_text(ctree, row, col_pos[F_COL_TOTAL], &total_str);
- new = atoi(new_str);
- unread = atoi(unread_str);
- total = atoi(total_str);
-
- prev_row = row;
-
- folderview_update_node(folderview, row);
-}
-
-void folderview_append_item(FolderItem *item)
-{
- GList *list;
-
- g_return_if_fail(item != NULL);
- g_return_if_fail(item->folder != NULL);
- if (folder_item_parent(item)) return;
-
- for (list = folderview_list; list != NULL; list = list->next) {
- FolderView *folderview = (FolderView *)list->data;
- GtkCTree *ctree = GTK_CTREE(folderview->ctree);
- GtkCTreeNode *node, *child;
- gint *col_pos = folderview->col_pos;
-
- node = gtk_ctree_find_by_row_data(ctree, NULL,
- folder_item_parent(item));
- if (node) {
- child = gtk_ctree_find_by_row_data(ctree, node, item);
- if (!child) {
- gchar *text[N_FOLDER_COLS] =
- {NULL, "0", "0", "0"};
-
- gtk_clist_freeze(GTK_CLIST(ctree));
-
- text[col_pos[F_COL_FOLDER]] = item->name;
- child = gtk_sctree_insert_node
- (ctree, node, NULL, text,
- FOLDER_SPACING,
- folderxpm, folderxpmmask,
- folderopenxpm, folderopenxpmmask,
- FALSE, FALSE);
- gtk_ctree_node_set_row_data(ctree, child, item);
- gtk_ctree_expand(ctree, node);
- folderview_update_node(folderview, child);
- folderview_sort_folders(folderview, node,
- item->folder);
-
- gtk_clist_thaw(GTK_CLIST(ctree));
- }
- }
- }
-}
-
static void folderview_set_folders(FolderView *folderview)
{
GList *list;
-#ifndef HAVE_LIBETPAN
- static gboolean missing_imap_warning = TRUE;
-#endif
list = folder_get_list();
for (; list != NULL; list = list->next) {
-#ifndef HAVE_LIBETPAN
- if ((FOLDER(list->data))
- && (FOLDER(list->data))->klass
- && (FOLDER(list->data))->klass->type == F_IMAP
- && missing_imap_warning) {
- missing_imap_warning = FALSE;
- alertpanel_error(
- _("You have one or more IMAP accounts "
- "defined. However this version of "
- "Sylpheed-Claws has been built without "
- "IMAP support; your IMAP account(s) are "
- "disabled.\n\n"
- "You probably need to "
- "install libetpan and recompile "
- "Sylpheed-Claws."));
- }
-#endif
folderview_append_folder(folderview, FOLDER(list->data));
}
}
void folderview_rescan_tree(Folder *folder, gboolean rebuild)
{
GtkWidget *window;
+ MainWindow *mainwin = mainwindow_get_mainwindow();
+ FolderView *folderview = NULL;
+ GtkAdjustment *pos = NULL;
+ gint height = 0;
g_return_if_fail(folder != NULL);
else
window = label_window_create(_("Scanning folder tree..."));
+ if (mainwin)
+ folderview = mainwin->folderview;
+
+ if (folderview) {
+ pos = gtk_scrolled_window_get_vadjustment(
+ GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+ height = pos->value;
+ }
+
folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
folder_scan_tree(folder, rebuild);
folder_set_ui_func(folder, NULL, NULL);
folderview_set_all();
+ if (folderview) {
+ pos = gtk_scrolled_window_get_vadjustment(
+ GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+ gtk_adjustment_set_value(pos, height);
+ }
+ gtk_widget_destroy(window);
+ inc_unlock();
+}
+
+void folderview_fast_rescan_tree(Folder *folder)
+{
+ GtkWidget *window;
+ MainWindow *mainwin = mainwindow_get_mainwindow();
+ FolderView *folderview = NULL;
+ GtkAdjustment *pos = NULL;
+ gint height = 0;
+
+ g_return_if_fail(folder != NULL);
+
+ if (!folder->klass->scan_tree) return;
+
+ inc_lock();
+
+ window = label_window_create(_("Scanning folder tree..."));
+
+ if (mainwin)
+ folderview = mainwin->folderview;
+
+ if (folderview) {
+ pos = gtk_scrolled_window_get_vadjustment(
+ GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+ height = pos->value;
+ }
+
+ folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
+ folder_fast_scan_tree(folder);
+ folder_set_ui_func(folder, NULL, NULL);
+
+ folderview_set_all();
+
+ if (folderview) {
+ pos = gtk_scrolled_window_get_vadjustment(
+ GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+ gtk_adjustment_set_value(pos, height);
+ }
gtk_widget_destroy(window);
inc_unlock();
}
item->opened == TRUE ||
item->processing_pending == TRUE)) {
if (folder_item_scan(item) < 0) {
- summaryview_unlock(folderview->summaryview, item);
- if (folder && !FOLDER_IS_LOCAL(folder)) {
- STATUSBAR_POP(folderview->mainwin);
- break;
+ if (folder) {
+ summaryview_unlock(folderview->summaryview, item);
+ if (FOLDER_TYPE(item->folder) == F_NEWS || FOLDER_IS_LOCAL(folder)) {
+ log_error(LOG_PROTOCOL, _("Couldn't scan folder %s\n"),
+ item->path ? item->path:item->name);
+ continue;
+ } else if (!FOLDER_IS_LOCAL(folder)) {
+ STATUSBAR_POP(folderview->mainwin);
+ break;
+ }
}
}
} else if (!item->folder->klass->scan_required) {
mask = openmask = searchmask;
}
- if (folder_has_parent_of_type(item, F_QUEUE) && item->total_msgs > 0 &&
- prefs_common.display_folder_unread) {
- str = g_strdup_printf("%s (%d%s)", name, item->total_msgs,
- add_unread_mark ? "+" : "");
- gtk_sctree_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_msgs > 0 || add_unread_mark) &&
- prefs_common.display_folder_unread)
- || add_sub_match_mark) {
-
- if (item->unread_msgs > 0)
- str = g_strdup_printf("%s (%d%s%s)", name, item->unread_msgs,
- add_unread_mark || add_sub_match_mark ? "+" : "",
- item->unreadmarked_msgs > 0 ? "!":"");
- else
- str = g_strdup_printf("%s (+)", name);
- gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
- xpm, mask, openxpm, openmask,
- FALSE, GTK_CTREE_ROW(node)->expanded);
- g_free(str);
+ str = NULL;
+ if (prefs_common.display_folder_unread) {
+ if (folder_has_parent_of_type(item, F_QUEUE)) {
+ /* only total_msgs matters here */
+ if (item->total_msgs > 0) {
+ /* show total number (should be equal to the unread number)
+ and signs if any */
+ str = g_strdup_printf("%s (%d%s%s)",
+ name, item->total_msgs,
+ (add_unread_mark || add_sub_match_mark) ? "+" : "",
+ (item->unreadmarked_msgs > 0) ? "!" : "");
+ }
} else {
- str = g_strdup_printf("%s%s", name,
- item->unreadmarked_msgs > 0 ? " (!)":"");
-
+ if (prefs_common.display_folder_unread == 1) {
+ if (item->unread_msgs > 0) {
+ /* show unread number and signs */
+ str = g_strdup_printf("%s (%d%s%s)",
+ name, item->unread_msgs,
+ (add_unread_mark || add_sub_match_mark) ? "+" : "",
+ (item->unreadmarked_msgs > 0) ? "!" : "");
+ }
+ } else {
+ if (item->total_msgs > 0) {
+ /* show unread number, total number and signs if any */
+ str = g_strdup_printf("%s (%d/%d%s%s)",
+ name, item->unread_msgs, item->total_msgs,
+ (add_unread_mark || add_sub_match_mark) ? "+" : "",
+ (item->unreadmarked_msgs > 0) ? "!" : "");
+ }
+ }
+ }
+ if ((str == NULL) &&
+ (add_unread_mark || add_sub_match_mark || (item->unreadmarked_msgs > 0))) {
+ /* no unread/total numbers, but at least one sign */
+ str = g_strdup_printf("%s (%s%s)",
+ name,
+ (add_unread_mark || add_sub_match_mark) ? "+" : "",
+ (item->unreadmarked_msgs > 0) ? "!" : "");
+ }
+ }
+ if (str == NULL) {
+ /* last fallback, folder name only or with ! sign */
+ str = g_strdup_printf("%s%s",
+ name, (item->unreadmarked_msgs > 0) ? " (!)" : "");
+ }
gtk_sctree_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 (!folder_item_parent(item)) {
folderview_update_node(folderview, node);
}
-#if !CLAWS /* keep it here for syncs */
-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, FALSE);
- }
- }
-}
-#endif
-
void folderview_update_search_icon(FolderItem *item, gboolean matches)
{
GList *list;
}
}
-gboolean folderview_update_item_claws(gpointer source, gpointer data)
+static gboolean folderview_update_item_claws(gpointer source, gpointer data)
{
FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
FolderView *folderview = (FolderView *)data;
ctree = GTK_CTREE(folderview->ctree);
node = gtk_ctree_find_by_row_data(ctree, NULL, update_info->item);
+
if (node) {
if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME))
folderview_update_node(folderview, node);
- if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) && (folderview->opened == node))
+
+ if ((update_info->update_flags & F_ITEM_UPDATE_CONTENT) &&
+ update_info->item == folderview->summaryview->folder_item &&
+ update_info->item != NULL)
if (!quicksearch_is_active(folderview->summaryview->quicksearch))
summary_show(folderview->summaryview, update_info->item);
}
return FALSE;
}
-static void folderview_update_item_foreach_func(gpointer key, gpointer val,
- gpointer data)
-{
- /* CLAWS: share this joy with other hook functions ... */
- folder_item_update((FolderItem *)key,
- (FolderItemUpdateFlags)GPOINTER_TO_INT(data));
-}
-
-void folderview_update_item_foreach(GHashTable *table, gboolean update_summary)
-{
- GList *list;
- FolderItemUpdateFlags flags;
-
- flags = update_summary ? F_ITEM_UPDATE_CONTENT | F_ITEM_UPDATE_MSGCNT
- : 0;
- for (list = folderview_list; list != NULL; list = list->next)
- g_hash_table_foreach(table, folderview_update_item_foreach_func,
- GINT_TO_POINTER(flags));
-}
-
static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
GNode *gnode, GtkCTreeNode *cnode,
gpointer data)
if (!event) return FALSE;
if (event->button == 1 || event->button == 2) {
- folderview->open_folder = TRUE;
+ if (!gtk_ctree_is_hot_spot (GTK_CTREE(clist), event->x, event->y))
+ folderview->open_folder = TRUE;
if (event->type == GDK_2BUTTON_PRESS) {
if (clist->selection) {
GtkCTreeNode *node;
node = GTK_CTREE_NODE(clist->selection->data);
- if (node)
+ if (node) {
gtk_ctree_toggle_expansion(
GTK_CTREE(ctree),
node);
+ folderview->open_folder = FALSE;
+ }
}
}
return FALSE;
return FALSE;
}
+void folderview_close_opened(FolderView *folderview)
+{
+ if (folderview->opened) {
+ FolderItem *olditem;
+
+ olditem = gtk_ctree_node_get_row_data(folderview->ctree, folderview->opened);
+ if (olditem) {
+ gchar *buf = g_strdup_printf(_("Closing Folder %s..."),
+ olditem->path ? olditem->path:olditem->name);
+ /* will be null if we just moved the previously opened folder */
+ STATUSBAR_PUSH(folderview->mainwin, buf);
+ main_window_cursor_wait(folderview->mainwin);
+ g_free(buf);
+ summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
+ summary_show(folderview->summaryview, NULL);
+ folder_item_close(olditem);
+ main_window_cursor_normal(folderview->mainwin);
+ STATUSBAR_POP(folderview->mainwin);
+ }
+ }
+ folderview->opened = NULL;
+}
static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
gint column, FolderView *folderview)
{
FolderItem *item;
gchar *buf;
int res = 0;
- START_TIMING("--- folderview_selected");
+ START_TIMING("");
folderview->selected = row;
+ debug_print("newly selected %p, opened %p\n", folderview->selected,
+ folderview->opened);
if (folderview->opened == row) {
folderview->open_folder = FALSE;
END_TIMING();
gtkut_ctree_set_focus_row(ctree, folderview->opened);
gtk_ctree_select(ctree, folderview->opened);
}
+ folderview->open_folder = FALSE;
END_TIMING();
return;
}
item = gtk_ctree_node_get_row_data(ctree, row);
if (!item || item->no_select) {
END_TIMING();
+ folderview->open_folder = FALSE;
return;
}
/* 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) {
- buf = g_strdup_printf(_("Closing Folder %s..."),
- olditem->path ? olditem->path:olditem->name);
- /* will be null if we just moved the previously opened folder */
- STATUSBAR_PUSH(folderview->mainwin, buf);
- main_window_cursor_wait(folderview->mainwin);
- g_free(buf);
- summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
- summary_show(folderview->summaryview, NULL);
- folder_item_close(olditem);
- main_window_cursor_normal(folderview->mainwin);
- STATUSBAR_POP(folderview->mainwin);
- }
- }
+ folderview_close_opened(folderview);
/* CLAWS: set compose button type: news folder items
* always have a news folder as parent */
prefs_common.folder_col_size[type] = width;
}
-void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem *item)
+static void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem *item)
{
GNode *srcnode;
}
}
-void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
+static void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
}
void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
- FolderItem *to_folder)
+ FolderItem *to_folder, gboolean copy)
{
FolderItem *from_parent = NULL;
FolderItem *new_folder = NULL;
from_parent = folder_item_parent(from_folder);
if (prefs_common.warn_dnd) {
- buf = g_strdup_printf(_("Do you really want to make folder '%s' a "
- "sub-folder of '%s' ?"), from_folder->name,
- to_folder->name);
- status = alertpanel_full(_("Move folder"), buf,
+ buf = g_strdup_printf(copy ? _("Do you really want to copy folder '%s' in '%s' ?"):
+ _("Do you really want to make folder '%s' a sub-folder of '%s' ?"),
+ from_folder->name, to_folder->name);
+ status = alertpanel_full(copy ? _("Copy folder"):_("Move folder"), buf,
GTK_STOCK_NO, GTK_STOCK_YES, NULL, TRUE,
NULL, ALERT_QUESTION, G_ALERTDEFAULT);
g_free(buf);
prefs_common.warn_dnd = FALSE;
}
- buf = g_strdup_printf(_("Moving %s to %s..."), from_folder->name, to_folder->name);
+ buf = g_strdup_printf(copy ? _("Copying %s to %s..."):_("Moving %s to %s..."),
+ from_folder->name, to_folder->name);
STATUSBAR_PUSH(folderview->mainwin, buf);
g_free(buf);
summary_clear_all(folderview->summaryview);
gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), FALSE);
inc_lock();
main_window_cursor_wait(folderview->mainwin);
- statusbar_verbosity_set(TRUE);
+
+ statusbar_verbosity_set(FALSE);
folder_item_update_freeze();
- if ((status = folder_item_move_to(from_folder, to_folder, &new_folder)) == F_MOVE_OK) {
+ if ((status = folder_item_move_to(from_folder, to_folder, &new_folder, copy)) == F_MOVE_OK) {
statusbar_verbosity_set(FALSE);
main_window_cursor_normal(folderview->mainwin);
STATUSBAR_POP(folderview->mainwin);
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."));
+ alertpanel_error(copy ? _("Can't copy a folder to one of its children."):
+ _("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!"));
+ alertpanel_error(copy ? _("Copy failed!"):_("Move failed!"));
break;
}
}
GTK_CTREE(folderview->ctree), NULL, item);
folderview_select(folderview, item);
+ folderview->open_folder = FALSE;
folderview->selected = node;
}
static void drag_state_stop(FolderView *folderview)
{
if (folderview->drag_timer)
- gtk_timeout_remove(folderview->drag_timer);
+ g_source_remove(folderview->drag_timer);
folderview->drag_timer = 0;
folderview->drag_node = NULL;
}
* we need to call drag_state_stop() */
drag_state_stop(folderview);
/* request expansion */
- if (0 != (folderview->drag_timer = gtk_timeout_add
+ if (0 != (folderview->drag_timer = g_timeout_add
(prefs_common.hover_timeout,
(GtkFunction)folderview_defer_expand,
folderview))) {
}
}
-gboolean folderview_update_folder(gpointer source, gpointer userdata)
+static gboolean folderview_update_folder(gpointer source, gpointer userdata)
{
FolderUpdateData *hookdata;
FolderView *folderview;
GtkCTreeNode *node;
node = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, hookdata->item);
- if (node != NULL)
+ if (node != NULL) {
gtk_ctree_remove_node(GTK_CTREE(ctree), node);
+ if (folderview->selected == node)
+ folderview->selected = NULL;
+ if (folderview->opened == node)
+ folderview->opened = NULL;
+ }
} else if (hookdata->update_flags & (FOLDER_TREE_CHANGED | FOLDER_ADD_FOLDER | FOLDER_REMOVE_FOLDER))
folderview_set(folderview);
src_item = folderview->summaryview->folder_item;
srcwidget = gtk_drag_get_source_widget(context);
- if (srcwidget == folderview->summaryview->ctree) {
+ if (srcwidget == summary_get_main_widget(folderview->summaryview)) {
/* comes from summaryview */
/* we are copying messages, so only accept folder items that are not
the source item, are no root items and can copy messages */
if (item && item->folder && folder_item_parent(item) != NULL && src_item &&
- src_item != item && FOLDER_CLASS(item->folder)->copy_msg != NULL)
+ src_item != item && FOLDER_CLASS(item->folder)->copy_msg != NULL &&
+ FOLDER_TYPE(item->folder) != F_UNKNOWN)
acceptable = TRUE;
} else if (srcwidget == folderview->ctree) {
/* comes from folderview */
the source items and can copy messages and create folder items */
if (item && item->folder && src_item && src_item != item &&
FOLDER_CLASS(item->folder)->copy_msg != NULL &&
- FOLDER_CLASS(item->folder)->create_folder != NULL)
+ FOLDER_CLASS(item->folder)->create_folder != NULL &&
+ ((FOLDER_TYPE(item->folder) != F_UNKNOWN && FOLDER_TYPE(src_item->folder) != F_UNKNOWN)
+ || item->folder == src_item->folder))
acceptable = TRUE;
} else {
/* comes from another app */
/* we are adding messages, so only accept folder items that are
no root items and can copy messages */
if (item && item->folder && folder_item_parent(item) != NULL
- && FOLDER_CLASS(item->folder)->add_msg != NULL)
+ && FOLDER_CLASS(item->folder)->add_msg != NULL &&
+ FOLDER_TYPE(item->folder) != F_UNKNOWN)
acceptable = TRUE;
}
}
if (!(item && item->folder && folder_item_parent(item) != NULL
&& FOLDER_CLASS(item->folder)->add_msg != NULL))
{
- gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ debug_print("item doesn't fit\n");
return;
}
if (!list) {
- gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ debug_print("list is empty\n");
return;
}
for (tmp = list; tmp != NULL; tmp = tmp->next) {
info->msginfo = NULL;
info->file = (gchar *)tmp->data;
msglist = g_slist_prepend(msglist, info);
+ debug_print("file is a mail\n");
+ } else {
+ debug_print("file isn't a mail\n");
}
}
if (msglist) {
/* comes from folderview */
char *source;
gboolean folder_is_normal = TRUE;
+ gboolean copy = (drag_context->action == GDK_ACTION_COPY);
source = data->data + 17;
if (gtk_clist_get_selection_info
return;
}
- folderview_move_folder(folderview, src_item, item);
+ folderview_move_folder(folderview, src_item, item, copy);
gtk_drag_finish(drag_context, TRUE, TRUE, time);
}
folderview->nodes_to_recollapse = NULL;
node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
if (!node) {
- gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ debug_print("no node\n");
return;
}
item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
if (!item) {
gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ debug_print("no item\n");
return;
}
folderview_finish_dnd(data->data, drag_context, time, item);
projects / claws.git / blobdiff