(dired-mode-map): Move tumme commands to Operate,

Regexp and Immediate menus. Change "Add Comment" to "Add Image
Comment". Change "Add Image Tag" to "Add Image Tags".

1 files changed, 42 insertions, 32 deletions

diff --git a/lisp/dired.el b/lisp/dired.el
index 67c9b737bc7..24bdbb150d0 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1305,45 +1305,24 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
     (define-key map [menu-bar immediate]
       (cons "Immediate" (make-sparse-keymap "Immediate")))
 
-    (define-key map [menu-bar immediate revert-buffer]
-      '(menu-item "Refresh" revert-buffer
-                  :help "Update contents of shown directories"))
-
-    (define-key map [menu-bar immediate dashes]
-      '("--"))
-
-    (define-key map [menu-bar immediate tumme]
-      (cons "Thumbnail Images" (make-sparse-keymap "tumme")))
-
-    (define-key map
-      [menu-bar immediate tumme tumme-mark-tagged-files]
-      '(menu-item "Mark From Image Tag..." tumme-mark-tagged-files
-                  :help "Mark files whose image tags matches regexp"))
     (define-key map
-      [menu-bar immediate tumme tumme-tag-remove]
-      '(menu-item "Remove Image Tag..." tumme-tag-remove
-                  :help "Remove image tag from current or marked files"))
-    (define-key map
-      [menu-bar immediate tumme tumme-tag-files]
-      '(menu-item "Add Image Tag..." tumme-tag-files
-                  :help "Add image tag to current or marked files"))
-    (define-key map
-      [menu-bar immediate tumme tumme-dired-comment-files]
-      '(menu-item "Add Comment..." tumme-dired-comment-files
-                  :help "Add comment to current or marked files"))
-    (define-key map
-      [menu-bar immediate tumme tumme-dired-display-external]
+      [menu-bar immediate tumme-dired-display-external]
       '(menu-item "Display Image Externally" tumme-dired-display-external
                   :help "Display image in external viewer"))
     (define-key map
-      [menu-bar immediate tumme tumme-dired-display-image]
+      [menu-bar immediate tumme-dired-display-image]
       '(menu-item "Display Image" tumme-dired-display-image
                   :help "Display sized image in a separate window"))
-    (define-key map
-      [menu-bar immediate tumme tumme-display-thumbs]
-      '(menu-item "Display Thumbnails" tumme-display-thumbs
-                  :help "Display thumbnails for current or marked image files"))
 
+    (define-key map [menu-bar immediate dashes-4]
+      '("--"))
+
+    (define-key map [menu-bar immediate revert-buffer]
+      '(menu-item "Refresh" revert-buffer
+                  :help "Update contents of shown directories"))
+
+    (define-key map [menu-bar immediate dashes]
+      '("--"))
 
     (define-key map [menu-bar immediate compare-directories]
       '(menu-item "Compare directories..." dired-compare-directories
@@ -1374,6 +1353,14 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
     (define-key map [menu-bar regexp]
       (cons "Regexp" (make-sparse-keymap "Regexp")))
 
+    (define-key map
+      [menu-bar regexp tumme-mark-tagged-files]
+      '(menu-item "Mark From Image Tag..." tumme-mark-tagged-files
+                  :help "Mark files whose image tags matches regexp"))    
+    
+    (define-key map [menu-bar regexp dashes-1]
+      '("--"))    
+
     (define-key map [menu-bar regexp downcase]
       '(menu-item "Downcase" dired-downcase
                   ;; When running on plain MS-DOS, there's only one
@@ -1461,6 +1448,29 @@ Do so according to the former subdir alist OLD-SUBDIR-ALIST."
     (define-key map [menu-bar operate]
       (cons "Operate" (make-sparse-keymap "Operate")))
 
+    (define-key map [menu-bar operate dashes-2]
+      '("--"))
+
+    (define-key map
+      [menu-bar operate tumme-tag-remove]
+      '(menu-item "Remove Image Tag..." tumme-tag-remove
+                  :help "Remove image tag from current or marked files"))
+    (define-key map
+      [menu-bar operate tumme-tag-files]
+      '(menu-item "Add Image Tags..." tumme-tag-files
+                  :help "Add image tags to current or marked files"))
+    (define-key map
+      [menu-bar operate tumme-dired-comment-files]
+      '(menu-item "Add Image Comment..." tumme-dired-comment-files
+                  :help "Add image comment to current or marked files"))
+    (define-key map
+      [menu-bar operate tumme-display-thumbs]
+      '(menu-item "Display Thumbnails" tumme-display-thumbs
+                  :help "Display thumbnails for current or marked image files"))
+    
+    (define-key map [menu-bar operate dashes-3]
+      '("--"))    
+
     (define-key map [menu-bar operate query-replace]
       '(menu-item "Query Replace in Files..." dired-do-query-replace-regexp
                   :help "Replace regexp in marked files"))