Remove GQView legacy items from menu; update docs

diff --git a/doc/docbook/GuideEditorsConfig.xml b/doc/docbook/GuideEditorsConfig.xml
index 7d71e83..fe96c55 100644 (file)
--- a/doc/docbook/GuideEditorsConfig.xml
+++ b/doc/docbook/GuideEditorsConfig.xml
@@ -8,7 +8,6 @@
       This dialog allows user to add new editors or modify the system ones. It is available in the menu\r
       <menuchoice>\r
         <guimenu>Edit</guimenu>\r
-        <guimenuitem>Preferences</guimenuitem>\r
         <guimenuitem>Configure Editors</guimenuitem>\r
       </menuchoice>\r
       .\r

diff --git a/doc/docbook/GuideFaq.xml b/doc/docbook/GuideFaq.xml
index 592988f..3185d1b 100644 (file)
--- a/doc/docbook/GuideFaq.xml
+++ b/doc/docbook/GuideFaq.xml
@@ -37,6 +37,15 @@
   <section id="Miscellaneous">\r
     <title>Miscellaneous</title>\r
     <para />\r
+    <section id="OpenCloseMultipleWindows">\r
+      <title>How can I save and restore multiple Geeqie windows</title>\r
+      <para>\r
+        The option\r
+        <link linkend="titleGuideOptionsLayout">Exit program when this window is closed</link>\r
+        provides this facility.\r
+      </para>\r
+      <para />\r
+    </section>\r
     <section id="IwanttobeabletoeditimageswithGeeqie">\r
       <title>I want to be able to edit images with Geeqie</title>\r
       <para>\r

diff --git a/doc/docbook/GuideImageManagementExternalEditing.xml b/doc/docbook/GuideImageManagementExternalEditing.xml
index ee8e1d6..3ef4df6 100644 (file)
--- a/doc/docbook/GuideImageManagementExternalEditing.xml
+++ b/doc/docbook/GuideImageManagementExternalEditing.xml
@@ -16,7 +16,6 @@
     dialogue presents you with an easy-to-use template. This dialogue is accessed via\r
     <menuchoice>\r
       <guimenu>Edit</guimenu>\r
-      <guimenuitem>Preferences</guimenuitem>\r
       <guimenuitem>Configure Editors</guimenuitem>\r
     </menuchoice>\r
     .\r

diff --git a/doc/docbook/GuideMainWindowMenus.xml b/doc/docbook/GuideMainWindowMenus.xml
index 608f60c..7fb1c79 100644 (file)
--- a/doc/docbook/GuideMainWindowMenus.xml
+++ b/doc/docbook/GuideMainWindowMenus.xml
@@ -828,16 +828,6 @@
       </varlistentry>\r
     </variablelist>\r
     <variablelist>\r
-      <varlistentry>\r
-        <term>\r
-          <menuchoice>\r
-            <guimenu>Preferences</guimenu>\r
-          </menuchoice>\r
-        </term>\r
-        <listitem>\r
-          <para>This submenu contains configuration and maintenance commands</para>\r
-        </listitem>\r
-      </varlistentry>\r
       <varlistentry>\r
         <term>\r
           <menuchoice>\r
@@ -848,7 +838,6 @@
               </keycombo>\r
             </shortcut>\r
             <guimenu>Preferences</guimenu>\r
-            <guimenuitem>Preferences…</guimenuitem>\r
           </menuchoice>\r
         </term>\r
         <listitem>\r
@@ -862,8 +851,7 @@
       <varlistentry>\r
         <term>\r
           <menuchoice>\r
-            <guimenu>Preferences</guimenu>\r
-            <guimenuitem>Configure Editors…</guimenuitem>\r
+            <guimenu>Configure Editors…</guimenu>\r
           </menuchoice>\r
         </term>\r
         <listitem>\r
@@ -877,8 +865,7 @@
       <varlistentry>\r
         <term>\r
           <menuchoice>\r
-            <guimenu>Preferences</guimenu>\r
-            <guimenuitem>Configure This window…</guimenuitem>\r
+            <guimenu>Configure This window…</guimenu>\r
           </menuchoice>\r
         </term>\r
         <listitem>\r
@@ -892,8 +879,7 @@
       <varlistentry>\r
         <term>\r
           <menuchoice>\r
-            <guimenu>Preferences</guimenu>\r
-            <guimenuitem>Thumbnail maintenance</guimenuitem>\r
+            <guimenu>Thumbnail maintenance</guimenu>\r
           </menuchoice>\r
         </term>\r
         <listitem>\r

diff --git a/doc/docbook/GuideOptionsHidden.xml b/doc/docbook/GuideOptionsHidden.xml
index d756e95..7bf38d7 100644 (file)
--- a/doc/docbook/GuideOptionsHidden.xml
+++ b/doc/docbook/GuideOptionsHidden.xml
@@ -17,7 +17,7 @@
   </para>\r
   <para>\r
     <emphasis role="strong">\r
