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.

diff --git a/ChangeLog b/ChangeLog
index 1f493f4..69096da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-17  Bill Wohler  <wohler@newt.com>
+
+       * make-dist: Create and populate etc/images/low-color.
+
 2005-10-15  Bill Wohler  <wohler@newt.com>
 
        * make-dist: Create and populate etc/images/gud.

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 3ed09ce..6819426 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-17  Bill Wohler  <wohler@newt.com>
+
+       * FOR-RELEASE (DOCUMENTATION): Removed lisp/toolbar from list
+       since it's gone. Also marked mh-e as done.
+
 2005-10-11  Juanma Barranquero  <lekktu@gmail.com>
 
        * FOR-RELEASE (FATAL ERRORS): Remove item about JPEG

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 73309bb..ba744a6 100644 (file)
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -89,14 +89,13 @@ lisp/gnus           done            ttn
 lisp/international     done            Kenichi Handa
 lisp/language          done            Kenichi Handa
 lisp/mail              done            ttn
-lisp/mh-e              working         Bill Wohler
+lisp/mh-e              done            Bill Wohler
 lisp/net               done            ttn
 lisp/obsolete          done            ttn
 lisp/play              done            ttn
 lisp/progmodes         done            Nick Roberts
 lisp/term              done            ttn
 lisp/textmodes         done            ttn
-lisp/toolbar           done            ttn
 lisp/url               done            ttn
 lispintro              done            ttn
 lispref                        done            ttn

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 8630a70..afc7b6b 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,63 @@
+2005-10-17  Bill Wohler  <wohler@newt.com>
+
+       Moved all remaining images from lisp/toolbar to etc/images. The
+       low resolution images were placed in their own directory (low-color).
+
+       * images/attach.*, images/cancel.*, images/close.*:
+       * images/copy.*, images/cut.*, images/diropen.*:
+       * images/exit.*, images/help.*, images/home.*:
+       * images/index.*, images/info.*, images/mail.*:
+       * images/new.*, images/open.*, images/paste.*:
+       * images/preferences.*, images/print.*, images/save.*:
+       * images/saveas.*, images/search.*:
+       * images/search-replace.*, images/spell.*:
+       * images/undo.*: Moved here from lisp/toolbar.
+
+       * images/low-color/copy.*: Moved here from lisp/toolbar/lc-copy.*.
+       * images/low-color/cut.*: Moved here from lisp/toolbar/lc-cut.*.
+       * images/low-color/help.*: Moved here from lisp/toolbar/lc-help.*.
+       * images/low-color/home.*: Moved here from lisp/toolbar/lc-home.*.
+       * images/low-color/index.*: Moved here from lisp/toolbar/lc-index.*.
+       * images/low-color/new.*: Moved here from lisp/toolbar/lc-new.*.
+       * images/low-color/open.*: Moved here from lisp/toolbar/lc-open.*.
+       * images/low-color/paste.*: Moved here from lisp/toolbar/lc-paste.*.
+       * images/low-color/preferences.*: Moved here from
+       lisp/toolbar/lc-preferences.*.
+       * images/low-color/print.*: Moved here from lisp/toolbar/lc-print.*.
+       * images/low-color/save.*: Moved here from lisp/toolbar/lc-save.*.
+       * images/low-color/saveas.*: Moved here from lisp/toolbar/lc-saveas.*.
+       * images/low-color/search.*: Moved here from lisp/toolbar/lc-search.*.
+       * images/low-color/spell.*: Moved here from lisp/toolbar/lc-spell.*.
+       * images/low-color/undo.*: Moved here from lisp/toolbar/lc-undo.*.
+
+       To conform with convention, the underscore (_) in the following
+       image names were replaced with dash (-) or (/) as appropriate.
+
+       * images/back-arrow.*: Moved here from lisp/toolbar/back_arrow.*.
+       * images/fld-open.*: Moved here from lisp/toolbar/fld_open.*.
+       * images/fwd-arrow.*: Moved here from lisp/toolbar/fwd_arrow.*.
+       * images/jump-to.*: Moved here from lisp/toolbar/jump_to.*.
+       * images/left-arrow.*: Moved here from lisp/toolbar/left_arrow.*.
+       * images/right-arrow.*: Moved here from lisp/toolbar/right_arrow.*.
+       * images/up-arrow.*: Moved here from lisp/toolbar/up_arrow.*.
+       * images/low-color/back-arrow.*: Moved here from
+       lisp/toolbar/lc-back_arrow.*. 
+       * images/low-color/fwd-arrow.*: Moved here from
+       lisp/toolbar/lc-fwd_arrow.*.
+       * images/low-color/jump-to.*: Moved here from
+       lisp/toolbar/lc-jump_to.*.
+       * images/low-color/left-arrow.*: Moved here from
+       lisp/toolbar/lc-left_arrow.*. 
+       * images/low-color/right-arrow.*: Moved here from
+       lisp/toolbar/lc-right_arrow.*. 
+       * images/low-color/up-arrow.*: Moved here from
+       lisp/toolbar/lc-up_arrow.*.
+       * images/mail/compose.*: Moved here from lisp/toolbar/mail_compose.*. 
+       * images/mail/send.*: Moved here from lisp/toolbar/mail_send.*.
+
+       * images/README: Incorporated the content of lisp/toolbar/README
+       now that all of the images are here.
+
 2005-10-16  Nick Roberts  <nickrob@snap.net.nz>
 
        * images/gud/n.pbm, images/gud/n.xpm
