# HG changeset patch # User zas_ # Date 1225049240 0 # Node ID f00c0c5e6dffcacd0df36c7572fb0ff9af299333 # Parent cbac5e35b1f7a52efb30f7409b989ad91a322202 Use h2/h3 tags where appropriate. diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/collections.html --- a/doc/collections.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/collections.html Sun Oct 26 19:27:20 2008 +0000 @@ -55,9 +55,8 @@

-

The collection window -

- +

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.

To open a new empty collection window press C or select New collection from the file menu.

@@ -66,8 +65,7 @@

The collection window consists of a pane to display the contents of the collection, and a status bar along the bottom of the window.

-

Icon pane -

+

Icon pane

The icon pane displays images contained in the collection as thumbnails in a grid, by default the file names also appear below each thumbnail.

@@ -446,8 +444,7 @@

-

Status bar -

+

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.

@@ -455,8 +452,7 @@

-

Drag and Drop -

+

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.

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/credits.html --- a/doc/credits.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/credits.html Sun Oct 26 19:27:20 2008 +0000 @@ -49,7 +49,7 @@

Credits

-

Authors

+

Authors

Geeqie is maintained by The Geeqie Team (Vladimir Nadvornik, Petr Ostadal, Laurent Monin).

This software is a fork of GQview project by John Ellis.

@@ -61,7 +61,7 @@

-

Copyright

+

Copyright

Geeqie and this accompanying documentation is copyright © 2008 The Geeqie Team and © 2006 John Ellis.

@@ -69,7 +69,7 @@

-

License

+

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.

@@ -79,7 +79,7 @@

-

Legal Notice

+

Legal Notice

Copyright © 2008 The Geeqie Team.
Copyright © 2006 John Ellis.

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/image_management_copy_move.html --- a/doc/image_management_copy_move.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/image_management_copy_move.html Sun Oct 26 19:27:20 2008 +0000 @@ -63,8 +63,7 @@

-

The Copy/Move dialog -

+

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.

@@ -90,8 +89,7 @@

-

The error dialog -

+

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.

@@ -99,8 +97,7 @@

-

The overwrite dialog -

+

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:

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/image_management_delete.html --- a/doc/image_management_delete.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/image_management_delete.html Sun Oct 26 19:27:20 2008 +0000 @@ -60,8 +60,7 @@

-

Confirm delete 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.

@@ -75,8 +74,7 @@

-

Safe Delete -

+

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:

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/image_management_external_editing.html --- a/doc/image_management_external_editing.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/image_management_external_editing.html Sun Oct 26 19:27:20 2008 +0000 @@ -58,8 +58,7 @@

-

Result dialog -

+

Result dialog

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

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/image_management_rename.html --- a/doc/image_management_rename.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/image_management_rename.html Sun Oct 26 19:27:20 2008 +0000 @@ -56,8 +56,7 @@

-

Rename single file dialog -

+

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.

@@ -67,8 +66,7 @@

-

Rename multiple files dialog -

+

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.

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/image_presentation_fullscreen.html --- a/doc/image_presentation_fullscreen.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/image_presentation_fullscreen.html Sun Oct 26 19:27:20 2008 +0000 @@ -58,8 +58,7 @@

-

Turning on full screen -

+

Turning on full screen

Full screen can be activated in a number of ways:

@@ -81,8 +80,7 @@

-

Turning off full screen -

+

Turning off full screen

To return to the normal view:

@@ -104,8 +102,7 @@

-

Configuring full screen -

+

Configuring full screen

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

@@ -119,9 +116,8 @@

-

Navigation -

- +

Navigation

+

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

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/image_presentation_slideshow.html --- a/doc/image_presentation_slideshow.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/image_presentation_slideshow.html Sun Oct 26 19:27:20 2008 +0000 @@ -58,8 +58,7 @@

-

Starting a slide show -

+

Starting a slide show

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

@@ -81,8 +80,7 @@

-

Stopping a slide show -

+

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.

@@ -92,8 +90,7 @@

-

Slide show status -

+

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.

@@ -103,8 +100,7 @@

-

Pausing a slide show -

+

Pausing a slide show

An active slide show can be paused in two ways:

@@ -122,8 +118,7 @@

-

Selecting the images to include in a slide show -

+

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.

@@ -137,8 +132,7 @@

-

Recursive slide show -

+

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:

@@ -156,17 +150,15 @@

-

Slide show sequence navigation -

- +

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 -

+

