Mercurial > geeqie
changeset 1117:73bbcaf9abba
Various fixes and cleanup.
author | zas_ |
---|---|
date | Mon, 10 Nov 2008 17:16:16 +0000 |
parents | 7f22b99b0eb9 |
children | 71c5b25b371a |
files | doc/collections.html doc/credits.html doc/image_management_delete.html doc/image_management_rename.html doc/image_presentation_fullscreen.html doc/image_search_finding_duplicates.html doc/image_search_search.html doc/introduction.html doc/main_window_image_pane.html doc/other_windows_image_window.html doc/printing.html doc/reference_keyboard_shortcuts.html doc/reference_management.html doc/sidebars_keywords.html doc/sidebars_sort_manager.html doc/style.css |
diffstat | 16 files changed, 40 insertions(+), 155 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/collections.html Mon Nov 10 16:11:28 2008 +0000 +++ b/doc/collections.html Mon Nov 10 17:16:16 2008 +0000 @@ -59,7 +59,7 @@ <p><b>Keyboard shortcuts</b> available in the collection window:</p> - <div class="gq-collections-4"> + <div class="collections-shortcuts"> <table width="80%" border="1" cellpadding="2" cellspacing="0"> <col width="25%"></col> <col width="25%"></col>
--- a/doc/credits.html Mon Nov 10 16:11:28 2008 +0000 +++ b/doc/credits.html Mon Nov 10 17:16:16 2008 +0000 @@ -49,7 +49,7 @@ <h2>Copyright</h2> - <p>Geeqie and this accompanying documentation is copyright <span class="gq-credits-6">©</span> 2008 The Geeqie Team and <span class="gq-credits-6">©</span> 2006 John Ellis.</p> + <p>Geeqie and this accompanying documentation is copyright © 2008 The Geeqie Team and © 2006 John Ellis.</p> <h2>License</h2> @@ -58,8 +58,8 @@ <p>This Geeqie documentation is released under the "<a href="gnu_fdl.txt">GNU Free Documentation License</a>".</p> <h2>Legal Notice</h2> - <p>Copyright <span class="gq-credits-6">©</span> 2008 The Geeqie Team.<br /> - Copyright <span class="gq-credits-6">©</span> 2006 John Ellis.</p> + <p>Copyright © 2008 The Geeqie Team.<br /> + Copyright © 2006 John Ellis.</p> <p>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 "<a href="gnu_fdl.txt">GNU Free Documentation License</a>".</p>
--- a/doc/image_management_delete.html Mon Nov 10 16:11:28 2008 +0000 +++ b/doc/image_management_delete.html Mon Nov 10 17:16:16 2008 +0000 @@ -59,7 +59,6 @@ <p>Safe Delete includes these options:</p> - <p> <dl class="dialog_desc"> <dt>Folder</dt> <dd><p>The folder to use for temporarily retaining deleted files.</p></dd> @@ -67,10 +66,10 @@ <dt>Maximum size</dt> <dd><p>The maximum amount of disk space to use when storing deleted files, in megabytes.</p> - <p>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.<p> + <p>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.</p> </dd> </dl> - + <p>Files moved to the Safe Delete folder are prefixed with a six digit number in the format: <code>nnnnnn_FILENAME</code> </p>
--- a/doc/image_management_rename.html Mon Nov 10 16:11:28 2008 +0000 +++ b/doc/image_management_rename.html Mon Nov 10 17:16:16 2008 +0000 @@ -53,7 +53,6 @@ <p>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.</p> - <p> <dl class="dialog_desc"> <dt>Manually enter new file names</dt> <dd>
--- a/doc/image_presentation_fullscreen.html Mon Nov 10 16:11:28 2008 +0000 +++ b/doc/image_presentation_fullscreen.html Mon Nov 10 17:16:16 2008 +0000 @@ -79,7 +79,6 @@ <p>Full screen behavior and location can be adjusted on the <a href="options_advanced.html">Advanced tab</a> of the preferences dialog.</p> - <p> <dl class="dialog_desc"> <dt>Size and location</dt> <dd><p>This can be changed using <span class="option_name">Full screen size</span> option, this can be used to select the monitor to use in a multiple monitor configuration.</p></dd> @@ -90,14 +89,13 @@ <dt>Disable screen saver in full screen</dt> <dd><p>This option will execute <i>xscreensaver-command --deactivate</i> once per minute to avoid the screen saver from activating.</p></dd> </dl> - </p> <h2>Navigation</h2> <p>The usual image navigation controls are available when in full screen, these are the commands available:</p> - <div class="gq-fullscreen-4"> - <table width="80%" border="1" cellpadding="4" cellspacing="0" rules="ROWS"> + <div class="fullscreen-shortcuts"> + <table width="80%" border="1" cellpadding="4" cellspacing="0" rules="rows"> <col id="fullscreen_shortcuts_col1" width="33%"></col> <col id="fullscreen_shortcuts_col2" width="33%"></col> <col id="fullscreen_shortcuts_col3" width="33%"></col> @@ -279,12 +277,12 @@ </table> </div> - <p>(*) Default Mouse wheel functions, can be altered by changing <span class="gq-fullscreen-10">the <a href="options_advanced.html">Mouse wheel scrolls image</a> option.</span></p> + <p>(*) Default Mouse wheel functions, can be altered by changing the <a href="options_advanced.html" class="option_name">Mouse wheel scrolls image</a> option.</p> <p>Several other standard controls are also available through the keyboard and context menu:</p> - <div class="gq-fullscreen-4"> - <table width="80%" border="1" cellpadding="4" cellspacing="0" rules="ROWS"> + <div class="fullscreen-functions"> + <table width="80%" border="1" cellpadding="4" cellspacing="0" rules="rows"> <col id="fullscreen_functions_col1" width="50%"></col> <col id="fullscreen_functions_col2" width="50%"></col>
--- a/doc/image_search_finding_duplicates.html Mon Nov 10 16:11:28 2008 +0000 +++ b/doc/image_search_finding_duplicates.html Mon Nov 10 17:16:16 2008 +0000 @@ -44,8 +44,7 @@ <h2>Adding files to be compared</h2> <p>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:</p> - - <p> + <dl class="menu_desc"> <dt>Add contents</dt> <dd><p>The contents of dropped folders will added to the window.</p></dd> @@ -57,7 +56,6 @@ <dd><p>Ignore folders contained in the drop list.</p></dd> </dl> - </p> <p>When files are added to the window, the comparison is restarted to include the new files.</p> @@ -97,11 +95,11 @@ <p><b>Keyboard shortcuts</b> available in the results list:</p> - <div class="gq-finding-duplicates-4"> + <div class="find-duplicates-shortcuts"> <table width="80%" border="1" cellpadding="2" cellspacing="0"> - <col id="find_duplicates_shortcuts_col1" width="25%"> - <col id="find_duplicates_shortcuts_col2" width="25%"> - <col id="find_duplicates_shortcuts_col3" width="50%"> + <col id="find_duplicates_shortcuts_col1" width="25%"></col> + <col id="find_duplicates_shortcuts_col2" width="25%"></col> + <col id="find_duplicates_shortcuts_col3" width="50%"></col> <thead> <tr>
--- a/doc/image_search_search.html Mon Nov 10 16:11:28 2008 +0000 +++ b/doc/image_search_search.html Mon Nov 10 17:16:16 2008 +0000 @@ -51,7 +51,6 @@ <p>One of several locations can be chosen as the source to use in the search.</p> - <p> <dl class="dialog_desc"> <dt>Path</dt> <dd> @@ -115,7 +114,7 @@ <p><b>Keyboard shortcuts</b> available in the results list:</p> - <div class="gq-search-4"> + <div class="search-shortcuts"> <table width="80%" border="1" cellpadding="2" cellspacing="0"> <col id="search_shortcuts_col1" width="25%"></col> <col id="search_shortcuts_col2" width="25%"></col>
--- a/doc/introduction.html Mon Nov 10 16:11:28 2008 +0000 +++ b/doc/introduction.html Mon Nov 10 17:16:16 2008 +0000 @@ -39,8 +39,8 @@ <p>Legal Notice</p> - <p>Copyright <span class="gq-introduction-6">©</span> 2008 The Geeqie Team.<br /> - Copyright <span class="gq-introduction-6">©</span> 2004 John Ellis.</p> + <p>Copyright © 2008 The Geeqie Team.<br /> + Copyright © 2004 John Ellis.</p> <p>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 "<a href="gnu_fdl.txt">GNU Free Documentation License</a>".</p>
--- a/doc/main_window_image_pane.html Mon Nov 10 16:11:28 2008 +0000 +++ b/doc/main_window_image_pane.html Mon Nov 10 17:16:16 2008 +0000 @@ -47,7 +47,7 @@ <p>The quality of the image, especially when using the zoom feature, is dependent on the settings that are available on the <a href="options_image.html">Image tab</a> of the preferences dialog.</p> - <p>To increase the speed of loading the next image when navigating the image list in sequence, enable the <a href="options_image.html">Preload next image</a> option.</p> + <p>To increase the speed of loading the next image when navigating the image list in sequence, enable the <a href="options_image.html" class="option_name">Preload next image</a> option.</p> <h2>Image panning and manipulation</h2>
--- a/doc/other_windows_image_window.html Mon Nov 10 16:11:28 2008 +0000 +++ b/doc/other_windows_image_window.html Mon Nov 10 17:16:16 2008 +0000 @@ -43,7 +43,7 @@ <p>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.</p> - <p>The image pane contained in an image window behaves and operates similar to the image pane of a <a href="main_window_image_pane.html">Main Window</a>. The keyboard shortcuts are the same, and the context menu is the same except “Hide file list” is replaced by “Close window”. The <a href="image_presentation_slideshow.html">slide show</a> and <a href="8_2_fillscreen.html">full screen</a> functions are also available.</p> + <p>The image pane contained in an image window behaves and operates similar to the image pane of a <a href="main_window_image_pane.html">Main Window</a>. The keyboard shortcuts are the same, and the context menu is the same except “Hide file list” is replaced by “Close window”. The <a href="image_presentation_slideshow.html">slide show</a> and <a href="image_presentation_fullscreen.html">full screen</a> functions are also available.</p> <h2>Navigation</h2> @@ -53,7 +53,6 @@ <p>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:</p> - <p> <dl> <dt>One or more <strong>files</strong></dt> <dd>The image window will display the first image; the list of dropped images can be navigated similar to a main window's image pane.</dd>
--- a/doc/printing.html Mon Nov 10 16:11:28 2008 +0000 +++ b/doc/printing.html Mon Nov 10 17:16:16 2008 +0000 @@ -62,6 +62,7 @@ <dt>Image size</dt><dd>When print one image per page, the size of the image in relation to the available print area.</dd> <dt>Proof size</dt><dd>When printing a Proof sheet, the size of each image in Units (see Paper tab).</dd> </dl> + </dd> </dl> <h2>Text tab</h2> @@ -97,14 +98,12 @@ <dl class="dialog_desc"> <dt>Destination</dt> <dd><p>Use this to select the destination of the print output.</p> - <p> <dl> <dt>Default printer</dt><dd>Prints to the system default printer.</dd> <dt>Custom printer</dt><dd>Prints to the printer using the command defined in Custom printer (below).</dd> <dt>Postscript file</dt><dd>Writes using the postscript format to named File (below).</dd> <dt>Image file</dt><dd>Writes using the selected File format (below) to named File (below).</dd> </dl> - </p> </dd> <dt>Custom printer</dt>
--- a/doc/reference_keyboard_shortcuts.html Mon Nov 10 16:11:28 2008 +0000 +++ b/doc/reference_keyboard_shortcuts.html Mon Nov 10 17:16:16 2008 +0000 @@ -37,11 +37,11 @@ <h1>Keyboard Shortcuts</h1> - <div class="gq-keyboard-shortcuts-4"> - <table width="90%" border="1" cellpadding="2" cellspacing="0" class="gq-keyboard-shortcuts-3"> - <col width="33%"></col> - <col width="33%"></col> - <col width="33%"></col> + <div class="keyboard-shortcuts"> + <table width="90%" border="1" cellpadding="2" cellspacing="0"> + <col id="keyboard_shortcuts_col1" width="33%"></col> + <col id="keyboard_shortcuts_col2" width="33%"></col> + <col id="keyboard_shortcuts_col3" width="33%"></col> <thead> <tr> @@ -955,7 +955,7 @@ </table> </div> - <p>(*) Default Mouse wheel functions, can be altered by changing <span class="gq-keyboard-shortcuts-10">the <a href="options_advanced.html">Mouse wheel scrolls image</a> option.</span></p> + <p>(*) Default Mouse wheel functions, can be altered by changing the <a href="options_advanced.html" class="option_name">Mouse wheel scrolls image</a> option.</p> <hr id="bottomseparator" />
--- a/doc/reference_management.html Mon Nov 10 16:11:28 2008 +0000 +++ b/doc/reference_management.html Mon Nov 10 17:16:16 2008 +0000 @@ -138,7 +138,7 @@ <tr> <td> - <p><em><SOURCE>/.</em><span class="gq-management-8">thumbnails</span> + <p><em><SOURCE>/.</em>thumbnails </p> </td>
--- a/doc/sidebars_keywords.html Mon Nov 10 16:11:28 2008 +0000 +++ b/doc/sidebars_keywords.html Mon Nov 10 17:16:16 2008 +0000 @@ -43,7 +43,7 @@ <p>To toggle display of the Keywords sidebar press Control + K or select “Keywords” from the View menu.</p> - <p><b>Keywords</b> <span class="gq-keywords-5">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.</span> Images associated to one or more keywords can be found using the <a href="image_search_search.html">Search window</a>.</p> + <p><b>Keywords</b> 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 <a href="image_search_search.html">Search window</a>.</p> <p><b>Comments</b> is an area to associate a textual description to an image.</p>
--- a/doc/sidebars_sort_manager.html Mon Nov 10 16:11:28 2008 +0000 +++ b/doc/sidebars_sort_manager.html Mon Nov 10 17:16:16 2008 +0000 @@ -91,7 +91,6 @@ <p>The images to add when activating a collection is determined by the selection style:</p> - <p> <dl class="dialog_desc"> <dt>Add image</dt> <dd><p>The visible image is added to the collection.</p></dd> @@ -99,7 +98,6 @@ <dt>Add selection</dt> <dd><p>All images selected in the file list will be added to the collection.</p></dd> </dl> - </p> <h3>Add button</h3>
--- a/doc/style.css Mon Nov 10 16:11:28 2008 +0000 +++ b/doc/style.css Mon Nov 10 17:16:16 2008 +0000 @@ -9,6 +9,10 @@ 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 @@ font-weight: bold } -span.option_name { - font-style: italic -} - p.note { font-style: italic } @@ -117,127 +117,23 @@ } /* 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} +div.fullscreen-shortcuts {text-align: center} +div.fullscreen-functions {text-align: center} -/* image_presentation.html */ - -/* 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}