* src/maemo/modest-msg-edit-window.c:

        * Removed all insenstive handlers for menu actions, as we don't show
          insensitive information banners from menus, only from toolbar
* src/widgets/modest-attachments-view.c:
        * Lose selection when the window focus leaves (fixes NB#61455).

pmo-trunk-r2608

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 47e5f27..1294512 100644 (file)
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -93,10 +93,6 @@ static gboolean msg_body_focus (GtkWidget *focus, GdkEventFocus *event, gpointer
 static void  recpt_field_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor);
 static void  send_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
 static void  style_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
 static void  recpt_field_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor);
 static void  send_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
 static void  style_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);

-static void  remove_attachment_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
-static void  zoom_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
-static void  paste_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
-static void  copy_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);

 static void  setup_insensitive_handlers (ModestMsgEditWindow *editor);
 static void  reset_modified (ModestMsgEditWindow *editor);
 
 static void  setup_insensitive_handlers (ModestMsgEditWindow *editor);
 static void  reset_modified (ModestMsgEditWindow *editor);
 

@@ -2418,23 +2414,6 @@ setup_insensitive_handlers (ModestMsgEditWindow *window)
 
        widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSend");
        g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (send_insensitive_press), window);
 
        widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSend");
        g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (send_insensitive_press), window);

-       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/EmailMenu/SendMenu");
-       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (send_insensitive_press), window);
-
-       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/SelectFontMenu");
-       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
-       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu");
-       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
-       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu");
-       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
-       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentLeftMenu");
-       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
-       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentCenterMenu");
-       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
-       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentRightMenu");
-       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
-       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/InsertImageMenu");
-       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);

        widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsBold");
        g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
        widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsItalics");
        widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsBold");
        g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
        widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ActionsItalics");

@@ -2446,15 +2425,6 @@ setup_insensitive_handlers (ModestMsgEditWindow *window)
        widget = priv->font_face_toolitem;
        g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
 
        widget = priv->font_face_toolitem;
        g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (style_insensitive_press), window);
 

-       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/AttachmentsMenu/RemoveAttachmentsMenu");
-       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (remove_attachment_insensitive_press), window);
-       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/ViewMenu/ZoomMenu");
-       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (zoom_insensitive_press), window);
-
-       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/EditMenu/PasteMenu");
-       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (paste_insensitive_press), window);
-       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu");
-       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (copy_insensitive_press), window);

 }
 
 static void  
 }
 
 static void  

@@ -2578,35 +2548,6 @@ send_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
        hildon_banner_show_information (NULL, NULL, _("mcen_ib_add_recipients_first"));
 }
 
        hildon_banner_show_information (NULL, NULL, _("mcen_ib_add_recipients_first"));
 }
 

-static void  
-zoom_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
-{
-       hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here"));
-}
-
-static void  
-remove_attachment_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
-{
-       ModestWindowPrivate *parent_priv;
-       ModestMsgEditWindowPrivate *priv;
-       GList *selected_attachments = NULL;
-       gint n_att_selected = 0;
-
-       priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor);
-       parent_priv = MODEST_WINDOW_GET_PRIVATE (editor);
-
-       selected_attachments = modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
-       n_att_selected = g_list_length (selected_attachments);
-       g_list_free (selected_attachments);
-
-       if (n_att_selected > 1)
-               hildon_banner_show_information (NULL, NULL, _("mcen_ib_unable_to_display_more"));
-       else if (n_att_selected == 0)
-               hildon_banner_show_information (NULL, NULL, _("TODO: select one attachment"));
-       else
-               hildon_banner_show_information (NULL, NULL, _("mail_ib_unable_to_purge_attachments"));
-}
-

 static void
 style_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
 {
 static void
 style_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
 {

@@ -2920,25 +2861,6 @@ update_paste_dimming (ModestMsgEditWindow *window)
 
 }
 
 
 }
 

