Move menu descriptions to definitions lists.

diff --git a/doc/main_window_file_pane.html b/doc/main_window_file_pane.html
index 98dc6df..064480c 100644 (file)
--- a/doc/main_window_file_pane.html
+++ b/doc/main_window_file_pane.html
@@ -139,15 +139,19 @@
 
   <p>Right clicking the mouse or pressing the menu key while the file pane has focus will display a menu. The menu functions will perform the same as those that match the window's <a href="main_window_menus.html">menu bar</a>, however a few functions are unique to the context menu:</p>
 
-  <p class="gq-file-pane-5"><b>View in new window:</b> Opens a new window containing a list of the currently selected images.</p>
+  <dl class="menu_desc">
 
-  <p class="gq-file-pane-5"><b>Sort:</b> Changes the sort order of file pane.</p>
+  <dt>View in new window</dt><dd>Opens a new window containing a list of the currently selected images.</dd>
 
-  <p class="gq-file-pane-5"><b>View as icons:</b> Toggles between the list and icon view modes.</p>
+  <dt>Sort</dt><dd>Changes the sort order of file pane.</dd>
 
-  <p class="gq-file-pane-5"><b>Show thumbnails:</b> Toggles display of thumbnails in the list view display mode.</p>
+  <dt>View as icons</dt><dd>Toggles between the list and icon view modes.</dd>
 
-  <p class="gq-file-pane-7"><b>Show filename text:</b> Toggles display of file names in the icon view display mode.</p>
+  <dt>Show thumbnails</dt><dd>Toggles display of thumbnails in the list view display mode.</dd>
+
+  <dt>Show filename text</dt><dd>Toggles display of file names in the icon view display mode.</dd>
+ 
+  </dl>
 
   <p><br />
   <br />

diff --git a/doc/main_window_folder_pane.html b/doc/main_window_folder_pane.html
index f63f8d8..025a11d 100644 (file)
--- a/doc/main_window_folder_pane.html
+++ b/doc/main_window_folder_pane.html
@@ -53,24 +53,26 @@
 
   <p class="gq-folder-pane-8">Note: These buttons are only displayed as an icon, the text below refers to the tool tip that appears by hovering the mouse over each button.</p>
 
-  <p class="gq-folder-pane-7"><b>Show thumbnails:</b> This button is active when the file list is in list view mode, and activating it will toggle the display of thumbnails.</p>
+  <dl class="menu_desc">
+  <dt>Show thumbnails</dt><dd>This button is active when the file list is in list view mode, and activating it will toggle the display of thumbnails.</dd>
 
-  <p class="gq-folder-pane-7"><b>Change to home folder:</b> Change the main window to display the contents of the user's home folder.</p>
+  <dt>Change to home folder</dt><dd>Change the main window to display the contents of the user's home folder.</dd>
 
-  <p class="gq-folder-pane-7"><b>Refresh file list:</b> This will check for changes to the active folder and update the window.</p>
+  <dt>Refresh file list</dt><dd>This will check for changes to the active folder and update the window.</dd>
 
-  <p class="gq-folder-pane-7"><b>Zoom in:</b> Increase the image display size.</p>
+  <dt>Zoom in</dt><dd>Increase the image display size.</dd>
 
-  <p class="gq-folder-pane-7"><b>Zoom out:</b> Decrease the image display size.</p>
+  <dt>Zoom out</dt><dd>Decrease the image display size.</dd>
 
-  <p class="gq-folder-pane-7"><b>Fit image to window:</b> This will size the image to fit within the image view.</p>
+  <dt>Fit image to window</dt><dd>This will size the image to fit within the image view.</dd>
 
-  <p class="gq-folder-pane-7"><b>Set zoom 1:1:</b> Restore zoom to the image's original size.</p>
+  <dt>Set zoom 1:1</dt><dd>Restore zoom to the image's original size.</dd>
 
-  <p class="gq-folder-pane-7"><b>Configure options:</b> Displays the <a href="options.html">Options window</a>.</p>
-
-  <p class="gq-folder-pane-7"><b>Float controls:</b> Toggle the folder pane, file pane, and status bar between the main window and a secondary window.</p>
+  <dt>Configure options</dt><dd>Displays the <a href="options.html">Options window</a>.</dd>
 
