sync with 0.9.8cvs7

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7e24e805ba2645bcafa3e5ace8aab7d7783091e3..d38c3145a48892117cbaa7652da9f7d0c0e8caa9 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2004-01-26 [paul]      0.9.8claws53
+
+       * sync with 0.9.8cvs7
+               see ChangeLog 2004-01-23
+

 2004-01-25 [alfons]    0.9.8claws52
 
        * src/compose.c
 2004-01-25 [alfons]    0.9.8claws52
 
        * src/compose.c

diff --git a/configure.ac b/configure.ac
index 2972747887bf83bfce7adbc23e8596fe7f93acf0..5f05a1fdf6de7da04bbfd4c51577bc645e871e0d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=52
+EXTRA_VERSION=53

 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 6430db91fd41107c166d4670b60b12122156c06c..dd1a1fd12ed39e8317a84d15c5c2275be2073fcd 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -31,6 +31,7 @@
 #include <gtk/gtkcombo.h>
 #include <gtk/gtkthemes.h>
 #include <gtk/gtkbindings.h>
 #include <gtk/gtkcombo.h>
 #include <gtk/gtkthemes.h>
 #include <gtk/gtkbindings.h>

+#include <gtk/gtkitemfactory.h>

 #include <stdlib.h>
 #include <stdarg.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <sys/stat.h>


@@ -158,6 +159,105 @@ void gtkut_button_set_create(GtkWidget **bbox,
        }
 }
 
        }
 }
 

+static void combo_button_size_request(GtkWidget *widget,
+                                     GtkRequisition *requisition,
+                                     gpointer data)
+{
+       ComboButton *combo = (ComboButton *)data;
+
+       if (combo->arrow->allocation.height != requisition->height)
+               gtk_widget_set_usize(combo->arrow, -1, requisition->height);
+}
+
+static void combo_button_enter(GtkWidget *widget, gpointer data)
+{
+       ComboButton *combo = (ComboButton *)data;
+
+       if (GTK_WIDGET_STATE(combo->arrow) != GTK_STATE_PRELIGHT) {
+               gtk_widget_set_state(combo->arrow, GTK_STATE_PRELIGHT);
+               gtk_widget_queue_draw(combo->arrow);
+       }
+       if (GTK_WIDGET_STATE(combo->button) != GTK_STATE_PRELIGHT) {
+               gtk_widget_set_state(combo->button, GTK_STATE_PRELIGHT);
+               gtk_widget_queue_draw(combo->button);
+       }
+}
+
+static void combo_button_leave(GtkWidget *widget, gpointer data)
+{
+       ComboButton *combo = (ComboButton *)data;
+
+       if (GTK_WIDGET_STATE(combo->arrow) != GTK_STATE_NORMAL) {
+               gtk_widget_set_state(combo->arrow, GTK_STATE_NORMAL);
+               gtk_widget_queue_draw(combo->arrow);
+       }
+       if (GTK_WIDGET_STATE(combo->button) != GTK_STATE_NORMAL) {
+               gtk_widget_set_state(combo->button, GTK_STATE_NORMAL);
+               gtk_widget_queue_draw(combo->button);
+       }
+}
+
+static gint combo_button_arrow_pressed(GtkWidget *widget, GdkEventButton *event,
+                                      gpointer data)
+{
+       ComboButton *combo = (ComboButton *)data;
+
+       if (!event) return FALSE;
+
+       gtk_menu_popup(GTK_MENU(combo->menu), NULL, NULL,
+                      menu_button_position, combo->button,
+                      event->button, event->time);
+
+       return FALSE;
+}
+
+static void combo_button_destroy(GtkWidget *widget, gpointer data)
+{
+       ComboButton *combo = (ComboButton *)data;
+
+       gtk_object_destroy(GTK_OBJECT(combo->factory));
+       g_free(combo);
+}
+
+ComboButton *gtkut_combo_button_create(GtkWidget *button,
+                                      GtkItemFactoryEntry *entries,
+                                      gint n_entries, const gchar *path,
+                                      gpointer data)
+{
+       ComboButton *combo;
+       GtkWidget *arrow;
+
+       combo = g_new0(ComboButton, 1);
+
+       combo->arrow = gtk_button_new();
+       arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+       gtk_container_add(GTK_CONTAINER(combo->arrow), arrow);
+       GTK_WIDGET_UNSET_FLAGS(combo->arrow, GTK_CAN_FOCUS);
+       gtk_widget_show_all(combo->arrow);
+
+       combo->button = button;
+       combo->menu = menu_create_items(entries, n_entries, path,
+                                       &combo->factory, data);
+       combo->data = data;
+
+       gtk_signal_connect(GTK_OBJECT(combo->button), "size_request",
+                          GTK_SIGNAL_FUNC(combo_button_size_request), combo);
+       gtk_signal_connect(GTK_OBJECT(combo->button), "enter",
+                          GTK_SIGNAL_FUNC(combo_button_enter), combo);
+       gtk_signal_connect(GTK_OBJECT(combo->button), "leave",
+                          GTK_SIGNAL_FUNC(combo_button_leave), combo);
+       gtk_signal_connect(GTK_OBJECT(combo->arrow), "enter",
+                          GTK_SIGNAL_FUNC(combo_button_enter), combo);
+       gtk_signal_connect(GTK_OBJECT(combo->arrow), "leave",
+                          GTK_SIGNAL_FUNC(combo_button_leave), combo);
+       gtk_signal_connect(GTK_OBJECT(combo->arrow), "button_press_event",
+                          GTK_SIGNAL_FUNC(combo_button_arrow_pressed), combo);
+       gtk_signal_connect(GTK_OBJECT(combo->arrow), "destroy",
+                          GTK_SIGNAL_FUNC(combo_button_destroy), combo);
+
+       return combo;
+}
+

 #define CELL_SPACING 1
 #define ROW_TOP_YPIXEL(clist, row) (((clist)->row_height * (row)) + \
                                    (((row) + 1) * CELL_SPACING) + \
 #define CELL_SPACING 1
 #define ROW_TOP_YPIXEL(clist, row) (((clist)->row_height * (row)) + \
                                    (((row) + 1) * CELL_SPACING) + \

diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
index 527733a402f584ca6cc583ae91b0659e228ca713..de14296e599c3c44becc7befe884283acda750a1 100644 (file)
--- a/src/gtk/gtkutils.h
+++ b/src/gtk/gtkutils.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -32,12 +32,25 @@
 #include <gtk/gtkeditable.h>
 #include <gtk/gtkctree.h>
 #include <gtk/gtkcombo.h>
 #include <gtk/gtkeditable.h>
 #include <gtk/gtkctree.h>
 #include <gtk/gtkcombo.h>

-#include "gtkstext.h"
+#include <gtk/gtkitemfactory.h>

 #include <stdlib.h>
 #if HAVE_WCHAR_H
 #  include <wchar.h>
 #endif
 
 #include <stdlib.h>
 #if HAVE_WCHAR_H
 #  include <wchar.h>
 #endif
 

+typedef struct _ComboButton    ComboButton;
+
+#include "gtkstext.h"
+
+struct _ComboButton
+{
+       GtkWidget *arrow;
+       GtkWidget *button;
+       GtkWidget *menu;
+       GtkItemFactory *factory;
+       gpointer data;
+};
+

 #define GTK_EVENTS_FLUSH() \
 { \
        while (gtk_events_pending()) \
 #define GTK_EVENTS_FLUSH() \
 { \
        while (gtk_events_pending()) \


@@ -94,6 +107,12 @@ void gtkut_button_set_create                (GtkWidget      **bbox,
                                         GtkWidget      **button3,
                                         const gchar     *label3);
 
                                         GtkWidget      **button3,
                                         const gchar     *label3);
 

+ComboButton *gtkut_combo_button_create (GtkWidget              *button,
+                                        GtkItemFactoryEntry    *entries,
+                                        gint                    n_entries,
+                                        const gchar            *path,
+                                        gpointer                data);
+

 void gtkut_ctree_node_move_if_on_the_edge
                                        (GtkCTree       *ctree,
                                         GtkCTreeNode   *node);
 void gtkut_ctree_node_move_if_on_the_edge
                                        (GtkCTree       *ctree,
                                         GtkCTreeNode   *node);

diff --git a/src/toolbar.c b/src/toolbar.c
index 89729f1f0559f99aa40ae8e4e23a62d62a81aa98..d3e44afe24bc47bdab04449d4c26e15b34d5dc40 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -200,30 +200,31 @@ struct {
        { "toolbar_msgview.xml", NULL}
 };
 
        { "toolbar_msgview.xml", NULL}
 };
 

