From: Laurent Monin Date: Mon, 10 Nov 2008 23:05:50 +0000 (+0000) Subject: Update documentation a bit: General, Image, Windows, Filtering, Editors and a part... X-Git-Tag: v1.0.0~678 X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=757b8ebc5495d81fb1fb1b531e2f5e682a0ad9c9 Update documentation a bit: General, Image, Windows, Filtering, Editors and a part of Advanced (Image Overlay) options. --- diff --git a/doc/options_advanced.html b/doc/options_advanced.html index bff03aad..971700bb 100644 --- a/doc/options_advanced.html +++ b/doc/options_advanced.html @@ -57,6 +57,107 @@

This option will execute xscreensaver-command --deactivate once per minute to avoid the screen saver from activating when Geeqie is displayed full screen.

+ +

Overlay Screen Display

+ +
+
Always show image overlay at startup
+

Enable this to have the image overlay info displayed by default

+ +
Image overlay template
+

Overlay info is customizable through this template

+

Overlay info format string syntax is: %tag[:max_length][:extra]%

+ +
+ +++ + + + + + + + + + + + +
TagReplaced by
%name%Filename of the picture
%collection%Name of the collection
%number%Current number of image in the list
%total%Total number of images
%date%File date
%size%File size
%width%Image width
%height%Image height
%res%Image resolution
%keywords%Image keywords from metadata
%comment%Image comment from metadata
+
+ +

To access exif data use the exif name, for example: %Exif.Photo.DateTimeOriginal% to get the date of the original shot

+ +

Pre-formatted exif data is also available:

+
+ +++ + + + + + + + + + + + + + +
TagReplaced by exif data
formatted.CameraCamera and sofware name
formatted.DateTimeImage Date
formatted.ShutterSpeedShutter speed in seconds (ie. 1/60s)
formatted.ApertureAperture (ie. f5.6)
formatted.ExposureBiasExposure bias (ie. +0.3)
formatted.ISOSpeedRatingISO sensitivity (ie. 100)
formatted.FocalLengthFocal length
formatted.FocalLength35mmFilmFocal length 35mm
formatted.SubjectDistanceSubject distance
formatted.FlashFlash
formatted.ResolutionResolution
formatted.ColorProfileColor profile
+
+ +

+ You can limit the length of displayed data using :number notation: + %formatted.Camera:20% will truncate the displayed data to 20 characters + and will add 3 dots at the end to denote the truncation.

+ +

+ If two or more variables are connected with the |-sign, it prints available + variables with a separator:
+ %formatted.ShutterSpeed%|%formatted.ISOSpeedRating%|%formatted.FocalLength%
+ could show:
+ "1/20s - 400 - 80 mm"
+ or
+ "1/200 - 80 mm" if there's no ISO information in the Exif data.
+

+ +

+ If a line is empty, it is removed. + This allows to add lines that totally disappear when no data is available. +

+ +

+ Extra string uses special character '*' to mark the position of the data. + If no '*' is present, then extra string is just appended to data. + Any "\n" is replaced by a newline on display. + Pango mark up is accepted in left and right parts. + If data is empty, nothing will be displayed. +

+ +

Examples:

+
+
%name:<i>*</i>\n%
name is displayed in italics ended with a newline
+
%size:\n%
size is displayed with a newline at end
+
%formatted.ISOSpeedRating:ISO *%
ie. "ISO 100"
+
Collection <b>*</b>\n
display collection name in bold prefixed by "Collection " and a newline is appended
+
+ +
+ +
Help button
+

Show syntax help

+ +
Defaults button
+

Restore default image overlay template

+ +
+ +

Delete

diff --git a/doc/options_editor_commands.html b/doc/options_editor_commands.html index ce94d75c..c8287b11 100644 --- a/doc/options_editor_commands.html +++ b/doc/options_editor_commands.html @@ -45,12 +45,14 @@
Menu name
-

This field is used to represent the command in the menus of Geeqie, it is intended to describe the application or function that results from executing the command in the Command Line field.

+

This field is used to represent the command in the menus of Geeqie, it is intended to describe the application or function that results from executing the command in the Command Line field.

+

External command Copy/Move/Rename/Delete/New Folder allows to specify commands to use for these operations. When set, internal operations will be disabled and these commands used instead.

+
Command Line

This field is the command to execute. Several macros are available to position image file names within the command. If no macro is specified, the behavior will be to append the filenames onto the end of the command (the result will be the same as “command %f”).

- +
@@ -117,6 +119,25 @@

Prevent full screen from deactivating when command is executed. Must occur as the first two characters.

+ + + + + + + + + + +
+

%%

+ 		+

This will be replaced by one '%'. This is the way to escape '%'.

+
+

%d

+ 		+

This only makes sense for external commands like copy or move as this is replaced by the destination.

+
diff --git a/doc/options_filtering.html b/doc/options_filtering.html index a32f443a..1ffac0d9 100644 --- a/doc/options_filtering.html +++ b/doc/options_filtering.html @@ -44,8 +44,11 @@

Filters

-
Show entries that begin with a dot
+
Show hidden files or folders

Enables the display of hidden files and folders, also known as dot files.

+ +
Show dot directory
+

Enables the display of the current directory as a dot in the directories views. It may be useful for some drag'n'drop operations.

Case sensitive sort

Files and folders are sorted such that upper case letters occur before lower case letters.

@@ -58,6 +61,10 @@
+

Grouping sidecar extensions

+

This field defines which extensions will lead to file grouping. Each extension should be separated by a semi-colon and should include the starting dot.

+

Grouped files will appear as one in file views. For example, it is useful when browsing directories containing two files for the same image (as raw+jpeg files generated by some cameras).

