static GtkCTreeNode *summary_find_next_msg
(SummaryView *summaryview,
GtkCTreeNode *current_node);
-static GtkCTreeNode *summary_find_prev_unread_msg
- (SummaryView *summaryview,
- GtkCTreeNode *current_node);
-static GtkCTreeNode *summary_find_next_unread_msg
- (SummaryView *summaryview,
- GtkCTreeNode *current_node);
-static GtkCTreeNode *summary_find_prev_marked_msg
- (SummaryView *summaryview,
- GtkCTreeNode *current_node);
-static GtkCTreeNode *summary_find_next_marked_msg
- (SummaryView *summaryview,
- GtkCTreeNode *current_node);
-static GtkCTreeNode *summary_find_prev_labeled_msg
- (SummaryView *summaryview,
- GtkCTreeNode *current_node);
-static GtkCTreeNode *summary_find_next_labeled_msg
- (SummaryView *summaryview,
- GtkCTreeNode *current_node);
+
+static GtkCTreeNode *summary_find_prev_flagged_msg
+ (SummaryView *summaryview,
+ GtkCTreeNode *current_node,
+ MsgPermFlags flags,
+ gboolean start_from_prev);
+static GtkCTreeNode *summary_find_next_flagged_msg
+ (SummaryView *summaryview,
+ GtkCTreeNode *current_node,
+ MsgPermFlags flags,
+ gboolean start_from_next);
+
static GtkCTreeNode *summary_find_msg_by_msgnum
(SummaryView *summaryview,
guint msgnum);
static GtkWidget *summary_ctree_create (SummaryView *summaryview);
-static void summary_toggle_view(SummaryView *summarview);
-
/* callback functions */
-static void summary_toggle_view_cb (GtkWidget *widget,
- gpointer data);
+static void summary_toggle_pressed (GtkWidget *eventbox,
+ GdkEventButton *event,
+ SummaryView *summaryview);
static void summary_button_pressed (GtkWidget *ctree,
GdkEventButton *event,
SummaryView *summaryview);
GtkWidget *statlabel_select;
GtkWidget *statlabel_msgs;
GtkWidget *hbox_spc;
- GtkWidget *toggle_view_btn;
- GtkWidget *toggle_view_arrow;
+ GtkWidget *toggle_eventbox;
+ GtkWidget *toggle_arrow;
GtkWidget *popupmenu;
GtkItemFactory *popupfactory;
gint n_entries;
statlabel_select = gtk_label_new("");
gtk_box_pack_start(GTK_BOX(hbox_l), statlabel_select, FALSE, FALSE, 12);
- /* toggle view buttons */
- toggle_view_btn = gtk_button_new();
- gtk_box_pack_end(GTK_BOX(hbox), toggle_view_btn, FALSE, FALSE, 0);
- gtk_button_set_relief(GTK_BUTTON(toggle_view_btn), GTK_RELIEF_NONE);
- toggle_view_arrow=gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
- gtk_container_add(GTK_CONTAINER(toggle_view_btn), toggle_view_arrow);
- gtk_signal_connect(GTK_OBJECT(toggle_view_btn), "clicked",
- GTK_SIGNAL_FUNC(summary_toggle_view_cb), summaryview);
+ /* 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);
summaryview->statlabel_folder = statlabel_folder;
summaryview->statlabel_select = statlabel_select;
summaryview->statlabel_msgs = statlabel_msgs;
- summaryview->toggle_view_btn = toggle_view_btn;
- summaryview->toggle_view_arrow = toggle_view_arrow;
+ summaryview->toggle_eventbox = toggle_eventbox;
+ summaryview->toggle_arrow = toggle_arrow;
summaryview->popupmenu = popupmenu;
summaryview->popupfactory = popupfactory;
- summaryview->msg_is_toggled_on = TRUE;
summaryview->lock_count = 0;
gtk_widget_show_all(vbox);
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);
+
summary_processing(summaryview, mlist);
for(cur = mlist ; cur != NULL ; cur = g_slist_next(cur)) {
g_slist_free(mlist);
+ summaryview->folder_item->new = summaryview->newmsgs;
+ summaryview->folder_item->unread = summaryview->unread;
+ summaryview->folder_item->total = summaryview->messages;
+ 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->selected) {
/* no selected message - select first unread
message, but do not display it */
- node = summary_find_next_unread_msg(summaryview, NULL);
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_UNREAD, FALSE);
if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
node = gtk_ctree_node_nth
(ctree,
node = summary_find_next_important_score(summaryview,
NULL);
else
- node = summary_find_next_unread_msg(summaryview, NULL);
-
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_UNREAD, FALSE);
if (node == NULL && GTK_CLIST(ctree)->row_list != NULL) {
node = gtk_ctree_node_nth
(ctree,
menu_set_sensitive(ifactory, "/Reply to sender", sens);
menu_set_sensitive(ifactory, "/Reply to all", sens);
menu_set_sensitive(ifactory, "/Forward", TRUE);
- menu_set_sensitive(ifactory, "/Redirect", TRUE);
+ menu_set_sensitive(ifactory, "/Redirect", sens);
menu_set_sensitive(ifactory, "/Add sender to address book", sens);
menu_set_sensitive(ifactory, "/Create filter rule", sens);
{
GtkCTreeNode *node;
- node = summary_find_prev_unread_msg(summaryview, summaryview->selected);
+ node = summary_find_prev_flagged_msg
+ (summaryview, summaryview->selected, MSG_UNREAD, FALSE);
if (!node) {
AlertValue val;
_("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
}
if (val != G_ALERTDEFAULT) return;
- node = summary_find_prev_unread_msg(summaryview, NULL);
+ node = summary_find_prev_flagged_msg(summaryview, NULL,
+ MSG_UNREAD, FALSE);
}
if (!node)
GtkCTreeNode *node = summaryview->selected;
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- while ((node = summary_find_next_unread_msg(summaryview, node)) == NULL) {
+ node = summary_find_next_flagged_msg
+ (summaryview, node, MSG_UNREAD, FALSE);
+
+ if (node)
+ summary_select_node(summaryview, node, TRUE, FALSE);
+ else {
+ node = summary_find_next_flagged_msg
+ (summaryview, NULL, MSG_UNREAD, FALSE);
+ if (node == NULL) {
+ AlertValue val;
+
+ switch (prefs_common.next_unread_msg_dialog) {
+ case NEXTUNREADMSGDIALOG_ALWAYS:
+ val = alertpanel(_("No more unread messages"),
+ _("No unread message found. "
+ "Go to next folder?"),
+ _("Yes"), _("No"), NULL);
+ break;
+ case NEXTUNREADMSGDIALOG_ASSUME_YES:
+ val = G_ALERTDEFAULT;
+ break;
+ case NEXTUNREADMSGDIALOG_ASSUME_NO:
+ val = G_ALERTOTHER;
+ break;
+ default:
+ debug_print(
+ _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
+ }
+
+ if (val == G_ALERTDEFAULT) {
+ if (gtk_signal_n_emissions_by_name
+ (GTK_OBJECT(ctree), "key_press_event") > 0)
+ gtk_signal_emit_stop_by_name
+ (GTK_OBJECT(ctree),
+ "key_press_event");
+ folderview_select_next_unread(summaryview->folderview);
+ return;
+ }
+ else
+ return;
+ } else
+ summary_select_node(summaryview, node, TRUE, FALSE);
+
+ }
+}
+
+void summary_select_prev_new(SummaryView *summaryview)
+{
+ GtkCTreeNode *node;
+
+ node = summary_find_prev_flagged_msg
+ (summaryview, summaryview->selected, MSG_NEW, FALSE);
+
+ if (!node) {
AlertValue val;
- switch (prefs_common.next_unread_msg_dialog) {
- case NEXTUNREADMSGDIALOG_ALWAYS:
- val = alertpanel(_("No more unread messages"),
- _("No unread message found. "
- "Go to next folder?"),
- _("Yes"), _("Search again"), _("No"));
- break;
- case NEXTUNREADMSGDIALOG_ASSUME_YES:
- val = G_ALERTDEFAULT;
- break;
- case NEXTUNREADMSGDIALOG_ASSUME_NO:
- val = G_ALERTOTHER;
- break;
- default:
- debug_print(
- _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
- }
+ val = alertpanel(_("No more new messages"),
+ _("No new message found. "
+ "Search from the end?"),
+ _("Yes"), _("No"), NULL);
+ if (val != G_ALERTDEFAULT) return;
+ node = summary_find_prev_flagged_msg(summaryview, NULL,
+ MSG_NEW, FALSE);
+ }
+
+ if (!node)
+ alertpanel_notice(_("No new messages."));
+ else
+ summary_select_node(summaryview, node, TRUE, FALSE);
+}
+void summary_select_next_new(SummaryView *summaryview)
+{
+ GtkCTreeNode *node = summaryview->selected;
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+
+ while ((node = summary_find_next_flagged_msg
+ (summaryview, node, MSG_NEW, FALSE)) == NULL) {
+ AlertValue val;
+
+ val = alertpanel(_("No more new messages"),
+ _("No new message found. "
+ "Go to next folder?"),
+ _("Yes"), _("Search again"), _("No"));
if (val == G_ALERTDEFAULT) {
if (gtk_signal_n_emissions_by_name
(GTK_OBJECT(ctree), "key_press_event") > 0)
{
GtkCTreeNode *node;
- node = summary_find_prev_marked_msg(summaryview, summaryview->selected);
+ node = summary_find_prev_flagged_msg
+ (summaryview, summaryview->selected, MSG_MARKED, TRUE);
if (!node) {
AlertValue val;
"Search from the end?"),
_("Yes"), _("No"), NULL);
if (val != G_ALERTDEFAULT) return;
- node = summary_find_prev_marked_msg(summaryview, NULL);
+ node = summary_find_prev_flagged_msg(summaryview, NULL,
+ MSG_MARKED, TRUE);
}
if (!node)
{
GtkCTreeNode *node;
- node = summary_find_next_marked_msg(summaryview, summaryview->selected);
+ node = summary_find_next_flagged_msg
+ (summaryview, summaryview->selected, MSG_MARKED, TRUE);
if (!node) {
AlertValue val;
"Search from the beginning?"),
_("Yes"), _("No"), NULL);
if (val != G_ALERTDEFAULT) return;
- node = summary_find_next_marked_msg(summaryview, NULL);
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_MARKED, TRUE);
}
if (!node)
{
GtkCTreeNode *node;
- node = summary_find_prev_labeled_msg(summaryview, summaryview->selected);
+ node = summary_find_prev_flagged_msg
+ (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
if (!node) {
AlertValue val;
"Search from the end?"),
_("Yes"), _("No"), NULL);
if (val != G_ALERTDEFAULT) return;
- node = summary_find_prev_labeled_msg(summaryview, NULL);
+ node = summary_find_prev_flagged_msg(summaryview, NULL,
+ MSG_CLABEL_FLAG_MASK, TRUE);
}
if (!node)
{
GtkCTreeNode *node;
- node = summary_find_next_labeled_msg(summaryview, summaryview->selected);
+ node = summary_find_next_flagged_msg
+ (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
if (!node) {
AlertValue val;
"Search from the beginning?"),
_("Yes"), _("No"), NULL);
if (val != G_ALERTDEFAULT) return;
- node = summary_find_next_labeled_msg(summaryview, NULL);
+ node = summary_find_next_flagged_msg(summaryview, NULL,
+ MSG_CLABEL_FLAG_MASK, TRUE);
}
if (!node)
for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (!MSG_IS_DELETED(msginfo->flags))
- break;
+ if (!MSG_IS_DELETED(msginfo->flags)) break;
}
return node;
for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (!MSG_IS_DELETED(msginfo->flags))
- break;
- }
-
- return node;
-}
-
-static GtkCTreeNode *summary_find_prev_unread_msg(SummaryView *summaryview,
- GtkCTreeNode *current_node)
-{
- GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- GtkCTreeNode *node;
- MsgInfo *msginfo;
-
- if (current_node)
- node = current_node;
- else
- node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
-
- for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
- msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) break;
- }
-
- return node;
-}
-
-static GtkCTreeNode *summary_find_next_unread_msg(SummaryView *summaryview,
- GtkCTreeNode *current_node)
-{
- GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- GtkCTreeNode *node;
- MsgInfo *msginfo;
-
- if (current_node)
- node = current_node;
- else
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-
- for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
- msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) break;
- }
-
- return node;
-}
-
-static GtkCTreeNode *summary_find_prev_marked_msg(SummaryView *summaryview,
- GtkCTreeNode *current_node)
-{
- GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- GtkCTreeNode *node;
- MsgInfo *msginfo;
-
- if (current_node)
- node = GTK_CTREE_NODE_PREV(current_node);
- else
- node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
-
- for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
- msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_IS_MARKED(msginfo->flags)) break;
- }
-
- return node;
-}
-
-static GtkCTreeNode *summary_find_next_marked_msg(SummaryView *summaryview,
- GtkCTreeNode *current_node)
-{
- GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
- GtkCTreeNode *node;
- MsgInfo *msginfo;
-
- if (current_node)
- node = gtkut_ctree_node_next(ctree, current_node);
- else
- node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-
- for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
- msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_IS_MARKED(msginfo->flags)) break;
+ if (!MSG_IS_DELETED(msginfo->flags)) break;
}
return node;
}
-static GtkCTreeNode *summary_find_prev_labeled_msg(SummaryView *summaryview,
- GtkCTreeNode *current_node)
+static GtkCTreeNode *summary_find_prev_flagged_msg(SummaryView *summaryview,
+ GtkCTreeNode *current_node,
+ MsgPermFlags flags,
+ gboolean start_from_prev)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node;
MsgInfo *msginfo;
- if (current_node)
- node = GTK_CTREE_NODE_PREV(current_node);
- else
+ if (current_node) {
+ if (start_from_prev)
+ node = GTK_CTREE_NODE_PREV(current_node);
+ else
+ node = current_node;
+ } else
node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_GET_COLORLABEL_VALUE(msginfo->flags) > 0) break;
+ if ((msginfo->flags.perm_flags & flags) != 0) break;
}
return node;
}
-static GtkCTreeNode *summary_find_next_labeled_msg(SummaryView *summaryview,
- GtkCTreeNode *current_node)
+static GtkCTreeNode *summary_find_next_flagged_msg(SummaryView *summaryview,
+ GtkCTreeNode *current_node,
+ MsgPermFlags flags,
+ gboolean start_from_next)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
GtkCTreeNode *node;
MsgInfo *msginfo;
- if (current_node)
- node = gtkut_ctree_node_next(ctree, current_node);
- else
+ if (current_node) {
+ if (start_from_next)
+ node = gtkut_ctree_node_next(ctree, current_node);
+ else
+ node = current_node;
+ } else
node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- if (MSG_GET_COLORLABEL_VALUE(msginfo->flags) > 0) break;
+ /* Find msg with matching flags but ignore messages with
+ ignore flags, if searching for new or unread messages */
+ if (!(((flags & (MSG_NEW | MSG_UNREAD)) != 0) && MSG_IS_IGNORE_THREAD(msginfo->flags)) &&
+ ((msginfo->flags.perm_flags & flags) != 0))
+ break;
}
return node;
return;
}
+ summaryview->newmsgs = summaryview->folder_item->new;
+ summaryview->unread = summaryview->folder_item->unread;
+ summaryview->messages = summaryview->folder_item->total;
+
rowlist = GTK_CLIST(summaryview->ctree)->selection;
for (cur = rowlist; cur != NULL; cur = cur->next) {
msginfo = gtk_ctree_node_get_row_data
}
gtk_label_set(GTK_LABEL(summaryview->statlabel_msgs), str);
g_free(str);
-
- summaryview->folder_item->new = summaryview->newmsgs;
- summaryview->folder_item->unread = summaryview->unread;
- summaryview->folder_item->total = summaryview->messages;
-
- folderview_update_msg_num(summaryview->folderview,
- summaryview->folderview->opened);
}
static void summary_set_column_titles(SummaryView *summaryview)
GtkCListCompareFunc cmp_func;
FolderItem *item = summaryview->folder_item;
- if (!item) return;
+ if (!item || !item->path || !item->parent || item->no_select) return;
switch (sort_key) {
case SORT_BY_MARK:
if (!summaryview->folder_item || !summaryview->folder_item->path)
return -1;
+
+ if (!summaryview->folder_item->cache)
+ return -1;
+
+ folder_item_write_cache(summaryview->folder_item);
+ return 0;
if (summaryview->folder_item->folder->update_mark != NULL)
summaryview->folder_item->folder->update_mark(summaryview->folder_item->folder, summaryview->folder_item);
text[col_pos[S_COL_LOCKED]] = NULL;
text[col_pos[S_COL_NUMBER]] = itos(msginfo->msgnum);
text[col_pos[S_COL_SIZE]] = to_human_readable(msginfo->size);
-
-#if 0
- text[col_pos[S_COL_SCORE]] = itos_buf(col_score, msginfo->threadscore);
-#else
text[col_pos[S_COL_SCORE]] = itos_buf(col_score, msginfo->score);
-#endif
if (msginfo->date_t) {
procheader_date_get_localtime(date_modified,
}
g_free(filename);
+/* NOT NEEDED ANYMORE
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_IGNORE_THREAD(msginfo->flags) ||
- MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags)) {
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_NEW | MSG_UNREAD);
- summary_set_row_marks(summaryview, row);
- gtk_clist_thaw(GTK_CLIST(ctree));
- summary_status_show(summaryview);
- }
+*/
+ 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;
msgview = summaryview->messageview;
summaryview->displayed = row;
- if (!summaryview->msg_is_toggled_on)
- summary_toggle_view(summaryview);
+ if (!messageview_is_visible(msgview))
+ main_window_toggle_message_view(summaryview->mainwin);
messageview_show(msgview, msginfo, all_headers);
if (msgview->type == MVIEW_TEXT ||
(msgview->type == MVIEW_MIME &&
gtkut_ctree_node_move_if_on_the_edge(ctree, row);
}
- 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_clist_thaw(GTK_CLIST(ctree));
- summary_status_show(summaryview);
- }
summary_set_menu_sensitive(summaryview);
main_window_set_toolbar_sensitive(summaryview->mainwin);
}
}
- if (summaryview->msg_is_toggled_on)
+ if (messageview_is_visible(summaryview->messageview))
summaryview->display_msg = TRUE;
gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
type, 0.0);
}
-static void summary_toggle_view(SummaryView *summaryview)
+void summary_toggle_view(SummaryView *summaryview)
{
- MainWindow *mainwin = summaryview->mainwin;
- GtkItemFactory *ifactory;
-
- if (!mainwin) return;
-
- ifactory = gtk_item_factory_from_widget(mainwin->menubar);
- menu_toggle_toggle(ifactory, "/View/Expand Summary View");
-}
-
-void summary_toggle_view_real(SummaryView *summaryview)
-{
- MainWindow *mainwin = summaryview->mainwin;
- union CompositeWin *cwin = &mainwin->win;
- GtkWidget *vpaned = NULL;
- GtkWidget *container = NULL;
- GtkWidget *toggle_view_btn;
- GtkWidget *toggle_view_arrow;
- GtkItemFactory *ifactory = gtk_item_factory_from_widget(mainwin->menubar);
-
- switch (mainwin->type) {
- case SEPARATE_NONE:
- vpaned = cwin->sep_none.vpaned;
- container = cwin->sep_none.hpaned;
- break;
- case SEPARATE_FOLDER:
- vpaned = cwin->sep_folder.vpaned;
- container = mainwin->vbox_body;
- break;
- case SEPARATE_MESSAGE:
- case SEPARATE_BOTH:
- return;
- }
-
- if (vpaned->parent != NULL) {
- summaryview->msg_is_toggled_on = FALSE;
- summaryview->displayed = NULL;
- gtk_widget_ref(vpaned);
- gtkut_container_remove(GTK_CONTAINER(container), vpaned);
- gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), container);
-
- gtk_widget_destroy(summaryview->toggle_view_arrow);
- gtk_widget_destroy(summaryview->toggle_view_btn);
-
- toggle_view_btn = gtk_button_new();
- gtk_box_pack_end(GTK_BOX(summaryview->hbox), toggle_view_btn, FALSE, FALSE, 0);
- gtk_box_reorder_child(GTK_BOX(summaryview->hbox), toggle_view_btn, 0);
- gtk_button_set_relief(GTK_BUTTON(toggle_view_btn), GTK_RELIEF_NONE);
- toggle_view_arrow=gtk_arrow_new(GTK_ARROW_UP, GTK_SHADOW_OUT);
- gtk_container_add(GTK_CONTAINER(toggle_view_btn), toggle_view_arrow);
- gtk_signal_connect(GTK_OBJECT(toggle_view_btn), "clicked",
- GTK_SIGNAL_FUNC(summary_toggle_view_cb), summaryview);
- gtk_widget_show_all(toggle_view_btn);
- menu_set_sensitive(ifactory, "/View/Expand Message View", FALSE);
- } else {
- summaryview->msg_is_toggled_on = TRUE;
- gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), vpaned);
- gtk_container_add(GTK_CONTAINER(container), vpaned);
- gtk_widget_unref(vpaned);
-
- gtk_widget_destroy(summaryview->toggle_view_arrow);
- gtk_widget_destroy(summaryview->toggle_view_btn);
-
- toggle_view_btn = gtk_button_new();
- gtk_box_pack_end(GTK_BOX(summaryview->hbox), toggle_view_btn, FALSE, FALSE, 0);
- gtk_box_reorder_child(GTK_BOX(summaryview->hbox), toggle_view_btn, 0);
- gtk_button_set_relief(GTK_BUTTON(toggle_view_btn), GTK_RELIEF_NONE);
- toggle_view_arrow=gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
- gtk_container_add(GTK_CONTAINER(toggle_view_btn), toggle_view_arrow);
- gtk_signal_connect(GTK_OBJECT(toggle_view_btn), "clicked",
- GTK_SIGNAL_FUNC(summary_toggle_view_cb), summaryview);
- gtk_widget_show_all(toggle_view_btn);
- menu_set_sensitive(ifactory, "/View/Expand Message View", TRUE);
- }
-
- gtk_widget_grab_focus(summaryview->ctree);
-
- summaryview->toggle_view_btn = toggle_view_btn;
- summaryview->toggle_view_arrow = toggle_view_arrow;
+ if (!messageview_is_visible(summaryview->messageview) &&
+ summaryview->selected)
+ summary_display_msg(summaryview,
+ summaryview->selected);
+ else
+ main_window_toggle_message_view(summaryview->mainwin);
}
static gboolean summary_search_unread_recursive(GtkCTree *ctree,
folderview_update_item(msginfo->to_folder, 0);
}
msginfo->to_folder = NULL;
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
- MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_set_perm_flags(msginfo, MSG_MARKED);
- CHANGE_FLAGS(msginfo);
+ 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);
}
folderview_update_item(msginfo->to_folder, 0);
}
msginfo->to_folder = NULL;
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
- MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_LOCKED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_set_perm_flags(msginfo, MSG_LOCKED);
- CHANGE_FLAGS(msginfo);
+ 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);
}
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+/* NOT NEEDED ANYMORE
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)) {
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_NEW | MSG_UNREAD);
- CHANGE_FLAGS(msginfo);
- summary_set_row_marks(summaryview, row);
- debug_print(_("Message %d is marked as read\n"),
- msginfo->msgnum);
- }
+*/
+ 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"),
+ msginfo->msgnum);
}
void summary_mark_as_read(SummaryView *summaryview)
msginfo = gtk_ctree_node_get_row_data(ctree, row);
if (MSG_IS_DELETED(msginfo->flags)) {
msginfo->to_folder = NULL;
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
+ procmsg_msginfo_unset_flags(msginfo, MSG_DELETED, 0);
summaryview->deleted--;
}
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_REPLIED | MSG_FORWARDED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_REPLIED);
- if (!MSG_IS_UNREAD(msginfo->flags)) {
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_UNREAD);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_set_perm_flags(msginfo, MSG_UNREAD);
+/* NOT NEEDED ANYMORE
+ if (!MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
summaryview->unread++;
- debug_print(_("Message %d is marked as unread\n"),
- msginfo->msgnum);
- }
+*/
- CHANGE_FLAGS(msginfo);
+ 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"),
+ msginfo->msgnum);
summary_set_row_marks(summaryview, row);
}
folderview_update_item(msginfo->to_folder, 0);
}
msginfo->to_folder = NULL;
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_MARKED);
- MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_DELETED);
- CHANGE_FLAGS(msginfo);
+ procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, MSG_MOVE | MSG_COPY);
+ procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
summaryview->deleted++;
if (!prefs_common.immediate_exec &&
else if (sel_last && node == GTK_CTREE_NODE_PREV(sel_last))
summary_step(summaryview, GTK_SCROLL_STEP_BACKWARD);
else
- summary_select_node(summaryview, node,
- summaryview->msg_is_toggled_on,
- FALSE);
+ summary_select_node
+ (summaryview, node,
+ messageview_is_visible(summaryview->messageview),
+ FALSE);
}
if (prefs_common.immediate_exec || item->stype == F_TRASH)
folderview_update_item(msginfo->to_folder, 0);
}
msginfo->to_folder = NULL;
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_MARKED);
- MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE | MSG_COPY);
- CHANGE_FLAGS(msginfo);
+ 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"),
msginfo->folder->path, msginfo->msgnum);
}
if (!prefs_common.immediate_exec)
msginfo->to_folder->op_count--;
}
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_MARKED);
- MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_COPY);
+ procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_COPY);
if (!MSG_IS_MOVE(msginfo->flags)) {
- MSG_SET_TMP_FLAGS(msginfo->flags, MSG_MOVE);
+ procmsg_msginfo_set_flags(msginfo, 0, MSG_MOVE);
summaryview->moved++;
changed = TRUE;
}
if (!prefs_common.immediate_exec)
msginfo->to_folder->op_count--;
}
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED | MSG_DELETED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_MARKED);
- MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_MOVE);
+ procmsg_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE);
if (!MSG_IS_COPY(msginfo->flags)) {
- MSG_SET_TMP_FLAGS(msginfo->flags, MSG_COPY);
+ procmsg_msginfo_set_flags(msginfo, 0, MSG_COPY);
summaryview->copied++;
changed = TRUE;
}
if (summaryview->mlist) {
procmsg_move_messages(summaryview->mlist);
- folder_item_scan_foreach(summaryview->folder_table);
folderview_update_item_foreach(summaryview->folder_table);
for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
summaryview->mlist = NULL;
}
+ folderview_update_item(summaryview->folder_item, FALSE);
g_hash_table_destroy(summaryview->folder_table);
summaryview->folder_table = NULL;
}
if (summaryview->mlist) {
procmsg_copy_messages(summaryview->mlist);
- folder_item_scan_foreach(summaryview->folder_table);
+ /* folder_item_scan_foreach(summaryview->folder_table); */
folderview_update_item_foreach(summaryview->folder_table);
g_slist_free(summaryview->mlist);
summaryview->mlist =
g_slist_append(summaryview->mlist, msginfo);
- MSG_UNSET_TMP_FLAGS(msginfo->flags, MSG_COPY);
+ procmsg_msginfo_unset_flags(msginfo, 0, MSG_COPY);
summary_set_row_marks(summaryview, node);
}
}
GSList *cur;
trash = summaryview->folder_item->folder->trash;
-
if (summaryview->folder_item->folder->type == F_MH) {
g_return_if_fail(trash != NULL);
}
summaryview->mlist = NULL;
if ((summaryview->folder_item != trash) && (trash != NULL)) {
- folder_item_scan(trash);
folderview_update_item(trash, FALSE);
}
+ folderview_update_item(summaryview->folder_item, FALSE);
}
static void summary_execute_delete_func(GtkCTree *ctree, GtkCTreeNode *node,
summaryview->folder_table);
}
- folder_item_scan_foreach(summaryview->folder_table);
+ /* folder_item_scan_foreach(summaryview->folder_table); */
folderview_update_item_foreach(summaryview->folder_table);
g_hash_table_destroy(summaryview->folder_table);
gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
- folder_item_scan_foreach(summaryview->folder_table);
+ /* folder_item_scan_foreach(summaryview->folder_table); */
folderview_update_item_foreach(summaryview->folder_table);
g_hash_table_destroy(summaryview->folder_table);
gint color_index;
msginfo = gtk_ctree_node_get_row_data(ctree, node);
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_CLABEL_FLAG_MASK);
- MSG_SET_COLORLABEL_VALUE(msginfo->flags, labelcolor);
+ procmsg_msginfo_unset_flags(msginfo, MSG_CLABEL_FLAG_MASK, 0);
+ procmsg_msginfo_set_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0);
color_index = labelcolor == 0 ? -1 : (gint)labelcolor - 1;
ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
guint selected_msgnum = summary_get_msgnum(summaryview, summaryview->selected);
guint displayed_msgnum = summary_get_msgnum(summaryview, summaryview->displayed);
-
item = summaryview->folder_item;
summary_lock(summaryview);
}
-
/* callback functions */
-static void summary_toggle_view_cb(GtkWidget *button,
- gpointer data)
+static void summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
+ SummaryView *summaryview)
{
- SummaryView *summaryview = (SummaryView *) data;
-
- if (!summaryview->msg_is_toggled_on && summaryview->selected)
- summary_display_msg(summaryview, summaryview->selected);
- else
- summary_toggle_view(summaryview);
+ if (!event) return;
+
+ summary_toggle_view(summaryview);
}
static void summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
summaryview->display_msg = TRUE;
} else if (event->button == 1) {
if (!prefs_common.emulate_emacs &&
- summaryview->msg_is_toggled_on)
+ messageview_is_visible(summaryview->messageview))
summaryview->display_msg = TRUE;
}
}
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_Delete:
RETURN_IF_LOCKED();
BREAK_ON_MODIFIER_KEY();
switch (column < 0 ? column : summaryview->col_state[column].type) {
case S_COL_MARK:
if (MSG_IS_MARKED(msginfo->flags)) {
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_MARKED);
- if (MSG_IS_IMAP(msginfo->flags))
- imap_msg_unset_perm_flags(msginfo, MSG_MARKED);
- CHANGE_FLAGS(msginfo);
+ procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, 0);
summary_set_row_marks(summaryview, row);
} else
summary_mark_row(summaryview, row);
break;
case S_COL_LOCKED:
if (MSG_IS_LOCKED(msginfo->flags)) {
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_LOCKED);
- CHANGE_FLAGS(msginfo);
+ procmsg_msginfo_unset_flags(msginfo, MSG_LOCKED, 0);
summary_set_row_marks(summaryview, row);
}
else
break;
}
- if (summaryview->display_msg) {
+ if (summaryview->display_msg ||
+ (prefs_common.show_msg_with_cursor_key &&
+ messageview_is_visible(summaryview->messageview))) {
summary_display_msg(summaryview, row);
summaryview->display_msg = FALSE;
} else {
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+/* NOT NEEDED ANYMORE
if (MSG_IS_NEW(msginfo->flags))
summaryview->newmsgs--;
if (MSG_IS_UNREAD(msginfo->flags))
summaryview->unread--;
- MSG_SET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
-
- CHANGE_FLAGS(msginfo);
+*/
+ 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"),
MsgInfo *msginfo;
msginfo = gtk_ctree_node_get_row_data(ctree, row);
+/* NOT NEEDED ANYMORE
if (MSG_IS_NEW(msginfo->flags))
summaryview->newmsgs++;
if (MSG_IS_UNREAD(msginfo->flags))
summaryview->unread++;
- MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_IGNORE_THREAD);
+*/
+ procmsg_msginfo_unset_flags(msginfo, MSG_IGNORE_THREAD, 0);
- CHANGE_FLAGS(msginfo);
-
summary_set_row_marks(summaryview, row);
debug_print(_("Message %d is marked as unignore thread\n"),
msginfo->msgnum);
return FALSE;
processing = item->prefs->processing;
+
if (processing != NULL) {
gchar * buf;
GSList * mlist;
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 = cur->next) {
MsgInfo * msginfo;