Configuring a slide show

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

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/image_search_finding_duplicates.html --- a/doc/image_search_finding_duplicates.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/image_search_finding_duplicates.html Sun Oct 26 19:27:20 2008 +0000 @@ -56,8 +56,7 @@

-

Adding files to be compared -

+

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:

@@ -71,8 +70,7 @@

-

Comparison methods -

+

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:

@@ -100,8 +98,7 @@

-

Results list -

+

Results list

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

@@ -413,8 +410,7 @@

-

Status bar -

+

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.

@@ -432,8 +428,7 @@

-

Thumbnails -

+

Thumbnails

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

@@ -441,8 +436,7 @@

-

Compare two file sets -

+

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.

@@ -452,8 +446,7 @@

-

Drag and Drop -

+

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 cbac5e35b1f7 -r f00c0c5e6dff doc/image_search_search.html --- a/doc/image_search_search.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/image_search_search.html Sun Oct 26 19:27:20 2008 +0000 @@ -66,8 +66,7 @@

-

Search location -

+

Search location

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

@@ -83,8 +82,7 @@

-

Search parameters -

+

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.

@@ -108,8 +106,7 @@

-

Results list -

+

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.

@@ -391,8 +388,7 @@

-

Status bar -

+

Status bar

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

@@ -410,8 +406,7 @@

-

Drag and Drop -

+

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 cbac5e35b1f7 -r f00c0c5e6dff doc/main_window_file_pane.html --- a/doc/main_window_file_pane.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/main_window_file_pane.html Sun Oct 26 19:27:20 2008 +0000 @@ -58,8 +58,7 @@

-

List view -

+

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.

@@ -71,8 +70,7 @@

-

Icon view -

+

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.

@@ -84,8 +82,7 @@

-

Multiple selection -

+

Multiple selection

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

@@ -137,8 +134,7 @@

-

Sorting -

+

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.

@@ -148,8 +144,7 @@

-

Context menu -

+

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:

@@ -167,8 +162,7 @@

-

Drag and Drop -

+

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 cbac5e35b1f7 -r f00c0c5e6dff doc/main_window_folder_pane.html --- a/doc/main_window_folder_pane.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/main_window_folder_pane.html Sun Oct 26 19:27:20 2008 +0000 @@ -56,22 +56,12 @@

The folder pane contains the menu bar, tool bar, path entry, and folder list.

-


-
-

- -

Menu bar -

- +

Menu bar

+

The main menu of the window. The functions available from the main menu are described in the Menus chapter.

-


-
-

- -

Tool bar -

- +

Tool bar

+

The tool bar includes buttons for often used operations. The tool bar can be hidden or shown by selecting “Hide toolbar” from the view menu.

Note: These buttons are only displayed as an icon, the text below refers to the tool tip that appears by hovering the mouse over each button.

@@ -94,13 +84,8 @@

Float controls: Toggle the folder pane, file pane, and status bar between the main window and a secondary window.

-


-
-

- -

Path entry -

- +

Path entry

+

This displays the active folder of the window and allows typing a location.

A folder or file can be typed into the entry to quickly change to a desired location or image, the main window will update after pressing the Enter key. Tab completion is also available in the path entry.

@@ -109,38 +94,29 @@

Next to the path entry is a button with a down arrow, clicking this will display a drop down list containing the most recent locations viewed. The list is ordered such that the most recent location is at the top. Selecting a location from the drop down list will change the window to display the location.

-


-
-

- -

Folder list -

- +

Folder list

+

This displays a list of sub folders contained in the active folder, or a tree that includes all folders in the file system.

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

-

List view -

+

List view

This mode can be enabled by unselecting “Tree” from the View menu, pressing Control + T, or unselecting “View as tree” from the context menu.

The list view mode displays sub folders contained in the active folder in a standard vertical list. The parent folder can be selected with the folder named “..”.

-

Tree view -

+

Tree view

This mode can be enabled by selecting “Tree” from the View menu, pressing Control + T, or selecting “View as tree” from the context menu.

The tree view mode displays all folders in the file system, starting with the root folder and branching out to include sub folders. A folder branch can be expanded or collapsed by clicking the expander next to each folder icon, or by pressing the respective “+” or “-” keys when the folder branch has the focus.

-

Sorting -

+

Sorting

The order of the folder names will match the order selected for the file pane. Sort order can be changed by clicking the sort area of the status bar or from the context menu of the file pane.

-

Context menu -

+

Context menu

Right clicking the mouse or pressing the menu key while the folder 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:

@@ -162,21 +138,12 @@