+  <dt>Float controls</dt><dd>Toggle the folder pane, file pane, and status bar between the main window and a secondary window.</dd>
+  </dl>
+  
   <h2>Path entry</h2>
  
   <p class="gq-folder-pane-7">This displays the active folder of the window and allows typing a location.</p>
@@ -107,23 +109,26 @@
 
   <p>Right clicking the mouse or pressing the menu key while the folder pane has focus will display a menu. The menu functions will perform the same as those that match the window's <a href="main_window_menus.html">menu bar</a>, however a few functions are unique to the context menu:</p>
 
-  <p class="gq-folder-pane-7"><b>Up to parent:</b> This will change the window to display the contents of the parent folder.</p>
+  <dl class="menu_desc">
+  <dt>Up to parent</dt><dd>This will change the window to display the contents of the parent folder.</dd>
+
+  <dt>Slide show</dt><dd>Start a <a href="image_presentation_slideshow.html">slide show</a> that contains all images in the selected folder.</dd>
 
-  <p class="gq-folder-pane-7"><b>Slide show:</b> Start a <a href="image_presentation_slideshow.html">slide show</a> that contains all images in the selected folder.</p>
+  <dt>Slide show recursive</dt><dd>Start a <a href="image_presentation_slideshow.html">slide show</a> that contains all images in the selected folder, and all images in the sub folders of that folder.</dd>
 
-  <p class="gq-folder-pane-7"><b>Slide show recursive:</b> Start a <a href="image_presentation_slideshow.html">slide show</a> that contains all images in the selected folder, and all images in the sub folders of that folder.</p>
+  <dt>Find duplicates</dt><dd>This will open a new <a href="image_search_finding_duplicates.html">find duplicates</a> window containing all images in the selected folder.</dd>
 
-  <p class="gq-folder-pane-7"><b>Find duplicates:</b> This will open a new <a href="image_search_finding_duplicates.html">find duplicates</a> window containing all images in the selected folder.</p>
+  <dt>Find duplicates recursive</dt><dd>This will open a new <a href="image_search_finding_duplicates.html">find duplicates</a> window containing all image in the selected folder, and all images in the sub folders of that folder.</dd>
 
-  <p class="gq-folder-pane-7"><b>Find duplicates recursive:</b> This will open a new <a href="image_search_finding_duplicates.html">find duplicates</a> window containing all image in the selected folder, and all images in the sub folders of that folder.</p>
+  <dt>New folder</dt><dd>Creates a new folder that is a sub folder of the selected folder.</dd>
 
-  <p class="gq-folder-pane-10"><b>New folder:</b> Creates a new folder that is a sub folder of the selected folder.</p>
+  <dt>Rename</dt><dd>Renames the selected folder.</dd>
 
-  <p class="gq-folder-pane-10"><b>Rename:</b> Renames the selected folder.</p>
+  <p class="gq-folder-pane-11">Note: Renaming a folder will not update metadata, such as keywords, or cached thumbnails for images contained in that folder, the data will be lost.</dd>
 
-  <p class="gq-folder-pane-11">Note: Renaming a folder will not update metadata, such as keywords, or cached thumbnails for images contained in that folder, the data will be lost.</p>
+  <dt>View as tree</dt><dd>Toggles between the list and tree modes of the folder pane.</dd>
 
-  <p class="gq-folder-pane-10"><b>View as tree:</b> Toggles between the list and tree modes of the folder pane.</p>
+  </dl>
 
   <h2>Drag and drop</h2>
 

diff --git a/doc/main_window_image_pane.html b/doc/main_window_image_pane.html
index 9764466..88f9351 100644 (file)
--- a/doc/main_window_image_pane.html
+++ b/doc/main_window_image_pane.html
@@ -97,9 +97,11 @@
 
   <p>Right clicking the mouse or pressing the menu key while the image has the focus will display a menu. The menu functions will perform the same as those that match the window's <a href="main_window_menus.html">menu bar</a>, however a few functions are unique to the context menu:</p>
 
