From: Laurent Monin Date: Mon, 10 Nov 2008 17:16:16 +0000 (+0000) Subject: Various fixes and cleanup. X-Git-Tag: v1.0.0~686 X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=82cd089fb37bda5fc685b5cd43486e8ff26d2679 Various fixes and cleanup. --- diff --git a/doc/collections.html b/doc/collections.html index b3b76e2e..259f2a10 100644 --- a/doc/collections.html +++ b/doc/collections.html @@ -59,7 +59,7 @@

Keyboard shortcuts available in the collection window:

-
+
diff --git a/doc/credits.html b/doc/credits.html index 7556f028..c87f8c77 100644 --- a/doc/credits.html +++ b/doc/credits.html @@ -49,7 +49,7 @@

Copyright

-

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

+

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

License

@@ -58,8 +58,8 @@

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

Legal Notice

-

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

+

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

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 --git a/doc/image_management_delete.html b/doc/image_management_delete.html index cfe36116..de71246d 100644 --- a/doc/image_management_delete.html +++ b/doc/image_management_delete.html @@ -59,7 +59,6 @@

Safe Delete includes these options:

-

Folder

The folder to use for temporarily retaining deleted files.

@@ -67,10 +66,10 @@
Maximum size

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

-

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

+

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

- +

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

diff --git a/doc/image_management_rename.html b/doc/image_management_rename.html index fe53d92b..bf615ebc 100644 --- a/doc/image_management_rename.html +++ b/doc/image_management_rename.html @@ -53,7 +53,6 @@

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

-

Manually enter new file names
diff --git a/doc/image_presentation_fullscreen.html b/doc/image_presentation_fullscreen.html index e7fe3f6c..c49fc393 100644 --- a/doc/image_presentation_fullscreen.html +++ b/doc/image_presentation_fullscreen.html @@ -79,7 +79,6 @@

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

-

Size and location

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

@@ -90,14 +89,13 @@
Disable screen saver in full screen

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

-

Navigation

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

-
-
+
+
@@ -279,12 +277,12 @@
-

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

+

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

Several other standard controls are also available through the keyboard and context menu:

-
- +
+
diff --git a/doc/image_search_finding_duplicates.html b/doc/image_search_finding_duplicates.html index d6cb9a50..1957020d 100644 --- a/doc/image_search_finding_duplicates.html +++ b/doc/image_search_finding_duplicates.html @@ -44,8 +44,7 @@

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:

- -

+

Add contents

The contents of dropped folders will added to the window.

@@ -57,7 +56,6 @@

Ignore folders contained in the drop list.

-

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

@@ -97,11 +95,11 @@

Keyboard shortcuts available in the results list:

-
+
- - - + + + diff --git a/doc/image_search_search.html b/doc/image_search_search.html index b636b3d3..c3496336 100644 --- a/doc/image_search_search.html +++ b/doc/image_search_search.html @@ -51,7 +51,6 @@

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

-

Path
@@ -115,7 +114,7 @@

Keyboard shortcuts available in the results list:

-
+
diff --git a/doc/introduction.html b/doc/introduction.html index 330bc88e..32b800e5 100644 --- a/doc/introduction.html +++ b/doc/introduction.html @@ -39,8 +39,8 @@

Legal Notice

-

Copyright © 2008 The Geeqie Team.
- Copyright © 2004 John Ellis.

+

Copyright © 2008 The Geeqie Team.
+ Copyright © 2004 John Ellis.

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 --git a/doc/main_window_image_pane.html b/doc/main_window_image_pane.html index 5580adf9..2a93b55a 100644 --- a/doc/main_window_image_pane.html +++ b/doc/main_window_image_pane.html @@ -47,7 +47,7 @@

The quality of the image, especially when using the zoom feature, is dependent on the settings that are available on the Image tab of the preferences dialog.

-

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

+

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

diff --git a/doc/other_windows_image_window.html b/doc/other_windows_image_window.html index c1ae49d5..cfdf2717 100644 --- a/doc/other_windows_image_window.html +++ b/doc/other_windows_image_window.html @@ -43,7 +43,7 @@

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.

+

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

@@ -53,7 +53,6 @@

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:

-

One or more files
The image window will display the first image; the list of dropped images can be navigated similar to a main window's image pane.
diff --git a/doc/printing.html b/doc/printing.html index ac2b1be6..1104900c 100644 --- a/doc/printing.html +++ b/doc/printing.html @@ -62,6 +62,7 @@
Image size
When print one image per page, the size of the image in relation to the available print area.
Proof size
When printing a Proof sheet, the size of each image in Units (see Paper tab).
+

Text tab

@@ -97,14 +98,12 @@
Destination

