#include <glib.h>
#include <gdk/gdkkeysyms.h>
+#include <gtk/gtkbindings.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkpixmap.h>
#include <gtk/gtkarrow.h>
#include <gtk/gtkeventbox.h>
#include <gtk/gtkstatusbar.h>
+#include <gtk/gtkmenuitem.h>
#include <stdio.h>
#include <stdlib.h>
#include "utils.h"
#include "gtkutils.h"
#include "filesel.h"
+#include "manage_window.h"
#include "alertpanel.h"
#include "inputdialog.h"
#include "statusbar.h"
#include "filter.h"
#include "folder.h"
+#include "addressbook.h"
+#include "addr_compl.h"
+#include "scoring.h"
+#include "prefs_folder_item.h"
#include "pixmaps/dir-open.xpm"
#include "pixmaps/mark.xpm"
static GtkCTreeNode *summary_find_next_unread_msg
(SummaryView *summaryview,
GtkCTreeNode *current_node);
+static GtkCTreeNode *summary_find_next_marked_msg
+ (SummaryView *summaryview,
+ GtkCTreeNode *current_node);
+static GtkCTreeNode *summary_find_prev_marked_msg
+ (SummaryView *summaryview,
+ GtkCTreeNode *current_node);
static GtkCTreeNode *summary_find_msg_by_msgnum
(SummaryView *summaryview,
guint msgnum);
static void summary_show_all_header_cb (SummaryView *summaryview,
guint action,
GtkWidget *widget);
+static void summary_add_sender_to_cb (SummaryView *summaryview,
+ guint action,
+ GtkWidget *widget);
static void summary_num_clicked (GtkWidget *button,
SummaryView *summaryview);
+static void summary_score_clicked (GtkWidget *button,
+ SummaryView *summaryview);
static void summary_size_clicked (GtkWidget *button,
SummaryView *summaryview);
static void summary_date_clicked (GtkWidget *button,
static gint summary_cmp_by_subject (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
+static gint summary_cmp_by_score (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
GtkTargetEntry summary_drag_types[1] =
{
GtkWidget *toggle_arrow;
GtkWidget *popupmenu;
GtkItemFactory *popupfactory;
+ GtkBindingSet *binding_set;
gint n_entries;
gint i;
titles[S_COL_FROM] = "From";
titles[S_COL_SUBJECT] = "Subject";
}
- titles[S_COL_SIZE] = _("Size");
+ titles[S_COL_SIZE] = _("Size");
+ titles[S_COL_SCORE] = _("Score");
ctree = gtk_sctree_new_with_titles(N_SUMMARY_COLS, S_COL_SUBJECT, titles);
gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_JUSTIFY_CENTER);
gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_NUMBER,
GTK_JUSTIFY_RIGHT);
+ gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_SCORE,
+ GTK_JUSTIFY_RIGHT);
gtk_clist_set_column_justification(GTK_CLIST(ctree), S_COL_SIZE,
GTK_JUSTIFY_RIGHT);
gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_MARK,
SUMMARY_COL_MIME_WIDTH);
gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_NUMBER,
prefs_common.summary_col_number);
+ gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_SCORE,
+ prefs_common.summary_col_score);
gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_SIZE,
prefs_common.summary_col_size);
gtk_clist_set_column_width(GTK_CLIST(ctree), S_COL_DATE,
"clicked",
GTK_SIGNAL_FUNC(summary_num_clicked),
summaryview);
+ gtk_signal_connect
+ (GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_SCORE].button),
+ "clicked",
+ GTK_SIGNAL_FUNC(summary_score_clicked),
+ summaryview);
gtk_signal_connect
(GTK_OBJECT(GTK_CLIST(ctree)->column[S_COL_SIZE].button),
"clicked",
"<SummaryView>", &popupfactory,
summaryview);
+ /* bind keys */
+ binding_set = gtk_binding_set_by_class
+ (GTK_CLIST_CLASS(GTK_OBJECT(ctree)->klass));
+
+ gtk_binding_entry_add_signal(binding_set, GDK_n, GDK_CONTROL_MASK,
+ "scroll_vertical", 2,
+ GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
+ GTK_TYPE_FLOAT, 0.0);
+ gtk_binding_entry_add_signal(binding_set, GDK_p, GDK_CONTROL_MASK,
+ "scroll_vertical", 2,
+ GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
+ GTK_TYPE_FLOAT, 0.0);
+ gtk_binding_entry_clear(binding_set, GDK_space, 0);
+
/* connect signals */
gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
GTK_SIGNAL_FUNC(summary_selected), summaryview);
gchar *buf;
gboolean is_refresh;
guint prev_msgnum = 0;
+ GSList *cur;
+ gint sort_mode;
+ gint sort_type;
STATUSBAR_POP(summaryview->mainwin);
- is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
- if (is_refresh)
+ is_refresh = (!prefs_common.open_inbox_on_inc &&
+ item == summaryview->folder_item) ? TRUE : FALSE;
+ if (is_refresh) {
prev_msgnum = summary_get_current_msgnum(summaryview);
+ if (prev_msgnum < 1)
+ is_refresh = FALSE;
+ }
#if 0
/* process the marks if any */
return FALSE;
} else
#endif
- summary_write_cache(summaryview);
+ if (!is_refresh)
+ summary_write_cache(summaryview);
gtk_clist_freeze(GTK_CLIST(ctree));
mlist = item->folder->get_msg_list(item->folder, item, !update_cache);
+ for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
+ MsgInfo * msginfo = (MsgInfo *) cur->data;
+
+ msginfo->score = score_message(prefs_scoring, msginfo);
+ }
+
STATUSBAR_POP(summaryview->mainwin);
/* set ctree and hash table from the msginfo list
main_window_cursor_normal(summaryview->mainwin);
+ /* sort before */
+ sort_mode = prefs_folder_item_get_sort_mode(item);
+ sort_type = prefs_folder_item_get_sort_type(item);
+
+ if (sort_mode != SORT_BY_NONE) {
+ summaryview->sort_mode = sort_mode;
+ if (sort_type == GTK_SORT_DESCENDING)
+ summaryview->sort_type = GTK_SORT_ASCENDING;
+ else
+ summaryview->sort_type = GTK_SORT_DESCENDING;
+
+ summary_sort(summaryview, sort_mode);
+ }
+
return TRUE;
}
}
}
+void summary_select_next_marked(SummaryView *summaryview)
+{
+ GtkCTreeNode *node;
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+
+ node = summary_find_next_marked_msg(summaryview,
+ summaryview->selected);
+
+ if (!node) {
+ AlertValue val;
+
+ val = alertpanel(_("No more marked messages"),
+ _("No marked message found. "
+ "Search from the beginning?"),
+ _("Yes"), _("No"), NULL);
+ if (val != G_ALERTDEFAULT) return;
+ node = summary_find_next_marked_msg(summaryview,
+ NULL);
+ }
+ if (!node) {
+ alertpanel_notice(_("No marked messages."));
+ } else {
+ gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+ gtk_sctree_select(GTK_SCTREE(ctree), node);
+ if (summaryview->displayed == node)
+ summaryview->displayed = NULL;
+ summary_display_msg(summaryview, node, FALSE);
+ }
+}
+
+void summary_select_prev_marked(SummaryView *summaryview)
+{
+ GtkCTreeNode *node;
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+
+ node = summary_find_prev_marked_msg(summaryview,
+ summaryview->selected);
+
+ if (!node) {
+ AlertValue val;
+
+ val = alertpanel(_("No more marked messages"),
+ _("No marked message found. "
+ "Search from the end?"),
+ _("Yes"), _("No"), NULL);
+ if (val != G_ALERTDEFAULT) return;
+ node = summary_find_prev_marked_msg(summaryview,
+ NULL);
+ }
+ if (!node) {
+ alertpanel_notice(_("No marked messages."));
+ } else {
+ gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+ gtk_sctree_select(GTK_SCTREE(ctree), node);
+ if (summaryview->displayed == node)
+ summaryview->displayed = NULL;
+ summary_display_msg(summaryview, node, FALSE);
+ }
+}
+
void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
{
GtkCTreeNode *node;
return node;
}
+static GtkCTreeNode *summary_find_next_marked_msg(SummaryView *summaryview,
+ GtkCTreeNode *current_node)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GtkCTreeNode *node;
+ MsgInfo *msginfo;
+
+ if (current_node)
+ node = GTK_CTREE_NODE_NEXT(current_node);
+ else
+ node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+ for (; node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
+ msginfo = gtk_ctree_node_get_row_data(ctree, node);
+ if (MSG_IS_MARKED(msginfo->flags)) break;
+ }
+
+ return node;
+}
+
+static GtkCTreeNode *summary_find_prev_marked_msg(SummaryView *summaryview,
+ GtkCTreeNode *current_node)
+{
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GtkCTreeNode *node;
+ MsgInfo *msginfo;
+
+ if (current_node)
+ node = GTK_CTREE_NODE_PREV(current_node);
+ else
+ node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+
+ for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
+ msginfo = gtk_ctree_node_get_row_data(ctree, node);
+ if (MSG_IS_MARKED(msginfo->flags)) break;
+ }
+
+ return node;
+}
+
static GtkCTreeNode *summary_find_msg_by_msgnum(SummaryView *summaryview,
guint msgnum)
{
GtkCList *clist = GTK_CLIST(summaryview->ctree);
GtkCListCompareFunc cmp_func;
+ if (!summaryview->folder_item)
+ return;
+
switch (type) {
case SORT_BY_NUMBER:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_num;
case SORT_BY_SUBJECT:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_subject;
break;
+ case SORT_BY_SCORE:
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_score;
+ break;
default:
return;
}
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
//gtkut_ctree_set_focus_row(ctree, summaryview->selected);
+ prefs_folder_item_set_config(summaryview->folder_item,
+ summaryview->sort_type,
+ summaryview->sort_mode);
+ prefs_folder_item_save_config(summaryview->folder_item);
+
debug_print(_("done.\n"));
STATUSBAR_POP(summaryview->mainwin);
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
+ MsgInfo *parentinfo;
+ MsgInfo *cur_msginfo;
GtkCTreeNode *node, *parent;
gchar *text[N_SUMMARY_COLS];
GHashTable *msgid_table;
+ GSList * cur;
+ GtkCTreeNode *cur_parent;
if (!mlist) return;
msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
summaryview->msgid_table = msgid_table;
- if (prefs_common.enable_thread) {
+ if (prefs_common.use_addr_book)
+ start_address_completion();
+
+ main_window_set_thread_option(summaryview->mainwin);
+
+ for (cur = mlist ; cur != NULL; cur = cur->next) {
+ msginfo = (MsgInfo *)cur->data;
+ msginfo->threadscore = msginfo->score;
+ }
+
+ /* if (prefs_common.enable_thread) { */
+ if (summaryview->folder_item->prefs->enable_thread) {
for (; mlist != NULL; mlist = mlist->next) {
msginfo = (MsgInfo *)mlist->data;
parent = NULL;
- summary_set_header(text, msginfo);
-
/* search parent node for threading */
- if (msginfo->inreplyto && *msginfo->inreplyto)
+ if (msginfo->inreplyto && *msginfo->inreplyto) {
parent = g_hash_table_lookup
(msgid_table, msginfo->inreplyto);
+ }
+
+ summary_set_header(text, msginfo);
node = gtk_ctree_insert_node
(ctree, parent, NULL, text, 2,
== NULL)
g_hash_table_insert(msgid_table,
msginfo->msgid, node);
+
+ cur_parent = parent;
+ cur_msginfo = msginfo;
+ while (cur_parent != NULL) {
+ parentinfo = gtk_ctree_node_get_row_data(ctree, cur_parent);
+
+ if (!parentinfo)
+ break;
+
+ if (parentinfo->threadscore <
+ cur_msginfo->threadscore) {
+ gchar * s;
+ parentinfo->threadscore =
+ cur_msginfo->threadscore;
+#if 0
+ s = itos(parentinfo->threadscore);
+ gtk_ctree_node_set_text(ctree, cur_parent, S_COL_SCORE, s);
+#endif
+ }
+ else break;
+
+ cur_msginfo = parentinfo;
+ if (cur_msginfo->inreplyto &&
+ *cur_msginfo->inreplyto) {
+ cur_parent = g_hash_table_lookup(msgid_table, cur_msginfo->inreplyto);
+ }
+ }
}
/* complete the thread */
optimal_width);
}
+ if (prefs_common.use_addr_book)
+ end_address_completion();
+
debug_print(_("done.\n"));
STATUSBAR_POP(summaryview->mainwin);
if (debug_mode)
{
static gchar date_modified[80];
static gchar *to = NULL;
+ static gchar *from_name = NULL;
+ static gchar col_number[11];
+ static gchar col_score[11];
text[S_COL_MARK] = NULL;
text[S_COL_UNREAD] = NULL;
text[S_COL_MIME] = NULL;
- text[S_COL_NUMBER] = itos(msginfo->msgnum);
+ text[S_COL_NUMBER] = itos_buf(col_number, msginfo->msgnum);
text[S_COL_SIZE] = to_human_readable(msginfo->size);
+#if 0
+ text[S_COL_SCORE] = itos_buf(col_score, msginfo->threadscore);
+#else
+ text[S_COL_SCORE] = itos_buf(col_score, msginfo->score);
+#endif
if (msginfo->date_t) {
procheader_date_get_localtime(date_modified,
text[S_COL_FROM] = msginfo->fromname ? msginfo->fromname :
_("(No From)");
if (prefs_common.swap_from && msginfo->from && msginfo->to &&
- cur_account && cur_account->address) {
+ cur_account && cur_account->address &&
+ !MSG_IS_NEWS(msginfo->flags)) {
gchar *from;
Xalloca(from, strlen(msginfo->from) + 1, return);
}
}
+ if ((text[S_COL_FROM] != to) && prefs_common.use_addr_book &&
+ msginfo->from) {
+ gint count;
+ gchar *from;
+
+ Xalloca(from, strlen(msginfo->from) + 1, return);
+ strcpy(from, msginfo->from);
+ extract_address(from);
+ count = complete_address(from);
+ if (count > 1) {
+ g_free(from_name);
+ from = get_complete_address(1);
+ from_name = procheader_get_fromname(from);
+ g_free(from);
+ text[S_COL_FROM] = from_name;
+ }
+ }
+
text[S_COL_SUBJECT] = msginfo->subject ? msginfo->subject :
_("(No Subject)");
}
}
g_free(filename);
- if (MSG_IS_NEW(msginfo->flags))
- summaryview->newmsgs--;
- if (MSG_IS_UNREAD(msginfo->flags))
- summaryview->unread--;
- if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
- MSG_UNSET_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
- summary_set_row_marks(summaryview, row);
- gtk_clist_thaw(GTK_CLIST(ctree));
- summary_status_show(summaryview);
- }
-
if (new_window) {
MessageView *msgview;
gtkut_ctree_node_move_if_on_the_edge(ctree, row);
}
+ if (MSG_IS_NEW(msginfo->flags))
+ summaryview->newmsgs--;
+ if (MSG_IS_UNREAD(msginfo->flags))
+ summaryview->unread--;
+ if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
+ MSG_UNSET_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
+ summary_set_row_marks(summaryview, row);
+ gtk_clist_thaw(GTK_CLIST(ctree));
+ summary_status_show(summaryview);
+ }
+
if (GTK_WIDGET_VISIBLE(summaryview->headerwin->window))
header_window_show(summaryview->headerwin, msginfo);
strchr(p + 2, '%')) {
alertpanel_error(_("Print command line is invalid:\n`%s'"),
cmdline);
+ g_free(cmdline);
return;
}
(ctree, GTK_CTREE_NODE(cur->data));
if (msginfo) procmsg_print_message(msginfo, cmdline);
}
+
+ g_free(cmdline);
}
void summary_execute(SummaryView *summaryview)
GSList *cur;
trash = summaryview->folder_item->folder->trash;
- g_return_if_fail(trash != NULL);
+ if (summaryview->folder_item->folder->type == F_MH) {
+ g_return_if_fail(trash != NULL);
+ }
if (summaryview->folder_item == trash) return;
/* search deleting messages and execute */
if (event->button == 3) {
/* right clicked */
+ summary_add_sender_to_cb(summaryview, 0, 0);
gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
NULL, NULL, event->button, event->time);
} else if (event->button == 2) {
if (alertpanel(_("Exit"), _("Exit this program?"),
_("OK"), _("Cancel"), NULL)
== G_ALERTDEFAULT) {
+ manage_window_focus_in
+ (summaryview->mainwin->window,
+ NULL, NULL);
app_will_exit(NULL, summaryview->mainwin);
}
}
case S_COL_NUMBER:
prefs_common.summary_col_number = width;
break;
+ case S_COL_SCORE:
+ prefs_common.summary_col_score = width;
+ break;
case S_COL_SIZE:
prefs_common.summary_col_size = width;
break;
header_window_show_cb(summaryview->mainwin, action, widget);
}
+static void summary_add_sender_to_cb (SummaryView *summaryview,
+ guint action,
+ GtkWidget *widget_)
+{
+ GtkWidget *submenu;
+ GList *groups, *tmp;
+ GtkMenuShell *menushell;
+ GtkWidget *menu;
+ GtkWidget *menuitem;
+ GList *child = menushell->children;
+ gboolean found = FALSE;
+ MsgInfo *msginfo;
+ gchar *from_address;
+
+ menushell = GTK_MENU_SHELL(summaryview->popupmenu);
+ g_return_if_fail(GTK_MENU_SHELL(summaryview->popupmenu));
+
+ /* we're iterating each menu item searching for the one with
+ * a "contacts" object data. if not found add the menu,
+ * else update it */
+ for (child = g_list_first(menushell->children); child; child = g_list_next(child)) {
+ if (gtk_object_get_data(GTK_OBJECT(child->data), "contacts")) {
+ found = TRUE;
+ break;
+ }
+ }
+
+ /* add item to default context menu if not present */
+ if (!found) {
+ submenu = gtk_menu_item_new_with_label(_("Add sender to address book"));
+ gtk_object_set_data(GTK_OBJECT(submenu), "contacts", (gpointer)1);
+ gtk_menu_insert(GTK_MENU(summaryview->popupmenu), submenu, 12);
+ gtk_widget_show(submenu);
+ }
+ else {
+ submenu = (GtkWidget *) child->data;
+ }
+
+ /* get the address info from the summary view */
+ msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+ summaryview->selected);
+ g_return_if_fail(msginfo != NULL);
+
+ from_address = g_strdup(msginfo->from);
+ eliminate_address_comment(from_address);
+ extract_address(from_address);
+ log_message("adding %s %s\n", msginfo->fromname, from_address);
+ addressbook_add_contact_by_menu(submenu, msginfo->fromname, from_address, NULL);
+ g_free(from_address);
+
+}
+
static void summary_num_clicked(GtkWidget *button, SummaryView *summaryview)
{
summary_sort(summaryview, SORT_BY_NUMBER);
}
+static void summary_score_clicked(GtkWidget *button,
+ SummaryView *summaryview)
+{
+ summary_sort(summaryview, SORT_BY_SCORE);
+}
+
static void summary_size_clicked(GtkWidget *button, SummaryView *summaryview)
{
summary_sort(summaryview, SORT_BY_SIZE);
gtk_clist_set_column_visibility(clist, S_COL_UNREAD, prefs_common.show_unread);
gtk_clist_set_column_visibility(clist, S_COL_MIME, prefs_common.show_mime);
gtk_clist_set_column_visibility(clist, S_COL_NUMBER, prefs_common.show_number);
+ gtk_clist_set_column_visibility(clist, S_COL_SCORE, prefs_common.show_score);
gtk_clist_set_column_visibility(clist, S_COL_SIZE, prefs_common.show_size);
gtk_clist_set_column_visibility(clist, S_COL_DATE, prefs_common.show_date);
gtk_clist_set_column_visibility(clist, S_COL_FROM, prefs_common.show_from);
return strcasecmp(msginfo1->subject, msginfo2->subject);
}
+
+static gint summary_cmp_by_score(GtkCList *clist,
+ gconstpointer ptr1, gconstpointer ptr2)
+{
+ MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
+ MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+ int diff;
+
+ /* if score are equal, sort by date */
+
+ diff = msginfo1->threadscore - msginfo2->threadscore;
+ if (diff != 0)
+ return diff;
+ else
+ return summary_cmp_by_date(clist, ptr1, ptr2);
+}
projects / claws.git / blobdiff