#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"
GType window_type,
gboolean show_toolbars,
gboolean fullscreen);
-static ModestWindow* modest_hildon2_window_mgr_get_main_window (ModestWindowMgr *self, gboolean show);
static GtkWindow *modest_hildon2_window_mgr_get_modal (ModestWindowMgr *self);
static void modest_hildon2_window_mgr_set_modal (ModestWindowMgr *self,
GtkWindow *window,
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);
mgr_class->set_fullscreen_mode = modest_hildon2_window_mgr_set_fullscreen_mode;
mgr_class->get_fullscreen_mode = modest_hildon2_window_mgr_get_fullscreen_mode;
mgr_class->show_toolbars = modest_hildon2_window_mgr_show_toolbars;
- mgr_class->get_main_window = modest_hildon2_window_mgr_get_main_window;
mgr_class->get_modal = modest_hildon2_window_mgr_get_modal;
mgr_class->set_modal = modest_hildon2_window_mgr_set_modal;
mgr_class->find_registered_header = modest_hildon2_window_mgr_find_registered_header;
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;
}
g_mutex_free (priv->queue_lock);
- /* Do not unref priv->main_window because it does not hold a
- new reference */
-
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
HildonWindowStack *stack;
gboolean nested_msg = FALSE;
ModestWindow *current_top;
- GtkWidget *modal;
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);
}
/* 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) ||
+ if ((MODEST_IS_MSG_VIEW_WINDOW (current_top) ||
+ MODEST_IS_MSG_EDIT_WINDOW (current_top) ||
+ MODEST_IS_HEADER_WINDOW (current_top)) &&
+ (MODEST_IS_FOLDER_WINDOW (window) ||
+ MODEST_IS_ACCOUNTS_WINDOW (window) ||
MODEST_IS_MAILBOXES_WINDOW (window))) {
gtk_window_present (GTK_WINDOW (current_top));
return FALSE;
return;
}
-static ModestWindow*
-modest_hildon2_window_mgr_get_main_window (ModestWindowMgr *self, gboolean show)
-{
- ModestHildon2WindowMgrPrivate *priv;
- ModestWindow *result;
-
- g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), NULL);
- priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self);
-
- /* TODO: make this return NULL always */
-
- result = MODEST_WINDOW_MGR_CLASS (parent_class)->get_main_window (self, FALSE);
- /* create the main window, if it hasn't been created yet */
- if (!result && show) {
- /* modest_window_mgr_register_window will set priv->main_window */
- result = modest_main_window_new ();
- /* We have to remove all other windows */
- if (!modest_window_mgr_close_all_windows (self)) {
- gtk_widget_destroy (GTK_WIDGET (result));
- return NULL;
- }
- if (!modest_window_mgr_register_window (self, result, NULL)) {
- gtk_widget_destroy (GTK_WIDGET (result));
- return NULL;
- }
- MODEST_DEBUG_BLOCK(
- g_debug ("%s: created main window: %p\n", __FUNCTION__, result);
- );
- }
- if (show) {
- gtk_widget_show_all (GTK_WIDGET (result));
- gtk_window_present (GTK_WINDOW (result));
- }
-
- return result;
-}
-
static gint
look_for_transient (gconstpointer a,
gconstpointer b)
gtk_window_set_destroy_with_parent (window, TRUE);
}
-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);
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;
}
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);
modest_platform_remove_new_mail_notifications (TRUE);
}
+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;
+}
projects / modest / blobdiff