X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-main-window.c;h=f1e93f458148b20ae0f29eff6d3f530f32bd5b78;hp=629379b8df6db412a5f26280509fb0ed4fe48f6e;hb=96d9a8c787c693406a0f26e3d3a00065c7236fe5;hpb=557b80dfd0ca9d4034003321f49cad07b5c2eb3e diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index 629379b..f1e93f4 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -53,6 +53,7 @@ #include "modest-mail-operation.h" #include "modest-icon-names.h" #include "modest-progress-bar-widget.h" +#include "modest-text-utils.h" #include "maemo/modest-osso-state-saving.h" #ifdef MODEST_HILDON_VERSION_0 @@ -88,7 +89,7 @@ static void on_queue_changed (ModestMailOperationQue ModestMainWindow *self); static void on_account_update (TnyAccountStore *account_store, - gchar *account_name, + const gchar *account_name, gpointer user_data); static gboolean on_inner_widgets_key_pressed (GtkWidget *widget, @@ -103,11 +104,16 @@ static void on_configuration_key_changed (ModestConf* conf, static void set_toolbar_mode (ModestMainWindow *self, ModestToolBarModes mode); -static void on_show_account_action_activated (GtkAction *action, - gpointer user_data); +static gboolean set_toolbar_transfer_mode (ModestMainWindow *self); -static void on_send_receive_csm_activated (GtkMenuItem *item, - gpointer user_data); +static void on_show_account_action_activated (GtkAction *action, + gpointer user_data); + +static void on_refresh_account_action_activated (GtkAction *action, + gpointer user_data); + +static void on_send_receive_csm_activated (GtkMenuItem *item, + gpointer user_data); /* list my signals */ enum { /* MY_SIGNAL_1, */ @@ -149,6 +155,9 @@ struct _ModestMainWindowPrivate { ModestMainWindowStyle style; ModestMainWindowContentsStyle contents_style; + + guint progress_bar_timeout; + }; #define MODEST_MAIN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_MAIN_WINDOW, \ @@ -169,13 +178,14 @@ static GtkWindowClass *parent_class = NULL; /* Private actions */ +/* This is the context sensitive menu: */ static const GtkActionEntry modest_folder_view_action_entries [] = { /* Folder View CSM actions */ - { "FolderViewCSMNewFolder", NULL, N_("FIXME: New Folder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_folder) }, + { "FolderViewCSMNewFolder", NULL, N_("mcen_ti_new_folder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_folder) }, { "FolderViewCSMRenameFolder", NULL, N_("mcen_me_user_renamefolder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_rename_folder) }, - { "FolderViewCSMPasteMsgs", NULL, N_("FIXME: Paste"), NULL, NULL, NULL }, - { "FolderViewCSMDeleteFolder", NULL, N_("FIXME: Delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_folder) }, + { "FolderViewCSMPasteMsgs", NULL, N_("mcen_me_inbox_paste"), NULL, NULL, NULL }, + { "FolderViewCSMDeleteFolder", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_folder) }, { "FolderViewCSMSearchMessages", NULL, N_("mcen_me_inbox_search"), NULL, NULL, NULL }, { "FolderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, NULL }, }; @@ -243,8 +253,6 @@ modest_main_window_init (ModestMainWindow *obj) priv->accounts_popup = NULL; priv->details_widget = NULL; - priv->optimized_view = FALSE; - priv->progress_widgets = NULL; priv->progress_bar = NULL; priv->current_toolbar_mode = TOOLBAR_MODE_NORMAL; @@ -253,6 +261,9 @@ modest_main_window_init (ModestMainWindow *obj) priv->contents_style = MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS; priv->merge_ids = NULL; + + priv->optimized_view = FALSE; + priv->progress_bar_timeout = 0; } static void @@ -266,6 +277,11 @@ modest_main_window_finalize (GObject *obj) g_byte_array_free (priv->merge_ids, TRUE); + if (priv->progress_bar_timeout > 0) { + g_source_remove (priv->progress_bar_timeout); + priv->progress_bar_timeout = 0; + } + G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -306,12 +322,12 @@ restore_settings (ModestMainWindow *self) conf = modest_runtime_get_conf (); + modest_widget_memory_restore (conf, G_OBJECT(self), + MODEST_CONF_MAIN_WINDOW_KEY); modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned), MODEST_CONF_MAIN_PANED_KEY); modest_widget_memory_restore (conf, G_OBJECT(priv->header_view), MODEST_CONF_HEADER_VIEW_KEY); - modest_widget_memory_restore (conf, G_OBJECT(self), - MODEST_CONF_MAIN_WINDOW_KEY); } @@ -354,14 +370,12 @@ on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self) static void -on_connection_changed (TnyDevice *device, gboolean online, ModestMainWindow *self) +on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow *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): */ - if (online) { - modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self)); - } + modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self)); } @@ -429,10 +443,11 @@ connect_signals (ModestMainWindow *self) G_CALLBACK (modest_ui_actions_on_password_requested), self); /* Device */ - g_signal_connect (G_OBJECT(modest_runtime_get_device()), "connection_changed", - G_CALLBACK(on_connection_changed), self); + g_signal_connect (G_OBJECT(modest_runtime_get_account_store()), "connecting-finished", + G_CALLBACK(on_account_store_connecting_finished), self); } +#if 0 /** Idle handler, to send/receive at startup .*/ gboolean sync_accounts_cb (ModestMainWindow *win) @@ -440,6 +455,7 @@ sync_accounts_cb (ModestMainWindow *win) modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (win)); return FALSE; /* Do not call this idle handler again. */ } +#endif static void on_hildon_program_is_topmost_notify(GObject *self, GParamSpec *propert_param, gpointer user_data) @@ -612,8 +628,14 @@ modest_main_window_new (void) tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (priv->folder_view), TNY_ACCOUNT_STORE (modest_runtime_get_account_store ())); - /* do send & receive when we are idle */ - g_idle_add ((GSourceFunc)sync_accounts_cb, self); + /* Do send & receive when we are idle */ + /* TODO: Enable this again. I have commented it out because, + * at least in scratchbox, this can cause us to start a second + * update (in response to a connection change) when we are already + * doing an update (started here, at startup). Tinymail doesn't like that. + * murrayc. + */ + /* g_idle_add ((GSourceFunc)sync_accounts_cb, self); */ HildonProgram *app = hildon_program_get_instance (); hildon_program_add_window (app, HILDON_WINDOW (self)); @@ -802,8 +824,8 @@ modest_main_window_show_toolbar (ModestWindow *self, priv->cancel_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarCancel"); priv->refresh_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSendReceive"); priv->sort_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSort"); - gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->progress_toolitem), FALSE); - gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), FALSE); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE); gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE); gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE); @@ -840,10 +862,10 @@ modest_main_window_show_toolbar (ModestWindow *self, } if (show_toolbar) { - /* Quick hack: this prevents toolbar icons "dance" when progress bar show status is changed */ + /* Quick hack: this prevents toolbar icons "dance" when progress bar show status is changed */ /* TODO: resize mode migth be GTK_RESIZE_QUEUE, in order to avoid unneccesary shows */ gtk_container_set_resize_mode (GTK_CONTAINER(parent_priv->toolbar), GTK_RESIZE_IMMEDIATE); - + gtk_widget_show (GTK_WIDGET (parent_priv->toolbar)); set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL); } else @@ -860,7 +882,7 @@ compare_display_names (ModestAccountData *a, static void on_account_update (TnyAccountStore *account_store, - gchar *accout_name, + const gchar *account_name, gpointer user_data) { GSList *account_names, *iter, *accounts; @@ -868,8 +890,7 @@ on_account_update (TnyAccountStore *account_store, ModestMainWindowPrivate *priv; ModestWindowPrivate *parent_priv; ModestAccountMgr *mgr; - gint i, num_accounts; - ModestAccountData *account_data; + gint i, num_accounts; GtkActionGroup *action_group; GList *groups; gchar *default_account; @@ -886,7 +907,8 @@ on_account_update (TnyAccountStore *account_store, accounts = NULL; while (iter) { - account_data = modest_account_mgr_get_account_data (mgr, (gchar*) iter->data); + ModestAccountData *account_data = + modest_account_mgr_get_account_data (mgr, (gchar*) iter->data); accounts = g_slist_prepend (accounts, account_data); iter = iter->next; @@ -901,7 +923,8 @@ on_account_update (TnyAccountStore *account_store, menu_detach because it does not work well with tap_and_hold */ if (priv->accounts_popup) - gtk_container_foreach (GTK_CONTAINER (priv->accounts_popup), (GtkCallback) gtk_widget_destroy, NULL); + gtk_container_foreach (GTK_CONTAINER (priv->accounts_popup), + (GtkCallback) gtk_widget_destroy, NULL); /* Delete old entries in the View menu. Do not free groups, it belongs to Gtk+ */ @@ -949,60 +972,96 @@ on_account_update (TnyAccountStore *account_store, default_account = modest_account_mgr_get_default_account (mgr); action_group = gtk_action_group_new (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS); for (i = 0; i < num_accounts; i++) { - GtkAction *new_action; - gchar* item_name, *display_name; - guint8 merge_id; - - account_data = (ModestAccountData *) g_slist_nth_data (accounts, i); + gchar *display_name = NULL; + + ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i); /* Create display name. The default account is shown differently */ - if (default_account && !(strcmp (default_account, account_data->account_name) == 0)) + 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"), account_data->display_name); - else + } + else { display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_mailbox_n"), account_data->display_name); + } /* Create action and add it to the action group. The action name must be the account name, this way we could know in the handlers the account to show */ - new_action = gtk_action_new (account_data->account_name, display_name, NULL, NULL); - gtk_action_group_add_action (action_group, new_action); - - /* Add ui from account data. We allow 2^9-1 account - changes in a single execution because we're - downcasting the guint to a guint8 in order to use a - GByteArray, it should be enough */ - item_name = g_strconcat (account_data->account_name, "Menu"); - merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager); - priv->merge_ids = g_byte_array_append (priv->merge_ids, &merge_id, 1); - gtk_ui_manager_add_ui (parent_priv->ui_manager, - merge_id, - "/MenuBar/ViewMenu/ViewMenuAdditions", - item_name, - account_data->account_name, - GTK_UI_MANAGER_MENUITEM, - FALSE); - - /* Connect the action signal "activate" */ - g_signal_connect (G_OBJECT (new_action), - "activate", - G_CALLBACK (on_show_account_action_activated), - self); - - /* Create item and add it to the send&receive CSM */ - item = gtk_menu_item_new_with_label (display_name); - gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item)); - g_signal_connect_data (G_OBJECT (item), - "activate", - G_CALLBACK (on_send_receive_csm_activated), - g_strdup (account_data->account_name), - (GClosureNotify) g_free, - 0); + if(account_data->account_name) { + gchar* item_name, *refresh_action_name; + guint8 merge_id; + GtkAction *view_account_action, *refresh_account_action; + + view_account_action = gtk_action_new (account_data->account_name, + display_name, NULL, NULL); + gtk_action_group_add_action (action_group, view_account_action); + + /* Add ui from account data. We allow 2^9-1 account + changes in a single execution because we're + downcasting the guint to a guint8 in order to use a + GByteArray, it should be enough */ + item_name = g_strconcat (account_data->account_name, "Menu", NULL); + merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager); + priv->merge_ids = g_byte_array_append (priv->merge_ids, &merge_id, 1); + gtk_ui_manager_add_ui (parent_priv->ui_manager, + merge_id, + "/MenuBar/ViewMenu/ViewMenuAdditions", + item_name, + account_data->account_name, + GTK_UI_MANAGER_MENUITEM, + FALSE); + + /* Connect the action signal "activate" */ + g_signal_connect (G_OBJECT (view_account_action), + "activate", + G_CALLBACK (on_show_account_action_activated), + self); + + /* Create the items for the Tools->Send&Receive submenu */ + 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); + gtk_action_group_add_action (action_group, refresh_account_action); + + merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager); + priv->merge_ids = g_byte_array_append (priv->merge_ids, &merge_id, 1); + gtk_ui_manager_add_ui (parent_priv->ui_manager, + merge_id, + "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions", + item_name, + refresh_action_name, + GTK_UI_MANAGER_MENUITEM, + FALSE); + g_free (refresh_action_name); + + g_signal_connect_data (G_OBJECT (refresh_account_action), + "activate", + G_CALLBACK (on_refresh_account_action_activated), + g_strdup (account_data->account_name), + (GClosureNotify) g_free, + 0); + + /* Create item and add it to the send&receive + CSM. If there is only one account then + it'll be no menu */ + if (priv->accounts_popup) { + item = gtk_menu_item_new_with_label (display_name); + gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item)); + g_signal_connect_data (G_OBJECT (item), + "activate", + G_CALLBACK (on_send_receive_csm_activated), + g_strdup (account_data->account_name), + (GClosureNotify) g_free, + 0); + } + g_free (item_name); + } /* Frees */ g_free (display_name); - g_free (item_name); modest_account_mgr_free_account_data (mgr, account_data); } gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 1); @@ -1063,19 +1122,20 @@ set_alignment (GtkWidget *widget, } static GtkWidget * -create_details_widget (TnyAccount *account) +create_details_widget (TnyFolderStore *folder_store) { GtkWidget *vbox; gchar *label; vbox = gtk_vbox_new (FALSE, 0); - /* Account description */ - if (!strcmp (tny_account_get_id (account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) { - gchar *device_name; - + /* Account description: */ + + if (modest_tny_folder_store_is_virtual_local_folders (folder_store)) { + /* Local folders: */ + /* Get device name */ - device_name = modest_conf_get_string (modest_runtime_get_conf(), + gchar *device_name = modest_conf_get_string (modest_runtime_get_conf(), MODEST_CONF_DEVICE_NAME, NULL); label = g_strdup_printf ("%s: %s", @@ -1084,50 +1144,74 @@ create_details_widget (TnyAccount *account) gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0); g_free (device_name); g_free (label); - } else if (!strcmp (tny_account_get_id (account), MODEST_MMC_ACCOUNT_ID)) { - /* TODO: MMC ? */ - gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("FIXME: MMC ?"), FALSE, FALSE, 0); - } else { - GString *proto; - - /* Put proto in uppercase */ - proto = g_string_new (tny_account_get_proto (account)); - proto = g_string_ascii_up (proto); - - label = g_strdup_printf ("%s %s: %s", - proto->str, - _("mcen_fi_remoteroot_account"), - tny_account_get_name (account)); - gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0); - g_string_free (proto, TRUE); - g_free (label); + } else if (TNY_IS_ACCOUNT (folder_store)) { + TnyAccount *account = TNY_ACCOUNT(folder_store); + + if(!strcmp (tny_account_get_id (account), MODEST_MMC_ACCOUNT_ID)) { + /* TODO: MMC ? */ + gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("FIXME: MMC ?"), FALSE, FALSE, 0); + } else { + /* Other accounts, such as IMAP and POP: */ + + GString *proto; + + /* Put proto in uppercase */ + proto = g_string_new (tny_account_get_proto (account)); + proto = g_string_ascii_up (proto); + + label = g_strdup_printf ("%s %s: %s", + proto->str, + _("mcen_fi_remoteroot_account"), + tny_account_get_name (account)); + gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0); + g_string_free (proto, TRUE); + g_free (label); + } } /* Message count */ + label = g_strdup_printf ("%s: %d", _("mcen_fi_rootfolder_messages"), - modest_tny_account_get_message_count (account)); + modest_tny_folder_store_get_message_count (folder_store)); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0); g_free (label); /* Folder count */ label = g_strdup_printf ("%s: %d", _("mcen_fi_rootfolder_folders"), - modest_tny_account_get_folder_count (account)); + modest_tny_folder_store_get_folder_count (folder_store)); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0); g_free (label); /* Size / Date */ - if (!strcmp (tny_account_get_id (account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) { + if (modest_tny_folder_store_is_virtual_local_folders (folder_store)) { /* FIXME: format size */ label = g_strdup_printf ("%s: %d", _("mcen_fi_rootfolder_size"), - modest_tny_account_get_local_size (account)); - gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0); - g_free (label); - } else if (!strcmp (tny_account_get_id (account), MODEST_MMC_ACCOUNT_ID)) { - gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("FIXME: MMC ?"), FALSE, FALSE, 0); - } else { - label = g_strdup_printf ("%s: %s", _("mcen_ti_lastupdated"), "08/08/08"); + modest_tny_folder_store_get_local_size (folder_store)); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0); g_free (label); + } else if (TNY_IS_ACCOUNT(folder_store)) { + TnyAccount *account = TNY_ACCOUNT(folder_store); + + if (!strcmp (tny_account_get_id (account), MODEST_MMC_ACCOUNT_ID)) { + gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("FIXME: MMC ?"), FALSE, FALSE, 0); + } else { + 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); + if (last_updated > 0) + last_updated_string = modest_text_utils_get_display_date(last_updated); + else + last_updated_string = g_strdup (_("FIXME: Never")); + + label = g_strdup_printf ("%s: %s", _("mcen_ti_lastupdated"), last_updated_string); + gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0); + g_free (last_updated_string); + g_free (label); + } } /* Set alignment */ @@ -1141,8 +1225,6 @@ modest_main_window_set_contents_style (ModestMainWindow *self, ModestMainWindowContentsStyle style) { ModestMainWindowPrivate *priv; - GtkWidget *content; - TnyAccount *account; g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); @@ -1157,10 +1239,12 @@ modest_main_window_set_contents_style (ModestMainWindow *self, /* Remove previous child. Delete it if it was an account details widget */ - content = gtk_bin_get_child (GTK_BIN (priv->contents_widget)); - if (priv->contents_style != MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS) - g_object_ref (content); - gtk_container_remove (GTK_CONTAINER (priv->contents_widget), content); + GtkWidget *content = gtk_bin_get_child (GTK_BIN (priv->contents_widget)); + if (content) { + if (priv->contents_style != MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS) + g_object_ref (content); + gtk_container_remove (GTK_CONTAINER (priv->contents_widget), content); + } priv->contents_style = style; @@ -1169,13 +1253,17 @@ modest_main_window_set_contents_style (ModestMainWindow *self, wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->header_view)); break; case MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS: + { /* TODO: show here account details */ - account = TNY_ACCOUNT (modest_folder_view_get_selected (priv->folder_view)); - priv->details_widget = create_details_widget (account); + TnyFolderStore *selected_folderstore = + modest_folder_view_get_selected (priv->folder_view); + + priv->details_widget = create_details_widget (selected_folderstore); wrap_in_scrolled_window (priv->contents_widget, - priv->details_widget); + priv->details_widget); break; + } default: g_return_if_reached (); } @@ -1203,7 +1291,7 @@ on_configuration_key_changed (ModestConf* conf, account = (TnyAccount *) modest_folder_view_get_selected (priv->folder_view); if (TNY_IS_ACCOUNT (account) && - !strcmp (tny_account_get_id (account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) { + !strcmp (tny_account_get_id (account), MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID)) { GList *children; GtkLabel *label; const gchar *device_name; @@ -1228,6 +1316,25 @@ on_configuration_key_changed (ModestConf* conf, } } +static gboolean +set_toolbar_transfer_mode (ModestMainWindow *self) +{ + ModestMainWindowPrivate *priv = NULL; + + g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (self), FALSE); + + priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + + set_toolbar_mode (self, TOOLBAR_MODE_TRANSFER); + + if (priv->progress_bar_timeout > 0) { + g_source_remove (priv->progress_bar_timeout); + priv->progress_bar_timeout = 0; + } + + return FALSE; +} + static void set_toolbar_mode (ModestMainWindow *self, ModestToolBarModes mode) @@ -1344,6 +1451,7 @@ on_queue_changed (ModestMailOperationQueue *queue, ModestToolBarModes mode; GSList *tmp; gboolean mode_changed = FALSE; + ModestMailOperationStatus status; g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); @@ -1367,9 +1475,9 @@ on_queue_changed (ModestMailOperationQueue *queue, tmp = priv->progress_widgets; switch (type) { case MODEST_MAIL_OPERATION_QUEUE_OPERATION_ADDED: - if (mode_changed) - set_toolbar_mode (self, mode); 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); @@ -1378,20 +1486,29 @@ on_queue_changed (ModestMailOperationQueue *queue, } break; case MODEST_MAIL_OPERATION_QUEUE_OPERATION_REMOVED: - if (mode == TOOLBAR_MODE_TRANSFER) { + /* If mail_op is mine, check errors */ + status = modest_mail_operation_get_status (mail_op); + if (status != MODEST_MAIL_OPERATION_STATUS_SUCCESS) + modest_mail_operation_execute_error_handler (mail_op); + /* 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)) + if (observers_empty (self)) { set_toolbar_mode (self, TOOLBAR_MODE_NORMAL); + + } } + break; } + } static void @@ -1416,6 +1533,7 @@ on_show_account_action_activated (GtkAction *action, if (acc_data->store_account) { modest_folder_view_set_account_id_of_visible_server_account (priv->folder_view, acc_data->store_account->account_name); + modest_window_set_active_account (MODEST_WINDOW (self), acc_data->account_name); } /* Free */ @@ -1423,17 +1541,29 @@ on_show_account_action_activated (GtkAction *action, } static void -on_send_receive_csm_activated (GtkMenuItem *item, - gpointer user_data) +refresh_account (const gchar *account_name) { ModestWindow *win; win = MODEST_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ())); - /* If user_data == NULL, we must update all (CSM option All) */ - if (!user_data) { + /* If account_name == NULL, we must update all (option All) */ + if (!account_name) modest_ui_actions_do_send_receive_all (win); - } else { - modest_ui_actions_do_send_receive ((const gchar *)user_data, win); - } + else + modest_ui_actions_do_send_receive (account_name, win); +} + +static void +on_refresh_account_action_activated (GtkAction *action, + gpointer user_data) +{ + refresh_account ((const gchar*) user_data); +} + +static void +on_send_receive_csm_activated (GtkMenuItem *item, + gpointer user_data) +{ + refresh_account ((const gchar*) user_data); }