Add "reply to ml" to the toolbar

diff --git a/ChangeLog.claws b/ChangeLog.claws
index b80a704fb9474e8ca3f6e87879673df0c747b188..7ebe4dcd14b4fa477aa706bde26efc9e95809488 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-09-26 [colin]     0.8.3claws27
+
+       * src/toolbar.[ch]
+         src/mainwindow.[ch]
+               Add "Reply to Mailing-list" to the toolbar
+
 2002-09-26 [christoph] 0.8.3claws26
 
        * src/summaryview.c

diff --git a/configure.in b/configure.in
index 9a68d6612e36956497b0259b4c2a2a557d381c85..8f93857720cd10ddd255262a45fc3d0125924ff8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ MINOR_VERSION=8
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws26
+EXTRA_VERSION=claws27
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 6c9ff3799be80f5efad76eb3c0fb1006dcd18803..57b3dd1f3072be2701a416821c4f1454664c5619 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -238,6 +238,9 @@ static void toolbar_reply_cb                (GtkWidget      *widget,
 static void toolbar_reply_to_all_cb    (GtkWidget      *widget,
                                         gpointer        data);
 
+static void toolbar_reply_to_list_cb   (GtkWidget      *widget,
+                                        gpointer        data);
+
 static void toolbar_reply_to_sender_cb (GtkWidget      *widget,
                                         gpointer        data);
 
@@ -268,6 +271,14 @@ static void toolbar_reply_to_all_popup_closed_cb
                                        (GtkMenuShell   *menu_shell,
                                         gpointer        data);
 
+static void toolbar_reply_to_list_popup_cb       (GtkWidget    *widget,
+                                               GdkEventButton  *event,
+                                               gpointer         data);
+
+static void toolbar_reply_to_list_popup_closed_cb
+                                       (GtkMenuShell   *menu_shell,
+                                        gpointer        data);
+
 static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget,
                                         GdkEventButton *event,
                                         gpointer        data);
@@ -822,6 +833,11 @@ static GtkItemFactoryEntry replyall_popup_entries[] =
        {N_("/Reply to all with _quote"), "<shift>A", reply_cb, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL},
        {N_("/_Reply to all without quote"), "a", reply_cb, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL}
 };
+static GtkItemFactoryEntry replylist_popup_entries[] =
+{
+       {N_("/Reply to list with _quote"), "<shift>A", reply_cb, COMPOSE_REPLY_TO_LIST_WITH_QUOTE, NULL},
+       {N_("/_Reply to list without quote"), "a", reply_cb, COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, NULL}
+};
 static GtkItemFactoryEntry replysender_popup_entries[] =
 {
        {N_("/Reply to sender with _quote"), NULL, reply_cb, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE, NULL},
@@ -2316,6 +2332,16 @@ static void toolbar_reply_to_all_cb(GtkWidget   *widget,
                 NULL);
 }
 
+static void toolbar_reply_to_list_cb(GtkWidget   *widget, 
+                                   gpointer     data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       reply_cb(mainwin, 
+                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_LIST_WITH_QUOTE 
+                : COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, 
+                NULL);
+}
 
 static void toolbar_reply_to_sender_cb(GtkWidget   *widget, 
                                       gpointer     data)
@@ -2410,6 +2436,28 @@ static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell *menu_shell, gpoin
        manage_window_focus_in(mainwin->window, NULL, NULL);
 }
 
+static void toolbar_reply_to_list_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
+{
+       MainWindow *mainwindow = (MainWindow *) data;
+       
+       if (!event) return;
+
+       if (event->button == 3) {
+               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
+               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->replylist_popup), NULL, NULL,
+                      menu_button_position, widget,
+                      event->button, event->time);
+       }
+}
+
+static void toolbar_reply_to_list_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)data;
+
+       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->replylist_btn), GTK_RELIEF_NONE);
+       manage_window_focus_in(mainwin->window, NULL, NULL);
+}
+
 static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
        MainWindow *mainwindow = (MainWindow *) data;
