use generic toolbar handling
authorOliver Haertel <o.h.a@gmx.net>
Tue, 24 Dec 2002 14:38:23 +0000 (14:38 +0000)
committerOliver Haertel <o.h.a@gmx.net>
Tue, 24 Dec 2002 14:38:23 +0000 (14:38 +0000)
ChangeLog.claws
configure.in
src/compose.c
src/compose.h
src/inc.c
src/mainwindow.c
src/mainwindow.h
src/messageview.c
src/messageview.h
src/summaryview.c

index ce3aaef715ee2115a59d7628acaa236b54d04cad..8bdf6355a678f943ed643e86fec72b3272898920 100644 (file)
@@ -1,3 +1,12 @@
+2002-12-24 [oliver]    0.8.7claws6
+
+       * src/mainwindow.[ch]
+       * src/messageview.[ch]
+       * src/compose.[ch]
+       * src/inc.c
+       * src/summaryview.c
+               changes to use updated toolbar handling
+               
 2002-12-24 [oliver]    0.8.7claws5
 
        * src/toolbar.[ch]
index b6b5c9046e5a327a55dc63cb08507ea97484207b..721e84217f3f320aba15b4141f1d5e55cfbf4bfb 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws5
+EXTRA_VERSION=claws6
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 6f74b4b16fc3b553382c375a1c0943426fa93665..39594ede480e898da9e2751d97c4335589e46166 100644 (file)
@@ -164,11 +164,6 @@ Compose *compose_generic_new                       (PrefsAccount   *account,
 
 static Compose *compose_create                 (PrefsAccount   *account,
                                                 ComposeMode     mode);
-static void compose_toolbar_create             (Compose        *compose,
-                                                GtkWidget      *container);
-static void compose_toolbar_update              (Compose        *compose);
-static void compose_toolbar_set_sensitive       (Compose        *compose,
-                                                gboolean        sensitive);
 
 static GtkWidget *compose_account_option_menu_create
                                                (Compose        *compose);
@@ -296,31 +291,8 @@ static void compose_update_priority_menu_item(Compose * compose);
 static gboolean compose_edit_size_alloc (GtkEditable   *widget,
                                         GtkAllocation  *allocation,
                                         GtkSHRuler     *shruler);
-
-static void toolbar_send_cb            (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_send_later_cb      (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_draft_cb           (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_insert_cb          (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_attach_cb          (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_sig_cb             (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_ext_editor_cb      (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_linewrap_cb                (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_address_cb         (GtkWidget      *widget,
-                                        gpointer        data);
-static void toolbar_compose_buttons_cb  (GtkWidget      *widget, 
-
-                                        ToolbarItem    *item);
 static void account_activated          (GtkMenuItem    *menuitem,
                                         gpointer        data);
-
 static void attach_selected            (GtkCList       *clist,
                                         gint            row,
                                         gint            column,
@@ -1379,6 +1351,46 @@ void compose_entry_select (Compose *compose, const gchar *mailto)
        }
 }
 
+void compose_toolbar_cb(gint action, gpointer data)
+{
+       ToolbarItem *toolbar_item = (ToolbarItem*)data;
+       Compose *compose = (Compose*)toolbar_item->parent;
+       
+       g_return_if_fail(compose != NULL);
+
+       switch(action) {
+       case A_SEND:
+               compose_send_cb(compose, 0, NULL);
+               break;
+       case A_SENDL:
+               compose_send_later_cb(compose, 0, NULL);
+               break;
+       case A_DRAFT:
+               compose_draft_cb(compose, 0, NULL);
+               break;
+       case A_INSERT:
+               compose_insert_file_cb(compose, 0, NULL);
+               break;
+       case A_ATTACH:
+               compose_attach_cb(compose, 0, NULL);
+               break;
+       case A_SIG:
+               compose_insert_sig(compose);
+               break;
+       case A_EXTEDITOR:
+               compose_ext_editor_cb(compose, 0, NULL);
+               break;
+       case A_LINEWRAP:
+               compose_wrap_line(compose);
+               break;
+       case A_ADDRBOOK:
+               compose_address_cb(compose, 0, NULL);
+               break;
+       default:
+               break;
+       }
+}
+
 static void compose_entries_set(Compose *compose, const gchar *mailto)
 {
        gchar *to = NULL;
@@ -4658,7 +4670,8 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        handlebox = gtk_handle_box_new();
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
 
-       compose_toolbar_create(compose, handlebox);
+       compose->toolbar = toolbar_create(TOOLBAR_COMPOSE, handlebox,
+                                         (gpointer)compose);
 
        vbox2 = gtk_vbox_new(FALSE, 2);
        gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
@@ -4993,230 +5006,12 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 #if USE_GPGME
        activate_gnupg_mode(compose, account);
 #endif 
-
-       common_toolbar_set_style(compose, TOOLBAR_COMPOSE);
-
+       toolbar_set_style(compose->toolbar->toolbar, compose->handlebox, prefs_common.toolbar_style);
        gtk_widget_show(window);
        
        return compose;
 }
 
-static void toolbar_compose_buttons_cb(GtkWidget   *widget, 
-                                      ToolbarItem *item)
-{
-       struct {
-               gint   index;
-               void (*func)(GtkWidget *widget, gpointer data);
-       } compose_action[] = {
-               { A_SEND,        toolbar_send_cb                        },
-               { A_SENDL,       toolbar_send_later_cb                  },
-               { A_DRAFT,       toolbar_draft_cb                       },
-               { A_INSERT,      toolbar_insert_cb                      },
-               { A_ATTACH,      toolbar_attach_cb                      },
-               { A_SIG,         toolbar_sig_cb                         },
-               { A_EXTEDITOR,   toolbar_ext_editor_cb                  },
-               { A_LINEWRAP,    toolbar_linewrap_cb                    },
-               { A_ADDRBOOK,    toolbar_address_cb                     },
-               { A_SYL_ACTIONS, common_toolbar_actions_execute_cb      }};
-
-
-       gint num_items = sizeof(compose_action)/sizeof(compose_action[0]);
-       gint i;
-       for (i = 0; i < num_items; i++) {
-               
-               if (compose_action[i].index == item->index) {
-                       if (item->index == A_SYL_ACTIONS)
-                               compose_action[i].func(widget, (gpointer)item->parent);
-                       else /* this won`t be necessary if everything is moved to toolbar.c */
-                               compose_action[i].func(widget, (gpointer)item->parent->data);
-                       break;
-               }
-       }
-}
-
-static void compose_toolbar_update(Compose *compose)
-{
-       gtk_container_remove(GTK_CONTAINER(compose->handlebox), 
-                            GTK_WIDGET(compose->toolbar->toolbar));
-       
-       compose->toolbar->toolbar       = NULL;
-       compose->toolbar->send_btn      = NULL;
-       compose->toolbar->sendl_btn     = NULL;
-       compose->toolbar->draft_btn     = NULL;
-       compose->toolbar->insert_btn    = NULL;
-       compose->toolbar->attach_btn    = NULL;
-       compose->toolbar->sig_btn       = NULL; 
-       compose->toolbar->exteditor_btn = NULL; 
-       compose->toolbar->linewrap_btn  = NULL; 
-       compose->toolbar->addrbook_btn  = NULL; 
-
-       TOOLBAR_DESTROY_ITEMS(compose->toolbar->item_list);     
-       TOOLBAR_DESTROY_ACTIONS(compose->toolbar->action_list);
-       compose_toolbar_create(compose, compose->handlebox);    
-}
-
-static void compose_toolbar_create(Compose   *compose, 
-                                  GtkWidget *container)
-{
-       ToolbarItem *toolbar_item;
-
-       GtkWidget *toolbar;
-       GtkWidget *icon_wid  = NULL;
-       GtkWidget *item;
-       GtkTooltips *toolbar_tips;
-       ToolbarSylpheedActions *action_item;
-       GSList *cur;
-       GSList *toolbar_list;
-       toolbar_tips = gtk_tooltips_new();
-       
-       toolbar_read_config_file(TOOLBAR_COMPOSE);
-       toolbar_list = toolbar_get_list(TOOLBAR_COMPOSE);
-
-       compose->toolbar = g_new0(Toolbar, 1); 
-       
-       toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
-                                 GTK_TOOLBAR_BOTH);
-       gtk_container_add(GTK_CONTAINER(container), toolbar);
-       gtk_container_set_border_width(GTK_CONTAINER(container), 2);
-       gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE);
-       gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
-                                   GTK_TOOLBAR_SPACE_LINE);
-       
-       for (cur = toolbar_list; cur != NULL; cur = cur->next) {
-
-               if (g_strcasecmp(((ToolbarItem*)cur->data)->file, SEPARATOR) == 0) {
-                       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-                       continue;
-               }
-               
-               toolbar_item = g_new0(ToolbarItem, 1); 
-               toolbar_item->file = g_strdup(((ToolbarItem*)cur->data)->file);
-               toolbar_item->text = g_strdup(((ToolbarItem*)cur->data)->text);
-               toolbar_item->index = ((ToolbarItem*)cur->data)->index;
-
-               toolbar_item->parent = g_new0(ToolbarParent, 1);
-               toolbar_item->parent->data = (gpointer)compose;
-               toolbar_item->parent->type = TOOLBAR_COMPOSE;
-
-               /* collect toolbar items in list to keep track */
-               compose->toolbar->item_list = g_slist_append(compose->toolbar->item_list, 
-                                                            toolbar_item);
-
-               icon_wid = stock_pixmap_widget(container, stock_pixmap_get_icon(toolbar_item->file));
-               item  = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                               toolbar_item->text,
-                                               (""),
-                                               (""),
-                                               icon_wid, toolbar_compose_buttons_cb, 
-                                               toolbar_item);
-               
-               switch (toolbar_item->index) {
-               case A_SEND:
-                       compose->toolbar->send_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            compose->toolbar->send_btn, 
-                                            _("Send Message"), NULL);
-                       break;
-               case A_SENDL:
-                       compose->toolbar->sendl_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            compose->toolbar->sendl_btn,
-                                            _("Put into queue folder and send later"), NULL);
-                       break;
-               case A_DRAFT:
-                       compose->toolbar->draft_btn = item; 
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            compose->toolbar->draft_btn,
-                                            _("Save to draft folder"), NULL);
-                       break;
-               case A_INSERT:
-                       compose->toolbar->insert_btn = item; 
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            compose->toolbar->insert_btn,
-                                            _("Insert file"), NULL);
-                       break;
-               case A_ATTACH:
-                       compose->toolbar->attach_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            compose->toolbar->attach_btn,
-                                            _("Attach file"), NULL);
-                       break;
-               case A_SIG:
-                       compose->toolbar->sig_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            compose->toolbar->sig_btn,
-                                            _("Insert signature"), NULL);
-                       break;
-               case A_EXTEDITOR:
-                       compose->toolbar->exteditor_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            compose->toolbar->exteditor_btn,
-                                            _("Edit with external editor"), NULL);
-                       break;
-               case A_LINEWRAP:
-                       compose->toolbar->linewrap_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            compose->toolbar->linewrap_btn,
-                                            _("Wrap all long lines"), NULL);
-                       break;
-               case A_ADDRBOOK:
-                       compose->toolbar->addrbook_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            compose->toolbar->addrbook_btn,
-                                            _("Address book"), NULL);
-                       break;
-               case A_SYL_ACTIONS:
-                       action_item = g_new0(ToolbarSylpheedActions, 1);
-                       action_item->widget = item;
-                       action_item->name   = g_strdup(toolbar_item->text);
-
-                       compose->toolbar->action_list = 
-                               g_slist_append(compose->toolbar->action_list,
-                                              action_item);
-
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            item,
-                                            action_item->name, NULL);
-
-                       gtk_widget_show(item);
-                       break;
-               default:
-                       break;
-               }
-       }
-
-       compose->toolbar->toolbar = toolbar;
-
-       gtk_widget_show_all(toolbar);
-}
-
-static void compose_toolbar_set_sensitive (Compose * compose, gboolean sensitive)
-{
-       GSList *items = compose->toolbar->action_list;
-       if (compose->toolbar->send_btn)
-               gtk_widget_set_sensitive(compose->toolbar->send_btn, sensitive);
-       if (compose->toolbar->sendl_btn)
-               gtk_widget_set_sensitive(compose->toolbar->sendl_btn, sensitive);
-       if (compose->toolbar->draft_btn )
-               gtk_widget_set_sensitive(compose->toolbar->draft_btn , sensitive);
-       if (compose->toolbar->insert_btn )
-               gtk_widget_set_sensitive(compose->toolbar->insert_btn , sensitive);
-       if (compose->toolbar->attach_btn)
-               gtk_widget_set_sensitive(compose->toolbar->attach_btn, sensitive);
-       if (compose->toolbar->sig_btn)
-               gtk_widget_set_sensitive(compose->toolbar->sig_btn, sensitive);
-       if (compose->toolbar->exteditor_btn)
-               gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, sensitive);
-       if (compose->toolbar->linewrap_btn)
-               gtk_widget_set_sensitive(compose->toolbar->linewrap_btn, sensitive);
-       if (compose->toolbar->addrbook_btn)
-               gtk_widget_set_sensitive(compose->toolbar->addrbook_btn, sensitive);
-       for (; items != NULL; items = g_slist_next(items)) {
-               ToolbarSylpheedActions *item = (ToolbarSylpheedActions *)items->data;
-               gtk_widget_set_sensitive(item->widget, sensitive);
-       }
-}
-
 static GtkWidget *compose_account_option_menu_create(Compose *compose)
 {
        GList *accounts;
@@ -5379,8 +5174,7 @@ void compose_reflect_prefs_pixmap_theme(void)
 
        for (cur = compose_list; cur != NULL; cur = cur->next) {
                compose = (Compose *)cur->data;
-               compose_toolbar_update(compose);
-               common_toolbar_set_style(compose, TOOLBAR_COMPOSE);
+               toolbar_update(TOOLBAR_COMPOSE, compose);
        }
 }
 
