Applied the marknav patch (commands to move to prev/next marked message).

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index 1fb92fe2429599884874669a7dd68ff6b8cd883f..20ffd22f03925c7668872ccd5e89c6cb4af34d63 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -136,6 +136,12 @@ static void summary_set_menu_sensitive     (SummaryView            *summaryview);
 static GtkCTreeNode *summary_find_next_unread_msg
                                        (SummaryView            *summaryview,
                                         GtkCTreeNode           *current_node);
+static GtkCTreeNode *summary_find_next_marked_msg
+                                       (SummaryView            *summaryview,
+                                        GtkCTreeNode           *current_node);
+static GtkCTreeNode *summary_find_prev_marked_msg
+                                       (SummaryView            *summaryview,
+                                        GtkCTreeNode           *current_node);
 static GtkCTreeNode *summary_find_msg_by_msgnum
                                        (SummaryView            *summaryview,
                                         guint                   msgnum);
@@ -843,6 +849,66 @@ void summary_select_next_unread(SummaryView *summaryview)
        }
 }
 
+void summary_select_next_marked(SummaryView *summaryview)
+{
+       GtkCTreeNode *node;
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+
+       node = summary_find_next_marked_msg(summaryview,
+                                           summaryview->selected);
+
+       if (!node) {
+               AlertValue val;
+
+               val = alertpanel(_("No more marked messages"),
+                                _("No marked message found. "
+                                  "Search from the beginning?"),
+                                _("Yes"), _("No"), NULL);
+               if (val != G_ALERTDEFAULT) return;
+               node = summary_find_next_marked_msg(summaryview,
+                                                   NULL);
+       }
+       if (!node) {
+               alertpanel_notice(_("No marked messages."));
+       } else {
+               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+               gtk_sctree_select(GTK_SCTREE(ctree), node);
+               if (summaryview->displayed == node)
+                       summaryview->displayed = NULL;
+               summary_display_msg(summaryview, node, FALSE);
+       }
+}
+
+void summary_select_prev_marked(SummaryView *summaryview)
+{
+       GtkCTreeNode *node;
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+
+       node = summary_find_prev_marked_msg(summaryview,
+                                           summaryview->selected);
+
+       if (!node) {
+               AlertValue val;
+
+               val = alertpanel(_("No more marked messages"),
+                                _("No marked message found. "
+                                  "Search from the end?"),
+                                _("Yes"), _("No"), NULL);
+               if (val != G_ALERTDEFAULT) return;
+               node = summary_find_prev_marked_msg(summaryview,
+                                                   NULL);
+       }
+       if (!node) {
+               alertpanel_notice(_("No marked messages."));
+       } else {
+               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+               gtk_sctree_select(GTK_SCTREE(ctree), node);
+               if (summaryview->displayed == node)
+                       summaryview->displayed = NULL;
+               summary_display_msg(summaryview, node, FALSE);
+       }
+}
+
 void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
 {
        GtkCTreeNode *node;
@@ -891,6 +957,46 @@ static GtkCTreeNode *summary_find_next_unread_msg(SummaryView *summaryview,
        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 = GTK_CTREE_NODE_NEXT(current_node);
+       else
+               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+
+       for (; node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
+               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               if (MSG_IS_MARKED(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(GTK_CLIST(ctree)->row_list_end);
+
+       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_msg_by_msgnum(SummaryView *summaryview,
                                                guint msgnum)
 {