Update documentation, remove obsolete GQview import options
authorColin Clark <colin.clark@cclark.uk>
Wed, 27 Mar 2019 11:56:16 +0000 (11:56 +0000)
committerColin Clark <colin.clark@cclark.uk>
Wed, 27 Mar 2019 11:56:16 +0000 (11:56 +0000)
Update plugin and remote commands documentation.
The last update for GQview was 13 years ago; presumably the import
options are no longer useful.

12 files changed:
doc/docbook/GuideImageManagementPlugins.xml
doc/docbook/GuideReference.xml
doc/docbook/GuideReferenceCommandLine.xml
doc/docbook/GuideReferencePCRE.xml
doc/docbook/GuideReferenceStandardPlugins.xml [new file with mode: 0644]
geeqie.1
plugins/Makefile.am
plugins/import/Makefile.am [deleted file]
plugins/import/geeqie-import [deleted file]
plugins/import/geeqie-import-geeqie.desktop.in [deleted file]
plugins/import/geeqie-import-gqview.desktop.in [deleted file]
src/remote.c

index 2a3cb90..ea001ea 100644 (file)
@@ -34,4 +34,8 @@
     <code>Escape</code>\r
     , to close the Result dialogue. The Result dialogue can not be closed while a command is still running.\r
   </para>\r
+  <para>\r
+    The supplied standard plugins are described in the\r
+    <link linkend="GuideReferenceStandardPlugins">Reference section.</link>\r
+  </para>\r
 </chapter>\r
index 2b5a60a..7528184 100644 (file)
@@ -11,6 +11,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceTags.xml" />\r
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceSupportedFormats.xml" />\r
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferencePixbufLoaders.xml" />\r
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceStandardPlugins.xml" />\r
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceUTC.xml" />\r
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceDecodeLatLong.xml" />\r
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideReferenceStandards.xml" />\r
index 71eac7b..7c23592 100644 (file)
             <entry>file:&lt;file&gt;</entry>\r
             <entry>Open  &lt;file&gt; and bring Geeqie window to the top</entry>\r
           </row>\r
+          <row>\r
+            <entry />\r
+            <entry>--file:&lt;file&gt;</entry>\r
+            <entry>Open  &lt;file&gt; and bring Geeqie window to the top</entry>\r
+          </row>\r
           <row>\r
             <entry />\r
             <entry>File:&lt;file&gt;</entry>\r
             <entry>Open  &lt;file&gt; and do not bring Geeqie window to the top</entry>\r
           </row>\r
+          <row>\r
+            <entry />\r
+            <entry>--File:&lt;file&gt;</entry>\r
+            <entry>Open  &lt;file&gt; and do not bring Geeqie window to the top</entry>\r
+          </row>\r
           <row>\r
             <entry />\r
             <entry>--tell</entry>\r
-            <entry>Print filename of current image</entry>\r
+            <entry>Print filename [and Collection] of current image</entry>\r
           </row>\r
           <row>\r
             <entry />\r
             <entry>view:&lt;file&gt;</entry>\r
             <entry>Open new window containing &lt;file&gt;</entry>\r
           </row>\r
+          <row>\r
+            <entry />\r
+            <entry>--view:&lt;file&gt;</entry>\r
+            <entry>Open new window containing &lt;file&gt;</entry>\r
+          </row>\r
           <row>\r
             <entry />\r
             <entry>--list-clear</entry>\r
             <entry>raise</entry>\r
             <entry>Bring the geeqie window to the top</entry>\r
           </row>\r
+          <row>\r
+            <entry />\r
+            <entry>--raise</entry>\r
+            <entry>Bring the geeqie window to the top</entry>\r
+          </row>\r
           <row>\r
             <entry />\r
             <entry>--id:&lt;ID&gt;</entry>\r
             <entry>--lua:&lt;file&gt;,&lt;lua script&gt;</entry>\r
             <entry>run lua script on file</entry>\r
           </row>\r
+          <row>\r
+            <entry />\r
+            <entry>--PWD:&lt;PWD&gt;</entry>\r
+            <entry>Use PWD as working directory for following commands</entry>\r
+          </row>\r
         </tbody>\r
       </tgroup>\r
     </table>\r
index 66d97be..7838c7d 100644 (file)
@@ -9,6 +9,7 @@
       <listitem>Use "." and not "?" for a single character.</listitem>\r
       <listitem>Use "abc.*ghk" and not "abc*ghk" for multiple characters</listitem>\r
       <listitem>Use "\." to represent the dot in a file extension</listitem>\r
+      <listitem>Use "(?i)" to make the following characters case-insensitive</listitem>\r
     </itemizedlist>\r
   </para>\r
 </section>\r
