Mercurial > geeqie
changeset 1165:473a7c4881cd
Fix up yet unmarked keys.
| author | zas_ |
|---|---|
| date | Thu, 20 Nov 2008 17:23:46 +0000 |
| parents | 3692efcbd325 |
| children | 26b9fca795f8 |
| files | doc/image_management_copy_move.html doc/image_management_delete.html doc/image_management_external_editing.html doc/image_management_rename.html doc/main_window_folder_pane.html doc/main_window_image_pane.html doc/main_window_navigation.html doc/options_filtering.html doc/other_windows_image_window.html doc/other_windows_pan_view.html doc/sidebars_keywords.html doc/style.css |
| diffstat | 12 files changed, 31 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/image_management_copy_move.html Thu Nov 20 11:46:43 2008 +0000 +++ b/doc/image_management_copy_move.html Thu Nov 20 17:23:46 2008 +0000 @@ -60,7 +60,7 @@ <dt>Bookmark list</dt><dd>This list on the left side of the window allows you to save links to folders that are frequently used. Activating a bookmark will change the active path to that pointed to by the link. To add items to the bookmark list highlight a folder and press <span class="key">Ctrl</span> + <span class="key">B</span>, select “Add bookmark” from the folder's context menu, or drag a folder onto the bookmark list.<br />The bookmark has a context menu that can be displayed by clicking the right mouse button, or pressing the Menu key when a bookmark has the focus. From the context menu you can edit a bookmark, move it up or down in the list, or remove the bookmark from the list. A bookmark can also be moved by pressing <span class="key">Shift</span> + <span class="key">Up</span> or <span class="key">Shift</span> + <span class="key">Down</span> while it has the focus.</dd> - <dt>Folder list</dt><dd>This is the list that displays the folders contained in the active path. To change the active path to a folder displayed in this list double click the primary mouse button or highlight the folder with the keyboard and press Enter or Space. This list has a context menu that allows renaming or bookmarking the selected folder. A folder can also be dragged onto the bookmark list to add a bookmark.</dd> + <dt>Folder list</dt><dd>This is the list that displays the folders contained in the active path. To change the active path to a folder displayed in this list double click the primary mouse button or highlight the folder with the keyboard and press <span class="key">Enter</span> or <span class="key">Spacebar</span>. This list has a context menu that allows renaming or bookmarking the selected folder. A folder can also be dragged onto the bookmark list to add a bookmark.</dd> <dt>Path entry</dt><dd>This text entry displays the active path of the dialog. The path can be directly edited using this entry. Tab completion is supported, and the drop down arrow will display a list of recently selected folders.</dd>
--- a/doc/image_management_delete.html Thu Nov 20 11:46:43 2008 +0000 +++ b/doc/image_management_delete.html Thu Nov 20 17:23:46 2008 +0000 @@ -41,19 +41,19 @@ <h1>Delete</h1> - <p>To delete a file in Geeqie press <span class="key">Ctrl</span> + <span class="key">D</span>, or select Delete from the file menu. Delete is also available in the context menu of all images and files. If <a href="options_advanced.html" class="option_name">Enable delete key</a> is enabled in Options, pressing the Delete key can also be used to delete files.</p> + <p>To delete a file in Geeqie press <span class="key">Ctrl</span> + <span class="key">D</span>, or select Delete from the file menu. Delete is also available in the context menu of all images and files. If <a href="options_advanced.html" class="option_name">Enable delete key</a> is enabled in Options, pressing the <span class="key">Delete</span> key can also be used to delete files.</p> <p>The behavior when starting a delete operation depends on the <a href="options_advanced.html" class="option_name">Confirm file delete</a> 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.</p> <h2>Confirm delete dialog</h2> - <p>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.</p> + <p>The dialog that appears when delete confirmation is enabled will show the file or files to be deleted. To delete the file press <span class="key">Enter</span> or activate the Delete button. Pressing <span class="key">Escape</span> or activating the Cancel button will close the dialog and abort the operation.</p> <p>When deleting multiple files, the dialog will include two arrow buttons to step the image preview through the list of files to be deleted. Initially the preview will be blank, activate the right arrow to display the first file.</p> - <p>The dialog will also display the status of the <a href="options_advanced.html" class="option_name">Safe Delete</a> feature. Use this to determine if a file to be Deleted will be immediately lost, or if the file can possibly be recovered from the Safe Delete folder.</p> + <p>The dialog will also display the status of the <a href="options_advanced.html" class="option_name">Safe Delete</a> feature. Use this to determine if a file to be deleted will be immediately lost, or if the file can possibly be recovered from the Safe Delete folder.</p> - <p>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.</p> + <p>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 <span class="key">Enter</span> will delete the remaining files. Pressing <span class="key">Escape</span> or activating the Cancel button will close the dialog and the remaining files will not be deleted.</p> <h2>Safe Delete</h2>
--- a/doc/image_management_external_editing.html Thu Nov 20 11:46:43 2008 +0000 +++ b/doc/image_management_external_editing.html Thu Nov 20 17:23:46 2008 +0000 @@ -55,7 +55,7 @@ <p>The result dialog will display the command's text output. If the editor command will result in multiple runs of the same command for each file, the Stop button will be enabled, activate it to stop Geeqie from executing the command for remaining files.</p> - <p>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.</p> + <p>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 <span class="key">Escape</span> to close the result dialog. The result dialog can not be closed while a command is still running.</p> <hr id="bottomseparator" />
--- a/doc/image_management_rename.html Thu Nov 20 11:46:43 2008 +0000 +++ b/doc/image_management_rename.html Thu Nov 20 17:23:46 2008 +0000 @@ -47,9 +47,9 @@ <h2>Rename single file dialog</h2> - <p>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.</p> + <p>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 <span class="key">Enter</span> or activate the Rename button to rename the file. Press <span class="key">Escape</span> or activate the Cancel button to close the dialog and abort renaming the file.</p> - <p>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.</p> + <p>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 <span class="key">Enter</span> or activate the Overwrite button. Press <span class="key">Escape</span> or activate the Cancel button to close the dialog abort renaming the file.</p> <h2>Rename multiple files dialog</h2> @@ -58,11 +58,11 @@ <dl class="dialog_desc"> <dt>Manually enter new file names</dt> <dd> - <p>To manually enter the new name of each file, the active file will be displayed in the image preview and it's original name will be displayed above the text entry. To rename the file type the new name and press Enter or activate the Rename button. When a file is successfully renamed it will be removed from the list and the next one will become the active file. After all files have been renamed, the dialog will close.</p> + <p>To manually enter the new name of each file, the active file will be displayed in the image preview and it's original name will be displayed above the text entry. To rename the file type the new name and press <span class="key">Enter</span> or activate the Rename button. When a file is successfully renamed it will be removed from the list and the next one will become the active file. After all files have been renamed, the dialog will close.</p> <p>Files do not have to be renamed in the order that they appear in the list, highlighting a name in the list will make it become the active file.</p> - <p>When renaming a file and the new name already exists on the file system a dialog will appear showing the renamed and existing files. To overwrite the existing file press enter or activate the Overwrite button. Press Escape or activate the Cancel button to return to the original rename dialog, the file that prompted the overwrite dialog will remain active.</p> + <p>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 <span class="key">Enter</span> or activate the Overwrite button. Press <span class="key">Escape</span> or activate the Cancel button to return to the original rename dialog, the file that prompted the overwrite dialog will remain active.</p> </dd> <dt>Automatic renaming of multiple files</dt> @@ -75,7 +75,7 @@ <p>The order of the file list can be changed by dragging a name to the desired location within the list. The preview column will update to reflect the new order.</p> - <p>When the preview of new names is satisfactory, press Enter or activate the Rename button to rename the files to match the name in the preview column. Press Escape or activate the Cancel button to close the dialog and abort the rename operation.</p> + <p>When the preview of new names is satisfactory, press <span class="key">Enter</span> or activate the Rename button to rename the files to match the name in the preview column. Press <span class="key">Escape</span> or activate the Cancel button to close the dialog and abort the rename operation.</p> <p>If the resulting new names match any existing files, a warning dialog will notify you. The rename dialog will remain so that you can select a different set of names.</p> </dd>
--- a/doc/main_window_folder_pane.html Thu Nov 20 11:46:43 2008 +0000 +++ b/doc/main_window_folder_pane.html Thu Nov 20 17:23:46 2008 +0000 @@ -77,9 +77,9 @@ <p>This displays the active folder of the window and allows typing a location.</p> - <p>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.</p> + <p>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 <span class="key">Enter</span> key. Tab completion is also available in the path entry.</p> - <p class="note"><span class="note_label">Note:</span> Tab completion uses the tab key, press the down arrow to move the focus from the entry.</p> + <p class="note"><span class="note_label">Note:</span> Tab completion uses the <span class="key">Tab</span> key, press the <span class="key">Down</span> key to move the focus from the entry.</p> <p>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.</p> @@ -99,7 +99,7 @@ <p>This mode can be enabled by selecting “Tree” from the View menu, pressing <span class="key">Ctrl</span> + <span class="key">T</span>, or selecting “View as tree” from the context menu.</p> - <p>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.</p> + <p>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 <span class="key">+</span> or <span class="key">-</span> keys when the folder branch has the focus.</p> <h2>Sorting</h2>
--- a/doc/main_window_image_pane.html Thu Nov 20 11:46:43 2008 +0000 +++ b/doc/main_window_image_pane.html Thu Nov 20 17:23:46 2008 +0000 @@ -56,7 +56,7 @@ <p>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.</p> <h3>Keyboard</h3> - <p>Use the <span class="key">Arrows</span> to pan the image in the desired direction, to increase the panning speed hold down the <span class="key">Shift</span> key while pressing an Arrow.<br />Press <span class="key">Ctrl</span> and an Arrow to move to the respective edge of the image. The image can only be panned with the keyboard when the image has the focus, indicated by a dotted line surrounding the image pane.</p> + <p>Use the <span class="key">Arrows</span> to pan the image in the desired direction, to increase the panning speed hold down the <span class="key">Shift</span> + <span class="key">Arrows</span>.<br />Press <span class="key">Ctrl</span> + <span class="key">Arrows</span> to move to the respective edge of the image. The image can only be panned with the keyboard when the image has the focus, indicated by a dotted line surrounding the image pane.</p> <div class="shortcuts"> <table width="80%" border="1" cellpadding="2" cellspacing="0"> @@ -244,7 +244,7 @@ <p>Using View > Split item from the main menu, image pane can be splitted in up to four panes, this allows to display images side by side. You may use drag'n drop to change images in each pane.</p> <p>Connected zoom is possible through the View > Connected zoom menu. Zoom is then applied to all displayed images.</p> - <p>Connected scrolling is also possible using <span class="key">Shift</span> and first mouse button.</p> + <p>Connected scrolling is also possible using <span class="key">Shift</span> and primary mouse button.</p>
--- a/doc/main_window_navigation.html Thu Nov 20 11:46:43 2008 +0000 +++ b/doc/main_window_navigation.html Thu Nov 20 17:23:46 2008 +0000 @@ -45,7 +45,7 @@ <p>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).</p> - <p>To select a folder with the keyboard, move the focus to the desired folder and press the Space or Enter key.</p> + <p>To select a folder with the keyboard, move the focus to the desired folder and press the <span class="key">SpaceBar</span> or <span class="key">Enter</span> key.</p> <h2>Moving around within a folder</h2> @@ -59,15 +59,15 @@ <h2>Direct path entry</h2> - <p>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.</p> + <p>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 <span class="key">Enter</span> key. Tab completion is also available in the path entry.</p> <p>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.</p> <h2>Stepping through images sequentially</h2> - <p>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.</p> + <p>To change the displayed image to next or previous one within the same folder, use the respective <span class="key">PageDown</span> and <span class="key">PageUp</span> keys. The mouse can also be used to change the image by clicking the image display with the respective primary and middle buttons.</p> - <p>To change to beginning or end of the image list, use the respective Home or End keys.</p> + <p>To change to beginning or end of the image list, use the respective <span class="key">Home</span> or <span class="key">End</span> keys.</p> <hr id="bottomseparator" />
--- a/doc/options_filtering.html Thu Nov 20 11:46:43 2008 +0000 +++ b/doc/options_filtering.html Thu Nov 20 17:23:46 2008 +0000 @@ -69,7 +69,7 @@ <h2>File types</h2> - <p>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 (.).</p> + <p>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 <span class="key">Enter</span>; press <span class="key">Escape</span> to cancel an active edit. The format for the filter field is a semicolon (;) seperated list of extensions, extensions must include the period (.).</p> <p class="note"><span class="note_label">Note:</span> Unlike all other options in the dialog, filter list changes are applied immediately.</p>
--- a/doc/other_windows_image_window.html Thu Nov 20 11:46:43 2008 +0000 +++ b/doc/other_windows_image_window.html Thu Nov 20 17:23:46 2008 +0000 @@ -49,7 +49,7 @@ <h2>Navigation</h2> - <p>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 <a href="main_window_image_pane.html">Main Window</a>.</p> + <p>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 <span class="key">PageDown</span> and <span class="key">PageUp</span> keys. In addition, all navigation methods for the mouse and keyboard are similar to that of the image pane of a <a href="main_window_image_pane.html">Main Window</a>.</p> <h2>Changing the image</h2>
--- a/doc/other_windows_pan_view.html Thu Nov 20 11:46:43 2008 +0000 +++ b/doc/other_windows_pan_view.html Thu Nov 20 17:23:46 2008 +0000 @@ -43,9 +43,9 @@ <p>This window proposes alternative views of the <em>current directory and its children</em>.<br /> You can pan the view as you pan an image in normal view mode, using left mouse button and drag.</p> - <p>A left mouse button click on any image will display informations about the image. Right button will show a context menu.</p> + <p>A primary mouse button click on any image will display informations about the image. Secondary mouse button will show a context menu.</p> - <p class="note"><span class="note_label">Note:</span>The pan view recursively visits each folder under the specified folder, so be careful it can eat a lot of ressources.</p> + <p class="note"><span class="note_label">Note:</span> The pan view recursively visits each folder under the specified folder, so be careful it can eat a lot of ressources.</p> <h2>Select a folder</h2> @@ -81,7 +81,7 @@ <h2>Find</h2> <p>At the bottom of the window:</p> <dl class="dialog_desc"> - <dt>Find button</dt><dd>Shows a text field for image search. One can enter a filename or a part of it or a date (yyyy or yyyy-mm or yyyy-mm-dd format, separator can be '/','-',' ','.',','). Pressing Enter key will start the search, pressing it again will move to the next match. Matched file is made visible and details are shown for it.</dd> + <dt>Find button</dt><dd>Shows a text field for image search. One can enter a filename or a part of it or a date (yyyy or yyyy-mm or yyyy-mm-dd format, separator can be '/','-',' ','.',','). Pressing <span class="key">Enter</span> key will start the search, pressing it again will move to the next match. Matched file is made visible and details are shown for it.</dd> </dl> <hr id="bottomseparator" />
--- a/doc/sidebars_keywords.html Thu Nov 20 11:46:43 2008 +0000 +++ b/doc/sidebars_keywords.html Thu Nov 20 17:23:46 2008 +0000 @@ -55,7 +55,7 @@ <p>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.</p> - <p>The <b>text entry</b> allows typing keywords to associate them with the active image. Keywords entered here can be separated by a space, tab, or comma; creating a new line by pressing Enter will also separate keywords.</p> + <p>The <b>text entry</b> allows typing keywords to associate them with the active image. Keywords entered here can be separated by a space, tab, or comma; creating a new line by pressing <span class="key">Enter</span> will also separate keywords.</p> <p>The <b>favorite keywords</b> list allows quick selection of commonly used keywords. <span class="key">A</span> 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.</p> @@ -86,7 +86,7 @@ <h2>Favorite Keywords Dialog</h2> - <p>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.</p> + <p>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 <span class="key">Enter</span> on the keyboard.</p> <p>Activate OK to save the changes and close the dialog, Cancel will discard the changes and close the dialog.</p>
--- a/doc/style.css Thu Nov 20 11:46:43 2008 +0000 +++ b/doc/style.css Thu Nov 20 17:23:46 2008 +0000 @@ -237,12 +237,13 @@ margin: 0.1em; } -/* Keyboard key Z*/ +/* Keyboard key style */ .key { border:0.2em solid; border-color:#ddd #bbb #bbb #ddd; - background:#eee; - padding:0.1em 0.4em; + background:#f2f2f2; + padding:0em 0.4em; + margin: 0; font-size:0.8em; white-space:nowrap; }