projects
/
modest
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c44bf81
)
Reorganize the message view menu, following the new ui specs:
author
José Dapena Paz
<jdapena@igalia.com>
Tue, 16 Feb 2010 18:04:24 +0000
(19:04 +0100)
committer
José Dapena Paz
<jdapena@igalia.com>
Tue, 16 Feb 2010 18:04:24 +0000
(19:04 +0100)
Fix 2/2 for NB#156612
src/widgets/modest-msg-view-window.c
patch
|
blob
|
history
diff --git
a/src/widgets/modest-msg-view-window.c
b/src/widgets/modest-msg-view-window.c
index
d36cebe
..
abaafcd
100644
(file)
--- a/
src/widgets/modest-msg-view-window.c
+++ b/
src/widgets/modest-msg-view-window.c
@@
-3963,9
+3963,9
@@
setup_menu (ModestMsgViewWindow *self)
g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW(self));
/* Settings menu buttons */
g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW(self));
/* Settings menu buttons */
- modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_find"), NULL,
- MODEST_WINDOW_MENU_CALLBACK (modest_msg_view_window_show_isearch_toolbar),
- MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_find_in_msg));
+ modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
+ MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_new_msg),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
modest_window_add_to_menu (MODEST_WINDOW (self),
dngettext(GETTEXT_PACKAGE,
modest_window_add_to_menu (MODEST_WINDOW (self),
dngettext(GETTEXT_PACKAGE,
@@
-3979,7
+3979,6
@@
setup_menu (ModestMsgViewWindow *self)
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_mark_as_read"), NULL,
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_mark_as_read),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_mark_as_read_msg_in_view));
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_mark_as_read"), NULL,
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_mark_as_read),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_mark_as_read_msg_in_view));
-
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_mark_as_unread"), NULL,
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_mark_as_unread),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_mark_as_unread_msg_in_view));
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_mark_as_unread"), NULL,
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_mark_as_unread),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_mark_as_unread_msg_in_view));
@@
-3991,9
+3990,6
@@
setup_menu (ModestMsgViewWindow *self)
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_remove_attachments),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_remove_attachments));
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_remove_attachments),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_remove_attachments));
- modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
- MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_new_msg),
- MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL,
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_add_to_contacts),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts));
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL,
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_add_to_contacts),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts));
@@
-4001,6
+3997,10
@@
setup_menu (ModestMsgViewWindow *self)
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_ti_message_properties"), NULL,
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_details),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_details));
modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_ti_message_properties"), NULL,
MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_details),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_details));
+
+ modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_find"), NULL,
+ MODEST_WINDOW_MENU_CALLBACK (modest_msg_view_window_show_isearch_toolbar),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_find_in_msg));
}
void
}
void