Proper dimming rules for folder window move to and delete

pmo-trunk-r7430

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index 90c9f7d..085278b 100644 (file)
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -390,10 +390,10 @@ static void setup_menu (ModestFolderWindow *self)
                                           NULL);
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_folder"), NULL,
                                           APP_MENU_CALLBACK (set_moveto_edit_mode),
-                                          NULL);
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_folder_window_move_to));
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_folder"), NULL,
                                           APP_MENU_CALLBACK (set_delete_edit_mode),
-                                          NULL);
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_folder_window_delete));
 
        /* new message */
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), 

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 1f13fa6..a02e032 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -471,6 +471,8 @@ modest_ui_dimming_rules_on_delete (ModestWindow *win, gpointer user_data)
                }
 
 #ifdef MODEST_TOOLKIT_HILDON2
+       } else if (MODEST_IS_FOLDER_WINDOW (win)) {
+               dimmed = modest_ui_dimming_rules_on_folder_window_delete (win, user_data);
        } else if (MODEST_IS_HEADER_WINDOW (win)) {
 
                if (!dimmed)
@@ -1043,6 +1045,8 @@ modest_ui_dimming_rules_on_move_to (ModestWindow *win, gpointer user_data)
 #ifdef MODEST_TOOLKIT_HILDON2
        else if (MODEST_IS_HEADER_WINDOW (win))
                dimmed = modest_ui_dimming_rules_on_header_window_move_to (win, user_data);
+       else if (MODEST_IS_FOLDER_WINDOW (win))
+               dimmed = modest_ui_dimming_rules_on_folder_window_move_to (win, user_data);
 #endif
        else if (MODEST_IS_MSG_VIEW_WINDOW (win)) 
                 dimmed = modest_ui_dimming_rules_on_view_window_move_to (win, user_data);
@@ -1196,6 +1200,42 @@ modest_ui_dimming_rules_on_header_window_move_to (ModestWindow *win, gpointer us
 
        return dimmed;
 }
+
+gboolean 
+modest_ui_dimming_rules_on_folder_window_move_to (ModestWindow *win, gpointer user_data)
+{
+       ModestDimmingRule *rule = NULL;
+       gboolean dimmed = FALSE;
+
+       g_return_val_if_fail (MODEST_IS_FOLDER_WINDOW(win), FALSE);
+       g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE);
+       rule = MODEST_DIMMING_RULE (user_data);
+
+       /* Check dimmed rule */ 
+       dimmed = _transfer_mode_enabled (win);
+       if (dimmed)
+               modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading"));     
+
+       return dimmed;
+}
+
+gboolean 
+modest_ui_dimming_rules_on_folder_window_delete (ModestWindow *win, gpointer user_data)
+{
+       ModestDimmingRule *rule = NULL;
+       gboolean dimmed = FALSE;
+
+       g_return_val_if_fail (MODEST_IS_FOLDER_WINDOW(win), FALSE);
+       g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE);
+       rule = MODEST_DIMMING_RULE (user_data);
+
+       /* Check dimmed rule */ 
+       dimmed = _transfer_mode_enabled (win);
+       if (dimmed)
+               modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading"));     
+
+       return dimmed;
+}
 #endif
 
 gboolean 

diff --git a/src/modest-ui-dimming-rules.h b/src/modest-ui-dimming-rules.h
index 846a901..23a4f5a 100644 (file)
--- a/src/modest-ui-dimming-rules.h
+++ b/src/modest-ui-dimming-rules.h
@@ -89,6 +89,8 @@ gboolean modest_ui_dimming_rules_on_save_to_drafts (ModestWindow *win, gpointer
 gboolean modest_ui_dimming_rules_on_insert_image (ModestWindow *win, gpointer user_data);
 #ifdef MODEST_TOOLKIT_HILDON2
 gboolean modest_ui_dimming_rules_on_header_window_move_to (ModestWindow *win, gpointer user_data);
+gboolean modest_ui_dimming_rules_on_folder_window_move_to (ModestWindow *win, gpointer user_data);
+gboolean modest_ui_dimming_rules_on_folder_window_delete (ModestWindow *win, gpointer user_data);
 #endif
 
 G_END_DECLS