messageview toolbar patch 4 by Ivan Francolin Martinez (ivanfm@sourceforge.net)
authorOliver Haertel <o.h.a@gmx.net>
Thu, 28 Nov 2002 22:56:41 +0000 (22:56 +0000)
committerOliver Haertel <o.h.a@gmx.net>
Thu, 28 Nov 2002 22:56:41 +0000 (22:56 +0000)
ChangeLog.claws
configure.in
src/mainwindow.c
src/mainwindow.h

index 71a00243e2c0903a1b5848eb21f9a959d2775a48..16b47f76207b0e73fba18891f1a25a5fe5f852de 100644 (file)
@@ -1,3 +1,9 @@
+2002-11-28 [Ivan Francolin Martinez (ivanfm@sourceforge.net)]  0.8.6claws31
+       
+       * src/mainwindow.[ch]
+               add patch by Ivan F. Martinez introducing messageview Toolbar
+               some changes and committed by oliver    
+
 2002-11-28 [Ivan Francolin Martinez (ivanfm@sourceforge.net)]  0.8.6claws30
 
        * src/messageview.[ch]
index a5278f1fe09fb21df6cc817df550c4854a506333..f55e1f663738880209559cc4e3019ed907ab94a9 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws30
+EXTRA_VERSION=claws31
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index f19cb18c0251c0a6933532b7afde3fad8b3cfe8d..fa64f2d5182e625cd13fc9e1e5187a7646e6d3b0 100644 (file)
@@ -293,13 +293,11 @@ static void toolbar_forward_popup_closed_cb
                                        (GtkMenuShell   *menu_shell,
                                         gpointer        data);
 
-static void activate_compose_button     (MainToolbar       *toolbar,
+static void activate_compose_button     (Toolbar       *toolbar,
                                         ToolbarStyle      style,
                                         ComposeButtonType type);
-static void toolbar_actions_execute_cb  (GtkWidget         *widget,
-                                        gpointer           data);
 static void toolbar_buttons_cb          (GtkWidget         *widget, 
-                                        ToolbarItem       *toolbar_item);
+                                        ToolbarItem       *item);
 static void toolbar_create              (MainWindow        *mainwin,
                                         GtkWidget         *container);
 
@@ -496,8 +494,6 @@ static void key_pressed (GtkWidget *widget,
                                GdkEventKey *event,
                                gpointer data);
 
-static void set_toolbar_style(MainWindow *mainwin);
-
 static void toggle_work_offline_cb(MainWindow *mainwin, guint action, GtkWidget *widget);
 
 static void addr_harvest_cb     ( MainWindow  *mainwin,
@@ -786,6 +782,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
                                                NULL, prefs_toolbar_cb, TOOLBAR_MAIN, NULL},
        {N_("/_Configuration/C_ustomize toolbars/_Compose window..."),
                                                NULL, prefs_toolbar_cb, TOOLBAR_COMPOSE, NULL},
+       {N_("/_Configuration/C_ustomize toolbars/M_essageView ..."),
+                                               NULL, prefs_toolbar_cb, TOOLBAR_MSGVIEW, NULL},
        {N_("/_Configuration/_Scoring..."),
                                                NULL, prefs_scoring_open_cb, 0, NULL},
        {N_("/_Configuration/_Filtering..."),
@@ -987,8 +985,6 @@ MainWindow *main_window_create(SeparateType type)
        summaryview->messageview = messageview;
        summaryview->window      = window;
 
-       messageview->mainwin     = mainwin;
-
        mainwin->vbox         = vbox;
        mainwin->menubar      = menubar;
        mainwin->menu_factory = ifactory;
@@ -1205,7 +1201,7 @@ void main_window_reflect_prefs_all_real(gboolean pixmap_theme_changed)
                /* pixmap themes */
                if (pixmap_theme_changed) {
                        toolbar_update(mainwin);
-                       set_toolbar_style(mainwin);
+                       common_toolbar_set_style(mainwin, TOOLBAR_MAIN);
                        folderview_reflect_prefs_pixmap_theme(mainwin->folderview);
                        summary_reflect_prefs_pixmap_theme(mainwin->summaryview);
 
@@ -1301,7 +1297,8 @@ void main_window_separation_change(MainWindow *mainwin, SeparateType type)
 {
        GtkWidget *folder_wid  = GTK_WIDGET_PTR(mainwin->folderview);
        GtkWidget *summary_wid = GTK_WIDGET_PTR(mainwin->summaryview);
-       GtkWidget *message_wid = GTK_WIDGET_PTR(mainwin->messageview);
+       //GtkWidget *message_wid = GTK_WIDGET_PTR(mainwin->messageview);
+       GtkWidget *message_wid = mainwin->messageview->vbox;
 
        debug_print("Changing window separation type from %d to %d\n",
                    mainwin->type, type);
@@ -2060,8 +2057,8 @@ void main_window_destroy_all(void)
                
                /* free toolbar stuff */
                toolbar_clear_list(TOOLBAR_MAIN);
-               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->t_action_list);
-               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->t_item_list);
+               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list);
+               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->item_list);
 
                g_free(mainwin->toolbar);
                g_free(mainwin);
