# HG changeset patch # User zas_ # Date 1226251039 0 # Node ID 36e6014c612ad84a16ccd16991a58637ede21dca # Parent 1bb220ff787ee83a53edccd058ef5f170acb9f30 Reformat and cleanup. diff -r 1bb220ff787e -r 36e6014c612a doc/image_management_delete.html --- a/doc/image_management_delete.html Sun Nov 09 13:37:39 2008 +0000 +++ b/doc/image_management_delete.html Sun Nov 09 17:17:19 2008 +0000 @@ -41,9 +41,9 @@

Delete

-

To delete a file in Geeqie press Control + D, or select Delete from the file menu. Delete is also available in the context menu of all images and files. If Enable delete key is enabled in Options, pressing the Delete key can also be used to delete files.

+

To delete a file in Geeqie press Control + D, or select Delete from the file menu. Delete is also available in the context menu of all images and files. If Enable delete key is enabled in Options, pressing the Delete key can also be used to delete files.

-

The behavior when starting a delete operation depends on the Confirm file delete option in Options. If the option is enabled a dialog will appear to confirm the operation, if it is not enabled the files will be deleted without further interaction. In all cases if the file is unable to be deleted you will be notified by a dialog.

+

The behavior when starting a delete operation depends on the Confirm file delete option in Options. If the option is enabled a dialog will appear to confirm the operation, if it is not enabled the files will be deleted without further interaction. In all cases if the file is unable to be deleted you will be notified by a dialog.



@@ -55,7 +55,7 @@

When deleting multiple files, the dialog will include two arrow buttons to step the image preview through the list of files to be deleted. Initially the preview will be blank, activate the right arrow to display the first file.

-

The dialog will also display the status of the Safe Delete feature. Use this to determine if a file to be Deleted will be immediately lost, or if the file can possibly be recovered from the Safe Delete folder.

+

The dialog will also display the status of the Safe Delete feature. Use this to determine if a file to be Deleted will be immediately lost, or if the file can possibly be recovered from the Safe Delete folder.

If a file is unable to be deleted, a dialog will appear to notify you. If multiple files were selected and any remain, the dialog will include a Continue button, activating this button or pressing Enter will delete the remaining files. Pressing Escape or activating the Cancel button will close the dialog and the remaining files will not be deleted.

@@ -65,15 +65,25 @@

Safe Delete

-

Geeqie includes a feature to temporarily store deleted files in a selected folder, to use this feature enable Safe Delete on the advanced tab of the preferences dialog. Safe Delete includes these options:

+

Geeqie includes a feature to temporarily store deleted files in a selected folder, to use this feature enable Safe Delete on the advanced tab of the preferences dialog.

+ +

Safe Delete includes these options:

-

Folder: The folder to use for temporarily retaining deleted files.

+

+

+
Folder
+

The folder to use for temporarily retaining deleted files.

-

Maximum size: The maximum amount of disk space to use when storing deleted files, in megabytes.

+
Maximum size
+

The maximum amount of disk space to use when storing deleted files, in megabytes.

-

When the total size of the deleted files stored in the Safe Delete folder exceeds the Maximum size, the oldest files are removed from the folder to make space for the new deleted files. Files moved to the Safe Delete folder are prefixed with a six digit number in the format:

+

When the total size of the deleted files stored in the Safe Delete folder exceeds the Maximum size, the oldest files are removed from the folder to make space for the new deleted files.

+

+
-

nnnnnn_FILENAME

+

Files moved to the Safe Delete folder are prefixed with a six digit number in the format: + nnnnnn_FILENAME +

This is used to distinguish which files to remove first when clearing space for new files. The digit counter increments with each deleted file.

diff -r 1bb220ff787e -r 36e6014c612a doc/image_management_rename.html --- a/doc/image_management_rename.html Sun Nov 09 13:37:39 2008 +0000 +++ b/doc/image_management_rename.html Sun Nov 09 17:17:19 2008 +0000 @@ -63,13 +63,20 @@

