2005-12-20 [paul] 1.9.100cvs96

[claws.git] / src / toolbar.h

diff --git a/src/toolbar.h b/src/toolbar.h
index 26742083024cc3abeb6e83cb5a736d8e1c9758f6..ca68d2360cb34a9f2c5465033a4c19e2cec0c597 100644 (file)
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -14,12 +14,14 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef __CUSTOM_TOOLBAR_H__
 #define __CUSTOM_TOOLBAR_H__
 
+#include "gtk/gtkutils.h"
+
 #define SEPARATOR_PIXMAP     "---"
 
 typedef struct _Toolbar Toolbar;
@@ -43,33 +45,33 @@ struct _Toolbar {
 
        GtkWidget *get_btn;
        GtkWidget *getall_btn;
+       ComboButton *getall_combo;
        GtkWidget *send_btn;
 
        GtkWidget *compose_mail_btn;
        GtkWidget *compose_news_btn;
 
        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;
+       GtkWidget *prev_btn;
        GtkWidget *next_btn;
        GtkWidget *exec_btn;
 
        GtkWidget *separator;
 
-       /* for the reply buttons */
-       GtkWidget *reply_popup;
-       GtkWidget *replyall_popup;
-       GtkWidget *replylist_popup;
-       GtkWidget *replysender_popup;
        
-       /* the forward button similar to the reply buttons*/
-       GtkWidget *fwd_popup;
-
        ComposeButtonType compose_btn_type;
 
        /* compose buttons */
@@ -79,8 +81,12 @@ struct _Toolbar {
        GtkWidget *attach_btn;
        GtkWidget *sig_btn;
        GtkWidget *exteditor_btn;
-       GtkWidget *linewrap_btn;
+       GtkWidget *linewrap_current_btn;
+       GtkWidget *linewrap_all_btn;
        GtkWidget *addrbook_btn;
+#ifdef USE_ASPELL
+       GtkWidget *spellcheck_btn;
+#endif
 
        GSList    *action_list;
        GSList    *item_list;
@@ -142,9 +148,13 @@ enum {
        A_REPLY_ALL,
        A_REPLY_ML,
        A_FORWARD,
-       A_DELETE,
+       A_TRASH,
+       A_DELETE_REAL,
        A_EXECUTE,
+       A_GOTO_PREV,
        A_GOTO_NEXT,
+       A_IGNORE_THREAD,
+       A_PRINT,
 
        /* compose toolbar */
        A_SEND,
@@ -154,8 +164,12 @@ enum {
        A_ATTACH,
        A_SIG,
        A_EXTEDITOR,
-       A_LINEWRAP,
+       A_LINEWRAP_CURRENT,
+       A_LINEWRAP_ALL,
        A_ADDRBOOK,
+#ifdef USE_ASPELL
+       A_CHECK_SPELLING,
+#endif
 
        /* common items */
        A_SYL_ACTIONS,
@@ -195,9 +209,6 @@ void        toolbar_comp_set_sensitive      (gpointer        data,
                                         gboolean        sensitive);
 
 /* invoked by mainwindow entries and toolbar actions */
-void   reply_cb                        (gpointer        data, 
-                                        guint           action, 
-                                        GtkWidget      *widget);
 void   delete_msgview_cb               (gpointer        data, 
                                         guint           action, 
                                         GtkWidget      *widget);
@@ -230,6 +241,5 @@ void        toolbar_set_style               (GtkWidget      *toolbar_wid,
                                         guint           action);
 void   toolbar_destroy                 (Toolbar        *toolbar);
 void   toolbar_init                    (Toolbar        *toolbar);
-void   toolbar_reply                   (gpointer        data, 
-                                        guint           action);
+
 #endif /* __CUSTOM_TOOLBAR_H__ */