@@ -5491,8 +5285,7 @@ static void compose_destroy(Compose *compose)
 
        gtk_widget_destroy(compose->paned);
 
-       TOOLBAR_DESTROY_ITEMS(compose->toolbar->item_list);
-       TOOLBAR_DESTROY_ACTIONS(compose->toolbar->action_list);
+       toolbar_destroy(compose->toolbar);
        g_free(compose->toolbar);
        g_free(compose);
 
@@ -6156,57 +5949,6 @@ static gboolean compose_edit_size_alloc(GtkEditable *widget,
        return TRUE;
 }
 
-static void toolbar_send_cb(GtkWidget *widget, gpointer data)
-{
-       compose_send_cb(data, 0, NULL);
-}
-
-static void toolbar_send_later_cb(GtkWidget *widget, gpointer data)
-{
-       compose_send_later_cb(data, 0, NULL);
-}
-
-static void toolbar_draft_cb(GtkWidget *widget, gpointer data)
-{
-       compose_draft_cb(data, 0, NULL);
-}
-
-static void toolbar_insert_cb(GtkWidget *widget, gpointer data)
-{
-       compose_insert_file_cb(data, 0, NULL);
-}
-
-static void toolbar_attach_cb(GtkWidget *widget, gpointer data)
-{
-       compose_attach_cb(data, 0, NULL);
-}
-
-static void toolbar_sig_cb(GtkWidget *widget, gpointer data)
-{
-       Compose *compose = (Compose *)data;
-
-       compose_insert_sig(compose);
-}
-
-static void toolbar_ext_editor_cb(GtkWidget *widget, gpointer data)
-{
-       Compose *compose = (Compose *)data;
-
-       compose_exec_ext_editor(compose);
-}
-
-static void toolbar_linewrap_cb(GtkWidget *widget, gpointer data)
-{
-       Compose *compose = (Compose *)data;
-
-       compose_wrap_line(compose);
-}
-
-static void toolbar_address_cb(GtkWidget *widget, gpointer data)
-{
-       compose_address_cb(data, 0, NULL);
-}
-
 static void account_activated(GtkMenuItem *menuitem, gpointer data)
 {
        Compose *compose = (Compose *)data;
@@ -6271,7 +6013,7 @@ static void attach_key_pressed(GtkWidget *widget, GdkEventKey *event,
 static void compose_allow_user_actions (Compose *compose, gboolean allow)
 {
        GtkItemFactory *ifactory = gtk_item_factory_from_widget(compose->menubar);
-       compose_toolbar_set_sensitive(compose, allow);
+       toolbar_comp_set_sensitive(compose, allow);
        menu_set_sensitive(ifactory, "/File", allow);
        menu_set_sensitive(ifactory, "/Edit", allow);
        menu_set_sensitive(ifactory, "/Spelling", allow);
index de86174d35526c98fb9c20a4e501c568e227e98b..886847d14b168bfde2beb1dd7152c69a1cf46edc 100644 (file)
@@ -257,5 +257,7 @@ void compose_reflect_prefs_pixmap_theme     (void);
 
 void compose_destroy_all                (void);
 void compose_draft                     (gpointer data);
+void compose_toolbar_cb                        (gint           action, 
+                                        gpointer       data);
 
 #endif /* __COMPOSE_H__ */
index 181d234dd2bf0001f7954faafcd16d5413794e93..b56185a66dd72647f505f455a07ac15607393fdd 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -270,7 +270,7 @@ static gint inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
                gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
                
                if (mainwin) {
-                       toolbar_set_sensitive(mainwin);
+                       toolbar_main_set_sensitive(mainwin);
                        main_window_set_menu_sensitive(mainwin);
                }
                        
@@ -370,7 +370,7 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean notify)
                gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
        }
 
-       toolbar_set_sensitive(mainwin);
+       toolbar_main_set_sensitive(mainwin);
        main_window_set_menu_sensitive(mainwin);
 
        new_msgs += inc_start(inc_dialog);
index c818ca697e1ca3f669fc9adac5266dc021bf5382..da6e941557cf6e36622406a587c4f560be5ff39b 100644 (file)
@@ -192,114 +192,6 @@ static void prefs_toolbar_cb        (MainWindow *mainwin,
                                 guint action,
                                 GtkWidget *widget);
 
-static void reply_cb                             (MainWindow   *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
-static void inc_mail_cb                                  (MainWindow   *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
-static void inc_all_account_mail_cb              (MainWindow   *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
-
-static void send_queue_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 next_unread_cb                        (MainWindow  *mainwin,
-                                         guint          action,
-                                         GtkWidget     *widget);
-
-static void toolbar_inc_cb             (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_inc_all_cb         (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_send_cb            (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_compose_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_list_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);
-
-static void toolbar_exec_cb            (GtkWidget      *widget,
-                                        gpointer        data);
-
-static void toolbar_next_unread_cb     (GtkWidget      *widget,
-                                        gpointer        data);
-
-
-static void toolbar_reply_popup_cb            (GtkWidget       *widget,
-                                               GdkEventButton  *event,
-                                               gpointer         data);
-static void toolbar_reply_popup_closed_cb      (GtkMenuShell   *menu_shell,
-                                               gpointer         data);
-
-static void toolbar_reply_to_all_popup_cb      (GtkWidget      *widget,
-                                               GdkEventButton  *event,
-                                               gpointer         data);
-
-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);
-static void toolbar_reply_to_sender_popup_closed_cb
-                                       (GtkMenuShell   *menu_shell,
-                                        gpointer        data);
-
-static void toolbar_forward_popup_cb    (GtkWidget      *widget,
-                                        GdkEventButton    *event,
-                                        gpointer        data);
-
-static void toolbar_forward_popup_closed_cb            
-                                       (GtkMenuShell   *menu_shell,
-                                        gpointer        data);
-
-static void activate_compose_button     (Toolbar       *toolbar,
-                                        ToolbarStyle      style,
-                                        ComposeButtonType type);
-static void toolbar_buttons_cb          (GtkWidget         *widget, 
-                                        ToolbarItem       *item);
-static void toolbar_create              (MainWindow        *mainwin,
-                                        GtkWidget         *container);
-
-static void toolbar_update              (MainWindow        *mainwin);
 
 static void inc_cancel_cb              (MainWindow     *mainwin,
                                         guint           action,
@@ -405,7 +297,9 @@ static void prev_cb          (MainWindow    *mainwin,
 static void next_cb             (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
-
+static void next_unread_cb      (MainWindow    *mainwin,
+                                 guint          action,
+                                 GtkWidget     *widget);
 static void prev_unread_cb      (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
@@ -805,34 +699,6 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Help/_About"),                   NULL, about_show, 0, NULL}
 };
 
-
-
-static GtkItemFactoryEntry reply_popup_entries[] =
-{
-       {N_("/Reply with _quote"), NULL, reply_cb, COMPOSE_REPLY_WITH_QUOTE, NULL},
-       {N_("/_Reply without quote"), NULL, reply_cb, COMPOSE_REPLY_WITHOUT_QUOTE, NULL}
-};
-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"), NULL, reply_cb, COMPOSE_REPLY_TO_LIST_WITH_QUOTE, NULL},
-       {N_("/_Reply to list without quote"), NULL, 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},
-       {N_("/_Reply to sender without quote"), NULL, reply_cb, COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE, NULL}
-};
-static GtkItemFactoryEntry fwd_popup_entries[] =
-{
-       {N_("/_Forward message (inline style)"), "f", reply_cb, COMPOSE_FORWARD_INLINE, NULL},
-       {N_("/Forward message as _attachment"), "<shift>F", reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}
-};
-
 MainWindow *main_window_create(SeparateType type)
 {
        MainWindow *mainwin;
@@ -917,7 +783,9 @@ MainWindow *main_window_create(SeparateType type)
        mainwin->window       = window;
        
        /* create toolbar */
-       toolbar_create(mainwin, handlebox);
+       mainwin->toolbar = toolbar_create(TOOLBAR_MAIN, 
+                                         handlebox, 
+                                         (gpointer)mainwin);
 
        /* vbox that contains body */
        vbox_body = gtk_vbox_new(FALSE, BORDER_WIDTH);
@@ -1082,7 +950,7 @@ MainWindow *main_window_create(SeparateType type)
                           GTK_SIGNAL_FUNC(ac_menu_popup_closed), mainwin);
        mainwin->ac_menu = ac_menu;
 
-       toolbar_set_sensitive(mainwin);
+       toolbar_main_set_sensitive(mainwin);
 
        /* create actions menu */
        update_mainwin_actions_menu(ifactory, mainwin);
@@ -1150,7 +1018,7 @@ void main_window_lock(MainWindow *mainwin)
        mainwin->lock_count++;
 
        main_window_set_menu_sensitive(mainwin);
-       toolbar_set_sensitive(mainwin);
+       toolbar_main_set_sensitive(mainwin);
 }
 
 void main_window_unlock(MainWindow *mainwin)
@@ -1159,7 +1027,7 @@ void main_window_unlock(MainWindow *mainwin)
                mainwin->lock_count--;
 
        main_window_set_menu_sensitive(mainwin);
-       toolbar_set_sensitive(mainwin);
+       toolbar_main_set_sensitive(mainwin);
 
        if (mainwin->lock_count == 0)
                gtk_widget_set_sensitive(mainwin->ac_button, TRUE);
@@ -1192,12 +1060,13 @@ void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
 
                main_window_show_cur_account(mainwin);
                main_window_set_menu_sensitive(mainwin);
-               toolbar_set_sensitive(mainwin);
+               toolbar_main_set_sensitive(mainwin);
 
                /* pixmap themes */
                if (pixmap_theme_changed) {
-                       toolbar_update(mainwin);
-                       common_toolbar_set_style(mainwin, TOOLBAR_MAIN);
+                       toolbar_update(TOOLBAR_MAIN, mainwin);
+                       messageview_reflect_prefs_pixmap_theme();
+                       compose_reflect_prefs_pixmap_theme();
                        folderview_reflect_prefs_pixmap_theme(mainwin->folderview);
                        summary_reflect_prefs_pixmap_theme(mainwin->summaryview);
 
@@ -1802,6 +1671,8 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
        GtkWidget *vbox_body = mainwin->vbox_body;
        GtkItemFactory *ifactory = mainwin->menu_factory;
        GtkWidget *menuitem;
+       GtkWidget *vbox;
+       GtkItemFactory *msgview_ifactory;
 
        debug_print("Setting widgets...");
 
@@ -1944,8 +1815,10 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                                     prefs_common.mainview_width,
                                     prefs_common.mainwin_height);
                gtk_widget_show_all(hpaned);
-               gtk_container_add(GTK_CONTAINER(messagewin),
-                                 GTK_WIDGET_PTR(mainwin->messageview));
+
+               messageview_add_toolbar(mainwin->messageview, messagewin);
+               msgview_ifactory = gtk_item_factory_from_widget(mainwin->messageview->menubar);
+               menu_set_sensitive(msgview_ifactory, "/File/Close", FALSE);
 
                mainwin->win.sep_message.messagewin = messagewin;
                mainwin->win.sep_message.hpaned     = hpaned;
@@ -2245,670 +2118,10 @@ static void toggle_message_cb(MainWindow *mainwin, guint action,
                summary_toggle_view(mainwin->summaryview);
 }
 
-/* Toolbar handling */
-static void toolbar_inc_cb(GtkWidget   *widget,
-                          gpointer      data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       inc_mail_cb(mainwin, 0, NULL);
-}
-
-static void toolbar_inc_all_cb(GtkWidget       *widget,
-                              gpointer  data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       inc_all_account_mail_cb(mainwin, 0, NULL);
-}
-
-static void toolbar_send_cb(GtkWidget  *widget,
-                           gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       send_queue_cb(mainwin, 0, NULL);
-}
-
-static void toolbar_compose_cb(GtkWidget  *widget,
-                              gpointer    data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       if (mainwin->toolbar->compose_btn_type == COMPOSEBUTTON_NEWS) 
-               compose_news_cb(mainwin, 0, NULL);
-       else
-               compose_mail_cb(mainwin, 0, NULL);
-}
-
-static void toolbar_reply_cb(GtkWidget   *widget, 
-                            gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       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, 
-                                   gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       reply_cb(mainwin, 
-                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_ALL_WITH_QUOTE 
-                : COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, 
-                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)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       reply_cb(mainwin, 
-                prefs_common.reply_with_quote ? COMPOSE_REPLY_TO_SENDER_WITH_QUOTE 
-                : COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE, 
-                NULL);
-}
-
-static void toolbar_forward_cb(GtkWidget       *widget,
-                              gpointer          data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       if (prefs_common.forward_as_attachment)
-               reply_cb(mainwin, COMPOSE_FORWARD_AS_ATTACH, NULL);
-       else
-               reply_cb(mainwin, COMPOSE_FORWARD, NULL);
-}
-
-static void toolbar_exec_cb(GtkWidget  *widget,
-                           gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       summary_execute(mainwin->summaryview);
-}
-
-static void toolbar_next_unread_cb(GtkWidget   *widget,
-                                  gpointer      data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       next_unread_cb(mainwin, 0, NULL);
-}
-
-/* popup callback functions */
-static void toolbar_reply_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->reply_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
-}
-
-static void toolbar_reply_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->reply_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(mainwin->window, NULL, NULL);
-}
-
-static void toolbar_reply_to_all_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->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)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->replyall_btn), GTK_RELIEF_NONE);
-       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;
-
-       if (!event) return;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(mainwindow->toolbar->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)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->replysender_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(mainwin->window, NULL, NULL);
-}
-
-static void toolbar_forward_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->fwd_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-       }
-}
-
-static void toolbar_forward_popup_closed_cb (GtkMenuShell *menu_shell, 
-                                            gpointer     data)
-{
-       MainWindow *mainwin = (MainWindow *)data;
-
-       gtk_button_set_relief(GTK_BUTTON(mainwin->toolbar->fwd_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(mainwin->window, NULL, NULL);
-}
-
-static void activate_compose_button (Toolbar           *toolbar,
-                                    ToolbarStyle      style,
-                                    ComposeButtonType type)
-{
-       if ((!toolbar->compose_mail_btn) || (!toolbar->compose_news_btn))
-               return;
-
-       gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? toolbar->compose_mail_btn 
-                       : toolbar->compose_news_btn);
-       gtk_widget_show(type == COMPOSEBUTTON_NEWS ? toolbar->compose_news_btn
-                       : toolbar->compose_mail_btn);
-       toolbar->compose_btn_type = type;       
-}
-
-void toolbar_set_compose_button(Toolbar            *toolbar, 
-                               ComposeButtonType  compose_btn_type)
-{
-       if (toolbar->compose_btn_type != compose_btn_type)
-               activate_compose_button(toolbar, 
-                                       prefs_common.toolbar_style,
-                                       compose_btn_type);
-}
-
-static void toolbar_buttons_cb(GtkWidget         *widget, 
-                              ToolbarItem       *item)
-{
-       struct {
-               gint   index;
-               void (*func)(GtkWidget *widget, gpointer data);
-       } toolbar_action[] = {
-               { A_RECEIVE_ALL,    toolbar_inc_all_cb                  },
-               { A_RECEIVE_CUR,    toolbar_inc_cb                      },
-               { A_SEND_QUEUED,    toolbar_send_cb                     },
-               { A_COMPOSE_EMAIL,  toolbar_compose_cb                  },
-               { 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,         common_toolbar_delete_cb            },
-               { A_EXECUTE,        toolbar_exec_cb                     },
-               { A_GOTO_NEXT,      toolbar_next_unread_cb              },
-               { A_SYL_ACTIONS,    common_toolbar_actions_execute_cb   },
-               
-               { A_COMPOSE_NEWS,   toolbar_compose_cb                  },    
-               { A_SEPARATOR,      NULL                                }};
-
-       gint num_items = sizeof(toolbar_action)/sizeof(toolbar_action[0]);
-       gint i;
-
-       for (i = A_RECEIVE_ALL; i < num_items; i++) {
-
-               if (toolbar_action[i].index == item->index) {
-                       if ((item->index == A_SYL_ACTIONS) || (item->index == A_DELETE))
-                               /* the common_toolbar_* stuff takes item->parent as data
-                                  pointer */                              
-                               toolbar_action[i].func(widget, (gpointer)item->parent);
-                       else /* to be removed */
-                               toolbar_action[i].func(widget, (gpointer)item->parent->data);
-                       break;
-               }
-       }
-}
-
-void toolbar_set_sensitive(MainWindow *mainwin)
-{
-       SensitiveCond state;
-       gboolean sensitive;
-       Toolbar *toolbar = mainwin->toolbar;
-       GSList *cur;
-       GSList *entry_list = NULL;
-       
-       typedef struct _Entry Entry;
-       struct _Entry {
-               GtkWidget *widget;
-               SensitiveCond cond;
-               gboolean empty;
-       };
-
-#define SET_WIDGET_COND(w, c)     \
-{ \
-       Entry *e = g_new0(Entry, 1); \
-       e->widget = w; \
-       e->cond   = c; \
-       entry_list = g_slist_append(entry_list, e); \
-}
-
-       SET_WIDGET_COND(toolbar->get_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
-       SET_WIDGET_COND(toolbar->getall_btn, M_HAVE_ACCOUNT|M_UNLOCKED);
-       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->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);
-
-       SET_WIDGET_COND(toolbar->next_btn, M_MSG_EXIST);
-       SET_WIDGET_COND(toolbar->delete_btn,
-                       M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED);
-       SET_WIDGET_COND(toolbar->exec_btn, M_DELAY_EXEC);
-
-       for (cur = toolbar->action_list; cur != NULL;  cur = cur->next) {
-               ToolbarSylpheedActions *act = (ToolbarSylpheedActions*)cur->data;
-               
-               SET_WIDGET_COND(act->widget, M_TARGET_EXIST|M_UNLOCKED);
-       }
-
-#undef SET_WIDGET_COND
-
-       state = main_window_get_current_state(mainwin);
-
-       for (cur = entry_list; cur != NULL; cur = cur->next) {
-               Entry *e = (Entry*) cur->data;
-
-               if (e->widget != NULL) {
-                       sensitive = ((e->cond & state) == e->cond);
-                       gtk_widget_set_sensitive(e->widget, sensitive); 
-               }
-       }
-       
-       while (entry_list != NULL) {
-               Entry *e = (Entry*) entry_list->data;
-
-               if (e)
-                       g_free(e);
-               entry_list = g_slist_remove(entry_list, e);
-       }
-
-       g_slist_free(entry_list);
-
-       activate_compose_button(toolbar, 
-                               prefs_common.toolbar_style,
-                               toolbar->compose_btn_type);
-}
-
-static void toolbar_update(MainWindow *mainwin)
-{
-       gtk_container_remove(GTK_CONTAINER(mainwin->handlebox), 
-                            GTK_WIDGET(mainwin->toolbar->toolbar));
-       
-       mainwin->toolbar->toolbar    = NULL;
-       mainwin->toolbar->get_btn    = NULL;
-       mainwin->toolbar->getall_btn = NULL;
-       mainwin->toolbar->send_btn   = NULL;
-       mainwin->toolbar->compose_mail_btn = NULL;
-       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;    
-       mainwin->toolbar->next_btn   = NULL;    
-       mainwin->toolbar->exec_btn   = NULL;
-
-       toolbar_clear_list(TOOLBAR_MAIN);
-       TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list);
-       toolbar_create(mainwin, mainwin->handlebox);    
-       toolbar_set_sensitive(mainwin);
-
-}
-
-static void toolbar_create(MainWindow *mainwin,
-                          GtkWidget  *container)
-{
-       ToolbarItem *toolbar_item;
-
-       GtkWidget *toolbar;
-       GtkWidget *icon_wid  = NULL;
-       GtkWidget *icon_news = NULL;
-       GtkWidget *item_news = NULL;
-       GtkWidget *item;
-       GtkTooltips *toolbar_tips;
-       ToolbarSylpheedActions *action_item;
-       GSList *cur;
-       GSList *toolbar_list;
-
-       guint n_menu_entries;
-       GtkWidget *reply_popup;
-       GtkWidget *replyall_popup;
-       GtkWidget *replylist_popup;
-       GtkWidget *replysender_popup;
-       GtkWidget *fwd_popup;
-
-       toolbar_tips = gtk_tooltips_new();
-
-       if (mainwin->toolbar != NULL) {
-               toolbar_clear_list(TOOLBAR_MAIN);
-               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list);
-               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->item_list);
-               g_free(mainwin->toolbar);
-       }
-
-       toolbar_read_config_file(TOOLBAR_MAIN);
-       toolbar_list = toolbar_get_list(TOOLBAR_MAIN);
-
-       mainwin->toolbar = g_new0(Toolbar, 1); 
-
-       toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
-                                 GTK_TOOLBAR_BOTH);
-       gtk_container_add(GTK_CONTAINER(container), toolbar);
-       gtk_container_set_border_width(GTK_CONTAINER(container), 2);
-       gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE);
-       gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
-                                   GTK_TOOLBAR_SPACE_LINE);
-       
-       for (cur = toolbar_list; cur != NULL; cur = cur->next) {
-       
-               if (g_strcasecmp(((ToolbarItem*)cur->data)->file, SEPARATOR) == 0) {
-                       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-                       continue;
-               }
-               
-               toolbar_item = g_new0(ToolbarItem, 1); 
-               toolbar_item->file = g_strdup(((ToolbarItem*)cur->data)->file);
-               toolbar_item->text = g_strdup(((ToolbarItem*)cur->data)->text);
-               toolbar_item->index = ((ToolbarItem*)cur->data)->index;
-               
-               toolbar_item->parent = g_new0(ToolbarParent, 1);
-               toolbar_item->parent->data = (gpointer)mainwin;
-               toolbar_item->parent->type = TOOLBAR_MAIN;
-
-               /* collect toolbar items in list to keep track */
-               mainwin->toolbar->item_list = g_slist_append(mainwin->toolbar->item_list, 
-                                                            toolbar_item);
-               
-               icon_wid = stock_pixmap_widget(container, stock_pixmap_get_icon(toolbar_item->file));
-               item  = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                               toolbar_item->text,
-                                               (""),
-                                               (""),
-                                               icon_wid, toolbar_buttons_cb, 
-                                               toolbar_item);
-               
-               switch (toolbar_item->index) {
-               case A_RECEIVE_ALL:
-                       mainwin->toolbar->getall_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->getall_btn, 
-                                          _("Receive Mail on all Accounts"), NULL);
-                       break;
-               case A_RECEIVE_CUR:
-                       mainwin->toolbar->get_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->get_btn,
-                                          _("Receive Mail on current Account"), NULL);
-                       break;
-               case A_SEND_QUEUED:
-                       mainwin->toolbar->send_btn = item; 
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->send_btn,
-                                          _("Send Queued Message(s)"), NULL);
-                       break;
-               case A_COMPOSE_EMAIL:
-                       icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
-                       item_news = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                                           _("News"),
-                                                           (""),
-                                                           (""),
-                                                           icon_news, toolbar_buttons_cb, 
-                                                           toolbar_item);
-                       mainwin->toolbar->compose_mail_btn = item; 
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->compose_mail_btn,
-                                          _("Compose Email"), NULL);
-                       mainwin->toolbar->compose_news_btn = item_news;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->compose_news_btn,
-                                          _("Compose News"), NULL);
-                       break;
-               case A_REPLY_MESSAGE:
-                       mainwin->toolbar->reply_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->reply_btn,
-                                          _("Reply to Message"), NULL);
-                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->reply_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_popup_cb),
-                                          mainwin);
-                       n_menu_entries = sizeof(reply_popup_entries) /
-                               sizeof(reply_popup_entries[0]);
-                       reply_popup = popupmenu_create(mainwin->window, reply_popup_entries, n_menu_entries,
-                                                      "<ReplyPopup>", mainwin);
-                       gtk_signal_connect(GTK_OBJECT(reply_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_popup_closed_cb), mainwin);
-                       mainwin->toolbar->reply_popup       = reply_popup;
-                       break;
-               case A_REPLY_SENDER:
-                       mainwin->toolbar->replysender_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->replysender_btn,
-                                          _("Reply to Sender"), NULL);
-                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->replysender_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_cb),
-                                          mainwin);
-                       n_menu_entries = sizeof(replysender_popup_entries) /
-                               sizeof(replysender_popup_entries[0]);
-                       replysender_popup = popupmenu_create(mainwin->window, 
-                                                            replysender_popup_entries, n_menu_entries,
-                                                            "<ReplySenderPopup>", mainwin);
-                       gtk_signal_connect(GTK_OBJECT(replysender_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_closed_cb), mainwin);
-                       mainwin->toolbar->replysender_popup = replysender_popup;
-                       break;
-               case A_REPLY_ALL:
-                       mainwin->toolbar->replyall_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->replyall_btn,
-                                          _("Reply to All"), NULL);
-                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->replyall_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_cb),
-                                          mainwin);
-                       n_menu_entries = sizeof(replyall_popup_entries) /
-                               sizeof(replyall_popup_entries[0]);
-                       replyall_popup = popupmenu_create(mainwin->window, 
-                                                         replyall_popup_entries, n_menu_entries,
-                                                         "<ReplyAllPopup>", mainwin);
-                       gtk_signal_connect(GTK_OBJECT(replyall_popup), "selection_done",
-                                          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), 
-                                            mainwin->toolbar->fwd_btn,
-                                          _("Forward Message"), NULL);
-                       gtk_signal_connect(GTK_OBJECT(mainwin->toolbar->fwd_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_forward_popup_cb),
-                                          mainwin);
-                       n_menu_entries = sizeof(fwd_popup_entries) /
-                               sizeof(fwd_popup_entries[0]);
-                       fwd_popup = popupmenu_create(mainwin->window, 
-                                                    fwd_popup_entries, n_menu_entries,
-                                                    "<ForwardPopup>", mainwin);
-                       gtk_signal_connect(GTK_OBJECT(fwd_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_forward_popup_closed_cb), mainwin);
-                       mainwin->toolbar->fwd_popup         = fwd_popup;
-                       break;
-               case A_DELETE:
-                       mainwin->toolbar->delete_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->delete_btn,
-                                          _("Delete Message"), NULL);
-                       break;
-               case A_EXECUTE:
-                       mainwin->toolbar->exec_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->exec_btn,
-                                          _("Execute"), NULL);
-                       break;
-               case A_GOTO_NEXT:
-                       mainwin->toolbar->next_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            mainwin->toolbar->next_btn,
-                                          _("Goto Next Message"), NULL);
-                       break;
-               case A_SYL_ACTIONS:
-                       action_item = g_new0(ToolbarSylpheedActions, 1);
-                       action_item->widget = item;
-                       action_item->name   = g_strdup(toolbar_item->text);
-
-                       mainwin->toolbar->action_list = 
-                               g_slist_append(mainwin->toolbar->action_list,
-                                              action_item);
-
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            item,
-                                            action_item->name, NULL);
-
-                       gtk_widget_show(item);
-                       break;
-               default:
-                       break;
-               }
-       }
-
-       mainwin->toolbar->toolbar = toolbar;
-
-       activate_compose_button(mainwin->toolbar, 
-                               prefs_common.toolbar_style, 
-                               mainwin->toolbar->compose_btn_type);
-
-       gtk_widget_show_all(toolbar);
-}
-
 static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
                              GtkWidget *widget)
 {
-       switch ((ToolbarStyle)action) {
-       case TOOLBAR_NONE:
-               gtk_widget_hide(mainwin->handlebox);
-       case TOOLBAR_ICON:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
-                                     GTK_TOOLBAR_ICONS);
-               break;
-       case TOOLBAR_TEXT:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
-                                     GTK_TOOLBAR_TEXT);
-               break;
-       case TOOLBAR_BOTH:
-               gtk_toolbar_set_style(GTK_TOOLBAR(mainwin->toolbar->toolbar),
-                                     GTK_TOOLBAR_BOTH);
-               break;
-       }
-
-       if (action != TOOLBAR_NONE) {
-               gtk_widget_show(mainwin->handlebox);
-               gtk_widget_queue_resize(mainwin->handlebox);
-       }
-
-       mainwin->toolbar_style = (ToolbarStyle)action;
-       prefs_common.toolbar_style = (ToolbarStyle)action;
+       toolbar_toggle(action, mainwin);
 }
 
 /* END Toolbar Stuff */
