projects / modest / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2007-05-07 Murray Cumming <murrayc@murrayc.com>
[modest] / src / maemo / modest-main-window.c
diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 33437ed..2ead14b 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -71,8 +71,9 @@ static gboolean modest_main_window_window_state_event (GtkWidget *widget,
                                                           gpointer userdata);
 
 static void connect_signals (ModestMainWindow *self);
-static void restore_sizes (ModestMainWindow *self);
-static void save_sizes (ModestMainWindow *self);
+
+static void restore_settings (ModestMainWindow *self);
+static void save_state (ModestWindow *self);
 
 static void modest_main_window_show_toolbar   (ModestWindow *window,
                                               gboolean show_toolbar);
@@ -132,6 +133,8 @@ struct _ModestMainWindowPrivate {
        GtkWidget *accounts_popup;
        GtkWidget *details_widget;
 
+       /* Optimized view enabled */
+       gboolean optimized_view;
 
        ModestHeaderView *header_view;
        ModestFolderView *folder_view;
@@ -206,16 +209,15 @@ modest_main_window_class_init (ModestMainWindowClass *klass)
 {
        GObjectClass *gobject_class;
        gobject_class = (GObjectClass*) klass;
-       ModestWindowClass *modest_window_class;
-
-       modest_window_class = (ModestWindowClass *) klass;
+       ModestWindowClass *modest_window_class = (ModestWindowClass *) klass;
 
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_main_window_finalize;
 
-       modest_window_class->show_toolbar_func = modest_main_window_show_toolbar;
-
        g_type_class_add_private (gobject_class, sizeof(ModestMainWindowPrivate));
+       
+       modest_window_class->show_toolbar_func = modest_main_window_show_toolbar;
+       modest_window_class->save_state_func = save_state;
 }
 
 static void
@@ -234,6 +236,8 @@ modest_main_window_init (ModestMainWindow *obj)
        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;
@@ -282,7 +286,7 @@ modest_main_window_get_child_widget (ModestMainWindow *self,
 
 
 static void
-restore_sizes (ModestMainWindow *self)
+restore_settings (ModestMainWindow *self)
 {
        ModestConf *conf;
        ModestMainWindowPrivate *priv;
@@ -301,9 +305,10 @@ restore_sizes (ModestMainWindow *self)
 
 
 static void
-save_sizes (ModestMainWindow *self)
+save_state (ModestWindow *window)
 {
        ModestConf *conf;
+       ModestMainWindow* self = MODEST_MAIN_WINDOW(window);
        ModestMainWindowPrivate *priv;
                
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
@@ -332,7 +337,7 @@ wrap_in_scrolled_window (GtkWidget *win, GtkWidget *widget)
 static gboolean
 on_delete_event (GtkWidget *widget, GdkEvent  *event, ModestMainWindow *self)
 {
-       save_sizes (self);
+       modest_window_save_state (MODEST_WINDOW(self));
        return FALSE;
 }
 
@@ -444,12 +449,13 @@ static void on_hildon_program_is_topmost_notify(GObject *self,
                /* 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)
+               const gboolean hibernation_prevented = 
+                       modest_window_mgr_get_hibernation_is_prevented (
+       modest_runtime_get_window_mgr ()); 
+       
+               if (hibernation_prevented)
                        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);
@@ -578,7 +584,7 @@ modest_main_window_new (void)
        gtk_box_pack_start (GTK_BOX(priv->main_vbox), priv->main_paned, TRUE, TRUE,0);
 
        gtk_container_add (GTK_CONTAINER(self), priv->main_vbox);
-       restore_sizes (MODEST_MAIN_WINDOW(self));
+       restore_settings (MODEST_MAIN_WINDOW(self));
 
        /* Set window icon */
        window_icon = modest_platform_get_icon (MODEST_APP_ICON);
@@ -763,10 +769,14 @@ modest_main_window_show_toolbar (ModestWindow *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");
 
@@ -815,18 +825,16 @@ modest_main_window_show_toolbar (ModestWindow *self,
                                   NULL, self);
        }
 
-       /* TODO: Why is this sometimes NULL? murrayc */
-       if (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);
+       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));
 
-                       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));
-       }
 }
 
 /*
@@ -1151,14 +1159,16 @@ static void
 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");
@@ -1183,6 +1193,10 @@ set_toolbar_mode (ModestMainWindow *self,
                
                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)
@@ -1197,12 +1211,14 @@ set_toolbar_mode (ModestMainWindow *self,
                }
                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
"modest" is a lean & mean e-mail program.