Move (and update) image pane shortcuts to a table. Simplify css styles for those...

diff --git a/doc/collections.html b/doc/collections.html
index 12cd5a1..93c1af6 100644 (file)
--- a/doc/collections.html
+++ b/doc/collections.html
@@ -63,7 +63,7 @@
 
   <p><b>Keyboard shortcuts</b> available in the collection window:</p>
 
-  <div class="collections-shortcuts">
+  <div class="shortcuts">
     <table width="80%" border="1" cellpadding="2" cellspacing="0">
       <col width="25%"></col>
       <col width="25%"></col>

diff --git a/doc/image_presentation_fullscreen.html b/doc/image_presentation_fullscreen.html
index a509b95..f2698b8 100644 (file)
--- a/doc/image_presentation_fullscreen.html
+++ b/doc/image_presentation_fullscreen.html
@@ -98,8 +98,8 @@
  
   <p>The usual image navigation controls are available when in full screen, these are the commands available:</p>
 
-  <div class="fullscreen-shortcuts">
-    <table width="80%" border="1" cellpadding="4" cellspacing="0" rules="rows">
+  <div class="shortcuts">
+    <table width="80%" border="1" cellpadding="4" cellspacing="0">
       <col id="fullscreen_shortcuts_col1" width="33%"></col>
       <col id="fullscreen_shortcuts_col2" width="33%"></col>
       <col id="fullscreen_shortcuts_col3" width="33%"></col>
@@ -136,7 +136,7 @@
       </tr>
  
       <tr>
-        <td colspan="3" class="fullscreen-shortcuts-separator">
+        <td colspan="3" class="shortcuts-separator">
           <p><strong>Image Navigation</strong></p>
         </td>
        </tr>
@@ -196,7 +196,7 @@
       </tr>
 
       <tr>
-        <td colspan="3" class="fullscreen-shortcuts-separator">
+        <td colspan="3" class="shortcuts-separator">
           <p><strong>Image panning</strong> (image has keyboard focus)</p>
         </td>
       </tr>

diff --git a/doc/image_search_finding_duplicates.html b/doc/image_search_finding_duplicates.html
index 7eac79c..6083076 100644 (file)
--- a/doc/image_search_finding_duplicates.html
+++ b/doc/image_search_finding_duplicates.html
@@ -101,7 +101,7 @@
 
   <p><b>Keyboard shortcuts</b> available in the results list:</p>
 
-  <div class="find-duplicates-shortcuts">
+  <div class="shortcuts">
     <table width="80%" border="1" cellpadding="2" cellspacing="0">
     <col id="find_duplicates_shortcuts_col1" width="25%"></col>
     <col id="find_duplicates_shortcuts_col2" width="25%"></col>

diff --git a/doc/image_search_search.html b/doc/image_search_search.html
index c7c5fc6..738cece 100644 (file)
--- a/doc/image_search_search.html
+++ b/doc/image_search_search.html
@@ -118,7 +118,7 @@
 
   <p><b>Keyboard shortcuts</b> available in the results list:</p>
 
-  <div class="search-shortcuts">
+  <div class="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>

diff --git a/doc/main_window_image_pane.html b/doc/main_window_image_pane.html
index 0892417..23bd20c 100644 (file)
--- a/doc/main_window_image_pane.html
+++ b/doc/main_window_image_pane.html
@@ -58,10 +58,151 @@
   <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>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.</p>