-static GtkItemFactoryEntry reply_popup_entries[] =
+static GtkItemFactoryEntry reply_entries[] =

 {
 {

-       {N_("/Reply with _quote"), NULL, toolbar_popup_cb, COMPOSE_REPLY_WITH_QUOTE, NULL},
-       {N_("/_Reply without quote"), NULL, toolbar_popup_cb, COMPOSE_REPLY_WITHOUT_QUOTE, NULL}
+       {N_("/Reply with _quote"), NULL,    toolbar_reply, COMPOSE_REPLY_WITH_QUOTE, NULL},
+       {N_("/_Reply without quote"), NULL, toolbar_reply, COMPOSE_REPLY_WITHOUT_QUOTE, NULL}

 };
 };

-static GtkItemFactoryEntry replyall_popup_entries[] =
+static GtkItemFactoryEntry replyall_entries[] =

 {
 {

-       {N_("/Reply to all with _quote"), "<shift>A", toolbar_popup_cb, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL},
-       {N_("/_Reply to all without quote"), "a", toolbar_popup_cb, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL}
+       {N_("/Reply to all with _quote"), "<shift>A", toolbar_reply, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL},
+       {N_("/_Reply to all without quote"), "a",     toolbar_reply, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL}

 };
 };

-static GtkItemFactoryEntry replylist_popup_entries[] =
+static GtkItemFactoryEntry replylist_entries[] =

 {
 {

-       {N_("/Reply to list with _quote"), NULL, toolbar_popup_cb, COMPOSE_REPLY_TO_LIST_WITH_QUOTE, NULL},
-       {N_("/_Reply to list without quote"), NULL, toolbar_popup_cb, COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, NULL}
+       {N_("/Reply to list with _quote"),    NULL, toolbar_reply, COMPOSE_REPLY_TO_LIST_WITH_QUOTE, NULL},
+       {N_("/_Reply to list without quote"), NULL, toolbar_reply, COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, NULL}

 };
 };

-static GtkItemFactoryEntry replysender_popup_entries[] =
+static GtkItemFactoryEntry replysender_entries[] =

 {
 {

-       {N_("/Reply to sender with _quote"), NULL, toolbar_popup_cb, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE, NULL},
-       {N_("/_Reply to sender without quote"), NULL, toolbar_popup_cb, COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE, NULL}
+       {N_("/Reply to sender with _quote"),    NULL, toolbar_reply, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE, NULL},
+       {N_("/_Reply to sender without quote"), NULL, toolbar_reply, COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE, NULL}

 };
 };

-static GtkItemFactoryEntry fwd_popup_entries[] =
+static GtkItemFactoryEntry forward_entries[] =

 {
 {

-       {N_("/_Forward message (inline style)"), "f", toolbar_popup_cb, COMPOSE_FORWARD_INLINE, NULL},
-       {N_("/Forward message as _attachment"), "<shift>F", toolbar_popup_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}
+       {N_("/_Forward"),               "f",        toolbar_reply, COMPOSE_FORWARD_INLINE, NULL},
+       {N_("/For_ward as attachment"), "<shift>F", toolbar_reply, COMPOSE_FORWARD_AS_ATTACH, NULL},
+       {N_("/Redirec_t"),              NULL,       toolbar_reply, COMPOSE_REDIRECT, NULL}

 };
 
 
 };
 
 