View as tree: Toggles between the list and tree modes of the folder pane.

-

Drag and drop -

+

Drag and drop

Image files can be dropped onto folders displayed in the folder pane. A menu will appear allowing you to select to move or copy the dropped images into the target folder. The list will automatically scroll up or down when the drag pointer is near the respective top or bottom of the list. When in tree mode, hovering over a folder for a brief period of time will expand that folder.

The folders can used as a drag source for drag and drop, for example to add images in a folder to a collection window. However drag and drop can not be used to move or copy folders in Geeqie.

-


-
-

- -


-
-

-
diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/main_window_image_pane.html --- a/doc/main_window_image_pane.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/main_window_image_pane.html Sun Oct 26 19:27:20 2008 +0000 @@ -58,8 +58,7 @@

-

Image display -

+

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.

@@ -71,8 +70,7 @@

-

Image panning and manipulation -

+

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.

@@ -94,8 +92,7 @@

-

Navigation -

+

Navigation

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

@@ -107,8 +104,7 @@

-

Context menu -

+

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:

@@ -120,8 +116,7 @@

-

Drag and Drop -

+

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.

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/main_window_layout.html --- a/doc/main_window_layout.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/main_window_layout.html Sun Oct 26 19:27:20 2008 +0000 @@ -52,8 +52,7 @@

The main window consists of four areas, the folder pane, file pane, image pane, and the status bar. The status bar is always at the bottom of the window. The three remaining areas, or panes, can be arranged and sized by the user.

-

Selecting the location of each pane -

+

Selecting the location of each pane

The arrangement of the folder, file, and image pane is selected on the Windows tab of the Options window. There are four choices for the layout, the difference is that each has the larger pane in a different location: right, bottom, left, and top.

@@ -61,20 +60,19 @@

Note: In the options window the file and image panes are labeled similarly, however the folder pane is labeled as tools.

-

Changing the size of a pane -

+

Changing the size of a pane

Between the panes of the main window are two dividers that can be moved with the mouse to adjust the size of each pane. Press and hold the primary button, then move the divider to the desired location and release the button.

-

Folder pane

+

Folder pane

The folder pane contains the menu bar, tool bar, path entry, and folder list. The list can be set to display the sub folders of the active folder or a tree that starts with the root folder and contains all folders in the file system.

-

File pane

+

File pane

The file pane lists the images contained in the active folder. The file pane can be set to display as a vertical list or an icon view.

-

Image pane

+

Image pane

The image pane is where the active image is displayed.

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/main_window_menus.html --- a/doc/main_window_menus.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/main_window_menus.html Sun Oct 26 19:27:20 2008 +0000 @@ -59,8 +59,7 @@

-

File Menu -

+

File Menu

New window: Opens a new main window, with the initial path set to the current folder.

@@ -90,8 +89,7 @@

Quit: Quits the Geeqie application, if collections have been changed but not saved, the user will be prompted for confirmation.

-

Edit menu -

+

Edit menu

in <command name>...: This will execute the external command associated with <command name>, these can be changed edited on the Editors tab of the Option dialog.

@@ -119,8 +117,7 @@

Set as wallpaper: Renders the current image to the root window (desktop). The resulting image will be tiled to fit the root window if zoom is not set to fit to window; when zoom is set to fit to window, the image will be scaled to fill the root window.

-

View menu -

+

View menu

Zoom in: Increases the zoom by one increment, resulting in a larger image.

@@ -156,8 +153,7 @@

Refresh: Updates the contents of the folder and file lists to match what is currently on disk, the current image will also be reread from disk.

-

Help menu -

+

Help menu

Contents: Open the Geeqie user manual in a new browser window.

@@ -171,8 +167,7 @@

-

Tear off menus -

+

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.

@@ -180,8 +175,7 @@

-

Keyboard shortcuts -

+

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 11.2 Keyboard Shortcuts.

@@ -189,8 +183,7 @@

-

Changing the main window menu bar 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:

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/main_window_navigation.html --- a/doc/main_window_navigation.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/main_window_navigation.html Sun Oct 26 19:27:20 2008 +0000 @@ -49,29 +49,29 @@

Navigation

-

Moving around in the file system

+

Moving around in the file system

To select the folder containing the desired images for display, change to the image's folder using the folder view. Single clicking a folder with the primary mouse button will change the main window to display that folder's contents. When the folder view is displayed as a list, use the folder named “..” to change to the parent folder (the parent folder is the folder that contains the current folder).

To select a folder with the keyboard, move the focus to the desired folder and press the Space or Enter key.