@@ -2520,7 +2517,7 @@ static void toolbar_forward_popup_closed_cb (GtkMenuShell *menu_shell,
        manage_window_focus_in(mainwin->window, NULL, NULL);
 }
 
-static void activate_compose_button (MainToolbar       *toolbar,
+static void activate_compose_button (Toolbar           *toolbar,
                                     ToolbarStyle      style,
                                     ComposeButtonType type)
 {
@@ -2534,7 +2531,7 @@ static void activate_compose_button (MainToolbar       *toolbar,
        toolbar->compose_btn_type = type;       
 }
 
-void toolbar_set_compose_button(MainToolbar       *toolbar, 
+void toolbar_set_compose_button(Toolbar            *toolbar, 
                                ComposeButtonType  compose_btn_type)
 {
        if (toolbar->compose_btn_type != compose_btn_type)
@@ -2544,55 +2541,51 @@ void toolbar_set_compose_button(MainToolbar       *toolbar,
 }
 
 static void toolbar_buttons_cb(GtkWidget         *widget, 
-                              ToolbarItem       *t_item)
+                              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,         toolbar_delete_cb          },
-               { A_EXECUTE,        toolbar_exec_cb            },
-               { A_GOTO_NEXT,      toolbar_next_unread_cb     },
-               { A_SYL_ACTIONS,    toolbar_actions_execute_cb },
+               { 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                       }};
+               { 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 == t_item->index) {
-                       MainWindow *mainwin = (MainWindow*)t_item->parent;
-                       toolbar_action[i].func(widget, mainwin);
+               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;
                }
        }
 }
 
-static void toolbar_actions_execute_cb(GtkWidget *widget,
-                                      gpointer   data)
-{
-       MainWindow *mainwin = (MainWindow*)data;
-
-       toolbar_action_execute(widget, mainwin->toolbar->t_action_list, data, TOOLBAR_MAIN);
-}
-
 void toolbar_set_sensitive(MainWindow *mainwin)
 {
        SensitiveCond state;
        gboolean sensitive;
-       MainToolbar *toolbar = mainwin->toolbar;
+       Toolbar *toolbar = mainwin->toolbar;
        GSList *cur;
        GSList *entry_list = NULL;
        
@@ -2629,7 +2622,7 @@ void toolbar_set_sensitive(MainWindow *mainwin)
                        M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED);
        SET_WIDGET_COND(toolbar->exec_btn, M_DELAY_EXEC);
 
-       for (cur = toolbar->t_action_list; cur != NULL;  cur = cur->next) {
+       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);
@@ -2684,7 +2677,7 @@ static void toolbar_update(MainWindow *mainwin)
        mainwin->toolbar->exec_btn   = NULL;
 
        toolbar_clear_list(TOOLBAR_MAIN);
-       TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->t_action_list);
+       TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->action_list);
        toolbar_create(mainwin, mainwin->handlebox);    
        toolbar_set_sensitive(mainwin);
 
