{N_("/Cancel a news message"), NULL, summary_cancel, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Mark/_Mark"), "<shift>asterisk", summary_mark, 0, NULL},
- {N_("/_Mark/_Unmark"), "U", summary_unmark, 0, NULL},
+ {N_("/_Mark/_Mark"), NULL, summary_mark, 0, NULL},
+ {N_("/_Mark/_Unmark"), NULL, summary_unmark, 0, NULL},
{N_("/_Mark/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Mark/Mark as unr_ead"), "<shift>exclam", summary_mark_as_unread, 0, NULL},
+ {N_("/_Mark/Mark as unr_ead"), NULL, summary_mark_as_unread, 0, NULL},
{N_("/_Mark/Mark as rea_d"), NULL, summary_mark_as_read, 0, NULL},
{N_("/_Mark/Mark all read"), NULL, summary_mark_all_read, 0, NULL},
{N_("/_Mark/Ignore thread"), NULL, summary_ignore_thread, 0, NULL},
gtk_widget_show(scrolledwin);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_AUTOMATIC,
- GTK_POLICY_ALWAYS);
+ GTK_POLICY_AUTOMATIC);
gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
gtk_widget_set_size_request(vbox,
prefs_common.summaryview_width,
void summary_init(SummaryView *summaryview)
{
- static GdkFont *boldfont = NULL;
- static GdkFont *smallfont = NULL;
GtkStyle *style;
GtkWidget *pixmap;
#define CURRENTLY_DISPLAYED(m) \
( (m->msgnum == displayed_msgnum) \
- && (!g_strcasecmp(m->folder->name,item->name)) )
+ && (!g_ascii_strcasecmp(m->folder->name,item->name)) )
gboolean summary_show(SummaryView *summaryview, FolderItem *item)
{
summary_lock(summaryview);
if (!prefs_common.summary_quicksearch_sticky
+ && !prefs_common.summary_quicksearch_recurse
&& !quicksearch_is_running(summaryview->quicksearch)) {
quicksearch_set(summaryview->quicksearch, prefs_common.summary_quicksearch_type, "");
}
if (summaryview->mainwin->lock_count == 0 &&
(summaryview->moved > 0 || summaryview->copied > 0)) {
AlertValue val;
+ gboolean changed = FALSE;
val = alertpanel(_("Process mark"),
_("Some marks are left. Process it?"),
summary_unlock(summaryview);
summary_execute(summaryview);
summary_lock(summaryview);
+ changed = TRUE;
} else if (G_ALERTALTERNATE == val) {
/* DO NOTHING */
} else {
inc_unlock();
return FALSE;
}
- folder_update_op_count();
+ if (changed || !quicksearch_is_active(summaryview->quicksearch))
+ folder_update_op_count();
}
gtk_clist_freeze(GTK_CLIST(ctree));
gtk_clist_thaw(GTK_CLIST(ctree));
summary_unlock(summaryview);
inc_unlock();
+ if (item && quicksearch_is_running(summaryview->quicksearch)) {
+ main_window_cursor_wait(summaryview->mainwin);
+ quicksearch_reset_cur_folder_item(summaryview->quicksearch);
+ if (quicksearch_is_active(summaryview->quicksearch))
+ quicksearch_search_subfolders(summaryview->quicksearch,
+ summaryview->folderview,
+ summaryview->folder_item);
+ main_window_cursor_normal(summaryview->mainwin);
+ }
return TRUE;
}
g_free(buf);
summaryview->folder_item = item;
item->opened = TRUE;
- g_signal_handlers_unblock_matched(G_OBJECT(ctree), G_SIGNAL_MATCH_DATA,
- 0, 0, NULL, NULL, summaryview);
-
buf = g_strdup_printf(_("Scanning folder (%s)..."), item->path);
debug_print("%s\n", buf);
STATUSBAR_PUSH(summaryview->mainwin, buf);
else
procmsg_msginfo_free(msginfo);
}
-
+
+ if (quicksearch_is_running(summaryview->quicksearch)) {
+ /* only scan subfolders when quicksearch changed,
+ * not when search is the same and folder changed */
+ main_window_cursor_wait(summaryview->mainwin);
+ quicksearch_reset_cur_folder_item(summaryview->quicksearch);
+ quicksearch_search_subfolders(summaryview->quicksearch,
+ summaryview->folderview,
+ summaryview->folder_item);
+ main_window_cursor_normal(summaryview->mainwin);
+ }
+
g_slist_free(mlist);
mlist = not_killed;
}
if (summaryview->sort_key != SORT_BY_NONE)
summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
- g_signal_handlers_unblock_matched(G_OBJECT(ctree), G_SIGNAL_MATCH_DATA,
- 0, 0, NULL, NULL, summaryview);
-
gtk_clist_thaw(GTK_CLIST(ctree));
if (is_refresh) {
void summary_select_prev_unread(SummaryView *summaryview)
{
GtkCTreeNode *node;
+ gboolean skip_cur = FALSE;
+
+ if (summaryview->displayed
+ && summaryview->selected == summaryview->displayed) {
+ debug_print("skipping current\n");
+ skip_cur = TRUE;
+ }
node = summary_find_prev_flagged_msg
- (summaryview, summaryview->selected, MSG_UNREAD, FALSE);
+ (summaryview, summaryview->selected, MSG_UNREAD, skip_cur);
if (!node) {
AlertValue val = 0;
{
GtkCTreeNode *node = summaryview->selected;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ gboolean skip_cur = FALSE;
+
+ if (summaryview->displayed
+ && summaryview->selected == summaryview->displayed) {
+ debug_print("skipping cur\n");
+ skip_cur = TRUE;
+ }
+
node = summary_find_next_flagged_msg
- (summaryview, node, MSG_UNREAD, FALSE);
+ (summaryview, node, MSG_UNREAD, skip_cur);
if (node)
summary_select_node(summaryview, node, TRUE, FALSE);
summary_display_msg_full(summaryview, row, FALSE, FALSE);
}
+static void msginfo_mark_as_read (SummaryView *summaryview, MsgInfo *msginfo,
+ GtkCTreeNode *row)
+{
+ g_return_if_fail(summaryview != NULL);
+ g_return_if_fail(msginfo != NULL);
+ g_return_if_fail(row != NULL);
+
+ if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
+ && procmsg_msg_has_marked_parent(msginfo))
+ summaryview->unreadmarked--;
+ if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
+ procmsg_msginfo_unset_flags
+ (msginfo, MSG_NEW | MSG_UNREAD, 0);
+ summary_set_row_marks(summaryview, row);
+ gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+ summary_status_show(summaryview);
+ }
+}
+
+typedef struct {
+ MsgInfo *msginfo;
+ SummaryView *summaryview;
+ GtkCTreeNode *row;
+} MarkAsReadData;
+
+static int msginfo_mark_as_read_timeout(void *data)
+{
+ MarkAsReadData *mdata = (MarkAsReadData *)data;
+ if (!mdata)
+ return FALSE;
+
+ if (mdata->msginfo == summary_get_selected_msg(mdata->summaryview))
+ msginfo_mark_as_read(mdata->summaryview, mdata->msginfo,
+ mdata->row);
+
+ g_free(mdata);
+
+ return FALSE;
+}
+
static void summary_display_msg_full(SummaryView *summaryview,
GtkCTreeNode *row,
gboolean new_window, gboolean all_headers)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
MsgInfo *msginfo;
- MsgFlags flags;
gint val;
if (!new_window) {
gtkut_ctree_node_move_if_on_the_edge(ctree, row);
}
- if (val == 0 &&
- (new_window || !prefs_common.mark_as_read_on_new_window)) {
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)
- && procmsg_msg_has_marked_parent(msginfo))
- summaryview->unreadmarked--;
- if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
- procmsg_msginfo_unset_flags
- (msginfo, MSG_NEW | MSG_UNREAD, 0);
- summary_set_row_marks(summaryview, row);
- gtk_clist_thaw(GTK_CLIST(ctree));
- summary_status_show(summaryview);
-
- flags = msginfo->flags;
+ if (val == 0) {
+ if (prefs_common.mark_as_read_delay) {
+ MarkAsReadData *data = g_new0(MarkAsReadData, 1);
+ data->summaryview = summaryview;
+ data->msginfo = msginfo;
+ data->row = row;
+ gtk_timeout_add(prefs_common.mark_as_read_delay * 1000,
+ msginfo_mark_as_read_timeout, data);
+ } else if (new_window || !prefs_common.mark_as_read_on_new_window) {
+ msginfo_mark_as_read(summaryview, msginfo, row);
}
}
g_strdup_printf("%s",
account->address);
- if (g_strcasecmp(from_name, msginfo->from) == 0) {
+ if (g_utf8_collate(from_name, msginfo->from) == 0) {
g_free(from_name);
found = TRUE;
break;
if (summary_is_locked(summaryview)) return;
if (summaryview->folder_item == to_folder) {
- alertpanel_notice(_("Destination is same as current folder."));
+ alertpanel_error(_("Destination is same as current folder."));
return;
}
if (summary_is_locked(summaryview)) return;
if (summaryview->folder_item == to_folder) {
- alertpanel_notice
+ alertpanel_error
(_("Destination to copy is same as current folder."));
return;
}
MsgInfo *msginfo;
gchar *filename = NULL;
gchar *src, *dest;
+ gchar *tmp;
AlertValue aval = 0;
g_warning("summary_save_as(): faild to convert character set.");
filename = g_strdup(oldstr);
}
- dest = filesel_select_file(_("Save as"), filename);
+ dest = filesel_select_file_save(_("Save as"), filename);
g_free(filename);
} else
- dest = filesel_select_file(_("Save as"), filename);
+ dest = filesel_select_file_save(_("Save as"), filename);
filename = NULL;
if (!dest) return;
if (is_file_exist(dest)) {
}
src = procmsg_get_message_file(msginfo);
+ tmp = g_path_get_basename(dest);
+
if ( aval==0 ) { /* append */
if (append_file(src, dest, TRUE) < 0)
- alertpanel_error(_("Can't save the file `%s'."),
- g_basename(dest));
+ 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'."),
- g_basename(dest));
+ alertpanel_error(_("Can't save the file `%s'."), tmp);
}
g_free(src);
-
/*
* If two or more msgs are selected,
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));
+ alertpanel_error(_("Can't save the file `%s'."), tmp);
}
g_free(src);
}
+ g_free(dest);
+ g_free(tmp);
}
void summary_print(SummaryView *summaryview)
if (parent && parent != node) {
gtk_ctree_move(ctree, node, parent, NULL);
- gtk_ctree_expand(ctree, node);
}
node = next;
while (node) {
next = GTK_CTREE_NODE_NEXT(node);
- if (!summaryview->thread_collapsed)
- gtk_ctree_expand(ctree, node);
if (prefs_common.bold_unread &&
GTK_CTREE_ROW(node)->children)
summary_set_row_marks(summaryview, node);
if (!event) return FALSE;
if (event->button == 3) {
- summaryview->display_msg = TRUE;
+ summaryview->display_msg = messageview_is_visible(summaryview->messageview);
/* right clicked */
gtk_menu_popup(GTK_MENU(summaryview->popupmenu), NULL, NULL,
NULL, NULL, event->button, event->time);
} else if (event->button == 2) {
- summaryview->display_msg = TRUE;
+ summaryview->display_msg = messageview_is_visible(summaryview->messageview);
} else if (event->button == 1) {
if (!prefs_common.emulate_emacs &&
messageview_is_visible(summaryview->messageview))
MessageView *messageview;
TextView *textview;
GtkAdjustment *adj;
+ gboolean mod_pressed;
if (summary_is_locked(summaryview)) return TRUE;
if (!event) return TRUE;
+ if (quicksearch_has_focus(summaryview->quicksearch))
+ return FALSE;
+
switch (event->keyval) {
case GDK_Left: /* Move focus */
adj = gtk_scrolled_window_get_hadjustment
case GDK_Down:
if ((node = summaryview->selected) != NULL) {
GtkCTreeNode *next = NULL;
- next = (event->keyval == GDK_Down)
- ? gtkut_ctree_node_next(ctree, node)
- : gtkut_ctree_node_prev(ctree, node);
+ do {
+ next = (event->keyval == GDK_Down)
+ ? gtkut_ctree_node_next(ctree, next ? next:node)
+ : gtkut_ctree_node_prev(ctree, next ? next:node);
+ } while (next && !gtk_ctree_is_viewable(ctree, next));
+
if (next) {
gtk_sctree_select_with_state
(GTK_SCTREE(ctree), next, event->state);
/* Deprecated - what are the non-deprecated equivalents? */
if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0);
-
+ summaryview->selected = next;
+ return TRUE;
+ }
+ }
+ break;
+ case GDK_Home:
+ case GDK_End:
+ if ((node = summaryview->selected) != NULL) {
+ GtkCTreeNode *next = NULL;
+ next = (event->keyval == GDK_Home)
+ ? gtk_ctree_node_nth(ctree, 0)
+ : gtk_ctree_node_nth(ctree,
+ g_list_length(GTK_CLIST(ctree)->row_list)-1);
+ if (next) {
+ gtk_sctree_select_with_state
+ (GTK_SCTREE(ctree), next, event->state);
+
+ /* Deprecated - what are the non-deprecated equivalents? */
+ if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL)
+ gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0);
+ summaryview->selected = next;
return TRUE;
}
}
summaryview->selected);
break;
}
- if (!textview_scroll_page(textview, FALSE))
- summary_select_next_unread(summaryview);
- }
+ mod_pressed = ((event->state &
+ (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
+ if (mod_pressed) {
+ if (!textview_scroll_page(textview, TRUE))
+ summary_select_prev_unread(summaryview);
+ } else {
+ if (!textview_scroll_page(textview, FALSE))
+ summary_select_next_unread(summaryview);
+ }
+ }
break;
case GDK_BackSpace: /* Page up */
textview_scroll_page(textview, TRUE);
break;
}
textview_scroll_one_line
- (textview, (event->state & GDK_MOD1_MASK) != 0);
+ (textview, (event->state &
+ (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
break;
case GDK_Delete:
BREAK_ON_MODIFIER_KEY();
default:
break;
}
- return TRUE;
+ return FALSE;
}
static void quicksearch_execute_cb(QuickSearch *quicksearch, gpointer data)
(ctree, GTK_CTREE_NODE(cur->data));
tmp2 = procmsg_get_message_file(msginfo);
if (!tmp2) continue;
- tmp1 = g_strconcat("file:/", tmp2, NULL);
+ tmp1 = g_strconcat("file://", tmp2, NULL);
g_free(tmp2);
if (!mail_list) {
if (!msginfo2->var_name) \
return -1; \
\
- return strcasecmp(msginfo1->var_name, msginfo2->var_name); \
+ return g_utf8_collate(msginfo1->var_name, msginfo2->var_name); \
}
CMP_FUNC_DEF(summary_cmp_by_to, to);
if (!str2)
return -1;
- return strcasecmp(str1, str2);
+ return g_utf8_collate(str1, str2);
}
static gint summary_cmp_by_simplified_subject
if (node)
summary_select_node(summaryview, node, TRUE, TRUE);
}
+
+void summaryview_export_mbox_list(SummaryView *summaryview)
+{
+ GSList *list = summary_get_selected_msg_list(summaryview);
+ gchar *mbox = filesel_select_file_save(_("Export to mbox file"), NULL);
+
+ if (mbox == NULL || list == NULL)
+ return;
+
+ export_list_to_mbox(list, mbox);
+
+ g_slist_free(list);
+ g_free(mbox);
+
+}
projects / claws.git / blobdiff