From: Dan Nicolaescu Date: Wed, 30 Apr 2008 05:48:32 +0000 (+0000) Subject: (menu-bar-tools-menu): Reorder, place Games last. X-Git-Tag: emacs-pretest-23.0.90~5931 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9a3558cbeb6ee199ec82220abc14feaa608c7a56;p=emacs.git (menu-bar-tools-menu): Reorder, place Games last. Add "..." in the appropriate places. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7b3cd0ffd89..a82d31d154c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,10 @@ 2008-04-30 Dan Nicolaescu + * menu-bar.el (menu-bar-tools-menu): Reorder, place Games last. + Add "..." in the appropriate places. + * epa.el (epa-key-list-mode-map): Add more menu entries. - Add ... in the appropriate places. + Add "..." in the appropriate places. * dired.el (dired-mode-map): Add :help. diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 3502496dec0..0ba1a0b1717 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -1082,6 +1082,54 @@ mail status in mode line")) (known (assq read-mail-command known-rmail-commands))) (if known (cdr known) (symbol-name read-mail-command)))) +(defvar menu-bar-games-menu (make-sparse-keymap "Games")) + +(define-key menu-bar-tools-menu [games] + (list 'menu-item "Games" menu-bar-games-menu)) + +(define-key menu-bar-tools-menu [separator-games] + '("--")) + +(define-key menu-bar-games-menu [zone] + '(menu-item "Zone Out" zone + :help "Play tricks with Emacs display when Emacs is idle")) +(define-key menu-bar-games-menu [tetris] + '(menu-item "Tetris" tetris + :help "Falling blocks game")) +(define-key menu-bar-games-menu [solitaire] + '(menu-item "Solitaire" solitaire + :help "Get rid of all the stones")) +(define-key menu-bar-games-menu [snake] + '(menu-item "Snake" snake + :help "Move snake around avoiding collisions")) +(define-key menu-bar-games-menu [pong] + '(menu-item "Pong" pong + :help "Bounce the ball to your opponent")) +(define-key menu-bar-games-menu [mult] + '(menu-item "Multiplication Puzzle" mpuz + :help "Exercise brain with multiplication")) +(define-key menu-bar-games-menu [life] + '(menu-item "Life" life + :help "Watch how John Conway's cellular automaton evolves")) +(define-key menu-bar-games-menu [hanoi] + '(menu-item "Towers of Hanoi" hanoi + :help "Watch Towers-of-Hanoi puzzle solved by Emacs")) +(define-key menu-bar-games-menu [gomoku] + '(menu-item "Gomoku" gomoku + :help "Mark 5 contiguous squares (like tic-tac-toe)")) +(define-key menu-bar-games-menu [bubbles] + '(menu-item "Bubbles" bubbles + :help "Remove all bubbles using the fewest moves")) +(define-key menu-bar-games-menu [black-box] + '(menu-item "Blackbox" blackbox + :help "Find balls in a black box by shooting rays")) +(define-key menu-bar-games-menu [adventure] + '(menu-item "Adventure" dunnet + :help "Dunnet, a text Adventure game for Emacs")) +(define-key menu-bar-games-menu [5x5] + '(menu-item "5x5" 5x5 + :help "Fill in all the squares on a 5x5 board")) + (defvar menu-bar-encryption-decryption-menu (make-sparse-keymap "Encryption/Decryption")) @@ -1104,7 +1152,7 @@ mail status in mode line")) :help "Import public keys from the current region")) (define-key menu-bar-encryption-decryption-menu [import-keys] - '(menu-item "Import Keys from File" epa-import-keys + '(menu-item "Import Keys from File..." epa-import-keys :help "Import public keys from a file")) (define-key menu-bar-encryption-decryption-menu [list-keys] @@ -1114,85 +1162,40 @@ mail status in mode line")) (define-key menu-bar-encryption-decryption-menu [separator-keys] '("--")) -(define-key menu-bar-encryption-decryption-menu [encrypt-region] - '(menu-item "Encrypt Region" epa-encrypt-region - :help "Encrypt the current region")) - -(define-key menu-bar-encryption-decryption-menu [encrypt-file] - '(menu-item "Encrypt File" epa-encrypt-file - :help "Encrypt a file")) - (define-key menu-bar-encryption-decryption-menu [sign-region] '(menu-item "Sign Region" epa-sign-region :help "Create digital signature of the current region")) -(define-key menu-bar-encryption-decryption-menu [sign-file] - '(menu-item "Sign File" epa-sign-file - :help "Create digital signature of a file")) - (define-key menu-bar-encryption-decryption-menu [verify-region] '(menu-item "Verify Region" epa-verify-region :help "Verify digital signature of the current region")) -(define-key menu-bar-encryption-decryption-menu [verify-file] - '(menu-item "Verify File" epa-verify-file - :help "Verify digital signature of a file")) +(define-key menu-bar-encryption-decryption-menu [encrypt-region] + '(menu-item "Encrypt Region" epa-encrypt-region + :help "Encrypt the current region")) (define-key menu-bar-encryption-decryption-menu [decrypt-region] '(menu-item "Decrypt Region" epa-decrypt-region :help "Decrypt the current region")) -(define-key menu-bar-encryption-decryption-menu [decrypt-file] - '(menu-item "Decrypt File" epa-decrypt-file - :help "Decrypt a file")) +(define-key menu-bar-encryption-decryption-menu [separator-file] + '("--")) -(defvar menu-bar-games-menu (make-sparse-keymap "Games")) +(define-key menu-bar-encryption-decryption-menu [sign-file] + '(menu-item "Sign File..." epa-sign-file + :help "Create digital signature of a file")) -(define-key menu-bar-tools-menu [games] - (list 'menu-item "Games" menu-bar-games-menu)) +(define-key menu-bar-encryption-decryption-menu [verify-file] + '(menu-item "Verify File..." epa-verify-file + :help "Verify digital signature of a file")) -(define-key menu-bar-tools-menu [separator-games] - '("--")) +(define-key menu-bar-encryption-decryption-menu [encrypt-file] + '(menu-item "Encrypt File..." epa-encrypt-file + :help "Encrypt a file")) -(define-key menu-bar-games-menu [zone] - '(menu-item "Zone Out" zone - :help "Play tricks with Emacs display when Emacs is idle")) -(define-key menu-bar-games-menu [tetris] - '(menu-item "Tetris" tetris - :help "Falling blocks game")) -(define-key menu-bar-games-menu [solitaire] - '(menu-item "Solitaire" solitaire - :help "Get rid of all the stones")) -(define-key menu-bar-games-menu [snake] - '(menu-item "Snake" snake - :help "Move snake around avoiding collisions")) -(define-key menu-bar-games-menu [pong] - '(menu-item "Pong" pong - :help "Bounce the ball to your opponent")) -(define-key menu-bar-games-menu [mult] - '(menu-item "Multiplication Puzzle" mpuz - :help "Exercise brain with multiplication")) -(define-key menu-bar-games-menu [life] - '(menu-item "Life" life - :help "Watch how John Conway's cellular automaton evolves")) -(define-key menu-bar-games-menu [hanoi] - '(menu-item "Towers of Hanoi" hanoi - :help "Watch Towers-of-Hanoi puzzle solved by Emacs")) -(define-key menu-bar-games-menu [gomoku] - '(menu-item "Gomoku" gomoku - :help "Mark 5 contiguous squares (like tic-tac-toe)")) -(define-key menu-bar-games-menu [bubbles] - '(menu-item "Bubbles" bubbles - :help "Remove all bubbles using the fewest moves")) -(define-key menu-bar-games-menu [black-box] - '(menu-item "Blackbox" blackbox - :help "Find balls in a black box by shooting rays")) -(define-key menu-bar-games-menu [adventure] - '(menu-item "Adventure" dunnet - :help "Dunnet, a text Adventure game for Emacs")) -(define-key menu-bar-games-menu [5x5] - '(menu-item "5x5" 5x5 - :help "Fill in all the squares on a 5x5 board")) +(define-key menu-bar-encryption-decryption-menu [decrypt-file] + '(menu-item "Decrypt File..." epa-decrypt-file + :help "Decrypt a file")) (define-key menu-bar-tools-menu [simple-calculator] '(menu-item "Simple Calculator" calculator