Get rid of View->Normal Size, it's just confusing

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

diff --git a/ChangeLog b/ChangeLog
index e46a2ce7ec1e3c5acfc38984cc6d3c02f3e8936f..5eec66486b5c98ff49830662fec3963090c676c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 38753226812677966ba624e756647d913f82ec60..c049cc080ce9f8e8fbf8e170d9e163f40a0b02ee 100644 (file)
--- 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 cf60e36b9e0b7969d42076e4c3244e5f74142577..12ed30c85e1ce20c18cc43a2d750101d23b4a7e5 100644 (file)
--- 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 f0492e334a5a9c50627bf03eb9337af69dd76f71..ea55fcd6b7c9fffc4285c25dc13e3aacb1b91c0a 100644 (file)
--- 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 c3543af019ba703f8e687e417cd444ff46ad606d..f412a260a72a962f91120d4c6bcc36c9385d35fd 100644 (file)
--- 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);
@@ -1739,15 +1738,6 @@ ev_window_cmd_view_zoom_out (GtkAction *action, EvWindow *ev_window)
        update_action_sensitivity (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)
 {
@@ -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) },