* sync with main changes of 2002-10-04

[claws.git] / src / mainwindow.c

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 6cb5961db153ae1adf8c5d3307b886f0d337f540..acdf385608f6ab0dbabf55b3be1247eb62fd2f62 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -588,7 +588,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {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/Set displayed _items..."),  NULL, set_display_item_cb, 0, NULL},
 
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Go to"),                   NULL, NULL, 0, "<Branch>"},
@@ -699,7 +699,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {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_("/_View/Show all _header"),         "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Show all _headers"),        "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
        {N_("/_View/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_View/_Update summary"),          "<control><alt>U", update_summary_cb,  0, NULL},
 
@@ -775,11 +775,11 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Configuration"),                 NULL, NULL, 0, "<Branch>"},
        {N_("/_Configuration/_Common preferences..."),
                                                NULL, prefs_common_open_cb, 0, NULL},
-       {N_("/_Configuration/C_ustom toolbar"),
+       {N_("/_Configuration/C_ustomize toolbar"),
                                                NULL, NULL, 0, "<Branch>"},
-       {N_("/_Configuration/C_ustom toolbar/_Main toolbar..."),
+       {N_("/_Configuration/C_ustomize toolbar/_Main toolbar..."),
                                                NULL, prefs_toolbar_cb, TOOLBAR_MAIN, NULL},
-       {N_("/_Configuration/C_ustom toolbar/_Compose toolbar..."),
+       {N_("/_Configuration/C_ustomize toolbar/_Compose toolbar..."),
                                                NULL, prefs_toolbar_cb, TOOLBAR_COMPOSE, NULL},
 #if 0
        {N_("/_Configuration/_Filter setting..."),
@@ -1558,11 +1558,11 @@ void main_window_add_mbox(MainWindow *mainwin)
        item->folder = folder;
        folder->node = g_node_new(item);
 
-       folder->create_folder(folder, item, "inbox");
-       folder->create_folder(folder, item, "outbox");
-       folder->create_folder(folder, item, "queue");
-       folder->create_folder(folder, item, "draft");
-       folder->create_folder(folder, item, "trash");
+       folder_create_folder(item, "inbox");
+       folder_create_folder(item, "outbox");
+       folder_create_folder(item, "queue");
+       folder_create_folder(item, "draft");
+       folder_create_folder(item, "trash");
 
        folderview_set(mainwin->folderview);
 }
@@ -1676,7 +1676,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/View/Go to/Prev labeled 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/Show all headers"          , M_SINGLE_TARGET_EXIST},
                {"/View/Message source"            , M_SINGLE_TARGET_EXIST},
 
                {"/Message/Get new mail"          , M_HAVE_ACCOUNT|M_UNLOCKED},
@@ -1773,7 +1773,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                menu_set_sensitive(ifactory, "/View/Sort/Descending", FALSE);
        }
 
-       SET_CHECK_MENU_ACTIVE("/View/Show all header",
+       SET_CHECK_MENU_ACTIVE("/View/Show all headers",
                              mainwin->messageview->textview->show_all_headers);
        SET_CHECK_MENU_ACTIVE("/View/Thread view", (state & M_THREADED) != 0);
 
@@ -2328,10 +2328,16 @@ static void toolbar_reply_cb(GtkWidget   *widget,
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       reply_cb(mainwin, 
-                prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE 
-                : COMPOSE_REPLY_WITHOUT_QUOTE,
-                NULL);
+       if (prefs_common.default_reply_list)
+               reply_cb(mainwin, 
+                        prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE 
+                        : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, 
+                        NULL);
+       else
+               reply_cb(mainwin, 
+                        prefs_common.reply_with_quote ? COMPOSE_REPLY_WITH_QUOTE 
+                        : COMPOSE_REPLY_WITHOUT_QUOTE,
+                        NULL);
 }
 
 static void toolbar_reply_to_all_cb(GtkWidget   *widget, 
@@ -3095,28 +3101,35 @@ void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 void compose_mail_cb(MainWindow *mainwin, guint action,
                            GtkWidget *widget)
 {
-       PrefsAccount * ac;
-       GList * list;
-       GList * cur;
+       PrefsAccount *ac = NULL;
+       FolderItem *item = mainwin->summaryview->folder_item;   
+        GList * list;
+        GList * cur;
 
-       if (mainwin->summaryview->folder_item) {
-               ac = mainwin->summaryview->folder_item->folder->account;
+       if (item) {
+               ac = account_find_from_item(item);
                if (ac && ac->protocol != A_NNTP) {
-                       compose_new_with_folderitem(ac, mainwin->summaryview->folder_item);
+                       compose_new_with_folderitem(ac, item);          /* CLAWS */
                        return;
                }
        }
 
-       if(cur_account && (cur_account->protocol != A_NNTP)) {
-               compose_new_with_folderitem(cur_account, mainwin->summaryview->folder_item);
+       /*
+        * CLAWS - use current account
+        */
+       if (cur_account && (cur_account->protocol != A_NNTP)) {
+               compose_new_with_folderitem(cur_account, item);
                return;
        }
 
+       /*
+        * CLAWS - just get the first one
+        */
        list = account_get_list();
-       for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
+       for (cur = list ; cur != NULL ; cur = g_list_next(cur)) {
                ac = (PrefsAccount *) cur->data;
                if (ac->protocol != A_NNTP) {
-                       compose_new_with_folderitem(ac, mainwin->summaryview->folder_item);
+                       compose_new_with_folderitem(ac, item);
                        return;
                }
        }
@@ -3557,6 +3570,14 @@ static void key_pressed (GtkWidget *widget, GdkEventKey *event,  gpointer data)
 
                app_exit_cb(mainwin, 0, NULL);
                return;
+       case GDK_space:
+               if (mainwin->folderview && mainwin->summaryview
+                   && !mainwin->summaryview->displayed) {
+                       summary_lock(mainwin->summaryview);
+                       folderview_select_next_unread(mainwin->folderview);
+                       summary_unlock(mainwin->summaryview);
+               }
+               break;
        default:
                break;
        }