From a09bb4dadbcb51965e90428ccccc9e0506e3c151 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Tue, 17 Nov 2009 19:11:07 +0100 Subject: [PATCH] Move ui msg view dimming rules to src/widgets --- src/hildon2/modest-msg-view-window-ui-dimming.h | 70 ----------------------- src/widgets/modest-msg-view-window-ui-dimming.h | 70 +++++++++++++++++++++++ src/widgets/modest-msg-view-window.c | 2 +- 3 files changed, 71 insertions(+), 71 deletions(-) delete mode 100644 src/hildon2/modest-msg-view-window-ui-dimming.h create mode 100644 src/widgets/modest-msg-view-window-ui-dimming.h diff --git a/src/hildon2/modest-msg-view-window-ui-dimming.h b/src/hildon2/modest-msg-view-window-ui-dimming.h deleted file mode 100644 index 270b83d..0000000 --- a/src/hildon2/modest-msg-view-window-ui-dimming.h +++ /dev/null @@ -1,70 +0,0 @@ -#ifndef __MODEST_MSG_VIEW_WINDOW_UI_DIMMING_PRIV_H__ -#define __MODEST_MSG_VIEW_WINDOW_UI_DIMMING_PRIV_H__ - -#include "modest-dimming-rules-group.h" -#include "modest-ui-dimming-rules.h" - -G_BEGIN_DECLS - - -/* 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/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/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) }, - - /* View Menu */ - { "/MenuBar/ViewMenu", NULL }, - { "/MenuBar/ViewMenu/ZoomMenu", NULL }, - { "/MenuBar/ViewMenu/ViewToggleFullscreenMenu", 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/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 }, - - /* Close Menu */ - { "/MenuBar/CloseMenu", NULL }, - { "/MenuBar/ToolsMenu/CloseWindowMenu", NULL }, - { "/MenuBar/ToolsMenu/CloseAllWindowsMenu", NULL }, - - -}; - -/* Clipboard status dimming rule entries */ -static const ModestDimmingEntry modest_msg_view_clipboard_dimming_entries [] = { - { "/MenuBar/EditMenu/EditCutMenu", G_CALLBACK(modest_ui_dimming_rules_always_dimmed) }, - { "/MenuBar/EditMenu/EditCopyMenu", G_CALLBACK(modest_ui_dimming_rules_on_copy) }, - { "/MenuBar/ToolsMenu/ToolsAddToContactsMenu", G_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts) }, -}; - -/* 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/ToolbarMessageReplyAll", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) }, - { "/ToolBar/ToolbarMessageForward", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) }, - { "/ToolBar/ToolbarDeleteMessage", G_CALLBACK(modest_ui_dimming_rules_on_delete_msg) }, - { "/ToolBar/ToolbarDownloadExternalImages", G_CALLBACK(modest_ui_dimming_rules_on_fetch_images) }, - { "/ToolBar/ToolbarMessageBack", G_CALLBACK(modest_ui_dimming_rules_on_view_previous) }, - { "/ToolBar/ToolbarMessageNext", G_CALLBACK(modest_ui_dimming_rules_on_view_next) }, -}; - -G_END_DECLS -#endif /* __MODEST_MSG_VIEW_WINDOW_UI_PRIV_H__ */ diff --git a/src/widgets/modest-msg-view-window-ui-dimming.h b/src/widgets/modest-msg-view-window-ui-dimming.h new file mode 100644 index 0000000..270b83d --- /dev/null +++ b/src/widgets/modest-msg-view-window-ui-dimming.h @@ -0,0 +1,70 @@ +#ifndef __MODEST_MSG_VIEW_WINDOW_UI_DIMMING_PRIV_H__ +#define __MODEST_MSG_VIEW_WINDOW_UI_DIMMING_PRIV_H__ + +#include "modest-dimming-rules-group.h" +#include "modest-ui-dimming-rules.h" + +G_BEGIN_DECLS + + +/* 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/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/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) }, + + /* View Menu */ + { "/MenuBar/ViewMenu", NULL }, + { "/MenuBar/ViewMenu/ZoomMenu", NULL }, + { "/MenuBar/ViewMenu/ViewToggleFullscreenMenu", 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/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 }, + + /* Close Menu */ + { "/MenuBar/CloseMenu", NULL }, + { "/MenuBar/ToolsMenu/CloseWindowMenu", NULL }, + { "/MenuBar/ToolsMenu/CloseAllWindowsMenu", NULL }, + + +}; + +/* Clipboard status dimming rule entries */ +static const ModestDimmingEntry modest_msg_view_clipboard_dimming_entries [] = { + { "/MenuBar/EditMenu/EditCutMenu", G_CALLBACK(modest_ui_dimming_rules_always_dimmed) }, + { "/MenuBar/EditMenu/EditCopyMenu", G_CALLBACK(modest_ui_dimming_rules_on_copy) }, + { "/MenuBar/ToolsMenu/ToolsAddToContactsMenu", G_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts) }, +}; + +/* 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/ToolbarMessageReplyAll", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) }, + { "/ToolBar/ToolbarMessageForward", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) }, + { "/ToolBar/ToolbarDeleteMessage", G_CALLBACK(modest_ui_dimming_rules_on_delete_msg) }, + { "/ToolBar/ToolbarDownloadExternalImages", G_CALLBACK(modest_ui_dimming_rules_on_fetch_images) }, + { "/ToolBar/ToolbarMessageBack", G_CALLBACK(modest_ui_dimming_rules_on_view_previous) }, + { "/ToolBar/ToolbarMessageNext", G_CALLBACK(modest_ui_dimming_rules_on_view_next) }, +}; + +G_END_DECLS +#endif /* __MODEST_MSG_VIEW_WINDOW_UI_PRIV_H__ */ diff --git a/src/widgets/modest-msg-view-window.c b/src/widgets/modest-msg-view-window.c index 44886b6..7f62301 100644 --- a/src/widgets/modest-msg-view-window.c +++ b/src/widgets/modest-msg-view-window.c @@ -37,7 +37,7 @@ #include "modest-marshal.h" #include "modest-platform.h" #include -#include +#include #include #include #include "modest-msg-view-window-ui-dimming.h" -- 1.7.9.5