@@ -9,21 +69,21 @@
 
 2005-10-14  Bill Wohler         <wohler@newt.com>
 
-       * etc/images/gud/break.*: Moved here from toolbar/gud-break.*.
-       * etc/images/gud/cont.*: Moved here from toolbar/gud-cont.*.
-       * etc/images/gud/down.*: Moved here from toolbar/gud-down.*.
-       * etc/images/gud/finish.*: Moved here from toolbar/gud-finish.*.
-       * etc/images/gud/ni.*: Moved here from toolbar/gud-ni.*.
-       * etc/images/gud/n.*: Moved here from toolbar/gud-n.*.
-       * etc/images/gud/print.*: Moved here from toolbar/gud-print.*.
-       * etc/images/gud/pstar.*: Moved here from toolbar/gud-pstar.*.
-       * etc/images/gud/remove.*: Moved here from toolbar/gud-remove.*.
-       * etc/images/gud/run.*: Moved here from toolbar/gud-run.*.
-       * etc/images/gud/si.*: Moved here from toolbar/gud-si.*.
-       * etc/images/gud/s.*: Moved here from toolbar/gud-s.*.
-       * etc/images/gud/until.*: Moved here from toolbar/gud-until.*.
-       * etc/images/gud/up.*: Moved here from toolbar/gud-up.*.
-       * etc/images/gud/watch.*: Moved here from toolbar/gud-watch.*.
+       * images/gud/break.*: Moved here from toolbar/gud-break.*.
+       * images/gud/cont.*: Moved here from toolbar/gud-cont.*.
+       * images/gud/down.*: Moved here from toolbar/gud-down.*.
+       * images/gud/finish.*: Moved here from toolbar/gud-finish.*.
+       * images/gud/ni.*: Moved here from toolbar/gud-ni.*.
+       * images/gud/n.*: Moved here from toolbar/gud-n.*.
+       * images/gud/print.*: Moved here from toolbar/gud-print.*.
+       * images/gud/pstar.*: Moved here from toolbar/gud-pstar.*.
+       * images/gud/remove.*: Moved here from toolbar/gud-remove.*.
+       * images/gud/run.*: Moved here from toolbar/gud-run.*.
+       * images/gud/si.*: Moved here from toolbar/gud-si.*.
+       * images/gud/s.*: Moved here from toolbar/gud-s.*.
+       * images/gud/until.*: Moved here from toolbar/gud-until.*.
+       * images/gud/up.*: Moved here from toolbar/gud-up.*.
+       * images/gud/watch.*: Moved here from toolbar/gud-watch.*.
 
 2005-10-14  Bill Wohler         <wohler@newt.com>
 
@@ -50,7 +110,7 @@
 2005-09-30  Bill Wohler  <wohler@newt.com>
 
        Moved MH-E image files from toolbar and mail directories into
-       etc/images.
+       images.
 
        * images/mail: New directory.
 

diff --git a/etc/images/README b/etc/images/README
index c697bfd..229840a 100644 (file)
--- a/etc/images/README
+++ b/etc/images/README
@@ -1,5 +1,17 @@
+All of the following icons are not part of Emacs, but distributed and
+used by Emacs.
+
+The following icons are from GTK+ 2.x:
+
+    close.xpm copy.xpm cut.xpm help.xpm home.xpm
+    index.xpm jump-to.xpm left-arrow.xpm new.xpm open.xpm
+    paste.xpm preferences.xpm print.xpm right-arrow.xpm save.xpm
+    saveas.xpm search.xpm spell.xpm undo.xpm up-arrow.xpm
+
+    back-arrow.xpm and fwd-arrow.xpm are slightly modified undo and redo.
+
+    diropen.xpm is file-manager.png from Gnome hicolor theme.
+
 The following icons are from GNOME 2.10:
 
     refresh.pbm, refresh.xpm
-
-They are not part of Emacs, but distributed and used by Emacs.

diff --git a/lisp/toolbar/attach.pbm b/etc/images/attach.pbm
similarity index 100%
rename from lisp/toolbar/attach.pbm
rename to etc/images/attach.pbm

diff --git a/lisp/toolbar/back_arrow.pbm b/etc/images/back-arrow.pbm
similarity index 100%
rename from lisp/toolbar/back_arrow.pbm
rename to etc/images/back-arrow.pbm

diff --git a/lisp/toolbar/back_arrow.xpm b/etc/images/back-arrow.xpm
similarity index 100%
rename from lisp/toolbar/back_arrow.xpm
rename to etc/images/back-arrow.xpm

diff --git a/lisp/toolbar/cancel.pbm b/etc/images/cancel.pbm
similarity index 100%
rename from lisp/toolbar/cancel.pbm
rename to etc/images/cancel.pbm

diff --git a/lisp/toolbar/cancel.xpm b/etc/images/cancel.xpm
similarity index 100%
rename from lisp/toolbar/cancel.xpm
rename to etc/images/cancel.xpm

diff --git a/lisp/toolbar/close.pbm b/etc/images/close.pbm
similarity index 100%
rename from lisp/toolbar/close.pbm
rename to etc/images/close.pbm

