Partial implementation of Leandro's cool button
[claws.git] / src / mainwindow.c
index 99d38c998cb46ce24bc98198443237589ec1d228..52989d89ce3682e36569a562f60dc0b61114c955 100644 (file)
@@ -57,6 +57,7 @@
 #include "export.h"
 #include "prefs_common.h"
 #include "prefs_filter.h"
+#include "prefs_filtering.h"
 #include "prefs_scoring.h"
 #include "prefs_account.h"
 #include "prefs_folder_item.h"
@@ -111,10 +112,20 @@ static void toolbar_send_cb               (GtkWidget      *widget,
 
 static void toolbar_compose_cb         (GtkWidget      *widget,
                                         gpointer        data);
+static void toolbar_popup_compose_type_cb(GtkWidget    *widget,
+                                        gpointer        data);
+static void toolbar_popup_compose_type_set(GtkWidget   *widget,
+                                        gpointer        data);
+static void toolbar_compose_news_cb            (GtkWidget      *widget,
+                                        gpointer        data);
+static void toolbar_compose_mail_cb            (GtkWidget      *widget,
+                                        gpointer        data);
 static void toolbar_reply_cb           (GtkWidget      *widget,
                                         gpointer        data);
 static void toolbar_reply_to_all_cb    (GtkWidget      *widget,
                                         gpointer        data);
+static void toolbar_reply_to_sender_cb (GtkWidget      *widget,
+                                        gpointer        data);
 static void toolbar_forward_cb         (GtkWidget      *widget,
                                         gpointer        data);
 
@@ -145,6 +156,9 @@ static gint main_window_close_cb (GtkWidget *widget,
 static void add_mailbox_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
+static void add_mbox_cb         (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void update_folderview_cb (MainWindow   *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -189,9 +203,7 @@ static void toggle_toolbar_cb        (MainWindow    *mainwin,
 static void toggle_statusbar_cb         (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-static void separate_widget_cb  (MainWindow    *mainwin,
-                                 guint          action,
-                                 GtkWidget     *widget);
+static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action);
 
 static void addressbook_open_cb        (MainWindow     *mainwin,
                                 guint           action,
@@ -214,6 +226,10 @@ static void send_queue_cb          (MainWindow     *mainwin,
 static void compose_cb                 (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
+static void compose_mail_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget);
+static void compose_news_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget);
 static void reply_cb                   (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -343,11 +359,17 @@ static void manual_open_cb         (MainWindow    *mainwin,
 static void scan_tree_func      (Folder        *folder,
                                  FolderItem    *item,
                                  gpointer       data);
+                                 
+static void activate_compose_button (MainWindow *mainwin,
+                               ComposeButtonType type);
+
+#define  SEPARATE_ACTION  667
 
 static GtkItemFactoryEntry mainwin_entries[] =
 {
        {N_("/_File"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_File/_Add mailbox..."),          NULL, add_mailbox_cb, 0, NULL},
+       {N_("/_File/_Add mbox mailbox..."),     NULL, add_mbox_cb, 0, NULL},
        {N_("/_File/_Update folder tree"),      NULL, update_folderview_cb, 0, NULL},
        {N_("/_File/_Folder"),                  NULL, NULL, 0, "<Branch>"},
        {N_("/_File/_Folder/Create _new folder..."),
@@ -377,11 +399,11 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {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/_Non-display"),    NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/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/Separate f_older tree"),    NULL, separate_widget_cb, SEPARATE_FOLDER, "<ToggleItem>"},
-       {N_("/_View/Separate m_essage view"),   NULL, separate_widget_cb, SEPARATE_MESSAGE, "<ToggleItem>"},
+       {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/_Code set"),                NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Code set/_Auto detect"),
@@ -458,18 +480,21 @@ static GtkItemFactoryEntry mainwin_entries[] =
 #undef CODESET_ACTION
 
        {N_("/_Message"),                       NULL, NULL, 0, "<Branch>"},
-       {N_("/_Message/Rece_ive new mail"),     "<alt>I",       inc_mail_cb, 0, NULL},
-       {N_("/_Message/Receive from _all accounts"),
+       {N_("/_Message/Get new ma_il"),         "<alt>I",       inc_mail_cb, 0, NULL},
+       {N_("/_Message/Get from _all accounts"),
                                                "<shift><alt>I", inc_all_account_mail_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Send queued messa_ges"),
                                                NULL, send_queue_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Message/Compose _new message"),  "<alt>N",       compose_cb, 0, NULL},
+       {N_("/_Message/Compose a_n email message"),     "<alt>N", compose_mail_cb, 0, NULL},
+       {N_("/_Message/Compose a news message"),        NULL,   compose_news_cb, 0, NULL},
        {N_("/_Message/_Reply"),                "<alt>R",       reply_cb, COMPOSE_REPLY, NULL},
+       {N_("/_Message/Repl_y to sender"),      "<control><alt>R", reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+       {N_("/_Message/Follow-up and reply to"), NULL, reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
        {N_("/_Message/Reply to a_ll"),         "<shift><alt>R", reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
-       {N_("/_Message/_Forward"),              "<control>F",   reply_cb, COMPOSE_FORWARD, NULL},
-       {N_("/_Message/Forward as an a_ttachment"),
+       {N_("/_Message/_Forward"),              "<control>F", reply_cb, COMPOSE_FORWARD, NULL},
+       {N_("/_Message/Forward as a_ttachment"),
                                                "<shift><control>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/M_ove..."),              "<alt>O", move_to_cb, 0, NULL},
@@ -480,13 +505,13 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Message/_Mark/_Unmark"),         NULL, 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 it as _being read"),
+       {N_("/_Message/_Mark/Mark as rea_d"),
                                                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_("/_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"),
@@ -682,6 +707,10 @@ MainWindow *main_window_create(SeparateType type)
        folderview->color_normal.red = folderview->color_normal.green =
                folderview->color_normal.blue = 0;
 
+       summaryview->color_important.red = 0;
+       summaryview->color_marked.green = 0;
+       summaryview->color_important.blue = (guint16)65535;
+
        color[0] = summaryview->color_marked;
        color[1] = summaryview->color_dim;
        color[2] = summaryview->color_normal;
@@ -708,7 +737,7 @@ MainWindow *main_window_create(SeparateType type)
        switch (prefs_common.toolbar_style) {
        case TOOLBAR_NONE:
                menuitem = gtk_item_factory_get_item
-                       (ifactory, "/View/Toolbar/Non-display");
+                       (ifactory, "/View/Toolbar/None");
                break;
        case TOOLBAR_ICON:
                menuitem = gtk_item_factory_get_item
@@ -729,10 +758,30 @@ MainWindow *main_window_create(SeparateType type)
        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
                                       prefs_common.show_statusbar);
 
+       /* set the check of the SEPARATE_xxx menu items. we also need the main window
+        * as a property and pass the action type to the callback */
+       menuitem = gtk_item_factory_get_widget_by_action(ifactory, SEPARATE_ACTION + SEPARATE_FOLDER);
+       g_assert(menuitem);
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), type & SEPARATE_FOLDER);
+       gtk_object_set_data(GTK_OBJECT(menuitem), "mainwindow", mainwin);
+       gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(separate_widget_cb), 
+                                          GUINT_TO_POINTER(SEPARATE_FOLDER));
+
+       menuitem = gtk_item_factory_get_widget_by_action(ifactory, SEPARATE_ACTION + SEPARATE_MESSAGE);
+       g_assert(menuitem);
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), type & SEPARATE_MESSAGE);
+       gtk_object_set_data(GTK_OBJECT(menuitem), "mainwindow", mainwin);
+       gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(separate_widget_cb), 
+                                          GUINT_TO_POINTER(SEPARATE_MESSAGE));
+
+       /*
        menu_set_sensitive(ifactory, "/Summary/Thread view",
                           prefs_common.enable_thread ? FALSE : TRUE);
        menu_set_sensitive(ifactory, "/Summary/Unthread view",
                           prefs_common.enable_thread ? TRUE : FALSE);
+       */
+       main_window_set_thread_option(mainwin);
+
        menu_set_sensitive(ifactory, "/Help/Manual/English", FALSE);
 
        /* set account selection menu */
@@ -757,6 +806,17 @@ MainWindow *main_window_create(SeparateType type)
        header_window_init(mainwin->headerwin);
        log_window_init(mainwin->logwin);
 
+       {
+               GtkStyle *newstyle;
+
+               gtk_widget_ensure_style(folderview->ctree);
+               newstyle = gtk_widget_get_style(folderview->ctree);
+               newstyle = gtk_style_copy(newstyle);
+               gtk_widget_set_style(summaryview->ctree, newstyle);
+               gtk_widget_ensure_style(summaryview->ctree);
+               gtk_widget_realize(summaryview->ctree);
+       }
+
        mainwin->cursor_count = 0;
 
        if (!watch_cursor)
@@ -804,6 +864,7 @@ void main_window_reflect_prefs_all(void)
                        gtk_widget_set_sensitive(mainwin->get_btn,    FALSE);
                        gtk_widget_set_sensitive(mainwin->getall_btn, FALSE);
                }
+
                if (prefs_common.immediate_exec)
                        gtk_widget_hide(mainwin->exec_btn);
                else
@@ -1006,10 +1067,12 @@ void main_window_add_mailbox(MainWindow *mainwin)
                g_free(path);
                return;
        }
+
        if (!strcmp(path, "Mail"))
                folder = folder_new(F_MH, _("Mailbox"), path);
        else
                folder = folder_new(F_MH, g_basename(path), path);
+
        g_free(path);
 
        if (folder->create_tree(folder) < 0) {
@@ -1027,13 +1090,62 @@ void main_window_add_mailbox(MainWindow *mainwin)
        folderview_set(mainwin->folderview);
 }
 
+void main_window_add_mbox(MainWindow *mainwin)
+{
+       gchar *path;
+       Folder *folder;
+       FolderItem * item;
+
+       path = input_dialog(_("Add mbox mailbox"),
+                           _("Input the location of mailbox."),
+                           "mail");
+
+       if (!path) return;
+
+       if (folder_find_from_path(path)) {
+               alertpanel_error(_("The mailbox `%s' already exists."), path);
+               g_free(path);
+               return;
+       }
+
+       /*
+       if (!strcmp(path, "Mail"))
+               folder = folder_new(F_MBOX, _("Mailbox"), path);
+               else
+       */
+
+       folder = folder_new(F_MBOX, g_basename(path), path);
+       g_free(path);
+
+       if (folder->create_tree(folder) < 0) {
+               alertpanel_error(_("Creation of the mailbox failed."));
+               folder_destroy(folder);
+               return;
+       }
+
+       folder_add(folder);
+
+       item = folder_item_new(folder->name, NULL);
+       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");
+
+       folderview_set(mainwin->folderview);
+}
+
 void main_window_set_toolbar_sensitive(MainWindow *mainwin, gboolean sensitive)
 {
-       gtk_widget_set_sensitive(mainwin->reply_btn,    sensitive);
-       gtk_widget_set_sensitive(mainwin->replyall_btn, sensitive);
-       gtk_widget_set_sensitive(mainwin->fwd_btn,      sensitive);
-       gtk_widget_set_sensitive(mainwin->exec_btn,     sensitive);
-       gtk_widget_set_sensitive(mainwin->next_btn,     sensitive);
+       gtk_widget_set_sensitive(mainwin->reply_btn,       sensitive);
+       gtk_widget_set_sensitive(mainwin->replyall_btn,    sensitive);
+       gtk_widget_set_sensitive(mainwin->replysender_btn, sensitive);
+       gtk_widget_set_sensitive(mainwin->fwd_btn,         sensitive);
+       gtk_widget_set_sensitive(mainwin->exec_btn,        sensitive);
+       gtk_widget_set_sensitive(mainwin->next_btn,        sensitive);
 
        if (!mainwin->summaryview->folder_item ||
            mainwin->summaryview->folder_item->folder->type == F_NEWS)
@@ -1062,16 +1174,17 @@ void main_window_set_menu_sensitive(MainWindow *mainwin, gint selection)
 
        menu_set_sensitive(ifactory, "/File/Save as...", sens);
        menu_set_sensitive(ifactory, "/Message/Reply", sens);
+       menu_set_sensitive(ifactory, "/Message/Reply to sender", sens);
        menu_set_sensitive(ifactory, "/Message/Reply to all", sens);
        menu_set_sensitive(ifactory, "/Message/Forward", sens);
-       menu_set_sensitive(ifactory, "/Message/Forward as an attachment", sens);
+       menu_set_sensitive(ifactory, "/Message/Forward as attachment", sens);
        menu_set_sensitive(ifactory, "/Message/Open in new window", sens);
        menu_set_sensitive(ifactory, "/Message/Show all header", sens);
        menu_set_sensitive(ifactory, "/Message/View source", sens);
        if (sens && (!mainwin->summaryview->folder_item ||
                     mainwin->summaryview->folder_item->stype != F_DRAFT))
                sens = FALSE;
-       menu_set_sensitive(ifactory, "/Message/Reedit", sens);
+       menu_set_sensitive(ifactory, "/Message/Re-edit", sens);
 
        if (selection == SUMMARY_SELECTED_SINGLE ||
            selection == SUMMARY_SELECTED_MULTIPLE)
@@ -1097,6 +1210,13 @@ void main_window_set_menu_sensitive(MainWindow *mainwin, gint selection)
        menu_set_sensitive(ifactory, "/Summary/Next message", sens);
        menu_set_sensitive(ifactory, "/Summary/Next unread message", sens);
        menu_set_sensitive(ifactory, "/Summary/Sort", sens);
+
+       if (mainwin->summaryview->folder_item &&
+           mainwin->summaryview->folder_item->folder->account)
+               sens = mainwin->summaryview->folder_item->folder->account->protocol == A_NNTP;
+       else
+               sens = FALSE;
+       menu_set_sensitive(ifactory, "/Message/Follow-up and reply to", sens);
 }
 
 void main_window_popup(MainWindow *mainwin)
@@ -1311,8 +1431,10 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
 #include "pixmaps/stock_mail_receive.xpm"
 #include "pixmaps/stock_mail_receive_all.xpm"
 #include "pixmaps/stock_mail_compose.xpm"
+#include "pixmaps/stock_news_compose.xpm"
 #include "pixmaps/stock_mail_reply.xpm"
 #include "pixmaps/stock_mail_reply_to_all.xpm"
+#include "pixmaps/stock_mail_reply_to_author.xpm"
 #include "pixmaps/stock_mail_forward.xpm"
 #include "pixmaps/stock_mail_send.xpm"
 #include "pixmaps/stock_preferences.xpm"
@@ -1338,9 +1460,11 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        GtkWidget *icon_wid;
        GtkWidget *get_btn;
        GtkWidget *getall_btn;
-       GtkWidget *compose_btn;
+       GtkWidget *compose_mail_btn;
+       GtkWidget *compose_news_btn;
        GtkWidget *reply_btn;
        GtkWidget *replyall_btn;
+       GtkWidget *replysender_btn;
        GtkWidget *fwd_btn;
        GtkWidget *send_btn;
        /*
@@ -1351,6 +1475,11 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        GtkWidget *delete_btn;
        GtkWidget *exec_btn;
 
+       GtkWidget *compose_type_btn;
+       GtkWidget *compose_type_arrow;
+       GtkWidget *compose_box;
+       GtkWidget *compose_label;
+
        toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
                                  GTK_TOOLBAR_BOTH);
        gtk_container_add(GTK_CONTAINER(container), toolbar);
@@ -1362,13 +1491,13 @@ static void main_window_toolbar_create(MainWindow *mainwin,
        CREATE_TOOLBAR_ICON(stock_mail_receive_xpm);
        get_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                          _("Get"),
-                                         _("Incorporate new mail"),
+                                         _("Get new mail from current account"),
                                          "Get",
                                          icon_wid, toolbar_inc_cb, mainwin);
        CREATE_TOOLBAR_ICON(stock_mail_receive_all_xpm);
        getall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                             _("Get all"),
-                                            _("Incorporate new mail of all accounts"),
+                                            _("Get new mail from all accounts"),
                                             "Get all",
                                             icon_wid,
                                             toolbar_inc_all_cb,
@@ -1385,16 +1514,77 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                           toolbar_send_cb,
                                           mainwin);
 
-       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
+       /* insert compose mail button widget */                                    
+
+       compose_mail_btn = gtk_button_new();
+       gtk_widget_show(compose_mail_btn);
 
+       compose_box = gtk_vbox_new(0, 0);
+       gtk_widget_show(compose_box);
+       
+       gtk_container_add(GTK_CONTAINER(compose_mail_btn), compose_box);
        CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
-       compose_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                             _("Compose"),
-                                             _("Compose new message"),
+       gtk_box_pack_start(GTK_BOX(compose_box), icon_wid, FALSE, FALSE, 0);
+
+       compose_label = gtk_label_new(_("Compose email"));
+       gtk_widget_show(compose_label);
+       gtk_box_pack_start(GTK_BOX(compose_box), compose_label, FALSE, FALSE, 0);
+       
+       GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(compose_mail_btn), GTK_CAN_FOCUS);
+       gtk_button_set_relief(GTK_BUTTON(compose_mail_btn), GTK_RELIEF_NONE);
+       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), compose_mail_btn,
+               NULL, NULL);
+
+       /* insert compose news button widget */
+
+       compose_news_btn = gtk_button_new();
+       gtk_widget_show(compose_news_btn);
+
+       compose_box = gtk_vbox_new(0, 0);
+       gtk_widget_show(compose_box);
+       
+       gtk_container_add(GTK_CONTAINER(compose_news_btn), compose_box);
+       CREATE_TOOLBAR_ICON(stock_news_compose_xpm);
+       gtk_box_pack_start(GTK_BOX(compose_box), icon_wid, FALSE, FALSE, 0);
+
+       compose_label = gtk_label_new(_("Compose news"));
+       gtk_widget_show(compose_label);
+       gtk_box_pack_start(GTK_BOX(compose_box), compose_label, FALSE, FALSE, 0);
+       
+       GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(compose_news_btn), GTK_CAN_FOCUS);
+       gtk_button_set_relief(GTK_BUTTON(compose_news_btn), GTK_RELIEF_NONE);
+       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), compose_news_btn,
+               NULL, NULL);
+
+       /* insert compose button type widget */
+       
+       compose_type_btn = gtk_button_new();
+       gtk_widget_show(compose_type_btn);
+       
+       compose_type_arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+       gtk_widget_show(compose_type_arrow);
+       
+       gtk_container_add(GTK_CONTAINER(compose_type_btn), compose_type_arrow);
+
+       GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(compose_type_btn), GTK_CAN_FOCUS);
+       gtk_button_set_relief(GTK_BUTTON(compose_type_btn), GTK_RELIEF_NONE);
+
+       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar), compose_type_btn,
+               NULL, NULL);
+
+#if 0
+       CREATE_TOOLBAR_ICON(stock_news_compose_xpm);
+       compose_news_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+                                             _("Compose news"),
+                                             _("Compose a news message"),
                                              "New",
                                              icon_wid,
