+2006-03-07 Reiner Steib <Reiner.Steib@gmx.de>
+
+ * etc/images/README: Add GIMP script.
+ (attach.xpm): Move to top level.
+ (sort-*.xpm) Add.
+
+ * etc/images/sort-ascending.xpm,
+ etc/images/sort-column-ascending.xpm,
+ etc/images/sort-criteria.xpm, etc/images/sort-descending.xpm,
+ etc/images/sort-row-ascending.xpm: New icons from GNOME 2.6.
+
2006-03-06 Reiner Steib <Reiner.Steib@gmx.de>
* GNUS-NEWS: Generated.
The following icons are from GNOME 2.6:
+ attach.xpm (stock_attach)
connect.xpm (stock_connect)
contact.xpm (stock_contact)
delete.xpm (stock_delete)
lock.xpm (stock_lock)
next-page.xpm (stock_next-page)
refresh.xpm (stock_refresh)
-
+ sort-ascending.xpm (stock_sort-ascending)
+ sort-column-ascending.xpm (stock_sort-column-ascending)
+ sort-criteria.xpm (stock_sort-criteria)
+ sort-descending.xpm (stock_sort-descending)
+ sort-row-ascending.xpm (stock_sort-row-ascending)
gnus/toggle-subscription.xpm (stock_task-recurring)
- mail/attach.xpm (stock_attach)
mail/compose.xpm (stock_mail-compose)
mail/copy.xpm (stock_mail-copy)
mail/forward.xpm (stock_mail-forward)
mail/send.xpm (stock_mail-send)
mail/spam.xpm (stock_spam)
-The following icons were contributed by from Adam Sjøgren <asjo@koldfront.dk>:
+
+The following icons were contributed by Adam Sjøgren <asjo@koldfront.dk>:
mail/preview.xpm (combining stock_mail and stock_zoom)
mail/save.xpm (combining stock_mail, stock_save and stock_convert)
+
The following icon is from AUCTeX:
separator.xpm (sep.xpm)
save.xpm
search.xpm
+
+The GNOME's stock_*.png files were converted to XPM using the following GIMP
+script:
+
+;; -*- scheme -*-
+;; Put this file in ~/.gimp-*/scripts/
+;; gimp -i -b '(rs-save-as-xpm "foo.png" "foo.xpm" 127)' '(gimp-quit 0)'
+(define (rs-save-as-xpm filename filename2 threshold)
+ (let* ((image (car (gimp-file-load RUN-NONINTERACTIVE filename filename)))
+ (drawable (car (gimp-image-get-active-layer image))))
+ (file-xpm-save RUN-NONINTERACTIVE image drawable
+ filename2 filename2 threshold)
+ (gimp-image-delete image)))
+;; end
--- /dev/null
+/* XPM */
+static char * stock_attach_xpm[] = {
+"24 24 99 2",
+" c None",
+". c #000000",
+"+ c #010101",
+"@ c #515151",
+"# c #9A9A9A",
+"$ c #CFCFCF",
+"% c #6F6F6F",
+"& c #464646",
+"* c #A5A5A5",
+"= c #E2E2E2",
+"- c #FFFFFF",
+"; c #F6F6F6",
+"> c #8A8A8A",
+", c #393939",
+"' c #1C1C1C",
+") c #8B8B8B",
+"! c #E6E6E6",
+"~ c #EEEEEE",
+"{ c #E1E1E1",
+"] c #F8F8F8",
+"^ c #F7F7F7",
+"/ c #CCCCCC",
+"( c #565656",
+"_ c #3E3E3E",
+": c #818181",
+"< c #D4D4D4",
+"[ c #E7E7E7",
+"} c #D7D7D7",
+"| c #FAFAFA",
+"1 c #F9F9F9",
+"2 c #C2C2C2",
+"3 c #CBCBCB",
+"4 c #F5F5F5",
+"5 c #D9D9D9",
+"6 c #030303",
+"7 c #545454",
+"8 c #DEDEDE",
+"9 c #B3B3B3",
+"0 c #797979",
+"a c #F4F4F4",
+"b c #9D9D9D",
+"c c #282828",
+"d c #FBFBFB",
+"e c #A6A6A6",
+"f c #C5C5C5",
+"g c #F0F0F0",
+"h c #CACACA",
+"i c #C7C7C7",
+"j c #F2F2F2",
+"k c #CECECE",
+"l c #C4C4C4",
+"m c #D5D5D5",
+"n c #DADADA",
+"o c #F3F3F3",
+"p c #858585",
+"q c #BEBEBE",
+"r c #D3D3D3",
+"s c #DCDCDC",
+"t c #9C9C9C",
+"u c #484848",
+"v c #A7A7A7",
+"w c #D6D6D6",
+"x c #C8C8C8",
+"y c #C6C6C6",
+"z c #4C4C4C",
+"A c #EAEAEA",
+"B c #E5E5E5",
+"C c #D8D8D8",
+"D c #ADADAD",
+"E c #BCBCBC",
+"F c #E0E0E0",
+"G c #F1F1F1",
+"H c #909090",
+"I c #686868",
+"J c #A2A2A2",
+"K c #C0C0C0",
+"L c #C1C1C1",
+"M c #787878",
+"N c #AEAEAE",
+"O c #151515",
+"P c #D0D0D0",
+"Q c #979797",
+"R c #727272",
+"S c #4A4A4A",
+"T c #ECECEC",
+"U c #ACACAC",
+"V c #BABABA",
+"W c #DDDDDD",
+"X c #DBDBDB",
+"Y c #B1B1B1",
+"Z c #232323",
+"` c #696969",
+" . c #B7B7B7",
+".. c #828282",
+"+. c #404040",
+"@. c #969696",
+"#. c #323232",
+"$. c #E8E8E8",
+"%. c #121212",
+" ",
+" . . . . . ",
+" . . . . ",
+" . + @ # $ % . ",
+" . . & * = - - ; > , ",
+" . ' ) ! ~ { - ] ^ ; / ( ",
+" . _ : < ' [ } | 1 ] 2 3 4 5 : . ",
+" 6 7 ! - - - . } 8 9 0 . = ; 4 a b c ",
+" . ; - - | | d . e f g ] . = 2 h a i ( ",
+" . j ] 1 k l f . m 1 ] ] . 9 n a o o 0 . ",
+" p - ] q 1 1 . r s 2 2 . = 4 a o j t c ",
+" u - ^ ^ ] ] . v w ^ ; . = a l x j y z ",
+" . A - ; q 2 . B C ; 4 . D E A F G A H . ",
+" I - 4 ; ; J . K L . M w o j G G m N O ",
+" , - a 4 4 n # . . 0 w j j G w P Q R S ",
+" . T - a U V W o k X T } w Y : ( Z . ",
+" ` - o o o o j j } ...+.Z . . ",
+" c - o j j } q @.#.Z . ",
+" . ! $./ # +.Z . . ",
+" , .., %.. ",
+" . . ",
+" ",
+" ",
+" "};
--- /dev/null
+/* XPM */
+static char * stock_sort_ascending_xpm[] = {
+"23 23 7 1",
+" c None",
+". c #314E6C",
+"+ c #000000",
+"@ c #D1DECF",
+"# c #7DA377",
+"$ c #E4ECE3",
+"% c #B3C9AF",
+" ",
+" .... ",
+" .. .. ",
+" .. .. ",
+" ...... ",
+" .. .. ",
+" .. .. ",
+" ",
+" + ",
+" ",
+" + ",
+" ",
+" + + ",
+" +@+ + ",
+" +@##+ ++ ++++++ ",
+" +###+$+ +++ ",
+" +##%#+ +++ ",
+" +%##+ +++ ",
+" +$###+ +++ ",
+" +++++++ ++++++ ",
+" ",
+" ",
+" "};
--- /dev/null
+/* XPM */
+static char * stock_sort_column_ascending_xpm[] = {
+"24 24 2 1",
+" c None",
+". c #000000",
+" ",
+" ",
+" ... ",
+" . .. ",
+" .. ",
+" .. ",
+" .. ",
+" .. ",
+" .. ",
+" ..... . ",
+" ",
+" . ",
+" ",
+" . ",
+" .... ",
+" .. .. ",
+" .. .. ",
+" .. .. ",
+" ..... ",
+" .. ",
+" . ... ",
+" ..... ",
+" ",
+" "};
--- /dev/null
+/* XPM */
+static char * stock_sort_criteria_xpm[] = {
+"24 24 28 1",
+" c None",
+". c #000000",
+"+ c #FFFFFF",
+"@ c #D3D3D3",
+"# c #F2ECE1",
+"$ c #F4EFE5",
+"% c #DFDAD2",
+"& c #C9C4BD",
+"* c #74716E",
+"= c #FAFAFA",
+"- c #EADFC9",
+"; c #ECE2CF",
+"> c #EEE5D4",
+", c #4C4B48",
+"' c #F5F5F5",
+") c #C9C9C9",
+"! c #E2D2B1",
+"~ c #CFC4B1",
+"{ c #BFBFBF",
+"] c #C0C0C0",
+"^ c #C7B99C",
+"/ c #F0F0F0",
+"( c #B7B7B7",
+"_ c #9A8F78",
+": c #877E69",
+"< c #AFA389",
+"[ c #A09889",
+"} c #314E6C",
+" ",
+" ",
+" ...... ",
+" ... ",
+" ... ",
+" ... ",
+" ......... ... ",
+" .+@.#$%&*. ...... ",
+" .=@.-;;;>, ",
+" .').!!!!.~. ",
+" .{].^^!.^.~. ",
+" ./(.._.^.:.~. ",
+" .....<.:...[. ",
+" .:.. .. ",
+" .. ",
+" ",
+" }}}} ",
+" }} }} ",
+" }} }} ",
+" }}}}}} ",
+" }} }} ",
+" }} }} ",
+" ",
+" "};
--- /dev/null
+/* XPM */
+static char * stock_sort_descending_xpm[] = {
+"24 23 7 1",
+" c None",
+". c #000000",
+"+ c #D1DECF",
+"@ c #7DA377",
+"# c #314E6C",
+"$ c #E4ECE3",
+"% c #B3C9AF",
+" ",
+" ",
+" ...... ",
+" ... ",
+" ... ",
+" ... ",
+" ... ",
+" ...... ",
+" . ",
+" ",
+" . ",
+" ",
+" . . ",
+" .+. . ",
+" .+@@. .. #### ",
+" .@@@.$. ## ## ",
+" .@@%@. ## ## ",
+" .%@@. ###### ",
+" .$@@@. ## ## ",
+" ....... ## ## ",
+" ",
+" ",
+" "};
--- /dev/null
+/* XPM */
+static char * stock_sort_row_ascending_xpm[] = {
+"21 17 2 1",
+" c None",
+". c #000000",
+" ",
+" ",
+" ",
+" ",
+" ... .... ",
+" . .. .. .. ",
+" .. .. .. ",
+" .. .. .. ",
+" .. ..... ",
+" .. .. ",
+" .. . .. ",
+" ..... . . . ..... ",
+" ",
+" ",
+" ",
+" ",
+" "};
+2006-03-07 Reiner Steib <Reiner.Steib@gmx.de>
+
+ * message.el (message-make-tool-bar): Rename gmm-image-load-path
+ to gmm-image-load-path-for-library. Call with no-error argument.
+ (message-tool-bar-gnome): Rename "mail/attach" to "attach".
+
+ * gnus-sum.el (gnus-summary-make-tool-bar): Ditto.
+
+ * gnus-group.el (gnus-group-make-tool-bar): Ditto.
+
+ * gmm-utils.el (gmm-image-load-path): Remove alias.
+
2006-03-06 Reiner Steib <Reiner.Steib@gmx.de>
* gmm-utils.el (gmm-image-load-path): Add alias.
(nconc (list image-directory)
(delete image-directory (copy-sequence load-path)))))))
-;; No time to do it right ATM, sorry...
-(defalias 'gmm-image-load-path 'gmm-image-load-path-for-library)
-
(defun gmm-customize-mode (&optional mode)
"Customize customization group for MODE.
If mode is nil, use `major-mode' of the curent buffer."
(when gnus-group-redraw-when-idle
(add-hook 'post-command-hook 'gnus-group-redraw-check nil t))
(let* ((load-path
- (gmm-image-load-path "gnus" "gnus/toggle-subscription.xpm"
- 'load-path))
+ (gmm-image-load-path-for-library "gnus"
+ "gnus/toggle-subscription.xpm"
+ nil t))
(image-load-path
- (gmm-image-load-path "gnus" "gnus/toggle-subscription.xpm"
- 'image-load-path))
+ (gmm-image-load-path-for-library "gnus"
+ "gnus/toggle-subscription.xpm"
+ 'image-load-path t))
(map (gmm-tool-bar-from-list gnus-group-tool-bar
gnus-group-tool-bar-zap-list
'gnus-group-mode-map)))
tool-bar-mode
(or (not gnus-summary-tool-bar-map) force))
(let* ((load-path
- (gmm-image-load-path "gnus" "mail/save.xpm" 'load-path))
+ (gmm-image-load-path-for-library "gnus"
+ "mail/save.xpm"
+ nil t))
(image-load-path
- (gmm-image-load-path "gnus" "mail/save.xpm" 'image-load-path))
+ (gmm-image-load-path-for-library "gnus"
+ "mail/save.xpm"
+ 'image-load-path t))
(map (gmm-tool-bar-from-list gnus-summary-tool-bar
gnus-summary-tool-bar-zap-list
'gnus-summary-mode-map)))
(message-send-and-exit "mail/send")
(message-dont-send "mail/save-draft")
(message-kill-buffer "close") ;; stock_cancel
- (mime-edit-insert-file "mail/attach" mime-edit-mode-map)
+ (mime-edit-insert-file "attach" mime-edit-mode-map)
(ispell-message "spell" nil :visible (not flyspell-mode))
(flyspell-buffer "spell" t :visible flyspell-mode
:help "Flyspell whole buffer")
(or (not message-tool-bar-map) force))
(setq message-tool-bar-map
(let ((load-path
- (gmm-image-load-path "message" "mail/save-draft.xpm"
- 'load-path))
+ (gmm-image-load-path-for-library "message"
+ "mail/save-draft.xpm"
+ nil t))
(image-load-path
- (gmm-image-load-path "message" "mail/save-draft.xpm"
- 'image-load-path)))
+ (gmm-image-load-path-for-library "message"
+ "mail/save-draft.xpm"
+ 'image-load-path t)))
(gmm-tool-bar-from-list message-tool-bar
message-tool-bar-zap-list
'message-mode-map))))
+2006-03-07 Reiner Steib <Reiner.Steib@gmx.de>
+
+ * emacs-mime.texi (Display Customization): Reword image/.* stuff.
+
+ * gnus.texi (Oort Gnus): Add note about `gnus-load'.
+ (MIME Commands): Fix mm-discouraged-alternatives.
+
2006-03-06 Reiner Steib <Reiner.Steib@gmx.de>
* gnus-news.el, gnus-news.texi: Update copyright.
(remove "text/html" mm-automatic-display))
@end lisp
-Adding @code{"image/.*"} might also be useful. Spammers use it as the
-prefered part of @samp{multipart/alternative} messages, and you might
+Adding @code{"image/.*"} might also be useful. Spammers use images as
+the prefered part of @samp{multipart/alternative} messages, so you might
not notice there are other parts. See also
-@code{gnus-buttonized-mime-types} (@pxref{MIME Commands, ,MIME Commands,
-gnus, Gnus Manual}), to which adding @code{"multipart/alternative"}
-enables you to choose manually one of two types those mails include.
-For example, you can set those variables like:
+@code{gnus-buttonized-mime-types}, @ref{MIME Commands, ,MIME Commands,
+gnus, Gnus Manual}. After adding @code{"multipart/alternative"} to
+@code{gnus-buttonized-mime-types} you can choose manually which
+alternative you'd like to view. For example, you can set those
+variables like:
@lisp
(setq gnus-buttonized-mime-types
\e$B$$$+$l$?\e(B Outlook (Express) \e$B$N5-;v$r=9$/$J$/$9$k$?$a$N!"\e(BRaymond Scholz
@email{rscholz@@zonix.de} \e$B$K$h$C$F?7@_$5$l$?%U%!%$%k$G$9!#\e(B
+@c FIXME: `gnus-load' \e$B$K$D$$$F8@5Z$7$F$$$k\e(B README \e$B$,!"\e(BCVS \e$B$K$O4^$^$l$F$$\e(B
+@c \e$B$^$;$s!#;d$?$A$O$3$N9`L\$N$?$a$N$h$jNI$$>l=j$r8+$D$1$k$Y$-$G$9!#\e(B
@item
@code{(require 'gnus-load)}
Display "multipart/related" parts as "multipart/mixed".
If displaying "text/html" is discouraged, see
-@code{mm-discouraged-alternatives} in @ref{Display Customization,
-Display Customization, , emacs-mime, Emacs-Mime Manual}. Images or
-other material inside a "multipart/related" part might be overlooked
-when this variable is @code{nil}.
+@code{mm-discouraged-alternatives}, images or other material inside a
+"multipart/related" part might be overlooked when this variable is
+@code{nil}. @ref{Display Customization, Display Customization, ,
+emacs-mime, Emacs-Mime Manual}.
@vindex gnus-mime-display-multipart-as-mixed
@item gnus-mime-display-multipart-as-mixed
A new file from Raymond Scholz @email{rscholz@@zonix.de} for deuglifying
broken Outlook (Express) articles.
+@c FIXME: `gnus-load' is mentioned in README, which is not included in
+@c CVS. We should find a better place for this item.
@item
@code{(require 'gnus-load)}
projects / elisp / gnus.git- / commitdiff