graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-20 11:37:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

moved pdb directory to the end.

Browse source 
2002-03-13  Sven Neumann  <sven@gimp.org>

	* app/Makefile.am (SUBDIRS): moved pdb directory to the end.

	* app/paint/Makefile.am: removed the ugly hack. Seems to work w/o it.

	* themes/Default/Makefile.am: don't build inline pixbuf headers here.

	* themes/Default/images/Makefile.am: build them here with a hack
	that extracts the icon names out of the filenames. Cleaner Makefile
	and correct dependencies.

	* themes/Default/imagerc
	* themes/Default/images/stock-button-reset.png: added a reset button
	(which looks just like refresh at the moment).

	* themes/Default/images/tools/Makefile.am: removed.

	* libgimpwidgets/gimpstock.c
	* libgimpwidgets/gimpwidgets.c: include the pixbuf headers from their
	new places.
This commit is contained in:
Sven Neumann 2002-03-13 18:07:25 +00:00 committed by Sven Neumann
parent c8fa869459
commit 6f0c89d054
12 changed files with 128 additions and 218 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ChangeLog
View file

@ -1,3 +1,25 @@
2002-03-13 Sven Neumann <sven@gimp.org>
* app/Makefile.am (SUBDIRS): moved pdb directory to the end.
* app/paint/Makefile.am: removed the ugly hack. Seems to work w/o it.
* themes/Default/Makefile.am: don't build inline pixbuf headers here.
* themes/Default/images/Makefile.am: build them here with a hack
that extracts the icon names out of the filenames. Cleaner Makefile
and correct dependencies.
* themes/Default/imagerc
* themes/Default/images/stock-button-reset.png: added a reset button
(which looks just like refresh at the moment).
* themes/Default/images/tools/Makefile.am: removed.
* libgimpwidgets/gimpstock.c
* libgimpwidgets/gimpwidgets.c: include the pixbuf headers from their
new places.
2002-03-13 Michael Natterer <mitch@gimp.org>
* app/gui/brush-select.[ch]: renamed parameters to be consistent

4
app/Makefile.am
View file

@ -9,12 +9,12 @@ SUBDIRS = \
paint \
xcf \
file \
pdb \
plug-in \
display \
tools \
widgets \
gui
gui \
pdb
scriptdata =

3
app/paint/Makefile.am
View file

@ -31,9 +31,6 @@ libapppaint_a_SOURCES = @STRIP_BEGIN@ \
gimpsmudge.h \
@STRIP_END@
## This is a truly ugly hack
libapppaint_a_LIBADD = ../core/gimppaintinfo.o
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DG_LOG_DOMAIN=\"Gimp-Paint\" \
@GIMP_THREAD_FLAGS@ \

4
libgimpwidgets/gimpstock.c
View file

@ -27,7 +27,7 @@
#include "gimpstock.h"
#include "themes/Default/gimp-stock-pixbufs.h"
#include "themes/Default/images/gimp-stock-pixbufs.h"
#include "libgimp/libgimp-intl.h"
@ -165,7 +165,7 @@ gimp_stock_button_pixbufs[] =
{ GIMP_STOCK_LINKED, stock_button_linked },
{ GIMP_STOCK_PASTE_AS_NEW, stock_button_paste_as_new },
{ GIMP_STOCK_PASTE_INTO, stock_button_paste_into },
{ GIMP_STOCK_RESET, stock_button_refresh },
{ GIMP_STOCK_RESET, stock_button_reset },
{ GIMP_STOCK_VISIBLE, stock_button_eye },
{ GIMP_STOCK_HCHAIN, stock_button_hchain },

2
libgimpwidgets/gimpwidgets.c
View file

@ -38,7 +38,7 @@
#include "gimpunitmenu.h"
#include "gimpwidgets.h"
#include "themes/Default/gimp-wilber-pixbufs.h"
#include "themes/Default/images/gimp-wilber-pixbufs.h"
#include "libgimp/libgimp-intl.h"

151
themes/Default/Makefile.am
View file

