#include <string.h>
#include <tny-account-store.h>
#include <tny-fs-stream.h>
+#include <tny-vfs-stream.h>
#include <config.h>
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_mark_set (GtkTextBuffer *buffer, GtkTextIter *location, GtkTextMark *mark, gpointer userdata);
static void text_buffer_can_undo (GtkTextBuffer *buffer, gboolean can_undo, ModestMsgEditWindow *window);
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,
gpointer userdata);
static void modest_msg_edit_window_size_change (GtkCheckMenuItem *menu_item,
static void modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard,
GdkEvent *event,
ModestMsgEditWindow *window);
+static void update_window_title (ModestMsgEditWindow *window);
static void update_dimmed (ModestMsgEditWindow *window);
struct _ModestMsgEditWindowPrivate {
GtkWidget *msg_body;
GtkWidget *header_box;
+
+ ModestPairList *from_field_protos;
GtkWidget *from_field;
+
GtkWidget *to_field;
GtkWidget *cc_field;
GtkWidget *bcc_field;
/* FIXME: this is a dup from the one in gtk/ */
+
+/**
+ * @result: A ModestPairList, which must be freed with modest_pair_list_free().
+ */
static ModestPairList*
get_transports (void)
{
- ModestAccountMgr *account_mgr;
GSList *transports = NULL;
- GSList *cursor, *accounts;
- account_mgr = modest_runtime_get_account_mgr();
- cursor = accounts = modest_account_mgr_account_names (account_mgr,
+ ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr();
+ GSList *accounts = modest_account_mgr_account_names (account_mgr,
TRUE /* only enabled accounts. */);
+
+ GSList *cursor = accounts;
while (cursor) {
- gchar *account_name = (gchar*)cursor->data;
- gchar *from_string = modest_account_mgr_get_from_string (account_mgr,
+ const gchar *account_name = cursor->data;
+ gchar *from_string = NULL;
+ if (account_name) {
+ from_string = modest_account_mgr_get_from_string (account_mgr,
account_name);
- if (!from_string) {
- /* something went wrong: ignore this one */
- g_free (account_name);
- cursor->data = NULL;
- } else {
- ModestPair *pair;
- pair = modest_pair_new ((gpointer) account_name,
+ }
+
+ if (from_string && account_name) {
+ gchar *name = g_strdup (account_name);
+ ModestPair *pair = modest_pair_new ((gpointer) name,
(gpointer) from_string , TRUE);
transports = g_slist_prepend (transports, pair);
- } /* don't free account name; it's freed when the transports list is freed */
+ }
+
cursor = cursor->next;
}
g_slist_free (accounts);
static void
-text_buffer_mark_set (GtkTextBuffer *buffer, GtkTextIter *iter, GtkTextMark *mark, gpointer userdata)
-{
- ModestMsgEditWindow *window;
- ModestMsgEditWindowPrivate *priv;
- GdkRectangle location;
- gint v_scroll_min_value = 0;
- gint v_scroll_max_value = 0;
- gint v_scroll_visible;
- GtkAdjustment *vadj;
- GtkTextMark *insert_mark;
- GtkTextIter insert_iter;
-
- g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (userdata));
- g_return_if_fail (GTK_IS_TEXT_MARK (mark));
- window = MODEST_MSG_EDIT_WINDOW (userdata);
- priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-
- 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), &insert_iter, insert_mark);
- gtk_text_view_get_iter_location (GTK_TEXT_VIEW (priv->msg_body), &insert_iter, &location);
-
- if (priv->header_box)
- v_scroll_min_value += priv->header_box->allocation.height + DEFAULT_MAIN_VBOX_SPACING;
- v_scroll_min_value += location.y;
- v_scroll_max_value = v_scroll_min_value + location.height;
-
- v_scroll_visible = GTK_WIDGET (window)->allocation.height;
-
- vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->scroll));
-
- if (((gdouble) v_scroll_min_value) < vadj->value)
- gtk_adjustment_set_value (vadj, v_scroll_min_value);
- else if (((gdouble) v_scroll_max_value) > (vadj->value + vadj->page_size))
- gtk_adjustment_set_value (vadj, ((gdouble)v_scroll_max_value) - vadj->page_size);
-}
-
-static void
init_window (ModestMsgEditWindow *obj)
{
GtkWidget *from_caption, *to_caption, *subject_caption;
GtkWidget *main_vbox;
ModestMsgEditWindowPrivate *priv;
- ModestPairList *protos;
+
GtkSizeGroup *size_group;
GtkWidget *frame;
GtkWidget *scroll_area;
size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- protos = get_transports ();
- priv->from_field = modest_combo_box_new (protos, g_str_equal);
- modest_pair_list_free (protos);
+ /* Note: This ModestPairList* must exist for as long as the combo
+ * that uses it, because the ModestComboBox uses the ID opaquely,
+ * so it can't know how to manage its memory. */
+ priv->from_field_protos = get_transports ();
+
+ priv->from_field = modest_combo_box_new (priv->from_field_protos, g_str_equal);
priv->to_field = modest_recpt_editor_new ();
priv->cc_field = modest_recpt_editor_new ();
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), "mark-set",
- G_CALLBACK (text_buffer_mark_set), 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_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field))),
"changed", G_CALLBACK (to_field_changed), obj);
to_field_changed (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field)), MODEST_MSG_EDIT_WINDOW (obj));
+ g_signal_connect (G_OBJECT (priv->subject_field), "changed", G_CALLBACK (subject_field_changed), obj);
priv->scroll = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
{
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;
}
+
+ /* This had to stay alive for as long as the combobox that used it: */
+ modest_pair_list_free (priv->from_field_protos);
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
if (bcc)
modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc);
if (subject)
- gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);
+ gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);
+
+ update_window_title (self);
/* gtk_text_buffer_set_can_paste_rich_text (priv->text_buffer, TRUE); */
wp_text_buffer_reset_buffer (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
- body = modest_tny_msg_get_body (msg, FALSE);
+ body = modest_tny_msg_get_body (msg, TRUE);
if ((body == NULL)||(body[0] == '\0')) {
g_free (body);
tool_item = GTK_WIDGET (gtk_tool_item_new ());
priv->font_color_button = hildon_color_button_new ();
GTK_WIDGET_UNSET_FLAGS (tool_item, GTK_CAN_FOCUS);
+ GTK_WIDGET_UNSET_FLAGS (priv->font_color_button, GTK_CAN_FOCUS);
gtk_container_add (GTK_CONTAINER (tool_item), priv->font_color_button);
gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE);
gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);
GError *error = NULL;
GdkPixbuf *window_icon = NULL;
GtkAction *action;
+ ModestConf *conf;
+ gboolean prefer_formatted;
+ gint file_format;
g_return_val_if_fail (msg, NULL);
gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-msg-edit-window-ui.xml", &error);
if (error != NULL) {
g_warning ("Could not merge modest-msg-edit-window-ui.xml: %s", error->message);
- g_error_free (error);
- error = NULL;
+ g_clear_error (&error);
}
/* Add accelerators */
restore_settings (MODEST_MSG_EDIT_WINDOW(obj));
- gtk_window_set_title (GTK_WINDOW(obj), "Modest");
gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL);
g_signal_connect (G_OBJECT(obj), "delete-event",
gtk_action_set_sensitive (action, FALSE);
action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu");
gtk_action_set_sensitive (action, FALSE);
+
+ /* Setup the file format */
+ conf = modest_runtime_get_conf ();
+ prefer_formatted = modest_conf_get_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, &error);
+ if (error) {
+ g_clear_error (&error);
+ file_format = MODEST_FILE_FORMAT_FORMATTED_TEXT;
+ } else
+ file_format = (prefer_formatted) ?
+ MODEST_FILE_FORMAT_FORMATTED_TEXT :
+ MODEST_FILE_FORMAT_PLAIN_TEXT;
+ modest_msg_edit_window_set_file_format (MODEST_MSG_EDIT_WINDOW (obj), file_format);
- return (ModestWindow*)obj;
+ return (ModestWindow*) obj;
}
static gint
return 0;
}
+/**
+ * @result: A new string which should be freed with g_free().
+ */
static gchar *
get_formatted_data (ModestMsgEditWindow *edit_window)
{
{
MsgData *data;
const gchar *account_name;
- GtkTextBuffer *buf;
- GtkTextIter b, e;
ModestMsgEditWindowPrivate *priv;
g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (edit_window), NULL);
account_name = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->from_field));
g_return_val_if_fail (account_name, NULL);
- buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
- gtk_text_buffer_get_bounds (buf, &b, &e);
/* don't free these (except from) */
data = g_slice_new0 (MsgData);
data->from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
account_name);
- data->to = (gchar*) modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR(priv->to_field));
- data->cc = (gchar*) modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR(priv->cc_field));
- data->bcc = (gchar*) modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR(priv->bcc_field));
- data->subject = (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->subject_field));
- data->plain_body = (gchar *) gtk_text_buffer_get_text (priv->text_buffer, &b, &e, FALSE);
+ data->account_name = g_strdup (account_name);
+ data->to = g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->to_field)));
+ data->cc = g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->cc_field)));
+ data->bcc = g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->bcc_field)));
+ 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);
+ } 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 */
+
if (wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer)))
- data->html_body = get_formatted_data (edit_window);
+ data->html_body = get_formatted_data (edit_window); /* returns a copy. */
else
data->html_body = NULL;
- data->attachments = priv->attachments;
+
+ data->attachments = priv->attachments; /* TODO: copy and free ? */
data->priority_flags = priv->priority_flags;
return data;
}
+/* TODO: We must duplicate this implementation for GNOME and Maemo, but that is unwise. */
void
modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window,
MsgData *data)
{
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (edit_window));
- g_free (data->from);
- g_free (data->html_body);
+ if (!data)
+ return;
+
+ g_free (data->to);
+ g_free (data->cc);
+ g_free (data->bcc);
+ g_free (data->subject);
g_free (data->plain_body);
+ g_free (data->html_body);
+ if (data->draft_msg != NULL) {
+ g_object_unref (data->draft_msg);
+ data->draft_msg = NULL;
+ }
+ g_free (data->account_name);
+
+ /* TODO: Free data->attachments? */
+
g_slice_free (MsgData, data);
}
ModestMsgEditWindowPrivate *priv;
GtkWidget *dialog = NULL;
gint response = 0;
- gchar *filename = NULL;
+ gchar *uri = NULL, *filename = NULL;
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
response = gtk_dialog_run (GTK_DIALOG (dialog));
switch (response) {
case GTK_RESPONSE_OK:
+ uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
break;
default:
}
gtk_widget_destroy (dialog);
+ if (uri) {
+
+ GnomeVFSHandle *handle = NULL;
+ GnomeVFSResult result;
+
+ 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 *content_id;
+ GnomeVFSFileInfo info;
+
+ if (gnome_vfs_get_file_info_from_handle (handle, &info, GNOME_VFS_FILE_INFO_GET_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);
+ }
+ g_free (filename);
+ }
+}
+
+void
+modest_msg_edit_window_attach_file_noninteractive (
+ ModestMsgEditWindow *window,
+ gchar *filename)
+{
+
+ ModestMsgEditWindowPrivate *priv;
+
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
if (filename) {
gint file_id;
if (gtk_check_menu_item_get_active (menu_item)) {
gchar *markup;
+ WPTextBufferFormat format;
label = gtk_bin_get_child (GTK_BIN (menu_item));
new_size_index = atoi (gtk_label_get_text (GTK_LABEL (label)));
-
- if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE,
- (gpointer) wp_get_font_size_index (new_size_index, 12)))
- wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body));
+ memset (&format, 0, sizeof (format));
+ format.cs.font_size = TRUE;
+ format.font_size = wp_get_font_size_index (new_size_index, DEFAULT_FONT_SIZE);
+ wp_text_buffer_set_format (WP_TEXT_BUFFER (priv->text_buffer), &format);
+
+/* if (!wp_text_buffer_set_attribute (WP_TEXT_BUFFER (priv->text_buffer), WPT_FONT_SIZE, */
+/* (gpointer) wp_get_font_size_index (new_size_index, 12))) */
+/* wp_text_view_reset_and_show_im (WP_TEXT_VIEW (priv->msg_body)); */
text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (window));
markup = g_strconcat ("<span font_family='Serif'>", gtk_label_get_text (GTK_LABEL (label)), "</span>", NULL);
font_size, DEFAULT_FONT_SIZE);
fmt.cs.font_size = TRUE;
}
- gtk_widget_destroy (dialog);
-
- gtk_widget_grab_focus(GTK_WIDGET(priv->msg_body));
wp_text_buffer_set_format(WP_TEXT_BUFFER(priv->text_buffer), &fmt);
}
-
+ gtk_widget_destroy (dialog);
+
+ gtk_widget_grab_focus(GTK_WIDGET(priv->msg_body));
}
void
}
}
}
+ gtk_text_iter_forward_char (&iter);
}
}
GdkEventFocus *event,
gpointer userdata)
{
+
update_dimmed (MODEST_MSG_EDIT_WINDOW (userdata));
return FALSE;
}
action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu");
gtk_action_set_sensitive (action, (selection != NULL) && (!MODEST_IS_ATTACHMENTS_VIEW (focused)));
}
+
+static void
+update_window_title (ModestMsgEditWindow *window)
+{
+ ModestMsgEditWindowPrivate *priv = NULL;
+ const gchar *subject;
+
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+ subject = gtk_entry_get_text (GTK_ENTRY (priv->subject_field));
+ if (subject == NULL || subject[0] == '\0')
+ subject = _("mail_va_new_email");
+
+ gtk_window_set_title (GTK_WINDOW (window), subject);
+
+}
+
+static void
+subject_field_changed (GtkEditable *editable,
+ ModestMsgEditWindow *window)
+{
+ update_window_title (window);
+}
projects / modest / blobdiff