X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmaemo%2Fmodest-main-window.c;h=6a91ba579847d990985ee1ddeb0f79a82064e248;hb=fd958e8a96328612ae617b3f04627781d6dc7b1f;hp=0d137bdd366c1746e4a99438b76bf49e3a9a91b4;hpb=c927ba1c95bb119013bfd74f63145339d6f84922;p=modest diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index 0d137bd..6a91ba5 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -106,11 +106,14 @@ static void set_toolbar_mode (ModestMainWindow *self, static gboolean set_toolbar_transfer_mode (ModestMainWindow *self); -static void on_show_account_action_activated (GtkAction *action, - gpointer user_data); +static void on_show_account_action_activated (GtkAction *action, + gpointer user_data); -static void on_send_receive_csm_activated (GtkMenuItem *item, - gpointer user_data); +static void on_refresh_account_action_activated (GtkAction *action, + gpointer user_data); + +static void on_send_receive_csm_activated (GtkMenuItem *item, + gpointer user_data); /* list my signals */ enum { /* MY_SIGNAL_1, */ @@ -367,14 +370,12 @@ on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self) static void -on_connection_changed (TnyDevice *device, gboolean online, ModestMainWindow *self) +on_account_store_connecting_finished (TnyAccountStore *store, ModestMainWindow *self) { /* When going online, do the equivalent of pressing the send/receive button, * as per the specification: * (without the check for >0 accounts, though that is not specified): */ - if (online) { - modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self)); - } + modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self)); } @@ -442,10 +443,11 @@ connect_signals (ModestMainWindow *self) G_CALLBACK (modest_ui_actions_on_password_requested), self); /* Device */ - g_signal_connect (G_OBJECT(modest_runtime_get_device()), "connection_changed", - G_CALLBACK(on_connection_changed), self); + g_signal_connect (G_OBJECT(modest_runtime_get_account_store()), "connecting-finished", + G_CALLBACK(on_account_store_connecting_finished), self); } +#if 0 /** Idle handler, to send/receive at startup .*/ gboolean sync_accounts_cb (ModestMainWindow *win) @@ -453,6 +455,7 @@ sync_accounts_cb (ModestMainWindow *win) modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (win)); return FALSE; /* Do not call this idle handler again. */ } +#endif static void on_hildon_program_is_topmost_notify(GObject *self, GParamSpec *propert_param, gpointer user_data) @@ -625,8 +628,14 @@ modest_main_window_new (void) tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (priv->folder_view), TNY_ACCOUNT_STORE (modest_runtime_get_account_store ())); - /* do send & receive when we are idle */ - g_idle_add ((GSourceFunc)sync_accounts_cb, self); + /* Do send & receive when we are idle */ + /* TODO: Enable this again. I have commented it out because, + * at least in scratchbox, this can cause us to start a second + * update (in response to a connection change) when we are already + * doing an update (started here, at startup). Tinymail doesn't like that. + * murrayc. + */ + /* g_idle_add ((GSourceFunc)sync_accounts_cb, self); */ HildonProgram *app = hildon_program_get_instance (); hildon_program_add_window (app, HILDON_WINDOW (self)); @@ -914,7 +923,8 @@ on_account_update (TnyAccountStore *account_store, menu_detach because it does not work well with tap_and_hold */ if (priv->accounts_popup) - gtk_container_foreach (GTK_CONTAINER (priv->accounts_popup), (GtkCallback) gtk_widget_destroy, NULL); + gtk_container_foreach (GTK_CONTAINER (priv->accounts_popup), + (GtkCallback) gtk_widget_destroy, NULL); /* Delete old entries in the View menu. Do not free groups, it belongs to Gtk+ */ @@ -962,7 +972,6 @@ on_account_update (TnyAccountStore *account_store, default_account = modest_account_mgr_get_default_account (mgr); action_group = gtk_action_group_new (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS); for (i = 0; i < num_accounts; i++) { - GtkAction *new_action = NULL; gchar *display_name = NULL; ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i); @@ -982,17 +991,22 @@ on_account_update (TnyAccountStore *account_store, action name must be the account name, this way we could know in the handlers the account to show */ if(account_data->account_name) { - new_action = gtk_action_new (account_data->account_name, display_name, NULL, NULL); - gtk_action_group_add_action (action_group, new_action); + 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 */ - gchar* item_name = g_strconcat (account_data->account_name, "Menu", NULL); - guint8 merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager); + 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, + gtk_ui_manager_add_ui (parent_priv->ui_manager, merge_id, "/MenuBar/ViewMenu/ViewMenuAdditions", item_name, @@ -1001,13 +1015,38 @@ on_account_update (TnyAccountStore *account_store, FALSE); /* Connect the action signal "activate" */ - g_signal_connect (G_OBJECT (new_action), - "activate", - G_CALLBACK (on_show_account_action_activated), + g_signal_connect (G_OBJECT (view_account_action), + "activate", + G_CALLBACK (on_show_account_action_activated), self); - /* Create item and add it to the send&receive CSM */ - /* TODO: Why is this sometimes NULL? murrayc */ + /* 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)); @@ -1018,7 +1057,6 @@ on_account_update (TnyAccountStore *account_store, (GClosureNotify) g_free, 0); } - g_free (item_name); } @@ -1084,19 +1122,20 @@ set_alignment (GtkWidget *widget, } static GtkWidget * -create_details_widget (TnyAccount *account) +create_details_widget (TnyFolderStore *folder_store) { GtkWidget *vbox; gchar *label; vbox = gtk_vbox_new (FALSE, 0); - /* Account description */ - if (!strcmp (tny_account_get_id (account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) { - gchar *device_name; - + /* Account description: */ + + if (modest_tny_folder_store_is_virtual_local_folders (folder_store)) { + /* Local folders: */ + /* Get device name */ - device_name = modest_conf_get_string (modest_runtime_get_conf(), + gchar *device_name = modest_conf_get_string (modest_runtime_get_conf(), MODEST_CONF_DEVICE_NAME, NULL); label = g_strdup_printf ("%s: %s", @@ -1105,63 +1144,74 @@ create_details_widget (TnyAccount *account) gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0); g_free (device_name); g_free (label); - } else if (!strcmp (tny_account_get_id (account), MODEST_MMC_ACCOUNT_ID)) { - /* TODO: MMC ? */ - gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("FIXME: MMC ?"), FALSE, FALSE, 0); - } else { - GString *proto; - - /* Put proto in uppercase */ - proto = g_string_new (tny_account_get_proto (account)); - proto = g_string_ascii_up (proto); - - label = g_strdup_printf ("%s %s: %s", - proto->str, - _("mcen_fi_remoteroot_account"), - tny_account_get_name (account)); - gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0); - g_string_free (proto, TRUE); - g_free (label); + } else if (TNY_IS_ACCOUNT (folder_store)) { + TnyAccount *account = TNY_ACCOUNT(folder_store); + + if(!strcmp (tny_account_get_id (account), MODEST_MMC_ACCOUNT_ID)) { + /* TODO: MMC ? */ + gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("FIXME: MMC ?"), FALSE, FALSE, 0); + } else { + /* Other accounts, such as IMAP and POP: */ + + GString *proto; + + /* Put proto in uppercase */ + proto = g_string_new (tny_account_get_proto (account)); + proto = g_string_ascii_up (proto); + + label = g_strdup_printf ("%s %s: %s", + proto->str, + _("mcen_fi_remoteroot_account"), + tny_account_get_name (account)); + gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0); + g_string_free (proto, TRUE); + g_free (label); + } } /* Message count */ + label = g_strdup_printf ("%s: %d", _("mcen_fi_rootfolder_messages"), - modest_tny_account_get_message_count (account)); + modest_tny_folder_store_get_message_count (folder_store)); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0); g_free (label); /* Folder count */ label = g_strdup_printf ("%s: %d", _("mcen_fi_rootfolder_folders"), - modest_tny_account_get_folder_count (account)); + modest_tny_folder_store_get_folder_count (folder_store)); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0); g_free (label); /* Size / Date */ - if (!strcmp (tny_account_get_id (account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) { + if (modest_tny_folder_store_is_virtual_local_folders (folder_store)) { /* FIXME: format size */ label = g_strdup_printf ("%s: %d", _("mcen_fi_rootfolder_size"), - modest_tny_account_get_local_size (account)); + 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 { - 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); + } else if (TNY_IS_ACCOUNT(folder_store)) { + TnyAccount *account = TNY_ACCOUNT(folder_store); + + if (!strcmp (tny_account_get_id (account), MODEST_MMC_ACCOUNT_ID)) { + gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("FIXME: MMC ?"), FALSE, FALSE, 0); + } else { + time_t last_updated; + gchar *last_updated_string; + /* Get last updated from configuration */ + last_updated = modest_account_mgr_get_int (modest_runtime_get_account_mgr (), + tny_account_get_id (account), + MODEST_ACCOUNT_LAST_UPDATED, + TRUE); + if (last_updated > 0) + last_updated_string = modest_text_utils_get_display_date(last_updated); + else + last_updated_string = g_strdup (_("FIXME: Never")); + + label = g_strdup_printf ("%s: %s", _("mcen_ti_lastupdated"), last_updated_string); + gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new (label), FALSE, FALSE, 0); + g_free (last_updated_string); + g_free (label); + } } /* Set alignment */ @@ -1175,8 +1225,6 @@ modest_main_window_set_contents_style (ModestMainWindow *self, ModestMainWindowContentsStyle style) { ModestMainWindowPrivate *priv; - GtkWidget *content; - TnyAccount *account; g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); @@ -1191,10 +1239,12 @@ modest_main_window_set_contents_style (ModestMainWindow *self, /* Remove previous child. Delete it if it was an account details widget */ - content = gtk_bin_get_child (GTK_BIN (priv->contents_widget)); - if (priv->contents_style != MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS) - g_object_ref (content); - gtk_container_remove (GTK_CONTAINER (priv->contents_widget), content); + GtkWidget *content = gtk_bin_get_child (GTK_BIN (priv->contents_widget)); + if (content) { + if (priv->contents_style != MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS) + g_object_ref (content); + gtk_container_remove (GTK_CONTAINER (priv->contents_widget), content); + } priv->contents_style = style; @@ -1203,13 +1253,17 @@ modest_main_window_set_contents_style (ModestMainWindow *self, wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->header_view)); break; case MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS: + { /* TODO: show here account details */ - account = TNY_ACCOUNT (modest_folder_view_get_selected (priv->folder_view)); - priv->details_widget = create_details_widget (account); + TnyFolderStore *selected_folderstore = + modest_folder_view_get_selected (priv->folder_view); + + priv->details_widget = create_details_widget (selected_folderstore); wrap_in_scrolled_window (priv->contents_widget, - priv->details_widget); + priv->details_widget); break; + } default: g_return_if_reached (); } @@ -1237,7 +1291,7 @@ on_configuration_key_changed (ModestConf* conf, account = (TnyAccount *) modest_folder_view_get_selected (priv->folder_view); if (TNY_IS_ACCOUNT (account) && - !strcmp (tny_account_get_id (account), MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) { + !strcmp (tny_account_get_id (account), MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID)) { GList *children; GtkLabel *label; const gchar *device_name; @@ -1393,19 +1447,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; @@ -1431,6 +1486,12 @@ on_queue_changed (ModestMailOperationQueue *queue, } break; case MODEST_MAIL_OPERATION_QUEUE_OPERATION_REMOVED: + /* If mail_op is mine, check errors */ + status = modest_mail_operation_get_status (mail_op); + if (status != MODEST_MAIL_OPERATION_STATUS_SUCCESS) + modest_mail_operation_execute_error_handler (mail_op); + + /* Change toolbar mode */ if (mode == TOOLBAR_MODE_TRANSFER) { while (tmp) { modest_progress_object_remove_operation (MODEST_PROGRESS_OBJECT (tmp->data), @@ -1444,8 +1505,10 @@ on_queue_changed (ModestMailOperationQueue *queue, } } + break; } + } static void @@ -1478,17 +1541,29 @@ on_show_account_action_activated (GtkAction *action, } static void -on_send_receive_csm_activated (GtkMenuItem *item, - gpointer user_data) +refresh_account (const gchar *account_name) { ModestWindow *win; win = MODEST_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ())); - /* If user_data == NULL, we must update all (CSM option All) */ - if (!user_data) { + /* If account_name == NULL, we must update all (option All) */ + if (!account_name) modest_ui_actions_do_send_receive_all (win); - } else { - modest_ui_actions_do_send_receive ((const gchar *)user_data, win); - } + else + modest_ui_actions_do_send_receive (account_name, win); +} + +static void +on_refresh_account_action_activated (GtkAction *action, + gpointer user_data) +{ + refresh_account ((const gchar*) user_data); +} + +static void +on_send_receive_csm_activated (GtkMenuItem *item, + gpointer user_data) +{ + refresh_account ((const gchar*) user_data); }