#include "prefs_folder_item.h"
#include "prefs_summary_column.h"
#include "prefs_template.h"
+#include "prefs_toolbar.h"
#include "account.h"
#include "addressbook.h"
#include "logwindow.h"
#include "version.h"
#include "selective_download.h"
-#define AC_LABEL_WIDTH 240
-
-#define STATUSBAR_PUSH(mainwin, str) \
-{ \
- gtk_statusbar_push(GTK_STATUSBAR(mainwin->statusbar), \
- mainwin->mainwin_cid, str); \
- gtkut_widget_wait_for_draw(mainwin->hbox_stat); \
-}
-#define STATUSBAR_POP(mainwin) \
-{ \
- gtk_statusbar_pop(GTK_STATUSBAR(mainwin->statusbar), \
- mainwin->mainwin_cid); \
-}
+#define AC_LABEL_WIDTH 240
/* list of all instantiated MainWindow */
static GList *mainwin_list = NULL;
static void main_window_set_widgets (MainWindow *mainwin,
SeparateType type);
-static void main_window_toolbar_create (MainWindow *mainwin,
- GtkWidget *container);
-
-/* callback functions */
-static void toolbar_inc_cb (GtkWidget *widget,
- gpointer data);
-static void toolbar_inc_all_cb (GtkWidget *widget,
- gpointer data);
-static void toolbar_send_cb (GtkWidget *widget,
- gpointer data);
-
-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_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_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_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);
-static void toolbar_exec_cb (GtkWidget *widget,
- gpointer data);
-
-static void toolbar_next_unread_cb (GtkWidget *widget,
- gpointer data);
-
-static void toolbar_prefs_cb (GtkWidget *widget,
- gpointer data);
-static void toolbar_account_cb (GtkWidget *widget,
- gpointer data);
#if 0
static void toolbar_account_button_pressed (GtkWidget *widget,
static void ac_menu_popup_closed (GtkMenuShell *menu_shell,
gpointer data);
-static gint main_window_close_cb (GtkWidget *widget,
- GdkEventAny *event,
- gpointer data);
+static gint main_window_close_cb (GtkWidget *widget,
+ GdkEventAny *event,
+ gpointer data);
+static gint folder_window_close_cb (GtkWidget *widget,
+ GdkEventAny *event,
+ gpointer data);
+static gint message_window_close_cb (GtkWidget *widget,
+ GdkEventAny *event,
+ gpointer data);
static void add_mailbox_cb (MainWindow *mainwin,
guint action,
static void toggle_statusbar_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
-static void toggle_expand_summaryview_cb (MainWindow *mainwin,
+static void separate_widget_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
-static void toggle_expand_messageview_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
-static void toggle_work_offline_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
-static void separate_widget_cb (GtkCheckMenuItem *checkitem,
- guint action,
- GtkWidget *widget);
static void addressbook_open_cb (MainWindow *mainwin,
guint action,
static void log_window_show_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
-static void sel_download_cb (MainWindow *mainwin,
+static void sel_download_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+static void prefs_toolbar_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
-static void inc_mail_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
-static void inc_all_account_mail_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
-static void inc_cancel_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
-
-static void send_queue_cb (MainWindow *mainwin,
- guint action,
- 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,
+static void inc_cancel_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
static void thread_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
+static void expand_threads_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+static void collapse_threads_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+
static void set_display_item_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
static void sort_summary_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
+static void sort_summary_type_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
static void attract_by_subject_cb(MainWindow *mainwin,
guint action,
GtkWidget *widget);
static void prev_unread_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
-static void next_unread_cb (MainWindow *mainwin,
+
+static void prev_new_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+static void next_new_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
static void prev_marked_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
-static void prefs_common_open_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
-static void prefs_filter_open_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
-static void prefs_scoring_open_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
-static void prefs_filtering_open_cb (MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
-static void prefs_account_open_cb(MainWindow *mainwin,
- guint action,
- GtkWidget *widget);
+static void prefs_common_open_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+static void prefs_filter_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 prefs_account_open_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+static void prefs_scoring_open_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+static void prefs_filtering_open_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
+
static void new_account_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
FolderItem *item,
gpointer data);
-static void activate_compose_button (MainWindow *mainwin,
- 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);
+static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget);
+
static void addr_harvest_cb ( MainWindow *mainwin,
guint action,
GtkWidget *widget );
guint action,
GtkWidget *widget );
-#define SEPARATE_ACTION 667
+#define SEPARATE_ACTION 500
static GtkItemFactoryEntry mainwin_entries[] =
{
{N_("/_File"), NULL, NULL, 0, "<Branch>"},
{N_("/_File/_Add mailbox..."), NULL, add_mailbox_cb, 0, NULL},
{N_("/_File/_Add mbox mailbox..."), NULL, add_mbox_cb, 0, NULL},
- {N_("/_File/_Rescan folder tree"), NULL, update_folderview_cb, 0, NULL},
+ {N_("/_File/_Check for new mails in all folders"),
+ NULL, update_folderview_cb, 0, NULL},
{N_("/_File/_Folder"), NULL, NULL, 0, "<Branch>"},
{N_("/_File/_Folder/Create _new folder..."),
NULL, new_folder_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/_Close"), "<alt>W", app_exit_cb, 0, NULL}, */
{N_("/_File/E_xit"), "<control>Q", app_exit_cb, 0, NULL},
{N_("/_Edit"), NULL, NULL, 0, "<Branch>"},
{N_("/_Edit/_Search folder..."), "<shift><control>F", search_cb, 1, NULL},
{N_("/_View"), NULL, NULL, 0, "<Branch>"},
{N_("/_View/Show or hi_de"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_View/Show or hi_de/_Folder tree"),
+ NULL, toggle_folder_cb, 0, "<ToggleItem>"},
+ {N_("/_View/Show or hi_de/_Message view"),
+ "V", toggle_message_cb, 0, "<ToggleItem>"},
{N_("/_View/Show or hi_de/_Toolbar"),
NULL, NULL, 0, "<Branch>"},
{N_("/_View/Show or hi_de/_Toolbar/Icon _and text"),
{N_("/_View/Show or hi_de/Status _bar"),
NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/Separate _Folder Tree"), NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER, "<ToggleItem>"},
- {N_("/_View/Separate _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/Separate f_older tree"), NULL, separate_widget_cb, SEPARATE_FOLDER, "<ToggleItem>"},
+ {N_("/_View/Separate m_essage view"), NULL, separate_widget_cb, SEPARATE_MESSAGE, "<ToggleItem>"},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{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/by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, "<RadioItem>"},
+ {N_("/_View/_Sort/by s_ize"), NULL, sort_summary_cb, SORT_BY_SIZE, "/View/Sort/by number"},
+ {N_("/_View/_Sort/by _date"), NULL, sort_summary_cb, SORT_BY_DATE, "/View/Sort/by number"},
+ {N_("/_View/_Sort/by _from"), NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by number"},
+ {N_("/_View/_Sort/by _subject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by number"},
+ {N_("/_View/_Sort/by _color label"),
+ NULL, sort_summary_cb, SORT_BY_LABEL, "/View/Sort/by number"},
+ {N_("/_View/_Sort/by _mark"), NULL, sort_summary_cb, SORT_BY_MARK, "/View/Sort/by number"},
+ {N_("/_View/_Sort/by _unread"), NULL, sort_summary_cb, SORT_BY_UNREAD, "/View/Sort/by number"},
+ {N_("/_View/_Sort/by a_ttachment"),
+ NULL, sort_summary_cb, SORT_BY_MIME, "/View/Sort/by number"},
+ {N_("/_View/_Sort/by score"), NULL, sort_summary_cb, SORT_BY_SCORE, "/View/Sort/by number"},
+ {N_("/_View/_Sort/by locked"), NULL, sort_summary_cb, SORT_BY_LOCKED, "/View/Sort/by number"},
+ {N_("/_View/_Sort/D_on't sort"), NULL, sort_summary_cb, SORT_BY_NONE, "/View/Sort/by number"},
+ {N_("/_View/_Sort/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Sort/Ascending"), NULL, sort_summary_type_cb, SORT_ASCENDING, "<RadioItem>"},
+ {N_("/_View/_Sort/Descending"), NULL, sort_summary_type_cb, SORT_DESCENDING, "/View/Sort/Ascending"},
{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, "<ToggleItem>"},
+ {N_("/_View/Th_read view"), "<control>T", thread_cb, 0, "<ToggleItem>"},
+ {N_("/_View/E_xpand all threads"), NULL, expand_threads_cb, 0, NULL},
+ {N_("/_View/Co_llapse all threads"), NULL, collapse_threads_cb, 0, NULL},
{N_("/_View/_Hide read messages"), NULL, hide_read_messages, 0, "<ToggleItem>"},
{N_("/_View/Set display _item..."), NULL, set_display_item_cb, 0, NULL},
{N_("/_View/_Go to/N_ext unread message"),
"<shift>N", next_unread_cb, 0, NULL},
{N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Go to/Prev ne_w message"), NULL, prev_new_cb, 0, NULL},
+ {N_("/_View/_Go to/Ne_xt new message"), NULL, next_new_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"),
{N_("/_View/Mess_age source"), "<control>U", view_source_cb, 0, NULL},
{N_("/_View/Show all _header"), "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/_Update
"), "<control><alt>U", update_summary_cb, 0, NULL},
+ {N_("/_View/_Update
summary"), "<control><alt>U", update_summary_cb, 0, NULL},
{N_("/_Message"), NULL, NULL, 0, "<Branch>"},
{N_("/_Message/Get new ma_il"), "<control>I", inc_mail_cb, 0, NULL},
{N_("/_Message/Follow-up and reply to"), NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, 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/Redirect"), NULL, reply_cb, COMPOSE_REDIRECT, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Re-_edit"), NULL, reedit_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Tools/_Create filter rule/by _Subject"),
NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
{N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tools/Actio_ns"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tools/E_xecute"), "X", execute_summary_cb, 0, NULL},
+ {N_("/_Tools/Actio_ns"), NULL, NULL, 0, "<Branch>"},
{N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Tools/Delete du_plicated messages"),
NULL, delete_duplicated_cb, 0, NULL},
{N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tools/E_xecute"), "X", execute_summary_cb, 0, NULL},
+ {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Tools/_Log window"), "<control>L", log_window_show_cb, 0, NULL},
{N_("/_Configuration"), NULL, NULL, 0, "<Branch>"},
{N_("/_Configuration/_Common preferences..."),
NULL, prefs_common_open_cb, 0, NULL},
+ {N_("/_Configuration/C_ustom Toolbar"), NULL, prefs_toolbar_cb, 0, NULL},
{N_("/_Configuration/_Filter setting..."),
NULL, prefs_filter_open_cb, 0, NULL},
{N_("/_Configuration/_Scoring..."),
{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"), "<shift>A", reply_cb, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL},
- {N_("/_Reply to all without quote"), "a", 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)"), "f", reply_cb, COMPOSE_FORWARD_INLINE, NULL},
- {N_("/Forward message as _attachment"), "<shift>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}
-};
MainWindow *main_window_create(SeparateType type)
{
GdkColormap *colormap;
GdkColor color[4];
gboolean success[4];
- guint n_menu_entries;
GtkItemFactory *ifactory;
GtkWidget *ac_menu;
GtkWidget *menuitem;
- GtkWidget *compose_popup;
- GtkWidget *reply_popup;
- GtkWidget *replyall_popup;
- GtkWidget *replysender_popup;
- GtkWidget *fwd_popup;
gint i;
+ guint n_menu_entries;
static GdkGeometry geometry;
n_menu_entries, "<Main>", mainwin);
gtk_widget_show(menubar);
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+ ifactory = gtk_item_factory_from_widget(menubar);
handlebox = gtk_handle_box_new();
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);
+ toolbar_popups_create(mainwin, window);
- main_window_toolbar_create(mainwin, handlebox);
+ //main_window_toolbar_create(mainwin, handlebox);
+ toolbar_create(mainwin, handlebox);
/* vbox that contains body */
vbox_body = gtk_vbox_new(FALSE, BORDER_WIDTH);
messageview->mainwin = mainwin;
- mainwin->window = window;
- mainwin->vbox = vbox;
- mainwin->menubar = menubar;
- mainwin->handlebox = handlebox;
- mainwin->vbox_body = vbox_body;
- mainwin->hbox_stat = hbox_stat;
- mainwin->statusbar = statusbar;
- mainwin->progressbar = progressbar;
- 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;
- mainwin->online_switch = online_switch;
- mainwin->offline_switch = offline_switch;
+ mainwin->window = window;
+ mainwin->vbox = vbox;
+ mainwin->menubar = menubar;
+ mainwin->menu_factory = ifactory;
+ mainwin->handlebox = handlebox;
+ mainwin->vbox_body = vbox_body;
+ mainwin->hbox_stat = hbox_stat;
+ mainwin->statusbar = statusbar;
+ mainwin->progressbar = progressbar;
+ mainwin->statuslabel = statuslabel;
+ mainwin->ac_button = ac_button;
+ mainwin->ac_label = ac_label;
+
+ mainwin->online_switch = online_switch;
+ mainwin->offline_switch = offline_switch;
/* set context IDs for status bar */
mainwin->mainwin_cid = gtk_statusbar_get_context_id
debug_print(_("done.\n"));
+ messageview->visible = TRUE;
+
main_window_set_widgets(mainwin, type);
/* set menu items */
- ifactory = gtk_item_factory_from_widget(menubar);
menuitem = gtk_item_factory_get_item
(ifactory, "/View/Code set/Auto detect");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
(ifactory, "/View/Show or hide/Status bar");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
prefs_common.show_statusbar);
-#if 0 /* FIXED SEPARATE WINDOWS */
- /* Message view and Folder tree are always shown at startup
- * make that in the menu visible */
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Separate Message View");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Separate Folder Tree");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-#endif
- /* 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);
- g_assert(menuitem);
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), type & SEPARATE_FOLDER);
- 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_FOLDER));
-
- menuitem = gtk_item_factory_get_widget_by_action(ifactory, SEPARATE_ACTION + SEPARATE_MESSAGE);
- g_assert(menuitem);
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), type & SEPARATE_MESSAGE);
- 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);
/* set account selection menu */
ac_menu = gtk_item_factory_get_widget
GTK_SIGNAL_FUNC(ac_menu_popup_closed), mainwin);
mainwin->ac_menu = ac_menu;
- main_window_set_toolbar_sensitive(mainwin);
+ toolbar_set_sensitive(mainwin);
- /* Create actions menu */
+ /* create actions menu */
update_mainwin_actions_menu(ifactory, mainwin);
/* show main window */
mainwin->lock_count++;
main_window_set_menu_sensitive(mainwin);
- main_window_set_toolbar_sensitive(mainwin);
+ toolbar_set_sensitive(mainwin);
}
void main_window_unlock(MainWindow *mainwin)
mainwin->lock_count--;
main_window_set_menu_sensitive(mainwin);
- main_window_set_toolbar_sensitive(mainwin);
+ toolbar_set_sensitive(mainwin);
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);
+ toolbar_set_sensitive(mainwin);
/* pixmap themes */
- if (pixmap_theme_changed)
- {
- gtk_container_remove(GTK_CONTAINER(mainwin->handlebox), GTK_WIDGET(mainwin->toolbar));
- mainwin->toolbar = NULL;
- main_window_toolbar_create(mainwin, mainwin->handlebox);
+ if (pixmap_theme_changed) {
+ gtk_container_remove(GTK_CONTAINER(mainwin->handlebox),
+ GTK_WIDGET(mainwin->toolbar->toolbar));
+
+ mainwin->toolbar->toolbar = NULL;
+ 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);
}
+ if (prefs_common.immediate_exec)
+ gtk_widget_hide(mainwin->toolbar->exec_btn);
+ else
+ gtk_widget_show(mainwin->toolbar->exec_btn);
+
summary_redisplay_msg(mainwin->summaryview);
headerview_set_visibility(mainwin->messageview->headerview,
prefs_common.display_header_pane);
GtkWidget *summary_wid = GTK_WIDGET_PTR(mainwin->summaryview);
GtkWidget *message_wid = GTK_WIDGET_PTR(mainwin->messageview);
+ debug_print(_("Changing window separation type from %d to %d\n"),
+ mainwin->type, type);
+
if (mainwin->type == type) return;
/* remove widgets from those containers */
gtk_widget_unref(message_wid);
}
+void main_window_toggle_message_view(MainWindow *mainwin)
+{
+ SummaryView *summaryview = mainwin->summaryview;
+ union CompositeWin *cwin = &mainwin->win;
+ GtkWidget *vpaned = NULL;
+ GtkWidget *container = NULL;
+ GtkWidget *msgwin = NULL;
+
+ switch (mainwin->type) {
+ case SEPARATE_NONE:
+ vpaned = cwin->sep_none.vpaned;
+ container = cwin->sep_none.hpaned;
+ break;
+ case SEPARATE_FOLDER:
+ vpaned = cwin->sep_folder.vpaned;
+ container = mainwin->vbox_body;
+ break;
+ case SEPARATE_MESSAGE:
+ msgwin = mainwin->win.sep_message.messagewin;
+ break;
+ case SEPARATE_BOTH:
+ msgwin = mainwin->win.sep_both.messagewin;
+ break;
+ }
+
+ if (msgwin) {
+ if (GTK_WIDGET_VISIBLE(msgwin)) {
+ gtk_widget_hide(msgwin);
+ mainwin->messageview->visible = FALSE;
+ summaryview->displayed = NULL;
+ } else {
+ gtk_widget_show(msgwin);
+ mainwin->messageview->visible = TRUE;
+ }
+ } else if (vpaned->parent != NULL) {
+ mainwin->messageview->visible = FALSE;
+ summaryview->displayed = NULL;
+ gtk_widget_ref(vpaned);
+ gtkut_container_remove(GTK_CONTAINER(container), vpaned);
+ gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), container);
+ gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),
+ GTK_ARROW_UP, GTK_SHADOW_OUT);
+ } else {
+ mainwin->messageview->visible = TRUE;
+ gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), vpaned);
+ gtk_container_add(GTK_CONTAINER(container), vpaned);
+ gtk_widget_unref(vpaned);
+ gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),
+ GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+ }
+
+ main_window_set_menu_sensitive(mainwin);
+
+ gtk_widget_grab_focus(summaryview->ctree);
+}
+
void main_window_get_size(MainWindow *mainwin)
{
GtkAllocation *allocation;
prefs_common.summaryview_width = allocation->width;
- if (mainwin->summaryview->msg_is_toggled_on)
+ if ((mainwin->type == SEPARATE_NONE ||
+ mainwin->type == SEPARATE_FOLDER) &&
+ messageview_is_visible(mainwin->messageview))
prefs_common.summaryview_height = allocation->height;
prefs_common.mainview_width = allocation->width;
for (list = folder_get_list(); list != NULL; list = list->next) {
folder = list->data;
- if (folder && folder->trash && folder->trash->total != 0) {
- folder_item_scan(folder->trash);
+ if (folder && folder->trash) {
folderview_update_item(folder->trash, TRUE);
}
}
folder_add(folder);
folder_set_ui_func(folder, scan_tree_func, mainwin);
- folder->scan_tree(folder);
+ folder_scan_tree(folder);
folder_set_ui_func(folder, NULL, NULL);
folderview_set(mainwin->folderview);
folder_add(folder);
- item = folder_item_new(folder->name, NULL);
+ item = folder_item_new(folder, folder->name, NULL);
item->folder = folder;
folder->node = g_node_new(item);
folderview_set(mainwin->folderview);
}
-typedef enum
-{
- M_UNLOCKED = 1 << 0,
- M_MSG_EXIST = 1 << 1,
- M_TARGET_EXIST = 1 << 2,
- M_SINGLE_TARGET_EXIST = 1 << 3,
- M_EXEC = 1 << 4,
- M_ALLOW_REEDIT = 1 << 5,
- M_HAVE_ACCOUNT = 1 << 6,
- M_THREADED = 1 << 7,
- M_UNTHREADED = 1 << 8,
- M_ALLOW_DELETE = 1 << 9,
- M_INC_ACTIVE = 1 << 10,
- M_NEWS = 1 << 11,
- M_HAVE_NEWS_ACCOUNT = 1 << 12,
- M_HIDE_READ_MSG = 1 << 13
-} SensitiveCond;
-
-static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
+SensitiveCond main_window_get_current_state(MainWindow *mainwin)
{
SensitiveCond state = 0;
SummarySelection selection;
state |= M_UNLOCKED;
if (selection != SUMMARY_NONE)
state |= M_MSG_EXIST;
- if (item) {
+ if (item && item->path && item->parent && !item->no_select) {
state |= M_EXEC;
if (item->threaded)
state |= M_THREADED;
/* if (item->folder->type != F_NEWS) */
state |= M_ALLOW_DELETE;
- if (selection == SUMMARY_NONE && item->hide_read_msgs
+ if ((selection == SUMMARY_NONE && item->hide_read_msgs)
|| selection != SUMMARY_NONE)
state |= M_HIDE_READ_MSG;
}
return state;
}
-void main_window_set_toolbar_sensitive(MainWindow *mainwin)
-{
- SensitiveCond state;
- gboolean sensitive;
- gint i = 0;
- struct {
- GtkWidget *widget;
- SensitiveCond cond;
- } entry[11];
-
-#define SET_WIDGET_COND(w, c) \
-{ \
- entry[i].widget = w; \
- entry[i].cond = c; \
- i++; \
-}
-
- SET_WIDGET_COND(mainwin->get_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
- SET_WIDGET_COND(mainwin->getall_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
- SET_WIDGET_COND(mainwin->compose_news_btn, M_HAVE_ACCOUNT);
- SET_WIDGET_COND(mainwin->reply_btn,
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
- SET_WIDGET_COND(mainwin->replyall_btn,
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
- SET_WIDGET_COND(mainwin->replysender_btn,
- M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
- SET_WIDGET_COND(mainwin->fwd_btn, M_HAVE_ACCOUNT|M_TARGET_EXIST);
-#if 0
- SET_WIDGET_COND(mainwin->prefs_btn, M_UNLOCKED);
- SET_WIDGET_COND(mainwin->account_btn, M_UNLOCKED);
-#endif
- SET_WIDGET_COND(mainwin->next_btn, M_MSG_EXIST);
- SET_WIDGET_COND(mainwin->delete_btn,
- M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED);
- SET_WIDGET_COND(mainwin->exec_btn, M_MSG_EXIST|M_EXEC|M_UNLOCKED);
- SET_WIDGET_COND(NULL, 0);
-
-#undef SET_WIDGET_COND
-
- state = main_window_get_current_state(mainwin);
-
- for (i = 0; entry[i].widget != NULL; i++) {
- 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)
{
- GtkItemFactory *ifactory;
+ GtkItemFactory *ifactory = mainwin->menu_factory;
SensitiveCond state;
gboolean sensitive;
GtkWidget *menuitem;
+ FolderItem *item;
+ gchar *menu_path;
gint i;
static const struct {
} entry[] = {
{"/File/Add mailbox..." , M_UNLOCKED},
{"/File/Add mbox mailbox..." , M_UNLOCKED},
- {"/File/Rescan folder tree" , M_UNLOCKED},
+ {"/File/Check for new mails in all folders", M_UNLOCKED},
{"/File/Folder" , M_UNLOCKED},
{"/File/Import mbox file..." , M_UNLOCKED},
{"/File/Export to mbox file...", M_UNLOCKED},
{"/File/Exit" , M_UNLOCKED},
{"/Edit/Select thread" , M_SINGLE_TARGET_EXIST},
- {"/View/Sort" , M_MSG_EXIST},
+ {"/View/Sort" , M_EXEC},
{"/View/Thread view" , M_EXEC},
+ {"/View/Expand all threads" , M_MSG_EXIST},
+ {"/View/Collapse all threads" , 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 new message" , M_MSG_EXIST},
+ {"/View/Go to/Next new 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},
{"/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_TARGET_EXIST},
- {"/Message/Bounce" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+ {"/Message/Redirect" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
{"/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},
{"/Tools/Harvest addresses" , M_UNLOCKED},
{"/Tools/Filter messages" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
{"/Tools/Create filter rule" , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+ {"/Tools/Actions" , M_TARGET_EXIST|M_UNLOCKED},
{"/Tools/Execute" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
- {"/Tools/Actions" , M_MSG_EXIST},
{"/Tools/Delete duplicated messages", M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
{"/Configuration", M_UNLOCKED},
{NULL, 0}
};
- ifactory = gtk_item_factory_from_widget(mainwin->menubar);
state = main_window_get_current_state(mainwin);
for (i = 0; entry[i].entry != NULL; i++) {
}
main_window_menu_callback_block(mainwin);
- menuitem = gtk_item_factory_get_widget(ifactory, "/View/Show all header");
- gtk_check_menu_item_set_active
- (GTK_CHECK_MENU_ITEM(menuitem),
- mainwin->messageview->textview->show_all_headers);
- menuitem = gtk_item_factory_get_widget(ifactory, "/View/Thread view");
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- (state & M_THREADED) != 0);
+
+#define SET_CHECK_MENU_ACTIVE(path, active) \
+{ \
+ menuitem = gtk_item_factory_get_widget(ifactory, path); \
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
+}
+
+ SET_CHECK_MENU_ACTIVE("/View/Show or hide/Message view",
+ messageview_is_visible(mainwin->messageview));
+
+ item = mainwin->summaryview->folder_item;
+ menu_path = "/View/Sort/Don't sort";
+ if (item) {
+ switch (item->sort_key) {
+ case SORT_BY_NUMBER:
+ menu_path = "/View/Sort/by number"; break;
+ case SORT_BY_SIZE:
+ menu_path = "/View/Sort/by size"; break;
+ case SORT_BY_DATE:
+ menu_path = "/View/Sort/by date"; break;
+ case SORT_BY_FROM:
+ menu_path = "/View/Sort/by from"; break;
+ case SORT_BY_SUBJECT:
+ menu_path = "/View/Sort/by subject"; break;
+ case SORT_BY_LABEL:
+ menu_path = "/View/Sort/by color label"; break;
+ case SORT_BY_MARK:
+ menu_path = "/View/Sort/by mark"; break;
+ case SORT_BY_UNREAD:
+ menu_path = "/View/Sort/by unread"; break;
+ case SORT_BY_MIME:
+ menu_path = "/View/Sort/by attachment"; break;
+ case SORT_BY_SCORE:
+ menu_path = "/View/Sort/by score"; break;
+ case SORT_BY_LOCKED:
+ menu_path = "/View/Sort/by locked"; break;
+ case SORT_BY_NONE:
+ default:
+ menu_path = "/View/Sort/Don't sort"; break;
+ }
+ }
+ SET_CHECK_MENU_ACTIVE(menu_path, TRUE);
+
+ if (!item || item->sort_type == SORT_ASCENDING) {
+ SET_CHECK_MENU_ACTIVE("/View/Sort/Ascending", TRUE);
+ } else {
+ SET_CHECK_MENU_ACTIVE("/View/Sort/Descending", TRUE);
+ }
+
+ if (item && item->sort_key != SORT_BY_NONE) {
+ menu_set_sensitive(ifactory, "/View/Sort/Ascending", TRUE);
+ menu_set_sensitive(ifactory, "/View/Sort/Descending", TRUE);
+ } else {
+ menu_set_sensitive(ifactory, "/View/Sort/Ascending", FALSE);
+ menu_set_sensitive(ifactory, "/View/Sort/Descending", FALSE);
+ }
+
+ SET_CHECK_MENU_ACTIVE("/View/Show all header",
+ mainwin->messageview->textview->show_all_headers);
+ SET_CHECK_MENU_ACTIVE("/View/Thread view", (state & M_THREADED) != 0);
+
+#undef SET_CHECK_MENU_ACTIVE
+
main_window_menu_callback_unblock(mainwin);
}
GtkWidget *hpaned;
GtkWidget *vpaned;
GtkWidget *vbox_body = mainwin->vbox_body;
- GtkItemFactory *ifactory=gtk_item_factory_from_widget(mainwin->menubar);
+ GtkItemFactory *ifactory = mainwin->menu_factory;
GtkWidget *menuitem;
debug_print(_("Setting widgets..."));
gtk_container_set_border_width(GTK_CONTAINER(folderwin),
BORDER_WIDTH);
gtk_signal_connect(GTK_OBJECT(folderwin), "delete_event",
- GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
- NULL);
+ GTK_SIGNAL_FUNC(folder_window_close_cb),
+ mainwin);
}
if (type & SEPARATE_MESSAGE) {
messagewin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width(GTK_CONTAINER(messagewin),
BORDER_WIDTH);
gtk_signal_connect(GTK_OBJECT(messagewin), "delete_event",
- GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
- NULL);
+ GTK_SIGNAL_FUNC(message_window_close_cb),
+ mainwin);
}
switch (type) {
GTK_WIDGET_PTR(mainwin->folderview));
vpaned = gtk_vpaned_new();
- if (mainwin->summaryview->msg_is_toggled_on) {
+ if (messageview_is_visible(mainwin->messageview)) {
gtk_paned_add2(GTK_PANED(hpaned), vpaned);
gtk_paned_add1(GTK_PANED(vpaned),
GTK_WIDGET_PTR(mainwin->summaryview));
prefs_common.mainwin_height);
gtk_widget_show_all(vpaned);
- menu_set_sensitive(ifactory, "/View/Separate Message View", TRUE);
- menu_set_sensitive(ifactory, "/View/Separate 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);
-
+ /* CLAWS: previous "gtk_widget_show_all" makes noticeview
+ * lose track of its visibility state */
+ if (!noticeview_is_visible(mainwin->messageview->noticeview))
+ gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
+
mainwin->win.sep_none.hpaned = hpaned;
mainwin->win.sep_none.vpaned = vpaned;
break;
case SEPARATE_FOLDER:
vpaned = gtk_vpaned_new();
- if (mainwin->summaryview->msg_is_toggled_on) {
+ if (messageview_is_visible(mainwin->messageview)) {
gtk_box_pack_start(GTK_BOX(vbox_body), vpaned,
TRUE, TRUE, 0);
gtk_paned_add1(GTK_PANED(vpaned),
gtk_container_add(GTK_CONTAINER(folderwin),
GTK_WIDGET_PTR(mainwin->folderview));
- menu_set_sensitive(ifactory, "/View/Separate Message View", TRUE);
- menu_set_sensitive(ifactory, "/View/Separate 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/Separate Message View", TRUE);
- menu_set_sensitive(ifactory, "/View/Separate 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;
gtk_widget_show_all(messagewin);
+
+ /* CLAWS: previous "gtk_widget_show_all" makes noticeview
+ * lose track of its visibility state */
+ if (!noticeview_is_visible(mainwin->messageview->noticeview))
+ gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
break;
case SEPARATE_BOTH:
gtk_box_pack_start(GTK_BOX(vbox_body),
gtk_container_add(GTK_CONTAINER(messagewin),
GTK_WIDGET_PTR(mainwin->messageview));
- menu_set_sensitive(ifactory, "/View/Separate Message View", TRUE);
- menu_set_sensitive(ifactory, "/View/Separate Folder Tree", TRUE);
-
mainwin->win.sep_both.folderwin = folderwin;
mainwin->win.sep_both.messagewin = messagewin;
gtk_widget_show_all(folderwin);
gtk_widget_show_all(messagewin);
+
+ /* CLAWS: previous "gtk_widget_show_all" makes noticeview
+ * lose track of its visibility state */
+ if (!noticeview_is_visible(mainwin->messageview->noticeview))
+ gtk_widget_hide(GTK_WIDGET_PTR(mainwin->messageview->noticeview));
break;
}
mainwin->type = type;
- debug_print(_("done.\n"));
-}
-
-static void main_window_toolbar_create(MainWindow *mainwin,
- GtkWidget *container)
-{
- GtkWidget *toolbar;
- GtkWidget *icon_wid;
- GtkWidget *get_btn;
- GtkWidget *getall_btn;
- GtkWidget *compose_mail_btn;
- GtkWidget *compose_news_btn;
- GtkWidget *reply_btn;
- GtkWidget *replyall_btn;
- GtkWidget *replysender_btn;
- GtkWidget *fwd_btn;
- GtkWidget *send_btn;
-#if 0
- GtkWidget *prefs_btn;
- GtkWidget *account_btn;
-#endif
- GtkWidget *next_btn;
- GtkWidget *delete_btn;
- GtkWidget *exec_btn;
-
- GtkTooltips *tooltips;
-
- toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
- GTK_TOOLBAR_BOTH);
- gtk_container_add(GTK_CONTAINER(container), toolbar);
- gtk_container_set_border_width(GTK_CONTAINER(container), 2);
- gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE);
- gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
- GTK_TOOLBAR_SPACE_LINE);
-
- 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);
- 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"),
- "Get all",
- icon_wid,
- toolbar_inc_all_cb,
- mainwin);
-
- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_SEND);
- send_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Send"),
- _("Send queued message(s)"),
- "Send",
- icon_wid,
- toolbar_send_cb,
- mainwin);
-
- /* insert compose mail button widget */
- 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",
- icon_wid,
- toolbar_compose_mail_cb,
- mainwin);
-
- /* 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",
- icon_wid,
- toolbar_compose_news_cb,
- mainwin);
-
- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
- /* 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 - Right button: more options"),
- "Reply",
- icon_wid,
- toolbar_reply_cb,
- mainwin);
-
- /* 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 - Right button: more options"),
- "Reply to all",
- icon_wid,
- toolbar_reply_to_all_cb,
- mainwin);
-
- /* 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 - Right button: more options"),
- "Reply to sender",
- icon_wid,
- toolbar_reply_to_sender_cb,
- mainwin);
-
- /* 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 - Right button: more options"),
- "Fwd",
- icon_wid,
- toolbar_forward_cb,
- mainwin);
-
- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_CLOSE);
- delete_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Delete"),
- _("Delete the message"),
- "Delete",
- icon_wid,
- toolbar_delete_cb,
- mainwin);
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_EXEC);
- exec_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Execute"),
- _("Execute marked process"),
- "Execute",
- icon_wid,
- toolbar_exec_cb,
- mainwin);
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_DOWN_ARROW);
- next_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Next"),
- _("Next unread message"),
- "Next unread",
- icon_wid,
- toolbar_next_unread_cb,
- mainwin);
-
-#if 0
- gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_PREFERENCES);
- prefs_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Prefs"),
- _("Common preferences"),
- "Prefs",
- icon_wid,
- toolbar_prefs_cb,
- mainwin);
- icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_PROPERTIES);
- account_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
- _("Account"),
- _("Account setting"),
- "Account",
- icon_wid,
- toolbar_account_cb,
- mainwin);
- gtk_signal_connect(GTK_OBJECT(account_btn), "button_press_event",
- GTK_SIGNAL_FUNC(toolbar_account_button_pressed),
- mainwin);
-#endif
-
- gtk_signal_connect(GTK_OBJECT(reply_btn), "button_press_event",
- GTK_SIGNAL_FUNC(toolbar_reply_popup_cb),
- mainwin);
-
- 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(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->reply_btn = reply_btn;
- mainwin->replyall_btn = replyall_btn;
- mainwin->replysender_btn = replysender_btn;
- mainwin->fwd_btn = fwd_btn;
- mainwin->send_btn = send_btn;
- #if 0
- mainwin->prefs_btn = prefs_btn;
- mainwin->account_btn = account_btn;
- #endif
- mainwin->next_btn = next_btn;
- mainwin->delete_btn = delete_btn;
- mainwin->exec_btn = exec_btn;
-
- gtk_widget_show_all(toolbar);
-}
-
-/* callback functions */
-static void toolbar_reply_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
- 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->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;
-
- 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_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)
-{
- 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);
- }
-}
-
-static void toolbar_forward_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
- MainWindow *mainwin = (MainWindow *)data;
-
- 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)
-{
- MainWindow *mainwin = (MainWindow *)data;
-
- inc_mail_cb(mainwin, 0, NULL);
-}
-
-static void toolbar_inc_all_cb (GtkWidget *widget,
- gpointer data)
-{
- MainWindow *mainwin = (MainWindow *)data;
-
- inc_all_account_mail_cb(mainwin, 0, NULL);
-}
-
-static void toolbar_send_cb (GtkWidget *widget,
- gpointer data)
-{
- MainWindow *mainwin = (MainWindow *)data;
-
- send_queue_cb(mainwin, 0, NULL);
-}
-
-static void toolbar_compose_cb (GtkWidget *widget,
- gpointer data)
-{
- MainWindow *mainwin = (MainWindow *)data;
-
- if (mainwin->compose_btn_type == COMPOSEBUTTON_MAIL)
- compose_cb(mainwin, 0, NULL);
- else
- compose_news_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,
- prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE
- : COMPOSE_REPLY_WITHOUT_QUOTE,
- NULL);
-}
-
-static void toolbar_reply_to_all_cb(GtkWidget *widget, gpointer data)
-{
- MainWindow *mainwin = (MainWindow *)data;
-
- reply_cb(mainwin,
- prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_ALL_WITH_QUOTE
- : COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE,
- NULL);
-}
-
+ mainwin->messageview->visible = TRUE;
-static void toolbar_reply_to_sender_cb(GtkWidget *widget, gpointer data)
-{
- MainWindow *mainwin = (MainWindow *)data;
-
- 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,
- gpointer data)
-{
- MainWindow *mainwin = (MainWindow *)data;
-
- 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,
- gpointer data)
-{
- MainWindow *mainwin = (MainWindow *)data;
-
- summary_delete(mainwin->summaryview);
-}
-
-static void toolbar_exec_cb (GtkWidget *widget,
- gpointer data)
-{
- MainWindow *mainwin = (MainWindow *)data;
-
- summary_execute(mainwin->summaryview);
-}
-
-static void toolbar_next_unread_cb (GtkWidget *widget,
- gpointer data)
-{
- MainWindow *mainwin = (MainWindow *)data;
-
- next_unread_cb(mainwin, 0, NULL);
-}
-
-static void toolbar_prefs_cb (GtkWidget *widget,
- gpointer data)
-{
- prefs_common_open();
-}
+ /* toggle menu state */
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/View/Show or hide/Folder tree");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/View/Show or hide/Message view");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-static void toolbar_account_cb (GtkWidget *widget,
- gpointer data)
-{
- MainWindow *mainwin = (MainWindow *)data;
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/View/Separate folder tree");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ ((type & SEPARATE_FOLDER) != 0));
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/View/Separate message view");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ ((type & SEPARATE_MESSAGE) != 0));
- prefs_account_open_cb(mainwin, 0, NULL);
+ debug_print(_("done.\n"));
}
#if 0
return TRUE;
}
+static gint folder_window_close_cb(GtkWidget *widget, GdkEventAny *event,
+ gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+ GtkWidget *menuitem;
+
+ menuitem = gtk_item_factory_get_item
+ (mainwin->menu_factory, "/View/Show or hide/Folder tree");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
+
+ return TRUE;
+}
+
+static gint message_window_close_cb(GtkWidget *widget, GdkEventAny *event,
+ gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+ GtkWidget *menuitem;
+
+ menuitem = gtk_item_factory_get_item
+ (mainwin->menu_factory, "/View/Show or hide/Message view");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);
+
+ return TRUE;
+}
+
static void add_mailbox_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
static void update_folderview_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
- summary_show(mainwin->summaryview, NULL, FALSE);
- folderview_rescan_all();
+ summary_show(mainwin->summaryview, NULL);
+ folderview_check_new_all();
}
static void new_folder_cb(MainWindow *mainwin, guint action,
static void toggle_folder_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
+ gboolean active;
+
+ active = GTK_CHECK_MENU_ITEM(widget)->active;
+
switch (mainwin->type) {
case SEPARATE_NONE:
case SEPARATE_MESSAGE:
+#if 0
+ if (active)
+ gtk_widget_show(GTK_WIDGET_PTR(mainwin->folderview));
+ else
+ gtk_widget_hide(GTK_WIDGET_PTR(mainwin->folderview));
+#endif
break;
case SEPARATE_FOLDER:
- if (GTK_CHECK_MENU_ITEM(widget)->active)
+ debug_print("separate folder\n");
+ if (active)
gtk_widget_show(mainwin->win.sep_folder.folderwin);
else
gtk_widget_hide(mainwin->win.sep_folder.folderwin);
break;
case SEPARATE_BOTH:
- if (GTK_CHECK_MENU_ITEM(widget)->active)
+ if (active)
gtk_widget_show(mainwin->win.sep_both.folderwin);
else
gtk_widget_hide(mainwin->win.sep_both.folderwin);
static void toggle_message_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
- switch (mainwin->type) {
- case SEPARATE_NONE:
- case SEPARATE_FOLDER:
- break;
- case SEPARATE_MESSAGE:
- if (GTK_CHECK_MENU_ITEM(widget)->active)
- gtk_widget_show(mainwin->win.sep_message.messagewin);
- else
- gtk_widget_hide(mainwin->win.sep_message.messagewin);
- break;
- case SEPARATE_BOTH:
- if (GTK_CHECK_MENU_ITEM(widget)->active)
- gtk_widget_show(mainwin->win.sep_both.messagewin);
- else
- gtk_widget_hide(mainwin->win.sep_both.messagewin);
- break;
- }
+ gboolean active;
+
+ active = GTK_CHECK_MENU_ITEM(widget)->active;
+
+ if (active != messageview_is_visible(mainwin->messageview))
+ summary_toggle_view(mainwin->summaryview);
}
static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
-/* 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:
+ gtk_widget_hide(mainwin->handlebox);
+ case TOOLBAR_ICON:
+ gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
+ GTK_TOOLBAR_ICONS);
+ break;
+ case TOOLBAR_TEXT:
+ gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
+ GTK_TOOLBAR_TEXT);
+ break;
+ case TOOLBAR_BOTH:
+ gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->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)
+static void separate_widget_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
{
- summary_toggle_view_real(mainwin->summaryview);
-}
+ SeparateType type;
-static void toggle_expand_messageview_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
- messageview_toggle_view_real(mainwin->messageview);
+ if (GTK_CHECK_MENU_ITEM(widget)->active)
+ type = mainwin->type | action;
+ else
+ type = mainwin->type & ~action;
+
+ main_window_separation_change(mainwin, type);
+
+ prefs_common.sep_folder = (type & SEPARATE_FOLDER) != 0;
+ prefs_common.sep_msg = (type & SEPARATE_MESSAGE) != 0;
}
static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
}
}
-static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action, GtkWidget *widget)
-{
- MainWindow *mainwin;
- SeparateType type;
-
- mainwin = (MainWindow *) gtk_object_get_data(GTK_OBJECT(checkitem), "mainwindow");
- g_return_if_fail(mainwin != NULL);
-
- type = mainwin->type ^ action;
- main_window_separation_change(mainwin, type);
-
- prefs_common.sep_folder = (type & SEPARATE_FOLDER) != 0;
- prefs_common.sep_msg = (type & SEPARATE_MESSAGE) != 0;
-}
-
static void addressbook_open_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
selective_download(mainwin);
}
-static void inc_mail_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+static void prefs_toolbar_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ prefs_toolbar();
+}
+
+
+void inc_mail_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
inc_mail(mainwin, prefs_common.newmail_notify_manu);
}
-static void inc_all_account_mail_cb(MainWindow *mainwin, guint action,
+void inc_all_account_mail_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
inc_cancel_all();
}
-static void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
GList *list;
}
}
-static void compose_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
- 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_with_folderitem(mainwin->summaryview->folder_item->folder->account, mainwin->summaryview->folder_item);
- }
- else
- compose_new(NULL);
-}
-
-static void compose_mail_cb(MainWindow *mainwin, guint action,
+void compose_mail_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
PrefsAccount * ac;
}
}
-static void compose_news_cb(MainWindow *mainwin, guint action,
+void compose_news_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
PrefsAccount * ac = NULL;
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);
+ compose_new(ac,
+ mainwin->summaryview->folder_item->path,
+ NULL);
return;
}
}
for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
ac = (PrefsAccount *) cur->data;
if (ac->protocol == A_NNTP) {
- compose_new(ac);
+ compose_new(ac, NULL, NULL);
return;
}
}
}
-static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
summary_reply(mainwin->summaryview, (ComposeMode)action);
}
static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
- GtkItemFactory *ifactory;
-
if (mainwin->menu_lock_count) return;
if (!mainwin->summaryview->folder_item) return;
- ifactory = gtk_item_factory_from_widget(widget);
-
if (GTK_CHECK_MENU_ITEM(widget)->active) {
summary_thread_build(mainwin->summaryview);
mainwin->summaryview->folder_item->threaded = TRUE;
}
}
+static void expand_threads_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ summary_expand_threads(mainwin->summaryview);
+}
+
+static void collapse_threads_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ summary_collapse_threads(mainwin->summaryview);
+}
+
static void set_display_item_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
static void sort_summary_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
- summary_sort(mainwin->summaryview, (SummarySortType)action);
+ FolderItem *item = mainwin->summaryview->folder_item;
+ GtkWidget *menuitem;
+
+ if (mainwin->menu_lock_count) return;
+ if (item) {
+ menuitem = gtk_item_factory_get_item
+ (mainwin->menu_factory, "/View/Sort/Ascending");
+ summary_sort(mainwin->summaryview, (FolderSortKey)action,
+ GTK_CHECK_MENU_ITEM(menuitem)->active
+ ? SORT_ASCENDING : SORT_DESCENDING);
+ }
+}
+
+static void sort_summary_type_cb(MainWindow *mainwin, guint action,
+ GtkWidget *widget)
+{
+ FolderItem *item = mainwin->summaryview->folder_item;
+
+ if (mainwin->menu_lock_count) return;
+ if (item)
+ summary_sort(mainwin->summaryview,
+ item->sort_key, (FolderSortType)action);
}
static void attract_by_subject_cb(MainWindow *mainwin, guint action,
folderview->opened);
if (!fitem) return;
- summary_show(mainwin->summaryview, fitem, TRUE);
+ folder_item_scan(fitem);
+ summary_show(mainwin->summaryview, fitem);
}
static void prev_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
summary_select_prev_unread(mainwin->summaryview);
}
-static void next_unread_cb(MainWindow *mainwin, guint action,
+void next_unread_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
summary_select_next_unread(mainwin->summaryview);
}
+static void prev_new_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+ summary_select_prev_new(mainwin->summaryview);
+}
+
+static void next_new_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+ summary_select_next_new(mainwin->summaryview);
+}
+
static void prev_marked_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
static void allsel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
+ MessageView *msgview = mainwin->messageview;
+
if (GTK_WIDGET_HAS_FOCUS(mainwin->summaryview->ctree))
summary_select_all(mainwin->summaryview);
- else if (mainwin->summaryview->msg_is_toggled_on && (
- GTK_WIDGET_HAS_FOCUS(mainwin->messageview->textview->text) ||
- GTK_WIDGET_HAS_FOCUS(mainwin->messageview->mimeview->ctree) ||
- GTK_WIDGET_HAS_FOCUS(mainwin->messageview->mimeview->notebook) ||
- GTK_WIDGET_HAS_FOCUS(mainwin->messageview->mimeview->textview->text)))
+ else if (messageview_is_visible(msgview) &&
+ (GTK_WIDGET_HAS_FOCUS(msgview->textview->text) ||
+ GTK_WIDGET_HAS_FOCUS(msgview->mimeview->textview->text)))
messageview_select_all(mainwin->messageview);
}
static void selthread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
- if (mainwin->summaryview->msg_is_toggled_on)
+ if (messageview_is_visible(mainwin->summaryview->messageview))
summary_select_thread(mainwin->summaryview);
}
g_free(str);
}
-static void activate_compose_button (MainWindow *mainwin,
- ToolbarStyle style,
- ComposeButtonType type)
-{
- SensitiveCond state = main_window_get_current_state(mainwin);
-
- if (style == TOOLBAR_NONE)
- return;
-
- 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)
-{
- if (mainwin->compose_btn_type != compose_btn_type)
- activate_compose_button(mainwin,
- 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
gtk_widget_hide(mainwin->handlebox);
break;
case TOOLBAR_ICON:
- gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
+ gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
GTK_TOOLBAR_ICONS);
break;
case TOOLBAR_TEXT:
- gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
+ gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
GTK_TOOLBAR_TEXT);
break;
case TOOLBAR_BOTH:
- gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar),
+ gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->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