* src/widgets/modest-msg-edit-window.h:

        * Added zoom actions for 80% and 120%.
* src/maemo/modest-msg-edit-window.c:
        * Now zoom menu is updated properly on inherited zooms
          (fixes NB#61337).
* src/maemo/ui/modest-msg-edit-window-ui.xml:
        * Added 80% and 120% menu levels actions.

pmo-trunk-r2370

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 6c3cedb..41385cb 100644 (file)
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -1800,12 +1800,21 @@ modest_msg_edit_window_set_zoom (ModestWindow *window,
                                 gdouble zoom)
 {
        ModestMsgEditWindowPrivate *priv;
+       ModestWindowPrivate *parent_priv;
+       GtkRadioAction *zoom_radio_action;
      
        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);
        priv->zoom_level = zoom;
        wp_text_buffer_set_font_scaling_factor (WP_TEXT_BUFFER (priv->text_buffer), zoom);
+
+       /* Zoom level menu options should be updated with the current zoom level */
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+       zoom_radio_action = GTK_RADIO_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, 
+                                                                        "/MenuBar/ViewMenu/ZoomMenu/Zoom50Menu"));
+       gtk_radio_action_set_current_value (zoom_radio_action, (gint) (zoom*100.0+0.1));
 }
 
 static gdouble

diff --git a/src/maemo/ui/modest-msg-edit-window-ui.xml b/src/maemo/ui/modest-msg-edit-window-ui.xml
index e5d0dfc..64c3e7b 100644 (file)
--- a/src/maemo/ui/modest-msg-edit-window-ui.xml
+++ b/src/maemo/ui/modest-msg-edit-window-ui.xml
@@ -55,7 +55,9 @@
     <menu name="ViewMenu" action="View">
       <menu name="ZoomMenu" action="Zoom">
        <menuitem name="Zoom50Menu" action="Zoom50"/>
+       <menuitem name="Zoom80Menu" action="Zoom80"/>
        <menuitem name="Zoom100Menu" action="Zoom100"/>
+       <menuitem name="Zoom120Menu" action="Zoom120"/>
        <menuitem name="Zoom150Menu" action="Zoom150"/>
        <menuitem name="Zoom200Menu" action="Zoom200"/>
       </menu>

diff --git a/src/widgets/modest-msg-edit-window-ui.h b/src/widgets/modest-msg-edit-window-ui.h
index 587961f..5fc77bb 100644 (file)
--- a/src/widgets/modest-msg-edit-window-ui.h
+++ b/src/widgets/modest-msg-edit-window-ui.h
@@ -120,7 +120,9 @@ static const GtkRadioActionEntry modest_msg_edit_alignment_radio_action_entries
 
 static const GtkRadioActionEntry modest_msg_edit_zoom_action_entries [] = {
        { "Zoom50", NULL, N_("mcen_me_viewer_50"), NULL, NULL, 50 },
+       { "Zoom80", NULL, N_("mcen_me_viewer_80"), NULL, NULL, 80 },
        { "Zoom100", NULL, N_("mcen_me_viewer_100"), NULL, NULL, 100 },
+       { "Zoom120", NULL, N_("mcen_me_viewer_120"), NULL, NULL, 120 },
        { "Zoom150", NULL, N_("mcen_me_viewer_150"), NULL, NULL, 150 },
        { "Zoom200", NULL, N_("mcen_me_viewer_200"), NULL, NULL, 200 }
 };