@@ -3009,115 +2222,11 @@ static void prefs_toolbar_cb(MainWindow *mainwin, guint action,
        prefs_toolbar_open((ToolbarType)action);
 }
 
-
-void inc_mail_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
-       inc_mail(mainwin, prefs_common.newmail_notify_manu);
-}
-
-void inc_all_account_mail_cb(MainWindow *mainwin, guint action,
-                                   GtkWidget *widget)
-{
-       inc_all_account_mail(mainwin, prefs_common.newmail_notify_manu);
-}
-
 static void inc_cancel_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        inc_cancel_all();
 }
 
-void send_queue_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
-       GList *list;
-
-       if (prefs_common.work_offline)
-               if (alertpanel(_("Offline warning"), 
-                              _("You're working offline. Override?"),
-                              _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
-               return;
-
-       for (list = folder_get_list(); list != NULL; list = list->next) {
-               Folder *folder = list->data;
-
-               if (folder->queue) {
-                       if (procmsg_send_queue
-                               (folder->queue, prefs_common.savemsg) < 0)
-                               alertpanel_error(_("Some errors occurred while sending queued messages."));
-                       folder_item_scan(folder->queue);
-                       folder_update_item(folder->queue, TRUE);
-               }
-       }
-}
-
-void compose_mail_cb(MainWindow *mainwin, guint action,
-                           GtkWidget *widget)
-{
-       PrefsAccount *ac = NULL;
-       FolderItem *item = mainwin->summaryview->folder_item;   
-        GList * list;
-        GList * cur;
-
-       if (item) {
-               ac = account_find_from_item(item);
-               if (ac && ac->protocol != A_NNTP) {
-                       compose_new_with_folderitem(ac, item);          /* CLAWS */
-                       return;
-               }
-       }
-
-       /*
-        * 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)) {
-               ac = (PrefsAccount *) cur->data;
-               if (ac->protocol != A_NNTP) {
-                       compose_new_with_folderitem(ac, item);
-                       return;
-               }
-       }
-}
-
-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(ac,
-                                   mainwin->summaryview->folder_item->path,
-                                   NULL);
-                       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, NULL, NULL);
-                       return;
-               }
-       }
-}
-
-void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
-{
-       summary_reply(mainwin->summaryview, (ComposeMode)action);
-}
-
 static void move_to_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
 {
        summary_move_to(mainwin->summaryview);
@@ -3340,7 +2449,7 @@ static void prev_unread_cb(MainWindow *mainwin, guint action,
        summary_select_prev_unread(mainwin->summaryview);
 }
 
-void next_unread_cb(MainWindow *mainwin, guint action,
+static void next_unread_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
        summary_select_next_unread(mainwin->summaryview);
index 7ce0021467285bd62b875b64f8202fee4b8ad24f..5b1f501055dc9d5b97910bad16dd3045d1e974e0 100644 (file)
@@ -166,8 +166,6 @@ void main_window_toolbar_set_compose_button (MainWindow *mainwin,
 
 SensitiveCond main_window_get_current_state   (MainWindow *mainwin);
 
-void toolbar_set_sensitive                    (MainWindow *mainwin);
-
 void toolbar_set_compose_button               (Toolbar          *toolbar, 
                                               ComposeButtonType  compose_btn_type);
 void main_window_destroy_all                  (void);
index 2bac361a228a1933834422425a47776fab761456..f7c6aab3d4a8d40edb04094e4a536507e629c4a5 100644 (file)
@@ -65,10 +65,6 @@ static void key_pressed                      (GtkWidget      *widget,
 static void focus_in                   (GtkWidget      *widget, 
                                         GdkEventFocus  *event,
                                         gpointer        data);
-static void messageview_toolbar_create (MessageView    *messageview,
-                                        GtkWidget      *container);
-static void toolbar_messageview_buttons_cb  (GtkWidget      *widget, 
-                                            ToolbarItem    *item);
 
 static void return_receipt_show                (NoticeView     *noticeview, 
                                         MsgInfo        *msginfo);      
@@ -78,17 +74,14 @@ static void return_receipt_send_clicked (NoticeView *noticeview,
 static PrefsAccount *select_account_from_list
                                        (GList          *ac_list);
 
-static void messageview_reply_cb       (gpointer        data,
-                                        guint           action,
-                                        GtkWidget      *widget);
-                                        
-static void messageview_delete_cb      (gpointer        data,
-                                        guint           action,
-                                        GtkWidget      *widget);
+static void messageview_menubar_cb     (gpointer        data, 
+                                        guint           action, 
+                                        GtkWidget      *widget);
                                         
 static void messageview_close_cb       (gpointer        data,
                                         guint           action,
                                         GtkWidget      *widget);
+static GList *msgview_list = NULL;
 
 MessageView *messageview_create(MainWindow *mainwin)
 {
@@ -154,33 +147,59 @@ static GtkItemFactoryEntry messageview_entries[] =
        {N_("/_File/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_File/_Close"),                   "<control>W", messageview_close_cb, 0, NULL},
 
-       {N_("/_Message"),               NULL, NULL, 0, "<Branch>"},
-       {N_("/_Message/_Reply"),                "<control>R",   messageview_reply_cb, COMPOSE_REPLY, NULL},
+       {N_("/_Message"),                       NULL, NULL, 0, "<Branch>"},
+       {N_("/_Message/_Reply"),                "<control>R",   messageview_menubar_cb, COMPOSE_REPLY, NULL},
        {N_("/_Message/Repl_y to"),             NULL, NULL, 0, "<Branch>"},
-       {N_("/_Message/Repl_y to/_all"),        "<shift><control>R", messageview_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
-       {N_("/_Message/Repl_y to/_sender"),     NULL, messageview_reply_cb, COMPOSE_REPLY_TO_SENDER, NULL},
+       {N_("/_Message/Repl_y to/_all"),        "<shift><control>R", messageview_menubar_cb, COMPOSE_REPLY_TO_ALL, NULL},
+       {N_("/_Message/Repl_y to/_sender"),     NULL, messageview_menubar_cb, COMPOSE_REPLY_TO_SENDER, NULL},
        {N_("/_Message/Repl_y to/mailing _list"),
-                                               "<control>L", messageview_reply_cb, COMPOSE_REPLY_TO_LIST, NULL},
-       {N_("/_Message/Follow-up and reply to"),NULL, messageview_reply_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
+                                               "<control>L", messageview_menubar_cb, COMPOSE_REPLY_TO_LIST, NULL},
+       {N_("/_Message/Follow-up and reply to"),NULL, messageview_menubar_cb, COMPOSE_FOLLOWUP_AND_REPLY_TO, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
-       {N_("/_Message/_Delete"),               "<control>D", messageview_delete_cb,  0, NULL},
+       {N_("/_Message/_Delete"),               "<control>D", delete_msgview_cb,  0, NULL},
        
-       {N_("/_Help"),                  NULL, NULL, 0, "<Branch>"},
-       {N_("/_Help/_About"),           NULL, about_show, 0, NULL}
+       {N_("/_Help"),                          NULL, NULL, 0, "<Branch>"},
+       {N_("/_Help/_About"),                   NULL, about_show, 0, NULL}
 };
 
 
+GList *messageview_get_msgview_list(void)
+{
+       return msgview_list;
+}
 
-MessageView *messageview_create_with_new_window(MainWindow *mainwin)
+void messageview_add_toolbar(MessageView *msgview, GtkWidget *window) 
 {
-       GtkWidget *window;
-       MessageView *msgview;
+       GtkWidget *handlebox;
        GtkWidget *vbox;
        GtkWidget *menubar;
-       GtkWidget *handlebox;
-
        guint n_menu_entries;
 
+       vbox = gtk_vbox_new(FALSE, 0);
+       gtk_widget_show(vbox);
+       gtk_container_add(GTK_CONTAINER(window), vbox); 
+       
+       n_menu_entries = sizeof(messageview_entries) / sizeof(messageview_entries[0]);
+       menubar = menubar_create(window, messageview_entries,
+                                n_menu_entries, "<MessageView>", msgview);
+       gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+
+       handlebox = gtk_handle_box_new();
+       gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
+       msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, handlebox,
+                                         (gpointer)msgview);
+       msgview->handlebox = handlebox;
+       msgview->menubar   = menubar;
+
+       gtk_container_add(GTK_CONTAINER(vbox),
+                         GTK_WIDGET_PTR(msgview));
+}
+
+MessageView *messageview_create_with_new_window(MainWindow *mainwin)
+{
+       GtkWidget *window;
+       MessageView *msgview;
+
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(window), _("Sylpheed - Message View"));
        gtk_window_set_wmclass(GTK_WINDOW(window), "message_view", "Sylpheed");
@@ -188,10 +207,6 @@ MessageView *messageview_create_with_new_window(MainWindow *mainwin)
        gtk_widget_set_usize(window, prefs_common.msgwin_width,
                             prefs_common.msgwin_height);
 
-       vbox = gtk_vbox_new(FALSE, 0);
-       gtk_widget_show(vbox);
-       gtk_container_add(GTK_CONTAINER(window), vbox);
-       
        msgview = messageview_create(mainwin);
 
        gtk_signal_connect(GTK_OBJECT(window), "size_allocate",
@@ -204,28 +219,19 @@ MessageView *messageview_create_with_new_window(MainWindow *mainwin)
        gtk_signal_connect(GTK_OBJECT(window), "focus_in_event",
                           GTK_SIGNAL_FUNC(focus_in), msgview);
 
-       n_menu_entries = sizeof(messageview_entries) / sizeof(messageview_entries[0]);
-       menubar = menubar_create(window, messageview_entries,
-                                n_menu_entries, "<MessageView>", msgview);
-       gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+       messageview_add_toolbar(msgview, window);
 
-       handlebox = gtk_handle_box_new();
-       gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
-       messageview_toolbar_create(msgview,handlebox);
-
-       gtk_container_add(GTK_CONTAINER(vbox), GTK_WIDGET_PTR(msgview));
        gtk_widget_grab_focus(msgview->textview->text);
        gtk_widget_show_all(window);
 
        msgview->new_window = TRUE;
        msgview->window = window;
        msgview->visible = TRUE;
-       msgview->menubar = menubar; 
-       msgview->handlebox = handlebox;
 
-       
+       toolbar_set_style(msgview->toolbar->toolbar, msgview->handlebox, 
+                         prefs_common.toolbar_style);
        messageview_init(msgview);
-       common_toolbar_set_style(msgview, TOOLBAR_MSGVIEW);
+       msgview_list = g_list_append(msgview_list, msgview);
 
        return msgview;
 }
@@ -581,6 +587,17 @@ static void messageview_change_view_type(MessageView *messageview,
        messageview->type = type;
 }
 
+void messageview_reflect_prefs_pixmap_theme(void)
+{
+       GList *cur;
+       MessageView *msgview;
+
+       for (cur = msgview_list; cur != NULL; cur = cur->next) {
+               msgview = (MessageView*)cur->data;
+               toolbar_update(TOOLBAR_MSGVIEW, msgview);
+       }
+}
+
 void messageview_clear(MessageView *messageview)
 {
        messageview_change_view_type(messageview, MVIEW_TEXT);
@@ -596,6 +613,7 @@ void messageview_destroy(MessageView *messageview)
        GtkWidget *imageview = GTK_WIDGET_PTR(messageview->imageview);
        GtkWidget *mimeview  = GTK_WIDGET_PTR(messageview->mimeview);
 
+       debug_print("destroy messageview\n");
        headerview_destroy(messageview->headerview);
        textview_destroy(messageview->textview);
        imageview_destroy(messageview->imageview);
@@ -603,8 +621,12 @@ void messageview_destroy(MessageView *messageview)
        noticeview_destroy(messageview->noticeview);
 
        toolbar_clear_list(TOOLBAR_MSGVIEW);
-        TOOLBAR_DESTROY_ITEMS(messageview->toolbar->item_list);        
-        TOOLBAR_DESTROY_ACTIONS(messageview->toolbar->action_list);
+       if (messageview->toolbar) {
+               toolbar_destroy(messageview->toolbar);
+               g_free(messageview->toolbar);
+       }
+       
+       msgview_list = g_list_remove(msgview_list, messageview); 
 
        g_free(messageview);
 
@@ -817,197 +839,18 @@ static PrefsAccount *select_account_from_list(GList *ac_list)
        return account_find_from_id(account_id);
 }
 
-static void messageview_toolbar_create(MessageView   *messageview, 
-                                      GtkWidget *container)
-{
-       ToolbarItem *toolbar_item;
-
-       GtkWidget *toolbar;
-       GtkWidget *icon_wid = NULL;
-       GtkWidget *item;
-       GtkTooltips *toolbar_tips;
-       ToolbarSylpheedActions *action_item;
-       GSList *cur;
-       GSList *toolbar_list;
-       toolbar_tips = gtk_tooltips_new();
-       
-       toolbar_read_config_file(TOOLBAR_MSGVIEW);
-       toolbar_list = toolbar_get_list(TOOLBAR_MSGVIEW);
-
-       messageview->toolbar = g_new0(Toolbar, 1); 
-
-       toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
-                                 GTK_TOOLBAR_BOTH);
-       gtk_container_add(GTK_CONTAINER(container), toolbar);
-       gtk_container_set_border_width(GTK_CONTAINER(container), 2);
-       gtk_toolbar_set_button_relief(GTK_TOOLBAR(toolbar), GTK_RELIEF_NONE);
-       gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
-                                   GTK_TOOLBAR_SPACE_LINE);
-       
-       for (cur = toolbar_list; cur != NULL; cur = cur->next) {
-
-               if (g_strcasecmp(((ToolbarItem*)cur->data)->file, SEPARATOR) == 0) {
-                       gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
-                       continue;
-               }
-               
-               toolbar_item = g_new0(ToolbarItem, 1); 
-               toolbar_item->file = g_strdup(((ToolbarItem*)cur->data)->file);
-               toolbar_item->text = g_strdup(((ToolbarItem*)cur->data)->text);
-               toolbar_item->index = ((ToolbarItem*)cur->data)->index;
-
-               toolbar_item->parent = g_new0(ToolbarParent, 1);
-               toolbar_item->parent->data = (gpointer)messageview;
-               toolbar_item->parent->type = TOOLBAR_MSGVIEW;
-
-               /* collect toolbar items in list to keep track */
-               messageview->toolbar->item_list = 
-                       g_slist_append(messageview->toolbar->item_list, 
-                                      toolbar_item);
-
-               icon_wid = stock_pixmap_widget(container, stock_pixmap_get_icon(toolbar_item->file));
-               item  = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                               toolbar_item->text,
-                                               (""),
-                                               (""),
-                                               icon_wid, toolbar_messageview_buttons_cb, 
-                                               toolbar_item);
-               
-               switch (toolbar_item->index) {
-               case A_COMPOSE_EMAIL:
-                       messageview->toolbar->compose_mail_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            messageview->toolbar->compose_mail_btn,
-                                          _("Compose Email"), NULL);
-                       break;
-               case A_REPLY_MESSAGE:
-                       messageview->toolbar->reply_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            messageview->toolbar->reply_btn,
-                                          _("Reply to Message"), NULL);
-                       break;
-               case A_REPLY_SENDER:
-                       messageview->toolbar->replysender_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            messageview->toolbar->replysender_btn,
-                                          _("Reply to Sender"), NULL);
-                       break;
-               case A_REPLY_ALL:
-                       messageview->toolbar->replyall_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            messageview->toolbar->replyall_btn,
-                                          _("Reply to All"), NULL);
-                       break;
-               case A_REPLY_ML:
-                       messageview->toolbar->replylist_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            messageview->toolbar->replylist_btn,
-                                          _("Reply to Mailing-list"), NULL);
-                       break;
-               case A_FORWARD:
-                       messageview->toolbar->fwd_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            messageview->toolbar->fwd_btn,
-                                          _("Forward Message"), NULL);
-                       break;
-               case A_DELETE:
-                       messageview->toolbar->delete_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            messageview->toolbar->delete_btn,
-                                          _("Delete Message"), NULL);
-                       break;
-               case A_GOTO_NEXT:
-                       messageview->toolbar->next_btn = item;
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            messageview->toolbar->next_btn,
-                                          _("Goto Next Message"), NULL);
-                       break;
-               case A_SYL_ACTIONS:
-                       action_item = g_new0(ToolbarSylpheedActions, 1);
-                       action_item->widget = item;
-                       action_item->name   = g_strdup(toolbar_item->text);
-
-                       messageview->toolbar->action_list = 
-                               g_slist_append(messageview->toolbar->action_list,
-                                              action_item);
-
-                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
-                                            item,
-                                            action_item->name, NULL);
-
-                       gtk_widget_show(item);
-                       break;
-               default:
-                       break;
-               }
-
-       }
-       messageview->toolbar->toolbar = toolbar;
-
-       gtk_widget_show_all(toolbar);
-}
-
-static void toolbar_messageview_buttons_cb(GtkWidget   *widget, 
-                                          ToolbarItem *item)
-{
-
-       struct {
-               gint   index;
-               void (*func)(GtkWidget *widget, gpointer data);
-       } messageview_action[] = {
-               { A_COMPOSE_EMAIL,      common_toolbar_compose_cb               },
-               { A_REPLY_MESSAGE,      common_toolbar_reply_cb                 },
-               { A_REPLY_SENDER,       common_toolbar_reply_to_sender_cb       },
-               { A_REPLY_ALL,          common_toolbar_reply_to_all_cb          },
-               { A_REPLY_ML,           common_toolbar_reply_to_list_cb         },
-               { A_FORWARD,            common_toolbar_forward_cb               },
-               { A_DELETE,             common_toolbar_delete_cb                },
-               { A_GOTO_NEXT,          common_toolbar_next_unread_cb           },
-               { A_SYL_ACTIONS,        common_toolbar_actions_execute_cb       },
-               };
-
-
-       gint num_items = sizeof(messageview_action)/sizeof(messageview_action[0]);
-       gint i;
-       for (i = 0; i < num_items; i++) {
-               
-               if (messageview_action[i].index == item->index) {
-                       messageview_action[i].func(widget, (gpointer)item->parent);
-                       break;
-               }
-       }
-}
-
-void messageview_reply_cb(gpointer data, guint action, GtkWidget *widget)
+static void messageview_menubar_cb(gpointer data, guint action, GtkWidget *widget)
 {
-       MessageView *messageview = (MessageView *)data;
-       
-       switch (action) {
-       case COMPOSE_REPLY:
-               common_toolbar_reply_cb(NULL,messageview);
-               break;
-       case COMPOSE_REPLY_TO_ALL:
-               common_toolbar_reply_to_all_cb(NULL,messageview);
-               break;
-       case COMPOSE_REPLY_TO_SENDER:
-               common_toolbar_reply_to_sender_cb(NULL,messageview);
-               break;
-       case COMPOSE_REPLY_TO_LIST:
-               common_toolbar_reply_to_list_cb(NULL,messageview);
-               break;
-       }
-}
-
-static void messageview_delete_cb(gpointer data, guint action, GtkWidget *widget)
-{
-       MessageView *messageview = (MessageView *)data;
+       MessageView *msgview = (MessageView*)data;
+       MainWindow *mainwin = (MainWindow*)msgview->mainwin;
 
-       common_toolbar_delete_cb(NULL,messageview);
+       g_return_if_fail(mainwin != NULL);
+       reply_cb(mainwin, action, widget);
 }
 
 static void messageview_close_cb(gpointer data, guint action, GtkWidget *widget)
 {
        MessageView *messageview = (MessageView *)data;
-
+       
        gtk_widget_destroy(messageview->window);
 }