-

Moving around within a folder

+

Moving around within a folder

After selecting the desired folder as above, the desired image can be viewed by selecting it from the file list. To select a file for display single click it with the primary mouse button.

To select a file with the keyboard, move the focus to the desired file. As you move the focus within the file list the image display will update to match the highlighted file.

-

Going home

+

Going home

To change to your home folder, click the Home button in the tool bar.

-

Direct path entry

+

Direct path entry

The current path is displayed in an entry field above the folder list. A folder or file can be typed into the entry to quickly change to a desired location or image, the main window will update after pressing the Enter key. Tab completion is also available in the path entry.

Next to the path entry is a button with a down arrow, clicking this will display a drop down list containing the most recent locations viewed. The list is ordered such that the most recent location is at the top. Selecting a location from the drop down list will change the window to display the location.

-

Stepping through images sequentially

+

Stepping through images sequentially

To change the displayed image to next or previous one within the same folder, use the respective PageDown and PageUp keys. The mouse can also be used to change the image by clicking the image display with the respective primary and middle buttons.

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/main_window_status_bar.html --- a/doc/main_window_status_bar.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/main_window_status_bar.html Sun Oct 26 19:27:20 2008 +0000 @@ -52,13 +52,11 @@

The status bar is comprised of five sections, from left to right these are a progress bar, sort method, file list counts, image details, and zoom setting. Each section is described below.

-

Progress Bar -

+

Progress Bar

The Progress bar updates to display the current state of thumbnail generation. When this section contains no text, thumbnail generation is idle. When “Loading thumbs...” is displayed, thumbnails are currently being generated when Geeqie is idle; the progress bar will update to display the percentage of thumbnails that are completed.

-

Sort method -

+

Sort method

This is the method used to sort image names in the file list. Clicking or activating this field will display a menu to allow selection of the sort method.

@@ -68,18 +66,15 @@ Size: Image are sorted by file size on disk.
Ascending: Toggles between increasing and decreasing sort order. A check will appear next to this entry to indicate ascending sort order.

-

File list -

+

File list

This section displays the count of files that appear in the file list, including the total byte size. The number of files selected is displayed in parenthesis, including the total byte size of the selected files. The slide show status is also displayed here; when a slide show is running, “Slideshow” will appear, the text will change to “Paused” when a slide show is in the paused state.

-

Image Details -

+

Image Details

This section displays the dimensions (width x height) and file byte size of the image that is active in the image pane. When the format of the file in the image pane can not be determined the dimensions will show as “(0 x 0)”, in addition “(no read permision)” may appear if the file permissions do not allow reading the contents of the file.

-

Zoom -

+

Zoom

This section displays the current zoom ratio. A ratio of 1:1 is the image's original size. When the left number is larger the image is displayed larger than original size, when the right number is larger the image is displayed smaller.

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/options_advanced.html --- a/doc/options_advanced.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/options_advanced.html Sun Oct 26 19:27:20 2008 +0000 @@ -62,8 +62,7 @@

-

Full Screen -

+

Full Screen

Location: Selects the location and position of the full screen window. 'Determined by window manager' will leave the window placement up to the window manager. 'Active screen' places the window on the same screen as the Geeqie main window. 'Active monitor' does the same, but limits the full screen window size to the monitor containing the main window. The remaining choices are dependent on the multiple monitor configuration.

@@ -77,8 +76,7 @@

-

Delete -

+

Delete

Confirm file delete: Prompts for confirmation before deleting files.

@@ -104,8 +102,7 @@

-

Behavior -

+

Behavior

Rectangular selection in icon view: Enable this to change the selection method used when selecting multiple items in an icon view.

@@ -119,8 +116,7 @@

-

Navigation -

+

Navigation

Progressive keyboard scrolling: This will cause image panning speed to gradually accelerate when holding down the keyboard arrows.

@@ -130,8 +126,7 @@

-

Miscellaneous -

+

Miscellaneous

Store keywords and comments local to source images: When enabled, Geeqie attempts to store metadata such as keywords closer to the source image. The resulting location is the source image's folder, in a sub folder with the name ".metadata". When the image source folder cannot be written, Geeqie falls back to saving the medata in "$HOME/.geeqie/metadata".

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/options_filtering.html --- a/doc/options_filtering.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/options_filtering.html Sun Oct 26 19:27:20 2008 +0000 @@ -55,8 +55,7 @@

-

Filters -

+

Filters

Show entries that begin with a dot: Enables the display of hidden files and folders, also known as dot files.

