correct a few menuitem labels
[claws.git] / src / mainwindow.c
index 7123c5b53317044d8dbe60f6dc1062ac2070efd2..ba3c8eb9b91efe5e0abb423c30511ded707ebf88 100644 (file)
@@ -262,6 +262,9 @@ static void inc_mail_cb                     (MainWindow     *mainwin,
 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,
@@ -397,7 +400,6 @@ static void allsel_cb                (MainWindow    *mainwin,
 static void selthread_cb        (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-
 static void create_filter_cb    (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -433,6 +435,9 @@ static void account_menu_cb  (GtkMenuItem   *menuitem,
 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,
@@ -452,6 +457,10 @@ static void key_pressed (GtkWidget *widget,
 
 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[] =
@@ -482,9 +491,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {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>"},
@@ -620,7 +626,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {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},
@@ -629,9 +635,9 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {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},
@@ -648,47 +654,51 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {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},
@@ -705,7 +715,13 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {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}
 };
@@ -913,7 +929,7 @@ MainWindow *main_window_create(SeparateType type)
                                       &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;
@@ -964,9 +980,9 @@ MainWindow *main_window_create(SeparateType type)
 #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
@@ -1407,9 +1423,10 @@ typedef enum
        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)
@@ -1461,6 +1478,9 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
                }
        }
 
+       if (inc_is_active())
+               state |= M_INC_ACTIVE;
+
        return state;
 }
 
@@ -1538,7 +1558,6 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                /* {"/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},
@@ -1553,10 +1572,11 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/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},
@@ -1569,12 +1589,15 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/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},
 
@@ -1733,8 +1756,8 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType 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");
@@ -1771,8 +1794,8 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                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;
@@ -1798,8 +1821,8 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                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);
                
@@ -1823,8 +1846,8 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                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;
@@ -2533,20 +2556,25 @@ static void sel_download_cb(MainWindow *mainwin, guint action,
 
 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)
+       if (procmsg_send_queue(prefs_common.savemsg) < 0)
                alertpanel_error(_("Some errors occurred while sending queued messages."));
 
        statusbar_pop_all();
@@ -2958,6 +2986,11 @@ static void manual_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;
@@ -3063,3 +3096,14 @@ static void set_toolbar_style(MainWindow *mainwin)
        }
 }
 
+static void addr_gather_cb( MainWindow *mainwin,
+                           guint action,
+                           GtkWidget *widget )
+{
+       addressbook_gather( mainwin->summaryview->folder_item );
+}
+
+/*
+* End of Source.
+*/
+