#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"
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_scoring_cb(FolderView *folderview, guint action,
GtkWidget *widget);
static void folderview_processing_cb(FolderView *folderview, guint action,
{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_("/---"), 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>"},
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),
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));
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);
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);
}
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(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);
folderview_check_new(item->folder);
else
folderview_rescan_tree(item->folder);
+
+ if (folderview->opened) {
+ item = gtk_ctree_node_get_row_data(ctree, folderview->opened);
+ if (item)
+ folderview_update_item(item, TRUE);
+ }
}
static void folderview_new_folder_cb(FolderView *folderview, guint action,
}
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 (prefs_common.fltlist) {
- if (folder_get_default_folder() == item->folder)
- prefs_filter_delete_path(old_path);
- prefs_filter_delete_path(old_id);
- g_free(old_id);
- } else {
- if (FOLDER_TYPE(item->folder) == F_MH)
- prefs_filtering_delete_path(old_path);
- prefs_filtering_delete_path(old_id);
- g_free(old_id);
- }
+ if (FOLDER_TYPE(item->folder) == F_MH)
+ prefs_filtering_delete_path(old_path);
+ prefs_filtering_delete_path(old_id);
+ g_free(old_id);
+
if (folderview->opened == folderview->selected ||
gtk_ctree_is_ancestor(ctree,
folderview->selected,
{
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();
{
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
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ } else {
+ /* comes from folderview */
+ char *source;
+ char *buf;
+ FolderItem *new_item;
+ source = data->data + 17;
+ if (*source == 0)
+ return;
+ 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 = folder_find_item_from_path(source);
+ if (!src_item)
+ return;
+ if (src_item->stype != F_NORMAL)
+ return;
+ 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);
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);
+ gtk_drag_finish(drag_context, FALSE, FALSE, time);
+ STATUSBAR_PUSH(folderview->mainwin, _("Done."));
+ main_window_cursor_normal(folderview->mainwin);
+ summary_clear_all(folderview->summaryview);
+ if (new_item)
+ folderview_select(folderview, new_item);
+ }
}
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