#define DEFAULT_SIZE_COMBOBOX_WIDTH 80
#define DEFAULT_MAIN_VBOX_SPACING 6
#define SUBJECT_MAX_LENGTH 1000
-#define IMAGE_MAX_WIDTH 640
+#define IMAGE_MAX_WIDTH 608
#define DEFAULT_FONT_SCALE 1.5
static void modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass);
static void reset_modified (ModestMsgEditWindow *editor);
static void text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *window);
-static void text_buffer_delete_range (GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end, gpointer userdata);
static void text_buffer_can_undo (GtkTextBuffer *buffer, gboolean can_undo, ModestMsgEditWindow *window);
static void text_buffer_can_redo (GtkTextBuffer *buffer, gboolean can_redo, ModestMsgEditWindow *window);
+static void text_buffer_apply_tag (GtkTextBuffer *buffer, GtkTextTag *tag,
+ GtkTextIter *start, GtkTextIter *end,
+ gpointer userdata);
static void text_buffer_delete_images_by_id (GtkTextBuffer *buffer, const gchar * image_id);
static void subject_field_changed (GtkEditable *editable, ModestMsgEditWindow *window);
static void modest_msg_edit_window_color_button_change (ModestMsgEditWindow *window,
ModestMsgEditWindow *window);
/* ModestWindow methods implementation */
-static void modest_msg_edit_window_set_zoom (ModestWindow *window, gdouble zoom);
+static void modest_msg_edit_window_disconnect_signals (ModestWindow *window);
+static void modest_msg_edit_window_set_zoom (ModestWindow *window, gdouble zoom);
static gdouble modest_msg_edit_window_get_zoom (ModestWindow *window);
static gboolean modest_msg_edit_window_zoom_minus (ModestWindow *window);
static gboolean modest_msg_edit_window_zoom_plus (ModestWindow *window);
GtkTextIter *match_start,
GtkTextIter *match_end);
+static void DEBUG_BUFFER (WPTextBuffer *buffer)
+{
+#ifdef DEBUG
+ GtkTextIter iter;
+
+ g_message ("BEGIN BUFFER OF SIZE %d", gtk_text_buffer_get_char_count (GTK_TEXT_BUFFER (buffer)));
+ gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (buffer), &iter);
+ while (!gtk_text_iter_is_end (&iter)) {
+ GString *output = g_string_new ("");
+ GSList *toggled_tags;
+ GSList *node;
+
+ toggled_tags = gtk_text_iter_get_toggled_tags (&iter, FALSE);
+ g_string_append_printf (output, "%d: CLOSED [ ", gtk_text_iter_get_offset (&iter));
+ for (node = toggled_tags; node != NULL; node = g_slist_next (node)) {
+ GtkTextTag *tag = (GtkTextTag *) node->data;
+ const gchar *name;
+ g_object_get (G_OBJECT (tag), "name", &name, NULL);
+ output = g_string_append (output, name);
+ g_string_append (output, " ");
+ }
+ output = g_string_append (output, "] OPENED [ ");
+ toggled_tags = gtk_text_iter_get_toggled_tags (&iter, TRUE);
+ for (node = toggled_tags; node != NULL; node = g_slist_next (node)) {
+ GtkTextTag *tag = (GtkTextTag *) node->data;
+ const gchar *name;
+ g_object_get (G_OBJECT (tag), "name", &name, NULL);
+ output = g_string_append (output, name);
+ g_string_append (output, " ");
+ }
+ output = g_string_append (output, "]\n");
+ g_message ("%s", output->str);
+ g_string_free (output, TRUE);
+ gtk_text_iter_forward_to_tag_toggle (&iter, NULL);
+ }
+ g_message ("END BUFFER");
+#endif
+}
/* static gboolean */
GtkWidget *cc_caption;
GtkWidget *bcc_caption;
+ gboolean update_caption_visibility;
GtkWidget *attachments_caption;
GtkTextBuffer *text_buffer;
gulong clipboard_change_handler_id;
TnyMsg *draft_msg;
+ TnyMsg *outbox_msg;
gboolean sent;
};
modest_window_class->zoom_minus_func = modest_msg_edit_window_zoom_minus;
modest_window_class->show_toolbar_func = modest_msg_edit_window_show_toolbar;
modest_window_class->save_state_func = save_state;
+ modest_window_class->disconnect_signals_func = modest_msg_edit_window_disconnect_signals;
g_type_class_add_private (gobject_class, sizeof(ModestMsgEditWindowPrivate));
-
-
}
static void
priv->cc_caption = NULL;
priv->bcc_caption = NULL;
+ priv->update_caption_visibility = FALSE;
priv->priority_flags = 0;
priv->last_search = NULL;
priv->draft_msg = NULL;
+ priv->outbox_msg = NULL;
priv->clipboard_change_handler_id = 0;
priv->sent = FALSE;
}
GtkWidget *subject_box;
GtkWidget *attachment_icon;
GtkWidget *window_box;
-
+#if (GTK_MINOR_VERSION >= 10)
+ GdkAtom deserialize_type;
+#endif
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
priv->text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
g_object_set (priv->text_buffer, "font_scale", DEFAULT_FONT_SCALE, NULL);
wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
+#if (GTK_MINOR_VERSION >= 10)
gtk_text_buffer_register_serialize_tagset(GTK_TEXT_BUFFER(priv->text_buffer), "wp-text-buffer");
- gtk_text_buffer_register_deserialize_tagset(GTK_TEXT_BUFFER(priv->text_buffer), "wp-text-buffer");
-
+ deserialize_type = gtk_text_buffer_register_deserialize_tagset(GTK_TEXT_BUFFER(priv->text_buffer),
+ "wp-text-buffer");
+ gtk_text_buffer_deserialize_set_can_create_tags (GTK_TEXT_BUFFER (priv->text_buffer),
+ deserialize_type, TRUE);
+#endif
wp_text_buffer_reset_buffer (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
priv->find_toolbar = hildon_find_toolbar_new (NULL);
g_signal_connect (G_OBJECT (priv->text_buffer), "refresh_attributes",
G_CALLBACK (text_buffer_refresh_attributes), obj);
- g_signal_connect (G_OBJECT (priv->text_buffer), "delete-range",
- G_CALLBACK (text_buffer_delete_range), obj);
g_signal_connect (G_OBJECT (priv->text_buffer), "can-undo",
G_CALLBACK (text_buffer_can_undo), obj);
g_signal_connect (G_OBJECT (priv->text_buffer), "can-redo",
g_signal_connect (G_OBJECT (obj), "window-state-event",
G_CALLBACK (modest_msg_edit_window_window_state_event),
NULL);
+ g_signal_connect_after (G_OBJECT (priv->text_buffer), "apply-tag",
+ G_CALLBACK (text_buffer_apply_tag), obj);
g_signal_connect_swapped (G_OBJECT (priv->to_field), "open-addressbook",
G_CALLBACK (modest_msg_edit_window_open_addressbook), obj);
g_signal_connect_swapped (G_OBJECT (priv->cc_field), "open-addressbook",
gtk_container_set_focus_vadjustment (GTK_CONTAINER (main_vbox), gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll)));
gtk_widget_show_all (GTK_WIDGET(priv->scroll));
- if (!modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, NULL)) {
- gtk_widget_set_no_show_all (priv->cc_caption, TRUE);
- gtk_widget_hide (priv->cc_caption);
- }
- if (!modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, NULL)) {
- gtk_widget_set_no_show_all (priv->bcc_caption, TRUE);
- gtk_widget_hide (priv->bcc_caption);
- }
-
window_box = gtk_vbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (window_box), priv->scroll, TRUE, TRUE, 0);
- gtk_box_pack_end (GTK_BOX (window_box), priv->find_toolbar, FALSE, FALSE, 0);
gtk_container_add (GTK_CONTAINER(obj), window_box);
priv->scroll_area = modest_scroll_area_new (priv->scroll, priv->msg_body);
gtk_container_add (GTK_CONTAINER (frame), priv->scroll_area);
- /*
- TODO: scroll_area was never instantiated.
- Stop building without warnings-as-errors. murrayc.
- gtk_container_set_focus_vadjustment (GTK_CONTAINER (scroll_area),
+ gtk_container_set_focus_vadjustment (GTK_CONTAINER (priv->scroll_area),
gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll)));
- */
priv->clipboard_change_handler_id = g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_PRIMARY)), "owner-change",
G_CALLBACK (modest_msg_edit_window_clipboard_owner_change), obj);
+
}
+static void
+modest_msg_edit_window_disconnect_signals (ModestWindow *window)
+{
+ ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+ if (g_signal_handler_is_connected (gtk_clipboard_get (GDK_SELECTION_PRIMARY),
+ priv->clipboard_change_handler_id))
+ g_signal_handler_disconnect (gtk_clipboard_get (GDK_SELECTION_PRIMARY),
+ priv->clipboard_change_handler_id);
+}
static void
modest_msg_edit_window_finalize (GObject *obj)
{
ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (obj);
- if (priv->clipboard_change_handler_id > 0) {
- g_signal_handler_disconnect (gtk_clipboard_get (GDK_SELECTION_PRIMARY), priv->clipboard_change_handler_id);
- priv->clipboard_change_handler_id = 0;
- }
+ /* Sanity check: shouldn't be needed, the window mgr should
+ call this function before */
+ modest_msg_edit_window_disconnect_signals (MODEST_WINDOW (obj));
if (priv->draft_msg != NULL) {
TnyHeader *header = tny_msg_get_header (priv->draft_msg);
g_object_unref (priv->draft_msg);
priv->draft_msg = NULL;
}
+ if (priv->outbox_msg != NULL) {
+ TnyHeader *header = tny_msg_get_header (priv->outbox_msg);
+ if (TNY_IS_HEADER (header)) {
+ ModestWindowMgr *mgr = modest_runtime_get_window_mgr ();
+ modest_window_mgr_unregister_header (mgr, header);
+ }
+ g_object_unref (priv->outbox_msg);
+ priv->outbox_msg = NULL;
+ }
/* This had to stay alive for as long as the combobox that used it: */
modest_pair_list_free (priv->from_field_protos);
return main_menu;
}
+static GdkPixbuf *
+pixbuf_from_stream (TnyStream *stream, const gchar *mime_type)
+{
+ GdkPixbufLoader *loader;
+ GdkPixbuf *pixbuf;
+
+ loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL);
+
+ if (loader == NULL)
+ return NULL;
+
+ tny_stream_reset (TNY_STREAM (stream));
+ while (!tny_stream_is_eos (TNY_STREAM (stream))) {
+ unsigned char read_buffer[128];
+ gint readed;
+ readed = tny_stream_read (TNY_STREAM (stream), (char *) read_buffer, 128);
+ if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, NULL))
+ break;
+ }
+
+ pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+ g_object_ref (pixbuf);
+ gdk_pixbuf_loader_close (loader, NULL);
+ g_object_unref (loader);
+
+ if (gdk_pixbuf_get_width (pixbuf) > IMAGE_MAX_WIDTH) {
+ GdkPixbuf *new_pixbuf;
+ gint new_height;
+ new_height = (gdk_pixbuf_get_height (pixbuf) * IMAGE_MAX_WIDTH) /
+ gdk_pixbuf_get_width (pixbuf);
+ new_pixbuf = gdk_pixbuf_scale_simple (pixbuf, IMAGE_MAX_WIDTH, new_height, GDK_INTERP_BILINEAR);
+ g_object_unref (pixbuf);
+ pixbuf = new_pixbuf;
+ }
+
+ return pixbuf;
+}
+
+static void
+replace_with_attachments (ModestMsgEditWindow *self, GList *attachments)
+{
+ ModestMsgEditWindowPrivate *priv;
+ GList *node;
+
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+
+ for (node = attachments; node != NULL; node = g_list_next (node)) {
+ TnyMimePart *part = (TnyMimePart *) node->data;
+ const gchar *cid = tny_mime_part_get_content_id (part);
+ const gchar *mime_type = tny_mime_part_get_content_type (part);
+ if ((cid != NULL)&&(mime_type != NULL)) {
+ TnyStream *stream = tny_mime_part_get_stream (part);
+ GdkPixbuf *pixbuf = pixbuf_from_stream (stream, mime_type);
+ g_object_unref (stream);
+
+ if (pixbuf != NULL) {
+/* wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf); */
+ g_object_unref (pixbuf);
+ }
+ }
+ }
+}
+
+static void
+update_last_cid (ModestMsgEditWindow *self, GList *attachments)
+{
+ GList *node;
+ ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+
+ for (node = attachments; node != NULL; node = g_list_next (node)) {
+ TnyMimePart *part = (TnyMimePart *) node->data;
+ const gchar *cid = tny_mime_part_get_content_id (part);
+ if (cid != NULL) {
+ char *invalid = NULL;
+ gint int_cid = strtol (cid, &invalid, 10);
+ if ((invalid != NULL) && (*invalid == '\0') && (int_cid > priv->last_cid)) {
+ priv->last_cid = int_cid;
+ }
+ }
+
+ }
+}
static void
-set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
+set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
{
TnyHeader *header;
const gchar *to, *cc, *bcc, *subject;
GtkTextIter iter;
TnyHeaderFlags priority_flags;
TnyFolder *msg_folder;
+ gboolean is_html = FALSE;
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
g_return_if_fail (TNY_IS_MSG (msg));
gtk_widget_set_no_show_all (priv->cc_caption, FALSE);
gtk_widget_show (priv->cc_caption);
} else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_CC, NULL)) {
- gtk_widget_set_no_show_all (priv->cc_caption, FALSE);
+ gtk_widget_set_no_show_all (priv->cc_caption, TRUE);
gtk_widget_hide (priv->cc_caption);
}
if (bcc) {
modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc);
- gtk_widget_set_no_show_all (priv->cc_caption, FALSE);
+ gtk_widget_set_no_show_all (priv->bcc_caption, FALSE);
gtk_widget_show (priv->bcc_caption);
} else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_BCC, NULL)) {
- gtk_widget_set_no_show_all (priv->bcc_caption, FALSE);
+ gtk_widget_set_no_show_all (priv->bcc_caption, TRUE);
gtk_widget_hide (priv->bcc_caption);
}
if (subject)
update_window_title (self);
wp_text_buffer_reset_buffer (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
- body = modest_tny_msg_get_body (msg, TRUE);
+ body = modest_tny_msg_get_body (msg, TRUE, &is_html);
if ((body == NULL)||(body[0] == '\0')) {
g_free (body);
body = modest_text_utils_convert_to_html ("");
+ is_html = FALSE;
}
wp_text_buffer_load_document_begin (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
wp_text_buffer_load_document_write (WP_TEXT_BUFFER (priv->text_buffer),
wp_text_buffer_load_document_end (WP_TEXT_BUFFER (priv->text_buffer));
g_free (body);
+ if (preserve_is_rich && !is_html) {
+ wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
/* Get the default format required from configuration */
- if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL)) {
+ } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL)) {
wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
}
} else {
gtk_widget_set_no_show_all (priv->attachments_caption, FALSE);
gtk_widget_show_all (priv->attachments_caption);
+ replace_with_attachments (self, priv->attachments);
}
+ update_last_cid (self, priv->attachments);
+
+ DEBUG_BUFFER (WP_TEXT_BUFFER (priv->text_buffer));
gtk_text_buffer_get_start_iter (priv->text_buffer, &iter);
gtk_text_buffer_place_cursor (priv->text_buffer, &iter);
/* we should set a reference to the incoming message if it is a draft */
msg_folder = tny_msg_get_folder (msg);
- if (msg_folder) {
- if (modest_tny_folder_is_local_folder (msg_folder) &&
- modest_tny_folder_get_local_folder_type (msg_folder) == TNY_FOLDER_TYPE_DRAFTS)
- priv->draft_msg = g_object_ref(msg);
+ if (msg_folder) {
+ if (modest_tny_folder_is_local_folder (msg_folder)) {
+ TnyFolderType type = modest_tny_folder_get_local_or_mmc_folder_type (msg_folder);
+ if (type == TNY_FOLDER_TYPE_DRAFTS)
+ priv->draft_msg = g_object_ref(msg);
+ if (type == TNY_FOLDER_TYPE_OUTBOX)
+ priv->outbox_msg = g_object_ref(msg);
+ }
g_object_unref (msg_folder);
}
}
ModestWindow*
-modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name)
+modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean preserve_is_rich)
{
GObject *obj;
ModestWindowPrivate *parent_priv;
modest_window_set_active_account (MODEST_WINDOW(obj), account_name);
modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj));
+ hildon_window_add_toolbar (HILDON_WINDOW (obj), GTK_TOOLBAR (priv->find_toolbar));
setup_insensitive_handlers (MODEST_MSG_EDIT_WINDOW (obj));
if (account_pair != NULL)
modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->from_field), account_pair->first);
- set_msg (MODEST_MSG_EDIT_WINDOW (obj), msg);
+ set_msg (MODEST_MSG_EDIT_WINDOW (obj), msg, preserve_is_rich);
text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (obj));
/* set initial state of cc and bcc */
action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewCcFieldMenu");
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
- modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, NULL));
+ modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action),
+ modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, NULL));
action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewBccFieldMenu");
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
- modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, NULL));
+ modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action),
+ modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, NULL));
/* Setup the file format */
conf = modest_runtime_get_conf ();
modest_msg_edit_window_set_file_format (MODEST_MSG_EDIT_WINDOW (obj), file_format);
update_paste_dimming (MODEST_MSG_EDIT_WINDOW (obj));
+ priv->update_caption_visibility = TRUE;
+
+ reset_modified (MODEST_MSG_EDIT_WINDOW (obj));
return (ModestWindow*) obj;
}
data->subject = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->subject_field)));
if (priv->draft_msg) {
data->draft_msg = g_object_ref (priv->draft_msg);
+ }
+ if (priv->outbox_msg) {
+ data->draft_msg = g_object_ref (priv->outbox_msg);
} else {
data->draft_msg = NULL;
}
GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
GtkTextIter b, e;
gtk_text_buffer_get_bounds (buf, &b, &e);
- data->plain_body = g_strdup (gtk_text_buffer_get_text (priv->text_buffer, &b, &e, FALSE)); /* returns a copy */
+ data->plain_body = modest_text_utils_text_buffer_get_text (priv->text_buffer); /* returns a copy */
if (wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer)))
data->html_body = get_formatted_data (edit_window); /* returns a copy. */
while (cursor) {
if (!(TNY_IS_MIME_PART(cursor->data))) {
g_warning ("strange data in attachment list");
+ cursor = g_list_next (cursor);
continue;
}
data->attachments = g_list_append (data->attachments,
buffer_format->cs.bold = ((buffer_format->bold&0x1) != (current_format->bold&0x1));
buffer_format->cs.italic = ((buffer_format->italic&0x1) != (current_format->italic&0x1));
- buffer_format->cs.color = gdk_color_equal(&(buffer_format->color), &(current_format->color));
+ buffer_format->cs.color = !gdk_color_equal(&(buffer_format->color), &(current_format->color));
buffer_format->cs.font_size = (buffer_format->font_size != current_format->font_size);
buffer_format->cs.font = (buffer_format->font != current_format->font);
buffer_format->cs.justification = (buffer_format->justification != current_format->justification);
if (buffer_format->cs.font) {
wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT, (gpointer) (buffer_format->font));
}
+ wp_text_buffer_thaw (WP_TEXT_BUFFER (priv->text_buffer));
if (buffer_format->cs.bullet) {
- wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BULLET, (gpointer) ((int)buffer_format->bullet));
+ wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_BULLET, (gpointer) ((buffer_format->bullet)?1:0));
}
/* wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), buffer_format); */
- wp_text_buffer_thaw (WP_TEXT_BUFFER (priv->text_buffer));
g_free (current_format);
}
static void
-toggle_action_set_active_block_notify (GtkToggleAction *action,
- gboolean value)
-{
- GSList *proxies = NULL;
-
- for (proxies = gtk_action_get_proxies (GTK_ACTION (action));
- proxies != NULL; proxies = g_slist_next (proxies)) {
- GtkWidget *widget = (GtkWidget *) proxies->data;
- gtk_action_block_activate_from (GTK_ACTION (action), widget);
- }
-
- gtk_toggle_action_set_active (action, value);
-
- for (proxies = gtk_action_get_proxies (GTK_ACTION (action));
- proxies != NULL; proxies = g_slist_next (proxies)) {
- GtkWidget *widget = (GtkWidget *) proxies->data;
- gtk_action_unblock_activate_from (GTK_ACTION (action), widget);
- }
-}
-
-static void
text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *window)
{
WPTextBufferFormat *buffer_format = g_new0 (WPTextBufferFormat, 1);
if (wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer))) {
action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatMenu/FileFormatFormattedTextMenu");
if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
- toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), TRUE);
+ modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), TRUE);
} else {
action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatMenu/FileFormatPlainTextMenu");
if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
- toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), TRUE);
+ modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), TRUE);
}
wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), buffer_format, FALSE);
action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ActionsBold");
- toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->bold);
+ modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->bold);
action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ActionsItalics");
- toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->italic);
+ modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->italic);
action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/BulletedListMenu");
- toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->bullet);
+ modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action), buffer_format->bullet);
g_signal_handlers_block_by_func (G_OBJECT (priv->font_color_button),
G_CALLBACK (modest_msg_edit_window_color_button_change),
}
+static TnyStream* create_stream_for_uri (const gchar* uri)
+{
+ if (!uri)
+ return NULL;
+
+ TnyStream *result = NULL;
+
+ GnomeVFSHandle *handle = NULL;
+ GnomeVFSResult test = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
+ if (test == GNOME_VFS_OK) {
+ /* Create the tinymail stream: */
+ /* Presumably tinymai will call gnome_vfs_close (handle) later. */
+ result = TNY_STREAM (tny_vfs_stream_new (handle));
+ }
+
+ return result;
+}
void
modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
uri = (const gchar *) uri_node->data;
result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
if (result == GNOME_VFS_OK) {
- GdkPixbufLoader *loader;
GdkPixbuf *pixbuf;
GnomeVFSFileInfo info;
gchar *filename, *basename, *escaped_filename;
TnyMimePart *mime_part;
- TnyStream *stream;
gchar *content_id;
const gchar *mime_type = NULL;
GnomeVFSURI *vfs_uri;
mime_part = tny_platform_factory_new_mime_part
(modest_runtime_get_platform_factory ());
- stream = TNY_STREAM (tny_vfs_stream_new (handle));
-
+
+ TnyStream *stream = create_stream_for_uri (uri);
tny_mime_part_construct_from_stream (mime_part, stream, mime_type);
content_id = g_strdup_printf ("%d", priv->last_cid);
basename = g_path_get_basename (filename);
tny_mime_part_set_filename (mime_part, basename);
g_free (basename);
+
+ pixbuf = pixbuf_from_stream (stream, mime_type);
+ if (pixbuf != NULL) {
+ insert_mark = gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer));
+ gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (priv->text_buffer), &position, insert_mark);
+ wp_text_buffer_insert_image (WP_TEXT_BUFFER (priv->text_buffer), &position, g_strdup (tny_mime_part_get_content_id (mime_part)), pixbuf);
+ }
+
priv->attachments = g_list_prepend (priv->attachments, mime_part);
modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
mime_part);
gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
g_free (filename);
- loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL);
- while (!tny_stream_is_eos (TNY_STREAM (stream))) {
- unsigned char read_buffer[128];
- gint readed;
- readed = tny_stream_read (TNY_STREAM (stream), (char *) read_buffer, 128);
- if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, NULL))
- break;
- }
- pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
- g_object_ref (pixbuf);
- gdk_pixbuf_loader_close (loader, NULL);
- g_object_unref (loader);
-
- if (gdk_pixbuf_get_width (pixbuf) > IMAGE_MAX_WIDTH) {
- GdkPixbuf *new_pixbuf;
- gint new_height;
- new_height = (gdk_pixbuf_get_height (pixbuf) * IMAGE_MAX_WIDTH) /
- gdk_pixbuf_get_width (pixbuf);
- new_pixbuf = gdk_pixbuf_scale_simple (pixbuf, IMAGE_MAX_WIDTH, new_height, GDK_INTERP_BILINEAR);
- g_object_unref (pixbuf);
- pixbuf = new_pixbuf;
- }
-
- if (pixbuf != NULL) {
- insert_mark = gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer));
- gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (priv->text_buffer), &position, insert_mark);
- wp_text_buffer_insert_image (WP_TEXT_BUFFER (priv->text_buffer), &position, g_strdup (tny_mime_part_get_content_id (mime_part)), pixbuf);
- }
}
}
}
void
-modest_msg_edit_window_attach_file (ModestMsgEditWindow *window)
+modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window)
{
ModestMsgEditWindowPrivate *priv;
gtk_widget_destroy (dialog);
for (uri_node = uris; uri_node != NULL; uri_node = g_slist_next (uri_node)) {
- const gchar *uri;
- GnomeVFSHandle *handle = NULL;
- GnomeVFSResult result;
-
- uri = (const gchar *) uri_node->data;
- result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
- if (result == GNOME_VFS_OK) {
- TnyMimePart *mime_part;
- TnyStream *stream;
- const gchar *mime_type = NULL;
- gchar *basename;
- gchar *escaped_filename;
- gchar *filename;
- gchar *content_id;
- GnomeVFSFileInfo info;
- GnomeVFSURI *vfs_uri;
-
- vfs_uri = gnome_vfs_uri_new (uri);
-
-
- escaped_filename = g_path_get_basename (gnome_vfs_uri_get_path (vfs_uri));
- filename = gnome_vfs_unescape_string_for_display (escaped_filename);
- g_free (escaped_filename);
- gnome_vfs_uri_unref (vfs_uri);
-
- if (gnome_vfs_get_file_info (uri,
- &info,
- GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
- GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE)
- == GNOME_VFS_OK)
- mime_type = gnome_vfs_file_info_get_mime_type (&info);
- mime_part = tny_platform_factory_new_mime_part
- (modest_runtime_get_platform_factory ());
- stream = TNY_STREAM (tny_vfs_stream_new (handle));
-
- tny_mime_part_construct_from_stream (mime_part, stream, mime_type);
-
- content_id = g_strdup_printf ("%d", priv->last_cid);
- tny_mime_part_set_content_id (mime_part, content_id);
- g_free (content_id);
- priv->last_cid++;
-
- basename = g_path_get_basename (filename);
- tny_mime_part_set_filename (mime_part, basename);
- g_free (basename);
-
- priv->attachments = g_list_prepend (priv->attachments, mime_part);
- modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
- mime_part);
- gtk_widget_set_no_show_all (priv->attachments_caption, FALSE);
- gtk_widget_show_all (priv->attachments_caption);
- gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
- g_free (filename);
-
- }
+ const gchar *uri = (const gchar *) uri_node->data;
+ modest_msg_edit_window_attach_file_one (window, uri);
}
g_slist_foreach (uris, (GFunc) g_free, NULL);
g_slist_free (uris);
}
void
-modest_msg_edit_window_attach_file_noninteractive (
+modest_msg_edit_window_attach_file_one (
ModestMsgEditWindow *window,
- const gchar *file_uri)
+ const gchar *uri)
{
+ g_return_if_fail (window);
+ g_return_if_fail (uri);
+
+ ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
- ModestMsgEditWindowPrivate *priv;
- priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-
- if (file_uri && strlen(file_uri)) {
- gint file_id = 0;
+ GnomeVFSHandle *handle = NULL;
+ GnomeVFSResult result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
+ if (result == GNOME_VFS_OK) {
+ TnyMimePart *mime_part;
+ TnyStream *stream;
+ const gchar *mime_type = NULL;
+ gchar *basename;
+ gchar *escaped_filename;
+ gchar *filename;
+ gchar *content_id;
+ GnomeVFSFileInfo info;
+ GnomeVFSURI *vfs_uri;
+
+ vfs_uri = gnome_vfs_uri_new (uri);
- /* TODO: We should probably try to use only the URI,
- * instead of using a filename.
- */
- gchar* filename = g_filename_from_uri (file_uri, NULL, NULL);
- if (!filename) {
- g_warning("%s: g_filename_from_uri('%s') failed.\n", __FUNCTION__, file_uri);
- }
-
- file_id = g_open (filename, O_RDONLY, 0);
- if (file_id != -1) {
- TnyMimePart *mime_part;
- TnyStream *stream;
- const gchar *mime_type;
- gchar *basename;
- gchar *content_id;
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
- mime_type = gnome_vfs_get_mime_type(filename);
-#else
- mime_type = gnome_vfs_get_file_mime_type_fast (filename, NULL);
-#endif
- mime_part = tny_platform_factory_new_mime_part
- (modest_runtime_get_platform_factory ());
- stream = TNY_STREAM (tny_fs_stream_new (file_id));
-
- tny_mime_part_construct_from_stream (mime_part, stream, mime_type);
-
- content_id = g_strdup_printf ("%d", priv->last_cid);
- tny_mime_part_set_content_id (mime_part, content_id);
- g_free (content_id);
- priv->last_cid++;
-
- basename = g_path_get_basename (filename);
- tny_mime_part_set_filename (mime_part, basename);
- g_free (basename);
-
- priv->attachments = g_list_prepend (priv->attachments, mime_part);
- modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
- mime_part);
- gtk_widget_set_no_show_all (priv->attachments_caption, FALSE);
- gtk_widget_show_all (priv->attachments_caption);
- } else if (file_id == -1) {
- close (file_id);
- g_warning("file to be attached does not exist: %s", filename);
- }
+ escaped_filename = g_path_get_basename (gnome_vfs_uri_get_path (vfs_uri));
+ filename = gnome_vfs_unescape_string_for_display (escaped_filename);
+ g_free (escaped_filename);
+ gnome_vfs_uri_unref (vfs_uri);
+
+ if (gnome_vfs_get_file_info (uri,
+ &info,
+ GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
+ GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE)
+ == GNOME_VFS_OK)
+ mime_type = gnome_vfs_file_info_get_mime_type (&info);
+ mime_part = tny_platform_factory_new_mime_part
+ (modest_runtime_get_platform_factory ());
+ stream = TNY_STREAM (tny_vfs_stream_new (handle));
+
+ tny_mime_part_construct_from_stream (mime_part, stream, mime_type);
+
+ content_id = g_strdup_printf ("%d", priv->last_cid);
+ tny_mime_part_set_content_id (mime_part, content_id);
+ g_free (content_id);
+ priv->last_cid++;
+
+ basename = g_path_get_basename (filename);
+ tny_mime_part_set_filename (mime_part, basename);
+ g_free (basename);
+
+ priv->attachments = g_list_prepend (priv->attachments, mime_part);
+ modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+ mime_part);
+ gtk_widget_set_no_show_all (priv->attachments_caption, FALSE);
+ gtk_widget_show_all (priv->attachments_caption);
+ gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
g_free (filename);
}
}
gboolean show)
{
ModestMsgEditWindowPrivate *priv = NULL;
- const gchar *recipients;
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+ if (!priv->update_caption_visibility)
+ return;
+
gtk_widget_set_no_show_all (priv->cc_caption, TRUE);
- recipients = modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->cc_field));
- if ((show) || ((recipients != NULL) && (recipients[0] != '\0')))
+ if (show)
gtk_widget_show (priv->cc_caption);
else
gtk_widget_hide (priv->cc_caption);
+
modest_conf_set_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, show, NULL);
}
gboolean show)
{
ModestMsgEditWindowPrivate *priv = NULL;
- const gchar *recipients;
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+ if (!priv->update_caption_visibility)
+ return;
+
gtk_widget_set_no_show_all (priv->bcc_caption, TRUE);
- recipients = modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->bcc_field));
- if ((show) || ((recipients != NULL) && (recipients[0] != '\0')))
+ if (show)
gtk_widget_show (priv->bcc_caption);
else
gtk_widget_hide (priv->bcc_caption);
+
modest_conf_set_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, show, NULL);
}
wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
} else {
GtkToggleAction *action = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatMenu/FileFormatFormattedTextMenu"));
- toggle_action_set_active_block_notify (action, TRUE);
+ modest_maemo_toggle_action_set_active_block_notify (action, TRUE);
}
}
break;
}
}
-static void
-text_buffer_delete_range (GtkTextBuffer *buffer, GtkTextIter *start, GtkTextIter *end, gpointer userdata)
-{
- ModestMsgEditWindow *window = (ModestMsgEditWindow *) userdata;
- GtkTextIter real_start, real_end;
- ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-
- if (gtk_text_iter_compare (start, end) > 0) {
- real_start = *end;
- real_end = *start;
- } else {
- real_start = *start;
- real_end = *end;
- }
- do {
- GSList *tags = gtk_text_iter_get_tags (&real_start);
- GSList *node;
- for (node = tags; node != NULL; node = g_slist_next (node)) {
- GtkTextTag *tag = (GtkTextTag *) node->data;
- if (g_object_get_data (G_OBJECT (tag), "image-set") != NULL) {
- gchar *image_id = g_object_get_data (G_OBJECT (tag), "image-index");
-
- modest_attachments_view_remove_attachment_by_id (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
- image_id);
- gtk_text_buffer_remove_tag (buffer, tag, start, end);
- }
- }
- } while (gtk_text_iter_forward_char (&real_start)&&
- (gtk_text_iter_compare (&real_start, &real_end)<=0));
-}
-
static gboolean
msg_body_focus (GtkWidget *focus,
GdkEventFocus *event,
}
gboolean
-modest_msg_edit_window_check_names (ModestMsgEditWindow *window)
+modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to_addressbook)
{
ModestMsgEditWindowPrivate *priv = NULL;
-
+
g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
return FALSE;
}
- if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field)))
+ if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field), add_to_addressbook))
return FALSE;
- if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field)))
+ if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field), add_to_addressbook))
return FALSE;
- if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field)))
+ if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field), add_to_addressbook))
return FALSE;
modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
modest_msg_edit_window_add_attachment_clicked (GtkButton *button,
ModestMsgEditWindow *window)
{
- modest_msg_edit_window_attach_file (window);
+ modest_msg_edit_window_offer_attach_file (window);
}
static void
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+
+ if (!GTK_WIDGET_VISIBLE (window))
+ return;
has_selection = gtk_clipboard_wait_for_targets (clipboard, NULL, NULL);
focused = gtk_window_get_focus (GTK_WINDOW (window));
gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
}
+gboolean
+message_is_empty (ModestMsgEditWindow *window)
+{
+ ModestMsgEditWindowPrivate *priv = NULL;
+
+ g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+ /** TODO: Add wpeditor API to tell us if there is any _visible_ text,
+ * so we can ignore markup.
+ */
+ GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
+ gint count = 0;
+ if (buf)
+ count = gtk_text_buffer_get_char_count (buf);
+
+ return count == 0;
+}
+
void
modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window,
gboolean show)
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
gtk_widget_set_no_show_all (priv->find_toolbar, FALSE);
+
if (show) {
gtk_widget_show_all (priv->find_toolbar);
hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->find_toolbar), TRUE);
GtkTextIter match_start, match_end;
gboolean continue_search = FALSE;
+ if (message_is_empty (window)) {
+ g_free (priv->last_search);
+ priv->last_search = NULL;
+ hildon_banner_show_information (GTK_WIDGET (window), NULL, _("mail_ib_nothing_to_find"));
+ return;
+ }
+
g_object_get (G_OBJECT (widget), "prefix", ¤t_search, NULL);
if ((current_search == NULL) || (strcmp (current_search, "") == 0)) {
g_free (current_search);
ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
GtkAction *action = NULL;
GtkClipboard *clipboard = NULL;
+ ModestEmailClipboard *e_clipboard;
GtkWidget *focused;
gboolean active;
focused = gtk_window_get_focus (GTK_WINDOW (window));
- clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
- active = gtk_clipboard_wait_is_text_available (clipboard);
+ e_clipboard = modest_runtime_get_email_clipboard ();
+ if (!modest_email_clipboard_cleared (e_clipboard)) {
+ active = TRUE;
+ } else {
+ clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+ active = gtk_clipboard_wait_is_text_available (clipboard);
+ }
if (active) {
if (MODEST_IS_ATTACHMENTS_VIEW (focused))
priv->draft_msg = draft;
}
+
+static void
+text_buffer_apply_tag (GtkTextBuffer *buffer, GtkTextTag *tag,
+ GtkTextIter *start, GtkTextIter *end,
+ gpointer userdata)
+{
+ ModestMsgEditWindow *window = MODEST_MSG_EDIT_WINDOW (userdata);
+ ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (userdata);
+ gchar *tag_name;
+
+ if (tag == NULL+13) return;
+ g_object_get (G_OBJECT (tag), "name", &tag_name, NULL);
+ if ((tag_name != NULL) && (g_str_has_prefix (tag_name, "image-tag-replace-"))) {
+ replace_with_attachments (window, priv->attachments);
+ }
+}
+
+void
+modest_msg_edit_window_add_part (ModestMsgEditWindow *window,
+ TnyMimePart *part)
+{
+ ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+ g_return_if_fail (TNY_IS_MIME_PART (part));
+ priv->attachments = g_list_prepend (priv->attachments, part);
+ g_object_ref (part);
+ modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), part);
+ gtk_widget_set_no_show_all (priv->attachments_caption, FALSE);
+ gtk_widget_show_all (priv->attachments_caption);
+ gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
+}
projects / modest / blobdiff