diff --git a/doc/docbook/GuideReferenceStandardPlugins.xml b/doc/docbook/GuideReferenceStandardPlugins.xml
new file mode 100644 (file)
index 0000000..2d1e779
--- /dev/null
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<section id="GuideReferenceStandardPlugins">\r
+  <title id="titleGuideReferenceStandardPlugins">Standard Plugins</title>\r
+  <para>The following plugins are supplied as standard with Geeqie.</para>\r
+  <section id="EditUFRawIDfile">\r
+    <title>Edit UFRaw ID file</title>\r
+    <para>Creates a UFRaw ID file for each of the selected files.</para>\r
+    <para>\r
+      This item is displayed in the\r
+      <emphasis role="strong">Edit</emphasis>\r
+      menu.\r
+    </para>\r
+  </section>\r
+  <section id="UFRawBatch">\r
+    <title>UFRaw Batch</title>\r
+    <para>\r
+      Searches for new RAW files or for modified UFRaw \r
+      ID files and processes them with\r
+      <code>ufraw-batch</code>\r
+      .\r
+    </para>\r
+    <para>\r
+      This item is displayed in the\r
+      <emphasis role="strong">Edit</emphasis>\r
+      menu.\r
+    </para>\r
+  </section>\r
+  <section id="UFRawBatchrecursive">\r
+    <title>UFRaw Batch recursive</title>\r
+    <para>As above, with a recursive search.</para>\r
+    <para>\r
+      This item is displayed in the\r
+      <emphasis role="strong">Edit</emphasis>\r
+      menu.\r
+    </para>\r
+  </section>\r
+  <section id="Symlink">\r
+    <title>Symlink</title>\r
+    <para>Creates a symbolic link on the selected files. If a file has sidecars, they will also be symlinked.</para>\r
+    <para>\r
+      This item is displayed in the\r
+      <emphasis role="strong">File</emphasis>\r
+      menu.\r
+    </para>\r
+  </section>\r
+  <section id="Applytheorientationtoimagecontent">\r
+    <title>Apply the orientation to image content</title>\r
+    <para>This command affects only jpeg, tiff and png files. The image file on disk is rotated to the orientation as specified by its Exif Orientation tag.</para>\r
+    <warning>\r
+      <para>External commands exiftran, exiv2 and mogrify, are used to implement this command.</para>\r
+    </warning>\r
+    <para>\r
+      This item is displayed in the\r
+      <emphasis role="strong">Edit/Orientation</emphasis>\r
+      menu.\r
+    </para>\r
+  </section>\r
+  <section id="Cameraimport">\r
+    <title>Camera import</title>\r
+    <para>Imports images from an attached camera to the current folder. If a file with the same name already exists it will not be overwritten, and the new image will not be downloaded.</para>\r
+    <para>\r
+      This item is displayed in the\r
+      <emphasis role="strong">Plugins</emphasis>\r
+      menu.\r
+    </para>\r
+  </section>\r
+  <section id="Exportjpeg">\r
+    <title>Export jpeg</title>\r
+    <para>\r
+      Extracts an embedded jpeg from a raw image to a file in the\r
+      <code>/tmp</code>\r
+      folder. If you wish to to keep this image, it must be copied or moved.\r
+      <para />\r
+      If\r
+      <code>jpgicc</code>\r
+      is installed, the image will be colour-corrected for the currently selected rendering intent.\r
+    </para>\r
+    <para>\r
+      This item is displayed in the\r
+      <emphasis role="strong">Plugins</emphasis>\r
+      menu.\r
+    </para>\r
+  </section>\r
+  <section id="Imagecrop">\r
+    <title>Image crop</title>\r
+    <para>\r
+      If rectangle coordinates have been set by\r
+      <emphasis role="strong">Edit/Draw Rectangle</emphasis>\r
+      , a cropped image will be stored in the\r
+      <code>/tmp</code>\r
+      folder. If you wish to to keep this image, it must be copied or moved.\r
+    </para>\r
+    <para>\r
+      This item is displayed in the\r
+      <emphasis role="strong">Plugins</emphasis>\r
+      menu.\r
+    </para>\r
+  </section>\r
+  <section id="Randomimage">\r
+    <title>Random image</title>\r
+    <para>Selects and displays a random image from a list of all images in Collections and the currently displayed folder.</para>\r
+    <para>\r
+      This item is displayed in the\r
+      <emphasis role="strong">Plugins</emphasis>\r
+      menu.\r
+    </para>\r
+  </section>\r
+  <section id="Tetheredphotography">\r
+    <title>Tethered photography</title>\r
+    <para>\r
+      If a camera is connected to the computer via USB, photos taken are immediately downloaded to the current folder and displayed on the computer.\r
+      <para />\r
+      If a file already exists with the same name, it is not overwritten but the download will not take place.\r
+      <para />\r
+      Auto-rename can be achieved with the --filename option of gphoto2.\r
+      <para />\r
+      In file\r
+      <code>$HOME/.config/gphoto2/settings</code>\r
+      , set the option:\r
+      <code>gphoto2=filename=&lt;see the gphoto2 manual&gt;</code>\r
+    </para>\r
+    <para>\r
+      This item is displayed in the\r
+      <emphasis role="strong">Plugins</emphasis>\r
+      menu.\r
+    </para>\r
+  </section>\r
+</section>\r
index 416e30d..db9e35a 100644 (file)
--- a/geeqie.1
+++ b/geeqie.1
@@ -271,6 +271,10 @@ Render thumbnails recursively (see Help).
 .IP \-\-lua:<FILE>,<lua-script>
 Run lua script on FILE.
 .br