@ -7,154 +7,3 @@ themedatadir = $(gimpdatadir)/themes/Default
themedata_DATA = gtkrc imagerc
EXTRA_DIST = $(themedata_DATA)
STOCK_VARIABLES = @STRIP_BEGIN@ \
stock_button_anchor \
$(srcdir)/images/stock-button-anchor.png \
stock_button_duplicate \
$(srcdir)/images/stock-button-duplicate.png \
stock_button_edit \
$(srcdir)/images/stock-button-edit.png \
stock_button_eye \
$(srcdir)/images/stock-button-eye.png \
stock_button_linked \
$(srcdir)/images/stock-button-linked.png \
stock_button_paste_as_new \
$(srcdir)/images/stock-button-paste-as-new.png \
stock_button_paste_into \
$(srcdir)/images/stock-button-paste-into.png \
stock_button_refresh \
$(srcdir)/images/stock-button-refresh.png \
stock_button_selection_replace \
$(srcdir)/images/stock-button-selection-replace.png \
stock_button_selection_add \
$(srcdir)/images/stock-button-selection-add.png \
stock_button_selection_subtract \
$(srcdir)/images/stock-button-selection-subtract.png \
stock_button_selection_intersect \
$(srcdir)/images/stock-button-selection-intersect.png \
stock_button_selection_stroke \
$(srcdir)/images/stock-button-selection-stroke.png \
stock_button_selection_to_path \
$(srcdir)/images/stock-button-selection-to-path.png \
stock_button_path_stroke \
$(srcdir)/images/stock-button-path-stroke.png \
\
stock_button_hchain \
$(srcdir)/images/stock-button-hchain.png \
stock_button_hchain_broken \
$(srcdir)/images/stock-button-hchain-broken.png \
stock_button_vchain \
$(srcdir)/images/stock-button-vchain.png \
stock_button_vchain_broken \
$(srcdir)/images/stock-button-vchain-broken.png \
\
stock_menu_navigation \
$(srcdir)/images/stock-menu-navigation.png \
stock_menu_qmask_off \
$(srcdir)/images/stock-menu-qmask-off.png \
stock_menu_qmask_on \
$(srcdir)/images/stock-menu-qmask-on.png \
\
stock_wilber_eek \
$(srcdir)/images/stock-wilber-eek.png \
@STRIP_END@
STOCK_TOOL_VARIABLES = @STRIP_BEGIN@ \
stock_tool_button_airbrush \
$(srcdir)/images/tools/stock-tool-button-airbrush.png \
stock_tool_button_bezier_select \
$(srcdir)/images/tools/stock-tool-button-bezier-select.png \
stock_tool_button_blend \
$(srcdir)/images/tools/stock-tool-button-blend.png \
stock_tool_button_blur \
$(srcdir)/images/tools/stock-tool-button-blur.png \
stock_tool_button_brightness_contrast \
$(srcdir)/images/tools/stock-tool-button-brightness-contrast.png \
stock_tool_button_bucket_fill \
$(srcdir)/images/tools/stock-tool-button-bucket-fill.png \
stock_tool_button_by_color_select \
$(srcdir)/images/tools/stock-tool-button-by-color-select.png \
stock_tool_button_clone \
$(srcdir)/images/tools/stock-tool-button-clone.png \
stock_tool_button_color_balance \
$(srcdir)/images/tools/stock-tool-button-color-balance.png \
stock_tool_button_color_picker \
$(srcdir)/images/tools/stock-tool-button-color-picker.png \
stock_tool_button_crop \
$(srcdir)/images/tools/stock-tool-button-crop.png \
stock_tool_button_curves \
$(srcdir)/images/tools/stock-tool-button-curves.png \
stock_tool_button_dodge \
$(srcdir)/images/tools/stock-tool-button-dodge.png \
stock_tool_button_ellipse_select \
$(srcdir)/images/tools/stock-tool-button-ellipse-select.png \
stock_tool_button_eraser \
$(srcdir)/images/tools/stock-tool-button-eraser.png \
stock_tool_button_flip \
$(srcdir)/images/tools/stock-tool-button-flip.png \
stock_tool_button_free_select \
$(srcdir)/images/tools/stock-tool-button-free-select.png \
stock_tool_button_fuzzy_select \
$(srcdir)/images/tools/stock-tool-button-fuzzy-select.png \
stock_tool_button_histogram \
$(srcdir)/images/tools/stock-tool-button-histogram.png \
stock_tool_button_hue_saturation \
$(srcdir)/images/tools/stock-tool-button-hue-saturation.png \
stock_tool_button_ink \
$(srcdir)/images/tools/stock-tool-button-ink.png \
stock_tool_button_iscissors \
$(srcdir)/images/tools/stock-tool-button-iscissors.png \
stock_tool_button_levels \
$(srcdir)/images/tools/stock-tool-button-levels.png \
stock_tool_button_measure \
$(srcdir)/images/tools/stock-tool-button-measure.png \
stock_tool_button_move \
$(srcdir)/images/tools/stock-tool-button-move.png \
stock_tool_button_paintbrush \
$(srcdir)/images/tools/stock-tool-button-paintbrush.png \
stock_tool_button_path \
$(srcdir)/images/tools/stock-tool-button-path.png \
stock_tool_button_pencil \
$(srcdir)/images/tools/stock-tool-button-pencil.png \
stock_tool_button_perspective \
$(srcdir)/images/tools/stock-tool-button-perspective.png \
stock_tool_button_posterize \
$(srcdir)/images/tools/stock-tool-button-posterize.png \
stock_tool_button_rect_select \
$(srcdir)/images/tools/stock-tool-button-rect-select.png \
stock_tool_button_rotate \
$(srcdir)/images/tools/stock-tool-button-rotate.png \
stock_tool_button_scale \
$(srcdir)/images/tools/stock-tool-button-scale.png \
stock_tool_button_shear \
$(srcdir)/images/tools/stock-tool-button-shear.png \
stock_tool_button_smudge \
$(srcdir)/images/tools/stock-tool-button-smudge.png \
stock_tool_button_text \
$(srcdir)/images/tools/stock-tool-button-text.png \
stock_tool_button_threshold \
$(srcdir)/images/tools/stock-tool-button-threshold.png \
stock_tool_button_zoom \
$(srcdir)/images/tools/stock-tool-button-zoom.png \
@STRIP_END@
WILBER_VARIABLES = @STRIP_BEGIN@ \
stock_wilber_16_16 \
$(srcdir)/images/stock-wilber-16x16.png \
stock_wilber_32_32 \
$(srcdir)/images/stock-wilber-32x32.png \
stock_wilber_48_48 \
$(srcdir)/images/stock-wilber-48x48.png \
stock_wilber_64_64 \
$(srcdir)/images/stock-wilber-64x64.png \
@STRIP_END@
noinst_DATA = gimp-stock-pixbufs.h gimp-wilber-pixbufs.h
CLEANFILES = $(noinst_DATA)
gimp-stock-pixbufs.h: $(STOCK_IMAGES) $(STOCK_TOOL_IMAGES) Makefile.am
gdk-pixbuf-csource --raw --build-list $(STOCK_VARIABLES) $(STOCK_TOOL_VARIABLES) >$(srcdir)/gimp-stock-pixbufs.h
gimp-wilber-pixbufs.h: $(WILBER_IMAGES) Makefile.am
gdk-pixbuf-csource --raw --build-list $(WILBER_VARIABLES) >$(srcdir)/gimp-wilber-pixbufs.h

