2005-10-29 [paul] 1.9.15cvs126

[claws.git] / src / toolbar.c

diff --git a/src/toolbar.c b/src/toolbar.c
index 84236c79f958125253396fe19c415beca9a7e888..4ac5e12dce62df629215877eee75547b7fbf044b 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -14,7 +14,7 @@
  *
  * 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.
  */
 
 /*
@@ -187,7 +187,7 @@ struct {
 #ifdef USE_ASPELL
        { "A_CHECK_SPELLING",   N_("Check spelling")                       },
 #endif
-       { "A_SYL_ACTIONS",      N_("Sylpheed Actions Feature")             }, 
+       { "A_SYL_ACTIONS",      N_("Sylpheed-Claws Actions Feature")       }, 
        { "A_SEPARATOR",        "Separator"                             }
 };
 
@@ -382,11 +382,10 @@ static void toolbar_set_default_main(void)
                gint icon;
                gchar *text;
        } default_toolbar[] = {
-               { A_RECEIVE_CUR,   STOCK_PIXMAP_MAIL_RECEIVE,         _("Get")     },
-               { A_RECEIVE_ALL,   STOCK_PIXMAP_MAIL_RECEIVE_ALL,     _("Get All") },
+               { A_RECEIVE_ALL,   STOCK_PIXMAP_MAIL_RECEIVE_ALL,     _("Get Mail") },
                { A_SEPARATOR,     0,                                 ("")         }, 
                { A_SEND_QUEUED,   STOCK_PIXMAP_MAIL_SEND_QUEUE,      _("Send")    },
-               { A_COMPOSE_EMAIL, STOCK_PIXMAP_MAIL_COMPOSE,         _("Email")   },
+               { A_COMPOSE_EMAIL, STOCK_PIXMAP_MAIL_COMPOSE,         _("Compose") },
                { A_SEPARATOR,     0,                                 ("")         },
                { A_REPLY_MESSAGE, STOCK_PIXMAP_MAIL_REPLY,           _("Reply")   }, 
                { A_REPLY_ALL,     STOCK_PIXMAP_MAIL_REPLY_TO_ALL,    _("All")     },
@@ -394,8 +393,7 @@ static void toolbar_set_default_main(void)
                { A_FORWARD,       STOCK_PIXMAP_MAIL_FORWARD,         _("Forward") },
                { A_SEPARATOR,     0,                                 ("")         },
                { A_TRASH,         STOCK_PIXMAP_TRASH,                _("Trash")   },
-               { A_EXECUTE,       STOCK_PIXMAP_EXEC,                 _("Execute") },
-               { A_GOTO_PREV,     STOCK_PIXMAP_UP_ARROW,             _("Previous")},
+               { A_SEPARATOR,     0,                                 ("")         },
                { A_GOTO_NEXT,     STOCK_PIXMAP_DOWN_ARROW,           _("Next")    }
        };
        
@@ -439,11 +437,6 @@ static void toolbar_set_default_compose(void)
                { A_SEPARATOR,          0,                               ("")                   }, 
                { A_INSERT,             STOCK_PIXMAP_INSERT_FILE,       _("Insert")             },
                { A_ATTACH,             STOCK_PIXMAP_MAIL_ATTACH,       _("Attach")             },
-               { A_SIG,                STOCK_PIXMAP_MAIL_SIGN,         _("Signature")          },
-               { A_SEPARATOR,          0,                               ("")                   },
-               { A_EXTEDITOR,          STOCK_PIXMAP_EDIT_EXTERN,       _("Editor")             },
-               { A_LINEWRAP_CURRENT,   STOCK_PIXMAP_LINEWRAP_CURRENT,  _("Wrap paragraph")     },
-               { A_LINEWRAP_ALL,       STOCK_PIXMAP_LINEWRAP_ALL,      _("Wrap all")           },
                { A_SEPARATOR,          0,                               ("")                   },
                { A_ADDRBOOK,           STOCK_PIXMAP_ADDRESS_BOOK,      _("Address")            }
        };
@@ -1428,7 +1421,7 @@ Toolbar *toolbar_create(ToolbarType        type,
                case A_COMPOSE_EMAIL:
                        icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
                        item_news = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-                                                           _("News"),
+                                                           _("Compose"),
                                                            (""),
                                                            (""),
                                                            icon_news, G_CALLBACK(toolbar_buttons_cb), 
@@ -2002,7 +1995,7 @@ void compose_mail_cb(gpointer data, guint action, GtkWidget *widget)
        FolderItem *item = mainwin->summaryview->folder_item;   
         GList * list;
         GList * cur;
-
+       
        if (item) {
                ac = account_find_from_item(item);
                if (ac && ac->protocol != A_NNTP) {
@@ -2042,9 +2035,8 @@ void compose_news_cb(gpointer data, guint action, GtkWidget *widget)
        if (mainwin->summaryview->folder_item) {
                ac = mainwin->summaryview->folder_item->folder->account;
                if (ac && ac->protocol == A_NNTP) {
-                       compose_new(ac,
-                                   mainwin->summaryview->folder_item->path,
-                                   NULL);
+                       compose_new_with_folderitem(ac,
+                                   mainwin->summaryview->folder_item);
                        return;
                }
        }
@@ -2053,7 +2045,8 @@ void compose_news_cb(gpointer data, guint action, GtkWidget *widget)
        for(cur = list ; cur != NULL ; cur = g_list_next(cur)) {
                ac = (PrefsAccount *) cur->data;
                if (ac->protocol == A_NNTP) {
-                       compose_new(ac, NULL, NULL);
+                       compose_new_with_folderitem(ac,
+                                   mainwin->summaryview->folder_item);
                        return;
                }
        }