/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2013 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 "edittags.h"
#include "manual.h"
#include "manage_window.h"
+#include "avatars.h"
#define SUMMARY_COL_MARK_WIDTH 10
#define SUMMARY_COL_STATUS_WIDTH 13
GtkCMCTreeNode *node);
-static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
- guint action);
-static void summary_set_hide_del_msgs_menu (SummaryView *summaryview,
- guint action);
-static void summary_set_hide_read_threads_menu (SummaryView *summaryview,
- guint action);
+static void summary_set_hide_menu (SummaryView *summaryview,
+ const gchar *menu_item,
+ guint action);
static GtkCMCTreeNode *summary_find_prev_msg
(SummaryView *summaryview,
gtk_cmclist_thaw(GTK_CMCLIST(summaryview->ctree));
}
+void summary_thaw_with_status(SummaryView *summaryview)
+{
+ if (summaryview) {
+ summary_status_show(summaryview);
+ gtk_cmclist_thaw(GTK_CMCLIST(summaryview->ctree));
+ }
+}
+
void summary_grab_focus(SummaryView *summaryview)
{
if (summaryview)
debug_print("Creating summary view...\n");
summaryview = g_new0(SummaryView, 1);
-#if !(GTK_CHECK_VERSION(2,12,0))
- summaryview->tooltips = tips;
-#endif
#define SUMMARY_VBOX_SPACING 3
vbox = gtk_vbox_new(FALSE, SUMMARY_VBOX_SPACING);
(item && item->path)?item->path:"(null)",
item?folder_item_parent(item):0x0,
item?item->no_select:FALSE);
- summary_set_hide_read_msgs_menu(summaryview, FALSE);
- summary_set_hide_del_msgs_menu(summaryview, FALSE);
- summary_set_hide_read_threads_menu(summaryview, FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadMessages", FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideDelMessages", FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadThreads", FALSE);
summary_clear_all(summaryview);
summaryview->folder_item = item;
summary_thaw(summaryview);
if (!quicksearch_has_sat_predicate(summaryview->quicksearch)) {
debug_print("search cancelled!\n");
- printf("search cancelled!\n");
summary_thaw(summaryview);
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
quicksearch_has_sat_predicate(summaryview->quicksearch) == FALSE) {
GSList *not_killed;
- summary_set_hide_read_msgs_menu(summaryview, summaryview->folder_item->hide_read_msgs);
- summary_set_hide_del_msgs_menu(summaryview, summaryview->folder_item->hide_del_msgs);
- summary_set_hide_read_threads_menu(summaryview, summaryview->folder_item->hide_read_threads);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadMessages",
+ summaryview->folder_item->hide_read_msgs);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideDelMessages",
+ summaryview->folder_item->hide_del_msgs);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadThreads",
+ summaryview->folder_item->hide_read_threads);
not_killed = NULL;
for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
g_slist_free(mlist);
mlist = not_killed;
} else {
- summary_set_hide_read_msgs_menu(summaryview, FALSE);
- summary_set_hide_del_msgs_menu(summaryview, FALSE);
- summary_set_hide_read_threads_menu(summaryview, FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadMessages",
+ FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideDelMessages",
+ FALSE);
+ summary_set_hide_menu(summaryview, "/Menu/View/HideReadThreads",
+ FALSE);
}
if (!hidden_removed) {
#undef CURRENTLY_DISPLAYED
+static void summary_cancel_mark_read_timeout(SummaryView *summaryview) {
+ if (summaryview->mark_as_read_timeout_tag != 0) {
+ g_source_remove(summaryview->mark_as_read_timeout_tag);
+ summaryview->mark_as_read_timeout_tag = 0;
+ }
+}
void summary_clear_list(SummaryView *summaryview)
{
summaryview->folder_item = NULL;
}
+ summary_cancel_mark_read_timeout(summaryview);
+
summaryview->display_msg = FALSE;
summaryview->selected = NULL;
_("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
}
- if (val == G_ALERTALTERNATE) {
- folderview_select_next_unread(summaryview->folderview, TRUE);
- return;
- }
- else
- return;
- } else
+ if (val == G_ALERTALTERNATE)
+ folderview_select_next_with_flag(summaryview->folderview, MSG_UNREAD, TRUE);
+ } else {
summary_select_node(summaryview, node, TRUE, FALSE);
-
+ }
}
}
}
if (val == G_ALERTALTERNATE) {
- folderview_select_next_new(summaryview->folderview);
+ folderview_select_next_with_flag(summaryview->folderview, MSG_NEW, TRUE);
return;
}
else
}
if (val == G_ALERTALTERNATE) {
- folderview_select_next_marked(summaryview->folderview);
+ folderview_select_next_with_flag(summaryview->folderview, MSG_MARKED, TRUE);
return;
}
else
if (!summaryview->folder_item)
return;
if (node) {
+ summary_cancel_mark_read_timeout(summaryview);
gtkut_ctree_expand_parent_all(ctree, node);
if (do_refresh) {
summary_lock(summaryview);
msginfo = gtk_cmctree_node_get_row_data(ctree, node);
+ cm_return_if_fail(msginfo != NULL);
+
if (MSG_IS_DELETED(msginfo->flags))
summaryview->deleted++;
gtk_box_pack_start(GTK_BOX(hbox), label,
FALSE, FALSE, 0);
- if (summaryview->sort_key == sort_by[type]) {
+ if (summaryview->sort_key == sort_by[type] ||
+ (summaryview->sort_key == SORT_BY_THREAD_DATE &&
+ sort_by[SORT_BY_DATE] && type == S_COL_DATE)) {
arrow = gtk_arrow_new
(summaryview->sort_type == SORT_ASCENDING
? GTK_ARROW_DOWN : GTK_ARROW_UP,
extract_address(from_text);
}
if (!from_text)
- _("(No From)");
+ from_text = _("(No From)");
} else {
gchar *tmp = summary_complete_address(msginfo->from);
if (tmp) {
from_text = msginfo->from;
else {
from_text = msginfo->from;
- extract_address(from_text);
+ if (from_text)
+ extract_address(from_text);
}
if (!from_text)
- _("(No From)");
+ from_text = _("(No From)");
}
}
MarkAsReadData *mdata = (MarkAsReadData *)data;
if (!mdata)
return FALSE;
-
+
if (mdata->msginfo == summary_get_selected_msg(mdata->summaryview))
msginfo_mark_as_read(mdata->summaryview, mdata->msginfo,
- mdata->summaryview->selected);
+ mdata->summaryview->selected);
+ procmsg_msginfo_free(mdata->msginfo);
- g_free(mdata);
+ mdata->summaryview->mark_as_read_timeout_tag = 0;
- return FALSE;
+ g_free(mdata);
+ return FALSE;
}
static void summary_display_msg_full(SummaryView *summaryview,
prefs_common.mark_as_read_delay) {
MarkAsReadData *data = g_new0(MarkAsReadData, 1);
data->summaryview = summaryview;
- data->msginfo = msginfo;
-#if GLIB_CHECK_VERSION(2,14,0)
- g_timeout_add_seconds(prefs_common.mark_as_read_delay,
- msginfo_mark_as_read_timeout, data);
-#else
- g_timeout_add(prefs_common.mark_as_read_delay * 1000,
- msginfo_mark_as_read_timeout, data);
-#endif
+ data->msginfo = procmsg_msginfo_new_ref(msginfo);
+ if (summaryview->mark_as_read_timeout_tag != 0)
+ g_source_remove(summaryview->mark_as_read_timeout_tag);
+ summaryview->mark_as_read_timeout_tag =
+ g_timeout_add_seconds(prefs_common.mark_as_read_delay,
+ msginfo_mark_as_read_timeout, data);
} else if (new_window || !prefs_common.mark_as_read_on_new_window) {
msginfo_mark_as_read(summaryview, msginfo, row);
}
msginfo = gtk_cmctree_node_get_row_data(ctree, summaryview->selected);
source_window_show_msg(srcwin, msginfo);
source_window_show(srcwin);
-#ifdef MAEMO
- maemo_window_full_screen_if_needed(GTK_WINDOW(srcwin->window));
- maemo_connect_key_press_to_mainwindow(GTK_WINDOW(srcwin->window));
-#endif
}
void summary_reedit(SummaryView *summaryview)
if (prefs_common.ask_mark_all_read) {
val = alertpanel_full(_("Mark all as read"),
_("Do you really want to mark all mails in this "
- "folder as read?"), GTK_STOCK_NO, _("Mark all as read"), NULL,
+ "folder as read?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
folder_item_set_batch(summaryview->folder_item, FALSE);
END_LONG_OPERATION(summaryview);
- node = summary_find_next_msg(summaryview, sel_last);
- if (!node)
+ if (summaryview->sort_type == SORT_ASCENDING) {
+ node = summary_find_next_msg(summaryview, sel_last);
+ if (!node)
+ node = summary_find_prev_msg(summaryview, sel_last);
+ } else {
node = summary_find_prev_msg(summaryview, sel_last);
-
+ if (!node)
+ node = summary_find_next_msg(summaryview, sel_last);
+ }
summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
if (prefs_common.immediate_exec || folder_has_parent_of_type(item, F_TRASH)) {
if (prefs_common.immediate_exec) {
summary_execute(summaryview);
} else {
- GtkCMCTreeNode *node = summary_find_next_msg(summaryview, sel_last);
- if (!node)
+ GtkCMCTreeNode *node = NULL;
+ if (summaryview->sort_type == SORT_ASCENDING) {
+ node = summary_find_next_msg(summaryview, sel_last);
+ if (!node)
+ node = summary_find_prev_msg(summaryview, sel_last);
+ } else {
node = summary_find_prev_msg(summaryview, sel_last);
+ if (!node)
+ node = summary_find_next_msg(summaryview, sel_last);
+ }
summary_select_node(summaryview, node, summaryview->display_msg, TRUE);
summary_status_show(summaryview);
}
if (!summaryview->folder_item ||
FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
- to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
- FOLDER_SEL_MOVE, NULL, FALSE);
+ to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, FALSE);
summary_move_selected_to(summaryview, to_folder);
}
if (!summaryview->folder_item) return;
- to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
- FOLDER_SEL_COPY, NULL, FALSE);
+ to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL, FALSE);
summary_copy_selected_to(summaryview, to_folder);
}
{
MsgInfo *msginfo, *full_msginfo;
gchar *from;
- GtkWidget *image = NULL;
GdkPixbuf *picture = NULL;
+ AvatarRender *avatarr;
msginfo = gtk_cmctree_node_get_row_data(GTK_CMCTREE(summaryview->ctree),
summaryview->selected);
extract_address(from);
full_msginfo = procmsg_msginfo_get_full_info(msginfo);
- if (full_msginfo &&
- full_msginfo->extradata &&
- full_msginfo->extradata->face) {
- image = face_get_from_header(full_msginfo->extradata->face);
- }
-#if HAVE_LIBCOMPFACE
- else if (full_msginfo &&
- full_msginfo->extradata &&
- full_msginfo->extradata->xface) {
- image = xface_get_from_header(full_msginfo->extradata->xface,
- &summaryview->ctree->style->white,
- summaryview->mainwin->window->window);
- }
-#endif
+
+ avatarr = avatars_avatarrender_new(full_msginfo);
+ hooks_invoke(AVATAR_IMAGE_RENDER_HOOKLIST, avatarr);
+
procmsg_msginfo_free(full_msginfo);
- if (image)
- picture = gtk_image_get_pixbuf(GTK_IMAGE(image));
+
+ if (avatarr->image)
+ picture = gtk_image_get_pixbuf(GTK_IMAGE(avatarr->image));
#ifndef USE_NEW_ADDRBOOK
addressbook_add_contact(msginfo->fromname, from, NULL, picture);
debug_print( "addressbook_add_contact - added\n" );
}
#endif
- if (image)
- gtk_widget_destroy(image);
+ avatars_avatarrender_free(avatarr);
}
void summary_select_all(SummaryView *summaryview)
if (node == summaryview->displayed) {
messageview_clear(summaryview->messageview);
+ summary_cancel_mark_read_timeout(summaryview);
summaryview->displayed = NULL;
}
if (GTK_CMCTREE_ROW(node)->children != NULL) {
if (!new_selected &&
gtkut_ctree_node_is_selected(ctree, node)) {
summary_unselect_all(summaryview);
- new_selected = summary_find_next_msg(summaryview, node);
- if (!new_selected)
- new_selected = summary_find_prev_msg
- (summaryview, node);
+ if (summaryview->sort_type == SORT_ASCENDING) {
+ new_selected = summary_find_next_msg(summaryview, node);
+ if (!new_selected)
+ new_selected = summary_find_prev_msg(summaryview, node);
+ } else {
+ new_selected = summary_find_prev_msg(summaryview, node);
+ if (!new_selected)
+ new_selected = summary_find_next_msg(summaryview, node);
+ }
}
gtk_sctree_remove_node((GtkSCTree *)ctree, node);
if (node == summaryview->displayed) {
messageview_clear(summaryview->messageview);
+ summary_cancel_mark_read_timeout(summaryview);
summaryview->displayed = NULL;
}
if (GTK_CMCTREE_ROW(node)->children != NULL) {
if (node == summaryview->displayed)
summaryview->displayed = NULL;
+ summary_cancel_mark_read_timeout(summaryview);
+
for (top_parent = node;
GTK_CMCTREE_ROW(top_parent)->parent != NULL;
top_parent = GTK_CMCTREE_ROW(top_parent)->parent)
return tag_b == NULL ? 0:1;
if (tag_b == NULL)
- return tag_a == NULL ? 0:1;
+ return 1;
return g_utf8_collate(tag_a, tag_b);
}
ctree = gtk_sctree_new_with_titles
(N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], titles);
- /* get normal row height */
- gtk_cmclist_set_row_height(GTK_CMCLIST(ctree), 0);
- normal_row_height = GTK_CMCLIST(ctree)->row_height;
-
if (prefs_common.show_col_headers == FALSE)
gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
g_signal_connect(G_OBJECT(ctree), "button_press_event",
G_CALLBACK(summary_button_pressed),
summaryview);
-#ifndef MAEMO
g_signal_connect(G_OBJECT(ctree), "popup-menu",
G_CALLBACK(summary_popup_menu), summaryview);
-#else
- gtk_widget_tap_and_hold_setup(GTK_WIDGET(ctree), NULL, NULL,
- GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
- g_signal_connect(G_OBJECT(ctree), "tap-and-hold",
- G_CALLBACK(summary_popup_menu), summaryview);
-#endif
g_signal_connect(G_OBJECT(ctree), "button_release_event",
G_CALLBACK(summary_button_released),
summaryview);
else
summary_redisplay_msg(summaryview);
+ /* get normal row height */
+ gtk_cmclist_set_row_height(GTK_CMCLIST(ctree), 0);
+ normal_row_height = GTK_CMCLIST(ctree)->row_height;
+
if ((prefs_common.layout_mode == SMALL_LAYOUT || prefs_common.layout_mode == VERTICAL_LAYOUT) &&
prefs_common.two_line_vert) {
gtk_cmclist_set_row_height(GTK_CMCLIST(summaryview->ctree), 2*normal_row_height + 2);
- } else {
- gtk_cmclist_set_row_height(GTK_CMCLIST(summaryview->ctree), 0);
}
}
static void summary_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
gint column, SummaryView *summaryview)
{
- GList *list, *cur;
+ const GList *list, *cur;
MessageView *msgview;
MsgInfo *msginfo;
gboolean marked_unread = FALSE;
static void summary_date_clicked(GtkWidget *button, SummaryView *summaryview)
{
- summary_sort_by_column_click(summaryview, SORT_BY_DATE);
+ if (summaryview->sort_key == SORT_BY_DATE)
+ summary_sort_by_column_click(summaryview, SORT_BY_DATE);
+ else
+ summary_sort_by_column_click(summaryview, SORT_BY_THREAD_DATE);
}
static void summary_from_clicked(GtkWidget *button, SummaryView *summaryview)
summary_show(summaryview, summaryview->folder_item);
}
-static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
- guint action)
+static void summary_set_hide_menu (SummaryView *summaryview,
+ const gchar *menu_item,
+ guint action)
{
GtkWidget *widget;
- widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideReadMessages");
- g_object_set_data(G_OBJECT(widget), "dont_toggle",
- GINT_TO_POINTER(1));
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
- g_object_set_data(G_OBJECT(widget), "dont_toggle",
- GINT_TO_POINTER(0));
-}
-
-static void summary_set_hide_read_threads_menu (SummaryView *summaryview,
- guint action)
-{
- GtkWidget *widget;
-
- widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideReadThreads");
- g_object_set_data(G_OBJECT(widget), "dont_toggle",
- GINT_TO_POINTER(1));
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
- g_object_set_data(G_OBJECT(widget), "dont_toggle",
- GINT_TO_POINTER(0));
-}
+ widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, menu_item);
+ cm_return_if_fail(widget != NULL);
-static void summary_set_hide_del_msgs_menu (SummaryView *summaryview,
- guint action)
-{
- GtkWidget *widget;
-
- widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideDelMessages");
g_object_set_data(G_OBJECT(widget), "dont_toggle",
GINT_TO_POINTER(1));
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
guint new, unread, unreadmarked, marked, total;
guint replied, forwarded, locked, ignored, watched;
static gboolean tips_initialized = FALSE;
-#if !(GTK_CHECK_VERSION(2,12,0))
- GtkTooltips *tips = summaryview->tooltips;
-#endif
if (prefs_common.layout_mode != SMALL_LAYOUT) {
if (tips_initialized) {
projects / claws.git / blobdiff