#include "quicksearch.h"
#include "partial_download.h"
#include "timing.h"
+#include "gedit-print.h"
#define SUMMARY_COL_MARK_WIDTH 10
#define SUMMARY_COL_STATUS_WIDTH 13
GtkCTreeNode *row,
FolderItem *to_folder);
-static void summary_execute_move (SummaryView *summaryview);
+static gint summary_execute_move (SummaryView *summaryview);
static void summary_execute_move_func (GtkCTree *ctree,
GtkCTreeNode *node,
gpointer data);
SummaryView *summaryview);
static void summary_from_clicked (GtkWidget *button,
SummaryView *summaryview);
+static void summary_to_clicked (GtkWidget *button,
+ SummaryView *summaryview);
static void summary_subject_clicked (GtkWidget *button,
SummaryView *summaryview);
static void summary_score_clicked (GtkWidget *button,
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/M_ove..."), "<control>O", summary_move_to, 0, NULL},
{N_("/_Copy..."), "<shift><control>O", summary_copy_to, 0, NULL},
- {N_("/_Delete"), "<control>D", summary_delete, 0, NULL},
+ {N_("/Move to _trash"), "<control>D", summary_delete_trash, 0, NULL},
+ {N_("/_Delete..."), NULL, summary_delete, 0, NULL},
{N_("/Cancel a news message"), NULL, summary_cancel, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark"), NULL, NULL, 0, "<Branch>"},
"", /* S_COL_MIME */
N_("Subject"), /* S_COL_SUBJECT */
N_("From"), /* S_COL_FROM */
+ N_("To"), /* S_COL_TO */
N_("Date"), /* S_COL_DATE */
N_("Size"), /* S_COL_SIZE */
N_("No."), /* S_COL_NUMBER */
return summaryview;
}
-void summary_init(SummaryView *summaryview)
+static void summary_set_fonts(SummaryView *summaryview)
{
- GtkWidget *pixmap;
PangoFontDescription *font_desc;
gint size;
- gtk_widget_realize(summaryview->ctree);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
- &markxpm, &markxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_DELETED,
- &deletedxpm, &deletedxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_NEW,
- &newxpm, &newxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_UNREAD,
- &unreadxpm, &unreadxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_REPLIED,
- &repliedxpm, &repliedxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_FORWARDED,
- &forwardedxpm, &forwardedxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP,
- &clipxpm, &clipxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_LOCKED,
- &lockedxpm, &lockedxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_IGNORETHREAD,
- &ignorethreadxpm, &ignorethreadxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_KEY,
- &clipkeyxpm, &clipkeyxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_KEY,
- &keyxpm, &keyxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
- &gpgsignedxpm, &gpgsignedxpmmask);
- stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED,
- &clipgpgsignedxpm, &clipgpgsignedxpmmask);
-
font_desc = pango_font_description_from_string(NORMAL_FONT);
gtk_widget_modify_font(summaryview->ctree, font_desc);
pango_font_description_free(font_desc);
font_desc = pango_font_description_new();
size = pango_font_description_get_size
- (summaryview->statlabel_folder->style->font_desc);
+ (summaryview->ctree->style->font_desc);
pango_font_description_set_size(font_desc, size * PANGO_SCALE_SMALL);
gtk_widget_modify_font(summaryview->statlabel_folder, font_desc);
gtk_widget_modify_font(summaryview->statlabel_select, font_desc);
gtk_widget_modify_font(summaryview->statlabel_msgs, font_desc);
pango_font_description_free(font_desc);
+}
+
+void summary_init(SummaryView *summaryview)
+{
+ GtkWidget *pixmap;
+
+ gtk_widget_realize(summaryview->ctree);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
+ &markxpm, &markxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_DELETED,
+ &deletedxpm, &deletedxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_NEW,
+ &newxpm, &newxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_UNREAD,
+ &unreadxpm, &unreadxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_REPLIED,
+ &repliedxpm, &repliedxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_FORWARDED,
+ &forwardedxpm, &forwardedxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP,
+ &clipxpm, &clipxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_LOCKED,
+ &lockedxpm, &lockedxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_IGNORETHREAD,
+ &ignorethreadxpm, &ignorethreadxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_KEY,
+ &clipkeyxpm, &clipkeyxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_KEY,
+ &keyxpm, &keyxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
+ &gpgsignedxpm, &gpgsignedxpmmask);
+ stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED,
+ &clipgpgsignedxpm, &clipgpgsignedxpmmask);
+
+ summary_set_fonts(summaryview);
pixmap = stock_pixmap_widget(summaryview->hbox_l, STOCK_PIXMAP_DIR_OPEN);
gtk_box_pack_start(GTK_BOX(summaryview->hbox_l), pixmap, FALSE, FALSE, 4);
/* STATUSBAR_POP(summaryview->mainwin); */
is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
+
if (is_refresh) {
selected_msgnum = summary_get_msgnum(summaryview,
summaryview->selected);
main_window_cursor_wait(summaryview->mainwin);
-/*
- mlist = item->folder->get_msg_list(item->folder, item, !update_cache);
-
- !!! NEW !!!
- USE LIST FROM CACHE, WILL NOT DISPLAY ANY MESSAGES DROPED
- BY OTHER PROGRAMS TO THE FOLDER
-*/
mlist = folder_item_get_msg_list(item);
- if (summaryview->folder_item->hide_read_msgs) {
+ if (summaryview->folder_item->hide_read_msgs &&
+ quicksearch_is_active(summaryview->quicksearch) == FALSE) {
GSList *not_killed;
summary_set_hide_read_msgs_menu(summaryview, TRUE);
for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
MsgInfo * msginfo = (MsgInfo *) cur->data;
- if ((MSG_IS_UNREAD(msginfo->flags)
- || MSG_IS_MARKED(msginfo->flags)
- || MSG_IS_LOCKED(msginfo->flags)
- || CURRENTLY_DISPLAYED(msginfo))
- && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+ if (MSG_IS_UNREAD(msginfo->flags) &&
+ !MSG_IS_IGNORE_THREAD(msginfo->flags))
+ not_killed = g_slist_prepend(not_killed, msginfo);
+ else if (is_refresh &&
+ (msginfo->msgnum == selected_msgnum ||
+ msginfo->msgnum == displayed_msgnum))
not_killed = g_slist_prepend(not_killed, msginfo);
else
procmsg_msginfo_free(msginfo);
summary_lock(summaryview);
}
} else {
- /* select first unread message */
- node = summary_find_next_flagged_msg(summaryview, NULL,
- MSG_UNREAD, FALSE);
+ switch (prefs_common.select_on_entry) {
+ case SELECTONENTRY_NEW:
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_NEW, FALSE);
+ if (node == NULL)
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_UNREAD, FALSE);
+ break;
+ case SELECTONENTRY_UNREAD:
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_UNREAD, FALSE);
+ if (node == NULL)
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_NEW, FALSE);
+ break;
+ default:
+ node = NULL;
+ }
+
if (node == NULL && GTK_CLIST(ctree)->row_list != NULL) {
node = gtk_ctree_node_nth
(ctree,
item->sort_type == SORT_DESCENDING
? 0 : GTK_CLIST(ctree)->rows - 1);
}
- if (prefs_common.open_unread_on_enter) {
- summary_unlock(summaryview);
- summary_select_node(summaryview, node,
- messageview_is_visible(summaryview->messageview),
- TRUE);
- summary_lock(summaryview);
- } else {
- summary_select_node(summaryview, node, FALSE, TRUE);
- }
+ summary_unlock(summaryview);
+ summary_select_node(summaryview, node,
+ prefs_common.always_show_msg,
+ TRUE);
+ summary_lock(summaryview);
}
summary_set_column_titles(summaryview);
#undef CURRENTLY_DISPLAYED
+
void summary_clear_list(SummaryView *summaryview)
{
GtkCList *clist = GTK_CLIST(summaryview->ctree);
{"/Move..." , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
{"/Copy..." , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
- {"/Delete" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+ {"/Move to trash" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
+ {"/Delete..." , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
{"/Cancel a news message" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
{"/Mark" , M_TARGET_EXIST},
val = alertpanel(_("No more new messages"),
_("No new message found. "
"Go to next folder?"),
- GTK_STOCK_YES, _("Search again"),
+ GTK_STOCK_YES, _("_Search again"),
GTK_STOCK_NO);
if (val == G_ALERTDEFAULT) {
g_signal_stop_emission_by_name(G_OBJECT(ctree),"key_press_event");
gtk_widget_grab_focus(GTK_WIDGET(ctree));
gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
}
- gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+ summary_unselect_all(summaryview);
if (display_msg && summaryview->displayed == node)
summaryview->displayed = NULL;
summaryview->display_msg = display_msg;
SORT_BY_MIME,
SORT_BY_SUBJECT,
SORT_BY_FROM,
+ SORT_BY_TO,
SORT_BY_DATE,
SORT_BY_SIZE,
SORT_BY_NUMBER,
switch (type) {
case S_COL_SUBJECT:
case S_COL_FROM:
+ case S_COL_TO:
case S_COL_DATE:
case S_COL_NUMBER:
if (prefs_common.trans_hdr)
}
}
+void summary_reflect_prefs(void)
+{
+ SummaryView *summaryview = mainwindow_get_mainwindow()->summaryview;
+ bold_style = bold_marked_style = bold_deleted_style =
+ small_style = small_marked_style = small_deleted_style = NULL;
+ summary_set_fonts(summaryview);
+ summary_set_column_titles(summaryview);
+ summary_show(summaryview, summaryview->folder_item);
+}
+
void summary_sort(SummaryView *summaryview,
FolderSortKey sort_key, FolderSortType sort_type)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCList *clist = GTK_CLIST(summaryview->ctree);
GtkCListCompareFunc cmp_func = NULL;
+ g_signal_handlers_block_by_func(G_OBJECT(summaryview->ctree),
+ G_CALLBACK(summary_tree_expanded), summaryview);
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
switch (sort_key) {
case SORT_BY_MARK:
case SORT_BY_NONE:
break;
default:
- return;
+ goto unlock;
}
summaryview->sort_key = sort_key;
/* allow fallback to don't sort */
if (summaryview->sort_key == SORT_BY_NONE)
- return;
+ goto unlock;
if (cmp_func != NULL) {
debug_print("Sorting summary...");
debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
}
+unlock:
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+ g_signal_handlers_unblock_by_func(G_OBJECT(summaryview->ctree),
+ G_CALLBACK(summary_tree_expanded), summaryview);
}
gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *gnode,
SET_TEXT(S_COL_SIZE);
SET_TEXT(S_COL_DATE);
SET_TEXT(S_COL_FROM);
+ SET_TEXT(S_COL_TO);
SET_TEXT(S_COL_SUBJECT);
#undef SET_TEXT
{
gint count;
gchar *res, *tmp, *email_addr;
+
+ if (addr == NULL)
+ return NULL;
Xstrdup_a(email_addr, addr, return NULL);
extract_address(email_addr);
res = NULL;
if (1 < (count = complete_address(email_addr))) {
tmp = get_complete_address(1);
-/* tmp = addressbook_lookup_name( email_addr );
- if( tmp ) { */
res = procheader_get_fromname(tmp);
g_free(tmp);
}
MsgInfo *msginfo)
{
static gchar date_modified[80];
- static gchar *to = NULL;
static gchar col_score[11];
static gchar buf[BUFFSIZE];
gint *col_pos = summaryview->col_pos;
FolderType ftype = F_UNKNOWN;
+ gchar *from_text = NULL, *to_text = NULL;
+ gboolean should_swap = FALSE;
text[col_pos[S_COL_MARK]] = NULL;
text[col_pos[S_COL_STATUS]] = NULL;
else
text[col_pos[S_COL_DATE]] = _("(No Date)");
- text[col_pos[S_COL_FROM]] = msginfo->fromname ? msginfo->fromname :
- _("(No From)");
-
- if (msginfo->folder && msginfo->folder->folder)
- ftype = msginfo->folder->folder->klass->type;
-
if (ftype != F_NEWS && prefs_common.swap_from && msginfo->from && msginfo->to) {
gchar *addr = NULL;
+
+ addr = g_strdup(msginfo->from);
- Xstrdup_a(addr, msginfo->from, return);
- extract_address(addr);
- if (prefs_common.use_addr_book) {
- if (account_find_from_address(addr)) {
- addr = summary_complete_address(msginfo->to);
- g_free(to);
- to = g_strconcat("-->", addr == NULL ? msginfo->to : addr, NULL);
- text[col_pos[S_COL_FROM]] = to;
- g_free(addr);
- }
- } else {
+ if (addr) {
+ extract_address(addr);
if (account_find_from_address(addr)) {
- g_free(to);
- to = g_strconcat("-->", msginfo->to, NULL);
- text[col_pos[S_COL_FROM]] = to;
+ should_swap = TRUE;
}
+ g_free(addr);
}
}
- /*
- * CLAWS: note that the "text[col_pos[S_COL_FROM]] != to" is really a hack,
- * checking whether the above block (which handles the special case of
- * the --> in sent boxes) was executed.
- */
- if (text[col_pos[S_COL_FROM]] != to && prefs_common.use_addr_book && msginfo->from) {
- gchar *from = summary_complete_address(msginfo->from);
- if (from) {
- g_free(to);
- to = from;
- text[col_pos[S_COL_FROM]] = to;
- }
+ if (!prefs_common.use_addr_book) {
+ from_text = msginfo->fromname ?
+ msginfo->fromname :
+ _("(No From)");
+ } else {
+ gchar *tmp = summary_complete_address(msginfo->from);
+ from_text = tmp ? tmp : (msginfo->fromname ?
+ msginfo->fromname:
+ _("(No From)"));
}
-
+
+ to_text = msginfo->to ? msginfo->to :
+ (msginfo->cc ? msginfo->cc :
+ (msginfo->newsgroups ? msginfo->newsgroups : _("(No Recipient)")
+ )
+ );
+
+ if (!should_swap) {
+ text[col_pos[S_COL_FROM]] = from_text;
+ text[col_pos[S_COL_TO]] = to_text;
+ } else {
+ gchar *tmp = NULL;
+ tmp = g_strconcat("-->", to_text, NULL);
+ text[col_pos[S_COL_FROM]] = tmp;
+ tmp = g_strconcat("<--", from_text, NULL);
+ text[col_pos[S_COL_TO]] = tmp;
+ }
+
+ if (msginfo->folder && msginfo->folder->folder)
+ ftype = msginfo->folder->folder->klass->type;
+
if (summaryview->simplify_subject_preg != NULL)
text[col_pos[S_COL_SUBJECT]] = msginfo->subject ?
string_remove_match(buf, BUFFSIZE, msginfo->subject,
if (!summaryview->selected) return;
if (!summaryview->folder_item) return;
- if (summaryview->folder_item->stype != F_OUTBOX &&
- summaryview->folder_item->stype != F_DRAFT &&
- summaryview->folder_item->stype != F_QUEUE) return;
+ if (!folder_has_parent_of_type(summaryview->folder_item, F_OUTBOX)
+ && !folder_has_parent_of_type(summaryview->folder_item, F_DRAFT)
+ && !folder_has_parent_of_type(summaryview->folder_item, F_QUEUE))
+ return;
msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
summaryview->selected);
GtkCTreeNode *node;
if (summary_is_locked(summaryview)) return FALSE;
-
if (type == GTK_SCROLL_STEP_FORWARD) {
node = gtkut_ctree_node_next(ctree, summaryview->selected);
if (node)
summaryview->moved--;
if (MSG_IS_COPY(msginfo->flags))
summaryview->copied--;
- procmsg_update_unread_children (msginfo, TRUE);
procmsg_msginfo_set_to_folder(msginfo, NULL);
- procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
- procmsg_msginfo_set_flags(msginfo, MSG_MARKED, 0);
+ procmsg_msginfo_change_flags(msginfo, MSG_MARKED, 0, MSG_DELETED, MSG_MOVE | MSG_COPY);
summary_set_row_marks(summaryview, row);
debug_print("Message %s/%d is marked\n", msginfo->folder->path, msginfo->msgnum);
}
changed = TRUE;
}
procmsg_msginfo_set_to_folder(msginfo, NULL);
- procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
- procmsg_msginfo_set_flags(msginfo, MSG_LOCKED, 0);
+ procmsg_msginfo_change_flags(msginfo, MSG_LOCKED, 0, MSG_DELETED, MSG_MOVE | MSG_COPY);
+
summary_set_row_marks(summaryview, row);
debug_print("Message %d is locked\n", msginfo->msgnum);
}
summaryview->moved--;
if (MSG_IS_COPY(msginfo->flags))
summaryview->copied--;
- procmsg_update_unread_children (msginfo, FALSE);
procmsg_msginfo_set_to_folder(msginfo, NULL);
- procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, MSG_MOVE | MSG_COPY);
- procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
+ procmsg_msginfo_change_flags(msginfo, MSG_DELETED, 0, MSG_MARKED, MSG_MOVE | MSG_COPY);
summaryview->deleted++;
if (!prefs_common.immediate_exec &&
- summaryview->folder_item->stype != F_TRASH)
+ !folder_has_parent_of_type(summaryview->folder_item, F_TRASH))
summary_set_row_marks(summaryview, row);
debug_print("Message %s/%d is set to delete\n",
GList *cur;
GtkCTreeNode *sel_last = NULL;
GtkCTreeNode *node;
+ AlertValue aval;
+ MsgInfo *msginfo;
if (!item) return;
if (summary_is_locked(summaryview)) return;
- /* if current folder is trash, ask for confirmation */
- if (item->stype == F_TRASH) {
- AlertValue aval;
- MsgInfo *msginfo;
+ if (!summaryview->folder_item ||
+ FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
- aval = alertpanel(_("Delete message(s)"),
- _("Do you really want to delete message(s) from the trash?"),
- GTK_STOCK_YES, GTK_STOCK_NO, NULL);
- if (aval != G_ALERTDEFAULT) return;
-
- for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL;
- cur = cur->next) {
- GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
- msginfo = gtk_ctree_node_get_row_data(ctree, row);
- if (msginfo->total_size != 0 &&
- msginfo->size != (off_t)msginfo->total_size)
- partial_mark_for_delete(msginfo);
- }
-
+ aval = alertpanel(_("Delete message(s)"),
+ _("Do you really want to delete selected message(s)?"),
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
+ if (aval != G_ALERTDEFAULT) return;
+
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL;
+ cur = cur->next) {
+ GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
+ msginfo = gtk_ctree_node_get_row_data(ctree, row);
+ if (msginfo->total_size != 0 &&
+ msginfo->size != (off_t)msginfo->total_size)
+ partial_mark_for_delete(msginfo);
}
main_window_cursor_wait(summaryview->mainwin);
if (!node)
node = summary_find_prev_msg(summaryview, sel_last);
- summary_select_node(summaryview, node, FALSE, FALSE);
+ summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
- if (prefs_common.immediate_exec || item->stype == F_TRASH) {
+ if (prefs_common.immediate_exec || folder_has_parent_of_type(item, F_TRASH)) {
summary_execute(summaryview);
/* after deleting, the anchor may be at an invalid row
* so reset it to the node we found earlier */
main_window_cursor_normal(summaryview->mainwin);
}
+void summary_delete_trash(SummaryView *summaryview)
+{
+ FolderItem *to_folder = NULL;
+ PrefsAccount *ac;
+ if (!summaryview->folder_item ||
+ FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
+
+ if (NULL != (ac = account_find_from_item(summaryview->folder_item)))
+ to_folder = account_get_special_folder(ac, F_TRASH);
+
+ if (to_folder == NULL)
+ to_folder = summaryview->folder_item->folder->trash;
+
+ if (to_folder == NULL || to_folder == summaryview->folder_item)
+ summary_delete(summaryview);
+ else
+ summary_move_selected_to(summaryview, to_folder);
+}
+
+
static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
summaryview->moved--;
if (MSG_IS_COPY(msginfo->flags))
summaryview->copied--;
- procmsg_update_unread_children (msginfo, FALSE);
procmsg_msginfo_set_to_folder(msginfo, NULL);
procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE | MSG_COPY);
if (MSG_IS_COPY(msginfo->flags)) {
summaryview->copied--;
}
- procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_COPY);
if (!MSG_IS_MOVE(msginfo->flags)) {
- procmsg_msginfo_set_flags(msginfo, 0, MSG_MOVE);
+ procmsg_msginfo_change_flags(msginfo, 0, MSG_MOVE, MSG_MARKED | MSG_DELETED, MSG_COPY);
summaryview->moved++;
+ } else {
+ procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_COPY);
}
+
if (!prefs_common.immediate_exec) {
summary_set_row_marks(summaryview, row);
}
END_LONG_OPERATION(summaryview);
- summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
-
- if (prefs_common.immediate_exec)
+ if (prefs_common.immediate_exec) {
summary_execute(summaryview);
- else {
+ } else {
summary_status_show(summaryview);
}
GtkCTreeNode *node = gtk_ctree_node_nth (GTK_CTREE(summaryview->ctree),
GTK_CLIST(summaryview->ctree)->rows - 1);
if (node)
- summary_select_node(summaryview, node, TRUE, TRUE);
+ summary_select_node(summaryview, node, prefs_common.always_show_msg, TRUE);
}
}
if (MSG_IS_MOVE(msginfo->flags)) {
summaryview->moved--;
}
- procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE);
+
if (!MSG_IS_COPY(msginfo->flags)) {
- procmsg_msginfo_set_flags(msginfo, 0, MSG_COPY);
+ procmsg_msginfo_change_flags(msginfo, 0, MSG_COPY, MSG_MARKED | MSG_DELETED, MSG_MOVE);
summaryview->copied++;
+ } else {
+ procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE);
}
if (!prefs_common.immediate_exec) {
summary_set_row_marks(summaryview, row);
END_LONG_OPERATION(summaryview);
- summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
-
if (prefs_common.immediate_exec)
summary_execute(summaryview);
else {
{
if (!summaryview->folder_item) return;
- if (summaryview->folder_item->total_msgs >= 500) {
- STATUSBAR_PUSH(summaryview->mainwin,
- _("Selecting all messages..."));
- main_window_cursor_wait(summaryview->mainwin);
- }
-
+ summary_lock(summaryview);
gtk_clist_select_all(GTK_CLIST(summaryview->ctree));
-
- if (summaryview->folder_item->total_msgs >= 500) {
- STATUSBAR_POP(summaryview->mainwin);
- main_window_cursor_normal(summaryview->mainwin);
- }
+ summary_unlock(summaryview);
+ summary_status_show(summaryview);
}
void summary_unselect_all(SummaryView *summaryview)
{
+ summary_lock(summaryview);
gtk_sctree_unselect_all(GTK_SCTREE(summaryview->ctree));
+ summary_unlock(summaryview);
+ summary_status_show(summaryview);
}
void summary_select_thread(SummaryView *summaryview)
if ( aval==0 ) { /* append */
if (append_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file `%s'."), tmp);
+ alertpanel_error(_("Can't save the file '%s'."), tmp);
} else { /* overwrite */
if (copy_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file `%s'."), tmp);
+ alertpanel_error(_("Can't save the file '%s'."), tmp);
}
g_free(src);
if (!msginfo) break;
src = procmsg_get_message_file(msginfo);
if (append_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file `%s'."), tmp);
+ alertpanel_error(_("Can't save the file '%s'."), tmp);
}
g_free(src);
}
void summary_print(SummaryView *summaryview)
{
- GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCList *clist = GTK_CLIST(summaryview->ctree);
+#ifndef USE_GNOMEPRINT
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
- GList *cur;
- gchar *cmdline;
+ gchar *cmdline = NULL;
gchar *p;
+#else
+ gboolean first = TRUE;
+ GList *tmplist;
+#endif
+ GList *cur;
if (clist->selection == NULL) return;
-
+#ifndef USE_GNOMEPRINT
cmdline = input_dialog(_("Print"),
_("Enter the print command line:\n"
- "(`%s' will be replaced with file name)"),
+ "('%s' will be replaced with file name)"),
prefs_common.print_cmd);
if (!cmdline) return;
if (!(p = strchr(cmdline, '%')) || *(p + 1) != 's' ||
strchr(p + 2, '%')) {
- alertpanel_error(_("Print command line is invalid:\n`%s'"),
+ alertpanel_error(_("Print command line is invalid:\n'%s'"),
cmdline);
g_free(cmdline);
return;
}
-
for (cur = clist->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
msginfo = gtk_ctree_node_get_row_data
(ctree, GTK_CTREE_NODE(cur->data));
}
g_free(cmdline);
+
+#else
+ tmplist = g_list_copy(clist->selection);
+ summary_unselect_all(summaryview);
+ for (cur = tmplist; cur != NULL && cur->data != NULL; cur = cur->next) {
+ GtkCTreeNode *node = GTK_CTREE_NODE(cur->data);
+ summary_select_node(summaryview, node, TRUE, TRUE);
+ if (!summaryview->messageview->mimeview
+ || !summaryview->messageview->mimeview->textview
+ || !summaryview->messageview->mimeview->textview->text)
+ alertpanel_warning(_("Cannot print: the message doesn't "
+ "contain text."));
+ gedit_print(
+ GTK_TEXT_VIEW(summaryview->messageview->mimeview
+ ->textview->text));
+ }
+ for (cur = tmplist; cur != NULL && cur->data != NULL; cur = cur->next) {
+ GtkCTreeNode *node = GTK_CTREE_NODE(cur->data);
+ gtk_sctree_select_with_state(
+ GTK_SCTREE(clist), node, first ? 0:GDK_CONTROL_MASK);
+ first = FALSE;
+ }
+ g_list_free(tmplist);
+#endif
}
gboolean summary_execute(SummaryView *summaryview)
GtkCList *clist = GTK_CLIST(summaryview->ctree);
GtkCTreeNode *node, *next;
GtkCTreeNode *new_selected = NULL;
+ gint move_val = -1;
if (!summaryview->folder_item) return FALSE;
summary_unthread_for_exec(summaryview);
folder_item_update_freeze();
- gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
- summary_execute_move(summaryview);
+ move_val = summary_execute_move(summaryview);
summary_execute_copy(summaryview);
summary_execute_delete(summaryview);
- folder_item_update_thaw();
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
node = GTK_CTREE_NODE(clist->row_list);
for (; node != NULL; node = next) {
if (!new_selected &&
gtkut_ctree_node_is_selected(ctree, node)) {
- gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+ summary_unselect_all(summaryview);
new_selected = summary_find_next_msg(summaryview, node);
if (!new_selected)
new_selected = summary_find_prev_msg
gtk_ctree_remove_node(ctree, node);
}
+ folder_item_update_thaw();
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
if (new_selected) {
+ summary_unlock(summaryview);
gtk_sctree_select
(GTK_SCTREE(ctree),
- summaryview->displayed ? summaryview->displayed
- : new_selected);
+ new_selected);
+ summary_lock(summaryview);
}
- if (summaryview->threaded)
+ if (summaryview->threaded) {
+ gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
summary_thread_build(summaryview);
+ summary_thread_init(summaryview);
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+ }
summaryview->selected = clist->selection ?
GTK_CTREE_NODE(clist->selection->data) : NULL;
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
- gtk_clist_thaw(clist);
-
summary_unlock(summaryview);
+
+ if (move_val < 0)
+ summary_show(summaryview, summaryview->folder_item);
return TRUE;
}
-static void summary_execute_move(SummaryView *summaryview)
+static gint summary_execute_move(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GSList *cur;
-
+ gint val = -1;
/* search moving messages and execute */
gtk_ctree_pre_recursive(ctree, NULL, summary_execute_move_func,
summaryview);
if (summaryview->mlist) {
- procmsg_move_messages(summaryview->mlist);
+ val = procmsg_move_messages(summaryview->mlist);
for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
procmsg_msginfo_free((MsgInfo *)cur->data);
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
}
+ return val;
}
static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
static void summary_execute_delete(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- FolderItem *trash;
GSList *cur;
- trash = summaryview->folder_item->folder->trash;
-
/* search deleting messages and execute */
gtk_ctree_pre_recursive
(ctree, NULL, summary_execute_delete_func, summaryview);
if (!summaryview->mlist) return;
- if (trash == NULL || summaryview->folder_item == trash)
- folder_item_remove_msgs(summaryview->folder_item,
- summaryview->mlist);
- else
- folder_item_move_msgs(trash, summaryview->mlist);
+ folder_item_remove_msgs(summaryview->folder_item,
+ summaryview->mlist);
for (cur = summaryview->mlist; cur != NULL && cur->data != NULL; cur = cur->next)
procmsg_msginfo_free((MsgInfo *)cur->data);
GtkCTreeNode *node;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- summary_lock(summaryview);
-
debug_print("Unthreading for execution...");
- gtk_clist_freeze(GTK_CLIST(ctree));
+ START_LONG_OPERATION(summaryview);
for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
summary_unthread_for_exec_func(ctree, node, NULL);
}
- gtk_clist_thaw(GTK_CLIST(ctree));
+ END_LONG_OPERATION(summaryview);
debug_print("done.\n");
-
- summary_unlock(summaryview);
}
static void summary_unthread_for_exec_func(GtkCTree *ctree, GtkCTreeNode *node,
msginfo = gtk_ctree_node_get_row_data(ctree, row);
- procmsg_msginfo_unset_flags(msginfo, MSG_CLABEL_FLAG_MASK, 0);
- procmsg_msginfo_set_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0);
+ procmsg_msginfo_change_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0,
+ MSG_CLABEL_FLAG_MASK, 0);
}
void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
prefs_common.summary_col_size[S_COL_SUBJECT]);
gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_FROM],
prefs_common.summary_col_size[S_COL_FROM]);
+ gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_TO],
+ prefs_common.summary_col_size[S_COL_TO]);
gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_DATE],
prefs_common.summary_col_size[S_COL_DATE]);
gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_SIZE],
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SIZE , summary_size_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_DATE , summary_date_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_FROM , summary_from_clicked);
+ CLIST_BUTTON_SIGNAL_CONNECT(S_COL_TO , summary_to_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SUBJECT, summary_subject_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_SCORE, summary_score_clicked);
CLIST_BUTTON_SIGNAL_CONNECT(S_COL_LOCKED, summary_locked_clicked);
gtk_widget_destroy(summaryview->ctree);
summaryview->ctree = ctree = summary_ctree_create(summaryview);
+ summary_set_fonts(summaryview);
pixmap = gtk_image_new_from_pixmap(clipxpm, clipxpmmask);
gtk_clist_set_column_widget(GTK_CLIST(ctree),
summaryview->col_pos[S_COL_MIME], pixmap);
break;
case GDK_Delete:
BREAK_ON_MODIFIER_KEY();
- summary_delete(summaryview);
+ summary_delete_trash(summaryview);
break;
default:
break;
static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
{
- if (summaryview->folder_item->stype == F_OUTBOX ||
- summaryview->folder_item->stype == F_DRAFT ||
- summaryview->folder_item->stype == F_QUEUE)
+ if (folder_has_parent_of_type(summaryview->folder_item, F_OUTBOX)
+ || folder_has_parent_of_type(summaryview->folder_item, F_DRAFT)
+ || folder_has_parent_of_type(summaryview->folder_item, F_QUEUE))
summary_reedit(summaryview);
else
summary_open_msg(summaryview);
MsgInfo *msginfo;
gboolean marked_unread = FALSE;
- if (summary_is_locked(summaryview))
+ if (summary_is_locked(summaryview)
+ || GTK_SCTREE(ctree)->selecting_range) {
return;
-
- if (column == -1 && GTK_CLIST(ctree)->selection
- && GTK_CLIST(ctree)->selection->next) {
- /* multiple selection */
- summary_status_show(summaryview);
}
+ summary_status_show(summaryview);
+
if (GTK_CLIST(ctree)->selection &&
GTK_CLIST(ctree)->selection->next) {
summaryview->display_msg = FALSE;
{
GtkCTreeNode *node = NULL;
START_TIMING("summary_sort_by_column_click");
- g_signal_handlers_block_by_func(G_OBJECT(summaryview->ctree),
- G_CALLBACK(summary_tree_expanded), summaryview);
- gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
if (summaryview->sort_key == sort_key)
summary_sort(summaryview, sort_key,
summaryview->sort_type == SORT_ASCENDING
else
summary_sort(summaryview, sort_key, SORT_ASCENDING);
- gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
- g_signal_handlers_unblock_by_func(G_OBJECT(summaryview->ctree),
- G_CALLBACK(summary_tree_expanded), summaryview);
-
node = GTK_CTREE_NODE(GTK_CLIST(summaryview->ctree)->row_list);
while (prefs_common.bold_unread && node) {
summary_sort_by_column_click(summaryview, SORT_BY_FROM);
}
+static void summary_to_clicked(GtkWidget *button, SummaryView *summaryview)
+{
+ summary_sort_by_column_click(summaryview, SORT_BY_TO);
+}
+
static void summary_subject_clicked(GtkWidget *button,
SummaryView *summaryview)
{
CMP_FUNC_DEF(summary_cmp_by_size, msginfo1->size - msginfo2->size)
CMP_FUNC_DEF(summary_cmp_by_date, msginfo1->date_t - msginfo2->date_t)
-#undef CMP_FUNC_DEF
-#define CMP_FUNC_DEF(func_name, var_name) \
-static gint func_name(GtkCList *clist, \
- gconstpointer ptr1, gconstpointer ptr2) \
-{ \
- MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data; \
- MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data; \
- \
- if (!msginfo1->var_name) \
- return (msginfo2->var_name != NULL); \
- if (!msginfo2->var_name) \
- return -1; \
- \
- return g_utf8_collate(msginfo1->var_name, msginfo2->var_name); \
-}
-
-CMP_FUNC_DEF(summary_cmp_by_to, to);
-
#undef CMP_FUNC_DEF
static gint summary_cmp_by_subject(GtkCList *clist,
return g_utf8_collate(str1, str2);
}
+static gint summary_cmp_by_to(GtkCList *clist, gconstpointer ptr1,
+ gconstpointer ptr2)
+{
+ const gchar *str1, *str2;
+ const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
+ const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
+ const SummaryView *sv = g_object_get_data(G_OBJECT(clist), "summaryview");
+
+ g_return_val_if_fail(sv, -1);
+
+ str1 = GTK_CELL_TEXT(r1->cell[sv->col_pos[S_COL_TO]])->text;
+ str2 = GTK_CELL_TEXT(r2->cell[sv->col_pos[S_COL_TO]])->text;
+
+ if (!str1)
+ return str2 != NULL;
+
+ if (!str2)
+ return -1;
+
+ return g_utf8_collate(str1, str2);
+}
+
static gint summary_cmp_by_simplified_subject
(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
{
if (mff->account->mark_crosspost_read) {
line = g_string_sized_new(128);
- g_string_sprintf(line, "%s:%d", msginfo->folder->path, msginfo->msgnum);
+ g_string_printf(line, "%s:%d", msginfo->folder->path, msginfo->msgnum);
debug_print("nfcp: checking <%s>", line->str);
if (mff->newsart &&
g_hash_table_lookup_extended(mff->newsart, line->str, &key, &value)) {
debug_print(" <%s>", (gchar *)value);
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
- procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
- procmsg_msginfo_set_flags(msginfo, mff->account->crosspost_col, 0);
+ procmsg_msginfo_change_flags(msginfo,
+ mff->account->crosspost_col, 0, MSG_NEW | MSG_UNREAD, 0);
}
g_hash_table_remove(mff->newsart, key);
g_free(key);
if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
summaryview->unreadmarked--;
- procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
- procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
+ procmsg_msginfo_change_flags(msginfo, MSG_IGNORE_THREAD, 0, MSG_NEW | MSG_UNREAD, 0);
summary_set_row_marks(summaryview, row);
debug_print("Message %d is marked as ignore thread\n",
STATUSBAR_PUSH(summaryview->mainwin, buf);
g_free(buf);
-/*
- mlist = item->folder->get_msg_list(item->folder, item,
- TRUE);
-*/
mlist = folder_item_get_msg_list(item);
for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = cur->next) {
MsgInfo * msginfo;
g_free(mbox);
}
+
+void summaryview_lock(SummaryView *summaryview, FolderItem *item)
+{
+ if (!summaryview || !summaryview->folder_item || !item) {
+ return;
+ }
+
+ if (summaryview->folder_item->folder == item->folder) {
+ gtk_widget_set_sensitive(summaryview->ctree, FALSE);
+ }
+}
+void summaryview_unlock(SummaryView *summaryview, FolderItem *item)
+{
+ gtk_widget_set_sensitive(summaryview->ctree, TRUE);
+}
projects / claws.git / blobdiff