Geeqie provides the ability to build lists of images, regardless of the location of the files on disk.

The collection window

A collection window displays the contents of a collection. It allows the collection to be modified and access to the images contained in the collection.

The selection can be changed using the keyboard and mouse the same as in a file pane of the main window.

Status bar

The status bar displays the total number of images in the collection, and the number of selected images in parenthesis. A progress bar also displays whenever thumbnails are loading from disk.

Drag and Drop

Drag and drop can be initialized with the primary or middle mouse buttons. Dragging an image that is selected will include all selected images in the drag. Dragging an image that is not selected will drag only that image.

To move images within the collection to change their order, initiate a drag for the selected image(s) and then move the mouse to the desired location within the window. A red arrow will appear to assist in determining the destination of the dragged images. Release the drag to move the images to the new location in the list.

Note: When renaming or moving files within Geeqie, the contents of collections located in the folder ($HOME)/.geeqie/collections will automatically update to the new name or location.

diff -r b223ad7f4867 -r 79e69e5f4642 doc/credits.html --- a/doc/credits.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/credits.html Mon Nov 10 14:10:39 2008 +0000 @@ -49,39 +49,23 @@

The ever growing list of contributors and language translators can be found in the README file included with the latest release of the program.
The Credits can also be viewed by selecting the Credits button located in the About dialog (open Help Menu, select About, click Credits... button).

-
-

Copyright

-
-

License

The Geeqie program is released under the “GNU General Public License”, the complete GNU GPL text can be found in the COPYING file included with each Geeqie release.

This Geeqie documentation is released under the "GNU Free Documentation License".

-
-

Legal Notice

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/image_management.html --- a/doc/image_management.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/image_management.html Mon Nov 10 14:10:39 2008 +0000 @@ -52,19 +52,7 @@ -

-
-

- -

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/image_management_copy_move.html --- a/doc/image_management_copy_move.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/image_management_copy_move.html Mon Nov 10 14:10:39 2008 +0000 @@ -45,16 +45,8 @@

The Copy and Move operations and dialogs behave the same in Geeqie, with the only difference being the final result. The remaining text of this page applies equally to the Copy and Move operations, for the remainder of this page these will be referred to as a Copy/Move operation.

-
-

Initiating a Copy/Move operation will display a dialog to select the destination folder to Copy/Move the selected file, after the destination folder is selected Geeqie will proceed to Copy/Move the images to the destination. If an error occurs or a file exists with the same name as one of the files being Copy/Moved, a dialog will appear prompting how to handle the situation.

-
-

The Copy/Move dialog

This is the dialog that is displayed when initiating a Copy/Move operation. The dialog contains a row of buttons near the top, vertical list of bookmarks along the left side, a vertical list of folders in the current path, a text entry field, and a row of buttons along the bottom.

@@ -77,18 +69,10 @@

Cancel button

Activate this button to close the dialog, the operation will be aborted.

-
-

The error dialog

If a problem occurs because Geeqie is unable to Copy or Move a selected file a dialog will appear to notify the user. The dialog will also ask if the operation should continue if one or more files remain to be Copied or Moved.

-
-

The overwrite dialog

If a file with the same name exists in the selected destination a dialog will appear to notify the user and ask how to resolve the conflict. The dialog will also display the source and destination images. The following possible solutions will be offered:

@@ -109,15 +93,7 @@

Cancel

This will close the dialog and stop the operation, all remaining files will be ignored.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/image_management_delete.html --- a/doc/image_management_delete.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/image_management_delete.html Mon Nov 10 14:10:39 2008 +0000 @@ -45,10 +45,6 @@

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.

-
-

Confirm delete dialog

The dialog that appears when delete confirmation is enabled will show the file or files to be deleted. To delete the file press Enter or activate the Delete button. Pressing Escape or activating the Cancel button will close the dialog and abort the operation.

@@ -59,10 +55,6 @@

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.

-
-

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.

@@ -89,19 +81,7 @@

To clear the contents of the Safe Delete folder, activate the Clear button provided for this purpose on the Advanced tab in Options.

-
-

- -

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/image_management_external_editing.html --- a/doc/image_management_external_editing.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/image_management_external_editing.html Mon Nov 10 14:10:39 2008 +0000 @@ -47,10 +47,6 @@

To edit the command list refer to section Editor Commands.

-
-

Result dialog

Commands that are set to display the command's output in a window will show a dialog when the command is executed.

@@ -61,15 +57,7 @@

Once all commands have completed or if the Stop button was activated and the pending command has completed, the Close button will be enabled, activate it or press Escape to close the result dialog. The result dialog can not be closed while a command is still running.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/image_management_rename.html --- a/doc/image_management_rename.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/image_management_rename.html Mon Nov 10 14:10:39 2008 +0000 @@ -45,20 +45,12 @@

When renaming a file, a dialog will display allowing entry of the new name for the file. The dialog will be different depending on the number of files selected to be renamed. A simple dialog will appear when renaming a single file, however when renaming multiple files the dialog will include a list of the file to be renamed and additional options.

-
-

Rename single file dialog

The dialog that appears when renaming a single file includes an image of the file, an entry to type the new name of the file, a Rename button, and a Cancel button. Type the new name into the text entry and press Enter or activate the Rename button to rename the file. Press Escape or activate the Cancel button to close the dialog and abort renaming the 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 close the dialog abort renaming the file.

-
-

Rename multiple files dialog

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.

@@ -90,15 +82,7 @@ -

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/image_presentation.html --- a/doc/image_presentation.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/image_presentation.html Mon Nov 10 14:10:39 2008 +0000 @@ -50,15 +50,7 @@ -

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/image_presentation_fullscreen.html --- a/doc/image_presentation_fullscreen.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/image_presentation_fullscreen.html Mon Nov 10 14:10:39 2008 +0000 @@ -41,10 +41,6 @@

Geeqie allows for the image pane to be expanded to fill the entire screen, this is referred to as full screen.

-
-

Turning on full screen

Full screen can be activated in a number of ways:

@@ -63,10 +59,6 @@ -

-
-

Turning off full screen

To return to the normal view:

@@ -85,10 +77,6 @@ -

-
-

Configuring full screen

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

@@ -106,10 +94,6 @@

-
-

Navigation

The usual image navigation controls are available when in full screen, these are the commands available:

@@ -152,20 +136,11 @@ - + - + - + @@ -173,15 +148,9 @@

Image Navigation

- + - + @@ -219,10 +188,7 @@

Home

- + - + - + @@ -275,10 +235,7 @@

[Shift] + Arrow Keys

