Mercurial > emacs
annotate lisp/toolbar/tool-bar.el @ 42315:33d9eae5bb32
Remove empty lines at the end of file.
author | Pavel Janík <Pavel@Janik.cz> |
---|---|
date | Tue, 25 Dec 2001 11:02:43 +0000 |
parents | a9bd717014f0 |
children | c187056ac630 |
rev | line source |
---|---|
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
38144
diff
changeset
|
1 ;;; tool-bar.el --- setting up the tool bar |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
2 ;; |
38698
0d7cddbc0fa7
(tool-bar-add-item-from-menu): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
38470
diff
changeset
|
3 ;; Copyright (C) 2000, 2001 Free Software Foundation, Inc. |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
4 ;; |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
5 ;; Author: Dave Love <fx@gnu.org> |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
6 ;; Keywords: mouse frames |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
7 |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
8 ;; This file is part of GNU Emacs. |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
9 |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
10 ;; GNU Emacs is free software; you can redistribute it and/or modify |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
11 ;; it under the terms of the GNU General Public License as published by |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
12 ;; the Free Software Foundation; either version 2, or (at your option) |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
13 ;; any later version. |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
14 |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
15 ;; GNU Emacs is distributed in the hope that it will be useful, |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
18 ;; GNU General Public License for more details. |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
19 |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
20 ;; You should have received a copy of the GNU General Public License |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
23 ;; Boston, MA 02111-1307, USA. |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
24 |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
25 ;;; Commentary: |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
26 |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
27 ;; Provides `tool-bar-mode' to control display of the tool -bar and |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
28 ;; bindings for the global tool bar with convenience functions |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
29 ;; `tool-bar-add-item' and `tool-bar-add-item-from-menu'. |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
30 |
32285 | 31 ;; The normal global binding for [tool-bar] (below) uses the value of |
33574 | 32 ;; `tool-bar-map' as the actual keymap to define the tool bar. Modes |
33 ;; may either bind items under the [tool-bar] prefix key of the local | |
34 ;; map to add to the global bar or may set `tool-bar-map' | |
32382 | 35 ;; buffer-locally to override it. (Some items are removed from the |
32285 | 36 ;; global bar in modes which have `special' as their `mode-class' |
37 ;; properlty.) | |
38 | |
32331
d1c0cf83e365
(tool-bar-mode): Check whether tool-bar-map
Dave Love <fx@gnu.org>
parents:
32285
diff
changeset
|
39 ;; Todo: Somehow make tool bars easily customizable by the naive? |
d1c0cf83e365
(tool-bar-mode): Check whether tool-bar-map
Dave Love <fx@gnu.org>
parents:
32285
diff
changeset
|
40 |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
41 ;;; Code: |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
42 |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
43 ;;;###autoload |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
44 (define-minor-mode tool-bar-mode |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
45 "Toggle use of the tool bar. |
34004 | 46 With numeric ARG, display the tool bar if and only if ARG is positive. |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
47 |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
48 See `tool-bar-add-item' and `tool-bar-add-item-from-menu' for |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
49 conveniently adding tool bar items." |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
50 :global t |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
51 :group 'mouse |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
52 :group 'frames |
39019
a9bd717014f0
(tool-bar-mode): Make it a no-op if images
Eli Zaretskii <eliz@gnu.org>
parents:
38698
diff
changeset
|
53 (and (display-images-p) |
a9bd717014f0
(tool-bar-mode): Make it a no-op if images
Eli Zaretskii <eliz@gnu.org>
parents:
38698
diff
changeset
|
54 (let ((lines (if tool-bar-mode 1 0))) |
a9bd717014f0
(tool-bar-mode): Make it a no-op if images
Eli Zaretskii <eliz@gnu.org>
parents:
38698
diff
changeset
|
55 ;; Alter existing frames... |
a9bd717014f0
(tool-bar-mode): Make it a no-op if images
Eli Zaretskii <eliz@gnu.org>
parents:
38698
diff
changeset
|
56 (mapc (lambda (frame) |
a9bd717014f0
(tool-bar-mode): Make it a no-op if images
Eli Zaretskii <eliz@gnu.org>
parents:
38698
diff
changeset
|
57 (modify-frame-parameters frame |
a9bd717014f0
(tool-bar-mode): Make it a no-op if images
Eli Zaretskii <eliz@gnu.org>
parents:
38698
diff
changeset
|
58 (list (cons 'tool-bar-lines lines)))) |
a9bd717014f0
(tool-bar-mode): Make it a no-op if images
Eli Zaretskii <eliz@gnu.org>
parents:
38698
diff
changeset
|
59 (frame-list)) |
a9bd717014f0
(tool-bar-mode): Make it a no-op if images
Eli Zaretskii <eliz@gnu.org>
parents:
38698
diff
changeset
|
60 ;; ...and future ones. |
a9bd717014f0
(tool-bar-mode): Make it a no-op if images
Eli Zaretskii <eliz@gnu.org>
parents:
38698
diff
changeset
|
61 (let ((elt (assq 'tool-bar-lines default-frame-alist))) |
a9bd717014f0
(tool-bar-mode): Make it a no-op if images
Eli Zaretskii <eliz@gnu.org>
parents:
38698
diff
changeset
|
62 (if elt |
a9bd717014f0
(tool-bar-mode): Make it a no-op if images
Eli Zaretskii <eliz@gnu.org>
parents:
38698
diff
changeset
|
63 (setcdr elt lines) |
a9bd717014f0
(tool-bar-mode): Make it a no-op if images
Eli Zaretskii <eliz@gnu.org>
parents:
38698
diff
changeset
|
64 (add-to-list 'default-frame-alist (cons 'tool-bar-lines lines))))) |
a9bd717014f0
(tool-bar-mode): Make it a no-op if images
Eli Zaretskii <eliz@gnu.org>
parents:
38698
diff
changeset
|
65 (if (and tool-bar-mode |
a9bd717014f0
(tool-bar-mode): Make it a no-op if images
Eli Zaretskii <eliz@gnu.org>
parents:
38698
diff
changeset
|
66 (display-graphic-p) |
a9bd717014f0
(tool-bar-mode): Make it a no-op if images
Eli Zaretskii <eliz@gnu.org>
parents:
38698
diff
changeset
|
67 (= 1 (length (default-value 'tool-bar-map)))) ; not yet setup |
a9bd717014f0
(tool-bar-mode): Make it a no-op if images
Eli Zaretskii <eliz@gnu.org>
parents:
38698
diff
changeset
|
68 (tool-bar-setup)))) |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
69 |
32285 | 70 (defvar tool-bar-map (make-sparse-keymap) |
71 "Keymap for the tool bar. | |
72 Define this locally to override the global tool bar.") | |
73 | |
74 (global-set-key [tool-bar] | |
75 '(menu-item "tool bar" ignore | |
76 :filter (lambda (ignore) tool-bar-map))) | |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
77 |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
78 ;;;###autoload |
32285 | 79 (defun tool-bar-add-item (icon def key &rest props) |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
80 "Add an item to the tool bar. |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
81 ICON names the image, DEF is the key definition and KEY is a symbol |
32285 | 82 for the fake function key in the menu keymap. Remaining arguments |
83 PROPS are additional items to add to the menu item specification. See | |
84 Info node `(elisp)Tool Bar'. Items are added from left to right. | |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
85 |
35764
0a2ba9c8fde1
(tool-bar-add-item): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
34019
diff
changeset
|
86 ICON is the base name of a file containing the image to use. The |
0a2ba9c8fde1
(tool-bar-add-item): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
34019
diff
changeset
|
87 function will first try to use ICON.xpm, then ICON.pbm, and finally |
0a2ba9c8fde1
(tool-bar-add-item): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
34019
diff
changeset
|
88 ICON.xbm, using `find-image'. |
32285 | 89 |
90 Keybindings are made in the map `tool-bar-map'. To define items in | |
91 some local map, bind `tool-bar-map' with `let' around calls of this | |
92 function." | |
34019
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
93 (let* ((fg (face-attribute 'tool-bar :foreground)) |
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
94 (bg (face-attribute 'tool-bar :background)) |
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
95 (colors (nconc (if (eq fg 'unspecified) nil (list :foreground fg)) |
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
96 (if (eq bg 'unspecified) nil (list :background bg)))) |
32788 | 97 (image (find-image |
32358 | 98 (if (display-color-p) |
34019
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
99 (list (list :type 'xpm :file (concat icon ".xpm")) |
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
100 (append (list :type 'pbm :file (concat icon ".pbm")) |
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
101 colors) |
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
102 (append (list :type 'xbm :file (concat icon ".xbm")) |
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
103 colors)) |
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
104 (list (append (list :type 'pbm :file (concat icon ".pbm")) |
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
105 colors) |
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
106 (append (list :type 'xbm :file (concat icon ".xbm")) |
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
107 colors) |
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
108 (list :type 'xpm :file (concat icon ".xpm"))))))) |
38470
b8361f155685
(tool-bar-add-item-from-menu, tool-bar-add-item): Don't call image-related
Eli Zaretskii <eliz@gnu.org>
parents:
38436
diff
changeset
|
109 (when (and (display-images-p) image) |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
110 (unless (image-mask-p image) |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
111 (setq image (append image '(:mask heuristic)))) |
32285 | 112 (define-key-after tool-bar-map (vector key) |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
113 `(menu-item ,(symbol-name key) ,def :image ,image ,@props))))) |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
114 |
32340
97bfc5c6e1c1
(tool-bar-add-item-from-menu): Add autoload cookie.
Dave Love <fx@gnu.org>
parents:
32331
diff
changeset
|
115 ;;;###autoload |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
116 (defun tool-bar-add-item-from-menu (command icon &optional map &rest props) |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
117 "Define tool bar binding for COMMAND using the given ICON in keymap MAP. |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
118 The binding of COMMAND is looked up in the menu bar in MAP (default |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
119 `global-map') and modified to add an image specification for ICON, which |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
120 is looked for as by `tool-bar-add-item'. |
32285 | 121 MAP must contain an appropriate keymap bound to `[menu-bar]'. |
122 PROPS is a list of additional properties to add to the binding. | |
123 | |
124 Keybindings are made in the map `tool-bar-map'. To define items in | |
125 some local map, bind `tool-bar-map' with `let' around calls of this | |
126 function." | |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
127 (unless map |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
128 (setq map global-map)) |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
129 (let* ((menu-bar-map (lookup-key map [menu-bar])) |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
130 (keys (where-is-internal command menu-bar-map)) |
34019
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
131 (fg (face-attribute 'tool-bar :foreground)) |
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
132 (bg (face-attribute 'tool-bar :background)) |
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
133 (colors (nconc (if (eq fg 'unspecified) nil (list :foreground fg)) |
3d6f9638e8e5
(tool-bar-add-item-from-menu): Use
Gerd Moellmann <gerd@gnu.org>
parents:
34004
diff
changeset
|
134 (if (eq bg 'unspecified) nil (list :background bg)))) |
33895
3683396305bc
(tool-bar-add-item-from-menu): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
33574
diff
changeset
|
135 (spec (if (display-color-p) |
3683396305bc
(tool-bar-add-item-from-menu): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
33574
diff
changeset
|
136 (list (list :type 'xpm :file (concat icon ".xpm")) |
3683396305bc
(tool-bar-add-item-from-menu): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
33574
diff
changeset
|
137 (append (list :type 'pbm :file (concat icon ".pbm")) |
3683396305bc
(tool-bar-add-item-from-menu): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
33574
diff
changeset
|
138 colors) |
3683396305bc
(tool-bar-add-item-from-menu): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
33574
diff
changeset
|
139 (append (list :type 'xbm :file (concat icon ".xbm")) |
3683396305bc
(tool-bar-add-item-from-menu): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
33574
diff
changeset
|
140 colors)) |
3683396305bc
(tool-bar-add-item-from-menu): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
33574
diff
changeset
|
141 (list (append (list :type 'pbm :file (concat icon ".pbm")) |
3683396305bc
(tool-bar-add-item-from-menu): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
33574
diff
changeset
|
142 colors) |
3683396305bc
(tool-bar-add-item-from-menu): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
33574
diff
changeset
|
143 (append (list :type 'xbm :file (concat icon ".xbm")) |
3683396305bc
(tool-bar-add-item-from-menu): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
33574
diff
changeset
|
144 colors) |
3683396305bc
(tool-bar-add-item-from-menu): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
33574
diff
changeset
|
145 (list :type 'xpm :file (concat icon ".xpm"))))) |
3683396305bc
(tool-bar-add-item-from-menu): Handle case
Gerd Moellmann <gerd@gnu.org>
parents:
33574
diff
changeset
|
146 (image (find-image spec)) |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
147 submap key) |
38470
b8361f155685
(tool-bar-add-item-from-menu, tool-bar-add-item): Don't call image-related
Eli Zaretskii <eliz@gnu.org>
parents:
38436
diff
changeset
|
148 (when (and (display-images-p) image) |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
149 ;; We'll pick up the last valid entry in the list of keys if |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
150 ;; there's more than one. |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
151 (dolist (k keys) |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
152 ;; We're looking for a binding of the command in a submap of |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
153 ;; the menu bar map, so the key sequence must be two or more |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
154 ;; long. |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
155 (if (and (vectorp k) |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
156 (> (length k) 1)) |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
157 (let ((m (lookup-key menu-bar-map (substring k 0 -1))) |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
158 ;; Last element in the bound key sequence: |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
159 (kk (aref k (1- (length k))))) |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
160 (if (and (keymapp m) |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
161 (symbolp kk)) |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
162 (setq submap m |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
163 key kk))))) |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
164 (when (and (symbolp submap) (boundp submap)) |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
165 (setq submap (eval submap))) |
31751
3c4b8a33fed9
Reapply Gerd's change from 2000-09-18, which seems to have gotten lost:
Miles Bader <miles@gnu.org>
parents:
31738
diff
changeset
|
166 (unless (image-mask-p image) |
3c4b8a33fed9
Reapply Gerd's change from 2000-09-18, which seems to have gotten lost:
Miles Bader <miles@gnu.org>
parents:
31738
diff
changeset
|
167 (setq image (append image '(:mask heuristic)))) |
38698
0d7cddbc0fa7
(tool-bar-add-item-from-menu): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
38470
diff
changeset
|
168 (let ((defn (assq key (cdr submap)))) |
0d7cddbc0fa7
(tool-bar-add-item-from-menu): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
38470
diff
changeset
|
169 (if (eq (cadr defn) 'menu-item) |
0d7cddbc0fa7
(tool-bar-add-item-from-menu): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
38470
diff
changeset
|
170 (define-key-after tool-bar-map (vector key) |
0d7cddbc0fa7
(tool-bar-add-item-from-menu): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
38470
diff
changeset
|
171 (append (cdr defn) (list :image image) props)) |
0d7cddbc0fa7
(tool-bar-add-item-from-menu): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
38470
diff
changeset
|
172 (setq defn (cdr defn)) |
0d7cddbc0fa7
(tool-bar-add-item-from-menu): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
38470
diff
changeset
|
173 (define-key-after tool-bar-map (vector key) |
0d7cddbc0fa7
(tool-bar-add-item-from-menu): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
38470
diff
changeset
|
174 (append `(menu-item ,(car defn) ,(cddr defn)) |
0d7cddbc0fa7
(tool-bar-add-item-from-menu): Handle
Gerd Moellmann <gerd@gnu.org>
parents:
38470
diff
changeset
|
175 (list :image image) props))))))) |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
176 |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
177 ;;; Set up some global items. Additions/deletions up for grabs. |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
178 |
32124 | 179 (defun tool-bar-setup () |
38144
ef9d470d0fd1
(tool-bar-setup): Remove the EXIT button.
Eli Zaretskii <eliz@gnu.org>
parents:
36715
diff
changeset
|
180 ;; People say it's bad to have EXIT on the tool bar, since users |
ef9d470d0fd1
(tool-bar-setup): Remove the EXIT button.
Eli Zaretskii <eliz@gnu.org>
parents:
36715
diff
changeset
|
181 ;; might inadvertently click that button. |
ef9d470d0fd1
(tool-bar-setup): Remove the EXIT button.
Eli Zaretskii <eliz@gnu.org>
parents:
36715
diff
changeset
|
182 ;;(tool-bar-add-item-from-menu 'save-buffers-kill-emacs "exit") |
32124 | 183 (tool-bar-add-item-from-menu 'find-file "new") |
184 (tool-bar-add-item-from-menu 'dired "open") | |
185 (tool-bar-add-item-from-menu 'kill-this-buffer "close") | |
186 (tool-bar-add-item-from-menu 'save-buffer "save" nil | |
36715
2b98ff02ebaf
(tool-bar-setup): Don't suppress write-file
Dave Love <fx@gnu.org>
parents:
35764
diff
changeset
|
187 :visible '(or buffer-file-name |
2b98ff02ebaf
(tool-bar-setup): Don't suppress write-file
Dave Love <fx@gnu.org>
parents:
35764
diff
changeset
|
188 (not (eq 'special |
2b98ff02ebaf
(tool-bar-setup): Don't suppress write-file
Dave Love <fx@gnu.org>
parents:
35764
diff
changeset
|
189 (get major-mode |
2b98ff02ebaf
(tool-bar-setup): Don't suppress write-file
Dave Love <fx@gnu.org>
parents:
35764
diff
changeset
|
190 'mode-class))))) |
32124 | 191 (tool-bar-add-item-from-menu 'write-file "saveas" nil |
36715
2b98ff02ebaf
(tool-bar-setup): Don't suppress write-file
Dave Love <fx@gnu.org>
parents:
35764
diff
changeset
|
192 :visible '(or buffer-file-name |
2b98ff02ebaf
(tool-bar-setup): Don't suppress write-file
Dave Love <fx@gnu.org>
parents:
35764
diff
changeset
|
193 (not (eq 'special |
2b98ff02ebaf
(tool-bar-setup): Don't suppress write-file
Dave Love <fx@gnu.org>
parents:
35764
diff
changeset
|
194 (get major-mode |
2b98ff02ebaf
(tool-bar-setup): Don't suppress write-file
Dave Love <fx@gnu.org>
parents:
35764
diff
changeset
|
195 'mode-class))))) |
32124 | 196 (tool-bar-add-item-from-menu 'undo "undo" nil |
197 :visible '(not (eq 'special (get major-mode | |
198 'mode-class)))) | |
199 (tool-bar-add-item-from-menu 'kill-region "cut" nil | |
200 :visible '(not (eq 'special (get major-mode | |
201 'mode-class)))) | |
202 (tool-bar-add-item-from-menu 'menu-bar-kill-ring-save "copy") | |
203 (tool-bar-add-item-from-menu 'yank "paste" nil | |
204 :visible '(not (eq 'special (get major-mode | |
205 'mode-class)))) | |
206 (tool-bar-add-item-from-menu 'nonincremental-search-forward "search") | |
207 ;;(tool-bar-add-item-from-menu 'ispell-buffer "spell") | |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
208 |
32124 | 209 ;; There's no icon appropriate for News and we need a command rather |
210 ;; than a lambda for Read Mail. | |
211 ;;(tool-bar-add-item-from-menu 'compose-mail "mail_compose") | |
31895
6d04db7a9256
(tool-bar-help): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31751
diff
changeset
|
212 |
32124 | 213 (tool-bar-add-item-from-menu 'print-buffer "print") |
32285 | 214 (tool-bar-add-item "preferences" 'customize 'customize |
32124 | 215 :help "Edit preferences (customize)") |
31895
6d04db7a9256
(tool-bar-help): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
31751
diff
changeset
|
216 |
32285 | 217 (tool-bar-add-item "help" (lambda () |
218 (interactive) | |
219 (popup-menu menu-bar-help-menu)) | |
220 'help | |
221 :help "Pop up the Help menu") | |
32124 | 222 ) |
31738
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
223 |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
224 (provide 'tool-bar) |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
225 |
e8458588eb55
Renamed from toolbar.el. Change `toolbar'
Dave Love <fx@gnu.org>
parents:
diff
changeset
|
226 ;;; tool-bar.el ends here |