From a6b2ca7156636313a97e7a2925acff0af98715b6 Mon Sep 17 00:00:00 2001 From: Colin Clark Date: Wed, 27 Mar 2019 11:56:16 +0000 Subject: [PATCH] Update documentation, remove obsolete GQview import options Update plugin and remote commands documentation. The last update for GQview was 13 years ago; presumably the import options are no longer useful. --- doc/docbook/GuideImageManagementPlugins.xml | 4 + doc/docbook/GuideReference.xml | 1 + doc/docbook/GuideReferenceCommandLine.xml | 27 +++- doc/docbook/GuideReferencePCRE.xml | 1 + doc/docbook/GuideReferenceStandardPlugins.xml | 128 ++++++++++++++++++ geeqie.1 | 4 + plugins/Makefile.am | 2 +- plugins/import/Makefile.am | 9 -- plugins/import/geeqie-import | 34 ----- .../import/geeqie-import-geeqie.desktop.in | 17 --- .../import/geeqie-import-gqview.desktop.in | 17 --- src/remote.c | 2 +- 12 files changed, 166 insertions(+), 80 deletions(-) create mode 100644 doc/docbook/GuideReferenceStandardPlugins.xml delete mode 100644 plugins/import/Makefile.am delete mode 100755 plugins/import/geeqie-import delete mode 100644 plugins/import/geeqie-import-geeqie.desktop.in delete mode 100644 plugins/import/geeqie-import-gqview.desktop.in diff --git a/doc/docbook/GuideImageManagementPlugins.xml b/doc/docbook/GuideImageManagementPlugins.xml index 2a3cb902..ea001ea1 100644 --- a/doc/docbook/GuideImageManagementPlugins.xml +++ b/doc/docbook/GuideImageManagementPlugins.xml @@ -34,4 +34,8 @@ Escape , to close the Result dialogue. The Result dialogue can not be closed while a command is still running. + + The supplied standard plugins are described in the + Reference section. + diff --git a/doc/docbook/GuideReference.xml b/doc/docbook/GuideReference.xml index 2b5a60a6..75281842 100644 --- a/doc/docbook/GuideReference.xml +++ b/doc/docbook/GuideReference.xml @@ -11,6 +11,7 @@ + diff --git a/doc/docbook/GuideReferenceCommandLine.xml b/doc/docbook/GuideReferenceCommandLine.xml index 71eac7be..7c235923 100644 --- a/doc/docbook/GuideReferenceCommandLine.xml +++ b/doc/docbook/GuideReferenceCommandLine.xml @@ -211,15 +211,25 @@ file:<file> Open <file> and bring Geeqie window to the top + + + --file:<file> + Open <file> and bring Geeqie window to the top + File:<file> Open <file> and do not bring Geeqie window to the top + + + --File:<file> + Open <file> and do not bring Geeqie window to the top + --tell - Print filename of current image + Print filename [and Collection] of current image @@ -231,6 +241,11 @@ view:<file> Open new window containing <file> + + + --view:<file> + Open new window containing <file> + --list-clear @@ -246,6 +261,11 @@ raise Bring the geeqie window to the top + + + --raise + Bring the geeqie window to the top + --id:<ID> @@ -311,6 +331,11 @@ --lua:<file>,<lua script> run lua script on file + + + --PWD:<PWD> + Use PWD as working directory for following commands + diff --git a/doc/docbook/GuideReferencePCRE.xml b/doc/docbook/GuideReferencePCRE.xml index 66d97bed..7838c7d3 100644 --- a/doc/docbook/GuideReferencePCRE.xml +++ b/doc/docbook/GuideReferencePCRE.xml @@ -9,6 +9,7 @@ Use "." and not "?" for a single character. Use "abc.*ghk" and not "abc*ghk" for multiple characters Use "\." to represent the dot in a file extension + Use "(?i)" to make the following characters case-insensitive diff --git a/doc/docbook/GuideReferenceStandardPlugins.xml b/doc/docbook/GuideReferenceStandardPlugins.xml new file mode 100644 index 00000000..2d1e779d --- /dev/null +++ b/doc/docbook/GuideReferenceStandardPlugins.xml @@ -0,0 +1,128 @@ + +
+ Standard Plugins + The following plugins are supplied as standard with Geeqie. +
+ Edit UFRaw ID file + Creates a UFRaw ID file for each of the selected files. + + This item is displayed in the + Edit + menu. + +
+
+ UFRaw Batch + + Searches for new RAW files or for modified UFRaw + ID files and processes them with + ufraw-batch + . + + + This item is displayed in the + Edit + menu. + +
+
+ UFRaw Batch recursive + As above, with a recursive search. + + This item is displayed in the + Edit + menu. + +
+ +
+ Apply the orientation to image content + 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. + + External commands exiftran, exiv2 and mogrify, are used to implement this command. + + + This item is displayed in the + Edit/Orientation + menu. + +
+
+ Camera import + 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. + + This item is displayed in the + Plugins + menu. + +
+
+ Export jpeg + + Extracts an embedded jpeg from a raw image to a file in the + /tmp + folder. If you wish to to keep this image, it must be copied or moved. + + If + jpgicc + is installed, the image will be colour-corrected for the currently selected rendering intent. + + + This item is displayed in the + Plugins + menu. + +
+
+ Image crop + + If rectangle coordinates have been set by + Edit/Draw Rectangle + , a cropped image will be stored in the + /tmp + folder. If you wish to to keep this image, it must be copied or moved. + + + This item is displayed in the + Plugins + menu. + +
+
+ Random image + Selects and displays a random image from a list of all images in Collections and the currently displayed folder. + + This item is displayed in the + Plugins + menu. + +
+
+ Tethered photography + + If a camera is connected to the computer via USB, photos taken are immediately downloaded to the current folder and displayed on the computer. + + If a file already exists with the same name, it is not overwritten but the download will not take place. + + Auto-rename can be achieved with the --filename option of gphoto2. + + In file + $HOME/.config/gphoto2/settings + , set the option: + gphoto2=filename=<see the gphoto2 manual> + + + This item is displayed in the + Plugins + menu. + +
+
diff --git a/geeqie.1 b/geeqie.1 index 416e30db..db9e35a5 100644 --- a/geeqie.1 +++ b/geeqie.1 @@ -271,6 +271,10 @@ Render thumbnails recursively (see Help). .IP \-\-lua:, Run lua script on FILE. .br +.B +.IP \-\-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. diff --git a/plugins/Makefile.am b/plugins/Makefile.am index abfaef8d..fa752389 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -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 index e9dc90b1..00000000 --- a/plugins/import/Makefile.am +++ /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 index 8e607c71..00000000 --- a/plugins/import/geeqie-import +++ /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 index 8a5039e2..00000000 --- a/plugins/import/geeqie-import-geeqie.desktop.in +++ /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 index 1c19ae4d..00000000 --- a/plugins/import/geeqie-import-gqview.desktop.in +++ /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 diff --git a/src/remote.c b/src/remote.c index c5ecfdc9..708fded9 100644 --- a/src/remote.c +++ b/src/remote.c @@ -1174,7 +1174,7 @@ static RemoteCommandEntry remote_commands[] = { #ifdef HAVE_LUA { NULL, "--lua:", gr_lua, TRUE, FALSE, N_(","), N_("run lua script on FILE") }, #endif - { NULL, "--PWD:", gr_pwd, TRUE, FALSE, N_(""), N_("for internal use only") }, + { NULL, "--PWD:", gr_pwd, TRUE, FALSE, N_(""), N_("use PWD as working directory for following commands") }, { NULL, NULL, NULL, FALSE, FALSE, NULL, NULL } }; -- 2.20.1