Moved all pixmaps and bitmaps from app/ and libgimp/ to pixmaps/

1999-03-12 Michael Natterer <mitschel@cs.tu-berlin.de> Moved all pixmaps and bitmaps from app/ and libgimp/ to pixmaps/ * app/tools/* * libgimp/chain.xpm: removed these files * pixmaps/*.[xpm|xbm]: new directory containing all pixmaps * app/Makefile.am * libgimp/Makefile.am * Makefile.am: changed list of EXTRA_DIST files accordingly * app/channels_dialog.c * app/layers_dialog.c * app/paths_dialog.c * app/palette.c * libgimp/gimpchainbutton.c: adjusted some #include's
1999-03-12 22:43:12 +00:00 · 1999-03-12 22:43:12 +00:00 · 3faf83af86
parent 7383354574
commit 3faf83af86
36 changed files with 131 additions and 111 deletions
--- a/18
+++ b/18
@ -1,4 +1,22 @@
+1999-03-12  Michael Natterer  <mitschel@cs.tu-berlin.de>

+        Moved all pixmaps and bitmaps from app/ and libgimp/ to pixmaps/
+
+	* app/tools/*
+	* libgimp/chain.xpm: removed these files
+
+	* pixmaps/*.[xpm|xbm]: new directory containing all pixmaps
+
+	* app/Makefile.am
+	* libgimp/Makefile.am
+	* Makefile.am: changed list of EXTRA_DIST files accordingly
+
+	* app/channels_dialog.c
+	* app/layers_dialog.c
+	* app/paths_dialog.c
+	* app/palette.c
+	* libgimp/gimpchainbutton.c: adjusted some #include's
+	
 Fri Mar 12 21:30:57 GMT 1999 Andy Thomas <alt@gimp.org>

 	Changed:-
--- a/Makefile.am
+++ b/Makefile.am
@ -5,37 +5,58 @@ SUBDIRS = po intl tools libgimp app plug-ins modules data @GIMPDOCS@
 bin_SCRIPTS = gimptool

 EXTRA_DIST = \
-	README.i18n		\
-	README.win32		\
-	ChangeLog.pre-1-0	\
-	MAINTAINERS		\
-	TODO			\
-	gtkrc			\
-	gimp_logo.ppm		\
-	gimp_splash.ppm		\
-	gimp1_1_splash.ppm	\
-	rmshm			\
-	user_install		\
-	user_install.bat	\
-	gimp_tips.txt		\
-	ps-menurc		\
-	gimp.1			\
-	gimptool.1		\
-	gtkrc.forest2		\
-	gimp.m4			\
-	gimprc.win32		\
+	pixmaps/anchor.xpm	 \
+	pixmaps/chain.xpm	 \
+	pixmaps/channel.xbm	 \
+	pixmaps/delete.xpm	 \
+	pixmaps/duplicate.xpm	 \
+	pixmaps/eye.xbm		 \
+	pixmaps/layer.xbm	 \
+	pixmaps/linked.xbm	 \
+	pixmaps/lower.xpm	 \
+	pixmaps/mask.xbm	 \
+	pixmaps/new.xpm		 \
+	pixmaps/raise.xpm	 \
+	pixmaps/paths.xbm	 \
+	pixmaps/penadd.xpm	 \
+	pixmaps/pendel.xpm	 \
+	pixmaps/penedit.xpm	 \
+	pixmaps/pennorm.xpm	 \
+	pixmaps/penstroke.xpm	 \
+	pixmaps/ptoselection.xpm \
+	pixmaps/zoom_in.xpm	 \
+	pixmaps/zoom_out.xpm	 \
+	README.i18n		 \
+	README.win32		 \
+	ChangeLog.pre-1-0	 \
+	MAINTAINERS		 \
+	TODO			 \
+	gtkrc			 \
+	gimp_logo.ppm		 \
+	gimp_splash.ppm		 \
+	gimp1_1_splash.ppm	 \
+	rmshm			 \
+	user_install		 \
+	user_install.bat	 \
+	gimp_tips.txt		 \
+	ps-menurc		 \
+	gimp.1			 \
+	gimptool.1		 \
+	gtkrc.forest2		 \
+	gimp.m4			 \
+	gimprc.win32		 \
 	config.h.win32

 gimpdata_DATA = \
-	gimprc			\
-	gimprc_user		\
-	gimprc.5		\
-	gtkrc			\
-	gimp_logo.ppm		\
-	gimp_splash.ppm		\
-	gimp1_1_splash.ppm	\
-	gimp_tips.txt		\
-	ps-menurc		\
+	gimprc			 \
+	gimprc_user		 \
+	gimprc.5		 \
+	gtkrc			 \
+	gimp_logo.ppm		 \
+	gimp_splash.ppm		 \
+	gimp1_1_splash.ppm	 \
+	gimp_tips.txt		 \
+	ps-menurc		 \
 	gtkrc.forest2

 gimpdata_SCRIPTS = user_install
--- a/app/Makefile.am
+++ b/app/Makefile.am
@ -356,26 +356,6 @@ gimp_SOURCES = \
 	xcf.h

 EXTRA_DIST = \
-	tools/anchor.xpm	\
-	tools/channel.xbm	\
-	tools/delete.xpm	\
-	tools/duplicate.xpm	\
-	tools/eye.xbm		\
-	tools/layer.xbm		\
-	tools/linked.xbm	\
-	tools/lower.xpm		\
-	tools/mask.xbm		\
-	tools/new.xpm		\
-	tools/raise.xpm		\
-	tools/paths.xbm		\
-	tools/penadd.xpm	\
-	tools/pendel.xpm	\
-	tools/penedit.xpm	\
-	tools/pennorm.xpm	\
-	tools/penstroke.xpm	\
-	tools/ptoselection.xpm	\
-	tools/zoom_in.xpm	\
-	tools/zoom_out.xpm	\
 	makefile.msc		\
 	gimp.def		\
 	gimp.rc			\
--- a/app/channels_dialog.c
+++ b/app/channels_dialog.c
@ -37,13 +37,13 @@
 #include "paint_funcs.h"
 #include "palette.h"

-#include "tools/eye.xbm"
-#include "tools/channel.xbm"
-#include "tools/new.xpm"
-#include "tools/raise.xpm"
-#include "tools/lower.xpm"
-#include "tools/duplicate.xpm"
-#include "tools/delete.xpm"
+#include "pixmaps/eye.xbm"
+#include "pixmaps/channel.xbm"
+#include "pixmaps/new.xpm"
+#include "pixmaps/raise.xpm"
+#include "pixmaps/lower.xpm"
+#include "pixmaps/duplicate.xpm"
+#include "pixmaps/delete.xpm"

 #include "libgimp/gimpintl.h"

--- a/app/gui/channels-dialog.c
+++ b/app/gui/channels-dialog.c
@ -37,13 +37,13 @@
 #include "paint_funcs.h"
 #include "palette.h"

-#include "tools/eye.xbm"
-#include "tools/channel.xbm"
-#include "tools/new.xpm"
-#include "tools/raise.xpm"
-#include "tools/lower.xpm"
-#include "tools/duplicate.xpm"
-#include "tools/delete.xpm"
+#include "pixmaps/eye.xbm"
+#include "pixmaps/channel.xbm"
+#include "pixmaps/new.xpm"
+#include "pixmaps/raise.xpm"
+#include "pixmaps/lower.xpm"
+#include "pixmaps/duplicate.xpm"
+#include "pixmaps/delete.xpm"

 #include "libgimp/gimpintl.h"

--- a/app/gui/layers-dialog.c
+++ b/app/gui/layers-dialog.c
@ -48,17 +48,17 @@

 #include "libgimp/gimpintl.h"

-#include "tools/eye.xbm"
-#include "tools/linked.xbm"
-#include "tools/layer.xbm"
-#include "tools/mask.xbm"
+#include "pixmaps/eye.xbm"
+#include "pixmaps/linked.xbm"
+#include "pixmaps/layer.xbm"
+#include "pixmaps/mask.xbm"

-#include "tools/new.xpm"
-#include "tools/raise.xpm"
-#include "tools/lower.xpm"
-#include "tools/duplicate.xpm"
-#include "tools/delete.xpm"
-#include "tools/anchor.xpm"
+#include "pixmaps/new.xpm"
+#include "pixmaps/raise.xpm"
+#include "pixmaps/lower.xpm"
+#include "pixmaps/duplicate.xpm"
+#include "pixmaps/delete.xpm"
+#include "pixmaps/anchor.xpm"

 #include "layer_pvt.h"

--- a/app/gui/palette-editor.c
+++ b/app/gui/palette-editor.c
@ -49,8 +49,8 @@
 #include "palette_select.h"
 #include "dialog_handler.h"

-#include "tools/zoom_in.xpm"
-#include "tools/zoom_out.xpm"
+#include "pixmaps/zoom_in.xpm"
+#include "pixmaps/zoom_out.xpm"

 #include "libgimp/gimpintl.h"

--- a/app/gui/paths-dialog.c
+++ b/app/gui/paths-dialog.c
@ -53,16 +53,16 @@

 #include "libgimp/gimpintl.h"

-#include "tools/new.xpm"
-#include "tools/duplicate.xpm"
-#include "tools/delete.xpm"
-#include "tools/pennorm.xpm"
-#include "tools/penadd.xpm"
-#include "tools/pendel.xpm"
-#include "tools/penedit.xpm"
-#include "tools/penstroke.xpm"
-#include "tools/ptoselection.xpm"
-#include "tools/path.xbm"
+#include "pixmaps/new.xpm"
+#include "pixmaps/duplicate.xpm"
+#include "pixmaps/delete.xpm"
+#include "pixmaps/pennorm.xpm"
+#include "pixmaps/penadd.xpm"
+#include "pixmaps/pendel.xpm"
+#include "pixmaps/penedit.xpm"
+#include "pixmaps/penstroke.xpm"
+#include "pixmaps/ptoselection.xpm"
+#include "pixmaps/path.xbm"

 #define PREVIEW_EVENT_MASK GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_ENTER_NOTIFY_MASK

--- a/app/layers_dialog.c
+++ b/app/layers_dialog.c
@ -48,17 +48,17 @@

 #include "libgimp/gimpintl.h"

-#include "tools/eye.xbm"
-#include "tools/linked.xbm"
-#include "tools/layer.xbm"
-#include "tools/mask.xbm"
+#include "pixmaps/eye.xbm"
+#include "pixmaps/linked.xbm"
+#include "pixmaps/layer.xbm"
+#include "pixmaps/mask.xbm"

-#include "tools/new.xpm"
-#include "tools/raise.xpm"
-#include "tools/lower.xpm"
-#include "tools/duplicate.xpm"
-#include "tools/delete.xpm"
-#include "tools/anchor.xpm"
+#include "pixmaps/new.xpm"
+#include "pixmaps/raise.xpm"
+#include "pixmaps/lower.xpm"
+#include "pixmaps/duplicate.xpm"
+#include "pixmaps/delete.xpm"
+#include "pixmaps/anchor.xpm"

 #include "layer_pvt.h"

--- a/app/palette.c
+++ b/app/palette.c
@ -49,8 +49,8 @@
 #include "palette_select.h"
 #include "dialog_handler.h"

-#include "tools/zoom_in.xpm"
-#include "tools/zoom_out.xpm"
+#include "pixmaps/zoom_in.xpm"
+#include "pixmaps/zoom_out.xpm"

 #include "libgimp/gimpintl.h"

--- a/app/paths_dialog.c
+++ b/app/paths_dialog.c
@ -53,16 +53,16 @@

 #include "libgimp/gimpintl.h"

-#include "tools/new.xpm"
-#include "tools/duplicate.xpm"
-#include "tools/delete.xpm"
-#include "tools/pennorm.xpm"
-#include "tools/penadd.xpm"
-#include "tools/pendel.xpm"
-#include "tools/penedit.xpm"
-#include "tools/penstroke.xpm"
-#include "tools/ptoselection.xpm"
-#include "tools/path.xbm"
+#include "pixmaps/new.xpm"
+#include "pixmaps/duplicate.xpm"
+#include "pixmaps/delete.xpm"
+#include "pixmaps/pennorm.xpm"
+#include "pixmaps/penadd.xpm"
+#include "pixmaps/pendel.xpm"
+#include "pixmaps/penedit.xpm"
+#include "pixmaps/penstroke.xpm"
+#include "pixmaps/ptoselection.xpm"
+#include "pixmaps/path.xbm"

 #define PREVIEW_EVENT_MASK GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_ENTER_NOTIFY_MASK

--- a/app/widgets/gimppaletteeditor.c
+++ b/app/widgets/gimppaletteeditor.c
@ -49,8 +49,8 @@
 #include "palette_select.h"
 #include "dialog_handler.h"

-#include "tools/zoom_in.xpm"
-#include "tools/zoom_out.xpm"
+#include "pixmaps/zoom_in.xpm"
+#include "pixmaps/zoom_out.xpm"

 #include "libgimp/gimpintl.h"

--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@ -15,7 +15,6 @@ INCLUDES = \
 	-I$(includedir)

 EXTRA_DIST = \
-	chain.xpm		\
 	gimpfeatures.h.in	\
 	makefile.msc		\
 	gimp.def		\
--- a/libgimp/gimpchainbutton.c
+++ b/libgimp/gimpchainbutton.c
@ -18,7 +18,8 @@
 */

 #include "gimpchainbutton.h"