-                                             toolbar_compose_cb,
+                                             toolbar_compose_news_cb,
                                              mainwin);
+#endif                                           
+
+       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
+       
        CREATE_TOOLBAR_ICON(stock_mail_reply_xpm);
        reply_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                            _("Reply"),
@@ -1405,12 +1595,20 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                            mainwin);
        CREATE_TOOLBAR_ICON(stock_mail_reply_to_all_xpm);
        replyall_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                              _("Reply all"),
+                                              _("All"),
                                               _("Reply to all"),
                                               "Reply to all",
                                               icon_wid,
                                               toolbar_reply_to_all_cb,
                                               mainwin);
+       CREATE_TOOLBAR_ICON(stock_mail_reply_to_author_xpm);
+       replysender_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
+                                                 _("Sender"),
+                                                 _("Reply to sender"),
+                                                 "Reply to sender",
+                                                 icon_wid,
+                                                 toolbar_reply_to_sender_cb,
+                                                 mainwin);
        CREATE_TOOLBAR_ICON(stock_mail_forward_xpm);
        fwd_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                          _("Forward"),
@@ -1440,8 +1638,6 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                                           toolbar_exec_cb,
                                           mainwin);
 
-       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-
        CREATE_TOOLBAR_ICON(stock_down_arrow_xpm);
        next_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                           _("Next"),
