/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "export.h"
#include "prefs_common.h"
#include "prefs_filter.h"
+#include "prefs_actions.h"
#include "prefs_filtering.h"
#include "prefs_scoring.h"
#include "prefs_account.h"
static void toggle_statusbar_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
+static void toggle_expand_summaryview_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+static void toggle_expand_messageview_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
static void separate_widget_cb (GtkCheckMenuItem *checkitem,
guint action,
GtkWidget *widget);
guint action,
GtkWidget *widget);
+static void show_all_header_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+
static void reedit_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
guint action,
GtkWidget *widget);
+static void create_filter_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+
static void prefs_common_open_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
static void prefs_template_open_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
+static void prefs_actions_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 menuitem_expandsummaryview_statechanged (GtkWidget *widget,
+ GtkStateType state,
+ gpointer data);
+
+static void key_pressed (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data);
+
+static void set_toolbar_style(MainWindow *mainwin);
+
#define SEPARATE_ACTION 667
static GtkItemFactoryEntry mainwin_entries[] =
{N_("/_File/_Export to mbox file..."), NULL, export_mbox_cb, 0, NULL},
{N_("/_File/Empty _trash"), "<shift>D", empty_trash_cb, 0, NULL},
{N_("/_File/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_File/_Save as..."), "y", save_as_cb, 0, NULL},
- {N_("/_File/_Print..."), "<control>P", print_cb, 0, NULL},
+ {N_("/_File/_Save as..."), "<control>S", save_as_cb, 0, NULL},
+ {N_("/_File/_Print..."), NULL, print_cb, 0, NULL},
{N_("/_File/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_File/E_xit"), "<control>Q", app_exit_cb, 0, NULL},
{N_("/_Edit/_Find in current message..."),
"<control>F", search_cb, 0, NULL},
{N_("/_Edit/_Search folder..."), "<shift><control>F", search_cb, 1, NULL},
+ {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Edit/Actio_ns"), NULL, NULL, 0, "<Branch>"},
{N_("/_View"), NULL, NULL, 0, "<Branch>"},
{N_("/_View/_Folder tree"), NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER, "<ToggleItem>"},
{N_("/_View/_Message view"), NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, "<ToggleItem>"},
+ {N_("/_View/E_xpand Summary View"), "V", toggle_expand_summaryview_cb, 0, "<ToggleItem>"},
+ {N_("/_View/Ex_pand Message View"), "<shift>V", toggle_expand_messageview_cb, 0, "<ToggleItem>"},
{N_("/_View/_Toolbar"), NULL, NULL, 0, "<Branch>"},
{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/_Sort/Sort by s_ize"), NULL, sort_summary_cb, SORT_BY_SIZE, NULL},
{N_("/_View/_Sort/Sort by _date"), NULL, sort_summary_cb, SORT_BY_DATE, NULL},
{N_("/_View/_Sort/Sort by _from"), NULL, sort_summary_cb, SORT_BY_FROM, NULL},
- {N_("/_View/_Sort/Sort by _subject"),NULL, sort_summary_cb, SORT_BY_SUBJECT, NULL},
+ {N_("/_View/_Sort/Sort by _subject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, NULL},
{N_("/_View/_Sort/Sort by _color label"),
NULL, sort_summary_cb, SORT_BY_LABEL, NULL},
{N_("/_View/_Sort/Sort by _mark"), NULL, sort_summary_cb, SORT_BY_MARK, NULL},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/_Go to"), NULL, NULL, 0, "<Branch>"},
- {N_("/_View/_Go to/_Prev message"), "p", prev_cb, 0, NULL},
- {N_("/_View/_Go to/_Next message"), "n", next_cb, 0, NULL},
+ {N_("/_View/_Go to/_Prev message"), "P", prev_cb, 0, NULL},
+ {N_("/_View/_Go to/_Next message"), "N", next_cb, 0, NULL},
{N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/_Go to/P_rev unread message"),
"<shift>P", prev_unread_cb, 0, NULL},
{N_("/_View/_Go to/Next la_beled message"),
NULL, next_labeled_cb, 0, NULL},
{N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/_Go to/Other _folder..."), "<alt>G", goto_folder_cb, 0, NULL},
+ {N_("/_View/_Go to/Other _folder..."), "G", goto_folder_cb, 0, NULL},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/Open in new _window"), "<shift><control>N", open_msg_cb, 0, NULL},
+ {N_("/_View/Open in new _window"), "<control><alt>N", open_msg_cb, 0, NULL},
{N_("/_View/_View source"), "<control>U", view_source_cb, 0, NULL},
- {N_("/_View/Show all _header"), "<control>H", header_window_show_cb, 0, NULL},
+ {N_("/_View/Show all _header"), "<control>H", show_all_header_cb, 0, NULL},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/_Update"), "<control><alt>U", update_summary_cb, 0, NULL},
{N_("/_Message"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Message/Get new ma_il"), "<control><alt>I", inc_mail_cb, 0, NULL},
+ {N_("/_Message/Get new ma_il"), "<control>I", inc_mail_cb, 0, NULL},
{N_("/_Message/Get from _all accounts"),
"<shift><control>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 a_n email message"), "w", compose_mail_cb, 0, NULL},
+ {N_("/_Message/Compose a_n email message"), "<control>M", compose_mail_cb, 0, NULL},
{N_("/_Message/Compose a news message"), NULL, compose_news_cb, 0, NULL},
{N_("/_Message/_Reply"), "<control>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"), "<control><shift>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+ {N_("/_Message/Reply to a_ll"), "<shift><control>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
{N_("/_Message/_Forward"), "<control><alt>F", reply_cb, COMPOSE_FORWARD, 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/M_ove..."), "o", move_to_cb, 0, NULL},
- {N_("/_Message/_Copy..."), "<shift>O", copy_to_cb, 0, NULL},
- {N_("/_Message/_Delete"), "d", delete_cb, 0, NULL},
+ {N_("/_Message/M_ove..."), "<control>O", move_to_cb, 0, NULL},
+ {N_("/_Message/_Copy..."), "<shift><control>O", copy_to_cb, 0, NULL},
+ {N_("/_Message/_Delete"), "<control>D", delete_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Delete du_plicated messages"),
NULL, delete_duplicated_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_Mark"), NULL, NULL, 0, "<Branch>"},
{N_("/_Message/_Mark/_Mark"), NULL, mark_cb, 0, NULL},
- {N_("/_Message/_Mark/_Unmark"), "u", unmark_cb, 0, NULL},
+ {N_("/_Message/_Mark/_Unmark"), "U", 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 as rea_d"),
{N_("/_Message/_Mark/Mark all _read"), NULL, mark_all_read_cb, 0, NULL},
{N_("/_Tool"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Tool/_Address book"), "<control><alt>A", addressbook_open_cb, 0, NULL},
+ {N_("/_Tool/_Address book"), "<shift><control>A", addressbook_open_cb, 0, NULL},
{N_("/_Tool/Add sender to address boo_k"),
NULL, add_address_cb, 0, NULL},
{N_("/_Tool/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Tool/_Filter messages"), NULL, filter_cb, 0, NULL},
+ {N_("/_Tool/_Create filter rule"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Tool/_Create filter rule/_Automatically"),
+ NULL, create_filter_cb, FILTER_BY_AUTO, NULL},
+ {N_("/_Tool/_Create filter rule/by _From"),
+ NULL, create_filter_cb, FILTER_BY_FROM, NULL},
+ {N_("/_Tool/_Create filter rule/by _To"),
+ NULL, create_filter_cb, FILTER_BY_TO, NULL},
+ {N_("/_Tool/_Create filter rule/by _Subject"),
+ NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
{N_("/_Tool/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tool/E_xecute"), "x", execute_summary_cb, 0, NULL},
+ {N_("/_Tool/E_xecute"), "X", execute_summary_cb, 0, NULL},
{N_("/_Tool/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Tool/_Log window"), "<control>L", log_window_show_cb, 0, NULL},
{N_("/_Configuration/_Filtering ..."),
NULL, prefs_filtering_open_cb, 0, NULL},
{N_("/_Configuration/_Template..."), NULL, prefs_template_open_cb, 0, NULL},
+ {N_("/_Configuration/_Actions..."), NULL, prefs_actions_open_cb, 0, NULL},
+ {N_("/_Configuration/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Configuration/_Preferences for current account..."),
NULL, prefs_account_open_cb, 0, NULL},
- {N_("/_Configuration/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Configuration/Create _new account..."),
NULL, new_account_cb, 0, NULL},
{N_("/_Configuration/_Edit accounts..."),
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), "key_press_event",
+ GTK_SIGNAL_FUNC(key_pressed), mainwin);
gtk_widget_realize(window);
gtk_widget_add_events(window, GDK_KEY_PRESS_MASK|GDK_KEY_RELEASE_MASK);
+
gtkut_widget_set_app_icon(window);
gtk_object_set_data(GTK_OBJECT(menuitem), "mainwindow", mainwin);
gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(separate_widget_cb),
GUINT_TO_POINTER(SEPARATE_MESSAGE));
-
-
+
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Expand Summary View");
+ gtk_signal_connect(GTK_OBJECT(menuitem), "state-changed", GTK_SIGNAL_FUNC(menuitem_expandsummaryview_statechanged),
+ mainwin);
+
menu_set_sensitive(ifactory, "/View/Thread view",
prefs_common.enable_thread ? FALSE : TRUE);
menu_set_sensitive(ifactory, "/View/Unthread view",
main_window_set_toolbar_sensitive(mainwin);
+ /* Create actions menu */
+ update_mainwin_actions_menu(ifactory, mainwin);
+
/* show main window */
gtk_widget_set_uposition(mainwin->window,
prefs_common.mainwin_x,
main_window_set_menu_sensitive(mainwin);
main_window_set_toolbar_sensitive(mainwin);
- if (prefs_common.immediate_exec)
- gtk_widget_hide(mainwin->exec_btn);
- else
- gtk_widget_show(mainwin->exec_btn);
+ /* pixmap themes */
+ gtk_container_remove(GTK_CONTAINER(mainwin->handlebox), GTK_WIDGET(mainwin->toolbar));
+ mainwin->toolbar = NULL;
+ main_window_toolbar_create(mainwin, mainwin->handlebox);
+ set_toolbar_style(mainwin);
+ activate_compose_button(mainwin, prefs_common.toolbar_style, mainwin->compose_btn_type);
+ folderview_reflect_prefs_pixmap_theme(mainwin->folderview);
+ summary_reflect_prefs_pixmap_theme(mainwin->summaryview);
summary_redisplay_msg(mainwin->summaryview);
headerview_set_visibility(mainwin->messageview->headerview,
M_EXEC = 1 << 4,
M_ALLOW_REEDIT = 1 << 5,
M_HAVE_ACCOUNT = 1 << 6,
- M_THREADED = 1 << 7,
+ M_THREADED = 1 << 7,
M_UNTHREADED = 1 << 8,
- M_NEWS = 1 << 9,
- M_HAVE_NEWS_ACCOUNT = 1 << 10
+ M_ALLOW_DELETE = 1 << 9,
+ M_NEWS = 1 << 10,
+ M_HAVE_NEWS_ACCOUNT = 1 << 11,
+ M_HIDE_READ_MSG = 1 << 12
} SensitiveCond;
static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
if (selection != SUMMARY_NONE)
state |= M_MSG_EXIST;
if (item) {
+ state |= M_EXEC;
if (item->threaded)
state |= M_THREADED;
else
state |= M_UNTHREADED;
+ if (item->folder->type != F_NEWS)
+ state |= M_ALLOW_DELETE;
+
+ if (selection == SUMMARY_NONE && item->hide_read_msgs
+ || selection != SUMMARY_NONE)
+ state |= M_HIDE_READ_MSG;
}
if (selection == SUMMARY_SELECTED_SINGLE ||
selection == SUMMARY_SELECTED_MULTIPLE)
state |= M_TARGET_EXIST;
if (selection == SUMMARY_SELECTED_SINGLE)
state |= M_SINGLE_TARGET_EXIST;
- 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;
void main_window_set_toolbar_sensitive(MainWindow *mainwin)
{
SensitiveCond state;
- gboolean sensitive;
+ gboolean sensitive;
gint i;
- const struct {
+ struct {
GtkWidget *widget;
SensitiveCond cond;
- } entry[] = {
- {mainwin->get_btn , M_HAVE_ACCOUNT|M_UNLOCKED},
- {mainwin->getall_btn , M_HAVE_ACCOUNT|M_UNLOCKED},
- {mainwin->compose_mail_btn, M_HAVE_ACCOUNT},
- {mainwin->compose_news_btn, M_HAVE_NEWS_ACCOUNT},
- {mainwin->reply_btn , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
- {mainwin->replyall_btn , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
- {mainwin->replysender_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}, */
- {mainwin->next_btn , M_MSG_EXIST},
- {mainwin->delete_btn , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
- {mainwin->exec_btn , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
- {NULL, 0}
- };
+ } entry[11];
+
+ entry[0].widget = mainwin->get_btn;
+ entry[0].cond = M_HAVE_ACCOUNT|M_UNLOCKED;
+ entry[1].widget = mainwin->getall_btn;
+ entry[1].cond = M_HAVE_ACCOUNT|M_UNLOCKED;
+ entry[2].widget = mainwin->compose_news_btn;
+ entry[2].cond = M_HAVE_NEWS_ACCOUNT;
+ entry[3].widget = mainwin->reply_btn;
+ entry[3].cond = M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST;
+ entry[4].widget = mainwin->replyall_btn;
+ entry[4].cond = M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST;
+ entry[5].widget = mainwin->replysender_btn;
+ entry[5].cond = M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST;
+ entry[6].widget = mainwin->fwd_btn;
+ entry[6].cond = M_HAVE_ACCOUNT|M_TARGET_EXIST;
+/* entry[6].widget = mainwin->prefs_btn;
+ entry[6].cond = M_UNLOCKED;
+ entry[7].widget = mainwin->account_btn;
+ entry[7].cond = M_UNLOCKED; */
+ entry[7].widget = mainwin->next_btn;
+ entry[7].cond = M_MSG_EXIST;
+ entry[8].widget = mainwin->delete_btn;
+ entry[8].cond = M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED;
+ entry[9].widget = mainwin->exec_btn;
+ entry[9].cond = M_MSG_EXIST|M_EXEC|M_UNLOCKED;
+ entry[10].widget = NULL;
+ entry[10].cond = 0;
state = main_window_get_current_state(mainwin);
/* {"/File/Close", M_UNLOCKED}, */
{"/File/Exit" , M_UNLOCKED},
+ {"/Edit/Actions" , M_MSG_EXIST},
{"/View/Sort" , M_MSG_EXIST},
{"/View/Thread view" , M_UNTHREADED},
{"/View/Unthread view" , M_THREADED},
- {"/View/Go to" , M_MSG_EXIST},
+ {"/View/Hide read messages" , M_HIDE_READ_MSG},
{"/View/Go to/Prev message" , M_MSG_EXIST},
{"/View/Go to/Next message" , M_MSG_EXIST},
+ {"/View/Go to/Prev unread message" , M_MSG_EXIST},
{"/View/Go to/Next unread message" , M_MSG_EXIST},
{"/View/Go to/Prev marked message" , M_MSG_EXIST},
{"/View/Go to/Next marked message" , M_MSG_EXIST},
{"/Message/Reply to sender" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
{"/Message/Reply to all" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
{"/Message/Follow-up and reply to", M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST|M_NEWS},
- {"/Message/Forward" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {"/Message/Forward" , M_HAVE_ACCOUNT|M_TARGET_EXIST},
{"/Message/Bounce" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
- {"/Message/Re-edit", M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
- {"/Message/Move...", M_TARGET_EXIST|M_EXEC|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/Delete duplicated messages", M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+ {"/Message/Re-edit" , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
+ {"/Message/Move..." , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
+ {"/Message/Copy..." , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
+ {"/Message/Delete" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
+ {"/Message/Mark" , M_TARGET_EXIST},
+ {"/Message/Delete duplicated messages", M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
{"/Tool/Add sender to address book", M_SINGLE_TARGET_EXIST},
{"/Tool/Filter messages" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+ {"/Tool/Create filter rule" , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
{"/Tool/Execute" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
{"/Configuration", M_UNLOCKED},
GtkWidget *vpaned;
GtkWidget *vbox_body = mainwin->vbox_body;
GtkItemFactory *ifactory=gtk_item_factory_from_widget(mainwin->menubar);
+ GtkWidget *menuitem;
debug_print(_("Setting widgets..."));
menu_set_sensitive(ifactory, "/View/Message view", TRUE);
menu_set_sensitive(ifactory, "/View/Folder tree", TRUE);
+ menu_set_sensitive(ifactory, "/View/Expand Summary View", TRUE);
+ menu_set_sensitive(ifactory, "/View/Expand Message View", TRUE);
+ menuitem = gtk_item_factory_get_widget(ifactory, "/View/Expand Message View");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
mainwin->win.sep_none.hpaned = hpaned;
mainwin->win.sep_none.vpaned = vpaned;
menu_set_sensitive(ifactory, "/View/Message view", TRUE);
menu_set_sensitive(ifactory, "/View/Folder tree", TRUE);
-
+ menu_set_sensitive(ifactory, "/View/Expand Summary View", FALSE);
+ menu_set_sensitive(ifactory, "/View/Expand Message View", FALSE);
+
mainwin->win.sep_message.messagewin = messagewin;
mainwin->win.sep_message.hpaned = hpaned;
set_toolbar_replysender_button(mainwin, (ToolbarStyle)action);
set_toolbar_forward_button(mainwin, (ToolbarStyle)action);*/
- switch ((ToolbarStyle)action) {
- case TOOLBAR_NONE:
- gtk_widget_hide(mainwin->handlebox);
- case TOOLBAR_ICON:
- gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
- GTK_TOOLBAR_ICONS);
- break;
- case TOOLBAR_TEXT:
- gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
- GTK_TOOLBAR_TEXT);
- break;
- case TOOLBAR_BOTH:
- gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
- GTK_TOOLBAR_BOTH);
- break;
- }
-
- if (action != TOOLBAR_NONE) {
- gtk_widget_show(mainwin->handlebox);
- gtk_widget_queue_resize(mainwin->handlebox);
- }
-
mainwin->toolbar_style = (ToolbarStyle)action;
prefs_common.toolbar_style = (ToolbarStyle)action;
+
+ set_toolbar_style(mainwin);
}
static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
}
}
+static void toggle_expand_summaryview_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+ summary_toggle_view_real(mainwin->summaryview);
+}
+
+static void toggle_expand_messageview_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+ messageview_toggle_view_real(mainwin->messageview);
+}
+
static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action, GtkWidget *widget)
{
static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
- GList *sel = GTK_CLIST(mainwin->summaryview->ctree)->selection;
- MsgInfo *msginfo;
-
- msginfo = gtk_ctree_node_get_row_data
- (GTK_CTREE(mainwin->summaryview->ctree),
- mainwin->summaryview->selected);
-
- if (!msginfo) return;
-
- switch (action) {
- case COMPOSE_REPLY:
- 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,
- FALSE, TRUE);
- break;
- case COMPOSE_REPLY_TO_ALL:
- compose_reply(msginfo, prefs_common.reply_with_quote,
- TRUE, TRUE);
- break;
- case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
- compose_reply(msginfo, TRUE, TRUE, TRUE);
- break;
- case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, TRUE, TRUE);
- break;
- case COMPOSE_FORWARD:
- if (prefs_common.forward_as_attachment) {
- reply_cb(mainwin, COMPOSE_FORWARD_AS_ATTACH, widget);
- return;
- } else {
- reply_cb(mainwin, COMPOSE_FORWARD_INLINE, widget);
- return;
- }
- break;
- case COMPOSE_FORWARD_INLINE:
- if (!sel->next) {
- compose_forward(NULL, msginfo, FALSE);
- break;
- }
- /* if (sel->next) FALL_THROUGH */
- case COMPOSE_FORWARD_AS_ATTACH:
- {
- GSList *msginfo_list = NULL;
- for ( ; sel != NULL; sel = sel->next)
- msginfo_list = g_slist_append(msginfo_list,
- gtk_ctree_node_get_row_data(GTK_CTREE(mainwin->summaryview->ctree),
- GTK_CTREE_NODE(sel->data)));
- compose_forward_multiple(NULL, msginfo_list);
- 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);
- }
-
- summary_set_marks_selected(mainwin->summaryview);
+ summary_reply(mainwin->summaryview, (ComposeMode)action);
}
static void move_to_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
summary_view_source(mainwin->summaryview);
}
+static void show_all_header_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ summary_display_msg_selected(mainwin->summaryview, TRUE);
+}
+
static void reedit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
summary_reedit(mainwin->summaryview);
{
FolderItem *to_folder;
- to_folder = foldersel_folder_sel(NULL, NULL);
+ to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_ALL, NULL);
if (to_folder)
folderview_select(mainwin->folderview, to_folder);
messageview_select_all(mainwin->messageview);
}
+static void create_filter_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ summary_filter_open(mainwin->summaryview, (PrefsFilterType)action);
+}
+
static void prefs_common_open_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
static void prefs_filter_open_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
- prefs_filter_open();
+ prefs_filter_open(NULL, NULL);
}
static void prefs_scoring_open_cb(MainWindow *mainwin, guint action,
prefs_template_open();
}
+static void prefs_actions_open_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ prefs_actions_open(mainwin);
+}
+
static void prefs_account_open_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
prefs_common.toolbar_style,
compose_btn_type);
}
+
+static void menuitem_expandsummaryview_statechanged (GtkWidget *widget, GtkStateType state, gpointer data)
+{
+ MainWindow *mainwin = (MainWindow*) data;
+
+ if (!mainwin) return;
+
+ gtk_widget_set_sensitive(GTK_WIDGET(mainwin->summaryview->toggle_view_btn), GTK_WIDGET_IS_SENSITIVE(widget));
+}
+
+#define BREAK_ON_MODIFIER_KEY() \
+ if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
+
+static void key_pressed (GtkWidget *widget, GdkEventKey *event, gpointer data)
+{
+ MainWindow *mainwin = (MainWindow*) data;
+
+ if (!mainwin || !event) return;
+
+ switch (event->keyval) {
+ case GDK_Q: /* Quit */
+ BREAK_ON_MODIFIER_KEY();
+
+ app_exit_cb(mainwin, 0, NULL);
+ return;
+ default:
+ break;
+ }
+}
+
+#undef BREAK_ON_MODIFIER_KEY
+
+static void set_toolbar_style(MainWindow *mainwin)
+{
+ switch (prefs_common.toolbar_style) {
+ case TOOLBAR_NONE:
+ gtk_widget_hide(mainwin->handlebox);
+ break;
+ case TOOLBAR_ICON:
+ gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
+ GTK_TOOLBAR_ICONS);
+ break;
+ case TOOLBAR_TEXT:
+ gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
+ GTK_TOOLBAR_TEXT);
+ break;
+ case TOOLBAR_BOTH:
+ gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
+ GTK_TOOLBAR_BOTH);
+ break;
+ }
+
+ if (prefs_common.toolbar_style != TOOLBAR_NONE) {
+ gtk_widget_show(mainwin->handlebox);
+ gtk_widget_queue_resize(mainwin->handlebox);
+
+ if (prefs_common.immediate_exec)
+ gtk_widget_hide(mainwin->exec_btn);
+ else
+ gtk_widget_show(mainwin->exec_btn);
+ }
+}
+
projects / claws.git / blobdiff