-#include "chain.xpm"
+
+#include "pixmaps/chain.xpm"

 static char **gimp_chain_xpm[] = {
  chain_hor_xpm,
--- a/libgimpwidgets/gimpchainbutton.c
+++ b/libgimpwidgets/gimpchainbutton.c
@ -18,7 +18,8 @@
 */

 #include "gimpchainbutton.h"
-#include "chain.xpm"
+
+#include "pixmaps/chain.xpm"

 static char **gimp_chain_xpm[] = {
  chain_hor_xpm,
--- a/app/tools/anchor.xpm
+++ b/app/tools/anchor.xpm
--- a/pixmaps/chain.xpm
+++ b/pixmaps/chain.xpm
--- a/app/tools/channel.xbm
+++ b/app/tools/channel.xbm
--- a/app/tools/delete.xpm
+++ b/app/tools/delete.xpm
--- a/app/tools/duplicate.xpm
+++ b/app/tools/duplicate.xpm
--- a/app/tools/eye.xbm
+++ b/app/tools/eye.xbm
--- a/app/tools/layer.xbm
+++ b/app/tools/layer.xbm
--- a/app/tools/linked.xbm
+++ b/app/tools/linked.xbm
--- a/app/tools/lower.xpm
+++ b/app/tools/lower.xpm
--- a/app/tools/mask.xbm
+++ b/app/tools/mask.xbm
--- a/app/tools/new.xpm
+++ b/app/tools/new.xpm
--- a/app/tools/path.xbm
+++ b/app/tools/path.xbm
--- a/app/tools/penadd.xpm
+++ b/app/tools/penadd.xpm
--- a/app/tools/pendel.xpm
+++ b/app/tools/pendel.xpm
--- a/app/tools/penedit.xpm
+++ b/app/tools/penedit.xpm
--- a/app/tools/pennorm.xpm
+++ b/app/tools/pennorm.xpm
--- a/app/tools/penstroke.xpm
+++ b/app/tools/penstroke.xpm
--- a/app/tools/ptoselection.xpm
+++ b/app/tools/ptoselection.xpm
--- a/app/tools/raise.xpm
+++ b/app/tools/raise.xpm
--- a/app/tools/zoom_in.xpm
+++ b/app/tools/zoom_in.xpm
--- a/app/tools/zoom_out.xpm
+++ b/app/tools/zoom_out.xpm