@@ -877,213 +878,6 @@ static void toolbar_exec_cb(GtkWidget     *widget,
        summary_execute(mainwin->summaryview);
 }
 
        summary_execute(mainwin->summaryview);
 }
 

-
-
-/* popup callback functions */
-static void toolbar_reply_popup_cb(GtkWidget       *widget, 
-                                  GdkEventButton  *event, 
-                                  gpointer         data)
-{
-       Toolbar *toolbar_data = (Toolbar*)data;
-       
-       if (!event) return;
-       
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(toolbar_data->reply_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
-}
-
-static void toolbar_reply_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
-       ToolbarItem *toolbar_item = (ToolbarItem*)data;
-       GtkWidget *window;
-       GtkWidget *reply_btn;
-       MainWindow *mainwin;
-       MessageView *msgview;
-
-       g_return_if_fail(toolbar_item != NULL);
-
-       switch(toolbar_item->type) {
-       case TOOLBAR_MAIN:
-               mainwin   = (MainWindow*)toolbar_item->parent;
-               reply_btn = mainwin->toolbar->reply_btn;
-               window    = mainwin->window;
-               break;
-       case TOOLBAR_MSGVIEW:
-               msgview   = (MessageView*)toolbar_item->parent;
-               reply_btn = msgview->toolbar->reply_btn;
-               window    = msgview->window;
-               break;
-       default:
-               return;
-       }
-
-       gtk_button_set_relief(GTK_BUTTON(reply_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(window, NULL, NULL);
-}
-
-static void toolbar_reply_to_all_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       Toolbar *toolbar_data = (Toolbar*)data;
-       
-       if (!event) return;
-       
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(toolbar_data->replyall_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
-}
-
-static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
-       ToolbarItem *toolbar_item = (ToolbarItem*)data;
-       GtkWidget *window;
-       GtkWidget *replyall_btn;
-       MainWindow *mainwin;
-       MessageView *msgview;
-
-       g_return_if_fail(toolbar_item != NULL);
-
-       switch(toolbar_item->type) {
-       case TOOLBAR_MAIN:
-               mainwin      = (MainWindow*)toolbar_item->parent; 
-               replyall_btn = mainwin->toolbar->replyall_btn;
-               window       = mainwin->window;
-               break;
-       case TOOLBAR_MSGVIEW:
-               msgview      = (MessageView*)toolbar_item->parent;
-               replyall_btn = msgview->toolbar->replyall_btn;
-               window       = msgview->window;
-               break;
-       default:
-               return;
-       }
-
-       gtk_button_set_relief(GTK_BUTTON(replyall_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(window, NULL, NULL);
-}
-
-static void toolbar_reply_to_list_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       Toolbar *toolbar_data = (Toolbar*)data;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(toolbar_data->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)
-{
-       ToolbarItem *toolbar_item = (ToolbarItem*)data;
-       gpointer parent = toolbar_item->parent;
-       GtkWidget *window;
-       GtkWidget *replylist_btn;
-
-
-       g_return_if_fail(toolbar_item != NULL);
-
-       switch(toolbar_item->type) {
-       case TOOLBAR_MAIN:
-               replylist_btn = ((MainWindow*)parent)->toolbar->replylist_btn;
-               window        = ((MainWindow*)parent)->window;
-               break;
-       case TOOLBAR_MSGVIEW:
-               replylist_btn = ((MessageView*)parent)->toolbar->replylist_btn;
-               window        = ((MessageView*)parent)->window;
-               break;
-       default:
-               return;
-       }
-
-       gtk_button_set_relief(GTK_BUTTON(replylist_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(window, NULL, NULL);
-}
-
-static void toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       Toolbar *toolbar_data = (Toolbar*)data;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(toolbar_data->replysender_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
-}
-
-static void toolbar_reply_to_sender_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
-       ToolbarItem *toolbar_item = (ToolbarItem*)data;
-       gpointer parent = toolbar_item->parent;
-       GtkWidget *window;
-       GtkWidget *replysender_btn;
-
-       g_return_if_fail(toolbar_item != NULL);
-
-       switch(toolbar_item->type) {
-       case TOOLBAR_MAIN:
-               replysender_btn = ((MainWindow*)parent)->toolbar->replysender_btn;
-               window          = ((MainWindow*)parent)->window;
-               break;
-       case TOOLBAR_MSGVIEW:
-               replysender_btn = ((MessageView*)parent)->toolbar->replysender_btn;
-               window          = ((MessageView*)parent)->window;
-               break;
-       default:
-               return;
-       }
-
-       gtk_button_set_relief(GTK_BUTTON(replysender_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(window, NULL, NULL);
-}
-
-static void toolbar_forward_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       Toolbar *toolbar_data = (Toolbar*)data;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(toolbar_data->fwd_popup), NULL, NULL,
-                              menu_button_position, widget,
-                              event->button, event->time);
-       }
-}
-
-static void toolbar_forward_popup_closed_cb (GtkMenuShell *menu_shell, 
-                                            gpointer     data)
-{
-       ToolbarItem *toolbar_item = (ToolbarItem*)data;
-       gpointer parent = toolbar_item->parent;
-       GtkWidget *window;
-       GtkWidget *fwd_btn;
-
-       g_return_if_fail(toolbar_item != NULL);
-
-       switch(toolbar_item->type) {
-       case TOOLBAR_MAIN:
-               fwd_btn = ((MainWindow*)parent)->toolbar->fwd_btn;
-               window  = ((MainWindow*)parent)->window;
-               break;
-       case TOOLBAR_MSGVIEW:
-               fwd_btn = ((MessageView*)parent)->toolbar->fwd_btn;
-               window  = ((MessageView*)parent)->window;
-               break;
-       default:
-               return;
-       }
-
-       gtk_button_set_relief(GTK_BUTTON(fwd_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(window, NULL, NULL);
-}
-

 /*
  * Delete current/selected(s) message(s)
  */
 /*
  * Delete current/selected(s) message(s)
  */


@@ -1497,11 +1291,11 @@ Toolbar *toolbar_create(ToolbarType      type,
        GtkWidget *window_wid;
 
        guint n_menu_entries;
        GtkWidget *window_wid;
 
        guint n_menu_entries;

-       GtkWidget *reply_popup;
-       GtkWidget *replyall_popup;
-       GtkWidget *replylist_popup;
-       GtkWidget *replysender_popup;
-       GtkWidget *fwd_popup;
+       ComboButton *reply_combo;
+       ComboButton *replyall_combo;
+       ComboButton *replylist_combo;
+       ComboButton *replysender_combo;
+       ComboButton *fwd_combo;

 
        GtkTooltips *toolbar_tips;
        ToolbarSylpheedActions *action_item;
 
        GtkTooltips *toolbar_tips;
        ToolbarSylpheedActions *action_item;


@@ -1594,105 +1388,85 @@ Toolbar *toolbar_create(ToolbarType     type,
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->reply_btn,
                                           _("Reply to Message"), NULL);
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->reply_btn,
                                           _("Reply to Message"), NULL);

-                       gtk_signal_connect(GTK_OBJECT(toolbar_data->reply_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_popup_cb),
-                                          toolbar_data);
-                       n_menu_entries = sizeof(reply_popup_entries) /
-                               sizeof(reply_popup_entries[0]);
-
-                       window_wid = get_window_widget(type, data);
-                       reply_popup = popupmenu_create(window_wid,
-                                                      reply_popup_entries, n_menu_entries,
-                                                      "<ReplyPopup>", (gpointer)toolbar_item);
-
-                       gtk_signal_connect(GTK_OBJECT(reply_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_popup_closed_cb), toolbar_item);
-                       toolbar_data->reply_popup = reply_popup;
+                       n_menu_entries = sizeof(reply_entries) / 
+                               sizeof(replysender_entries[0]);
+                       reply_combo = gtkut_combo_button_create(toolbar_data->reply_btn,
+                                             reply_entries, n_menu_entries,
+                                             "<Reply>", (gpointer)toolbar_item);
+                       gtk_button_set_relief(GTK_BUTTON(reply_combo->arrow),
+                                             GTK_TOOLBAR(toolbar)->relief);
+                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
+                                                 GTK_WIDGET_PTR(reply_combo),
+                                                 _("Reply to Message"), "Reply");
+                       toolbar_data->reply_combo = reply_combo;

                        break;
                case A_REPLY_SENDER:
                        toolbar_data->replysender_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->replysender_btn,
                                           _("Reply to Sender"), NULL);
                        break;
                case A_REPLY_SENDER:
                        toolbar_data->replysender_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->replysender_btn,
                                           _("Reply to Sender"), NULL);

-                       gtk_signal_connect(GTK_OBJECT(toolbar_data->replysender_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_cb),
-                                          toolbar_data);
-                       n_menu_entries = sizeof(replysender_popup_entries) /
-                               sizeof(replysender_popup_entries[0]);
-
-                       window_wid = get_window_widget(type, data);
-                       replysender_popup = popupmenu_create(window_wid, 
-                                                            replysender_popup_entries, n_menu_entries,
-                                                            "<ReplySenderPopup>", (gpointer)toolbar_item);
-
-                       gtk_signal_connect(GTK_OBJECT(replysender_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_closed_cb), toolbar_item);
-                       toolbar_data->replysender_popup = replysender_popup;
+                       n_menu_entries = sizeof(replysender_entries) / 
+                               sizeof(replysender_entries[0]);
+                       replysender_combo = gtkut_combo_button_create(toolbar_data->replysender_btn,
+                                             replysender_entries, n_menu_entries,
+                                             "<ReplySender>", (gpointer)toolbar_item);
+                       gtk_button_set_relief(GTK_BUTTON(replysender_combo->arrow),
+                                             GTK_TOOLBAR(toolbar)->relief);
+                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
+                                                 GTK_WIDGET_PTR(replysender_combo),
+                                                 _("Reply to Sender"), "ReplySender");
+                       toolbar_data->replysender_combo = replysender_combo;

                        break;
                case A_REPLY_ALL:
                        toolbar_data->replyall_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->replyall_btn,
                                           _("Reply to All"), NULL);
                        break;
                case A_REPLY_ALL:
                        toolbar_data->replyall_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->replyall_btn,
                                           _("Reply to All"), NULL);