The dialog that appears when renaming multiple files includes the list of files to be renamed, a preview image of the active file, an entry to enter the new file name, an auto rename check box, a Rename button, and a Cancel button.

-

Manually enter new file names: To manually enter the new name of each file, the active file will be displayed in the image preview and it's original name will be displayed above the text entry. To rename the file type the new name and press Enter or activate the Rename button. When a file is successfully renamed it will be removed from the list and the next one will become the active file. After all files have been renamed, the dialog will close.

- +

+

+
Manually enter new file names
+
+

To manually enter the new name of each file, the active file will be displayed in the image preview and it's original name will be displayed above the text entry. To rename the file type the new name and press Enter or activate the Rename button. When a file is successfully renamed it will be removed from the list and the next one will become the active file. After all files have been renamed, the dialog will close.

+

Files do not have to be renamed in the order that they appear in the list, highlighting a name in the list will make it become the active file.

When renaming a file and the new name already exists on the file system a dialog will appear showing the renamed and existing files. To overwrite the existing file press enter or activate the Overwrite button. Press Escape or activate the Cancel button to return to the original rename dialog, the file that prompted the overwrite dialog will remain active.

+
-

Automatic renaming of multiple files: To automatically rename the files in the list, enable the Auto rename check box. The dialog will change to batch mode for numerical naming of files.

+
Automatic renaming of multiple files
+
+

To automatically rename the files in the list, enable the Auto rename check box. The dialog will change to batch mode for numerical naming of files.

The file name list will change to include a preview column that will show the resulting name of each file. The text entry will change to three entries; the first represents the text that appears in the new names before the number, the second will be the start number to use when incrementing the file number, and the third represents the text to append to the name after the number. The end text should include the file name extension, therefore batch renaming multiple types of files (those with different extensions) all at once is not recommended.

@@ -80,6 +87,8 @@

When the preview of new names is satisfactory, press Enter or activate the Rename button to rename the files to match the name in the preview column. Press Escape or activate the Cancel button to close the dialog and abort the rename operation.

If the resulting new names match any existing files, a warning dialog will notify you. The rename dialog will remain so that you can select a different set of names.

+
+



diff -r 1bb220ff787e -r 36e6014c612a doc/image_presentation_fullscreen.html --- a/doc/image_presentation_fullscreen.html Sun Nov 09 13:37:39 2008 +0000 +++ b/doc/image_presentation_fullscreen.html Sun Nov 09 17:17:19 2008 +0000 @@ -93,11 +93,18 @@

Full screen behavior and location can be adjusted on the Advanced tab of the preferences dialog.

-

Size and location: This can be changed using Full screen size option, this can be used to select the monitor to use in a multiple monitor configuration.

+

+

+
Size and location
+

This can be changed using Full screen size option, this can be used to select the monitor to use in a multiple monitor configuration.

-

Smooth image flip in full screen: This option delays the image change until the next image is entirely decoded into memory, the result is a smoother transition between images.

+
Smooth image flip in full screen
+

This option delays the image change until the next image is entirely decoded into memory, the result is a smoother transition between images.

-

Disable screen saver in full screen: This option will execute xscreensaver-command --deactivate once per minute to avoid the screen saver from activating.

+
Disable screen saver in full screen
+

This option will execute xscreensaver-command --deactivate once per minute to avoid the screen saver from activating.

+
+



diff -r 1bb220ff787e -r 36e6014c612a doc/image_presentation_slideshow.html --- a/doc/image_presentation_slideshow.html Sun Nov 09 13:37:39 2008 +0000 +++ b/doc/image_presentation_slideshow.html Sun Nov 09 17:17:19 2008 +0000 @@ -151,11 +151,16 @@

The options that control the behavior of slide shows are located on the General tab of the options dialog.

-

Display time: The delay between each image in the slide show can be adjusted with the Delay before image change option.

+
+
Display time
+

The delay between each image in the slide show can be adjusted with the Delay before image change option.

-

