guint action,
GtkWidget *widget );
+static void addr_gather_msg_cb ( MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget );
+
#define SEPARATE_ACTION 667
static GtkItemFactoryEntry mainwin_entries[] =
{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/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_File/_Save as..."), "<control>S", save_as_cb, 0, NULL},
{N_("/_File/_Print..."), NULL, print_cb, 0, NULL},
"<control>F", search_cb, 0, NULL},
{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/_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/Th_read view"), "<control>T", thread_cb, 0, "<ToggleItem>"},
{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 \
#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/Mess_age source"), "<control>U", view_source_cb, 0, NULL},
{N_("/_Message/_Mark/Mark all _read"), NULL, mark_all_read_cb, 0, NULL},
{N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Tools/_Selective
Download"), "<alt>S", sel_download_cb, 0, NULL},
+ {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/_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_("/_Tools/_Gather addresses"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_Tools/_Gather addresses/from _Folder..."), NULL, addr_gather_cb, 0, NULL},
+ {N_("/_Tools/_Gather addresses/from _Messages..."), NULL, addr_gather_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>"},
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},
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
{"/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/Save as...", M_SINGLE_TARGET_EXIST|M_UNLOCKED},
{"/File/Print..." , M_TARGET_EXIST|M_UNLOCKED},
/* {"/File/Close", M_UNLOCKED}, */
{"/Message/Delete" , M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED},
{"/Message/Mark" , M_TARGET_EXIST},
+ {"/Tools/Selective download..." , M_HAVE_ACCOUNT|M_UNLOCKED},
{"/Tools/Add sender to address book", M_SINGLE_TARGET_EXIST},
+ {"/Tools/Gather addresses" , M_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},
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;
{
GList *list;
- if (procmsg_send_queue(prefs_common.savemsg) < 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);
}
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,
}
}
+/*
+ * Gather addresses for selected folder.
+ */
static void addr_gather_cb( MainWindow *mainwin,
guint action,
GtkWidget *widget )
{
- addressbook_gather( mainwin->summaryview->folder_item );
+ addressbook_gather( mainwin->summaryview->folder_item, NULL );
+}
+
+/*
+ * Gather addresses for selected messages in summary view.
+ */
+static void addr_gather_msg_cb( MainWindow *mainwin,
+ guint action,
+ GtkWidget *widget )
+{
+ summary_gather_address( mainwin->summaryview );
}
/*
projects / claws.git / blobdiff