-                       gtk_signal_connect(GTK_OBJECT(toolbar_data->replyall_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_cb),
-                                          toolbar_data);
-                       n_menu_entries = sizeof(replyall_popup_entries) /
-                               sizeof(replyall_popup_entries[0]);
-
-                       window_wid = get_window_widget(type, data);     
-                       replyall_popup = popupmenu_create(window_wid, 
-                                                         replyall_popup_entries, n_menu_entries,
-                                                         "<ReplyAllPopup>", (gpointer)toolbar_item);
-       
-                       gtk_signal_connect(GTK_OBJECT(replyall_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_closed_cb), toolbar_item);
-                       toolbar_data->replyall_popup = replyall_popup;
+                       n_menu_entries = sizeof(replyall_entries) / 
+                               sizeof(replyall_entries[0]);
+                       replyall_combo = gtkut_combo_button_create(toolbar_data->replyall_btn,
+                                             replyall_entries, n_menu_entries,
+                                             "<ReplyAll>", (gpointer)toolbar_item);
+                       gtk_button_set_relief(GTK_BUTTON(replyall_combo->arrow),
+                                             GTK_TOOLBAR(toolbar)->relief);
+                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
+                                                 GTK_WIDGET_PTR(replyall_combo),
+                                                 _("Reply to All"), "ReplyAll");
+                       toolbar_data->replyall_combo = replyall_combo;

                        break;
                case A_REPLY_ML:
                        toolbar_data->replylist_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->replylist_btn,
                                           _("Reply to Mailing-list"), NULL);
                        break;
                case A_REPLY_ML:
                        toolbar_data->replylist_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->replylist_btn,
                                           _("Reply to Mailing-list"), NULL);