-  <p class="gq-image-pane-7"><b>View in new window:</b> Opens a new window containing a second copy of the current image.</p>
+  <dl class="menu_desc">
+  <dt>View in new window</dt><dd>Opens a new window containing a second copy of the current image.</dd>
 
-  <p class="gq-image-pane-7"><b>Pause slide show</b>, <b>Continue slide show</b>: Controls the pause state of an active slide show, the text of the menu will change to reflect the action that will be performed.</p>
+  <dt>Pause slide show, Continue slide show</dt><dd>Controls the pause state of an active slide show, the text of the menu will change to reflect the action that will be performed.</dd>
+  </dl>
 
   <p><br />
   <br />

diff --git a/doc/main_window_menus.html b/doc/main_window_menus.html
index 54723d2..e3869e0 100644 (file)
--- a/doc/main_window_menus.html
+++ b/doc/main_window_menus.html
@@ -49,108 +49,121 @@
 
   <h2>File Menu</h2>
 
-  <p class="gq-menus-5"><b>New window</b>: Opens a new main window, with the initial path set to the current folder.</p>
+  <dl class="menu_desc">
+  <dt>New window</dt><dd>Opens a new main window, with the initial path set to the current folder.</dd>
 
-  <p class="gq-menus-6"><b>New collection</b>: Opens a new collection window, the new collection will be empty.</p>
+  <dt>New collection</dt><dd>Opens a new collection window, the new collection will be empty.</dd>
 
-  <p class="gq-menus-6"><b>Open collection</b>: Displays a dialog to open a collection stored on disk, the selected collection will then appear in a new window.</p>
+  <dt>Open collection</dt><dd>Displays a dialog to open a collection stored on disk, the selected collection will then appear in a new window.</dd>
 
-  <p class="gq-menus-5"><b>Open recent</b>: This menu item lists the recently active collections, selecting an item from the list will open that collection in a new window. The most recent item will appear at the top of the list.</p>
+  <dt>Open recent</dt><dd>This menu item lists the recently active collections, selecting an item from the list will open that collection in a new window. The most recent item will appear at the top of the list.</dd>
 
-  <p class="gq-menus-6"><b>Search...</b>: Opens a new Search window.</p>
+  <dt>Search...</dt><dd>Opens a new Search window.</dd>
 
-  <p class="gq-menus-6"><b>Find duplicates...</b>: Opens a new Find Duplicates window.</p>
+  <dt>Find duplicates...</dt><dd>Opens a new Find Duplicates window.</dd>
 
-  <p class="gq-menus-6"><b>Print..</b>: Opens a print dialog.</p>
+  <dt>Print..</dt><dd>Opens a print dialog.</dd>
 
-  <p class="gq-menus-5"><b>New folder...</b>: Creates a new folder in the current path.</p>
+  <dt>New folder...</dt><dd>Creates a new folder in the current path.</dd>
 
-  <p class="gq-menus-6"><b>Copy...</b>: Opens a dialog to select a destination to copy the currently selected files.</p>
+  <dt>Copy...</dt><dd>Opens a dialog to select a destination to copy the currently selected files.</dd>
 
-  <p class="gq-menus-6"><b>Move...</b>: Opens a dialog to select a destination to move currently selected files.</p>
+  <dt>Move...</dt><dd>Opens a dialog to select a destination to move currently selected files.</dd>
 
-  <p class="gq-menus-5"><b>Rename...</b>: Renames the current file selection.</p>
+  <dt>Rename...</dt><dd>Renames the current file selection.</dd>
 
-  <p class="gq-menus-5"><b>Delete...</b>: Deletes the current file selection.</p>
+  <dt>Delete...</dt><dd>Deletes the current file selection.</dd>
 
-  <p class="gq-menus-5"><b>Close window</b>: Closes the window containing the menu, if the window is the last main window Geeqie will quit.</p>
+  <dt>Close window</dt><dd>Closes the window containing the menu, if the window is the last main window Geeqie will quit.</dd>
 
-  <p class="gq-menus-5"><b>Quit</b>: Quits the Geeqie application, if collections have been changed but not saved, the user will be prompted for confirmation.</p>
+  <dt>Quit</dt><dd>Quits the Geeqie application, if collections have been changed but not saved, the user will be prompted for confirmation.</dd>
+  </dl>
 
   <h2>Edit menu</h2>
 
