comment out menu entry not existing in claws
[claws.git] / src / mainwindow.c
index 45eae9dff57fec22ecd3f3e7b33b80f992ce1ce5..6a554f109bdbb67ae7bd7cf23480b2666ade68e7 100644 (file)
@@ -76,6 +76,7 @@
 #include "about.h"
 #include "manual.h"
 #include "prefs_templates.h"
+#include "version.h"
 
 #define AC_LABEL_WIDTH 240
 
@@ -275,6 +276,12 @@ static void mark_as_unread_cb              (MainWindow     *mainwin,
 static void mark_as_read_cb            (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
+static void mark_all_read_cb           (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
+static void add_address_cb             (MainWindow     *mainwin,
+                                        guint           action,
+                                        GtkWidget      *widget);
 
 static void set_charset_cb             (MainWindow     *mainwin,
                                         guint           action,
@@ -313,15 +320,22 @@ static void next_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,
                                  guint          action,
                                  GtkWidget     *widget);
-
+static void prev_marked_cb      (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void next_marked_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-
-static void prev_marked_cb      (MainWindow    *mainwin,
+static void prev_labeled_cb     (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
+static void next_labeled_cb     (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 
@@ -416,6 +430,9 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/Separate f_older tree"),    NULL, NULL, SEPARATE_ACTION + SEPARATE_FOLDER, "<ToggleItem>"},
        {N_("/_View/Separate m_essage view"),   NULL, NULL, SEPARATE_ACTION + SEPARATE_MESSAGE, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
+       {N_("/_View/View _source"),             "<control>U", view_source_cb, 0, NULL},
+       {N_("/_View/Show all _header"),         "<control>H", header_window_show_cb, 0, NULL},
+       {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Code set"),                NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Code set/_Auto detect"),
         NULL, set_charset_cb, C_AUTO, "<RadioItem>"},
@@ -508,9 +525,12 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/Forward as a_ttachment"),
                                                "<shift><control>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
+       {N_("/_Message/Re-_edit"),              NULL, reedit_cb, 0, NULL},
+       {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/M_ove..."),              "<alt>O", move_to_cb, 0, NULL},
        {N_("/_Message/_Copy..."),              NULL, copy_to_cb, 0, NULL},
        {N_("/_Message/_Delete"),               "<alt>D", delete_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/_Unmark"),         NULL, unmark_cb, 0, NULL},
@@ -520,9 +540,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, mark_as_read_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Open in new _window"),   "<shift><control>N", open_msg_cb, 0, NULL},
-       {N_("/_Message/View _source"),          "<control>U", view_source_cb, 0, NULL},
-       {N_("/_Message/Show all _header"),      "<control>H", header_window_show_cb, 0, NULL},
-       {N_("/_Message/Re-_edit"),              NULL, reedit_cb, 0, NULL},
 
        {N_("/_Summary"),                       NULL, NULL, 0, "<Branch>"},
        {N_("/_Summary/_Delete duplicated messages"),
@@ -531,13 +548,25 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Summary/E_xecute"),              "<alt>X", execute_summary_cb, 0, NULL},
        {N_("/_Summary/_Update"),               "<alt>U", update_summary_cb,  0, NULL},
        {N_("/_Summary/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Summary/_Prev message"),         NULL, prev_cb, 0, NULL},
-       {N_("/_Summary/_Next message"),         NULL, next_cb, 0, NULL},
-       {N_("/_Summary/N_ext unread message"),  NULL, next_unread_cb, 0, NULL},
-       {N_("/_Summary/Prev marked message"),   NULL, prev_marked_cb, 0, NULL},
-       {N_("/_Summary/Next marked message"),   NULL, next_marked_cb, 0, NULL},
-       {N_("/_Summary/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Summary/_Go to other folder"),   "<alt>G", goto_folder_cb, 0, NULL},
+       {N_("/_Summary/Go _to"),                NULL, NULL, 0, "<Branch>"},
+       {N_("/_Summary/Go _to/_Prev message"),  NULL, prev_cb, 0, NULL},
+       {N_("/_Summary/Go _to/_Next message"),  NULL, next_cb, 0, NULL},
+       {N_("/_Summary/Go _to/---"),            NULL, NULL, 0, "<Separator>"},
+       {N_("/_Summary/Go _to/P_rev unread message"),
+                                               NULL, prev_unread_cb, 0, NULL},
+       {N_("/_Summary/Go _to/N_ext unread message"),
+                                               NULL, next_unread_cb, 0, NULL},
+       {N_("/_Summary/Go _to/---"),            NULL, NULL, 0, "<Separator>"},
+       {N_("/_Summary/Go _to/Prev _marked message"),
+                                               NULL, prev_marked_cb, 0, NULL},
+       {N_("/_Summary/Go _to/Next m_arked message"),
+                                               NULL, next_marked_cb, 0, NULL},
+       {N_("/_Summary/Go _to/---"),            NULL, NULL, 0, "<Separator>"},
+       {N_("/_Summary/Go _to/Prev _labeled message"),
+                                               NULL, prev_labeled_cb, 0, NULL},
+       {N_("/_Summary/Go _to/Next la_beled message"),
+                                               NULL, next_labeled_cb, 0, NULL},
+       {N_("/_Summary/_Go to other folder..."),"<alt>G", goto_folder_cb, 0, NULL},
        {N_("/_Summary/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Summary/_Sort"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Summary/_Sort/Sort by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, NULL},
@@ -545,8 +574,12 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Summary/_Sort/Sort by _date"),   NULL, sort_summary_cb, SORT_BY_DATE, NULL},
        {N_("/_Summary/_Sort/Sort by _from"),   NULL, sort_summary_cb, SORT_BY_FROM, NULL},
        {N_("/_Summary/_Sort/Sort by _subject"),NULL, sort_summary_cb, SORT_BY_SUBJECT, NULL},
-       {N_("/_Summary/_Sort/Sort by sco_re"),  NULL, sort_summary_cb, SORT_BY_SCORE, NULL},
-       {N_("/_Summary/_Sort/Sort by _label"),  NULL, sort_summary_cb, SORT_BY_LABEL, NULL},
+       {N_("/_Summary/_Sort/Sort by _color label"),
+                                               NULL, sort_summary_cb, SORT_BY_LABEL, NULL},
+       {N_("/_Summary/_Sort/Sort by _mark"),   NULL, sort_summary_cb, SORT_BY_MARK, NULL},
+       {N_("/_Summary/_Sort/Sort by _unread"), NULL, sort_summary_cb, SORT_BY_UNREAD, NULL},
+       {N_("/_Summary/_Sort/Sort by a_ttachment"),
+                                               NULL, sort_summary_cb, SORT_BY_MIME, NULL},
        {N_("/_Summary/_Sort/---"),             NULL, NULL, 0, "<Separator>"},
        {N_("/_Summary/_Sort/_Attract by subject"),
                                                NULL, attract_by_subject_cb, 0, NULL},
@@ -627,8 +660,11 @@ MainWindow *main_window_create(SeparateType type)
                           GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
        gtk_signal_connect(GTK_OBJECT(window), "focus_out_event",
                           GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+
        gtk_widget_realize(window);
 
+       gtkut_widget_set_app_icon(window);
+
        vbox = gtk_vbox_new(FALSE, 0);
        gtk_widget_show(vbox);
        gtk_container_add(GTK_CONTAINER(window), vbox);
@@ -819,6 +855,7 @@ MainWindow *main_window_create(SeparateType type)
                                 prefs_common.mainwin_y);
        gtk_widget_set_usize(window, prefs_common.mainwin_width,
                             prefs_common.mainwin_height);
+                            
        gtk_widget_show(mainwin->window);
 
        /* initialize views */
@@ -828,6 +865,7 @@ MainWindow *main_window_create(SeparateType type)
        header_window_init(mainwin->headerwin);
        log_window_init(mainwin->logwin);
 
+
        mainwin->lock_count = 0;
        mainwin->cursor_count = 0;
 
@@ -1201,7 +1239,8 @@ static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
                state |= M_EXEC;
        if (selection == SUMMARY_SELECTED_SINGLE &&
            (mainwin->summaryview->folder_item &&
-            mainwin->summaryview->folder_item->stype == F_DRAFT))
+            (mainwin->summaryview->folder_item->stype == F_DRAFT ||
+             mainwin->summaryview->folder_item->stype == F_QUEUE)))
                state |= M_ALLOW_REEDIT;
        if (cur_account)
                state |= M_HAVE_ACCOUNT;
@@ -1266,32 +1305,37 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/File/Close", M_UNLOCKED},
                {"/File/Exit" , M_UNLOCKED},
 
-               {"/Message/Get new mail"         , M_UNLOCKED},
-               {"/Message/Get from all accounts", M_UNLOCKED},
-               {"/Message/Reply"                , M_SINGLE_TARGET_EXIST},
-               {"/Message/Reply to sender"      , M_SINGLE_TARGET_EXIST},
-                {"/Message/Folllow-up and reply to", M_SINGLE_TARGET_EXIST},
-               {"/Message/Reply to all"         , M_SINGLE_TARGET_EXIST},
-               {"/Message/Forward"              , M_SINGLE_TARGET_EXIST},
-               {"/Message/Forward as attachment", M_SINGLE_TARGET_EXIST},
+               {"/View/Show all header"      , M_SINGLE_TARGET_EXIST},
+               {"/View/View 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/Compose new message"  , M_HAVE_ACCOUNT}, */
+               {"/Message/Reply"                , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Message/Reply to sender"      , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Message/Reply to all"         , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Message/Forward"              , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
+               {"/Message/Forward as attachment", M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Open in new window"   , M_SINGLE_TARGET_EXIST},
-               {"/Message/Show all header"      , M_SINGLE_TARGET_EXIST},
-               {"/Message/View source"          , M_SINGLE_TARGET_EXIST},
+               {"/Message/Re-edit", M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
                {"/Message/Move...", M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
                {"/Message/Copy...", M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
                {"/Message/Delete" , M_TARGET_EXIST|M_EXEC|M_UNLOCKED},
                {"/Message/Mark"   , M_TARGET_EXIST},
-               {"/Message/Re-edit", M_ALLOW_REEDIT},
+               {"/Message/Add sender to address book", M_SINGLE_TARGET_EXIST},
 
                {"/Summary/Delete duplicated messages", M_MSG_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Summary/Filter messages"    , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
-               {"/Summary/Execute"            , M_MSG_EXIST|M_UNLOCKED},
-               {"/Summary/Prev message"       , M_MSG_EXIST},
-               {"/Summary/Next message"       , M_MSG_EXIST},
-               {"/Summary/Prev marked message", M_MSG_EXIST},
-               {"/Summary/Next marked message", M_MSG_EXIST},
-               {"/Summary/Next unread message", M_MSG_EXIST},
-               {"/Summary/Sort"               , M_MSG_EXIST},
+               {"/Summary/Filter messages"           , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Summary/Execute"                   , M_MSG_EXIST|M_EXEC|M_UNLOCKED},
+               {"/Summary/Go to"                     , M_MSG_EXIST},
+               {"/Summary/Go to/Prev message"        , M_MSG_EXIST},
+               {"/Summary/Go to/Next message"        , M_MSG_EXIST},
+               {"/Summary/Go to/Next unread message" , M_MSG_EXIST},
+               {"/Summary/Go to/Prev marked message" , M_MSG_EXIST},
+               {"/Summary/Go to/Next marked message" , M_MSG_EXIST},
+               {"/Summary/Go to/Prev labeled message", M_MSG_EXIST},
+               {"/Summary/Go to/Next labeled message", M_MSG_EXIST},
+               {"/Summary/Sort"                      , M_MSG_EXIST},
 
                {"/Configuration", M_UNLOCKED},
 
@@ -2033,12 +2077,16 @@ static void ac_menu_popup_closed(GtkMenuShell *menu_shell, gpointer data)
        button = gtk_object_get_data(GTK_OBJECT(menu_shell), "menu_button");
        gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
        gtk_object_remove_data(GTK_OBJECT(mainwin->ac_menu), "menu_button");
+       manage_window_focus_in(mainwin->window, NULL, NULL);
 }
 
 static gint main_window_close_cb(GtkWidget *widget, GdkEventAny *event,
                                 gpointer data)
 {
-       app_exit_cb(data, 0, widget);
+       MainWindow *mainwin = (MainWindow *)data;
+
+       if (mainwin->lock_count == 0)
+               app_exit_cb(data, 0, widget);
 
        return TRUE;
 }
@@ -2252,7 +2300,7 @@ static void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        GList *list;
 
        if (procmsg_send_queue() < 0)
-               alertpanel_error(_("Sending queued message failed."));
+               alertpanel_error(_("Some errors occurred while sending queued messages."));
 
        statusbar_pop_all();
 
@@ -2442,6 +2490,18 @@ static void mark_as_read_cb(MainWindow *mainwin, guint action,
        summary_mark_as_read(mainwin->summaryview);
 }
 
+static void mark_all_read_cb(MainWindow *mainwin, guint action,
+                            GtkWidget *widget)
+{
+       summary_mark_all_read(mainwin->summaryview);
+}
+
+static void add_address_cb(MainWindow *mainwin, guint action,
+                          GtkWidget *widget)
+{
+       summary_add_address(mainwin->summaryview);
+}
+
 static void set_charset_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
@@ -2578,22 +2638,40 @@ static void next_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        summary_step(mainwin->summaryview, GTK_SCROLL_STEP_FORWARD);
 }
 
+static void prev_unread_cb(MainWindow *mainwin, guint action,
+                          GtkWidget *widget)
+{
+       summary_select_prev_unread(mainwin->summaryview);
+}
+
 static void next_unread_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
        summary_select_next_unread(mainwin->summaryview);
 }
 
+static void prev_marked_cb(MainWindow *mainwin, guint action,
+                          GtkWidget *widget)
+{
+       summary_select_prev_marked(mainwin->summaryview);
+}
+
 static void next_marked_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
        summary_select_next_marked(mainwin->summaryview);
 }
 
-static void prev_marked_cb(MainWindow *mainwin, guint action,
-                          GtkWidget *widget)
+static void prev_labeled_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget)
 {
-       summary_select_prev_marked(mainwin->summaryview);
+       summary_select_prev_labeled(mainwin->summaryview);
+}
+
+static void next_labeled_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget)
+{
+       summary_select_next_labeled(mainwin->summaryview);
 }
 
 static void goto_folder_cb(MainWindow *mainwin, guint action,