-                       gtk_signal_connect(GTK_OBJECT(toolbar_data->replylist_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_list_popup_cb),
-                                          toolbar_data);
-                       n_menu_entries = sizeof(replylist_popup_entries) /
-                               sizeof(replylist_popup_entries[0]);
-
-                       window_wid = get_window_widget(type, data);
-                       replylist_popup = popupmenu_create(window_wid, 
-                                                          replylist_popup_entries, n_menu_entries,
-                                                          "<ReplyMlPopup>", (gpointer)toolbar_item);
-               
-                       gtk_signal_connect(GTK_OBJECT(replylist_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_list_popup_closed_cb), toolbar_item);
-                       toolbar_data->replylist_popup = replylist_popup;
+                       n_menu_entries = sizeof(replylist_entries) / 
+                               sizeof(replylist_entries[0]);
+                       replylist_combo = gtkut_combo_button_create(toolbar_data->replylist_btn,
+                                             replylist_entries, n_menu_entries,
+                                             "<ReplyList>", (gpointer)toolbar_item);
+                       gtk_button_set_relief(GTK_BUTTON(replylist_combo->arrow),
+                                             GTK_TOOLBAR(toolbar)->relief);
+                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
+                                                 GTK_WIDGET_PTR(replylist_combo),
+                                                 _("Reply to Mailing-list"), "ReplyList");
+                       toolbar_data->replylist_combo = replylist_combo;

                        break;
                case A_FORWARD:
                        toolbar_data->fwd_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->fwd_btn,
                                             _("Forward Message"), NULL);
                        break;
                case A_FORWARD:
                        toolbar_data->fwd_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->fwd_btn,
                                             _("Forward Message"), NULL);

