#include <modest-maemo-utils.h>
#endif
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon.h>
+#endif
+#include <tny-camel-bs-mime-part.h>
+#include <tny-camel-bs-msg.h>
+
#define MYDOCS_ENV "MYDOCSDIR"
#define DOCS_FOLDER ".documents"
gulong row_deleted_handler;
gulong row_inserted_handler;
gulong rows_reordered_handler;
+ gulong fetch_image_redraw_handler;
guint purge_timeout;
GtkWidget *remove_attachment_banner;
(GInstanceInitFunc) modest_msg_view_window_init,
NULL
};
-#ifdef MODEST_TOOLKIT_GTK
- my_type = g_type_register_static (MODEST_TYPE_WINDOW,
+#ifndef MODEST_TOOLKIT_HILDON2
+ my_type = g_type_register_static (MODEST_TYPE_SHELL_WINDOW,
"ModestMsgViewWindow",
&my_info, 0);
#else
g_error_free (error);
error = NULL;
}
- /* ****** */
-
- /* Add accelerators */
- gtk_window_add_accel_group (GTK_WINDOW (obj),
- gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
priv->is_search_result = FALSE;
priv->is_outbox = FALSE;
priv->row_deleted_handler = 0;
priv->row_inserted_handler = 0;
priv->rows_reordered_handler = 0;
+ priv->fetch_image_redraw_handler = 0;
priv->progress_hint = FALSE;
priv->fetching_images = 0;
call this function before */
modest_msg_view_window_disconnect_signals (MODEST_WINDOW (obj));
+ if (priv->fetch_image_redraw_handler > 0) {
+ g_source_remove (priv->fetch_image_redraw_handler);
+ priv->fetch_image_redraw_handler = 0;
+ }
+
if (priv->other_body != NULL) {
g_object_unref (priv->other_body);
priv->other_body = NULL;
current_search = modest_isearch_toolbar_get_search (MODEST_ISEARCH_TOOLBAR (widget));
if ((current_search == NULL) || (strcmp (current_search, "") == 0)) {
- modest_platform_system_banner (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text"));
+ modest_platform_system_banner (NULL, NULL, _CS_FIND_REP_ENTER_TEXT);
return;
}
priv->last_search);
if (!result) {
modest_platform_system_banner (NULL, NULL,
- _HL("ckct_ib_find_no_matches"));
+ _HL_IB_FIND_NO_MATCHES);
g_free (priv->last_search);
priv->last_search = NULL;
} else {
} else {
if (!modest_isearch_view_search_next (MODEST_ISEARCH_VIEW (priv->msg_view))) {
modest_platform_system_banner (NULL, NULL,
- _HL("ckct_ib_find_search_complete"));
+ _HL_IB_FIND_COMPLETE);
g_free (priv->last_search);
priv->last_search = NULL;
} else {
if (zoom_level >= 2.0) {
modest_platform_system_banner (NULL, NULL,
- _CS("ckct_ib_max_zoom_level_reached"));
+ _CS_MAX_ZOOM_LEVEL_REACHED);
return FALSE;
} else if (zoom_level >= 1.5) {
zoom_level = 2.0;
/* set zoom level */
int_zoom = (gint) rint (zoom_level*100.0+0.1);
- banner_text = g_strdup_printf (_HL("wdgt_ib_zoom"), int_zoom);
+ banner_text = g_strdup_printf (_HL_IB_ZOOM, int_zoom);
modest_platform_information_banner (GTK_WIDGET (window), NULL, banner_text);
g_free (banner_text);
modest_zoomable_set_zoom (MODEST_ZOOMABLE (priv->msg_view), zoom_level);
if (zoom_level <= 0.5) {
modest_platform_system_banner (NULL, NULL,
- _CS("ckct_ib_min_zoom_level_reached"));
+ _CS_MIN_ZOOM_LEVEL_REACHED);
return FALSE;
} else if (zoom_level <= 0.8) {
zoom_level = 0.5;
/* set zoom level */
int_zoom = (gint) rint (zoom_level*100.0+0.1);
- banner_text = g_strdup_printf (_HL("wdgt_ib_zoom"), int_zoom);
+ banner_text = g_strdup_printf (_HL_IB_ZOOM, int_zoom);
modest_platform_information_banner (GTK_WIDGET (window), NULL, banner_text);
g_free (banner_text);
modest_zoomable_set_zoom (MODEST_ZOOMABLE (priv->msg_view), zoom_level);
{
GtkWidget *focus;
- focus = gtk_window_get_focus (GTK_WINDOW (window));
+ focus = gtk_container_get_focus_child ((GtkContainer *) window);
/* for the isearch toolbar case */
if (focus && GTK_IS_ENTRY (focus)) {
static void
message_reader_performer (gboolean canceled,
GError *err,
- GtkWindow *parent_window,
+ ModestWindow *parent_window,
TnyAccount *account,
gpointer user_data)
{
/* We set the header from model while we're loading */
tny_header_view_set_header (TNY_HEADER_VIEW (priv->msg_view), header);
- modest_window_set_title (MODEST_WINDOW (window), _CS("ckdg_pb_updating"));
+ modest_window_set_title (MODEST_WINDOW (window), _CS_UPDATING);
if (header)
folder = NULL;
we're not online */
if (!tny_device_is_online (modest_runtime_get_device())) {
GtkResponseType response;
+ GtkWindow *toplevel;
- response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window),
- _("mcen_nc_get_msg"));
+ toplevel = (GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) window);
+ response = modest_platform_run_confirmation_dialog (toplevel, _("mcen_nc_get_msg"));
if (response == GTK_RESPONSE_CANCEL) {
update_window_title (window);
return FALSE;
}
/* Offer the connection dialog if necessary */
- modest_platform_connect_if_remote_and_perform ((GtkWindow *) window,
+ modest_platform_connect_if_remote_and_perform ((ModestWindow *) window,
TRUE,
TNY_FOLDER_STORE (folder),
message_reader_performer,
else
info->row_reference = NULL;
- message_reader_performer (FALSE, NULL, (GtkWindow *) window, account, info);
+ message_reader_performer (FALSE, NULL, (ModestWindow *) window, account, info);
if (account)
g_object_unref (account);
if (folder)
return;
}
+ if (msg && TNY_IS_CAMEL_BS_MSG (msg)) {
+ TnyMimePart *body;
+ body = modest_tny_msg_find_body_part (msg, TRUE);
+
+ if (body && !tny_camel_bs_mime_part_is_fetched (TNY_CAMEL_BS_MIME_PART (body))) {
+ /* We have body structure but not the body mime part. What we do
+ * is restarting load of message */
+ self = (ModestMsgViewWindow *) modest_mail_operation_get_source (mail_op);
+ priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
+
+ tny_header_unset_flag (TNY_HEADER (header), TNY_HEADER_FLAG_CACHED);
+
+ modest_msg_view_window_reload (self);
+
+ if (row_reference)
+ gtk_tree_row_reference_free (row_reference);
+ g_object_unref (body);
+ return;
+ }
+
+ if (body)
+ g_object_unref (body);
+ }
+
/* Get the window */
self = (ModestMsgViewWindow *) modest_mail_operation_get_source (mail_op);
g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (self));
parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager,
"/ToolBar");
- /* We don't use HILDON_ICON_SIZE_FINGER in order to avoid the ifdef here */
- gtk_toolbar_set_icon_size (GTK_TOOLBAR (parent_priv->toolbar), gtk_icon_size_from_name ("hildon-finger"));
+#ifdef MODEST_TOOLKIT_HILDON2
+ gtk_toolbar_set_icon_size (GTK_TOOLBAR (parent_priv->toolbar), HILDON_ICON_SIZE_FINGER);
+#else
+ gtk_toolbar_set_icon_size (GTK_TOOLBAR (parent_priv->toolbar), GTK_ICON_SIZE_LARGE_TOOLBAR);
+#endif
gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE);
priv->next_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageNext");
account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ());
msg = tny_camel_msg_new ();
- tny_camel_msg_parse (msg, file_stream);
+ tny_camel_msg_parse ((TnyCamelMsg *) msg, file_stream);
msg_win = modest_msg_view_window_new_for_attachment (TNY_MSG (msg), account, mailbox, helper->attachment_uid);
modest_window_set_zoom (MODEST_WINDOW (msg_win),
modest_window_get_zoom (MODEST_WINDOW (helper->self)));
g_slice_free (DecodeAsyncHelper, helper);
}
+static void
+view_attachment_connect_handler (gboolean canceled,
+ GError *err,
+ GtkWindow *parent_window,
+ TnyAccount *account,
+ TnyMimePart *part)
+{
+
+ if (canceled || err) {
+ g_object_unref (part);
+ return;
+ }
+
+ modest_msg_view_window_view_attachment (MODEST_MSG_VIEW_WINDOW (parent_window),
+ part);
+ g_object_unref (part);
+}
+
void
modest_msg_view_window_view_attachment (ModestMsgViewWindow *window,
TnyMimePart *mime_part)
if (tny_mime_part_is_purged (mime_part))
goto frees;
+ if (TNY_IS_CAMEL_BS_MIME_PART (mime_part) &&
+ !tny_camel_bs_mime_part_is_fetched (TNY_CAMEL_BS_MIME_PART (mime_part))) {
+ gboolean is_merge;
+ TnyAccount *account;
+
+ is_merge = g_str_has_prefix (priv->msg_uid, "merge:");
+ account = NULL;
+ /* Get the account */
+ if (!is_merge)
+ account = tny_account_store_find_account (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
+ priv->msg_uid);
+
+ if (!tny_device_is_online (modest_runtime_get_device())) {
+ modest_platform_connect_and_perform ((ModestWindow *) window,
+ TRUE,
+ TNY_ACCOUNT (account),
+ (ModestConnectedPerformer) view_attachment_connect_handler,
+ g_object_ref (mime_part));
+ goto frees;
+ }
+ }
+
if (!modest_tny_mime_part_is_msg (mime_part) && tny_mime_part_get_filename (mime_part)) {
gchar *filepath = NULL;
const gchar *att_filename = tny_mime_part_get_filename (mime_part);
* modest_platform_system_banner is or does Gtk+ code */
gdk_threads_enter (); /* CHECKED */
- if (info->result == GNOME_VFS_OK) {
- modest_platform_system_banner (NULL, NULL, _CS("sfil_ib_saved"));
+ if (info->result == GNOME_VFS_ERROR_CANCELLED) {
+ /* nothing */
+ } else if (info->result == GNOME_VFS_OK) {
+ modest_platform_system_banner (NULL, NULL, _CS_SAVED);
} else if (info->result == GNOME_VFS_ERROR_NO_SPACE) {
gchar *msg = NULL;
return FALSE;
}
+static void
+save_mime_part_to_file_connect_handler (gboolean canceled,
+ GError *err,
+ GtkWindow *parent_window,
+ TnyAccount *account,
+ SaveMimePartInfo *info)
+{
+ if (canceled || err) {
+ if (canceled && !err) {
+ info->result = GNOME_VFS_ERROR_CANCELLED;
+ }
+ g_idle_add ((GSourceFunc) idle_save_mime_part_show_result, info);
+ } else {
+ g_thread_create ((GThreadFunc)save_mime_part_to_file, info, FALSE, NULL);
+ }
+}
+
+static gboolean
+save_mime_part_to_file_connect_idle (SaveMimePartInfo *info)
+{
+ gboolean is_merge;
+ TnyAccount *account;
+ ModestMsgViewWindowPrivate *priv;
+
+ priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (info->window);
+
+ is_merge = g_str_has_prefix (priv->msg_uid, "merge:");
+ account = NULL;
+
+ /* Get the account */
+ if (!is_merge)
+ account = tny_account_store_find_account (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
+ priv->msg_uid);
+
+ modest_platform_connect_and_perform ((ModestWindow *) info->window,
+ TRUE,
+ TNY_ACCOUNT (account),
+ (ModestConnectedPerformer) save_mime_part_to_file_connect_handler,
+ info);
+ return FALSE;
+}
+
static gpointer
save_mime_part_to_file (SaveMimePartInfo *info)
{
TnyStream *stream;
SaveMimePartPair *pair = (SaveMimePartPair *) info->pairs->data;
+ if (TNY_IS_CAMEL_BS_MIME_PART (pair->part) &&
+ !tny_camel_bs_mime_part_is_fetched (TNY_CAMEL_BS_MIME_PART (pair->part))) {
+ g_idle_add ((GSourceFunc) save_mime_part_to_file_connect_idle, info);
+ return NULL;
+ }
+
info->result = gnome_vfs_create (&handle, pair->filename, GNOME_VFS_OPEN_WRITE, FALSE, 0644);
if (info->result == GNOME_VFS_OK) {
GError *error = NULL;
escaped_basename = g_uri_unescape_string (basename, NULL);
message = g_strdup_printf ("%s\n%s",
- _FM("docm_nc_replace_file"),
+ _FM_REPLACE_FILE,
(escaped_basename) ? escaped_basename : "");
response = modest_platform_run_confirmation_dialog (parent, message);
g_free (message);
g_free (escaped_basename);
} else {
response = modest_platform_run_confirmation_dialog (parent,
- _FM("docm_nc_replace_multiple"));
+ _FM_REPLACE_MULTIPLE);
}
if (response != GTK_RESPONSE_OK)
is_ok = FALSE;
if (modest_maemo_utils_in_usb_mode ()) {
err_msg = dgettext ("hildon-status-bar-usb", "usbh_ib_mmc_usb_connected");
} else {
- err_msg = _FM("sfil_ib_readonly_location");
+ err_msg = _FM_READ_ONLY_LOCATION;
}
#else
- err_msg = _FM("sfil_ib_readonly_location");
+ err_msg = _FM_READ_ONLY_LOCATION;
#endif
modest_platform_system_banner (NULL, NULL, err_msg);
} else {
/* In Hildon 2.2 save and delete operate over all the attachments as there's no
* selection available */
mime_parts = modest_msg_view_get_attachments (MODEST_MSG_VIEW (priv->msg_view));
- if (mime_parts && !modest_toolkit_utils_select_attachments (GTK_WINDOW (window), mime_parts, FALSE)) {
+ if (mime_parts && !modest_toolkit_utils_select_attachments (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (window))), mime_parts, FALSE)) {
g_object_unref (mime_parts);
return;
}
/* if multiple, set multiple string */
if (save_multiple_str) {
g_object_set (G_OBJECT (save_dialog), "save-multiple", save_multiple_str, NULL);
- gtk_window_set_title (GTK_WINDOW (save_dialog), _FM("sfil_ti_save_objects_files"));
+ gtk_window_set_title (GTK_WINDOW (save_dialog), _FM_SAVE_OBJECT_FILES);
g_free (save_multiple_str);
}
g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+#ifdef MODEST_TOOLKIT_HILDON2
/* In hildon 2.2 we ignore the get_all flag as we always get all attachments. This is
* because we don't have selection
*/
g_object_unref (mime_parts);
return;
}
+#else
+ /* In gtk we get only selected attachments for the operation.
+ */
+ mime_parts = modest_msg_view_get_selected_attachments (MODEST_MSG_VIEW (priv->msg_view));
+
+ /* Remove already purged messages from mime parts list. We use
+ a copy of the list to remove items in the original one */
+ tmp = tny_list_copy (mime_parts);
+ iter = tny_list_create_iterator (tmp);
+ while (!tny_iterator_is_done (iter)) {
+ TnyMimePart *part = TNY_MIME_PART (tny_iterator_get_current (iter));
+ if (tny_mime_part_is_purged (part))
+ tny_list_remove (mime_parts, (GObject *) part);
+
+ g_object_unref (part);
+ tny_iterator_next (iter);
+ }
+ g_object_unref (tmp);
+ g_object_unref (iter);
+
+ if (tny_list_get_length (mime_parts) == 0) {
+ g_object_unref (mime_parts);
+ return;
+ }
+#endif
n_attachments = tny_list_get_length (mime_parts);
if (n_attachments == 1) {
"mcen_nc_purge_files_text",
n_attachments), n_attachments);
}
- response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window),
+ response = modest_platform_run_confirmation_dialog (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (window))),
confirmation_message);
g_free (confirmation_message);
} FetchImageData;
gboolean
+on_fetch_image_timeout_refresh_view (gpointer userdata)
+{
+ ModestMsgViewWindowPrivate *priv;
+
+ priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (userdata);
+ update_progress_hint (MODEST_MSG_VIEW_WINDOW (userdata));
+ if (GTK_WIDGET_DRAWABLE (priv->msg_view)) {
+ gtk_widget_queue_draw (GTK_WIDGET (priv->msg_view));
+ }
+ priv->fetch_image_redraw_handler = 0;
+ g_object_unref (userdata);
+ return FALSE;
+}
+
+gboolean
on_fetch_image_idle_refresh_view (gpointer userdata)
{
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (fidata->window);
priv->fetching_images--;
- gtk_widget_queue_draw (fidata->msg_view);
- update_progress_hint (MODEST_MSG_VIEW_WINDOW (fidata->window));
+ if (priv->fetch_image_redraw_handler == 0) {
+ priv->fetch_image_redraw_handler = g_timeout_add (500, on_fetch_image_timeout_refresh_view, g_object_ref (fidata->window));
+ }
+
}
gdk_threads_leave ();