-static void  
-paste_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
-{
-       GtkWidget *focused = gtk_window_get_focus (GTK_WINDOW (editor));
-
-       if (MODEST_IS_ATTACHMENTS_VIEW (focused))
-               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_unable_to_paste_here"));
-       else
-               hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ecoc_ib_edwin_nothing_to_paste"));
-               
-}
-
-static void  
-copy_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
-{
-       hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_unable_to_copy"));
-               
-}
-

 
 static void
 modest_msg_edit_window_system_clipboard_owner_change (GtkClipboard *clipboard,
 
 static void
 modest_msg_edit_window_system_clipboard_owner_change (GtkClipboard *clipboard,

diff --git a/src/widgets/modest-attachments-view.c b/src/widgets/modest-attachments-view.c
index 09a7e77..a54b259 100644 (file)
--- a/src/widgets/modest-attachments-view.c
+++ b/src/widgets/modest-attachments-view.c
@@ -67,6 +67,7 @@ static gboolean button_press_event (GtkWidget *widget, GdkEventButton *event, Mo
 static gboolean motion_notify_event (GtkWidget *widget, GdkEventMotion *event, ModestAttachmentsView *atts_view);
 static gboolean button_release_event (GtkWidget *widget, GdkEventButton *event, ModestAttachmentsView *atts_view);
 static gboolean key_press_event (GtkWidget *widget, GdkEventKey *event, ModestAttachmentsView *atts_view);
 static gboolean motion_notify_event (GtkWidget *widget, GdkEventMotion *event, ModestAttachmentsView *atts_view);
 static gboolean button_release_event (GtkWidget *widget, GdkEventButton *event, ModestAttachmentsView *atts_view);
 static gboolean key_press_event (GtkWidget *widget, GdkEventKey *event, ModestAttachmentsView *atts_view);

+static gboolean focus_out_event (GtkWidget *widget, GdkEventFocus *event, ModestAttachmentsView *atts_view);

 static GtkWidget *get_att_view_at_coords (ModestAttachmentsView *atts_view,
                                          gdouble x, gdouble y);
 static void unselect_all (ModestAttachmentsView *atts_view);
 static GtkWidget *get_att_view_at_coords (ModestAttachmentsView *atts_view,
                                          gdouble x, gdouble y);
 static void unselect_all (ModestAttachmentsView *atts_view);

@@ -240,6 +241,7 @@ modest_attachments_view_instance_init (GTypeInstance *instance, gpointer g_class
        g_signal_connect (G_OBJECT (instance), "button-release-event", G_CALLBACK (button_release_event), instance);
        g_signal_connect (G_OBJECT (instance), "motion-notify-event", G_CALLBACK (motion_notify_event), instance);
        g_signal_connect (G_OBJECT (instance), "key-press-event", G_CALLBACK (key_press_event), instance);
        g_signal_connect (G_OBJECT (instance), "button-release-event", G_CALLBACK (button_release_event), instance);
        g_signal_connect (G_OBJECT (instance), "motion-notify-event", G_CALLBACK (motion_notify_event), instance);
        g_signal_connect (G_OBJECT (instance), "key-press-event", G_CALLBACK (key_press_event), instance);

+       g_signal_connect (G_OBJECT (instance), "focus-out-event", G_CALLBACK (focus_out_event), instance);

 
        GTK_WIDGET_SET_FLAGS (instance, GTK_CAN_FOCUS);
 
 
        GTK_WIDGET_SET_FLAGS (instance, GTK_CAN_FOCUS);
 

@@ -750,3 +752,12 @@ own_clipboard (ModestAttachmentsView *atts_view)
                                      clipboard_get, clipboard_clear, G_OBJECT(atts_view));
                              
 }
                                      clipboard_get, clipboard_clear, G_OBJECT(atts_view));
                              
 }

+
+static gboolean 
+focus_out_event (GtkWidget *widget, GdkEventFocus *event, ModestAttachmentsView *atts_view)
+{
+       if (!gtk_widget_is_focus (widget))
+               unselect_all (atts_view);
+
+       return FALSE;
+}