#include "defs.h"
#include <glib.h>
+#include <gdk/gdkkeysyms.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtkwidget.h>
#include "prefs_scoring.h"
#include "prefs_account.h"
#include "prefs_folder_item.h"
+#include "prefs_summary_column.h"
+#include "prefs_template.h"
#include "account.h"
#include "addressbook.h"
#include "headerwindow.h"
#include "codeconv.h"
#include "about.h"
#include "manual.h"
-#include "prefs_templates.h"
#include "version.h"
#define AC_LABEL_WIDTH 240
gpointer data);
static void toolbar_reply_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_reply_quote_cb (GtkWidget *widget,
+ gpointer data);
static void toolbar_reply_to_all_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_reply_to_all_quote_cb (GtkWidget *widget,
+ gpointer data);
static void toolbar_reply_to_sender_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_reply_to_sender_quote_cb (GtkWidget *widget,
+ gpointer data);
static void toolbar_forward_cb (GtkWidget *widget,
gpointer data);
static void prefs_account_open_cb(MainWindow *mainwin,
guint action,
GtkWidget *widget);
+static void prefs_template_open_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
static void new_account_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
ToolbarStyle style,
ComposeButtonType type);
-static void prefs_templates_open_cb(MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
+static void focus_out (GtkWidget *widget,
+ GdkEventFocus *event,
+ gpointer data);
+
+static void key_pressed (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data);
+
+static void key_released (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data);
#define SEPARATE_ACTION 667
CODESET_ACTION(C_EUC_KR)},
{N_("/_View/_Code set/Korean (ISO-2022-KR)"),
CODESET_ACTION(C_ISO_2022_KR)},
+ CODESET_SEPARATOR,
+ {N_("/_View/_Code set/Thai (TIS-620)"),
+ CODESET_ACTION(C_TIS_620)},
+ {N_("/_View/_Code set/Thai (Windows-874)"),
+ CODESET_ACTION(C_WINDOWS_874)},
#endif
#undef CODESET_SEPARATOR
{N_("/_Message/_Forward"), "<shift><alt>F", reply_cb, COMPOSE_FORWARD, NULL},
{N_("/_Message/Forward as a_ttachment"),
"<shift><control>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
+ {N_("/_Message/Bounce"), NULL, reply_cb, COMPOSE_BOUNCE, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Re-_edit"), NULL, reedit_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_Mark/Mark as unr_ead"), NULL, mark_as_unread_cb, 0, NULL},
{N_("/_Message/_Mark/Mark as rea_d"),
NULL, mark_as_read_cb, 0, NULL},
+ {N_("/_Message/_Mark/Mark all read"), NULL, mark_all_read_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Open in new _window"), "<shift><control>N", open_msg_cb, 0, NULL},
NULL, prefs_scoring_open_cb, 0, NULL},
{N_("/_Configuration/_Filtering ..."),
NULL, prefs_filtering_open_cb, 0, NULL},
- {N_("/_Configuration/_Templates ..."),
- NULL, prefs_templates_open_cb, 0, NULL},
- {N_("/_Configuration/_Preferences per account..."),
+ {N_("/_Configuration/_Template..."), NULL, prefs_template_open_cb, 0, NULL},
+ {N_("/_Configuration/_Preferences for current account..."),
NULL, prefs_account_open_cb, 0, NULL},
{N_("/_Configuration/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Configuration/Create _new account..."),
GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
gtk_signal_connect(GTK_OBJECT(window), "focus_out_event",
GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+ gtk_signal_connect(GTK_OBJECT(window), "focus_out_event",
+ GTK_SIGNAL_FUNC(focus_out), mainwin);
+ gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
+ GTK_SIGNAL_FUNC(key_pressed), mainwin);
+ gtk_signal_connect(GTK_OBJECT(window), "key_release_event",
+ GTK_SIGNAL_FUNC(key_released), mainwin);
gtk_widget_realize(window);
+ gtk_widget_add_events(window, GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK);
gtkut_widget_set_app_icon(window);
main_window_set_menu_sensitive(mainwin);
main_window_set_toolbar_sensitive(mainwin);
+ main_window_set_toolbar_reply_buttons(mainwin, 0);
if (mainwin->lock_count == 0)
gtk_widget_set_sensitive(mainwin->ac_button, TRUE);
main_window_show_cur_account(mainwin);
main_window_set_menu_sensitive(mainwin);
main_window_set_toolbar_sensitive(mainwin);
+ main_window_set_toolbar_reply_buttons(mainwin, 0);
if (prefs_common.immediate_exec)
gtk_widget_hide(mainwin->exec_btn);
else
gtk_widget_show(mainwin->exec_btn);
- summary_change_display_item(mainwin->summaryview);
summary_redisplay_msg(mainwin->summaryview);
headerview_set_visibility(mainwin->messageview->headerview,
prefs_common.display_header_pane);
}
}
+void main_window_set_summary_column(void)
+{
+ GList *cur;
+ MainWindow *mainwin;
+
+ for (cur = mainwin_list; cur != NULL; cur = cur->next) {
+ mainwin = (MainWindow *)cur->data;
+ summary_set_column_order(mainwin->summaryview);
+ }
+}
+
void main_window_set_account_menu(GList *account_list)
{
GList *cur, *cur_ac, *cur_item;
gtk_window_set_title(GTK_WINDOW(mainwin->window), buf);
g_free(buf);
- /* buf = g_strdup_printf(_("Current account: %s"), ac_name);
- gtk_label_set_text(GTK_LABEL(mainwin->ac_label), buf); */
gtk_label_set_text(GTK_LABEL(mainwin->ac_label), ac_name);
gtk_widget_queue_resize(mainwin->ac_button);
- /* g_free(buf); */
g_free(ac_name);
}
{
SensitiveCond state = 0;
SummarySelection selection;
+ FolderItem *item = mainwin->summaryview->folder_item;
selection = summary_get_selection_type(mainwin->summaryview);
state |= M_UNLOCKED;
if (selection != SUMMARY_NONE)
state |= M_MSG_EXIST;
- if (mainwin->summaryview->folder_item) {
- if (mainwin->summaryview->folder_item->threaded)
+ if (item) {
+ if (item->threaded)
state |= M_THREADED;
else
state |= M_UNTHREADED;
state |= M_TARGET_EXIST;
if (selection == SUMMARY_SELECTED_SINGLE)
state |= M_SINGLE_TARGET_EXIST;
- if (mainwin->summaryview->folder_item &&
- mainwin->summaryview->folder_item->folder->type != F_NEWS)
+ if (item && item->folder->type != F_NEWS)
state |= M_EXEC;
if (mainwin->summaryview->folder_item &&
mainwin->summaryview->folder_item->folder->type == F_NEWS)
state |= M_NEWS;
if (selection == SUMMARY_SELECTED_SINGLE &&
- (mainwin->summaryview->folder_item &&
- (mainwin->summaryview->folder_item->stype == F_DRAFT ||
- mainwin->summaryview->folder_item->stype == F_OUTBOX ||
- mainwin->summaryview->folder_item->stype == F_QUEUE)))
+ (item &&
+ (item->stype == F_OUTBOX || item->stype == F_DRAFT ||
+ item->stype == F_QUEUE)))
state |= M_ALLOW_REEDIT;
if (cur_account)
state |= M_HAVE_ACCOUNT;
{mainwin->compose_mail_btn, M_HAVE_ACCOUNT},
{mainwin->compose_news_btn, M_HAVE_ACCOUNT},
{mainwin->reply_btn , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {mainwin->reply_quote_btn , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
{mainwin->replyall_btn , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {mainwin->replyall_quote_btn , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
{mainwin->replysender_btn , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {mainwin->replysender_quote_btn , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
{mainwin->fwd_btn , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
/* {mainwin->prefs_btn , M_UNLOCKED},
{mainwin->account_btn , M_UNLOCKED}, */
{"/Message/Copy...", M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
{"/Message/Delete" , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
{"/Message/Mark" , M_TARGET_EXIST},
- {"/Message/Add sender to address book", M_SINGLE_TARGET_EXIST},
{"/Summary/Delete duplicated messages", M_MSG_EXIST|M_EXEC|M_UNLOCKED},
{"/Summary/Filter messages" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
#include "pixmaps/stock_mail_compose.xpm"
#include "pixmaps/stock_news_compose.xpm"
#include "pixmaps/stock_mail_reply.xpm"
+#include "pixmaps/stock_mail_reply_quote.xpm"
#include "pixmaps/stock_mail_reply_to_all.xpm"
+#include "pixmaps/stock_mail_reply_to_all_quote.xpm"
#include "pixmaps/stock_mail_reply_to_author.xpm"
+#include "pixmaps/stock_mail_reply_to_author_quote.xpm"
#include "pixmaps/stock_mail_forward.xpm"
#include "pixmaps/stock_mail_send.xpm"
#include "pixmaps/stock_preferences.xpm"
GtkWidget *compose_mail_btn_plain;
GtkWidget *compose_news_btn_plain;
GtkWidget *reply_btn;
+ GtkWidget *reply_quote_btn;
GtkWidget *replyall_btn;
+ GtkWidget *replyall_quote_btn;
GtkWidget *replysender_btn;
+ GtkWidget *replysender_quote_btn;
GtkWidget *fwd_btn;
GtkWidget *send_btn;
/*
icon_wid,
toolbar_reply_cb,
mainwin);
+ CREATE_TOOLBAR_ICON(stock_mail_reply_quote_xpm);
+ reply_quote_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ _("Reply"),
+ _("Reply to the message quoting it"),
+ "Reply quoting",
+ icon_wid,
+ toolbar_reply_quote_cb,
+ mainwin);
CREATE_TOOLBAR_ICON(stock_mail_reply_to_all_xpm);
replyall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("All"),
icon_wid,
toolbar_reply_to_all_cb,
mainwin);
+ CREATE_TOOLBAR_ICON(stock_mail_reply_to_all_quote_xpm);
+ replyall_quote_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ _("All"),
+ _("Reply to all quoting the message"),
+ "Reply to all quoting",
+ icon_wid,
+ toolbar_reply_to_all_quote_cb,
+ mainwin);
CREATE_TOOLBAR_ICON(stock_mail_reply_to_author_xpm);
replysender_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Sender"),
icon_wid,
toolbar_reply_to_sender_cb,
mainwin);
+ CREATE_TOOLBAR_ICON(stock_mail_reply_to_author_quote_xpm);
+ replysender_quote_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ _("Sender"),
+ _("Reply to sender quoting the message"),
+ "Reply to sender quoting",
+ icon_wid,
+ toolbar_reply_to_sender_quote_cb,
+ mainwin);
CREATE_TOOLBAR_ICON(stock_mail_forward_xpm);
fwd_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Forward"),
mainwin->compose_mail_btn_plain = compose_mail_btn_plain;
mainwin->compose_news_btn_plain = compose_news_btn_plain;
mainwin->reply_btn = reply_btn;
+ mainwin->reply_quote_btn = reply_quote_btn;
mainwin->replyall_btn = replyall_btn;
+ mainwin->replyall_quote_btn = replyall_quote_btn;
mainwin->replysender_btn = replysender_btn;
+ mainwin->replysender_quote_btn = replysender_quote_btn;
mainwin->fwd_btn = fwd_btn;
mainwin->send_btn = send_btn;
/*
reply_cb(mainwin, COMPOSE_REPLY, NULL);
}
+static void toolbar_reply_quote_cb (GtkWidget *widget,
+ gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ reply_cb(mainwin, COMPOSE_REPLY_WITH_QUOTE, NULL);
+}
+
static void toolbar_reply_to_all_cb (GtkWidget *widget,
gpointer data)
{
reply_cb(mainwin, COMPOSE_REPLY_TO_ALL, NULL);
}
+static void toolbar_reply_to_all_quote_cb (GtkWidget *widget,
+ gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ reply_cb(mainwin, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL);
+}
+
static void toolbar_reply_to_sender_cb (GtkWidget *widget,
gpointer data)
{
reply_cb(mainwin, COMPOSE_REPLY_TO_SENDER, NULL);
}
+static void toolbar_reply_to_sender_quote_cb (GtkWidget *widget,
+ gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ reply_cb(mainwin, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE, NULL);
+}
+
static void toolbar_forward_cb (GtkWidget *widget,
gpointer data)
{
compose_reply(msginfo, prefs_common.reply_with_quote,
FALSE, FALSE);
break;
+ case COMPOSE_REPLY_WITH_QUOTE:
+ compose_reply(msginfo, TRUE, FALSE, FALSE);
+ break;
+ case COMPOSE_REPLY_WITHOUT_QUOTE:
+ compose_reply(msginfo, FALSE, FALSE, FALSE);
+ break;
case COMPOSE_REPLY_TO_SENDER:
compose_reply(msginfo, prefs_common.reply_with_quote,
FALSE, TRUE);
break;
+ case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
+ compose_reply(msginfo, TRUE, FALSE, TRUE);
+ break;
+ case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
+ compose_reply(msginfo, FALSE, FALSE, TRUE);
+ break;
case COMPOSE_FOLLOWUP_AND_REPLY_TO:
compose_followup_and_reply_to(msginfo,
prefs_common.reply_with_quote,
compose_reply(msginfo, prefs_common.reply_with_quote,
TRUE, TRUE);
break;
+ case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
+ compose_reply(msginfo, TRUE, TRUE, FALSE);
+ break;
+ case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
+ compose_reply(msginfo, FALSE, TRUE, FALSE);
+ break;
case COMPOSE_FORWARD:
if (!sel->next) {
compose_forward(NULL, msginfo, FALSE);
g_slist_free(msginfo_list);
}
break;
+ case COMPOSE_BOUNCE:
+ compose_bounce(NULL, msginfo);
+ break;
default:
g_warning("reply_cb(): invalid action type: %d\n", action);
}
static void set_display_item_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
- prefs_summary_display_item_set();
+ prefs_summary_column_open();
}
static void sort_summary_cb(MainWindow *mainwin, guint action,
static void prefs_filtering_open_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
- prefs_filtering_open();
+ prefs_filtering_open(NULL);
+}
+
+static void prefs_template_open_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ prefs_template_open();
}
static void prefs_account_open_cb(MainWindow *mainwin, guint action,
compose_btn_type);
}
-static void prefs_templates_open_cb(MainWindow *mainwin, guint action,
- GtkWidget *widget)
+static void key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- prefs_templates_open();
+ MainWindow *mainwin = (MainWindow *)data;
+
+ if (!mainwin) return;
+ if (event && (event->keyval == GDK_Control_L) || (event->keyval == GDK_Control_R)) {
+ main_window_set_toolbar_reply_buttons(mainwin, TRUE);
+ }
+}
+
+static void key_released(GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ if (!mainwin) return;
+ if (event && (event->keyval == GDK_Control_L) || (event->keyval == GDK_Control_R)) {
+ main_window_set_toolbar_reply_buttons(mainwin, FALSE);
+ }
+}
+
+void main_window_set_toolbar_reply_buttons(MainWindow *mainwin, gboolean keymod)
+{
+ gboolean quote = (prefs_common.reply_with_quote ^ keymod);
+
+ gtk_widget_hide(quote ? mainwin->reply_btn : mainwin->reply_quote_btn);
+ gtk_widget_show(!quote ? mainwin->reply_btn : mainwin->reply_quote_btn);
+ gtk_widget_hide(quote ? mainwin->replyall_btn : mainwin->replyall_quote_btn);
+ gtk_widget_show(!quote ? mainwin->replyall_btn : mainwin->replyall_quote_btn);
+ gtk_widget_hide(quote ? mainwin->replysender_btn : mainwin->replysender_quote_btn);
+ gtk_widget_show(!quote ? mainwin->replysender_btn : mainwin->replysender_quote_btn);
+}
+
+static void focus_out (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ main_window_set_toolbar_reply_buttons(mainwin, FALSE);
+
}
projects / claws.git / blobdiff