X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-hildon2-window-mgr.c;h=06ed06534ae7b6e06b7820266129aec105e57a3f;hp=3922dd6055a07647ac347ba122cccf456d7525f6;hb=9c2f8007e10d401d50ce21d4ee8e49b116c5006b;hpb=fd1d9e254d08ad38779f8a1bb5c4d6d350040a9b diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c index 3922dd6..06ed065 100644 --- a/src/hildon2/modest-hildon2-window-mgr.c +++ b/src/hildon2/modest-hildon2-window-mgr.c @@ -35,6 +35,7 @@ #include "modest-mailboxes-window.h" #include "modest-header-window.h" #include "modest-main-window.h" +#include "modest-window-mgr-priv.h" #include "modest-conf.h" #include "modest-defs.h" #include "modest-signal-mgr.h" @@ -50,6 +51,7 @@ #include "modest-tny-msg.h" #include "modest-tny-account.h" #include +#include /* 'private'/'protected' functions */ static void modest_hildon2_window_mgr_class_init (ModestHildon2WindowMgrClass *klass); @@ -85,6 +87,7 @@ static gboolean modest_hildon2_window_mgr_find_registered_message_uid (ModestWin ModestWindow **win); static GList *modest_hildon2_window_mgr_get_window_list (ModestWindowMgr *self); static gboolean modest_hildon2_window_mgr_close_all_windows (ModestWindowMgr *self); +static gboolean modest_hildon2_window_mgr_close_all_but_initial (ModestWindowMgr *self); static gboolean window_has_modals (ModestWindow *window); static ModestWindow *modest_hildon2_window_mgr_show_initial_window (ModestWindowMgr *self); static ModestWindow *modest_hildon2_window_mgr_get_current_top (ModestWindowMgr *self); @@ -171,6 +174,7 @@ modest_hildon2_window_mgr_class_init (ModestHildon2WindowMgrClass *klass) mgr_class->find_registered_message_uid = modest_hildon2_window_mgr_find_registered_message_uid; mgr_class->get_window_list = modest_hildon2_window_mgr_get_window_list; mgr_class->close_all_windows = modest_hildon2_window_mgr_close_all_windows; + mgr_class->close_all_but_initial = modest_hildon2_window_mgr_close_all_but_initial; mgr_class->show_initial_window = modest_hildon2_window_mgr_show_initial_window; mgr_class->get_current_top = modest_hildon2_window_mgr_get_current_top; mgr_class->screen_is_on = modest_hildon2_window_mgr_screen_is_on; @@ -422,6 +426,25 @@ modest_hildon2_window_mgr_get_window_list (ModestWindowMgr *self) return g_list_copy (priv->window_list); } +static gint window_precedence (GtkWindow *window) +{ + if (MODEST_IS_ACCOUNTS_WINDOW (window)) { + return 10; + } else if (MODEST_IS_MAILBOXES_WINDOW (window)) { + return 20; + } else if (MODEST_IS_FOLDER_WINDOW (window)) { + return 30; + } else if (MODEST_IS_HEADER_WINDOW (window)) { + return 40; + } else if (MODEST_IS_MSG_VIEW_WINDOW (window)) { + return 50; + } else if (MODEST_IS_MSG_EDIT_WINDOW (window)) { + return 60; + } else { + return 100; + } +} + static gboolean modest_hildon2_window_mgr_register_window (ModestWindowMgr *self, ModestWindow *window, @@ -433,44 +456,17 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self, HildonWindowStack *stack; gboolean nested_msg = FALSE; ModestWindow *current_top; - GtkWidget *modal; + const gchar *acc_name, *toplevel_acc_name; g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), FALSE); g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE); priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self); - /* Check that there is no active modal dialog */ - modal = (GtkWidget *) modest_window_mgr_get_modal (self); - while (modal && GTK_IS_DIALOG (modal)) { - GtkWidget *parent; - - /* If it's a hildon note then don't try to close it as - this is the default behaviour of WM, delete event - is not issued for this kind of notes as we want the - user to always click on a button */ - if (HILDON_IS_NOTE (modal)) { - gtk_window_present (GTK_WINDOW (modal)); - return FALSE; - } - - /* Get the parent */ - parent = (GtkWidget *) gtk_window_get_transient_for (GTK_WINDOW (modal)); - - /* Try to close it */ - gtk_dialog_response (GTK_DIALOG (modal), GTK_RESPONSE_DELETE_EVENT); - - /* Maybe the dialog was not closed, because a close - confirmation dialog for example. Then ignore the - register process */ - if (GTK_IS_WINDOW (modal)) { - gtk_window_present (GTK_WINDOW (modal)); - return FALSE; - } - - /* Get next modal */ - modal = parent; - } + /* Try to close active modal dialogs */ + if (modest_window_mgr_get_num_windows (self) && + !_modest_window_mgr_close_active_modals (self)) + return FALSE; stack = hildon_window_stack_get_default (); current_top = (ModestWindow *) hildon_window_stack_peek (stack); @@ -519,30 +515,58 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self, g_object_unref (header); } - /* Do not go backwards */ - if ((MODEST_IS_MSG_VIEW_WINDOW (current_top) || MODEST_IS_MSG_EDIT_WINDOW (current_top)) && - (MODEST_IS_FOLDER_WINDOW (window) || MODEST_IS_ACCOUNTS_WINDOW (window) || - MODEST_IS_MAILBOXES_WINDOW (window))) { - gtk_window_present (GTK_WINDOW (window)); - return FALSE; - } + /* Rules + * * toplevel = msg edit -> if not modified, close, if modified, stay + * * same account -> no action + * * window = accounts -> no action + * * window = folders, mailboxes, headers: close all up to accounts window + */ - if (MODEST_IS_FOLDER_WINDOW (current_top) && MODEST_IS_FOLDER_WINDOW (window)) { - gtk_window_present (GTK_WINDOW (window)); - return FALSE; - } + if (MODEST_IS_MSG_EDIT_WINDOW (current_top) && + !modest_msg_edit_window_is_modified (MODEST_MSG_EDIT_WINDOW (current_top))) { + gboolean retval; - if (MODEST_IS_MAILBOXES_WINDOW (current_top) && MODEST_IS_MAILBOXES_WINDOW (window)) { - gtk_window_present (GTK_WINDOW (window)); - return FALSE; + g_signal_emit_by_name (G_OBJECT (current_top), "delete-event", NULL, &retval); + current_top = (ModestWindow *) hildon_window_stack_peek (stack); } - /* Mailboxes window can not replace folder windows */ - if (MODEST_IS_FOLDER_WINDOW (current_top) && MODEST_IS_MAILBOXES_WINDOW (window)) { + if (MODEST_IS_MSG_EDIT_WINDOW (current_top) || + (current_top && MODEST_IS_ACCOUNTS_WINDOW (window))) { gtk_window_present (GTK_WINDOW (current_top)); return FALSE; } + acc_name = modest_window_get_active_account (window); + + if (MODEST_IS_MSG_VIEW_WINDOW (current_top) || + MODEST_IS_HEADER_WINDOW (current_top) || + MODEST_IS_FOLDER_WINDOW (current_top) || + MODEST_IS_MAILBOXES_WINDOW (current_top)) { + toplevel_acc_name = modest_window_get_active_account (current_top); + + if (acc_name != NULL && g_strcmp0 (toplevel_acc_name, acc_name) == 0) { + /* Same account, no action */ + + if (window_precedence (GTK_WINDOW (current_top)) >= window_precedence (GTK_WINDOW (window))) { + if (!(MODEST_IS_MSG_VIEW_WINDOW (current_top) && MODEST_IS_MSG_VIEW_WINDOW (window))) { + gtk_window_present (GTK_WINDOW (current_top)); + return FALSE; + } + } + } else { + while (current_top && !MODEST_IS_ACCOUNTS_WINDOW (current_top)) { + gboolean retval; + g_signal_emit_by_name (G_OBJECT (current_top), "delete-event", NULL, &retval); + + if (retval) { + gtk_window_present (GTK_WINDOW (current_top)); + return FALSE; + } + current_top = (ModestWindow *) hildon_window_stack_peek (stack); + } + } + } + /* Trying to open a folders window and a mailboxes window at the same time from the accounts window is not allowed */ if (MODEST_IS_MAILBOXES_WINDOW (current_top) && @@ -585,7 +609,7 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self, /* Close the current view */ g_signal_emit_by_name (G_OBJECT (current_top), "delete-event", NULL, &retval); - if (retval == TRUE) { + if (retval) { /* Cancelled closing top window, then we fail to register */ goto fail; } @@ -596,8 +620,26 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self, *handler_id = g_signal_connect (window, "delete-event", G_CALLBACK (on_window_destroy), self); g_hash_table_insert (priv->destroy_handlers, window, handler_id); + if (!MODEST_IS_MSG_EDIT_WINDOW (window) && + !MODEST_IS_ACCOUNTS_WINDOW (window)) { + acc_name = modest_window_get_active_account (window); + + if (acc_name) { + modest_platform_remove_new_mail_notifications (FALSE, acc_name); + modest_account_mgr_set_has_new_mails (modest_runtime_get_account_mgr (), + acc_name, + FALSE); + } + } + /* Show toolbar always */ - modest_window_show_toolbar (window, TRUE); + if (MODEST_IS_MSG_EDIT_WINDOW (window)) { + gboolean show_toolbar; + show_toolbar = modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, NULL); + modest_window_show_toolbar (window, show_toolbar); + } else { + modest_window_show_toolbar (window, TRUE); + } return TRUE; fail: @@ -862,7 +904,8 @@ look_for_transient (gconstpointer a, child = (GtkWindow *) b; win = (GtkWindow *) a; - if (gtk_window_get_transient_for (win) == child) + if ((gtk_window_get_transient_for (win) == child) && + GTK_WIDGET_VISIBLE (win)) return 0; else return 1; @@ -913,17 +956,31 @@ modest_hildon2_window_mgr_set_modal (ModestWindowMgr *self, gtk_window_set_modal (window, TRUE); gtk_window_set_transient_for (window, parent); gtk_window_set_destroy_with_parent (window, TRUE); + + if (!gtk_window_has_toplevel_focus (window)) { + GList *toplevels, *node; + + toplevels = gtk_window_list_toplevels (); + for (node = toplevels; node != NULL; node = g_list_next (node)) { + if (gtk_window_has_toplevel_focus (GTK_WINDOW (node->data))) { + if (GTK_IS_DIALOG (node->data)) { + gtk_window_set_transient_for (window, GTK_WINDOW (node->data)); + } + break; + } + } + } } -static gboolean -on_idle_close_all_but_first (gpointer data) +static void +close_all_but_first (gpointer data) { gint num_windows, i; gboolean retval; HildonWindowStack *stack; stack = hildon_window_stack_get_default (); - g_return_val_if_fail (stack, FALSE); + g_return_if_fail (stack); num_windows = hildon_window_stack_size (stack); @@ -934,6 +991,15 @@ on_idle_close_all_but_first (gpointer data) current_top = hildon_window_stack_peek (stack); g_signal_emit_by_name (G_OBJECT (current_top), "delete-event", NULL, &retval); } +} + +static gboolean +on_idle_close_all_but_first (gpointer data) +{ + gdk_threads_enter (); + close_all_but_first (data); + gdk_threads_leave (); + return FALSE; } @@ -1051,11 +1117,10 @@ modest_hildon2_window_mgr_create_caches (ModestWindowMgr *self) modest_accounts_window_pre_create (); MODEST_WINDOW_MGR_CLASS(parent_class)->create_caches (self); - } -static void -osso_display_event_cb (osso_display_state_t state, +static void +osso_display_event_cb (osso_display_state_t state, gpointer data) { ModestHildon2WindowMgrPrivate *priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (data); @@ -1064,6 +1129,37 @@ osso_display_event_cb (osso_display_state_t state, /* Stop blinking if the screen becomes on */ if (priv->display_state == OSSO_DISPLAY_ON) - modest_platform_remove_new_mail_notifications (TRUE); + modest_platform_remove_new_mail_notifications (TRUE, NULL); } +static gboolean +modest_hildon2_window_mgr_close_all_but_initial (ModestWindowMgr *self) +{ + ModestWindow *top; + + /* Exit if there are no windows */ + if (!modest_window_mgr_get_num_windows (self)) { + g_warning ("%s: unable to close, there are no windows", __FUNCTION__); + return FALSE; + } + + /* Close active modals */ + if (!_modest_window_mgr_close_active_modals (self)) { + g_debug ("%s: unable to close some dialogs", __FUNCTION__); + return FALSE; + } + + /* Close all but first */ + top = modest_window_mgr_get_current_top (self); + if (!MODEST_IS_ACCOUNTS_WINDOW (top)) + close_all_but_first (NULL); + + /* If some cannot be closed return */ + top = modest_window_mgr_get_current_top (self); + if (!MODEST_IS_ACCOUNTS_WINDOW (top)) { + g_debug ("%s: could not close some windows", __FUNCTION__); + return FALSE; + } + + return TRUE; +}