4
themes/Default/imagerc
View file

@ -59,8 +59,8 @@ style "gimp-icons"
}
stock["gimp-reset"] =
{
{ "images/stock-button-refresh.png", *, *, "gtk-button" },
{ "images/stock-button-refresh.png", *, *, * }
{ "images/stock-button-reset.png", *, *, "gtk-button" },
{ "images/stock-button-reset.png", *, *, * }
}
stock["gimp-stroke"] =
{

3
themes/Default/images/.cvsignore
View file

@ -2,3 +2,6 @@ Makefile
Makefile.in
.xvpics
.thumbnails
stock-icons.list
gimp-stock-pixbufs.h
gimp-wilber-pixbufs.h

103
themes/Default/images/Makefile.am
View file

@ -1,9 +1,12 @@
## Process this file with automake to produce Makefile.in
SUBDIRS = preferences tools
SUBDIRS = preferences
themedatadir = $(gimpdatadir)/themes/Default/images
## Icons that override GTK+ default stock icons
DIALOG_IMAGES = @STRIP_BEGIN@ \
gimp-dialog-error.png \
gimp-dialog-info.png \
@ -20,7 +23,27 @@ GTK_STOCK_IMAGES = @STRIP_BEGIN@ \
stock-button-refresh.png \
@STRIP_END@
STOCK_IMAGES = @STRIP_BEGIN@ \
## Wilber icons for the window managaer, compiled in
WILBER_IMAGES = @STRIP_BEGIN@ \
stock-wilber-16x16.png \
stock-wilber-32x32.png \
stock-wilber-48x48.png \
stock-wilber-64x64.png \
@STRIP_END@
WILBER_VARIABLES = @STRIP_BEGIN@ \
stock_wilber_16_16 $(srcdir)/stock-wilber-16x16.png \
stock_wilber_32_32 $(srcdir)/stock-wilber-32x32.png \
stock_wilber_48_48 $(srcdir)/stock-wilber-48x48.png \
stock_wilber_64_64 $(srcdir)/stock-wilber-64x64.png \
@STRIP_END@
## Below are compiled in stock icons
STOCK_BUTTON_IMAGES = @STRIP_BEGIN@ \
stock-button-anchor.png \
stock-button-duplicate.png \
stock-button-edit.png \
@ -28,6 +51,7 @@ STOCK_IMAGES = @STRIP_BEGIN@ \
stock-button-linked.png \
stock-button-paste-as-new.png \
stock-button-paste-into.png \
stock-button-reset.png \
stock-button-selection-replace.png \
stock-button-selection-add.png \
stock-button-selection-subtract.png \
@ -39,22 +63,87 @@ STOCK_IMAGES = @STRIP_BEGIN@ \
stock-button-hchain-broken.png \
stock-button-vchain.png \
stock-button-vchain-broken.png \
@STRIP_END@
STOCK_MENU_IMAGES = @STRIP_BEGIN@ \
stock-menu-navigation.png \
stock-menu-qmask-off.png \
stock-menu-qmask-on.png \
@STRIP_END@
STOCK_WILBER_IMAGES = @STRIP_BEGIN@ \
stock-wilber-eek.png \
@STRIP_END@
WILBER_IMAGES = @STRIP_BEGIN@ \
stock-wilber-16x16.png \
stock-wilber-32x32.png \
stock-wilber-48x48.png \
stock-wilber-64x64.png \
STOCK_TOOL_IMAGES = @STRIP_BEGIN@ \
tools/stock-tool-button-airbrush.png \
tools/stock-tool-button-bezier-select.png \
tools/stock-tool-button-blend.png \
tools/stock-tool-button-blur.png \
tools/stock-tool-button-brightness-contrast.png \
tools/stock-tool-button-bucket-fill.png \
tools/stock-tool-button-by-color-select.png \
tools/stock-tool-button-clone.png \
tools/stock-tool-button-color-balance.png \
tools/stock-tool-button-color-picker.png \
tools/stock-tool-button-crop.png \
tools/stock-tool-button-curves.png \
tools/stock-tool-button-dodge.png \
tools/stock-tool-button-ellipse-select.png \
tools/stock-tool-button-eraser.png \
tools/stock-tool-button-flip.png \
tools/stock-tool-button-free-select.png \
tools/stock-tool-button-fuzzy-select.png \
tools/stock-tool-button-histogram.png \
tools/stock-tool-button-hue-saturation.png \
tools/stock-tool-button-ink.png \
tools/stock-tool-button-iscissors.png \
tools/stock-tool-button-levels.png \
tools/stock-tool-button-measure.png \
tools/stock-tool-button-move.png \
tools/stock-tool-button-paintbrush.png \
tools/stock-tool-button-path.png \
tools/stock-tool-button-pencil.png \
tools/stock-tool-button-perspective.png \
tools/stock-tool-button-posterize.png \
tools/stock-tool-button-rect-select.png \
tools/stock-tool-button-rotate.png \
tools/stock-tool-button-scale.png \
tools/stock-tool-button-shear.png \
tools/stock-tool-button-smudge.png \
tools/stock-tool-button-text.png \
tools/stock-tool-button-threshold.png \
tools/stock-tool-button-zoom.png \
@STRIP_END@
STOCK_IMAGES = \
$(STOCK_BUTTON_IMAGES) \
$(STOCK_MENU_IMAGES) \
$(STOCK_TOOL_IMAGES) \
$(STOCK_WILBER_IMAGES)
themedata_DATA = $(DIALOG_IMAGES) $(GTK_STOCK_IMAGES) $(STOCK_IMAGES)
EXTRA_DIST = \
$(themedata_DATA) \
$(WILBER_IMAGES) \
gimp-dialog-icons.xcf.gz
noinst_DATA = gimp-stock-pixbufs.h gimp-wilber-pixbufs.h
CLEANFILES = $(noinst_DATA) stock-icons.list
stock-icons.list: $(STOCK_IMAGES) Makefile.am
( rm -f $@; \
for image in $(STOCK_IMAGES); do \
echo -n $$image | \
sed -e 's|.*/||' -e 's|-|_|g' -e 's|\.png$$||' >> $@; \
echo " $(srcdir)/$$image" >> $@; \
done )
gimp-stock-pixbufs.h: stock-icons.list
gdk-pixbuf-csource --raw --build-list `cat stock-icons.list` >$(srcdir)/gimp-stock-pixbufs.h
gimp-wilber-pixbufs.h: $(WILBER_IMAGES)
gdk-pixbuf-csource --raw --build-list $(WILBER_VARIABLES) >$(srcdir)/gimp-wilber-pixbufs.h

BIN
themes/Default/images/stock-button-reset.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 204 B

2
themes/Default/images/tools/.cvsignore
View file

@ -1,4 +1,2 @@
Makefile
Makefile.in
.xvpics
.thumbnails

48
themes/Default/images/tools/Makefile.am
View file

@ -1,48 +0,0 @@
## Process this file with automake to produce Makefile.in
themedatadir = $(gimpdatadir)/themes/Default/images/tools
STOCK_TOOL_IMAGES = @STRIP_BEGIN@ \
stock-tool-button-airbrush.png \
stock-tool-button-bezier-select.png \
stock-tool-button-blend.png \
stock-tool-button-blur.png \
stock-tool-button-brightness-contrast.png \
stock-tool-button-bucket-fill.png \
stock-tool-button-by-color-select.png \
stock-tool-button-clone.png \
stock-tool-button-color-balance.png \
stock-tool-button-color-picker.png \
stock-tool-button-crop.png \
stock-tool-button-curves.png \
stock-tool-button-dodge.png \
stock-tool-button-ellipse-select.png \
stock-tool-button-eraser.png \
stock-tool-button-flip.png \
stock-tool-button-free-select.png \
stock-tool-button-fuzzy-select.png \
stock-tool-button-histogram.png \
stock-tool-button-hue-saturation.png \
stock-tool-button-ink.png \
stock-tool-button-iscissors.png \
stock-tool-button-levels.png \
stock-tool-button-measure.png \
stock-tool-button-move.png \
stock-tool-button-paintbrush.png \
stock-tool-button-path.png \
stock-tool-button-pencil.png \
stock-tool-button-perspective.png \
stock-tool-button-posterize.png \
stock-tool-button-rect-select.png \
stock-tool-button-rotate.png \
stock-tool-button-scale.png \
stock-tool-button-shear.png \
stock-tool-button-smudge.png \
stock-tool-button-text.png \
stock-tool-button-threshold.png \
stock-tool-button-zoom.png \
@STRIP_END@
themedata_DATA = $(STOCK_TOOL_IMAGES)
EXTRA_DIST = $(themedata_DATA)