- + - + - + - +

Change to first image.

@@ -234,10 +200,7 @@

End

Change to last image.

@@ -249,10 +212,7 @@

Image panning (image has keyboard focus)

Pan Image faster.

@@ -290,10 +247,7 @@

[Control] + Arrow Keys

Pan to respective edge of image.

@@ -305,10 +259,7 @@

SpaceBar

Change to next image.

@@ -320,10 +271,7 @@

Backspace

Change to previous image.

@@ -473,15 +421,7 @@

(*) Releases prior to 1.5.3 will turn off full screen prior to activating the function.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/image_presentation_slideshow.html --- a/doc/image_presentation_slideshow.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/image_presentation_slideshow.html Mon Nov 10 14:10:39 2008 +0000 @@ -43,10 +43,6 @@

The image pane can be set to automatically change the displayed image after a period of time, in Geeqie this is referred to as a slide show.

-
-

Starting a slide show

A slide show can be started in a number of ways:

@@ -65,30 +61,18 @@ -

-
-

Stopping a slide show

An active slide show can be stopped by using the same functions available to start one, as they work like a toggle switch. If slide show repeat is not enabled in the options dialog, the slide show will stop when the last image in the sequence is displayed.

Any action that changes the image pane to a new image will stop the active slide show, with the exception of the methods discussed in Slide show sequence navigation.

-
-

Slide show status

The main window status bar can be used to determine when a slide show is active, Slide show will be displayed next to the file count field. An individual Image Window can also display a slide show, however the status will not be immediately visible. To determine the slide show status in an image window, open a context menu by right clicking or using the menu key, the slide show menu item will reflect the slide show status; if Start slide show is displayed, no slide show is active, conversely if Stop slide show is displayed a slide show is active.

When a Slide show is paused, the main window status bar will display Paused instead of Slide show. Likewise, the image context menu will display Pause slide show or Continue slide show, depending on the current state.

-
-

Pausing a slide show

An active slide show can be paused in two ways:

@@ -103,10 +87,6 @@ -

-
-

Selecting the images to include in a slide show

When a single image is selected, all images in the current folder are included in the slide show. The sequence will begin with the current image; however if random slide shows are enabled, the sequence will begin with a random image from the list.

@@ -117,10 +97,6 @@

So far, the methods described are for slide shows in a main window, in an Image Window, the slide show will use all images referenced by that window.

-
-

Recursive slide show

In the main window, a recursive slide show can be started from a folder's context menu; the folder's right click menu will include two slide show options:

@@ -135,18 +111,10 @@ -

-
-

Slide show sequence navigation

When a slide show is active, functions that normally change the image forward and backward can be used to step through those contained in the slide show.

-
-

Configuring a slide show

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

@@ -162,15 +130,7 @@

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 b223ad7f4867 -r 79e69e5f4642 doc/image_search.html --- a/doc/image_search.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/image_search.html Mon Nov 10 14:10:39 2008 +0000 @@ -50,19 +50,7 @@ -

-
-

- -

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/image_search_finding_duplicates.html --- a/doc/image_search_finding_duplicates.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/image_search_finding_duplicates.html Mon Nov 10 14:10:39 2008 +0000 @@ -43,10 +43,6 @@

To display a new Find Duplicates Window press D or select Find duplicates from the File menu.

-
-

Adding files to be compared

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:

@@ -67,10 +63,6 @@

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

-
-

Comparison methods

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

@@ -97,10 +89,6 @@

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”.

-
-

Results list

Files that match with the selected comparison method will appear in the list. Matching files are grouped in alternating color.

@@ -262,10 +250,7 @@ - + - + - + - +

@@ -365,10 +350,7 @@

Displays the context menu.

@@ -380,10 +362,7 @@

Control + T

Toggle display of thumbnails.

@@ -395,10 +374,7 @@

Control + W

Close window.

@@ -408,18 +384,10 @@

-
-

The selection can be changed using the keyboard and mouse the same as in a file pane of the main window.

The image Dimensions column of the result list will only contain dimension information when comparing by dimensions, or when the data is easily available from memory or has been read from the cache.

-
-

Status bar

Along the bottom of the Find Duplicates window is an area that displays the count of files contained in the window, and the number of files in the result list.

@@ -434,41 +402,21 @@

If the time to complete a stage will be significant, an estimated time to completion will also be displayed in the progress bar. The estimated time only refers to the current stage, other stages are not included in the estimate. The time estimate is displayed using the format MINUTES:SECONDS.

-
-

Thumbnails

Thumbnails can be displayed beside each image in the result list by enabling the Thumbnails check box.

-
-

Compare two file sets

Sometimes it is useful to compare one group of files to another, different group of files. Enable this check box to compare two groups of files. When enabled a second list will appear, files can be added to this list using the same methods for the main list.

When comparing two file sets the results list will display matches between the two lists. For each match group, the first file is always from the main group, and the remaining files are always from the second group.

-
-

Drag and Drop

Drag and drop can be initiated with the primary or middle mouse buttons. Dragging a file that is selected will include all selected files in the drag. Dragging a file that is not selected will first change the selection to the dragged file, and clear the previous selection.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/image_search_search.html --- a/doc/image_search_search.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/image_search_search.html Mon Nov 10 14:10:39 2008 +0000 @@ -43,20 +43,12 @@

To display a new Search Window press F3 or select Search from the File menu.

-
-

To start a search activate the Find button. A search in progress can be stopped by activating the Stop button.

The progress of an active search is displayed as a progress bar at the bottom of the window. The progress bar will also display the total files that match the search parameters, and the total number of files searched.

When a search is completed, the total number of files found and their total size will be displayed in the status bar.

-
-

Search location

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

@@ -80,10 +72,6 @@ -

-
-

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.

@@ -121,10 +109,6 @@ -

-
-

Results list

Files that match the parameters of the search are shown in the list. By default they are displayed in the order that they are found, to sort the results list by a column activate or click the column title. Activating a column that is already used to sort the list will toggle between increasing and decreasing sort order.

@@ -255,10 +239,7 @@ - + - + - + - +

@@ -358,10 +339,7 @@

Displays the context menu.

@@ -373,10 +351,7 @@

Control + T

Toggle display of thumbnails.

@@ -388,10 +363,7 @@

Control + W

Close window.

@@ -401,18 +373,10 @@

-
-

The selection can be changed using the keyboard and mouse the same as in a file pane of the main window.

The image Dimensions column of the result list will only contain dimension information when dimensions are included in the search parameters.

-
-

Status bar

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

@@ -444,23 +408,11 @@ -

