#define DEFAULT_FONT_SIZE 3
#define DEFAULT_FONT 2
#define DEFAULT_SIZE_BUTTON_FONT_FAMILY "Sans"
-#define DEFAULT_MAIN_VBOX_SPACING 6
+#define DEFAULT_MAIN_VBOX_SPACING 0
#define SUBJECT_MAX_LENGTH 1000
#define IMAGE_MAX_WIDTH 560
#define DEFAULT_FONT_SCALE 1.5
#define ATTACHMENT_BUTTON_WIDTH 118
#define MAX_FROM_VALUE 36
-#define MAX_BODY_LENGTH 4096
+#define MAX_BODY_LENGTH 128*1024
+#define MAX_BODY_LINES 2048
static gboolean is_wp_text_buffer_started = FALSE;
}
static void
+body_size_request (GtkWidget *body,
+ GtkRequisition *req,
+ gpointer user_data)
+{
+ /* Make sure the body always get at least 70 pixels */
+ if (req->height < 70)
+ req->height = 70;
+}
+
+static void
connect_signals (ModestMsgEditWindow *obj)
{
ModestMsgEditWindowPrivate *priv;
G_CALLBACK (msg_body_focus), obj);
g_signal_connect (G_OBJECT (priv->msg_body), "focus-out-event",
G_CALLBACK (msg_body_focus), obj);
+ g_signal_connect (G_OBJECT (priv->msg_body), "size-request",
+ G_CALLBACK (body_size_request), obj);
g_signal_connect (G_OBJECT (obj), "set-focus", G_CALLBACK (window_focus), obj);
g_signal_connect (G_OBJECT (modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR (priv->to_field))),
"changed", G_CALLBACK (recpt_field_changed), obj);
content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg));
- if (content_type && !g_strcasecmp (content_type, "multipart/related")) {
+ if (content_type && !g_ascii_strcasecmp (content_type, "multipart/related")) {
parent = g_object_ref (msg);
- } else if (content_type && !g_strcasecmp (content_type, "multipart/mixed")) {
+ } else if (content_type && !g_ascii_strcasecmp (content_type, "multipart/mixed")) {
TnyList *parts = TNY_LIST (tny_simple_list_new ());
TnyIterator *iter;
TnyMimePart *part;
part = TNY_MIME_PART (tny_iterator_get_current (iter));
content_type = tny_mime_part_get_content_type (part);
- if (content_type && !g_strcasecmp (content_type, "multipart/related")) {
+ if (content_type && !g_ascii_strcasecmp (content_type, "multipart/related")) {
parent = part;
break;
} else {
modest_tny_msg_get_references (TNY_MSG (msg), NULL, &(priv->references), &(priv->in_reply_to));
priority_flags = tny_header_get_priority (header);
- if (to)
- modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field), to);
+ if (to) {
+ gchar *quoted_names = modest_text_utils_quote_names (to);
+ modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field), quoted_names);
+ g_free (quoted_names);
+ }
field_view_set = TRUE;
if (cc) {
- modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field), cc);
+ gchar *quoted_names = modest_text_utils_quote_names (cc);
+ modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field), quoted_names);
+ g_free (quoted_names);
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)) {
field_view_set = TRUE;
if (bcc) {
- modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc);
+ gchar *quoted_names = modest_text_utils_quote_names (bcc);
+ modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), quoted_names);
+ g_free (quoted_names);
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)) {
dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window),
GTK_FILE_CHOOSER_ACTION_OPEN);
gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_select_attachment_title"));
- conf_folder = modest_conf_get_string (modest_runtime_get_conf (), MODEST_CONF_LATEST_ATTACH_FILE_PATH, NULL);
+ conf_folder = modest_conf_get_string (modest_runtime_get_conf (),
+ MODEST_CONF_LATEST_ATTACH_FILE_PATH, NULL);
if (conf_folder && conf_folder[0] != '\0') {
gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog), conf_folder);
} else {
gchar *docs_folder;
- /* Set the default folder to images folder */
- docs_folder = g_build_filename (g_getenv (MODEST_MAEMO_UTILS_MYDOCS_ENV),
- ".documents", NULL);
+ /* Set the default folder to documents folder */
+ docs_folder = (gchar *) g_strdup(g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS));
+ if (!docs_folder) {
+ /* fallback */
+ docs_folder = g_build_filename (g_getenv (MODEST_MAEMO_UTILS_MYDOCS_ENV),
+ ".documents", NULL);
+ }
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), docs_folder);
g_free (docs_folder);
}
gtk_widget_set_no_show_all (GTK_WIDGET (parent_priv->toolbar), TRUE);
- if (parent_priv->toolbar) {
- if (file_format == MODEST_FILE_FORMAT_PLAIN_TEXT) {
- gtk_widget_hide (parent_priv->toolbar);
- } else {
- gtk_widget_show (parent_priv->toolbar);
- }
- }
-
if (current_format != file_format) {
switch (file_format) {
case MODEST_FILE_FORMAT_FORMATTED_TEXT:
wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
remove_tags (WP_TEXT_BUFFER (priv->text_buffer));
+ if (parent_priv->toolbar)
+ gtk_widget_show (parent_priv->toolbar);
break;
case MODEST_FILE_FORMAT_PLAIN_TEXT:
{
gtk_widget_destroy (dialog);
if (response == GTK_RESPONSE_OK) {
wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
- if (parent_priv->toolbar) gtk_widget_hide (parent_priv->toolbar);
+ if (parent_priv->toolbar)
+ gtk_widget_hide (parent_priv->toolbar);
} else {
GtkToggleAction *action = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatFormattedTextMenu"));
modest_utils_toggle_action_set_active_block_notify (action, TRUE);
modest_msg_edit_window_undo (ModestMsgEditWindow *window)
{
ModestMsgEditWindowPrivate *priv;
+ ModestWindowPrivate *parent_priv;
+ gboolean was_rich_text, is_rich_text;
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-
+ parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+
+ was_rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer));
+
wp_text_buffer_undo (WP_TEXT_BUFFER (priv->text_buffer));
+ is_rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer));
+
+ if (parent_priv->toolbar && was_rich_text != is_rich_text) {
+ if (is_rich_text)
+ gtk_widget_show (parent_priv->toolbar);
+ else
+ gtk_widget_hide (parent_priv->toolbar);
+ }
+
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
}
modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to_addressbook)
{
ModestMsgEditWindowPrivate *priv = NULL;
-
+ GSList *address_list = NULL;
+
g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
return FALSE;
}
+ /* Check names */
g_object_ref (window);
- if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field), add_to_addressbook)) {
+ if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field), &address_list)) {
modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
g_object_unref (window);
return FALSE;
}
- if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field), add_to_addressbook)) {
+ if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field), &address_list)) {
modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->cc_field));
g_object_unref (window);
return FALSE;
}
- if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field), add_to_addressbook)) {
+ if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field), &address_list)) {
modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->bcc_field));
g_object_unref (window);
return FALSE;
}
+ /* Add contacts to address book */
+ if (address_list)
+ modest_address_book_add_address_list (address_list);
+
if (!modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->cc_field)) &&
!modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->bcc_field)))
modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field));
GtkTextIter end_iter;
gint offset;
glong utf8_len;
+ gint line;
+ gchar *text_offset;
+ gint text_lines;
ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
gtk_text_buffer_get_end_iter (GTK_TEXT_BUFFER (buffer), &end_iter);
offset = gtk_text_iter_get_offset (&end_iter);
+ line = gtk_text_iter_get_line (&end_iter);
+
+ text_offset = text;
+ text_lines = 0;
+ while (text_offset < text + len) {
+ if (*text_offset == '\n')
+ text_lines++;
+ if (text_lines + line >= MAX_BODY_LINES) {
+ len = text_offset - text;
+ break;
+ }
+ text_offset++;
+ }
+
utf8_len = g_utf8_strlen (text, len);
- if (offset + utf8_len > MAX_BODY_LENGTH) {
+ if (line > MAX_BODY_LINES || offset + utf8_len > MAX_BODY_LENGTH) {
g_signal_stop_emission_by_name (G_OBJECT (buffer), "insert-text");
- if (offset < MAX_BODY_LENGTH)
+ if (line <= MAX_BODY_LINES && offset < MAX_BODY_LENGTH)
{
gchar *result;
gchar *utf8_end;
}
}
- if (offset + utf8_len > MAX_BODY_LENGTH) {
+ if (line > MAX_BODY_LINES || offset + utf8_len > MAX_BODY_LENGTH) {
if (priv->max_chars_banner == NULL) {
priv->max_chars_banner = hildon_banner_show_information (GTK_WIDGET (window), NULL,
_CS("ckdg_ib_maximum_characters_reached"));