-                       gtk_signal_connect(GTK_OBJECT(toolbar_data->fwd_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_forward_popup_cb),
-                                          toolbar_data);
-                       n_menu_entries = sizeof(fwd_popup_entries) /
-                               sizeof(fwd_popup_entries[0]);
-
-                       window_wid = get_window_widget(type, data);
-                       fwd_popup = popupmenu_create(window_wid, 
-                                                    fwd_popup_entries, n_menu_entries,
-                                                    "<ForwardPopup>", (gpointer)toolbar_item);
-
-                       gtk_signal_connect(GTK_OBJECT(fwd_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_forward_popup_closed_cb), toolbar_item);
-                       toolbar_data->fwd_popup = fwd_popup;
+                       n_menu_entries = sizeof(forward_entries) / 
+                               sizeof(forward_entries[0]);
+                       fwd_combo = gtkut_combo_button_create(toolbar_data->fwd_btn,
+                                             forward_entries, n_menu_entries,
+                                             "<Forward>", (gpointer)toolbar_item);
+                       gtk_button_set_relief(GTK_BUTTON(fwd_combo->arrow),
+                                             GTK_TOOLBAR(toolbar)->relief);
+                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
+                                                 GTK_WIDGET_PTR(fwd_combo),
+                                                 _("Forward Message"), "Fwd");
+                       toolbar_data->fwd_combo = fwd_combo;

                        break;
                case A_DELETE:
                        toolbar_data->delete_btn = item;
                        break;
                case A_DELETE:
                        toolbar_data->delete_btn = item;