diff --git a/lisp/toolbar/close.xpm b/etc/images/close.xpm
similarity index 100%
rename from lisp/toolbar/close.xpm
rename to etc/images/close.xpm

diff --git a/lisp/toolbar/copy.pbm b/etc/images/copy.pbm
similarity index 100%
rename from lisp/toolbar/copy.pbm
rename to etc/images/copy.pbm

diff --git a/lisp/toolbar/copy.xpm b/etc/images/copy.xpm
similarity index 100%
rename from lisp/toolbar/copy.xpm
rename to etc/images/copy.xpm

diff --git a/lisp/toolbar/cut.pbm b/etc/images/cut.pbm
similarity index 100%
rename from lisp/toolbar/cut.pbm
rename to etc/images/cut.pbm

diff --git a/lisp/toolbar/cut.xpm b/etc/images/cut.xpm
similarity index 100%
rename from lisp/toolbar/cut.xpm
rename to etc/images/cut.xpm

diff --git a/lisp/toolbar/diropen.pbm b/etc/images/diropen.pbm
similarity index 100%
rename from lisp/toolbar/diropen.pbm
rename to etc/images/diropen.pbm

diff --git a/lisp/toolbar/diropen.xpm b/etc/images/diropen.xpm
similarity index 100%
rename from lisp/toolbar/diropen.xpm
rename to etc/images/diropen.xpm

diff --git a/lisp/toolbar/exit.pbm b/etc/images/exit.pbm
similarity index 100%
rename from lisp/toolbar/exit.pbm
rename to etc/images/exit.pbm

diff --git a/lisp/toolbar/exit.xpm b/etc/images/exit.xpm
similarity index 100%
rename from lisp/toolbar/exit.xpm
rename to etc/images/exit.xpm

diff --git a/lisp/toolbar/fld_open.pbm b/etc/images/fld-open.pbm
similarity index 100%
rename from lisp/toolbar/fld_open.pbm
rename to etc/images/fld-open.pbm

diff --git a/lisp/toolbar/fld_open.xpm b/etc/images/fld-open.xpm
similarity index 100%
rename from lisp/toolbar/fld_open.xpm
rename to etc/images/fld-open.xpm

diff --git a/lisp/toolbar/fwd_arrow.pbm b/etc/images/fwd-arrow.pbm
similarity index 100%
rename from lisp/toolbar/fwd_arrow.pbm
rename to etc/images/fwd-arrow.pbm

diff --git a/lisp/toolbar/fwd_arrow.xpm b/etc/images/fwd-arrow.xpm
similarity index 100%
rename from lisp/toolbar/fwd_arrow.xpm
rename to etc/images/fwd-arrow.xpm

diff --git a/lisp/toolbar/help.pbm b/etc/images/help.pbm
similarity index 100%
rename from lisp/toolbar/help.pbm
rename to etc/images/help.pbm

diff --git a/lisp/toolbar/help.xpm b/etc/images/help.xpm
similarity index 100%
rename from lisp/toolbar/help.xpm
rename to etc/images/help.xpm

diff --git a/lisp/toolbar/home.pbm b/etc/images/home.pbm
similarity index 100%
rename from lisp/toolbar/home.pbm
rename to etc/images/home.pbm

diff --git a/lisp/toolbar/home.xpm b/etc/images/home.xpm
similarity index 100%
rename from lisp/toolbar/home.xpm
rename to etc/images/home.xpm

diff --git a/lisp/toolbar/index.pbm b/etc/images/index.pbm
similarity index 100%
rename from lisp/toolbar/index.pbm
rename to etc/images/index.pbm

diff --git a/lisp/toolbar/index.xpm b/etc/images/index.xpm
similarity index 100%
rename from lisp/toolbar/index.xpm
rename to etc/images/index.xpm

diff --git a/lisp/toolbar/info.pbm b/etc/images/info.pbm
similarity index 100%
rename from lisp/toolbar/info.pbm
rename to etc/images/info.pbm

diff --git a/lisp/toolbar/info.xpm b/etc/images/info.xpm
similarity index 100%
rename from lisp/toolbar/info.xpm
rename to etc/images/info.xpm

diff --git a/lisp/toolbar/jump_to.pbm b/etc/images/jump-to.pbm
similarity index 100%
rename from lisp/toolbar/jump_to.pbm
rename to etc/images/jump-to.pbm

diff --git a/lisp/toolbar/jump_to.xpm b/etc/images/jump-to.xpm
similarity index 100%
rename from lisp/toolbar/jump_to.xpm
rename to etc/images/jump-to.xpm

diff --git a/lisp/toolbar/left_arrow.pbm b/etc/images/left-arrow.pbm
similarity index 100%
rename from lisp/toolbar/left_arrow.pbm
rename to etc/images/left-arrow.pbm

diff --git a/lisp/toolbar/left_arrow.xpm b/etc/images/left-arrow.xpm
similarity index 100%
rename from lisp/toolbar/left_arrow.xpm
rename to etc/images/left-arrow.xpm

diff --git a/lisp/toolbar/lc-back_arrow.xpm b/etc/images/low-color/back-arrow.xpm
similarity index 100%
rename from lisp/toolbar/lc-back_arrow.xpm
rename to etc/images/low-color/back-arrow.xpm