-
-

Drag and Drop

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/index.html --- a/doc/index.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/index.html Mon Nov 10 14:10:39 2008 +0000 @@ -19,10 +19,7 @@ - +

Contents

@@ -107,11 +104,7 @@

GNU Free Documentation License

-
-

- -

@@ -121,15 +114,9 @@ - + - + - + - + - + - +

Next diff -r b223ad7f4867 -r 79e69e5f4642 doc/introduction.html --- a/doc/introduction.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/introduction.html Mon Nov 10 14:10:39 2008 +0000 @@ -46,26 +46,14 @@

-
-

Introduction

Geeqie is an image viewer, that makes navigation of images easy. Images can be viewed full screen, and a slide show function allows automatic changing of the displayed image.

Geeqie is an image manager, with complete copy, move, rename, and delete functions available at the press of a button. Find the right image with the search feature. Image collectors can free up space with a function that finds duplicate images.

-
-

The one thing Geeqie is not, and never be, is an image editor. However, Geeqie paired with an image editor, such as the Gimp, can be a very powerful combination.

-
-

Basic Features

@@ -122,21 +110,9 @@ -

-
-

“An application that displays images.” - This was, and still is, the primary goal of Geeqie. Over time image management features have been added, but the core purpose of Geeqie remains the same.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/main_window.html --- a/doc/main_window.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/main_window.html Mon Nov 10 14:10:39 2008 +0000 @@ -54,15 +54,7 @@

Status Bar

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/main_window_file_pane.html --- a/doc/main_window_file_pane.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/main_window_file_pane.html Mon Nov 10 14:10:39 2008 +0000 @@ -45,10 +45,6 @@

A context menu can be displayed by clicking the right mouse button on the file pane or pressing the menu key while the file pane has the focus.

-
-

List view

This mode can be enabled by selecting “List” from the View menu, pressing Control + L on the keyboard, or unselecting “View as icons” from the context menu.

@@ -57,10 +53,6 @@

Thumbnails can be displayed next to each file in the list, to toggle thumbnails on or off by selecting “Thumbnails” from the View menu, pressing the T key, clicking the thumbnail button on the tool bar, or selecting “Show thumbnails” from the context menu.

-
-

Icon view

This mode can be enabled by selecting “Icons” from the View menu, pressing Control + I on the keyboard, or selecting “View as icons” from the context menu.

@@ -69,10 +61,6 @@

The file name displayed below each thumbnail can be turned on or off by selecting “Show filename text” from the context menu.

-
-

Multiple selection

It is possible to select more than one image from the file pane. Multiple files can be selected with several methods:

@@ -121,20 +109,12 @@

The current number of selected images and their total size will be indicated in the File list section of the status bar.

-
-

Sorting

The order of the images can be changed by clicking the sort area of the status bar or from the context menu. The sort methods are by file name, number, file date, or file size. The number method will sort file names by their natural order, for example files with names of file_10, file_12, and file_9 will appear in order file_9, file_10, and file_12.

Selecting the ascending menu item will toggle between increasing and decreasing sort order.

-
-

Context menu

Right clicking the mouse or pressing the menu key while the file pane has focus will display a menu. The menu functions will perform the same as those that match the window's menu bar, however a few functions are unique to the context menu:

@@ -158,23 +138,11 @@ -

-
-

Drag and Drop

Drag and drop can be initialized with the primary or middle mouse buttons in the file pane. Dragging a file that is selected will include all selected files in the drag. Dragging a file that is not selected will first change the selection to the dragged file, and clear the previous selection.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/main_window_image_pane.html --- a/doc/main_window_image_pane.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/main_window_image_pane.html Mon Nov 10 14:10:39 2008 +0000 @@ -43,10 +43,6 @@

The image pane is the region of the main window that displays the selected image. The image pane allows adjustment of display size and orientation; it also provides several methods to manipulate the image with the mouse and keyboard.

-
-

Image display

The image is drawn to the screen as it is decoded from disk. The image can be panned and zoomed while it is still loading. Image adjustment operations for rotation, mirror, and flip will delay until the image is completed. The adjustment queue will remember one operation and will retain the most recently requested function, which will be performed once the image has finished loading.

@@ -55,10 +51,6 @@

To increase the speed of loading the next image when navigating the image list in sequence, enable the Preload next image option.

-
-

Image panning and manipulation

When the image size is larger than the image pane, the visible region can be changed with the keyboard or mouse. The keyboard can also be used to adjust the orientation of the image.

@@ -80,10 +72,6 @@

Smooth Scroll

To start the smooth scroll function hold down the [Shift] key and click the primary mouse button. An icon will appear at the location of the mouse pointer, the mouse can then be positioned to pan the image. The image will pan in the direction of the mouse pointer relative to the icon. The pan speed will increase in proportion to the distance that the pointer is from the center of the icon. To end the smooth scroll function click the primary mouse button within the image pane.

-
-

Navigation

The displayed image can be changed to the next or previous image using the keyboard or mouse.

@@ -94,10 +82,6 @@

Mouse

To change to the next image in the list click the left mouse button, click the middle mouse button to change to the previous image. The mouse wheel can also be used to change the current image (*).

-
-

Context menu

Right clicking the mouse or pressing the menu key while the image has the focus will display a menu. The menu functions will perform the same as those that match the window's menu bar, however a few functions are unique to the context menu:

@@ -108,31 +92,15 @@

Pause slide show, Continue slide show

Controls the pause state of an active slide show, the text of the menu will change to reflect the action that will be performed.

-
-

Drag and Drop

Files and folders can be dropped onto the image pane, dropping a file will display the file and dropping a folder will change the main window to display the contents of the folder. When dropping multiple items on the image pane, only the first item in the list will be used, all additional items will be ignored.

A drag and drop operation can be initiated from the image pane with the middle mouse button, the dragged item will contain the file path of the displayed image.

-
-

- -

-
-

(*) Note: The mouse wheel behavior for scrolling and image step can be swapped with the Mouse wheel scrolls image option located on the Advanced tab of the preferences dialog.

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/main_window_layout.html --- a/doc/main_window_layout.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/main_window_layout.html Mon Nov 10 14:10:39 2008 +0000 @@ -67,15 +67,7 @@

The image pane is where the active image is displayed.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/main_window_menus.html --- a/doc/main_window_menus.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/main_window_menus.html Mon Nov 10 14:10:39 2008 +0000 @@ -43,10 +43,6 @@

This section describes the functions of each item on the menu bar in the Geeqie main window.

-
-

File Menu

