#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 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] =
{
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",
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;
+ 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)
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;
}
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)");
}
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)
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;
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