# HG changeset patch # User zas_ # Date 1227128033 0 # Node ID 0186f9c7d9e44c3b76cb8973a990ea44856bf8c8 # Parent 50ffcd7c3539cb97432fe02603922294355e2723 Move (and update) image pane shortcuts to a table. Simplify css styles for those tables. diff -r 50ffcd7c3539 -r 0186f9c7d9e4 doc/collections.html --- a/doc/collections.html Wed Nov 19 17:42:36 2008 +0000 +++ b/doc/collections.html Wed Nov 19 20:53:53 2008 +0000 @@ -63,7 +63,7 @@

Keyboard shortcuts available in the collection window:

-
+
diff -r 50ffcd7c3539 -r 0186f9c7d9e4 doc/image_presentation_fullscreen.html --- a/doc/image_presentation_fullscreen.html Wed Nov 19 17:42:36 2008 +0000 +++ b/doc/image_presentation_fullscreen.html Wed Nov 19 20:53:53 2008 +0000 @@ -98,8 +98,8 @@

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

-
-
+
+
@@ -136,7 +136,7 @@ - @@ -196,7 +196,7 @@ - diff -r 50ffcd7c3539 -r 0186f9c7d9e4 doc/image_search_finding_duplicates.html --- a/doc/image_search_finding_duplicates.html Wed Nov 19 17:42:36 2008 +0000 +++ b/doc/image_search_finding_duplicates.html Wed Nov 19 20:53:53 2008 +0000 @@ -101,7 +101,7 @@

Keyboard shortcuts available in the results list:

-
+
+

Image Navigation

+

Image panning (image has keyboard focus)

diff -r 50ffcd7c3539 -r 0186f9c7d9e4 doc/image_search_search.html --- a/doc/image_search_search.html Wed Nov 19 17:42:36 2008 +0000 +++ b/doc/image_search_search.html Wed Nov 19 20:53:53 2008 +0000 @@ -118,7 +118,7 @@

Keyboard shortcuts available in the results list:

-
+
diff -r 50ffcd7c3539 -r 0186f9c7d9e4 doc/main_window_image_pane.html --- a/doc/main_window_image_pane.html Wed Nov 19 17:42:36 2008 +0000 +++ b/doc/main_window_image_pane.html Wed Nov 19 20:53:53 2008 +0000 @@ -58,10 +58,151 @@

Keyboard

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

-

To scale the image size, use the [+] or [=] key to zoom in and the [-] key to zoom out. The [X] or keypad [*] key will scale the image to fit the available display area, the [Z] or keypad [/] key will reset the zoom to original image size. There are also keys to select a preset zoom factor: [1] = 1:1, [2] = 2:1, [3] =3:1, [4] = 4:1, [7] = 1:4, [8] = 1:3, and [9] = 1:2.

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -

To rotate the image clockwise 90 degrees press the “]” key, to rotate counterclockwise 90 degrees press the “[“ key. To rotate the image 180 degrees use [Shift] + [R], the image can also be flipped horizontally or vertically with the respective [Shift] + [M] (mirror) and [Shift] + [F] (flip) keys.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Shortcut

+
+

Context menu name

+
+

Description

+
+

+

+

=

+
+

Zoom in

+
+

Zoom in.

+
+

-

+
+

Zoom out

+
+

Zoom out.

+
+

X

+

[Keypad] *

+
+

Fit image to window

+
+

Scale the image to fit the available display area.

+
+

Z

+

[Keypad] /

+
+

Zoom 1:1

+
+

Reset the zoom to original image size.

+
+

]

+
+

Adjust > Rotate clockwise

+
+

Rotate the image clockwise 90 degrees.

+
+

[

+
+

Adjust > Rotate counterclockwise

+
+

Rotate the image counterclockwise 90 degrees.

+
+

[Shift] + R

+
+

Adjust > Rotate 180

+
+

Rotate the image 180 degrees.

+
+

[Shift] + M

+
+

Adjust > Mirror

+
+

Flip the image horizontally.

+
+

[Shift] + F

+
+

Adjust > Flip

+
+

Flip the image vertically.

+
+

Note: The rotation, mirror, and flip functions will not change the image file on disk.

Mouse

diff -r 50ffcd7c3539 -r 0186f9c7d9e4 doc/reference_keyboard_shortcuts.html --- a/doc/reference_keyboard_shortcuts.html Wed Nov 19 17:42:36 2008 +0000 +++ b/doc/reference_keyboard_shortcuts.html Wed Nov 19 20:53:53 2008 +0000 @@ -41,7 +41,7 @@

Keyboard Shortcuts

-
+
@@ -63,7 +63,7 @@ - @@ -110,7 +110,7 @@ - @@ -163,7 +163,7 @@ - @@ -286,7 +286,7 @@ - @@ -381,7 +381,7 @@ - @@ -634,7 +634,7 @@ - @@ -648,7 +648,7 @@ - @@ -914,7 +914,7 @@ - diff -r 50ffcd7c3539 -r 0186f9c7d9e4 doc/style.css --- a/doc/style.css Wed Nov 19 17:42:36 2008 +0000 +++ b/doc/style.css Wed Nov 19 20:53:53 2008 +0000 @@ -142,6 +142,7 @@ font-weight: bold; } +/* note */ p.note { font-style: italic; } @@ -149,6 +150,7 @@ font-weight: bold; } +/* bottom page note */ p.bottomnote { margin-top: 5em; font-style: italic; @@ -177,26 +179,23 @@ border: 0; } -/* collections.html */ -div.collections-shortcuts { +/* shortcuts tables */ +div.shortcuts { text-align: center; } -.collections-shortcuts p { +.shortcuts p { margin: 0.1em; } +td.shortcuts-separator { + background-color: white; + font-size: 95%; +} +.shortcuts td+td+td { + text-align: left; +} + /* image_presentation_fullscreen.html */ -div.fullscreen-shortcuts { - text-align: center; -} -.fullscreen-shortcuts p { - margin: 0.1em; -} -td.fullscreen-shortcuts-separator { - background-color: white; - font-size: 110%; -} - div.fullscreen-functions { text-align: center; } @@ -204,22 +203,6 @@ margin: 0.1em; } -/* image_search_finding_duplicates.html */ -div.find-duplicates-shortcuts { - text-align: center; -} -.find-duplicates-shortcuts p { - margin: 0.1em; -} - -/* image_search_search.html */ -div.search-shortcuts { - text-align: center; -} -.search-shortcuts p { - margin: 0.1em; -} - /* index.html */ .menu ul { font-size: 110%; @@ -244,21 +227,6 @@ margin: 0.1em; } -/* reference_keyboard_shortcuts.html */ -div.keyboard-shortcuts { - text-align: center; -} -.keyboard-shortcuts p { - margin: 0.1em; -} -td.keyboard-shortcuts-separator { - background-color: white; - font-size: 110%; -} -.keyboard-shortcuts td+td+td { - text-align: left; -} - /* reference_management.html */ .file_locations_subtitle { font-weight: bold; @@ -268,4 +236,3 @@ .file_locations p { margin: 0.1em; } -
+

Image Navigation

+

Image panning (image has keyboard focus)

+

File Menu

+

Edit Menu

+

View Menu

+

Help Menu

+

Collection Window

+

Find Duplicates Window (same as Collection Window above, with the following additions)