2012-02-08 [pawel] 3.8.0cvs27

[claws.git] / src / toolbar.h

diff --git a/src/toolbar.h b/src/toolbar.h
index e1188a171c86f175704c9a7aba2b52391c7cddbe..03701e4b5d1c51e0d623b762133b63eef2053fa8 100644 (file)
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 2001-2011 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifndef __CUSTOM_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,       
@@ -49,25 +49,21 @@ typedef enum
 struct _Toolbar {
        GtkWidget *toolbar;
 
+       GtkWidget *folders_btn;
        GtkWidget *get_btn;
        GtkWidget *getall_btn;
-       ComboButton *getall_combo;
        GtkWidget *send_btn;
 
        GtkWidget *compose_mail_btn;
-       GtkWidget *compose_news_btn;
+       GtkWidget *compose_mail_icon;
+       GtkWidget *compose_news_icon;
 
        GtkWidget *reply_btn;
-       ComboButton *reply_combo;
        GtkWidget *replysender_btn;
-       ComboButton *replysender_combo;
        GtkWidget *replyall_btn;
-       ComboButton *replyall_combo;
        GtkWidget *replylist_btn;
-       ComboButton *replylist_combo;
 
        GtkWidget *fwd_btn;
-       ComboButton *fwd_combo;
        
        GtkWidget *trash_btn;
        GtkWidget *delete_btn;
@@ -77,8 +73,11 @@ struct _Toolbar {
 
        GtkWidget *separator;
        GtkWidget *learn_spam_btn;
-       GtkWidget *learn_ham_btn;
-
+       GtkWidget *learn_spam_icon;
+       GtkWidget *learn_ham_icon;
+       
+       GtkWidget *cancel_inc_btn;
+       
        ComposeButtonType compose_btn_type;
        LearnButtonType learn_btn_type;
 
@@ -92,13 +91,21 @@ struct _Toolbar {
        GtkWidget *linewrap_current_btn;
        GtkWidget *linewrap_all_btn;
        GtkWidget *addrbook_btn;
-#ifdef USE_ASPELL
-       GtkWidget *spellcheck_btn;
-#endif
+
+       GtkWidget *open_mail_btn;
+       GtkWidget *close_window_btn;
+
+       GtkWidget *preferences_btn;
 
        GSList    *action_list;
        GSList    *item_list;
 
+#ifdef USE_ENCHANT
+       GtkWidget *spellcheck_btn;
+#endif
+#if !GTK_CHECK_VERSION(2,12,0)
+       GtkTooltips *tooltips;
+#endif
 };
 
 struct _ToolbarItem {
@@ -126,9 +133,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) \
@@ -155,6 +162,7 @@ enum {
        A_REPLY_SENDER,
        A_REPLY_ALL,
        A_REPLY_ML,
+       A_OPEN_MAIL,
        A_FORWARD,
        A_TRASH,
        A_DELETE_REAL,
@@ -162,8 +170,11 @@ enum {
        A_GOTO_PREV,
        A_GOTO_NEXT,
        A_IGNORE_THREAD,
+       A_WATCH_THREAD,
        A_PRINT,
        A_LEARN_SPAM,
+       A_GO_FOLDERS,
+       A_PREFERENCES,
 
        /* compose toolbar */
        A_SEND,
@@ -176,28 +187,28 @@ enum {
        A_LINEWRAP_CURRENT,
        A_LINEWRAP_ALL,
        A_ADDRBOOK,
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
        A_CHECK_SPELLING,
 #endif
 
        /* common items */
-       A_SYL_ACTIONS,
+       A_CLAWS_ACTIONS,
+       A_CANCEL_INC,
+       A_CLOSE,
+
        A_SEPARATOR,
 
+       A_CLAWS_PLUGINS,
+
        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);
@@ -249,8 +260,9 @@ 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);
+gboolean toolbar_check_action_btns     (ToolbarType    type);
 #endif /* __CUSTOM_TOOLBAR_H__ */