2001-07-16 12:23:00 +00:00
|
|
|
;;; tool-bar.el --- setting up the tool bar
|
2000-09-19 17:36:49 +00:00
|
|
|
;;
|
2005-08-01 15:47:19 +00:00
|
|
|
;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
|
2008-01-07 02:45:14 +00:00
|
|
|
;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
2000-09-19 17:36:49 +00:00
|
|
|
;;
|
|
|
|
;; Author: Dave Love <fx@gnu.org>
|
|
|
|
;; Keywords: mouse frames
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2000-09-19 17:36:49 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2000-09-19 17:36:49 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 08:06:51 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2000-09-19 17:36:49 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
2002-06-20 21:35:38 +00:00
|
|
|
;; Provides `tool-bar-mode' to control display of the tool-bar and
|
2000-09-19 17:36:49 +00:00
|
|
|
;; bindings for the global tool bar with convenience functions
|
|
|
|
;; `tool-bar-add-item' and `tool-bar-add-item-from-menu'.
|
|
|
|
|
2000-10-08 15:29:52 +00:00
|
|
|
;; The normal global binding for [tool-bar] (below) uses the value of
|
2000-11-17 17:50:48 +00:00
|
|
|
;; `tool-bar-map' as the actual keymap to define the tool bar. Modes
|
|
|
|
;; may either bind items under the [tool-bar] prefix key of the local
|
|
|
|
;; map to add to the global bar or may set `tool-bar-map'
|
2000-10-11 14:11:47 +00:00
|
|
|
;; buffer-locally to override it. (Some items are removed from the
|
2000-10-08 15:29:52 +00:00
|
|
|
;; global bar in modes which have `special' as their `mode-class'
|
2002-03-26 08:48:51 +00:00
|
|
|
;; property.)
|
2000-10-08 15:29:52 +00:00
|
|
|
|
2000-10-09 11:12:06 +00:00
|
|
|
;; Todo: Somehow make tool bars easily customizable by the naive?
|
|
|
|
|
2000-09-19 17:36:49 +00:00
|
|
|
;;; Code:
|
|
|
|
|
2005-10-28 16:22:08 +00:00
|
|
|
;; The autoload cookie doesn't work when preloading.
|
|
|
|
;; Deleting it means invoking this command won't work
|
|
|
|
;; when you are on a tty. I hope that won't cause too much trouble -- rms.
|
2000-09-19 17:36:49 +00:00
|
|
|
(define-minor-mode tool-bar-mode
|
|
|
|
"Toggle use of the tool bar.
|
2000-11-29 15:29:45 +00:00
|
|
|
With numeric ARG, display the tool bar if and only if ARG is positive.
|
2000-09-19 17:36:49 +00:00
|
|
|
|
|
|
|
See `tool-bar-add-item' and `tool-bar-add-item-from-menu' for
|
|
|
|
conveniently adding tool bar items."
|
2002-02-21 09:39:39 +00:00
|
|
|
:init-value nil
|
2000-09-19 17:36:49 +00:00
|
|
|
:global t
|
|
|
|
:group 'mouse
|
|
|
|
:group 'frames
|
2008-10-09 19:30:47 +00:00
|
|
|
(if tool-bar-mode
|
|
|
|
(progn
|
|
|
|
(dolist (frame (frame-list))
|
|
|
|
(if (display-graphic-p frame)
|
|
|
|
(set-frame-parameter frame 'tool-bar-lines 1)))
|
|
|
|
(tool-bar-setup))
|
|
|
|
(modify-all-frames-parameters (list (cons 'tool-bar-lines 0)))))
|
2000-09-19 17:36:49 +00:00
|
|
|
|
2002-02-21 09:39:39 +00:00
|
|
|
;;;###autoload
|
2006-03-26 14:20:01 +00:00
|
|
|
;; Used in the Show/Hide menu, to have the toggle reflect the current frame.
|
|
|
|
(defun toggle-tool-bar-mode-from-frame (&optional arg)
|
|
|
|
"Toggle tool bar on or off, based on the status of the current frame.
|
|
|
|
See `tool-bar-mode' for more information."
|
|
|
|
(interactive (list (or current-prefix-arg 'toggle)))
|
|
|
|
(if (eq arg 'toggle)
|
|
|
|
(tool-bar-mode (if (> (frame-parameter nil 'tool-bar-lines) 0) 0 1))
|
|
|
|
(tool-bar-mode arg)))
|
|
|
|
|
|
|
|
;;;###autoload
|
2002-02-21 09:39:39 +00:00
|
|
|
;; We want to pretend the toolbar by standard is on, as this will make
|
|
|
|
;; customize consider disabling the toolbar a customization, and save
|
|
|
|
;; that. We could do this for real by setting :init-value above, but
|
|
|
|
;; that would turn on the toolbar in MS Windows where it is currently
|
|
|
|
;; useless, and it would overwrite disabling the tool bar from X
|
|
|
|
;; resources. If anyone want to implement this in a cleaner way,
|
|
|
|
;; please do so.
|
|
|
|
;; -- Per Abrahamsen <abraham@dina.kvl.dk> 2002-02-21.
|
|
|
|
(put 'tool-bar-mode 'standard-value '(t))
|
|
|
|
|
2000-10-08 15:29:52 +00:00
|
|
|
(defvar tool-bar-map (make-sparse-keymap)
|
|
|
|
"Keymap for the tool bar.
|
|
|
|
Define this locally to override the global tool bar.")
|
|
|
|
|
|
|
|
(global-set-key [tool-bar]
|
|
|
|
'(menu-item "tool bar" ignore
|
2008-05-07 18:16:28 +00:00
|
|
|
:filter tool-bar-make-keymap))
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
(declare-function image-mask-p "image.c" (spec &optional frame))
|
|
|
|
|
2008-05-07 18:16:28 +00:00
|
|
|
(defun tool-bar-make-keymap (&optional ignore)
|
|
|
|
"Generate an actual keymap from `tool-bar-map'.
|
|
|
|
Its main job is to figure out which images to use based on the display's
|
|
|
|
color capability and based on the available image libraries."
|
|
|
|
(mapcar (lambda (bind)
|
2008-05-13 17:52:31 +00:00
|
|
|
(let (image-exp plist)
|
2008-05-07 18:16:28 +00:00
|
|
|
(when (and (eq (car-safe (cdr-safe bind)) 'menu-item)
|
2008-05-13 17:52:31 +00:00
|
|
|
;; For the format of menu-items, see node
|
|
|
|
;; `Extended Menu Items' in the Elisp manual.
|
|
|
|
(setq plist (nthcdr (if (consp (nth 4 bind)) 5 4)
|
|
|
|
bind))
|
|
|
|
(setq image-exp (plist-get plist :image))
|
|
|
|
(consp image-exp)
|
|
|
|
(not (eq (car image-exp) 'image))
|
|
|
|
(fboundp (car image-exp)))
|
|
|
|
(if (not (display-images-p))
|
|
|
|
(setq bind nil)
|
|
|
|
(let ((image (eval image-exp)))
|
2008-05-13 18:02:44 +00:00
|
|
|
(unless (and image (image-mask-p image))
|
2008-05-13 17:52:31 +00:00
|
|
|
(setq image (append image '(:mask heuristic))))
|
|
|
|
(setq bind (copy-sequence bind)
|
|
|
|
plist (nthcdr (if (consp (nth 4 bind)) 5 4)
|
|
|
|
bind))
|
|
|
|
(plist-put plist :image image))))
|
|
|
|
bind))
|
2008-05-07 18:16:28 +00:00
|
|
|
tool-bar-map))
|
|
|
|
|
|
|
|
(defconst tool-bar-find-image-cache (make-hash-table :weakness t :test 'equal))
|
|
|
|
|
|
|
|
(defun tool-bar-find-image (specs)
|
|
|
|
"Like `find-image' but with caching."
|
|
|
|
(or (gethash specs tool-bar-find-image-cache)
|
|
|
|
(puthash specs (find-image specs) tool-bar-find-image-cache)))
|
2000-09-19 17:36:49 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
2000-10-08 15:29:52 +00:00
|
|
|
(defun tool-bar-add-item (icon def key &rest props)
|
2000-09-19 17:36:49 +00:00
|
|
|
"Add an item to the tool bar.
|
|
|
|
ICON names the image, DEF is the key definition and KEY is a symbol
|
2000-10-08 15:29:52 +00:00
|
|
|
for the fake function key in the menu keymap. Remaining arguments
|
|
|
|
PROPS are additional items to add to the menu item specification. See
|
|
|
|
Info node `(elisp)Tool Bar'. Items are added from left to right.
|
2000-09-19 17:36:49 +00:00
|
|
|
|
2001-01-31 13:23:12 +00:00
|
|
|
ICON is the base name of a file containing the image to use. The
|
Fix typos (sync from the trunk).
* facemenu.el (facemenu-unlisted-faces): Fix obsolescence declaration.
* hi-lock.el (hi-lock-mode): Fix typo in docstring.
* icomplete.el (icomplete-compute-delay, icomplete-get-keys): Doc fixes.
(icomplete-delay-completions-threshold): Fix typo in docstring.
* speedbar.el (speedbar-stealthy-function-list)
(speedbar-verbosity-level, speedbar-supported-extension-expressions)
(speedbar-update-current-file, speedbar-add-indicator)
(speedbar-tag-expand): Reflow docstrings.
(speedbar-use-imenu-flag, speedbar-use-tool-tips-flag)
(speedbar-ignored-directory-regexp, speedbar-file-unshown-regexp)
(speedbar-file-regexp, speedbar-message, speedbar-item-info)
(speedbar-files-item-info, speedbar-fetch-replacement-function)
(speedbar-maybe-add-localized-support)
(speedbar-generic-list-positioned-group-p, speedbar-insert-generic-list)
(speedbar-extract-one-symbol, speedbar-recenter-to-top)
(speedbar-recenter, speedbar-separator-face): Fix typos in docstrings.
(speedbar-ignored-directory-expressions, speedbar-handle-delete-frame)
(speedbar-show-info-under-mouse, speedbar-directory-buttons)
(speedbar-check-vc-this-line, speedbar-files-line-directory)
(speedbar-buffer-buttons, speedbar-buffer-buttons-temp)
(speedbar-buffers-line-directory): Doc fixes.
* tool-bar.el (tool-bar-add-item): Fix typo in docstring.
* emacs-lisp/edebug.el (edebug-unwrap*, edebug-signal)
(edebug-restore-status): Doc fixes.
(edebug-gensym, edebug-top-level-nonstop, edebug-eval-display)
(edebug-eval-result-list, edebug-eval-redisplay, edebug)
(edebug-trace): Fix typos in docstrings.
* emulation/tpu-edt.el (tpu-match-beginning, tpu-match-end)
(tpu-check-match, tpu-goto-breadcrumb, tpu-reset-screen-size)
(tpu-toggle-overwrite-mode, tpu-include, tpu-get, tpu-what-line)
(tpu-insert-escape, tpu-insert-formfeed, tpu-end-define-macro-key)
(tpu-check-search-case, tpu-select, tpu-unselect, tpu-trim-line-ends)
(tpu-toggle-control-keys): Fix typos in docstrings.
(tpu-kill-buffer): Doc fix.
(tpu-make-file-buffer-list, tpu-toggle-regexp, tpu-cut)
(tpu-append-region, tpu-delete-current-char, tpu-emacs-replace):
Reflow docstrings.
* eshell/em-smart.el (eshell-review-quick-commands): Doc fix.
* eshell/esh-arg.el (eshell-quote-backslash): Fix typo in docstring.
* play/solitaire.el (solitaire, solitaire-mode-map, solitaire-mode-hook)
(solitaire-mode, solitaire, solitaire-solve): Fix typos in docstrings.
* progmodes/gdb-ui.el (gdb-source-info): Fix typo in docstring.
* progmodes/python.el (python-comment-line-p, python-blank-line-p)
(python-skip-out): Doc fixes.
2008-08-26 11:02:51 +00:00
|
|
|
function will first try to use low-color/ICON.xpm if `display-color-cells'
|
2004-06-08 17:53:11 +00:00
|
|
|
is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally
|
2001-01-31 13:23:12 +00:00
|
|
|
ICON.xbm, using `find-image'.
|
2000-10-08 15:29:52 +00:00
|
|
|
|
2002-04-01 16:28:16 +00:00
|
|
|
Use this function only to make bindings in the global value of `tool-bar-map'.
|
|
|
|
To define items in any other map, use `tool-bar-local-item'."
|
|
|
|
(apply 'tool-bar-local-item icon def key tool-bar-map props))
|
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun tool-bar-local-item (icon def key map &rest props)
|
|
|
|
"Add an item to the tool bar in map MAP.
|
|
|
|
ICON names the image, DEF is the key definition and KEY is a symbol
|
|
|
|
for the fake function key in the menu keymap. Remaining arguments
|
|
|
|
PROPS are additional items to add to the menu item specification. See
|
|
|
|
Info node `(elisp)Tool Bar'. Items are added from left to right.
|
|
|
|
|
|
|
|
ICON is the base name of a file containing the image to use. The
|
2008-05-07 18:16:28 +00:00
|
|
|
function will first try to use low-color/ICON.xpm if `display-color-cells'
|
2004-06-08 17:53:11 +00:00
|
|
|
is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally
|
2002-04-01 16:28:16 +00:00
|
|
|
ICON.xbm, using `find-image'."
|
2000-11-29 19:21:47 +00:00
|
|
|
(let* ((fg (face-attribute 'tool-bar :foreground))
|
|
|
|
(bg (face-attribute 'tool-bar :background))
|
|
|
|
(colors (nconc (if (eq fg 'unspecified) nil (list :foreground fg))
|
|
|
|
(if (eq bg 'unspecified) nil (list :background bg))))
|
2004-06-08 17:47:52 +00:00
|
|
|
(xpm-spec (list :type 'xpm :file (concat icon ".xpm")))
|
|
|
|
(xpm-lo-spec (if (> (display-color-cells) 256)
|
|
|
|
nil
|
Moved all remaining images from lisp/toolbar to etc/images, moved
lisp/toolbar/tool-bar to lisp and "deleted" lisp/toolbar. The low
resolution images were placed in their own directory (low-color).
Replaced underscore (_) in filenames with dash (-) per convention
* make-dist: Create and populate etc/images/low-color.
* admin/FOR-RELEASE (DOCUMENTATION): Removed lisp/toolbar from list
since it's gone. Also marked mh-e as done.
* lisp/toolbar/attach.*, lisp/toolbar/cancel.*, lisp/toolbar/close.*:
* lisp/toolbar/copy.*, lisp/toolbar/cut.*, lisp/toolbar/diropen.*:
* lisp/toolbar/exit.*, lisp/toolbar/help.*, lisp/toolbar/home.*:
* lisp/toolbar/index.*, lisp/toolbar/info.*, lisp/toolbar/mail.*:
* lisp/toolbar/new.*, lisp/toolbar/open.*, lisp/toolbar/paste.*, *
* lisp/toolbar/preferences.*, lisp/toolbar/print.*, lisp/toolbar/save.*:
* lisp/toolbar/saveas.*, lisp/toolbar/search.*:
* lisp/toolbar/search-replace.*: lisp/toolbar/spell.*:
* lisp/toolbar/undo.*: Moved to etc/images.
* lisp/toolbar/lc-copy.*: Moved to etc/images/low-color/copy.*.
* lisp/toolbar/lc-cut.*: Moved to etc/images/low-color/cut.*.
* lisp/toolbar/lc-help.*: Moved to etc/images/low-color/help.*.
* lisp/toolbar/lc-home.*: Moved to etc/images/low-color/home.*.
* lisp/toolbar/lc-index.*: Moved to etc/images/low-color/index.*.
* lisp/toolbar/lc-new.*: Moved to etc/images/low-color/new.*.
* lisp/toolbar/lc-open.*: Moved to etc/images/low-color/open.*.
* lisp/toolbar/lc-paste.*: Moved to etc/images/low-color/paste.*.
* lisp/toolbar/lc-preferences.*: Moved to etc/images/low-color/preferences.*.
* lisp/toolbar/lc-print.*: Moved to etc/images/low-color/print.*.
* lisp/toolbar/lc-save.*: Moved to etc/images/low-color/save.*.
* lisp/toolbar/lc-saveas.*: Moved to etc/images/low-color/saveas.*.
* lisp/toolbar/lc-search.*: Moved to etc/images/low-color/search.*.
* lisp/toolbar/lc-spell.*: Moved to etc/images/low-color/spell.*.
* lisp/toolbar/lc-undo.*: Moved to etc/images/low-color/undo.*.
To conform with convention, the underscore (_) in the following image
names were replaced with dash (-) or (/) as appropriate.
* lisp/toolbar/back_arrow.*: Moved to etc/images/back-arrow.*.
* lisp/toolbar/fld_open.*: Moved to etc/images/fld-open.*.
* lisp/toolbar/fwd_arrow.*: Moved to etc/images/fwd-arrow.*.
* lisp/toolbar/jump_to.*: Moved to etc/images/jump-to.*.
* lisp/toolbar/left_arrow.*: Moved to etc/images/left-arrow.*.
* lisp/toolbar/right_arrow.*: Moved to etc/images/right-arrow.*.
* lisp/toolbar/up_arrow.*: Moved to etc/images/up-arrow.*.
* lisp/toolbar/lc-back_arrow.*.: Moved to etc/images/low-color/back-arrow.*.
* lisp/toolbar/lc-fwd_arrow.*.: Moved to etc/images/low-color/fwd-arrow.*.
* lisp/toolbar/lc-jump_to.*: Moved to etc/images/low-color/jump-to.*.
* lisp/toolbar/lc-left_arrow.*.: Moved to etc/images/low-color/left-arrow.*.
* lisp/toolbar/lc-right_arrow.*.: Moved to etc/images/low-color/right-arrow.*.
* lisp/toolbar/lc-up_arrow.*: Moved to etc/images/low-color/up-arrow.*.
* lisp/toolbar/mail_compose.*.: Moved to etc/images/mail/compose.*.
* lisp/toolbar/mail_send.*: Moved to etc/images/mail/send.*.
* lisp/info.el (info-tool-bar-map): Replaced underscores in image
names with dashes.
* lisp/makefile.w32-in (WINS): Removed toolbar.
* lisp/menu-bar.el: Replaced toolbar/tool-bar.el with tool-bar.el in
comment.
* lisp/tool-bar.el: Moved to lisp from lisp/toolbar. Now that
lisp/toolbar is empty, it should be deleted when folks run "cvs up
-P".
* etc/images/README: Incorporated the content of lisp/toolbar/README
now that all of the images are here.
2005-10-17 22:21:06 +00:00
|
|
|
(list :type 'xpm :file
|
|
|
|
(concat "low-color/" icon ".xpm"))))
|
|
|
|
(pbm-spec (append (list :type 'pbm :file
|
|
|
|
(concat icon ".pbm")) colors))
|
|
|
|
(xbm-spec (append (list :type 'xbm :file
|
|
|
|
(concat icon ".xbm")) colors))
|
2008-05-07 18:16:28 +00:00
|
|
|
(image-exp `(tool-bar-find-image
|
|
|
|
(if (display-color-p)
|
|
|
|
',(list xpm-lo-spec xpm-spec pbm-spec xbm-spec)
|
|
|
|
',(list pbm-spec xbm-spec xpm-lo-spec xpm-spec)))))
|
2004-06-08 17:47:52 +00:00
|
|
|
|
2008-05-07 18:16:28 +00:00
|
|
|
(define-key-after map (vector key)
|
|
|
|
`(menu-item ,(symbol-name key) ,def :image ,image-exp ,@props))))
|
2000-09-19 17:36:49 +00:00
|
|
|
|
2000-10-09 17:56:11 +00:00
|
|
|
;;;###autoload
|
2000-09-19 17:36:49 +00:00
|
|
|
(defun tool-bar-add-item-from-menu (command icon &optional map &rest props)
|
2005-10-28 21:03:35 +00:00
|
|
|
"Define tool bar binding for COMMAND in keymap MAP using the given ICON.
|
2002-04-01 16:28:16 +00:00
|
|
|
This makes a binding for COMMAND in `tool-bar-map', copying its
|
|
|
|
binding from the menu bar in MAP (which defaults to `global-map'), but
|
|
|
|
modifies the binding by adding an image specification for ICON. It
|
|
|
|
finds ICON just like `tool-bar-add-item'. PROPS are additional
|
|
|
|
properties to add to the binding.
|
|
|
|
|
|
|
|
MAP must contain appropriate binding for `[menu-bar]' which holds a keymap.
|
|
|
|
|
|
|
|
Use this function only to make bindings in the global value of `tool-bar-map'.
|
2005-10-28 21:03:35 +00:00
|
|
|
To define items in any other map, use `tool-bar-local-item-from-menu'."
|
2002-07-16 22:46:09 +00:00
|
|
|
(apply 'tool-bar-local-item-from-menu command icon
|
|
|
|
(default-value 'tool-bar-map) map props))
|
2002-04-01 16:28:16 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun tool-bar-local-item-from-menu (command icon in-map &optional from-map &rest props)
|
2005-10-28 21:03:35 +00:00
|
|
|
"Define local tool bar binding for COMMAND using the given ICON.
|
2002-04-01 16:28:16 +00:00
|
|
|
This makes a binding for COMMAND in IN-MAP, copying its binding from
|
|
|
|
the menu bar in FROM-MAP (which defaults to `global-map'), but
|
|
|
|
modifies the binding by adding an image specification for ICON. It
|
|
|
|
finds ICON just like `tool-bar-add-item'. PROPS are additional
|
|
|
|
properties to add to the binding.
|
|
|
|
|
2005-10-28 21:03:35 +00:00
|
|
|
FROM-MAP must contain appropriate binding for `[menu-bar]' which
|
|
|
|
holds a keymap."
|
2002-04-01 16:28:16 +00:00
|
|
|
(unless from-map
|
|
|
|
(setq from-map global-map))
|
|
|
|
(let* ((menu-bar-map (lookup-key from-map [menu-bar]))
|
2000-09-19 17:36:49 +00:00
|
|
|
(keys (where-is-internal command menu-bar-map))
|
2000-11-29 19:21:47 +00:00
|
|
|
(fg (face-attribute 'tool-bar :foreground))
|
|
|
|
(bg (face-attribute 'tool-bar :background))
|
|
|
|
(colors (nconc (if (eq fg 'unspecified) nil (list :foreground fg))
|
|
|
|
(if (eq bg 'unspecified) nil (list :background bg))))
|
2004-06-08 17:47:52 +00:00
|
|
|
(xpm-spec (list :type 'xpm :file (concat icon ".xpm")))
|
|
|
|
(xpm-lo-spec (if (> (display-color-cells) 256)
|
|
|
|
nil
|
Moved all remaining images from lisp/toolbar to etc/images, moved
lisp/toolbar/tool-bar to lisp and "deleted" lisp/toolbar. The low
resolution images were placed in their own directory (low-color).
Replaced underscore (_) in filenames with dash (-) per convention
* make-dist: Create and populate etc/images/low-color.
* admin/FOR-RELEASE (DOCUMENTATION): Removed lisp/toolbar from list
since it's gone. Also marked mh-e as done.
* lisp/toolbar/attach.*, lisp/toolbar/cancel.*, lisp/toolbar/close.*:
* lisp/toolbar/copy.*, lisp/toolbar/cut.*, lisp/toolbar/diropen.*:
* lisp/toolbar/exit.*, lisp/toolbar/help.*, lisp/toolbar/home.*:
* lisp/toolbar/index.*, lisp/toolbar/info.*, lisp/toolbar/mail.*:
* lisp/toolbar/new.*, lisp/toolbar/open.*, lisp/toolbar/paste.*, *
* lisp/toolbar/preferences.*, lisp/toolbar/print.*, lisp/toolbar/save.*:
* lisp/toolbar/saveas.*, lisp/toolbar/search.*:
* lisp/toolbar/search-replace.*: lisp/toolbar/spell.*:
* lisp/toolbar/undo.*: Moved to etc/images.
* lisp/toolbar/lc-copy.*: Moved to etc/images/low-color/copy.*.
* lisp/toolbar/lc-cut.*: Moved to etc/images/low-color/cut.*.
* lisp/toolbar/lc-help.*: Moved to etc/images/low-color/help.*.
* lisp/toolbar/lc-home.*: Moved to etc/images/low-color/home.*.
* lisp/toolbar/lc-index.*: Moved to etc/images/low-color/index.*.
* lisp/toolbar/lc-new.*: Moved to etc/images/low-color/new.*.
* lisp/toolbar/lc-open.*: Moved to etc/images/low-color/open.*.
* lisp/toolbar/lc-paste.*: Moved to etc/images/low-color/paste.*.
* lisp/toolbar/lc-preferences.*: Moved to etc/images/low-color/preferences.*.
* lisp/toolbar/lc-print.*: Moved to etc/images/low-color/print.*.
* lisp/toolbar/lc-save.*: Moved to etc/images/low-color/save.*.
* lisp/toolbar/lc-saveas.*: Moved to etc/images/low-color/saveas.*.
* lisp/toolbar/lc-search.*: Moved to etc/images/low-color/search.*.
* lisp/toolbar/lc-spell.*: Moved to etc/images/low-color/spell.*.
* lisp/toolbar/lc-undo.*: Moved to etc/images/low-color/undo.*.
To conform with convention, the underscore (_) in the following image
names were replaced with dash (-) or (/) as appropriate.
* lisp/toolbar/back_arrow.*: Moved to etc/images/back-arrow.*.
* lisp/toolbar/fld_open.*: Moved to etc/images/fld-open.*.
* lisp/toolbar/fwd_arrow.*: Moved to etc/images/fwd-arrow.*.
* lisp/toolbar/jump_to.*: Moved to etc/images/jump-to.*.
* lisp/toolbar/left_arrow.*: Moved to etc/images/left-arrow.*.
* lisp/toolbar/right_arrow.*: Moved to etc/images/right-arrow.*.
* lisp/toolbar/up_arrow.*: Moved to etc/images/up-arrow.*.
* lisp/toolbar/lc-back_arrow.*.: Moved to etc/images/low-color/back-arrow.*.
* lisp/toolbar/lc-fwd_arrow.*.: Moved to etc/images/low-color/fwd-arrow.*.
* lisp/toolbar/lc-jump_to.*: Moved to etc/images/low-color/jump-to.*.
* lisp/toolbar/lc-left_arrow.*.: Moved to etc/images/low-color/left-arrow.*.
* lisp/toolbar/lc-right_arrow.*.: Moved to etc/images/low-color/right-arrow.*.
* lisp/toolbar/lc-up_arrow.*: Moved to etc/images/low-color/up-arrow.*.
* lisp/toolbar/mail_compose.*.: Moved to etc/images/mail/compose.*.
* lisp/toolbar/mail_send.*: Moved to etc/images/mail/send.*.
* lisp/info.el (info-tool-bar-map): Replaced underscores in image
names with dashes.
* lisp/makefile.w32-in (WINS): Removed toolbar.
* lisp/menu-bar.el: Replaced toolbar/tool-bar.el with tool-bar.el in
comment.
* lisp/tool-bar.el: Moved to lisp from lisp/toolbar. Now that
lisp/toolbar is empty, it should be deleted when folks run "cvs up
-P".
* etc/images/README: Incorporated the content of lisp/toolbar/README
now that all of the images are here.
2005-10-17 22:21:06 +00:00
|
|
|
(list :type 'xpm :file
|
|
|
|
(concat "low-color/" icon ".xpm"))))
|
|
|
|
(pbm-spec (append (list :type 'pbm :file
|
|
|
|
(concat icon ".pbm")) colors))
|
|
|
|
(xbm-spec (append (list :type 'xbm :file
|
|
|
|
(concat icon ".xbm")) colors))
|
2008-05-07 18:16:28 +00:00
|
|
|
(image-exp `(tool-bar-find-image
|
|
|
|
(if (display-color-p)
|
|
|
|
',(list xpm-lo-spec xpm-spec pbm-spec xbm-spec)
|
|
|
|
',(list pbm-spec xbm-spec xpm-lo-spec xpm-spec))))
|
2000-09-19 17:36:49 +00:00
|
|
|
submap key)
|
2008-05-07 18:16:28 +00:00
|
|
|
;; We'll pick up the last valid entry in the list of keys if
|
|
|
|
;; there's more than one.
|
|
|
|
(dolist (k keys)
|
|
|
|
;; We're looking for a binding of the command in a submap of
|
|
|
|
;; the menu bar map, so the key sequence must be two or more
|
|
|
|
;; long.
|
|
|
|
(if (and (vectorp k)
|
|
|
|
(> (length k) 1))
|
|
|
|
(let ((m (lookup-key menu-bar-map (substring k 0 -1)))
|
|
|
|
;; Last element in the bound key sequence:
|
|
|
|
(kk (aref k (1- (length k)))))
|
|
|
|
(if (and (keymapp m)
|
|
|
|
(symbolp kk))
|
|
|
|
(setq submap m
|
|
|
|
key kk)))))
|
|
|
|
(when (and (symbolp submap) (boundp submap))
|
|
|
|
(setq submap (eval submap)))
|
|
|
|
(let ((defn (assq key (cdr submap))))
|
|
|
|
(if (eq (cadr defn) 'menu-item)
|
|
|
|
(define-key-after in-map (vector key)
|
|
|
|
(append (cdr defn) (list :image image-exp) props))
|
|
|
|
(setq defn (cdr defn))
|
|
|
|
(define-key-after in-map (vector key)
|
|
|
|
(let ((rest (cdr defn)))
|
|
|
|
;; If the rest of the definition starts
|
|
|
|
;; with a list of menu cache info, get rid of that.
|
|
|
|
(if (and (consp rest) (consp (car rest)))
|
|
|
|
(setq rest (cdr rest)))
|
|
|
|
(append `(menu-item ,(car defn) ,rest)
|
|
|
|
(list :image image-exp) props)))))))
|
2000-09-19 17:36:49 +00:00
|
|
|
|
|
|
|
;;; Set up some global items. Additions/deletions up for grabs.
|
|
|
|
|
2006-03-26 13:57:43 +00:00
|
|
|
(defvar tool-bar-setup nil
|
2008-10-09 19:30:47 +00:00
|
|
|
"Non-nil if the tool-bar has been set up by `tool-bar-setup'.")
|
2006-03-26 13:57:43 +00:00
|
|
|
|
|
|
|
(defun tool-bar-setup (&optional frame)
|
2008-10-09 19:30:47 +00:00
|
|
|
(unless (or tool-bar-setup
|
|
|
|
(null tool-bar-mode)
|
|
|
|
;; No-op if the initial frame is on a tty, deferring
|
|
|
|
;; action until called from x-create-frame-with-faces.
|
|
|
|
;; Tool-bar icons can depend on X settings, which are
|
|
|
|
;; initially unavailable in this case.
|
|
|
|
(not (display-graphic-p frame)))
|
2006-03-26 13:57:43 +00:00
|
|
|
(with-selected-frame (or frame (selected-frame))
|
|
|
|
;; People say it's bad to have EXIT on the tool bar, since users
|
|
|
|
;; might inadvertently click that button.
|
|
|
|
;;(tool-bar-add-item-from-menu 'save-buffers-kill-emacs "exit")
|
|
|
|
(tool-bar-add-item-from-menu 'find-file "new")
|
|
|
|
(tool-bar-add-item-from-menu 'menu-find-file-existing "open")
|
|
|
|
(tool-bar-add-item-from-menu 'dired "diropen")
|
|
|
|
(tool-bar-add-item-from-menu 'kill-this-buffer "close")
|
|
|
|
(tool-bar-add-item-from-menu 'save-buffer "save" nil
|
|
|
|
:visible '(or buffer-file-name
|
|
|
|
(not (eq 'special
|
|
|
|
(get major-mode
|
|
|
|
'mode-class)))))
|
|
|
|
(tool-bar-add-item-from-menu 'write-file "saveas" nil
|
|
|
|
:visible '(or buffer-file-name
|
|
|
|
(not (eq 'special
|
|
|
|
(get major-mode
|
|
|
|
'mode-class)))))
|
|
|
|
(tool-bar-add-item-from-menu 'undo "undo" nil
|
|
|
|
:visible '(not (eq 'special (get major-mode
|
|
|
|
'mode-class))))
|
|
|
|
(tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [cut])
|
|
|
|
"cut" nil
|
|
|
|
:visible '(not (eq 'special (get major-mode
|
|
|
|
'mode-class))))
|
|
|
|
(tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [copy])
|
|
|
|
"copy")
|
|
|
|
(tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [paste])
|
|
|
|
"paste" nil
|
|
|
|
:visible '(not (eq 'special (get major-mode
|
|
|
|
'mode-class))))
|
|
|
|
(tool-bar-add-item-from-menu 'nonincremental-search-forward "search")
|
|
|
|
;;(tool-bar-add-item-from-menu 'ispell-buffer "spell")
|
|
|
|
|
|
|
|
;; There's no icon appropriate for News and we need a command rather
|
|
|
|
;; than a lambda for Read Mail.
|
2008-05-07 18:16:28 +00:00
|
|
|
;;(tool-bar-add-item-from-menu 'compose-mail "mail/compose")
|
2006-03-26 13:57:43 +00:00
|
|
|
|
2008-05-07 18:16:28 +00:00
|
|
|
(tool-bar-add-item-from-menu 'print-buffer "print")
|
2006-03-26 13:57:43 +00:00
|
|
|
|
2008-05-07 18:16:28 +00:00
|
|
|
;; tool-bar-add-item-from-menu itself operates on
|
|
|
|
;; (default-value 'tool-bar-map), but when we don't use that function,
|
|
|
|
;; we must explicitly operate on the default value.
|
2006-03-26 13:57:43 +00:00
|
|
|
|
2008-05-07 18:16:28 +00:00
|
|
|
(let ((tool-bar-map (default-value 'tool-bar-map)))
|
|
|
|
(tool-bar-add-item "preferences" 'customize 'customize
|
|
|
|
:help "Edit preferences (customize)")
|
2006-05-01 20:15:56 +00:00
|
|
|
|
2008-05-07 18:16:28 +00:00
|
|
|
(tool-bar-add-item "help" (lambda ()
|
|
|
|
(interactive)
|
|
|
|
(popup-menu menu-bar-help-menu))
|
|
|
|
'help
|
|
|
|
:help "Pop up the Help menu"))
|
|
|
|
(setq tool-bar-setup t))))
|
2000-09-19 17:36:49 +00:00
|
|
|
|
|
|
|
|
2006-05-03 11:56:53 +00:00
|
|
|
(provide 'tool-bar)
|
2008-04-10 14:10:46 +00:00
|
|
|
;; arch-tag: 15f30f0a-d0d7-4d50-bbb7-f48fd0c8582f
|
2000-09-19 17:36:49 +00:00
|
|
|
;;; tool-bar.el ends here
|