X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-folder-window.c;h=324393c77faea598c193820125ebfd1cd95dbc3c;hp=6a14d9d83e9c04f1d1c0d6eb966b69ac48738d16;hb=9f7590eb9656209c0cb8419c56b6a2102198a663;hpb=599760add45b15b23de7ef18ed7ef88318846028 diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c index 6a14d9d..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,16 +41,16 @@ #include #include #include -#include -#include -#include +#include #include +#include #include #include #include #include #include "modest-text-utils.h" #include "modest-tny-account.h" +#include "modest-account-protocol.h" typedef enum { EDIT_MODE_COMMAND_MOVE = 1, @@ -64,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); @@ -96,6 +95,18 @@ static void on_queue_changed (ModestMailOperationQueue *queue, ModestMailOperation *mail_op, ModestMailOperationQueueNotification type, ModestFolderWindow *self); +static void on_activity_changed (ModestFolderView *view, + gboolean activity, + ModestFolderWindow *folder_window); +static void on_visible_account_changed (ModestFolderView *folder_view, + const gchar *account_id, + gpointer user_data); +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 { @@ -154,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)); @@ -202,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; @@ -217,45 +270,6 @@ modest_folder_window_disconnect_signals (ModestWindow *self) } static void -on_visible_account_changed (ModestFolderView *folder_view, - const gchar *account_id, - gpointer user_data) -{ - if (account_id) { - TnyAccount *acc = - modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(), - MODEST_TNY_ACCOUNT_STORE_QUERY_ID, - account_id); - if (acc) { - const gchar *name; - const gchar *mailbox; - gchar *title = NULL; - ModestFolderWindowPrivate *priv; - - priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (user_data); - - mailbox = modest_folder_view_get_mailbox (MODEST_FOLDER_VIEW (priv->folder_view)); - if (mailbox) { - title = g_strdup (mailbox); - } else { - name = modest_tny_account_get_parent_modest_account_name_for_server_account (acc); - title = modest_account_mgr_get_display_name (modest_runtime_get_account_mgr(), - name); - } - if (title) { - gtk_window_set_title (GTK_WINDOW (user_data), title); - g_free (title); - } else { - gtk_window_set_title (GTK_WINDOW (user_data), _("mcen_ap_name")); - } - g_object_unref (acc); - } - } else { - gtk_window_set_title (GTK_WINDOW (user_data), _("mcen_ap_name")); - } -} - -static void connect_signals (ModestFolderWindow *self) { ModestFolderWindowPrivate *priv; @@ -263,8 +277,8 @@ connect_signals (ModestFolderWindow *self) priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(self); /* folder view */ - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, - G_OBJECT (priv->folder_view), "folder-activated", + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (priv->folder_view), "folder-activated", G_CALLBACK (on_folder_activated), self); priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, @@ -277,12 +291,24 @@ connect_signals (ModestFolderWindow *self) "visible-account-changed", G_CALLBACK (on_visible_account_changed), self); - priv->sighandlers = - modest_signal_mgr_connect (priv->sighandlers, - G_OBJECT (priv->new_message_button), - "clicked", - G_CALLBACK (modest_ui_actions_on_new_msg), self); + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (priv->folder_view), + "activity-changed", + G_CALLBACK (on_activity_changed), self); + + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (priv->new_message_button), + "clicked", + G_CALLBACK (modest_ui_actions_on_new_msg), self); + + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + 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 * @@ -299,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); @@ -312,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), @@ -321,7 +354,7 @@ modest_folder_window_new (TnyFolderStoreQuery *query) G_CALLBACK (edit_mode_changed), (gpointer) self); action_area_box = hildon_tree_view_get_action_area_box (GTK_TREE_VIEW (priv->folder_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")); new_message_pixbuf = modest_platform_get_icon ("general_add", MODEST_ICON_SIZE_BIG); @@ -341,11 +374,14 @@ modest_folder_window_new (TnyFolderStoreQuery *query) priv->top_vbox = gtk_vbox_new (0, FALSE); top_alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); gtk_alignment_set_padding (GTK_ALIGNMENT (top_alignment), - 0, 0, + HILDON_MARGIN_HALF, 0, HILDON_MARGIN_DOUBLE, HILDON_MARGIN_DOUBLE); 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); @@ -356,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 (); @@ -481,7 +513,42 @@ modest_folder_window_set_mailbox (ModestFolderWindow *self, priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self); modest_folder_view_set_mailbox (MODEST_FOLDER_VIEW (priv->folder_view), mailbox); + modest_window_set_active_mailbox (MODEST_WINDOW (self), mailbox); +} +static void +edit_account (GtkButton *button, + ModestFolderWindow *self) +{ + const gchar *account_name; + + account_name = modest_window_get_active_account ((ModestWindow *) self); + if (modest_ui_actions_check_for_active_account ((ModestWindow *) self, account_name)) { + /* Show the account settings dialog */ + ModestAccountProtocol *proto; + ModestProtocolType proto_type; + + /* Get proto */ + proto_type = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (), + account_name); + proto = (ModestAccountProtocol *) + modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (), + proto_type); + + /* Create and show the dialog */ + if (proto && MODEST_IS_ACCOUNT_PROTOCOL (proto)) { + ModestAccountSettingsDialog *dialog = + modest_account_protocol_get_account_settings_dialog (proto, account_name); + + 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)); + } + } + } } static void @@ -493,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)); @@ -503,16 +573,17 @@ 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), + 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)); } static void @@ -528,17 +599,16 @@ on_folder_activated (ModestFolderView *folder_view, priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self); - if (!folder) - return; - - if (!TNY_IS_FOLDER (folder)) + if (!folder || !TNY_IS_FOLDER (folder)) return; /* We cannot open noselect folders (fake ones) */ if (tny_folder_get_caps (folder) & TNY_FOLDER_CAPS_NOSELECT) return; - headerwin = modest_header_window_new (folder, modest_window_get_active_account (MODEST_WINDOW (self))); + headerwin = modest_header_window_new (folder, + modest_window_get_active_account (MODEST_WINDOW (self)), + modest_window_get_active_mailbox (MODEST_WINDOW (self))); if (modest_window_mgr_register_window (modest_runtime_get_window_mgr (), MODEST_WINDOW (headerwin), @@ -689,6 +759,10 @@ update_progress_hint (ModestFolderWindow *self) priv->current_store_account); } + if (!priv->progress_hint) { + priv->progress_hint = modest_folder_view_get_activity (MODEST_FOLDER_VIEW (priv->folder_view)); + } + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self)); if (GTK_WIDGET_VISIBLE (self)) { @@ -778,3 +852,114 @@ on_queue_changed (ModestMailOperationQueue *queue, } } +static void +on_activity_changed (ModestFolderView *view, + gboolean activity, + ModestFolderWindow *folder_window) +{ + g_return_if_fail (MODEST_IS_FOLDER_WINDOW (folder_window)); + + update_progress_hint (folder_window); +} + + +static void +update_window_title (ModestFolderWindow *self, + TnyAccount *account) +{ + if (account) { + const gchar *name; + const gchar *mailbox; + gchar *title = NULL; + ModestFolderWindowPrivate *priv; + + priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self); + + mailbox = modest_folder_view_get_mailbox (MODEST_FOLDER_VIEW (priv->folder_view)); + if (mailbox) { + title = g_strdup (mailbox); + } else { + name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); + title = modest_account_mgr_get_display_name (modest_runtime_get_account_mgr(), + name); + } + if (title) { + gtk_window_set_title (GTK_WINDOW (self), title); + g_free (title); + } else { + gtk_window_set_title (GTK_WINDOW (self), _("mcen_ap_name")); + } + } else { + gtk_window_set_title (GTK_WINDOW (self), _("mcen_ap_name")); + } +} + +static void +on_visible_account_changed (ModestFolderView *folder_view, + const gchar *account_id, + gpointer user_data) +{ + TnyAccount *account; + + if (!account_id) + return; + + account = modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(), + MODEST_TNY_ACCOUNT_STORE_QUERY_ID, + account_id); + + /* Update window title */ + if (account) { + update_window_title (MODEST_FOLDER_WINDOW (user_data), account); + g_object_unref (account); + } +} + +static void +on_account_changed (TnyAccountStore *account_store, + TnyAccount *account, + gpointer user_data) +{ + const gchar *acc_id, *visible; + ModestFolderWindowPrivate *priv; + + if (!TNY_IS_STORE_ACCOUNT (account)) + return; + + priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (user_data); + + acc_id = tny_account_get_id (account); + visible = modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (priv->folder_view)); + + /* Update title if the visible account is the one that have just changed */ + 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; +}