X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-main-window.c;h=9bb6f3ff92b063421ace74f8cbdf52ed0d10ef33;hp=845aaeefcff032506ea433644b616e80868a1dbf;hb=362784ce756b3f0e31cd451d9ac5e69b909d4053;hpb=364bebc9387ddeca8a598a9085f1bb41d4b74222 diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index 845aaee..9bb6f3f 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -31,11 +31,14 @@ #include #include #include +#include +#include #include +#include #include "modest-hildon-includes.h" #include "modest-defs.h" #include - +#include "widgets/modest-header-view-priv.h" #include "widgets/modest-main-window.h" #include "widgets/modest-msg-edit-window.h" #include "widgets/modest-account-view-window.h" @@ -48,6 +51,7 @@ #include "modest-main-window-ui-dimming.h" #include "modest-account-mgr.h" #include "modest-tny-account.h" +#include "modest-tny-folder.h" #include "modest-conf.h" #include #include "modest-tny-platform-factory.h" @@ -58,6 +62,7 @@ #include "modest-text-utils.h" #include "modest-ui-dimming-manager.h" #include "maemo/modest-osso-state-saving.h" +#include "modest-text-utils.h" #ifdef MODEST_HAVE_HILDON0_WIDGETS #include @@ -73,16 +78,21 @@ #define YSPACE 0 /* 'private'/'protected' functions */ -static void modest_main_window_class_init (ModestMainWindowClass *klass); -static void modest_main_window_init (ModestMainWindow *obj); -static void modest_main_window_finalize (GObject *obj); +static void modest_main_window_class_init (ModestMainWindowClass *klass); +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); static void connect_signals (ModestMainWindow *self); -static void restore_settings (ModestMainWindow *self, gboolean do_folder_view_too); +static void modest_main_window_disconnect_signals (ModestWindow *self); + +static void restore_settings (ModestMainWindow *self, + gboolean do_folder_view_too); + static void save_state (ModestWindow *self); static void modest_main_window_show_toolbar (ModestWindow *window, @@ -91,14 +101,14 @@ static void modest_main_window_show_toolbar (ModestWindow *window, static void cancel_progressbar (GtkToolButton *toolbutton, ModestMainWindow *self); -static void on_queue_changed (ModestMailOperationQueue *queue, - ModestMailOperation *mail_op, - ModestMailOperationQueueNotification type, - ModestMainWindow *self); +static void on_queue_changed (ModestMailOperationQueue *queue, + ModestMailOperation *mail_op, + ModestMailOperationQueueNotification type, + ModestMainWindow *self); static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window); -static void on_account_update (TnyAccountStore *account_store, +static void account_number_changed (TnyAccountStore *account_store, const gchar *account_name, gpointer user_data); @@ -108,7 +118,8 @@ static gboolean on_inner_widgets_key_pressed (GtkWidget *widget, static void on_configuration_key_changed (ModestConf* conf, const gchar *key, - ModestConfEvent event, + ModestConfEvent event, + ModestConfNotificationId id, ModestMainWindow *self); static void set_toolbar_mode (ModestMainWindow *self, @@ -137,6 +148,19 @@ modest_main_window_cleanup_queue_error_signals (ModestMainWindow *self); static GtkWidget * create_empty_view (void); +static gboolean +on_folder_view_focus_in (GtkWidget *widget, + GdkEventFocus *event, + gpointer userdata); +static gboolean +on_header_view_focus_in (GtkWidget *widget, + GdkEventFocus *event, + gpointer userdata); +static void +modest_main_window_on_folder_selection_changed (ModestFolderView *folder_view, + TnyFolderStore *folder_store, + gboolean selected, + ModestMainWindow *main_window); /* list my signals */ enum { @@ -154,8 +178,8 @@ struct _ModestMainWindowPrivate { GtkWidget *empty_view; /* Progress observers */ - GtkWidget *progress_bar; - GSList *progress_widgets; + GtkWidget *progress_bar; + GSList *progress_widgets; /* Tollbar items */ GtkWidget *progress_toolitem; @@ -188,6 +212,8 @@ struct _ModestMainWindowPrivate { /* Signal handler UIDs */ gint queue_changed_handler_uid; GList *queue_err_signals; + + ModestConfNotificationId notification_id; }; #define MODEST_MAIN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_MAIN_WINDOW, \ @@ -230,13 +256,13 @@ static const GtkActionEntry modest_header_view_action_entries [] = { { "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 }, + { "HeaderViewCSMDelete", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_message) }, + { "HeaderViewCSMCancelSending", NULL, N_("mcen_me_outbox_cancelsend"), NULL, NULL, G_CALLBACK (modest_ui_actions_cancel_send) }, { "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 }, + { "ToggleFolders", MODEST_STOCK_SPLIT_VIEW, N_("mcen_me_inbox_hidefolders"), "t", NULL, G_CALLBACK (modest_ui_actions_toggle_folders_view), TRUE }, }; /************************************************************************/ @@ -281,6 +307,7 @@ modest_main_window_class_init (ModestMainWindowClass *klass) modest_window_class->save_state_func = save_state; modest_window_class->zoom_minus_func = on_zoom_minus_plus_not_implemented; modest_window_class->zoom_plus_func = on_zoom_minus_plus_not_implemented; + modest_window_class->disconnect_signals_func = modest_main_window_disconnect_signals; } static void @@ -319,6 +346,10 @@ modest_main_window_finalize (GObject *obj) priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj); + /* 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_cleanup_queue_error_signals ((ModestMainWindow *) obj); g_slist_free (priv->progress_widgets); @@ -330,10 +361,11 @@ modest_main_window_finalize (GObject *obj) priv->progress_bar_timeout = 0; } - /* Disconnect signal handlers */ - if (priv->queue_changed_handler_uid) - g_signal_handler_disconnect (modest_runtime_get_mail_operation_queue (), - priv->queue_changed_handler_uid); + if (priv->notification_id) { + modest_conf_forget_namespace (modest_runtime_get_conf (), + MODEST_CONF_NAMESPACE, + priv->notification_id); + } G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -367,6 +399,8 @@ modest_main_window_get_child_widget (ModestMainWindow *self, static void restore_settings (ModestMainWindow *self, gboolean do_folder_view_too) { + printf ("DEBUGDEBUG: %s\n", __FUNCTION__); + ModestConf *conf; ModestMainWindowPrivate *priv; @@ -425,62 +459,78 @@ wrap_in_scrolled_window (GtkWidget *win, GtkWidget *widget) } -static gboolean -on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self) -{ - modest_window_save_state (MODEST_WINDOW(self)); - return FALSE; -} +/* static gboolean */ +/* on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self) */ +/* { */ +/* modest_window_save_state (MODEST_WINDOW(self)); */ +/* return FALSE; */ +/* } */ -typedef struct -{ - ModestMainWindow *self; - TnySendQueue *queue; - TnyHeader *header; -} OnResponseInfo; - -static void -on_response (GtkDialog *dialog, gint arg1, gpointer user_data) -{ - OnResponseInfo *info = (OnResponseInfo *) user_data; - ModestMainWindow *self = info->self; - TnyHeader *header = info->header; - TnySendQueue *queue = info->queue; - - if (arg1 == GTK_RESPONSE_YES) { - TnyFolder *outbox = tny_send_queue_get_outbox (queue); - tny_folder_remove_msg (outbox, header, NULL); - tny_folder_sync (outbox, TRUE, NULL); - g_object_unref (outbox); - } +/* static void */ +/* on_sendqueue_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, ModestMainWindow *user_data) */ +/* { */ +/* if (err) { */ +/* printf ("DEBUG: %s: err->code=%d, err->message=%s\n", __FUNCTION__, err->code, err->message); */ - g_object_unref (queue); - g_object_unref (header); - g_object_unref (self); +/* if (err->code == TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL) */ +/* /\* Don't show waste the user's time by showing him a dialog telling him */ +/* * that he has just cancelled something: *\/ */ +/* return; */ +/* } */ - gtk_widget_destroy (GTK_WIDGET (dialog)); - g_slice_free (OnResponseInfo, info); -} - - -static void -on_sendqueue_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, ModestMainWindow *user_data) -{ - if (header) { - gchar *str = g_strdup_printf ("%s. Do you want to remove the message (%s)?", - err->message, tny_header_get_subject (header)); - OnResponseInfo *info = g_slice_new (OnResponseInfo); - GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (user_data), 0, - GTK_MESSAGE_ERROR, GTK_BUTTONS_YES_NO, str); - g_free (str); - info->queue = g_object_ref (self); - info->self = g_object_ref (user_data); - info->header = g_object_ref (header); - g_signal_connect (G_OBJECT (dialog), "response", - G_CALLBACK (on_response), info); - gtk_widget_show_all (dialog); - } -} +/* /\* Get the server name: *\/ */ +/* const gchar* server_name = NULL; */ + +/* TnyCamelTransportAccount* server_account = tny_camel_send_queue_get_transport_account ( */ +/* TNY_CAMEL_SEND_QUEUE (self)); */ +/* if (server_account) { */ +/* server_name = tny_account_get_hostname (TNY_ACCOUNT (server_account)); */ + +/* g_object_unref (server_account); */ +/* server_account = NULL; */ +/* } */ + +/* if (!server_name) */ +/* server_name = _("Unknown Server"); */ + +/* /\* Show the appropriate message text for the GError: *\/ */ +/* gchar *message = NULL; */ +/* if (err) { */ +/* switch (err->code) { */ +/* case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_HOST_LOOKUP_FAILED: */ +/* message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); */ +/* break; */ +/* case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_SERVICE_UNAVAILABLE: */ +/* message = g_strdup_printf (_("emev_ib_ui_smtp_server_invalid"), server_name); */ +/* break; */ +/* case TNY_TRANSPORT_ACCOUNT_ERROR_SEND_AUTHENTICATION_NOT_SUPPORTED: */ +/* /\* TODO: This logical ID seems more suitable for a wrong username or password than for a */ +/* * wrong authentication method. The user is unlikely to guess at the real cause. */ +/* *\/ */ +/* message = g_strdup_printf (_("eemev_ni_ui_smtp_authentication_fail_error"), server_name); */ +/* break; */ +/* case TNY_TRANSPORT_ACCOUNT_ERROR_SEND: */ +/* /\* TODO: Tinymail is still sending this sometimes when it should */ +/* * send TNY_ACCOUNT_ERROR_TRY_CONNECT_USER_CANCEL. *\/ */ +/* default: */ +/* message = g_strdup (_("emev_ib_ui_smtp_send_error")); */ +/* break; */ +/* } */ +/* } else { */ +/* message = g_strdup (_("emev_ib_ui_smtp_send_error")); */ +/* } */ + +/* modest_maemo_show_information_note_and_forget (GTK_WINDOW (user_data), message); */ +/* g_free (message); */ + +/* /\* TODO: Offer to remove the message, to avoid messages in future? *\/ */ +/* /\* */ +/* TnyFolder *outbox = tny_send_queue_get_outbox (queue); */ +/* tny_folder_remove_msg (outbox, header, NULL); */ +/* tny_folder_sync (outbox, TRUE, NULL); */ +/* g_object_unref (outbox); */ +/* *\/ */ +/* } */ typedef struct { TnySendQueue *queue; @@ -503,71 +553,71 @@ modest_main_window_cleanup_queue_error_signals (ModestMainWindow *self) priv->queue_err_signals = NULL; } -static void -on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow *self) -{ - ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); +/* static void */ +/* on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow *self) */ +/* { */ +/* ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); */ - /* When going online, do the equivalent of pressing the send/receive button, - * as per the specification: - * (without the check for >0 accounts, though that is not specified): */ +/* /\* When going online, do the equivalent of pressing the send/receive button, */ +/* * as per the specification: */ +/* * (without the check for >0 accounts, though that is not specified): *\/ */ - TnyDevice *device = tny_account_store_get_device (store); +/* TnyDevice *device = tny_account_store_get_device (store); */ - /* modest_folder_view_update_model (MODEST_FOLDER_VIEW (priv->folder_view), store); */ +/* /\* modest_folder_view_update_model (MODEST_FOLDER_VIEW (priv->folder_view), store); *\/ */ - /* Check that we are really online. - * This signal should not be emitted when we are not connected, - * but it seems to happen sometimes: */ - if (!tny_device_is_online (device)) - return; +/* /\* 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); +/* 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 (); +/* /\* Stop the existing send queues: *\/ */ +/* modest_runtime_remove_all_send_queues (); */ - /* Create the send queues again, using the appropriate transport accounts - * for this new connection. - * This could be the first time that they are created if this is the first - * connection. */ - /* TODO: Does this really destroy the TnySendQueues and their threads - * We do not want 2 TnySendQueues to exist with the same underlying - * outbox directory. */ - - modest_main_window_cleanup_queue_error_signals (self); - - GSList *account_names = modest_account_mgr_account_names ( - modest_runtime_get_account_mgr(), - TRUE /* enabled accounts only */); - GSList *iter = account_names; - while (iter) { - const gchar *account_name = (const gchar*)(iter->data); - if (account_name) { - TnyTransportAccount *account = TNY_TRANSPORT_ACCOUNT ( - modest_tny_account_store_get_transport_account_for_open_connection - (modest_runtime_get_account_store(), account_name)); - if (account) { - /* Q: Is this the first location where the send-queues are requested? */ - QueueErrorSignal *esignal = g_slice_new (QueueErrorSignal); - printf ("debug: %s:\n Transport account for %s: %s\n", __FUNCTION__, account_name, - tny_account_get_id(TNY_ACCOUNT(account))); - esignal->queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (account)); - esignal->signal = g_signal_connect (G_OBJECT (esignal->queue), "error-happened", - G_CALLBACK (on_sendqueue_error_happened), self); - priv->queue_err_signals = g_list_prepend (priv->queue_err_signals, esignal); - } - } +/* /\* Create the send queues again, using the appropriate transport accounts */ +/* * for this new connection. */ +/* * This could be the first time that they are created if this is the first */ +/* * connection. *\/ */ +/* /\* TODO: Does this really destroy the TnySendQueues and their threads */ +/* * We do not want 2 TnySendQueues to exist with the same underlying */ +/* * outbox directory. *\/ */ + +/* modest_main_window_cleanup_queue_error_signals (self); */ + +/* GSList *account_names = modest_account_mgr_account_names ( */ +/* modest_runtime_get_account_mgr(), */ +/* TRUE /\* enabled accounts only *\/); */ +/* GSList *iter = account_names; */ +/* while (iter) { */ +/* const gchar *account_name = (const gchar*)(iter->data); */ +/* if (account_name) { */ +/* TnyTransportAccount *account = TNY_TRANSPORT_ACCOUNT ( */ +/* modest_tny_account_store_get_transport_account_for_open_connection */ +/* (modest_runtime_get_account_store(), account_name)); */ +/* if (account) { */ +/* /\* Q: Is this the first location where the send-queues are requested? *\/ */ +/* QueueErrorSignal *esignal = g_slice_new (QueueErrorSignal); */ +/* printf ("debug: %s:\n Transport account for %s: %s\n", __FUNCTION__, account_name, */ +/* tny_account_get_id(TNY_ACCOUNT(account))); */ +/* esignal->queue = TNY_SEND_QUEUE (modest_runtime_get_send_queue (account)); */ +/* esignal->signal = g_signal_connect (G_OBJECT (esignal->queue), "error-happened", */ +/* G_CALLBACK (on_sendqueue_error_happened), self); */ +/* priv->queue_err_signals = g_list_prepend (priv->queue_err_signals, esignal); */ +/* } */ +/* } */ - iter = g_slist_next (iter); - } +/* iter = g_slist_next (iter); */ +/* } */ - modest_account_mgr_free_account_names (account_names); - account_names = NULL; +/* modest_account_mgr_free_account_names (account_names); */ +/* account_names = NULL; */ - modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self)); -} +/* modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self)); */ +/* } */ static void _folder_view_csm_menu_activated (GtkWidget *widget, gpointer user_data) @@ -590,6 +640,20 @@ _header_view_csm_menu_activated (GtkWidget *widget, gpointer user_data) } static void +modest_main_window_disconnect_signals (ModestWindow *self) +{ + ModestMainWindowPrivate *priv; + + priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + + /* Disconnect signal handlers */ + if (g_signal_handler_is_connected (modest_runtime_get_mail_operation_queue (), + priv->queue_changed_handler_uid)) + g_signal_handler_disconnect (modest_runtime_get_mail_operation_queue (), + priv->queue_changed_handler_uid); +} + +static void connect_signals (ModestMainWindow *self) { ModestWindowPrivate *parent_priv; @@ -603,9 +667,11 @@ connect_signals (ModestMainWindow *self) g_signal_connect (G_OBJECT(priv->folder_view), "key-press-event", G_CALLBACK(on_inner_widgets_key_pressed), self); g_signal_connect (G_OBJECT(priv->folder_view), "folder_selection_changed", - G_CALLBACK(modest_ui_actions_on_folder_selection_changed), self); + G_CALLBACK(modest_main_window_on_folder_selection_changed), self); g_signal_connect (G_OBJECT(priv->folder_view), "folder-display-name-changed", G_CALLBACK(modest_ui_actions_on_folder_display_name_changed), self); + g_signal_connect (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"); @@ -624,6 +690,8 @@ connect_signals (ModestMainWindow *self) G_CALLBACK(on_inner_widgets_key_pressed), self); g_signal_connect (G_OBJECT(priv->header_view), "msg_count_changed", G_CALLBACK(_on_msg_count_changed), self); + g_signal_connect (G_OBJECT (priv->header_view), "focus-in-event", + G_CALLBACK (on_header_view_focus_in), self); /* Header view CSM */ menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/HeaderViewCSM"); @@ -633,11 +701,9 @@ connect_signals (ModestMainWindow *self) 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", G_CALLBACK (modest_main_window_window_state_event), NULL); - g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self); /* Mail Operation Queue */ priv->queue_changed_handler_uid = @@ -645,13 +711,18 @@ connect_signals (ModestMainWindow *self) "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); g_signal_connect (G_OBJECT(modest_runtime_get_conf ()), "key_changed", G_CALLBACK (on_configuration_key_changed), self); /* Track account changes. We need to refresh the toolbar */ g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()), - "account_update", G_CALLBACK (on_account_update), + "account_inserted", G_CALLBACK (account_number_changed), + self); + g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()), + "account_removed", G_CALLBACK (account_number_changed), self); /* Account store */ @@ -659,10 +730,10 @@ connect_signals (ModestMainWindow *self) "password_requested", G_CALLBACK (modest_ui_actions_on_password_requested), self); - /* Device */ - g_signal_connect (G_OBJECT(modest_runtime_get_account_store()), - "connecting-finished", - G_CALLBACK(on_account_store_connecting_finished), self); +/* /\* Device *\/ */ +/* g_signal_connect (G_OBJECT(modest_runtime_get_account_store()), */ +/* "connecting-finished", */ +/* G_CALLBACK(on_account_store_connecting_finished), self); */ } #if 0 @@ -740,6 +811,12 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data) 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); @@ -756,11 +833,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)); + gtk_action_set_visible (send_receive_all, g_slist_length (accounts) > 1); modest_account_mgr_free_account_names (accounts); } - - } ModestWindow * @@ -774,10 +849,10 @@ modest_main_window_new (void) ModestDimmingRulesGroup *toolbar_rules_group = NULL; GtkActionGroup *action_group = NULL; GError *error = NULL; - GdkPixbuf *window_icon = NULL; ModestConf *conf = NULL; GtkAction *action = NULL; - + GdkPixbuf *window_icon; + 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); @@ -788,8 +863,8 @@ modest_main_window_new (void) 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"); + menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules", FALSE); + toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules", TRUE); /* Add common actions */ gtk_action_group_add_actions (action_group, @@ -861,6 +936,7 @@ modest_main_window_new (void) gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), modest_conf_get_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, NULL)); hildon_window_set_menu (HILDON_WINDOW (self), GTK_MENU (parent_priv->menubar)); + gtk_widget_show (parent_priv->menubar); /* Get device name */ modest_maemo_utils_get_device_name (); @@ -874,8 +950,15 @@ modest_main_window_new (void) modest_widget_memory_restore (modest_runtime_get_conf (), G_OBJECT(priv->header_view), MODEST_CONF_HEADER_VIEW_KEY); + /* Other style properties of header view */ + g_object_set (G_OBJECT (priv->header_view), + "rules-hint", FALSE, + NULL); + /* gtk_widget_show (priv->header_view); */ + /* Empty view */ priv->empty_view = create_empty_view (); + gtk_widget_show (priv->empty_view); /* Create scrolled windows */ folder_win = gtk_scrolled_window_new (NULL, NULL); @@ -886,6 +969,7 @@ modest_main_window_new (void) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->contents_widget), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + /* gtk_widget_show (priv->contents_widget); */ /* paned */ priv->main_paned = gtk_hpaned_new (); @@ -896,12 +980,9 @@ modest_main_window_new (void) /* putting it all together... */ priv->main_vbox = gtk_vbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX(priv->main_vbox), priv->main_paned, TRUE, TRUE,0); - + gtk_widget_show (priv->main_vbox); + gtk_container_add (GTK_CONTAINER(self), priv->main_vbox); - - /* Set window icon */ - window_icon = modest_platform_get_icon (MODEST_APP_ICON); - gtk_window_set_icon (GTK_WINDOW (self), window_icon); HildonProgram *app = hildon_program_get_instance (); hildon_program_add_window (app, HILDON_WINDOW (self)); @@ -912,8 +993,19 @@ modest_main_window_new (void) g_signal_connect (G_OBJECT(self), "show", G_CALLBACK (modest_main_window_on_show), folder_win); + /* Set window icon */ + window_icon = modest_platform_get_icon (MODEST_APP_ICON); + if (window_icon) { + gtk_window_set_icon (GTK_WINDOW (self), window_icon); + g_object_unref (window_icon); + } - restore_settings (MODEST_MAIN_WINDOW(self), FALSE); + /* Dont't restore settings here, + * because it requires a gtk_widget_show(), + * and we don't want to do that until later, + * so that the UI is not visible for non-menu D-Bus activation. + */ + /* restore_settings (MODEST_MAIN_WINDOW(self), FALSE); */ return MODEST_WINDOW(self); } @@ -948,6 +1040,7 @@ modest_main_window_set_style (ModestMainWindow *self, ModestMainWindowPrivate *priv; ModestWindowPrivate *parent_priv; GtkAction *action; + gboolean active; g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); @@ -958,8 +1051,17 @@ modest_main_window_set_style (ModestMainWindow *self, if (priv->style == style) return; - /* Get toggle button */ - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarToggleView"); + /* Get toggle button and update the state if needed. This will + happen only when the set_style is not invoked from the UI, + for example when it's called from widget memory */ + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToggleFolders"); + active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); + if ((active && style == MODEST_MAIN_WINDOW_STYLE_SIMPLE) || + (!active && style == MODEST_MAIN_WINDOW_STYLE_SPLIT)) { + g_signal_handlers_block_by_func (action, modest_ui_actions_toggle_folders_view, self); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), !active); + g_signal_handlers_unblock_by_func (action, modest_ui_actions_toggle_folders_view, self); + } priv->style = style; switch (style) { @@ -971,9 +1073,23 @@ modest_main_window_set_style (ModestMainWindow *self, /* Reparent the contents widget to the main vbox */ gtk_widget_reparent (priv->contents_widget, priv->main_vbox); - g_signal_handlers_block_by_func (action, modest_ui_actions_toggle_folders_view, self); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), TRUE); - g_signal_handlers_unblock_by_func (action, modest_ui_actions_toggle_folders_view, self); + if (modest_header_view_has_selected_headers (MODEST_HEADER_VIEW (priv->header_view))) { + TnyList *selection = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (priv->header_view)); + TnyIterator *iterator = tny_list_create_iterator (selection); + TnyHeader *header; + tny_iterator_first (iterator); + header = TNY_HEADER (tny_iterator_get_current (iterator)); + if (tny_header_get_subject (header)) + gtk_window_set_title (GTK_WINDOW(self), tny_header_get_subject (header)); + else + gtk_window_set_title (GTK_WINDOW (self), _("mail_va_no_subject")); + + if (header) + g_object_unref (header); + + g_object_unref (iterator); + g_object_unref (selection); + } break; case MODEST_MAIN_WINDOW_STYLE_SPLIT: @@ -985,10 +1101,6 @@ modest_main_window_set_style (ModestMainWindow *self, gtk_paned_add2 (GTK_PANED (priv->main_paned), priv->contents_widget); gtk_container_add (GTK_CONTAINER (priv->main_vbox), priv->main_paned); - g_signal_handlers_block_by_func (action, modest_ui_actions_toggle_folders_view, self); - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE); - g_signal_handlers_unblock_by_func (action, modest_ui_actions_toggle_folders_view, self); - break; default: g_return_if_reached (); @@ -1114,7 +1226,7 @@ modest_main_window_show_toolbar (ModestWindow *self, gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0); /* Set send & receive button tap and hold menu */ - on_account_update (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()), + account_number_changed (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()), NULL, self); } @@ -1138,9 +1250,9 @@ compare_display_names (ModestAccountData *a, } static void -on_account_update (TnyAccountStore *account_store, - const gchar *account_name, - gpointer user_data) +account_number_changed (TnyAccountStore *account_store, + const gchar *account_name, + gpointer user_data) { GSList *account_names, *iter, *accounts; ModestMainWindow *self; @@ -1228,7 +1340,7 @@ on_account_update (TnyAccountStore *account_store, 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)); + gtk_menu_shell_prepend (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item)); } /* Create a new action group */ @@ -1239,7 +1351,9 @@ on_account_update (TnyAccountStore *account_store, ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i); - /* Create display name. The default account is shown differently */ + /* 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"), @@ -1253,9 +1367,9 @@ on_account_update (TnyAccountStore *account_store, /* 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) { + if(account_data && account_data->account_name) { gchar* item_name, *refresh_action_name; - guint8 merge_id; + guint8 merge_id = 0; GtkAction *view_account_action, *refresh_account_action; view_account_action = gtk_action_new (account_data->account_name, @@ -1265,7 +1379,7 @@ on_account_update (TnyAccountStore *account_store, /* 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 */ + 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); @@ -1276,7 +1390,7 @@ on_account_update (TnyAccountStore *account_store, account_data->account_name, GTK_UI_MANAGER_MENUITEM, FALSE); - + /* Connect the action signal "activate" */ g_signal_connect (G_OBJECT (view_account_action), "activate", @@ -1287,6 +1401,7 @@ on_account_update (TnyAccountStore *account_store, refresh_action_name = g_strconcat ("SendReceive", account_data->account_name, NULL); refresh_account_action = gtk_action_new ((const gchar*) refresh_action_name, display_name, NULL, NULL); + printf("DEBUG: %s: menu display_name=%s\n", __FUNCTION__, display_name); gtk_action_group_add_action (action_group, refresh_account_action); merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager); @@ -1311,8 +1426,23 @@ on_account_update (TnyAccountStore *account_store, 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)); + 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)) + { + gchar *escaped = g_markup_printf_escaped ("%s", display_name); + gtk_label_set_markup (GTK_LABEL (label), escaped); + g_free (escaped); + } + else + { + gtk_label_set_text (GTK_LABEL (label), display_name); + } + + item = gtk_menu_item_new (); + gtk_container_add (GTK_CONTAINER (item), label); + + gtk_menu_shell_prepend (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item)); g_signal_connect_data (G_OBJECT (item), "activate", G_CALLBACK (on_send_receive_csm_activated), @@ -1325,10 +1455,54 @@ on_account_update (TnyAccountStore *account_store, /* Frees */ g_free (display_name); - modest_account_mgr_free_account_data (mgr, account_data); } + gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 1); + /* We cannot do this in the loop above because this relies on the action + * 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); + + 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); + + gchar *path = g_strconcat ("/MenuBar/ViewMenu/ViewMenuAdditions/", item_name, NULL); + GtkWidget *item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path); + g_free(path); + + if (item) { + GtkWidget *child = gtk_bin_get_child (GTK_BIN (item)); + if (GTK_IS_LABEL (child)) { + const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child)); + gchar *bold_name = g_markup_printf_escaped("%s", cur_name); + gtk_label_set_markup (GTK_LABEL (child), bold_name); + 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); + + if (item) { + GtkWidget *child = gtk_bin_get_child (GTK_BIN (item)); + if (GTK_IS_LABEL (child)) { + const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child)); + gchar *bold_name = g_markup_printf_escaped("%s", cur_name); + gtk_label_set_markup (GTK_LABEL (child), bold_name); + g_free (bold_name); + } + } + + g_free(item_name); + } + + modest_account_mgr_free_account_data (mgr, account_data); + } + if (priv->accounts_popup) { /* Mandatory in order to view the menu contents */ gtk_widget_show_all (priv->accounts_popup); @@ -1417,7 +1591,8 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) gtk_style_lookup_color (styled_widget->style, "SecondaryTextColor", &color); gray_color_markup = modest_text_utils_get_color_string (&color); #else - gray_color_markup = "#BBBBBB"; + // gray_color_markup is freed below + gray_color_markup = g_strdup ("#BBBBBB"); #endif /* Account description: */ @@ -1496,10 +1671,15 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) /* Size / Date */ if (modest_tny_account_is_virtual_local_folders (account) || modest_tny_account_is_memory_card_account (account)) { - /* FIXME: format size */ - label = g_markup_printf_escaped ("%s: %d", - gray_color_markup, _("mcen_fi_rootfolder_size"), - modest_tny_folder_store_get_local_size (folder_store)); + + gchar *size = modest_text_utils_get_display_size ( + modest_tny_folder_store_get_local_size (folder_store)); + + label = g_markup_printf_escaped ("%s: %s", + gray_color_markup, _("mcen_fi_rootfolder_size"), + size); + g_free (size); + label_w = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label_w), label); gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0); @@ -1536,13 +1716,29 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) return vbox; } +gboolean +modest_main_window_send_receive_in_progress (ModestMainWindow *self) +{ + ModestMainWindowPrivate *priv = NULL; + + g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (self), FALSE); + + priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + + return priv->send_receive_in_progress; +} + void modest_main_window_notify_send_receive_initied (ModestMainWindow *self) { GtkAction *action = NULL; GtkWidget *widget = NULL; - + ModestMainWindowPrivate *priv = NULL; + g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); + priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + + priv->send_receive_in_progress = TRUE; action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu"); gtk_action_set_sensitive (action, FALSE); @@ -1557,8 +1753,12 @@ modest_main_window_notify_send_receive_completed (ModestMainWindow *self) { GtkAction *action = NULL; GtkWidget *widget = NULL; - + ModestMainWindowPrivate *priv = NULL; + g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); + priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + + priv->send_receive_in_progress = FALSE; action = modest_window_get_action (MODEST_WINDOW(self), "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu"); gtk_action_set_sensitive (action, TRUE); @@ -1577,11 +1777,13 @@ _on_msg_count_changed (ModestHeaderView *header_view, { printf ("DEBUG: %s\n", __FUNCTION__); gboolean folder_empty = FALSE; - TnyFolderChangeChanged changed; + TnyFolderChangeChanged changed; + ModestMainWindowPrivate *priv; g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window)); g_return_if_fail (TNY_IS_FOLDER(folder)); g_return_if_fail (TNY_IS_FOLDER_CHANGE(change)); + priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window); changed = tny_folder_change_get_changed (change); @@ -1597,14 +1799,15 @@ _on_msg_count_changed (ModestHeaderView *header_view, if (folder_empty) { modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY); + gtk_widget_grab_focus (GTK_WIDGET (priv->folder_view)); } else { modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS); - } - + } } + void modest_main_window_set_contents_style (ModestMainWindow *self, ModestMainWindowContentsStyle style) @@ -1641,6 +1844,8 @@ modest_main_window_set_contents_style (ModestMainWindow *self, switch (priv->contents_style) { case MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS: wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->header_view)); + modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget), + TRUE); break; case MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS: { @@ -1654,10 +1859,16 @@ modest_main_window_set_contents_style (ModestMainWindow *self, priv->details_widget); } g_object_unref (selected_folderstore); + modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget), + FALSE); + + break; } case MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY: wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->empty_view)); + modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget), + FALSE); break; default: g_return_if_reached (); @@ -1682,17 +1893,18 @@ modest_main_window_get_contents_style (ModestMainWindow *self) static void on_configuration_key_changed (ModestConf* conf, const gchar *key, - ModestConfEvent event, + ModestConfEvent event, + ModestConfNotificationId id, ModestMainWindow *self) { - ModestMainWindowPrivate *priv; + ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); TnyAccount *account; - if (!key || strcmp (key, MODEST_CONF_DEVICE_NAME)) + if (!key || + priv->notification_id != id || + strcmp (key, MODEST_CONF_DEVICE_NAME)) return; - priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); - if (priv->contents_style != MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS) return; @@ -1772,64 +1984,64 @@ set_toolbar_mode (ModestMainWindow *self, /* Show and hide toolbar items */ switch (mode) { case TOOLBAR_MODE_NORMAL: -/* if (sort_action) */ -/* gtk_action_set_visible (sort_action, TRUE); */ -/* if (refresh_action) */ -/* gtk_action_set_visible (refresh_action, TRUE); */ -/* if (priv->progress_toolitem) { */ -/* gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), FALSE); */ -/* gtk_widget_hide (priv->progress_toolitem); */ -/* } */ -/* if (priv->progress_bar) */ -/* gtk_widget_hide (priv->progress_bar); */ - -/* if (cancel_action) */ -/* gtk_action_set_visible (cancel_action, FALSE); */ - if (priv->sort_toolitem) - gtk_widget_show (priv->sort_toolitem); - - if (priv->refresh_toolitem) - gtk_widget_show (priv->refresh_toolitem); - - if (priv->progress_toolitem) + if (sort_action) + gtk_action_set_visible (sort_action, TRUE); + if (refresh_action) + gtk_action_set_visible (refresh_action, TRUE); + if (priv->progress_toolitem) { gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), FALSE); + gtk_widget_hide (priv->progress_toolitem); + } if (priv->progress_bar) gtk_widget_hide (priv->progress_bar); + + if (cancel_action) + gtk_action_set_visible (cancel_action, FALSE); +/* if (priv->sort_toolitem) */ +/* gtk_widget_show (priv->sort_toolitem); */ + +/* if (priv->refresh_toolitem) */ +/* gtk_widget_show (priv->refresh_toolitem); */ + +/* if (priv->progress_toolitem) */ +/* gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), FALSE); */ +/* if (priv->progress_bar) */ +/* gtk_widget_hide (priv->progress_bar); */ - if (priv->cancel_toolitem) - gtk_widget_hide (priv->cancel_toolitem); +/* if (priv->cancel_toolitem) */ +/* gtk_widget_hide (priv->cancel_toolitem); */ /* 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) */ -/* gtk_action_set_visible (sort_action, FALSE); */ -/* if (refresh_action) */ -/* gtk_action_set_visible (refresh_action, FALSE); */ -/* if (cancel_action) */ -/* gtk_action_set_visible (cancel_action, TRUE); */ -/* 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); */ - - if (priv->sort_toolitem) - gtk_widget_hide (priv->sort_toolitem); - - if (priv->refresh_toolitem) - gtk_widget_hide (priv->refresh_toolitem); - - if (priv->progress_toolitem) + if (sort_action) + gtk_action_set_visible (sort_action, FALSE); + if (refresh_action) + gtk_action_set_visible (refresh_action, FALSE); + if (cancel_action) + gtk_action_set_visible (cancel_action, TRUE); + 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); + +/* if (priv->sort_toolitem) */ +/* gtk_widget_hide (priv->sort_toolitem); */ + +/* if (priv->refresh_toolitem) */ +/* gtk_widget_hide (priv->refresh_toolitem); */ + +/* if (priv->progress_toolitem) */ +/* gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE); */ +/* if (priv->progress_bar) */ +/* gtk_widget_show (priv->progress_bar); */ - if (priv->cancel_toolitem) - gtk_widget_show (priv->cancel_toolitem); +/* if (priv->cancel_toolitem) */ +/* gtk_widget_show (priv->cancel_toolitem); */ /* Show toolbar if it's hiden (optimized view ) */ if (priv->optimized_view) @@ -1849,10 +2061,10 @@ cancel_progressbar (GtkToolButton *toolbutton, priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); - /* Get operation observers and cancel its current operation */ + /* Get operation observers and cancel all the operations */ tmp = priv->progress_widgets; while (tmp) { - modest_progress_object_cancel_current_operation (MODEST_PROGRESS_OBJECT(tmp->data)); + modest_progress_object_cancel_all_operations (MODEST_PROGRESS_OBJECT(tmp->data)); tmp=g_slist_next(tmp); } } @@ -1898,7 +2110,7 @@ on_queue_changed (ModestMailOperationQueue *queue, /* Get toolbar mode from operation id*/ op_type = modest_mail_operation_get_type_operation (mail_op); switch (op_type) { - case MODEST_MAIL_OPERATION_TYPE_SEND: +/* case MODEST_MAIL_OPERATION_TYPE_SEND: */ case MODEST_MAIL_OPERATION_TYPE_RECEIVE: case MODEST_MAIL_OPERATION_TYPE_OPEN: mode = TOOLBAR_MODE_TRANSFER; @@ -1965,14 +2177,17 @@ on_show_account_action_activated (GtkAction *action, acc_data = modest_account_mgr_get_account_data (mgr, acc_name); /* Set the new visible & active account */ - if (acc_data->store_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); } + + modest_folder_view_select_first_inbox_or_local (priv->folder_view); /* Free */ - modest_account_mgr_free_account_data (mgr, acc_data); + if (acc_data) + modest_account_mgr_free_account_data (mgr, acc_data); } static void @@ -2013,3 +2228,156 @@ on_zoom_minus_plus_not_implemented (ModestWindow *window) return FALSE; } + +static gboolean +on_folder_view_focus_in (GtkWidget *widget, + GdkEventFocus *event, + gpointer userdata) +{ + ModestMainWindow *main_window = NULL; + + g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (userdata), FALSE); + main_window = MODEST_MAIN_WINDOW (userdata); + + /* Update toolbar dimming state */ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); + + return FALSE; +} + +static gboolean +on_header_view_focus_in (GtkWidget *widget, + GdkEventFocus *event, + 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); + + if (modest_header_view_has_selected_headers (MODEST_HEADER_VIEW (priv->header_view))) { + TnyList *selection = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (priv->header_view)); + TnyIterator *iterator = tny_list_create_iterator (selection); + TnyHeader *header; + + tny_iterator_first (iterator); + header = TNY_HEADER (tny_iterator_get_current (iterator)); + + if (tny_header_get_subject (header)) + gtk_window_set_title (GTK_WINDOW(main_window), tny_header_get_subject (header)); + else + gtk_window_set_title (GTK_WINDOW (main_window), _("mail_va_no_subject")); + + if (header) + g_object_unref (header); + + g_object_unref (iterator); + g_object_unref (selection); + } + + + /* Update toolbar dimming state */ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window)); + + return FALSE; +} + +static void +modest_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; + gboolean show_reply = TRUE; + gboolean show_forward = TRUE; + gboolean show_cancel_send = FALSE; + gboolean show_clipboard = TRUE; + gboolean show_delete = TRUE; + + if (selected) { + if (TNY_IS_ACCOUNT (folder_store)) { + show_reply = show_forward = show_cancel_send = show_clipboard = show_delete = FALSE; + } else if (TNY_IS_FOLDER (folder_store)) { + if (modest_tny_folder_is_local_folder (TNY_FOLDER (folder_store))) { + TnyFolderType folder_type = modest_tny_folder_get_local_or_mmc_folder_type ( + TNY_FOLDER (folder_store)); + switch (folder_type) { + case TNY_FOLDER_TYPE_DRAFTS: + show_clipboard = show_delete = TRUE; + show_reply = show_forward = show_cancel_send = FALSE; + break; + case TNY_FOLDER_TYPE_SENT: + show_forward = show_clipboard = show_delete = TRUE; + show_reply = show_cancel_send = FALSE; + break; + case TNY_FOLDER_TYPE_OUTBOX: + show_clipboard = show_delete = show_cancel_send = TRUE; + show_reply = show_forward = FALSE; + break; + default: + show_reply = show_forward = show_clipboard = show_delete = TRUE; + show_cancel_send = FALSE; + } + } else { + show_reply = show_forward = show_clipboard = show_delete = TRUE; + show_cancel_send = FALSE; + } + } + } + + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/HeaderViewCSM/HeaderViewCSMReply"); + gtk_action_set_visible (action, show_reply); + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/HeaderViewCSM/HeaderViewCSMReplyAll"); + gtk_action_set_visible (action, show_reply); + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/HeaderViewCSM/HeaderViewCSMForward"); + 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 +modest_main_window_on_msg_view_window_msg_changed (ModestMsgViewWindow *view_window, + GtkTreeModel *model, + GtkTreeRowReference *row_reference, + ModestMainWindow *self) +{ + ModestMainWindowPrivate *priv = NULL; + GtkTreeModel *header_model = NULL; + GtkTreePath *path = NULL; + + g_return_val_if_fail (MODEST_MSG_VIEW_WINDOW (view_window), FALSE); + g_return_val_if_fail (MODEST_MAIN_WINDOW (self), FALSE); + g_return_val_if_fail (gtk_tree_row_reference_valid (row_reference), FALSE); + + priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); + header_model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view)); + + /* Do nothing if we changed the folder in the main view */ + if (header_model != model) + return FALSE; + + /* Select the message in the header view */ + path = gtk_tree_row_reference_get_path (row_reference); + gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->header_view), + path, NULL, FALSE); + gtk_tree_path_free (path); + + return TRUE; +}