* src/modest-mail-operation.[ch]:

[modest] / src / modest-ui-dimming-rules.c

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index c212f71..a583675 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -191,6 +191,13 @@ modest_ui_dimming_rules_on_delete (ModestWindow *win, gpointer user_data)
 
                if (folder_view && gtk_widget_is_focus (folder_view)) 
                        dimmed = modest_ui_dimming_rules_on_delete_folder (win, rule);
+
+               if (header_view && folder_view &&
+                   !gtk_widget_is_focus (header_view) &&
+                   !gtk_widget_is_focus (folder_view)) {
+                       dimmed = TRUE;
+                       modest_dimming_rule_set_notification (rule, dgettext("hildon-common-strings", "ckct_ib_nothing_to_delete"));                    
+               }
        } else {
                dimmed = modest_ui_dimming_rules_on_delete_folder (win, rule);
        }
@@ -204,7 +211,7 @@ gboolean
 modest_ui_dimming_rules_on_delete_folder (ModestWindow *win, gpointer user_data)
 {
        ModestDimmingRule *rule = NULL;
-       TnyFolderType types[5];
+       TnyFolderType types[6];
        gboolean dimmed = FALSE;
 
        g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE);
@@ -216,6 +223,7 @@ modest_ui_dimming_rules_on_delete_folder (ModestWindow *win, gpointer user_data)
        types[2] = TNY_FOLDER_TYPE_SENT;
        types[3] = TNY_FOLDER_TYPE_INBOX;
        types[4] = TNY_FOLDER_TYPE_ROOT;
+       types[5] = TNY_FOLDER_TYPE_ARCHIVE;
 
                
        /* Check dimmed rule */ 
@@ -225,7 +233,7 @@ modest_ui_dimming_rules_on_delete_folder (ModestWindow *win, gpointer user_data)
                        modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_delete_error"));
        }
        if (!dimmed) {
-               dimmed = _selected_folder_is_any_of_type (win, types, 5);
+               dimmed = _selected_folder_is_any_of_type (win, types, 6);
                if (dimmed)
                        modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_delete_error"));
        }
@@ -454,7 +462,7 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
                if (!dimmed) {
                        dimmed = _selected_msg_sent_in_progress (win);
                        if (dimmed)
-                               modest_dimming_rule_set_notification (rule, _("mcen_ib_message_unableto_delete"));
+                               modest_dimming_rule_set_notification (rule, _("ckct_ib_unable_to_delete]"));
                }
        } 
        else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
@@ -888,11 +896,6 @@ modest_ui_dimming_rules_on_cut (ModestWindow *win, gpointer user_data)
 
        /* Check window specific dimming rules */
        if (MODEST_IS_MAIN_WINDOW (win)) {
-               if (!dimmed) {
-                       dimmed = _selected_folder_not_writeable (MODEST_MAIN_WINDOW(win));
-                       if (dimmed)
-                               modest_dimming_rule_set_notification (rule, _("mcen_ib_message_unableto_delete"));
-               }
                if (!dimmed) { 
                        dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win));                   
                        if (dimmed)
@@ -958,8 +961,8 @@ modest_ui_dimming_rules_on_view_previous (ModestWindow *win, gpointer user_data)
        }
        if (!dimmed) {
                dimmed = modest_msg_view_window_first_message_selected (MODEST_MSG_VIEW_WINDOW(win));
-               if (dimmed)
-                       modest_dimming_rule_set_notification (rule, "");
+/*             if (dimmed) */
+/*                     modest_dimming_rule_set_notification (rule, ""); */
        }               
 
        return dimmed;
@@ -983,8 +986,8 @@ modest_ui_dimming_rules_on_view_next (ModestWindow *win, gpointer user_data)
        }
        if (!dimmed) {
                dimmed = modest_msg_view_window_last_message_selected (MODEST_MSG_VIEW_WINDOW(win));
-               if (dimmed)
-                       modest_dimming_rule_set_notification (rule, "");
+/*             if (dimmed) */
+/*                     modest_dimming_rule_set_notification (rule, ""); */
        }               
 
        return dimmed;
@@ -1028,7 +1031,7 @@ modest_ui_dimming_rules_on_cancel_sending (ModestWindow *win, gpointer user_data
        }
        if (!dimmed) {
                dimmed = !_sending_in_progress (win);
-               if (dimmed) 
+               if (dimmed)
                        modest_dimming_rule_set_notification (rule, "");
        }
 
@@ -1209,8 +1212,6 @@ _selected_folder_is_MMC_or_POP_root (ModestMainWindow *win)
 }
 
 
-
-
 static gboolean
 _selected_folder_is_empty (ModestMainWindow *win)
 {
@@ -1304,7 +1305,7 @@ _selected_folder_is_any_of_type (ModestWindow *win,
                                                                   MODEST_WIDGET_TYPE_FOLDER_VIEW);
                /* If no folder view, always dimmed */
                if (!folder_view)
-                       return TRUE;
+                       return FALSE;
        
                /* Get selected folder as parent of new folder to create */
                folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
@@ -1312,7 +1313,7 @@ _selected_folder_is_any_of_type (ModestWindow *win,
                if (!(folder && TNY_IS_FOLDER(folder))) {
                        if (folder)
                                g_object_unref (folder);
-                       return TRUE;
+                       return FALSE;
                }
                
                /* Check folder type */
@@ -1438,7 +1439,7 @@ _invalid_clipboard_selected (ModestWindow *win,
                          (MODEST_IS_ATTACHMENTS_VIEW (focused)));
                
                if (result)
-                       modest_dimming_rule_set_notification (rule, _(""));                     
+                       modest_dimming_rule_set_notification (rule, "");
        }               
        else if (MODEST_IS_MAIN_WINDOW (win)) {
                GtkWidget *header_view = NULL;