Webkit based mime part and msg view implementation.

[modest] / src / widgets / modest-msg-edit-window.c

diff --git a/src/widgets/modest-msg-edit-window.c b/src/widgets/modest-msg-edit-window.c
index bc8bb5b..c27e632 100644 (file)
--- a/src/widgets/modest-msg-edit-window.c
+++ b/src/widgets/modest-msg-edit-window.c
@@ -83,13 +83,20 @@
 #include "modest-color-button.h"
 #endif
 
-#define DEFAULT_FONT_SIZE 3
-#define DEFAULT_FONT 2
-#define DEFAULT_SIZE_BUTTON_FONT_FAMILY "Sans"
 #define DEFAULT_MAIN_VBOX_SPACING 0
 #define SUBJECT_MAX_LENGTH 1000
 #define IMAGE_MAX_WIDTH 560
+#ifdef MODEST_TOOLKIT_HILDON2
+#define DEFAULT_SIZE_BUTTON_FONT_FAMILY "Sans"
 #define DEFAULT_FONT_SCALE 1.5
+#define DEFAULT_FONT_SIZE 3
+#define DEFAULT_FONT 2
+#else
+#define DEFAULT_SIZE_BUTTON_FONT_FAMILY "Sans"
+#define DEFAULT_FONT_SCALE 1.0
+#define DEFAULT_FONT_SIZE 2
+#define DEFAULT_FONT 2
+#endif
 #define ATTACHMENT_BUTTON_WIDTH 118
 #define MAX_FROM_VALUE 36
 #define MAX_BODY_LENGTH 128*1024
@@ -363,7 +370,7 @@ modest_msg_edit_window_get_type (void)
 #ifdef MODEST_TOOLKIT_HILDON2
                                                  MODEST_TYPE_HILDON2_WINDOW,
 #else
-                                                 MODEST_TYPE_WINDOW,
+                                                 MODEST_TYPE_SHELL_WINDOW,
 #endif
                                                  "ModestMsgEditWindow",
                                                  &my_info, 0);
@@ -892,10 +899,6 @@ init_window (ModestMsgEditWindow *obj)
                g_clear_error (&error);
        }
 
-       /* Add accelerators */
-       gtk_window_add_accel_group (GTK_WINDOW (obj), 
-                                   gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
-
        parent_priv->menubar = NULL;
 
        title_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -1275,7 +1278,9 @@ replace_with_images (ModestMsgEditWindow *self, TnyList *attachments)
                        if (pixbuf != NULL) {
                                priv->images_count ++;
                                priv->images_size += stream_size;
+#ifndef MODEST_HAVE_LIBWPEDITOR_PLUS
                                wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf);
+#endif
                                g_object_unref (pixbuf);
                        }
                }
@@ -2422,7 +2427,7 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
                        if (stream == NULL) {
 
                                modest_platform_information_banner (NULL, NULL, 
-                                                                   _FM("sfil_ib_opening_not_allowed"));
+                                                                   _FM_OPENING_NOT_ALLOWED);
                                g_free (filename);
                                g_object_unref (mime_part);
                                gnome_vfs_file_info_unref (info);
@@ -2644,7 +2649,7 @@ modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window,
                
                if (stream == NULL) {
 
-                       modest_platform_information_banner (NULL, NULL, _FM("sfil_ib_opening_not_allowed"));
+                       modest_platform_information_banner (NULL, NULL, _FM_OPENING_NOT_ALLOWED);
 
                        g_object_unref (mime_part);
                        g_free (filename);
@@ -3704,7 +3709,7 @@ body_insert_text (GtkTextBuffer *buffer,
                if (priv->max_chars_banner == NULL) {
 #ifdef MODEST_TOOLKIT_HILDON2
                        priv->max_chars_banner = hildon_banner_show_information (GTK_WIDGET (window), NULL, 
-                                                                                _CS("ckdg_ib_maximum_characters_reached"));
+                                                                                _CS_MAXIMUM_CHARACTERS_REACHED);
                        g_object_weak_ref (G_OBJECT (priv->max_chars_banner), (GWeakNotify) max_chars_banner_unref, window);
 #endif
                }
@@ -3764,7 +3769,7 @@ subject_field_insert_text (GtkEditable *editable,
 
        if (result_len + old_length > 1000) {
                modest_platform_system_banner (GTK_WIDGET (window), NULL, 
-                                               _CS("ckdg_ib_maximum_characters_reached"));
+                                               _CS_MAXIMUM_CHARACTERS_REACHED);
        }
        g_string_free (result, TRUE);
 }
