#include "filtering.h"
#include "string_match.h"
#include "toolbar.h"
+#include "news.h"
#define SUMMARY_COL_MARK_WIDTH 10
#define SUMMARY_COL_UNREAD_WIDTH 13
static GtkItemFactoryEntry summary_popup_entries[] =
{
{N_("/_Reply"), NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
- {N_("/Repl_y to sender"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+ {N_("/Repl_y to"), NULL, NULL, 0, "<Branch>"},
+ {N_("/Repl_y to/_all"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+ {N_("/Repl_y to/_sender"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+ {N_("/Repl_y to/mailing _list"),
+ NULL, summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
{N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
- {N_("/Reply to a_ll"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+ {N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Forward"), NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
{N_("/Redirect"), NULL, summary_reply_cb, COMPOSE_REDIRECT, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_QUICKSEARCH);
gtk_container_add (GTK_CONTAINER(summaryview->toggle_search), pixmap);
gtk_widget_show(pixmap);
+ summaryview->quick_search_pixmap = pixmap;
/* Init summaryview prefs */
summaryview->sort_key = SORT_BY_NONE;
return best_node;
}
+#define CURRENTLY_DISPLAYED(m) \
+( (m->msgnum == displayed_msgnum) \
+ && (!g_strcasecmp(m->folder->name,item->name)) )
+
gboolean summary_show(SummaryView *summaryview, FolderItem *item)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
if ((MSG_IS_UNREAD(msginfo->flags)
|| MSG_IS_MARKED(msginfo->flags)
- || MSG_IS_LOCKED(msginfo->flags))
+ || MSG_IS_LOCKED(msginfo->flags)
+ || CURRENTLY_DISPLAYED(msginfo))
&& !MSG_IS_IGNORE_THREAD(msginfo->flags))
not_killed = g_slist_append(not_killed, msginfo);
else
return TRUE;
}
+#undef CURRENTLY_DISPLAYED
+
void summary_clear_list(SummaryView *summaryview)
{
GtkCList *clist = GTK_CLIST(summaryview->ctree);
summaryview->subject_table = NULL;
}
summaryview->mlist = NULL;
- if (summaryview->folder_table) {
- g_hash_table_destroy(summaryview->folder_table);
- summaryview->folder_table = NULL;
- }
gtk_clist_clear(clist);
if (summaryview->col_pos[S_COL_SUBJECT] == N_SUMMARY_COLS - 1) {
sens = (selection == SUMMARY_SELECTED_MULTIPLE) ? FALSE : TRUE;
menu_set_sensitive(ifactory, "/Reply", sens);
- menu_set_sensitive(ifactory, "/Reply to sender", sens);
- menu_set_sensitive(ifactory, "/Reply to all", sens);
+ menu_set_sensitive(ifactory, "/Reply to", sens);
+ menu_set_sensitive(ifactory, "/Reply to/all", sens);
+ menu_set_sensitive(ifactory, "/Reply to/sender", sens);
+ menu_set_sensitive(ifactory, "/Reply to/mailing list", sens);
menu_set_sensitive(ifactory, "/Forward", TRUE);
menu_set_sensitive(ifactory, "/Redirect", sens);
else
menu_set_sensitive(ifactory, "/Re-edit", FALSE);
- menu_set_sensitive(ifactory, "/Save as...", sens);
+ menu_set_sensitive(ifactory, "/Save as...", TRUE);
menu_set_sensitive(ifactory, "/Print...", TRUE);
menu_set_sensitive(ifactory, "/Select all", TRUE);
g_node_destroy(root);
+ folderview_update_items_when_required(FALSE);
+
summary_thread_init(summaryview);
} else {
gchar *text[N_SUMMARY_COLS];
g_free(filename);
if (new_window || !prefs_common.mark_as_read_on_new_window) {
- if (MSG_IS_NEW(msginfo->flags) && MSG_IS_IGNORE_THREAD(msginfo->flags))
+ if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->newmsgs--;
- if (MSG_IS_UNREAD(msginfo->flags) && MSG_IS_IGNORE_THREAD(msginfo->flags))
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->unread--;
if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
procmsg_msginfo_unset_flags
(msginfo, MSG_NEW | MSG_UNREAD, 0);
+ folderview_update_item(msginfo->folder, FALSE);
summary_set_row_marks(summaryview, row);
gtk_clist_thaw(GTK_CLIST(ctree));
summary_status_show(summaryview);
gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
type, 0.0);
+
+ if(summaryview->selected) {
+ gtk_sctree_reanchor (GTK_SCTREE(ctree), summaryview->selected);
+ }
+
+
}
void summary_toggle_view(SummaryView *summaryview)
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row_as_read(summaryview,
GTK_CTREE_NODE(cur->data));
+ folderview_update_items_when_required(FALSE);
summary_status_show(summaryview);
}
summary_set_row_marks(summaryview, node);
}
gtk_clist_thaw(clist);
+ folderview_update_items_when_required(FALSE);
summary_status_show(summaryview);
}
for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
summary_mark_row_as_unread(summaryview,
GTK_CTREE_NODE(cur->data));
+ folderview_update_items_when_required(FALSE);
summary_status_show(summaryview);
}
gchar *filename = NULL;
gchar *src, *dest;
+ AlertValue aval;
+
if (!summaryview->selected) return;
msginfo = gtk_ctree_node_get_row_data(ctree, summaryview->selected);
if (!msginfo) return;
dest = filesel_select_file(_("Save as"), filename);
if (!dest) return;
if (is_file_exist(dest)) {
- AlertValue aval;
-
- aval = alertpanel(_("Overwrite"),
- _("Overwrite existing file?"),
- _("OK"), _("Cancel"), NULL);
- if (G_ALERTDEFAULT != aval) return;
+ aval = alertpanel(_("Append or Overwrite"),
+ _("Append or overwrite existing file?"),
+ _("Append"), _("Overwrite"), _("Cancel"));
+ if (aval!=0 && aval!=1) return;
}
src = procmsg_get_message_file(msginfo);
- if (copy_file(src, dest, TRUE) < 0) {
- alertpanel_error(_("Can't save the file `%s'."),
- g_basename(dest));
+ if ( aval==0 ) { /* append */
+ if (append_file(src, dest, TRUE) < 0)
+ alertpanel_error(_("Can't save the file `%s'."),
+ g_basename(dest));
+ } else { /* overwrite */
+ if (copy_file(src, dest, TRUE) < 0)
+ alertpanel_error(_("Can't save the file `%s'."),
+ g_basename(dest));
}
g_free(src);
+
+
+ /*
+ * If two or more msgs are selected,
+ * append them to the output file.
+ */
+ if (GTK_CLIST(ctree)->selection->next) {
+ GList *item;
+ for (item = GTK_CLIST(ctree)->selection->next; item != NULL; item=item->next) {
+ msginfo = gtk_ctree_node_get_row_data(ctree, (GtkCTreeNode*)item->data);
+ if (!msginfo) break;
+ src = procmsg_get_message_file(msginfo);
+ if (append_file(src, dest, TRUE) < 0)
+ alertpanel_error(_("Can't save the file `%s'."),
+ g_basename(dest));
+ }
+ g_free(src);
+ }
}
void summary_print(SummaryView *summaryview)
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GSList *cur;
- summaryview->folder_table = g_hash_table_new(NULL, NULL);
-
/* search moving messages and execute */
gtk_ctree_pre_recursive(ctree, NULL, summary_execute_move_func,
summaryview);
if (summaryview->mlist) {
procmsg_move_messages(summaryview->mlist);
- folderview_update_item_foreach(summaryview->folder_table, FALSE);
+ folderview_update_items_when_required(FALSE);
for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
procmsg_msginfo_free((MsgInfo *)cur->data);
}
folderview_update_item(summaryview->folder_item, FALSE);
- g_hash_table_destroy(summaryview->folder_table);
- summaryview->folder_table = NULL;
}
static void summary_execute_move_func(GtkCTree *ctree, GtkCTreeNode *node,
msginfo->to_folder->op_count > 0)
msginfo->to_folder->op_count--;
- g_hash_table_insert(summaryview->folder_table,
- msginfo->to_folder, GINT_TO_POINTER(1));
-
summaryview->mlist =
g_slist_append(summaryview->mlist, msginfo);
gtk_ctree_node_set_row_data(ctree, node, NULL);
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- summaryview->folder_table = g_hash_table_new(NULL, NULL);
-
/* search copying messages and execute */
gtk_ctree_pre_recursive(ctree, NULL, summary_execute_copy_func,
summaryview);
if (summaryview->mlist) {
procmsg_copy_messages(summaryview->mlist);
- /* folder_item_scan_foreach(summaryview->folder_table); */
- folderview_update_item_foreach(summaryview->folder_table, FALSE);
+ folderview_update_items_when_required(FALSE);
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
}
-
- g_hash_table_destroy(summaryview->folder_table);
- summaryview->folder_table = NULL;
}
static void summary_execute_copy_func(GtkCTree *ctree, GtkCTreeNode *node,
msginfo->to_folder->op_count > 0)
msginfo->to_folder->op_count--;
- g_hash_table_insert(summaryview->folder_table,
- msginfo->to_folder, GINT_TO_POINTER(1));
-
summaryview->mlist =
g_slist_append(summaryview->mlist, msginfo);
summary_status_show(summaryview);
}
else {
- summaryview->folder_table = g_hash_table_new(NULL, NULL);
-
gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
GTK_CTREE_FUNC(summary_filter_func),
summaryview);
gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
- /* folder_item_scan_foreach(summaryview->folder_table); */
- folderview_update_item_foreach(summaryview->folder_table, FALSE);
-
- g_hash_table_destroy(summaryview->folder_table);
- summaryview->folder_table = NULL;
+ folderview_update_items_when_required(FALSE);
}
debug_print("done.\n");
summaryview->folder_item != dest)
summary_move_row_to(summaryview, node, dest);
} else
- filter_message_by_msginfo(global_processing, msginfo, summaryview->folder_table);
+ filter_message_by_msginfo(global_processing, msginfo);
}
void summary_filter_open(SummaryView *summaryview, PrefsFilterType type)
switch (mode) {
case COMPOSE_REPLY:
- compose_reply(msginfo, prefs_common.reply_with_quote,
- FALSE, FALSE, text);
+ if (prefs_common.default_reply_list)
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ FALSE, TRUE, FALSE, text);
+ else
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ FALSE, FALSE, FALSE, text);
break;
case COMPOSE_REPLY_WITH_QUOTE:
- compose_reply(msginfo, TRUE, FALSE, FALSE, text);
+ if (prefs_common.default_reply_list)
+ compose_reply(msginfo, TRUE, FALSE, TRUE, FALSE, text);
+ else
+ compose_reply(msginfo, TRUE, FALSE, FALSE, FALSE, text);
break;
case COMPOSE_REPLY_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, FALSE, FALSE, NULL);
+ if (prefs_common.default_reply_list)
+ compose_reply(msginfo, FALSE, FALSE, TRUE, FALSE, NULL);
+ else
+ compose_reply(msginfo, FALSE, FALSE, FALSE, FALSE, NULL);
break;
case COMPOSE_REPLY_TO_SENDER:
compose_reply(msginfo, prefs_common.reply_with_quote,
- FALSE, TRUE, text);
+ FALSE, FALSE, TRUE, text);
break;
case COMPOSE_FOLLOWUP_AND_REPLY_TO:
compose_followup_and_reply_to(msginfo,
FALSE, TRUE, text);
break;
case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
- compose_reply(msginfo, TRUE, FALSE, TRUE, text);
+ compose_reply(msginfo, TRUE, FALSE, FALSE, TRUE, text);
break;
case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, FALSE, TRUE, NULL);
+ compose_reply(msginfo, FALSE, FALSE, FALSE, TRUE, NULL);
break;
case COMPOSE_REPLY_TO_ALL:
compose_reply(msginfo, prefs_common.reply_with_quote,
- TRUE, FALSE, text);
+ TRUE, FALSE, FALSE, text);
break;
case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
- compose_reply(msginfo, TRUE, TRUE, FALSE, text);
+ compose_reply(msginfo, TRUE, TRUE, FALSE, FALSE, text);
break;
case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, TRUE, FALSE, NULL);
+ compose_reply(msginfo, FALSE, TRUE, FALSE, FALSE, NULL);
+ break;
+ case COMPOSE_REPLY_TO_LIST:
+ compose_reply(msginfo, prefs_common.reply_with_quote,
+ FALSE, TRUE, FALSE, text);
+ break;
+ case COMPOSE_REPLY_TO_LIST_WITH_QUOTE:
+ compose_reply(msginfo, TRUE, FALSE, TRUE, FALSE, text);
+ break;
+ case COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE:
+ compose_reply(msginfo, FALSE, FALSE, TRUE, FALSE, NULL);
break;
case COMPOSE_FORWARD:
if (prefs_common.forward_as_attachment) {
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);
+ folderview_update_item(msginfo->folder, FALSE);
procmsg_msginfo_set_flags(msginfo, mff->account->crosspost_col, 0);
}
g_hash_table_remove(mff->newsart, key);
gtk_widget_show(pixmap);
summaryview->folder_pixmap = pixmap;
+ pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_QUICKSEARCH);
+ gtk_container_remove (GTK_CONTAINER(summaryview->toggle_search),
+ summaryview->quick_search_pixmap);
+ gtk_container_add(GTK_CONTAINER(summaryview->toggle_search), pixmap);
+ gtk_widget_show(pixmap);
+ summaryview->quick_search_pixmap = pixmap;
+
folderview_unselect(summaryview->folderview);
folderview_select(summaryview->folderview, summaryview->folder_item);
}
projects / claws.git / blobdiff