@@ -1475,27 +1671,79 @@ static void main_window_toolbar_create(MainWindow *mainwin,
                           mainwin);
        */
 
-       mainwin->toolbar      = toolbar;
-       mainwin->get_btn      = get_btn;
-       mainwin->getall_btn   = getall_btn;
-       mainwin->compose_btn  = compose_btn;
-       mainwin->reply_btn    = reply_btn;
-       mainwin->replyall_btn = replyall_btn;
-       mainwin->fwd_btn      = fwd_btn;
-       mainwin->send_btn     = send_btn;
+       gtk_signal_connect(GTK_OBJECT(compose_type_btn), "clicked",
+               GTK_SIGNAL_FUNC(toolbar_popup_compose_type_cb),
+               mainwin);
+
+       gtk_signal_connect(GTK_OBJECT(compose_mail_btn), "clicked",
+               GTK_SIGNAL_FUNC(toolbar_compose_cb),
+               mainwin);
+       
+       mainwin->toolbar         = toolbar;
+       mainwin->get_btn         = get_btn;
+       mainwin->getall_btn      = getall_btn;
+       mainwin->compose_mail_btn = compose_mail_btn;
+       mainwin->compose_news_btn = compose_news_btn;
+       mainwin->reply_btn       = reply_btn;
+       mainwin->replyall_btn    = replyall_btn;
+       mainwin->replysender_btn = replysender_btn;
+       mainwin->fwd_btn         = fwd_btn;
+       mainwin->send_btn        = send_btn;
        /*
-       mainwin->prefs_btn    = prefs_btn;
-       mainwin->account_btn  = account_btn;
+       mainwin->prefs_btn       = prefs_btn;
+       mainwin->account_btn     = account_btn;
        */
