Add dimming for save to drafts menu action (fixes NB#66476).

* src/widgets/modest-msg-edit-window-ui.h:
        * Add email menu ui action for checking dimming rules.
* src/maemo/modest-msg-edit-window-ui-dimming.h:
        * Add dimming rule for save to drafts to editor.
* src/modest-ui-dimming-rules.[ch]:
        * Added dimming rule implementation for save to drafts in
          editor. If message is not marked as modified, we don't dim.

pmo-trunk-r3353

diff --git a/src/maemo/modest-msg-edit-window-ui-dimming.h b/src/maemo/modest-msg-edit-window-ui-dimming.h
index 648638f..8c8e1ec 100644 (file)
--- a/src/maemo/modest-msg-edit-window-ui-dimming.h
+++ b/src/maemo/modest-msg-edit-window-ui-dimming.h
@@ -23,6 +23,7 @@ static const ModestDimmingEntry modest_msg_edit_window_menu_dimming_entries [] =
        { "/MenuBar/EditMenu/RedoMenu", G_CALLBACK (modest_ui_dimming_rules_on_redo) }, 
        { "/MenuBar/EditMenu/PasteMenu", G_CALLBACK (modest_ui_dimming_rules_on_editor_paste) },        
        { "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu", G_CALLBACK (modest_ui_dimming_rules_on_editor_remove_attachment) }, 
+       { "/MenuBar/EmailMenu/SaveToDraftsMenu", G_CALLBACK (modest_ui_dimming_rules_on_save_to_drafts) },
 
 };
 

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index f435e9c..be43ca6 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -2605,3 +2605,21 @@ _selected_folder_has_subfolder_with_same_name (ModestWindow *win)
        return result;
 }      
 
+gboolean 
+modest_ui_dimming_rules_on_save_to_drafts (ModestWindow *win, 
+                                          gpointer user_data)
+{
+       ModestDimmingRule *rule = NULL;
+       gboolean dimmed = FALSE;
+
+       g_return_val_if_fail (MODEST_MSG_EDIT_WINDOW (win), FALSE);
+       g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE);
+       rule = MODEST_DIMMING_RULE (user_data);
+
+       /* Check dimmed rule */ 
+       if (!dimmed) {
+               dimmed = !modest_msg_edit_window_is_modified (MODEST_MSG_EDIT_WINDOW (win));
+       }
+
+       return dimmed;  
+}

diff --git a/src/modest-ui-dimming-rules.h b/src/modest-ui-dimming-rules.h
index 52ef55e..1f3ab6e 100644 (file)
--- a/src/modest-ui-dimming-rules.h
+++ b/src/modest-ui-dimming-rules.h
@@ -81,6 +81,7 @@ gboolean modest_ui_dimming_rules_on_send (ModestWindow *win, gpointer user_data)
 gboolean modest_ui_dimming_rules_on_editor_remove_attachment (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_editor_paste (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_editor_paste_show_menu (ModestWindow *win, gpointer user_data);
+gboolean modest_ui_dimming_rules_on_save_to_drafts (ModestWindow *win, gpointer user_data);
 
 G_END_DECLS
 #endif 

diff --git a/src/widgets/modest-msg-edit-window-ui.h b/src/widgets/modest-msg-edit-window-ui.h
index 1e825c0..d8d1df1 100644 (file)
--- a/src/widgets/modest-msg-edit-window-ui.h
+++ b/src/widgets/modest-msg-edit-window-ui.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
 static const GtkActionEntry modest_msg_edit_action_entries [] = {
 
        /* Toplevel menus */
-       { "Email", NULL, N_("mcen_me_inbox_email") },
+       { "Email", NULL, N_("mcen_me_inbox_email") , NULL, NULL, G_CALLBACK (modest_ui_actions_on_email_menu_activated) },
        { "View", NULL, N_("mcen_me_inbox_view") , NULL, NULL, G_CALLBACK (modest_ui_actions_on_view_menu_activated)},
        { "Edit", NULL, N_("mcen_me_inbox_edit") , NULL, NULL, G_CALLBACK (modest_ui_actions_on_edit_menu_activated)},
        { "Format", NULL, N_("mcen_me_editor_format") , NULL, NULL, G_CALLBACK (modest_ui_actions_on_format_menu_activated)},