diff --git a/lisp/toolbar/lc-copy.xpm b/etc/images/low-color/copy.xpm
similarity index 100%
rename from lisp/toolbar/lc-copy.xpm
rename to etc/images/low-color/copy.xpm

diff --git a/lisp/toolbar/lc-cut.xpm b/etc/images/low-color/cut.xpm
similarity index 100%
rename from lisp/toolbar/lc-cut.xpm
rename to etc/images/low-color/cut.xpm

diff --git a/lisp/toolbar/lc-fwd_arrow.xpm b/etc/images/low-color/fwd-arrow.xpm
similarity index 100%
rename from lisp/toolbar/lc-fwd_arrow.xpm
rename to etc/images/low-color/fwd-arrow.xpm

diff --git a/lisp/toolbar/lc-help.xpm b/etc/images/low-color/help.xpm
similarity index 100%
rename from lisp/toolbar/lc-help.xpm
rename to etc/images/low-color/help.xpm

diff --git a/lisp/toolbar/lc-home.xpm b/etc/images/low-color/home.xpm
similarity index 100%
rename from lisp/toolbar/lc-home.xpm
rename to etc/images/low-color/home.xpm

diff --git a/lisp/toolbar/lc-index.xpm b/etc/images/low-color/index.xpm
similarity index 100%
rename from lisp/toolbar/lc-index.xpm
rename to etc/images/low-color/index.xpm

diff --git a/lisp/toolbar/lc-jump_to.xpm b/etc/images/low-color/jump-to.xpm
similarity index 100%
rename from lisp/toolbar/lc-jump_to.xpm
rename to etc/images/low-color/jump-to.xpm

diff --git a/lisp/toolbar/lc-left_arrow.xpm b/etc/images/low-color/left-arrow.xpm
similarity index 100%
rename from lisp/toolbar/lc-left_arrow.xpm
rename to etc/images/low-color/left-arrow.xpm

diff --git a/lisp/toolbar/lc-new.xpm b/etc/images/low-color/new.xpm
similarity index 100%
rename from lisp/toolbar/lc-new.xpm
rename to etc/images/low-color/new.xpm

diff --git a/lisp/toolbar/lc-open.xpm b/etc/images/low-color/open.xpm
similarity index 100%
rename from lisp/toolbar/lc-open.xpm
rename to etc/images/low-color/open.xpm

diff --git a/lisp/toolbar/lc-paste.xpm b/etc/images/low-color/paste.xpm
similarity index 100%
rename from lisp/toolbar/lc-paste.xpm
rename to etc/images/low-color/paste.xpm

diff --git a/lisp/toolbar/lc-preferences.xpm b/etc/images/low-color/preferences.xpm
similarity index 100%
rename from lisp/toolbar/lc-preferences.xpm
rename to etc/images/low-color/preferences.xpm

diff --git a/lisp/toolbar/lc-print.xpm b/etc/images/low-color/print.xpm
similarity index 100%
rename from lisp/toolbar/lc-print.xpm
rename to etc/images/low-color/print.xpm

diff --git a/lisp/toolbar/lc-right_arrow.xpm b/etc/images/low-color/right-arrow.xpm
similarity index 100%
rename from lisp/toolbar/lc-right_arrow.xpm
rename to etc/images/low-color/right-arrow.xpm

diff --git a/lisp/toolbar/lc-save.xpm b/etc/images/low-color/save.xpm
similarity index 100%
rename from lisp/toolbar/lc-save.xpm
rename to etc/images/low-color/save.xpm

diff --git a/lisp/toolbar/lc-saveas.xpm b/etc/images/low-color/saveas.xpm
similarity index 100%
rename from lisp/toolbar/lc-saveas.xpm
rename to etc/images/low-color/saveas.xpm

diff --git a/lisp/toolbar/lc-search.xpm b/etc/images/low-color/search.xpm
similarity index 100%
rename from lisp/toolbar/lc-search.xpm
rename to etc/images/low-color/search.xpm

diff --git a/lisp/toolbar/lc-spell.xpm b/etc/images/low-color/spell.xpm
similarity index 100%
rename from lisp/toolbar/lc-spell.xpm
rename to etc/images/low-color/spell.xpm

diff --git a/lisp/toolbar/lc-undo.xpm b/etc/images/low-color/undo.xpm
similarity index 100%
rename from lisp/toolbar/lc-undo.xpm
rename to etc/images/low-color/undo.xpm

diff --git a/lisp/toolbar/lc-up_arrow.xpm b/etc/images/low-color/up-arrow.xpm
similarity index 100%
rename from lisp/toolbar/lc-up_arrow.xpm
rename to etc/images/low-color/up-arrow.xpm

diff --git a/lisp/toolbar/mail.pbm b/etc/images/mail.pbm
similarity index 100%
rename from lisp/toolbar/mail.pbm
rename to etc/images/mail.pbm

diff --git a/lisp/toolbar/mail.xpm b/etc/images/mail.xpm
similarity index 100%
rename from lisp/toolbar/mail.xpm
rename to etc/images/mail.xpm

diff --git a/lisp/toolbar/mail_compose.pbm b/etc/images/mail/compose.pbm
similarity index 100%
rename from lisp/toolbar/mail_compose.pbm
rename to etc/images/mail/compose.pbm

