2007-11-07 [paul] 3.0.2cvs123

[claws.git] / src / toolbar.h

diff --git a/src/toolbar.h b/src/toolbar.h
index 227e550bea6129c7a22909c5f783c2930e754dcb..3c7b640face78028914ee0bae2519a2935c21d5c 100644 (file)
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -26,7 +26,7 @@
 
 typedef struct _Toolbar Toolbar;
 typedef struct _ToolbarItem ToolbarItem;
-typedef struct _ToolbarSylpheedActions ToolbarSylpheedActions;
+typedef struct _ToolbarClawsActions ToolbarClawsActions;
 
 typedef enum {
        TOOLBAR_MAIN = 0,       
@@ -55,7 +55,8 @@ struct _Toolbar {
        GtkWidget *send_btn;
 
        GtkWidget *compose_mail_btn;
-       GtkWidget *compose_news_btn;
+       GtkWidget *compose_mail_icon;
+       GtkWidget *compose_news_icon;
 
        GtkWidget *reply_btn;
        GtkWidget *replysender_btn;
@@ -72,7 +73,8 @@ struct _Toolbar {
 
        GtkWidget *separator;
        GtkWidget *learn_spam_btn;
-       GtkWidget *learn_ham_btn;
+       GtkWidget *learn_spam_icon;
+       GtkWidget *learn_ham_icon;
        
        GtkWidget *cancel_inc_btn;
        
@@ -99,6 +101,7 @@ struct _Toolbar {
        GSList    *action_list;
        GSList    *item_list;
 
+       GtkTooltips *tooltips;
 };
 
 struct _ToolbarItem {
@@ -126,9 +129,9 @@ struct _ToolbarItem {
 
 #define TOOLBAR_DESTROY_ACTIONS(action_list) \
 { \
-       ToolbarSylpheedActions *action; \
+       ToolbarClawsActions *action; \
        while (action_list != NULL) { \
-               action = (ToolbarSylpheedActions*)action_list->data;\
+               action = (ToolbarClawsActions*)action_list->data;\
                action_list = \
                        g_slist_remove(action_list, action);\
                if (action->name) \
@@ -163,6 +166,7 @@ enum {
        A_GOTO_PREV,
        A_GOTO_NEXT,
        A_IGNORE_THREAD,
+       A_WATCH_THREAD,
        A_PRINT,
        A_LEARN_SPAM,
        A_GO_FOLDERS,
@@ -183,7 +187,7 @@ enum {
 #endif
 
        /* common items */
-       A_SYL_ACTIONS,
+       A_CLAWS_ACTIONS,
        A_CANCEL_INC,
        A_CLOSE,
 
@@ -192,17 +196,12 @@ enum {
        N_ACTION_VAL
 };
 
-struct _ToolbarSylpheedActions {
+struct _ToolbarClawsActions {
        GtkWidget *widget;
        gchar     *name;
 };
 
 
-void   toolbar_action_execute          (GtkWidget      *widget,
-                                        GSList         *action_list, 
-                                        gpointer        data,
-                                        gint            source);
-
 GList  *toolbar_get_action_items       (ToolbarType     source);
 
 void   toolbar_save_config_file        (ToolbarType     source);
@@ -254,8 +253,8 @@ void        toolbar_set_style               (GtkWidget      *toolbar_wid,
                                         GtkWidget      *handlebox_wid,
                                         guint           action);
 void   toolbar_destroy                 (Toolbar        *toolbar);
-void   toolbar_init                    (Toolbar        *toolbar);
 void toolbar_set_learn_button          (Toolbar        *toolbar, 
                                         LearnButtonType  learn_btn_type);
-
+const gchar *toolbar_get_short_text    (int action);
+int         toolbar_get_icon           (int action);
 #endif /* __CUSTOM_TOOLBAR_H__ */