Avoid wait on taking screenshot. Now it shouldn't be required.
[modest] / src / hildon2 / modest-accounts-window.c
index b05e8dc..9609add 100644 (file)
@@ -28,8 +28,6 @@
  */
 
 #include <modest-accounts-window.h>
-#include <modest-osso-state-saving.h>
-#include <libosso.h>
 #include <hildon/hildon-pannable-area.h>
 #include <hildon/hildon-banner.h>
 #include <hildon/hildon-helper.h>
@@ -83,6 +81,12 @@ static void on_row_deleted (GtkTreeModel *tree_model,
                            GtkTreePath  *path,
                            gpointer      user_data);
 static void row_count_changed (ModestAccountsWindow *self);
+static gboolean on_key_press(GtkWidget *widget,
+                               GdkEventKey *event,
+                               gpointer user_data);
+static gboolean on_delete_event (GtkWidget *widget,
+                                GdkEvent *event,
+                                gpointer userdata);
 
 typedef struct _ModestAccountsWindowPrivate ModestAccountsWindowPrivate;
 struct _ModestAccountsWindowPrivate {
@@ -236,6 +240,10 @@ connect_signals (ModestAccountsWindow *self)
 
        /* we don't register this in sighandlers, as it should be run
         * after disconnecting all signals, in destroy stage */
+
+
+       g_signal_connect(G_OBJECT(self), "key-press-event",
+                       G_CALLBACK(on_key_press), self);
 }
 
 static ModestWindow *
@@ -259,7 +267,7 @@ modest_accounts_window_new_real (void)
 
        box_alignment = gtk_alignment_new (0, 0, 1.0, 1.0);
        gtk_alignment_set_padding (GTK_ALIGNMENT (box_alignment), 
-                                  0, 0,
+                                  HILDON_MARGIN_HALF, 0,
                                   HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE);
        priv->box = gtk_vbox_new (FALSE, 0);
 
@@ -292,7 +300,8 @@ modest_accounts_window_new_real (void)
                                  G_CALLBACK (on_queue_changed),
                                  self);
 
-       priv->new_message_button = hildon_button_new (0, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+       priv->new_message_button = hildon_button_new (MODEST_EDITABLE_SIZE,
+                                                     HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
 
        hildon_button_set_title (HILDON_BUTTON (priv->new_message_button), _("mcen_ti_new_message"));
        hildon_button_set_image (HILDON_BUTTON (priv->new_message_button), gtk_image_new_from_pixbuf (new_message_pixbuf));
@@ -353,10 +362,6 @@ modest_accounts_window_new (void)
 
        connect_signals (MODEST_ACCOUNTS_WINDOW (self));
 
-       /* Load previous osso state, for instance if we are being restored from 
-        * hibernation:  */
-       modest_osso_load_state ();
-
        app = hildon_program_get_instance ();
        hildon_program_add_window (app, HILDON_WINDOW (self));
        
@@ -369,10 +374,14 @@ modest_accounts_window_new (void)
        g_signal_connect (G_OBJECT (self), "map-event",
                          G_CALLBACK (_modest_accounts_window_map_event),
                          G_OBJECT (self));
+       g_signal_connect (G_OBJECT (self), "delete-event",
+                         G_CALLBACK (on_delete_event), self);
        update_progress_hint (MODEST_ACCOUNTS_WINDOW (self));
 
        row_count_changed (MODEST_ACCOUNTS_WINDOW (self));
 
+       gtk_window_set_title (GTK_WINDOW (self), _("mcen_ap_name"));
+
        return self;
 }
 
@@ -398,15 +407,20 @@ setup_menu (ModestAccountsWindow *self)
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_account"), NULL, 
                                           APP_MENU_CALLBACK (modest_ui_actions_on_new_account), 
                                           NULL);
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_edit_accounts"), NULL,
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
+                                          APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive_all));
+       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self),
+                                          dngettext(GETTEXT_PACKAGE,
+                                                    "mcen_me_edit_account",
+                                                    "mcen_me_edit_accounts",
+                                                    2),
+                                          NULL,
                                           APP_MENU_CALLBACK (modest_ui_actions_on_accounts), 
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_edit_accounts));
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_globalsmtpservers"), NULL,
                                           APP_MENU_CALLBACK (modest_ui_actions_on_smtp_servers),
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_tools_smtp_servers));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive_all));
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
                                           APP_MENU_CALLBACK (modest_ui_actions_cancel_send),
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
@@ -660,3 +674,54 @@ modest_accounts_window_pre_create (void)
                pre_created_accounts_window = GTK_WIDGET (modest_accounts_window_new_real ());
        }
 }
+
+
+static gboolean
+on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
+{
+       ModestAccountsWindowPrivate *priv;
+       HildonPannableArea *pannable;
+
+       if (event->type == GDK_KEY_RELEASE)
+               return FALSE;
+
+       priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(user_data);
+
+       pannable = HILDON_PANNABLE_AREA (priv->pannable);
+
+       switch (event->keyval) {
+
+       case GDK_Up:
+               modest_maemo_utils_scroll_pannable(pannable, 0, -1);
+               break;
+
+       case GDK_Down:
+               modest_maemo_utils_scroll_pannable(pannable, 0, 1);
+               break;
+       }
+
+       return FALSE;
+}
+
+static gboolean
+on_delete_event (GtkWidget *widget,
+                GdkEvent *event,
+                gpointer userdata)
+{
+       ModestAccountsWindowPrivate *priv;
+
+       priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (widget);
+
+       modest_account_view_set_show_last_update (MODEST_ACCOUNT_VIEW (priv->account_view), FALSE);
+
+       gtk_widget_queue_resize (widget);
+
+       gdk_window_process_updates (priv->account_view->window, TRUE);
+
+       hildon_gtk_window_take_screenshot (GTK_WINDOW (widget), TRUE);
+
+       modest_account_view_set_show_last_update (MODEST_ACCOUNT_VIEW (priv->account_view), TRUE);
+
+       return FALSE;
+
+}