diff --git a/lisp/toolbar/mail_compose.xpm b/etc/images/mail/compose.xpm
similarity index 100%
rename from lisp/toolbar/mail_compose.xpm
rename to etc/images/mail/compose.xpm

diff --git a/lisp/toolbar/mail_send.pbm b/etc/images/mail/send.pbm
similarity index 100%
rename from lisp/toolbar/mail_send.pbm
rename to etc/images/mail/send.pbm

diff --git a/lisp/toolbar/mail_send.xpm b/etc/images/mail/send.xpm
similarity index 100%
rename from lisp/toolbar/mail_send.xpm
rename to etc/images/mail/send.xpm

diff --git a/lisp/toolbar/new.pbm b/etc/images/new.pbm
similarity index 100%
rename from lisp/toolbar/new.pbm
rename to etc/images/new.pbm

diff --git a/lisp/toolbar/new.xpm b/etc/images/new.xpm
similarity index 100%
rename from lisp/toolbar/new.xpm
rename to etc/images/new.xpm

diff --git a/lisp/toolbar/open.pbm b/etc/images/open.pbm
similarity index 100%
rename from lisp/toolbar/open.pbm
rename to etc/images/open.pbm

diff --git a/lisp/toolbar/open.xpm b/etc/images/open.xpm
similarity index 100%
rename from lisp/toolbar/open.xpm
rename to etc/images/open.xpm

diff --git a/lisp/toolbar/paste.pbm b/etc/images/paste.pbm
similarity index 100%
rename from lisp/toolbar/paste.pbm
rename to etc/images/paste.pbm

diff --git a/lisp/toolbar/paste.xpm b/etc/images/paste.xpm
similarity index 100%
rename from lisp/toolbar/paste.xpm
rename to etc/images/paste.xpm

diff --git a/lisp/toolbar/preferences.pbm b/etc/images/preferences.pbm
similarity index 100%
rename from lisp/toolbar/preferences.pbm
rename to etc/images/preferences.pbm

diff --git a/lisp/toolbar/preferences.xpm b/etc/images/preferences.xpm
similarity index 100%
rename from lisp/toolbar/preferences.xpm
rename to etc/images/preferences.xpm

diff --git a/lisp/toolbar/print.pbm b/etc/images/print.pbm
similarity index 100%
rename from lisp/toolbar/print.pbm
rename to etc/images/print.pbm

diff --git a/lisp/toolbar/print.xpm b/etc/images/print.xpm
similarity index 100%
rename from lisp/toolbar/print.xpm
rename to etc/images/print.xpm

diff --git a/lisp/toolbar/right_arrow.pbm b/etc/images/right-arrow.pbm
similarity index 100%
rename from lisp/toolbar/right_arrow.pbm
rename to etc/images/right-arrow.pbm

diff --git a/lisp/toolbar/right_arrow.xpm b/etc/images/right-arrow.xpm
similarity index 100%
rename from lisp/toolbar/right_arrow.xpm
rename to etc/images/right-arrow.xpm

diff --git a/lisp/toolbar/save.pbm b/etc/images/save.pbm
similarity index 100%
rename from lisp/toolbar/save.pbm
rename to etc/images/save.pbm

diff --git a/lisp/toolbar/save.xpm b/etc/images/save.xpm
similarity index 100%
rename from lisp/toolbar/save.xpm
rename to etc/images/save.xpm

diff --git a/lisp/toolbar/saveas.pbm b/etc/images/saveas.pbm
similarity index 100%
rename from lisp/toolbar/saveas.pbm
rename to etc/images/saveas.pbm

diff --git a/lisp/toolbar/saveas.xpm b/etc/images/saveas.xpm
similarity index 100%
rename from lisp/toolbar/saveas.xpm
rename to etc/images/saveas.xpm

diff --git a/lisp/toolbar/search-replace.pbm b/etc/images/search-replace.pbm
similarity index 100%
rename from lisp/toolbar/search-replace.pbm
rename to etc/images/search-replace.pbm

diff --git a/lisp/toolbar/search-replace.xpm b/etc/images/search-replace.xpm
similarity index 100%
rename from lisp/toolbar/search-replace.xpm
rename to etc/images/search-replace.xpm

diff --git a/lisp/toolbar/search.pbm b/etc/images/search.pbm
similarity index 100%
rename from lisp/toolbar/search.pbm
rename to etc/images/search.pbm

diff --git a/lisp/toolbar/search.xpm b/etc/images/search.xpm
similarity index 100%
rename from lisp/toolbar/search.xpm
rename to etc/images/search.xpm

diff --git a/lisp/toolbar/spell.pbm b/etc/images/spell.pbm
similarity index 100%
rename from lisp/toolbar/spell.pbm
rename to etc/images/spell.pbm

diff --git a/lisp/toolbar/spell.xpm b/etc/images/spell.xpm
similarity index 100%
rename from lisp/toolbar/spell.xpm
rename to etc/images/spell.xpm

diff --git a/lisp/toolbar/undo.pbm b/etc/images/undo.pbm
similarity index 100%
rename from lisp/toolbar/undo.pbm
rename to etc/images/undo.pbm

diff --git a/lisp/toolbar/undo.xpm b/etc/images/undo.xpm
similarity index 100%
rename from lisp/toolbar/undo.xpm
rename to etc/images/undo.xpm

