#include "modest-mail-operation.h"
#include "modest-icon-names.h"
#include "modest-progress-bar-widget.h"
+#include "maemo/modest-osso-state-saving.h"
+
+#ifdef MODEST_HILDON_VERSION_0
+#include <hildon-widgets/hildon-program.h>
+#else
+#include <hildon/hildon-program.h>
+#endif /*MODEST_HILDON_VERSION_0*/
+
/* 'private'/'protected' functions */
static void modest_main_window_class_init (ModestMainWindowClass *klass);
GtkWidget *accounts_popup;
GtkWidget *details_widget;
+ /* Optimized view enabled */
+ gboolean optimized_view;
ModestHeaderView *header_view;
ModestFolderView *folder_view;
priv->accounts_popup = NULL;
priv->details_widget = NULL;
+ priv->optimized_view = FALSE;
+
priv->progress_widgets = NULL;
priv->progress_bar = NULL;
priv->current_toolbar_mode = TOOLBAR_MODE_NORMAL;
return FALSE; /* Do not call this idle handler again. */
}
+static void on_hildon_program_is_topmost_notify(GObject *self,
+ GParamSpec *propert_param, gpointer user_data)
+{
+ HildonProgram *app = HILDON_PROGRAM (self);
+
+ /*
+ ModestWindow* self = MODEST_WINDOW(user_data);
+ */
+
+ /* Note that use of hildon_program_set_can_hibernate()
+ * is generally referred to as "setting the killable flag",
+ * though hibernation does not seem equal to death.
+ * murrayc */
+
+ if (hildon_program_get_is_topmost (app)) {
+ /* Prevent hibernation when the progam comes to the foreground,
+ * because hibernation should only happen when the application
+ * is in the background: */
+ hildon_program_set_can_hibernate (app, FALSE);
+ } else {
+ /* Allow hibernation if the program has gone to the background: */
+
+ /* However, prevent hibernation while the settings are being changed: */
+ gboolean settings_dialog_is_open = FALSE;
+
+ if (settings_dialog_is_open)
+ hildon_program_set_can_hibernate (app, FALSE);
+ else {
+
+ /* Allow hibernation, after saving the state: */
+ modest_osso_save_state();
+ hildon_program_set_can_hibernate (app, TRUE);
+ }
+ }
+
+}
+
+
ModestWindow*
modest_main_window_new (void)
/* do send & receive when we are idle */
g_idle_add ((GSourceFunc)sync_accounts_cb, self);
+
+ HildonProgram *app = hildon_program_get_instance ();
+ hildon_program_add_window (app, HILDON_WINDOW (self));
+
+ /* Register HildonProgram signal handlers: */
+ /* These are apparently deprecated, according to the
+ * "HildonApp/HildonAppView to HildonProgram/HildonWindow migration guide",
+ * though the API reference does not mention that:
+ *
+ g_signal_connect (G_OBJECT(app), "topmost_status_lose",
+ G_CALLBACK (on_hildon_program_save_state), self);
+ g_signal_connect (G_OBJECT(app), "topmost_status_acquire",
+ G_CALLBACK (on_hildon_program_status_acquire), self);
+ */
+ g_signal_connect (G_OBJECT(app), "notify::is-topmost",
+ G_CALLBACK (on_hildon_program_is_topmost_notify), self);
+
+ /* Load previous osso state, for instance if we are being restored from
+ * hibernation: */
+ modest_osso_load_state();
+
return MODEST_WINDOW(self);
}
GtkWidget *placeholder = NULL;
gint insert_index;
- parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+ g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+
+ /* Set optimized view status */
+ priv->optimized_view = !show_toolbar;
- if (!parent_priv->toolbar && show_toolbar) {
+ if (!parent_priv->toolbar) {
parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager,
"/ToolBar");
NULL, self);
}
- /* TODO: Why is this sometimes NULL? murrayc */
- if (parent_priv->toolbar) {
- if (show_toolbar) {
- gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
- set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
- } else
- gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
- }
+ if (show_toolbar) {
+ /* Quick hack: this prevents toolbar icons "dance" when progress bar show status is changed */
+ /* TODO: resize mode migth be GTK_RESIZE_QUEUE, in order to avoid unneccesary shows */
+ gtk_container_set_resize_mode (GTK_CONTAINER(parent_priv->toolbar), GTK_RESIZE_IMMEDIATE);
+
+ gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
+ set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
+ } else
+ gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
+
}
/*
set_toolbar_mode (ModestMainWindow *self,
ModestToolBarModes mode)
{
- ModestWindowPrivate *parent_priv;
- ModestMainWindowPrivate *priv;
- GtkAction *sort_action, *refresh_action, *cancel_action;
-
+ ModestWindowPrivate *parent_priv = NULL;
+ ModestMainWindowPrivate *priv = NULL;
+ GtkAction *sort_action = NULL, *refresh_action = NULL, *cancel_action = NULL;
+
g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+
+ g_return_if_fail (GTK_IS_TOOLBAR(parent_priv->toolbar));
sort_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSort");
refresh_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSendReceive");
if (cancel_action)
gtk_action_set_visible (cancel_action, FALSE);
+
+ /* Hide toolbar if optimized view is enabled */
+ if (priv->optimized_view)
+ gtk_widget_hide (GTK_WIDGET(parent_priv->toolbar));
break;
case TOOLBAR_MODE_TRANSFER:
if (sort_action)
}
if (priv->progress_bar)
gtk_widget_show (priv->progress_bar);
+
+ /* Show toolbar if it's hiden (optimized view ) */
+ if (priv->optimized_view)
+ gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
break;
default:
g_return_if_reached ();
}
-
- gtk_widget_show_all (GTK_WIDGET (self));
}
static void
projects / modest / blobdiff