From c7baa757f36226f608a724462ff91a6cee2667c7 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Mon, 9 Jul 2007 12:59:07 +0000 Subject: [PATCH] * src/maemo/modest-icon-names.h: * Add maemo icons for next, previous and find in page. * src/maemo/modest-main-window-ui.h, src/maemo/modest-msg-view-window.c: * Use the maemo theme icons for next, previous and find in page toolbar buttons (fixes NB#61158). pmo-trunk-r2648 --- src/maemo/modest-icon-names.h | 3 +++ src/maemo/modest-main-window-ui.h | 6 +++--- src/maemo/modest-msg-view-window.c | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/maemo/modest-icon-names.h b/src/maemo/modest-icon-names.h index adfa82f..92a190b 100644 --- a/src/maemo/modest-icon-names.h +++ b/src/maemo/modest-icon-names.h @@ -89,6 +89,9 @@ #define MODEST_TOOLBAR_ICON_MOVE_TO_FOLDER "qgn_toolb_gene_movetofldr" #define MODEST_TOOLBAR_ICON_BOLD "qgn_list_gene_bold" #define MODEST_TOOLBAR_ICON_ITALIC "qgn_list_gene_italic" +#define MODEST_TOOLBAR_ICON_NEXT "qgn_toolb_gene_forward" +#define MODEST_TOOLBAR_ICON_PREV "qgn_toolb_gene_back" +#define MODEST_TOOLBAR_ICON_FIND "qgn_toolb_gene_find" /* Stock icon names */ #define MODEST_STOCK_MAIL_SEND "modest-stock-mail-send" diff --git a/src/maemo/modest-main-window-ui.h b/src/maemo/modest-main-window-ui.h index 29cfdec..4826ba1 100644 --- a/src/maemo/modest-main-window-ui.h +++ b/src/maemo/modest-main-window-ui.h @@ -120,9 +120,9 @@ static const GtkActionEntry modest_action_entries [] = { /* { "ToolbarToggleView", MODEST_STOCK_SPLIT_VIEW, N_("gqn_toolb_rss_fldonoff"), "t", NULL, G_CALLBACK (modest_ui_actions_toggle_folders_view) }, */ { "ToolbarDeleteMessage", MODEST_STOCK_DELETE, N_("qgn_toolb_gene_deletebutton"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_message_or_folder) }, { "ToolbarSort", MODEST_STOCK_SORT, N_("qgn_list_sort"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_sort) }, - { "ToolbarFindInMessage", GTK_STOCK_FIND, N_("qgn_toolb_gene_find"), NULL, NULL, NULL }, - { "ToolbarMessageBack", GTK_STOCK_GO_BACK, N_("qgn_toolb_gene_back"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_prev) }, - { "ToolbarMessageNext", GTK_STOCK_GO_FORWARD, N_("qgn_toolb_gene_forward"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_next) }, + { "ToolbarFindInMessage", MODEST_TOOLBAR_ICON_FIND, N_("qgn_toolb_gene_find"), NULL, NULL, NULL }, + { "ToolbarMessageBack", MODEST_TOOLBAR_ICON_PREV, N_("qgn_toolb_gene_back"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_prev) }, + { "ToolbarMessageNext", MODEST_TOOLBAR_ICON_NEXT, N_("qgn_toolb_gene_forward"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_next) }, { "ToolbarMessageMoveTo", MODEST_TOOLBAR_ICON_MOVE_TO_FOLDER, N_("qgn_toolb_gene_movetofldr"), NULL, NULL, G_CALLBACK(modest_ui_actions_on_move_to) }, { "ToolbarCancel", GTK_STOCK_STOP, "", NULL, NULL, NULL }, }; diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c index b92cab2..f0b4109 100644 --- a/src/maemo/modest-msg-view-window.c +++ b/src/maemo/modest-msg-view-window.c @@ -113,7 +113,7 @@ enum { }; static const GtkToggleActionEntry msg_view_toggle_action_entries [] = { - { "FindInMessage", GTK_STOCK_FIND, N_("qgn_toolb_gene_find"), NULL, NULL, G_CALLBACK (modest_msg_view_window_toggle_find_toolbar), FALSE }, + { "FindInMessage", MODEST_TOOLBAR_ICON_FIND, N_("qgn_toolb_gene_find"), NULL, NULL, G_CALLBACK (modest_msg_view_window_toggle_find_toolbar), FALSE }, { "ToolsFindInMessage", NULL, N_("mcen_me_viewer_find"), NULL, NULL, G_CALLBACK (modest_msg_view_window_toggle_find_toolbar), FALSE }, }; -- 1.7.9.5