#include <modest-widget-memory.h>
#include <modest-account-mgr-helpers.h>
+#include <gtkhtml/gtkhtml.h>
static void modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass);
static void modest_msg_edit_window_init (ModestMsgEditWindow *obj);
GtkWidget *msg_body;
- ModestProtoList *from_field_protos;
+ ModestPairList *from_field_protos;
GtkWidget *from_field;
GtkWidget *to_field;
GtkWidget *to_button, *cc_button, *bcc_button;
GtkWidget *header_table;
GtkWidget *main_vbox;
+ GtkWidget *msg_vbox;
+ GtkWidget *scrolled_window;
ModestMsgEditWindowPrivate *priv;
ModestWindowPrivate *parent_priv;
gtk_table_attach_defaults (GTK_TABLE(header_table), priv->bcc_field, 1,2,3,4);
gtk_table_attach_defaults (GTK_TABLE(header_table), priv->subject_field,1,2,4,5);
- priv->msg_body = gtk_text_view_new ();
+ priv->msg_body = gtk_html_new ();
+ gtk_html_load_empty (GTK_HTML (priv->msg_body));
+ gtk_html_set_editable (GTK_HTML (priv->msg_body), TRUE);
- main_vbox = gtk_vbox_new (FALSE, 6);
+ main_vbox = gtk_vbox_new (FALSE, 0);
+
+ scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_box_pack_start (GTK_BOX(main_vbox), priv->menubar, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX(main_vbox), priv->toolbar, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX(main_vbox), header_table, FALSE, FALSE, 6);
- gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 6);
+ gtk_box_pack_start (GTK_BOX(main_vbox), scrolled_window, TRUE, TRUE, 0);
+
+ msg_vbox = gtk_vbox_new (FALSE, 0);
+ gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), msg_vbox);
+
+ gtk_box_pack_start (GTK_BOX(msg_vbox), header_table, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(msg_vbox), priv->msg_body, TRUE, TRUE, 0);
gtk_widget_show_all (GTK_WIDGET(main_vbox));
gtk_container_add (GTK_CONTAINER(obj), main_vbox);
set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
{
TnyHeader *header;
- GtkTextBuffer *buf;
const gchar *to, *cc, *bcc, *subject;
ModestMsgEditWindowPrivate *priv;
gchar *body;
gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);
- buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW(priv->msg_body));
body = modest_tny_msg_get_body (msg, FALSE, NULL);
- if (body)
- gtk_text_buffer_set_text (buf, body, -1);
+ gtk_html_set_editable (GTK_HTML (priv->msg_body), FALSE);
+ if (body) {
+ gtk_html_load_from_string (GTK_HTML (priv->msg_body), body, -1);
+ }
+ gtk_html_set_editable (GTK_HTML (priv->msg_body), TRUE);
g_free (body);
}
ModestWindow *
-modest_msg_edit_window_new (TnyMsg *msg, const gchar *account)
+modest_msg_edit_window_new (TnyMsg *msg, const gchar *account,
+ gboolean preserve_is_rich)
{
ModestMsgEditWindow *self;
ModestMsgEditWindowPrivate *priv;
return MODEST_WINDOW(self);
}
+static gboolean
+html_export_save_buffer (gpointer engine,
+ const gchar *data,
+ size_t len,
+ GString **buffer)
+{
+ *buffer = g_string_append (*buffer, data);
+ return TRUE;
+}
+
MsgData *
modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
const gchar *account_name;
gchar *from_string = NULL;
ModestMsgEditWindowPrivate *priv;
+ GString *buffer;
g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (edit_window), NULL);
data->cc = g_strdup ( gtk_entry_get_text (GTK_ENTRY(priv->cc_field)));
data->bcc = g_strdup ( gtk_entry_get_text (GTK_ENTRY(priv->bcc_field)));
data->subject = g_strdup ( gtk_entry_get_text (GTK_ENTRY(priv->subject_field)));
- data->msg_id = 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 = gtk_text_buffer_get_text (buf, &b, &e, FALSE); /* Returns a copy. */
+/* 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 = gtk_text_buffer_get_text (buf, &b, &e, FALSE); /\* Returns a copy. *\/ */
- /* No rich supported yet, then html body is NULL */
- data->html_body = NULL;
+ buffer = g_string_new ("");
+ gtk_html_export (GTK_HTML (priv->msg_body), "text/html", (GtkHTMLSaveReceiverFn) html_export_save_buffer, &buffer);
+ data->html_body = g_string_free (buffer, FALSE);
+ buffer = g_string_new ("");
+ gtk_html_export (GTK_HTML (priv->msg_body), "text/plain", (GtkHTMLSaveReceiverFn) html_export_save_buffer, &buffer);
+ data->plain_body = g_string_free (buffer, FALSE);
return data;
}
void
modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window,
- GList *att_list)
+ TnyList *att_list)
{
g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
g_message ("Remove attachments operation is not supported");
}
+void
+modest_msg_edit_window_get_parts_size (ModestMsgEditWindow *window,
+ gint *parts_count,
+ guint64 *parts_size)
+{
+ *parts_count = 0;
+ *parts_size = 0;
+}
+
void
modest_msg_edit_window_show_cc (ModestMsgEditWindow *window,
gboolean show)
}
gboolean
-modest_msg_edit_window_check_names (ModestMsgEditWindow *window)
+modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to_addressbook)
{
g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window);
priv->sent = sent;
}
+
+GtkWidget *
+modest_msg_edit_window_get_child_widget (ModestMsgEditWindow *win,
+ ModestMsgEditWindowWidgetType widget_type)
+{
+ ModestMsgEditWindowPrivate *priv;
+
+ g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (win), NULL);
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (win);
+
+ switch (widget_type) {
+ case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_BODY:
+ return priv->msg_body;
+ break;
+ case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_TO:
+ return priv->to_field;
+ break;
+ case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_CC:
+ return priv->cc_field;
+ break;
+ case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_BCC:
+ return priv->bcc_field;
+ break;
+ case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_SUBJECT:
+ return priv->subject_field;
+ break;
+ case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_ATTACHMENTS:
+ return NULL;
+ break;
+ default:
+ return NULL;
+ }
+ return NULL;
+}
+
+/* FUNCTIONS NOT IMPLEMENTED YET */
+
+void
+modest_msg_edit_window_set_modified (ModestMsgEditWindow *window,
+ gboolean modified)
+{
+ g_message (__FUNCTION__);
+}
+
+void
+modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window,
+ gboolean show)
+{
+ g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+}
+
+void
+modest_msg_edit_window_add_part (ModestMsgEditWindow *window,
+ TnyMimePart *part)
+{
+ g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+}
+
+void
+modest_msg_edit_window_redo (ModestMsgEditWindow *window)
+{
+ g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+}
+
+void
+modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window)
+{
+ g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+}
+
+void
+modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window, const gchar *file_uri)
+{
+ g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+}
+
+void
+modest_msg_edit_window_set_draft (ModestMsgEditWindow *window,
+ TnyMsg *draft)
+{
+ g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+}
+
+gboolean
+modest_msg_edit_window_is_modified (ModestMsgEditWindow *window)
+{
+ g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+ return TRUE;
+}
+
+const gchar *
+modest_msg_edit_window_get_clipboard_text (ModestMsgEditWindow *win)
+{
+ g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+ return NULL;
+}
+
+gboolean
+modest_msg_edit_window_can_redo (ModestMsgEditWindow *window)
+{
+ g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+ return FALSE;
+}
+gboolean
+modest_msg_edit_window_can_undo (ModestMsgEditWindow *window)
+{
+ g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+ return FALSE;
+}
+
+const gchar*
+modest_msg_edit_window_get_message_uid (ModestMsgEditWindow *window)
+{
+ g_message ("NOT IMPLEMENTED %s", __FUNCTION__);
+ return NULL;
+}
projects / modest / blobdiff