Repeat: This will cause the slide show to loop indefinitely, it will continue with the first image after displaying the last image in the slide show list.

+
Repeat
+

This will cause the slide show to loop indefinitely, it will continue with the first image after displaying the last image in the slide show list.

-

Random: This will display images randomly selected from the slide show list. Each image from the slide show list will be displayed once. When Repeat is also enabled, the random sequence is changed after each complete cycle of the images.

+
Random
+

This will display images randomly selected from the slide show list. Each image from the slide show list will be displayed once. When Repeat is also enabled, the random sequence is changed after each complete cycle of the images.

+



diff -r 1bb220ff787e -r 36e6014c612a doc/image_search_finding_duplicates.html --- a/doc/image_search_finding_duplicates.html Sun Nov 09 13:37:39 2008 +0000 +++ b/doc/image_search_finding_duplicates.html Sun Nov 09 17:17:19 2008 +0000 @@ -51,9 +51,19 @@

Add files to be compared using drag and drop. Drop files or folders onto the Find Duplicates window to add them to the list of files to compare. When one or more folders are dropped onto the window a menu will appear allowing you to choose the desired action:

-

Add contents: The contents of dropped folders will added to the window.
- Add contents recursive: The contents of dropped folders and all sub folders will be added to the window.
- Skip folders: Ignore folders contained in the drop list.

+

+

+

When files are added to the window, the comparison is restarted to include the new files.

@@ -65,25 +75,27 @@

The attribute to use for two images to match can be selected with the “Compare by:” drop down menu. Each method is explained below:

-

Name: The file name.

+
+
Name

The file name.

-

Size: The file size.

+
Size

The file size.

-

Date: The file date.

+
Date

The file date.

-

Dimensions: The image dimensions.

+
Dimensions

The image dimensions.

-

Checksum: The MD5 file checksum.

+
Checksum

The MD5 file checksum.

-

Path: The complete path to file.

+
Path

The complete path to file.

-

Similarity (high): Very similar image content.

+
Similarity (high)

Very similar image content.

-

Similarity: Similar image content.

+
Similarity

Similar image content.

-

Similarity (low): Slightly similar image content.

+
Similarity (low)

Slightly similar image content.

-

Similarity (custom): Similar image content, the value to use to consider two images a match is configured in the Advanced tab of the preferences dialog by setting the “Custom similarity threshold”.

+
Similarity (custom)

Similar image content, the value to use to consider two images a match is configured in the Advanced tab of the preferences dialog by setting the “Custom similarity threshold”.

+



diff -r 1bb220ff787e -r 36e6014c612a doc/image_search_search.html --- a/doc/image_search_search.html Sun Nov 09 13:37:39 2008 +0000 +++ b/doc/image_search_search.html Sun Nov 09 17:17:19 2008 +0000 @@ -61,13 +61,24 @@

One of several locations can be chosen as the source to use in the search.

-

Path: The search will include files located in the selected folder, enable the Recurse check box to include the contents of all sub folders.

- -

Comments: The search will include all files that have a keyword or comment associated to it.

+

+

+
Path
+
+

The search will include files located in the selected folder, enable the Recurse check box to include the contents of all sub folders.

+
+
Comments
+
+

The search will include all files that have a keyword or comment associated to it.

Note: Only keyword and comment associations stored in the user's home folder are included in this search type.

+
-

Results: The search will include all files currently listed in the results list, use this to refine a previous search.

+
Results
+
+

The search will include all files currently listed in the results list, use this to refine a previous search.

+
+



@@ -76,23 +87,40 @@

Search parameters

Each search parameter can be enabled or disabled with the check box to it's left. For a file to be a match, all enabled parameters must be true.

- -

File name: The search will match if the entered text appears within the file name, or if the text exactly matches the file name, depending on the method selected from the drop down menu. The text comparison can be made to be case sensitive by enabling the Match case checkbox.

+ +
+
File name
+
+