@@ -3871,7 +3876,7 @@ modest_msg_edit_window_isearch_toolbar_search (GtkWidget *widget,
                g_free (priv->last_search);
                priv->last_search = NULL;
                /* Information banner about empty search */
-               modest_platform_system_banner (NULL, NULL, _CS("ecdg_ib_find_rep_enter_text"));
+               modest_platform_system_banner (NULL, NULL, _CS_FIND_REP_ENTER_TEXT);
                return;
        }
 
@@ -3887,14 +3892,14 @@ modest_msg_edit_window_isearch_toolbar_search (GtkWidget *widget,
                result = gtk_text_iter_forward_search_insensitive (&selection_end, current_search, 
                                                                   &match_start, &match_end);
                if (!result)
-                       modest_platform_system_banner (NULL, NULL, _HL("ckct_ib_find_search_complete"));
+                       modest_platform_system_banner (NULL, NULL, _HL_IB_FIND_COMPLETE);
        } else {
                GtkTextIter buffer_start;
                gtk_text_buffer_get_start_iter (priv->text_buffer, &buffer_start);
                result = gtk_text_iter_forward_search_insensitive (&buffer_start, current_search, 
                                                                   &match_start, &match_end);
                if (!result)
-                       modest_platform_system_banner (NULL, NULL, _HL("ckct_ib_find_no_matches"));
+                       modest_platform_system_banner (NULL, NULL, _HL_IB_FIND_NO_MATCHES);
        }
 
        /* Mark as selected the string found in search */
@@ -4196,6 +4201,7 @@ typedef struct _MessageSettingsHelper {
        GtkToggleButton *current_format;
 } MessageSettingsHelper;
 
+#ifdef MODEST_TOOLKIT_HILDON2
 static void
 on_priority_toggle (GtkToggleButton *button, 
                    MessageSettingsHelper *helper)
@@ -4264,6 +4270,7 @@ on_format_toggle (GtkToggleButton *button,
        }
 
 }
+#endif
 
 static void
 modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window)
@@ -4292,7 +4299,7 @@ modest_msg_edit_window_show_msg_settings_dialog (ModestMsgEditWindow *window)
 
        dialog = gtk_dialog_new_with_buttons (_("mcen_me_message_settings"), NULL,
                                              GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                             _HL("wdgt_bd_done"), GTK_RESPONSE_ACCEPT, NULL);
+                                             _HL_DONE, GTK_RESPONSE_ACCEPT, NULL);
        vbox = gtk_vbox_new (FALSE, 0);
        align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
        gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE, 0);
@@ -4415,6 +4422,7 @@ on_message_settings (GtkAction *action,
        modest_msg_edit_window_show_msg_settings_dialog (window);
 }
 
+#ifdef MODEST_TOOLKIT_HILDON2
 static void
 on_cc_button_toggled (GtkWidget *button,
                      ModestMsgEditWindow *window)
@@ -4434,8 +4442,9 @@ on_bcc_button_toggled (GtkWidget *button,
        modest_msg_edit_window_show_bcc (MODEST_MSG_EDIT_WINDOW (window),
                                        modest_togglable_get_active (button));
 }
+#endif
 
-static void 
+static void
 setup_menu (ModestMsgEditWindow *self)
 {
        ModestMsgEditWindowPrivate *priv = NULL;