X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-main-window.c;h=614fe61cfa859b014c436b5d29a09507cc56cbbc;hp=1c62da92104a796eaed0ac41394661403b2183a4;hb=de2d9a7e88e25c2b3128cdc69a27c334cb9635ea;hpb=8eb87055216f549c737d2126f33d1fc913f2632d diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index 1c62da9..614fe61 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -53,6 +53,7 @@ #include "modest-tny-account.h" #include "modest-tny-folder.h" #include "modest-conf.h" +#include #include #include "modest-tny-platform-factory.h" #include "modest-tny-msg.h" @@ -65,12 +66,6 @@ #include "modest-text-utils.h" #include "modest-signal-mgr.h" -#ifdef MODEST_HAVE_HILDON0_WIDGETS -#include -#else -#include -#endif /*MODEST_HAVE_HILDON0_WIDGETS*/ - #define MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS "ModestMainWindowActionAdditions" #define XALIGN 0.5 @@ -84,8 +79,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 +91,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); @@ -112,20 +106,20 @@ static void on_queue_changed (ModestMailOperationQueue *queue, static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window); -static void -on_account_inserted (TnyAccountStore *accoust_store, - TnyAccount *account, - gpointer user_data); +static void on_account_inserted (TnyAccountStore *accoust_store, + TnyAccount *account, + gpointer user_data); -static void -on_account_removed (TnyAccountStore *accoust_store, - TnyAccount *account, - gpointer user_data); +static void 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_account_changed (TnyAccountStore *account_store, + TnyAccount *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, @@ -169,13 +163,19 @@ 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 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 on_updating_msg_list (ModestHeaderView *header_view, + gboolean starting, + gpointer user_data); + +static gboolean restore_paned_timeout_handler (gpointer *data); + typedef struct _ModestMainWindowPrivate ModestMainWindowPrivate; struct _ModestMainWindowPrivate { GtkWidget *msg_paned; @@ -216,12 +216,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, \ @@ -344,7 +347,14 @@ 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; + + modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(), + GTK_WINDOW(obj), + "applications_email_mainview"); } static void @@ -354,18 +364,11 @@ 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)); - + modest_main_window_disconnect_signals (MODEST_WINDOW (obj)); modest_main_window_cleanup_queue_error_signals ((ModestMainWindow *) obj); - + g_slist_free (priv->progress_widgets); g_byte_array_free (priv->merge_ids, TRUE); @@ -375,6 +378,21 @@ 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->updating_banner) { + gtk_widget_destroy (priv->updating_banner); + priv->updating_banner = NULL; + } + + 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); } @@ -403,6 +421,25 @@ 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; + + /* Timeouts are outside the main lock */ + gdk_threads_enter (); + 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); + } + gdk_threads_leave (); + + return FALSE; +} + static void restore_settings (ModestMainWindow *self, gboolean do_folder_view_too) @@ -427,6 +464,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)); @@ -454,10 +493,11 @@ save_state (ModestWindow *window) } static gint -compare_display_names (ModestAccountData *a, - ModestAccountData *b) +compare_display_names (ModestAccountSettings *a, + ModestAccountSettings *b) { - return strcmp (a->display_name, b->display_name); + return strcmp (modest_account_settings_get_display_name (a), + modest_account_settings_get_display_name (b)); } static void @@ -470,6 +510,7 @@ update_menus (ModestMainWindow* self) gint i, num_accounts; GList *groups; gchar *default_account; + const gchar *active_account_name; GtkWidget *send_receive_button, *item; GtkAction *send_receive_all = NULL; GSList *radio_group; @@ -484,9 +525,9 @@ update_menus (ModestMainWindow* self) accounts = NULL; while (iter) { - ModestAccountData *account_data = - modest_account_mgr_get_account_data (mgr, (gchar*) iter->data); - accounts = g_slist_prepend (accounts, account_data); + ModestAccountSettings *settings = + modest_account_mgr_load_account_settings (mgr, (gchar*) iter->data); + accounts = g_slist_prepend (accounts, settings); iter = iter->next; } @@ -499,7 +540,7 @@ update_menus (ModestMainWindow* self) send_receive_all = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu"); - gtk_action_set_visible (send_receive_all, num_accounts > 1); + gtk_action_set_visible (send_receive_all, num_accounts > 0); /* Delete old send&receive popup items. We can not just do a menu_detach because it does not work well with @@ -525,7 +566,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); @@ -552,57 +593,66 @@ update_menus (ModestMainWindow* self) /* Create a new action group */ default_account = modest_account_mgr_get_default_account (mgr); + active_account_name = modest_window_get_active_account (MODEST_WINDOW (self)); + + if (!active_account_name) + modest_window_set_active_account (MODEST_WINDOW (self), default_account); + 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; - - ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i); + gchar *display_name = NULL; + const gchar *account_name; + ModestAccountSettings *settings = (ModestAccountSettings *) 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"), - account_data->display_name); + if (!settings) { + g_warning ("%s: BUG: account_data == NULL", __FUNCTION__); + continue; } - else { + account_name = modest_account_settings_get_account_name (settings); + + if (default_account && account_name && + !(strcmp (default_account, account_name) == 0)) { + display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"), + modest_account_settings_get_display_name (settings)); + } else { display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_mailbox_n"), - account_data->display_name); + modest_account_settings_get_display_name (settings)); } - + /* 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 */ - if(account_data && account_data->account_name) { + if (settings && account_name) { gchar* item_name, *refresh_action_name; guint8 merge_id = 0; GtkAction *view_account_action, *refresh_account_action; - view_account_action = GTK_ACTION (gtk_radio_action_new (account_data->account_name, + view_account_action = GTK_ACTION (gtk_radio_action_new (account_name, display_name, NULL, NULL, 0)); gtk_action_group_add_action (priv->view_additions_group, view_account_action); gtk_radio_action_set_group (GTK_RADIO_ACTION (view_account_action), radio_group); radio_group = gtk_radio_action_get_group (GTK_RADIO_ACTION (view_account_action)); - if (default_account && account_data->account_name && - (strcmp (default_account, account_data->account_name) == 0)) { - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (view_account_action), TRUE); + if (active_account_name) { + if (active_account_name && account_name && + (strcmp (active_account_name, account_name) == 0)) { + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (view_account_action), TRUE); + } } /* 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); + item_name = g_strconcat (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, + account_name, GTK_UI_MANAGER_MENUITEM, FALSE); @@ -613,7 +663,7 @@ update_menus (ModestMainWindow* self) self); /* Create the items for the Tools->Send&Receive submenu */ - refresh_action_name = g_strconcat ("SendReceive", account_data->account_name, NULL); + refresh_action_name = g_strconcat ("SendReceive", account_name, NULL); refresh_account_action = gtk_action_new ((const gchar*) refresh_action_name, display_name, NULL, NULL); gtk_action_group_add_action (priv->view_additions_group, refresh_account_action); @@ -632,7 +682,7 @@ update_menus (ModestMainWindow* self) g_signal_connect_data (G_OBJECT (refresh_account_action), "activate", G_CALLBACK (on_refresh_account_action_activated), - g_strdup (account_data->account_name), + g_strdup (account_name), (GClosureNotify) g_free, 0); @@ -642,7 +692,7 @@ update_menus (ModestMainWindow* self) if (priv->accounts_popup) { GtkWidget *label = gtk_label_new(NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - if (default_account && (strcmp(account_data->account_name, default_account) == 0)) + if (default_account && (strcmp(account_name, default_account) == 0)) { gchar *escaped = g_markup_printf_escaped ("%s", display_name); gtk_label_set_markup (GTK_LABEL (label), escaped); @@ -660,7 +710,7 @@ update_menus (ModestMainWindow* self) g_signal_connect_data (G_OBJECT (item), "activate", G_CALLBACK (on_send_receive_csm_activated), - g_strdup (account_data->account_name), + g_strdup (account_name), (GClosureNotify) g_free, 0); } @@ -677,11 +727,14 @@ update_menus (ModestMainWindow* self) * group being inserted. This makes the default account appear in bold. * I agree it is a rather ugly way, but I don't see another possibility. armin. */ for (i = 0; i < num_accounts; i++) { - ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i); + ModestAccountSettings *settings = (ModestAccountSettings *) g_slist_nth_data (accounts, i); + const gchar *account_name; - if(account_data->account_name && default_account && - strcmp (account_data->account_name, default_account) == 0) { - gchar *item_name = g_strconcat (account_data->account_name, "Menu", NULL); + account_name = modest_account_settings_get_account_name (settings); + + if(account_name && default_account && + strcmp (account_name, default_account) == 0) { + gchar *item_name = g_strconcat (account_name, "Menu", NULL); gchar *path = g_strconcat ("/MenuBar/ViewMenu/ViewMenuAdditions/", item_name, NULL); GtkWidget *item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path); @@ -696,7 +749,7 @@ update_menus (ModestMainWindow* self) g_free (bold_name); } } - + path = g_strconcat("/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions/", item_name, NULL); item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path); g_free (path); @@ -714,7 +767,7 @@ update_menus (ModestMainWindow* self) g_free(item_name); } - modest_account_mgr_free_account_data (mgr, account_data); + g_object_unref (settings); } if (priv->accounts_popup) { @@ -812,15 +865,25 @@ 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 (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"); @@ -829,60 +892,97 @@ 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 ()), + "account_changed", + G_CALLBACK (on_account_changed), + 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 @@ -942,12 +1042,11 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data) priv->folder_view = MODEST_FOLDER_VIEW (modest_platform_create_folder_view (NULL)); wrap_in_scrolled_window (folder_win, GTK_WIDGET(priv->folder_view)); -/* wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET(priv->header_view)); */ 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), @@ -957,16 +1056,9 @@ 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); - /* Check if accounts exist and show the account wizard if not */ gboolean accounts_exist = modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE); @@ -983,8 +1075,9 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data) accounts = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE); send_receive_all = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu"); - gtk_action_set_visible (send_receive_all, g_slist_length (accounts) > 1); + gtk_action_set_visible (send_receive_all, g_slist_length (accounts) > 0); modest_account_mgr_free_account_names (accounts); + update_menus (MODEST_MAIN_WINDOW (self)); } } @@ -999,6 +1092,7 @@ modest_main_window_new (void) ModestDimmingRulesGroup *toolbar_rules_group = NULL; GtkActionGroup *action_group = NULL; GError *error = NULL; + HildonProgram *app; ModestConf *conf = NULL; GtkAction *action = NULL; GdkPixbuf *window_icon; @@ -1075,7 +1169,7 @@ modest_main_window_new (void) gtk_ui_manager_get_accel_group (parent_priv->ui_manager)); /* Menubar. Update the state of some toggles */ - parent_priv->menubar = modest_maemo_utils_menubar_to_menu (parent_priv->ui_manager); + parent_priv->menubar = modest_maemo_utils_get_manager_menubar_as_menu (parent_priv->ui_manager, "/MenuBar"); conf = modest_runtime_get_conf (); action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewShowToolbarMainMenu/ViewShowToolbarNormalScreenMenu"); @@ -1134,7 +1228,7 @@ modest_main_window_new (void) gtk_container_add (GTK_CONTAINER(self), priv->main_vbox); - HildonProgram *app = hildon_program_get_instance (); + app = hildon_program_get_instance (); hildon_program_add_window (app, HILDON_WINDOW (self)); g_signal_connect (G_OBJECT(app), "notify::is-topmost", @@ -1144,7 +1238,7 @@ modest_main_window_new (void) G_CALLBACK (modest_main_window_on_show), folder_win); /* Set window icon */ - window_icon = modest_platform_get_icon (MODEST_APP_ICON); + window_icon = modest_platform_get_icon (MODEST_APP_ICON, MODEST_ICON_SIZE_BIG); if (window_icon) { gtk_window_set_icon (GTK_WINDOW (self), window_icon); g_object_unref (window_icon); @@ -1160,29 +1254,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) @@ -1370,7 +1441,10 @@ modest_main_window_show_toolbar (ModestWindow *self, 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); + if (modest_main_window_transfer_mode_enabled (MODEST_MAIN_WINDOW(self))) + set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_TRANSFER); + else + set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL); } else { gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar)); @@ -1382,12 +1456,12 @@ 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), + modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), show_toolbar); } @@ -1400,19 +1474,10 @@ on_account_inserted (TnyAccountStore *accoust_store, } 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 @@ -1423,6 +1488,22 @@ on_account_removed (TnyAccountStore *accoust_store, update_menus (MODEST_MAIN_WINDOW (user_data)); } +static void +on_account_changed (TnyAccountStore *account_store, + TnyAccount *account, + gpointer user_data) +{ + ModestMainWindow *win = MODEST_MAIN_WINDOW (user_data); + + /* We need to refresh the details widget because it could have changed */ + if (modest_main_window_get_contents_style(win) == MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS) { + modest_main_window_set_contents_style (win, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS); + } + + /* Update the menus as well, the account name could be changed */ + update_menus (MODEST_MAIN_WINDOW (user_data)); +} + /* * This function manages the key events used to navigate between * header and folder views (when the window is in split view) @@ -1448,9 +1529,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; @@ -1478,6 +1567,50 @@ create_empty_view (void) return GTK_WIDGET(align); } +/* + * Free the returned string + */ +static gchar * +get_gray_color_markup (GtkWidget *styled_widget) +{ + gchar *gray_color_markup = NULL; +#ifndef MODEST_HAVE_HILDON0_WIDGETS + /* Obtain the secondary text color. We need a realized widget, that's why + we get styled_widget from outside */ + GdkColor color; + if (gtk_style_lookup_color (styled_widget->style, "SecondaryTextColor", &color)) + gray_color_markup = modest_text_utils_get_color_string (&color); +#endif /*MODEST_HAVE_HILDON0_WIDGETS*/ + + if (!gray_color_markup) + gray_color_markup = g_strdup ("#BBBBBB"); + + 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) { @@ -1490,22 +1623,11 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) 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 - GdkColor color; - 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 + 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; @@ -1514,13 +1636,12 @@ 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_label_set_ellipsize (GTK_LABEL (label_w), PANGO_ELLIPSIZE_END); gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0); g_free (device_name); g_free (label); @@ -1548,6 +1669,7 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) label_w = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label_w), label); + gtk_label_set_ellipsize (GTK_LABEL (label_w), PANGO_ELLIPSIZE_END); gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0); g_string_free (proto, TRUE); g_free (label); @@ -1561,6 +1683,7 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) modest_tny_folder_store_get_message_count (folder_store)); label_w = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label_w), label); + gtk_label_set_ellipsize (GTK_LABEL (label_w), PANGO_ELLIPSIZE_END); gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0); g_free (label); @@ -1571,6 +1694,7 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) modest_tny_folder_store_get_folder_count (folder_store)); label_w = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label_w), label); + gtk_label_set_ellipsize (GTK_LABEL (label_w), PANGO_ELLIPSIZE_END); gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0); g_free (label); @@ -1588,18 +1712,18 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) label_w = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label_w), label); + gtk_label_set_ellipsize (GTK_LABEL (label_w), PANGO_ELLIPSIZE_END); gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0); g_free (label); } else if (TNY_IS_ACCOUNT(folder_store)) { TnyAccount *account = TNY_ACCOUNT(folder_store); time_t last_updated; - gchar *last_updated_string; + const 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 @@ -1609,8 +1733,8 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) gray_color_markup, _("mcen_ti_lastupdated"), last_updated_string); label_w = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label_w), label); + gtk_label_set_ellipsize (GTK_LABEL (label_w), PANGO_ELLIPSIZE_END); gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0); - g_free (last_updated_string); g_free (label); } @@ -1815,21 +1939,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)); @@ -1837,14 +1961,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); } @@ -1927,12 +2051,12 @@ set_toolbar_mode (ModestMainWindow *self, gtk_action_set_visible (refresh_action, FALSE); if (cancel_action) gtk_action_set_visible (cancel_action, TRUE); + if (priv->progress_bar) + gtk_widget_show (priv->progress_bar); if (priv->progress_toolitem) { gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE); gtk_widget_show (priv->progress_toolitem); } - if (priv->progress_bar) - gtk_widget_show (priv->progress_bar); /* Show toolbar if it's hiden (optimized view ) */ if (priv->optimized_view) @@ -1993,69 +2117,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 @@ -2063,20 +2277,30 @@ set_account_visible(ModestMainWindow *self, const gchar *acc_name) { ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); GtkAction *action; + ModestAccountMgr *mgr; + ModestAccountSettings *settings; + ModestServerAccountSettings *store_settings = NULL; /* Get account data */ - ModestAccountMgr *mgr = modest_runtime_get_account_mgr (); - ModestAccountData *acc_data = modest_account_mgr_get_account_data (mgr, acc_name); + mgr = modest_runtime_get_account_mgr (); + settings = modest_account_mgr_load_account_settings (mgr, acc_name); + if (settings) + store_settings = modest_account_settings_get_store_settings (settings); /* Set the new visible & active account */ - if (acc_data && 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); - action = gtk_action_group_get_action (priv->view_additions_group, acc_data->account_name); + if (settings && (modest_server_account_settings_get_account_name (store_settings)!= NULL)) { + const gchar *account_name; + + account_name = modest_account_settings_get_account_name (settings); + + modest_folder_view_set_account_id_of_visible_server_account + (priv->folder_view, + modest_server_account_settings_get_account_name (store_settings)); + modest_window_set_active_account (MODEST_WINDOW (self), account_name); + action = gtk_action_group_get_action (priv->view_additions_group, account_name); if (action != NULL) { if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) { - modest_maemo_toggle_action_set_active_block_notify ( + modest_utils_toggle_action_set_active_block_notify ( GTK_TOGGLE_ACTION (action), TRUE); } @@ -2087,8 +2311,10 @@ set_account_visible(ModestMainWindow *self, const gchar *acc_name) /* Free */ - if (acc_data) - modest_account_mgr_free_account_data (mgr, acc_data); + if (settings) { + g_object_unref (store_settings); + g_object_unref (settings); + } } /* Make sure that at least one account is "viewed": */ @@ -2104,15 +2330,20 @@ set_at_least_one_account_visible(ModestMainWindow *self) } const gchar *active_server_account_name = - modest_folder_view_get_account_id_of_visible_server_account (priv->folder_view); + modest_folder_view_get_account_id_of_visible_server_account (priv->folder_view); + if (!active_server_account_name || !modest_account_mgr_account_exists (account_mgr, active_server_account_name, TRUE)) { gchar* first_modest_name = modest_account_mgr_get_first_account_name (account_mgr); - if (first_modest_name) { + gchar* default_modest_name = modest_account_mgr_get_default_account (account_mgr); + if (default_modest_name) { + set_account_visible (self, default_modest_name); + } else if (first_modest_name) { set_account_visible (self, first_modest_name); - g_free (first_modest_name); } + g_free (first_modest_name); + g_free (default_modest_name); } } @@ -2131,9 +2362,15 @@ static void refresh_account (const gchar *account_name) { ModestWindow *win; - - win = MODEST_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ())); - + + /* win must already exists here, obviously */ + win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), + FALSE); + if (!win) { + g_warning ("%s: BUG: no main window!", __FUNCTION__); + return; + } + /* If account_name == NULL, we must update all (option All) */ if (!account_name) modest_ui_actions_do_send_receive_all (win); @@ -2167,9 +2404,7 @@ on_zoom_minus_plus_not_implemented (ModestWindow *window) } static gboolean -on_folder_view_focus_in (GtkWidget *widget, - GdkEventFocus *event, - gpointer userdata) +on_folder_view_focus_in (GtkWidget *widget, GdkEventFocus *event, gpointer userdata) { ModestMainWindow *main_window = NULL; @@ -2188,11 +2423,10 @@ on_header_view_focus_in (GtkWidget *widget, gpointer userdata) { ModestMainWindow *main_window = NULL; - ModestMainWindowPrivate *priv = NULL; g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (userdata), FALSE); + main_window = MODEST_MAIN_WINDOW (userdata); - priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window); /* Update toolbar dimming state */ modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); @@ -2201,10 +2435,10 @@ on_header_view_focus_in (GtkWidget *widget, } static void -modest_main_window_on_folder_selection_changed (ModestFolderView *folder_view, - TnyFolderStore *folder_store, - gboolean selected, - ModestMainWindow *main_window) +on_folder_selection_changed (ModestFolderView *folder_view, + TnyFolderStore *folder_store, + gboolean selected, + ModestMainWindow *main_window) { ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (main_window); GtkAction *action = NULL; @@ -2234,6 +2468,9 @@ modest_main_window_on_folder_selection_changed (ModestFolderView *folder_view, show_clipboard = show_delete = show_cancel_send = TRUE; show_reply = show_forward = FALSE; break; + case TNY_FOLDER_TYPE_INVALID: + g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + break; default: show_reply = show_forward = show_clipboard = show_delete = TRUE; show_cancel_send = FALSE; @@ -2253,19 +2490,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 @@ -2298,3 +2528,60 @@ 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); + + if (priv->updating_banner == NULL) { + + /* We're outside the main lock */ + gdk_threads_enter (); + priv->updating_banner = + modest_platform_animation_banner (GTK_WIDGET (user_data), NULL, + _CS ("ckdg_pb_updating")); + gdk_threads_leave (); + } + + /* 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; + } + } +}