From: Reiner Steib Date: Tue, 21 Feb 2006 21:25:18 +0000 (+0000) Subject: * gnus-group.el (gnus-group-tool-bar-gnome): Use new icon names. X-Git-Url: https://cgit.sxemacs.org/?a=commitdiff_plain;h=0fbcec8ba5aa2436ea176f782c9396d3d80fe362;p=gnus * gnus-group.el (gnus-group-tool-bar-gnome): Use new icon names. (gnus-group-make-tool-bar): Use `gmm-image-load-path'. * gnus-sum.el (gnus-summary-tool-bar-gnome): Use new icon names. (gnus-summary-make-tool-bar): Use `gmm-image-load-path'. * message.el (message-tool-bar-gnome): Use new icon names. (message-make-tool-bar): Use `gmm-image-load-path'. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8dd6c636b..212638d4c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,14 @@ 2006-02-21 Reiner Steib + * gnus-group.el (gnus-group-tool-bar-gnome): Use new icon names. + (gnus-group-make-tool-bar): Use `gmm-image-load-path'. + + * gnus-sum.el (gnus-summary-tool-bar-gnome): Use new icon names. + (gnus-summary-make-tool-bar): Use `gmm-image-load-path'. + + * message.el (message-tool-bar-gnome): Use new icon names. + (message-make-tool-bar): Use `gmm-image-load-path'. + * gmm-utils.el (gmm-defun-compat, gmm-image-search-load-path): New functions from MH-E. (gmm-image-load-path): New variable from MH-E. diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index 286bd7eca..8a255e972 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -1030,15 +1030,15 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and :group 'gnus-group) (defcustom gnus-group-tool-bar-gnome - '((gnus-group-post-news "compose") - (gnus-group-get-new-news "inbox") ;; Add... nil :visible gnus-plugged ? + '((gnus-group-post-news "mail/compose") + (gnus-group-get-new-news "mail/inbox") ;; Add... nil :visible gnus-plugged ? ;; FIXME: gnus-*-read-group should have a better help text. (gnus-topic-read-group "open" nil :visible gnus-topic-mode) (gnus-group-read-group "open" nil :visible (not gnus-topic-mode)) ;; (gnus-group-find-new-groups "???" nil) (gnus-group-save-newsrc "save") (gnus-group-describe-group "describe") - (gnus-group-unsubscribe-current-group "toggle-subscription") + (gnus-group-unsubscribe-current-group "gnus/toggle-subscription") ;; (gnus-group-subscribe "subscribe" t ;; :help "Subscribe to the current group") ;; (gnus-group-unsubscribe "unsubscribe" t @@ -1046,7 +1046,7 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and ;; ;; Some useful agent icons? I don't use the agent so agent users should ;; suggest useful commands: - (gnus-group-send-queue "outbox" t + (gnus-group-send-queue "mail/outbox" t :visible (and gnus-agent gnus-plugged) :help "Send articles from the queue group") (gnus-agent-toggle-plugged "connect" nil @@ -1054,7 +1054,7 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and (gnus-agent-toggle-plugged "disconnect" nil :visible (and gnus-agent gnus-plugged)) ;; - (gnus-group-exit "exit-mode") + (gnus-group-exit "exit") (gnus-info-find-node "help")) "List of functions for the group tool bar (GNOME style). @@ -1115,7 +1115,8 @@ When FORCE, rebuild the tool bar." ;; The Gnus 5.10.6 code checked (default-value 'tool-bar-mode). ;; Why? --rsteib (or (not gnus-group-tool-bar-map) force)) - (let* ((load-path (mm-image-load-path)) + (let* ((load-path (gmm-image-load-path "gnus" nil 'load-path)) + (image-load-path (gmm-image-load-path "gnus" nil 'image-load-path)) (map (gmm-tool-bar-from-list gnus-group-tool-bar gnus-group-tool-bar-zap-list 'gnus-group-mode-map))) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index b1e1cc811..6c39ee296 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -2670,13 +2670,13 @@ Pre-defined symbols include `gnus-summary-tool-bar-gnome' and :group 'gnus-summary) (defcustom gnus-summary-tool-bar-gnome - '((gnus-summary-post-news "compose" nil) - (gnus-summary-reply-with-original "reply-author") - (gnus-summary-reply "reply-author" nil :visible nil) - (gnus-summary-followup-with-original "reply-all") - (gnus-summary-followup "reply-all" nil :visible nil) - (gnus-summary-mail-forward "forward") - (gnus-summary-save-article "save") ;; stock_mail-copy + '((gnus-summary-post-news "mail/compose" nil) + (gnus-summary-reply-with-original "mail/reply") + (gnus-summary-reply "mail/reply" nil :visible nil) + (gnus-summary-followup-with-original "mail/reply-all") + (gnus-summary-followup "mail/reply-all" nil :visible nil) + (gnus-summary-mail-forward "mail/forward") + (gnus-summary-save-article "mail/save") (gnus-summary-search-article-forward "search") (gnus-summary-print-article "print") (gnus-summary-mark-as-expirable @@ -2685,10 +2685,10 @@ Pre-defined symbols include `gnus-summary-tool-bar-gnome' and gnus-newsgroup-name)) (gnus-summary-tick-article-forward "flag-followup" nil :visible nil) (gnus-summary-mark-as-spam - "spam" t :visible (spam-group-ham-contents-p gnus-newsgroup-name) + "mail/spam" t :visible (spam-group-ham-contents-p gnus-newsgroup-name) :help "Mark as spam") (gnus-summary-mark-as-read-forward - "not-spam" nil :visible (spam-group-spam-contents-p gnus-newsgroup-name)) + "mail/not-spam" nil :visible (spam-group-spam-contents-p gnus-newsgroup-name)) ;; Some new commands that may need more suitable icons: (gnus-summary-save-newsrc "save" nil :visible nil) ;; (gnus-summary-show-article "stock_message-display" nil :visible nil) @@ -2702,9 +2702,9 @@ Pre-defined symbols include `gnus-summary-tool-bar-gnome' and (gnus-summary-sort-by-author "sort-a-z" nil :visible nil) (gnus-summary-sort-by-date "sort-1-9" nil :visible nil) ;; - (gnus-summary-insert-new-articles "inbox") + (gnus-summary-insert-new-articles "mail/inbox") ;; - (gnus-summary-exit "exit-mode") + (gnus-summary-exit "exit") ;; (customize-group 'gnus-summary) "preferences" (gnus-info-find-node "help")) "List of functions for the summary tool bar (GNOME style). @@ -2769,7 +2769,8 @@ When FORCE, rebuild the tool bar." (boundp 'tool-bar-mode) tool-bar-mode (or (not gnus-summary-tool-bar-map) force)) - (let* ((load-path (mm-image-load-path)) + (let* ((load-path (gmm-image-load-path "gnus" nil 'load-path)) + (image-load-path (gmm-image-load-path "gnus" nil 'image-load-path)) (map (gmm-tool-bar-from-list gnus-summary-tool-bar gnus-summary-tool-bar-zap-list 'gnus-summary-mode-map))) diff --git a/lisp/message.el b/lisp/message.el index d4592fd8d..8cc106e65 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -6739,16 +6739,16 @@ Pre-defined symbols include `message-tool-bar-gnome' and ;; http://thread.gmane.org/gmane.emacs.gnus.general/61719 (defcustom message-tool-bar-gnome '((gmm-ignore "separator") - (message-send-and-exit "send") - (message-dont-send "save-draft") + (message-send-and-exit "mail/send") + (message-dont-send "mail/save-draft") (message-kill-buffer "close") ;; stock_cancel - (mml-attach-file "attach" mml-mode-map) + (mml-attach-file "mail/attach" mml-mode-map) (ispell-message "spell" nil :visible (not flyspell-mode)) (flyspell-buffer "spell" t :visible flyspell-mode :help "Flyspell whole buffer") ;; We should have a mail-preview icon with an envelope like the one in ;; stock_mail-reply. - (mml-preview "mail-preview" mml-mode-map) + (mml-preview "mail/preview" mml-mode-map) (mml-secure-message-sign-encrypt "lock" mml-mode-map :visible nil) (message-insert-importance-high "important" nil :visible nil) (message-insert-importance-low "unimportant" nil :visible nil) @@ -6803,7 +6803,9 @@ When FORCE, rebuild the tool bar." tool-bar-mode (or (not message-tool-bar-map) force)) (setq message-tool-bar-map - (let ((load-path (mm-image-load-path))) + (let ((load-path (gmm-image-load-path "message" nil 'load-path)) + (image-load-path + (gmm-image-load-path "message" nil 'image-load-path))) (gmm-tool-bar-from-list message-tool-bar message-tool-bar-zap-list 'message-mode-map))))