Use this to select the destination of the print output.

-

Default printer
Prints to the system default printer.
Custom printer
Prints to the printer using the command defined in Custom printer (below).
Postscript file
Writes using the postscript format to named File (below).
Image file
Writes using the selected File format (below) to named File (below).
-

Custom printer
diff --git a/doc/reference_keyboard_shortcuts.html b/doc/reference_keyboard_shortcuts.html index c821bfbc..a3f46ab6 100644 --- a/doc/reference_keyboard_shortcuts.html +++ b/doc/reference_keyboard_shortcuts.html @@ -37,11 +37,11 @@

Keyboard Shortcuts

-
-
- - - +
+
+ + + @@ -955,7 +955,7 @@
-

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

+

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

diff --git a/doc/reference_management.html b/doc/reference_management.html index b50f3e2c..7d58c81c 100644 --- a/doc/reference_management.html +++ b/doc/reference_management.html @@ -138,7 +138,7 @@ -

<SOURCE>/.thumbnails +

<SOURCE>/.thumbnails

diff --git a/doc/sidebars_keywords.html b/doc/sidebars_keywords.html index 5eb95ba8..88c51bf3 100644 --- a/doc/sidebars_keywords.html +++ b/doc/sidebars_keywords.html @@ -43,7 +43,7 @@

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.

+

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.

diff --git a/doc/sidebars_sort_manager.html b/doc/sidebars_sort_manager.html index 60a9921b..94e80f82 100644 --- a/doc/sidebars_sort_manager.html +++ b/doc/sidebars_sort_manager.html @@ -91,7 +91,6 @@

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

-

Add image

The visible image is added to the collection.

@@ -99,7 +98,6 @@
Add selection

All images selected in the file list will be added to the collection.

-

Add button

diff --git a/doc/style.css b/doc/style.css index 282c45fa..514349ba 100644 --- a/doc/style.css +++ b/doc/style.css @@ -9,6 +9,10 @@ body { font-family: "Trebuchet MS", Verdana, "Lucida Grande", Tahoma, Helvetica, Sans-Serif; } +table {page-break-before: always} + +.option_name { font-variant: small-caps; font-size: 90%; font-weight: bold } + p.previous { text-align: left } @@ -101,10 +105,6 @@ thead { font-weight: bold } -span.option_name { - font-style: italic -} - p.note { font-style: italic } @@ -117,127 +117,23 @@ code { } /* collections.html */ -div.gq-collections-4 {text-align: center} - -/* credits.html */ -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%} - -/* image_management_copy_move.html */ - -/* image_management_delete.html */ -span.gq-delete-7 {font-style: normal} - -/* image_management_external_editing.html */ - -/* image_management.html */ - -/* image_management_rename.html */ +div.collections-shortcuts {text-align: center} /* 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} - -/* image_presentation.html */ +div.fullscreen-shortcuts {text-align: center} +div.fullscreen-functions {text-align: center} -/* image_presentation_slideshow.html */ -span.gq-slideshow-6 {text-decoration: none} /* image_search_finding_duplicates.html */ -div.gq-finding-duplicates-4 {text-align: center} - -/* image_search.html */ +div.find-duplicates-shortcuts {text-align: center} /* image_search_search.html */ -div.gq-search-4 {text-align: center} +div.search-shortcuts {text-align: center} /* index.html */ .menu ul {font-size: 110%; font-weight: bold; margin: 10px;} .menu ul li {margin: 4px;} .menu ul li ul {font-size: 90%; font-weight: normal} -/* introduction.html */ -span.gq-introduction-6 {font-family: Nimbus Roman No9 L} - -/* main_window_file_pane.html */ - -/* main_window_folder_pane.html */ - -/* main_window.html */ - -/* main_window_image_pane.html */ -span.gq-image-pane-6 {text-decoration: none} - -/* main_window_layout.html */ - -/* main_window_menus.html */ -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} - -/* 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} - -/* options_hidden.html */ -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} - -/* options_window.html */ - -/* other_windows.html */ - -/* other_windows_image_properties.html */ - -/* other_windows_image_window.html */ - -/* printing.html */ -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} - -/* reference_management.html */ -span.gq-management-9 {font-weight: medium} -span.gq-management-8 {font-style: normal} -div.gq-management-4 {text-align: center} - -/* reference_thumbnails.html */ - -/* sidebars_exif.html */ - -/* sidebars.html */ - -/* sidebars_keywords.html */ -span.gq-keywords-5 {font-weight: medium} - -/* sidebars_sort_manager.html */ -span.gq-sort-manager-8 {font-weight: medium} - -/* template.html */ +div.keyboard-shortcuts {text-align: center}