About: Opens a window containing the Geeqie version, credits, website, and email contact information.

-
-

Tear off menus

Menus can be permanently displayed by selecting the dotted line item at the top of each menu category. A tear off menu will behave the same as an ordinary window. To close a tear off menu, select the dotted line item at the top of the menu.

-
-

Keyboard shortcuts

The keyboard sequence associated to each menu entry is listed within the main window menu bar. For reference, the complete list of default keyboard shortcuts can be found in section Keyboard Shortcuts.

-
-

Changing the main window menu bar keyboard shortcuts

The keyboard shortcuts associated with the menu bar items can be changed by editing the accels file located in the Geeqie configuration folder while the Geeqie application is not running:

@@ -254,21 +238,9 @@

-
-

Modifiers can be combined, for example in the exit line above, the text would be “<control><shift>q” to set the exit shortcut to [Control] + [Shift] + Q.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/main_window_navigation.html --- a/doc/main_window_navigation.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/main_window_navigation.html Mon Nov 10 14:10:39 2008 +0000 @@ -69,15 +69,7 @@

To change to beginning or end of the image list, use the respective Home or End keys.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/main_window_status_bar.html --- a/doc/main_window_status_bar.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/main_window_status_bar.html Mon Nov 10 14:10:39 2008 +0000 @@ -75,15 +75,7 @@

A tilde (~) appears within the ratio display when the zoom is set to fit the image within the display area. In this zoom mode the ratio is automatically adjusted, and the displayed ratio may not be the actual ratio because the status bar display rounds the actual value to the nearest tenth (0.1).

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/options.html --- a/doc/options.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/options.html Mon Nov 10 14:10:39 2008 +0000 @@ -55,15 +55,7 @@ -

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/options_advanced.html --- a/doc/options_advanced.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/options_advanced.html Mon Nov 10 14:10:39 2008 +0000 @@ -43,10 +43,6 @@

This section describes the options presented under the Advanced Tab of the preferences dialog.

-
-

Full Screen

@@ -64,10 +60,6 @@ -

-
-

Delete

@@ -97,10 +89,6 @@ -

-
-

Behavior

@@ -117,10 +105,6 @@ -

-
-

Navigation

@@ -131,10 +115,6 @@

The default is for the mouse wheel to change the image, and to scroll the image when shift is used in combination with the wheel. Enabling this swaps the behavior so that operating the wheel will scroll the image, and holding down shift will change the image.

-
-

Miscellaneous

@@ -151,15 +131,7 @@ -

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/options_editor_commands.html --- a/doc/options_editor_commands.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/options_editor_commands.html Mon Nov 10 14:10:39 2008 +0000 @@ -45,10 +45,6 @@

Geeqie includes ten entries that can be used for executing other applications or shell commands with the selected image. These commands are accessible by menu and keyboard shortcuts. The keyboard shortcuts use [Control] + [1] through [Control] + [0], which correspond to lines one through ten in the preferences dialog.

-
-

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.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/options_filtering.html --- a/doc/options_filtering.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/options_filtering.html Mon Nov 10 14:10:39 2008 +0000 @@ -43,10 +43,6 @@

This section describes the options presented under the Filtering Tab of the preferences dialog.

-
-

Filters

@@ -64,10 +60,6 @@ -

-
-

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 (.).

@@ -87,15 +79,7 @@ -

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/options_general.html --- a/doc/options_general.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/options_general.html Mon Nov 10 14:10:39 2008 +0000 @@ -43,10 +43,6 @@

This section describes the options presented under the General Tab of the preferences dialog.

-
-

Startup

@@ -87,10 +83,6 @@

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

-
-

Slide show

@@ -105,11 +97,7 @@

When enabled, slide shows will continue at the beginning after the last image is displayed.

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/options_hidden.html --- a/doc/options_hidden.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/options_hidden.html Mon Nov 10 14:10:39 2008 +0000 @@ -51,10 +51,6 @@

-
-

lazy_image_sync: [true | false]: This will suppress the image view from changing when selecting a new folder; the current image will remain displayed until the user manually selects another image.

display_dialogs_under_mouse: [true | false]: Enabling this will cause new dialogs to initially position themselves such that they are under the current mouse position.

@@ -71,23 +67,11 @@ 1: Normal
2: Best

-
-

Find Duplicates window

[Control] + [Shift] + [Right Mouse click]: Use this to display a dialog containing the data stored for the clicked image file. This is usually only useful for debugging purposes.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/options_image.html --- a/doc/options_image.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/options_image.html Mon Nov 10 14:10:39 2008 +0000 @@ -43,10 +43,6 @@

This section describes the options presented under the Image Tab of the preferences dialog.

-
-

Zoom

@@ -71,10 +67,6 @@ -

-
-

Zoom control

@@ -89,10 +81,6 @@ -

-
-

Appearance

@@ -100,10 +88,6 @@

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

-
-

Convenience

@@ -120,15 +104,7 @@

Auto rotates images based on data stored in images that include EXIF data.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/options_window.html --- a/doc/options_window.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/options_window.html Mon Nov 10 14:10:39 2008 +0000 @@ -43,10 +43,6 @@

This section describes the options presented under the Windows Tab of the preferences dialog.

-
-

State

@@ -57,10 +53,6 @@

This will maintain the tool window state between Geeqie sessions.

-
-

Size

@@ -72,23 +64,11 @@

This will restrict the maximum size a window can grow to automatically fit an image. The value represents the percentage of the desktop size in width and height.

-
-

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.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/other_windows.html --- a/doc/other_windows.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/other_windows.html Mon Nov 10 14:10:39 2008 +0000 @@ -50,19 +50,7 @@ -

-
-

- -

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/other_windows_image_properties.html --- a/doc/other_windows_image_properties.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/other_windows_image_properties.html Mon Nov 10 14:10:39 2008 +0000 @@ -45,24 +45,12 @@

To display a properties window for a an image select Properties from it's context menu, in most windows pressing Control + P will display the properties of the selected images or files.

-
-

The properties window contains a scaled down image of the file and information about the file under several tabs. If the window contains more than one file, they can be navigated by activating the left and right arrow buttons, or by clicking the primary and middle mouse buttons on the image preview.

-
-

Image preview

This displays the contents of the active file. When the window contains more than one file, they can be navigated with the primary and middle mouse buttons. The image display is also a drag source for drag and drop, start the drag operation by pressing the middle mouse button and dragging the file to the desired target.

-
-

General tab

This displays information about the active file. It includes:

@@ -73,35 +61,15 @@

Compress ratio: The percentage of file size compared to the size of the image when decoded into memory.

