projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add new mark-all-unread (and recursively when relevant) action to folder
[claws.git] / src / summaryview.c
diff --git a/src/summaryview.c b/src/summaryview.c
index 415334170c234534a95f05fadb6b8f26a9a7c2e3..4739b66c235bfe9948a9e44ee3a9c51171a45f8d 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1833,8 +1833,12 @@ void summary_select_prev_unread(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node;
 
-       node = summary_find_prev_flagged_msg
-               (summaryview, summaryview->selected, MSG_UNREAD, TRUE);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = summary_find_prev_flagged_msg
+                       (summaryview, summaryview->selected, MSG_UNREAD, TRUE);
+       else
+               node = summary_find_next_flagged_msg
+                       (summaryview, summaryview->selected, MSG_UNREAD, TRUE);
 
        if (!node || node == summaryview->selected) {
                AlertValue val = 0;
@@ -1857,8 +1861,12 @@ void summary_select_prev_unread(SummaryView *summaryview)
                                        _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
                }
                if (val != G_ALERTALTERNATE) return;
-               node = summary_find_prev_flagged_msg(summaryview, NULL,
-                                                    MSG_UNREAD, FALSE);
+               if (summaryview->sort_type == SORT_ASCENDING)
+                       node = summary_find_prev_flagged_msg(summaryview, NULL,
+                                                            MSG_UNREAD, FALSE);
+               else
+                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                            MSG_UNREAD, FALSE);
        }
 
        if (!node)
@@ -1871,8 +1879,12 @@ void summary_select_next_unread(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node = summaryview->selected;
 
-       node = summary_find_next_flagged_msg
-               (summaryview, node, MSG_UNREAD, TRUE);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = summary_find_next_flagged_msg
+                       (summaryview, node, MSG_UNREAD, TRUE);
+       else
+               node = summary_find_prev_flagged_msg
+                       (summaryview, node, MSG_UNREAD, TRUE);
        
        if (node)
                summary_select_node(summaryview, node, -1);
@@ -1906,8 +1918,12 @@ void summary_select_prev_new(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node;
 
-       node = summary_find_prev_flagged_msg
-               (summaryview, summaryview->selected, MSG_NEW, TRUE);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = summary_find_prev_flagged_msg
+                       (summaryview, summaryview->selected, MSG_NEW, TRUE);
+       else
+               node = summary_find_next_flagged_msg
+                       (summaryview, summaryview->selected, MSG_NEW, TRUE);
 
        if (!node || node == summaryview->selected) {
                AlertValue val = 0;
@@ -1930,8 +1946,12 @@ void summary_select_prev_new(SummaryView *summaryview)
                                        _("Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"));
                }
                if (val != G_ALERTALTERNATE) return;
-               node = summary_find_prev_flagged_msg(summaryview, NULL,
-                                                    MSG_NEW, FALSE);
+               if (summaryview->sort_type == SORT_ASCENDING)
+                       node = summary_find_prev_flagged_msg(summaryview, NULL,
+                                                            MSG_NEW, FALSE);
+               else
+                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                            MSG_NEW, FALSE);
        }
 
        if (!node)