-       mainwin->next_btn     = next_btn;
-       mainwin->delete_btn   = delete_btn;
-       mainwin->exec_btn     = exec_btn;
+       mainwin->next_btn        = next_btn;
+       mainwin->delete_btn      = delete_btn;
+       mainwin->exec_btn        = exec_btn;
 
        gtk_widget_show_all(toolbar);
+
+       activate_compose_button(mainwin, COMPOSEBUTTON_MAIL);
 }
 
 /* callback functions */
 
+static void toolbar_popup_compose_type_cb      (GtkWidget      *widget,
+                                gpointer data)
+{
+       MainWindow *mainwindow = (MainWindow *) data;
+       GtkWidget *compose_menu, *compose_item;
+
+       g_return_if_fail(mainwindow != NULL);
+       
+       compose_menu = gtk_menu_new();
+       
+       compose_item = gtk_menu_item_new_with_label(_("E-Mail message"));
+       gtk_widget_show(compose_item);
+       gtk_menu_append(GTK_MENU(compose_menu), compose_item);
+       gtk_signal_connect(GTK_OBJECT(compose_item), "activate",
+               GTK_SIGNAL_FUNC(toolbar_popup_compose_type_set),
+               mainwindow);
+       gtk_object_set_data(GTK_OBJECT(compose_item), "entry", GINT_TO_POINTER(COMPOSEBUTTON_MAIL));            
+       
+       compose_item = gtk_menu_item_new_with_label(_("News article"));
+       gtk_widget_show(compose_item);
+       gtk_menu_append(GTK_MENU(compose_menu), compose_item);
+       gtk_signal_connect(GTK_OBJECT(compose_item), "activate",
+               GTK_SIGNAL_FUNC(toolbar_popup_compose_type_set),
+               mainwindow);
+       gtk_object_set_data(GTK_OBJECT(compose_item), "entry", GINT_TO_POINTER(COMPOSEBUTTON_NEWS));            
+               
+       gtk_menu_popup(GTK_MENU(compose_menu), NULL, NULL, NULL,
+               NULL, 1, 0);
+}
+
+static void toolbar_popup_compose_type_set(GtkWidget *widget, gpointer data)
+{
+       ComposeButtonType compose_type = GPOINTER_TO_INT( gtk_object_get_data(GTK_OBJECT(widget), "entry") );
+       MainWindow *mainwindow = (MainWindow *) data;
+
+       mainwindow->compose_btn_type = compose_type;
+
+       activate_compose_button(mainwindow, mainwindow->compose_btn_type);
+}      
+
 static void toolbar_inc_cb     (GtkWidget      *widget,
                                 gpointer        data)
 {
@@ -1525,7 +1773,26 @@ static void toolbar_compose_cb   (GtkWidget      *widget,
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       compose_cb(mainwin, 0, NULL);
+       if (mainwin->compose_btn_type == COMPOSEBUTTON_MAIL)
+               compose_cb(mainwin, 0, NULL);
+       else
+               compose_news_cb(mainwin, 0, NULL);
+}
+
+static void toolbar_compose_news_cb    (GtkWidget      *widget,
+                                gpointer        data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       compose_news_cb(mainwin, 0, NULL);
+}
+
+static void toolbar_compose_mail_cb    (GtkWidget      *widget,
+                                gpointer        data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       compose_mail_cb(mainwin, 0, NULL);
 }
 
 static void toolbar_reply_cb   (GtkWidget      *widget,
@@ -1544,12 +1811,23 @@ static void toolbar_reply_to_all_cb     (GtkWidget      *widget,
        reply_cb(mainwin, COMPOSE_REPLY_TO_ALL, NULL);
 }
 
+static void toolbar_reply_to_sender_cb (GtkWidget      *widget,
+                                        gpointer        data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       reply_cb(mainwin, COMPOSE_REPLY_TO_SENDER, NULL);
+}
+
 static void toolbar_forward_cb (GtkWidget      *widget,
                                 gpointer        data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 
-       reply_cb(mainwin, COMPOSE_FORWARD, NULL);
+       if (prefs_common.forward_as_attachment)
+               reply_cb(mainwin, COMPOSE_FORWARD_AS_ATTACH, NULL);
+       else
+               reply_cb(mainwin, COMPOSE_FORWARD, NULL);
 }
 
 static void toolbar_delete_cb  (GtkWidget      *widget,
@@ -1628,6 +1906,12 @@ static void add_mailbox_cb(MainWindow *mainwin, guint action,
        main_window_add_mailbox(mainwin);
 }
 
+static void add_mbox_cb(MainWindow *mainwin, guint action,
+                       GtkWidget *widget)
+{
+       main_window_add_mbox(mainwin);
+}
+
 static void update_folderview_cb(MainWindow *mainwin, guint action,
                                 GtkWidget *widget)
 {
@@ -1778,11 +2062,14 @@ static void toggle_statusbar_cb(MainWindow *mainwin, guint action,
        }
 }
 
-static void separate_widget_cb(MainWindow *mainwin, guint action,
-                              GtkWidget *widget)
+static void separate_widget_cb(GtkCheckMenuItem *checkitem, guint action)
 {
+       MainWindow *mainwin;
        SeparateType type;
 
+       mainwin = (MainWindow *) gtk_object_get_data(GTK_OBJECT(checkitem), "mainwindow");
+       g_return_if_fail(mainwin != NULL);
+
        type = mainwin->type ^ action;
        main_window_separation_change(mainwin, type);
 
@@ -1835,12 +2122,68 @@ static void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 
 static void compose_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
-       if (mainwin->summaryview->folder_item)
-               compose_new(mainwin->summaryview->folder_item->folder->account);
+       if (mainwin->summaryview->folder_item) {
+               if (mainwin->summaryview->folder_item->folder->account != NULL
+                   && mainwin->summaryview->folder_item->folder->account->protocol == A_NNTP)
+                       compose_new_with_recipient(mainwin->summaryview->folder_item->folder->account, mainwin->summaryview->folder_item->path);
+               else
+                       compose_new(mainwin->summaryview->folder_item->folder->account);
+       }
        else
                compose_new(NULL);
 }
 
+static void compose_mail_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget)
+{
+       PrefsAccount * ac;
+       GList * list;
+       GList * cur;
+
+       if (mainwin->summaryview->folder_item) {
+               ac = mainwin->summaryview->folder_item->folder->account;
+               if (ac && ac->protocol != A_NNTP) {
+                       compose_new(ac);
+                       return;
+               }
+       }
+
+       list = account_get_list();
+       for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
+               ac = (PrefsAccount *) cur->data;
+               if (ac->protocol != A_NNTP) {
+                       compose_new(ac);
+                       return;
+               }
+       }
+}
+
+static void compose_news_cb(MainWindow *mainwin, guint action,
+                           GtkWidget *widget)
+{
+       PrefsAccount * ac = NULL;
+       GList * list;
+       GList * cur;
+
+       if (mainwin->summaryview->folder_item) {
+               ac = mainwin->summaryview->folder_item->folder->account;
+               if (ac && ac->protocol == A_NNTP) {
+                       compose_new_with_recipient
+                               (ac, mainwin->summaryview->folder_item->path);
+                       return;
+               }
+       }
+
+       list = account_get_list();
+       for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
+               ac = (PrefsAccount *) cur->data;
+               if (ac->protocol == A_NNTP) {
+                       compose_new(ac);
+                       return;
+               }
+       }
+}
+
 static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        MsgInfo *msginfo;
