diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | data/evince-ui.xml | 1 | ||||
| -rw-r--r-- | shell/ev-view.c | 7 | ||||
| -rw-r--r-- | shell/ev-view.h | 1 | ||||
| -rw-r--r-- | shell/ev-window.c | 13 |
5 files changed, 9 insertions, 22 deletions
@@ -1,3 +1,12 @@ +2005-05-17 Marco Pesenti Gritti <mpg@redhat.com> + + * data/evince-ui.xml: + * shell/ev-view.c: + * shell/ev-view.h: + * shell/ev-window.c: (update_action_sensitivity): + + Get rid of View->Normal Size, it's just confusing + Tue May 17 00:51:21 2005 Jonathan Blandford <jrb@redhat.com> * backend/ev-document-info.h: diff --git a/data/evince-ui.xml b/data/evince-ui.xml index 3875322..c049cc0 100644 --- a/data/evince-ui.xml +++ b/data/evince-ui.xml @@ -33,7 +33,6 @@ <menuitem name="ViewZoomInMenu" action="ViewZoomIn"/> <menuitem name="ViewZoomInMenu" action="ViewZoomIn"/> <menuitem name="ViewZoomOutMenu" action="ViewZoomOut"/> - <menuitem name="ViewNormalSizeMenu" action="ViewNormalSize"/> <menuitem name="ViewBestFitMenu" action="ViewBestFit"/> <menuitem name="ViewPageWidthMenu" action="ViewPageWidth"/> <separator/> diff --git a/shell/ev-view.c b/shell/ev-view.c index cf60e36..12ed30c 100644 --- a/shell/ev-view.c +++ b/shell/ev-view.c @@ -2471,13 +2471,6 @@ ev_view_zoom_for_size_single_page (EvView *view, ev_view_set_zoom (view, scale, FALSE); } - -void -ev_view_zoom_normal (EvView *view) -{ - ev_view_set_zoom (view, 1.0, FALSE); -} - void ev_view_set_zoom_for_size (EvView *view, int width, diff --git a/shell/ev-view.h b/shell/ev-view.h index f0492e3..ea55fcd 100644 --- a/shell/ev-view.h +++ b/shell/ev-view.h @@ -91,7 +91,6 @@ void ev_view_set_zoom_for_size (EvView *view, int height, int vsb_width, int hsb_height); -void ev_view_zoom_normal (EvView *view); /* Find */ gboolean ev_view_can_find_next (EvView *view); diff --git a/shell/ev-window.c b/shell/ev-window.c index c3543af..f412a26 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -226,7 +226,6 @@ update_action_sensitivity (EvWindow *ev_window) has_pages && ev_view_can_zoom_in (view)); set_action_sensitive (ev_window, "ViewZoomOut", has_pages && ev_view_can_zoom_out (view)); - set_action_sensitive (ev_window, "ViewNormalSize", has_pages); set_action_sensitive (ev_window, "ViewBestFit", has_pages); set_action_sensitive (ev_window, "ViewPageWidth", has_pages); set_action_sensitive (ev_window, "ViewReload", has_pages); @@ -1740,15 +1739,6 @@ ev_window_cmd_view_zoom_out (GtkAction *action, EvWindow *ev_window) } static void -ev_window_cmd_view_normal_size (GtkAction *action, EvWindow *ev_window) -{ - g_return_if_fail (EV_IS_WINDOW (ev_window)); - - ev_view_zoom_normal (EV_VIEW (ev_window->priv->view)); - update_action_sensitivity (ev_window); -} - -static void ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window) { g_return_if_fail (EV_IS_WINDOW (ev_window)); @@ -2376,9 +2366,6 @@ static const GtkActionEntry entries[] = { { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "<control>minus", N_("Shrink the document"), G_CALLBACK (ev_window_cmd_view_zoom_out) }, - { "ViewNormalSize", GTK_STOCK_ZOOM_100, NULL, "<control>0", - N_("Reset the zoom level to the default value"), - G_CALLBACK (ev_window_cmd_view_normal_size) }, { "ViewReload", GTK_STOCK_REFRESH, N_("_Reload"), "<control>R", N_("Reload the document"), G_CALLBACK (ev_window_cmd_view_reload) }, |