Add zoom reset (#132)

Cobinja · clefebvre · commit 43acb8ffe7a0 · 2017-08-30T13:57:59.000+01:00
diff --git a/libview/ev-view.c b/libview/ev-view.c
@@ -5653,6 +5653,14 @@ ev_view_zoom_out (EvView *view)
 	ev_view_zoom (view, ZOOM_OUT_FACTOR);
 }
 
+void
+ev_view_zoom_reset (EvView *view)
+{
+  gdouble scale;
+  g_return_if_fail (view->sizing_mode == EV_SIZING_FREE);
+  ev_document_model_set_scale (view->model, 1.0);
+}
+
 static double
 zoom_for_size_fit_width (gdouble doc_width,
 			 gdouble doc_height,
diff --git a/libview/ev-view.h b/libview/ev-view.h
@@ -67,6 +67,7 @@ gboolean	ev_view_can_zoom_in       (EvView         *view);
 void		ev_view_zoom_in		  (EvView         *view);
 gboolean        ev_view_can_zoom_out      (EvView         *view);
 void		ev_view_zoom_out	  (EvView         *view);
+void		ev_view_zoom_reset	  (EvView         *view);
 void        ev_view_zoom (EvView  *view,
 						  gdouble  factor);
 
diff --git a/libview/ev-web-view.c b/libview/ev-web-view.c
@@ -691,6 +691,17 @@ ev_web_view_zoom_out(EvWebView *webview)
 	return TRUE;
 }
 
+gboolean
+ev_web_view_zoom_reset(EvWebView *webview)
+{
+  if (webview->zoom_level == 1)
+		return FALSE;
+
+	webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW(webview),
+	                                1.0);
+	return TRUE;
+}
+
 /**
  * ev_web_view_disconnect_handlers
  * @webview : #EvWebView instance
diff --git a/libview/ev-web-view.h b/libview/ev-web-view.h
@@ -83,6 +83,7 @@ void		ev_web_view_copy				   (EvWebView  *webview);
 /* Zoom control */
 gboolean     ev_web_view_zoom_in               (EvWebView *webview);
 gboolean     ev_web_view_zoom_out              (EvWebView *webview);
+gboolean     ev_web_view_zoom_reset            (EvWebView *webview);
 
 /*For safe replacement by an EvView*/
 void       ev_web_view_disconnect_handlers    (EvWebView  *webview);
diff --git a/previewer/ev-previewer-window.c b/previewer/ev-previewer-window.c
@@ -135,6 +135,14 @@ ev_previewer_window_zoom_out (GtkAction         *action,
 	ev_view_zoom_out (window->view);
 }
 
+static void
+ev_previewer_window_zoom_reset (GtkAction         *action,
+			      EvPreviewerWindow *window)
+{
+	ev_document_model_set_sizing_mode (window->model, EV_SIZING_FREE);
+	ev_view_zoom_reset (window->view);
+}
+
 static void
 ev_previewer_window_zoom_best_fit (GtkToggleAction   *action,
 				   EvPreviewerWindow *window)
