/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2009 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 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
gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree),
col_pos[F_COL_TOTAL],
GTK_JUSTIFY_RIGHT);
- if (prefs_common.enable_dotted_lines) {
- gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_DOTTED);
- gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
- GTK_CMCTREE_EXPANDER_SQUARE);
- } else {
- gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
- gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
- GTK_CMCTREE_EXPANDER_TRIANGLE);
- }
+ gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
+ gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
+ GTK_CMCTREE_EXPANDER_TRIANGLE);
gtk_sctree_set_stripes(GTK_SCTREE(ctree), prefs_common.use_stripes_in_summaries);
gtk_sctree_set_recursive_expand(GTK_SCTREE(ctree), FALSE);
/* don't let title buttons take key focus */
for (i = 0; i < N_FOLDER_COLS; i++) {
- GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[i].button,
- GTK_CAN_FOCUS);
+ gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[i].button, FALSE);
gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[i],
prefs_common.folder_col_size[i]);
gtk_cmclist_set_column_visibility
folderview->target_list = gtk_target_list_new(folderview_drag_types, 2);
folderview_list = g_list_append(folderview_list, folderview);
folderview->deferred_refresh_id = -1;
-
+ folderview->scroll_timeout_id = -1;
return folderview;
}
if (folderview) {
pos = gtk_scrolled_window_get_vadjustment(
GTK_SCROLLED_WINDOW(folderview->scrolledwin));
- height = pos->value;
+ height = gtk_adjustment_get_value(pos);
}
folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
if (folderview) {
pos = gtk_scrolled_window_get_vadjustment(
GTK_SCROLLED_WINDOW(folderview->scrolledwin));
- height = pos->value;
+ height = gtk_adjustment_get_value(pos);
}
folder_set_ui_func(folder, folderview_scan_tree_func, NULL);
}
switch (stype) {
case F_INBOX:
- if (item->hide_read_msgs) {
+ if (item->hide_read_msgs || item->hide_read_threads) {
xpm = mark?m_inboxhrmxpm:inboxhrmxpm;
openxpm = mark?m_inboxopenhrmxpm:inboxopenhrmxpm;
} else {
}
break;
case F_OUTBOX:
- if (item->hide_read_msgs) {
+ if (item->hide_read_msgs || item->hide_read_threads) {
xpm = mark?m_outboxhrmxpm:outboxhrmxpm;
openxpm = mark?m_outboxopenhrmxpm:outboxopenhrmxpm;
} else {
}
break;
case F_QUEUE:
- if (item->hide_read_msgs) {
+ if (item->hide_read_msgs || item->hide_read_threads) {
xpm = mark?m_queuehrmxpm:queuehrmxpm;
openxpm = mark?m_queueopenhrmxpm:queueopenhrmxpm;
} else {
}
break;
case F_TRASH:
- if (item->hide_read_msgs) {
+ if (item->hide_read_msgs || item->hide_read_threads) {
xpm = mark?m_trashhrmxpm:trashhrmxpm;
openxpm = mark?m_trashopenhrmxpm:trashopenhrmxpm;
} else {
openxpm = mark?m_draftsopenxpm:draftsopenxpm;
break;
default:
- if (item->hide_read_msgs) {
+ if (item->hide_read_msgs || item->hide_read_threads) {
xpm = mark?m_folderhrmxpm:folderhrmxpm;
openxpm = mark?m_folderopenhrmxpm:folderopenhrmxpm;
} else {
str = g_strdup_printf("%s", name);
}
}
- gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
+ gtk_cmctree_set_node_info(ctree, node, str, FOLDER_SPACING,
xpm, openxpm,
FALSE, GTK_CMCTREE_ROW(node)->expanded);
g_free(str);
folder_has_parent_of_type(item, F_TRASH)) {
use_bold = use_color = FALSE;
} else if (folder_has_parent_of_type(item, F_QUEUE)) {
- /* highlight queue folder if there are any messages */
- use_bold = use_color = (item->total_msgs > 0);
+ GSList *list = folder_item_get_msg_list(item);
+ GSList *cur;
+ use_bold = use_color = FALSE;
+ for (cur = list; cur; cur = cur->next) {
+ MsgInfo *msginfo = (MsgInfo *)cur->data;
+ if (!MSG_IS_DELETED(msginfo->flags)) {
+ /* highlight queue folder if there are any messages */
+ use_bold = use_color = TRUE;
+ break;
+ }
+ }
} else {
/* if unread messages exist, print with bold font */
use_bold = (item->unread_msgs > 0|| item->new_msgs > 0)
ctree = GTK_CMCTREE(folderview->ctree);
node = gtk_cmctree_find_by_row_data(ctree, NULL, item);
- if (node) {
+ if (node && item->search_match != matches) {
item->search_match = matches;
folderview_update_node(folderview, node);
}
return FALSE;
switch (event->keyval) {
- case GDK_Right:
+ case GDK_KEY_Right:
#ifndef GENERIC_UMPC
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
#endif
if (folderview->selected) {
folderview_select_node(folderview,
}
break;
#ifdef GENERIC_UMPC
- case GDK_Return:
+ case GDK_KEY_Return:
if (folderview->selected && GTK_CMCTREE_ROW(folderview->selected)->children) {
gtk_cmctree_toggle_expansion(
GTK_CMCTREE(folderview->ctree),
}
break;
#endif
- case GDK_space:
+ case GDK_KEY_space:
BREAK_ON_MODIFIER_KEY();
if (folderview->selected) {
if (folderview->opened == folderview->selected &&
olditem = gtk_cmctree_node_get_row_data(GTK_CMCTREE(folderview->ctree),
folderview->opened);
if (olditem) {
- gchar *buf = g_strdup_printf(_("Closing Folder %s..."),
+ 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);
gtk_cmctree_expand(ctree, row);
/* ungrab the mouse event */
- if (GTK_WIDGET_HAS_GRAB(ctree)) {
+ if (gtk_widget_has_grab(GTK_WIDGET(ctree))) {
gtk_grab_remove(GTK_WIDGET(ctree));
if (gdk_pointer_is_grabbed())
gdk_pointer_ungrab(GDK_CURRENT_TIME);
/* Open Folder */
/* TODO: wwp: avoid displaying (null) in the status bar */
- buf = g_strdup_printf(_("Opening Folder %s..."), item->path ?
+ buf = g_strdup_printf(_("Opening folder %s..."), item->path ?
item->path : "(null)");
debug_print("%s\n", buf);
STATUSBAR_PUSH(folderview->mainwin, buf);
void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
FolderItem *to_folder, gboolean copy)
{
- FolderItem *from_parent = NULL;
FolderItem *new_folder = NULL;
- GtkCMCTreeNode *src_node = NULL;
gchar *buf;
gint status;
cm_return_if_fail(from_folder != NULL);
cm_return_if_fail(to_folder != NULL);
- src_node = gtk_cmctree_find_by_row_data(GTK_CMCTREE(folderview->ctree), NULL, from_folder);
- from_parent = folder_item_parent(from_folder);
-
if (prefs_common.warn_dnd) {
buf = g_strdup_printf(copy ? _("Do you really want to copy folder '%s' in '%s' ?"):
_("Do you really want to make folder '%s' a subfolder of '%s' ?"),
static gchar *last_boldfont = NULL;
static gboolean last_derive = 0;
-void folderview_reflect_prefs_pixmap_theme(FolderView *folderview)
+void folderview_reinit_fonts(FolderView *folderview)
{
/* force reinit */
g_free(last_smallfont);
FolderItem *item = folderview_get_selected_item(folderview);
GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
GTK_SCROLLED_WINDOW(folderview->scrolledwin));
- gint height = pos->value;
+ gint height = gtk_adjustment_get_value(pos);
if (!last_smallfont || strcmp(last_smallfont, SMALL_FONT) ||
!last_normalfont || strcmp(last_normalfont, NORMAL_FONT) ||
folderview->drag_node = NULL;
}
-static gint folderview_defer_expand(FolderView *folderview)
+static gboolean folderview_defer_expand(FolderView *folderview)
{
if (folderview->drag_node) {
folderview_recollapse_nodes(folderview, folderview->drag_node);
/* request expansion */
if (0 != (folderview->drag_timer = g_timeout_add
(prefs_common.hover_timeout,
- (GtkFunction)folderview_defer_expand,
+ (GSourceFunc)folderview_defer_expand,
folderview))) {
folderview->drag_node = node;
folderview->drag_item = item;
if (item) {
source = g_strdup_printf ("FROM_OTHER_FOLDER%s", folder_item_get_identifier(item));
gtk_selection_data_set(selection_data,
- selection_data->target, 8,
+ gtk_selection_data_get_target(selection_data), 8,
source, strlen(source));
break;
} else
return FALSE;
}
+static gboolean folderview_dnd_scroll_cb(gpointer data)
+{
+ FolderView *folderview = (FolderView *)data;
+ GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
+ GTK_SCROLLED_WINDOW(folderview->scrolledwin));
+ gint new_val = (int)gtk_adjustment_get_value(pos) + folderview->scroll_value;
+ gint max = (int)gtk_adjustment_get_upper(pos) -
+ (int)gtk_adjustment_get_page_size(pos);
+
+ if (folderview->scroll_value == 0) {
+ folderview->scroll_timeout_id = -1;
+ return FALSE;
+ }
+
+ if (folderview->scroll_value > 0 && new_val > max) {
+ new_val = max;
+ } else if (folderview->scroll_value < 0 && new_val < 0) {
+ new_val = 0;
+ }
+ gtk_adjustment_set_value(pos, new_val);
+
+ return TRUE;
+}
+
static gboolean folderview_drag_motion_cb(GtkWidget *widget,
GdkDragContext *context,
gint x,
gboolean acceptable = FALSE;
GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
GTK_SCROLLED_WINDOW(folderview->scrolledwin));
- int height = (int)pos->page_size;
- int total_height = (int)pos->upper;
- int vpos = (int) pos->value;
+ int height = (int)gtk_adjustment_get_page_size(pos);
+ int total_height = (int)gtk_adjustment_get_upper(pos);
+ int vpos = (int)gtk_adjustment_get_value(pos);
int offset = prefs_common.show_col_headers ? 24:0;
-
+ int dist;
+
if (gtk_cmclist_get_selection_info
(GTK_CMCLIST(widget), x - offset, y - offset, &row, &column)) {
GtkWidget *srcwidget;
- if (y > height - 24 && height + vpos < total_height) {
- gtk_adjustment_set_value(pos, (vpos+5 > total_height ? total_height : vpos+5));
- gtk_adjustment_changed(pos);
+ if (y > height - (48 - offset) && height + vpos < total_height) {
+ dist = -(height - (48 - offset) - y);
+ folderview->scroll_value = 1.41f * (1+(dist / 6));
+ } else if (y < 72 - (24 - offset) && y >= 0) {
+ dist = 72 - (24 - offset) - y;
+ folderview->scroll_value = -1.41f * (1+(dist / 6));
+ } else {
+ folderview->scroll_value = 0;
}
- if (y < 48 && y > 0) {
- gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
- gtk_adjustment_changed(pos);
+ if (folderview->scroll_value != 0 && folderview->scroll_timeout_id == -1) {
+ folderview->scroll_timeout_id =
+ g_timeout_add(30, folderview_dnd_scroll_cb,
+ folderview);
}
node = gtk_cmctree_node_nth(GTK_CMCTREE(widget), row);
(G_OBJECT(widget),
G_CALLBACK(folderview_selected), folderview);
gdk_drag_status(context,
- (context->actions == GDK_ACTION_COPY ?
+ (gdk_drag_context_get_actions(context) == GDK_ACTION_COPY ?
GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
} else {
if (folderview->opened)
FolderView *folderview)
{
drag_state_stop(folderview);
+ folderview->scroll_value = 0;
gtk_cmctree_select(GTK_CMCTREE(widget), folderview->opened);
}
GtkCMCTreeNode *node;
int offset = prefs_common.show_col_headers ? 24:0;
+ folderview->scroll_value = 0;
+
if (info == TARGET_DUMMY) {
drag_state_stop(folderview);
- if ((void *)strstr(data->data, "FROM_OTHER_FOLDER") != (void *)data->data) {
+ const gchar *ddata = (const gchar *)gtk_selection_data_get_data(data);
+ if ((gchar *)strstr(ddata, "FROM_OTHER_FOLDER") != ddata) {
/* comes from summaryview */
if (gtk_cmclist_get_selection_info
(GTK_CMCLIST(widget), x - offset, y - offset, &row, &column) == 0)
return;
}
if (item && src_item) {
- switch (drag_context->action) {
+ switch (gdk_drag_context_get_selected_action(drag_context)) {
case GDK_ACTION_COPY:
summary_copy_selected_to(folderview->summaryview, item);
gtk_drag_finish(drag_context, TRUE, FALSE, time);
/* comes from folderview */
char *source;
gboolean folder_is_normal = TRUE;
- gboolean copy = (drag_context->action == GDK_ACTION_COPY);
+ gboolean copy = (GDK_ACTION_COPY ==
+ gdk_drag_context_get_selected_action(drag_context));
- source = data->data + 17;
+ source = (char *)gtk_selection_data_get_data(data) + 17;
if (gtk_cmclist_get_selection_info
(GTK_CMCLIST(widget), x - offset, y - offset, &row, &column) == 0
|| *source == 0) {
debug_print("no item\n");
return;
}
- folderview_finish_dnd(data->data, drag_context, time, item);
+ folderview_finish_dnd(gtk_selection_data_get_data(data),
+ drag_context, time, item);
}
}
FolderView *folderview)
{
drag_state_stop(folderview);
+ folderview->scroll_value = 0;
g_slist_free(folderview->nodes_to_recollapse);
folderview->nodes_to_recollapse = NULL;
}
projects / claws.git / blobdiff