-
-

Keywords tab

The keywords tab contains the same information that is in the Keywords sidebar, please refer to the Keywords Sidebar page for details.

-
-

EXIF tab

The EXIF tab contains the same information that is in the EXIF sidebar, please refer to the EXIF Sidebar page for details.

-
-

- -

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/other_windows_image_window.html --- a/doc/other_windows_image_window.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/other_windows_image_window.html Mon Nov 10 14:10:39 2008 +0000 @@ -45,24 +45,12 @@

An image window can always be opened from the context menu of all images and files. Keyboard shortcuts exist for most windows that display images or files, however the shortcut can vary dependent on the type of window containing them.

-
-

The image pane contained in an image window behaves and operates similar to the image pane of a Main Window. The keyboard shortcuts are the same, and the context menu is the same except “Hide file list” is replaced by “Close window”. The slide show and full screen functions are also available.

-
-

Navigation

When the image window contains a list of images or is linked to a collection, the displayed image can be changed forward or backward in the list with the respective PageDown and PageUp keys. In addition, all navigation methods for the mouse and keyboard are similar to that of the image pane of a Main Window.

-
-

Changing the image

To change the contents of an image window, drop the items onto the window with drag and drop. The dropped item can be one or more files, folders, or an image from a collection window:

@@ -83,23 +71,11 @@

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

-
-

Information 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.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/printing.html --- a/doc/printing.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/printing.html Mon Nov 10 14:10:39 2008 +0000 @@ -45,10 +45,6 @@

The print dialog includes tabs that group related printing options, a preview pane, and a Print and Cancel button.

-
-

Layout tab

@@ -70,10 +66,6 @@ -

-
-

Text tab

Font size: The font size to use for the text description of each image, in points.

-
-

Paper tab

Margins: These values specify the size of the paper edges not to be included in the print region, in Units (above).

-
-

Printer tab

@@ -138,10 +122,6 @@

Abbreviation for Dots Per Inch. When the Destination is a printer or postscript file, this defines the maximum DPI to use when outputting image data. For example if the Destination printer is only capable of 600 DPI, but the resulting image to print is 1200 DPI, Geeqie will scale the image down to 600 DPI before sending it to the printer. This can greatly reduce the size of a print job when printing Proof Sheets or very large images.

-
-

Preview

The preview displays a small version of the output that will result with the current settings. The preview will update whenever a setting is changed that will effect the print output.

@@ -170,39 +150,19 @@ -

-
-

Remember print settings

Enable this check box to retain the current settings as the default for the print dialog. This option only retains the settings when a print operation is started by activating the print button. In addition, only the settings relevant to the current print operation will be retained.

-
-

Print button

Activate the print button to start the print job, the dialog will change to display the progress as images are sent to the selected print destination.

-
-

Cancel button

Activate this button to close the print dialog, no printing will be performed.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/reference.html --- a/doc/reference.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/reference.html Mon Nov 10 14:10:39 2008 +0000 @@ -49,15 +49,7 @@ -

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/reference_command_line.html --- a/doc/reference_command_line.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/reference_command_line.html Mon Nov 10 14:10:39 2008 +0000 @@ -190,10 +190,7 @@ - +

--debug

@@ -207,14 +204,6 @@

-
-

- -

-
-

Remote commands

The --remote command line option will send all entered commands to an existing Geeqie process, a new process will be started if one does not exist. These are the additional commands that can be used with the remote command:

@@ -271,10 +260,7 @@

--first

@@ -286,10 +272,7 @@

--last

@@ -455,10 +438,7 @@

file:<filename>

@@ -470,10 +450,7 @@

view:<filename>

@@ -487,21 +464,7 @@

- -

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/reference_keyboard_shortcuts.html --- a/doc/reference_keyboard_shortcuts.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/reference_keyboard_shortcuts.html Mon Nov 10 14:10:39 2008 +0000 @@ -93,10 +93,7 @@ - + @@ -105,10 +102,7 @@ - + @@ -134,10 +128,7 @@ - + @@ -146,10 +137,7 @@ - + @@ -158,10 +146,7 @@ - + @@ -170,10 +155,7 @@ - + @@ -187,10 +169,7 @@ - + @@ -199,10 +178,7 @@ - + @@ -211,10 +187,7 @@ - + @@ -223,10 +196,7 @@ - + @@ -235,10 +205,7 @@ - + @@ -247,10 +214,7 @@ - + @@ -259,10 +223,7 @@ - + @@ -271,10 +232,7 @@ - + @@ -283,10 +241,7 @@ - + @@ -295,10 +250,7 @@ - + @@ -308,10 +260,7 @@

[Control] + D
[Delete]

- + @@ -320,10 +269,7 @@ - + @@ -332,10 +278,7 @@ - + @@ -349,10 +292,7 @@ - + @@ -361,10 +301,7 @@ - + @@ -373,10 +310,7 @@ - + @@ -385,10 +319,7 @@ - + @@ -397,10 +328,7 @@ - + @@ -409,10 +337,7 @@ - + @@ -421,10 +346,7 @@ - + @@ -433,10 +355,7 @@ - + @@ -445,10 +364,7 @@ - + @@ -457,10 +373,7 @@ - + @@ -496,10 +409,7 @@ - + @@ -508,10 +418,7 @@ - + @@ -520,10 +427,7 @@ - + @@ -532,10 +436,7 @@ - + @@ -544,10 +445,7 @@ - + @@ -556,10 +454,7 @@ - + @@ -568,10 +463,7 @@ - + @@ -580,10 +472,7 @@ - + @@ -592,10 +481,7 @@ - + @@ -604,10 +490,7 @@ - + @@ -616,10 +499,7 @@ - + @@ -628,10 +508,7 @@ - + @@ -640,10 +517,7 @@ - + @@ -652,10 +526,7 @@ - + @@ -664,10 +535,7 @@ - + @@ -676,10 +544,7 @@ - + @@ -688,10 +553,7 @@ - + @@ -700,10 +562,7 @@ - + @@ -712,10 +571,7 @@ - + @@ -724,10 +580,7 @@ - + @@ -736,10 +589,7 @@ - + @@ -749,10 +599,7 @@

