Mercurial > geeqie
changeset 1158:616fae3a801f
Unify [Shift] and [Control] notation.
| author | zas_ |
|---|---|
| date | Wed, 19 Nov 2008 21:16:27 +0000 |
| parents | 0186f9c7d9e4 |
| children | e2ca6295c5d0 |
| files | doc/collections.html doc/image_management_copy_move.html doc/image_management_delete.html doc/image_management_external_editing.html doc/image_management_rename.html doc/image_search_finding_duplicates.html doc/image_search_search.html doc/main_window_file_pane.html doc/main_window_folder_pane.html doc/main_window_image_pane.html doc/options_advanced.html doc/other_windows_image_properties.html doc/printing.html doc/reference_keyboard_shortcuts.html doc/sidebars_exif.html doc/sidebars_keywords.html doc/sidebars_sort_manager.html |
| diffstat | 17 files changed, 63 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/collections.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/collections.html Wed Nov 19 21:16:27 2008 +0000 @@ -115,7 +115,7 @@ <tr> <td> - <p>Control + A</p> + <p>[Control] + A</p> </td> <td> @@ -129,7 +129,7 @@ <tr> <td> - <p>Control + Shift + A</p> + <p>[Control] + [Shift] + A</p> </td> <td> @@ -143,8 +143,8 @@ <tr> <td> - <p>Control + 1 through<br /> - Control + 0</p> + <p>[Control] + 1 through<br /> + [Control] + 0</p> </td> <td> @@ -158,7 +158,7 @@ <tr> <td> - <p>Control + P</p> + <p>[Control] + P</p> </td> <td> @@ -172,7 +172,7 @@ <tr> <td> - <p>Control + C</p> + <p>[Control] + C</p> </td> <td> @@ -186,7 +186,7 @@ <tr> <td> - <p>Control + M</p> + <p>[Control] + M</p> </td> <td> @@ -200,7 +200,7 @@ <tr> <td> - <p>Control + R</p> + <p>[Control] + R</p> </td> <td> @@ -214,7 +214,7 @@ <tr> <td> - <p>Control + D</p> + <p>[Control] + D</p> </td> <td> @@ -242,7 +242,7 @@ <tr> <td> - <p>Control + L</p> + <p>[Control] + L</p> </td> <td> @@ -284,7 +284,7 @@ <tr> <td> - <p>Control + S</p> + <p>[Control] + S</p> </td> <td> @@ -298,7 +298,7 @@ <tr> <td> - <p>Control + T</p> + <p>[Control] + T</p> </td> <td> @@ -406,7 +406,7 @@ <tr> <td> - <p>Control + W</p> + <p>[Control] + W</p> </td> <td> </td>
--- a/doc/image_management_copy_move.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/image_management_copy_move.html Wed Nov 19 21:16:27 2008 +0000 @@ -41,7 +41,7 @@ <h1>Copy and Move</h1> - <p>To copy an file in Geeqie press Control + C, to move an file press Control + M. These operations also appear under File in the main menu, and in the context menu of all images and files.</p> + <p>To copy an file in Geeqie press [Control] + C, to move an file press [Control] + M. These operations also appear under File in the main menu, and in the context menu of all images and files.</p> <p>The Copy and Move operations and dialogs behave the same in Geeqie, with the only difference being the final result. The remaining text of this page applies equally to the Copy and Move operations, for the remainder of this page these will be referred to as a Copy/Move operation.</p> @@ -58,7 +58,7 @@ <dt>Show Hidden check box</dt><dd>Enabling this check box will cause hidden folders to appear in the folder list.</dd> - <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 Control + B, 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 Shift + Up or Shift + Down while it has the focus.</dd> + <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 [Control] + B, 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 [Shift] + Up or [Shift] + Down 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>
--- a/doc/image_management_delete.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/image_management_delete.html Wed Nov 19 21:16:27 2008 +0000 @@ -41,7 +41,7 @@ <h1>Delete</h1> - <p>To delete a file in Geeqie press Control + D, 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 [Control] + D, 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>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>
--- a/doc/image_management_external_editing.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/image_management_external_editing.html Wed Nov 19 21:16:27 2008 +0000 @@ -43,7 +43,7 @@ <p>Geeqie provides the ability to execute commands, such as running an image editor, on a selected image. In Geeqie these are called the external editing commands.</p> - <p>These commands are executed by pressing Control and a number key, from the Edit menu, or from the context menu available to all images and files. The keyboards shortcuts are Control + 1 through Control + 9, and Control + 0, they correspond respectively to commands 1 through 10 on the <a href="options_editor_commands.html">Editors tab</a> in Options.</p> + <p>These commands are executed by pressing [Control] and a number key, from the Edit menu, or from the context menu available to all images and files. The keyboards shortcuts are [Control] + 1 through [Control] + 9, and [Control] + 0, they correspond respectively to commands 1 through 10 on the <a href="options_editor_commands.html">Editors tab</a> in Options.</p> <p>To edit the command list refer to section <a href="options_editor_commands.html">Editor Commands</a>.</p>
--- a/doc/image_management_rename.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/image_management_rename.html Wed Nov 19 21:16:27 2008 +0000 @@ -41,7 +41,7 @@ <h1>Rename</h1> - <p>To rename a file in Geeqie press Control + R, or select Rename from the File menu. Rename is also available in the context menu of all images and files.</p> + <p>To rename a file in Geeqie press [Control] + R, or select Rename from the File menu. Rename is also available in the context menu of all images and files.</p> <p>When renaming a file, a dialog will display allowing entry of the new name for the file. The dialog will be different depending on the number of files selected to be renamed. A simple dialog will appear when renaming a single file, however when renaming multiple files the dialog will include a list of the file to be renamed and additional options.</p>
--- a/doc/image_search_finding_duplicates.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/image_search_finding_duplicates.html Wed Nov 19 21:16:27 2008 +0000 @@ -154,7 +154,7 @@ <tr> <td> - <p>Control + A</p> + <p>[Control] + A</p> </td> <td> @@ -168,7 +168,7 @@ <tr> <td> - <p>Control + Shift + A</p> + <p>[Control] + [Shift] + A</p> </td> <td> @@ -210,8 +210,8 @@ <tr> <td> - <p>Control + 1 through<br /> - Control + 0</p> + <p>[Control] + 1 through<br /> + [Control] + 0</p> </td> <td> @@ -225,7 +225,7 @@ <tr> <td> - <p>Control + P</p> + <p>[Control] + P</p> </td> <td> @@ -265,7 +265,7 @@ <tr> <td> - <p>Control + C</p> + <p>[Control] + C</p> </td> <td> @@ -279,7 +279,7 @@ <tr> <td> - <p>Control + M</p> + <p>[Control] + M</p> </td> <td> @@ -293,7 +293,7 @@ <tr> <td> - <p>Control + R</p> + <p>[Control] + R</p> </td> <td> @@ -307,7 +307,7 @@ <tr> <td> - <p>Control + D</p> + <p>[Control] + D</p> </td> <td> @@ -335,7 +335,7 @@ <tr> <td> - <p>Control + Delete</p> + <p>[Control] + Delete</p> </td> <td> @@ -361,7 +361,7 @@ <tr> <td> - <p>Control + T</p> + <p>[Control] + T</p> </td> <td> </td> @@ -373,7 +373,7 @@ <tr> <td> - <p>Control + W</p> + <p>[Control] + W</p> </td> <td> </td>
--- a/doc/image_search_search.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/image_search_search.html Wed Nov 19 21:16:27 2008 +0000 @@ -170,7 +170,7 @@ <tr> <td> - <p>Control + A</p> + <p>[Control] + A</p> </td> <td> @@ -184,7 +184,7 @@ <tr> <td> - <p>Control + Shift + A</p> + <p>[Control] + [Shift] + A</p> </td> <td> @@ -198,8 +198,8 @@ <tr> <td> - <p>Control + 1 through<br /> - Control + 0</p> + <p>[Control] + 1 through<br /> + [Control] + 0</p> </td> <td> @@ -213,7 +213,7 @@ <tr> <td> - <p>Control + P</p> + <p>[Control] + P</p> </td> <td> @@ -253,7 +253,7 @@ <tr> <td> - <p>Control + C</p> + <p>[Control] + C</p> </td> <td> @@ -267,7 +267,7 @@ <tr> <td> - <p>Control + M</p> + <p>[Control] + M</p> </td> <td> @@ -281,7 +281,7 @@ <tr> <td> - <p>Control + R</p> + <p>[Control] + R</p> </td> <td> @@ -295,7 +295,7 @@ <tr> <td> - <p>Control + D</p> + <p>[Control] + D</p> </td> <td> @@ -323,7 +323,7 @@ <tr> <td> - <p>Control + Delete</p> + <p>[Control] + Delete</p> </td> <td> @@ -349,7 +349,7 @@ <tr> <td> - <p>Control + T</p> + <p>[Control] + T</p> </td> <td> </td> @@ -361,7 +361,7 @@ <tr> <td> - <p>Control + W</p> + <p>[Control] + W</p> </td> <td> </td>
--- a/doc/main_window_file_pane.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/main_window_file_pane.html Wed Nov 19 21:16:27 2008 +0000 @@ -47,7 +47,7 @@ <h2>List view</h2> - <p>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.</p> + <p>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.</p> <p>The list view mode displays images in a standard vertical list. Three columns provide the file name, size in bytes, and the time the contents were last modified.</p> @@ -55,7 +55,7 @@ <h2>Icon view</h2> - <p>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.</p> + <p>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.</p> <p>The icon view mode displays images as thumbnails in a grid, and by default a file name below each thumbnail.</p> @@ -69,7 +69,7 @@ <ul> <li> - <p>Control + Primary mouse button will add or remove the file from the selection.</p> + <p>[Control] + Primary mouse button will add or remove the file from the selection.</p> </li> <li> @@ -77,11 +77,11 @@ </li> <li> - <p>Shift + Primary mouse button will select all images between the clicked and focused image, or it will unselect all those images if the clicked image is already selected.</p> + <p>[Shift] + Primary mouse button will select all images between the clicked and focused image, or it will unselect all those images if the clicked image is already selected.</p> </li> <li> - <p>Shift + Control + Primary mouse works as Shift + Primary, but will not change the selection of files outside the region between the focus and clicked image.</p> + <p>[Shift] + [Control] + Primary mouse works as [Shift] + Primary, but will not change the selection of files outside the region between the focus and clicked image.</p> </li> </ul> @@ -89,23 +89,23 @@ <ul> <li> - <p>Control + Arrows will move the focus without changing the selection.</p> + <p>[Control] + Arrows will move the focus without changing the selection.</p> </li> <li> - <p>Control + Space will toggle selection of the focused image.</p> + <p>[Control] + Space will toggle selection of the focused image.</p> </li> <li> - <p>Shift + Arrows will select a region of images.</p> + <p>[Shift] + Arrows will select a region of images.</p> </li> <li> - <p>Shift + Control + Arrows works as Shift + Arrows, but will not change the selection of files outside the current focus region.</p> + <p>[Shift] + [Control] + Arrows works as [Shift] + Arrows, but will not change the selection of files outside the current focus region.</p> </li> </ul> - <p>To select all files press Control + A, or to unselect all image press Control + Shift + A. These operations are also available from the Edit menu as “Select all” and “Select none”.</p> + <p>To select all files press [Control] + A, or to unselect all image press [Control] + [Shift] + A. These operations are also available from the Edit menu as “Select all” and “Select none”.</p> <p>The current number of selected images and their total size will be indicated in the File list section of the <a href="main_window_status_bar.html">status bar</a>.</p>
--- a/doc/main_window_folder_pane.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/main_window_folder_pane.html Wed Nov 19 21:16:27 2008 +0000 @@ -91,13 +91,13 @@ <h2>List view</h2> - <p>This mode can be enabled by unselecting “Tree” from the View menu, pressing Control + T, or unselecting “View as tree” from the context menu.</p> + <p>This mode can be enabled by unselecting “Tree” from the View menu, pressing [Control] + T, or unselecting “View as tree” from the context menu.</p> <p>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 “..”.</p> <h2>Tree view</h2> - <p>This mode can be enabled by selecting “Tree” from the View menu, pressing Control + T, or selecting “View as tree” from the context menu.</p> + <p>This mode can be enabled by selecting “Tree” from the View menu, pressing [Control] + T, 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>
--- a/doc/main_window_image_pane.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/main_window_image_pane.html Wed Nov 19 21:16:27 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 arrow keys to pan the image in the desired direction, to increase the panning speed hold down the Shift key while pressing an arrow key.<br />Press Control and an arrow key 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 arrow keys to pan the image in the desired direction, to increase the panning speed hold down the [Shift] key while pressing an arrow key.<br />Press [Control] and an arrow key 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">
--- a/doc/options_advanced.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/options_advanced.html Wed Nov 19 21:16:27 2008 +0000 @@ -229,7 +229,7 @@ <dd><p>This will cause image panning speed to gradually accelerate when holding down the keyboard arrows.</p></dd> <dt>Mouse wheel scrolls image</dt> - <dd><p>The default is for the mouse wheel to change the image, and to scroll the image when shift is used in combination with the wheel. Enabling this swaps the behavior so that operating the wheel will scroll the image, and holding down shift will change the image.</p></dd> + <dd><p>The default is for the mouse wheel to change the image, and to scroll the image when [Shift] is used in combination with the wheel. Enabling this swaps the behavior so that operating the wheel will scroll the image, and holding down [Shift] will change the image.</p></dd> <dt>Home button path</dt> <dd><p>This defines the path to use for the "Home" button in the main window. By default or when this field is empty, this is the user's directory.</p></dd>
--- a/doc/other_windows_image_properties.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/other_windows_image_properties.html Wed Nov 19 21:16:27 2008 +0000 @@ -43,7 +43,7 @@ <p>The image properties window is a dialog that displays various information about a file.</p> - <p>To display a properties window for a an image select Properties from it's context menu, in most windows pressing Control + P will display the properties of the selected images or files.</p> + <p>To display a properties window for a an image select Properties from it's context menu, in most windows pressing [Control] + P will display the properties of the selected images or files.</p> <p>The properties window contains a scaled down image of the file and information about the file under several tabs. If the window contains more than one file, they can be navigated by activating the left and right arrow buttons, or by clicking the primary and middle mouse buttons on the image preview.</p>
--- a/doc/printing.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/printing.html Wed Nov 19 21:16:27 2008 +0000 @@ -41,7 +41,7 @@ <h1>Printing</h1> - <p>To print an image press Shift + P or select Print from the File menu.</p> + <p>To print an image press [Shift] + P or select Print from the File menu.</p> <p>The print dialog includes tabs that group related printing options, a preview pane, and a Print and Cancel button.</p>
--- a/doc/reference_keyboard_shortcuts.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/reference_keyboard_shortcuts.html Wed Nov 19 21:16:27 2008 +0000 @@ -401,7 +401,7 @@ <p>-</p> </td> <td> - <p>[Control + Mouse Wheel down</p> + <p>[Control] + Mouse Wheel down</p> </td> <td> <p>Zoom image out.</p>
--- a/doc/sidebars_exif.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/sidebars_exif.html Wed Nov 19 21:16:27 2008 +0000 @@ -43,7 +43,7 @@ <p>The EXIF sidebar displays EXIF data that is embedded in an image. The sidebar has two choices of data display, standard and advanced.</p> - <p>To toggle display of the The EXIF sidebar press Control + E or select “Exif data” from the View menu.</p> + <p>To toggle display of the The EXIF sidebar press [Control] + E or select “Exif data” from the View menu.</p> <p><b>EXIF</b>: Stands for “Exchangeable image file format”, it is the common format used to store additional information into the JPEG and TIFF file formats. EXIF is the standard for saving the settings used when taking a photo with a digital camera, however other imaging devices and some software also use the EXIF format to store settings in the image file.</p>
--- a/doc/sidebars_keywords.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/sidebars_keywords.html Wed Nov 19 21:16:27 2008 +0000 @@ -43,7 +43,7 @@ <p>The Keywords sidebar displays keywords and comments for the active image, and provides functions for editing them.</p> - <p>To toggle display of the Keywords sidebar press Control + K or select “Keywords” from the View menu.</p> + <p>To toggle display of the Keywords sidebar press [Control] + K or select “Keywords” from the View menu.</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>
--- a/doc/sidebars_sort_manager.html Wed Nov 19 20:53:53 2008 +0000 +++ b/doc/sidebars_sort_manager.html Wed Nov 19 21:16:27 2008 +0000 @@ -43,7 +43,7 @@ <p>The Sort Manager sidebar provides a convenient method to quickly sort many files into a set of folders or collections.</p> - <p>To toggle display of the Sort Manager press Control + S or select “Sort manager” from the View menu.</p> + <p>To toggle display of the Sort Manager press [Control] + S or select “Sort manager” from the View menu.</p> <p>The mode of the Sort Manager is selected by the drop down list under the sidebar title. The Folder mode allows moving or copying the visible image to a folder, and the Collection mode allows adding the visible image or file selection to a collection.</p> @@ -61,7 +61,7 @@ <p>To edit an item select “Properties” from it's context menu. A dialog will appear allowing the Name, Path, and Icon for the item to be changed. Select OK to close the dialog and apply the changes, or Cancel to close the dialog and discard the changes.</p> - <p>To change the order of the list, select “Move up” or “Move down” from the item's context menu. To move an item with the keyboard move the focus to that item, then press Shift + Up or Shift + Down to move the item.</p> + <p>To change the order of the list, select “Move up” or “Move down” from the item's context menu. To move an item with the keyboard move the focus to that item, then press [Shift] + Up or [Shift] + Down to move the item.</p> <p>To remove an item from the list select “Remove” from it's context menu.</p>