-  <p class="gq-menus-5"><b>in &lt;command name&gt;...</b>: This will execute the external command associated with &lt;command name&gt;, these can be changed edited on the <a href="options_editor_commands.html">Editors tab</a> of the Option dialog.</p>
+  <dl class="menu_desc">
 
-  <p class="gq-menus-5"><b>Adjust</b> sub menu:</p>
+  <dt>in &lt;command name&gt;...</dt><dd>This will execute the external command associated with &lt;command name&gt;, these can be changed edited on the <a href="options_editor_commands.html">Editors tab</a> of the Option dialog.</dd>
 
-  <p class="gq-menus-7"><b>Rotate clockwise</b>: Rotates the current image clockwise 90 degrees, does not effect the file on disk.</p>
+  <dt>Adjust</dt><dd>
+         <dl class="menu_desc_sublevel1">
+         <dt>Rotate clockwise</dt><dd>Rotates the current image clockwise 90 degrees, does not effect the file on disk.</dd>
 
-  <p class="gq-menus-7"><b>Rotate counterclockwise</b>: Rotates the current image counterclockwise 90 degrees, does not effect the file on disk.</p>
+         <dt>Rotate counterclockwise</dt><dd>Rotates the current image counterclockwise 90 degrees, does not effect the file on disk.</dd>
 
-  <p class="gq-menus-7"><b>Rotate 180</b>: Rotates the current image 180 degrees, does not effect the file on disk.</p>
+         <dt>Rotate 180</dt><dd>Rotates the current image 180 degrees, does not effect the file on disk.</dd>
 
-  <p class="gq-menus-7"><b>Mirror</b>: Swaps the left and right sides of the image so that the result is similar to that of looking at the image in a mirror, does not effect the file on disk.</p>
+         <dt>Mirror</dt><dd>Swaps the left and right sides of the image so that the result is similar to that of looking at the image in a mirror, does not effect the file on disk.</dd>
 
-  <p class="gq-menus-7"><b>Flip</b>: Swaps the top and bottom sides of the image, does not effect the file on disk.</p>
+         <dt>Flip</dt><dd>Swaps the top and bottom sides of the image, does not effect the file on disk.</dd>
+         </dl>
+  </dd>
 
-  <p class="gq-menus-5"><b>Properties</b>: Opens a Properties Window for the currently selected files.</p>
+  <dt>Properties</dt><dd>Opens a Properties Window for the currently selected files.</dd>
 
-  <p class="gq-menus-5"><b>Select all</b>: Selects all files displayed in the file list.</p>
+  <dt>Select all</dt><dd>Selects all files displayed in the file list.</dd>
 
-  <p class="gq-menus-5"><b>Select none</b>: Clears the current file selection.</p>
+  <dt>Select none</dt><dd>Clears the current file selection.</dd>
 
-  <p class="gq-menus-5"><b>Preferences...</b>: Opens the <a href="options.html">Preferences Dialog</a> for changing of user preferences.</p>
+  <dt>Preferences...</dt><dd>Opens the <a href="options.html">Preferences Dialog</a> for changing of user preferences.</dd>
 
-  <p class="gq-menus-5"><b>Thumbnail maintenance</b>: Opens a dialog with utilities to manage cached thumbnails and keywords data.</p>
+  <dt>Thumbnail maintenance</dt><dd>Opens a dialog with utilities to manage cached thumbnails and keywords data.</dd>
 
-  <p class="gq-menus-5"><b>Set as wallpaper</b>: Renders the current image to the root window (desktop). The resulting image will be tiled to fit the root window if zoom is not set to <u>fit to window</u>; when zoom is set to <u>fit to window</u>, the image will be scaled to fill the root window.</p>
+  <dt>Set as wallpaper</dt><dd>Renders the current image to the root window (desktop). The resulting image will be tiled to fit the root window if zoom is not set to <u>fit to window</u>; when zoom is set to <u>fit to window</u>, the image will be scaled to fill the root window.</dd>
+  </dl>
 
   <h2>View menu</h2>
 
