#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkscrolledwindow.h>
#include <string.h>
#include <stdlib.h>
-#include "intl.h"
#include "main.h"
#include "mainwindow.h"
#include "folderview.h"
#include "statusbar.h"
#include "hooks.h"
#include "folderutils.h"
+#include "partial_download.h"
+#include "prefs_folder_column.h"
-typedef enum
-{
- COL_FOLDER = 0,
- COL_NEW = 1,
- COL_UNREAD = 2,
- COL_TOTAL = 3
-} FolderColumnPos;
-
-#define N_FOLDER_COLS 4
#define COL_FOLDER_WIDTH 150
#define COL_NUM_WIDTH 32
static GtkStyle *bold_color_style;
static GtkStyle *bold_tgtfold_style;
-static GdkBitmap *inboxxpm;
+static GdkPixmap *inboxxpm;
static GdkBitmap *inboxxpmmask;
static GdkPixmap *inboxhrmxpm;
static GdkBitmap *inboxhrmxpmmask;
static GdkBitmap *queueopenxpmmask;
static GdkPixmap *queueopenhrmxpm;
static GdkBitmap *queueopenhrmxpmmask;
-static GdkPixmap *newxpm;
-static GdkBitmap *newxpmmask;
-static GdkPixmap *unreadxpm;
-static GdkBitmap *unreadxpmmask;
static GdkPixmap *draftsxpm;
static GdkBitmap *draftsxpmmask;
static GdkPixmap *draftsopenxpm;
static GdkBitmap *draftsopenxpmmask;
+static GdkPixmap *noselectxpm;
+static GdkBitmap *noselectxpmmask;
+
+static GdkPixmap *m_inboxxpm;
+static GdkBitmap *m_inboxxpmmask;
+static GdkPixmap *m_inboxhrmxpm;
+static GdkBitmap *m_inboxhrmxpmmask;
+static GdkPixmap *m_inboxopenxpm;
+static GdkBitmap *m_inboxopenxpmmask;
+static GdkPixmap *m_inboxopenhrmxpm;
+static GdkBitmap *m_inboxopenhrmxpmmask;
+static GdkPixmap *m_outboxxpm;
+static GdkBitmap *m_outboxxpmmask;
+static GdkPixmap *m_outboxhrmxpm;
+static GdkBitmap *m_outboxhrmxpmmask;
+static GdkPixmap *m_outboxopenxpm;
+static GdkBitmap *m_outboxopenxpmmask;
+static GdkPixmap *m_outboxopenhrmxpm;
+static GdkBitmap *m_outboxopenhrmxpmmask;
+static GdkPixmap *m_folderxpm;
+static GdkBitmap *m_folderxpmmask;
+static GdkPixmap *m_folderhrmxpm;
+static GdkBitmap *m_folderhrmxpmmask;
+static GdkPixmap *m_folderopenxpm;
+static GdkBitmap *m_folderopenxpmmask;
+static GdkPixmap *m_folderopenhrmxpm;
+static GdkBitmap *m_folderopenhrmxpmmask;
+static GdkPixmap *m_trashopenxpm;
+static GdkBitmap *m_trashopenxpmmask;
+static GdkPixmap *m_trashopenhrmxpm;
+static GdkBitmap *m_trashopenhrmxpmmask;
+static GdkPixmap *m_trashxpm;
+static GdkBitmap *m_trashxpmmask;
+static GdkPixmap *m_trashhrmxpm;
+static GdkBitmap *m_trashhrmxpmmask;
+static GdkPixmap *m_queuexpm;
+static GdkBitmap *m_queuexpmmask;
+static GdkPixmap *m_queuehrmxpm;
+static GdkBitmap *m_queuehrmxpmmask;
+static GdkPixmap *m_queueopenxpm;
+static GdkBitmap *m_queueopenxpmmask;
+static GdkPixmap *m_queueopenhrmxpm;
+static GdkBitmap *m_queueopenhrmxpmmask;
+static GdkPixmap *m_draftsxpm;
+static GdkBitmap *m_draftsxpmmask;
+static GdkPixmap *m_draftsopenxpm;
+static GdkBitmap *m_draftsopenxpmmask;
+
+static GdkPixmap *newxpm;
+static GdkBitmap *newxpmmask;
+static GdkPixmap *unreadxpm;
+static GdkBitmap *unreadxpmmask;
+static GdkPixmap *readxpm;
+static GdkBitmap *readxpmmask;
+
static void folderview_select_node (FolderView *folderview,
GtkCTreeNode *node);
static GtkItemFactoryEntry folderview_common_popup_entries[] =
{
- {N_("/Mark all _read"), NULL, mark_all_read_cb, 0, NULL},
+ {N_("/Mark all re_ad"), NULL, mark_all_read_cb, 0, NULL},
{N_("/_Search folder..."), NULL, folderview_search_cb, 0, NULL},
{N_("/_Properties..."), NULL, folderview_property_cb, 0, NULL},
- {N_("/Pr_ocessing..."), NULL, folderview_processing_cb, 0, NULL},
+ {N_("/Process_ing..."), NULL, folderview_processing_cb, 0, NULL},
};
static GtkItemFactoryEntry folder_view_trash_popup_entries[] = {
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/Empty trash..."), NULL, folderview_empty_trash_cb, 0, NULL},
+ {N_("/------"), NULL, NULL, 0, "<Separator>"},
+ {N_("/Empty _trash..."), NULL, folderview_empty_trash_cb, 0, NULL},
};
g_hash_table_insert(folderview->popups, fpopup->klass, factory);
}
-FolderView *folderview_create(void)
+static void folderview_column_set_titles(FolderView *folderview)
+{
+ GtkWidget *ctree = folderview->ctree;
+ GtkWidget *label_new;
+ GtkWidget *label_unread;
+ GtkWidget *label_total;
+ GtkWidget *hbox_new;
+ 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);
+
+ /* CLAWS: titles for "New" and "Unread" show new & unread pixmaps
+ * instead text (text overflows making them unreadable and ugly) */
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_NEW,
+ &newxpm, &newxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_UNREAD,
+ &unreadxpm, &unreadxpmmask);
+ 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);
+
+ hbox_new = gtk_hbox_new(FALSE, 4);
+ hbox_unread = gtk_hbox_new(FALSE, 4);
+ hbox_total = gtk_hbox_new(FALSE, 4);
+
+ /* left justified */
+ gtk_box_pack_start(GTK_BOX(hbox_new), label_new, TRUE, TRUE, 0);
+ gtk_misc_set_alignment (GTK_MISC (label_new), 1, 0.5);
+ gtk_box_pack_start(GTK_BOX(hbox_unread), label_unread, TRUE, TRUE, 0);
+ gtk_misc_set_alignment (GTK_MISC (label_unread), 1, 0.5);
+ gtk_box_pack_start(GTK_BOX(hbox_total), label_total, TRUE, TRUE, 0);
+ gtk_misc_set_alignment (GTK_MISC (label_total), 1, 0.5);
+
+ gtk_widget_show_all(hbox_new);
+ gtk_widget_show_all(hbox_unread);
+ gtk_widget_show_all(hbox_total);
+
+ 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);
+}
+
+GtkWidget *folderview_ctree_create(FolderView *folderview)
{
- FolderView *folderview;
- GtkWidget *scrolledwin;
GtkWidget *ctree;
+ gint *col_pos;
+ FolderColumnState *col_state;
+ FolderColumnType type;
gchar *titles[N_FOLDER_COLS];
gint i;
+ GtkWidget *scrolledwin = folderview->scrolledwin;
- debug_print("Creating folder view...\n");
- folderview = g_new0(FolderView, 1);
+ debug_print("creating tree...\n");
+ memset(titles, 0, sizeof(titles));
- titles[COL_FOLDER] = _("Folder");
- titles[COL_NEW] = _("New");
- titles[COL_UNREAD] = _("Unread");
- titles[COL_TOTAL] = _("#");
+ col_state = prefs_folder_column_get_config();
+ memset(titles, 0, sizeof(titles));
- scrolledwin = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_policy
- (GTK_SCROLLED_WINDOW(scrolledwin),
- GTK_POLICY_AUTOMATIC,
- prefs_common.folderview_vscrollbar_policy);
- gtk_widget_set_size_request(scrolledwin,
- prefs_common.folderview_width,
- prefs_common.folderview_height);
+ col_pos = folderview->col_pos;
+
+ for (i = 0; i < N_FOLDER_COLS; i++) {
+ folderview->col_state[i] = col_state[i];
+ type = col_state[i].type;
+ col_pos[type] = i;
+ }
+
+ titles[col_pos[F_COL_FOLDER]] = _("Folder");
+ titles[col_pos[F_COL_NEW]] = _("New");
+ titles[col_pos[F_COL_UNREAD]] = _("Unread");
+ titles[col_pos[F_COL_TOTAL]] = _("#");
- ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, COL_FOLDER, titles);
+ ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER],
+ titles);
- gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
- gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_NEW,
+ gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[F_COL_NEW],
GTK_JUSTIFY_RIGHT);
- gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_UNREAD,
+ gtk_clist_set_column_justification(GTK_CLIST(ctree),
+ col_pos[F_COL_UNREAD],
GTK_JUSTIFY_RIGHT);
- gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_TOTAL,
+ gtk_clist_set_column_justification(GTK_CLIST(ctree),
+ col_pos[F_COL_TOTAL],
GTK_JUSTIFY_RIGHT);
- gtk_clist_set_column_width(GTK_CLIST(ctree), COL_FOLDER,
- prefs_common.folder_col_folder);
- gtk_clist_set_column_width(GTK_CLIST(ctree), COL_NEW,
- prefs_common.folder_col_new);
- gtk_clist_set_column_width(GTK_CLIST(ctree), COL_UNREAD,
- prefs_common.folder_col_unread);
- gtk_clist_set_column_width(GTK_CLIST(ctree), COL_TOTAL,
- prefs_common.folder_col_total);
gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_DOTTED);
gtk_ctree_set_expander_style(GTK_CTREE(ctree),
GTK_CTREE_EXPANDER_SQUARE);
gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
gtk_clist_set_compare_func(GTK_CLIST(ctree), folderview_clist_compare);
- /* create popup factories */
- folderview->popups = g_hash_table_new(g_str_hash, g_str_equal);
- g_hash_table_foreach(folderview_popups, create_ifactories, folderview);
-
/* don't let title buttons take key focus */
- for (i = 0; i < N_FOLDER_COLS; i++)
+ for (i = 0; i < N_FOLDER_COLS; i++) {
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
GTK_CAN_FOCUS);
-
+ gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[i],
+ prefs_common.folder_col_size[i]);
+ gtk_clist_set_column_visibility
+ (GTK_CLIST(ctree), i, col_state[i].visible);
+ }
g_signal_connect(G_OBJECT(ctree), "key_press_event",
G_CALLBACK(folderview_key_pressed),
G_CALLBACK(folderview_drag_end_cb),
folderview);
+ gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
+
+ return ctree;
+}
+
+void folderview_set_column_order(FolderView *folderview)
+{
+ GtkWidget *ctree;
+ FolderItem *item = folderview_get_selected_item(folderview);
+ GtkWidget *scrolledwin = folderview->scrolledwin;
+
+ debug_print("recreating tree...\n");
+ gtk_widget_destroy(folderview->ctree);
+
+ folderview->ctree = ctree = folderview_ctree_create(folderview);
+ gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
+ GTK_CLIST(ctree)->hadjustment);
+ gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
+ GTK_CLIST(ctree)->vadjustment);
+ gtk_widget_show(ctree);
+
+ folderview_set(folderview);
+ folderview_column_set_titles(folderview);
+
+ folderview_select(folderview,item);
+}
+
+FolderView *folderview_create(void)
+{
+ FolderView *folderview;
+ GtkWidget *scrolledwin;
+ GtkWidget *ctree;
+
+ debug_print("Creating folder view...\n");
+ folderview = g_new0(FolderView, 1);
+
+ scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_policy
+ (GTK_SCROLLED_WINDOW(scrolledwin),
+ GTK_POLICY_AUTOMATIC,
+ prefs_common.folderview_vscrollbar_policy);
+ gtk_widget_set_size_request(scrolledwin,
+ prefs_common.folderview_width,
+ prefs_common.folderview_height);
+
folderview->scrolledwin = scrolledwin;
+ ctree = folderview_ctree_create(folderview);
+
+ /* create popup factories */
+ folderview->popups = g_hash_table_new(g_str_hash, g_str_equal);
+ g_hash_table_foreach(folderview_popups, create_ifactories, folderview);
+
folderview->ctree = ctree;
folderview->folder_update_callback_id =
hooks_register_hook(FOLDER_ITEM_UPDATE_HOOKLIST, folderview_update_item_claws, (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);
void folderview_init(FolderView *folderview)
{
GtkWidget *ctree = folderview->ctree;
- GtkWidget *label_new;
- GtkWidget *label_unread;
- GtkWidget *hbox_new;
- GtkWidget *hbox_unread;
-
- gtk_widget_realize(ctree);
+
stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE, &inboxxpm, &inboxxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE_HRM, &inboxhrmxpm, &inboxhrmxpmmask);
stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_OPEN, &inboxopenxpm, &inboxopenxpmmask);
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) */
- stock_pixmap_gdk(ctree, STOCK_PIXMAP_NEW,
- &newxpm, &newxpmmask);
- stock_pixmap_gdk(ctree, STOCK_PIXMAP_UNREAD,
- &unreadxpm, &unreadxpmmask);
-
- label_new = gtk_pixmap_new(newxpm, newxpmmask);
- label_unread = gtk_pixmap_new(unreadxpm, unreadxpmmask);
-
- hbox_new = gtk_hbox_new(FALSE, 4);
- hbox_unread = gtk_hbox_new(FALSE, 4);
-
- /* left justified */
- gtk_box_pack_start(GTK_BOX(hbox_new), label_new, TRUE, TRUE, 0);
- gtk_misc_set_alignment (GTK_MISC (label_new), 1, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox_unread), label_unread, TRUE, TRUE, 0);
- gtk_misc_set_alignment (GTK_MISC (label_unread), 1, 0.5);
-
- gtk_widget_show_all(hbox_new);
- gtk_widget_show_all(hbox_unread);
-
- gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_NEW,hbox_new);
- gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_UNREAD,hbox_unread);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_NOSELECT, &noselectxpm, &noselectxpmmask);
+
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE_MARK, &m_inboxxpm, &m_inboxxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE_HRM_MARK, &m_inboxhrmxpm, &m_inboxhrmxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_OPEN_MARK, &m_inboxopenxpm, &m_inboxopenxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX_OPEN_HRM_MARK, &m_inboxopenhrmxpm, &m_inboxopenhrmxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_CLOSE_MARK, &m_outboxxpm, &m_outboxxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_CLOSE_HRM_MARK, &m_outboxhrmxpm, &m_outboxhrmxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_OPEN_MARK, &m_outboxopenxpm, &m_outboxopenxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX_OPEN_HRM_MARK, &m_outboxopenhrmxpm, &m_outboxopenhrmxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_CLOSE_MARK, &m_folderxpm, &m_folderxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_CLOSE_HRM_MARK, &m_folderhrmxpm, &m_folderhrmxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN_MARK, &m_folderopenxpm, &m_folderopenxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN_HRM_MARK, &m_folderopenhrmxpm, &m_folderopenhrmxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_OPEN_MARK, &m_trashopenxpm, &m_trashopenxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_OPEN_HRM_MARK, &m_trashopenhrmxpm, &m_trashopenhrmxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_CLOSE_MARK, &m_trashxpm, &m_trashxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH_CLOSE_HRM_MARK, &m_trashhrmxpm, &m_trashhrmxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE_MARK, &m_queuexpm, &m_queuexpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE_HRM_MARK, &m_queuehrmxpm, &m_queuehrmxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN_MARK, &m_queueopenxpm, &m_queueopenxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN_HRM_MARK, &m_queueopenhrmxpm, &m_queueopenhrmxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_CLOSE_MARK, &m_draftsxpm, &m_draftsxpmmask);
+ stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_OPEN_MARK, &m_draftsopenxpm, &m_draftsopenxpmmask);
if (!normal_style) {
PangoFontDescription *font_desc;
if (!bold_style) {
PangoFontDescription *font_desc;
bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
- font_desc = pango_font_description_from_string(prefs_common.boldfont);
+ font_desc = pango_font_description_from_string(BOLD_FONT);
if (font_desc) {
if (bold_style->font_desc)
pango_font_description_free
(bold_style->font_desc);
bold_style->font_desc = font_desc;
}
+ pango_font_description_set_weight
+ (bold_style->font_desc, PANGO_WEIGHT_BOLD);
bold_color_style = gtk_style_copy(bold_style);
bold_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
{
FolderItem *item;
- item = folderview_get_selected(folderview);
+ item = folderview_get_selected_item(folderview);
if (item == NULL)
return;
+ summary_lock(folderview->summaryview);
+ folder_item_update_freeze();
+ if (folderview->summaryview->folder_item == item)
+ gtk_clist_freeze(GTK_CLIST(folderview->summaryview->ctree));
folderutils_mark_all_read(item);
+ if (folderview->summaryview->folder_item == item)
+ gtk_clist_thaw(GTK_CLIST(folderview->summaryview->ctree));
+ folder_item_update_thaw();
+ summary_unlock(folderview->summaryview);
}
static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
folderview_select_node(folderview, node);
}
+FolderItem *folderview_get_selected_item(FolderView *folderview)
+{
+ GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+
+ if (!folderview->selected) return NULL;
+ 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);
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_NEW, &new_str);
- gtk_ctree_node_get_text(ctree, row, COL_UNREAD, &unread_str);
- gtk_ctree_node_get_text(ctree, row, COL_TOTAL, &total_str);
+ 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);
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;
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));
gtk_clist_freeze(GTK_CLIST(ctree));
- text[COL_FOLDER] = item->name;
+ text[col_pos[F_COL_FOLDER]] = item->name;
child = gtk_ctree_insert_node
(ctree, node, NULL, text,
FOLDER_SPACING,
folderview_scan_tree_func(item->folder, item, NULL);
former_new = item->new_msgs;
+
if (folder_item_scan(item) < 0) {
+ summaryview_unlock(folderview->summaryview, item);
if (folder && !FOLDER_IS_LOCAL(folder))
break;
}
+
folderview_update_node(folderview, node);
new_msgs += item->new_msgs;
former_new_msgs += former_new;
inc_unlock();
}
-static gboolean folderview_search_new_recursive(GtkCTree *ctree,
- GtkCTreeNode *node)
+static gboolean folderview_have_new_children_sub(FolderView *folderview,
+ FolderItem *item,
+ gboolean in_sub)
{
- FolderItem *item;
+ GNode *node = NULL;
+
+ if (!item || !item->folder || !item->folder->node)
+ return FALSE;
+
+ node = item->folder->node;
+
+ node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+ node = node->children;
- if (node) {
- item = gtk_ctree_node_get_row_data(ctree, node);
- if (item) {
- if (item->new_msgs > 0 ||
- (item->stype == F_QUEUE && item->total_msgs > 0))
+ if (in_sub &&
+ (item->new_msgs > 0 ||
+ (item->stype == F_QUEUE && item->total_msgs > 0))) {
+ return TRUE;
+ }
+
+ while (node != NULL) {
+ if (node && node->data) {
+ FolderItem *next_item = (FolderItem*) node->data;
+ node = node->next;
+ if (folderview_have_new_children_sub(folderview,
+ next_item, TRUE))
return TRUE;
}
- node = GTK_CTREE_ROW(node)->children;
- } else
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-
- while (node) {
- if (folderview_search_new_recursive(ctree, node) == TRUE)
- return TRUE;
- node = GTK_CTREE_ROW(node)->sibling;
}
return FALSE;
}
static gboolean folderview_have_new_children(FolderView *folderview,
- GtkCTreeNode *node)
+ FolderItem *item)
{
- GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+ return folderview_have_new_children_sub(folderview, item, FALSE);
+}
- if (!node)
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
- if (!node)
+static gboolean folderview_have_unread_children_sub(FolderView *folderview,
+ FolderItem *item,
+ gboolean in_sub)
+{
+ GNode *node = NULL;
+
+ if (!item || !item->folder || !item->folder->node)
return FALSE;
+
+ node = item->folder->node;
+
+ node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+ node = node->children;
- node = GTK_CTREE_ROW(node)->children;
-
- while (node) {
- if (folderview_search_new_recursive(ctree, node) == TRUE)
- return TRUE;
- node = GTK_CTREE_ROW(node)->sibling;
+ if (in_sub &&
+ (item->unread_msgs > 0 ||
+ (item->stype == F_QUEUE && item->total_msgs > 0))) {
+ return TRUE;
}
- return FALSE;
-}
-
-static gboolean folderview_search_unread_recursive(GtkCTree *ctree,
- GtkCTreeNode *node)
-{
- FolderItem *item;
-
- if (node) {
- item = gtk_ctree_node_get_row_data(ctree, node);
- if (item) {
- if (item->unread_msgs > 0 ||
- (item->stype == F_QUEUE && item->total_msgs > 0))
+ while (node != NULL) {
+ if (node && node->data) {
+ FolderItem *next_item = (FolderItem*) node->data;
+ node = node->next;
+ if (folderview_have_unread_children_sub(folderview,
+ next_item,
+ TRUE))
return TRUE;
}
- node = GTK_CTREE_ROW(node)->children;
- } else
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-
- while (node) {
- if (folderview_search_unread_recursive(ctree, node) == TRUE)
- return TRUE;
- node = GTK_CTREE_ROW(node)->sibling;
}
return FALSE;
}
static gboolean folderview_have_unread_children(FolderView *folderview,
- GtkCTreeNode *node)
+ FolderItem *item)
{
- GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+ return folderview_have_unread_children_sub(folderview, item, FALSE);
+}
- if (!node)
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
- if (!node)
+static gboolean folderview_have_matching_children_sub(FolderView *folderview,
+ FolderItem *item,
+ gboolean in_sub)
+{
+ GNode *node = NULL;
+
+ if (!item || !item->folder || !item->folder->node)
return FALSE;
- node = GTK_CTREE_ROW(node)->children;
+ node = item->folder->node;
+
+ node = g_node_find(node, G_PRE_ORDER, G_TRAVERSE_ALL, item);
+ node = node->children;
+
+ if (in_sub && item->search_match){
+ return TRUE;
+ }
- while (node) {
- if (folderview_search_unread_recursive(ctree, node) == TRUE)
- return TRUE;
- node = GTK_CTREE_ROW(node)->sibling;
+ while (node != NULL) {
+ if (node && node->data) {
+ FolderItem *next_item = (FolderItem*) node->data;
+ node = node->next;
+ if (folderview_have_matching_children_sub(folderview,
+ next_item,
+ TRUE))
+ return TRUE;
+ }
}
return FALSE;
}
+static gboolean folderview_have_matching_children(FolderView *folderview,
+ FolderItem *item)
+{
+ return folderview_have_matching_children_sub(folderview, item, FALSE);
+}
+
static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
{
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
FolderItem *item;
GdkPixmap *xpm, *openxpm;
GdkBitmap *mask, *openmask;
+ static GdkPixmap *searchicon;
+ static GdkBitmap *searchmask;
+ gboolean mark = FALSE;
gchar *name;
gchar *str;
gboolean add_unread_mark;
+ gboolean add_sub_match_mark;
gboolean use_bold, use_color;
+ gint *col_pos = folderview->col_pos;
item = gtk_ctree_node_get_row_data(ctree, node);
g_return_if_fail(item != NULL);
+ mark = (item->marked_msgs != 0);
+
switch (item->stype) {
case F_INBOX:
if (item->hide_read_msgs) {
- xpm = inboxhrmxpm;
- mask = inboxhrmxpmmask;
- openxpm = inboxopenhrmxpm;
- openmask = inboxopenhrmxpmmask;
+ xpm = mark?m_inboxhrmxpm:inboxhrmxpm;
+ mask = mark?m_inboxhrmxpmmask:inboxhrmxpmmask;
+ openxpm = mark?m_inboxopenhrmxpm:inboxopenhrmxpm;
+ openmask = mark?m_inboxopenhrmxpmmask:inboxopenhrmxpmmask;
} else {
- xpm = inboxxpm;
- mask = inboxxpmmask;
- openxpm = inboxopenxpm;
- openmask = inboxopenxpmmask;
+ xpm = mark?m_inboxxpm:inboxxpm;
+ mask = mark?m_inboxxpmmask:inboxxpmmask;
+ openxpm = mark?m_inboxopenxpm:inboxopenxpm;
+ openmask = mark?m_inboxopenxpmmask:inboxopenxpmmask;
}
break;
case F_OUTBOX:
if (item->hide_read_msgs) {
- xpm = outboxhrmxpm;
- mask = outboxhrmxpmmask;
- openxpm = outboxopenhrmxpm;
- openmask = outboxopenhrmxpmmask;
+ xpm = mark?m_outboxhrmxpm:outboxhrmxpm;
+ mask = mark?m_outboxhrmxpmmask:outboxhrmxpmmask;
+ openxpm = mark?m_outboxopenhrmxpm:outboxopenhrmxpm;
+ openmask = mark?m_outboxopenhrmxpmmask:outboxopenhrmxpmmask;
} else {
- xpm = outboxxpm;
- mask = outboxxpmmask;
- openxpm = outboxopenxpm;
- openmask = outboxopenxpmmask;
+ xpm = mark?m_outboxxpm:outboxxpm;
+ mask = mark?m_outboxxpmmask:outboxxpmmask;
+ openxpm = mark?m_outboxopenxpm:outboxopenxpm;
+ openmask = mark?m_outboxopenxpmmask:outboxopenxpmmask;
}
break;
case F_QUEUE:
if (item->hide_read_msgs) {
- xpm = queuehrmxpm;
- mask = queuehrmxpmmask;
- openxpm = queueopenhrmxpm;
- openmask = queueopenhrmxpmmask;
+ xpm = mark?m_queuehrmxpm:queuehrmxpm;
+ mask = mark?m_queuehrmxpmmask:queuehrmxpmmask;
+ openxpm = mark?m_queueopenhrmxpm:queueopenhrmxpm;
+ openmask = mark?m_queueopenhrmxpmmask:queueopenhrmxpmmask;
} else {
- xpm = queuexpm;
- mask = queuexpmmask;
- openxpm = queueopenxpm;
- openmask = queueopenxpmmask;
+ xpm = mark?m_queuexpm:queuexpm;
+ mask = mark?m_queuexpmmask:queuexpmmask;
+ openxpm = mark?m_queueopenxpm:queueopenxpm;
+ openmask = mark?m_queueopenxpmmask:queueopenxpmmask;
}
break;
case F_TRASH:
if (item->hide_read_msgs) {
- xpm = trashhrmxpm;
- mask = trashhrmxpmmask;
- openxpm = trashopenhrmxpm;
- openmask = trashopenhrmxpmmask;
+ xpm = mark?m_trashhrmxpm:trashhrmxpm;
+ mask = mark?m_trashhrmxpmmask:trashhrmxpmmask;
+ openxpm = mark?m_trashopenhrmxpm:trashopenhrmxpm;
+ openmask = mark?m_trashopenhrmxpmmask:trashopenhrmxpmmask;
} else {
- xpm = trashxpm;
- mask = trashxpmmask;
- openxpm = trashopenxpm;
- openmask = trashopenxpmmask;
+ xpm = mark?m_trashxpm:trashxpm;
+ mask = mark?m_trashxpmmask:trashxpmmask;
+ openxpm = mark?m_trashopenxpm:trashopenxpm;
+ openmask = mark?m_trashopenxpmmask:trashopenxpmmask;
}
break;
case F_DRAFT:
- xpm = draftsxpm;
- mask = draftsxpmmask;
- openxpm = draftsopenxpm;
- openmask = draftsopenxpmmask;
+ xpm = mark?m_draftsxpm:draftsxpm;
+ mask = mark?m_draftsxpmmask:draftsxpmmask;
+ openxpm = mark?m_draftsopenxpm:draftsopenxpm;
+ openmask = mark?m_draftsopenxpmmask:draftsopenxpmmask;
break;
default:
if (item->hide_read_msgs) {
- xpm = folderhrmxpm;
- mask = folderhrmxpmmask;
- openxpm = folderopenhrmxpm;
- openmask = folderopenhrmxpmmask;
+ xpm = mark?m_folderhrmxpm:folderhrmxpm;
+ mask = mark?m_folderhrmxpmmask:folderhrmxpmmask;
+ openxpm = mark?m_folderopenhrmxpm:folderopenhrmxpm;
+ openmask = mark?m_folderopenhrmxpmmask:folderopenhrmxpmmask;
} else {
- xpm = folderxpm;
- mask = folderxpmmask;
- openxpm = folderopenxpm;
- openmask = folderopenxpmmask;
+ xpm = mark?m_folderxpm:folderxpm;
+ mask = mark?m_folderxpmmask:folderxpmmask;
+ openxpm = mark?m_folderopenxpm:folderopenxpm;
+ openmask = mark?m_folderopenxpmmask:folderopenxpmmask;
}
}
+
+ if (item->no_select) {
+ xpm = openxpm = noselectxpm;
+ mask = openmask = noselectxpmmask;
+ }
+
name = folder_item_get_name(item);
- if (!GTK_CTREE_ROW(node)->expanded &&
- folderview_have_unread_children(folderview, node))
- add_unread_mark = TRUE;
- else
+ if (!GTK_CTREE_ROW(node)->expanded) {
+ add_unread_mark = folderview_have_unread_children(
+ folderview, item);
+ add_sub_match_mark = folderview_have_matching_children(
+ folderview, item);
+ } else {
add_unread_mark = FALSE;
+ add_sub_match_mark = FALSE;
+ }
+
+ if (item->search_match) {
+ if (!searchicon) {
+ stock_pixmap_gdk(folderview->ctree, STOCK_PIXMAP_QUICKSEARCH,
+ &searchicon, &searchmask);
+ }
+ xpm = openxpm = searchicon;
+ mask = openmask = searchmask;
+ }
if (item->stype == F_QUEUE && item->total_msgs > 0 &&
prefs_common.display_folder_unread) {
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) {
+ } 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_unread_mark || add_sub_match_mark ? "+" : "",
item->unreadmarked_msgs > 0 ? "!":"");
else
str = g_strdup_printf("%s (+)", name);
g_free(name);
if (!folder_item_parent(item)) {
- gtk_ctree_node_set_text(ctree, node, COL_NEW, "-");
- gtk_ctree_node_set_text(ctree, node, COL_UNREAD, "-");
- gtk_ctree_node_set_text(ctree, node, COL_TOTAL, "-");
+ gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_NEW], "-");
+ gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], "-");
+ gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL], "-");
} else {
- 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));
+ gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_NEW], itos(item->new_msgs));
+ gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], itos(item->unread_msgs));
+ gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL], itos(item->total_msgs));
}
if (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
use_color =
(item->new_msgs > 0) ||
(add_unread_mark &&
- folderview_have_new_children(folderview, node));
+ folderview_have_new_children(folderview, item));
}
gtk_ctree_node_set_foreground(ctree, node, NULL);
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;
}
#endif
+void folderview_update_search_icon(FolderItem *item, gboolean matches)
+{
+ 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) {
+ item->search_match = matches;
+ folderview_update_node(folderview, node);
+ }
+ }
+}
+
gboolean folderview_update_item_claws(gpointer source, gpointer data)
{
FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
FolderView *folderview = (FolderView *)data;
GtkCTree *ctree;
GtkCTreeNode *node;
-
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);
if (event->button == 1) {
folderview->open_folder = TRUE;
+
+ if (event->type == GDK_2BUTTON_PRESS) {
+ if (clist->selection) {
+ GtkCTreeNode *node;
+
+ node = GTK_CTREE_NODE(clist->selection->data);
+ if (node)
+ gtk_ctree_toggle_expansion(
+ GTK_CTREE(ctree),
+ node);
+ }
+ }
return FALSE;
}
gtk_item_factory_get_item(fpopup_factory, "/Empty trash...") == NULL) {
gtk_item_factory_create_item(fpopup_factory, &folder_view_trash_popup_entries[0], folderview, 1);
gtk_item_factory_create_item(fpopup_factory, &folder_view_trash_popup_entries[1], folderview, 1);
- } else {
+ } else if (item != folder->trash) {
gtk_item_factory_delete_entry(fpopup_factory, &folder_view_trash_popup_entries[0]);
gtk_item_factory_delete_entry(fpopup_factory, &folder_view_trash_popup_entries[1]);
}
SET_SENS("/Mark all read", item->unread_msgs >= 1);
SET_SENS("/Search folder...", item->total_msgs >= 1 &&
folderview->selected == folderview->opened);
- SET_SENS("/Properties...", TRUE);
+ SET_SENS("/Properties...", item->node->parent != NULL);
SET_SENS("/Processing...", item->node->parent != NULL);
- if (item == folder->trash)
- SET_SENS("/Empty trash...", folder_item_get_msg_list(item) != NULL);
+ if (item == folder->trash) {
+ GSList *msglist = folder_item_get_msg_list(item);
+ SET_SENS("/Empty trash...", msglist != NULL);
+ procmsg_msg_list_free(msglist);
+ }
#undef SET_SENS
popup = gtk_item_factory_get_widget(fpopup_factory, fpopup->path);
folderview->open_folder = FALSE;
return;
}
-
+
if (!can_select || summary_is_locked(folderview->summaryview)) {
gtkut_ctree_set_focus_row(ctree, folderview->opened);
gtk_ctree_select(ctree, folderview->opened);
if (!folderview->open_folder) return;
item = gtk_ctree_node_get_row_data(ctree, row);
- if (!item) return;
+ if (!item || item->no_select) return;
can_select = FALSE;
static void folderview_col_resized(GtkCList *clist, gint column, gint width,
FolderView *folderview)
{
- switch (column) {
- case COL_FOLDER:
- prefs_common.folder_col_folder = width;
- break;
- case COL_NEW:
- prefs_common.folder_col_new = width;
- break;
- case COL_UNREAD:
- prefs_common.folder_col_unread = width;
- break;
- case COL_TOTAL:
- prefs_common.folder_col_total = width;
- break;
- default:
- break;
- }
+ FolderColumnType type = folderview->col_state[column].type;
+
+ prefs_common.folder_col_size[type] = width;
}
void folderview_create_folder_node_recursive(FolderView *folderview, FolderItem *item)
GNode *srcnode;
folderview_create_folder_node(folderview, item);
-
+
+ if (!item || !item->folder || !item->folder->node)
+ return;
+
srcnode = item->folder->node;
srcnode = g_node_find(srcnode, G_PRE_ORDER, G_TRAVERSE_ALL, item);
srcnode = srcnode->children;
GtkCTree *ctree = GTK_CTREE(folderview->ctree);
gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
GtkCTreeNode *node, *parent_node;
-
+ gint *col_pos = folderview->col_pos;
+
parent_node = gtk_ctree_find_by_row_data(ctree, NULL, folder_item_parent(item));
if (parent_node == NULL)
return;
gtk_clist_freeze(GTK_CLIST(ctree));
- text[COL_FOLDER] = item->name;
+ text[col_pos[F_COL_FOLDER]] = item->name;
node = gtk_ctree_insert_node(ctree, parent_node, NULL, text,
FOLDER_SPACING,
folderxpm, folderxpmmask,
if (prefs_common.ask_on_clean) {
if (alertpanel(_("Empty trash"),
_("Empty all messages in trash?"),
- _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
return;
}
for (cur = mlist ; cur != NULL ; cur = cur->next) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
- partial_mark_for_delete(msginfo);
- procmsg_msginfo_free(msginfo);
+ if (MSG_IS_LOCKED(msginfo->flags))
+ continue;
+ /* is it partially received? (partial_recv isn't cached) */
+ if (msginfo->total_size != 0 &&
+ msginfo->size != (off_t)msginfo->total_size)
+ partial_mark_for_delete(msginfo);
}
+ procmsg_msg_list_free(mlist);
folder_item_remove_all_msg(item);
}
g_return_if_fail(item != NULL);
g_return_if_fail(item->folder != NULL);
- if (folder_item_parent(item) == NULL && item->folder->account)
- account_open(item->folder->account);
- else {
- prefs_folder_item_open(item);
- }
+ if (folder_item_parent(item) == NULL)
+ return;
+
+ prefs_folder_item_open(item);
}
static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *node)
src_node = gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), NULL, from_folder);
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,
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL, TRUE,
+ NULL, ALERT_QUESTION, G_ALERTALTERNATE);
+ g_free(buf);
+
+ if (status != G_ALERTDEFAULT
+ && status != (G_ALERTDEFAULT | G_ALERTDISABLE))
+ return;
+ if (status & G_ALERTDISABLE)
+ prefs_common.warn_dnd = FALSE;
+ }
+
buf = g_strdup_printf(_("Moving %s to %s..."), from_folder->name, to_folder->name);
STATUSBAR_PUSH(folderview->mainwin, buf);
g_free(buf);
if (!item2->name)
return -1;
- return g_strcasecmp(item1->name, item2->name);
+ return g_utf8_collate(item1->name, item2->name);
}
static void folderview_processing_cb(FolderView *folderview, guint action,
void folderview_reflect_prefs_pixmap_theme(FolderView *folderview)
{
+}
+
+void folderview_reflect_prefs(void)
+{
+ FolderView *folderview = mainwindow_get_mainwindow()->folderview;
+ normal_style = normal_color_style = bold_style =
+ bold_color_style = bold_tgtfold_style = NULL;
+ FolderItem *item = folderview_get_selected_item(folderview);
folderview_init(folderview);
+ folderview_column_set_titles(folderview);
folderview_set_all();
+ if (item)
+ folderview_select(folderview, item);
}
static void drag_state_stop(FolderView *folderview)
FolderView *folderview)
{
gint row, column;
- FolderItem *item, *src_item = NULL;
+ FolderItem *item = NULL, *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;
+ int height = (int)pos->page_size;
+ int total_height = (int)pos->upper;
+ int vpos = (int) 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)
+ if (y < 48 && y > 0)
gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
src_item = folderview->summaryview->folder_item;
/* re-check (due to acceptable possibly set for folder moves */
- if (!(item && item->folder && item->path &&
+ if (!(item && item->folder && item->path && !item->no_select &&
src_item && src_item != item && FOLDER_CLASS(item->folder)->copy_msg != NULL)) {
return;
}
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) {
+ if (!item || item->no_select || !src_item || src_item->stype != F_NORMAL) {
gtk_drag_finish(drag_context, FALSE, FALSE, time);
return;
}
folderview->nodes_to_recollapse = NULL;
}
-FolderItem *folderview_get_selected(FolderView *folderview)
-{
- return (FolderItem *) gtk_ctree_node_get_row_data(
- GTK_CTREE(folderview->ctree), folderview->selected);
-}
-
void folderview_register_popup(FolderViewPopup *fpopup)
{
GList *folderviews;
projects / claws.git / blobdiff