#include "modest-progress-bar-widget.h"
#include "modest-defs.h"
#include "modest-hildon-includes.h"
-#include <gtkhtml/gtkhtml-search.h>
#include "modest-ui-dimming-manager.h"
#include <gdk/gdkkeysyms.h>
#include <modest-tny-account.h>
+#include <modest-mime-part-view.h>
+#include <modest-isearch-view.h>
#include <math.h>
#define DEFAULT_FOLDER "MyDocs/.documents"
priv->purge_timeout = 0;
priv->remove_attachment_banner = NULL;
priv->msg_uid = NULL;
+
+ modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
+ GTK_WINDOW(obj),"applications_email_viewer");
}
}
static void
-init_window (ModestMsgViewWindow *obj, TnyMsg *msg)
+init_window (ModestMsgViewWindow *obj)
{
GtkWidget *main_vbox;
ModestMsgViewWindowPrivate *priv;
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj);
parent_priv = MODEST_WINDOW_GET_PRIVATE(obj);
- priv->msg_view = modest_msg_view_new (msg);
+ priv->msg_view = GTK_WIDGET (tny_platform_factory_new_msg_view (modest_tny_platform_factory_get_instance ()));
modest_msg_view_set_shadow_type (MODEST_MSG_VIEW (priv->msg_view), GTK_SHADOW_NONE);
main_vbox = gtk_vbox_new (FALSE, 6);
hildon_window_set_menu (HILDON_WINDOW(obj), GTK_MENU(parent_priv->menubar));
gtk_widget_show (GTK_WIDGET(parent_priv->menubar));
+#ifdef MODEST_USE_MOZEMBED
+ priv->main_scroll = priv->msg_view;
+ gtk_widget_set_size_request (priv->msg_view, -1, 1600);
+#else
priv->main_scroll = gtk_scrolled_window_new (NULL, NULL);
+ gtk_container_add (GTK_CONTAINER (priv->main_scroll), priv->msg_view);
+#endif
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->main_scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->main_scroll), GTK_SHADOW_NONE);
modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->main_scroll), TRUE);
- gtk_container_add (GTK_CONTAINER (priv->main_scroll), priv->msg_view);
gtk_box_pack_start (GTK_BOX(main_vbox), priv->main_scroll, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER(obj), main_vbox);
{
ModestMsgViewWindowPrivate *priv;
ModestHeaderView *header_view = NULL;
- ModestMainWindow *main_window = NULL;
- ModestWindowMgr *window_mgr = NULL;
-
+ ModestWindow *main_window = NULL;
+
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (self);
if (gtk_clipboard_get (GDK_SELECTION_PRIMARY) &&
priv->rows_reordered_handler);
}
- window_mgr = modest_runtime_get_window_mgr();
- g_assert(window_mgr != NULL);
-
- main_window = MODEST_MAIN_WINDOW(
- modest_window_mgr_get_main_window(window_mgr));
-
- if(main_window == NULL)
+ main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
+ FALSE); /* don't create */
+ if (!main_window)
return;
-
+
header_view = MODEST_HEADER_VIEW(
modest_main_window_get_child_widget(
- main_window, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW));
-
+ MODEST_MAIN_WINDOW(main_window),
+ MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW));
if (header_view == NULL)
return;
/* TODO: This should be in _init(), with the parameters as properties. */
static void
-modest_msg_view_window_construct (ModestMsgViewWindow *self, TnyMsg *msg,
+modest_msg_view_window_construct (ModestMsgViewWindow *self,
const gchar *modest_account_name,
const gchar *msg_uid)
{
GError *error = NULL;
GdkPixbuf *window_icon;
- g_return_if_fail (msg);
-
obj = G_OBJECT (self);
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj);
parent_priv = MODEST_WINDOW_GET_PRIVATE(obj);
gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
/* Init window */
- init_window (MODEST_MSG_VIEW_WINDOW(obj), msg);
+ init_window (MODEST_MSG_VIEW_WINDOW(obj));
restore_settings (MODEST_MSG_VIEW_WINDOW(obj));
/* Set window icon */
/* g_signal_connect (G_OBJECT(obj), "delete-event", G_CALLBACK(on_delete_event), obj); */
- g_signal_connect (G_OBJECT(priv->msg_view), "link_clicked",
+ g_signal_connect (G_OBJECT(priv->msg_view), "activate_link",
G_CALLBACK (modest_ui_actions_on_msg_link_clicked), obj);
g_signal_connect (G_OBJECT(priv->msg_view), "link_hover",
G_CALLBACK (modest_ui_actions_on_msg_link_hover), obj);
/* Check toolbar dimming rules */
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (obj));
modest_window_check_dimming_rules_group (MODEST_WINDOW (obj), "ModestClipboardDimmingRules");
-
+
}
+/* FIXME: parameter checks */
ModestWindow *
modest_msg_view_window_new_with_header_model (TnyMsg *msg,
const gchar *modest_account_name,
ModestMsgViewWindowPrivate *priv = NULL;
TnyFolder *header_folder = NULL;
ModestHeaderView *header_view = NULL;
- ModestMainWindow *main_window = NULL;
- ModestWindowMgr *window_mgr = NULL;
-
+ ModestWindow *main_window = NULL;
+
window = g_object_new(MODEST_TYPE_MSG_VIEW_WINDOW, NULL);
g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), NULL);
- modest_msg_view_window_construct (window, msg, modest_account_name, msg_uid);
+
+ modest_msg_view_window_construct (window, modest_account_name, msg_uid);
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
/* Remember the message list's TreeModel so we can detect changes
* and change the list selection when necessary: */
- window_mgr = modest_runtime_get_window_mgr();
- g_assert(window_mgr != NULL);
- main_window = MODEST_MAIN_WINDOW(
- modest_window_mgr_get_main_window(window_mgr));
- g_assert(main_window != NULL);
+
+ main_window = modest_window_mgr_get_main_window(
+ modest_runtime_get_window_mgr(), FALSE); /* don't create */
+ if (!main_window) {
+ g_warning ("%s: BUG: no main window", __FUNCTION__);
+ return NULL;
+ }
+
header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget(
- main_window, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW));
+ MODEST_MAIN_WINDOW(main_window),
+ MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW));
if (header_view != NULL){
header_folder = modest_header_view_get_folder(header_view);
g_assert(header_folder != NULL);
MODEST_HEADER_VIEW_OBSERVER(window));
}
+ gtk_widget_show_all (GTK_WIDGET (window));
+
+ tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg);
+ update_window_title (MODEST_MSG_VIEW_WINDOW (window));
+
modest_msg_view_window_update_priority (window);
/* Check toolbar dimming rules */
window = g_object_new(MODEST_TYPE_MSG_VIEW_WINDOW, NULL);
g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), NULL);
- modest_msg_view_window_construct (window, msg, modest_account_name, msg_uid);
+ modest_msg_view_window_construct (window, modest_account_name, msg_uid);
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
* so we can disable some UI appropriately: */
priv->is_search_result = TRUE;
+ tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg);
+
return MODEST_WINDOW(window);
}
const gchar *msg_uid)
{
GObject *obj = NULL;
+ ModestMsgViewWindowPrivate *priv;
g_return_val_if_fail (msg, NULL);
obj = g_object_new(MODEST_TYPE_MSG_VIEW_WINDOW, NULL);
+ priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (obj);
modest_msg_view_window_construct (MODEST_MSG_VIEW_WINDOW (obj),
- msg, modest_account_name, msg_uid);
+ modest_account_name, msg_uid);
+
+ tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg);
return MODEST_WINDOW(obj);
}
*/
if (priv->header_model == NULL) {
msg = modest_msg_view_window_get_message (self);
- header = tny_msg_get_header (msg);
- g_object_unref (msg);
+ if (msg) {
+ header = tny_msg_get_header (msg);
+ g_object_unref (msg);
+ }
return header;
}
msg_view = MODEST_MSG_VIEW (priv->msg_view);
- return modest_msg_view_get_message (msg_view);
+ return tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view));
}
const gchar*
gchar *current_search;
ModestMsgViewWindowPrivate *priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (obj);
- if (modest_msg_view_get_message_is_empty (MODEST_MSG_VIEW (priv->msg_view))) {
+ if (modest_mime_part_view_is_empty (MODEST_MIME_PART_VIEW (priv->msg_view))) {
hildon_banner_show_information (NULL, NULL, _("mail_ib_nothing_to_find"));
return;
}
gboolean result;
g_free (priv->last_search);
priv->last_search = g_strdup (current_search);
- result = modest_msg_view_search (MODEST_MSG_VIEW (priv->msg_view),
- priv->last_search);
+ result = modest_isearch_view_search (MODEST_ISEARCH_VIEW (priv->msg_view),
+ priv->last_search);
if (!result) {
hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_no_matches"));
g_free (priv->last_search);
modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view));
}
} else {
- if (!modest_msg_view_search_next (MODEST_MSG_VIEW (priv->msg_view))) {
+ if (!modest_isearch_view_search_next (MODEST_ISEARCH_VIEW (priv->msg_view))) {
hildon_banner_show_information (NULL, NULL, dgettext("hildon-libs", "ckct_ib_find_search_complete"));
g_free (priv->last_search);
priv->last_search = NULL;
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
- modest_msg_view_set_zoom (MODEST_MSG_VIEW (priv->msg_view), zoom);
+ modest_zoomable_set_zoom (MODEST_ZOOMABLE (priv->msg_view), zoom);
action = gtk_ui_manager_get_action (parent_priv->ui_manager,
"/MenuBar/ViewMenu/ZoomMenu/Zoom50Menu");
g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window), 1.0);
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
- return modest_msg_view_get_zoom (MODEST_MSG_VIEW (priv->msg_view));
+ return modest_zoomable_get_zoom (MODEST_ZOOMABLE (priv->msg_view));
}
static gboolean
}
/* New mail operation */
- mail_op = modest_mail_operation_new_with_error_handling (op_type,
- G_OBJECT(window),
+ mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(window),
modest_ui_actions_get_msgs_full_error_handler,
- NULL);
+ NULL, NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
modest_mail_operation_get_msg (mail_op, header, view_msg_cb, row_reference);
/* Mark header as read */
if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN))
- tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+ tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
/* Set new message */
- modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), msg);
+ tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg);
modest_msg_view_window_update_priority (self);
update_window_title (MODEST_MSG_VIEW_WINDOW (self));
modest_msg_view_grab_focus (MODEST_MSG_VIEW (priv->msg_view));
folder_type = TNY_FOLDER_TYPE_UNKNOWN;
- msg = modest_msg_view_get_message (MODEST_MSG_VIEW (priv->msg_view));
+ msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view));
if (msg) {
TnyFolder *folder;
folder = tny_msg_get_folder (msg);
-
if (folder) {
folder_type = tny_folder_get_folder_type (folder);
-
- if (folder_type == TNY_FOLDER_TYPE_NORMAL || folder_type == TNY_FOLDER_TYPE_UNKNOWN) {
- const gchar *fname = tny_folder_get_name (folder);
- folder_type = modest_tny_folder_guess_folder_type_from_name (fname);
- }
-
g_object_unref (folder);
}
g_object_unref (msg);
modest_msg_view_window_view_attachment (ModestMsgViewWindow *window, TnyMimePart *mime_part)
{
ModestMsgViewWindowPrivate *priv;
+ const gchar *msg_uid;
+ gchar *attachment_uid = NULL;
+ gint attachment_index = 0;
+ GList *attachments;
+
g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (window));
g_return_if_fail (TNY_IS_MIME_PART (mime_part) || (mime_part == NULL));
-
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE (window);
+ msg_uid = modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (window));
+ attachments = modest_msg_view_get_attachments (MODEST_MSG_VIEW (priv->msg_view));
+ attachment_index = g_list_index (attachments, mime_part);
+ g_list_free (attachments);
+
+ if (msg_uid && attachment_index >= 0) {
+ attachment_uid = g_strdup_printf ("%s/%d", msg_uid, attachment_index);
+ }
+
if (mime_part == NULL) {
gboolean error = FALSE;
GList *selected_attachments = modest_msg_view_get_selected_attachments (MODEST_MSG_VIEW (priv->msg_view));
gchar *filepath = NULL;
const gchar *att_filename = tny_mime_part_get_filename (mime_part);
TnyFsStream *temp_stream = NULL;
-
- temp_stream = modest_maemo_utils_create_temp_stream (att_filename, &filepath);
+ temp_stream = modest_maemo_utils_create_temp_stream (att_filename, attachment_uid, &filepath);
if (temp_stream) {
const gchar *content_type;
g_warning ("window for is already being created");
} else {
/* it's not found, so create a new window for it */
- modest_window_mgr_register_header (mgr, header); /* register the uid before building the window */
+ modest_window_mgr_register_header (mgr, header, attachment_uid); /* register the uid before building the window */
gchar *account = g_strdup (modest_window_get_active_account (MODEST_WINDOW (window)));
if (!account)
account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ());
- msg_win = modest_msg_view_window_new_for_attachment (TNY_MSG (mime_part), account, NULL);
+ msg_win = modest_msg_view_window_new_for_attachment (TNY_MSG (mime_part), account, attachment_uid);
modest_window_set_zoom (MODEST_WINDOW (msg_win),
modest_window_get_zoom (MODEST_WINDOW (window)));
modest_window_mgr_register_window (mgr, msg_win);
TnyStream *stream;
SaveMimePartPair *pair = (SaveMimePartPair *) info->pairs->data;
- result = gnome_vfs_create (&handle, pair->filename, GNOME_VFS_OPEN_WRITE, FALSE, 0777);
+ result = gnome_vfs_create (&handle, pair->filename, GNOME_VFS_OPEN_WRITE, FALSE, 0444);
if (result == GNOME_VFS_OK) {
stream = tny_vfs_stream_new (handle);
tny_mime_part_decode_to_stream (pair->part, stream);
if (!is_ok) {
save_mime_part_info_free (info, TRUE);
} else {
+ GtkWidget *banner = hildon_banner_show_animation (NULL, NULL,
+ _CS("sfil_ib_saving"));
+ info->banner = g_object_ref (banner);
g_thread_create ((GThreadFunc)save_mime_part_to_file, info, FALSE, NULL);
+ g_object_unref (banner);
}
}
if (files_to_save != NULL) {
SaveMimePartInfo *info = g_slice_new0 (SaveMimePartInfo);
- GtkWidget *banner = hildon_banner_show_animation (NULL, NULL,
- _CS("sfil_ib_saving"));
info->pairs = files_to_save;
- info->banner = banner;
info->result = TRUE;
- g_object_ref (banner);
save_mime_parts_to_file_with_checks (info);
}
}
/* modest_msg_view_remove_attachment (MODEST_MSG_VIEW (priv->msg_view), node->data); */
}
- msg = modest_msg_view_get_message (MODEST_MSG_VIEW (priv->msg_view));
- modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), NULL);
+ msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view));
+ tny_msg_view_clear (TNY_MSG_VIEW (priv->msg_view));
tny_msg_rewrite_cache (msg);
- modest_msg_view_set_message (MODEST_MSG_VIEW (priv->msg_view), msg);
+ tny_msg_view_set_msg (TNY_MSG_VIEW (priv->msg_view), msg);
g_list_foreach (mime_parts, (GFunc) g_object_unref, NULL);
g_list_free (mime_parts);
TnyMsg *msg = NULL;
TnyHeader *header = NULL;
const gchar *subject = NULL;
+
+ msg = tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view));
- msg = modest_msg_view_get_message (MODEST_MSG_VIEW (priv->msg_view));
if (msg != NULL) {
header = tny_msg_get_header (msg);
subject = tny_header_get_subject (header);
gtk_window_set_title (GTK_WINDOW (window), subject);
}
+
static void on_move_focus (ModestMsgViewWindow *window,
GtkDirectionType direction,
gpointer userdata)
projects / modest / blobdiff