X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-accounts-window.c;h=497b1d3449e16c3edaf5fc907987c99c106015aa;hb=9c2f8007e10d401d50ce21d4ee8e49b116c5006b;hp=88104ec4607dede8e6b3102b7de70ff2e65ea107;hpb=a4703e7a3ab041bcc15f1154440508408a498859;p=modest diff --git a/src/hildon2/modest-accounts-window.c b/src/hildon2/modest-accounts-window.c index 88104ec..497b1d3 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 @@ -38,8 +36,7 @@ #include #include #include -#include -#include +#include #include #include #include @@ -50,6 +47,7 @@ #include #include #include +#include /* 'private'/'protected' functions */ @@ -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 { @@ -214,7 +218,7 @@ connect_signals (ModestAccountsWindow *self) "progress-list-changed", G_CALLBACK (on_progress_list_changed), self); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->account_view)); + model = modest_account_view_get_model (MODEST_ACCOUNT_VIEW (priv->account_view)); priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, @@ -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 * @@ -330,6 +338,7 @@ modest_accounts_window_new_real (void) return MODEST_WINDOW(self); } + ModestWindow * modest_accounts_window_new (void) { @@ -337,6 +346,9 @@ modest_accounts_window_new (void) ModestWindow *self; ModestAccountsWindowPrivate *priv = NULL; HildonProgram *app; +#ifdef MODEST_TOOLKIT_HILDON2 + GtkWidget *live_search; +#endif if (pre_created_accounts_window) { self = MODEST_WINDOW (pre_created_accounts_window); @@ -346,6 +358,11 @@ modest_accounts_window_new (void) } priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(self); priv->account_view = GTK_WIDGET (modest_account_view_new (modest_runtime_get_account_mgr ())); +#ifdef MODEST_TOOLKIT_HILDON2 + live_search = modest_account_view_setup_live_search (MODEST_ACCOUNT_VIEW (priv->account_view)); + hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), priv->account_view); + gtk_box_pack_start (GTK_BOX (priv->box), live_search, FALSE, FALSE, 0); +#endif 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); @@ -354,10 +371,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)); @@ -370,6 +383,8 @@ 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)); @@ -401,15 +416,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)); @@ -450,6 +470,7 @@ on_account_activated (GtkTreeView *account_view, } else { new_window = GTK_WIDGET (modest_folder_window_new (NULL)); + modest_window_set_active_account (MODEST_WINDOW (new_window), account_name); } registered = modest_window_mgr_register_window (modest_runtime_get_window_mgr (), @@ -568,7 +589,7 @@ row_count_changed (ModestAccountsWindow *self) gint count; priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (self); - model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->account_view)); + model = modest_account_view_get_model (MODEST_ACCOUNT_VIEW (priv->account_view)); count = gtk_tree_model_iter_n_children (model, NULL); @@ -663,3 +684,55 @@ 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; + +} +