X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-view-window-ui-dimming.h;h=7bd09088b2ef817ffbe93bd532f1e7aa0cc332a4;hp=2f3dc572e58f0bcbc42728c523a36467352c8f53;hb=d8c49b249239b3b99d985cdc582600cda5f2230f;hpb=6f839c90aa26fbc42532cb8ee1bd4769f8539a14

diff --git a/src/maemo/modest-msg-view-window-ui-dimming.h b/src/maemo/modest-msg-view-window-ui-dimming.h
index 2f3dc57..7bd0908 100644
--- a/src/maemo/modest-msg-view-window-ui-dimming.h
+++ b/src/maemo/modest-msg-view-window-ui-dimming.h
@@ -7,21 +7,21 @@
 G_BEGIN_DECLS
 
 
-/* Dimming rules entries */
-static const ModestDimmingEntry modest_msg_view_dimming_entries [] = {
+/* Menu Dimming rules entries */
+static const ModestDimmingEntry modest_msg_view_menu_dimming_entries [] = {
 
 	/* Message Menu */
 	{ "/MenuBar/MessageMenu/MessageNewMenu", G_CALLBACK(modest_ui_dimming_rules_on_new_msg) },
 	{ "/MenuBar/MessageMenu/MessageReplyMenu", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
 	{ "/MenuBar/MessageMenu/MessageReplyAllMenu", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
 	{ "/MenuBar/MessageMenu/MessageForwardMenu",  G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
-	{ "/MenuBar/MessageMenu/MessageDeleteMenu",  NULL },
+	{ "/MenuBar/MessageMenu/MessageDeleteMenu",  G_CALLBACK(modest_ui_dimming_rules_on_delete_msg) },
 	{ "/MenuBar/MessageMenu/MessageDetailsMenu", G_CALLBACK(modest_ui_dimming_rules_on_details) },
 
 	/* Edit Menu */
 	{ "/MenuBar/EditMenu", NULL },
 	{ "/MenuBar/EditMenu/EditCutMenu", G_CALLBACK(modest_ui_dimming_rules_always_dimmed) },
-	{ "/MenuBar/EditMenu/EditCopyMenu", NULL },
+	{ "/MenuBar/EditMenu/EditCopyMenu", G_CALLBACK(modest_ui_dimming_rules_on_copy) },
 	{ "/MenuBar/EditMenu/EditPasteMenu", G_CALLBACK(modest_ui_dimming_rules_always_dimmed) },
 	{ "/MenuBar/EditMenu/EditSelectAllMenu", NULL },
 	{ "/MenuBar/EditMenu/EditMoveToMenu", G_CALLBACK(modest_ui_dimming_rules_on_move_to) },
@@ -30,34 +30,24 @@ static const ModestDimmingEntry modest_msg_view_dimming_entries [] = {
 	{ "/MenuBar/ViewMenu", NULL },
 	{ "/MenuBar/ViewMenu/ZoomMenu", NULL },
 	{ "/MenuBar/ViewMenu/ViewToggleFullscreenMenu", NULL },
-	{ "/MenuBar/ViewMenu/ViewPreviousMessageMenu", NULL },
-	{ "/MenuBar/ViewMenu/ViewNextMessageMenu", NULL },
+	{ "/MenuBar/ViewMenu/ViewPreviousMessageMenu", G_CALLBACK(modest_ui_dimming_rules_on_view_previous) },
+	{ "/MenuBar/ViewMenu/ViewNextMessageMenu",  G_CALLBACK(modest_ui_dimming_rules_on_view_next)},
 	
 	/* Attachments Menu */
 	{ "/MenuBar/AttachmentsMenu", NULL },
-	{ "/MenuBar/AttachmentsMenu/ViewAttachmentMenu", NULL },
-	{ "/MenuBar/AttachmentsMenu/SaveAttachmentMenu", NULL },
-	{ "/MenuBar/AttachmentsMenu/RemoveAttachmentMenu", NULL },
+	{ "/MenuBar/AttachmentsMenu/ViewAttachmentMenu", G_CALLBACK(modest_ui_dimming_rules_on_view_attachments) },
+	{ "/MenuBar/AttachmentsMenu/SaveAttachmentMenu", G_CALLBACK(modest_ui_dimming_rules_on_save_attachments) },
+	{ "/MenuBar/AttachmentsMenu/RemoveAttachmentMenu", G_CALLBACK(modest_ui_dimming_rules_on_remove_attachments) },
 
 	/* Tools Menu */
 	{ "/MenuBar/ToolsMenu", NULL },
-	{ "/MenuBar/ToolsMenu/ToolsContactsMenu", NULL },
+	{ "/MenuBar/ToolsMenu/ToolsAddToContactsMenu", G_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts) },
 
 	/* Close Menu */
 	{ "/MenuBar/CloseMenu", NULL },
 	{ "/MenuBar/ToolsMenu/CloseWindowMenu", NULL },
 	{ "/MenuBar/ToolsMenu/CloseAllWindowsMenu", NULL },
 
-	/* Toolbar */
-	{ "/Toolbar/ToolbarMessageNew", NULL },
-	{ "/Toolbar/ToolbarMessageReply", NULL },
-	{ "/Toolbar/ToolbarDeleteMessage", NULL },
-	{ "/Toolbar/ToolbarMoveTo", NULL },
-	{ "/Toolbar/ToolbarFindInMessage", NULL },
-	{ "/Toolbar/ToolbarMessageBack", NULL },
-	{ "/Toolbar/ToolbarMessageNext", NULL },
-	{ "/Toolbar/ToolbarCancel", NULL },
-
 	/* Contextual Menus (Toolbar) */
 	{ "/ToolbarReplyCSM/MessageForwardMenu", NULL },
 	{ "/ToolbarReplyCSM/MessageReplyAllMenu", NULL },
@@ -65,5 +55,18 @@ static const ModestDimmingEntry modest_msg_view_dimming_entries [] = {
 	
 };
 
+/* Menu Dimming rules entries */
+static const ModestDimmingEntry modest_msg_view_toolbar_dimming_entries [] = {
+
+	/* Toolbar */
+	{ "/ToolBar/ToolbarMessageReply", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
+	{ "/ToolBar/ToolbarMessageMoveTo", G_CALLBACK(modest_ui_dimming_rules_on_move_to) },
+	{ "/ToolBar/ToolbarDeleteMessage",  G_CALLBACK(modest_ui_dimming_rules_on_delete_msg) },
+	{ "/ToolBar/FindInMessage", G_CALLBACK(modest_ui_dimming_rules_on_find_msg) },
+	{ "/ToolBar/ToolbarMessageBack", G_CALLBACK(modest_ui_dimming_rules_on_view_previous) },
+	{ "/ToolBar/ToolbarMessageNext", G_CALLBACK(modest_ui_dimming_rules_on_view_next) },
+	{ "/ToolBar/ToolbarCancel", NULL },
+};
+
 G_END_DECLS
 #endif /* __MODEST_MSG_VIEW_WINDOW_UI_PRIV_H__ */