Mercurial > hg > forks > geeqie

changeset 2622:cad1ce03590d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove GQView legacy items from menu; update docs
author Colin Clark <colin.clark@cclark.uk>
date Sun, 08 Oct 2017 13:30:05 +0100
parents 20a0f0e29029
children f5886b8e1968
files doc/docbook/GuideEditorsConfig.xml doc/docbook/GuideFaq.xml doc/docbook/GuideImageManagementExternalEditing.xml doc/docbook/GuideMainWindowMenus.xml doc/docbook/GuideOptionsHidden.xml doc/docbook/GuideOptionsLayout.xml doc/docbook/GuideOptionsMain.xml doc/docbook/GuideReferenceManagement.xml plugins/import/geeqie-import-geeqie.desktop.in plugins/import/geeqie-import-gqview.desktop.in src/layout_util.c
diffstat 11 files changed, 22 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/doc/docbook/GuideEditorsConfig.xml	Tue Oct 03 10:35:14 2017 +0100
+++ b/doc/docbook/GuideEditorsConfig.xml	Sun Oct 08 13:30:05 2017 +0100
@@ -8,7 +8,6 @@
       This dialog allows user to add new editors or modify the system ones. It is available in the menu
       <menuchoice>
         <guimenu>Edit</guimenu>
-        <guimenuitem>Preferences</guimenuitem>
         <guimenuitem>Configure Editors</guimenuitem>
       </menuchoice>
       .
--- a/doc/docbook/GuideFaq.xml	Tue Oct 03 10:35:14 2017 +0100
+++ b/doc/docbook/GuideFaq.xml	Sun Oct 08 13:30:05 2017 +0100
@@ -37,6 +37,15 @@
   <section id="Miscellaneous">
     <title>Miscellaneous</title>
     <para />
+    <section id="OpenCloseMultipleWindows">
+      <title>How can I save and restore multiple Geeqie windows</title>
+      <para>
+        The option
+        <link linkend="titleGuideOptionsLayout">Exit program when this window is closed</link>
+        provides this facility.
+      </para>
+      <para />
+    </section>
     <section id="IwanttobeabletoeditimageswithGeeqie">
       <title>I want to be able to edit images with Geeqie</title>
       <para>
--- a/doc/docbook/GuideImageManagementExternalEditing.xml	Tue Oct 03 10:35:14 2017 +0100
+++ b/doc/docbook/GuideImageManagementExternalEditing.xml	Sun Oct 08 13:30:05 2017 +0100
@@ -16,7 +16,6 @@
     dialogue presents you with an easy-to-use template. This dialogue is accessed via
     <menuchoice>
       <guimenu>Edit</guimenu>
-      <guimenuitem>Preferences</guimenuitem>
       <guimenuitem>Configure Editors</guimenuitem>
     </menuchoice>
     .
--- a/doc/docbook/GuideMainWindowMenus.xml	Tue Oct 03 10:35:14 2017 +0100
+++ b/doc/docbook/GuideMainWindowMenus.xml	Sun Oct 08 13:30:05 2017 +0100
@@ -831,16 +831,6 @@
       <varlistentry>
         <term>
           <menuchoice>
-            <guimenu>Preferences</guimenu>
-          </menuchoice>
-        </term>
-        <listitem>
-          <para>This submenu contains configuration and maintenance commands</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <menuchoice>
             <shortcut>
               <keycombo>
                 <keycap>Ctrl</keycap>
@@ -848,7 +838,6 @@
               </keycombo>
             </shortcut>
             <guimenu>Preferences</guimenu>
-            <guimenuitem>Preferences…</guimenuitem>
           </menuchoice>
         </term>
         <listitem>
@@ -862,8 +851,7 @@
       <varlistentry>
         <term>
           <menuchoice>
-            <guimenu>Preferences</guimenu>
-            <guimenuitem>Configure Editors…</guimenuitem>
+            <guimenu>Configure Editors…</guimenu>
           </menuchoice>
         </term>
         <listitem>
@@ -877,8 +865,7 @@
       <varlistentry>
         <term>
           <menuchoice>
-            <guimenu>Preferences</guimenu>
-            <guimenuitem>Configure This window…</guimenuitem>
+            <guimenu>Configure This window…</guimenu>
           </menuchoice>
         </term>
         <listitem>
