#include "pixmaps/forwarded.xpm"
#include "pixmaps/clip.xpm"
#include "pixmaps/ignorethread.xpm"
+#include "pixmaps/locked.xpm"
#define STATUSBAR_PUSH(mainwin, str) \
{ \
#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;
static GdkBitmap *forwardedxpmmask;
static GdkPixmap *ignorethreadxpm;
static GdkBitmap *ignorethreadxpmmask;
+static GdkPixmap *lockedxpm;
+static GdkBitmap *lockedxpmmask;
static GdkPixmap *clipxpm;
static GdkBitmap *clipxpmmask;
/* display functions */
static void summary_status_show (SummaryView *summaryview);
+static void summary_set_column_titles (SummaryView *summaryview);
static void summary_set_ctree_from_list (SummaryView *summaryview,
GSList *mlist);
static void summary_set_header (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,
{N_("/_Forward"), NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
{N_("/Forward as a_ttachment"),
NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
+ {N_("/Bounce"), NULL, summary_reply_cb, COMPOSE_BOUNCE, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Re-_edit"), NULL, summary_reedit, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
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)
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);
- pixmap = gtk_pixmap_new(clipxpm, clipxpmmask);
- gtk_clist_set_column_widget(GTK_CLIST(summaryview->ctree),
- summaryview->col_pos[S_COL_MIME], pixmap);
- gtk_widget_show(pixmap);
-
if (!small_style) {
small_style = gtk_style_copy
(gtk_widget_get_style(summaryview->ctree));
gtk_widget_show(pixmap);
summary_clear_list(summaryview);
+ summary_set_column_titles(summaryview);
summary_colorlabel_menu_create(summaryview);
summary_set_menu_sensitive(summaryview);
gtk_clist_freeze(GTK_CLIST(ctree));
summary_clear_list(summaryview);
+ summary_set_column_titles(summaryview);
summary_set_menu_sensitive(summaryview);
if (!is_refresh)
messageview_clear(summaryview->messageview);
}
summary_status_show(summaryview);
-
summary_set_menu_sensitive(summaryview);
-
main_window_set_toolbar_sensitive(summaryview->mainwin);
debug_print("\n");
menu_set_sensitive(ifactory, "/Reply to all", sens);
menu_set_sensitive(ifactory, "/Forward", TRUE);
menu_set_sensitive(ifactory, "/Forward as attachment", TRUE);
+ menu_set_sensitive(ifactory, "/Bounce", TRUE);
menu_set_sensitive(ifactory, "/Add sender to address book", sens);
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;
+ if (!MSG_IS_DELETED(msginfo->flags))
+ break;
}
return node;
summaryview->messages);
}
+static void summary_set_column_titles(SummaryView *summaryview)
+{
+ GtkCList *clist = GTK_CLIST(summaryview->ctree);
+ GtkWidget *hbox;
+ GtkWidget *label;
+ GtkWidget *arrow;
+ gint pos;
+ const gchar *title;
+ SummaryColumnType type;
+ gboolean single_char;
+ GtkJustification justify;
+
+ static SummarySortType sort_by[N_SUMMARY_COLS] = {
+ SORT_BY_MARK,
+ SORT_BY_UNREAD,
+ SORT_BY_MIME,
+ SORT_BY_SUBJECT,
+ SORT_BY_FROM,
+ SORT_BY_DATE,
+ SORT_BY_SIZE,
+ SORT_BY_NUMBER
+ };
+
+ for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
+ type = summaryview->col_state[pos].type;
+
+ single_char = (type == S_COL_MIME ||
+ type == S_COL_MARK || type == S_COL_UNREAD);
+ justify = (type == S_COL_NUMBER || type == S_COL_SIZE)
+ ? GTK_JUSTIFY_RIGHT : GTK_JUSTIFY_LEFT;
+
+ switch (type) {
+ case S_COL_SUBJECT:
+ case S_COL_FROM:
+ case S_COL_DATE:
+ case S_COL_NUMBER:
+ if (prefs_common.trans_hdr)
+ title = gettext(col_label[type]);
+ else
+ title = col_label[type];
+ break;
+ default:
+ title = gettext(col_label[type]);
+ }
+
+ if (type == S_COL_MIME) {
+ label = gtk_pixmap_new(clipxpm, clipxpmmask);
+ gtk_widget_show(label);
+ gtk_clist_set_column_widget(clist, pos, label);
+ continue;
+ }
+ if (single_char) {
+ gtk_clist_set_column_title(clist, pos, title);
+ continue;
+ }
+
+ hbox = gtk_hbox_new(FALSE, 4);
+ label = gtk_label_new(title);
+ if (justify == GTK_JUSTIFY_RIGHT)
+ gtk_box_pack_end(GTK_BOX(hbox), label,
+ FALSE, FALSE, 0);
+ else
+ gtk_box_pack_start(GTK_BOX(hbox), label,
+ FALSE, FALSE, 0);
+
+ if (summaryview->sort_mode == sort_by[type]) {
+ arrow = gtk_arrow_new
+ (summaryview->sort_type == GTK_SORT_ASCENDING
+ ? GTK_ARROW_DOWN : GTK_ARROW_UP,
+ GTK_SHADOW_IN);
+ if (justify == GTK_JUSTIFY_RIGHT)
+ gtk_box_pack_start(GTK_BOX(hbox), arrow,
+ FALSE, FALSE, 0);
+ else
+ gtk_box_pack_end(GTK_BOX(hbox), arrow,
+ FALSE, FALSE, 0);
+ }
+
+ gtk_widget_show_all(hbox);
+ gtk_clist_set_column_widget(clist, pos, hbox);
+ }
+}
+
void summary_sort(SummaryView *summaryview, SummarySortType type)
{
GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
gtk_clist_set_sort_type(clist, summaryview->sort_type);
summaryview->sort_mode = type;
+ summary_set_column_titles(summaryview);
+
gtk_ctree_sort_node(ctree, NULL);
gtk_ctree_node_moveto(ctree, summaryview->selected, -1, 0.5, 0);
- /*gtkut_ctree_set_focus_row(ctree, summaryview->selected);*/
-
prefs_folder_item_set_config(summaryview->folder_item,
summaryview->sort_type,
summaryview->sort_mode);
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);
- CHANGE_FLAGS(msginfo);
- summary_set_row_marks(summaryview, row);
- gtk_clist_thaw(GTK_CLIST(ctree));
- summary_status_show(summaryview);
- }
if (new_window) {
MessageView *msgview;
gtkut_ctree_node_move_if_on_the_edge(ctree, row);
}
+ if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
+ 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);
+ }
+
if (GTK_WIDGET_VISIBLE(summaryview->headerwin->window))
header_window_show(summaryview->headerwin, msginfo);
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);
void summary_set_marks_selected(SummaryView *summaryview)
{
- summary_set_row_marks(summaryview, summaryview->selected);
+ GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+ GList *cur;
+
+ for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+ summary_set_row_marks(summaryview, GTK_CTREE_NODE(cur->data));
}
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);
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)) {
void summary_filter(SummaryView *summaryview)
{
- if (!prefs_common.fltlist && !prefs_filtering) {
+ if (!prefs_common.fltlist && !global_processing) {
alertpanel_error(_("No filter rules defined."));
return;
}
gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
- if (prefs_filtering == NULL) {
+ if (global_processing == NULL) {
gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
GTK_CTREE_FUNC(summary_filter_func),
summaryview);
gchar *file;
FolderItem *dest;
- if (prefs_filtering == NULL) {
+ if (global_processing == NULL) {
/* old filtering */
file = procmsg_get_message_file_path(msginfo);
dest = filter_get_dest_folder(prefs_common.fltlist, file);
summary_move_row_to(summaryview, node, dest);
}
else
- filter_msginfo_move_or_delete(prefs_filtering, msginfo,
+ filter_msginfo_move_or_delete(global_processing, msginfo,
summaryview->folder_table);
}
GtkWidget *ctree;
gint *col_pos = summaryview->col_pos;
SummaryColumnState *col_state;
- const gchar *titles[N_SUMMARY_COLS];
+ gchar *titles[N_SUMMARY_COLS];
SummaryColumnType type;
gint pos;
+ memset(titles, 0, sizeof(titles));
+
col_state = prefs_summary_column_get_config();
for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
summaryview->col_state[pos] = col_state[pos];
type = col_state[pos].type;
col_pos[type] = pos;
-
- switch (type) {
- case S_COL_NUMBER:
- case S_COL_DATE:
- case S_COL_FROM:
- case S_COL_SUBJECT:
- case S_COL_SCORE:
- if (prefs_common.trans_hdr)
- titles[pos] = gettext(col_label[type]);
- else
- titles[pos] = col_label[type];
- break;
- default:
- titles[pos] = gettext(col_label[type]);
- }
}
col_state = summaryview->col_state;
ctree = gtk_sctree_new_with_titles
- (N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], (gchar **)titles);
+ (N_SUMMARY_COLS, col_pos[S_COL_SUBJECT], titles);
gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_EXTENDED);
gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[S_COL_MARK],
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],
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],
summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
break;
case GDK_BackSpace: /* Page up */
- case GDK_Delete:
textview_scroll_page(summaryview->messageview->textview, TRUE);
break;
case GDK_p: /* Prev */
summary_mark_as_unread(summaryview);
break;
case GDK_d: /* Delete */
+ case GDK_Delete:
RETURN_IF_LOCKED();
BREAK_ON_MODIFIER_KEY();
summary_delete(summaryview);
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;
}
g_slist_free(msginfo_list);
}
break;
+ case COMPOSE_BOUNCE:
+ compose_bounce(NULL, msginfo);
+ break;
default:
g_warning("summary_reply_cb(): invalid action: %d\n", action);
}
projects / claws.git / blobdiff