- + @@ -761,10 +608,7 @@ - + @@ -773,10 +617,7 @@ - + @@ -785,10 +626,7 @@ - + @@ -802,27 +640,15 @@ - + - - - + + + - + @@ -845,10 +668,7 @@ - + @@ -857,10 +677,7 @@ - + @@ -869,10 +686,7 @@ - + @@ -881,10 +695,7 @@ - + @@ -893,10 +704,7 @@ - + @@ -905,10 +713,7 @@ - + @@ -917,10 +722,7 @@ - + @@ -929,10 +731,7 @@ - + @@ -941,10 +740,7 @@ - + @@ -953,10 +749,7 @@ - + @@ -965,10 +758,7 @@ - + @@ -977,10 +767,7 @@ - + @@ -989,10 +776,7 @@ - + @@ -1001,10 +785,7 @@ - + @@ -1013,10 +794,7 @@ - + @@ -1025,10 +803,7 @@ - + @@ -1037,10 +812,7 @@ - + @@ -1049,10 +821,7 @@ - + @@ -1061,10 +830,7 @@ - + @@ -1073,10 +839,7 @@ - + @@ -1085,10 +848,7 @@ - + @@ -1097,10 +857,7 @@ - + @@ -1109,10 +866,7 @@ - + @@ -1121,10 +875,7 @@ - + @@ -1133,10 +884,7 @@ - + @@ -1145,10 +893,7 @@ - + @@ -1157,10 +902,7 @@ - + @@ -1169,27 +911,15 @@ - + - - - + + + - + @@ -1212,10 +939,7 @@ - + @@ -1224,10 +948,7 @@ - + @@ -1236,21 +957,9 @@

Home

Change to first image.

End

Change to last image.

[Shift] + Arrow Keys

Pan Image faster.

[Control] + Arrow Keys

Pan to respective edge of image.

SpaceBar

Change to next image.

Backspace

Change to previous image.

[Control] + N

New Window

Open a new empty collection window.

Display open collection dialog.

Open new search window.

Open new Find Duplicates window.

[Shift] + P

Open print dialog.

[Control] + F

Create new folder in current path.

[Control] + C

Copy selected images, opens destination selection dialog.

[Control] + M

Move selected images, opens destination selection dialog.

[Control] + R

Rename selected images, opens rename dialog.

Delete selected images.

[Control] + W

Close window, Geeqie exits when last window is closed.

[Control] + Q

Quit Geeqie.

[Control] + 1 ... 0

Run external edit command on selected images.

[Control] + A

Select all images.

[Control] + [Shift] + A

Unselect all images.

[Control] + P

Open image properties window.

[Control] + O

Open Geeqie preferences window.

]

Rotate image clockwise 90 degrees.

