static void toolbar_compose_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_compose_news_cb (GtkWidget *widget,
+ gpointer data);
+static void toolbar_compose_mail_cb (GtkWidget *widget,
+ gpointer data);
static void toolbar_reply_cb (GtkWidget *widget,
gpointer data);
static void toolbar_reply_to_all_cb (GtkWidget *widget,
static void compose_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
+static void compose_mail_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget);
+static void compose_news_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget);
static void reply_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
{N_("/_View/_Toolbar/Icon _and text"), NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"},
{N_("/_View/_Toolbar/_Icon"), NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Toolbar/Icon and text"},
{N_("/_View/_Toolbar/_Text"), NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Toolbar/Icon and text"},
- {N_("/_View/_Toolbar/_Non-display"), NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Toolbar/Icon and text"},
+ {N_("/_View/_Toolbar/_None"), NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Toolbar/Icon and text"},
{N_("/_View/_Status bar"), NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/Separate f_older tree"), NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER, "<ToggleItem>"},
#undef CODESET_ACTION
{N_("/_Message"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Message/
Rece_ive new mail"), "<alt>I", inc_mail_cb, 0, NULL},
- {N_("/_Message/Receive from _all accounts"),
+ {N_("/_Message/
Get new ma_il"), "<alt>I", inc_mail_cb, 0, NULL},
+ {N_("/_Message/Get from _all accounts"),
"<shift><alt>I", inc_all_account_mail_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Send queued messa_ges"),
NULL, send_queue_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/Compose _new message"), "<alt>N", compose_cb, 0, NULL},
+ {N_("/_Message/Compose a_n email message"), "<alt>N", compose_mail_cb, 0, NULL},
+ {N_("/_Message/Compose a news message"), NULL, compose_news_cb, 0, NULL},
{N_("/_Message/_Reply"), "<alt>R", reply_cb, COMPOSE_REPLY, NULL},
{N_("/_Message/Repl_y to sender"), "<control><alt>R", reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+ {N_("/_Message/Follow-up and reply to"), NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
{N_("/_Message/Reply to a_ll"), "<shift><alt>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
{N_("/_Message/_Forward"), "<control>F", reply_cb, COMPOSE_FORWARD, NULL},
- {N_("/_Message/Forward as an a_ttachment"),
+ {N_("/_Message/Forward as a_ttachment"),
"<shift><control>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/M_ove..."), "<alt>O", move_to_cb, 0, NULL},
{N_("/_Message/_Mark/_Unmark"), NULL, unmark_cb, 0, NULL},
{N_("/_Message/_Mark/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_Mark/Mark as unr_ead"), NULL, mark_as_unread_cb, 0, NULL},
- {N_("/_Message/_Mark/Mark it as _being read"),
+ {N_("/_Message/_Mark/Mark as rea_d"),
NULL, mark_as_read_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Open in new _window"), "<shift><control>N", open_msg_cb, 0, NULL},
{N_("/_Message/View _source"), "<control>U", view_source_cb, 0, NULL},
{N_("/_Message/Show all _header"), "<control>H", header_window_show_cb, 0, NULL},
- {N_("/_Message/Re_edit"), NULL, reedit_cb, 0, NULL},
+ {N_("/_Message/Re-_edit"), NULL, reedit_cb, 0, NULL},
{N_("/_Summary"), NULL, NULL, 0, "<Branch>"},
{N_("/_Summary/_Delete duplicated messages"),
switch (prefs_common.toolbar_style) {
case TOOLBAR_NONE:
menuitem = gtk_item_factory_get_item
- (ifactory, "/View/Toolbar/Non-display");
+ (ifactory, "/View/Toolbar/None");
break;
case TOOLBAR_ICON:
menuitem = gtk_item_factory_get_item
menu_set_sensitive(ifactory, "/Message/Reply to sender", sens);
menu_set_sensitive(ifactory, "/Message/Reply to all", sens);
menu_set_sensitive(ifactory, "/Message/Forward", sens);
- menu_set_sensitive(ifactory, "/Message/Forward as an attachment", sens);
+ menu_set_sensitive(ifactory, "/Message/Forward as attachment", sens);
menu_set_sensitive(ifactory, "/Message/Open in new window", sens);
menu_set_sensitive(ifactory, "/Message/Show all header", sens);
menu_set_sensitive(ifactory, "/Message/View source", sens);
if (sens && (!mainwin->summaryview->folder_item ||
mainwin->summaryview->folder_item->stype != F_DRAFT))
sens = FALSE;
- menu_set_sensitive(ifactory, "/Message/Reedit", sens);
+ menu_set_sensitive(ifactory, "/Message/Re-edit", sens);
if (selection == SUMMARY_SELECTED_SINGLE ||
selection == SUMMARY_SELECTED_MULTIPLE)
menu_set_sensitive(ifactory, "/Summary/Next message", sens);
menu_set_sensitive(ifactory, "/Summary/Next unread message", sens);
menu_set_sensitive(ifactory, "/Summary/Sort", sens);
+
+ if (mainwin->summaryview->folder_item &&
+ mainwin->summaryview->folder_item->folder->account)
+ sens = mainwin->summaryview->folder_item->folder->account->protocol == A_NNTP;
+ else
+ sens = FALSE;
+ menu_set_sensitive(ifactory, "/Message/Follow-up and reply to", sens);
}
void main_window_popup(MainWindow *mainwin)
#include "pixmaps/stock_mail_receive.xpm"
#include "pixmaps/stock_mail_receive_all.xpm"
#include "pixmaps/stock_mail_compose.xpm"
+#include "pixmaps/stock_news_compose.xpm"
#include "pixmaps/stock_mail_reply.xpm"
#include "pixmaps/stock_mail_reply_to_all.xpm"
#include "pixmaps/stock_mail_reply_to_author.xpm"
CREATE_TOOLBAR_ICON(stock_mail_receive_xpm);
get_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Get"),
- _("Incorporate new mail"),
+ _("Get new mail from current account"),
"Get",
icon_wid, toolbar_inc_cb, mainwin);
CREATE_TOOLBAR_ICON(stock_mail_receive_all_xpm);
getall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Get all"),
- _("Incorporate new mail of all accounts"),
+ _("Get new mail from all accounts"),
"Get all",
icon_wid,
toolbar_inc_all_cb,
CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
compose_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Compose"),
- _("Compose new message"),
+ _("Compose email"),
+ _("Compose an email message"),
"New",
icon_wid,
- toolbar_compose_cb,
+ toolbar_compose_mail_cb,
+ mainwin);
+ CREATE_TOOLBAR_ICON(stock_news_compose_xpm);
+ compose_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ _("Compose news"),
+ _("Compose a news message"),
+ "New",
+ icon_wid,
+ toolbar_compose_news_cb,
mainwin);
CREATE_TOOLBAR_ICON(stock_mail_reply_xpm);
reply_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
compose_cb(mainwin, 0, NULL);
}
+static void toolbar_compose_news_cb (GtkWidget *widget,
+ gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ compose_news_cb(mainwin, 0, NULL);
+}
+
+static void toolbar_compose_mail_cb (GtkWidget *widget,
+ gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ compose_mail_cb(mainwin, 0, NULL);
+}
+
static void toolbar_reply_cb (GtkWidget *widget,
gpointer data)
{
{
MainWindow *mainwin = (MainWindow *)data;
- reply_cb(mainwin, COMPOSE_FORWARD, NULL);
+ if (prefs_common.forward_as_attachment)
+ reply_cb(mainwin, COMPOSE_FORWARD_AS_ATTACH, NULL);
+ else
+ reply_cb(mainwin, COMPOSE_FORWARD, NULL);
}
static void toolbar_delete_cb (GtkWidget *widget,
static void compose_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
- if (mainwin->summaryview->folder_item)
- compose_new(mainwin->summaryview->folder_item->folder->account);
+ if (mainwin->summaryview->folder_item) {
+ if (mainwin->summaryview->folder_item->folder->account != NULL
+ && mainwin->summaryview->folder_item->folder->account->protocol == A_NNTP)
+ compose_new_with_recipient(mainwin->summaryview->folder_item->folder->account, mainwin->summaryview->folder_item->path);
+ else
+ compose_new(mainwin->summaryview->folder_item->folder->account);
+ }
else
compose_new(NULL);
}
+static void compose_mail_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ PrefsAccount * ac;
+ GList * list;
+ GList * cur;
+
+ if (mainwin->summaryview->folder_item) {
+ ac = mainwin->summaryview->folder_item->folder->account;
+ if (ac && ac->protocol != A_NNTP) {
+ compose_new(ac);
+ return;
+ }
+ }
+
+ list = account_get_list();
+ for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
+ ac = (PrefsAccount *) cur->data;
+ if (ac->protocol != A_NNTP) {
+ compose_new(ac);
+ return;
+ }
+ }
+}
+
+static void compose_news_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ PrefsAccount * ac = NULL;
+ GList * list;
+ GList * cur;
+
+ if (mainwin->summaryview->folder_item) {
+ ac = mainwin->summaryview->folder_item->folder->account;
+ if (ac && ac->protocol == A_NNTP) {
+ compose_new_with_recipient
+ (ac, mainwin->summaryview->folder_item->path);
+ return;
+ }
+ }
+
+ list = account_get_list();
+ for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
+ ac = (PrefsAccount *) cur->data;
+ if (ac->protocol == A_NNTP) {
+ compose_new(ac);
+ return;
+ }
+ }
+}
+
static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
MsgInfo *msginfo;
compose_reply(msginfo, prefs_common.reply_with_quote,
FALSE, TRUE);
break;
+ case COMPOSE_FOLLOWUP_AND_REPLY_TO:
+ compose_followup_and_reply_to(msginfo,
+ prefs_common.reply_with_quote,
+ FALSE, TRUE);
+ break;
case COMPOSE_REPLY_TO_ALL:
compose_reply(msginfo, prefs_common.reply_with_quote,
TRUE, FALSE);
projects / claws.git / blobdiff