X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-view-window.c;h=92ea3008a340aa05441eb58ee789ec5ba3f8d0cf;hp=14deee823afca1bf6de1d7e85642ccf1c354454d;hb=531402cfff9f940ed5c3b49ec30f8cb9bbd32d34;hpb=8a3f4c540e48d964de9d885b463bc9aadba1394b diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c index 14deee8..92ea300 100644 --- a/src/maemo/modest-msg-view-window.c +++ b/src/maemo/modest-msg-view-window.c @@ -50,15 +50,19 @@ #include "modest-progress-bar-widget.h" #include "modest-defs.h" #include "modest-hildon-includes.h" -#include #include "modest-ui-dimming-manager.h" #include #include +#include +#include +#include #define DEFAULT_FOLDER "MyDocs/.documents" static void modest_msg_view_window_class_init (ModestMsgViewWindowClass *klass); static void modest_msg_view_window_init (ModestMsgViewWindow *obj); +static void modest_header_view_observer_init( + ModestHeaderViewObserverIface *iface_class); static void modest_msg_view_window_finalize (GObject *obj); static void modest_msg_view_window_toggle_find_toolbar (GtkToggleAction *obj, gpointer data); @@ -89,6 +93,34 @@ static void modest_msg_view_window_show_toolbar (ModestWindow *window, static void modest_msg_view_window_clipboard_owner_change (GtkClipboard *clipboard, GdkEvent *event, ModestMsgViewWindow *window); +void modest_msg_view_window_on_row_changed( + GtkTreeModel *header_model, + GtkTreePath *arg1, + GtkTreeIter *arg2, + ModestMsgViewWindow *window); + +void modest_msg_view_window_on_row_deleted( + GtkTreeModel *header_model, + GtkTreePath *arg1, + ModestMsgViewWindow *window); + +void modest_msg_view_window_on_row_inserted( + GtkTreeModel *header_model, + GtkTreePath *tree_path, + GtkTreeIter *tree_iter, + ModestMsgViewWindow *window); + +void modest_msg_view_window_on_row_reordered( + GtkTreeModel *header_model, + GtkTreePath *arg1, + GtkTreeIter *arg2, + gpointer arg3, + ModestMsgViewWindow *window); + +void modest_msg_view_window_update_model_replaced( + ModestHeaderViewObserver *window, + GtkTreeModel *model, + const gchar *tny_folder_id); static void cancel_progressbar (GtkToolButton *toolbutton, ModestMsgViewWindow *self); @@ -102,6 +134,10 @@ static void on_account_removed (TnyAccountStore *account_store, TnyAccount *account, gpointer user_data); +static void on_move_focus (ModestMsgViewWindow *window, + GtkDirectionType direction, + gpointer userdata); + static void view_msg_cb (ModestMailOperation *mail_op, TnyHeader *header, TnyMsg *msg, @@ -157,17 +193,28 @@ struct _ModestMsgViewWindowPrivate { /* Optimized view enabled */ gboolean optimized_view; + /* Whether this was created via the *_new_for_search_result() function. */ + gboolean is_search_result; + /* A reference to the @model of the header view * to allow selecting previous/next messages, * if the message is currently selected in the header view. */ + const gchar *header_folder_id; GtkTreeModel *header_model; GtkTreeRowReference *row_reference; GtkTreeRowReference *next_row_reference; - guint clipboard_change_handler; - guint queue_change_handler; - guint account_removed_handler; + gulong clipboard_change_handler; + gulong queue_change_handler; + gulong account_removed_handler; + gulong row_changed_handler; + gulong row_deleted_handler; + gulong row_inserted_handler; + gulong rows_reordered_handler; + + guint purge_timeout; + GtkWidget *remove_attachment_banner; guint progress_bar_timeout; @@ -203,6 +250,17 @@ modest_msg_view_window_get_type (void) my_type = g_type_register_static (MODEST_TYPE_WINDOW, "ModestMsgViewWindow", &my_info, 0); + + static const GInterfaceInfo modest_header_view_observer_info = + { + (GInterfaceInitFunc) modest_header_view_observer_init, + NULL, /* interface_finalize */ + NULL /* interface_data */ + }; + + g_type_add_interface_static (my_type, + MODEST_TYPE_HEADER_VIEW_OBSERVER, + &modest_header_view_observer_info); } return my_type; } @@ -256,22 +314,40 @@ modest_msg_view_window_class_init (ModestMsgViewWindowClass *klass) G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER); } +static void modest_header_view_observer_init( + ModestHeaderViewObserverIface *iface_class) +{ + iface_class->update_func = modest_msg_view_window_update_model_replaced; +} + static void modest_msg_view_window_init (ModestMsgViewWindow *obj) { ModestMsgViewWindowPrivate *priv; priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj); + priv->is_search_result = FALSE; + priv->msg_view = NULL; priv->header_model = NULL; + priv->header_folder_id = NULL; priv->clipboard_change_handler = 0; priv->queue_change_handler = 0; priv->account_removed_handler = 0; + priv->row_changed_handler = 0; + priv->row_deleted_handler = 0; + priv->row_inserted_handler = 0; + priv->rows_reordered_handler = 0; priv->current_toolbar_mode = TOOLBAR_MODE_NORMAL; priv->optimized_view = FALSE; priv->progress_bar_timeout = 0; + priv->purge_timeout = 0; + priv->remove_attachment_banner = NULL; priv->msg_uid = NULL; + + modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(), + GTK_WINDOW(obj),"applications_email_viewer"); } @@ -388,7 +464,7 @@ menubar_to_menu (GtkUIManager *ui_manager) { GtkWidget *main_menu; GtkWidget *menubar; - GList *iter; + GList *iter, *children; /* Create new main menu */ main_menu = gtk_menu_new(); @@ -396,43 +472,61 @@ menubar_to_menu (GtkUIManager *ui_manager) /* Get the menubar from the UI manager */ menubar = gtk_ui_manager_get_widget (ui_manager, "/MenuBar"); - iter = gtk_container_get_children (GTK_CONTAINER (menubar)); + iter = children = gtk_container_get_children (GTK_CONTAINER (menubar)); while (iter) { GtkWidget *menu; menu = GTK_WIDGET (iter->data); gtk_widget_reparent(menu, main_menu); - + iter = g_list_next (iter); } + g_list_free (children); + return main_menu; } static void -init_window (ModestMsgViewWindow *obj, TnyMsg *msg) +init_window (ModestMsgViewWindow *obj) { GtkWidget *main_vbox; ModestMsgViewWindowPrivate *priv; ModestWindowPrivate *parent_priv; - + ModestConf *conf; + GtkAction *action = NULL; + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj); parent_priv = MODEST_WINDOW_GET_PRIVATE(obj); - priv->msg_view = modest_msg_view_new (msg); + priv->msg_view = GTK_WIDGET (tny_platform_factory_new_msg_view (modest_tny_platform_factory_get_instance ())); modest_msg_view_set_shadow_type (MODEST_MSG_VIEW (priv->msg_view), GTK_SHADOW_NONE); main_vbox = gtk_vbox_new (FALSE, 6); /* Menubar */ parent_priv->menubar = menubar_to_menu (parent_priv->ui_manager); - gtk_widget_show_all (GTK_WIDGET(parent_priv->menubar)); + conf = modest_runtime_get_conf (); + action = gtk_ui_manager_get_action (parent_priv->ui_manager, + "/MenuBar/ViewMenu/ViewShowToolbarMenu/ViewShowToolbarNormalScreenMenu"); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), + modest_conf_get_bool (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR, NULL)); + action = gtk_ui_manager_get_action (parent_priv->ui_manager, + "/MenuBar/ViewMenu/ViewShowToolbarMenu/ViewShowToolbarFullScreenMenu"); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), + modest_conf_get_bool (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR_FULLSCREEN, NULL)); hildon_window_set_menu (HILDON_WINDOW(obj), GTK_MENU(parent_priv->menubar)); + gtk_widget_show (GTK_WIDGET(parent_priv->menubar)); +#ifdef MODEST_USE_MOZEMBED + priv->main_scroll = priv->msg_view; + gtk_widget_set_size_request (priv->msg_view, -1, 1600); +#else priv->main_scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_container_add (GTK_CONTAINER (priv->main_scroll), priv->msg_view); +#endif gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->main_scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->main_scroll), GTK_SHADOW_NONE); modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->main_scroll), TRUE); - gtk_container_add (GTK_CONTAINER (priv->main_scroll), priv->msg_view); gtk_box_pack_start (GTK_BOX(main_vbox), priv->main_scroll, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER(obj), main_vbox); @@ -450,10 +544,13 @@ static void modest_msg_view_window_disconnect_signals (ModestWindow *self) { ModestMsgViewWindowPrivate *priv; - + ModestHeaderView *header_view = NULL; + ModestWindow *main_window = NULL; + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self); - if (g_signal_handler_is_connected (gtk_clipboard_get (GDK_SELECTION_PRIMARY), + if (gtk_clipboard_get (GDK_SELECTION_PRIMARY) && + g_signal_handler_is_connected (gtk_clipboard_get (GDK_SELECTION_PRIMARY), priv->clipboard_change_handler)) g_signal_handler_disconnect (gtk_clipboard_get (GDK_SELECTION_PRIMARY), priv->clipboard_change_handler); @@ -467,6 +564,43 @@ modest_msg_view_window_disconnect_signals (ModestWindow *self) priv->account_removed_handler)) g_signal_handler_disconnect (G_OBJECT (modest_runtime_get_account_store ()), priv->account_removed_handler); + + if (priv->header_model) { + if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), + priv->row_changed_handler)) + g_signal_handler_disconnect(G_OBJECT (priv->header_model), + priv->row_changed_handler); + + if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), + priv->row_deleted_handler)) + g_signal_handler_disconnect(G_OBJECT (priv->header_model), + priv->row_deleted_handler); + + if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), + priv->row_inserted_handler)) + g_signal_handler_disconnect(G_OBJECT (priv->header_model), + priv->row_inserted_handler); + + if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), + priv->rows_reordered_handler)) + g_signal_handler_disconnect(G_OBJECT (priv->header_model), + priv->rows_reordered_handler); + } + + main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), + FALSE); /* don't create */ + if (!main_window) + return; + + header_view = MODEST_HEADER_VIEW( + modest_main_window_get_child_widget( + MODEST_MAIN_WINDOW(main_window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW)); + if (header_view == NULL) + return; + + modest_header_view_remove_observer(header_view, + MODEST_HEADER_VIEW_OBSERVER(self)); } static void @@ -490,6 +624,17 @@ modest_msg_view_window_finalize (GObject *obj) priv->progress_bar_timeout = 0; } + if (priv->remove_attachment_banner) { + gtk_widget_destroy (priv->remove_attachment_banner); + g_object_unref (priv->remove_attachment_banner); + priv->remove_attachment_banner = NULL; + } + + if (priv->purge_timeout > 0) { + g_source_remove (priv->purge_timeout); + priv->purge_timeout = 0; + } + if (priv->row_reference) { gtk_tree_row_reference_free (priv->row_reference); priv->row_reference = NULL; @@ -544,57 +689,25 @@ select_next_valid_row (GtkTreeModel *model, return retval; } -ModestWindow * -modest_msg_view_window_new_with_header_model (TnyMsg *msg, - const gchar *modest_account_name, - const gchar *msg_uid, - GtkTreeModel *model, - GtkTreeRowReference *row_reference) -{ - ModestMsgViewWindow *window = NULL; - ModestMsgViewWindowPrivate *priv = NULL; - - window = MODEST_MSG_VIEW_WINDOW(modest_msg_view_window_new (msg, modest_account_name, msg_uid)); - g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), NULL); - - priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); - - g_object_ref (model); - priv->header_model = model; - priv->row_reference = gtk_tree_row_reference_copy (row_reference); - priv->next_row_reference = gtk_tree_row_reference_copy (row_reference); - select_next_valid_row (model, &(priv->next_row_reference), TRUE); - - modest_msg_view_window_update_priority (window); - - /* Check toolbar dimming rules */ - modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); - - return MODEST_WINDOW(window); -} - - -ModestWindow * -modest_msg_view_window_new (TnyMsg *msg, +/* TODO: This should be in _init(), with the parameters as properties. */ +static void +modest_msg_view_window_construct (ModestMsgViewWindow *self, const gchar *modest_account_name, const gchar *msg_uid) { - ModestMsgViewWindow *self = NULL; GObject *obj = NULL; ModestMsgViewWindowPrivate *priv = NULL; ModestWindowPrivate *parent_priv = NULL; ModestDimmingRulesGroup *menu_rules_group = NULL; ModestDimmingRulesGroup *toolbar_rules_group = NULL; + ModestDimmingRulesGroup *clipboard_rules_group = NULL; GtkActionGroup *action_group = NULL; GError *error = NULL; GdkPixbuf *window_icon; - g_return_val_if_fail (msg, NULL); - - obj = g_object_new(MODEST_TYPE_MSG_VIEW_WINDOW, NULL); + obj = G_OBJECT (self); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj); parent_priv = MODEST_WINDOW_GET_PRIVATE(obj); - self = MODEST_MSG_VIEW_WINDOW (obj); priv->msg_uid = g_strdup (msg_uid); @@ -606,6 +719,7 @@ modest_msg_view_window_new (TnyMsg *msg, menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules", FALSE); toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules", TRUE); + clipboard_rules_group = modest_dimming_rules_group_new ("ModestClipboardDimmingRules", FALSE); /* Add common actions */ gtk_action_group_add_actions (action_group, @@ -644,24 +758,30 @@ modest_msg_view_window_new (TnyMsg *msg, modest_dimming_rules_group_add_rules (menu_rules_group, modest_msg_view_menu_dimming_entries, G_N_ELEMENTS (modest_msg_view_menu_dimming_entries), - self); + MODEST_WINDOW (self)); modest_dimming_rules_group_add_rules (toolbar_rules_group, modest_msg_view_toolbar_dimming_entries, G_N_ELEMENTS (modest_msg_view_toolbar_dimming_entries), - self); + MODEST_WINDOW (self)); + modest_dimming_rules_group_add_rules (clipboard_rules_group, + modest_msg_view_clipboard_dimming_entries, + G_N_ELEMENTS (modest_msg_view_clipboard_dimming_entries), + MODEST_WINDOW (self)); /* Insert dimming rules group for this window */ modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group); modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group); + modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, clipboard_rules_group); g_object_unref (menu_rules_group); g_object_unref (toolbar_rules_group); + g_object_unref (clipboard_rules_group); /* Add accelerators */ gtk_window_add_accel_group (GTK_WINDOW (obj), gtk_ui_manager_get_accel_group (parent_priv->ui_manager)); /* Init window */ - init_window (MODEST_MSG_VIEW_WINDOW(obj), msg); + init_window (MODEST_MSG_VIEW_WINDOW(obj)); restore_settings (MODEST_MSG_VIEW_WINDOW(obj)); /* Set window icon */ @@ -673,7 +793,7 @@ modest_msg_view_window_new (TnyMsg *msg, /* g_signal_connect (G_OBJECT(obj), "delete-event", G_CALLBACK(on_delete_event), obj); */ - g_signal_connect (G_OBJECT(priv->msg_view), "link_clicked", + g_signal_connect (G_OBJECT(priv->msg_view), "activate_link", G_CALLBACK (modest_ui_actions_on_msg_link_clicked), obj); g_signal_connect (G_OBJECT(priv->msg_view), "link_hover", G_CALLBACK (modest_ui_actions_on_msg_link_hover), obj); @@ -692,6 +812,9 @@ modest_msg_view_window_new (TnyMsg *msg, G_CALLBACK (modest_msg_view_window_window_state_event), NULL); + g_signal_connect (G_OBJECT (obj), "move-focus", + G_CALLBACK (on_move_focus), obj); + /* Mail Operation Queue */ priv->queue_change_handler = g_signal_connect (G_OBJECT (modest_runtime_get_mail_operation_queue ()), "queue-changed", @@ -715,10 +838,314 @@ modest_msg_view_window_new (TnyMsg *msg, /* Check toolbar dimming rules */ modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (obj)); + modest_window_check_dimming_rules_group (MODEST_WINDOW (obj), "ModestClipboardDimmingRules"); + +} + +/* FIXME: parameter checks */ +ModestWindow * +modest_msg_view_window_new_with_header_model (TnyMsg *msg, + const gchar *modest_account_name, + const gchar *msg_uid, + GtkTreeModel *model, + GtkTreeRowReference *row_reference) +{ + ModestMsgViewWindow *window = NULL; + ModestMsgViewWindowPrivate *priv = NULL; + TnyFolder *header_folder = NULL; + ModestHeaderView *header_view = NULL; + ModestWindow *main_window = NULL; + + window = g_object_new(MODEST_TYPE_MSG_VIEW_WINDOW, NULL); + g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), NULL); + + modest_msg_view_window_construct (window, modest_account_name, msg_uid); + + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); + + /* Remember the message list's TreeModel so we can detect changes + * and change the list selection when necessary: */ + + main_window = modest_window_mgr_get_main_window( + modest_runtime_get_window_mgr(), FALSE); /* don't create */ + if (!main_window) { + g_warning ("%s: BUG: no main window", __FUNCTION__); + return NULL; + } + + header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget( + MODEST_MAIN_WINDOW(main_window), + MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW)); + if (header_view != NULL){ + header_folder = modest_header_view_get_folder(header_view); + g_assert(header_folder != NULL); + priv->header_folder_id = tny_folder_get_id(header_folder); + g_assert(priv->header_folder_id != NULL); + g_object_unref(header_folder); + } + + priv->header_model = g_object_ref(model); + priv->row_reference = gtk_tree_row_reference_copy (row_reference); + priv->next_row_reference = gtk_tree_row_reference_copy (row_reference); + select_next_valid_row (model, &(priv->next_row_reference), TRUE); + + priv->row_changed_handler = g_signal_connect( + GTK_TREE_MODEL(model), "row-changed", + G_CALLBACK(modest_msg_view_window_on_row_changed), + window); + priv->row_deleted_handler = g_signal_connect( + GTK_TREE_MODEL(model), "row-deleted", + G_CALLBACK(modest_msg_view_window_on_row_deleted), + window); + priv->row_inserted_handler = g_signal_connect ( + GTK_TREE_MODEL(model), "row-inserted", + G_CALLBACK(modest_msg_view_window_on_row_inserted), + window); + priv->rows_reordered_handler = g_signal_connect( + GTK_TREE_MODEL(model), "rows-reordered", + G_CALLBACK(modest_msg_view_window_on_row_reordered), + window); + + if (header_view != NULL){ + modest_header_view_add_observer(header_view, + MODEST_HEADER_VIEW_OBSERVER(window)); + } + + gtk_widget_show_all (GTK_WIDGET (window)); + + tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg); + update_window_title (MODEST_MSG_VIEW_WINDOW (window)); + + modest_msg_view_window_update_priority (window); + + /* Check toolbar dimming rules */ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); + + return MODEST_WINDOW(window); +} + +ModestWindow * +modest_msg_view_window_new_for_search_result (TnyMsg *msg, + const gchar *modest_account_name, + const gchar *msg_uid) +{ + ModestMsgViewWindow *window = NULL; + ModestMsgViewWindowPrivate *priv = NULL; + + window = g_object_new(MODEST_TYPE_MSG_VIEW_WINDOW, NULL); + g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), NULL); + modest_msg_view_window_construct (window, modest_account_name, msg_uid); + + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); + + /* Remember that this is a search result, + * so we can disable some UI appropriately: */ + priv->is_search_result = TRUE; + + tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg); + + return MODEST_WINDOW(window); +} + +ModestWindow * +modest_msg_view_window_new_for_attachment (TnyMsg *msg, + const gchar *modest_account_name, + const gchar *msg_uid) +{ + GObject *obj = NULL; + ModestMsgViewWindowPrivate *priv; + g_return_val_if_fail (msg, NULL); + + obj = g_object_new(MODEST_TYPE_MSG_VIEW_WINDOW, NULL); + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (obj); + modest_msg_view_window_construct (MODEST_MSG_VIEW_WINDOW (obj), + modest_account_name, msg_uid); + + tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg); return MODEST_WINDOW(obj); } +void modest_msg_view_window_on_row_changed( + GtkTreeModel *header_model, + GtkTreePath *arg1, + GtkTreeIter *arg2, + ModestMsgViewWindow *window){ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); +} + +void modest_msg_view_window_on_row_deleted( + GtkTreeModel *header_model, + GtkTreePath *arg1, + ModestMsgViewWindow *window){ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); +} + +/* On insertions we check if the folder still has the message we are + * showing or do not. If do not, we do nothing. Which means we are still + * not attached to any header folder and thus next/prev buttons are + * still dimmed. Once the message that is shown by msg-view is found, the + * new model of header-view will be attached and the references will be set. + * On each further insertions dimming rules will be checked. However + * this requires extra CPU time at least works. + * (An message might be deleted from TnyFolder and thus will not be + * inserted into the model again for example if it is removed by the + * imap server and the header view is refreshed.) + */ +void modest_msg_view_window_on_row_inserted( + GtkTreeModel *new_model, + GtkTreePath *tree_path, + GtkTreeIter *tree_iter, + ModestMsgViewWindow *window){ + ModestMsgViewWindowPrivate *priv = NULL; + TnyHeader *header = NULL; + gchar *uid = NULL; + + g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window)); + + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); + + /* If we already has a model attached then the message shown by + * msg-view is in it, and thus we do not need any actions but + * to check the dimming rules.*/ + if(priv->header_model != NULL){ + gtk_tree_row_reference_free(priv->next_row_reference); + priv->next_row_reference = gtk_tree_row_reference_copy( + priv->row_reference); + select_next_valid_row (priv->header_model, + &(priv->next_row_reference), FALSE); + modest_ui_actions_check_toolbar_dimming_rules ( + MODEST_WINDOW (window)); + return; + } + + /* Check if the newly inserted message is the same we are actually + * showing. IF not, we should remain detached from the header model + * and thus prev and next toolbarbuttons should remain dimmed. */ + gtk_tree_model_get (new_model, tree_iter, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, -1); + uid = modest_tny_folder_get_header_unique_id(header); + if(!g_str_equal(priv->msg_uid, uid)){ + g_free(uid); + return; + } + g_free(uid); + + /* Setup row_reference for the actual msg. */ + priv->row_reference = gtk_tree_row_reference_new( + new_model, tree_path); + if(priv->row_reference == NULL){ + g_warning("No reference for msg header item."); + return; + } + + /* Attach new_model and connect some callback to it to become able + * to detect changes in header-view. */ + priv->header_model = g_object_ref(new_model); + g_signal_connect (new_model, "row-changed", + G_CALLBACK (modest_msg_view_window_on_row_changed), + window); + g_signal_connect (new_model, "row-deleted", + G_CALLBACK (modest_msg_view_window_on_row_deleted), + window); + g_signal_connect (new_model, "rows-reordered", + G_CALLBACK (modest_msg_view_window_on_row_reordered), + window); + + /* Now set up next_row_reference. */ + priv->next_row_reference = gtk_tree_row_reference_copy( + priv->row_reference); + select_next_valid_row (priv->header_model, + &(priv->next_row_reference), FALSE); + + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); +} + +void modest_msg_view_window_on_row_reordered( + GtkTreeModel *header_model, + GtkTreePath *arg1, + GtkTreeIter *arg2, + gpointer arg3, + ModestMsgViewWindow *window){ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); +} + +/* The modest_msg_view_window_update_model_replaced implements update + * function for ModestHeaderViewObserver. Checks whether the TnyFolder + * actually belongs to the header-view is the same as the TnyFolder of + * the message of msg-view or not. If they are different, there is + * nothing to do. If they are the same, then the model has replaced and + * the reference in msg-view shall be replaced from the old model to + * the new model. In this case the view will be detached from it's + * header folder. From this point the next/prev buttons are dimmed. + */ +void modest_msg_view_window_update_model_replaced( + ModestHeaderViewObserver *observer, + GtkTreeModel *model, + const gchar *tny_folder_id){ + ModestMsgViewWindowPrivate *priv = NULL; + ModestMsgViewWindow *window = NULL; + + g_assert(MODEST_IS_HEADER_VIEW_OBSERVER(observer)); + g_assert(MODEST_IS_MSG_VIEW_WINDOW(observer)); + + window = MODEST_MSG_VIEW_WINDOW(observer); + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(window); + + /* If there is an other folder in the header-view then we do + * not care about it's model (msg list). Else if the + * header-view shows the folder the msg shown by us is in, we + * shall replace our model reference and make some check. */ + if(tny_folder_id == NULL || + !g_str_equal(tny_folder_id, priv->header_folder_id)) + return; + + /* Model is changed(replaced), so we should forget the old + * one. Because there might be other references and there + * might be some change on the model even if we unreferenced + * it, we need to disconnect our signals here. */ + if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), + priv->row_changed_handler)) + g_signal_handler_disconnect(G_OBJECT (priv->header_model), + priv->row_changed_handler); + priv->row_changed_handler = 0; + if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), + priv->row_deleted_handler)) + g_signal_handler_disconnect(G_OBJECT (priv->header_model), + priv->row_deleted_handler); + priv->row_deleted_handler = 0; + if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), + priv->row_inserted_handler)) + g_signal_handler_disconnect(G_OBJECT (priv->header_model), + priv->row_inserted_handler); + priv->row_inserted_handler = 0; + if (g_signal_handler_is_connected(G_OBJECT (priv->header_model), + priv->rows_reordered_handler)) + g_signal_handler_disconnect(G_OBJECT (priv->header_model), + priv->rows_reordered_handler); + priv->rows_reordered_handler = 0; + g_object_unref(priv->header_model); + priv->header_model = NULL; + g_object_unref(priv->row_reference); + priv->row_reference = NULL; + g_object_unref(priv->next_row_reference); + priv->next_row_reference = NULL; + + modest_ui_actions_check_toolbar_dimming_rules(MODEST_WINDOW(window)); + + if(tny_folder_id == NULL) + return; + + g_assert(model != NULL); + + /* Also we must connect to the new model for row insertions. + * Only for insertions now. We will need other ones only after + * the msg is show by msg-view is added to the new model. */ + priv->row_inserted_handler = g_signal_connect ( + model, "row-inserted", + G_CALLBACK(modest_msg_view_window_on_row_inserted), + window); +} gboolean modest_msg_view_window_toolbar_on_transfer_mode (ModestMsgViewWindow *self) @@ -743,13 +1170,15 @@ modest_msg_view_window_get_header (ModestMsgViewWindow *self) g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), NULL); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self); - /* If the message ws not obtained from a treemodel, + /* If the message was not obtained from a treemodel, * for instance if it was opened directly by the search UI: */ if (priv->header_model == NULL) { msg = modest_msg_view_window_get_message (self); - header = tny_msg_get_header (msg); - g_object_unref (msg); + if (msg) { + header = tny_msg_get_header (msg); + g_object_unref (msg); + } return header; } @@ -758,6 +1187,8 @@ modest_msg_view_window_get_header (ModestMsgViewWindow *self) * instead of sometimes retrieving it from the header view? * Then we wouldn't be dependent on the message actually still being selected * in the header view. murrayc. */ + if (!gtk_tree_row_reference_valid (priv->row_reference)) + return NULL; path = gtk_tree_row_reference_get_path (priv->row_reference); g_return_val_if_fail (path != NULL, NULL); gtk_tree_model_get_iter (priv->header_model, @@ -785,7 +1216,7 @@ modest_msg_view_window_get_message (ModestMsgViewWindow *self) msg_view = MODEST_MSG_VIEW (priv->msg_view); - return modest_msg_view_get_message (msg_view); + return tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view)); } const gchar* @@ -846,7 +1277,7 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget, gchar *current_search; ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (obj); - if (modest_msg_view_get_message_is_empty (MODEST_MSG_VIEW (priv->msg_view))) { + if (modest_mime_part_view_is_empty (MODEST_MIME_PART_VIEW (priv->msg_view))) { hildon_banner_show_information (NULL, NULL, _("mail_ib_nothing_to_find")); return; } @@ -863,18 +1294,22 @@ modest_msg_view_window_find_toolbar_search (GtkWidget *widget, gboolean result; g_free (priv->last_search); priv->last_search = g_strdup (current_search); - result = modest_msg_view_search (MODEST_MSG_VIEW (priv->msg_view), - priv->last_search); + result = modest_isearch_view_search (MODEST_ISEARCH_VIEW (priv->msg_view), + priv->last_search); if (!result) { hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_no_matches")); g_free (priv->last_search); priv->last_search = NULL; - } + } else { + modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view)); + } } else { - if (!modest_msg_view_search_next (MODEST_MSG_VIEW (priv->msg_view))) { + if (!modest_isearch_view_search_next (MODEST_ISEARCH_VIEW (priv->msg_view))) { hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_search_complete")); g_free (priv->last_search); priv->last_search = NULL; + } else { + modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view)); } } @@ -887,11 +1322,20 @@ modest_msg_view_window_set_zoom (ModestWindow *window, gdouble zoom) { ModestMsgViewWindowPrivate *priv; + ModestWindowPrivate *parent_priv; + GtkAction *action = NULL; + gint int_zoom = (gint) rint (zoom*100.0+0.1); g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window)); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); - modest_msg_view_set_zoom (MODEST_MSG_VIEW (priv->msg_view), zoom); + parent_priv = MODEST_WINDOW_GET_PRIVATE (window); + modest_zoomable_set_zoom (MODEST_ZOOMABLE (priv->msg_view), zoom); + + action = gtk_ui_manager_get_action (parent_priv->ui_manager, + "/MenuBar/ViewMenu/ZoomMenu/Zoom50Menu"); + + gtk_radio_action_set_current_value (GTK_RADIO_ACTION (action), int_zoom); } static gdouble @@ -902,7 +1346,7 @@ modest_msg_view_window_get_zoom (ModestWindow *window) g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), 1.0); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); - return modest_msg_view_get_zoom (MODEST_MSG_VIEW (priv->msg_view)); + return modest_zoomable_get_zoom (MODEST_ZOOMABLE (priv->msg_view)); } static gboolean @@ -1010,32 +1454,33 @@ modest_msg_view_window_last_message_selected (ModestMsgViewWindow *window) GtkTreePath *path; ModestMsgViewWindowPrivate *priv; GtkTreeIter tmp_iter; - gboolean has_next = FALSE; + gboolean is_last_selected; g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), TRUE); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); - if (priv->header_model) { - path = gtk_tree_row_reference_get_path (priv->row_reference); - if (path == NULL) return FALSE; - while (!has_next) { - TnyHeader *header; - gtk_tree_path_next (path); - if (!gtk_tree_model_get_iter (priv->header_model, &tmp_iter, path)) - break; - gtk_tree_model_get (priv->header_model, &tmp_iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, - &header, -1); - if (!(tny_header_get_flags(header) & TNY_HEADER_FLAG_DELETED)) { - has_next = TRUE; - break; - } - } - gtk_tree_path_free (path); - return !has_next; - } else { + /*if no model (so no rows at all), then virtually we are the last*/ + if (!priv->header_model) return TRUE; + + path = gtk_tree_row_reference_get_path (priv->row_reference); + if (path == NULL) + return TRUE; + + is_last_selected = TRUE; + while (is_last_selected) { + TnyHeader *header; + gtk_tree_path_next (path); + if (!gtk_tree_model_get_iter (priv->header_model, &tmp_iter, path)) + break; + gtk_tree_model_get (priv->header_model, &tmp_iter, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, + &header, -1); + if (!(tny_header_get_flags(header) & TNY_HEADER_FLAG_DELETED)) + is_last_selected = FALSE; } - + gtk_tree_path_free (path); + return is_last_selected; } gboolean @@ -1050,57 +1495,61 @@ modest_msg_view_window_has_headers_model (ModestMsgViewWindow *window) } gboolean +modest_msg_view_window_is_search_result (ModestMsgViewWindow *window) +{ + ModestMsgViewWindowPrivate *priv; + + g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), TRUE); + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); + + return priv->is_search_result; +} + +gboolean modest_msg_view_window_first_message_selected (ModestMsgViewWindow *window) { GtkTreePath *path; ModestMsgViewWindowPrivate *priv; - gboolean result; + gboolean is_first_selected; GtkTreeIter tmp_iter; +/* gchar * path_string;*/ g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), TRUE); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); - if (priv->header_model) { - gchar * path_string; - path = gtk_tree_row_reference_get_path (priv->row_reference); - if (!path) - return TRUE; + /*if no model (so no rows at all), then virtually we are the first*/ + if (!priv->header_model) + return TRUE; - path_string = gtk_tree_path_to_string (path); - result = (strcmp (path_string, "0")==0); - if (result) { - g_free (path_string); - gtk_tree_path_free (path); - return result; - } + path = gtk_tree_row_reference_get_path (priv->row_reference); + if (!path) + return TRUE; - while (result) { - TnyHeader *header; +/* path_string = gtk_tree_path_to_string (path); + is_first_selected = strcmp (path_string, "0"); - gtk_tree_path_prev (path); - - if (!gtk_tree_model_get_iter (priv->header_model, &tmp_iter, path)) - break; - gtk_tree_model_get (priv->header_model, &tmp_iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, - &header, -1); - if (!(tny_header_get_flags(header)&TNY_HEADER_FLAG_DELETED)) { - result = FALSE; - break; - } + g_free (path_string); + gtk_tree_path_free (path); - path_string = gtk_tree_path_to_string (path); - if (strcmp(path_string, "0")==0) { - g_free (path_string); - break; - } - g_free (path_string); - } - gtk_tree_path_free (path); - return result; - } else { - return TRUE; + return is_first_selected;*/ + + is_first_selected = TRUE; + while (is_first_selected) { + TnyHeader *header; + if(!gtk_tree_path_prev (path)) + break; + /* Here the 'if' is needless for logic, but let make sure + * iter is valid for gtk_tree_model_get. */ + if (!gtk_tree_model_get_iter (priv->header_model, &tmp_iter, path)) + break; + gtk_tree_model_get (priv->header_model, &tmp_iter, + TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, + &header, -1); + if (!(tny_header_get_flags(header) & TNY_HEADER_FLAG_DELETED)) + is_first_selected = FALSE; } - + gtk_tree_path_free (path); + return is_first_selected; } /** @@ -1119,7 +1568,7 @@ static gboolean message_reader (ModestMsgViewWindow *window, ModestMsgViewWindowPrivate *priv, TnyHeader *header, - GtkTreePath *path) + GtkTreeRowReference *row_reference) { ModestMailOperation *mail_op = NULL; ModestMailOperationTypeOperation op_type; @@ -1127,7 +1576,7 @@ message_reader (ModestMsgViewWindow *window, ModestWindow *msg_window = NULL; ModestWindowMgr *mgr; - g_return_val_if_fail (path != NULL, FALSE); + g_return_val_if_fail (row_reference != NULL, FALSE); mgr = modest_runtime_get_window_mgr (); already_showing = modest_window_mgr_find_registered_header (mgr, header, &msg_window); @@ -1143,39 +1592,39 @@ message_reader (ModestMsgViewWindow *window, if (tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED) { op_type = MODEST_MAIL_OPERATION_TYPE_OPEN; } else { - TnyFolder *folder; - GtkResponseType response; - op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE; - /* Ask the user if he wants to download the message */ - response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window), - _("mcen_nc_get_msg")); - if (response == GTK_RESPONSE_CANCEL) - return FALSE; + /* Ask the user if he wants to download the message if + we're not online */ + if (!tny_device_is_online (modest_runtime_get_device())) { + TnyFolder *folder = NULL; + GtkResponseType response; + + response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window), + _("mcen_nc_get_msg")); + if (response == GTK_RESPONSE_CANCEL) + return FALSE; - /* Offer the connection dialog if necessary */ - /* FIXME: should this stuff go directly to the mail - operation instead of spread it all over the - code? */ - folder = tny_header_get_folder (header); - if (folder) { - if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (folder))) { + /* Offer the connection dialog if necessary */ + folder = tny_header_get_folder (header); + if (folder) { + if (!modest_platform_connect_and_wait_if_network_folderstore (NULL, + TNY_FOLDER_STORE (folder))) { + g_object_unref (folder); + return FALSE; + } g_object_unref (folder); - return FALSE; } - g_object_unref (folder); } } /* New mail operation */ - mail_op = modest_mail_operation_new_with_error_handling (op_type, - G_OBJECT(window), + mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(window), modest_ui_actions_get_msgs_full_error_handler, - NULL); + NULL, NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - modest_mail_operation_get_msg (mail_op, header, view_msg_cb, path); + modest_mail_operation_get_msg (mail_op, header, view_msg_cb, row_reference); g_object_unref (mail_op); /* Update toolbar dimming rules */ @@ -1192,6 +1641,7 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window) GtkTreeIter tmp_iter; TnyHeader *header; gboolean retval = TRUE; + GtkTreeRowReference *row_reference = NULL; g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), FALSE); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); @@ -1213,18 +1663,21 @@ modest_msg_view_window_select_next_message (ModestMsgViewWindow *window) if (path == NULL) return FALSE; + row_reference = gtk_tree_row_reference_copy (priv->next_row_reference); + gtk_tree_model_get_iter (priv->header_model, &tmp_iter, path); + gtk_tree_path_free (path); gtk_tree_model_get (priv->header_model, &tmp_iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, -1); /* Read the message & show it */ - if (!message_reader (window, priv, header, path)) { + if (!message_reader (window, priv, header, row_reference)) { retval = FALSE; - gtk_tree_path_free (path); + gtk_tree_row_reference_free (row_reference); } /* Free */ @@ -1239,7 +1692,8 @@ modest_msg_view_window_select_first_message (ModestMsgViewWindow *self) ModestMsgViewWindowPrivate *priv = NULL; TnyHeader *header = NULL; GtkTreeIter iter; - GtkTreePath *path; + GtkTreePath *path = NULL; + GtkTreeRowReference *row_reference = NULL; g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self), FALSE); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self); @@ -1260,9 +1714,11 @@ modest_msg_view_window_select_first_message (ModestMsgViewWindow *self) } path = gtk_tree_model_get_path (priv->header_model, &iter); - + row_reference = gtk_tree_row_reference_new (priv->header_model, path); + gtk_tree_path_free (path); + /* Read the message & show it */ - message_reader (self, priv, header, path); + message_reader (self, priv, header, row_reference); /* Free */ g_object_unref (header); @@ -1275,6 +1731,7 @@ modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window) { ModestMsgViewWindowPrivate *priv = NULL; GtkTreePath *path; + GtkTreeRowReference *row_reference = NULL; g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), FALSE); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); @@ -1299,12 +1756,15 @@ modest_msg_view_window_select_previous_message (ModestMsgViewWindow *window) continue; } + row_reference = gtk_tree_row_reference_new (priv->header_model, path); /* Read the message & show it */ - if (!message_reader (window, priv, header, path)) { + if (!message_reader (window, priv, header, row_reference)) { + gtk_tree_row_reference_free (row_reference); g_object_unref (header); break; } + gtk_tree_path_free (path); g_object_unref (header); return TRUE; @@ -1322,12 +1782,12 @@ view_msg_cb (ModestMailOperation *mail_op, { ModestMsgViewWindow *self = NULL; ModestMsgViewWindowPrivate *priv = NULL; - GtkTreePath *path; + GtkTreeRowReference *row_reference = NULL; /* If there was any error */ - path = (GtkTreePath *) user_data; + row_reference = (GtkTreeRowReference *) user_data; if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) { - gtk_tree_path_free (path); + gtk_tree_row_reference_free (row_reference); return; } @@ -1338,17 +1798,17 @@ view_msg_cb (ModestMailOperation *mail_op, /* Update the row reference */ gtk_tree_row_reference_free (priv->row_reference); - priv->row_reference = gtk_tree_row_reference_new (priv->header_model, path); + priv->row_reference = gtk_tree_row_reference_copy (row_reference); priv->next_row_reference = gtk_tree_row_reference_copy (priv->row_reference); select_next_valid_row (priv->header_model, &(priv->next_row_reference), TRUE); - gtk_tree_path_free (path); + gtk_tree_row_reference_free (row_reference); /* Mark header as read */ if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN)) - tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN); + tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN); /* Set new message */ - modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), msg); + tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg); modest_msg_view_window_update_priority (self); update_window_title (MODEST_MSG_VIEW_WINDOW (self)); modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view)); @@ -1378,20 +1838,13 @@ modest_msg_view_window_get_folder_type (ModestMsgViewWindow *window) folder_type = TNY_FOLDER_TYPE_UNKNOWN; - msg = modest_msg_view_get_message (MODEST_MSG_VIEW (priv->msg_view)); + msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view)); if (msg) { TnyFolder *folder; folder = tny_msg_get_folder (msg); - if (folder) { folder_type = tny_folder_get_folder_type (folder); - - if (folder_type == TNY_FOLDER_TYPE_NORMAL || folder_type == TNY_FOLDER_TYPE_UNKNOWN) { - const gchar *fname = tny_folder_get_name (folder); - folder_type = modest_tny_folder_guess_folder_type_from_name (fname); - } - g_object_unref (folder); } g_object_unref (msg); @@ -1456,18 +1909,6 @@ modest_msg_view_window_window_state_event (GtkWidget *widget, GdkEventWindowStat } -void -modest_msg_view_window_toggle_fullscreen (ModestMsgViewWindow *window) -{ - ModestWindowPrivate *parent_priv; - GtkAction *fs_toggle_action; - parent_priv = MODEST_WINDOW_GET_PRIVATE (window); - - fs_toggle_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewToggleFullscreenMenu"); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (fs_toggle_action), - !gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (fs_toggle_action))); -} - static void set_homogeneous (GtkWidget *widget, gpointer data) @@ -1487,6 +1928,8 @@ modest_msg_view_window_show_toolbar (ModestWindow *self, GtkWidget *reply_button = NULL, *menu = NULL; GtkWidget *placeholder = NULL; gint insert_index; + const gchar *action_name; + GtkAction *action; parent_priv = MODEST_WINDOW_GET_PRIVATE(self); priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self); @@ -1497,6 +1940,7 @@ modest_msg_view_window_show_toolbar (ModestWindow *self, if (!parent_priv->toolbar) { parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar"); + gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE); /* Set homogeneous toolbar */ gtk_container_foreach (GTK_CONTAINER (parent_priv->toolbar), @@ -1552,6 +1996,20 @@ modest_msg_view_window_show_toolbar (ModestWindow *self, gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE); gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar)); } + + /* Update also the actions (to update the toggles in the + menus), we have to do it manually because some other window + of the same time could have changed it (remember that the + toolbar fullscreen mode is shared by all the windows of the + same type */ + if (modest_window_mgr_get_fullscreen_mode (modest_runtime_get_window_mgr ())) + action_name = "/MenuBar/ViewMenu/ViewShowToolbarMenu/ViewShowToolbarFullScreenMenu"; + else + action_name = "/MenuBar/ViewMenu/ViewShowToolbarMenu/ViewShowToolbarNormalScreenMenu"; + + action = gtk_ui_manager_get_action (parent_priv->ui_manager, action_name); + modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), + show_toolbar); } static void @@ -1559,34 +2017,10 @@ modest_msg_view_window_clipboard_owner_change (GtkClipboard *clipboard, GdkEvent *event, ModestMsgViewWindow *window) { - ModestWindowPrivate *parent_priv; -/* GtkAction *action; */ - gboolean is_address; - gchar *selection; - GtkWidget *focused; - if (!GTK_WIDGET_VISIBLE (window)) return; - parent_priv = MODEST_WINDOW_GET_PRIVATE (window); - selection = gtk_clipboard_wait_for_text (clipboard); - - is_address = ((selection != NULL) && (modest_text_utils_validate_recipient (selection, NULL))); - -/* action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/ToolsAddToContactsMenu"); */ -/* gtk_action_set_sensitive (action, is_address); */ - - focused = gtk_window_get_focus (GTK_WINDOW (window)); - -/* action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/EditCopyMenu"); */ -/* gtk_action_set_sensitive (action, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused))); */ - -/* action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/EditCutMenu"); */ -/* gtk_action_set_sensitive (action, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused))); */ - - g_free (selection); -/* modest_msg_view_window_update_dimmed (window); */ - + modest_window_check_dimming_rules_group (MODEST_WINDOW (window), "ModestClipboardDimmingRules"); } gboolean @@ -1740,11 +2174,24 @@ void modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart *mime_part) { ModestMsgViewWindowPrivate *priv; + const gchar *msg_uid; + gchar *attachment_uid = NULL; + gint attachment_index = 0; + GList *attachments; + g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window)); g_return_if_fail (TNY_IS_MIME_PART (mime_part) || (mime_part == NULL)); - priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); + msg_uid = modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (window)); + attachments = modest_msg_view_get_attachments (MODEST_MSG_VIEW (priv->msg_view)); + attachment_index = g_list_index (attachments, mime_part); + g_list_free (attachments); + + if (msg_uid && attachment_index >= 0) { + attachment_uid = g_strdup_printf ("%s/%d", msg_uid, attachment_index); + } + if (mime_part == NULL) { gboolean error = FALSE; GList *selected_attachments = modest_msg_view_get_selected_attachments (MODEST_MSG_VIEW (priv->msg_view)); @@ -1768,24 +2215,15 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart if (tny_mime_part_is_purged (mime_part)) { g_object_unref (mime_part); - hildon_banner_show_information (NULL, NULL, _("mail_ib_attach_not_local")); return; } if (!TNY_IS_MSG (mime_part)) { gchar *filepath = NULL; const gchar *att_filename = tny_mime_part_get_filename (mime_part); - gchar *extension = NULL; TnyFsStream *temp_stream = NULL; - - if (att_filename) { - extension = g_strrstr (att_filename, "."); - if (extension != NULL) - extension++; - } - - temp_stream = modest_maemo_utils_create_temp_stream (extension, &filepath); - + temp_stream = modest_maemo_utils_create_temp_stream (att_filename, attachment_uid, &filepath); + if (temp_stream) { const gchar *content_type; content_type = tny_mime_part_get_content_type (mime_part); @@ -1794,7 +2232,8 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart modest_platform_activate_file (filepath, content_type); g_object_unref (temp_stream); g_free (filepath); - /* TODO: delete temporary file */ + /* NOTE: files in the temporary area will be automatically + * cleaned after some time if they are no longer in use */ } } else { /* message attachment */ @@ -1816,11 +2255,11 @@ modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart g_warning ("window for is already being created"); } else { /* it's not found, so create a new window for it */ - modest_window_mgr_register_header (mgr, header); /* register the uid before building the window */ + modest_window_mgr_register_header (mgr, header, attachment_uid); /* register the uid before building the window */ gchar *account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (window))); if (!account) account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ()); - msg_win = modest_msg_view_window_new (TNY_MSG (mime_part), account, NULL); + msg_win = modest_msg_view_window_new_for_attachment (TNY_MSG (mime_part), account, attachment_uid); modest_window_set_zoom (MODEST_WINDOW (msg_win), modest_window_get_zoom (MODEST_WINDOW (window))); modest_window_mgr_register_window (mgr, msg_win); @@ -1873,21 +2312,22 @@ static gboolean idle_save_mime_part_show_result (SaveMimePartInfo *info) { if (info->pairs != NULL) { - gdk_threads_enter (); - save_mime_parts_to_file_with_checks (info); - gdk_threads_leave (); + save_mime_part_to_file (info); } else { gboolean result; result = info->result; - gdk_threads_enter (); + /* This is a GDK lock because we are an idle callback and + * hildon_banner_show_information is or does Gtk+ code */ + + gdk_threads_enter (); /* CHECKED */ save_mime_part_info_free (info, TRUE); if (result) { hildon_banner_show_information (NULL, NULL, _CS("sfil_ib_saved")); } else { hildon_banner_show_information (NULL, NULL, _("mail_ib_file_operation_failed")); } - gdk_threads_leave (); + gdk_threads_leave (); /* CHECKED */ } return FALSE; @@ -1901,7 +2341,7 @@ save_mime_part_to_file (SaveMimePartInfo *info) TnyStream *stream; SaveMimePartPair *pair = (SaveMimePartPair *) info->pairs->data; - result = gnome_vfs_create (&handle, pair->filename, GNOME_VFS_OPEN_WRITE, FALSE, 0777); + result = gnome_vfs_create (&handle, pair->filename, GNOME_VFS_OPEN_WRITE, FALSE, 0444); if (result == GNOME_VFS_OK) { stream = tny_vfs_stream_new (handle); tny_mime_part_decode_to_stream (pair->part, stream); @@ -1922,14 +2362,22 @@ save_mime_part_to_file (SaveMimePartInfo *info) static void save_mime_parts_to_file_with_checks (SaveMimePartInfo *info) { - SaveMimePartPair *pair; gboolean is_ok = TRUE; - - pair = info->pairs->data; - if (modest_maemo_utils_file_exists (pair->filename)) { + gint replaced_files = 0; + const GList *files = info->pairs; + const GList *iter; + + for (iter = files; (iter != NULL) && (replaced_files < 2); iter = g_list_next(iter)) { + SaveMimePartPair *pair = iter->data; + if (modest_maemo_utils_file_exists (pair->filename)) { + replaced_files++; + } + } + if (replaced_files) { GtkWidget *confirm_overwrite_dialog; - confirm_overwrite_dialog = hildon_note_new_confirmation (NULL, - _("emev_nc_replace_files")); + const gchar *message = (replaced_files == 1) ? + _FM("docm_nc_replace_file") : _FM("docm_nc_replace_multiple"); + confirm_overwrite_dialog = hildon_note_new_confirmation (NULL, message); if (gtk_dialog_run (GTK_DIALOG (confirm_overwrite_dialog)) != GTK_RESPONSE_OK) { is_ok = FALSE; } @@ -1939,7 +2387,11 @@ save_mime_parts_to_file_with_checks (SaveMimePartInfo *info) if (!is_ok) { save_mime_part_info_free (info, TRUE); } else { + GtkWidget *banner = hildon_banner_show_animation (NULL, NULL, + _CS("sfil_ib_saving")); + info->banner = g_object_ref (banner); g_thread_create ((GThreadFunc)save_mime_part_to_file, info, FALSE, NULL); + g_object_unref (banner); } } @@ -2045,16 +2497,29 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, GList *mim if (files_to_save != NULL) { SaveMimePartInfo *info = g_slice_new0 (SaveMimePartInfo); - GtkWidget *banner = hildon_banner_show_animation (NULL, NULL, - _CS("sfil_ib_saving")); info->pairs = files_to_save; - info->banner = banner; info->result = TRUE; - g_object_ref (banner); save_mime_parts_to_file_with_checks (info); } } +static gboolean +show_remove_attachment_information (gpointer userdata) +{ + ModestMsgViewWindow *window = (ModestMsgViewWindow *) userdata; + ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window); + + if (priv->remove_attachment_banner != NULL) { + gtk_widget_destroy (priv->remove_attachment_banner); + g_object_unref (priv->remove_attachment_banner); + } + + priv->remove_attachment_banner = g_object_ref ( + hildon_banner_show_animation (NULL, NULL, _("mcen_ib_removing_attachment"))); + + return FALSE; +} + void modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean get_all) { @@ -2118,26 +2583,36 @@ modest_msg_view_window_remove_attachments (ModestMsgViewWindow *window, gboolean if (response != GTK_RESPONSE_OK) return; + priv->purge_timeout = g_timeout_add (2000, show_remove_attachment_information, window); /* folder = tny_msg_get_folder (msg); */ /* tny_msg_uncache_attachments (msg); */ /* tny_folder_refresh (folder, NULL); */ /* g_object_unref (folder); */ - modest_platform_information_banner (NULL, NULL, _("mcen_ib_removing_attachment")); - for (node = mime_parts; node != NULL; node = g_list_next (node)) { tny_mime_part_set_purged (TNY_MIME_PART (node->data)); /* modest_msg_view_remove_attachment (MODEST_MSG_VIEW (priv->msg_view), node->data); */ } - msg = modest_msg_view_get_message (MODEST_MSG_VIEW (priv->msg_view)); - modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), NULL); + msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view)); + tny_msg_view_clear (TNY_MSG_VIEW (priv->msg_view)); tny_msg_rewrite_cache (msg); - modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), msg); + tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg); g_list_foreach (mime_parts, (GFunc) g_object_unref, NULL); g_list_free (mime_parts); + if (priv->purge_timeout > 0) { + g_source_remove (priv->purge_timeout); + priv->purge_timeout = 0; + } + + if (priv->remove_attachment_banner) { + gtk_widget_destroy (priv->remove_attachment_banner); + g_object_unref (priv->remove_attachment_banner); + priv->remove_attachment_banner = NULL; + } + } @@ -2149,8 +2624,9 @@ update_window_title (ModestMsgViewWindow *window) TnyMsg *msg = NULL; TnyHeader *header = NULL; const gchar *subject = NULL; + + msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view)); - msg = modest_msg_view_get_message (MODEST_MSG_VIEW (priv->msg_view)); if (msg != NULL) { header = tny_msg_get_header (msg); subject = tny_header_get_subject (header); @@ -2162,3 +2638,18 @@ update_window_title (ModestMsgViewWindow *window) gtk_window_set_title (GTK_WINDOW (window), subject); } + + +static void on_move_focus (ModestMsgViewWindow *window, + GtkDirectionType direction, + gpointer userdata) +{ + GtkWidget *current_focus = NULL; + + current_focus = gtk_window_get_focus (GTK_WINDOW (window)); + if ((current_focus != NULL) && + MODEST_IS_ATTACHMENTS_VIEW (current_focus)) { + g_signal_stop_emission_by_name (G_OBJECT (window), "move-focus"); + } +} +