X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-main-window.c;h=73eed0f29369e06e143c82fdadb513204e3956e5;hb=5ad9cc827a81603d2cb8ec6223a95febcbafd742;hp=ebd9fde3b6c03ec2af11253ca2d1bccc543facdd;hpb=73cee7c6c6528d126e30333278323ffe838f129f;p=modest diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index ebd9fde..73eed0f 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -84,8 +84,8 @@ static void modest_main_window_init (ModestMainWindow *obj); static void modest_main_window_finalize (GObject *obj); static gboolean modest_main_window_window_state_event (GtkWidget *widget, - GdkEventWindowState *event, - gpointer userdata); + GdkEventWindowState *event, + gpointer userdata); static void connect_signals (ModestMainWindow *self); @@ -96,8 +96,7 @@ static void restore_settings (ModestMainWindow *self, static void save_state (ModestWindow *self); -static void -update_menus (ModestMainWindow* self); +static void update_menus (ModestMainWindow* self); static void modest_main_window_show_toolbar (ModestWindow *window, gboolean show_toolbar); @@ -122,10 +121,8 @@ on_account_removed (TnyAccountStore *accoust_store, TnyAccount *account, gpointer user_data); -static void -on_account_changed (ModestAccountMgr* mgr, - const gchar* account, - gpointer user_data); +static void on_default_account_changed (ModestAccountMgr* mgr, + gpointer user_data); static gboolean on_inner_widgets_key_pressed (GtkWidget *widget, GdkEventKey *event, @@ -151,47 +148,36 @@ static void on_refresh_account_action_activated (GtkAction *action, static void on_send_receive_csm_activated (GtkMenuItem *item, gpointer user_data); -static void -_on_msg_count_changed (ModestHeaderView *header_view, - TnyFolder *folder, - TnyFolderChange *change, - ModestMainWindow *main_window); +static void on_msg_count_changed (ModestHeaderView *header_view, + TnyFolder *folder, + TnyFolderChange *change, + ModestMainWindow *main_window); -static void -modest_main_window_cleanup_queue_error_signals (ModestMainWindow *self); +static void modest_main_window_cleanup_queue_error_signals (ModestMainWindow *self); static GtkWidget * create_empty_view (void); -static gboolean -on_folder_view_focus_in (GtkWidget *widget, - GdkEventFocus *event, - gpointer userdata); -static gboolean -on_header_view_focus_in (GtkWidget *widget, - GdkEventFocus *event, - gpointer userdata); -static void -modest_main_window_on_folder_selection_changed (ModestFolderView *folder_view, - TnyFolderStore *folder_store, - gboolean selected, - ModestMainWindow *main_window); +static gboolean on_folder_view_focus_in (GtkWidget *widget, + GdkEventFocus *event, + gpointer userdata); + +static gboolean on_header_view_focus_in (GtkWidget *widget, + GdkEventFocus *event, + gpointer userdata); + +static void modest_main_window_on_folder_selection_changed (ModestFolderView *folder_view, + TnyFolderStore *folder_store, + gboolean selected, + ModestMainWindow *main_window); -static void -set_at_least_one_account_visible(ModestMainWindow *self); +static void set_at_least_one_account_visible(ModestMainWindow *self); -static void -modest_main_window_on_send_queue_status_changed (ModestTnySendQueue *send_queue, - gchar *msg_id, - guint status, - gpointer user_data); +static void on_updating_msg_list (ModestHeaderView *header_view, + gboolean starting, + gpointer user_data); -/* list my signals */ -enum { - /* MY_SIGNAL_1, */ - /* MY_SIGNAL_2, */ - LAST_SIGNAL -}; +static gboolean restore_paned_timeout_handler (gpointer *data); typedef struct _ModestMainWindowPrivate ModestMainWindowPrivate; struct _ModestMainWindowPrivate { @@ -233,12 +219,15 @@ struct _ModestMainWindowPrivate { ModestMainWindowContentsStyle contents_style; guint progress_bar_timeout; + guint restore_paned_timeout; /* Signal handler UIDs */ GList *queue_err_signals; GSList *sighandlers; - - ModestConfNotificationId notification_id; + + /* "Updating" banner for header view */ + GtkWidget *updating_banner; + guint updating_banner_timeout; }; #define MODEST_MAIN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_MAIN_WINDOW, \ @@ -361,7 +350,10 @@ modest_main_window_init (ModestMainWindow *obj) priv->optimized_view = FALSE; priv->send_receive_in_progress = FALSE; priv->progress_bar_timeout = 0; + priv->restore_paned_timeout = 0; priv->sighandlers = NULL; + priv->updating_banner = NULL; + priv->updating_banner_timeout = 0; } static void @@ -371,12 +363,6 @@ modest_main_window_finalize (GObject *obj) priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj); - if (priv->notification_id) { - modest_conf_forget_namespace (modest_runtime_get_conf (), - MODEST_CONF_NAMESPACE, - priv->notification_id); - } - /* Sanity check: shouldn't be needed, the window mgr should call this function before */ modest_main_window_disconnect_signals (MODEST_WINDOW (obj)); @@ -392,26 +378,36 @@ modest_main_window_finalize (GObject *obj) priv->progress_bar_timeout = 0; } + if (priv->updating_banner_timeout > 0) { + g_source_remove (priv->updating_banner_timeout); + priv->updating_banner_timeout = 0; + } + + if (priv->restore_paned_timeout > 0) { + g_source_remove (priv->restore_paned_timeout); + priv->restore_paned_timeout = 0; + } + G_OBJECT_CLASS(parent_class)->finalize (obj); } GtkWidget* modest_main_window_get_child_widget (ModestMainWindow *self, - ModestWidgetType widget_type) + ModestMainWindowWidgetType widget_type) { ModestMainWindowPrivate *priv; GtkWidget *widget; g_return_val_if_fail (self, NULL); - g_return_val_if_fail (widget_type >= 0 && widget_type < MODEST_WIDGET_TYPE_NUM, + g_return_val_if_fail (widget_type >= 0 && widget_type < MODEST_MAIN_WINDOW_WIDGET_TYPE_NUM, NULL); priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); switch (widget_type) { - case MODEST_WIDGET_TYPE_HEADER_VIEW: + case MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW: widget = (GtkWidget*)priv->header_view; break; - case MODEST_WIDGET_TYPE_FOLDER_VIEW: + case MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW: widget = (GtkWidget*)priv->folder_view; break; default: return NULL; @@ -420,6 +416,21 @@ modest_main_window_get_child_widget (ModestMainWindow *self, return widget ? GTK_WIDGET(widget) : NULL; } +static gboolean +restore_paned_timeout_handler (gpointer *data) +{ + ModestMainWindow *main_window = MODEST_MAIN_WINDOW (data); + ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window); + ModestConf *conf; + + if (GTK_WIDGET_VISIBLE (main_window)) { + conf = modest_runtime_get_conf (); + modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned), + MODEST_CONF_MAIN_PANED_KEY); + } + return FALSE; +} + static void restore_settings (ModestMainWindow *self, gboolean do_folder_view_too) @@ -444,6 +455,8 @@ restore_settings (ModestMainWindow *self, gboolean do_folder_view_too) modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned), MODEST_CONF_MAIN_PANED_KEY); + g_timeout_add (500, (GSourceFunc) restore_paned_timeout_handler, self); + /* We need to force a redraw here in order to get the right position of the horizontal paned separator */ gtk_widget_show (GTK_WIDGET (self)); @@ -542,7 +555,7 @@ update_menus (ModestMainWindow* self) } /* We need to call this in order to ensure that the new actions are added in the right - order (alphabetical */ + order (alphabetical) */ gtk_ui_manager_ensure_update (parent_priv->ui_manager); } else groups = g_list_next (groups); @@ -572,13 +585,9 @@ update_menus (ModestMainWindow* self) priv->view_additions_group = gtk_action_group_new (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS); radio_group = NULL; for (i = 0; i < num_accounts; i++) { - gchar *display_name = NULL; - + gchar *display_name = NULL; ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i); - /* Create display name. The UI specification specifies a different format string - * to use for the default account, though both seem to be "%s", so - * I don't see what the point is. murrayc. */ if (default_account && account_data->account_name && !(strcmp (default_account, account_data->account_name) == 0)) { display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"), @@ -633,7 +642,6 @@ update_menus (ModestMainWindow* self) refresh_action_name = g_strconcat ("SendReceive", account_data->account_name, NULL); refresh_account_action = gtk_action_new ((const gchar*) refresh_action_name, display_name, NULL, NULL); - printf("DEBUG: %s: menu display_name=%s\n", __FUNCTION__, display_name); gtk_action_group_add_action (priv->view_additions_group, refresh_account_action); merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager); @@ -766,79 +774,6 @@ wrap_in_scrolled_window (GtkWidget *win, GtkWidget *widget) } -/* static gboolean */ -/* on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self) */ -/* { */ -/* modest_window_save_state (MODEST_WINDOW(self)); */ -/* return FALSE; */ -/* } */ - -/* static void */ -/* on_sendqueue_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, ModestMainWindow *user_data) */ -/* { */ -/* if (err) { */ -/* printf ("DEBUG: %s: err->code=%d, err->message=%s\n", __FUNCTION__, err->code, err->message); */ - -/* if (err->code == TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL) */ -/* /\* Don't show waste the user's time by showing him a dialog telling him */ -/* * that he has just cancelled something: *\/ */ -/* return; */ -/* } */ - -/* /\* Get the server name: *\/ */ -/* const gchar* server_name = NULL; */ - -/* TnyCamelTransportAccount* server_account = tny_camel_send_queue_get_transport_account ( */ -/* TNY_CAMEL_SEND_QUEUE (self)); */ -/* if (server_account) { */ -/* server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account)); */ - -/* g_object_unref (server_account); */ -/* server_account = NULL; */ -/* } */ - -/* if (!server_name) */ -/* server_name = _("Unknown Server"); */ - -/* /\* Show the appropriate message text for the GError: *\/ */ -/* gchar *message = NULL; */ -/* if (err) { */ -/* switch (err->code) { */ -/* case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_HOST_LOOKUP_FAILED: */ -/* message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); */ -/* break; */ -/* case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_SERVICE_UNAVAILABLE: */ -/* message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); */ -/* break; */ -/* case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_AUTHENTICATION_NOT_SUPPORTED: */ -/* /\* TODO: This logical ID seems more suitable for a wrong username or password than for a */ -/* * wrong authentication method. The user is unlikely to guess at the real cause. */ -/* *\/ */ -/* message = g_strdup_printf (_("eemev_ni_ui_smtp_authentication_fail_error"), server_name); */ -/* break; */ -/* case TNY_TRANSPORT_ACCOUNT_ERROR_SEND: */ -/* /\* TODO: Tinymail is still sending this sometimes when it should */ -/* * send TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL. *\/ */ -/* default: */ -/* message = g_strdup (_("emev_ib_ui_smtp_send_error")); */ -/* break; */ -/* } */ -/* } else { */ -/* message = g_strdup (_("emev_ib_ui_smtp_send_error")); */ -/* } */ - -/* modest_maemo_show_information_note_and_forget (GTK_WINDOW (user_data), message); */ -/* g_free (message); */ - -/* /\* TODO: Offer to remove the message, to avoid messages in future? *\/ */ -/* /\* */ -/* TnyFolder *outbox = tny_send_queue_get_outbox (queue); */ -/* tny_folder_remove_msg (outbox, header, NULL); */ -/* tny_folder_sync (outbox, TRUE, NULL); */ -/* g_object_unref (outbox); */ -/* *\/ */ -/* } */ - typedef struct { TnySendQueue *queue; guint signal; @@ -860,71 +795,6 @@ modest_main_window_cleanup_queue_error_signals (ModestMainWindow *self) priv->queue_err_signals = NULL; } -/* static void */ -/* on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow *self) */ -/* { */ -/* ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); */ - -/* /\* When going online, do the equivalent of pressing the send/receive button, */ -/* * as per the specification: */ -/* * (without the check for >0 accounts, though that is not specified): *\/ */ - -/* TnyDevice *device = tny_account_store_get_device (store); */ - -/* /\* modest_folder_view_update_model (MODEST_FOLDER_VIEW (priv->folder_view), store); *\/ */ - -/* /\* Check that we are really online. */ -/* * This signal should not be emitted when we are not connected, */ -/* * but it seems to happen sometimes: *\/ */ -/* if (!tny_device_is_online (device)) */ -/* return; */ - -/* const gchar *iap_id = tny_maemo_conic_device_get_current_iap_id (TNY_MAEMO_CONIC_DEVICE (device)); */ -/* printf ("DEBUG: %s: connection id=%s\n", __FUNCTION__, iap_id); */ - -/* /\* Stop the existing send queues: *\/ */ -/* modest_runtime_remove_all_send_queues (); */ - -/* /\* Create the send queues again, using the appropriate transport accounts */ -/* * for this new connection. */ -/* * This could be the first time that they are created if this is the first */ -/* * connection. *\/ */ -/* /\* TODO: Does this really destroy the TnySendQueues and their threads */ -/* * We do not want 2 TnySendQueues to exist with the same underlying */ -/* * outbox directory. *\/ */ - -/* modest_main_window_cleanup_queue_error_signals (self); */ - -/* GSList *account_names = modest_account_mgr_account_names ( */ -/* modest_runtime_get_account_mgr(), */ -/* TRUE /\* enabled accounts only *\/); */ -/* GSList *iter = account_names; */ -/* while (iter) { */ -/* const gchar *account_name = (const gchar*)(iter->data); */ -/* if (account_name) { */ -/* TnyTransportAccount *account = TNY_TRANSPORT_ACCOUNT ( */ -/* modest_tny_account_store_get_transport_account_for_open_connection */ -/* (modest_runtime_get_account_store(), account_name)); */ -/* if (account) { */ -/* /\* Q: Is this the first location where the send-queues are requested? *\/ */ -/* QueueErrorSignal *esignal = g_slice_new (QueueErrorSignal); */ -/* printf ("debug: %s:\n Transport account for %s: %s\n", __FUNCTION__, account_name, */ -/* tny_account_get_id(TNY_ACCOUNT(account))); */ -/* esignal->queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (account)); */ -/* esignal->signal = g_signal_connect (G_OBJECT (esignal->queue), "error-happened", */ -/* G_CALLBACK (on_sendqueue_error_happened), self); */ -/* priv->queue_err_signals = g_list_prepend (priv->queue_err_signals, esignal); */ -/* } */ -/* } */ - -/* iter = g_slist_next (iter); */ -/* } */ - -/* modest_account_mgr_free_account_names (account_names); */ -/* account_names = NULL; */ - -/* modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self)); */ -/* } */ static void _folder_view_csm_menu_activated (GtkWidget *widget, gpointer user_data) @@ -968,15 +838,19 @@ connect_signals (ModestMainWindow *self) /* folder view */ - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, - G_OBJECT(priv->folder_view), "key-press-event", - G_CALLBACK(on_inner_widgets_key_pressed), self); - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->folder_view), "folder_selection_changed", - G_CALLBACK(modest_main_window_on_folder_selection_changed), self); - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->folder_view), "folder-display-name-changed", - G_CALLBACK(modest_ui_actions_on_folder_display_name_changed), self); - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (priv->folder_view), "focus-in-event", - G_CALLBACK (on_folder_view_focus_in), self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT(priv->folder_view), "key-press-event", + G_CALLBACK(on_inner_widgets_key_pressed), self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, G_OBJECT(priv->folder_view), "folder_selection_changed", + G_CALLBACK (modest_main_window_on_folder_selection_changed), self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->folder_view), "folder-display-name-changed", + G_CALLBACK (modest_ui_actions_on_folder_display_name_changed), self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (priv->folder_view), "focus-in-event", + G_CALLBACK (on_folder_view_focus_in), self); /* Folder view CSM */ menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/FolderViewCSM"); @@ -985,60 +859,90 @@ connect_signals (ModestMainWindow *self) G_CALLBACK(_folder_view_csm_menu_activated), self); /* header view */ - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "header_selected", - G_CALLBACK(modest_ui_actions_on_header_selected), self); - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "header_activated", - G_CALLBACK(modest_ui_actions_on_header_activated), self); - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "item_not_found", - G_CALLBACK(modest_ui_actions_on_item_not_found), self); - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "key-press-event", - G_CALLBACK(on_inner_widgets_key_pressed), self); - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "msg_count_changed", - G_CALLBACK(_on_msg_count_changed), self); - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (priv->header_view), "focus-in-event", - G_CALLBACK (on_header_view_focus_in), self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "header_selected", + G_CALLBACK(modest_ui_actions_on_header_selected), self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "header_activated", + G_CALLBACK(modest_ui_actions_on_header_activated), self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "item_not_found", + G_CALLBACK(modest_ui_actions_on_item_not_found), self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "key-press-event", + G_CALLBACK(on_inner_widgets_key_pressed), self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "msg_count_changed", + G_CALLBACK(on_msg_count_changed), self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (priv->header_view), "focus-in-event", + G_CALLBACK (on_header_view_focus_in), self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (priv->header_view), + "updating-msg-list", + G_CALLBACK (on_updating_msg_list), + self); /* Header view CSM */ menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/HeaderViewCSM"); gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->header_view), menu, NULL, 0); - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "tap-and-hold", - G_CALLBACK(_header_view_csm_menu_activated), - self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "tap-and-hold", + G_CALLBACK(_header_view_csm_menu_activated), + self); /* window */ - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (self), "window-state-event", - G_CALLBACK (modest_main_window_window_state_event), - NULL); - + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (self), "window-state-event", + G_CALLBACK (modest_main_window_window_state_event), + NULL); + /* Mail Operation Queue */ - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_mail_operation_queue ()), - "queue-changed", G_CALLBACK (on_queue_changed), self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (modest_runtime_get_mail_operation_queue ()), + "queue-changed", + G_CALLBACK (on_queue_changed), self); /* Track changes in the device name */ - priv->notification_id = modest_conf_listen_to_namespace (modest_runtime_get_conf (), - MODEST_CONF_NAMESPACE); - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(modest_runtime_get_conf ()), - "key_changed", G_CALLBACK (on_configuration_key_changed), - self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT(modest_runtime_get_conf ()), + "key_changed", + G_CALLBACK (on_configuration_key_changed), + self); /* Track account changes. We need to refresh the toolbar */ - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_store ()), - "account_inserted", G_CALLBACK (on_account_inserted), - self); - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_store ()), - "account_removed", G_CALLBACK (on_account_removed), - self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (modest_runtime_get_account_store ()), + "account_inserted", + G_CALLBACK (on_account_inserted), + self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (modest_runtime_get_account_store ()), + "account_removed", + G_CALLBACK (on_account_removed), + self); /* We need to refresh the send & receive menu to change the bold * account when the default account changes. */ - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_mgr ()), - "account_changed", G_CALLBACK (on_account_changed), - self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (modest_runtime_get_account_mgr ()), + "default_account_changed", + G_CALLBACK (on_default_account_changed), + self); /* Account store */ - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (modest_runtime_get_account_store()), - "password_requested", - G_CALLBACK (modest_ui_actions_on_password_requested), self); + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (modest_runtime_get_account_store()), + "password_requested", + G_CALLBACK (modest_ui_actions_on_password_requested), + self); } #if 0 @@ -1051,8 +955,9 @@ sync_accounts_cb (ModestMainWindow *win) } #endif -static void on_hildon_program_is_topmost_notify(GObject *self, - GParamSpec *propert_param, gpointer user_data) +static void +on_hildon_program_is_topmost_notify(GObject *self, + GParamSpec *propert_param, gpointer user_data) { HildonProgram *app = HILDON_PROGRAM (self); @@ -1102,7 +1007,7 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data) gtk_widget_show (GTK_WIDGET (priv->folder_view)); /* Connect signals */ - connect_signals ((ModestMainWindow*)self); + connect_signals (MODEST_MAIN_WINDOW (self)); /* Set account store */ tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (priv->folder_view), @@ -1112,15 +1017,14 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data) * hibernation: */ modest_osso_load_state (); - /* Restore window & widget settings */ - + /* Restore window & widget settings */ restore_settings (MODEST_MAIN_WINDOW(self), TRUE); - /* The UI spec wants us to show a connection dialog when the application is - * started by the user, if there is no connection. - * Do this before showing the account wizard, - * because wizard needs a connection to discover capabilities. */ - modest_platform_connect_and_wait (GTK_WINDOW (self), NULL); +/* /\* The UI spec wants us to show a connection dialog when the application is */ +/* * started by the user, if there is no connection. */ +/* * Do this before showing the account wizard, */ +/* * because wizard needs a connection to discover capabilities. *\/ */ +/* modest_platform_connect_and_wait (GTK_WINDOW (self), NULL); */ /* Check if accounts exist and show the account wizard if not */ gboolean accounts_exist = @@ -1213,11 +1117,11 @@ modest_main_window_new (void) modest_dimming_rules_group_add_rules (menu_rules_group, modest_main_window_menu_dimming_entries, G_N_ELEMENTS (modest_main_window_menu_dimming_entries), - self); + MODEST_WINDOW (self)); modest_dimming_rules_group_add_rules (toolbar_rules_group, modest_main_window_toolbar_dimming_entries, G_N_ELEMENTS (modest_main_window_toolbar_dimming_entries), - self); + MODEST_WINDOW (self)); /* Insert dimming rules group for this window */ modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group); @@ -1315,29 +1219,6 @@ modest_main_window_new (void) return MODEST_WINDOW(self); } -gboolean -modest_main_window_close_all (ModestMainWindow *self) -{ - GtkWidget *note; - GtkResponseType response; - - /* Create the confirmation dialog MSG-NOT308 */ - note = hildon_note_new_confirmation_add_buttons (GTK_WINDOW (self), - _("emev_nc_close_windows"), - _("mcen_bd_yes"), GTK_RESPONSE_YES, - _("mcen_bd_no"), GTK_RESPONSE_NO, - NULL); - - response = gtk_dialog_run (GTK_DIALOG (note)); - gtk_widget_destroy (GTK_WIDGET (note)); - - if (response == GTK_RESPONSE_YES) - return TRUE; - else - return FALSE; -} - - void modest_main_window_set_style (ModestMainWindow *self, ModestMainWindowStyle style) @@ -1459,12 +1340,7 @@ modest_main_window_show_toolbar (ModestWindow *self, ModestWindowPrivate *parent_priv = NULL; GtkWidget *reply_button = NULL, *menu = NULL; GtkWidget *placeholder = NULL; - ModestAccountMgr *mgr = NULL; - TnyTransportAccount *transport_account = NULL; - ModestTnySendQueue *send_queue = NULL; gint insert_index; - GSList *iter = NULL; - GSList *account_names = NULL; const gchar *action_name; GtkAction *action; @@ -1522,38 +1398,6 @@ modest_main_window_show_toolbar (ModestWindow *self, /* Set send & receive button tap and hold menu */ update_menus (MODEST_MAIN_WINDOW (self)); - - /* Create send queue for all defined accounts */ - mgr = modest_runtime_get_account_mgr (); - account_names = modest_account_mgr_account_names (mgr, TRUE); - iter = account_names; - while (iter) { - transport_account = - TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account - (modest_runtime_get_account_store(), - iter->data, - TNY_ACCOUNT_TYPE_TRANSPORT)); - - /* Create new send queue for this new account */ - send_queue = modest_runtime_get_send_queue (transport_account); - if (MODEST_IS_TNY_SEND_QUEUE(send_queue)) { - - /* Connect 'status_changed' signal of this new send-queue */ - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, G_OBJECT (send_queue), "status_changed", - G_CALLBACK (modest_main_window_on_send_queue_status_changed), - self); - } - - iter = iter->next; - - /* free */ - if (send_queue != NULL) - g_object_unref (send_queue); - if (transport_account != NULL) - g_object_unref (transport_account); - - } - modest_account_mgr_free_account_names (account_names); } if (show_toolbar) { @@ -1574,9 +1418,9 @@ modest_main_window_show_toolbar (ModestWindow *self, toolbar fullscreen mode is shared by all the windows of the same type */ if (modest_window_mgr_get_fullscreen_mode (modest_runtime_get_window_mgr ())) - action_name = "/MenuBar/ViewMenu/ViewShowToolbarMenu/ViewShowToolbarFullScreenMenu"; + action_name = "/MenuBar/ViewMenu/ViewShowToolbarMainMenu/ViewShowToolbarFullScreenMenu"; else - action_name = "/MenuBar/ViewMenu/ViewShowToolbarMenu/ViewShowToolbarNormalScreenMenu"; + action_name = "/MenuBar/ViewMenu/ViewShowToolbarMainMenu/ViewShowToolbarNormalScreenMenu"; action = gtk_ui_manager_get_action (parent_priv->ui_manager, action_name); modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), @@ -1584,91 +1428,18 @@ modest_main_window_show_toolbar (ModestWindow *self, } static void -modest_main_window_on_send_queue_status_changed (ModestTnySendQueue *send_queue, - gchar *msg_id, - guint status, - gpointer user_data) -{ - ModestMainWindowPrivate *priv = NULL; - TnyFolderStore *selected_folder = NULL; - TnyFolderType folder_type; - - g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE (send_queue)); - g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data)); - priv = MODEST_MAIN_WINDOW_GET_PRIVATE(user_data); - - /* Check if selected folder is OUTBOX */ - selected_folder = modest_folder_view_get_selected (priv->folder_view); - if (!TNY_IS_FOLDER (selected_folder)) goto frees; - folder_type = modest_tny_folder_guess_folder_type (TNY_FOLDER (selected_folder)); -#if GTK_CHECK_VERSION(2, 8, 0) /* gtk_tree_view_column_queue_resize is only available in GTK+ 2.8 */ - if (folder_type == TNY_FOLDER_TYPE_OUTBOX) { - GtkTreeViewColumn * tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (priv->header_view), - TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN); - gtk_tree_view_column_queue_resize (tree_column); -#endif - } - - /* Free */ - frees: - if (selected_folder != NULL) - g_object_unref (selected_folder); -} - -static void on_account_inserted (TnyAccountStore *accoust_store, TnyAccount *account, gpointer user_data) { - TnyTransportAccount *transport_account = NULL; - ModestTnySendQueue *send_queue = NULL; - ModestMainWindowPrivate *priv; - const gchar *account_name = NULL; - - g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data)); - priv = MODEST_MAIN_WINDOW_GET_PRIVATE (user_data); - update_menus (MODEST_MAIN_WINDOW (user_data)); - - /* Get transport account */ - account_name = tny_account_get_name (TNY_ACCOUNT (account)); - transport_account = - TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account - (modest_runtime_get_account_store(), - account_name, - TNY_ACCOUNT_TYPE_TRANSPORT)); - - /* Create new send queue for this new account */ - send_queue = modest_runtime_get_send_queue (transport_account); - if (!MODEST_IS_TNY_SEND_QUEUE(send_queue)) goto frees; - - /* Connect 'status_changed' signal of this new send-queue */ - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (send_queue), "status_changed", - G_CALLBACK (modest_main_window_on_send_queue_status_changed), - user_data); - - /* Free */ - frees: - if (transport_account != NULL) - g_object_unref (G_OBJECT (transport_account)); - if (send_queue != NULL) - g_object_unref (send_queue); } static void -on_account_changed (ModestAccountMgr* mgr, - const gchar* account, - gpointer user_data) +on_default_account_changed (ModestAccountMgr* mgr, + gpointer user_data) { - gchar *default_account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ()); - - /* Actually, we only want to know when another account has become - * the default account, but there is no default_account_changed - * signal in ModestAccountMgr. */ - if(strcmp(account, default_account) == 0) - update_menus (MODEST_MAIN_WINDOW (user_data)); - - g_free (default_account); + update_menus (MODEST_MAIN_WINDOW (user_data)); } static void @@ -1704,9 +1475,17 @@ on_inner_widgets_key_pressed (GtkWidget *widget, if (priv->style == MODEST_MAIN_WINDOW_STYLE_SIMPLE) return FALSE; - if (MODEST_IS_HEADER_VIEW (widget) && event->keyval == GDK_Left) - gtk_widget_grab_focus (GTK_WIDGET (priv->folder_view)); - else if (MODEST_IS_FOLDER_VIEW (widget) && event->keyval == GDK_Right) + if (MODEST_IS_HEADER_VIEW (widget)) { + if (event->keyval == GDK_Left) + gtk_widget_grab_focus (GTK_WIDGET (priv->folder_view)); + else if ((event->keyval == GDK_Return)||(event->keyval == GDK_KP_Enter)) { + guint selected_headers = modest_header_view_count_selected_headers (MODEST_HEADER_VIEW (widget)); + if (selected_headers > 1) { + hildon_banner_show_information (NULL, NULL, _("mcen_ib_select_one_message")); + return TRUE; + } + } + } else if (MODEST_IS_FOLDER_VIEW (widget) && event->keyval == GDK_Right) gtk_widget_grab_focus (GTK_WIDGET (priv->header_view)); return FALSE; @@ -1734,18 +1513,14 @@ create_empty_view (void) return GTK_WIDGET(align); } -static GtkWidget * -create_details_widget (GtkWidget *styled_widget, TnyAccount *account) +/* + * Free the returned string + */ +static gchar * +get_gray_color_markup (GtkWidget *styled_widget) { - /* TODO: Clean up this function. It's a mess, with lots of copy/paste. murrayc. */ - - GtkWidget *vbox; - GtkWidget *label_w; - gchar *label; gchar *gray_color_markup; - vbox = gtk_vbox_new (FALSE, 0); - /* Obtain the secondary text color. We need a realized widget, that's why we get styled_widget from outside */ #ifndef MODEST_HAVE_HILDON0_WIDGETS @@ -1753,15 +1528,51 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) gtk_style_lookup_color (styled_widget->style, "SecondaryTextColor", &color); gray_color_markup = modest_text_utils_get_color_string (&color); #else - // gray_color_markup is freed below gray_color_markup = g_strdup ("#BBBBBB"); #endif - /* Account description: */ + return gray_color_markup; +} + +/* + * Free the returned string + */ +static gchar* +create_device_name_visual_string (const gchar *device_name, + const gchar *gray_color_markup) +{ + gchar *tmp, *label; + + /* We have to use "" to fill the %s of the translation. We can + not just use the device name because the device name is + shown in a different color, so it could not be included + into the tag */ + tmp = g_strdup_printf (_("mcen_fi_localroot_description"), ""); + label = g_markup_printf_escaped ("%s%s", + gray_color_markup, + tmp, + device_name); + g_free (tmp); + + return label; +} + +static GtkWidget * +create_details_widget (GtkWidget *styled_widget, TnyAccount *account) +{ + /* TODO: Clean up this function. It's a mess, with lots of copy/paste. murrayc. */ + GtkWidget *vbox; + GtkWidget *label_w; + gchar *label; + gchar *gray_color_markup; + + vbox = gtk_vbox_new (FALSE, 0); + + gray_color_markup = get_gray_color_markup (styled_widget); + + /* Account description: */ if (modest_tny_account_is_virtual_local_folders (account) || (modest_tny_account_is_memory_card_account (account))) { - gchar *tmp; - /* Local folders: */ /* Get device name */ gchar *device_name = NULL; @@ -1770,11 +1581,9 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) MODEST_CONF_DEVICE_NAME, NULL); else device_name = g_strdup (tny_account_get_name (account)); - - tmp = g_strdup_printf (_("mcen_fi_localroot_description"), ""); //TODO: Why the ""? - label = g_markup_printf_escaped ("%s%s", - gray_color_markup, tmp, device_name); - g_free (tmp); + + label = create_device_name_visual_string ((const gchar *) device_name, + (const gchar *) gray_color_markup); label_w = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label_w), label); gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0); @@ -1852,10 +1661,9 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) time_t last_updated; gchar *last_updated_string; /* Get last updated from configuration */ - last_updated = modest_account_mgr_get_int (modest_runtime_get_account_mgr (), - tny_account_get_id (account), - MODEST_ACCOUNT_LAST_UPDATED, - TRUE); + last_updated = modest_account_mgr_get_last_updated (modest_runtime_get_account_mgr (), + tny_account_get_id (account)); + if (last_updated > 0) last_updated_string = modest_text_utils_get_display_date(last_updated); else @@ -1932,12 +1740,11 @@ modest_main_window_notify_send_receive_completed (ModestMainWindow *self) static void -_on_msg_count_changed (ModestHeaderView *header_view, - TnyFolder *folder, - TnyFolderChange *change, - ModestMainWindow *main_window) +on_msg_count_changed (ModestHeaderView *header_view, + TnyFolder *folder, + TnyFolderChange *change, + ModestMainWindow *main_window) { - printf ("DEBUG: %s\n", __FUNCTION__); gboolean folder_empty = FALSE; gboolean all_marked_as_deleted = FALSE; TnyFolderChangeChanged changed; @@ -1952,12 +1759,10 @@ _on_msg_count_changed (ModestHeaderView *header_view, /* If something changes */ if ((changed) & TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT) - folder_empty = (tny_folder_change_get_new_all_count (change) == 0); + folder_empty = (tny_folder_change_get_new_all_count (change) == 0); else folder_empty = (tny_folder_get_all_count (TNY_FOLDER (folder)) == 0); - printf ("DEBUG: %s: folder_empty=%d\n", __FUNCTION__, folder_empty); - /* Check header removed (hide marked as DELETED headers) */ if (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS) { modest_header_view_refilter (MODEST_HEADER_VIEW(priv->header_view)); @@ -2074,21 +1879,21 @@ on_configuration_key_changed (ModestConf* conf, ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); TnyAccount *account = NULL; - if (!key || - priv->notification_id != id || - strcmp (key, MODEST_CONF_DEVICE_NAME)) + if (!key || strcmp (key, MODEST_CONF_DEVICE_NAME)) return; if (priv->contents_style != MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS) return; + if (priv->folder_view) account = (TnyAccount *) modest_folder_view_get_selected (priv->folder_view); + if (account && TNY_IS_ACCOUNT (account) && strcmp (tny_account_get_id (account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID) == 0) { GList *children; GtkLabel *label; const gchar *device_name; - gchar *new_text; + gchar *new_text, *gray_color_markup; /* Get label */ children = gtk_container_get_children (GTK_CONTAINER (priv->details_widget)); @@ -2096,14 +1901,14 @@ on_configuration_key_changed (ModestConf* conf, device_name = modest_conf_get_string (modest_runtime_get_conf(), MODEST_CONF_DEVICE_NAME, NULL); + + gray_color_markup = get_gray_color_markup (GTK_WIDGET (self)); + new_text = create_device_name_visual_string (device_name, gray_color_markup); - new_text = g_strdup_printf ("%s: %s", - _("mcen_fi_localroot_description"), - device_name); - - gtk_label_set_text (label, new_text); + gtk_label_set_markup (label, new_text); gtk_widget_show (GTK_WIDGET (label)); + g_free (gray_color_markup); g_free (new_text); g_list_free (children); } @@ -2252,69 +2057,159 @@ observers_empty (ModestMainWindow *self) return is_empty; } -static void -on_queue_changed (ModestMailOperationQueue *queue, - ModestMailOperation *mail_op, - ModestMailOperationQueueNotification type, - ModestMainWindow *self) + +/** + * Gets the toolbar mode needed for each mail operation. It stores in + * @mode_changed if the toolbar mode has changed or not + */ +static ModestToolBarModes +get_toolbar_mode_from_mail_operation (ModestMainWindow *self, + ModestMailOperation *mail_op, + gboolean *mode_changed) { - ModestMainWindowPrivate *priv; - ModestMailOperationTypeOperation op_type; ModestToolBarModes mode; - GSList *tmp; - gboolean mode_changed = FALSE; + ModestMainWindowPrivate *priv; + + *mode_changed = FALSE; + priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); - g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); - priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); - /* Get toolbar mode from operation id*/ - op_type = modest_mail_operation_get_type_operation (mail_op); - switch (op_type) { + switch (modest_mail_operation_get_type_operation (mail_op)) { case MODEST_MAIL_OPERATION_TYPE_RECEIVE: case MODEST_MAIL_OPERATION_TYPE_OPEN: mode = TOOLBAR_MODE_TRANSFER; if (priv->current_toolbar_mode == TOOLBAR_MODE_NORMAL) - mode_changed = TRUE; + *mode_changed = TRUE; break; default: - mode = TOOLBAR_MODE_NORMAL; - + mode = TOOLBAR_MODE_NORMAL; } - - + return mode; +} + +static void +on_mail_operation_started (ModestMailOperation *mail_op, + gpointer user_data) +{ + ModestMainWindow *self; + ModestMailOperationTypeOperation op_type; + ModestMainWindowPrivate *priv; + ModestToolBarModes mode; + GSList *tmp; + gboolean mode_changed = FALSE; + TnyAccount *account; + + self = MODEST_MAIN_WINDOW (user_data); + priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); + + /* Do not show progress for receiving operations if the + account is the local account or the MMC one */ + op_type = modest_mail_operation_get_type_operation (mail_op); + account = modest_mail_operation_get_account (mail_op); + if (account && op_type == MODEST_MAIL_OPERATION_TYPE_RECEIVE) { + gboolean is_remote; + + is_remote = !(modest_tny_account_is_virtual_local_folders (account) || + modest_tny_account_is_memory_card_account (account)); + g_object_unref (account); + if (!is_remote) + return; + } + + /* Get toolbar mode from operation id*/ + mode = get_toolbar_mode_from_mail_operation (self, mail_op, &mode_changed); + /* Add operation observers and change toolbar if neccessary*/ tmp = priv->progress_widgets; - switch (type) { - case MODEST_MAIL_OPERATION_QUEUE_OPERATION_ADDED: - if (mode == TOOLBAR_MODE_TRANSFER) { - if (mode_changed) { - set_toolbar_transfer_mode(self); - } - while (tmp) { - modest_progress_object_add_operation (MODEST_PROGRESS_OBJECT (tmp->data), - mail_op); - tmp = g_slist_next (tmp); - } + if (mode == TOOLBAR_MODE_TRANSFER) { + if (mode_changed) + set_toolbar_transfer_mode(self); + + while (tmp) { + modest_progress_object_add_operation (MODEST_PROGRESS_OBJECT (tmp->data), + mail_op); + tmp = g_slist_next (tmp); } - break; - case MODEST_MAIL_OPERATION_QUEUE_OPERATION_REMOVED: - /* Change toolbar mode */ - if (mode == TOOLBAR_MODE_TRANSFER) { - while (tmp) { - modest_progress_object_remove_operation (MODEST_PROGRESS_OBJECT (tmp->data), - mail_op); - tmp = g_slist_next (tmp); - } - - /* If no more operations are being observed, NORMAL mode is enabled again */ - if (observers_empty (self)) { - set_toolbar_mode (self, TOOLBAR_MODE_NORMAL); - } + } +} + +static void +on_mail_operation_finished (ModestMailOperation *mail_op, + gpointer user_data) +{ + ModestToolBarModes mode; + ModestMailOperationTypeOperation op_type; + GSList *tmp = NULL; + ModestMainWindow *self; + gboolean mode_changed; + TnyAccount *account; + ModestMainWindowPrivate *priv; + + self = MODEST_MAIN_WINDOW (user_data); + priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); + + /* The mail operation was not added to the progress objects if + the account was the local account or the MMC one */ + op_type = modest_mail_operation_get_type_operation (mail_op); + account = modest_mail_operation_get_account (mail_op); + if (account && op_type == MODEST_MAIL_OPERATION_TYPE_RECEIVE) { + gboolean is_remote; + + is_remote = !(modest_tny_account_is_virtual_local_folders (account) || + modest_tny_account_is_memory_card_account (account)); + g_object_unref (account); + if (!is_remote) + return; + } + + /* Get toolbar mode from operation id*/ + mode = get_toolbar_mode_from_mail_operation (self, mail_op, &mode_changed); + + /* Change toolbar mode */ + tmp = priv->progress_widgets; + if (mode == TOOLBAR_MODE_TRANSFER) { + while (tmp) { + modest_progress_object_remove_operation (MODEST_PROGRESS_OBJECT (tmp->data), + mail_op); + tmp = g_slist_next (tmp); + } + + /* If no more operations are being observed, NORMAL mode is enabled again */ + if (observers_empty (self)) { + set_toolbar_mode (self, TOOLBAR_MODE_NORMAL); } + } +} - break; - } +static void +on_queue_changed (ModestMailOperationQueue *queue, + ModestMailOperation *mail_op, + ModestMailOperationQueueNotification type, + ModestMainWindow *self) +{ + ModestMainWindowPrivate *priv; + + priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); + if (type == MODEST_MAIL_OPERATION_QUEUE_OPERATION_ADDED) { + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (mail_op), + "operation-started", + G_CALLBACK (on_mail_operation_started), + self); + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (mail_op), + "operation-finished", + G_CALLBACK (on_mail_operation_finished), + self); + } else if (type == MODEST_MAIL_OPERATION_QUEUE_OPERATION_REMOVED) { + priv->sighandlers = modest_signal_mgr_disconnect (priv->sighandlers, + G_OBJECT (mail_op), + "operation-started"); + priv->sighandlers = modest_signal_mgr_disconnect (priv->sighandlers, + G_OBJECT (mail_op), + "operation-finished"); + } } static void @@ -2512,19 +2407,12 @@ modest_main_window_on_folder_selection_changed (ModestFolderView *folder_view, gtk_action_set_visible (action, show_forward); action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/HeaderViewCSM/HeaderViewCSMCancelSending"); gtk_action_set_visible (action, show_cancel_send); -/* action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/HeaderViewCSM/HeaderViewCSMCut"); */ -/* gtk_action_set_visible (action, show_clipboard); */ -/* action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/HeaderViewCSM/HeaderViewCSMCopy"); */ -/* gtk_action_set_visible (action, show_clipboard); */ -/* action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/HeaderViewCSM/HeaderViewCSMPaste"); */ -/* gtk_action_set_visible (action, show_clipboard); */ action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/HeaderViewCSM/HeaderViewCSMDelete"); gtk_action_set_visible (action, show_delete); /* We finally call to the ui actions handler, after updating properly * the header view CSM */ modest_ui_actions_on_folder_selection_changed (folder_view, folder_store, selected, main_window); - } gboolean @@ -2557,3 +2445,54 @@ modest_main_window_on_msg_view_window_msg_changed (ModestMsgViewWindow *view_win return TRUE; } +static gboolean +show_updating_banner (gpointer user_data) +{ + ModestMainWindowPrivate *priv = NULL; + + priv = MODEST_MAIN_WINDOW_GET_PRIVATE (user_data); + + priv->updating_banner = + modest_platform_animation_banner (GTK_WIDGET (user_data), NULL, + _CS ("ckdg_pb_updating")); + + /* Remove timeout */ + priv->updating_banner_timeout = 0; + return FALSE; +} + +/** + * We use this function to show/hide a progress banner showing + * "Updating" while the header view is being filled. We're not showing + * it unless the update takes more than 2 seconds + * + * If starting = TRUE then the refresh is starting, otherwise it means + * that is has just finished + */ +static void +on_updating_msg_list (ModestHeaderView *header_view, + gboolean starting, + gpointer user_data) +{ + ModestMainWindowPrivate *priv = NULL; + + priv = MODEST_MAIN_WINDOW_GET_PRIVATE (user_data); + + /* Remove old timeout */ + if (priv->updating_banner_timeout > 0) { + g_source_remove (priv->updating_banner_timeout); + priv->updating_banner_timeout = 0; + } + + /* Create a new timeout */ + if (starting) { + priv->updating_banner_timeout = + g_timeout_add (2000, show_updating_banner, user_data); + } else { + /* Remove the banner if exists */ + if (priv->updating_banner) { + gtk_widget_destroy (priv->updating_banner); + priv->updating_banner = NULL; + } + } +}