+.B
+.IP \-\-PWD:<PWD>
+Use PWD as working directory for following commands.
+.br
 
 .SH USAGE
 Key naming is similar to that of \fBemacs\fP(1): \fIC-key\fP indicates that control should be held, and key should be pressed; \fIS-key\fP  indicates that shift should be held and key should be pressed; these two can be combined, also, into \fIC-S-key\fP.
index abfaef8..fa75238 100644 (file)
@@ -1,5 +1,5 @@
 
-SUBDIRS = rotate symlink ufraw import geocode-parameters export-jpeg tethered-photography camera-import image-crop random-image
+SUBDIRS = rotate symlink ufraw geocode-parameters export-jpeg tethered-photography camera-import image-crop random-image
 qq_desktoptemplatedir = $(appdir)
 qq_desktoptemplate_in_files = template.desktop.in
 qq_desktoptemplate_DATA = $(qq_desktoptemplate_in_files:.desktop.in=.desktop)
diff --git a/plugins/import/Makefile.am b/plugins/import/Makefile.am
deleted file mode 100644 (file)
index e9dc90b..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-dist_gq_bin_SCRIPTS = geeqie-import
-
-gq_desktopdir = $(appdir)/applications
-gq_desktop_in_files = geeqie-import-geeqie.desktop.in geeqie-import-gqview.desktop.in
-gq_desktop_DATA = $(gq_desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
-
-EXTRA_DIST = $(gq_desktop_in_files)
-CLEANFILES = $(gq_desktop_DATA)
diff --git a/plugins/import/geeqie-import b/plugins/import/geeqie-import
deleted file mode 100755 (executable)
index 8e607c7..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-       gqview) 
-           srcdir=$HOME/.gqview/metadata
-           ;;
-       geeqie-1-alpha) 
-           srcdir=$HOME/.geeqie/metadata
-           ;;
-       *)
-           echo Unknown argument $1
-           exit 1
-           ;;
-esac
-
-destdir=$HOME/.local/share/geeqie/metadata
-
-if [ ! -d $HOME/.local/share/geeqie ] ; then
-    echo \"$HOME/.local/share/geeqie\" does not exist
-    exit 1
-fi
-
-for ext in .meta .gq.xmp ; do
-    find "$srcdir" -type f -name "*$ext" -print | while read src ; do
-        img="${src#$srcdir}"
-        img="${img%$ext}"
-        dest="$destdir$img$ext"
-        if [ -f "$img" -a ! -f "$dest" ] ; then
-            mkdir -p "${dest%/*}"
-            cp -pr "$src" "$dest"
-            echo Importing $ext metadata for \"$img\"
-        fi
-    done
-done
diff --git a/plugins/import/geeqie-import-geeqie.desktop.in b/plugins/import/geeqie-import-geeqie.desktop.in
deleted file mode 100644 (file)
index 8a5039e..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-_Name=Import Geeqie 1.0alphaX metadata
-
-# call the helper script
-Exec=geeqie-import geeqie-1-alpha
-
-# Desktop files that are usable only in Geeqie should be marked like this:
-Categories=X-Geeqie;
-OnlyShowIn=X-Geeqie;
-
-# Show in menu "File"
-#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
deleted file mode 100644 (file)
index 1c19ae4..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-_Name=Import GQView metadata
-
-# call the helper script
-Exec=geeqie-import gqview
-
-# Desktop files that are usable only in Geeqie should be marked like this:
-Categories=X-Geeqie;
-OnlyShowIn=X-Geeqie;
-
-# Show in menu "File"
-#X-Geeqie-Menu-Path=EditMenu/PreferencesMenu
-
-# It can be made verbose
-X-Geeqie-Verbose=true
index c5ecfdc..708fded 100644 (file)
@@ -1174,7 +1174,7 @@ static RemoteCommandEntry remote_commands[] = {
 #ifdef HAVE_LUA
        { NULL, "--lua:",               gr_lua,                 TRUE, FALSE, N_("<FILE>,<lua script>"), N_("run lua script on FILE") },
 #endif
-       { NULL, "--PWD:",               gr_pwd,                 TRUE, FALSE, N_("<PWD>"), N_("for internal use only") },
+       { NULL, "--PWD:",               gr_pwd,                 TRUE, FALSE, N_("<PWD>"), N_("use PWD as working directory for following commands") },
        { NULL, NULL, NULL, FALSE, FALSE, NULL, NULL }
 };