@@ -1900,13 +1674,28 @@ void toolbar_main_set_sensitive(gpointer data)
        SET_WIDGET_COND(toolbar->compose_news_btn, M_HAVE_ACCOUNT);
        SET_WIDGET_COND(toolbar->reply_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
        SET_WIDGET_COND(toolbar->compose_news_btn, M_HAVE_ACCOUNT);
        SET_WIDGET_COND(toolbar->reply_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);

+       if (toolbar->reply_btn)
+               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->reply_combo),
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);

        SET_WIDGET_COND(toolbar->replyall_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
        SET_WIDGET_COND(toolbar->replyall_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);

+       if (toolbar->replyall_btn)
+               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->replyall_combo),
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);

        SET_WIDGET_COND(toolbar->replylist_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
        SET_WIDGET_COND(toolbar->replylist_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);

+       if (toolbar->replylist_btn) 
+               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->replylist_combo),
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);

        SET_WIDGET_COND(toolbar->replysender_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
        SET_WIDGET_COND(toolbar->replysender_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);

+       if (toolbar->replysender_btn)
+               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->replysender_combo),
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);

        SET_WIDGET_COND(toolbar->fwd_btn, M_HAVE_ACCOUNT|M_TARGET_EXIST);
        SET_WIDGET_COND(toolbar->fwd_btn, M_HAVE_ACCOUNT|M_TARGET_EXIST);

+       if (toolbar->fwd_btn)
+               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->fwd_combo),
+                       M_HAVE_ACCOUNT|M_TARGET_EXIST); 

 
        SET_WIDGET_COND(toolbar->next_btn, M_MSG_EXIST);
        SET_WIDGET_COND(toolbar->delete_btn,
 
        SET_WIDGET_COND(toolbar->next_btn, M_MSG_EXIST);
        SET_WIDGET_COND(toolbar->delete_btn,

diff --git a/src/toolbar.h b/src/toolbar.h
index 974b9544845a0e23e13873460f8b375bd4a95160..aa9b28ef0a578c63298e04860c09de6e03fabdfb 100644 (file)
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -20,6 +20,8 @@
 #ifndef __CUSTOM_TOOLBAR_H__
 #define __CUSTOM_TOOLBAR_H__
 
 #ifndef __CUSTOM_TOOLBAR_H__
 #define __CUSTOM_TOOLBAR_H__
 

+#include "gtk/gtkutils.h"
+

 #define SEPARATOR_PIXMAP     "---"
 
 typedef struct _Toolbar Toolbar;
 #define SEPARATOR_PIXMAP     "---"
 
 typedef struct _Toolbar Toolbar;


@@ -49,27 +51,24 @@ struct _Toolbar {
        GtkWidget *compose_news_btn;
 
        GtkWidget *reply_btn;
        GtkWidget *compose_news_btn;
 
        GtkWidget *reply_btn;

+       ComboButton *reply_combo;

        GtkWidget *replysender_btn;
        GtkWidget *replysender_btn;

+       ComboButton *replysender_combo;

        GtkWidget *replyall_btn;
        GtkWidget *replyall_btn;

+       ComboButton *replyall_combo;

        GtkWidget *replylist_btn;
        GtkWidget *replylist_btn;

+       ComboButton *replylist_combo;

 
        GtkWidget *fwd_btn;
 
        GtkWidget *fwd_btn;

-
+       ComboButton *fwd_combo;
+       

        GtkWidget *delete_btn;
        GtkWidget *next_btn;
        GtkWidget *exec_btn;
 
        GtkWidget *separator;
 
        GtkWidget *delete_btn;
        GtkWidget *next_btn;
        GtkWidget *exec_btn;
 
        GtkWidget *separator;
 

-       /* for the reply buttons */
-       GtkWidget *reply_popup;
-       GtkWidget *replyall_popup;
-       GtkWidget *replylist_popup;
-       GtkWidget *replysender_popup;

        
        

-       /* the forward button similar to the reply buttons*/
-       GtkWidget *fwd_popup;
-

        ComposeButtonType compose_btn_type;
 
        /* compose buttons */
        ComposeButtonType compose_btn_type;
 
        /* compose buttons */