-      display_dialogs_under_mouse: [true\r
+      place_dialogs_under_mouse: [true\r
       <emphasis role="i">false</emphasis>\r
       ]\r
     </emphasis>\r
@@ -33,16 +33,6 @@
     <listitem>1: Center image.</listitem>\r
     <listitem>2: Maintain same visible region as previous image, if possible.</listitem>\r
   </varlistentry>\r
-  <para />\r
-  <varlistentry>\r
-    <term>\r
-      <emphasis role="strong">dither_quality:</emphasis>\r
-      Set the quality when dithering images on displays with a limited color pallet:\r
-    </term>\r
-    <listitem>0: No dithering</listitem>\r
-    <listitem>1: Normal</listitem>\r
-    <listitem>2: Best</listitem>\r
-  </varlistentry>\r
   <para>\r
     <emphasis role="strong">\r
       thumbnails.use_xvpics =  [true\r

diff --git a/doc/docbook/GuideOptionsLayout.xml b/doc/docbook/GuideOptionsLayout.xml
index c56c416..43589d7 100644 (file)
--- a/doc/docbook/GuideOptionsLayout.xml
+++ b/doc/docbook/GuideOptionsLayout.xml
@@ -5,7 +5,6 @@
     This item is accessed via\r
     <menuchoice>\r
       <guimenu>Edit</guimenu>\r
-      <guimenuitem>Preferences</guimenuitem>\r
       <guimenuitem>Configure this window</guimenuitem>\r
     </menuchoice>\r
     .\r
@@ -50,6 +49,9 @@
           </menuchoice>\r
           , if this check box is clicked all instances will be closed when this window is exited.\r
         </para>\r
+        <note>\r
+          <para>When a window with this check box selected is closed, the existence of all other open Geeqie windows will be remembered. When Geeqie is started again, all those windows will be re-opened.</para>\r
+        </note>\r
       </listitem>\r
     </varlistentry>\r
     <varlistentry>\r

diff --git a/doc/docbook/GuideOptionsMain.xml b/doc/docbook/GuideOptionsMain.xml
index 15b6ed7..c6b06bc 100644 (file)
--- a/doc/docbook/GuideOptionsMain.xml
+++ b/doc/docbook/GuideOptionsMain.xml
@@ -14,7 +14,6 @@
         </shortcut>\r
         <guimenu>Edit</guimenu>\r
         <guimenuitem>Preferences</guimenuitem>\r
-        <guimenuitem>Preferences</guimenuitem>\r
       </menuchoice>\r
       or\r
       <guiicon>\r

diff --git a/doc/docbook/GuideReferenceManagement.xml b/doc/docbook/GuideReferenceManagement.xml
index 95b45de..c197e7d 100644 (file)
--- a/doc/docbook/GuideReferenceManagement.xml
+++ b/doc/docbook/GuideReferenceManagement.xml
@@ -5,7 +5,6 @@
     Thumbnails and other cached data can be maintained from the dialog accessible by selecting\r
     <menuchoice>\r
       <guimenu>Edit</guimenu>\r
-      <guimenuitem>Preferences</guimenuitem>\r
       <guimenuitem>Thumbnail Maintenance</guimenuitem>\r
     </menuchoice>\r
     .\r

diff --git a/plugins/import/geeqie-import-geeqie.desktop.in b/plugins/import/geeqie-import-geeqie.desktop.in
index 2b158ab..8a5039e 100644 (file)
--- a/plugins/import/geeqie-import-geeqie.desktop.in
+++ b/plugins/import/geeqie-import-geeqie.desktop.in
@@ -11,7 +11,7 @@ Categories=X-Geeqie;
 OnlyShowIn=X-Geeqie;
 
 # Show in menu "File"
-X-Geeqie-Menu-Path=EditMenu/PreferencesMenu
+#X-Geeqie-Menu-Path=EditMenu/PreferencesMenu
 
 # It can be made verbose
 X-Geeqie-Verbose=true

diff --git a/plugins/import/geeqie-import-gqview.desktop.in b/plugins/import/geeqie-import-gqview.desktop.in
index ea56de4..1c19ae4 100644 (file)
--- a/plugins/import/geeqie-import-gqview.desktop.in
+++ b/plugins/import/geeqie-import-gqview.desktop.in
@@ -11,7 +11,7 @@ Categories=X-Geeqie;
 OnlyShowIn=X-Geeqie;
 
 # Show in menu "File"
-X-Geeqie-Menu-Path=EditMenu/PreferencesMenu
+#X-Geeqie-Menu-Path=EditMenu/PreferencesMenu
 
 # It can be made verbose
 X-Geeqie-Verbose=true

diff --git a/src/layout_util.c b/src/layout_util.c
index 4fdd4c1..d7a6184 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -1996,12 +1996,10 @@ static const gchar *menu_ui_description =
 "      <menuitem action='SaveMetadata'/>"
 "      <placeholder name='PropertiesSection'/>"
 "      <separator/>"
-"        <menu action='PreferencesMenu'>"
-"        <menuitem action='Preferences'/>"
-"        <menuitem action='Editors'/>"
-"        <menuitem action='LayoutConfig'/>"
-"        <menuitem action='Maintenance'/>"
-"      </menu>"
+"      <menuitem action='Preferences'/>"
+"      <menuitem action='Editors'/>"
+"      <menuitem action='LayoutConfig'/>"
+"      <menuitem action='Maintenance'/>"
 "      <placeholder name='PreferencesSection'/>"
 "      <separator/>"
 #if !GTK_CHECK_VERSION(3,0,0)