image-dired: Improve menus

* lisp/image-dired.el (image-dired-toggle-append-browsing)
(image-dired-toggle-movement-tracking): Improve messages.
(image-dired-thumbnail-mode-menu, image-dired-minor-mode-menu):
Make toggle entries into checkboxes.  Add separators.  Remove
obsoleted commands accidentally added back in merge.

diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index 07f6c23c8b01919816ae8b3a74569cbbbb0e59b1..3811d208990c5c3328f845903d0e006125e7c000 100644 (file)
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -956,7 +956,7 @@ Otherwise, delete overlays."
   (interactive)
   (setq image-dired-append-when-browsing
         (not image-dired-append-when-browsing))
-  (message "Append browsing %s."
+  (message "Append browsing %s"
            (if image-dired-append-when-browsing
                "on"
              "off")))
@@ -1319,7 +1319,7 @@ around in the thumbnail or dired buffer will find the matching
 position in the other buffer."
   (interactive)
   (setq image-dired-track-movement (not image-dired-track-movement))
-  (message "Tracking %s" (if image-dired-track-movement "on" "off")))
+  (message "Movement tracking %s" (if image-dired-track-movement "on" "off")))
 
 (defun image-dired-track-thumbnail ()
   "Track current Dired file's thumb in `image-dired-thumbnail-buffer'.
@@ -1668,31 +1668,33 @@ You probably want to use this together with
   '("Image-Dired"
     ["Display image" image-dired-display-thumbnail-original-image]
     ["Display in external viewer" image-dired-thumbnail-display-external]
-
+    "---"
     ["Mark original" image-dired-mark-thumb-original-file]
     ["Unmark original" image-dired-unmark-thumb-original-file]
     ["Flag original for deletion" image-dired-flag-thumb-original-file]
-
+    "---"
     ["Track original" image-dired-track-original-file]
     ["Jump to dired buffer" image-dired-jump-original-dired-buffer]
-
-    ["Toggle movement tracking on/off" image-dired-toggle-movement-tracking]
-
+    ["Toggle movement tracking on/off" image-dired-toggle-movement-tracking
+     :style toggle
+     :selected image-dired-track-movement]
+    "---"
     ["Rotate original right" image-dired-rotate-original-right]
     ["Rotate original left" image-dired-rotate-original-left]
-    ["Rotate thumbnail right" image-dired-rotate-thumbnail-right]
-    ["Rotate thumbnail left" image-dired-rotate-thumbnail-left]
-
+    "---"
     ["Line up thumbnails" image-dired-line-up]
     ["Dynamic line up" image-dired-line-up-dynamic]
     ["Refresh thumb" image-dired-refresh-thumb]
+    "---"
     ["Comment thumbnail" image-dired-comment-thumbnail]
     ["Tag current or marked thumbnails" image-dired-tag-thumbnail]
+    "---"
     ["Remove tag from current or marked thumbnails"
      image-dired-tag-thumbnail-remove]
     ["Unmark all marks" image-dired-unmark-all-marks]
     ["Delete marked images" image-dired-delete-marked]
     ["Delete thumbnail from buffer" image-dired-delete-char]
+    "---"
     ["Quit" quit-window]))
 
 (defvar image-dired-display-image-mode-map
@@ -1800,18 +1802,24 @@ Resized or in full-size."
     ["Display thumb for next file" image-dired-next-line-and-display]
     ["Display thumb for previous file" image-dired-previous-line-and-display]
     ["Mark and display next" image-dired-mark-and-display-next]
-
+    "---"
     ["Create thumbnails for marked files" image-dired-create-thumbs]
-
+    "---"
     ["Display thumbnails append" image-dired-display-thumbs-append]
     ["Display this thumbnail" image-dired-display-thumb]
     ["Display image" image-dired-dired-display-image]
     ["Display in external viewer" image-dired-dired-display-external]
-
-    ["Toggle display properties" image-dired-toggle-dired-display-properties]
-    ["Toggle append browsing" image-dired-toggle-append-browsing]
-    ["Toggle movement tracking" image-dired-toggle-movement-tracking]
-
+    "---"
+    ["Toggle display properties" image-dired-toggle-dired-display-properties
+     :style toggle
+     :selected image-dired-dired-disp-props]
+    ["Toggle append browsing" image-dired-toggle-append-browsing
+     :style toggle
+     :selected image-dired-append-when-browsing]
+    ["Toggle movement tracking" image-dired-toggle-movement-tracking
+     :style toggle
+     :selected image-dired-track-movement]
+    "---"
     ["Jump to thumbnail buffer" image-dired-jump-thumbnail-buffer]
     ["Mark tagged files" image-dired-mark-tagged-files]
     ["Comment files" image-dired-dired-comment-files]