diff --git a/lisp/toolbar/up_arrow.pbm b/etc/images/up-arrow.pbm
similarity index 100%
rename from lisp/toolbar/up_arrow.pbm
rename to etc/images/up-arrow.pbm

diff --git a/lisp/toolbar/up_arrow.xpm b/etc/images/up-arrow.xpm
similarity index 100%
rename from lisp/toolbar/up_arrow.xpm
rename to etc/images/up-arrow.xpm

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f737d02..ebc4209 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,66 @@
+2005-10-17  Bill Wohler  <wohler@newt.com>
+
+       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).
+
+       * toolbar/attach.*, toolbar/cancel.*, toolbar/close.*,
+       * toolbar/copy.*, toolbar/cut.*, toolbar/diropen.*, toolbar/exit.*:
+       * toolbar/help.*, toolbar/home.*, toolbar/index.*, toolbar/info.*:
+       * toolbar/mail.*, toolbar/new.*, toolbar/open.*, toolbar/paste.*:
+       * toolbar/preferences.*, toolbar/print.*, toolbar/save.*:
+       * toolbar/saveas.*, toolbar/search.*, toolbar/search-replace.*:
+       * toolbar/spell.*, toolbar/undo.*: Moved to etc/images.
+
+       * toolbar/lc-copy.*: Moved to etc/images/low-color/copy.*.
+       * toolbar/lc-cut.*: Moved to etc/images/low-color/cut.*.
+       * toolbar/lc-help.*: Moved to etc/images/low-color/help.*.
+       * toolbar/lc-home.*: Moved to etc/images/low-color/home.*.
+       * toolbar/lc-index.*: Moved to etc/images/low-color/index.*.
+       * toolbar/lc-new.*: Moved to etc/images/low-color/new.*.
+       * toolbar/lc-open.*: Moved to etc/images/low-color/open.*.
+       * toolbar/lc-paste.*: Moved to etc/images/low-color/paste.*.
+       * toolbar/lc-preferences.*: Moved to
+       etc/images/low-color/preferences.*.
+       * toolbar/lc-print.*: Moved to etc/images/low-color/print.*.
+       * toolbar/lc-save.*: Moved to etc/images/low-color/save.*.
+       * toolbar/lc-saveas.*: Moved to etc/images/low-color/saveas.*.
+       * toolbar/lc-search.*: Moved to etc/images/low-color/search.*.
+       * toolbar/lc-spell.*: Moved to etc/images/low-color/spell.*.
+       * 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.
+
+       * toolbar/back_arrow.*: Moved to etc/images/back-arrow.*.
+       * toolbar/fld_open.*: Moved to etc/images/fld-open.*.
+       * toolbar/fwd_arrow.*: Moved to etc/images/fwd-arrow.*.
+       * toolbar/jump_to.*: Moved to etc/images/jump-to.*.
+       * toolbar/left_arrow.*: Moved to etc/images/left-arrow.*.
+       * toolbar/right_arrow.*: Moved to etc/images/right-arrow.*.
+       * toolbar/up_arrow.*: Moved to etc/images/up-arrow.*.
+       * toolbar/lc-back_arrow.*.: Moved to etc/images/low-color/back-arrow.*.
+       * toolbar/lc-fwd_arrow.*.: Moved to etc/images/low-color/fwd-arrow.*.
+       * toolbar/lc-jump_to.*: Moved to etc/images/low-color/jump-to.*.
+       * toolbar/lc-left_arrow.*.: Moved to etc/images/low-color/left-arrow.*.
+       * toolbar/lc-right_arrow.*.: Moved to
+       etc/images/low-color/right-arrow.*.
+       * toolbar/lc-up_arrow.*: Moved to etc/images/low-color/up-arrow.*.
+       * toolbar/mail_compose.*.: Moved to etc/images/mail/compose.*.
+       * toolbar/mail_send.*: Moved to etc/images/mail/send.*.
+
+       * info.el (info-tool-bar-map): Replaced underscores in image names
+       with dashes.
+
+       * makefile.w32-in (WINS): Removed toolbar.
+
+       * menu-bar.el: Replaced toolbar/tool-bar.el with tool-bar.el in
+       comment.
+
+       * tool-bar.el: Moved to lisp from toolbar. Now that
+       toolbar is empty, it should be deleted when folks run "cvs up
+       -P".
+
 2005-10-18  Jay Belanger  <belanger@truman.edu>
 
        * calc/calc-store (calc-store-into): Get the proper variable name

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ba1298f..fbd26ac 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-15  Bill Wohler  <wohler@newt.com>
+
+       * message.el (message-tool-bar-map): Renamed image file from
+       mail_send to mail/send.
+
 2005-10-16  Masatake YAMATO  <jet@gyve.org>
 
        * message.el (message-expand-group): Pass the common

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index b7607ad..8ac3bb8 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -6586,7 +6586,7 @@ which specify the range to operate on."
                                           write-file dired open-file))
                 (define-key tool-bar-map (vector key) nil))
               (message-tool-bar-local-item-from-menu
-               'message-send-and-exit "mail_send" tool-bar-map message-mode-map)
+               'message-send-and-exit "mail/send" tool-bar-map message-mode-map)
               (message-tool-bar-local-item-from-menu
                'message-kill-buffer "close" tool-bar-map message-mode-map)
               (message-tool-bar-local-item-from-menu

diff --git a/lisp/info.el b/lisp/info.el
index 0e2f821..6594d76 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3161,14 +3161,14 @@ if point is in a menu item description, follow that menu item."
   (if (display-graphic-p)
       (let ((map (make-sparse-keymap)))
        (tool-bar-local-item-from-menu 'Info-exit "close" map Info-mode-map)
-       (tool-bar-local-item-from-menu 'Info-prev "left_arrow" map Info-mode-map)
-       (tool-bar-local-item-from-menu 'Info-next "right_arrow" map Info-mode-map)
-       (tool-bar-local-item-from-menu 'Info-up "up_arrow" map Info-mode-map)
-       (tool-bar-local-item-from-menu 'Info-history-back "back_arrow" map Info-mode-map)
-       (tool-bar-local-item-from-menu 'Info-history-forward "fwd_arrow" map Info-mode-map)
+       (tool-bar-local-item-from-menu 'Info-prev "left-arrow" map Info-mode-map)
+       (tool-bar-local-item-from-menu 'Info-next "right-arrow" map Info-mode-map)
+       (tool-bar-local-item-from-menu 'Info-up "up-arrow" map Info-mode-map)
+       (tool-bar-local-item-from-menu 'Info-history-back "back-arrow" map Info-mode-map)
+       (tool-bar-local-item-from-menu 'Info-history-forward "fwd-arrow" map Info-mode-map)
        (tool-bar-local-item-from-menu 'Info-top-node "home" map Info-mode-map)
        (tool-bar-local-item-from-menu 'Info-index "index" map Info-mode-map)
-       (tool-bar-local-item-from-menu 'Info-goto-node "jump_to" map Info-mode-map)
+       (tool-bar-local-item-from-menu 'Info-goto-node "jump-to" map Info-mode-map)
        (tool-bar-local-item-from-menu 'Info-search "search" map Info-mode-map)
        map)))
 

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index a58e50c..d909c90 100644 (file)
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -91,7 +91,6 @@ WINS=\
        progmodes \
        term \
        textmodes \
-       toolbar \
        url
 
 doit:

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 401513c..7a28a00 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1733,7 +1733,7 @@ Buffers menu is regenerated."
          :help "Terminate input and exit minibuffer")))
 \f
 ;;;###autoload
-;; This comment is taken from toolbar/tool-bar.el near
+;; This comment is taken from tool-bar.el near
 ;; (put 'tool-bar-mode ...)
 ;; We want to pretend the menu bar by standard is on, as this will make
 ;; customize consider disabling the menu bar a customization, and save

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 53c562c..19172f1 100644 (file)
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-17  Bill Wohler  <wohler@newt.com>
+
+       * mh-customize.el (mh-folder-tool-bar-map): Renamed image file
+       left_arrow to left-arrow, right_arrow to right-arrow, mail_compose
+       to mail/compose, fld_open to fld-open.
+       (mh-letter-tool-bar-map): Renamed image file mail_send to
+       mail/send.
+
 2005-10-16  Bill Wohler  <wohler@newt.com>
 
        * mh-comp.el (mh-display-completion-list-compat): New macro which

diff --git a/lisp/mh-e/mh-customize.el b/lisp/mh-e/mh-customize.el
index c1d8161..d26819d 100644 (file)
--- a/lisp/mh-e/mh-customize.el
+++ b/lisp/mh-e/mh-customize.el
@@ -1916,12 +1916,12 @@ new mail into your Inbox folder.")
     "Save MIME parts from this message
 This button runs `mh-mime-save-parts' which saves a message's
 different parts into separate files.")
-  (mh-previous-undeleted-msg (folder) "left_arrow"
+  (mh-previous-undeleted-msg (folder) "left-arrow"
     "Go to the previous undeleted message
 This button runs `mh-previous-undeleted-msg'")
   (mh-page-msg (folder) "page-down"
     "Page the current message forwards\nThis button runs `mh-page-msg'")
-  (mh-next-undeleted-msg (folder) "right_arrow"
+  (mh-next-undeleted-msg (folder) "right-arrow"
     "Go to the next undeleted message\nThe button runs `mh-next-undeleted-msg'")
   (mh-delete-msg (folder) "close"
     "Mark this message for deletion\nThis button runs `mh-delete-msg'")
@@ -1944,7 +1944,7 @@ This button runs `mh-previous-undeleted-msg'")
   (mh-alias-grab-from-field (folder) "mail/alias"
     "Grab From alias\nThis button runs `mh-alias-grab-from-field'"
     (and (mh-extract-from-header-value) (not (mh-alias-for-from-p))))
-  (mh-send (folder) "mail_compose"
+  (mh-send (folder) "mail/compose"
     "Compose new message\nThis button runs `mh-send'")
   (mh-rescan-folder (folder) "refresh"
     "Rescan this folder\nThis button runs `mh-rescan-folder'")
@@ -1952,10 +1952,10 @@ This button runs `mh-previous-undeleted-msg'")
     "Repack this folder\nThis button runs `mh-pack-folder'")
   (mh-tool-bar-search (folder) "search"
     "Search\nThis button runs `mh-tool-bar-search-function'")
-  (mh-visit-folder (folder) "fld_open"
+  (mh-visit-folder (folder) "fld-open"
     "Visit other folder\nThis button runs `mh-visit-folder'")
   ;; Letter buffer buttons
-  (mh-send-letter (letter) "mail_send" "Send this letter")
+  (mh-send-letter (letter) "mail/send" "Send this letter")
   (mh-compose-insertion (letter) "attach" "Insert attachment")
   (ispell-message (letter) "spell" "Check spelling")
   (save-buffer (letter) "save" "Save current buffer to its file"

diff --git a/lisp/toolbar/tool-bar.el b/lisp/tool-bar.el
similarity index 92%
rename from lisp/toolbar/tool-bar.el
rename to lisp/tool-bar.el
index 487255a..984dac9 100644 (file)
--- a/lisp/toolbar/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -97,7 +97,7 @@ 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
-function will first try to use lc-ICON.xpm if display-color-cells
+function will first try to use low-color/ICON.xpm if display-color-cells
 is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally
 ICON.xbm, using `find-image'.
 
@@ -114,7 +114,7 @@ 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
-function will first try to use lc-ICON.xpm if display-color-cells
+function will first try to use low-color/ICON.xpm if display-color-cells
 is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally
 ICON.xbm, using `find-image'."
   (let* ((fg (face-attribute 'tool-bar :foreground))
@@ -124,9 +124,12 @@ ICON.xbm, using `find-image'."
         (xpm-spec (list :type 'xpm :file (concat icon ".xpm")))
         (xpm-lo-spec (if (> (display-color-cells) 256)
                          nil
-                       (list :type 'xpm :file (concat "lc-" icon ".xpm"))))
-        (pbm-spec (append (list :type 'pbm :file (concat icon ".pbm")) colors))
-        (xbm-spec (append (list :type 'xbm :file (concat icon ".xbm")) colors))
+                       (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))
         (image (find-image
                (if (display-color-p)
                    (list xpm-lo-spec xpm-spec pbm-spec xbm-spec)
@@ -175,9 +178,12 @@ MAP must contain appropriate binding for `[menu-bar]' which holds a keymap."
         (xpm-spec (list :type 'xpm :file (concat icon ".xpm")))
         (xpm-lo-spec (if (> (display-color-cells) 256)
                          nil
-                       (list :type 'xpm :file (concat "lc-" icon ".xpm"))))
-        (pbm-spec (append (list :type 'pbm :file (concat icon ".pbm")) colors))
-        (xbm-spec (append (list :type 'xbm :file (concat icon ".xbm")) colors))
+                       (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))
         (spec (if (display-color-p)
                   (list xpm-lo-spec xpm-spec pbm-spec xbm-spec)
                 (list pbm-spec xbm-spec xpm-lo-spec xpm-spec)))
@@ -255,7 +261,7 @@ MAP must contain appropriate binding for `[menu-bar]' which holds a keymap."
 
   ;; There's no icon appropriate for News and we need a command rather
   ;; than a lambda for Read Mail.
-  ;;(tool-bar-add-item-from-menu 'compose-mail "mail_compose")
+  ;;(tool-bar-add-item-from-menu 'compose-mail "mail/compose")
 
   (tool-bar-add-item-from-menu 'print-buffer "print")
   (tool-bar-add-item "preferences" 'customize 'customize

diff --git a/lisp/toolbar/README b/lisp/toolbar/README
deleted file mode 100644 (file)
index 81df0c8..0000000
--- a/lisp/toolbar/README
+++ /dev/null
@@ -1,12 +0,0 @@
-The following icons are from GTK+ 2.x:
-
-    close.xpm copy.xpm cut.xpm help.xpm home.xpm
-    index.xpm jump_to.xpm left_arrow.xpm new.xpm open.xpm
-    paste.xpm preferences.xpm print.xpm right_arrow.xpm save.xpm
-    saveas.xpm search.xpm spell.xpm undo.xpm up_arrow.xpm
-
-    back_arrow.xpm and fwd_arrow.xpm are slightly modified undo and redo.
-
-    diropen.xpm is file-manager.png from Gnome hicolor theme.
-
-They are not part of Emacs, but distributed and used by Emacs.

diff --git a/make-dist b/make-dist
index 80ff2d5..0e25de0 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -315,8 +315,8 @@ for subdir in lisp site-lisp lispref lispintro \
              src src/m src/s src/bitmaps lib-src oldXMenu lwlib \
              nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
              etc etc/e \
-             etc/images etc/images/ezimage etc/images/gnus \
-             etc/images/gud etc/images/mail etc/images/smilies \
+             etc/images etc/images/ezimage etc/images/gnus etc/images/gud \
+             etc/images/low-color etc/images/mail etc/images/smilies \
              etc/tree-widget etc/tree-widget/default etc/tree-widget/folder \
              info man m4 msdos vms mac mac/inc mac/inc/sys \
              mac/src mac/Emacs.app mac/Emacs.app/Contents \
@@ -602,8 +602,8 @@ echo "Making links to \`etc/images'"
    fi
  done)
 
-for dir in etc/images/ezimage etc/images/gnus etc/images/gud etc/images/mail \
-           etc/images/smilies \
+for dir in etc/images/ezimage etc/images/gnus etc/images/gud \
+           etc/images/low-color etc/images/mail etc/images/smilies \
            etc/tree-widget/default etc/tree-widget/folder ; do
     echo "Making links to \`${dir}'"
     (cd ${dir}