From a3fdc3edb741d900e12f06793731a7ffc3b83fda Mon Sep 17 00:00:00 2001
From: Colin Clark <colin.clark@cclark.uk>
Date: Thu, 21 Jun 2018 11:50:49 +0100
Subject: [PATCH] Fix #616: Image Position settings missing in 1.4

https://github.com/BestImageViewer/geeqie/issues/616

Image scroll settings are now on status bar. Update tool-tip and
documentation.
---
 doc/docbook/GuideMainWindowStatusBar.xml | 8 ++++----
 src/layout.c                             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/docbook/GuideMainWindowStatusBar.xml b/doc/docbook/GuideMainWindowStatusBar.xml
index 343caae0..76a51467 100644
--- a/doc/docbook/GuideMainWindowStatusBar.xml
+++ b/doc/docbook/GuideMainWindowStatusBar.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <section id="GuideMainWindowStatusBar">
   <title id="titleGuideMainWindowStatusBar">Status Bar</title>
-  <para>The status bar contains information and details about the contents of the main window. Information displayed includes the progress of generating thumbnails, the number of files in the file list with byte size, the current file selection count including byte size, details about the currently displayed image, and the zoom setting. The current sort preference is also displayed, and can be adjusted from the status bar.</para>
-  <para>The status bar is comprised of five sections, from left to right these are a progress bar, sort method, file list counts, image details, and zoom setting. Each section is described below.</para>
+  <para>The status bar contains information and details about the contents of the main window. Information displayed includes the progress of generating thumbnails, the number of files in the file list with byte size, the current file selection count including byte size, details about the currently displayed image, and the zoom and image scroll settings. The current sort preference is also displayed, and can be adjusted from the status bar.</para>
+  <para>The status bar is comprised of five sections, from left to right these are a progress bar, sort method, file list counts, image details, and zoom and scroll setting. Each section is described below.</para>
   <para />
   <section id="ProgressBar">
     <title>Progress Bar</title>
@@ -111,8 +111,8 @@
     <title>Buttons</title>
     <para>Statusbar buttons corresponds to selected menu action.</para>
     <para />
-    <section id="Zoom">
-      <title>Zoom</title>
+    <section id="ZoomAndScroll">
+      <title>Zoom and Scroll</title>
       <para>The button label displays the current zoom ratio. A ratio of 1:1 is the image's original size. When the left number is larger the image is displayed larger than original size, when the right number is larger the image is displayed smaller.</para>
       <para>A tilde (~) appears within the ratio display when the zoom is set to fit the image within the display area. In this zoom mode the ratio is automatically adjusted, and the displayed ratio may not be the actual ratio because the status bar display rounds the actual value to the nearest tenth (0.1).</para>
       <para />
diff --git a/src/layout.c b/src/layout.c
index 4c14cdfc..f1fc5cc1 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -800,7 +800,7 @@ static void layout_status_setup(LayoutWindow *lw, GtkWidget *box, gboolean small
 	gtk_widget_show(toolbar);
 	gtk_box_pack_end(GTK_BOX(hbox), toolbar_frame, FALSE, FALSE, 0);
 	lw->info_zoom = layout_zoom_button(lw, hbox, ZOOM_LABEL_WIDTH, TRUE);
-	gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_zoom), _("Select zoom mode"));
+	gtk_widget_set_tooltip_text(GTK_WIDGET(lw->info_zoom), _("Select zoom and scroll mode"));
 	gtk_widget_show(lw->info_zoom);
 
 	if (small_format)
-- 
2.20.1