@@ -71,8 +70,7 @@

-

File types -

+

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 -r cbac5e35b1f7 -r f00c0c5e6dff doc/options_general.html --- a/doc/options_general.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/options_general.html Sun Oct 26 19:27:20 2008 +0000 @@ -59,8 +59,7 @@

-

Startup -

+

Startup

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

@@ -72,8 +71,7 @@ -

Thumbnails -

+

Thumbnails

@@ -118,8 +116,7 @@

-

Slide show -

+

Slide show

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/options_hidden.html --- a/doc/options_hidden.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/options_hidden.html Sun Oct 26 19:27:20 2008 +0000 @@ -52,8 +52,7 @@

Hidden Options

-

geeqierc -

+

geeqierc

This section describes the options not accessible by the graphical interface, these options exist to maintain behavior of older releases of Geeqie. To change these settings, edit the Geeqie configuration file:

@@ -85,8 +84,7 @@

-

Find Duplicates window -

+

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 cbac5e35b1f7 -r f00c0c5e6dff doc/options_image.html --- a/doc/options_image.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/options_image.html Sun Oct 26 19:27:20 2008 +0000 @@ -63,8 +63,7 @@

-

Zoom -

+

Zoom

Quality: Selects the method used to scale the size of an image.

@@ -83,8 +82,7 @@

-

Zoom control -

+

Zoom control

When new image is selected: This controls the behavior of the zoom setting when changing the displayed image.

@@ -96,8 +94,7 @@

-

Appearance -

+

Appearance

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

@@ -105,8 +102,7 @@

-

Convenience -

+

Convenience

Refresh on file change: Geeqie will monitor currently active images and folders for changes in their modification time, and update the display if it changes.

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/options_window.html --- a/doc/options_window.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/options_window.html Sun Oct 26 19:27:20 2008 +0000 @@ -55,8 +55,7 @@

-

State -

+

State

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

@@ -66,8 +65,7 @@

-

Size -

+

Size

Fit window to image when tools are hidden/floating: The main window will be resized to accommodate each image's size and proportions when the image pane is the only one visible within the window.

@@ -77,8 +75,7 @@

-

Window Layout -

+

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 cbac5e35b1f7 -r f00c0c5e6dff doc/other_windows_image_properties.html --- a/doc/other_windows_image_properties.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/other_windows_image_properties.html Sun Oct 26 19:27:20 2008 +0000 @@ -63,8 +63,7 @@

-

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.

@@ -72,8 +71,7 @@

-

General tab -

+

General tab

This displays information about the active file. It includes:

@@ -87,8 +85,7 @@

-

Keywords tab -

+

Keywords tab

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

@@ -96,8 +93,7 @@

-

EXIF tab -

+

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 cbac5e35b1f7 -r f00c0c5e6dff doc/other_windows_image_window.html --- a/doc/other_windows_image_window.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/other_windows_image_window.html Sun Oct 26 19:27:20 2008 +0000 @@ -62,8 +62,7 @@

-

Navigation -

+

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.

@@ -71,8 +70,7 @@

-

Changing the image -

+

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:

@@ -90,8 +88,7 @@

-

Information Overlay -

+

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 cbac5e35b1f7 -r f00c0c5e6dff doc/printing.html --- a/doc/printing.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/printing.html Sun Oct 26 19:27:20 2008 +0000 @@ -62,8 +62,7 @@

-

Layout tab -

+

Layout tab

Source: This selects the group of images to use for print output.

@@ -80,8 +79,7 @@

-

Text tab -

+

Text tab

Name: Include the file name below each image.

@@ -97,8 +95,7 @@

-

Paper tab -

+

Paper tab

Format: The size of the paper in the printer's paper tray. Many common sizes are provided, however if the paper size is not listed selected the Custom format and enter the paper size in Size below.

@@ -114,8 +111,7 @@

-

Printer tab -

+

Printer tab

Destination: Use this to select the destination of the print output.

@@ -136,8 +132,7 @@

-

Preview -

+

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.

@@ -161,8 +156,7 @@

-

Remember print settings -

+

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.

@@ -170,8 +164,7 @@

-

Print button -

+

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.

@@ -179,8 +172,7 @@

-

Cancel button -

+

Cancel button

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

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/reference_command_line.html --- a/doc/reference_command_line.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/reference_command_line.html Sun Oct 26 19:27:20 2008 +0000 @@ -217,8 +217,7 @@

-

Remote commands -