@@ -2492,6 +2540,7 @@ static void toolbar_buttons_cb(GtkWidget         *widget,
                { A_REPLY_MESSAGE,  toolbar_reply_cb           },
                { A_REPLY_SENDER,   toolbar_reply_to_sender_cb },
                { A_REPLY_ALL,      toolbar_reply_to_all_cb    },
+               { A_REPLY_ML,       toolbar_reply_to_list_cb   },
                { A_FORWARD,        toolbar_forward_cb         },
                { A_DELETE,         toolbar_delete_cb          },
                { A_EXECUTE,        toolbar_exec_cb            },
@@ -2552,6 +2601,8 @@ void toolbar_set_sensitive(MainWindow *mainwin)
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
        SET_WIDGET_COND(toolbar->replyall_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
+       SET_WIDGET_COND(toolbar->replylist_btn,
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
        SET_WIDGET_COND(toolbar->replysender_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
        SET_WIDGET_COND(toolbar->fwd_btn, M_HAVE_ACCOUNT|M_TARGET_EXIST);
@@ -2608,6 +2659,7 @@ static void toolbar_update(MainWindow *mainwin)
        mainwin->toolbar->compose_news_btn = NULL;
        mainwin->toolbar->reply_btn        = NULL;      
        mainwin->toolbar->replyall_btn     = NULL;      
+       mainwin->toolbar->replylist_btn     = NULL;     
        mainwin->toolbar->replysender_btn  = NULL;      
        mainwin->toolbar->fwd_btn    = NULL;    
        mainwin->toolbar->delete_btn = NULL;    
@@ -2639,6 +2691,7 @@ static void toolbar_create(MainWindow *mainwin,
        guint n_menu_entries;
        GtkWidget *reply_popup;
        GtkWidget *replyall_popup;
+       GtkWidget *replylist_popup;
        GtkWidget *replysender_popup;
        GtkWidget *fwd_popup;
 
@@ -2779,6 +2832,24 @@ static void toolbar_create(MainWindow *mainwin,
                                           GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_closed_cb), mainwin);
                        mainwin->toolbar->replyall_popup    = replyall_popup;
                        break;
+               case A_REPLY_ML:
+                       mainwin->toolbar->replylist_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            mainwin->toolbar->replylist_btn,
+                                          _("Reply to Mailing-list"), NULL);
+                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->replylist_btn), 
+                                          "button_press_event",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_to_list_popup_cb),
+                                          mainwin);
+                       n_menu_entries = sizeof(replylist_popup_entries) /
+                               sizeof(replylist_popup_entries[0]);
+                       replylist_popup = popupmenu_create(mainwin->window, 
+                                                         replylist_popup_entries, n_menu_entries,
+                                                         "<ReplyMlPopup>", mainwin);
+                       gtk_signal_connect(GTK_OBJECT(replylist_popup), "selection_done",
+                                          GTK_SIGNAL_FUNC(toolbar_reply_to_list_popup_closed_cb), mainwin);
+                       mainwin->toolbar->replylist_popup    = replylist_popup;
+                       break;
                case A_FORWARD:
                        mainwin->toolbar->fwd_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 7d4ebcfe98c8cd42258861f59b7eed8d29bc1cec..34711de082f0e796484df0b2b835a2b9f463ab4f 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -154,6 +154,7 @@ struct _MainToolbar {
        GtkWidget *reply_btn;
        GtkWidget *replysender_btn;
        GtkWidget *replyall_btn;
+       GtkWidget *replylist_btn;
 
        GtkWidget *fwd_btn;
 
@@ -166,6 +167,7 @@ struct _MainToolbar {
        /* for the reply buttons */
        GtkWidget *reply_popup;
        GtkWidget *replyall_popup;
+       GtkWidget *replylist_popup;
        GtkWidget *replysender_popup;
        
        /* the forward button similar to the reply buttons*/

diff --git a/src/toolbar.c b/src/toolbar.c
index 37fae03d5ded4930b66cd8e21b66c6446150c229..21cb29e1cb2916438136aa6f7d8475c02af1bb34 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -85,6 +85,7 @@ static ToolbarText toolbar_text [] = {
        { "A_REPLY_MESSAGE", N_("Reply to Message")                     },
        { "A_REPLY_SENDER",  N_("Reply to Sender")                      },
        { "A_REPLY_ALL",     N_("Reply to All")                         },
+       { "A_REPLY_ML",      N_("Reply to Mailing-list")                },
        { "A_FORWARD",       N_("Forward Message")                      }, 
        { "A_DELETE",        N_("Delete Message")                       },
        { "A_EXECUTE",       N_("Execute")                              },
@@ -173,10 +174,11 @@ GList *toolbar_get_action_items(Toolbar source)
        gint i = 0;
        
        if (source == TOOLBAR_MAIN) {
-               gint main_items[12] = { A_RECEIVE_ALL,   A_RECEIVE_CUR,   A_SEND_QUEUED,
+               gint main_items[13] = { A_RECEIVE_ALL,   A_RECEIVE_CUR,   A_SEND_QUEUED,
                                        A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,  
-                                       A_REPLY_ALL,     A_FORWARD,       A_DELETE,        
-                                       A_EXECUTE,      A_GOTO_NEXT,      A_SYL_ACTIONS };
+                                       A_REPLY_ALL,     A_REPLY_ML,      A_FORWARD,       
+                                       A_DELETE,        A_EXECUTE,       A_GOTO_NEXT,      
+                                       A_SYL_ACTIONS };
 
                for (i = 0; i < sizeof(main_items)/sizeof(main_items[0]); i++) 
                        items = g_list_append(items, toolbar_text[main_items[i]].descr);

diff --git a/src/toolbar.h b/src/toolbar.h
index 75f91a844f7dfb45b8752240b4e2047e98dc42e2..029112fbca9ef4764c09a16828533cb955101559 100644 (file)
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -79,6 +79,7 @@ enum {
        A_REPLY_MESSAGE,
        A_REPLY_SENDER,
        A_REPLY_ALL,
+       A_REPLY_ML,
        A_FORWARD,
        A_DELETE,
        A_EXECUTE,