The search will match if the entered text appears within the file name, or if the text exactly matches the file name, depending on the method selected from the drop down menu. The text comparison can be made to be case sensitive by enabling the Match case checkbox.

+
-

File size: The search will match if the file size on disk is equal to, less than, greater than, or between the entered value, depending on the method selected from the drop down menu. The between test is inclusive, for example a file of size 10 will match if the size parameters are between 10 and 15.

+
File size
+

The search will match if the file size on disk is equal to, less than, greater than, or between the entered value, depending on the method selected from the drop down menu. The between test is inclusive, for example a file of size 10 will match if the size parameters are between 10 and 15.

+
-

File date: The search will match if the file modification time on disk is equal to, before, after, or between the entered date, depending on the method selected from the drop down menu. The between test is inclusive, for example a file with date of 10/04/2003 will match if the date parameters are between 10/04/2003 and 12/31/2003.

- +
File date
+
+

The search will match if the file modification time on disk is equal to, before, after, or between the entered date, depending on the method selected from the drop down menu. The between test is inclusive, for example a file with date of 10/04/2003 will match if the date parameters are between 10/04/2003 and 12/31/2003.

For convenience, the button with the down arrow displays a pop up calendar to enter the date.

+
-

Image dimensions: The search will match if the image dimensions are equal to, less than, greater than, or between the entered values, depending on the method selected from the drop down menu. The between test is inclusive.

- +
Image dimensions
+
+

The search will match if the image dimensions are equal to, less than, greater than, or between the entered values, depending on the method selected from the drop down menu. The between test is inclusive.

The image dimensions test is simple, both width and height must be within the allowed values for a match.

+
-

Image content: The search will match if the image contents are similar within the percentage value, inclusive. This uses the same test and data that is used to determine image similarity when Finding Duplicates. The entry is for entering the path for the image to use in this test.

+
Image content
+
+

The search will match if the image contents are similar within the percentage value, inclusive. This uses the same test and data that is used to determine image similarity when Finding Duplicates. The entry is for entering the path for the image to use in this test.

+
-

Keywords: The search will match if the file's associated keywords match all, match any, or exclude the entered keywords, depending on the method selected from the drop down menu. Keywords can be separated with a space, comma, or tab character.

- +
Keywords
+
+

The search will match if the file's associated keywords match all, match any, or exclude the entered keywords, depending on the method selected from the drop down menu. Keywords can be separated with a space, comma, or tab character.

+
+
+



@@ -389,15 +417,32 @@

At the bottom of the search window is an area that includes the following items from left to right:

-

Thumbnails: Enable this check box to display a thumbnail next to each image in the results list.

+
+
Thumbnails
+
+

Enable this check box to display a thumbnail next to each image in the results list.

+
-

File count display: Displays the total count of files in the results list, and their size on disk. The count of selected files will appear in parenthesis.

+
File count display
+
+

Displays the total count of files in the results list, and their size on disk. The count of selected files will appear in parenthesis.

+
-

Search progress: When a search is active, the text “Searching...” will appear here. Two numbers in parenthesis will also be displayed, the first number is the number of files that match the search parameters and the second number is the total number of files that were searched.

+
Search progress
+
+

When a search is active, the text “Searching...” will appear here. Two numbers in parenthesis will also be displayed, the first number is the number of files that match the search parameters and the second number is the total number of files that were searched.

+
-

Find: Activate the find button to start a search with the selected parameters.

- -

Stop: Activate the stop button to end a search that is in progress.

+
Find
+
+

Activate the find button to start a search with the selected parameters.

+
+ +
Stop
+
+

Activate the stop button to end a search that is in progress.

+
+



diff -r 1bb220ff787e -r 36e6014c612a doc/introduction.html --- a/doc/introduction.html Sun Nov 09 13:37:39 2008 +0000 +++ b/doc/introduction.html Sun Nov 09 17:17:19 2008 +0000 @@ -66,7 +66,7 @@

-

Basic Features

+

Basic Features

-

Advanced Features

+

Advanced Features