+

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:

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/reference_management.html --- a/doc/reference_management.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/reference_management.html Sun Oct 26 19:27:20 2008 +0000 @@ -56,8 +56,7 @@

-

Geeqie thumbnail cache -

+

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.

@@ -69,8 +68,7 @@

-

Shared thumbnail cache -

+

Shared thumbnail cache

The utilities listed here operate on the shared thumbnail mechanism.

@@ -82,8 +80,7 @@

-

Create thumbnails -

+

Create thumbnails

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

@@ -97,8 +94,7 @@

-

Metadata -

+

Metadata

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

@@ -108,8 +104,7 @@

-

File locations -

+

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.

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/reference_thumbnails.html --- a/doc/reference_thumbnails.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/reference_thumbnails.html Sun Oct 26 19:27:20 2008 +0000 @@ -52,8 +52,7 @@

Note: This page only refers the Geeqie thumbnail caching mechanism, the shared thumbnail cache mechanism is not explained here.

-

Format -

+

Format

Thumbnails are stored in PNG image format. The thumbnail name is the name of the source image with “.png” appended.

@@ -63,8 +62,7 @@

-

Location -

+

Location

Thumbnails are stored in:

@@ -88,8 +86,7 @@

-

Size -

+

Size

Geeqie allows the following sizes for thumbnails:

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/sidebars_exif.html --- a/doc/sidebars_exif.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/sidebars_exif.html Sun Oct 26 19:27:20 2008 +0000 @@ -64,13 +64,11 @@

-

Standard view -

+

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.

-

Advanced view -

+

Advanced view

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

@@ -78,8 +76,7 @@

-

Customizing the standard view -

+

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.

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/sidebars_keywords.html --- a/doc/sidebars_keywords.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/sidebars_keywords.html Sun Oct 26 19:27:20 2008 +0000 @@ -68,8 +68,7 @@

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

-

Keywords -

+

Keywords

The keywords panel consists of two fields. The left field is a text entry that allows direct typing of one or more keywords. The right field is a list of favorite or often used keywords that can be associated with the active image by filling the check box next to the keyword.

@@ -77,13 +76,11 @@

The favorite keywords list allows quick selection of commonly used keywords. A keyword is enabled when the check box next to it is filled. The text entry will update as words from the list are selected. To edit the favorite keywords list activate the favorites button at the bottom of the sidebar.

-

Comments -

+

Comments

This text entry allows entering text to be associated with the active image.

-

The buttons -

+

The buttons

Note: These buttons are only displayed as an icon, the text below refers to the tool tip that appears by hovering the mouse over each button.

@@ -100,8 +97,7 @@

-

Favorite Keywords Dialog -

+

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.

diff -r cbac5e35b1f7 -r f00c0c5e6dff doc/sidebars_sort_manager.html --- a/doc/sidebars_sort_manager.html Sun Oct 26 13:43:10 2008 +0000 +++ b/doc/sidebars_sort_manager.html Sun Oct 26 19:27:20 2008 +0000 @@ -62,15 +62,13 @@

-

Folder view -

- +

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.

Clicking or activating an item in the list will copy, move, or link the active image's file to that location. The active image will then change to the next image.

-

Bookmark list -

+

Bookmark list

This is a list of possible folders to use as a destination for the selected operation. A context menu will appear by right clicking on an item, or pressing the menu key when the item has the focus.

@@ -82,18 +80,15 @@

To remove an item from the list select “Remove” from it's context menu.

-

Copy, Move, and Link -

+

Copy, Move, and Link

These are the available operations to use on the active image, they should be self explanatory.

-

Add button -

+

Add button

Activate this button to add a folder to the bookmark list. A dialog will appear to allow selection of the folder to use for the new item.

-

Undo button -

+

Undo button

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

@@ -101,35 +96,30 @@

-

Collection view -

- +

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.

Clicking or activating an item in the list will add the selected image to that collection.

-

Collection list -

+

Collection list

This is the list of collections located in the folder $HOME/.geeqie/collections. Activating a member of this list will result in the current image selection to be added to the collection. If the image already exists within the collection, it will not be added a second time.

A new empty collection can be added to the list by activating the Add button at the bottom of the sidebar.

-

Choosing the selection style -

+

Choosing the selection style

The images to add when activating a collection is determined by the selection style:

Add image:The visible image is added to the collection.
Add selection: All images selected in the file list will be added to the collection.

-

Add button -

+

Add button

Activate this button to add a new empty collection to the visible list. A dialog will appear to allow entry of the name to use for the new collection.

-

Undo button -

+

Undo button

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