refactored the toolbar structure.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1520 ee746299-78ed-0310-b773-934348b2243d

1 files changed, 87 insertions, 29 deletions

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 91d9ca93..2a8d0f0e 100644
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -27,39 +27,92 @@
 #include <glib/gi18n.h>
 #include <gtk/gtkwindow.h>
 #include <gtk/gtklabel.h>
+#include <gtk/gtkstock.h>
 
 #include "prefs_toolbar.h"
 #include "prefs_display_items.h"
 
 static PrefsDisplayItem all_items[] =
 {
-	{T_SEPARATOR,	"separator",	N_("Separator"),	TRUE, FALSE},
-	{T_GET,		"get",		N_("Get"),		FALSE, FALSE},
-	{T_GET_ALL,	"get-all",	N_("Get all"),		FALSE, FALSE},
-	{T_SEND_QUEUE,	"send-queue",	N_("Send"),		FALSE, FALSE},
-	{T_COMPOSE,	"compose",	N_("Compose"),		FALSE, FALSE},
-	{T_REPLY,	"reply",	N_("Reply"),		FALSE, FALSE},
-	{T_REPLY_ALL,	"reply-all",	N_("Reply all"),	FALSE, FALSE},
-	{T_FORWARD,	"forward",	N_("Forward"),		FALSE, FALSE},
-	{T_DELETE,	"delete",	N_("Delete"),		FALSE, FALSE},
-	{T_JUNK,	"junk",		N_("Junk"),		FALSE, FALSE},
-	{T_EXECUTE,	"execute",	N_("Execute"),		FALSE, FALSE},
-	{T_NEXT,	"next",		N_("Next"),		FALSE, FALSE},
-	{T_PREV,	"prev",		N_("Prev"),		FALSE, FALSE},
-	{T_ADDRESS_BOOK,"address-book",	N_("Address"),		FALSE, FALSE},
-	{T_PRINT,	"print",	N_("Print"),		FALSE, FALSE},
-	{T_COMMON_PREFS,"common-prefs",	N_("Prefs"),		FALSE, FALSE},
-	{T_ACCOUNT_PREFS,
-			"account-prefs",N_("Account"),		FALSE, FALSE},
-
-	{T_SEND,	"send",		N_("Send"),		FALSE, FALSE},
-	{T_SEND_LATER,	"send-later",	N_("Send later"),	FALSE, FALSE},
-	{T_DRAFT,	"draft",	N_("Draft"),		FALSE, FALSE},
-	{T_INSERT_FILE,	"insert-file",	N_("Insert"),		FALSE, FALSE},
-	{T_ATTACH_FILE,	"attach-file",	N_("Attach"),		FALSE, FALSE},
-	{T_SIGNATURE,	"signature",	N_("Signature"),	FALSE, FALSE},
-	{T_EDITOR,	"editor",	N_("Editor"),		FALSE, FALSE},
-	{T_LINEWRAP,	"linewrap",	N_("Linewrap"),		FALSE, FALSE},
+	{T_SEPARATOR,	"separator",	N_("Separator"),
+	 NULL,	0, NULL, TRUE, FALSE},
+	{T_GET,		"get",		N_("Get"),
+	 N_("Incorporate new mail"),
+	 STOCK_PIXMAP_MAIL_SEND, NULL, FALSE, FALSE},
+	{T_GET_ALL,	"get-all",	N_("Get all"),
+	 N_("Incorporate new mail of all accounts"),
+	 STOCK_PIXMAP_MAIL_RECEIVE_ALL,	NULL, FALSE, FALSE},
+	{T_SEND_QUEUE,	"send-queue",	N_("Send"),
+	 N_("Send queued message(s)"),
+	 STOCK_PIXMAP_MAIL_SEND, NULL, FALSE, FALSE},
+	{T_COMPOSE,	"compose",	N_("Compose"),
+	 N_("Compose new message"),
+	 STOCK_PIXMAP_MAIL_COMPOSE, NULL, FALSE, FALSE},
+	{T_REPLY,	"reply",	N_("Reply"),
+	 N_("Reply to the message"),
+	 STOCK_PIXMAP_MAIL_REPLY, NULL, FALSE, FALSE},
+	{T_REPLY_ALL,	"reply-all",	N_("Reply all"),
+	 N_("Reply to all"),
+	 STOCK_PIXMAP_MAIL_REPLY_TO_ALL, NULL, FALSE, FALSE},
+	{T_FORWARD,	"forward",	N_("Forward"),
+	 N_("Forward the message"),
+	 STOCK_PIXMAP_MAIL_FORWARD, NULL, FALSE, FALSE},
+	{T_DELETE,	"delete",	N_("Delete"),
+	 N_("Delete the message"),
+	 STOCK_PIXMAP_DELETE, NULL, FALSE, FALSE},
+	{T_JUNK,	"junk",		N_("Junk"),
+	 N_("Set as junk mail"),
+	 STOCK_PIXMAP_SPAM, NULL, FALSE, FALSE},
+	{T_NEXT,	"next",		N_("Next"),
+	 N_("Next unread message"),
+	 -1, GTK_STOCK_GO_DOWN, FALSE, FALSE},
+	{T_PREV,	"prev",		N_("Prev"),
+	 N_("Previous unread message"),
+	 -1, GTK_STOCK_GO_UP, FALSE, FALSE},
+	{T_PRINT,	"print",	N_("Print"),
+	 N_("Print message"),
+	 -1, GTK_STOCK_PRINT, FALSE, FALSE},
+	{T_ADDRESS_BOOK,	"address-book",	N_("Address"),
+	 N_("Address book"),
+	 STOCK_PIXMAP_ADDRESS_BOOK, NULL, FALSE, FALSE},
+	{T_EXECUTE,	"execute",	N_("Execute"),
+	 N_("Execute marked process"),
+	 -1, GTK_STOCK_EXECUTE, FALSE, FALSE},
+	{T_COMMON_PREFS,	"common-prefs",	N_("Prefs"),
+	 N_("Common preferences"),
+	 -1, GTK_STOCK_PREFERENCES, FALSE, FALSE},
+	{T_ACCOUNT_PREFS,	"account-prefs", N_("Account"),
+	 N_("Account preferences"),
+	 -1, GTK_STOCK_PREFERENCES, FALSE, FALSE},
+
+	{T_SEND,	"send",		N_("Send"),
+	 N_("Send message"),
+	 STOCK_PIXMAP_MAIL_SEND, NULL, FALSE, FALSE},
+	{T_SEND_LATER,	"send-later",	N_("Send later"),
+	 N_("Put into queue folder and send later"),
+	 STOCK_PIXMAP_MAIL_SEND_QUEUE, NULL, FALSE, FALSE},
+	{T_DRAFT,	"draft",	N_("Draft"),
+	 N_("Save to draft folder"),
+	 -1, GTK_STOCK_SAVE, FALSE, FALSE},
+	{T_INSERT_FILE,	"insert-file",	N_("Insert"),
+	 N_("Insert file"),
+	 STOCK_PIXMAP_INSERT_FILE, NULL, FALSE, FALSE},
+	{T_ATTACH_FILE,	"attach-file",	N_("Attach"),
+	 N_("Attach file"),
+	 STOCK_PIXMAP_MAIL_ATTACH, NULL, FALSE, FALSE},
+	{T_SIGNATURE,	"signature",	N_("Signature"),
+	 N_("Append signature"),
+	 STOCK_PIXMAP_SIGN, NULL, FALSE, FALSE},
+	{T_EDITOR,	"editor",	N_("Editor"),
+	 N_("Edit with external editor"),
+#ifdef GTK_STOCK_EDIT
+	 -1, GTK_STOCK_EDIT, FALSE, FALSE},
+#else
+	 STOCK_PIXMAP_MAIL_COMPOSE, NULL, FALSE, FALSE},
+#endif
+	{T_LINEWRAP,	"linewrap",	N_("Linewrap"),
+	 N_("Wrap all long lines"),
+	 STOCK_PIXMAP_LINEWRAP, NULL, FALSE, FALSE},
 
 	{-1,		NULL,		NULL,			FALSE, FALSE}
 };
@@ -76,11 +129,11 @@ static gint main_available_items[] =
 	T_FORWARD,
 	T_DELETE,
 	T_JUNK,
-	T_EXECUTE,
 	T_NEXT,
 	T_PREV,
-	T_ADDRESS_BOOK,
 	T_PRINT,
+	T_ADDRESS_BOOK,
+	T_EXECUTE,
 	T_COMMON_PREFS,
 	T_ACCOUNT_PREFS,
 	-1
@@ -98,6 +151,8 @@ static gint compose_available_items[] =
 	T_EDITOR,
 	T_LINEWRAP,
 	T_ADDRESS_BOOK,
+	T_COMMON_PREFS,
+	T_ACCOUNT_PREFS,
 	-1
 };
 
@@ -117,6 +172,9 @@ static gint default_main_items[] =
 	T_JUNK,
 	T_SEPARATOR,
 	T_NEXT,
+	T_SEPARATOR,
+	T_PRINT,
+	T_ADDRESS_BOOK,
 	-1
 };