@@ -295,6 +303,9 @@ static const GtkActionEntry action_entries[] = {
         { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "<control>minus",
           N_("Shrink the document"),
           G_CALLBACK (ev_previewer_window_zoom_out) },
+        { "ViewZoomReset", GTK_STOCK_ZOOM_100, NULL, "<control>0",
+          N_("Reset zoom to 100\%"),
+          G_CALLBACK (ev_previewer_window_zoom_reset) },
 #if GTKUNIXPRINT_ENABLED
 	/* translators: Print document currently shown in the Print Preview window */
 	{ "PreviewPrint", GTK_STOCK_PRINT, N_("Print"), NULL,
diff --git a/previewer/previewer-ui.xml b/previewer/previewer-ui.xml
@@ -9,6 +9,7 @@
     <toolitem name="ViewBestFit" action="ViewBestFit"/>
     <toolitem name="ViewZoomOut" action="ViewZoomOut"/>
     <toolitem name="ViewZoomIn" action="ViewZoomIn"/>
+    <toolitem name="ViewZoomReset" action="ViewZoomReset"/>
     <separator/>
     <toolitem name="PreviewPrint" action="PreviewPrint"/>
   </toolbar>
diff --git a/shell/ev-toolbar.c b/shell/ev-toolbar.c
@@ -219,6 +219,11 @@ ev_toolbar_constructed (GObject *object)
     ev_toolbar->priv->expand_window_button = create_button (action);
     gtk_box_pack_end (GTK_BOX (box), ev_toolbar->priv->expand_window_button, FALSE, FALSE, 0);
 
+    action = gtk_action_group_get_action (action_group, "ViewZoomReset");
+    button = create_button (action);
+    gtk_box_pack_end (GTK_BOX (box), button, FALSE, FALSE, 0);
+    gtk_widget_show (GTK_WIDGET (button));
+
     action = gtk_action_group_get_action (action_group, "ViewZoomIn");
     button = create_button (action);
     gtk_box_pack_end (GTK_BOX (box), button, FALSE, FALSE, 0);
diff --git a/shell/ev-window.c b/shell/ev-window.c
@@ -450,6 +450,7 @@ ev_window_setup_action_sensitivity (EvWindow *ev_window)
 	ev_window_set_action_sensitive (ev_window, "ViewExpandWindow", has_pages && !(document->iswebdocument));
 	ev_window_set_action_sensitive (ev_window, "ViewZoomIn", has_pages && !(document->iswebdocument));
 	ev_window_set_action_sensitive (ev_window, "ViewZoomOut", has_pages && !(document->iswebdocument));
+  ev_window_set_action_sensitive (ev_window, "ViewZoomReset", has_pages && !(document->iswebdocument));
 	ev_window_set_action_sensitive (ev_window, "ViewPresentation", has_pages && !(document->iswebdocument));
 
 	/* Bookmarks menu */
@@ -527,6 +528,9 @@ ev_window_update_actions (EvWindow *ev_window)
 						has_pages &&
 						ev_view_can_zoom_out (view) &&
 						!presentation_mode);
+    ev_window_set_action_sensitive (ev_window, "ViewZoomReset",
+						has_pages &&
+						!presentation_mode);
 	}
         /* Go menu */
 	if (has_pages) {
@@ -4375,6 +4379,23 @@ ev_window_cmd_view_zoom_out (GtkAction *action, EvWindow *ev_window)
 	}
 }
 
+static void
+ev_window_cmd_view_zoom_reset (GtkAction *action, EvWindow *ev_window)
+{
+        g_return_if_fail (EV_IS_WINDOW (ev_window));
+
+	ev_document_model_set_sizing_mode (ev_window->priv->model, EV_SIZING_FREE);
+#if ENABLE_EPUB
+	if ( ev_window->priv->document->iswebdocument)  {
+		ev_web_view_zoom_reset(EV_WEB_VIEW(ev_window->priv->webview));
+	}
+	else
+#endif
+	{
+		ev_view_zoom_reset (EV_VIEW (ev_window->priv->view));
+	}
+}
+
 static void
 ev_window_cmd_go_previous_page (GtkAction *action, EvWindow *ev_window)
 {
@@ -5803,6 +5824,9 @@ static const GtkActionEntry entries[] = {
 
 
         /* View menu */
+        { "ViewZoomReset", "zoom-original-symbolic", N_("_Reset Zoom"), "<control>0",
+          N_("Reset zoom to 100\%"),
+          G_CALLBACK (ev_window_cmd_view_zoom_reset) },
         { "ViewZoomIn", "zoom-in-symbolic", N_("Zoom _In"), "<control>plus",
           N_("Enlarge the document"),
           G_CALLBACK (ev_window_cmd_view_zoom_in) },
@@ -6121,6 +6145,10 @@ set_action_properties (GtkActionGroup *action_group)
 	action = gtk_action_group_get_action (action_group, "ViewZoomOut");
 	/*translators: this is the label for toolbar button*/
 	g_object_set (action, "short_label", _("Zoom Out"), NULL);
+  
+  action = gtk_action_group_get_action (action_group, "ViewZoomReset");
+	/*translators: this is the label for toolbar button*/
+	g_object_set (action, "short_label", _("Reset Zoom"), NULL);
 
 	action = gtk_action_group_get_action (action_group, "ViewBestFit");
 	/*translators: this is the label for toolbar button*/
diff --git a/shell/xreader-ui.xml b/shell/xreader-ui.xml
@@ -44,6 +44,7 @@
       <separator/>
       <menuitem name="ViewZoomInMenu" action="ViewZoomIn"/>
       <menuitem name="ViewZoomOutMenu" action="ViewZoomOut"/>
+      <menuitem name="ViewZoomResetMenu" action="ViewZoomReset"/>
       <menuitem name="ViewBestFitMenu" action="ViewBestFit"/>
       <menuitem name="ViewPageWidthMenu" action="ViewPageWidth"/>
       <menuitem name="ViewExpandWindowMenu" action="ViewExpandWindow"/>