[

Rotate image counterclockwise 90 degree.

[Shift] + R

Rotate image 180 degrees.

[Shift] + M

Flip image horizontally (mirror).

[Shift] + F

Flip image vertically.

Reset zoom to original size (1:1).

Fit image to window size.

Zoom image to fit window width.

Zoom image to fit window height.

Set zoom to 1:1

Set zoom to 2:1

Set zoom to 3:1

Set zoom to 4:1

Set zoom to 1:4

Set zoom to 1:3

Set zoom to 1:2

Toggle display of thumbnails when in list view.

[Control] + L

Display file list as detailed list view.

[Control] + I

Display file list as icon view.

[Control] + T

Toggle folder display between list and tree views.

Refresh file list.

Toggle floating of file display.

[Control] + H

Toggle hiding of file display.

[Control] + E

Toggle EXIF sidebar.

[Control] + S

Toggle Sort Manager sidebar.

[Control] + K

Toggle Keywords sidebar.

Toggle full screen.

Toggle information overlay in full screen.

Toggle slideshow.

Toggle pause of slideshow.

Open User Manual in browser.

@@ -833,10 +659,7 @@

Arrow Keys

Move selection.

[Shift] + Arrow Keys

Select multiple images.

[Control] + Arrow Keys

Move focus without changing selection.

[SpaceBar]

Select only image with focus.

[Control] + [SpaceBar]

Toggle selection of image with focus.

[Home]

Move focus to first image.

[End]

Move focus to last image.

[Control] + A

Select all images.

[Control] + [Shift] + A

Unselect all images.

[Delete]

Remove selected image from collection, does not delete image from disk.

[Control] + L

Add images from main window's file list.

[Control] + T

Toggle display of icon filenames.

Sort collection by name.

Sort collection by file date.

Sort collection by file size.

Sort collection by file path.

Sort collection by natural numerical order.

[Enter]

View image with focus in main window.

View image with focus in new window.

[Control] + 1 ... 0

Run external edit command on selected images.

Save collection.

[Control] + S

Save collection as, opens destination dialog.

Append to collection, opens append dialog.

[Control] + C

Copy selected images, opens destination selection dialog.

[Control] + M

Move selected images, opens destination selection dialog.

[Control] + R

Rename selected images, opens rename dialog.

[Control] + D

Delete selected images.

[Control] + P

Open image properties window.

[Control] + W

Close collection window.

@@ -1200,10 +930,7 @@

Select group 1 duplicates.

Select group 2 duplicates.

Open new collection window and add selected images.

-
-

(*) Default Mouse wheel functions, can be altered by changing the Mouse wheel scrolls image option.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/reference_management.html --- a/doc/reference_management.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/reference_management.html Mon Nov 10 14:10:39 2008 +0000 @@ -41,10 +41,6 @@

Thumbnails and other cached data can be maintained from the dialog accessible by selecting Thumbnail maintenance from the Edit menu of the main window.

-
-

Geeqie thumbnail cache

The utilities listed here operate on the Geeqie caching mechanism. This also includes the data cached for the search and find duplicates utilities.

@@ -57,10 +53,6 @@

Removes all thumbnails and data stored in the user's home folder: $HOME/.geeqie/thumbnails.

-
-

Shared thumbnail cache

The utilities listed here operate on the shared thumbnail mechanism.

@@ -72,10 +64,6 @@

Clear cache

Removes all thumbnails stored in the user's home folder: $HOME/.thumbnails.

-
-

Create thumbnails

This utility will render thumbnails using the current thumbnail caching mechanism, as determined in preferences.

@@ -93,10 +81,6 @@ -

-
-

Metadata

This utility operates on the data store for keywords and comments located in the user's home folder: $HOME/.geeqie/metadata.

@@ -106,10 +90,6 @@

Removes keywords and comments for which the source image is no longer present.

-
-

File locations

The various file locations and their use are listed below. <HOME> refers to your home folder and <SOURCE> refers to the folder containing the image.

@@ -276,19 +256,7 @@

-
-

- -

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/reference_thumbnails.html --- a/doc/reference_thumbnails.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/reference_thumbnails.html Mon Nov 10 14:10:39 2008 +0000 @@ -49,10 +49,6 @@

The modification time (mtime) of the thumbnail is set to match the source file. Thumbnails are regenerated when the timestamps of the thumbnail and source file do not match.

-
-

Location

Thumbnails are stored in:

@@ -73,10 +69,6 @@

Local thumbnail caching is enabled with the option “Cache thumbnails into .thumbnails” on the General tab of the options dialog. If it is not possible to store the thumbnail local to the source file (usually due to no write permissions), Geeqie will fall back to saving the thumbnail in the user's ($HOME)/.geeqie/thumbnails folder.

-
-

Size

Geeqie allows the following sizes for thumbnails:

@@ -87,19 +79,7 @@

When a cached thumbnail's width and height do not match the preferred size, the thumbnail is regenerated.

-
-

- -

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/sidebars.html --- a/doc/sidebars.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/sidebars.html Mon Nov 10 14:10:39 2008 +0000 @@ -51,15 +51,7 @@ -

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/sidebars_exif.html --- a/doc/sidebars_exif.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/sidebars_exif.html Mon Nov 10 14:10:39 2008 +0000 @@ -45,18 +45,10 @@

To toggle display of the The EXIF sidebar press Control + E or select “Exif data” from the View menu.

-
-

EXIF: Stands for “Exchangeable image file format”, it is the common format used to store additional information into the JPEG and TIFF file formats. EXIF is the standard for saving the settings used when taking a photo with a digital camera, however other imaging devices and some software also use the EXIF format to store settings in the image file.

The EXIF parser in Geeqie conforms to version 2.2 of the EXIF specification, with the exception that GPS attributes are ignored. In addition, manufacturer extensions to the format are not supported, this includes the proprietary data stored in the MakerNote Tag. Geeqie support of EXIF is read only.

-
-

Standard view

The standard view of the EXIF sidebar displays information that is common to most cameras, data is displayed in the standard format for each attribute.

@@ -65,25 +57,13 @@

The advanced view displays all tags that are present in the image. Unlike the standard view, data is displayed in raw format.

-
-

Customizing the standard view

Additional information can be added to the standard view. To add custom EXIF tags to the standard view, switch to the advanced view. The first column of each row in the advanced view is a check box, enabling the check box will result in the corresponding tag to appear in the standard view. Customized tags are displayed in the order that they are added.

To remove customized tags from the standard view, switch to the advanced view and disable the check box next to the tag (or tags) you want to remove.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/sidebars_keywords.html --- a/doc/sidebars_keywords.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/sidebars_keywords.html Mon Nov 10 14:10:39 2008 +0000 @@ -45,18 +45,10 @@

To toggle display of the Keywords sidebar press Control + K or select “Keywords” from the View menu.

-
-

Keywords are single words that are associated to an image. They can be used to classify, group, or describe; the uses for keywords are only limited by your imagination. Images associated to one or more keywords can be found using the Search window.

Comments is an area to associate a textual description to an image.

-
-

The sidebar is comprised of three sections: Keywords, Comments and a button bar.

Keywords

@@ -92,25 +84,13 @@ -

-
-

Favorite Keywords Dialog

This dialog allows editing of the favorite keywords list that is displayed in the Keywords sidebar. Activating the Add button will create a new blank item at the current position in the list, the new item will immediately change to the editing state to allow entry of the new keyword. Activating the Remove button will remove the selected keyword from the list. To edit a row highlight it then click it or press Enter on the keyboard.

Activate OK to save the changes and close the dialog, Cancel will discard the changes and close the dialog.

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/sidebars_sort_manager.html --- a/doc/sidebars_sort_manager.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/sidebars_sort_manager.html Mon Nov 10 14:10:39 2008 +0000 @@ -47,10 +47,6 @@

The mode of the Sort Manager is selected by the drop down list under the sidebar title. The Folder mode allows moving or copying the visible image to a folder, and the Collection mode allows adding the visible image or file selection to a collection.

-
-

Folder view

The Sort Manager folder view consists of a vertical list for bookmarking folders, a section to select the operation to perform, and a set of buttons along the bottom.

@@ -81,10 +77,6 @@

Activate this button to undo the last copy, move, or link operation. The undo function can only reverse the most recent operation.

-
-

Collection view

The Sort Manager collection view consists of a vertical list of collection, a section to determine the current selection, and a set of buttons along the bottom.

@@ -119,23 +111,7 @@

Activate this button to undo the last add operation. The undo function can only reverse the most recent operation.

-
-

- -

-
-

- -

-
-

- -

-
-

- -

diff -r b223ad7f4867 -r 79e69e5f4642 doc/style.css --- a/doc/style.css Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/style.css Mon Nov 10 14:10:39 2008 +0000 @@ -1,46 +1,134 @@ +/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ + /* common */ - p.previous {text-align: left} - p.navtop_title {text-align: center; font-weight:bold;} - p.navbottom_title {text-align: center;} +body { + margin: 2em; + padding: 0; + color: #000; + background-color: #eee; + font-family: "Trebuchet MS", Verdana, "Lucida Grande", Tahoma, Helvetica, Sans-Serif; +} + +p.previous { + text-align: left +} +p.navtop_title { + text-align: center; + font-weight:bold; +} +p.navbottom_title { + text-align: center; +} + +p.next { + text-align: right +} - p.next {text-align: right} - div.navtop {text-align: center} - div.navbottom {text-align: center} +div.navtop { + text-align: center +} + +div.navbottom { + text-align: center +} + +h1 { + margin-top: 1.3em; + margin-bottom: 1.3em; + color: #820303; + background: #effefe +} + +h2 { + margin-top: 1em; + margin-bottom: 1em; + color: #5A0202; + background: #f6fefe +} + +h3 { + margin-top: 0.7em; + margin-bottom: 0.7em; + color: #270101; + background: #f8fefe +} - div.bottomspacer { padding-bottom: 5em;} - div.footer { text-align: right} - /* menu descriptions */ - dl.menu_desc { padding-left: 2em;} - .menu_desc dt {font-weight: bold; padding-top: 0.3em} - .menu_desc dd {} - /* dialog descriptions */ - dl.dialog_desc { padding-left: 2em;} - .dialog_desc dt {font-weight: bold; padding-top: 0.3em} - .dialog_desc dd {} +hr#bottomseparator { + margin-top: 6em; +} + +div.bottomspacer { + margin-bottom: 5em; +} +div.footer { + text-align: right +} + +/* menu descriptions */ +dl.menu_desc { + margin-left: 2em; +} +.menu_desc dt { + font-weight: bold; + padding-top: 0.3em +} +.menu_desc dd {} - thead { font-weight: bold; } +/* dialog descriptions */ +dl.dialog_desc { + margin-left: 2em; +} +.dialog_desc dt { + display: inline; + padding-left: 0.1em; + padding-right: 0.1em; + font-weight: bold; + margin-top: 0.3em; + border: 1px solid white +} +.dialog_desc dd {} +.dialog_desc dd dl { + font-size: 90%; + margin-bottom: 1em; +} - .file_locations_subtitle { font-weight: bold} - - span.option_name { font-style: italic } - - p.note { font-style: italic } - .note em { font-weight: bold } +thead { + font-weight: bold; +} + +.file_locations_subtitle { + font-weight: bold +} + +span.option_name { + font-style: italic +} + +p.note { + font-style: italic +} +.note em { + font-weight: bold +} + +code { + background: white +} /* collections.html */ - div.gq-collections-4 {text-align: center} +div.gq-collections-4 {text-align: center} /* credits.html */ - span.gq-credits-6 {font-family: Nimbus Roman No9 L} +span.gq-credits-6 {font-family: Nimbus Roman No9 L} /* faq.html */ - pre.gq-faq-9 {margin-left: 1.58in} - span.gq-faq-5 {font-size: 120%} +pre.gq-faq-9 {margin-left: 1.58in} +span.gq-faq-5 {font-size: 120%} /* image_management_copy_move.html */ /* image_management_delete.html */ - span.gq-delete-7 {font-style: normal} +span.gq-delete-7 {font-style: normal} /* image_management_external_editing.html */ @@ -49,30 +137,30 @@ /* image_management_rename.html */ /* image_presentation_fullscreen.html */ - span.gq-fullscreen-10 {text-decoration: none} - div.gq-fullscreen-4 {text-align: center} - table.gq-fullscreen-3 {page-break-before: always} +span.gq-fullscreen-10 {text-decoration: none} +div.gq-fullscreen-4 {text-align: center} +table.gq-fullscreen-3 {page-break-before: always} /* image_presentation.html */ /* image_presentation_slideshow.html */ - span.gq-slideshow-6 {text-decoration: none} +span.gq-slideshow-6 {text-decoration: none} /* image_search_finding_duplicates.html */ - div.gq-finding-duplicates-4 {text-align: center} +div.gq-finding-duplicates-4 {text-align: center} /* image_search.html */ /* image_search_search.html */ - div.gq-search-4 {text-align: center} +div.gq-search-4 {text-align: center} /* index.html */ - .menu ul {font-size: 110%; font-weight: bold; margin: 10px;} - .menu ul li {margin: 4px;} - .menu ul>ul {font-size: 90%; font-weight: normal} +.menu ul {font-size: 110%; font-weight: bold; margin: 10px;} +.menu ul li {margin: 4px;} +.menu ul>ul {font-size: 90%; font-weight: normal} /* introduction.html */ - span.gq-introduction-6 {font-family: Nimbus Roman No9 L} +span.gq-introduction-6 {font-family: Nimbus Roman No9 L} /* main_window_file_pane.html */ @@ -81,38 +169,38 @@ /* main_window.html */ /* main_window_image_pane.html */ - span.gq-image-pane-6 {text-decoration: none} +span.gq-image-pane-6 {text-decoration: none} /* main_window_layout.html */ /* main_window_menus.html */ - span.gq-menus-8 {text-decoration: none} +span.gq-menus-8 {text-decoration: none} /* main_window_navigation.html */ /* main_window_status_bar.html */ /* options_advanced.html */ - span.gq-advanced-13 {text-decoration: none} +span.gq-advanced-13 {text-decoration: none} /* options_editor_commands.html */ /* options_filtering.html */ /* options_general.html */ - dd.gq-general-10 {margin-left: 0in; margin-bottom: 0.2in; text-decoration: none} - dd.gq-general-9 {margin-bottom: 0.2in} - dd.gq-general-7 {margin-bottom: 0.2in; text-decoration: none} - dd.gq-general-6 {margin-left: 0in; margin-bottom: 0.2in} +dd.gq-general-10 {margin-left: 0in; margin-bottom: 0.2in; text-decoration: none} +dd.gq-general-9 {margin-bottom: 0.2in} +dd.gq-general-7 {margin-bottom: 0.2in; text-decoration: none} +dd.gq-general-6 {margin-left: 0in; margin-bottom: 0.2in} /* options_hidden.html */ - pre.gq-hidden-6 {margin-left: 1.58in; margin-bottom: 0.2in} +pre.gq-hidden-6 {margin-left: 1.58in; margin-bottom: 0.2in} /* options.html */ /* options_image.html */ - dd.gq-image-12 {margin-bottom: 0.2in} - span.gq-image-8 {text-decoration: none} +dd.gq-image-12 {margin-bottom: 0.2in} +span.gq-image-8 {text-decoration: none} /* options_window.html */ @@ -123,21 +211,21 @@ /* other_windows_image_window.html */ /* printing.html */ - span.gq-printing-8 {text-decoration: none} +span.gq-printing-8 {text-decoration: none} /* reference_command_line.html */ /* reference.html */ /* reference_keyboard_shortcuts.html */ - span.gq-keyboard-shortcuts-10 {text-decoration: none} - div.gq-keyboard-shortcuts-4 {text-align: center} - table.gq-keyboard-shortcuts-3 {page-break-before: always} +span.gq-keyboard-shortcuts-10 {text-decoration: none} +div.gq-keyboard-shortcuts-4 {text-align: center} +table.gq-keyboard-shortcuts-3 {page-break-before: always} /* reference_management.html */ - span.gq-management-9 {font-weight: medium} - span.gq-management-8 {font-style: normal} - div.gq-management-4 {text-align: center} +span.gq-management-9 {font-weight: medium} +span.gq-management-8 {font-style: normal} +div.gq-management-4 {text-align: center} /* reference_thumbnails.html */ @@ -146,9 +234,9 @@ /* sidebars.html */ /* sidebars_keywords.html */ - span.gq-keywords-5 {font-weight: medium} +span.gq-keywords-5 {font-weight: medium} /* sidebars_sort_manager.html */ - span.gq-sort-manager-8 {font-weight: medium} +span.gq-sort-manager-8 {font-weight: medium} /* template.html */ diff -r b223ad7f4867 -r 79e69e5f4642 doc/template.html --- a/doc/template.html Mon Nov 10 13:00:29 2008 +0000 +++ b/doc/template.html Mon Nov 10 14:10:39 2008 +0000 @@ -39,19 +39,7 @@

-
-

- -

-
-

- -

-
-

- -