X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-accounts-window.c;h=9609add3c3b92d1fc684662be0c0e0bdb764073b;hp=309178be39990d02a89fe04865963dd341563c38;hb=22a2aa923978b9bdcdb9d1fb6eebc08729a7a0e9;hpb=e29e0098c2a92e44c59a531ec71548cbe93a8c8c diff --git a/src/hildon2/modest-accounts-window.c b/src/hildon2/modest-accounts-window.c index 309178b..9609add 100644 --- a/src/hildon2/modest-accounts-window.c +++ b/src/hildon2/modest-accounts-window.c @@ -28,8 +28,6 @@ */ #include -#include -#include #include #include #include @@ -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 { @@ -105,6 +109,7 @@ struct _ModestAccountsWindowPrivate { /* globals */ static GtkWindowClass *parent_class = NULL; +static GtkWidget *pre_created_accounts_window = NULL; /************************************************************************/ @@ -235,17 +240,19 @@ 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); } -ModestWindow * -modest_accounts_window_new (void) +static ModestWindow * +modest_accounts_window_new_real (void) { ModestAccountsWindow *self = NULL; ModestAccountsWindowPrivate *priv = NULL; - HildonProgram *app; GdkPixbuf *window_icon; GdkPixbuf *new_message_pixbuf; - GtkWidget *action_area_box; guint accel_key; GdkModifierType accel_mods; GtkAccelGroup *accel_group; @@ -260,7 +267,7 @@ modest_accounts_window_new (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); @@ -293,22 +300,17 @@ modest_accounts_window_new (void) G_CALLBACK (on_queue_changed), self); - priv->account_view = GTK_WIDGET (modest_account_view_new (modest_runtime_get_account_mgr ())); - - action_area_box = hildon_tree_view_get_action_area_box (GTK_TREE_VIEW (priv->account_view)); - 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)); - gtk_box_pack_start (GTK_BOX (action_area_box), priv->new_message_button, TRUE, TRUE, 0); gtk_widget_show_all (priv->new_message_button); - hildon_tree_view_set_action_area_visible (GTK_TREE_VIEW (priv->account_view), TRUE); g_object_unref (new_message_pixbuf); setup_menu (self); - gtk_container_add (GTK_CONTAINER (priv->pannable), priv->account_view); gtk_box_pack_start (GTK_BOX (priv->box), priv->pannable, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (box_alignment), priv->box); gtk_container_add (GTK_CONTAINER (self), box_alignment); @@ -317,18 +319,9 @@ modest_accounts_window_new (void) gtk_widget_show (priv->box); gtk_widget_show (box_alignment); - connect_signals (MODEST_ACCOUNTS_WINDOW (self)); - - /* Load previous osso state, for instance if we are being restored from - * hibernation: */ - modest_osso_load_state (); - /* Get device name */ modest_maemo_utils_get_device_name (); - app = hildon_program_get_instance (); - hildon_program_add_window (app, HILDON_WINDOW (self)); - /* Set window icon */ window_icon = modest_platform_get_icon (MODEST_APP_ICON, MODEST_ICON_SIZE_BIG); if (window_icon) { @@ -336,6 +329,42 @@ modest_accounts_window_new (void) g_object_unref (window_icon); } + accel_group = gtk_accel_group_new (); + gtk_accelerator_parse ("n", &accel_key, &accel_mods); + gtk_widget_add_accelerator (priv->new_message_button, "clicked", accel_group, + accel_key, accel_mods, 0); + gtk_window_add_accel_group (GTK_WINDOW (self), accel_group); + + return MODEST_WINDOW(self); +} + +ModestWindow * +modest_accounts_window_new (void) +{ + GtkWidget *action_area_box; + ModestWindow *self; + ModestAccountsWindowPrivate *priv = NULL; + HildonProgram *app; + + if (pre_created_accounts_window) { + self = MODEST_WINDOW (pre_created_accounts_window); + pre_created_accounts_window = NULL; + } else { + self = modest_accounts_window_new_real (); + } + priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(self); + priv->account_view = GTK_WIDGET (modest_account_view_new (modest_runtime_get_account_mgr ())); + + action_area_box = hildon_tree_view_get_action_area_box (GTK_TREE_VIEW (priv->account_view)); + gtk_box_pack_start (GTK_BOX (action_area_box), priv->new_message_button, TRUE, TRUE, 0); + hildon_tree_view_set_action_area_visible (GTK_TREE_VIEW (priv->account_view), TRUE); + gtk_container_add (GTK_CONTAINER (priv->pannable), priv->account_view); + + connect_signals (MODEST_ACCOUNTS_WINDOW (self)); + + app = hildon_program_get_instance (); + hildon_program_add_window (app, HILDON_WINDOW (self)); + /* Dont't restore settings here, * because it requires a gtk_widget_show(), * and we don't want to do that until later, @@ -345,19 +374,18 @@ modest_accounts_window_new (void) g_signal_connect (G_OBJECT (self), "map-event", G_CALLBACK (_modest_accounts_window_map_event), G_OBJECT (self)); - update_progress_hint (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 (self); + row_count_changed (MODEST_ACCOUNTS_WINDOW (self)); - accel_group = gtk_accel_group_new (); - gtk_accelerator_parse ("n", &accel_key, &accel_mods); - gtk_widget_add_accelerator (priv->new_message_button, "clicked", accel_group, - accel_key, accel_mods, 0); - gtk_window_add_accel_group (GTK_WINDOW (self), accel_group); + gtk_window_set_title (GTK_WINDOW (self), _("mcen_ap_name")); - return MODEST_WINDOW(self); + return self; } + ModestAccountView * modest_accounts_window_get_account_view (ModestAccountsWindow *self) { @@ -379,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)); @@ -538,12 +571,13 @@ on_row_deleted (GtkTreeModel *tree_model, row_count_changed (self); } -static void row_count_changed (ModestAccountsWindow *self) +static void +row_count_changed (ModestAccountsWindow *self) { ModestAccountsWindowPrivate *priv; GtkTreeModel *model; gint count; - + priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (self); model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->account_view)); @@ -552,9 +586,11 @@ static void row_count_changed (ModestAccountsWindow *self) if (count == 0) { gtk_widget_hide (priv->account_view); gtk_widget_show (priv->no_accounts_container); + g_debug ("%s: hiding accounts view", __FUNCTION__); } else { gtk_widget_hide (priv->no_accounts_container); gtk_widget_show (priv->account_view); + g_debug ("%s: showing accounts view", __FUNCTION__); } gtk_container_child_set (GTK_CONTAINER(priv->box), priv->pannable, "expand", count > 0, @@ -629,3 +665,63 @@ on_queue_changed (ModestMailOperationQueue *queue, } } +void +modest_accounts_window_pre_create (void) +{ + static gboolean pre_created = FALSE; + if (!pre_created) { + pre_created = TRUE; + 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; + +}