-
-  <p>To rotate the image clockwise 90 degrees press the &ldquo;]&rdquo; key, to rotate counterclockwise 90 degrees press the &ldquo;[&ldquo; 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.</p>
-
+  <div class="shortcuts">
+    <table width="80%" border="1" cellpadding="2" cellspacing="0">
+    <col id="image_pane_shortcuts_col1" width="25%"></col>
+    <col id="image_pane_shortcuts_col2" width="25%"></col>
+    <col id="image_pane_shortcuts_col3" width="50%"></col>
+
+    <thead>
+      <tr>
+        <td>
+          <p>Shortcut</p>
+        </td>
+
+        <td>
+          <p>Context menu name</p>
+        </td>
+
+        <td>
+          <p>Description</p>
+        </td>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>
+          <p>+</p>
+         <p>=</p>
+        </td>
+
+        <td>
+          <p>Zoom in</p>
+        </td>
+
+        <td>
+          <p>Zoom in.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>-</p>
+       </td>
+
+        <td>
+          <p>Zoom out</p>
+        </td>
+
+        <td>
+          <p>Zoom out.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>X</p>
+         <p>[Keypad] *</p>
+       </td>
+
+        <td>
+          <p>Fit image to window</p>
+        </td>
+
+        <td>
+          <p>Scale the image to fit the available display area.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>Z</p>
+         <p>[Keypad] /</p>
+       </td>
+
+        <td>
+          <p>Zoom 1:1</p>
+        </td>
+
+        <td>
+          <p>Reset the zoom to original image size.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>]</p>
+       </td>
+
+        <td>
+          <p>Adjust &gt; Rotate clockwise</p>
+        </td>
+
+        <td>
+          <p>Rotate the image clockwise 90 degrees.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>[</p>
+       </td>
+
+        <td>
+          <p>Adjust &gt; Rotate counterclockwise</p>
+        </td>
+
+        <td>
+          <p>Rotate the image counterclockwise 90 degrees.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>[Shift] + R</p>
+       </td>
+
+        <td>
+          <p>Adjust &gt; Rotate 180</p>
+        </td>
+
+        <td>
+          <p>Rotate the image 180 degrees.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>[Shift] + M</p>
+       </td>
+
+        <td>
+          <p>Adjust &gt; Mirror</p>
+        </td>
+
+        <td>
+          <p>Flip the image horizontally.</p>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <p>[Shift] + F</p>
+       </td>
+
+        <td>
+          <p>Adjust &gt; Flip</p>
+        </td>
+
+        <td>
+          <p>Flip the image vertically.</p>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+  </div>
   <p class="note"><span class="note_label">Note:</span> The rotation, mirror, and flip functions will not change the image file on disk.</p>
 
   <h3>Mouse</h3>

diff --git a/doc/reference_keyboard_shortcuts.html b/doc/reference_keyboard_shortcuts.html
index b2ade7b..2fd9562 100644 (file)
--- a/doc/reference_keyboard_shortcuts.html
+++ b/doc/reference_keyboard_shortcuts.html
@@ -41,7 +41,7 @@
 
   <h1>Keyboard Shortcuts</h1>
 
-  <div class="keyboard-shortcuts">
+  <div class="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>
@@ -63,7 +63,7 @@
 
       <tbody>
       <tr>
-        <td colspan="3" class="keyboard-shortcuts-separator">
+        <td colspan="3" class="shortcuts-separator">
           <p><strong>Image Navigation</strong></p>
         </td>
       </tr>
@@ -110,7 +110,7 @@
         </td>
       </tr>
       <tr>
-        <td colspan="3" class="keyboard-shortcuts-separator">
+        <td colspan="3" class="shortcuts-separator">
           <p><strong>Image panning</strong> (image has keyboard focus)</p>
         </td>
       </tr>
@@ -163,7 +163,7 @@
         </td>
       </tr>
       <tr>
-        <td colspan="3" class="keyboard-shortcuts-separator">
+        <td colspan="3" class="shortcuts-separator">
           <p><strong>File Menu</strong></p>
         </td>
        </tr>
@@ -286,7 +286,7 @@
         </td>
       </tr>
       <tr>
-        <td colspan="3" class="keyboard-shortcuts-separator">
+        <td colspan="3" class="shortcuts-separator">
           <p><strong>Edit Menu</strong></p>
         </td>
       </tr>
@@ -381,7 +381,7 @@
         </td>
       </tr>
       <tr>
-        <td colspan="3" class="keyboard-shortcuts-separator">
+        <td colspan="3" class="shortcuts-separator">
           <p><strong>View Menu</strong></p>
         </td>
       </tr>
@@ -634,7 +634,7 @@
         </td>
       </tr>
       <tr>
-        <td colspan="3" class="keyboard-shortcuts-separator">
+        <td colspan="3" class="shortcuts-separator">
           <p><strong>Help Menu</strong></p>
         </td>
       </tr>
@@ -648,7 +648,7 @@
         </td>
       </tr>
       <tr>
-        <td colspan="3" class="keyboard-shortcuts-separator">
+        <td colspan="3" class="shortcuts-separator">
           <p><strong>Collection Window</strong></p>
         </td>
       </tr>
@@ -914,7 +914,7 @@
         </td>
       </tr>
       <tr>
-        <td colspan="3" class="keyboard-shortcuts-separator">
+        <td colspan="3" class="shortcuts-separator">
           <p><strong>Find Duplicates Window</strong> (same as Collection Window above, with the following additions)</p>
         </td>
       </tr>

diff --git a/doc/style.css b/doc/style.css
index 504c4ac..231b050 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -142,6 +142,7 @@ thead {
        font-weight: bold;
 }
 
+/* note */
 p.note {
        font-style: italic;
 }
@@ -149,6 +150,7 @@ p.note {
        font-weight: bold;
 }
 
+/* bottom page note */
 p.bottomnote {
        margin-top: 5em;
        font-style: italic;
@@ -177,46 +179,27 @@ code {
        border: 0;
 }
 
-/* collections.html */
-div.collections-shortcuts {
+/* shortcuts tables */
+div.shortcuts {
        text-align: center;
 }
-.collections-shortcuts p {
+.shortcuts p {
        margin: 0.1em;
 }
-
-/* image_presentation_fullscreen.html */
-div.fullscreen-shortcuts {
-       text-align: center;
-}
-.fullscreen-shortcuts p {
-       margin: 0.1em;
-}
-td.fullscreen-shortcuts-separator {
+td.shortcuts-separator {
        background-color: white;
-       font-size: 110%;
-}
-
-div.fullscreen-functions {
-       text-align: center;
+       font-size: 95%;
 }
-.fullscreen-functions p {
-       margin: 0.1em;
+.shortcuts td+td+td {
+       text-align: left;
 }
 
-/* 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 {
+/* image_presentation_fullscreen.html */
+div.fullscreen-functions {
        text-align: center;
 }
-.search-shortcuts p {
+.fullscreen-functions p {
        margin: 0.1em;
 }
 
@@ -244,21 +227,6 @@ div.search-shortcuts {
        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 @@ td.keyboard-shortcuts-separator {
 .file_locations p {
        margin: 0.1em;
 }
-