#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 "inc.h"
+#include "statusbar.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;
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);
+
+void folderview_create_folder_node (FolderView *folderview,
+ FolderItem *item);
+void folderview_update_item (FolderItem *item,
+ gboolean update_summary,
+ 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 GtkItemFactoryEntry folderview_mbox_popup_entries[] =
{
{N_("/Create _new folder..."), NULL, folderview_new_mbox_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_("/_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_("/_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_("/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_("/_Properties..."), NULL, folderview_property_cb, 0, NULL},
{N_("/_Processing..."), NULL, folderview_processing_cb, 0, NULL},
{N_("/S_coring..."), NULL, folderview_scoring_cb, 0, NULL}
};
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);
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->mbox_popup = mbox_popup;
folderview->mbox_factory = mbox_factory;
+ folderview->folder_item_update_callback_id =
+ folder_item_update_callback_register(folderview_update_item, (gpointer) folderview);
+
gtk_widget_show_all(scrolledwin);
folderview_list = g_list_append(folderview_list, folderview);
if (!normalfont)
- normalfont = gdk_fontset_load(NORMAL_FONT);
+ normalfont = gtkut_font_load(NORMAL_FONT);
if (!boldfont)
- boldfont = gdk_fontset_load(BOLD_FONT);
+ boldfont = gtkut_font_load(BOLD_FONT);
if (!bold_style) {
bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
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);
if (!folder->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();
}
+#if 0
void folderview_rescan_all(void)
{
GList *list;
if (!folder->scan_tree) continue;
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();
+
+ list = folder_get_list();
+ for (; list != NULL; list = list->next) {
+ Folder *folder = list->data;
+
+ folderview_check_new(folder);
+ }
+
gtk_widget_destroy(window);
inc_unlock();
}
+#endif
void folderview_check_new(Folder *folder)
{
folder_write_list();
}
+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,
GtkCTreeNode *node)
{
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
GtkStyle *style = NULL;
+ GtkStyle *color_style = NULL;
FolderItem *item;
GdkPixmap *xpm, *openxpm;
GdkBitmap *mask, *openmask;
item->path &&
!strcmp2(item->name, item->path) &&
prefs_common.ng_abbrev_len < strlen(item->path))
- name = get_abbrev_newsgroup_name(item->path);
+ name = get_abbrev_newsgroup_name(item->path, prefs_common.ng_abbrev_len);
else
name = g_strdup(item->name);
}
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;
}
gtk_ctree_node_set_row_style(ctree, node, style);
+ item->need_update = FALSE;
+
if ((node = gtkut_ctree_find_collapsed_parent(ctree, node)) != NULL)
folderview_update_node(folderview, node);
}
-void folderview_update_item(FolderItem *item, gboolean update_summary)
+void folderview_update_item(FolderItem *item, gboolean update_summary, gpointer data)
{
- GList *list;
- FolderView *folderview;
+ FolderView *folderview = (FolderView *)data;
GtkCTree *ctree;
GtkCTreeNode *node;
+ g_return_if_fail(folderview != NULL);
g_return_if_fail(item != NULL);
- 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) {
- folderview_update_node(folderview, node);
- if (update_summary && folderview->opened == node)
- summary_show(folderview->summaryview,
- item, FALSE);
- }
+ 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_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);
-}
-
static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
GNode *gnode, GtkCTreeNode *cnode,
gpointer data)
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;
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;
SET_SENS(mail_factory, "/Rename folder...", rename_folder);
SET_SENS(mail_factory, "/Delete folder", delete_folder);
SET_SENS(mail_factory, "/Check for new messages", update_tree);
- SET_SENS(mail_factory, "/Rescan folder tree", rescan_tree);
+ SET_SENS(mail_factory, "/Rebuild folder tree", rescan_tree);
SET_SENS(mail_factory, "/Remove mailbox", remove_tree);
SET_SENS(mail_factory, "/Search folder...", search_folder);
- SET_SENS(mail_factory, "/Property...", folder_property);
+ 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, "/Rename folder...", rename_folder);
SET_SENS(imap_factory, "/Delete folder", delete_folder);
SET_SENS(imap_factory, "/Check for new messages", update_tree);
- SET_SENS(imap_factory, "/Rescan folder tree", rescan_tree);
+ SET_SENS(imap_factory, "/Rebuild folder tree", rescan_tree);
SET_SENS(imap_factory, "/Remove IMAP4 account", remove_tree);
SET_SENS(imap_factory, "/Search folder...", search_folder);
- SET_SENS(imap_factory, "/Property...", folder_property);
+ 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) {
#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) {
SET_SENS(mbox_factory, "/Create new folder...", new_folder);
SET_SENS(mbox_factory, "/Rename folder...", rename_folder);
SET_SENS(mbox_factory, "/Delete folder", delete_folder);
- SET_SENS(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,
+ toolbar_set_compose_button
+ (folderview->mainwin->toolbar,
item->folder->type == 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);
+ debug_print("%s\n", buf);
+ STATUSBAR_PUSH(folderview->mainwin, buf);
+ g_free(buf);
+
+ main_window_cursor_wait(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);
- opened = summary_show(folderview->summaryview, item, FALSE);
+ /* 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_check_new(item->folder);
else
folderview_rescan_tree(item->folder);
+
+ if (folderview->opened) {
+ item = gtk_ctree_node_get_row_data(ctree, folderview->opened);
+ if (item)
+ folder_update_item(item, TRUE);
+ }
+}
+
+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;
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();
}
}
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);
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));
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;
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;
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();
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);
}
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
FolderItem *item;
+ PrefsAccount *account;
gchar *name, *name_;
gchar *message;
AlertValue avalue;
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();
/*
* CLAWS: wait till Hiro has completed his stuff
*/
- prefs_folder_item_open(item);
+ if (item->parent == NULL && item->folder->account)
+ account_open(item->folder->account);
+ else
+ prefs_folder_item_open(item);
#endif
}
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) {
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 (item->folder->type == F_MH || item->folder->type == F_IMAP)
+ acceptable = TRUE;
}
+
}
if (acceptable) {
FolderItem *item, *src_item;
GtkCTreeNode *node;
- if (gtk_clist_get_selection_info
- (GTK_CLIST(widget), x - 24, y - 24, &row, &column) == 0)
- return;
+ 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;
- if (item && src_item) {
- switch (drag_context->action) {
- case GDK_ACTION_COPY:
+ 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 &&
+ (item->folder->type == F_MH || item->folder->type == 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 (src_item->folder->type != item->folder->type ||
+ (item->folder->type == F_IMAP &&
+ src_item->folder != item->folder))
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);
+ 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;
+ char *buf;
+ GtkCTreeNode *src_node;
+ FolderItem *new_item, *src_parent;
+
+ 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;
}
- } else
- gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ 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);
+
+ if (!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);
+ summary_clear_all(folderview->summaryview);
+ folderview->opened = NULL;
+ folderview->selected = NULL;
+ gtk_widget_set_sensitive(folderview->ctree, FALSE);
+ inc_lock();
+ main_window_cursor_wait(folderview->mainwin);
+ if ((new_item = folder_item_move_to(src_item, item)) != NULL) {
+ main_window_cursor_normal(folderview->mainwin);
+ 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");
+
+ STATUSBAR_POP(folderview->mainwin);
+ folderview_create_folder_node_recursive(folderview, new_item);
+ folder_update_item(src_parent, TRUE);
+ folder_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);
+ folderview_select(folderview, new_item);
+ } else {
+ main_window_cursor_normal(folderview->mainwin);
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ STATUSBAR_POP(folderview->mainwin);
+ }
+ inc_unlock();
+ gtk_widget_set_sensitive(folderview->ctree, TRUE);
+ }
}
static gint folderview_clist_compare(GtkCList *clist,
folderview_init(folderview);
folderview_set_all();
}
+
+GtkTargetEntry folderview_drag_types[1] =
+{
+ {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
+};
+
+
+static void folderview_start_drag(GtkWidget *widget, gint button, GdkEvent *event,
+ FolderView *folderview)
+{
+ GtkTargetList *list;
+ GdkDragContext *context;
+
+ g_return_if_fail(folderview != NULL);
+ if (folderview->selected == NULL) return;
+
+ list = gtk_target_list_new(folderview_drag_types, 1);
+
+ context = gtk_drag_begin(widget, 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", item->path);
+ gtk_selection_data_set(selection_data,
+ selection_data->target, 8,
+ source, strlen(source));
+ break;
+ } else
+ return;
+ }
+}
+
projects / claws.git / blobdiff