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,
static void allsel_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
-
+static void selthread_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
static void create_filter_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
static void manual_open_cb (MainWindow *mainwin,
guint action,
GtkWidget *widget);
+static void faq_open_cb (MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget);
static void scan_tree_func (Folder *folder,
FolderItem *item,
static void set_toolbar_style(MainWindow *mainwin);
+static void addr_gather_cb ( MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget );
+
#define SEPARATE_ACTION 667
static GtkItemFactoryEntry mainwin_entries[] =
{N_("/_Edit"), NULL, NULL, 0, "<Branch>"},
{N_("/_Edit/_Copy"), "<control>C", copy_cb, 0, NULL},
{N_("/_Edit/Select _all"), "<control>A", allsel_cb, 0, NULL},
+ {N_("/_Edit/Select thread"), "<control>Z", selthread_cb, 0, NULL},
{N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Edit/_Find in current message..."),
"<control>F", search_cb, 0, NULL},
{N_("/_Edit/_Search folder..."), "<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/Separate _Folder Tree"), NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER, "<ToggleItem>"},
{N_("/_View/Separate _Message View"), NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, "<ToggleItem>"},
{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_("/_Message/Get new ma_il"), "<control>I", inc_mail_cb, 0, NULL},
{N_("/_Message/Get from _all accounts"),
"<shift><control>I", inc_all_account_mail_cb, 0, NULL},
+ {N_("/_Message/Cancel receivin_g"), NULL, inc_cancel_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Message/Send queued messa_ges"),
- NULL, send_queue_cb, 0, NULL},
+ {N_("/_Message/_Send queued messages"), NULL, send_queue_cb, 0, NULL},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/Compose a_n email message"), "<control>M", compose_mail_cb, 0, NULL},
{N_("/_Message/Compose a news message"), NULL, compose_news_cb, 0, NULL},
{N_("/_Message/_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/_Gather addresses..."), NULL, addr_gather_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/_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/_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_("/_Help/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Help/_About"), NULL, about_show, 0, NULL}
};
&folderview->color_op);
summaryview->color_important.red = 0;
- summaryview->color_marked.green = 0;
+ summaryview->color_important.green = 0;
summaryview->color_important.blue = (guint16)65535;
color[0] = summaryview->color_marked;
#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
M_THREADED = 1 << 7,
M_UNTHREADED = 1 << 8,
M_ALLOW_DELETE = 1 << 9,
- M_NEWS = 1 << 10,
- M_HAVE_NEWS_ACCOUNT = 1 << 11,
- M_HIDE_READ_MSG = 1 << 12
+ 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)
state |= M_THREADED;
else
state |= M_UNTHREADED;
- if (item->folder->type != F_NEWS)
- state |= M_ALLOW_DELETE;
+ /* if (item->folder->type != F_NEWS) */
+ state |= M_ALLOW_DELETE;
if (selection == SUMMARY_NONE && item->hide_read_msgs
|| selection != SUMMARY_NONE)
}
}
+ if (inc_is_active())
+ state |= M_INC_ACTIVE;
+
return state;
}
/* {"/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/Hide read messages" , M_HIDE_READ_MSG},
{"/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/Cancel receiving" , M_INC_ACTIVE},
{"/Message/Compose a news message", M_HAVE_NEWS_ACCOUNT},
{"/Message/Reply" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
{"/Message/Reply to sender" , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
{"/Message/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/Gather addresses..." , M_SINGLE_TARGET_EXIST|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},
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;
static void inc_mail_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
- inc_mail(mainwin);
+ inc_mail(mainwin, prefs_common.newmail_notify_manu);
}
static void inc_all_account_mail_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
- inc_all_account_mail(mainwin);
+ inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
+}
+
+static void inc_cancel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+ inc_cancel_all();
}
static void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
{
GList *list;
- if (procmsg_send_queue() < 0)
- alertpanel_error(_("Some errors occurred while sending queued messages."));
-
- statusbar_pop_all();
-
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);
}
messageview_select_all(mainwin->messageview);
}
+static void selthread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+ if (mainwin->summaryview->msg_is_toggled_on)
+ summary_select_thread(mainwin->summaryview);
+}
+
static void create_filter_cb(MainWindow *mainwin, guint action,
GtkWidget *widget)
{
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,
manual_open((ManualLang)action);
}
+static void faq_open_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
+{
+ faq_open((ManualLang)action);
+}
+
static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
{
MainWindow *mainwin = (MainWindow *)data;
}
}
+static void addr_gather_cb( MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget )
+{
+ addressbook_gather( mainwin->summaryview->folder_item );
+}
+
+/*
+* End of Source.
+*/
+