From: Dirk-Jan C. Binnema Date: Tue, 6 Feb 2007 14:11:22 +0000 (+0000) Subject: * update toolbars/menus for Maemo: X-Git-Tag: git_migration_finished~4090 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=cec5df836ee5d53c832c3ecd3da09fe8d743966f * update toolbars/menus for Maemo: - make modest-main-window-ui frontend-specific, they are very different - implement maemo-style menus pmo-trunk-r791 --- diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am index 50edf4e..1348e0e 100644 --- a/src/gtk/Makefile.am +++ b/src/gtk/Makefile.am @@ -32,6 +32,7 @@ libmodest_ui_la_SOURCES= \ modest-edit-msg-window.c \ modest-icon-names.h \ modest-main-window.c \ + modest-main-window-ui.h \ modest-store-widget.c \ modest-store-widget.h \ modest-transport-widget.c \ diff --git a/src/gtk/modest-main-window-ui.h b/src/gtk/modest-main-window-ui.h new file mode 100644 index 0000000..de1e4cb --- /dev/null +++ b/src/gtk/modest-main-window-ui.h @@ -0,0 +1,98 @@ +/* Copyright (c) 2006, Nokia Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Nokia Corporation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __MODEST_MAIN_WINDOW_UI_PRIV_H__ +#define __MODEST_MAIN_WINDOW_UI_PRIV_H__ + +#include +#include "modest-icon-names.h" +#include "modest-ui-actions.h" + +G_BEGIN_DECLS + + +/* Action entries */ +static const GtkActionEntry modest_action_entries [] = { + + /* Toplevel menus */ + { "File", NULL, N_("_File") }, + { "Edit", NULL, N_("_Edit") }, + { "Actions", NULL, N_("_Actions") }, + { "Options", NULL, N_("_Options") }, + { "Help", NULL, N_("_Help") }, + + /* FILE */ + { "FileNew", GTK_STOCK_NEW, N_("_New"), "N", N_("Compose new message"), G_CALLBACK (_modest_ui_actions_on_new_msg) }, + { "FileOpen", GTK_STOCK_OPEN, N_("_Open"), "O", N_("Open a message"), NULL }, + { "FileSave", GTK_STOCK_SAVE, N_("_Save"), "S", N_("Save a message"), NULL }, + { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("Save _As"), NULL, N_("Save a message as"), NULL }, + { "FileQuit", GTK_STOCK_QUIT, N_("_Quit"), "Q", N_("Exit the application"), G_CALLBACK (_modest_ui_actions_on_quit) }, + + /* EDIT */ + { "EditUndo", GTK_STOCK_UNDO, N_("_Undo"), "Z", N_("Undo last action"), NULL }, + { "EditRedo", GTK_STOCK_REDO, N_("_Redo"), "Z", N_("Redo previous action"), NULL }, + { "EditCut", GTK_STOCK_CUT, N_("Cut"), "X", N_("_Cut"), NULL }, + { "EditCopy", GTK_STOCK_COPY, N_("Copy"), "C", N_("Copy"), NULL }, + { "EditPaste", GTK_STOCK_PASTE, N_("Paste"), "V", N_("Paste"), NULL }, + { "EditDelete", GTK_STOCK_DELETE, N_("_Delete"), "Q", N_("Delete"), NULL }, + { "EditSelectAll", NULL, N_("Select all"), "A", N_("Select all"), NULL }, + { "EditDeselectAll", NULL, N_("Deselect all"), "A", N_("Deselect all"), NULL }, + + /* VIEW */ + { "ToggleView", GTK_STOCK_CDROM, N_("_Toggle view"), NULL, N_("Toggle the list view"), G_CALLBACK(_modest_ui_actions_toggle_view) }, + + /* ACTIONS */ + { "ActionsNew", MODEST_STOCK_NEW_MAIL, N_("_New Message"), NULL, N_("Compose a new message"), G_CALLBACK (_modest_ui_actions_on_new_msg) }, + { "ActionsReply", MODEST_STOCK_REPLY, N_("_Reply"), NULL, N_("Reply to a message"), G_CALLBACK (_modest_ui_actions_on_reply) }, + { "ActionsReplyAll", MODEST_STOCK_REPLY_ALL, N_("Reply to all"), NULL, N_("Reply to all"), G_CALLBACK (_modest_ui_actions_on_reply_all) }, + { "ActionsForward", MODEST_STOCK_FORWARD, N_("_Forward"), NULL, N_("Forward a message"), G_CALLBACK (_modest_ui_actions_on_forward) }, + { "ActionsBounce", NULL, N_("_Bounce"), NULL, N_("Bounce a message"), NULL }, + { "ActionsSendReceive", MODEST_STOCK_SEND_RECEIVE, N_("Send/Receive"), NULL, N_("Send and receive messages"), NULL }, + { "ActionsDelete", MODEST_STOCK_DELETE, N_("Delete message"), NULL, N_("Delete messages"), G_CALLBACK (_modest_ui_actions_on_delete) }, + { "ActionsFolderNew", NULL, N_("New Folder"), NULL, N_("Create a new folder"), G_CALLBACK (_modest_ui_actions_on_new_folder) }, + { "ActionsFolderDelete", NULL, N_("Delete Folder"), NULL, N_("Delete the folder"), G_CALLBACK (_modest_ui_actions_on_delete_folder) }, + { "ActionsFolderRename", NULL, N_("Rename Folder"), NULL, N_("Rename the folder"), G_CALLBACK (_modest_ui_actions_on_rename_folder) }, + { "ActionsFolderMoveToTrash", NULL, N_("Move Folder to Trash"), NULL, N_("Move folder to Trash"), G_CALLBACK (_modest_ui_actions_on_move_to_trash_folder) }, + + + /* GOTO */ + { "GotoPrevious", MODEST_STOCK_PREV, N_("Previous"), NULL, N_("Go to previous message"), NULL }, + { "GotoNext", MODEST_STOCK_NEXT, N_("Next"), NULL, N_("Go to next message"), G_CALLBACK (_modest_ui_actions_on_next) }, + + /* OPTIONS */ + { "OptionsAccounts", NULL, N_("_Accounts"), NULL, N_("Manage accounts"), G_CALLBACK (_modest_ui_actions_on_accounts) }, + { "OptionsContacts", NULL, N_("_Contacts"), NULL, N_("Manage contacts"), NULL }, + + /* HELP */ + { "HelpAbout", GTK_STOCK_ABOUT, N_("About"), NULL, N_("About Modest"), G_CALLBACK (_modest_ui_actions_on_about) }, +}; + + +G_END_DECLS +#endif /* __MODEST_MAIN_WINDOW_UI_PRIV_H__ */ diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am index 8517111..d9dc019 100644 --- a/src/maemo/Makefile.am +++ b/src/maemo/Makefile.am @@ -47,6 +47,7 @@ libmodest_ui_la_SOURCES= \ modest-edit-msg-window.c \ modest-icon-names.h \ modest-main-window.c \ + modest-main-window-ui.h \ modest-store-widget.c \ modest-store-widget.h \ modest-transport-widget.c \ diff --git a/src/maemo/modest-main-window-ui.h b/src/maemo/modest-main-window-ui.h new file mode 100644 index 0000000..fd3c7c6 --- /dev/null +++ b/src/maemo/modest-main-window-ui.h @@ -0,0 +1,126 @@ +/* Copyright (c) 2006, Nokia Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the Nokia Corporation nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS + * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __MODEST_MAIN_WINDOW_UI_PRIV_H__ +#define __MODEST_MAIN_WINDOW_UI_PRIV_H__ + +#include +#include "modest-icon-names.h" +#include "modest-ui-actions.h" + +G_BEGIN_DECLS + + +/* Action entries */ +static const GtkActionEntry modest_action_entries [] = { + + /* Toplevel menus */ + { "Message", NULL, N_("Message") }, + { "Edit", NULL, N_("Edit") }, + { "View", NULL, N_("View") }, + { "Folders", NULL, N_("Folders") }, + { "Accounts",NULL, N_("Accounts") }, + { "Tools", NULL, N_("Tools") }, + { "Close", NULL, N_("Close") }, + + /* Message */ + { "MessageNew", NULL, N_("_New message"), "N", NULL, G_CALLBACK (_modest_ui_actions_on_new_msg) }, + { "MessageOpen", NULL, N_("_Open"), "O", NULL, NULL }, + { "MessageCancelSending", NULL, N_("Cancel sending"), NULL, NULL, NULL }, + { "MessageSend", NULL, N_("Send"), NULL, NULL, NULL }, + { "MessageReply", NULL, N_("_Reply"), NULL, NULL, G_CALLBACK (_modest_ui_actions_on_reply) }, + { "MessageReplyAll", NULL, N_("Reply to all"), NULL, NULL, G_CALLBACK (_modest_ui_actions_on_reply_all) }, + { "MessageForward", NULL, N_("_Forward"), NULL, NULL, G_CALLBACK (_modest_ui_actions_on_forward) }, + { "MessageDelete", NULL, N_("Delete message"), NULL, NULL, G_CALLBACK (_modest_ui_actions_on_delete) }, + { "MessageSendReceive", NULL, N_("Send and receive"), NULL, NULL, NULL }, + { "MessageContents", NULL, N_("Retrieve contents"), NULL, NULL, NULL }, + { "MessageDetails", NULL, N_("Details..."), NULL, NULL, NULL }, + + + /* Edit */ + { "EditUndo", NULL, N_("_Undo"), "Z", NULL, NULL }, + { "EditCut", NULL, N_("Cut"), "X", NULL, NULL }, + { "EditCopy", NULL, N_("Copy"), "C", NULL, NULL }, + { "EditPaste", NULL, N_("Paste"), "V", NULL, NULL }, + { "EditDelete", NULL, N_("_Delete"), NULL, NULL, NULL }, + { "EditSelect", NULL, N_("Select..."), NULL, NULL, NULL }, /* submenu */ + { "EditMoveTo", NULL, N_("Move to..."), NULL, NULL, NULL }, + + + /* View */ + { "ViewSort", NULL, N_("Sort..."), NULL, NULL, NULL }, + { "ViewFolders", NULL, N_("Folders"), NULL, NULL, NULL }, + { "ViewFullscreen", NULL, N_("Fullscreen"), NULL, NULL, NULL }, + { "ViewDetails", NULL, N_("Details"), NULL, NULL, NULL }, + { "ViewThumbnails", NULL, N_("Thumbnails"), NULL, NULL, NULL }, + { "ViewShowToolbar", NULL, N_("Show toolbar"), NULL, NULL, NULL }, /* submenu */ + + + /* Folders */ + { "FoldersNew", NULL, N_("New folder"), NULL, NULL, G_CALLBACK (_modest_ui_actions_on_new_folder) }, + { "FoldersManage", NULL, N_("Manage..."), NULL, NULL, NULL }, + { "FoldersDetails", NULL, N_("Details..."), NULL, NULL, NULL }, + { "FoldersDelete", NULL, N_("Delete"), NULL, NULL, G_CALLBACK (_modest_ui_actions_on_delete_folder) }, + { "FoldersRename", NULL, N_("Rename"), NULL, NULL, G_CALLBACK (_modest_ui_actions_on_rename_folder) }, + { "FoldersMoveToTrash", NULL, N_("Move to trash"), NULL, NULL, G_CALLBACK (_modest_ui_actions_on_move_to_trash_folder) }, + + + /* Accounts */ + { "AccountsNew", NULL, N_("_New account..."), NULL, NULL, NULL }, + { "AccountsManage", NULL, N_("Manage..."), NULL, NULL, G_CALLBACK (_modest_ui_actions_on_accounts) }, + { "AccountsConfigureSMTP", NULL, N_("Configure SMTP servers..."), NULL, NULL, NULL }, + + /* Tools */ + { "ToolsSettings", NULL, N_("Settings..."), NULL, NULL, NULL }, + { "ToolsContacts", NULL, N_("Contact..."), NULL, NULL, NULL }, + { "ToolsFontSettings", NULL, N_("Font settings..."), NULL, NULL, NULL }, + { "ToolsSearchMessages", NULL, N_("Search messages..."), NULL, NULL, NULL }, + { "ToolsHelp", NULL, N_("Help"), NULL, NULL, NULL }, + + /* Close */ + { "CloseWindow", NULL, N_("Close window"), NULL, NULL, NULL }, + { "CloseAllWindows", NULL, N_("Close all windows"), NULL, NULL, G_CALLBACK (_modest_ui_actions_on_quit) }, + + + /* Toolbar items; they is some overlap with the menu items, + * but we need to specificy them differently, they have icons for example + */ + /* Headers Toolbar */ + { "ToolbarMessageNew", MODEST_STOCK_NEW_MAIL, N_("Compose a new message"), NULL, NULL, G_CALLBACK (_modest_ui_actions_on_new_msg) }, + { "ToolbarMessageReply", MODEST_STOCK_REPLY, N_("Reply a message"), NULL, NULL, G_CALLBACK (_modest_ui_actions_on_reply) }, + { "ToolbarMessageReplyAll", MODEST_STOCK_REPLY_ALL, N_("Reply to all"), NULL, NULL, G_CALLBACK (_modest_ui_actions_on_reply_all) }, + { "ToolbarMessageForward", MODEST_STOCK_FORWARD, N_("Forward a message"), NULL, NULL, G_CALLBACK (_modest_ui_actions_on_forward) }, + { "ToolbarSendReceive", MODEST_STOCK_SEND_RECEIVE, N_("Send & receive"), NULL, NULL, G_CALLBACK (_modest_ui_actions_on_forward) }, + { "ToolbarToggleView", GTK_STOCK_CDROM, N_("Toggle view"), NULL, NULL, G_CALLBACK (_modest_ui_actions_toggle_view) }, + { "ToolbarDeleteMessage", GTK_STOCK_DELETE, N_("Delete message"), NULL, NULL, G_CALLBACK (_modest_ui_actions_on_delete) }, +}; + + +G_END_DECLS +#endif /* __MODEST_MAIN_WINDOW_UI_PRIV_H__ */ diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index ccd48ea..2bc9de2 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -281,13 +281,14 @@ get_toolbar (ModestMainWindow *self) gtk_tool_item_set_homogeneous (progress_item, FALSE); gtk_tool_item_set_expand(progress_item, TRUE); - stop_icon = gtk_image_new_from_icon_name("qgn_toolb_gene_stop", GTK_ICON_SIZE_BUTTON); + gtk_toolbar_insert (GTK_TOOLBAR(toolbar), progress_item, + gtk_toolbar_get_n_items(GTK_TOOLBAR(toolbar))); + stop_icon = gtk_image_new_from_icon_name("qgn_toolb_gene_stop", GTK_ICON_SIZE_BUTTON); gtk_toolbar_insert (GTK_TOOLBAR(toolbar), gtk_tool_button_new(stop_icon, NULL), gtk_toolbar_get_n_items(GTK_TOOLBAR(toolbar))); - gtk_toolbar_insert (GTK_TOOLBAR(toolbar), progress_item, - gtk_toolbar_get_n_items(GTK_TOOLBAR(toolbar))); + gtk_widget_show_all (toolbar); return toolbar; } diff --git a/src/maemo/ui/modest-ui.xml b/src/maemo/ui/modest-ui.xml index 1f77bf0..83fa0b9 100644 --- a/src/maemo/ui/modest-ui.xml +++ b/src/maemo/ui/modest-ui.xml @@ -31,78 +31,100 @@ - - - + + + + - - + + - + + + + + - + - - - - - + + + - - - - - + + - - - - - + + + + + + + + - - - + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - + + - - + - - - + - - + + - + - - - - + + + + diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am index 6214b2f..24ce3bc 100644 --- a/src/widgets/Makefile.am +++ b/src/widgets/Makefile.am @@ -30,7 +30,6 @@ libmodest_widgets_la_SOURCES= \ modest-header-view-priv.h \ modest-header-view-render.c \ modest-main-window.h \ - modest-main-window-ui.h \ modest-msg-view.c \ modest-msg-view.h \ modest-tny-stream-gtkhtml.c \ diff --git a/src/widgets/modest-main-window-ui.h b/src/widgets/modest-main-window-ui.h deleted file mode 100644 index de1e4cb..0000000 --- a/src/widgets/modest-main-window-ui.h +++ /dev/null @@ -1,98 +0,0 @@ -/* Copyright (c) 2006, Nokia Corporation - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the Nokia Corporation nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef __MODEST_MAIN_WINDOW_UI_PRIV_H__ -#define __MODEST_MAIN_WINDOW_UI_PRIV_H__ - -#include -#include "modest-icon-names.h" -#include "modest-ui-actions.h" - -G_BEGIN_DECLS - - -/* Action entries */ -static const GtkActionEntry modest_action_entries [] = { - - /* Toplevel menus */ - { "File", NULL, N_("_File") }, - { "Edit", NULL, N_("_Edit") }, - { "Actions", NULL, N_("_Actions") }, - { "Options", NULL, N_("_Options") }, - { "Help", NULL, N_("_Help") }, - - /* FILE */ - { "FileNew", GTK_STOCK_NEW, N_("_New"), "N", N_("Compose new message"), G_CALLBACK (_modest_ui_actions_on_new_msg) }, - { "FileOpen", GTK_STOCK_OPEN, N_("_Open"), "O", N_("Open a message"), NULL }, - { "FileSave", GTK_STOCK_SAVE, N_("_Save"), "S", N_("Save a message"), NULL }, - { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("Save _As"), NULL, N_("Save a message as"), NULL }, - { "FileQuit", GTK_STOCK_QUIT, N_("_Quit"), "Q", N_("Exit the application"), G_CALLBACK (_modest_ui_actions_on_quit) }, - - /* EDIT */ - { "EditUndo", GTK_STOCK_UNDO, N_("_Undo"), "Z", N_("Undo last action"), NULL }, - { "EditRedo", GTK_STOCK_REDO, N_("_Redo"), "Z", N_("Redo previous action"), NULL }, - { "EditCut", GTK_STOCK_CUT, N_("Cut"), "X", N_("_Cut"), NULL }, - { "EditCopy", GTK_STOCK_COPY, N_("Copy"), "C", N_("Copy"), NULL }, - { "EditPaste", GTK_STOCK_PASTE, N_("Paste"), "V", N_("Paste"), NULL }, - { "EditDelete", GTK_STOCK_DELETE, N_("_Delete"), "Q", N_("Delete"), NULL }, - { "EditSelectAll", NULL, N_("Select all"), "A", N_("Select all"), NULL }, - { "EditDeselectAll", NULL, N_("Deselect all"), "A", N_("Deselect all"), NULL }, - - /* VIEW */ - { "ToggleView", GTK_STOCK_CDROM, N_("_Toggle view"), NULL, N_("Toggle the list view"), G_CALLBACK(_modest_ui_actions_toggle_view) }, - - /* ACTIONS */ - { "ActionsNew", MODEST_STOCK_NEW_MAIL, N_("_New Message"), NULL, N_("Compose a new message"), G_CALLBACK (_modest_ui_actions_on_new_msg) }, - { "ActionsReply", MODEST_STOCK_REPLY, N_("_Reply"), NULL, N_("Reply to a message"), G_CALLBACK (_modest_ui_actions_on_reply) }, - { "ActionsReplyAll", MODEST_STOCK_REPLY_ALL, N_("Reply to all"), NULL, N_("Reply to all"), G_CALLBACK (_modest_ui_actions_on_reply_all) }, - { "ActionsForward", MODEST_STOCK_FORWARD, N_("_Forward"), NULL, N_("Forward a message"), G_CALLBACK (_modest_ui_actions_on_forward) }, - { "ActionsBounce", NULL, N_("_Bounce"), NULL, N_("Bounce a message"), NULL }, - { "ActionsSendReceive", MODEST_STOCK_SEND_RECEIVE, N_("Send/Receive"), NULL, N_("Send and receive messages"), NULL }, - { "ActionsDelete", MODEST_STOCK_DELETE, N_("Delete message"), NULL, N_("Delete messages"), G_CALLBACK (_modest_ui_actions_on_delete) }, - { "ActionsFolderNew", NULL, N_("New Folder"), NULL, N_("Create a new folder"), G_CALLBACK (_modest_ui_actions_on_new_folder) }, - { "ActionsFolderDelete", NULL, N_("Delete Folder"), NULL, N_("Delete the folder"), G_CALLBACK (_modest_ui_actions_on_delete_folder) }, - { "ActionsFolderRename", NULL, N_("Rename Folder"), NULL, N_("Rename the folder"), G_CALLBACK (_modest_ui_actions_on_rename_folder) }, - { "ActionsFolderMoveToTrash", NULL, N_("Move Folder to Trash"), NULL, N_("Move folder to Trash"), G_CALLBACK (_modest_ui_actions_on_move_to_trash_folder) }, - - - /* GOTO */ - { "GotoPrevious", MODEST_STOCK_PREV, N_("Previous"), NULL, N_("Go to previous message"), NULL }, - { "GotoNext", MODEST_STOCK_NEXT, N_("Next"), NULL, N_("Go to next message"), G_CALLBACK (_modest_ui_actions_on_next) }, - - /* OPTIONS */ - { "OptionsAccounts", NULL, N_("_Accounts"), NULL, N_("Manage accounts"), G_CALLBACK (_modest_ui_actions_on_accounts) }, - { "OptionsContacts", NULL, N_("_Contacts"), NULL, N_("Manage contacts"), NULL }, - - /* HELP */ - { "HelpAbout", GTK_STOCK_ABOUT, N_("About"), NULL, N_("About Modest"), G_CALLBACK (_modest_ui_actions_on_about) }, -}; - - -G_END_DECLS -#endif /* __MODEST_MAIN_WINDOW_UI_PRIV_H__ */