X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-folder-window.c;h=324393c77faea598c193820125ebfd1cd95dbc3c;hp=22d8b1c74674e7dcbce02fb3f5a2d9249200b4ed;hb=9f7590eb9656209c0cb8419c56b6a2102198a663;hpb=a4703e7a3ab041bcc15f1154440508408a498859 diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c index 22d8b1c..324393c 100644 --- a/src/hildon2/modest-folder-window.c +++ b/src/hildon2/modest-folder-window.c @@ -28,8 +28,6 @@ */ #include -#include -#include #include #include #include @@ -43,10 +41,9 @@ #include #include #include -#include -#include -#include +#include #include +#include #include #include #include @@ -65,6 +62,7 @@ typedef enum { static void modest_folder_window_class_init (ModestFolderWindowClass *klass); static void modest_folder_window_init (ModestFolderWindow *obj); static void modest_folder_window_finalize (GObject *obj); +static void modest_folder_window_dispose (GObject *obj); static void connect_signals (ModestFolderWindow *self); static void modest_folder_window_disconnect_signals (ModestWindow *self); @@ -106,6 +104,9 @@ static void on_visible_account_changed (ModestFolderView *folder_view, static void on_account_changed (TnyAccountStore *account_store, TnyAccount *account, gpointer user_data); +static gboolean on_key_press(GtkWidget *widget, + GdkEventKey *event, + gpointer user_data); typedef struct _ModestFolderWindowPrivate ModestFolderWindowPrivate; struct _ModestFolderWindowPrivate { @@ -164,6 +165,7 @@ modest_folder_window_class_init (ModestFolderWindowClass *klass) parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_folder_window_finalize; + gobject_class->dispose = modest_folder_window_dispose; g_type_class_add_private (gobject_class, sizeof(ModestFolderWindowPrivate)); @@ -212,6 +214,47 @@ modest_folder_window_finalize (GObject *obj) } static void +modest_folder_window_dispose (GObject *obj) +{ + ModestFolderWindowPrivate *priv; + + priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(obj); + if (priv->folder_view) { + TnyList *list; + + list = modest_folder_view_get_model_tny_list (MODEST_FOLDER_VIEW (priv->folder_view)); + + if (list) { + TnyIterator *iter; + + iter = tny_list_create_iterator (list); + while (!tny_iterator_is_done (iter)) { + GObject *item = tny_iterator_get_current (iter); + + if (TNY_IS_ACCOUNT (item)) { + if (TNY_IS_FOLDER_STORE (item) && + modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (item))) { + tny_account_cancel (TNY_ACCOUNT (item)); + } + } + g_object_unref (item); + tny_iterator_next (iter); + } + g_object_unref (iter); + } + + if (list && TNY_IS_GTK_FOLDER_LIST_STORE (list)) { + g_object_run_dispose (G_OBJECT (list)); + } + + g_object_unref (list); + priv->folder_view = NULL; + } + + G_OBJECT_CLASS(parent_class)->dispose (obj); +} + +static void modest_folder_window_disconnect_signals (ModestWindow *self) { ModestFolderWindowPrivate *priv; @@ -262,6 +305,10 @@ connect_signals (ModestFolderWindow *self) G_OBJECT (modest_runtime_get_account_store()), "account-changed", G_CALLBACK (on_account_changed), self); + + + g_signal_connect(G_OBJECT(self), "key-press-event", + G_CALLBACK(on_key_press), self); } ModestWindow * @@ -278,6 +325,9 @@ modest_folder_window_new (TnyFolderStoreQuery *query) GdkModifierType accel_mods; GtkAccelGroup *accel_group; GtkWidget *top_alignment; +#ifdef MODEST_TOOLKIT_HILDON2 + GtkWidget *live_search; +#endif self = MODEST_FOLDER_WINDOW(g_object_new(MODEST_TYPE_FOLDER_WINDOW, NULL)); priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(self); @@ -291,6 +341,10 @@ modest_folder_window_new (TnyFolderStoreQuery *query) self); priv->folder_view = modest_platform_create_folder_view (query); +#ifdef MODEST_TOOLKIT_HILDON2 + live_search = modest_folder_view_setup_live_search (MODEST_FOLDER_VIEW (priv->folder_view)); + hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), priv->folder_view); +#endif modest_folder_view_set_cell_style (MODEST_FOLDER_VIEW (priv->folder_view), MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT); modest_folder_view_set_filter (MODEST_FOLDER_VIEW (priv->folder_view), @@ -325,6 +379,9 @@ modest_folder_window_new (TnyFolderStoreQuery *query) gtk_container_add (GTK_CONTAINER (pannable), priv->folder_view); gtk_container_add (GTK_CONTAINER (top_alignment), pannable); +#ifdef MODEST_TOOLKIT_HILDON2 + gtk_box_pack_end (GTK_BOX (priv->top_vbox), live_search, FALSE, FALSE, 0); +#endif gtk_box_pack_end (GTK_BOX (priv->top_vbox), top_alignment, TRUE, TRUE, 0); gtk_container_add (GTK_CONTAINER (self), priv->top_vbox); @@ -335,10 +392,6 @@ modest_folder_window_new (TnyFolderStoreQuery *query) connect_signals (MODEST_FOLDER_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 (); @@ -486,11 +539,14 @@ edit_account (GtkButton *button, if (proto && MODEST_IS_ACCOUNT_PROTOCOL (proto)) { ModestAccountSettingsDialog *dialog = modest_account_protocol_get_account_settings_dialog (proto, account_name); - modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), - (GtkWindow *) dialog, - (GtkWindow *) self); - gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), FALSE); - gtk_widget_show (GTK_WIDGET (dialog)); + + if (dialog) { + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + (GtkWindow *) dialog, + (GtkWindow *) self); + gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), FALSE); + gtk_widget_show (GTK_WIDGET (dialog)); + } } } } @@ -504,6 +560,9 @@ setup_menu (ModestFolderWindow *self) modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_folder"), NULL, APP_MENU_CALLBACK (modest_ui_actions_on_new_folder), 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)); modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_rename_folder"), NULL, APP_MENU_CALLBACK (set_rename_edit_mode), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_rename_folder)); @@ -514,17 +573,16 @@ setup_menu (ModestFolderWindow *self) APP_MENU_CALLBACK (set_delete_edit_mode), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_folder_window_delete)); - /* send receive actions should be only one visible always */ - 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)); - 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)); - modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_edit_account"), NULL, - APP_MENU_CALLBACK (edit_account), + modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), + dngettext(GETTEXT_PACKAGE, + "mcen_me_edit_account", + "mcen_me_edit_accounts", + 1), + NULL, APP_MENU_CALLBACK (edit_account), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_edit_accounts)); } @@ -877,3 +935,31 @@ on_account_changed (TnyAccountStore *account_store, if (acc_id && visible && !g_utf8_collate (acc_id, visible)) update_window_title (MODEST_FOLDER_WINDOW (user_data), account); } + + +static gboolean +on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data) +{ + ModestFolderWindowPrivate *priv; + HildonPannableArea *pannable; + + if (event->type == GDK_KEY_RELEASE) + return FALSE; + + priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (user_data); + + pannable = HILDON_PANNABLE_AREA (gtk_widget_get_parent (priv->folder_view)); + + 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; +}