-  <p class="gq-menus-5"><b>Zoom in</b>: Increases the zoom by one increment, resulting in a larger image.</p>
+  <dl class="menu_desc">
 
-  <p class="gq-menus-5"><b>Zoom out</b>: Decreases the zoom by one increment, resulting in a smaller image.</p>
+  <dt>Zoom in</dt><dd>Increases the zoom by one increment, resulting in a larger image.</dd>
 
-  <p class="gq-menus-5"><b>Zoom 1:1</b>: Resets the zoom to the original size of the image.</p>
+  <dt>Zoom out</dt><dd>Decreases the zoom by one increment, resulting in a smaller image.</dd>
 
-  <p class="gq-menus-5"><b>Zoom to fit</b>: Automatically adjusts the zoom so that the image will fit within the display pane. The effect on images with an original size smaller than the display pane can be changed with the <u>Allow enlargement of image for zoom to fit</u> <span class="gq-menus-8">option located on the <a href="options_image.html">Image tab</a> of the preferences dialog</span>.</p>
+  <dt>Zoom 1:1</dt><dd>Resets the zoom to the original size of the image.</dd>
 
-  <p class="gq-menus-5"><b>Thumbnails</b>: Toggles the display of image thumbnails in the file list, this item is not available when the file list is in icon view mode. A check appears next to this item when thumbnails are enabled.</p>
+  <dt>Zoom to fit</dt><dd>Automatically adjusts the zoom so that the image will fit within the display pane. The effect on images with an original size smaller than the display pane can be changed with the <u>Allow enlargement of image for zoom to fit</u> <span class="gq-menus-8">option located on the <a href="options_image.html">Image tab</a> of the preferences dialog</span>.</dd>
 
-  <p class="gq-menus-5"><b>List</b>: Changes the file list to display files in list format.</p>
+  <dt>Thumbnails</dt><dd>Toggles the display of image thumbnails in the file list, this item is not available when the file list is in icon view mode. A check appears next to this item when thumbnails are enabled.</dd>
 
-  <p class="gq-menus-5"><b>Icons</b>: Changes the file list to display files as icons.</p>
+  <dt>List</dt><dd>Changes the file list to display files in list format.</dd>
 
-  <p class="gq-menus-5"><b>Tree</b>: Toggles the folder list between simple and tree modes. A check appears next to this item when the folder is in tree mode.</p>
+  <dt>Icons</dt><dd>Changes the file list to display files as icons.</dd>
 
-  <p class="gq-menus-5"><b>Full screen</b>: Toggles the full screen window display.</p>
+  <dt>Tree</dt><dd>Toggles the folder list between simple and tree modes. A check appears next to this item when the folder is in tree mode.</dd>
 
-  <p class="gq-menus-5"><b>Float file list</b>: Toggles the location of the menu bar, tool bar, status bar, and file lists between the main window and a second window. A check appears next to this item when the location is the second window.</p>
+  <dt>Full screen</dt><dd>Toggles the full screen window display.</dd>
 
-  <p class="gq-menus-5"><b>Hide file list</b>: Toggles visibility of the menu bar, tool bar, status bar, and file lists.</p>
+  <dt>Float file list</dt><dd>Toggles the location of the menu bar, tool bar, status bar, and file lists between the main window and a second window. A check appears next to this item when the location is the second window.</dd>
 
-  <p class="gq-menus-5"><b>Hide toolbar</b>: Toggles visibility of the tool bar. A check appears next to this item when the tool bar is not visible.</p>
+  <dt>Hide file list</dt><dd>Toggles visibility of the menu bar, tool bar, status bar, and file lists.</dd>
 
-  <p class="gq-menus-5"><b>Keywords</b>: Toggles display of the Keywords sidebar.</p>
+  <dt>Hide toolbar</dt><dd>Toggles visibility of the tool bar. A check appears next to this item when the tool bar is not visible.</dd>
 
-  <p class="gq-menus-5"><b>Exif data</b>: Toggles display of the EXIF sidebar.</p>
+  <dt>Keywords</dt><dd>Toggles display of the Keywords sidebar.</dd>
 
-  <p class="gq-menus-5"><b>Sort manager</b>: Toggles display of the Sort Manager sidebar.</p>
+  <dt>Exif data</dt><dd>Toggles display of the EXIF sidebar.</dd>
 
