#include "prefs_folder_item.h"
#include "filtering.h"
#include "string_match.h"
+#include "toolbar.h"
#define SUMMARY_COL_MARK_WIDTH 10
#define SUMMARY_COL_UNREAD_WIDTH 13
gboolean all_headers);
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,
static void summary_key_pressed (GtkWidget *ctree,
GdkEventKey *event,
SummaryView *summaryview);
+static void summary_searchbar_pressed (GtkWidget *ctree,
+ GdkEventKey *event,
+ SummaryView *summaryview);
+static void summary_searchtype_changed (GtkMenuItem *widget,
+ gpointer data);
static void summary_open_row (GtkSCTree *sctree,
SummaryView *summaryview);
static void summary_tree_expanded (GtkCTree *ctree,
static gint summary_cmp_by_from (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
+static gint summary_cmp_by_to (GtkCList *clist,
+ gconstpointer ptr1,
+ gconstpointer ptr2);
static gint summary_cmp_by_subject (GtkCList *clist,
gconstpointer ptr1,
gconstpointer ptr2);
static void news_flag_crosspost (MsgInfo *msginfo);
+static void tog_searchbar_cb (GtkWidget *w,
+ gpointer data);
+
+
GtkTargetEntry summary_drag_types[1] =
{
{"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
{N_("/M_ove..."), NULL, summary_move_to, 0, NULL},
{N_("/_Copy..."), NULL, summary_copy_to, 0, NULL},
{N_("/_Delete"), NULL, summary_delete, 0, NULL},
+ {N_("/Cancel a news message"), NULL, summary_cancel, 0, NULL},
{N_("/E_xecute"), NULL, summary_execute_cb, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark"), NULL, NULL, 0, "<Branch>"},
GtkWidget *ctree;
GtkWidget *hbox;
GtkWidget *hbox_l;
+ GtkWidget *hbox_search;
GtkWidget *statlabel_folder;
GtkWidget *statlabel_select;
GtkWidget *statlabel_msgs;
GtkWidget *toggle_eventbox;
GtkWidget *toggle_arrow;
GtkWidget *popupmenu;
+ GtkWidget *search_type_opt;
+ GtkWidget *search_type;
+ GtkWidget *search_string;
+ GtkWidget *menuitem;
+ GtkWidget *toggle_search;
+ GtkTooltips *search_tip;
GtkItemFactory *popupfactory;
gint n_entries;
- debug_print(_("Creating summary view...\n"));
+ debug_print("Creating summary view...\n");
summaryview = g_new0(SummaryView, 1);
- vbox = gtk_vbox_new(FALSE, 2);
+ vbox = gtk_vbox_new(FALSE, 3);
+
+ /* create status label */
+ hbox = gtk_hbox_new(FALSE, 0);
+
+ search_tip = gtk_tooltips_new();
+ toggle_search = gtk_toggle_button_new();
+
+ gtk_tooltips_set_tip(GTK_TOOLTIPS(search_tip),
+ toggle_search,
+ _("Toggle quick-search bar"), NULL);
+
+ gtk_box_pack_start(GTK_BOX(hbox), toggle_search, FALSE, FALSE, 2);
+
+ hbox_l = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), hbox_l, TRUE, TRUE, 0);
+
+ statlabel_folder = gtk_label_new("");
+ gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_folder, FALSE, FALSE, 2);
+ statlabel_select = gtk_label_new("");
+ gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_select, FALSE, FALSE, 12);
+
+ /* toggle view button */
+ toggle_eventbox = gtk_event_box_new();
+ gtk_box_pack_end(GTK_BOX(hbox), toggle_eventbox, FALSE, FALSE, 4);
+ toggle_arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+ gtk_container_add(GTK_CONTAINER(toggle_eventbox), toggle_arrow);
+ gtk_signal_connect(GTK_OBJECT(toggle_eventbox), "button_press_event",
+ GTK_SIGNAL_FUNC(summary_toggle_pressed),
+ summaryview);
+
+
+ statlabel_msgs = gtk_label_new("");
+ gtk_box_pack_end(GTK_BOX(hbox), statlabel_msgs, FALSE, FALSE, 4);
+
+ hbox_spc = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_end(GTK_BOX(hbox), hbox_spc, FALSE, FALSE, 6);
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_CLIST(ctree)->vadjustment);
gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
- /* create status label */
- hbox = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ /* status label */
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- hbox_l = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), hbox_l, TRUE, TRUE, 0);
+ /* quick search */
+ hbox_search = gtk_hbox_new(FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox_search, FALSE, FALSE, 0);
- statlabel_folder = gtk_label_new("");
- gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_folder, FALSE, FALSE, 2);
- statlabel_select = gtk_label_new("");
- gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_select, FALSE, FALSE, 12);
+ search_type_opt = gtk_option_menu_new();
+ gtk_widget_show(search_type_opt);
+ gtk_box_pack_start(GTK_BOX(hbox_search), search_type_opt, FALSE, FALSE, 0);
- /* toggle view button */
- toggle_eventbox = gtk_event_box_new();
- gtk_box_pack_end(GTK_BOX(hbox), toggle_eventbox, FALSE, FALSE, 4);
- toggle_arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
- gtk_container_add(GTK_CONTAINER(toggle_eventbox), toggle_arrow);
- gtk_signal_connect(GTK_OBJECT(toggle_eventbox), "button_press_event",
- GTK_SIGNAL_FUNC(summary_toggle_pressed),
+ search_type = gtk_menu_new();
+ MENUITEM_ADD (search_type, menuitem, _("Subject"), S_SEARCH_SUBJECT);
+ gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
+ GTK_SIGNAL_FUNC(summary_searchtype_changed),
+ summaryview);
+ MENUITEM_ADD (search_type, menuitem, _("From"), S_SEARCH_FROM);
+ gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
+ GTK_SIGNAL_FUNC(summary_searchtype_changed),
+ summaryview);
+ MENUITEM_ADD (search_type, menuitem, _("To"), S_SEARCH_TO);
+ gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
+ GTK_SIGNAL_FUNC(summary_searchtype_changed),
summaryview);
- statlabel_msgs = gtk_label_new("");
- gtk_box_pack_end(GTK_BOX(hbox), statlabel_msgs, FALSE, FALSE, 4);
+ gtk_option_menu_set_menu(GTK_OPTION_MENU(search_type_opt), search_type);
+ gtk_widget_show(search_type);
+
+ search_string = gtk_entry_new();
+
+ gtk_box_pack_start(GTK_BOX(hbox_search), search_string, FALSE, FALSE, 2);
+
+ gtk_widget_show(search_string);
+ gtk_widget_show(hbox_search);
- hbox_spc = gtk_hbox_new(FALSE, 0);
- gtk_box_pack_end(GTK_BOX(hbox), hbox_spc, FALSE, FALSE, 6);
+ gtk_signal_connect(GTK_OBJECT(search_string), "key_press_event",
+ GTK_SIGNAL_FUNC(summary_searchbar_pressed),
+ summaryview);
+
+ gtk_signal_connect (GTK_OBJECT(toggle_search), "toggled",
+ GTK_SIGNAL_FUNC(tog_searchbar_cb), hbox_search);
/* create popup menu */
n_entries = sizeof(summary_popup_entries) /
summaryview->ctree = ctree;
summaryview->hbox = hbox;
summaryview->hbox_l = hbox_l;
+ summaryview->hbox_search = hbox_search;
summaryview->statlabel_folder = statlabel_folder;
summaryview->statlabel_select = statlabel_select;
summaryview->statlabel_msgs = statlabel_msgs;
summaryview->toggle_eventbox = toggle_eventbox;
summaryview->toggle_arrow = toggle_arrow;
+ summaryview->toggle_search = toggle_search;
summaryview->popupmenu = popupmenu;
summaryview->popupfactory = popupfactory;
summaryview->lock_count = 0;
+ summaryview->search_type_opt = search_type_opt;
+ summaryview->search_type = search_type;
+ summaryview->search_string = search_string;
/* CLAWS: need this to get the SummaryView * from
* the CList */
gtk_widget_show(pixmap);
summaryview->folder_pixmap = pixmap;
+ pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_QUICKSEARCH);
+ gtk_container_add (GTK_CONTAINER(summaryview->toggle_search), pixmap);
+ gtk_widget_show(pixmap);
+
+ /* Init summaryview prefs */
+ summaryview->sort_key = SORT_BY_NONE;
+ summaryview->sort_type = SORT_ASCENDING;
+
+ /* Init summaryview extra data */
+ summaryview->simplify_subject_preg = NULL;
+
summary_clear_list(summaryview);
summary_set_column_titles(summaryview);
summary_colorlabel_menu_create(summaryview);
inc_lock();
summary_lock(summaryview);
+ if (item != summaryview->folder_item) {
+ /* changing folder, reset search */
+ gtk_entry_set_text(GTK_ENTRY(summaryview->search_string), "");
+ }
+
STATUSBAR_POP(summaryview->mainwin);
- is_refresh = (!prefs_common.open_inbox_on_inc &&
- item == summaryview->folder_item) ? TRUE : FALSE;
+ is_refresh = (item == summaryview->folder_item) ? TRUE : FALSE;
if (is_refresh) {
selected_msgnum = summary_get_msgnum(summaryview,
summaryview->selected);
((buf = folder_item_get_path(item)) == NULL ||
change_dir(buf) < 0))) {
g_free(buf);
- debug_print(_("empty folder\n\n"));
+ debug_print("empty folder\n\n");
summary_set_hide_read_msgs_menu(summaryview, FALSE);
if (is_refresh)
messageview_clear(summaryview->messageview);
summary_set_hide_read_msgs_menu(summaryview, FALSE);
}
+ if (strlen(gtk_entry_get_text(GTK_ENTRY(summaryview->search_string))) > 0) {
+ GSList *not_killed;
+ gint search_type = GPOINTER_TO_INT(gtk_object_get_user_data(
+ GTK_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
+ GTK_MENU(summaryview->search_type))))));
+ gchar *search_string = gtk_entry_get_text(GTK_ENTRY(summaryview->search_string));
+ gchar *searched_header = NULL;
+
+ not_killed = NULL;
+ for (cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
+ MsgInfo * msginfo = (MsgInfo *) cur->data;
+
+ switch (search_type) {
+ case S_SEARCH_SUBJECT:
+ searched_header = msginfo->subject;
+ break;
+ case S_SEARCH_FROM:
+ searched_header = msginfo->from;
+ break;
+ case S_SEARCH_TO:
+ searched_header = msginfo->to;
+ break;
+ default:
+ debug_print("unknown search type (%d)\n", search_type);
+ break;
+ }
+ if (searched_header && strcasestr(searched_header, search_string) != NULL)
+ not_killed = g_slist_append(not_killed, msginfo);
+ else
+ procmsg_msginfo_free(msginfo);
+ }
+ g_slist_free(mlist);
+ mlist = not_killed;
+ }
+
if ((global_scoring || item->prefs->scoring)) {
GSList *not_killed;
gint kill_score;
g_slist_free(mlist);
- folderview_update_msg_num(summaryview->folderview,
- summaryview->folderview->opened);
-
- if (item->sort_key != SORT_BY_NONE)
- summary_sort(summaryview, item->sort_key, item->sort_type);
+ if (summaryview->sort_key != SORT_BY_NONE)
+ summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
gtk_signal_handler_unblock_by_data(GTK_OBJECT(ctree), summaryview);
}
} else {
/* select first unread message */
- if (item->sort_key == SORT_BY_SCORE)
+ if (summaryview->sort_key == SORT_BY_SCORE)
node = summary_find_next_important_score(summaryview,
NULL);
else
summary_status_show(summaryview);
summary_set_menu_sensitive(summaryview);
- main_window_set_toolbar_sensitive(summaryview->mainwin);
+ toolbar_set_sensitive(summaryview->mainwin);
debug_print("\n");
STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
{
summary_clear_list(summaryview);
summary_set_menu_sensitive(summaryview);
- main_window_set_toolbar_sensitive(summaryview->mainwin);
+ toolbar_set_sensitive(summaryview->mainwin);
summary_status_show(summaryview);
}
else
menu_set_sensitive(ifactory, "/Move...", FALSE);
+#if 0
menu_set_sensitive(ifactory, "/Delete", TRUE);
+#endif
menu_set_sensitive(ifactory, "/Select all", TRUE);
menu_set_sensitive(ifactory, "/Copy...", TRUE);
menu_set_sensitive(ifactory, "/Execute", TRUE);
else
sens = FALSE;
menu_set_sensitive(ifactory, "/Follow-up and reply to", sens);
+ menu_set_sensitive(ifactory, "/Cancel a news message", sens);
+ menu_set_sensitive(ifactory, "/Delete", !sens);
+
summary_lock(summaryview);
menuitem = gtk_item_factory_get_widget(ifactory, "/View/All header");
gtk_check_menu_item_set_active
MsgInfo *src_msginfo, *dst_msginfo;
GHashTable *subject_table;
- debug_print(_("Attracting messages by subject..."));
+ debug_print("Attracting messages by subject...");
STATUSBAR_PUSH(summaryview->mainwin,
_("Attracting messages by subject..."));
gtk_clist_thaw(clist);
- debug_print(_("done.\n"));
+ debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
SummaryColumnType type;
gboolean single_char;
GtkJustification justify;
- FolderItem *item = summaryview->folder_item;
static FolderSortKey sort_by[N_SUMMARY_COLS] = {
SORT_BY_MARK,
gtk_box_pack_start(GTK_BOX(hbox), label,
FALSE, FALSE, 0);
- if (item && item->sort_key == sort_by[type]) {
+ if (summaryview->sort_key == sort_by[type]) {
arrow = gtk_arrow_new
- (item->sort_type == SORT_ASCENDING
+ (summaryview->sort_type == SORT_ASCENDING
? GTK_ARROW_DOWN : GTK_ARROW_UP,
GTK_SHADOW_IN);
if (justify == GTK_JUSTIFY_RIGHT)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCList *clist = GTK_CLIST(summaryview->ctree);
- GtkCListCompareFunc cmp_func;
- FolderItem *item = summaryview->folder_item;
-
- if (!item || !item->path || !item->parent || item->no_select) return;
+ GtkCListCompareFunc cmp_func = NULL;
switch (sort_key) {
case SORT_BY_MARK:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_date;
break;
case SORT_BY_FROM:
- cmp_func = (GtkCListCompareFunc)summary_cmp_by_from;
+ cmp_func = summaryview->folder_item->stype != F_OUTBOX ?
+ (GtkCListCompareFunc) summary_cmp_by_from :
+ (GtkCListCompareFunc) summary_cmp_by_to;
break;
case SORT_BY_SUBJECT:
- {
- PrefsFolderItem *prefs = summaryview->folder_item->prefs;
-
- if (prefs && prefs->enable_simplify_subject
- && prefs->simplify_subject_regexp && prefs->simplify_subject_regexp[0])
- cmp_func = (GtkCListCompareFunc)summary_cmp_by_simplified_subject;
- else
- cmp_func = (GtkCListCompareFunc)summary_cmp_by_subject;
- }
+ if (summaryview->simplify_subject_preg)
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_simplified_subject;
+ else
+ cmp_func = (GtkCListCompareFunc)summary_cmp_by_subject;
break;
case SORT_BY_SCORE:
cmp_func = (GtkCListCompareFunc)summary_cmp_by_score;
cmp_func = (GtkCListCompareFunc)summary_cmp_by_label;
break;
case SORT_BY_NONE:
- item->sort_key = sort_key;
- item->sort_type = SORT_ASCENDING;
- summary_set_column_titles(summaryview);
- summary_set_menu_sensitive(summaryview);
+ cmp_func = NULL;
return;
default:
return;
}
- debug_print(_("Sorting summary..."));
- STATUSBAR_PUSH(summaryview->mainwin, _("Sorting summary..."));
+ summaryview->sort_key = sort_key;
+ summaryview->sort_type = sort_type;
- main_window_cursor_wait(summaryview->mainwin);
+ summary_set_column_titles(summaryview);
+ summary_set_menu_sensitive(summaryview);
+ if(cmp_func != NULL) {
+ debug_print("Sorting summary...");
+ STATUSBAR_PUSH(summaryview->mainwin, _("Sorting summary..."));
- gtk_clist_set_compare_func(clist, cmp_func);
+ main_window_cursor_wait(summaryview->mainwin);
- gtk_clist_set_sort_type(clist, (GtkSortType)sort_type);
- item->sort_key = sort_key;
- item->sort_type = sort_type;
+ gtk_clist_set_compare_func(clist, cmp_func);
- summary_set_column_titles(summaryview);
- summary_set_menu_sensitive(summaryview);
+ gtk_clist_set_sort_type(clist, (GtkSortType)sort_type);
- gtk_sctree_sort_recursive(ctree, NULL);
+ gtk_sctree_sort_recursive(ctree, NULL);
- gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
+ gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
- debug_print(_("done.\n"));
- STATUSBAR_POP(summaryview->mainwin);
+ main_window_cursor_normal(summaryview->mainwin);
- main_window_cursor_normal(summaryview->mainwin);
+ debug_print("done.\n");
+ STATUSBAR_POP(summaryview->mainwin);
+ }
}
gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *gnode,
if (!mlist) return;
- debug_print(_("\tSetting summary from message data..."));
+ debug_print("\tSetting summary from message data...");
STATUSBAR_PUSH(summaryview->mainwin,
_("Setting summary from message data..."));
gdk_flush();
summaryview->folder_item->prefs->important_score;
}
- summaryview_subject_filter_init(summaryview->folder_item->prefs);
-
- if (summaryview->folder_item->threaded) {
+ if (summaryview->threaded) {
GNode *root, *gnode;
root = procmsg_get_thread_tree(mlist);
if (prefs_common.use_addr_book)
end_address_completion();
- debug_print(_("done.\n"));
+ debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
if (debug_mode) {
debug_print("\tmsgid hash table size = %d\n",
static gchar *to = NULL;
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;
g_free(to);
to = g_strconcat("-->", addr == NULL ? msginfo->to : addr, NULL);
text[col_pos[S_COL_FROM]] = to;
+ g_free(addr);
}
} else {
if (cur_account && cur_account->address && !strcmp( addr, cur_account->address)) {
* the --> in sent boxes) was executed.
*/
if (text[col_pos[S_COL_FROM]] != to && prefs_common.use_addr_book && msginfo->from) {
- gchar *from;
- from = summary_complete_address(msginfo->from);
+ gchar *from = summary_complete_address(msginfo->from);
if (from) {
- /*
- * FIXME: this text[col_pos[S_COL_FROM]] should be freed
- * but may have been assigned _("No From"). Should be
- * freed???
- */
- text[col_pos[S_COL_FROM]] = from;
- }
+ g_free(to);
+ to = from;
+ text[col_pos[S_COL_FROM]] = to;
+ }
}
- if (prefs->enable_simplify_subject
- && prefs->simplify_subject_preg != NULL )
+ if (summaryview->simplify_subject_preg != NULL)
text[col_pos[S_COL_SUBJECT]] = msginfo->subject ?
string_remove_match(buf, BUFFSIZE, msginfo->subject,
- prefs->simplify_subject_preg) :
-
+ summaryview->simplify_subject_preg) :
_("(No Subject)");
else
text[col_pos[S_COL_SUBJECT]] = msginfo->subject ? msginfo->subject :
}
g_free(filename);
- 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))
- summaryview->unread--;
-
- 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 (new_window || !prefs_common.mark_as_read_on_new_window) {
+ 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))
+ summaryview->unread--;
+ 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 (new_window) {
MessageView *msgview;
- msgview = messageview_create_with_new_window();
+ msgview = messageview_create_with_new_window(summaryview->mainwin);
messageview_show(msgview, msginfo, all_headers);
} else {
MessageView *msgview;
}
summary_set_menu_sensitive(summaryview);
- main_window_set_toolbar_sensitive(summaryview->mainwin);
+ toolbar_set_sensitive(summaryview->mainwin);
summary_unlock(summaryview);
}
procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
procmsg_msginfo_set_flags(msginfo, MSG_MARKED, 0);
summary_set_row_marks(summaryview, row);
- debug_print(_("Message %s/%d is marked\n"), msginfo->folder->path, msginfo->msgnum);
+ debug_print("Message %s/%d is marked\n", msginfo->folder->path, msginfo->msgnum);
}
static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE | MSG_COPY);
procmsg_msginfo_set_flags(msginfo, MSG_LOCKED, 0);
summary_set_row_marks(summaryview, row);
- debug_print(_("Message %d is locked\n"), msginfo->msgnum);
+ debug_print("Message %d is locked\n", msginfo->msgnum);
}
void summary_mark(SummaryView *summaryview)
procmsg_msginfo_unset_flags(msginfo, MSG_NEW | MSG_UNREAD, 0);
summary_set_row_marks(summaryview, row);
- debug_print(_("Message %d is marked as read\n"),
+ debug_print("Message %d is marked as read\n",
msginfo->msgnum);
}
procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED | MSG_FORWARDED, 0);
procmsg_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
- debug_print(_("Message %d is marked as unread\n"),
+ debug_print("Message %d is marked as unread\n",
msginfo->msgnum);
summary_set_row_marks(summaryview, row);
summaryview->folder_item->stype != F_TRASH)
summary_set_row_marks(summaryview, row);
- debug_print(_("Message %s/%d is set to delete\n"),
+ debug_print("Message %s/%d is set to delete\n",
msginfo->folder->path, msginfo->msgnum);
}
+void summary_cancel(SummaryView *summaryview)
+{
+ MsgInfo * msginfo;
+ GtkCList *clist = GTK_CLIST(summaryview->ctree);
+
+ msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+ summaryview->selected);
+ if (!msginfo) return;
+
+ if (!check_permission(summaryview, msginfo))
+ return;
+
+ news_cancel_article(summaryview->folder_item->folder, msginfo);
+
+ if (summary_is_locked(summaryview)) return;
+
+ summary_lock(summaryview);
+
+ gtk_clist_freeze(clist);
+
+ summary_update_status(summaryview);
+ summary_status_show(summaryview);
+
+ gtk_clist_thaw(clist);
+
+ summary_unlock(summaryview);
+}
+
void summary_delete(SummaryView *summaryview)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
if (summaryview->folder_item->stype == F_TRASH) return;
main_window_cursor_wait(summaryview->mainwin);
- debug_print(_("Deleting duplicated messages..."));
+ debug_print("Deleting duplicated messages...");
STATUSBAR_PUSH(summaryview->mainwin,
_("Deleting duplicated messages..."));
else
summary_status_show(summaryview);
- debug_print(_("done.\n"));
+ debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
}
procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE | MSG_COPY);
summary_set_row_marks(summaryview, row);
- debug_print(_("Message %s/%d is unmarked\n"),
+ debug_print("Message %s/%d is unmarked\n",
msginfo->folder->path, msginfo->msgnum);
}
}
}
- debug_print(_("Message %d is set to move to %s\n"),
+ debug_print("Message %d is set to move to %s\n",
msginfo->msgnum, to_folder->path);
}
}
}
- debug_print(_("Message %d is set to copy to %s\n"),
+ debug_print("Message %d is set to copy to %s\n",
msginfo->msgnum, to_folder->path);
}
}
src = procmsg_get_message_file(msginfo);
- if (copy_file(src, dest) < 0) {
+ if (copy_file(src, dest, TRUE) < 0) {
alertpanel_error(_("Can't save the file `%s'."),
g_basename(dest));
}
gtk_clist_freeze(clist);
- if (summaryview->folder_item->threaded)
+ if (summaryview->threaded)
summary_unthread_for_exec(summaryview);
summary_execute_move(summaryview);
node = next;
}
- if (summaryview->folder_item->threaded)
+ if (summaryview->threaded)
summary_thread_build(summaryview);
summaryview->selected = clist->selection ?
if (summaryview->mlist) {
procmsg_move_messages(summaryview->mlist);
- folderview_update_item_foreach(summaryview->folder_table);
+ folderview_update_item_foreach(summaryview->folder_table, FALSE);
for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
procmsg_msginfo_free((MsgInfo *)cur->data);
procmsg_copy_messages(summaryview->mlist);
/* folder_item_scan_foreach(summaryview->folder_table); */
- folderview_update_item_foreach(summaryview->folder_table);
+ folderview_update_item_foreach(summaryview->folder_table, FALSE);
g_slist_free(summaryview->mlist);
summaryview->mlist = NULL;
summary_lock(summaryview);
- debug_print(_("Building threads..."));
+ debug_print("Building threads...");
STATUSBAR_PUSH(summaryview->mainwin, _("Building threads..."));
main_window_cursor_wait(summaryview->mainwin);
gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
summary_tree_expanded, summaryview);
- debug_print(_("done.\n"));
+ debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
+ summaryview->threaded = TRUE;
+
summary_unlock(summaryview);
}
summary_lock(summaryview);
- debug_print(_("Unthreading..."));
+ debug_print("Unthreading...");
STATUSBAR_PUSH(summaryview->mainwin, _("Unthreading..."));
main_window_cursor_wait(summaryview->mainwin);
gtk_signal_handler_unblock_by_func(GTK_OBJECT(ctree),
summary_tree_collapsed, summaryview);
- debug_print(_("done.\n"));
+ debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
+ summaryview->threaded = FALSE;
+
summary_unlock(summaryview);
}
summary_lock(summaryview);
- debug_print(_("Unthreading for execution..."));
+ debug_print("Unthreading for execution...");
gtk_clist_freeze(GTK_CLIST(ctree));
gtk_clist_thaw(GTK_CLIST(ctree));
- debug_print(_("done.\n"));
+ debug_print("done.\n");
summary_unlock(summaryview);
}
summary_lock(summaryview);
- debug_print(_("filtering..."));
+ debug_print("filtering...");
STATUSBAR_PUSH(summaryview->mainwin, _("Filtering..."));
main_window_cursor_wait(summaryview->mainwin);
gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
/* folder_item_scan_foreach(summaryview->folder_table); */
- folderview_update_item_foreach(summaryview->folder_table);
+ folderview_update_item_foreach(summaryview->folder_table, FALSE);
g_hash_table_destroy(summaryview->folder_table);
summaryview->folder_table = NULL;
}
- debug_print(_("done.\n"));
+ debug_print("done.\n");
STATUSBAR_POP(summaryview->mainwin);
main_window_cursor_normal(summaryview->mainwin);
{
GtkCTree *ctree = GTK_CTREE(widget);
GtkCTreeNode *node;
+ MessageView *messageview;
+ TextView *textview;
if (summary_is_locked(summaryview)) return;
if (!event) return;
return;
}
+ messageview = summaryview->messageview;
+ if (messageview->type == MVIEW_MIME &&
+ gtk_notebook_get_current_page
+ (GTK_NOTEBOOK(messageview->mimeview->notebook)) == 1)
+ textview = messageview->mimeview->textview;
+ else
+ textview = messageview->textview;
+
switch (event->keyval) {
case GDK_space: /* Page down or go to the next */
if (summaryview->displayed != summaryview->selected) {
summaryview->selected);
break;
}
- if (!textview_scroll_page(summaryview->messageview->textview,
- FALSE))
+ if (!textview_scroll_page(textview, FALSE))
summary_select_next_unread(summaryview);
break;
case GDK_BackSpace: /* Page up */
- textview_scroll_page(summaryview->messageview->textview, TRUE);
+ textview_scroll_page(textview, TRUE);
break;
case GDK_Return: /* Scroll up/down one line */
if (summaryview->displayed != summaryview->selected) {
summaryview->selected);
break;
}
- textview_scroll_one_line(summaryview->messageview->textview,
- (event->state & GDK_MOD1_MASK) != 0);
+ textview_scroll_one_line
+ (textview, (event->state & GDK_MOD1_MASK) != 0);
break;
case GDK_asterisk: /* Mark */
summary_mark(summaryview);
}
}
+static void summary_searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
+ SummaryView *summaryview)
+{
+ if (event != NULL && event->keyval == GDK_Return)
+ summary_show(summaryview, summaryview->folder_item);
+}
+
+static void summary_searchtype_changed(GtkMenuItem *widget, gpointer data)
+{
+ SummaryView *sw = (SummaryView *)data;
+ if (gtk_entry_get_text(GTK_ENTRY(sw->search_string)))
+ summary_show(sw, sw->folder_item);
+}
+
+static void tog_searchbar_cb(GtkWidget *w, gpointer data)
+{
+ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))) {
+ prefs_common.show_searchbar = TRUE;
+ gtk_widget_show(GTK_WIDGET(data));
+ } else {
+ prefs_common.show_searchbar = FALSE;
+ gtk_widget_hide(GTK_WIDGET(data));
+ }
+}
+
static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
{
if (summaryview->folder_item->stype == F_OUTBOX ||
GTK_CLIST(ctree)->selection->next) {
summaryview->display_msg = FALSE;
summary_set_menu_sensitive(summaryview);
- main_window_set_toolbar_sensitive(summaryview->mainwin);
+ toolbar_set_sensitive(summaryview->mainwin);
return;
}
summaryview->display_msg = FALSE;
} else {
summary_set_menu_sensitive(summaryview);
- main_window_set_toolbar_sensitive(summaryview->mainwin);
+ toolbar_set_sensitive(summaryview->mainwin);
}
}
static void summary_sort_by_column_click(SummaryView *summaryview,
FolderSortKey sort_key)
{
- FolderItem *item = summaryview->folder_item;
-
- if (!item) return;
-
- if (item->sort_key == sort_key)
+ if (summaryview->sort_key == sort_key)
summary_sort(summaryview, sort_key,
- item->sort_type == SORT_ASCENDING
+ summaryview->sort_type == SORT_ASCENDING
? SORT_DESCENDING : SORT_ASCENDING);
else
summary_sort(summaryview, sort_key, SORT_ASCENDING);
return strcasecmp(msginfo1->fromname, msginfo2->fromname);
}
+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 = gtk_object_get_data(GTK_OBJECT(clist), "summaryview");
+
+ g_return_val_if_fail(sv, -1);
+
+ str1 = GTK_CELL_TEXT(r1->cell[sv->col_pos[S_COL_FROM]])->text;
+ str2 = GTK_CELL_TEXT(r2->cell[sv->col_pos[S_COL_FROM]])->text;
+
+ if (!str1)
+ return str2 != NULL;
+
+ if (!str2)
+ return -1;
+
+ if (g_strncasecmp(str1, "-->", 3) == 0)
+ str1 += 3;
+ if (g_strncasecmp(str2, "-->", 3) == 0)
+ str2 += 3;
+
+ return strcasecmp(str1, str2);
+}
+
static gint summary_cmp_by_subject(GtkCList *clist,
gconstpointer ptr1, gconstpointer ptr2)
{
if (mff->account->mark_crosspost_read && MSG_IS_NEWS(msginfo->flags)) {
line = g_string_sized_new(128);
g_string_sprintf(line, "%s:%d", msginfo->folder->path, msginfo->msgnum);
- debug_print(_("nfcp: checking <%s>"), line->str);
+ 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);
+ 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);
g_free(key);
}
g_string_free(line, TRUE);
- debug_print(_("\n"));
+ debug_print("\n");
}
}
msginfo = gtk_ctree_node_get_row_data(ctree, row);
gtk_ctree_select(GTK_CTREE(ctree), row);
- debug_print(_("Message %d selected\n"), msginfo->msgnum);
+ debug_print("Message %d selected\n", msginfo->msgnum);
}
/* select current thread */
GtkCTreeNode *node = summaryview->selected;
GList *cur;
+ g_return_if_fail(node != NULL);
+
while (GTK_CTREE_ROW(node)->parent != NULL)
node = GTK_CTREE_ROW(node)->parent;
procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
summary_set_row_marks(summaryview, row);
- debug_print(_("Message %d is marked as ignore thread\n"),
+ debug_print("Message %d is marked as ignore thread\n",
msginfo->msgnum);
}
procmsg_msginfo_unset_flags(msginfo, MSG_IGNORE_THREAD, 0);
summary_set_row_marks(summaryview, row);
- debug_print(_("Message %d is marked as unignore thread\n"),
+ debug_print("Message %d is marked as unignore thread\n",
msginfo->msgnum);
}
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;
- }
- }
- }
-}
void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
{
pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
- gtk_box_reorder_child(GTK_BOX(summaryview->hbox), pixmap, 0);
+ gtk_box_reorder_child(GTK_BOX(summaryview->hbox), pixmap, 1); /* search_toggle before */
gtk_widget_show(pixmap);
summaryview->folder_pixmap = pixmap;
/*
* Harvest addresses for selected messages in summary view.
*/
-void summary_harvest_address( SummaryView *summaryview ) {
+void summary_harvest_address(SummaryView *summaryview)
+{
GtkCTree *ctree = GTK_CTREE( summaryview->ctree );
GList *cur;
GList *msgList;
g_list_free( msgList );
}
+static regex_t *summary_compile_simplify_regexp(gchar *simplify_subject_regexp)
+{
+ int err;
+ gchar buf[BUFFSIZE];
+ regex_t *preg = NULL;
+
+ preg = g_new0(regex_t, 1);
+
+ err = string_match_precompile(simplify_subject_regexp,
+ preg, REG_EXTENDED);
+ if (err) {
+ regerror(err, preg, buf, BUFFSIZE);
+ alertpanel_error(_("Regular expression (regexp) error:\n%s"), buf);
+ g_free(preg);
+ preg = NULL;
+ }
+
+ return preg;
+}
+
+void summary_set_prefs_from_folderitem(SummaryView *summaryview, FolderItem *item)
+{
+ g_return_if_fail(summaryview != NULL);
+ g_return_if_fail(item != NULL);
+
+ /* Subject simplification */
+ if(summaryview->simplify_subject_preg) {
+ regfree(summaryview->simplify_subject_preg);
+ g_free(summaryview->simplify_subject_preg);
+ summaryview->simplify_subject_preg = NULL;
+ }
+ if(item->prefs && item->prefs->simplify_subject_regexp &&
+ item->prefs->simplify_subject_regexp[0] && item->prefs->enable_simplify_subject)
+ summaryview->simplify_subject_preg = summary_compile_simplify_regexp(item->prefs->simplify_subject_regexp);
+
+ /* Sorting */
+ summaryview->sort_key = item->sort_key;
+ summaryview->sort_type = item->sort_type;
+
+ /* Threading */
+ summaryview->threaded = item->threaded;
+}
+
+void summary_save_prefs_to_folderitem(SummaryView *summaryview, FolderItem *item)
+{
+ /* Sorting */
+ item->sort_key = summaryview->sort_key;
+ item->sort_type = summaryview->sort_type;
+
+ /* Threading */
+ item->threaded = summaryview->threaded;
+}
+
/*
* End of Source.
*/
-
projects / claws.git / blobdiff