@@ -1853,10 +2196,21 @@ static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 
        switch (action) {
        case COMPOSE_REPLY:
-               compose_reply(msginfo, prefs_common.reply_with_quote, FALSE);
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             FALSE, FALSE);
+               break;
+       case COMPOSE_REPLY_TO_SENDER:
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             FALSE, TRUE);
+               break;
+       case COMPOSE_FOLLOWUP_AND_REPLY_TO:
+               compose_followup_and_reply_to(msginfo,
+                                             prefs_common.reply_with_quote,
+                                             FALSE, TRUE);
                break;
        case COMPOSE_REPLY_TO_ALL:
-               compose_reply(msginfo, prefs_common.reply_with_quote, TRUE);
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             TRUE, FALSE);
                break;
        case COMPOSE_FORWARD:
                compose_forward(NULL, msginfo, FALSE);
@@ -1865,7 +2219,7 @@ static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
                compose_forward(NULL, msginfo, TRUE);
                break;
        default:
-               compose_reply(msginfo, prefs_common.reply_with_quote, FALSE);
+               g_warning("reply_cb(): invalid action type: %d\n", action);
        }
 
        summary_set_marks_selected(mainwin->summaryview);
@@ -1941,27 +2295,40 @@ static void set_charset_cb(MainWindow *mainwin, guint action,
 void main_window_set_thread_option(MainWindow *mainwin)
 {
        GtkItemFactory *ifactory;
+       gboolean no_item = FALSE;
 
        ifactory = gtk_item_factory_from_widget(mainwin->menubar);
 
-       if (mainwin->summaryview->folder_item->prefs->enable_thread) {
+       if (mainwin->summaryview == NULL)
+               no_item = TRUE;
+       else if (mainwin->summaryview->folder_item == NULL)
+               no_item = TRUE;
+
+       if (no_item) {
                menu_set_sensitive(ifactory, "/Summary/Thread view",   FALSE);
-               menu_set_sensitive(ifactory, "/Summary/Unthread view", TRUE);
-               summary_thread_build(mainwin->summaryview);
+               menu_set_sensitive(ifactory, "/Summary/Unthread view", FALSE);
        }
        else {
-               menu_set_sensitive(ifactory, "/Summary/Thread view",   TRUE);
-               menu_set_sensitive(ifactory, "/Summary/Unthread view", FALSE);
-               summary_unthread(mainwin->summaryview);
+               if (mainwin->summaryview->folder_item->prefs->enable_thread) {
+                       menu_set_sensitive(ifactory,
+                                          "/Summary/Thread view",   FALSE);
+                       menu_set_sensitive(ifactory,
+                                          "/Summary/Unthread view", TRUE);
+                       summary_thread_build(mainwin->summaryview);
+               }
+               else {
+                       menu_set_sensitive(ifactory,
+                                          "/Summary/Thread view",   TRUE);
+                       menu_set_sensitive(ifactory,
+                                          "/Summary/Unthread view", FALSE);
+                       summary_unthread(mainwin->summaryview);
+               }
+               prefs_folder_item_save_config(mainwin->summaryview->folder_item);
        }
-       prefs_folder_item_save_config(mainwin->summaryview->folder_item);
 }
 
 static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
-       /*
-       ifactory = gtk_item_factory_from_widget(widget);
-       */
        mainwin->summaryview->folder_item->prefs->enable_thread =
                !mainwin->summaryview->folder_item->prefs->enable_thread;
        main_window_set_thread_option(mainwin);
@@ -2067,7 +2434,7 @@ static void goto_folder_cb(MainWindow *mainwin, guint action,
 {
        FolderItem *to_folder;
 
-       to_folder = foldersel_folder_sel(NULL);
+       to_folder = foldersel_folder_sel(NULL, NULL);
 
        if (to_folder)
                folderview_select(mainwin->folderview, to_folder);
@@ -2102,7 +2469,7 @@ static void prefs_filter_open_cb(MainWindow *mainwin, guint action,
 static void prefs_scoring_open_cb(MainWindow *mainwin, guint action,
                                  GtkWidget *widget)
 {
-       prefs_scoring_open();
+       prefs_scoring_open(NULL);
 }
 
 static void prefs_filtering_open_cb(MainWindow *mainwin, guint action,
@@ -2165,3 +2532,14 @@ static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
        STATUSBAR_POP(mainwin);
        g_free(str);
 }
+
+static void activate_compose_button (MainWindow *mainwin,
+                               ComposeButtonType type)
+{
+       gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? mainwin->compose_mail_btn 
+               : mainwin->compose_news_btn);
+       gtk_widget_show(type == COMPOSEBUTTON_NEWS ? mainwin->compose_news_btn
+               : mainwin->compose_mail_btn);
+       mainwin->compose_btn_type = type;               
+}
+