{N_("/Repl_y to/_sender"), NULL, summary_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
{N_("/Repl_y to/mailing _list"),
"<control>L", summary_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
- {N_("/Follow-up and reply to"), NULL, summary_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Forward"), "<control><alt>F", summary_reply_cb, COMPOSE_FORWARD_INLINE, NULL},
{N_("/For_ward as attachment"), NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
{N_("/_Copy..."), "<shift><control>O", summary_copy_to, 0, NULL},
{N_("/Move to _trash"), "<control>D", summary_delete_trash, 0, NULL},
{N_("/_Delete..."), NULL, summary_delete, 0, NULL},
- {N_("/Cancel a news message"), NULL, summary_cancel, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Mark"), NULL, NULL, 0, "<Branch>"},
{N_("/_Mark/_Mark"), NULL, summary_mark, 0, NULL},
{N_("/_Mark/Unlock"), NULL, summary_msgs_unlock, 0, NULL},
{N_("/Color la_bel"), NULL, NULL, 0, NULL},
- {N_("/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/Re-_edit"), NULL, summary_reedit, 0, NULL},
{N_("/---"), NULL, NULL, 0, "<Separator>"},
{N_("/Add sender to address boo_k"),
NULL, summary_add_address_cb, 0, NULL},
"<control><alt>N", summary_open_msg, 0, NULL},
{N_("/_View/_Source"), "<control>U", summary_view_source, 0, NULL},
{N_("/_View/All _header"), "<control>H", summary_show_all_header_cb, 0, "<ToggleItem>"},
+ {N_("/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Save as..."), "<control>S", summary_save_as, 0, NULL},
+ {N_("/_Print..."), "<control>P", summary_print, 0, NULL},
}; /* see also list in menu_connect_identical_items() in menu.c if this changes */
static const gchar *const col_label[N_SUMMARY_COLS] = {
- N_("M"), /* S_COL_MARK */
+ "", /* S_COL_MARK */
N_("S"), /* S_COL_STATUS */
"", /* S_COL_MIME */
N_("Subject"), /* S_COL_SUBJECT */
N_("To"), /* S_COL_TO */
N_("Date"), /* S_COL_DATE */
N_("Size"), /* S_COL_SIZE */
- N_("No."), /* S_COL_NUMBER */
+ N_("#"), /* S_COL_NUMBER */
N_("Score"), /* S_COL_SCORE */
- N_("L") /* S_COL_LOCKED */
+ "", /* S_COL_LOCKED */
};
#define START_LONG_OPERATION(summaryview) { \
if (summary_is_locked(summaryview)) return FALSE;
if (!summaryview->mainwin)
- return;
+ return FALSE;
inc_lock();
summary_lock(summaryview);
{"/Reply to/all" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
{"/Reply to/sender" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
{"/Reply to/mailing list" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
- {"/Follow-up and reply to" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
{"/Forward" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
{"/Forward as attachment" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
{"/Redirect" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
- {"/Re-edit" , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
-
- {"/Move..." , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
- {"/Copy..." , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
- {"/Move to trash" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NOT_NEWS},
- {"/Delete..." , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
- {"/Cancel a news message" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED|M_NEWS},
+ {"/Move..." , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
+ {"/Copy..." , M_TARGET_EXIST|M_EXEC},
+ {"/Move to trash" , M_TARGET_EXIST|M_ALLOW_DELETE|M_NOT_NEWS},
+ {"/Delete..." , M_TARGET_EXIST|M_ALLOW_DELETE},
{"/Mark" , M_TARGET_EXIST},
{"/Mark/Mark" , M_TARGET_EXIST},
{"/View/Open in new window" , M_SINGLE_TARGET_EXIST},
{"/View/Source" , M_SINGLE_TARGET_EXIST},
{"/View/All header" , M_SINGLE_TARGET_EXIST},
-#if 0
- {"/Save as..." , M_TARGET_EXIST|M_UNLOCKED},
- {"/Print..." , M_TARGET_EXIST|M_UNLOCKED},
-
- {"/Select thread" , M_SINGLE_TARGET_EXIST},
- {"/Select all" , M_TARGET_EXIST},
-#endif
+ {"/Save as..." , M_TARGET_EXIST},
+ {"/Print..." , M_TARGET_EXIST},
{NULL, 0}
};
gint pos;
const gchar *title;
SummaryColumnType type;
- gboolean single_char;
GtkJustification justify;
static FolderSortKey sort_by[N_SUMMARY_COLS] = {
type = summaryview->col_state[pos].type;
/* CLAWS: mime and unread are single char headers */
- single_char = (type == S_COL_MIME || type == S_COL_STATUS);
justify = (type == S_COL_NUMBER || type == S_COL_SIZE)
? GTK_JUSTIFY_RIGHT : GTK_JUSTIFY_LEFT;
else
title = col_label[type];
break;
- /* CLAWS: dummies for mark and locked headers */
- case S_COL_MARK:
- case S_COL_LOCKED:
- title = "";
- break;
default:
title = gettext(col_label[type]);
}
gtk_widget_show(label);
gtk_clist_set_column_widget(clist, pos, label);
continue;
- } else if (single_char) {
+ } else if (type == S_COL_MARK) {
+ label = gtk_image_new_from_pixmap(markxpm, markxpmmask);
+ gtk_widget_show(label);
+ gtk_clist_set_column_widget(clist, pos, label);
+ continue;
+ } else if (type == S_COL_LOCKED) {
+ label = gtk_image_new_from_pixmap(lockedxpm, lockedxpmmask);
+ gtk_widget_show(label);
+ gtk_clist_set_column_widget(clist, pos, label);
+ continue;
+ } else if (type == S_COL_STATUS) {
gtk_clist_set_column_title(clist, pos, title);
continue;
}
- /* CLAWS: changed so that locked and mark headers
- * show a pixmap instead of single character */
hbox = gtk_hbox_new(FALSE, 4);
-
- if (type == S_COL_LOCKED)
- label = gtk_pixmap_new(lockedxpm, lockedxpmmask);
- else if (type == S_COL_MARK)
- label = gtk_pixmap_new(markxpm, markxpmmask);
- else
- label = gtk_label_new(title);
-
+ label = gtk_label_new(title);
+
if (justify == GTK_JUSTIFY_RIGHT)
gtk_box_pack_end(GTK_BOX(hbox), label,
FALSE, FALSE, 0);
summary_set_header(summaryview, text, msginfo);
- gtk_ctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
+ gtk_sctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
NULL, NULL, NULL, NULL, FALSE,
gnode->parent->parent ? TRUE : FALSE);
#define SET_TEXT(col) \
summary_set_header(summaryview, text, msginfo);
- node = gtk_ctree_insert_node
+ node = gtk_sctree_insert_node
(ctree, NULL, node, text, 2,
- NULL, NULL, NULL, NULL, FALSE, FALSE);
+ NULL, NULL, NULL, NULL,
+ FALSE, FALSE);
GTKUT_CTREE_NODE_SET_ROW_DATA(node, msginfo);
summary_set_marks_func(ctree, node, summaryview);
{
GtkWidget *ctree;
GtkWidget *scrolledwin = summaryview->scrolledwin;
- GtkWidget *pixmap;
FolderItem *item;
guint selected_msgnum = summary_get_msgnum(summaryview, summaryview->selected);
guint displayed_msgnum = summary_get_msgnum(summaryview, summaryview->displayed);
summaryview->ctree = ctree = summary_ctree_create(summaryview);
summary_set_fonts(summaryview);
- pixmap = gtk_image_new_from_pixmap(clipxpm, clipxpmmask);
- gtk_clist_set_column_widget(GTK_CLIST(ctree),
- summaryview->col_pos[S_COL_MIME], pixmap);
- gtk_widget_show(pixmap);
+ summary_set_column_titles(summaryview);
gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_CLIST(ctree)->hadjustment);
gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
BREAK_ON_MODIFIER_KEY();
summary_delete_trash(summaryview);
break;
+ case GDK_y:
+ case GDK_t:
+ case GDK_l:
+ case GDK_c:
+ if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
+ mimeview_pass_key_press_event(messageview->mimeview,
+ event);
+ break;
+ }
default:
break;
}
projects / claws.git / blobdiff