Addl fix #521: zoom increment is not multiplicative

[geeqie.git] / doc / docbook / GuideOptionsImage.xml

diff --git a/doc/docbook/GuideOptionsImage.xml b/doc/docbook/GuideOptionsImage.xml
index 7cac9ae..9f2a028 100644 (file)
--- a/doc/docbook/GuideOptionsImage.xml
+++ b/doc/docbook/GuideOptionsImage.xml
@@ -37,14 +37,6 @@
                   <para>High quality results, moderately fast.</para>\r
                 </listitem>\r
               </varlistentry>\r
-              <varlistentry>\r
-                <term>\r
-                  <guilabel>Hyper</guilabel>\r
-                </term>\r
-                <listitem>\r
-                  <para>Slowest scaler, sometimes gives better results than bilinear.</para>\r
-                </listitem>\r
-              </varlistentry>\r
             </variablelist>\r
           </para>\r
         </listitem>\r
@@ -73,34 +65,62 @@
       </varlistentry>\r
       <varlistentry>\r
         <term>\r
-          <guilabel>Allow enlargement of image for zoom to fit</guilabel>\r
+          <guilabel>Zoom increment</guilabel>\r
+        </term>\r
+        <listitem>\r
+          <para>Adjusts the step size when zooming in or out on an image.</para>\r
+        </listitem>\r
+      </varlistentry>\r
+      <varlistentry>\r
+        <term>\r
+          <guilabel>Zoom style</guilabel>\r
+        </term>\r
+        <listitem>\r
+          <para>Selects whether the zoom step size is applied as a geometric (n * step) or arithmetic (n + step) factor.</para>\r
+        </listitem>\r
+      </varlistentry>\r
+    </variablelist>\r
+  </section>\r
+  <section id="FitImageToWindow">\r
+    <title>Fit Image To Window</title>\r
+    <variablelist>\r
+      <varlistentry>\r
+        <term>\r
+          <guilabel>Allow enlargement of image (max. size in %)</guilabel>\r
         </term>\r
         <listitem>\r
           <para>\r
             Enable this to allow Geeqie to increase the image size for images that are smaller than the current view area when the zoom is set to\r
             <emphasis>Fit image to window</emphasis>\r
-            . The value in the adjoining spin box sets the maximum size permitted in percent i.e. 100% is full-size.\r
+            . This value sets the maximum expansion permitted in percent i.e. 100% is full-size.\r
           </para>\r
         </listitem>\r
       </varlistentry>\r
       <varlistentry>\r
         <term>\r
-          <guilabel>Limit image size when autofitting</guilabel>\r
+          <guilabel>Virtual window size (% of actual window)</guilabel>\r
         </term>\r
         <listitem>\r
           <para>\r
-            This percentage will affect the size of the image when\r
+            This value will set the virtual size of the window when\r
             <emphasis>Fit image to window</emphasis>\r
-            is set. Instead of using 100% of the window, it will use the specified percentage. It allows one to keep a border around the image (values lower than 100%) or to auto zoom the image (values greater than 100%). It affects fullscreen mode too.\r
+            is set. Instead of using the actual size of the window, the specified percentage of the window will be used. It allows one to keep a border around the image (values lower than 100%) or to auto zoom the image (values greater than 100%). It affects fullscreen mode too.\r
           </para>\r
         </listitem>\r
       </varlistentry>\r
+    </variablelist>\r
+  </section>\r
+  <section id="TileSize">\r
+    <title>Tile Size</title>\r
+    <variablelist>\r
       <varlistentry>\r
         <term>\r
-          <guilabel>Zoom increment</guilabel>\r
+          <guilabel>Tile size in pixels</guilabel>\r
         </term>\r
         <listitem>\r
-          <para>Adjusts the step size when zooming in or out on an image. This value corresponds to the percentage of the original image.</para>\r
+          <para>\r
+            This option is only available when GPU acceleration is not selected. It sets the size in pixels that large images are split into during rendering. Setting a larger value will reduce the tiling effect seen as the image is displayed, but will also slightly increase the delay until the first part of the image is seen.\r
+          </para>\r
         </listitem>\r
       </varlistentry>\r
     </variablelist>\r
@@ -127,7 +147,7 @@
           <note>\r
             <para>\r
               You may use the\r
-              <emphasis>Limit image size when autofitting</emphasis>\r
+              <emphasis>Virtual window size</emphasis>\r
               (see above) option to keep a border around the image in fullscreen mode.\r
             </para>\r
           </note>\r