/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
*
* 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
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
#include "defs.h"
#include <glib.h>
#define SUMMARY_COL_MARK_WIDTH 10
#define SUMMARY_COL_UNREAD_WIDTH 13
#define SUMMARY_COL_LOCKED_WIDTH 13
-#define SUMMARY_COL_MIME_WIDTH 10
+#define SUMMARY_COL_MIME_WIDTH 11
static GdkFont *boldfont;
static GdkFont *smallfont;
static GdkPixmap *clipxpm;
static GdkBitmap *clipxpmmask;
+static GdkPixmap *keyxpm;
+static GdkBitmap *keyxpmmask;
+static GdkPixmap *clipkeyxpm;
+static GdkBitmap *clipkeyxpmmask;
static void summary_free_msginfo_func (GtkCTree *ctree,
GtkCTreeNode *node,
static void summary_toggle_view (SummaryView *summaryview);
static void summary_set_row_marks (SummaryView *summaryview,
GtkCTreeNode *row);
+static void summaryview_subject_filter_init (PrefsFolderItem *prefs);
/* message handling */
static void summary_mark_row (SummaryView *summaryview,
&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);
if (!small_style) {
small_style = gtk_style_copy
return FALSE;
}
folder_update_op_count();
- } else
- summary_write_cache(summaryview);
+ } else {
+ /*
+ * CLAWS: summary_show() is responsible for updating the caches.
+ * after filtering inc.c::inc_finished() forces the update of
+ * the cache by indirectly calling summary_show() (by re-selecting
+ * the currently selected mail folder).
+ * this collides with the new filtering system that may have set
+ * any message flag before calling summary_show().
+ * we can prevent this cache-write by checking the opened member
+ * of the folderview. if this is NULL, the folderview forced
+ * an update of the summary view.
+ */
+ if (summaryview->folderview->opened)
+ summary_write_cache(summaryview);
+ }
summaryview->folderview->opened = selected_node;
mlist = not_killed;
}
- if (item->prefs->enable_simplify_subject
- && item->prefs->simplify_subject_regexp != NULL
- && strlen(item->prefs->simplify_subject_regexp) != 0) {
- summary_simplify_subject(summaryview,
- item->prefs->simplify_subject_regexp,
- mlist);
- }
-
STATUSBAR_POP(summaryview->mainwin);
/* set ctree and hash table from the msginfo list
summary_set_column_titles(summaryview);
- gtk_ctree_sort_node(ctree, NULL);
+ gtk_ctree_sort_recursive(ctree, NULL);
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
prefs_folder_item_set_config(summaryview->folder_item,
summaryview->important_score =
summaryview->folder_item->prefs->important_score;
}
+
+ summaryview_subject_filter_init(summaryview->folder_item->prefs);
if (summaryview->folder_item->threaded) {
GNode *root, *gnode;
static gchar *from_name = NULL;
static gchar col_number[11];
static gchar col_score[11];
+ static gchar buf[BUFFSIZE];
+ PrefsFolderItem *prefs = summaryview->folder_item->prefs;
gint *col_pos = summaryview->col_pos;
text[col_pos[S_COL_MARK]] = NULL;
}
}
- text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
- _("(No Subject)");
+ if (prefs->enable_simplify_subject
+ && prefs->simplify_subject_preg != NULL )
+ text[col_pos[S_COL_SUBJECT]] = msginfo->subject ?
+ string_remove_match(buf, BUFFSIZE, msginfo->subject,
+ prefs->simplify_subject_preg) :
+
+ _("(No Subject)");
+ else
+ text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
+ _("(No Subject)");
}
#define CHANGE_FLAGS(msginfo) \
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
+ MsgFlags flags;
gchar *filename;
if (!new_window && summaryview->displayed == row) return;
summary_status_show(summaryview);
}
+ flags = msginfo->flags;
+
if (new_window) {
MessageView *msgview;
gtkut_ctree_node_move_if_on_the_edge(ctree, row);
}
- if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
+ if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags) ||
+ (MSG_IS_MIME(msginfo->flags) - MSG_IS_MIME(flags) != 0)) {
MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
CHANGE_FLAGS(msginfo);
summary_set_row_marks(summaryview, row);
gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], NULL);
}
- if (MSG_IS_MIME(flags)) {
+ if (MSG_IS_MIME(flags) && MSG_IS_ENCRYPTED(flags)) {
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+ clipkeyxpm, clipkeyxpmmask);
+ } else if (MSG_IS_ENCRYPTED(flags)) {
+ gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+ keyxpm, keyxpmmask);
+ } else if (MSG_IS_MIME(flags)) {
gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
clipxpm, clipxpmmask);
} else {
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
+ gchar *filename = NULL;
gchar *src, *dest;
if (!summaryview->selected) return;
msginfo = gtk_ctree_node_get_row_data(ctree, summaryview->selected);
if (!msginfo) return;
- dest = filesel_select_file(_("Save as"), NULL);
+ if (msginfo->subject) {
+ Xstrdup_a(filename, msginfo->subject, return);
+ subst_for_filename(filename);
+ }
+ dest = filesel_select_file(_("Save as"), filename);
if (!dest) return;
if (is_file_exist(dest)) {
AlertValue aval;
}
}
-void summary_simplify_subject(SummaryView *summaryview, gchar * rexp,
- GSList * mlist)
-{
- GSList * cur;
- for(cur = mlist ; cur != NULL ; cur = cur->next) {
- MsgInfo * msginfo = (MsgInfo *) cur->data;
- string_remove_all_matches(msginfo->subject, rexp,
- REG_EXTENDED, 0);
- }
-}
-
void summary_processing(SummaryView *summaryview, GSList * mlist)
{
GSList * processing_list;
g_hash_table_destroy(summaryview->folder_table);
summaryview->folder_table = NULL;
-
- summary_show(summaryview, summaryview->folder_item, FALSE);
}
debug_print(_("done.\n"));
main_window_cursor_normal(summaryview->mainwin);
summary_unlock(summaryview);
+
+ /*
+ * CLAWS: summary_show() only valid after having a lock. ideally
+ * we want the lock to be context aware...
+ */
+ if (global_processing) {
+ /*
+ * CLAWS: to prevent summary_show to write the cache,
+ * we force an update of the summaryview in a special way,
+ * like inc.c::inc_finished().
+ */
+ folderview_unselect(summaryview->folderview);
+ folderview_select(summaryview->folderview, summaryview->folder_item);
+ }
}
static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
summaryview->folder_item != dest)
summary_move_row_to(summaryview, node, dest);
}
- else
+ else
filter_msginfo_move_or_delete(global_processing, msginfo,
summaryview->folder_table);
}
if (!event) return;
switch (event->keyval) {
- case GDK_g: /* Go */
- case GDK_G:
- RETURN_IF_LOCKED();
- BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
- to_folder = foldersel_folder_sel(NULL, NULL);
- if (to_folder) {
- debug_print(_("Go to %s\n"), to_folder->path);
- folderview_select(summaryview->folderview, to_folder);
- }
- return;
- case GDK_w: /* Write new message */
- BREAK_ON_MODIFIER_KEY();
- if (summaryview->folder_item) {
- PrefsAccount *ac;
- ac = summaryview->folder_item->folder->account;
- if (ac && ac->protocol == A_NNTP)
- compose_new_with_recipient
- (ac, summaryview->folder_item->path);
- else
- compose_new_with_folderitem(ac, summaryview->folder_item);
- } else
- compose_new(NULL);
- return;
- case GDK_D: /* Empty trash */
- RETURN_IF_LOCKED();
- BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
- main_window_empty_trash(summaryview->mainwin, TRUE);
- return;
- case GDK_Q: /* Quit */
+ case GDK_Q: /* Quit */
RETURN_IF_LOCKED();
BREAK_ON_MODIFIER_KEY();
if (prefs_common.confirm_on_exit) {
if (alertpanel(_("Exit"), _("Exit this program?"),
- _("OK"), _("Cancel"), NULL)
- == G_ALERTDEFAULT) {
+ _("OK"), _("Cancel"), NULL)
+ == G_ALERTDEFAULT) {
manage_window_focus_in
(summaryview->mainwin->window,
NULL, NULL);
- app_will_exit(NULL, summaryview->mainwin);
+ app_will_exit(NULL, summaryview->mainwin);
}
}
return;
- case GDK_Left: /* Move focus */
case GDK_Escape:
gtk_widget_grab_focus(summaryview->folderview->ctree);
return;
FALSE))
summary_select_next_unread(summaryview);
break;
- case GDK_n: /* Next */
- case GDK_N:
- BREAK_ON_MODIFIER_KEY();
- summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
- break;
- case GDK_BackSpace: /* Page up */
- textview_scroll_page(summaryview->messageview->textview, TRUE);
- break;
- case GDK_p: /* Prev */
- case GDK_P:
- BREAK_ON_MODIFIER_KEY();
- summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
- break;
case GDK_v: /* Toggle summary mode / message mode */
case GDK_V:
BREAK_ON_MODIFIER_KEY();
textview_scroll_one_line(summaryview->messageview->textview,
(event->state & GDK_MOD1_MASK) != 0);
break;
- case GDK_asterisk: /* Mark */
- summary_mark(summaryview);
- break;
- case GDK_exclam: /* Mark as unread */
- summary_mark_as_unread(summaryview);
- break;
- case GDK_d: /* Delete */
case GDK_Delete:
RETURN_IF_LOCKED();
BREAK_ON_MODIFIER_KEY();
summary_delete(summaryview);
break;
- case GDK_u: /* Unmark */
- case GDK_U:
- BREAK_ON_MODIFIER_KEY();
- summary_unmark(summaryview);
- break;
- case GDK_o: /* Move */
- RETURN_IF_LOCKED();
- BREAK_ON_MODIFIER_KEY();
- summary_move_to(summaryview);
- break;
- case GDK_O: /* Copy */
- RETURN_IF_LOCKED();
- BREAK_ON_MODIFIER_KEY();
- summary_copy_to(summaryview);
- break;
- case GDK_x: /* Execute */
- case GDK_X:
- RETURN_IF_LOCKED();
- BREAK_ON_MODIFIER_KEY();
- KEY_PRESS_EVENT_STOP();
- summary_execute(summaryview);
- break;
- case GDK_a: /* Reply to the message */
- BREAK_ON_MODIFIER_KEY();
- summary_reply_cb(summaryview,
- COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL);
- break;
- case GDK_A: /* Reply to the message with quotation */
- BREAK_ON_MODIFIER_KEY();
- summary_reply_cb(summaryview,
- COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL);
- break;
- case GDK_f: /* Forward the message */
- BREAK_ON_MODIFIER_KEY();
- summary_reply_cb(summaryview, COMPOSE_FORWARD, NULL);
+ case GDK_asterisk: /* Mark */
+ summary_mark(summaryview);
break;
- case GDK_F:
- BREAK_ON_MODIFIER_KEY();
- summary_reply_cb(summaryview, COMPOSE_FORWARD_AS_ATTACH, NULL);
+ case GDK_exclam: /* Mark as unread */
+ summary_mark_as_unread(summaryview);
break;
- case GDK_y: /* Save the message */
- BREAK_ON_MODIFIER_KEY();
- summary_save_as(summaryview);
+ case GDK_BackSpace: /* Page up */
+ textview_scroll_page(summaryview->messageview->textview, TRUE);
break;
default:
break;
GtkWidget *widget;
widget = gtk_item_factory_get_item(gtk_item_factory_from_widget(summaryview->mainwin->menubar),
- "/Summary/Hide read messages");
+ "/View/Hide read messages");
gtk_object_set_data(GTK_OBJECT(widget), "dont_toggle",
GINT_TO_POINTER(1));
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
gtk_object_set_data(GTK_OBJECT(widget), "dont_toggle",
GINT_TO_POINTER(0));
}
+static void summaryview_subject_filter_init(PrefsFolderItem *prefs)
+{
+ int err;
+ gchar buf[BUFFSIZE];
+ if (prefs->enable_simplify_subject) {
+ if (prefs->simplify_subject_regexp &&
+ *prefs->simplify_subject_regexp != 0x00) {
+
+ if (!prefs->simplify_subject_preg)
+ prefs->simplify_subject_preg = g_new(regex_t, 1);
+ else
+ regfree(prefs->simplify_subject_preg);
+
+ err = string_match_precompile(prefs->simplify_subject_regexp,
+ prefs->simplify_subject_preg, REG_EXTENDED);
+ if (err) {
+ regerror(err, prefs->simplify_subject_preg, buf, BUFFSIZE);
+ alertpanel_error(_("Regular expression (regexp) error:\n%s"), buf);
+ g_free(prefs->simplify_subject_preg);
+ prefs->simplify_subject_preg = NULL;
+ }
+ } else {
+ if (prefs->simplify_subject_preg) {
+ regfree(prefs->simplify_subject_preg);
+ g_free(prefs->simplify_subject_preg);
+ prefs->simplify_subject_preg = NULL;
+ }
+ }
+ }
+}
+
+
/*
* End of Source.
*/
projects / claws.git / blobdiff