-  <p class="gq-menus-5"><b>Toggle slideshow</b>: Begins or ends a slide show, the slide show status is displayed in the status bar.</p>
+  <dt>Sort manager</dt><dd>Toggles display of the Sort Manager sidebar.</dd>
 
-  <p class="gq-menus-5"><b>Refresh</b>: Updates the contents of the folder and file lists to match what is currently on disk, the current image will also be reread from disk.</p>
+  <dt>Toggle slideshow</dt><dd>Begins or ends a slide show, the slide show status is displayed in the status bar.</dd>
+
+  <dt>Refresh</dt><dd>Updates the contents of the folder and file lists to match what is currently on disk, the current image will also be reread from disk.</dd>
+  </dl>
 
   <h2>Help menu</h2>
 
-  <p class="gq-menus-5"><b>Contents</b>: Open the Geeqie user manual in a new browser window.</p>
+  <dl class="menu_desc">
 
-  <p class="gq-menus-5"><b>Keyboard shortcuts</b>: Displays a window listing the default keyboard shortcuts.</p>
+  <dt>Contents</dt><dd>Open the Geeqie user manual in a new browser window.</dd>
 
-  <p class="gq-menus-5"><b>Release notes</b>: Displays a window containing the release notes for the version of Geeqie in use.</p>
+  <dt>Keyboard shortcuts</dt><dd>Displays a window listing the default keyboard shortcuts.</dd>
 
-  <p class="gq-menus-5"><b>About</b>: Opens a window containing the Geeqie version, credits, website, and email contact information.</p>
+  <dt>Release notes</dt><dd>Displays a window containing the release notes for the version of Geeqie in use.</dd>
 
+  <dt>About</dt><dd>Opens a window containing the Geeqie version, credits, website, and email contact information.</dd>
+   
+  </dl>
   <p><br />
   <br />
   </p>

diff --git a/doc/main_window_status_bar.html b/doc/main_window_status_bar.html
index e03aeb1..bca2105 100644 (file)
--- a/doc/main_window_status_bar.html
+++ b/doc/main_window_status_bar.html
@@ -53,11 +53,13 @@
 
   <p>This is the method used to sort image names in the file list. Clicking or activating this field will display a menu to allow selection of the sort method.</p>
 
-  <p class="gq-status-bar-5"><b>Name</b>: Images are sorted by file name.<br />
-  <b>Number</b>: Images are sorted by natural numerical order, such that, for example, 9_name.jpg will be listed before 10_name.jpg.<br />
-  <b>Date</b>: Images are sorted by file date on disk.<br />
-  <b>Size</b>: Image are sorted by file size on disk.<br />
-  <b>Ascending</b>: Toggles between increasing and decreasing sort order. A check will appear next to this entry to indicate ascending sort order.</p>
+  <dl class="menu_desc">
+  <dt>Name</dt><dd>Images are sorted by file name.</dd>
+  <dt>Number</dt><dd>Images are sorted by natural numerical order, such that, for example, 9_name.jpg will be listed before 10_name.jpg.</dd>
+  <dt>Date</dt><dd>Images are sorted by file date on disk.</dd>
+  <dt>Size</dt><dd>Image are sorted by file size on disk.</dd>
+  <dt>Ascending</dt><dd>Toggles between increasing and decreasing sort order. A check will appear next to this entry to indicate ascending sort order.</dd>
+  </dl>
 
   <h2>File list</h2>
 

diff --git a/doc/style.css b/doc/style.css
index 7ad3243..79d0fd7 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -1,10 +1,12 @@
 /* common */
  p.previous {text-align: left}
  div.navtop {text-align: center}
- div.navtop table { border: 5px}
  div.navbottom {text-align: center}
- div.bottomspacer { padding-bottom: 50px;}
+ div.bottomspacer { padding-bottom: 5em;}
  div.footer { text-align: right}
+ dl.menu_desc { padding-left: 2em;}
+ .menu_desc dt {font-weight: bold; padding-top: 0.3em}
+ .menu_desc dd {}
 
 /* collections.html */
  p.gq-collections-8 {font-weight: bold; text-align: center}