Only handle zoom keys in message view window (fixes NB#144441, NB#150401).

[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 f8dcb8b..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
@@ -2420,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);
@@ -2642,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);
@@ -3702,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
                }
@@ -3762,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);
 }
@@ -3869,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;
        }