make lock stuff added some days ago more functional

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index d5539e45b3a7c3bb69e4f97a9cffd2f94cb585a8..8dbdeecd4f0f7a77c2d08ed05d6b0be9005828a0 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -89,6 +89,7 @@
 #include "pixmaps/forwarded.xpm"
 #include "pixmaps/clip.xpm"
 #include "pixmaps/ignorethread.xpm"
+#include "pixmaps/locked.xpm"
 
 #define STATUSBAR_PUSH(mainwin, str) \
 { \
@@ -105,6 +106,7 @@
 
 #define SUMMARY_COL_MARK_WIDTH         10
 #define SUMMARY_COL_UNREAD_WIDTH       13
+#define SUMMARY_COL_LOCKED_WIDTH       13
 #define SUMMARY_COL_MIME_WIDTH         10
 
 static GdkFont *boldfont;
@@ -135,6 +137,8 @@ static GdkPixmap *forwardedxpm;
 static GdkBitmap *forwardedxpmmask;
 static GdkPixmap *ignorethreadxpm;
 static GdkBitmap *ignorethreadxpmmask;
+static GdkPixmap *lockedxpm;
+static GdkBitmap *lockedxpmmask;
 
 static GdkPixmap *clipxpm;
 static GdkBitmap *clipxpmmask;
@@ -202,6 +206,8 @@ static void summary_set_row_marks   (SummaryView            *summaryview,
 /* message handling */
 static void summary_mark_row           (SummaryView            *summaryview,
                                         GtkCTreeNode           *row);
+static void summary_lock_row           (SummaryView            *summaryview,
+                                        GtkCTreeNode           *row);
 static void summary_mark_row_as_read   (SummaryView            *summaryview,
                                         GtkCTreeNode           *row);
 static void summary_mark_row_as_unread (SummaryView            *summaryview,
@@ -429,7 +435,8 @@ static const gchar *const col_label[N_SUMMARY_COLS] = {
        N_("Date"),     /* S_COL_DATE    */
        N_("Size"),     /* S_COL_SIZE    */
        N_("No."),      /* S_COL_NUMBER  */
-       N_("Score")     /* S_COL_SCORE   */
+       N_("Score"),    /* S_COL_SCORE   */
+       N_("L")         /* S_COL_LOCKED  */
 };
 
 SummaryView *summary_create(void)
@@ -535,6 +542,7 @@ void summary_init(SummaryView *summaryview)
                      forwarded_xpm);
        PIXMAP_CREATE(summaryview->ctree, ignorethreadxpm, ignorethreadxpmmask,
                      ignorethread_xpm);
+       PIXMAP_CREATE(summaryview->ctree, lockedxpm, lockedxpmmask, locked_xpm);                      
        PIXMAP_CREATE(summaryview->ctree, clipxpm, clipxpmmask, clip_xpm);
        PIXMAP_CREATE(summaryview->hbox, folderxpm, folderxpmmask,
                      dir_open_xpm);
@@ -1299,7 +1307,8 @@ static GtkCTreeNode *summary_find_prev_msg(SummaryView *summaryview,
 
        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;
@@ -1319,7 +1328,8 @@ static GtkCTreeNode *summary_find_next_msg(SummaryView *summaryview,
 
        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;
+               if (!MSG_IS_DELETED(msginfo->flags))
+                       break;
        }
 
        return node;
@@ -2491,6 +2501,14 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], NULL);
        }
 
+       if (MSG_IS_LOCKED(flags)) {
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_LOCKED],
+                                         lockedxpm, lockedxpmmask);
+       }
+       else {
+               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], NULL);
+       }
+
        if (MSG_IS_MIME(flags)) {
                gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          clipxpm, clipxpmmask);
@@ -2547,6 +2565,38 @@ static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
        debug_print(_("Message %d is marked\n"), msginfo->msgnum);
 }
 
+static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
+{
+       /* almost verbatim summary_mark_row(); may want a menu action? */
+       gboolean changed = FALSE;
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       MsgInfo *msginfo;
+
+       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       if (MSG_IS_DELETED(msginfo->flags))
+               summaryview->deleted--;
+       if (MSG_IS_MOVE(msginfo->flags)) {
+               summaryview->moved--;
+               changed = TRUE;
+       }
+       if (MSG_IS_COPY(msginfo->flags)) {
+               summaryview->copied--;
+               changed = TRUE;
+       }
+       if (changed && !prefs_common.immediate_exec) {
+               msginfo->to_folder->op_count--;
+               if (msginfo->to_folder->op_count == 0)
+                       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);
+       CHANGE_FLAGS(msginfo);
+       summary_set_row_marks(summaryview, row);
+       debug_print(_("Message %d is locked\n"), msginfo->msgnum);
+}
+
 void summary_mark(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -2657,6 +2707,8 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
 
        msginfo = gtk_ctree_node_get_row_data(ctree, row);
 
+       if (MSG_IS_LOCKED(msginfo->flags)) return;
+
        if (MSG_IS_DELETED(msginfo->flags)) return;
 
        if (MSG_IS_MOVE(msginfo->flags)) {
@@ -3787,6 +3839,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                                           GTK_JUSTIFY_CENTER);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
                                           GTK_JUSTIFY_CENTER);
+       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
+                                          GTK_JUSTIFY_CENTER);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MIME],
                                           GTK_JUSTIFY_CENTER);
        gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_SIZE],
@@ -3799,6 +3853,8 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                                   SUMMARY_COL_MARK_WIDTH);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_UNREAD],
                                   SUMMARY_COL_UNREAD_WIDTH);
+       gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_LOCKED],
+                                  SUMMARY_COL_LOCKED_WIDTH);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_MIME],
                                   SUMMARY_COL_MIME_WIDTH);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_SUBJECT],
@@ -4206,6 +4262,15 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                        summary_status_show(summaryview);
                }
                break;
+       case S_COL_LOCKED:
+               if (MSG_IS_LOCKED(msginfo->flags)) {
+                       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_LOCKED);
+                       CHANGE_FLAGS(msginfo);
+                       summary_set_row_marks(summaryview, row);
+               }
+               else
+                       summary_lock_row(summaryview, row);
+               break;
        default:
                break;
        }