@@ -2701,7 +2694,7 @@ static void toolbar_create(MainWindow *mainwin,
        GtkWidget *item_news = NULL;
        GtkWidget *item;
        GtkTooltips *toolbar_tips;
-       ToolbarSylpheedActions *t_action_item;
+       ToolbarSylpheedActions *action_item;
        GSList *cur;
        GSList *toolbar_list;
 
@@ -2716,15 +2709,15 @@ static void toolbar_create(MainWindow *mainwin,
 
        if (mainwin->toolbar != NULL) {
                toolbar_clear_list(TOOLBAR_MAIN);
-               TOOLBAR_DESTROY_ACTIONS(mainwin->toolbar->t_action_list);
-               TOOLBAR_DESTROY_ITEMS(mainwin->toolbar->t_item_list);
+               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(MainToolbar, 1); 
+       mainwin->toolbar = g_new0(Toolbar, 1); 
 
        toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
                                  GTK_TOOLBAR_BOTH);
@@ -2745,12 +2738,14 @@ static void toolbar_create(MainWindow *mainwin,
                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 = (gpointer)mainwin;
+               
+               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->t_item_list = g_slist_append(mainwin->toolbar->t_item_list, 
-                                                             toolbar_item);
+               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),
@@ -2904,17 +2899,17 @@ static void toolbar_create(MainWindow *mainwin,
                                           _("Goto Next Message"), NULL);
                        break;
                case A_SYL_ACTIONS:
-                       t_action_item = g_new0(ToolbarSylpheedActions, 1);
-                       t_action_item->widget = item;
-                       t_action_item->name   = g_strdup(toolbar_item->text);
+                       action_item = g_new0(ToolbarSylpheedActions, 1);
+                       action_item->widget = item;
+                       action_item->name   = g_strdup(toolbar_item->text);
 
-                       mainwin->toolbar->t_action_list = 
-                               g_slist_append(mainwin->toolbar->t_action_list,
-                                              t_action_item);
+                       mainwin->toolbar->action_list = 
+                               g_slist_append(mainwin->toolbar->action_list,
+                                              action_item);
 
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             item,
-                                            t_action_item->name, NULL);
+                                            action_item->name, NULL);
 
                        gtk_widget_show(item);
                        break;
@@ -3054,9 +3049,9 @@ static void sel_download_cb(MainWindow *mainwin, guint action,
 }
 
 static void prefs_toolbar_cb(MainWindow *mainwin, guint action,
-                              GtkWidget *widget)
+                            GtkWidget *widget)
 {
-       prefs_toolbar(action);
+       prefs_toolbar_open((ToolbarType)action);
 }
 
 
@@ -3581,32 +3576,6 @@ static void key_pressed (GtkWidget *widget, GdkEventKey *event,  gpointer data)
 
 #undef BREAK_ON_MODIFIER_KEY
 
-static void set_toolbar_style(MainWindow *mainwin)
-{
-       switch (prefs_common.toolbar_style) {
-       case TOOLBAR_NONE:
-               gtk_widget_hide(mainwin->handlebox);
-               break;
-       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 (prefs_common.toolbar_style != TOOLBAR_NONE) {
-               gtk_widget_show(mainwin->handlebox);
-               gtk_widget_queue_resize(mainwin->handlebox);
-       }
-}
-
 /*
  * Harvest addresses for selected folder.
  */
index 4ee07fd7b5a666663af0b6e7f119014cdd8346fd..a3191d41ab85baf529b78bcd0260ef8c2e714311 100644 (file)
@@ -23,7 +23,6 @@
 #include <glib.h>
 
 typedef struct _MainWindow  MainWindow;
-typedef struct _MainToolbar MainToolbar;
 
 #include "folderview.h"
 #include "summaryview.h"
@@ -97,11 +96,10 @@ struct _MainWindow
        GtkWidget *menubar;
 
        GtkItemFactory *menu_factory;
-       
+
        /* Toolbar handlebox */
        GtkWidget *handlebox;
-       
-       MainToolbar *toolbar;
+       Toolbar *toolbar;
 
        /* body */
        GtkWidget *vbox_body;
@@ -133,53 +131,6 @@ struct _MainWindow
        MessageView     *messageview;
        LogWindow       *logwin;
 };
-typedef enum 
-{
-       COMPOSEBUTTON_MAIL,
-       COMPOSEBUTTON_NEWS
-} ComposeButtonType;
-
-struct _MainToolbar {
-
-       GtkWidget *toolbar;
-
-       GtkWidget *get_btn;
-       GtkWidget *getall_btn;
-       GtkWidget *sel_down;
-       GtkWidget *sel_down_all;
-       GtkWidget *sel_down_cur;
-       GtkWidget *send_btn;
-
-       GtkWidget *compose_mail_btn;
-       GtkWidget *compose_news_btn;
-
-       GtkWidget *reply_btn;
-       GtkWidget *replysender_btn;
-       GtkWidget *replyall_btn;
-       GtkWidget *replylist_btn;
-
-       GtkWidget *fwd_btn;
-
-       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;
-
-       GSList    *t_action_list;
-       GSList    *t_item_list;
-};
 
 MainWindow *main_window_create         (SeparateType    type);
 
@@ -217,7 +168,7 @@ SensitiveCond main_window_get_current_state   (MainWindow *mainwin);
 
 void toolbar_set_sensitive                    (MainWindow *mainwin);
 
-void toolbar_set_compose_button               (MainToolbar        *toolbar, 
+void toolbar_set_compose_button               (Toolbar          *toolbar, 
                                               ComposeButtonType  compose_btn_type);
 void main_window_destroy_all                  (void);