@@ -892,8 +879,7 @@
       <varlistentry>
         <term>
           <menuchoice>
-            <guimenu>Preferences</guimenu>
-            <guimenuitem>Thumbnail maintenance</guimenuitem>
+            <guimenu>Thumbnail maintenance</guimenu>
           </menuchoice>
         </term>
         <listitem>
--- a/doc/docbook/GuideOptionsHidden.xml	Tue Oct 03 10:35:14 2017 +0100
+++ b/doc/docbook/GuideOptionsHidden.xml	Sun Oct 08 13:30:05 2017 +0100
@@ -17,7 +17,7 @@
   </para>
   <para>
     <emphasis role="strong">
-      display_dialogs_under_mouse: [true
+      place_dialogs_under_mouse: [true
       <emphasis role="i">false</emphasis>
       ]
     </emphasis>
@@ -33,16 +33,6 @@
     <listitem>1: Center image.</listitem>
     <listitem>2: Maintain same visible region as previous image, if possible.</listitem>
   </varlistentry>
-  <para />
-  <varlistentry>
-    <term>
-      <emphasis role="strong">dither_quality:</emphasis>
-      Set the quality when dithering images on displays with a limited color pallet:
-    </term>
-    <listitem>0: No dithering</listitem>
-    <listitem>1: Normal</listitem>
-    <listitem>2: Best</listitem>
-  </varlistentry>
   <para>
     <emphasis role="strong">
       thumbnails.use_xvpics =  [true
--- a/doc/docbook/GuideOptionsLayout.xml	Tue Oct 03 10:35:14 2017 +0100
+++ b/doc/docbook/GuideOptionsLayout.xml	Sun Oct 08 13:30:05 2017 +0100
@@ -5,7 +5,6 @@
     This item is accessed via
     <menuchoice>
       <guimenu>Edit</guimenu>
-      <guimenuitem>Preferences</guimenuitem>
       <guimenuitem>Configure this window</guimenuitem>
     </menuchoice>
     .
@@ -50,6 +49,9 @@
           </menuchoice>
           , if this check box is clicked all instances will be closed when this window is exited.
         </para>
+        <note>
+          <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>
+        </note>
       </listitem>
     </varlistentry>
     <varlistentry>
--- a/doc/docbook/GuideOptionsMain.xml	Tue Oct 03 10:35:14 2017 +0100
+++ b/doc/docbook/GuideOptionsMain.xml	Sun Oct 08 13:30:05 2017 +0100
@@ -14,7 +14,6 @@
         </shortcut>
         <guimenu>Edit</guimenu>
         <guimenuitem>Preferences</guimenuitem>
-        <guimenuitem>Preferences</guimenuitem>
       </menuchoice>
       or
       <guiicon>
--- a/doc/docbook/GuideReferenceManagement.xml	Tue Oct 03 10:35:14 2017 +0100
+++ b/doc/docbook/GuideReferenceManagement.xml	Sun Oct 08 13:30:05 2017 +0100
@@ -5,7 +5,6 @@
     Thumbnails and other cached data can be maintained from the dialog accessible by selecting
     <menuchoice>
       <guimenu>Edit</guimenu>
-      <guimenuitem>Preferences</guimenuitem>
       <guimenuitem>Thumbnail Maintenance</guimenuitem>
     </menuchoice>
     .
--- a/plugins/import/geeqie-import-geeqie.desktop.in	Tue Oct 03 10:35:14 2017 +0100
+++ b/plugins/import/geeqie-import-geeqie.desktop.in	Sun Oct 08 13:30:05 2017 +0100
@@ -11,7 +11,7 @@
 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
--- a/plugins/import/geeqie-import-gqview.desktop.in	Tue Oct 03 10:35:14 2017 +0100
+++ b/plugins/import/geeqie-import-gqview.desktop.in	Sun Oct 08 13:30:05 2017 +0100
@@ -11,7 +11,7 @@
 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
--- a/src/layout_util.c	Tue Oct 03 10:35:14 2017 +0100
+++ b/src/layout_util.c	Sun Oct 08 13:30:05 2017 +0100
@@ -1996,12 +1996,10 @@
 "      <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)