#include "message_search.h"
#include "headerview.h"
#include "menu.h"
+#include "stock_pixmap.h"
#include "folder.h"
#include "inc.h"
#include "compose.h"
static void toolbar_compose_cb (GtkWidget *widget,
gpointer data);
-static void toolbar_popup_compose_type_cb(GtkWidget *widget,
- gpointer data);
-static void toolbar_popup_compose_type_set(GtkWidget *widget,
- gpointer data);
-static void toolbar_compose_news_cb (GtkWidget *widget,
+static void toolbar_compose_news_cb (GtkWidget *widget,
gpointer data);
-static void toolbar_compose_mail_cb (GtkWidget *widget,
+static void toolbar_compose_mail_cb (GtkWidget *widget,
gpointer data);
static void toolbar_reply_cb (GtkWidget *widget,
gpointer data);
-static void toolbar_reply_quote_cb (GtkWidget *widget,
+static void toolbar_reply_popup_cb (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer data);
+static void toolbar_reply_popup_closed_cb(GtkMenuShell *menu_shell,
gpointer data);
static void toolbar_reply_to_all_cb (GtkWidget *widget,
gpointer data);
-static void toolbar_reply_to_all_quote_cb (GtkWidget *widget,
+static void toolbar_reply_to_all_popup_cb(GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer data);
+static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell *menu_shell,
gpointer data);
static void toolbar_reply_to_sender_cb (GtkWidget *widget,
gpointer data);
-static void toolbar_reply_to_sender_quote_cb (GtkWidget *widget,
+static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer data);
+static void toolbar_reply_to_sender_popup_closed_cb(GtkMenuShell *menu_shell,
gpointer data);
static void toolbar_forward_cb (GtkWidget *widget,
gpointer data);
+static void toolbar_forward_popup_cb (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer data);
+static void toolbar_forward_popup_closed_cb(GtkMenuShell *menu_shell,
+ gpointer data);
static void toolbar_delete_cb (GtkWidget *widget,
gpointer data);
guint action,
GtkWidget *widget);
+static void hide_read_messages (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+
static void thread_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
ToolbarStyle style,
ComposeButtonType type);
-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
static GtkItemFactoryEntry mainwin_entries[] =
{N_("/_File/_Save as..."), NULL, save_as_cb, 0, NULL},
{N_("/_File/_Print..."), "<alt>P", print_cb, 0, NULL},
{N_("/_File/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL},
+ /* {N_("/_File/_Close"), "<alt>W", app_exit_cb, 0, NULL}, */
{N_("/_File/E_xit"), "<alt>Q", app_exit_cb, 0, NULL},
{N_("/_Edit"), NULL, NULL, 0, "<Branch>"},
{N_("/_Edit/_Copy"), "<control>C", copy_cb, 0, NULL},
{N_("/_Edit/Select _all"), "<control>A", allsel_cb, 0, NULL},
{N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Edit/_Find in current message"), "<control>F", search_cb, 0, NULL},
- {N_("/_Edit/_Search folder"), "<control>S", search_cb, 1, NULL},
+ {N_("/_Edit/_Find in current message..."),
+ "<control>F", search_cb, 0, NULL},
+ {N_("/_Edit/_Search folder..."), "<control>S", search_cb, 1, NULL},
{N_("/_View"), NULL, NULL, 0, "<Branch>"},
{N_("/_View/_Folder tree"), NULL, toggle_folder_cb, 0, "<ToggleItem>"},
{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/_None"), NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Toolbar/Icon and text"},
- {N_("/_View/_Status bar"), NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
+ {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>"},
{N_("/_View/Separate m_essage view"), NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, "<ToggleItem>"},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
- {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/_Sort"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_View/_Sort/Sort by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, NULL},
+ {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 _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/_Sort/Sort by _unread"), NULL, sort_summary_cb, SORT_BY_UNREAD, NULL},
+ {N_("/_View/_Sort/Sort by a_ttachment"),
+ NULL, sort_summary_cb, SORT_BY_MIME, NULL},
+ {N_("/_View/_Sort/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Sort/_Attract by subject"),
+ NULL, attract_by_subject_cb, 0, NULL},
+ {N_("/_View/Th_read view"), "<control>T", thread_cb, 0, NULL},
+ {N_("/_View/U_nthread view"), "<shift><control>T", thread_cb, 1, NULL},
+ {N_("/_View/Set display _item..."), NULL, set_display_item_cb, 0, NULL},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/_Code set"), NULL, NULL, 0, "<Branch>"},
{N_("/_View/_Code set/_Auto detect"),
NULL, set_charset_cb, C_AUTO, "<RadioItem>"},
+ {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Go to"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_View/_Go to/_Prev message"), NULL, prev_cb, 0, NULL},
+ {N_("/_View/_Go to/_Next message"), NULL, next_cb, 0, NULL},
+ {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Go to/P_rev unread message"),
+ NULL, prev_unread_cb, 0, NULL},
+ {N_("/_View/_Go to/N_ext unread message"),
+ NULL, next_unread_cb, 0, NULL},
+ {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Go to/Prev _marked message"),
+ NULL, prev_marked_cb, 0, NULL},
+ {N_("/_View/_Go to/Next m_arked message"),
+ NULL, next_marked_cb, 0, NULL},
+ {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Go to/Prev _labeled message"),
+ NULL, prev_labeled_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/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/Open in new _window"), "<shift><control>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/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Update"), "<alt>U", update_summary_cb, 0, NULL},
#define CODESET_SEPARATOR \
{N_("/_View/_Code set/---"), NULL, NULL, 0, "<Separator>"}
#undef CODESET_ACTION
{N_("/_Message"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Message/Get new ma_il"), "<alt>I", inc_mail_cb, 0, NULL},
+ {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/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"), "<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/_Copy..."), NULL, copy_to_cb, 0, NULL},
{N_("/_Message/_Delete"), "<alt>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"), NULL, unmark_cb, 0, NULL},
{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},
-
- {N_("/_Summary"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Summary/_Delete duplicated messages"),
- NULL, delete_duplicated_cb, 0, NULL},
- {N_("/_Summary/_Filter messages"), NULL, filter_cb, 0, NULL},
- {N_("/_Summary/E_xecute"), "<alt>X", execute_summary_cb, 0, NULL},
- {N_("/_Summary/_Update"), "<alt>U", update_summary_cb, 0, NULL},
- {N_("/_Summary/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Summary/Go _to"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Summary/Go _to/_Prev message"), NULL, prev_cb, 0, NULL},
- {N_("/_Summary/Go _to/_Next message"), NULL, next_cb, 0, NULL},
- {N_("/_Summary/Go _to/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Summary/Go _to/P_rev unread message"),
- NULL, prev_unread_cb, 0, NULL},
- {N_("/_Summary/Go _to/N_ext unread message"),
- NULL, next_unread_cb, 0, NULL},
- {N_("/_Summary/Go _to/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Summary/Go _to/Prev _marked message"),
- NULL, prev_marked_cb, 0, NULL},
- {N_("/_Summary/Go _to/Next m_arked message"),
- NULL, next_marked_cb, 0, NULL},
- {N_("/_Summary/Go _to/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Summary/Go _to/Prev _labeled message"),
- NULL, prev_labeled_cb, 0, NULL},
- {N_("/_Summary/Go _to/Next la_beled message"),
- NULL, next_labeled_cb, 0, NULL},
- {N_("/_Summary/_Go to other folder..."),"<alt>G", goto_folder_cb, 0, NULL},
- {N_("/_Summary/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Summary/_Sort"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Summary/_Sort/Sort by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, NULL},
- {N_("/_Summary/_Sort/Sort by s_ize"), NULL, sort_summary_cb, SORT_BY_SIZE, NULL},
- {N_("/_Summary/_Sort/Sort by _date"), NULL, sort_summary_cb, SORT_BY_DATE, NULL},
- {N_("/_Summary/_Sort/Sort by _from"), NULL, sort_summary_cb, SORT_BY_FROM, NULL},
- {N_("/_Summary/_Sort/Sort by _subject"),NULL, sort_summary_cb, SORT_BY_SUBJECT, NULL},
- {N_("/_Summary/_Sort/Sort by _color label"),
- NULL, sort_summary_cb, SORT_BY_LABEL, NULL},
- {N_("/_Summary/_Sort/Sort by _mark"), NULL, sort_summary_cb, SORT_BY_MARK, NULL},
- {N_("/_Summary/_Sort/Sort by _unread"), NULL, sort_summary_cb, SORT_BY_UNREAD, NULL},
- {N_("/_Summary/_Sort/Sort by a_ttachment"),
- NULL, sort_summary_cb, SORT_BY_MIME, NULL},
- {N_("/_Summary/_Sort/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Summary/_Sort/_Attract by subject"),
- NULL, attract_by_subject_cb, 0, NULL},
- {N_("/_Summary/_Thread view"), "<control>T", thread_cb, 0, NULL},
- {N_("/_Summary/Unt_hread view"), "<shift><control>T", thread_cb, 1, NULL},
- {N_("/_Summary/Set display _item..."), NULL, set_display_item_cb, 0, NULL},
+ {N_("/_Message/_Mark/Mark all _read"), NULL, mark_all_read_cb, 0, NULL},
{N_("/_Tool"), NULL, NULL, 0, "<Branch>"},
{N_("/_Tool/_Address book"), "<alt>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/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tool/E_xecute"), "<alt>X", execute_summary_cb, 0, NULL},
+ {N_("/_Tool/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Tool/_Log window"), "<alt>L", log_window_show_cb, 0, NULL},
{N_("/_Configuration"), NULL, NULL, 0, "<Branch>"},
{N_("/_Configuration/C_hange current account"),
NULL, NULL, 0, "<Branch>"},
- {N_("/_Help"), NULL, NULL, 0, "<LastBranch>"},
+ {N_("/_Help"), NULL, NULL, 0, "<Branch>"},
{N_("/_Help/_Manual"), NULL, NULL, 0, "<Branch>"},
{N_("/_Help/_Manual/_English"), NULL, manual_open_cb, MANUAL_LANG_EN, NULL},
{N_("/_Help/_Manual/_Japanese"), NULL, manual_open_cb, MANUAL_LANG_JA, NULL},
{N_("/_Help/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Help/_About"), NULL, about_show, 0, NULL}
};
+static GtkItemFactoryEntry reply_popup_entries[] =
+{
+ {N_("/Reply with _quote"), NULL, reply_cb, COMPOSE_REPLY_WITH_QUOTE, NULL},
+ {N_("/_Reply without quote"), NULL, reply_cb, COMPOSE_REPLY_WITHOUT_QUOTE, NULL}
+};
+static GtkItemFactoryEntry replyall_popup_entries[] =
+{
+ {N_("/Reply to all with _quote"), NULL, reply_cb, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL},
+ {N_("/_Reply to all without quote"), NULL, reply_cb, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL}
+};
+static GtkItemFactoryEntry replysender_popup_entries[] =
+{
+ {N_("/Reply to sender with _quote"), NULL, reply_cb, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE, NULL},
+ {N_("/_Reply to sender without quote"), NULL, reply_cb, COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE, NULL}
+};
+static GtkItemFactoryEntry fwd_popup_entries[] =
+{
+ {N_("/_Forward message (inline style)"), NULL, reply_cb, COMPOSE_FORWARD_INLINE, NULL},
+ {N_("/Forward message as _attachment"), NULL, reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}
+};
+
MainWindow *main_window_create(SeparateType type)
{
GtkItemFactory *ifactory;
GtkWidget *ac_menu;
GtkWidget *menuitem;
+ GtkWidget *compose_popup;
+ GtkWidget *reply_popup;
+ GtkWidget *replyall_popup;
+ GtkWidget *replysender_popup;
+ GtkWidget *fwd_popup;
gint i;
debug_print(_("Creating main window...\n"));
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);
gtk_widget_show(handlebox);
gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
+ /* create the popup menus for the reply buttons specials */
+ n_menu_entries = sizeof(reply_popup_entries) /
+ sizeof(reply_popup_entries[0]);
+ reply_popup = popupmenu_create(window, reply_popup_entries, n_menu_entries,
+ "<ReplyPopup>", mainwin);
+ gtk_signal_connect(GTK_OBJECT(reply_popup), "selection_done",
+ GTK_SIGNAL_FUNC(toolbar_reply_popup_closed_cb), mainwin);
+ n_menu_entries = sizeof(replyall_popup_entries) /
+ sizeof(replyall_popup_entries[0]);
+ replyall_popup = popupmenu_create(window, replyall_popup_entries, n_menu_entries,
+ "<ReplyAllPopup>", mainwin);
+ gtk_signal_connect(GTK_OBJECT(replyall_popup), "selection_done",
+ GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_closed_cb), mainwin);
+ n_menu_entries = sizeof(replysender_popup_entries) /
+ sizeof(replysender_popup_entries[0]);
+ replysender_popup = popupmenu_create(window, replysender_popup_entries, n_menu_entries,
+ "<ReplySenderPopup>", mainwin);
+ gtk_signal_connect(GTK_OBJECT(replysender_popup), "selection_done",
+ GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_closed_cb), mainwin);
+ /* create the popup menu for the forward button */
+ n_menu_entries = sizeof(fwd_popup_entries) /
+ sizeof(fwd_popup_entries[0]);
+ fwd_popup = popupmenu_create(window, fwd_popup_entries, n_menu_entries,
+ "<ForwardPopup>", mainwin);
+ gtk_signal_connect(GTK_OBJECT(fwd_popup), "selection_done",
+ GTK_SIGNAL_FUNC(toolbar_forward_popup_closed_cb), mainwin);
+
main_window_toolbar_create(mainwin, handlebox);
/* vbox that contains body */
mainwin->statuslabel = statuslabel;
mainwin->ac_button = ac_button;
mainwin->ac_label = ac_label;
-
+ mainwin->reply_popup = reply_popup;
+ mainwin->replyall_popup = replyall_popup;
+ mainwin->replysender_popup = replysender_popup;
+ mainwin->fwd_popup = fwd_popup;
+
/* set context IDs for status bar */
mainwin->mainwin_cid = gtk_statusbar_get_context_id
(GTK_STATUSBAR(statusbar), "Main Window");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
prefs_common.show_statusbar);
+ /* Message view and Folder tree are always shown at startup
+ * make that in the menu visible */
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Message view");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Folder tree");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+
/* set the check of the SEPARATE_xxx menu items. we also need the main window
* as a property and pass the action type to the callback */
menuitem = gtk_item_factory_get_widget_by_action(ifactory, SEPARATE_ACTION + SEPARATE_FOLDER);
GUINT_TO_POINTER(SEPARATE_MESSAGE));
- menu_set_sensitive(ifactory, "/Summary/Thread view",
+ menu_set_sensitive(ifactory, "/View/Thread view",
prefs_common.enable_thread ? FALSE : TRUE);
- menu_set_sensitive(ifactory, "/Summary/Unthread view",
+ menu_set_sensitive(ifactory, "/View/Unthread view",
prefs_common.enable_thread ? TRUE : FALSE);
-
- /*main_window_set_thread_option(mainwin);*/
-
/* set account selection menu */
ac_menu = gtk_item_factory_get_widget
prefs_common.mainwin_y);
gtk_widget_set_usize(window, prefs_common.mainwin_width,
prefs_common.mainwin_height);
-
gtk_widget_show(mainwin->window);
/* initialize views */
header_window_init(mainwin->headerwin);
log_window_init(mainwin->logwin);
-
mainwin->lock_count = 0;
mainwin->cursor_count = 0;
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);
gtk_widget_ref(folder_wid);
gtk_widget_ref(summary_wid);
gtk_widget_ref(message_wid);
- gtk_container_remove
+ gtkut_container_remove
(GTK_CONTAINER(folder_wid->parent), folder_wid);
- gtk_container_remove
+ gtkut_container_remove
(GTK_CONTAINER(summary_wid->parent), summary_wid);
- gtk_container_remove
+ gtkut_container_remove
(GTK_CONTAINER(message_wid->parent), message_wid);
/* clean containers */
void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
{
GList *list;
+ guint has_trash;
+ Folder *folder;
+
+ for (has_trash = 0, list = folder_get_list(); list != NULL; list = list->next) {
+ folder = FOLDER(list->data);
+ if (folder && folder->trash && folder->trash->total > 0)
+ has_trash++;
+ }
+ if (!has_trash) return;
+
if (confirm) {
if (alertpanel(_("Empty trash"),
_("Empty all messages in trash?"),
procmsg_empty_trash();
for (list = folder_get_list(); list != NULL; list = list->next) {
- Folder *folder;
-
folder = list->data;
- if (folder->trash) {
+ if (folder && folder->trash && folder->trash->total != 0) {
folder_item_scan(folder->trash);
folderview_update_item(folder->trash, TRUE);
}
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_NEWS = 1 << 9,
+ M_HAVE_NEWS_ACCOUNT = 1 << 10
} SensitiveCond;
static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
SensitiveCond state = 0;
SummarySelection selection;
FolderItem *item = mainwin->summaryview->folder_item;
-
+ GList *account_list = account_get_list();
+
selection = summary_get_selection_type(mainwin->summaryview);
if (mainwin->lock_count == 0)
state |= M_ALLOW_REEDIT;
if (cur_account)
state |= M_HAVE_ACCOUNT;
+
+ for ( ; account_list != NULL; account_list = account_list->next) {
+ if (((PrefsAccount*)account_list->data)->protocol == A_NNTP) {
+ state |= M_HAVE_NEWS_ACCOUNT;
+ break;
+ }
+ }
return state;
}
void main_window_set_toolbar_sensitive(MainWindow *mainwin)
{
SensitiveCond state;
- gboolean sensitive;
+ gboolean sensitive;
gint i;
const struct {
{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_ACCOUNT},
+ {mainwin->compose_news_btn, M_HAVE_NEWS_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}, */
sensitive = ((entry[i].cond & state) == entry[i].cond);
gtk_widget_set_sensitive(entry[i].widget, sensitive);
}
+
+ activate_compose_button(mainwin,
+ prefs_common.toolbar_style,
+ mainwin->compose_btn_type);
}
void main_window_set_menu_sensitive(MainWindow *mainwin)
{"/File/Empty trash" , M_UNLOCKED},
{"/File/Save as...", M_SINGLE_TARGET_EXIST|M_UNLOCKED},
{"/File/Print..." , M_TARGET_EXIST|M_UNLOCKED},
- {"/File/Close", M_UNLOCKED},
+ /* {"/File/Close", M_UNLOCKED}, */
{"/File/Exit" , M_UNLOCKED},
- {"/View/Show all header" , M_SINGLE_TARGET_EXIST},
- {"/View/View source" , M_SINGLE_TARGET_EXIST},
+ {"/View/Sort" , M_MSG_EXIST},
+ {"/View/Thread view" , M_UNTHREADED},
+ {"/View/Unthread view" , M_THREADED},
+ {"/View/Go to" , M_MSG_EXIST},
+ {"/View/Go to/Prev message" , M_MSG_EXIST},
+ {"/View/Go to/Next 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},
+ {"/View/Go to/Prev labeled message", M_MSG_EXIST},
+ {"/View/Go to/Next labeled message", M_MSG_EXIST},
+ {"/View/Open in new window" , M_SINGLE_TARGET_EXIST},
+ {"/View/Show all header" , M_SINGLE_TARGET_EXIST},
+ {"/View/View source" , M_SINGLE_TARGET_EXIST},
{"/Message/Get new mail" , M_HAVE_ACCOUNT|M_UNLOCKED},
{"/Message/Get from all accounts" , M_HAVE_ACCOUNT|M_UNLOCKED},
-/* {"/Message/Compose new message" , M_HAVE_ACCOUNT}, */
+ {"/Message/Compose a news message", M_HAVE_NEWS_ACCOUNT},
{"/Message/Reply" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_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 as attachment" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
- {"/Message/Bounce" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
- {"/Message/Open in new window" , M_SINGLE_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},
- {"/Summary/Delete duplicated messages", M_MSG_EXIST|M_EXEC|M_UNLOCKED},
- {"/Summary/Filter messages" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
- {"/Summary/Execute" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
- {"/Summary/Go to" , M_MSG_EXIST},
- {"/Summary/Go to/Prev message" , M_MSG_EXIST},
- {"/Summary/Go to/Next message" , M_MSG_EXIST},
- {"/Summary/Go to/Next unread message" , M_MSG_EXIST},
- {"/Summary/Go to/Prev marked message" , M_MSG_EXIST},
- {"/Summary/Go to/Next marked message" , M_MSG_EXIST},
- {"/Summary/Go to/Prev labeled message", M_MSG_EXIST},
- {"/Summary/Go to/Next labeled message", M_MSG_EXIST},
- {"/Summary/Sort" , M_MSG_EXIST},
- {"/Summary/Thread view" , M_UNTHREADED},
- {"/Summary/Unthread view" , M_THREADED},
+ {"/Tool/Add sender to address book", M_SINGLE_TARGET_EXIST},
+ {"/Tool/Filter messages" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+ {"/Tool/Execute" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
{"/Configuration", M_UNLOCKED},
};
ifactory = gtk_item_factory_from_widget(mainwin->menubar);
- state = main_window_get_current_state(mainwin);
+ state = main_window_get_current_state(mainwin);
for (i = 0; entry[i].entry != NULL; i++) {
sensitive = ((entry[i].cond & state) == entry[i].cond);
GtkWidget *hpaned;
GtkWidget *vpaned;
GtkWidget *vbox_body = mainwin->vbox_body;
+ GtkItemFactory *ifactory=gtk_item_factory_from_widget(mainwin->menubar);
debug_print(_("Setting widgets..."));
/* create separated window(s) if needed */
if (type & SEPARATE_FOLDER) {
folderwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_title(GTK_WINDOW(folderwin),
+ _("Sylpheed - Folder View"));
+ gtk_window_set_wmclass(GTK_WINDOW(folderwin),
+ "folder_view", "Sylpheed");
gtk_window_set_policy(GTK_WINDOW(folderwin),
TRUE, TRUE, FALSE);
gtk_widget_set_usize(folderwin, -1,
}
if (type & SEPARATE_MESSAGE) {
messagewin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_title(GTK_WINDOW(messagewin),
+ _("Sylpheed - Message View"));
+ gtk_window_set_wmclass(GTK_WINDOW(messagewin),
+ "message_view", "Sylpheed");
gtk_window_set_policy(GTK_WINDOW(messagewin),
TRUE, TRUE, FALSE);
gtk_widget_set_usize
prefs_common.mainwin_height);
gtk_widget_show_all(vpaned);
+ menu_set_sensitive(ifactory, "/View/Message view", FALSE);
+ menu_set_sensitive(ifactory, "/View/Folder tree", FALSE);
+
mainwin->win.sep_none.hpaned = hpaned;
mainwin->win.sep_none.vpaned = vpaned;
break;
gtk_container_add(GTK_CONTAINER(folderwin),
GTK_WIDGET_PTR(mainwin->folderview));
+ menu_set_sensitive(ifactory, "/View/Message view", FALSE);
+ menu_set_sensitive(ifactory, "/View/Folder tree", TRUE);
+
mainwin->win.sep_folder.folderwin = folderwin;
mainwin->win.sep_folder.vpaned = vpaned;
gtk_widget_show_all(hpaned);
gtk_container_add(GTK_CONTAINER(messagewin),
GTK_WIDGET_PTR(mainwin->messageview));
+
+ menu_set_sensitive(ifactory, "/View/Message view", TRUE);
+ menu_set_sensitive(ifactory, "/View/Folder tree", FALSE);
mainwin->win.sep_message.messagewin = messagewin;
mainwin->win.sep_message.hpaned = hpaned;
gtk_container_add(GTK_CONTAINER(messagewin),
GTK_WIDGET_PTR(mainwin->messageview));
+ menu_set_sensitive(ifactory, "/View/Message view", TRUE);
+ menu_set_sensitive(ifactory, "/View/Folder tree", TRUE);
+
mainwin->win.sep_both.folderwin = folderwin;
mainwin->win.sep_both.messagewin = messagewin;
debug_print(_("done.\n"));
}
-#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_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"
-#include "pixmaps/stock_properties.xpm"
-#include "pixmaps/stock_down_arrow.xpm"
-#include "pixmaps/stock_close.xpm"
-#include "pixmaps/stock_exec.xpm"
-
-#define CREATE_TOOLBAR_ICON(xpm_d) \
-{ \
- icon = gdk_pixmap_create_from_xpm_d(container->window, &mask, \
- &container->style->white, \
- xpm_d); \
- icon_wid = gtk_pixmap_new(icon, mask); \
-}
-
static void main_window_toolbar_create(MainWindow *mainwin,
GtkWidget *container)
{
GtkWidget *toolbar;
- GdkPixmap *icon;
- GdkBitmap *mask;
GtkWidget *icon_wid;
GtkWidget *get_btn;
GtkWidget *getall_btn;
GtkWidget *compose_mail_btn;
GtkWidget *compose_news_btn;
- 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;
/*
GtkWidget *next_btn;
GtkWidget *delete_btn;
GtkWidget *exec_btn;
- GtkWidget *compose_type_btn;
- GtkWidget *compose_type_arrow;
- GtkWidget *compose_box;
- GtkWidget *compose_label;
+
GtkTooltips *tooltips;
toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
GTK_TOOLBAR_SPACE_LINE);
- CREATE_TOOLBAR_ICON(stock_mail_receive_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_RECEIVE);
get_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Get"),
_("Get new mail from current account"),
"Get",
icon_wid, toolbar_inc_cb, mainwin);
- CREATE_TOOLBAR_ICON(stock_mail_receive_all_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_RECEIVE_ALL);
getall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Get all"),
_("Get new mail from all accounts"),
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
- CREATE_TOOLBAR_ICON(stock_mail_send_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_SEND);
send_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Send"),
_("Send queued message(s)"),
toolbar_send_cb,
mainwin);
- /* to implement Leandro's "combined" compose buttons, we create
- * two sets of compose buttons, one for normal (text + icon)
- * toolbar, and one for both text-only and icon-only toolbar;
- * we switch between those sets. */
-
/* insert compose mail button widget */
-
- compose_mail_btn = gtk_button_new();
- gtk_widget_show(compose_mail_btn);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, compose_mail_btn,
- _("Compose email message"),
- _("email"));
- compose_box = gtk_vbox_new(0, 0);
- gtk_widget_show(compose_box);
-
- gtk_container_add(GTK_CONTAINER(compose_mail_btn), compose_box);
- CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
- gtk_box_pack_start(GTK_BOX(compose_box), icon_wid, FALSE, FALSE, 0);
-
- compose_label = gtk_label_new(_("Email"));
- gtk_widget_show(compose_label);
- gtk_box_pack_start(GTK_BOX(compose_box), compose_label, FALSE, FALSE, 0);
-
- GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(compose_mail_btn), GTK_CAN_FOCUS);
- gtk_button_set_relief(GTK_BUTTON(compose_mail_btn), GTK_RELIEF_NONE);
- gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), compose_mail_btn,
- NULL, NULL);
-
- /* insert compose news button widget */
-
- compose_news_btn = gtk_button_new();
- gtk_widget_show(compose_news_btn);
- tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(tooltips, compose_news_btn,
- _("Compose news article"),
- _("news"));
- compose_box = gtk_vbox_new(0, 0);
- gtk_widget_show(compose_box);
-
- gtk_container_add(GTK_CONTAINER(compose_news_btn), compose_box);
- CREATE_TOOLBAR_ICON(stock_news_compose_xpm);
- gtk_box_pack_start(GTK_BOX(compose_box), icon_wid, FALSE, FALSE, 0);
-
- compose_label = gtk_label_new(_("News"));
- gtk_widget_show(compose_label);
- gtk_box_pack_start(GTK_BOX(compose_box), compose_label, FALSE, FALSE, 0);
-
- GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(compose_news_btn), GTK_CAN_FOCUS);
- gtk_button_set_relief(GTK_BUTTON(compose_news_btn), GTK_RELIEF_NONE);
- gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), compose_news_btn,
- NULL, NULL);
-
- /* insert compose btn plain */
-
- CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
- compose_mail_btn_plain = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_COMPOSE);
+ compose_mail_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Email"),
_("Compose an email message"),
"New",
toolbar_compose_mail_cb,
mainwin);
- /* insert compose btn plain */
-
- CREATE_TOOLBAR_ICON(stock_news_compose_xpm);
- compose_news_btn_plain = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+ /* insert compose news button widget */
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
+ compose_news_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("News"),
_("Compose a news message"),
"New",
toolbar_compose_news_cb,
mainwin);
- /* insert compose button type widget */
-
- compose_type_btn = gtk_button_new();
- gtk_widget_show(compose_type_btn);
-
- compose_type_arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
- gtk_widget_show(compose_type_arrow);
-
- gtk_container_add(GTK_CONTAINER(compose_type_btn), compose_type_arrow);
-
- GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(compose_type_btn), GTK_CAN_FOCUS);
- gtk_button_set_relief(GTK_BUTTON(compose_type_btn), GTK_RELIEF_NONE);
-
- gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), compose_type_btn,
- NULL, NULL);
-
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
- CREATE_TOOLBAR_ICON(stock_mail_reply_xpm);
+ /* reply button */
+
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_REPLY);
reply_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Reply"),
- _("Reply to the message"),
+ _("Reply to the message - Right button: more options"),
"Reply",
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 button */
+
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_REPLY_TO_ALL);
replyall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("All"),
- _("Reply to all"),
+ _("Reply to all - Right button: more options"),
"Reply to 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);
+
+ /* reply to sender button */
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_REPLY_TO_AUTHOR);
replysender_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Sender"),
- _("Reply to sender"),
+ _("Reply to sender - Right button: more options"),
"Reply to 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);
+
+ /* forward button */
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_FORWARD);
fwd_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Forward"),
- _("Forward the message"),
+ _("Forward the message - Right button: more options"),
"Fwd",
icon_wid,
toolbar_forward_cb,
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
- CREATE_TOOLBAR_ICON(stock_close_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_CLOSE);
delete_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Delete"),
_("Delete the message"),
toolbar_delete_cb,
mainwin);
- CREATE_TOOLBAR_ICON(stock_exec_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_EXEC);
exec_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Execute"),
_("Execute marked process"),
toolbar_exec_cb,
mainwin);
- CREATE_TOOLBAR_ICON(stock_down_arrow_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_DOWN_ARROW);
next_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Next"),
_("Next unread message"),
/*
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
- CREATE_TOOLBAR_ICON(stock_preferences_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_PREFERENCES);
prefs_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Prefs"),
_("Common preference"),
icon_wid,
toolbar_prefs_cb,
mainwin);
- CREATE_TOOLBAR_ICON(stock_properties_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_PROPERTIES);
account_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Account"),
_("Account setting"),
mainwin);
*/
- gtk_signal_connect(GTK_OBJECT(compose_type_btn), "clicked",
- GTK_SIGNAL_FUNC(toolbar_popup_compose_type_cb),
+ gtk_signal_connect(GTK_OBJECT(reply_btn), "button_press_event",
+ GTK_SIGNAL_FUNC(toolbar_reply_popup_cb),
mainwin);
-
- gtk_signal_connect(GTK_OBJECT(compose_mail_btn), "clicked",
- GTK_SIGNAL_FUNC(toolbar_compose_mail_cb),
+
+ gtk_signal_connect(GTK_OBJECT(replyall_btn), "button_press_event",
+ GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_cb),
mainwin);
-
- gtk_signal_connect(GTK_OBJECT(compose_news_btn), "clicked",
- GTK_SIGNAL_FUNC(toolbar_compose_news_cb),
+
+ gtk_signal_connect(GTK_OBJECT(replysender_btn), "button_press_event",
+ GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_cb),
+ mainwin);
+
+ gtk_signal_connect(GTK_OBJECT(fwd_btn), "button_press_event",
+ GTK_SIGNAL_FUNC(toolbar_forward_popup_cb),
mainwin);
+
- mainwin->toolbar = toolbar;
- mainwin->get_btn = get_btn;
- mainwin->getall_btn = getall_btn;
- mainwin->compose_mail_btn = compose_mail_btn;
- mainwin->compose_news_btn = compose_news_btn;
- 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->toolbar = toolbar;
+ mainwin->get_btn = get_btn;
+ mainwin->getall_btn = getall_btn;
+ mainwin->compose_mail_btn = compose_mail_btn;
+ mainwin->compose_news_btn = compose_news_btn;
+ mainwin->reply_btn = reply_btn;
+ mainwin->replyall_btn = replyall_btn;
+ mainwin->replysender_btn = replysender_btn;
mainwin->fwd_btn = fwd_btn;
mainwin->send_btn = send_btn;
/*
mainwin->exec_btn = exec_btn;
gtk_widget_show_all(toolbar);
-
- /* activate Leandro menu system */
- activate_compose_button(mainwin,
- prefs_common.toolbar_style,
- mainwin->compose_btn_type);
}
/* callback functions */
-
-static void toolbar_popup_compose_type_cb (GtkWidget *widget,
- gpointer data)
+static void toolbar_reply_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
{
MainWindow *mainwindow = (MainWindow *) data;
- GtkWidget *compose_menu, *compose_item;
-
- g_return_if_fail(mainwindow != NULL);
-
- compose_menu = gtk_menu_new();
- compose_item = gtk_menu_item_new_with_label(_("Email message"));
- gtk_widget_show(compose_item);
- gtk_menu_append(GTK_MENU(compose_menu), compose_item);
- gtk_signal_connect(GTK_OBJECT(compose_item), "activate",
- GTK_SIGNAL_FUNC(toolbar_popup_compose_type_set),
- mainwindow);
- gtk_object_set_data(GTK_OBJECT(compose_item), "entry", GINT_TO_POINTER(COMPOSEBUTTON_MAIL));
+ if (!event) return;
+
+ if (event->button == 3) {
+ gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+ gtk_menu_popup(GTK_MENU(mainwindow->reply_popup), NULL, NULL,
+ menu_button_position, widget,
+ event->button, event->time);
+ }
+}
+
+static void toolbar_reply_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ gtk_button_set_relief(GTK_BUTTON(mainwin->reply_btn), GTK_RELIEF_NONE);
+ manage_window_focus_in(mainwin->window, NULL, NULL);
+}
+
+static void toolbar_reply_to_all_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+ MainWindow *mainwindow = (MainWindow *) data;
- compose_item = gtk_menu_item_new_with_label(_("News article"));
- gtk_widget_show(compose_item);
- gtk_menu_append(GTK_MENU(compose_menu), compose_item);
- gtk_signal_connect(GTK_OBJECT(compose_item), "activate",
- GTK_SIGNAL_FUNC(toolbar_popup_compose_type_set),
- mainwindow);
- gtk_object_set_data(GTK_OBJECT(compose_item), "entry", GINT_TO_POINTER(COMPOSEBUTTON_NEWS));
-
- gtk_menu_popup(GTK_MENU(compose_menu), NULL, NULL, NULL,
- NULL, 1, 0);
+ if (!event) return;
+
+ if (event->button == 3) {
+ gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+ gtk_menu_popup(GTK_MENU(mainwindow->replyall_popup), NULL, NULL,
+ menu_button_position, widget,
+ event->button, event->time);
+ }
+}
+
+static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ gtk_button_set_relief(GTK_BUTTON(mainwin->replyall_btn), GTK_RELIEF_NONE);
+ manage_window_focus_in(mainwin->window, NULL, NULL);
+}
+
+static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+ MainWindow *mainwindow = (MainWindow *) data;
+ GtkWidget *replysender_menu, *replysender_item;
+
+ if (!event) return;
+
+ if (event->button == 3) {
+ gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+ gtk_menu_popup(GTK_MENU(mainwindow->replysender_popup), NULL, NULL,
+ menu_button_position, widget,
+ event->button, event->time);
+ }
}
-static void toolbar_popup_compose_type_set(GtkWidget *widget, gpointer data)
+static void toolbar_reply_to_sender_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+
+ gtk_button_set_relief(GTK_BUTTON(mainwin->replysender_btn), GTK_RELIEF_NONE);
+ manage_window_focus_in(mainwin->window, NULL, NULL);
+}
+
+static void toolbar_forward_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
{
- ComposeButtonType compose_type = GPOINTER_TO_INT( gtk_object_get_data(GTK_OBJECT(widget), "entry") );
MainWindow *mainwindow = (MainWindow *) data;
+
+ if (!event) return;
+
+ if (event->button == 3) {
+ gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+ gtk_menu_popup(GTK_MENU(mainwindow->fwd_popup), NULL, NULL,
+ menu_button_position, widget,
+ event->button, event->time);
+ }
+}
- mainwindow->compose_btn_type = compose_type;
+static void toolbar_forward_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
- activate_compose_button(mainwindow, prefs_common.toolbar_style, mainwindow->compose_btn_type);
-}
+ gtk_button_set_relief(GTK_BUTTON(mainwin->fwd_btn), GTK_RELIEF_NONE);
+ manage_window_focus_in(mainwin->window, NULL, NULL);
+}
static void toolbar_inc_cb (GtkWidget *widget,
gpointer data)
compose_mail_cb(mainwin, 0, NULL);
}
-static void toolbar_reply_cb (GtkWidget *widget,
- gpointer data)
+static void toolbar_reply_cb(GtkWidget *widget, gpointer data)
{
MainWindow *mainwin = (MainWindow *)data;
- reply_cb(mainwin, COMPOSE_REPLY, NULL);
+ reply_cb(mainwin,
+ prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE
+ : COMPOSE_REPLY_WITHOUT_QUOTE,
+ NULL);
}
-static void toolbar_reply_quote_cb (GtkWidget *widget,
- gpointer data)
+static void toolbar_reply_to_all_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)
-{
- MainWindow *mainwin = (MainWindow *)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);
+ reply_cb(mainwin,
+ prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_ALL_WITH_QUOTE
+ : COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE,
+ NULL);
}
-static void toolbar_reply_to_sender_cb (GtkWidget *widget,
- gpointer data)
-{
- MainWindow *mainwin = (MainWindow *)data;
- reply_cb(mainwin, COMPOSE_REPLY_TO_SENDER, NULL);
-}
-
-static void toolbar_reply_to_sender_quote_cb (GtkWidget *widget,
- gpointer data)
+static void toolbar_reply_to_sender_cb(GtkWidget *widget, gpointer data)
{
MainWindow *mainwin = (MainWindow *)data;
- reply_cb(mainwin, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE, NULL);
+ reply_cb(mainwin,
+ prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_SENDER_WITH_QUOTE
+ : COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE,
+ NULL);
}
static void toolbar_forward_cb (GtkWidget *widget,
static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
- activate_compose_button(mainwin, (ToolbarStyle)action,
+/* activate_compose_button(mainwin, (ToolbarStyle)action,
mainwin->compose_btn_type);
+ set_toolbar_reply_button(mainwin, (ToolbarStyle)action);
+ set_toolbar_replyall_button(mainwin, (ToolbarStyle)action);
+ set_toolbar_replysender_button(mainwin, (ToolbarStyle)action);
+ set_toolbar_forward_button(mainwin, (ToolbarStyle)action);*/
switch ((ToolbarStyle)action) {
case TOOLBAR_NONE:
TRUE, TRUE);
break;
case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
- compose_reply(msginfo, TRUE, TRUE, FALSE);
+ compose_reply(msginfo, TRUE, TRUE, TRUE);
break;
case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
- compose_reply(msginfo, FALSE, TRUE, FALSE);
+ 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;
debug_print(_("forced charset: %s\n"), str ? str : "Auto-Detect");
}
+static void hide_read_messages (MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ if (!mainwin->summaryview->folder_item
+ || gtk_object_get_data(GTK_OBJECT(widget), "dont_toggle"))
+ return;
+ summary_toggle_show_read_messages(mainwin->summaryview);
+}
+
static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
GtkItemFactory *ifactory;
if (0 == action) {
summary_thread_build(mainwin->summaryview);
mainwin->summaryview->folder_item->threaded = TRUE;
- menu_set_sensitive(ifactory, "/Summary/Thread view", FALSE);
- menu_set_sensitive(ifactory, "/Summary/Unthread view", TRUE);
+ menu_set_sensitive(ifactory, "/View/Thread view", FALSE);
+ menu_set_sensitive(ifactory, "/View/Unthread view", TRUE);
} else {
summary_unthread(mainwin->summaryview);
mainwin->summaryview->folder_item->threaded = FALSE;
- menu_set_sensitive(ifactory, "/Summary/Thread view", TRUE);
- menu_set_sensitive(ifactory, "/Summary/Unthread view", FALSE);
+ menu_set_sensitive(ifactory, "/View/Thread view", TRUE);
+ menu_set_sensitive(ifactory, "/View/Unthread view", FALSE);
}
}
ToolbarStyle style,
ComposeButtonType type)
{
+ SensitiveCond state = main_window_get_current_state(mainwin);
+
if (style == TOOLBAR_NONE)
return;
- if (style == TOOLBAR_BOTH) {
- gtk_widget_hide(mainwin->compose_mail_btn_plain);
- gtk_widget_hide(mainwin->compose_news_btn_plain);
- gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? mainwin->compose_mail_btn
- : mainwin->compose_news_btn);
- gtk_widget_show(type == COMPOSEBUTTON_NEWS ? mainwin->compose_news_btn
- : mainwin->compose_mail_btn);
- mainwin->compose_btn_type = type;
- }
- else {
- gtk_widget_hide(mainwin->compose_news_btn);
- gtk_widget_hide(mainwin->compose_mail_btn);
- gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? mainwin->compose_mail_btn_plain
- : mainwin->compose_news_btn_plain);
- gtk_widget_show(type == COMPOSEBUTTON_NEWS ? mainwin->compose_news_btn_plain
- : mainwin->compose_mail_btn_plain);
- mainwin->compose_btn_type = type;
- }
+ gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? mainwin->compose_mail_btn
+ : mainwin->compose_news_btn);
+ gtk_widget_show(type == COMPOSEBUTTON_NEWS ? mainwin->compose_news_btn
+ : mainwin->compose_mail_btn);
+ mainwin->compose_btn_type = type;
}
void main_window_toolbar_set_compose_button(MainWindow *mainwin, ComposeButtonType compose_btn_type)
prefs_common.toolbar_style,
compose_btn_type);
}
-
-static void key_pressed(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, 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);
-
-}