Mercurial > hg > xemacs-beta
comparison lisp/x11/x-toolbar.el @ 10:49a24b4fd526 r19-15b6
Import from CVS: tag r19-15b6
author | cvs |
---|---|
date | Mon, 13 Aug 2007 08:47:52 +0200 |
parents | b82b59fe008d |
children | 9ee227acff29 |
comparison
equal
deleted
inserted
replaced
9:6f2bbbbbe05a | 10:49a24b4fd526 |
---|---|
51 (if (or (not toolbar-mail-frame) | 51 (if (or (not toolbar-mail-frame) |
52 (not (frame-live-p toolbar-mail-frame))) | 52 (not (frame-live-p toolbar-mail-frame))) |
53 (progn | 53 (progn |
54 (setq toolbar-mail-frame (make-frame)) | 54 (setq toolbar-mail-frame (make-frame)) |
55 (add-hook 'vm-quit-hook | 55 (add-hook 'vm-quit-hook |
56 '(lambda () | 56 (lambda () |
57 (save-excursion | 57 (save-excursion |
58 (if (frame-live-p toolbar-mail-frame) | 58 (if (frame-live-p toolbar-mail-frame) |
59 (delete-frame toolbar-mail-frame))))) | 59 (delete-frame toolbar-mail-frame))))) |
60 (select-frame toolbar-mail-frame) | 60 (select-frame toolbar-mail-frame) |
61 (raise-frame toolbar-mail-frame) | 61 (raise-frame toolbar-mail-frame) |
62 (funcall toolbar-mail-command))) | 62 (funcall toolbar-mail-command))) |
63 (if (frame-iconified-p toolbar-mail-frame) | 63 (if (frame-iconified-p toolbar-mail-frame) |
64 (deiconify-frame toolbar-mail-frame)) | 64 (deiconify-frame toolbar-mail-frame)) |
122 | 122 |
123 (defvar toolbar-news-frame nil | 123 (defvar toolbar-news-frame nil |
124 "The frame in which news is displayed.") | 124 "The frame in which news is displayed.") |
125 | 125 |
126 (defun toolbar-news () | 126 (defun toolbar-news () |
127 "Run GNUS in a separate frame." | 127 "Run Gnus in a separate frame." |
128 (interactive) | 128 (interactive) |
129 (if (or (not toolbar-news-frame) | 129 (when (or (not toolbar-news-frame) |
130 (not (frame-live-p toolbar-news-frame))) | 130 (not (frame-live-p toolbar-news-frame))) |
131 (progn | 131 (setq toolbar-news-frame (make-frame)) |
132 (setq toolbar-news-frame (make-frame)) | 132 (add-hook 'gnus-exit-gnus-hook |
133 (add-hook 'gnus-exit-gnus-hook | 133 (lambda () |
134 '(lambda () | 134 (when (frame-live-p toolbar-news-frame) |
135 (if (frame-live-p toolbar-news-frame) | 135 (if (cdr (frame-list)) |
136 (delete-frame toolbar-news-frame)))) | 136 (delete-frame toolbar-news-frame)) |
137 (select-frame toolbar-news-frame) | 137 (setq toolbar-news-frame nil)))) |
138 (raise-frame toolbar-news-frame) | 138 (select-frame toolbar-news-frame) |
139 (gnus))) | 139 (raise-frame toolbar-news-frame) |
140 (gnus)) | |
140 (if (frame-iconified-p toolbar-news-frame) | 141 (if (frame-iconified-p toolbar-news-frame) |
141 (deiconify-frame toolbar-news-frame)) | 142 (deiconify-frame toolbar-news-frame)) |
142 (select-frame toolbar-news-frame) | 143 (select-frame toolbar-news-frame) |
143 (raise-frame toolbar-news-frame)) | 144 (raise-frame toolbar-news-frame)) |
144 | 145 |
204 (toolbar-debug-icon . "debug") | 205 (toolbar-debug-icon . "debug") |
205 (toolbar-news-icon . "news"))) | 206 (toolbar-news-icon . "news"))) |
206 | 207 |
207 (defun init-x-toolbar () | 208 (defun init-x-toolbar () |
208 (mapcar | 209 (mapcar |
209 #'(lambda (cons) | 210 (lambda (cons) |
210 (let ((prefix (expand-file-name (cdr cons) toolbar-icon-directory))) | 211 (let ((prefix (expand-file-name (cdr cons) toolbar-icon-directory))) |
211 (set (car cons) | 212 (set (car cons) |
212 (if (featurep 'xpm) | 213 (if (featurep 'xpm) |
213 (toolbar-make-button-list | 214 (toolbar-make-button-list |
214 (concat prefix "-up.xpm") | 215 (concat prefix "-up.xpm") |
215 nil | 216 nil |
216 (concat prefix "-xx.xpm") | 217 (concat prefix "-xx.xpm") |
217 (concat prefix "-cap-up.xpm") | 218 (concat prefix "-cap-up.xpm") |
218 nil | 219 nil |
219 (concat prefix "-cap-xx.xpm")) | 220 (concat prefix "-cap-xx.xpm")) |
220 (toolbar-make-button-list | 221 (toolbar-make-button-list |
221 (concat prefix "-up.xbm") | 222 (concat prefix "-up.xbm") |
222 (concat prefix "-dn.xbm") | 223 (concat prefix "-dn.xbm") |
223 (concat prefix "-xx.xbm") | 224 (concat prefix "-xx.xbm") |
224 ))))) | 225 ))))) |
225 init-x-toolbar-list) | 226 init-x-toolbar-list) |
226 ;; do this now because errors will occur if the icon symbols | 227 ;; do this now because errors will occur if the icon symbols |
227 ;; are not initted | 228 ;; are not initted |
228 (set-specifier default-toolbar initial-toolbar-spec)) | 229 (set-specifier default-toolbar initial-toolbar-spec)) |
229 | 230 |