changeset 2470:ee7e3a232511

Merge.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 28 Apr 2017 16:28:35 +0300
parents 5e92b54ecfa1 (current diff) 67c8cff1dc39 (diff)
children 5e0081ebbced
files
diffstat 2 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/doc/docbook/GuideOptionsLayout.xml	Wed Apr 26 23:33:20 2017 +0300
+++ b/doc/docbook/GuideOptionsLayout.xml	Fri Apr 28 16:28:35 2017 +0300
@@ -58,6 +58,17 @@
       </term>
       <listitem>
         <para>This may be set for each instance of Geeqie.</para>
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para>No change: Use the Current Working Directory. If called from a system menu rather than the command line, the Home directory will probably be used.</para>
+          </listitem>
+          <listitem>
+            <para>Restore last path: Use the folder in use when Geeqie was previously closed.</para>
+          </listitem>
+          <listitem>
+            <para>Home path: Use the folder specified in the Home Path box.</para>
+          </listitem>
+        </itemizedlist>
       </listitem>
     </varlistentry>
     <varlistentry>
--- a/src/layout.c	Wed Apr 26 23:33:20 2017 +0300
+++ b/src/layout.c	Fri Apr 28 16:28:35 2017 +0300
@@ -634,7 +634,7 @@
 
 	if (!n)
 		{
-		gtk_label_set_text(GTK_LABEL(lw->info_zoom), "");
+		gtk_button_set_label(GTK_BUTTON(lw->info_zoom), "");
 		gtk_label_set_text(GTK_LABEL(lw->info_details), "");
 		}
 	else