@@ -1944,8 +1964,12 @@ void summary_select_next_new(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node = summaryview->selected;
 
-       node = summary_find_next_flagged_msg
-               (summaryview, node, MSG_NEW, TRUE);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = summary_find_next_flagged_msg
+                       (summaryview, node, MSG_NEW, TRUE);
+       else
+               node = summary_find_prev_flagged_msg
+                       (summaryview, node, MSG_NEW, TRUE);
        
        if (node)
                summary_select_node(summaryview, node, -1);
@@ -1978,8 +2002,12 @@ void summary_select_prev_marked(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node;
 
-       node = summary_find_prev_flagged_msg
-               (summaryview, summaryview->selected, MSG_MARKED, TRUE);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = summary_find_prev_flagged_msg
+                       (summaryview, summaryview->selected, MSG_MARKED, TRUE);
+       else
+               node = summary_find_next_flagged_msg
+                       (summaryview, summaryview->selected, MSG_MARKED, TRUE);
 
        if (!node) {
                AlertValue val;
@@ -2003,8 +2031,12 @@ void summary_select_next_marked(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node = summaryview->selected;
 
-       node = summary_find_next_flagged_msg
-               (summaryview, node, MSG_MARKED, TRUE);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = summary_find_next_flagged_msg
+                       (summaryview, node, MSG_MARKED, TRUE);
+       else
+               node = summary_find_prev_flagged_msg
+                       (summaryview, node, MSG_MARKED, TRUE);
        
        if (node)
                summary_select_node(summaryview, node, -1);
@@ -2037,8 +2069,12 @@ void summary_select_prev_labeled(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node;
 
-       node = summary_find_prev_flagged_msg
-               (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = summary_find_prev_flagged_msg
+                       (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
+       else
+               node = summary_find_next_flagged_msg
+                       (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
 
        if (!node) {
                AlertValue val;
@@ -2062,8 +2098,12 @@ void summary_select_next_labeled(SummaryView *summaryview)
 {
        GtkCMCTreeNode *node;
 
-       node = summary_find_next_flagged_msg
-               (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
+       if (summaryview->sort_type == SORT_ASCENDING)
+               node = summary_find_next_flagged_msg
+                       (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
+       else
+               node = summary_find_prev_flagged_msg
+                       (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
 
        if (!node) {
                AlertValue val;
@@ -2073,8 +2113,12 @@ void summary_select_next_labeled(SummaryView *summaryview)
                                   "Search from the beginning?"),
                                 GTK_STOCK_NO, "+"GTK_STOCK_YES, NULL);
                if (val != G_ALERTALTERNATE) return;
-               node = summary_find_next_flagged_msg(summaryview, NULL,
-                                                    MSG_CLABEL_FLAG_MASK, TRUE);
+               if (summaryview->sort_type == SORT_ASCENDING)
+                       node = summary_find_next_flagged_msg(summaryview, NULL,
+                                                            MSG_CLABEL_FLAG_MASK, TRUE);
+               else
+                       node = summary_find_prev_flagged_msg(summaryview, NULL,
+                                                            MSG_CLABEL_FLAG_MASK, TRUE);
        }
 
        if (!node)
@@ -3981,7 +4025,25 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
                msginfo->msgnum);
 }
 
-void summary_mark_as_read(SummaryView *summaryview)
+static void summary_mark_row_as_unread(SummaryView *summaryview,
+                                    GtkCMCTreeNode *row)
+{
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       MsgInfo *msginfo;
+
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
+       cm_return_if_fail(msginfo);
+
+       if(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags))
+               return;
+
+       summary_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
+       summary_set_row_marks(summaryview, row);
+       debug_print("Message %d is marked as unread\n",
+               msginfo->msgnum);
+}
+
+void summary_mark_as_read(SummaryView *summaryview, gboolean read)
 {
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
@@ -3992,8 +4054,12 @@ void summary_mark_as_read(SummaryView *summaryview)
        START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
        for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
-               summary_mark_row_as_read(summaryview,
-                                        GTK_CMCTREE_NODE(cur->data));
+               if (read)
+                       summary_mark_row_as_read(summaryview,
+                                                GTK_CMCTREE_NODE(cur->data));
+               else
+                       summary_mark_row_as_unread(summaryview,
+                                                GTK_CMCTREE_NODE(cur->data));
        folder_item_set_batch(summaryview->folder_item, FALSE);
        END_LONG_OPERATION(summaryview);
        
@@ -4034,17 +4100,26 @@ void summary_msgs_unlock(SummaryView *summaryview)
        summary_status_show(summaryview);
 }
 
-void summary_mark_all_read(SummaryView *summaryview)
+void summary_mark_all_read(SummaryView *summaryview, gboolean read)
 {
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GtkCMCTreeNode *node;
        AlertValue val;
        gboolean froze = FALSE;
+       gchar *message;
+       gchar *title;
+
+       if (read) {
+               title = _("Mark all as read");
+               message = _("Do you really want to mark all mails in this folder as read?");
+       } else {
+               title = _("Mark all as unread");
+               message = _("Do you really want to mark all mails in this folder as unread?");
+       }
 
        if (prefs_common.ask_mark_all_read) {
-               val = alertpanel_full(_("Mark all as read"),
-                       _("Do you really want to mark all mails in this "
-                         "folder as read?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
+               val = alertpanel_full(title, message,
+                         GTK_STOCK_NO, GTK_STOCK_YES, NULL,
                          TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
                if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
@@ -4059,7 +4134,10 @@ void summary_mark_all_read(SummaryView *summaryview)
        folder_item_set_batch(summaryview->folder_item, TRUE);
        for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
             node = gtkut_ctree_node_next(ctree, node))
-               summary_mark_row_as_read(summaryview, node);
+               if (read)
+                       summary_mark_row_as_read(summaryview, node);
+               else
+                       summary_mark_row_as_unread(summaryview, node);
        folder_item_set_batch(summaryview->folder_item, FALSE);
        for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
             node = gtkut_ctree_node_next(ctree, node)) {
@@ -4139,27 +4217,6 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid
 }
 
 
-static void summary_mark_row_as_unread(SummaryView *summaryview,
-                                      GtkCMCTreeNode *row)
-{
-       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
-       MsgInfo *msginfo;
-
-       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
-       cm_return_if_fail(msginfo);
-       if (MSG_IS_DELETED(msginfo->flags)) {
-               procmsg_msginfo_set_to_folder(msginfo, NULL);
-               summary_msginfo_unset_flags(msginfo, MSG_DELETED, 0);
-               summaryview->deleted--;
-       }
-
-       summary_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
-       debug_print("Message %d is marked as unread\n",
-               msginfo->msgnum);
-
-       summary_set_row_marks(summaryview, row);
-}
-
 void summary_mark_as_unread(SummaryView *summaryview)
 {
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
@@ -7706,6 +7763,7 @@ void summary_toggle_watch_thread(SummaryView *summaryview)
                summary_watch_thread(summaryview);
 }
 
+
 void summary_toggle_show_read_messages(SummaryView *summaryview)
 {
        FolderItemUpdateData source;
Claws Mail