Commit 28cbe15e authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

declared GimpPixmap as deprecated.

2004-07-13  Sven Neumann  <sven@gimp.org>

	* libgimpwidgets/gimppixmap.[ch]: declared GimpPixmap as deprecated.

	* libgimpwidgets/gimpwidgets.[ch]: ditto for gimp_pixmap_button_new().

	* plug-ins/Lighting/ChangeLog: removed outdated and unused ChangeLog.

	* plug-ins/Lighting/Makefile.am
	* plug-ins/Lighting/*.xpm: removed XPM files...

	* configure.in
	* plug-ins/Lighting/images: ... and added them as PNG images here.
	These should be redone with antialiased edges.

	* plug-ins/Lighting/lighting_stock.[ch]
	* plug-ins/Lighting/lighting_ui.c: register stock icons and use
	those instead of GimpPixmaps.

	* plug-ins/MapObject/Makefile.am
	* plug-ins/MapObject/*.xpm: removed duplicated XPM files.

	* plug-ins/MapObject/mapobject_stock.[ch]: register stock icons
	reusing the generated header from the Lighting plug-in.

	* plug-ins/MapObject/mapobject_ui.c: use them.

	* plug-ins/pagecurl/pagecurl.c: undef GIMP_DISABLE_DEPRECATED until
	GimpPixmap has been replaced here as well.
parent 00645d10
2004-07-13 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimppixmap.[ch]: declared GimpPixmap as deprecated.
* libgimpwidgets/gimpwidgets.[ch]: ditto for gimp_pixmap_button_new().
* plug-ins/Lighting/ChangeLog: removed outdated and unused ChangeLog.
* plug-ins/Lighting/Makefile.am
* plug-ins/Lighting/*.xpm: removed XPM files...
* configure.in
* plug-ins/Lighting/images: ... and added them as PNG images here.
These should be redone with antialiased edges.
* plug-ins/Lighting/lighting_stock.[ch]
* plug-ins/Lighting/lighting_ui.c: register stock icons and use
those instead of GimpPixmaps.
* plug-ins/MapObject/Makefile.am
* plug-ins/MapObject/*.xpm: removed duplicated XPM files.
* plug-ins/MapObject/mapobject_stock.[ch]: register stock icons
reusing the generated header from the Lighting plug-in.
* plug-ins/MapObject/mapobject_ui.c: use them.
* plug-ins/pagecurl/pagecurl.c: undef GIMP_DISABLE_DEPRECATED until
GimpPixmap has been replaced here as well.
2004-07-13 Shlomi Fish <shlomif@iglu.org.il>
* plug-ins/gimpressionist/presets.c: fixed Bug # 147483 (gimpressionist
* plug-ins/gimpressionist/presets.c: fixed bug #147483 (gimpressionist
will delete global presets if the user running GIMP has priviliges to
do so ). This was done by creating a function to check if a preset is
global, and by making sure the delete button is in-sensitive when this
is the case.
do so). This was done by creating a function to check if a preset is
global, and by making sure the delete button is in-sensitive when
this is the case.
2004-07-13 Sven Neumann <sven@gimp.org>
......
......@@ -1601,6 +1601,7 @@ plug-ins/xjt/Makefile
plug-ins/FractalExplorer/Makefile
plug-ins/FractalExplorer/examples/Makefile
plug-ins/Lighting/Makefile
plug-ins/Lighting/images/Makefile
plug-ins/MapObject/Makefile
plug-ins/bmp/Makefile
plug-ins/common/Makefile
......
......@@ -26,6 +26,7 @@
#include "gimpwidgetstypes.h"
#undef GIMP_DISABLE_DEPRECATED
#include "gimppixmap.h"
......@@ -70,9 +71,7 @@ gimp_pixmap_get_type (void)
static void
gimp_pixmap_class_init (GimpPixmapClass *klass)
{
GtkWidgetClass *widget_class;
widget_class = GTK_WIDGET_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
......@@ -96,9 +95,7 @@ gimp_pixmap_init (GimpPixmap *pixmap)
GtkWidget *
gimp_pixmap_new (gchar **xpm_data)
{
GimpPixmap *pixmap;
pixmap = g_object_new (GIMP_TYPE_PIXMAP, NULL);
GimpPixmap *pixmap = g_object_new (GIMP_TYPE_PIXMAP, NULL);
gimp_pixmap_set (pixmap, xpm_data);
......
......@@ -20,6 +20,8 @@
* Boston, MA 02111-1307, USA.
*/
#ifndef GIMP_DISABLE_DEPRECATED
#ifndef __GIMP_PIXMAP_H__
#define __GIMP_PIXMAP_H__
......@@ -70,3 +72,6 @@ void gimp_pixmap_set (GimpPixmap *pixmap,
G_END_DECLS
#endif /* __GIMP_PIXMAP_H__ */
#endif /* GIMP_DISABLE_DEPRECATED */
......@@ -31,9 +31,12 @@
#include "gimpwidgetstypes.h"
#include "gimpchainbutton.h"
#include "gimppixmap.h"
#include "gimpsizeentry.h"
#include "gimpunitmenu.h"
#undef GIMP_DISABLE_DEPRECATED
#include "gimppixmap.h"
#include "gimpwidgets.h"
#include "libgimp/libgimp-intl.h"
......
......@@ -221,9 +221,14 @@ GtkWidget * gimp_coordinates_new (GimpUnit unit,
gdouble ysize_100 /* % */);
#ifndef GIMP_DISABLE_DEPRECATED
GtkWidget * gimp_pixmap_button_new (gchar **xpm_data,
const gchar *text);
#endif
/*
* Standard Callbacks
*/
......
Changes:
========
0.2.2: Fixed a bug in the preview code sometimes causing a SIGSEGV.
Thanks to Prabhanjan <prabham@india.s3.com> for reporting it.
0.2.1: Fixed a bug in the calculation of the normals. Thanks to
Simon Budig <Simon.Budig@unix-ag.org> for pointing this out.
0.2.0: Fixed crashes when rerunning after closing mapping images. Removed
GckNotebook and fixed gtk refcounting problems. Added non-interactive
(scripting) interface. First non-beta release.
0.1.1: Transparent background and RGBA support, various bug fixes and
minor speed ups. First beta version.
0.0.x: Many bug fixes. Moved it to "..filters/Light Effects/Lighting Effects"
0.0.1: First version for 0.99.x
......@@ -13,19 +13,13 @@ endif
AM_LDFLAGS = $(mwindows)
SUBDIRS = images
libexecdir = $(gimpplugindir)/plug-ins
libexec_PROGRAMS = Lighting
Lighting_SOURCES = \
amb1.xpm \
amb2.xpm \
diffint1.xpm \
diffint2.xpm \
diffref1.xpm \
diffref2.xpm \
high1.xpm \
high2.xpm \
lighting_apply.c \
lighting_apply.h \
lighting_image.c \
......@@ -36,10 +30,10 @@ Lighting_SOURCES = \
lighting_preview.h \
lighting_shade.c \
lighting_shade.h \
lighting_stock.c \
lighting_stock.h \
lighting_ui.c \
lighting_ui.h \
specref1.xpm \
specref2.xpm
lighting_ui.h
INCLUDES = \
-I$(top_srcdir) \
......
/* XPM */
char * amb1_xpm[] = {
"32 32 53 1",
" c None",
". c #861786178617",
"X c #861782078617",
"o c #69A66DB669A6",
"O c #8E388E388E38",
"+ c #B6DAB2CAB6DA",
"@ c #BEFBBAEABEFB",
"# c #AEBAAEBAAEBA",
"$ c #9E799E799E79",
"% c #8E388A288E38",
"& c #618565956185",
"* c #30C234D330C2",
"= c #A699A699A699",
"- c #CF3CCF3CCF3C",
"; c #D75CD34CD75C",
": c #C71BC30BC71B",
"> c #DF7DDF7DDF7D",
", c #D75CD75CD75C",
"< c #CF3CCB2BCF3C",
"1 c #AEBAAAAAAEBA",
"2 c #965896589658",
"3 c #79E779E779E7",
"4 c #514455555144",
"5 c #18611C711861",
"6 c #E79DE38DE79D",
"7 c #E79DE79DE79D",
"8 c #DF7DDB6CDF7D",
"9 c #BEFBBEFBBEFB",
"0 c #9E799A699E79",
"q c #79E77DF779E7",
"w c #618561856185",
"e c #38E338E338E3",
"r c #000004100000",
"t c #EFBEEFBEEFBE",
"y c #FFFFFBEEFFFF",
"u c #410341034103",
"i c #08200C300820",
"p c #FFFFFFFFFFFF",
"a c #B6DAB6DAB6DA",
"s c #965892489658",
"d c #104014511040",
"f c #71C675D671C6",
"g c #596559655965",
"h c #104010401040",
"j c #000000000000",
"k c #514451445144",
"l c #30C230C230C2",
"z c #59655D755965",
"x c #410345144103",
"c c #208124922081",
"v c #49244D344924",
"b c #208120812081",
"n c #082008200820",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" .Xo ",
" O+@@#$%&* ",
" =-;;-:+$.&* ",
" =;>>>,<@12345 ",
" O->6778-9#0qwer ",
" +;>7tyt-910X&ui ",
" @;>7ypy-a=sqwud ",
" .@-,8ty6:#$Ofgehj ",
" X#:<---:+=2Xoklij ",
" o$+@99a#=2.fzxcrj ",
" %$1#1=$2.f&v*dj ",
" &.200sOXf&kebrj ",
" *&3qXqfozvecnjj ",
" *4w&wgkx*bnjj ",
" 5euuelcdrjj ",
" ridhirjjj ",
" jjj ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
/* XPM */
char * amb2_xpm[] = {
"32 32 23 1",
" c None",
". c #CF3CCF3CCF3C",
"X c #CF3CCB2BCF3C",
"o c #C71BC30BC71B",
"O c #D75CD75CD75C",
"+ c #DF7DDB6CDF7D",
"@ c #C71BC71BC71B",
"# c #AEBAAEBAAEBA",
"$ c #DF7DDF7DDF7D",
"% c #E79DE38DE79D",
"& c #D75CD34CD75C",
"* c #E79DE79DE79D",
"= c #AEBAAAAAAEBA",
"- c #EFBEEBADEFBE",
"; c #BEFBBEFBBEFB",
": c #A699A289A699",
"> c #F7DEF3CEF7DE",
", c #F7DEF7DEF7DE",
"< c #B6DAB2CAB6DA",
"1 c #FFFFFFFFFFFF",
"2 c #FFFFFBEEFFFF",
"3 c #B6DAB6DAB6DA",
"4 c #BEFBBAEABEFB",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ..X ",
" oO+++O.@# ",
" X$%%$$+O&X# ",
" X%%*%%$$+&.@= ",
" o$%**-*%$+O.@;: ",
" O%**>,,%$+O.Xo< ",
" +%%-,12*+O&.Xo3 ",
" .+$%*,2,%+O&.@;3< ",
" .+$$%%*%+O&.X@;3< ",
" XO+$$$++OO&.@o43< ",
" .O+++OO&&.Xo;3< ",
" @&&OO&&..X@;43# ",
" #X.....X@o;43<: ",
" #@@XX@@o;43<: ",
" =;oo;;433<: ",
" :<3333<#: ",
" <<< ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
/* XPM */
char * diffint1_xpm[] = {
"32 32 9 1",
" c None",
". c #514455555144",
"X c #514451445144",
"o c #49244D344924",
"O c #596559655965",
"+ c #492449244924",
"@ c #410345144103",
"# c #59655D755965",
"$ c #618561856185",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ..X ",
" o.OO...X+ ",
" XOOOOOO..X+ ",
" XOOOOOOO...X+ ",
" oOOOOOOOOO..Xo@ ",
" .OOO###OO...XX+ ",
" OOOO#$#OO...XXo ",
" .OOOO###OO...XXoo ",
" ..OOOOOOO...XXooo ",
" X.OOOOOO....XXooo ",
" ...O......XXooo ",
" X........XXXoo+ ",
" +X.....XXXXooo@ ",
" +XXXXXXXoooo@ ",
" +oXXXooooo@ ",
" @+ooooo+@ ",
" ooo ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
/* XPM */
char * diffint2_xpm[] = {
"32 32 45 1",
" c None",
". c #A699A699A699",
"X c #A699A289A699",
"o c #965896589658",
"O c #BEFBBEFBBEFB",
"+ c #CF3CCB2BCF3C",
"@ c #C71BC71BC71B",
"# c #C71BC30BC71B",
"$ c #B6DAB6DAB6DA",
"% c #8E388E388E38",
"& c #69A669A669A6",
"* c #D75CD75CD75C",
"= c #DF7DDB6CDF7D",
"- c #CF3CCF3CCF3C",
"; c #965892489658",
": c #DF7DDF7DDF7D",
"> c #E79DE38DE79D",
", c #D75CD34CD75C",
"< c #AEBAAEBAAEBA",
"1 c #9E799E799E79",
"2 c #861786178617",
"3 c #596559655965",
"4 c #E79DE79DE79D",
"5 c #B6DAB2CAB6DA",
"6 c #71C671C671C6",
"7 c #492449244924",
"8 c #F7DEF3CEF7DE",
"9 c #F7DEF7DEF7DE",
"0 c #71C675D671C6",
"q c #514455555144",
"w c #FFFFFFFFFFFF",
"e c #FFFFFBEEFFFF",
"r c #BEFBBAEABEFB",
"t c #EFBEEBADEFBE",
"y c #AEBAAAAAAEBA",
"u c #9E799A699E79",
"i c #8E388A288E38",
"p c #49244D344924",
"a c #861782078617",
"s c #69A66DB669A6",
"d c #79E779E779E7",
"f c #618565956185",
"g c #514451445144",
"h c #618561856185",
"j c #410345144103",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" .Xo ",
" .O+@#$.%& ",
" $*==*-#$.;& ",
" $=:>:=,+O<123 ",
" .*:444:*+O5X%67 ",
" O=>4898*+O5X%0q ",
" +=:49we=@r<1%03 ",
" .@*=:8et-#$yui03p ",
" X#-,**=-#r<Xoasqp ",
" o$#+++@#r5.uidfgp ",
" .$OOOr$<.1%as3p ",
" %.<55<yXu%a0hg7 ",
" &;1XX1uoia0fgpj ",
" &2%%%iadshgpj ",
" 36000sf3gpj ",
" 7q33qgp7j ",
" ppp ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
/* XPM */
char * diffref1_xpm[] = {
"32 32 11 1",
" c None",
". c #49244D344924",
"X c #410345144103",
"o c #492449244924",
"O c #514451445144",
"+ c #596559655965",
"@ c #79E779E779E7",
"# c #69A669A669A6",
"$ c #BEFBBAEABEFB",
"% c #8E388A288E38",
"& c #514455555144",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ... ",
" Xo.....oX ",
" X.........X ",
" X...........X ",
" X....OO.......X ",
" o...+@#O......o ",
" ...O@$%&....... ",
" ....O#%#O........ ",
" .....O&O......... ",
" ................. ",
" ............... ",
" o.............o ",
" X.............X ",
" X...........X ",
" X.........X ",
" Xo.....oX ",
" ... ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
/* XPM */
char * diffref2_xpm[] = {
"32 32 40 1",
" c None",
". c #D75CD34CD75C",
"X c #CF3CCF3CCF3C",
"o c #BEFBBAEABEFB",
"O c #F7DEF3CEF7DE",
"+ c #F7DEF7DEF7DE",
"@ c #FFFFFBEEFFFF",
"# c #EFBEEBADEFBE",
"$ c #D75CD75CD75C",
"% c #B6DAB2CAB6DA",
"& c #79E779E779E7",
"* c #E79DE79DE79D",
"= c #FFFFFFFFFFFF",
"- c #EFBEEFBEEFBE",
"; c #E79DE38DE79D",
": c #C71BC71BC71B",
"> c #A699A289A699",
", c #618565956185",
"< c #AEBAAEBAAEBA",
"1 c #861786178617",
"2 c #492449244924",
"3 c #8E388E388E38",
"4 c #596559655965",
"5 c #CF3CCB2BCF3C",
"6 c #618561856185",
"7 c #DF7DDB6CDF7D",
"8 c #C71BC30BC71B",
"9 c #AEBAAAAAAEBA",
"0 c #8E388A288E38",
"q c #49244D344924",
"w c #9E799E799E79",
"e c #79E77DF779E7",
"r c #965892489658",
"t c #71C671C671C6",
"y c #514451445144",
"u c #9E799A699E79",
"i c #861782078617",
"p c #69A66DB669A6",
"a c #514455555144",
"s c #410345144103",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" .Xo ",
" .O+@@#$%& ",
" *=====@-$%& ",
" *=======+;:>, ",
" .========+*X<12 ",
" O========+*X%34 ",
" +========O;5<36 ",
" .@=======@#78906q ",
" X@======@O;Xowe4q ",
" o#@====@O*$89rtyq ",
" $-+++O#;$:%ui6q ",
" %$;**;7X8%w0py2 ",
" &%:XX58o9u0taqs ",
" &><%<9wripaqs ",
" ,1330et6yqs ",
" 24664yq2s ",
" qqq ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
/* XPM */
char * high1_xpm[] = {
"32 32 40 1",
" c None",
". c #D75CD34CD75C",
"X c #CF3CCF3CCF3C",
"o c #BEFBBAEABEFB",
"O c #F7DEF3CEF7DE",
"+ c #F7DEF7DEF7DE",
"@ c #FFFFFBEEFFFF",
"# c #EFBEEBADEFBE",
"$ c #D75CD75CD75C",
"% c #B6DAB2CAB6DA",
"& c #79E779E779E7",
"* c #E79DE79DE79D",
"= c #FFFFFFFFFFFF",
"- c #EFBEEFBEEFBE",
"; c #E79DE38DE79D",
": c #C71BC71BC71B",
"> c #A699A289A699",
", c #618565956185",
"< c #AEBAAEBAAEBA",
"1 c #861786178617",
"2 c #492449244924",
"3 c #8E388E388E38",
"4 c #596559655965",
"5 c #CF3CCB2BCF3C",
"6 c #618561856185",
"7 c #DF7DDB6CDF7D",
"8 c #C71BC30BC71B",
"9 c #AEBAAAAAAEBA",
"0 c #8E388A288E38",
"q c #49244D344924",
"w c #9E799E799E79",
"e c #79E77DF779E7",
"r c #965892489658",
"t c #71C671C671C6",
"y c #514451445144",
"u c #9E799A699E79",
"i c #861782078617",
"p c #69A66DB669A6",
"a c #514455555144",
"s c #410345144103",
" ",
" ",
" ",
" ",
" ",
" ",