X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-main-window.c;h=43b8a8406ba3d50c3f382698318fcc4957552fec;hp=33437ed1b9529d21b655a8d7f5ee7ba5fcc0c959;hb=6aa04a4745825df25bc83dcccc764acce2803f5f;hpb=b4a9749039155183fffb11fce77d06caf3238dce diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index 33437ed..43b8a84 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -31,6 +31,7 @@ #include #include #include +#include #include "modest-hildon-includes.h" #include "modest-defs.h" #include @@ -44,6 +45,7 @@ #include "modest-widget-memory.h" #include "modest-window-priv.h" #include "modest-main-window-ui.h" +#include "modest-main-window-ui-dimming.h" #include "modest-account-mgr.h" #include "modest-tny-account.h" #include "modest-conf.h" @@ -53,6 +55,8 @@ #include "modest-mail-operation.h" #include "modest-icon-names.h" #include "modest-progress-bar-widget.h" +#include "modest-text-utils.h" +#include "modest-ui-dimming-manager.h" #include "maemo/modest-osso-state-saving.h" #ifdef MODEST_HILDON_VERSION_0 @@ -61,6 +65,12 @@ #include #endif /*MODEST_HILDON_VERSION_0*/ +#define MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS "ModestMainWindowActionAdditions" + +#define XALIGN 0.5 +#define YALIGN 0.5 +#define XSPACE 1 +#define YSPACE 0 /* 'private'/'protected' functions */ static void modest_main_window_class_init (ModestMainWindowClass *klass); @@ -71,8 +81,9 @@ static gboolean modest_main_window_window_state_event (GtkWidget *widget, gpointer userdata); static void connect_signals (ModestMainWindow *self); -static void restore_sizes (ModestMainWindow *self); -static void save_sizes (ModestMainWindow *self); + +static void restore_settings (ModestMainWindow *self); +static void save_state (ModestWindow *self); static void modest_main_window_show_toolbar (ModestWindow *window, gboolean show_toolbar); @@ -86,7 +97,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, @@ -98,9 +109,22 @@ static void on_configuration_key_changed (ModestConf* conf, ModestConfEvent event, ModestMainWindow *self); -static void -set_toolbar_mode (ModestMainWindow *self, - ModestToolBarModes mode); +static void set_toolbar_mode (ModestMainWindow *self, + ModestToolBarModes mode); + +static gboolean set_toolbar_transfer_mode (ModestMainWindow *self); + +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); + + +static GtkWidget * create_empty_view (void); /* list my signals */ enum { @@ -116,6 +140,7 @@ struct _ModestMainWindowPrivate { GtkWidget *main_paned; GtkWidget *main_vbox; GtkWidget *contents_widget; + GtkWidget *empty_view; /* Progress observers */ GtkWidget *progress_bar; @@ -128,16 +153,27 @@ struct _ModestMainWindowPrivate { GtkWidget *refresh_toolitem; ModestToolBarModes current_toolbar_mode; + /* Merge ids used to add/remove accounts to the ViewMenu*/ + GByteArray *merge_ids; + /* On-demand widgets */ GtkWidget *accounts_popup; GtkWidget *details_widget; + /* Optimized view enabled */ + gboolean optimized_view; + + /* Optimized view enabled */ + gboolean send_receive_in_progress; ModestHeaderView *header_view; ModestFolderView *folder_view; 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, \ @@ -158,23 +194,37 @@ 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) }, - { "FolderViewCSMSearchMessages", NULL, N_("mcen_me_inbox_search"), NULL, NULL, NULL }, - { "FolderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, NULL }, + { "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, G_CALLBACK (modest_ui_actions_on_search_messages) }, + { "FolderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_help) }, }; +static const GtkActionEntry modest_header_view_action_entries [] = { + + /* Header View CSM actions */ + { "HeaderViewCSMOpen", NULL, N_("mcen_me_inbox_open"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_folder) }, + { "HeaderViewCSMReply", NULL, N_("mcen_me_inbox_reply"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_reply) }, + { "HeaderViewCSMReplyAll", NULL, N_("mcen_me_inbox_replytoall"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_reply_all) }, + { "HeaderViewCSMForward", NULL, N_("mcen_me_inbox_forward"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_forward) }, + { "HeaderViewCSMCut", NULL, N_("mcen_me_inbox_cut"), "X", NULL, G_CALLBACK (modest_ui_actions_on_cut) }, + { "HeaderViewCSMCopy", NULL, N_("mcen_me_inbox_copy"), "C", NULL, G_CALLBACK (modest_ui_actions_on_copy) }, + { "HeaderViewCSMPaste", NULL, N_("mcen_me_inbox_paste"), "V", NULL, G_CALLBACK (modest_ui_actions_on_paste) }, + { "HeaderViewCSMDelete", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete) }, + { "HeaderViewCSMCancelSending", NULL, N_("mcen_me_outbox_cancelsend"), NULL, NULL, NULL }, + { "HeaderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_help) }, +}; static const GtkToggleActionEntry modest_main_window_toggle_action_entries [] = { { "ToolbarToggleView", MODEST_STOCK_SPLIT_VIEW, N_("gqn_toolb_rss_fldonoff"), "t", NULL, G_CALLBACK (modest_ui_actions_toggle_folders_view), FALSE }, }; - /************************************************************************/ GType @@ -206,16 +256,15 @@ modest_main_window_class_init (ModestMainWindowClass *klass) { GObjectClass *gobject_class; gobject_class = (GObjectClass*) klass; - ModestWindowClass *modest_window_class; - - modest_window_class = (ModestWindowClass *) klass; + ModestWindowClass *modest_window_class = (ModestWindowClass *) klass; parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_main_window_finalize; - modest_window_class->show_toolbar_func = modest_main_window_show_toolbar; - g_type_class_add_private (gobject_class, sizeof(ModestMainWindowPrivate)); + + modest_window_class->show_toolbar_func = modest_main_window_show_toolbar; + modest_window_class->save_state_func = save_state; } static void @@ -233,6 +282,7 @@ modest_main_window_init (ModestMainWindow *obj) priv->contents_widget = NULL; priv->accounts_popup = NULL; priv->details_widget = NULL; + priv->empty_view = NULL; priv->progress_widgets = NULL; priv->progress_bar = NULL; @@ -240,6 +290,12 @@ modest_main_window_init (ModestMainWindow *obj) priv->style = MODEST_MAIN_WINDOW_STYLE_SPLIT; priv->contents_style = MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS; + + priv->merge_ids = NULL; + + priv->optimized_view = FALSE; + priv->send_receive_in_progress = FALSE; + priv->progress_bar_timeout = 0; } static void @@ -251,6 +307,13 @@ modest_main_window_finalize (GObject *obj) g_slist_free (priv->progress_widgets); + 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); } @@ -280,9 +343,8 @@ modest_main_window_get_child_widget (ModestMainWindow *self, } - static void -restore_sizes (ModestMainWindow *self) +restore_settings (ModestMainWindow *self) { ModestConf *conf; ModestMainWindowPrivate *priv; @@ -290,20 +352,27 @@ restore_sizes (ModestMainWindow *self) priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); conf = modest_runtime_get_conf (); - - modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned), - MODEST_CONF_MAIN_PANED_KEY); + + modest_widget_memory_restore (conf, G_OBJECT(self), + MODEST_CONF_MAIN_WINDOW_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); + modest_widget_memory_restore (conf, G_OBJECT(priv->folder_view), + MODEST_CONF_FOLDER_VIEW_KEY); + modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned), + MODEST_CONF_MAIN_PANED_KEY); + + /* 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)); } static void -save_sizes (ModestMainWindow *self) +save_state (ModestWindow *window) { ModestConf *conf; + ModestMainWindow* self = MODEST_MAIN_WINDOW(window); ModestMainWindowPrivate *priv; priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); @@ -315,6 +384,8 @@ save_sizes (ModestMainWindow *self) MODEST_CONF_MAIN_PANED_KEY); modest_widget_memory_save (conf, G_OBJECT(priv->header_view), MODEST_CONF_HEADER_VIEW_KEY); + modest_widget_memory_save (conf, G_OBJECT(priv->folder_view), + MODEST_CONF_FOLDER_VIEW_KEY); } static void @@ -332,23 +403,84 @@ wrap_in_scrolled_window (GtkWidget *win, GtkWidget *widget) static gboolean on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self) { - save_sizes (self); + modest_window_save_state (MODEST_WINDOW(self)); return FALSE; } 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) { - do_send_receive (MODEST_WINDOW (self)); + + TnyDevice *device = tny_account_store_get_device (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. */ + 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) { + printf ("debug: %s:\n Transport account for %s: %s\n", __FUNCTION__, account_name, + tny_account_get_id(TNY_ACCOUNT(account))); + modest_runtime_get_send_queue (account); + } + } + + iter = g_slist_next (iter); } + + g_slist_free (account_names); + + + modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self)); +} + +static void +_folder_view_csm_menu_activated (GtkWidget *widget, gpointer user_data) +{ + g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data)); + + /* Update dimmed */ + modest_window_check_dimming_rules_group (MODEST_WINDOW (user_data), "ModestMenuDimmingRules"); } +static void +_header_view_csm_menu_activated (GtkWidget *widget, gpointer user_data) +{ + g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data)); + /* Update visibility */ + + /* Update dimmed */ + modest_window_check_dimming_rules_group (MODEST_WINDOW (user_data), "ModestMenuDimmingRules"); +} static void connect_signals (ModestMainWindow *self) @@ -368,9 +500,12 @@ connect_signals (ModestMainWindow *self) g_signal_connect (G_OBJECT(priv->folder_view), "folder-display-name-changed", G_CALLBACK(modest_ui_actions_on_folder_display_name_changed), self); + /* Folder view CSM */ menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/FolderViewCSM"); gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->folder_view), menu, NULL, 0); - + g_signal_connect (G_OBJECT(priv->folder_view), "tap-and-hold", + G_CALLBACK(_folder_view_csm_menu_activated), + self); /* header view */ /* g_signal_connect (G_OBJECT(priv->header_view), "status_update", */ /* G_CALLBACK(modest_ui_actions_on_header_status_update), self); */ @@ -383,6 +518,13 @@ connect_signals (ModestMainWindow *self) g_signal_connect (G_OBJECT(priv->header_view), "key-press-event", G_CALLBACK(on_inner_widgets_key_pressed), 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); + g_signal_connect (G_OBJECT(priv->header_view), "tap-and-hold", + G_CALLBACK(_header_view_csm_menu_activated), + self); + /* window */ g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self); g_signal_connect (G_OBJECT (self), "window-state-event", @@ -408,18 +550,24 @@ connect_signals (ModestMainWindow *self) G_CALLBACK (on_account_update), self); + /* Account store */ + g_signal_connect (G_OBJECT (modest_runtime_get_account_store()), "password_requested", + 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) { - do_send_receive (MODEST_WINDOW(win)); + modest_ui_actions_on_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) @@ -444,12 +592,13 @@ static void on_hildon_program_is_topmost_notify(GObject *self, /* Allow hibernation if the program has gone to the background: */ /* However, prevent hibernation while the settings are being changed: */ - gboolean settings_dialog_is_open = FALSE; - - if (settings_dialog_is_open) + const gboolean hibernation_prevented = + modest_window_mgr_get_hibernation_is_prevented ( + modest_runtime_get_window_mgr ()); + + if (hibernation_prevented) hildon_program_set_can_hibernate (app, FALSE); else { - /* Allow hibernation, after saving the state: */ modest_osso_save_state(); hildon_program_set_can_hibernate (app, TRUE); @@ -463,25 +612,32 @@ static void on_hildon_program_is_topmost_notify(GObject *self, ModestWindow* modest_main_window_new (void) { - ModestMainWindow *self; - ModestMainWindowPrivate *priv; - ModestWindowPrivate *parent_priv; - GtkWidget *folder_win; - GtkActionGroup *action_group; + ModestMainWindow *self = NULL; + ModestMainWindowPrivate *priv = NULL; + ModestWindowPrivate *parent_priv = NULL; + GtkWidget *folder_win = NULL; + ModestDimmingRulesGroup *menu_rules_group = NULL; + ModestDimmingRulesGroup *toolbar_rules_group = NULL; + GtkActionGroup *action_group = NULL; GError *error = NULL; - TnyFolderStoreQuery *query; - GdkPixbuf *window_icon; - ModestConf *conf; - GtkAction *action; + TnyFolderStoreQuery *query = NULL; + GdkPixbuf *window_icon = NULL; + ModestConf *conf = NULL; + GtkAction *action = NULL; self = MODEST_MAIN_WINDOW(g_object_new(MODEST_TYPE_MAIN_WINDOW, NULL)); priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); parent_priv = MODEST_WINDOW_GET_PRIVATE(self); parent_priv->ui_manager = gtk_ui_manager_new(); + parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new(); + action_group = gtk_action_group_new ("ModestMainWindowActions"); gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); + menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules"); + toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules"); + /* Add common actions */ gtk_action_group_add_actions (action_group, modest_action_entries, @@ -493,6 +649,11 @@ modest_main_window_new (void) G_N_ELEMENTS (modest_folder_view_action_entries), self); + gtk_action_group_add_actions (action_group, + modest_header_view_action_entries, + G_N_ELEMENTS (modest_header_view_action_entries), + self); + gtk_action_group_add_toggle_actions (action_group, modest_toggle_action_entries, G_N_ELEMENTS (modest_toggle_action_entries), @@ -515,6 +676,22 @@ modest_main_window_new (void) error = NULL; } + /* Add common dimming rules */ + 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_dimming_rules_group_add_rules (toolbar_rules_group, + modest_main_window_toolbar_dimming_entries, + G_N_ELEMENTS (modest_main_window_toolbar_dimming_entries), + self); + + /* Insert dimming rules group for this window */ + modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group); + modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group); + g_object_unref (menu_rules_group); + g_object_unref (toolbar_rules_group); + /* Add accelerators */ gtk_window_add_accel_group (GTK_WINDOW (self), gtk_ui_manager_get_accel_group (parent_priv->ui_manager)); @@ -532,6 +709,9 @@ modest_main_window_new (void) modest_conf_get_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, NULL)); hildon_window_set_menu (HILDON_WINDOW (self), GTK_MENU (parent_priv->menubar)); + /* Get device name */ + modest_maemo_utils_get_device_name (); + /* folder view */ query = tny_folder_store_query_new (); tny_folder_store_query_add_item (query, NULL, @@ -543,16 +723,16 @@ modest_main_window_new (void) modest_folder_view_set_style (priv->folder_view, MODEST_FOLDER_VIEW_STYLE_SHOW_ONE); - /* Get device name */ - modest_maemo_utils_get_device_name (); - /* header view */ priv->header_view = MODEST_HEADER_VIEW(modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_DETAILS)); if (!priv->header_view) g_printerr ("modest: cannot instantiate header view\n"); modest_header_view_set_style (priv->header_view, MODEST_HEADER_VIEW_STYLE_TWOLINES); - + + /* Empty view */ + priv->empty_view = create_empty_view (); + /* Create scrolled windows */ folder_win = gtk_scrolled_window_new (NULL, NULL); priv->contents_widget = gtk_scrolled_window_new (NULL, NULL); @@ -568,9 +748,8 @@ modest_main_window_new (void) /* paned */ priv->main_paned = gtk_hpaned_new (); - gtk_paned_add1 (GTK_PANED(priv->main_paned), folder_win); - gtk_paned_add2 (GTK_PANED(priv->main_paned), priv->contents_widget); - gtk_widget_show (GTK_WIDGET(priv->header_view)); + gtk_paned_pack1 (GTK_PANED(priv->main_paned), folder_win, TRUE, TRUE); + gtk_paned_pack2 (GTK_PANED(priv->main_paned), priv->contents_widget, TRUE, TRUE); gtk_tree_view_columns_autosize (GTK_TREE_VIEW(priv->header_view)); /* putting it all together... */ @@ -578,7 +757,6 @@ modest_main_window_new (void) gtk_box_pack_start (GTK_BOX(priv->main_vbox), priv->main_paned, TRUE, TRUE,0); gtk_container_add (GTK_CONTAINER(self), priv->main_vbox); - restore_sizes (MODEST_MAIN_WINDOW(self)); /* Set window icon */ window_icon = modest_platform_get_icon (MODEST_APP_ICON); @@ -591,10 +769,15 @@ 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)); @@ -615,6 +798,9 @@ modest_main_window_new (void) * hibernation: */ modest_osso_load_state(); + /* Restore window & widget settings */ + restore_settings (MODEST_MAIN_WINDOW(self)); + return MODEST_WINDOW(self); } @@ -662,7 +848,6 @@ modest_main_window_set_style (ModestMainWindow *self, action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarToggleView"); priv->style = style; - switch (style) { case MODEST_MAIN_WINDOW_STYLE_SIMPLE: /* Remove main paned */ @@ -763,10 +948,14 @@ modest_main_window_show_toolbar (ModestWindow *self, GtkWidget *placeholder = NULL; gint insert_index; - parent_priv = MODEST_WINDOW_GET_PRIVATE(self); + g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + parent_priv = MODEST_WINDOW_GET_PRIVATE(self); + + /* Set optimized view status */ + priv->optimized_view = !show_toolbar; - if (!parent_priv->toolbar && show_toolbar) { + if (!parent_priv->toolbar) { parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar"); @@ -778,8 +967,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); @@ -815,129 +1004,223 @@ modest_main_window_show_toolbar (ModestWindow *self, NULL, self); } - /* TODO: Why is this sometimes NULL? murrayc */ - if (parent_priv->toolbar) { - if (show_toolbar) { - /* 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); + if (show_toolbar) { + /* 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 + gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar)); - gtk_widget_show (GTK_WIDGET (parent_priv->toolbar)); - set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL); - } else - gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar)); - } } -/* - * TODO: modify the menu dynamically. Add handlers to each item of the - * menu when created - */ +static gint +compare_display_names (ModestAccountData *a, + ModestAccountData *b) +{ + return strcmp (a->display_name, b->display_name); +} + static void on_account_update (TnyAccountStore *account_store, - gchar *accout_name, + const gchar *account_name, gpointer user_data) { + GSList *account_names, *iter, *accounts; ModestMainWindow *self; ModestMainWindowPrivate *priv; ModestWindowPrivate *parent_priv; - TnyList *account_list; - GtkWidget *item, *send_receive_button; - TnyIterator *iter; ModestAccountMgr *mgr; + gint i, num_accounts; + GtkActionGroup *action_group; + GList *groups; gchar *default_account; - + GtkWidget *send_receive_button, *item; + self = MODEST_MAIN_WINDOW (user_data); priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); parent_priv = MODEST_WINDOW_GET_PRIVATE (self); - /* If there is no toolbar then exit */ - if (!parent_priv->toolbar) - return; + /* Get enabled account IDs */ + mgr = modest_runtime_get_account_mgr (); + account_names = modest_account_mgr_account_names (mgr, TRUE); + iter = account_names; + accounts = NULL; - if (priv->accounts_popup && gtk_menu_get_attach_widget (GTK_MENU (priv->accounts_popup)) ) { - /* gtk_menu_detach will also unreference the popup, - * so we can forget about this instance, and create a new one later: - */ - gtk_menu_detach (GTK_MENU (priv->accounts_popup)); - priv->accounts_popup = NULL; - } + while (iter) { + ModestAccountData *account_data = + modest_account_mgr_get_account_data (mgr, (gchar*) iter->data); + accounts = g_slist_prepend (accounts, account_data); - /* Get accounts */ - account_list = tny_simple_list_new (); - tny_account_store_get_accounts (account_store, - account_list, - TNY_ACCOUNT_STORE_STORE_ACCOUNTS); + iter = iter->next; + } + g_slist_free (account_names); + + /* Order the list of accounts by its display name */ + accounts = g_slist_sort (accounts, (GCompareFunc) compare_display_names); + num_accounts = g_slist_length (accounts); + + /* Delete old send&receive popup items. We can not just do a + 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); + + /* Delete old entries in the View menu. Do not free groups, it + belongs to Gtk+ */ + groups = gtk_ui_manager_get_action_groups (parent_priv->ui_manager); + while (groups) { + if (!strcmp (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS, + gtk_action_group_get_name (GTK_ACTION_GROUP (groups->data)))) { + gtk_ui_manager_remove_action_group (parent_priv->ui_manager, + GTK_ACTION_GROUP (groups->data)); + groups = NULL; + /* Remove uis */ + if (priv->merge_ids) { + for (i = 0; i < priv->merge_ids->len; i++) + gtk_ui_manager_remove_ui (parent_priv->ui_manager, priv->merge_ids->data[i]); + g_byte_array_free (priv->merge_ids, TRUE); + } + /* We need to call this in order to ensure + that the new actions are added in the right + order (alphabetical */ + gtk_ui_manager_ensure_update (parent_priv->ui_manager); + } else + groups = g_list_next (groups); + } + priv->merge_ids = g_byte_array_sized_new (num_accounts); - /* If there is only one account do not show any menu */ - if (tny_list_get_length (account_list) <= 1) - goto free; - /* Get send receive button */ - send_receive_button = gtk_ui_manager_get_widget (parent_priv->ui_manager, + send_receive_button = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSendReceive"); /* Create the menu */ - priv->accounts_popup = gtk_menu_new (); - item = gtk_menu_item_new_with_label (_("mcen_me_toolbar_sendreceive_all")); - gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item)); - item = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item)); + if (num_accounts > 1) { + if (!priv->accounts_popup) + priv->accounts_popup = gtk_menu_new (); + item = gtk_menu_item_new_with_label (_("mcen_me_toolbar_sendreceive_all")); + gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item)); + g_signal_connect (G_OBJECT (item), + "activate", + G_CALLBACK (on_send_receive_csm_activated), + NULL); + item = gtk_separator_menu_item_new (); + gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item)); + } - iter = tny_list_create_iterator (account_list); - mgr = modest_runtime_get_account_mgr (); + /* Create a new action group */ default_account = modest_account_mgr_get_default_account (mgr); - - do { - TnyAccount *acc = NULL; - const gchar *acc_name = NULL; - - /* Create tool item */ - acc = TNY_ACCOUNT (tny_iterator_get_current (iter)); - if (acc) - acc_name = tny_account_get_name (acc); - - /* Create display name */ + action_group = gtk_action_group_new (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS); + for (i = 0; i < num_accounts; i++) { gchar *display_name = NULL; - if (acc_name) { - if (default_account && !(strcmp (default_account, acc_name) == 0)) - display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"), acc_name); - else - display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_mailbox_n"), acc_name); + + ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i); + + /* Create display name. The default account is shown differently */ + 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 - { - /* TODO: This probably should never happen: */ - display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"), ""); + else { + display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_mailbox_n"), + account_data->display_name); } - - item = gtk_menu_item_new_with_label (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 */ + 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); + } - /* Free */ + /* Frees */ g_free (display_name); - g_object_unref (acc); - - /* Append item */ - gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item)); - - /* Go to next */ - tny_iterator_next (iter); - - } while (!tny_iterator_is_done (iter)); - - g_object_unref (iter); - - /* Mandatory in order to view the menu contents */ - gtk_widget_show_all (priv->accounts_popup); + modest_account_mgr_free_account_data (mgr, account_data); + } + gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 1); - /* Setup tap_and_hold */ - gtk_widget_tap_and_hold_setup (send_receive_button, priv->accounts_popup, NULL, 0); + if (priv->accounts_popup) { + /* Mandatory in order to view the menu contents */ + gtk_widget_show_all (priv->accounts_popup); - free: + /* Setup tap_and_hold just if was not done before*/ + if (!gtk_menu_get_attach_widget (GTK_MENU (priv->accounts_popup))) + gtk_widget_tap_and_hold_setup (send_receive_button, priv->accounts_popup, NULL, 0); + } - /* Free */ - g_object_unref (account_list); + /* Frees */ + g_slist_free (accounts); + g_free (default_account); } /* @@ -982,6 +1265,20 @@ set_alignment (GtkWidget *widget, } static GtkWidget * +create_empty_view (void) +{ + GtkLabel *label = NULL; + GtkWidget *align = NULL; + + align = gtk_alignment_new(XALIGN, YALIGN, XSPACE, YSPACE); + label = GTK_LABEL(gtk_label_new (_("mcen_ia_nomessages"))); + gtk_label_set_justify (label, GTK_JUSTIFY_CENTER); + gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET(label)); + + return GTK_WIDGET(align); +} + +static GtkWidget * create_details_widget (TnyAccount *account) { GtkWidget *vbox; @@ -989,63 +1286,85 @@ create_details_widget (TnyAccount *account) 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_account_is_virtual_local_folders (account)) { + /* 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", - _("mcen_fi_localroot_description"), + label = g_strdup_printf (_("mcen_fi_localroot_description"), device_name); 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); + if(!strcmp (tny_account_get_id (account), MODEST_MMC_ACCOUNT_ID)) { + gtk_box_pack_start (GTK_BOX (vbox), + gtk_label_new (tny_account_get_name (account)), + FALSE, FALSE, 0); + } else { + /* Other accounts, such as IMAP and POP: */ + + GString *proto; + gchar *tmp; + + /* Put proto in uppercase */ + proto = g_string_new (tny_account_get_proto (account)); + proto = g_string_ascii_up (proto); + + /* note: mcen_fi_localroot_description is something like "%s account" + * however, we should display "%s account: %s"... therefore, ugly tmp */ + tmp = g_strdup_printf (_("mcen_fi_remoteroot_account"),proto->str); + label = g_strdup_printf ("%s: %s", tmp,tny_account_get_name (account)); + g_free (tmp); + + gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0); + g_string_free (proto, TRUE); + g_free (label); + } } /* Message count */ + TnyFolderStore *folder_store = TNY_FOLDER_STORE (account); 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_account_is_virtual_local_folders (account)) { /* FIXME: format size */ label = g_strdup_printf ("%s: %d", _("mcen_fi_rootfolder_size"), - modest_tny_account_get_local_size (account)); + 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 (!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"); + } else if (TNY_IS_ACCOUNT(folder_store)) { + TnyAccount *account = TNY_ACCOUNT(folder_store); + + 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); } @@ -1056,12 +1375,43 @@ create_details_widget (TnyAccount *account) } void +modest_main_window_notify_send_receive_initied (ModestMainWindow *self) +{ + GtkAction *action = NULL; + GtkWidget *widget = NULL; + + g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); + + action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu"); + gtk_action_set_sensitive (action, FALSE); + action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveCancelSendingMenu"); + gtk_action_set_sensitive (action, FALSE); + widget = modest_window_get_action_widget (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions"); + gtk_widget_set_sensitive (widget, FALSE); +} + +void +modest_main_window_notify_send_receive_completed (ModestMainWindow *self) +{ + GtkAction *action = NULL; + GtkWidget *widget = NULL; + + g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); + + action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu"); + gtk_action_set_sensitive (action, TRUE); + action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveCancelSendingMenu"); + gtk_action_set_sensitive (action, TRUE); + widget = modest_window_get_action_widget (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions"); + gtk_widget_set_sensitive (widget, TRUE); +} + + +void 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)); @@ -1071,15 +1421,22 @@ modest_main_window_set_contents_style (ModestMainWindow *self, set if there are details, because it could happen when we're selecting different accounts consecutively */ if ((priv->contents_style == style) && - (priv->contents_style == MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS)) + (priv->contents_style != MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS)) return; /* 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_HEADERS) + g_object_ref (content); + else if (priv->contents_style == MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY) { + g_object_ref (priv->empty_view); + gtk_container_remove (GTK_CONTAINER (content), priv->empty_view); + } + + gtk_container_remove (GTK_CONTAINER (priv->contents_widget), content); + } priv->contents_style = style; @@ -1088,12 +1445,21 @@ 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); + if (TNY_IS_ACCOUNT (selected_folderstore)) { + priv->details_widget = create_details_widget ( + TNY_ACCOUNT (selected_folderstore)); - wrap_in_scrolled_window (priv->contents_widget, + wrap_in_scrolled_window (priv->contents_widget, priv->details_widget); + } + break; + } + case MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY: + wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->empty_view)); break; default: g_return_if_reached (); @@ -1147,18 +1513,39 @@ 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) { - ModestWindowPrivate *parent_priv; - ModestMainWindowPrivate *priv; - GtkAction *sort_action, *refresh_action, *cancel_action; - + ModestWindowPrivate *parent_priv = NULL; + ModestMainWindowPrivate *priv = NULL; + GtkAction *sort_action = NULL, *refresh_action = NULL, *cancel_action = NULL; + g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); parent_priv = MODEST_WINDOW_GET_PRIVATE(self); priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + + g_return_if_fail (GTK_IS_TOOLBAR(parent_priv->toolbar)); sort_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSort"); refresh_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSendReceive"); @@ -1183,6 +1570,10 @@ set_toolbar_mode (ModestMainWindow *self, if (cancel_action) gtk_action_set_visible (cancel_action, FALSE); + + /* Hide toolbar if optimized view is enabled */ + if (priv->optimized_view) + gtk_widget_hide (GTK_WIDGET(parent_priv->toolbar)); break; case TOOLBAR_MODE_TRANSFER: if (sort_action) @@ -1197,12 +1588,14 @@ set_toolbar_mode (ModestMainWindow *self, } if (priv->progress_bar) gtk_widget_show (priv->progress_bar); + + /* Show toolbar if it's hiden (optimized view ) */ + if (priv->optimized_view) + gtk_widget_show (GTK_WIDGET (parent_priv->toolbar)); break; default: g_return_if_reached (); } - - gtk_widget_show_all (GTK_WIDGET (self)); } static void @@ -1251,19 +1644,20 @@ on_queue_changed (ModestMailOperationQueue *queue, ModestMainWindow *self) { ModestMainWindowPrivate *priv; - ModestMailOperationId op_id; + ModestMailOperationTypeOperation op_type; 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); /* Get toolbar mode from operation id*/ - op_id = modest_mail_operation_get_id (mail_op); - switch (op_id) { - case MODEST_MAIL_OPERATION_ID_SEND: - case MODEST_MAIL_OPERATION_ID_RECEIVE: + op_type = modest_mail_operation_get_type_operation (mail_op); + switch (op_type) { + case MODEST_MAIL_OPERATION_TYPE_SEND: + case MODEST_MAIL_OPERATION_TYPE_RECEIVE: mode = TOOLBAR_MODE_TRANSFER; if (priv->current_toolbar_mode == TOOLBAR_MODE_NORMAL) mode_changed = TRUE; @@ -1278,9 +1672,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); @@ -1289,7 +1683,8 @@ on_queue_changed (ModestMailOperationQueue *queue, } break; case MODEST_MAIL_OPERATION_QUEUE_OPERATION_REMOVED: - if (mode == TOOLBAR_MODE_TRANSFER) { + /* Change toolbar mode */ + if (mode == TOOLBAR_MODE_TRANSFER) { while (tmp) { modest_progress_object_remove_operation (MODEST_PROGRESS_OBJECT (tmp->data), mail_op); @@ -1297,9 +1692,70 @@ on_queue_changed (ModestMailOperationQueue *queue, } /* 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 +on_show_account_action_activated (GtkAction *action, + gpointer user_data) +{ + ModestAccountData *acc_data; + ModestMainWindow *self; + ModestMainWindowPrivate *priv; + ModestAccountMgr *mgr; + const gchar *acc_name; + + self = MODEST_MAIN_WINDOW (user_data); + priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + + /* Get account data */ + acc_name = gtk_action_get_name (action); + mgr = modest_runtime_get_account_mgr (); + acc_data = modest_account_mgr_get_account_data (mgr, acc_name); + + /* Set the new visible & active account */ + 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 */ + modest_account_mgr_free_account_data (mgr, acc_data); +} + +static void +refresh_account (const gchar *account_name) +{ + ModestWindow *win; + + win = MODEST_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ())); + + /* 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 (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); }