index f4b4f9d429a65b78657a20774bf04362d53b18f2..dbdfa84eb9d0cb47d6dfa5d9069abffea6fd8c3e 100644 (file)
@@ -43,7 +43,6 @@ typedef enum
 struct _MessageView
 {
        GtkWidget *vbox;
-       GtkWidget *menubar;
 
        MessageType type;
        gboolean new_window;
@@ -52,6 +51,7 @@ struct _MessageView
        /* Toolbar handlebox */
        GtkWidget *handlebox;
        Toolbar *toolbar;
+       GtkWidget *menubar;
 
        HeaderView *headerview;
        TextView *textview;
@@ -86,8 +86,8 @@ void messageview_copy_clipboard                       (MessageView    *messageview);
 void messageview_select_all                    (MessageView    *messageview);
 void messageview_set_position                  (MessageView    *messageview,
                                                 gint            pos);
-void messageview_toggle_view_real(MessageView *messageview);
-
+void messageview_toggle_view_real              (MessageView    *messageview);
+GList *messageview_get_msgview_list            (void);
 gboolean messageview_search_string             (MessageView    *messageview,
                                                 const gchar    *str,
                                                 gboolean        case_sens);
@@ -97,4 +97,7 @@ gboolean messageview_search_string_backward   (MessageView    *messageview,
 
 gboolean messageview_is_visible                        (MessageView    *messageview);
 
+void messageview_add_toolbar                   (MessageView *msgview,
+                                                GtkWidget *vbox);
+void messageview_reflect_prefs_pixmap_theme    (void);
 #endif /* __MESSAGEVIEW_H__ */
index bec3c1c9a188cb8388d958d351cafa07b68e2b72..0371c63003745b554db17852bd06fac9e2af2344 100644 (file)
@@ -1068,7 +1068,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        summary_status_show(summaryview);
        summary_set_menu_sensitive(summaryview);
-       toolbar_set_sensitive(summaryview->mainwin);
+       toolbar_main_set_sensitive(summaryview->mainwin);
 
        debug_print("\n");
        STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
@@ -1131,7 +1131,7 @@ void summary_clear_all(SummaryView *summaryview)
 {
        summary_clear_list(summaryview);
        summary_set_menu_sensitive(summaryview);
-       toolbar_set_sensitive(summaryview->mainwin);
+       toolbar_main_set_sensitive(summaryview->mainwin);
        summary_status_show(summaryview);
 }
 
@@ -2409,7 +2409,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
        }
 
        summary_set_menu_sensitive(summaryview);
-       toolbar_set_sensitive(summaryview->mainwin);
+       toolbar_main_set_sensitive(summaryview->mainwin);
 
        summary_unlock(summaryview);
 }
@@ -4785,7 +4785,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
             GTK_CLIST(ctree)->selection->next) {
                summaryview->display_msg = FALSE;
                summary_set_menu_sensitive(summaryview);
-               toolbar_set_sensitive(summaryview->mainwin);
+               toolbar_main_set_sensitive(summaryview->mainwin);
                return;
        }
 
@@ -4829,7 +4829,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                summaryview->display_msg = FALSE;
        } else {
                summary_set_menu_sensitive(summaryview);
-               toolbar_set_sensitive(summaryview->mainwin);
+               toolbar_main_set_sensitive(summaryview->mainwin);
        }
 }