+

File types

This list contains the image formats that are understood by Geeqie. To disable a specific file type from being displayed, uncheck it's corresponding checkbox. Filters can be edited by first selecting the line containing the item to be changed, then clicking the filter or description field, making any changes, then pressing enter; press escape to cancel an active edit. The format for the filter field is a semicolon (;) seperated list of extensions, extensions must include the period (.).

diff --git a/doc/options_general.html b/doc/options_general.html index 3146d6af..503081e7 100644 --- a/doc/options_general.html +++ b/doc/options_general.html @@ -44,12 +44,16 @@

Startup

-
Change to folder
+
Restore folder on startup

Enabling this will cause Geeqie to initially open to the specified folder.

Use Current

Activate this button to change the setting to the current folder.

-
+ +
Use last path
+

When checked, Geeqie will recall the last path used on startup.

+
+

Thumbnails

@@ -76,6 +80,12 @@
Cache thumbnails into .thumbnails

When enabled, Geeqie attempts to store cached thumbnails closer to the source image. This way multiple users can benefit from a single cache, thereby reducing wasted disk space. The resulting location is the source image's folder, in a sub folder with the name .thumbnails. When the image source folder cannot be written, Geeqie falls back to saving the thumbnail in the user's home folder.

+
Faster jpeg thumbnailing
+

This will speed up thumbnails generation in some cases, but may reduce the quality

+ +
Use EXIF thumbnails when available
+

Geeqie will extract thumbnail from EXIF data if available instead of generating one. This will speed up thumbnails generation but EXIF thumbnail may be not in sync with the image if it was modified by a tool which didn't take care of the thumbnail data.

+
Use xvpics thumbnails when found

xvpics is a common thumbnail caching format used by several applications. Thumbnails are stored locally to the source image in a sub folder with the name .xvpics. Enabling this option will allow Geeqie to read thumbnails saved in the xvpics format.

Note: Support for xvpics is read only, Geeqie can not generate thumbnails in this format.

diff --git a/doc/options_image.html b/doc/options_image.html index dc565268..a7cdfff7 100644 --- a/doc/options_image.html +++ b/doc/options_image.html @@ -61,6 +61,10 @@
Allow enlargement of image for zoom to fit

Enable this to allow Geeqie to increase the image size for images that are smaller than the current view area when the zoom is set to “Fit to Window”.

+
Limit image size when autofitting
+

This percentage will affect the size of the image when Fit image to window is set, instead of using 100% of the window, it will use the specified percentage. It allows to keep a border around the image (values lower than 100%) or to auto zoom the image (values greater than 100%). It affects fullscreen mode too.

+ +
Zoom increment

Adjusts the step size when zooming in or out on an image. This value corresponds to the percentage of the original image.

@@ -78,14 +82,32 @@
Leave zoom at previous setting
The zoom setting is unchanged, the new image will be scaled the same as the previous image.
+ + +

Scroll control

+ +
+
Scroll reset method
+

This controls the scroll initial position when changing the displayed image.

+ +
+
Top left
The new image is displayed from top left corner.
+
Center
The new image is centered
+
No change
The new image is positionned as the previous one, whenever possible.
+
+

Appearance

-
Black background
-

Enable this to draw the image background (the area around the image) in black.

+
Custom border color
+

Enable this to draw the image background (the area around the image) in the specified color.

+
Border color
+

Use this color chooser to define the color to use as image background.

+
+

Note: You may use Limit image size when autofitting option to keep a border around the image in fullscreen mode.

Convenience

diff --git a/doc/options_window.html b/doc/options_window.html index 705985e0..31643515 100644 --- a/doc/options_window.html +++ b/doc/options_window.html @@ -45,7 +45,7 @@
Remember window positions
-

This will maintain the main window size and position between Geeqie sessions.

+

This will maintain windows size and position between Geeqie sessions.

Remember tool state

This will maintain the tool window state between Geeqie sessions.

@@ -64,7 +64,8 @@

Window Layout

-

The Geeqie main window consists of three main panes, their position and order can be changed here. The first four selections represent the basic layout of the main window. The numbers within each selection represent the order of the pane content. The order of the content can be changed by dragging the Tools, Files, or Image with the mouse to the desired location within the list.

+

The Geeqie main window consists of three main panes, their position and order can be changed here. The first four selections represent the basic layout of the main window. The numbers within each selection represent the order of the pane content.

+

The order of the content can be changed by dragging the Tools, Files, or Image with the mouse to the desired location within the list.

diff --git a/doc/other_windows_image_window.html b/doc/other_windows_image_window.html index 15913e5a..e98c6cc0 100644 --- a/doc/other_windows_image_window.html +++ b/doc/other_windows_image_window.html @@ -68,9 +68,11 @@

To update the image display in the event that the source file has changed, press the R key.

-

Information Overlay

+

Information and histogram Overlay

A small overlay can be turned on and off by pressing the I key. This overlay displays the image file name, dimensions, file date, and file size. The count of the current image and of all images contained by the window are also displayed in parenthesis. When the window is linked to a collection, the collection title will also appear in the overlay in italics above the file name.

+

An histogram is displayed if I key is pressed twice, K key will modify the data displayed, and J key will toggle linear or logarithmic histogram.

+

Overlay info is customizable through Image Overlay Template option in Advanced tab in Preferences dialog.

diff --git a/doc/style.css b/doc/style.css index 25934b46..226c796b 100644 --- a/doc/style.css +++ b/doc/style.css @@ -157,6 +157,10 @@ code { list-style-type: circle; } +.examples dt { + border: 0; +} + /* collections.html */ div.collections-shortcuts { text-align: center;