static void toolbar_account_cb (GtkWidget *widget,
gpointer data);
+#if 0
static void toolbar_account_button_pressed (GtkWidget *widget,
GdkEventButton *event,
gpointer data);
+#endif
static void ac_label_button_pressed (GtkWidget *widget,
GdkEventButton *event,
gpointer data);
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_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 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 account_menu_cb (GtkMenuItem *menuitem,
gpointer data);
+static void online_switch_clicked(GtkButton *btn,
+ gpointer data);
+
static void manual_open_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
static void set_toolbar_style(MainWindow *mainwin);
-static void addr_gather_cb ( MainWindow *mainwin,
+static void addr_harvest_cb ( MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget );
+
+static void addr_harvest_msg_cb ( MainWindow *mainwin,
guint action,
GtkWidget *widget );
{N_("/_File/_Import mbox file..."), NULL, import_mbox_cb, 0, NULL},
{N_("/_File/_Export to mbox file..."), NULL, export_mbox_cb, 0, NULL},
{N_("/_File/Empty _trash"), "<shift>D", empty_trash_cb, 0, NULL},
- {N_("/_File/_Gather addresses..."), NULL, addr_gather_cb, 0, NULL},
+ {N_("/_File/_Work offline"), "<control>W", toggle_work_offline_cb, 0, "<ToggleItem>"},
{N_("/_File/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_File/_Save as..."), "<control>S", save_as_cb, 0, NULL},
{N_("/_File/_Print..."), NULL, print_cb, 0, NULL},
{N_("/_Edit/_Find in current message..."),
"<control>F", search_cb, 0, NULL},
{N_("/_Edit/_Search folder..."), "<shift><control>F", search_cb, 1, NULL},
- {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Edit/Actio_ns"), NULL, NULL, 0, "<Branch>"},
-
{N_("/_View"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_View/Show or hi_de"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_View/Show or hi_de/_Toolbar"),
+ NULL, NULL, 0, "<Branch>"},
+ {N_("/_View/Show or hi_de/_Toolbar/Icon _and text"),
+ NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"},
+ {N_("/_View/Show or hi_de/_Toolbar/_Icon"),
+ NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Show or hide/Toolbar/Icon and text"},
+ {N_("/_View/Show or hi_de/_Toolbar/_Text"),
+ NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Show or hide/Toolbar/Icon and text"},
+ {N_("/_View/Show or hi_de/_Toolbar/_None"),
+ NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/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/_Toolbar"), NULL, NULL, 0, "<Branch>"},
- {N_("/_View/_Toolbar/Icon _and text"), NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"},
- {N_("/_View/_Toolbar/_Icon"), NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Toolbar/Icon and text"},
- {N_("/_View/_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/---"), 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"),
+ {N_("/_View/_Sort/by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, NULL},
+ {N_("/_View/_Sort/by s_ize"), NULL, sort_summary_cb, SORT_BY_SIZE, NULL},
+ {N_("/_View/_Sort/by _date"), NULL, sort_summary_cb, SORT_BY_DATE, NULL},
+ {N_("/_View/_Sort/by _from"), NULL, sort_summary_cb, SORT_BY_FROM, NULL},
+ {N_("/_View/_Sort/by _subject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, NULL},
+ {N_("/_View/_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"),
+ {N_("/_View/_Sort/by _mark"), NULL, sort_summary_cb, SORT_BY_MARK, NULL},
+ {N_("/_View/_Sort/by _unread"), NULL, sort_summary_cb, SORT_BY_UNREAD, NULL},
+ {N_("/_View/_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, "<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/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Go to"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_View/_Go to/_Prev message"), "P", prev_cb, 0, NULL},
+ {N_("/_View/_Go to/_Next message"), "N", next_cb, 0, NULL},
+ {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Go to/P_rev unread message"),
+ "<shift>P", prev_unread_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 _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..."), "G", goto_folder_cb, 0, NULL},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
#define CODESET_SEPARATOR \
{N_("/_View/_Code set/Cyrillic (KOI8-_R)"),
CODESET_ACTION(C_KOI8_R)},
{N_("/_View/_Code set/Cyrillic (Windows-1251)"),
- CODESET_ACTION(C_CP1251)},
+ CODESET_ACTION(C_WINDOWS_1251)},
CODESET_SEPARATOR,
#endif
{N_("/_View/_Code set/Japanese (ISO-2022-_JP)"),
#undef CODESET_SEPARATOR
#undef CODESET_ACTION
- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/_Go to"), NULL, NULL, 0, "<Branch>"},
- {N_("/_View/_Go to/_Prev message"), "P", prev_cb, 0, NULL},
- {N_("/_View/_Go to/_Next message"), "N", next_cb, 0, NULL},
- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_View/_Go to/P_rev unread message"),
- "<shift>P", prev_unread_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 _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..."), "G", goto_folder_cb, 0, NULL},
{N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_View/Open in new _window"), "<control><alt>N", open_msg_cb, 0, NULL},
- {N_("/_View/_View source"), "<control>U", view_source_cb, 0, NULL},
+ {N_("/_View/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_("/_Message/_Copy..."), "<shift><control>O", copy_to_cb, 0, NULL},
{N_("/_Message/_Delete"), "<control>D", delete_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/Delete du_plicated messages"),
- NULL, delete_duplicated_cb, 0, NULL},
- {N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_Mark"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Message/_Mark/_Mark"), NULL, mark_cb, 0, NULL},
+ {N_("/_Message/_Mark/_Mark"), "<shift>asterisk", mark_cb, 0, NULL},
{N_("/_Message/_Mark/_Unmark"), "U", unmark_cb, 0, NULL},
{N_("/_Message/_Mark/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/_Mark/Mark as unr_ead"), NULL, mark_as_unread_cb, 0, NULL},
+ {N_("/_Message/_Mark/Mark as unr_ead"), "<shift>exclam", 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_("/_Tool"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Tool/_Address book"), "<shift><control>A", addressbook_open_cb, 0, NULL},
- {N_("/_Tool/Add sender to address boo_k"),
+ {N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Tools/_Selective download..."), "<alt>S", sel_download_cb, 0, NULL},
+ {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tools/_Address book..."), "<shift><control>A", addressbook_open_cb, 0, NULL},
+ {N_("/_Tools/Add sender to address boo_k"),
NULL, add_address_cb, 0, NULL},
- {N_("/_Tool/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tool/_Filter messages"), NULL, filter_cb, 0, NULL},
- {N_("/_Tool/_Create filter rule"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Tool/_Create filter rule/_Automatically"),
+ {N_("/_Tools/_Harvest addresses"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Tools/_Harvest addresses/from _Folder..."),
+ NULL, addr_harvest_cb, 0, NULL},
+ {N_("/_Tools/_Harvest addresses/from _Messages..."),
+ NULL, addr_harvest_msg_cb, 0, NULL},
+ {N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tools/_Filter messages"), NULL, filter_cb, 0, NULL},
+ {N_("/_Tools/_Create filter rule"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Tools/_Create filter rule/_Automatically"),
NULL, create_filter_cb, FILTER_BY_AUTO, NULL},
- {N_("/_Tool/_Create filter rule/by _From"),
+ {N_("/_Tools/_Create filter rule/by _From"),
NULL, create_filter_cb, FILTER_BY_FROM, NULL},
- {N_("/_Tool/_Create filter rule/by _To"),
+ {N_("/_Tools/_Create filter rule/by _To"),
NULL, create_filter_cb, FILTER_BY_TO, NULL},
- {N_("/_Tool/_Create filter rule/by _Subject"),
+ {N_("/_Tools/_Create filter rule/by _Subject"),
NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
- {N_("/_Tool/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tool/E_xecute"), "X", execute_summary_cb, 0, NULL},
- {N_("/_Tool/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Tool/_Log window"), "<control>L", log_window_show_cb, 0, NULL},
- {N_("/_Tool/_Selective Download"), "<alt>S", sel_download_cb, 0, 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/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_Tools/Delete du_plicated messages"),
+ NULL, delete_duplicated_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/_Filter setting..."),
NULL, prefs_filter_open_cb, 0, NULL},
- {N_("/_Configuration/_Scoring ..."),
+ {N_("/_Configuration/_Scoring..."),
NULL, prefs_scoring_open_cb, 0, NULL},
- {N_("/_Configuration/_Filtering ..."),
+ {N_("/_Configuration/_Filtering..."),
NULL, prefs_filtering_open_cb, 0, NULL},
{N_("/_Configuration/_Template..."), NULL, prefs_template_open_cb, 0, NULL},
{N_("/_Configuration/_Actions..."), NULL, prefs_actions_open_cb, 0, NULL},
{N_("/_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/_German"), NULL, manual_open_cb, MANUAL_LANG_DE, NULL},
+ {N_("/_Help/_Manual/_Spanish"), NULL, manual_open_cb, MANUAL_LANG_ES, NULL},
{N_("/_Help/_Manual/_French"), NULL, manual_open_cb, MANUAL_LANG_FR, NULL},
{N_("/_Help/_Manual/_Japanese"), NULL, manual_open_cb, MANUAL_LANG_JA, NULL},
{N_("/_Help/_FAQ"), NULL, NULL, 0, "<Branch>"},
{N_("/_Help/_FAQ/_English"), NULL, faq_open_cb, MANUAL_LANG_EN, NULL},
+ {N_("/_Help/_FAQ/_German"), NULL, faq_open_cb, MANUAL_LANG_DE, NULL},
{N_("/_Help/_FAQ/_Spanish"), NULL, faq_open_cb, MANUAL_LANG_ES, NULL},
{N_("/_Help/_FAQ/_French"), NULL, faq_open_cb, MANUAL_LANG_FR, NULL},
{N_("/_Help/_FAQ/_Italian"), NULL, faq_open_cb, MANUAL_LANG_IT, NULL},
{N_("/Forward message as _attachment"), "<shift>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}
};
-
MainWindow *main_window_create(SeparateType type)
{
MainWindow *mainwin;
GtkWidget *statuslabel;
GtkWidget *ac_button;
GtkWidget *ac_label;
+ GtkWidget *online_status;
+ GtkWidget *offline_status;
+ GtkWidget *online_switch;
+ GtkWidget *offline_switch;
FolderView *folderview;
SummaryView *summaryview;
GtkWidget *fwd_popup;
gint i;
+ static GdkGeometry geometry;
+
debug_print(_("Creating main window...\n"));
mainwin = g_new0(MainWindow, 1);
gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);
gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
gtk_window_set_wmclass(GTK_WINDOW(window), "main_window", "Sylpheed");
+
+ if (!geometry.min_height) {
+ geometry.min_width = 320;
+ geometry.min_height = 200;
+ }
+ gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
+ GDK_HINT_MIN_SIZE);
+
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
GTK_SIGNAL_FUNC(main_window_close_cb), mainwin);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
gtk_widget_set_usize(progressbar, 120, 1);
gtk_box_pack_start(GTK_BOX(hbox_stat), progressbar, FALSE, FALSE, 0);
+ online_status = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_ONLINE);
+ offline_status = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_WORK_OFFLINE);
+ online_switch = gtk_button_new ();
+ offline_switch = gtk_button_new ();
+ gtk_container_add (GTK_CONTAINER(online_switch), online_status);
+ gtk_button_set_relief (GTK_BUTTON(online_switch), GTK_RELIEF_NONE);
+ gtk_signal_connect (GTK_OBJECT(online_switch), "clicked", (GtkSignalFunc)online_switch_clicked, mainwin);
+ gtk_box_pack_start (GTK_BOX(hbox_stat), online_switch, FALSE, FALSE, 0);
+ gtk_container_add (GTK_CONTAINER(offline_switch), offline_status);
+ gtk_button_set_relief (GTK_BUTTON(offline_switch), GTK_RELIEF_NONE);
+ gtk_signal_connect (GTK_OBJECT(offline_switch), "clicked", (GtkSignalFunc)online_switch_clicked, mainwin);
+ gtk_box_pack_start (GTK_BOX(hbox_stat), offline_switch, FALSE, FALSE, 0);
+
statuslabel = gtk_label_new("");
gtk_box_pack_start(GTK_BOX(hbox_stat), statuslabel, FALSE, FALSE, 0);
gtk_widget_show_all(hbox_stat);
+ gtk_widget_hide(offline_switch);
/* create views */
mainwin->folderview = folderview = folderview_create();
mainwin->summaryview = summaryview = summary_create();
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;
/* set context IDs for status bar */
mainwin->mainwin_cid = gtk_statusbar_get_context_id
switch (prefs_common.toolbar_style) {
case TOOLBAR_NONE:
menuitem = gtk_item_factory_get_item
- (ifactory, "/View/Toolbar/None");
+ (ifactory, "/View/Show or hide/Toolbar/None");
break;
case TOOLBAR_ICON:
menuitem = gtk_item_factory_get_item
- (ifactory, "/View/Toolbar/Icon");
+ (ifactory, "/View/Show or hide/Toolbar/Icon");
break;
case TOOLBAR_TEXT:
menuitem = gtk_item_factory_get_item
- (ifactory, "/View/Toolbar/Text");
+ (ifactory, "/View/Show or hide/Toolbar/Text");
break;
case TOOLBAR_BOTH:
menuitem = gtk_item_factory_get_item
- (ifactory, "/View/Toolbar/Icon and text");
+ (ifactory, "/View/Show or hide/Toolbar/Icon and text");
}
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
gtk_widget_hide(mainwin->hbox_stat);
- menuitem = gtk_item_factory_get_item(ifactory, "/View/Status bar");
+ menuitem = gtk_item_factory_get_item
+ (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/Message view");
+ 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/Folder tree");
+ 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
mainwin_list = g_list_append(mainwin_list, mainwin);
+ /* init work_offline */
+ if (prefs_common.work_offline)
+ online_switch_clicked (GTK_BUTTON(online_switch), mainwin);
+
return mainwin;
}
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 */
{
SensitiveCond state;
gboolean sensitive;
- gint i;
+ gint i = 0;
struct {
GtkWidget *widget;
SensitiveCond cond;
} entry[11];
- entry[0].widget = mainwin->get_btn;
- entry[0].cond = M_HAVE_ACCOUNT|M_UNLOCKED;
- entry[1].widget = mainwin->getall_btn;
- entry[1].cond = M_HAVE_ACCOUNT|M_UNLOCKED;
- entry[2].widget = mainwin->compose_news_btn;
- entry[2].cond = M_HAVE_NEWS_ACCOUNT;
- entry[3].widget = mainwin->reply_btn;
- entry[3].cond = M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST;
- entry[4].widget = mainwin->replyall_btn;
- entry[4].cond = M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST;
- entry[5].widget = mainwin->replysender_btn;
- entry[5].cond = M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST;
- entry[6].widget = mainwin->fwd_btn;
- entry[6].cond = M_HAVE_ACCOUNT|M_TARGET_EXIST;
-/* entry[6].widget = mainwin->prefs_btn;
- entry[6].cond = M_UNLOCKED;
- entry[7].widget = mainwin->account_btn;
- entry[7].cond = M_UNLOCKED; */
- entry[7].widget = mainwin->next_btn;
- entry[7].cond = M_MSG_EXIST;
- entry[8].widget = mainwin->delete_btn;
- entry[8].cond = M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED;
- entry[9].widget = mainwin->exec_btn;
- entry[9].cond = M_MSG_EXIST|M_EXEC|M_UNLOCKED;
- entry[10].widget = NULL;
- entry[10].cond = 0;
+#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);
{"/File/Import mbox file..." , M_UNLOCKED},
{"/File/Export to mbox file...", M_UNLOCKED},
{"/File/Empty trash" , M_UNLOCKED},
- {"/File/Gather addresses...", M_SINGLE_TARGET_EXIST|M_UNLOCKED},
+ {"/File/Work offline" , M_UNLOCKED},
{"/File/Save as...", M_SINGLE_TARGET_EXIST|M_UNLOCKED},
{"/File/Print..." , M_TARGET_EXIST|M_UNLOCKED},
/* {"/File/Close", M_UNLOCKED}, */
{"/File/Exit" , M_UNLOCKED},
- {"/Edit/Actions" , M_MSG_EXIST},
{"/Edit/Select thread" , M_SINGLE_TARGET_EXIST},
{"/View/Sort" , M_MSG_EXIST},
{"/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/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},
+ {"/View/Message 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/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},
{"/Message/Delete" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
{"/Message/Mark" , M_TARGET_EXIST},
- {"/Message/Delete duplicated messages", M_MSG_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
- {"/Tool/Add sender to address book", M_SINGLE_TARGET_EXIST},
- {"/Tool/Filter messages" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
- {"/Tool/Create filter rule" , M_SINGLE_TARGET_EXIST|M_UNLOCKED},
- {"/Tool/Execute" , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+ {"/Tools/Selective download..." , M_HAVE_ACCOUNT|M_UNLOCKED},
+ {"/Tools/Add sender to address book", M_SINGLE_TARGET_EXIST},
+ {"/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/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},
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) {
prefs_common.mainwin_height);
gtk_widget_show_all(vpaned);
- menu_set_sensitive(ifactory, "/View/Message view", TRUE);
- menu_set_sensitive(ifactory, "/View/Folder tree", TRUE);
+ 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_container_add(GTK_CONTAINER(folderwin),
GTK_WIDGET_PTR(mainwin->folderview));
- menu_set_sensitive(ifactory, "/View/Message view", TRUE);
- menu_set_sensitive(ifactory, "/View/Folder tree", TRUE);
+ 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_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);
+ 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);
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);
+ 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;
mainwin->type = type;
+ ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+
+ 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);
+
+ 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));
+
debug_print(_("done.\n"));
}
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;
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 preference"),
+ _("Common preferences"),
"Prefs",
icon_wid,
toolbar_prefs_cb,
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);
- 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->prefs_btn = prefs_btn;
- mainwin->account_btn = account_btn;
- */
- mainwin->next_btn = next_btn;
- mainwin->delete_btn = delete_btn;
- mainwin->exec_btn = exec_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;
+ #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);
}
prefs_account_open_cb(mainwin, 0, NULL);
}
+#if 0
static void toolbar_account_button_pressed(GtkWidget *widget,
GdkEventButton *event,
gpointer data)
menu_button_position, widget,
event->button, event->time);
}
+#endif
static void ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
gpointer data)
return TRUE;
}
+static gint folder_window_close_cb(GtkWidget *widget, GdkEventAny *event,
+ gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+ GtkItemFactory *ifactory;
+ GtkWidget *menuitem;
+
+ ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/View/Expand Summary View");
+ 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;
+ GtkItemFactory *ifactory;
+ GtkWidget *menuitem;
+
+ ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/View/Expand 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 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)
+ 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)
{
+ gboolean active;
+
+ active = GTK_CHECK_MENU_ITEM(widget)->active;
+
switch (mainwin->type) {
case SEPARATE_NONE:
case SEPARATE_FOLDER:
break;
case SEPARATE_MESSAGE:
- if (GTK_CHECK_MENU_ITEM(widget)->active)
+ if (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)
+ if (active)
gtk_widget_show(mainwin->win.sep_both.messagewin);
else
gtk_widget_hide(mainwin->win.sep_both.messagewin);
messageview_toggle_view_real(mainwin->messageview);
}
-static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action, GtkWidget *widget)
+static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+ if (GTK_CHECK_MENU_ITEM(widget)->active) {
+ online_switch_clicked (GTK_BUTTON(mainwin->online_switch), mainwin);
+ } else {
+ online_switch_clicked (GTK_BUTTON(mainwin->offline_switch), mainwin);
+ }
+}
+static void online_switch_clicked (GtkButton *btn, gpointer data)
{
MainWindow *mainwin;
- SeparateType type;
+ GtkItemFactory *ifactory;
+ GtkCheckMenuItem *menuitem;
- mainwin = (MainWindow *) gtk_object_get_data(GTK_OBJECT(checkitem), "mainwindow");
+ mainwin = (MainWindow *) data;
+
+ ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+ menuitem = GTK_CHECK_MENU_ITEM (gtk_item_factory_get_widget(ifactory, "/File/Work offline"));
+
g_return_if_fail(mainwin != NULL);
+ g_return_if_fail(menuitem != NULL);
+
+ if (btn == GTK_BUTTON(mainwin->online_switch)) {
+ /* go offline */
+ gtk_widget_hide (mainwin->online_switch);
+ gtk_widget_show (mainwin->offline_switch);
+ menuitem->active = TRUE;
+ prefs_common.work_offline = TRUE;
+ inc_autocheck_timer_remove();
+ } else {
+ /*go online */
+ gtk_widget_hide (mainwin->offline_switch);
+ gtk_widget_show (mainwin->online_switch);
+ menuitem->active = FALSE;
+ prefs_common.work_offline = FALSE;
+ inc_autocheck_timer_set();
+ }
+}
+
+static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action, GtkWidget *widget)
+{
+ MainWindow *mainwin;
+ SeparateType type;
+
+ if (GTK_CHECK_MENU_ITEM(widget)->active)
+ type = mainwin->type | action;
+ else
+ type = mainwin->type & ~action;
- type = mainwin->type ^ action;
main_window_separation_change(mainwin, type);
prefs_common.sep_folder = (type & SEPARATE_FOLDER) != 0;
{
GList *list;
- if (procmsg_send_queue() < 0)
- alertpanel_error(_("Some errors occurred while sending queued messages."));
-
- statusbar_pop_all();
+ if (prefs_common.work_offline)
+ if (alertpanel(_("Offline warning"),
+ _("You're working offline. Override?"),
+ _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+ return;
for (list = folder_get_list(); list != NULL; list = list->next) {
- Folder *folder;
+ Folder *folder = list->data;
- folder = list->data;
if (folder->queue) {
+ if (procmsg_send_queue
+ (folder->queue, prefs_common.savemsg) < 0)
+ alertpanel_error(_("Some errors occurred while sending queued messages."));
+ statusbar_pop_all();
folder_item_scan(folder->queue);
folderview_update_item(folder->queue, 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);
+ summary_sort(mainwin->summaryview, (FolderSortKey)action);
}
static void attract_by_subject_cb(MainWindow *mainwin, guint action,
{
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))
+ 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)))
messageview_select_all(mainwin->messageview);
}
static void prefs_filtering_open_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
- prefs_filtering_open(NULL);
+ prefs_filtering_open(NULL, NULL, NULL);
}
static void prefs_template_open_cb(MainWindow *mainwin, guint action,
}
}
-static void addr_gather_cb( MainWindow *mainwin,
+/*
+ * Harvest addresses for selected folder.
+ */
+static void addr_harvest_cb( MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget )
+{
+ addressbook_harvest( mainwin->summaryview->folder_item, FALSE, NULL );
+}
+
+/*
+ * Harvest addresses for selected messages in summary view.
+ */
+static void addr_harvest_msg_cb( MainWindow *mainwin,
guint action,
GtkWidget *widget )
{
- addressbook_gather( mainwin->summaryview->folder_item );
+ summary_harvest_address( mainwin->summaryview );
}
/*
projects / claws.git / blobdiff