From 28cbe15ed7e002b213095e5341caf08d573ae36f Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Tue, 13 Jul 2004 15:59:52 +0000 Subject: [PATCH] declared GimpPixmap as deprecated. 2004-07-13 Sven Neumann * 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. --- ChangeLog | 38 +++++- configure.in | 1 + libgimpwidgets/gimppixmap.c | 9 +- libgimpwidgets/gimppixmap.h | 5 + libgimpwidgets/gimpwidgets.c | 5 +- libgimpwidgets/gimpwidgets.h | 5 + plug-ins/Lighting/ChangeLog | 20 ---- plug-ins/Lighting/Makefile.am | 16 +-- plug-ins/Lighting/amb1.xpm | 88 -------------- plug-ins/Lighting/amb2.xpm | 58 ---------- plug-ins/Lighting/diffint1.xpm | 44 ------- plug-ins/Lighting/diffint2.xpm | 80 ------------- plug-ins/Lighting/diffref1.xpm | 46 -------- plug-ins/Lighting/diffref2.xpm | 75 ------------ plug-ins/Lighting/high1.xpm | 75 ------------ plug-ins/Lighting/high2.xpm | 78 ------------- plug-ins/Lighting/images/.cvsignore | 6 + plug-ins/Lighting/images/Makefile.am | 29 +++++ .../images/stock-intensity-ambient-high.png | Bin 0 -> 725 bytes .../images/stock-intensity-ambient-low.png | Bin 0 -> 918 bytes .../images/stock-intensity-diffuse-high.png | Bin 0 -> 829 bytes .../images/stock-intensity-diffuse-low.png | Bin 0 -> 504 bytes .../stock-reflectivity-diffuse-high.png | Bin 0 -> 805 bytes .../images/stock-reflectivity-diffuse-low.png | Bin 0 -> 441 bytes .../stock-reflectivity-highlight-high.png | Bin 0 -> 822 bytes .../stock-reflectivity-highlight-low.png | Bin 0 -> 805 bytes .../stock-reflectivity-specular-high.png | Bin 0 -> 842 bytes .../stock-reflectivity-specular-low.png | Bin 0 -> 800 bytes plug-ins/Lighting/lighting_stock.c | 109 ++++++++++++++++++ plug-ins/Lighting/lighting_stock.h | 38 ++++++ plug-ins/Lighting/lighting_ui.c | 78 +++++++------ plug-ins/Lighting/specref1.xpm | 75 ------------ plug-ins/Lighting/specref2.xpm | 79 ------------- plug-ins/MapObject/Makefile.am | 16 +-- plug-ins/MapObject/amb1.xpm | 88 -------------- plug-ins/MapObject/amb2.xpm | 58 ---------- plug-ins/MapObject/diffint1.xpm | 44 ------- plug-ins/MapObject/diffint2.xpm | 80 ------------- plug-ins/MapObject/diffref1.xpm | 46 -------- plug-ins/MapObject/diffref2.xpm | 75 ------------ plug-ins/MapObject/high1.xpm | 75 ------------ plug-ins/MapObject/high2.xpm | 78 ------------- plug-ins/MapObject/mapobject_stock.c | 109 ++++++++++++++++++ plug-ins/MapObject/mapobject_stock.h | 38 ++++++ plug-ins/MapObject/mapobject_ui.c | 74 ++++++------ plug-ins/MapObject/specref1.xpm | 75 ------------ plug-ins/MapObject/specref2.xpm | 79 ------------- plug-ins/pagecurl/pagecurl.c | 5 +- 48 files changed, 470 insertions(+), 1527 deletions(-) delete mode 100644 plug-ins/Lighting/ChangeLog delete mode 100644 plug-ins/Lighting/amb1.xpm delete mode 100644 plug-ins/Lighting/amb2.xpm delete mode 100644 plug-ins/Lighting/diffint1.xpm delete mode 100644 plug-ins/Lighting/diffint2.xpm delete mode 100644 plug-ins/Lighting/diffref1.xpm delete mode 100644 plug-ins/Lighting/diffref2.xpm delete mode 100644 plug-ins/Lighting/high1.xpm delete mode 100644 plug-ins/Lighting/high2.xpm create mode 100644 plug-ins/Lighting/images/.cvsignore create mode 100644 plug-ins/Lighting/images/Makefile.am create mode 100644 plug-ins/Lighting/images/stock-intensity-ambient-high.png create mode 100644 plug-ins/Lighting/images/stock-intensity-ambient-low.png create mode 100644 plug-ins/Lighting/images/stock-intensity-diffuse-high.png create mode 100644 plug-ins/Lighting/images/stock-intensity-diffuse-low.png create mode 100644 plug-ins/Lighting/images/stock-reflectivity-diffuse-high.png create mode 100644 plug-ins/Lighting/images/stock-reflectivity-diffuse-low.png create mode 100644 plug-ins/Lighting/images/stock-reflectivity-highlight-high.png create mode 100644 plug-ins/Lighting/images/stock-reflectivity-highlight-low.png create mode 100644 plug-ins/Lighting/images/stock-reflectivity-specular-high.png create mode 100644 plug-ins/Lighting/images/stock-reflectivity-specular-low.png create mode 100644 plug-ins/Lighting/lighting_stock.c create mode 100644 plug-ins/Lighting/lighting_stock.h delete mode 100644 plug-ins/Lighting/specref1.xpm delete mode 100644 plug-ins/Lighting/specref2.xpm delete mode 100644 plug-ins/MapObject/amb1.xpm delete mode 100644 plug-ins/MapObject/amb2.xpm delete mode 100644 plug-ins/MapObject/diffint1.xpm delete mode 100644 plug-ins/MapObject/diffint2.xpm delete mode 100644 plug-ins/MapObject/diffref1.xpm delete mode 100644 plug-ins/MapObject/diffref2.xpm delete mode 100644 plug-ins/MapObject/high1.xpm delete mode 100644 plug-ins/MapObject/high2.xpm create mode 100644 plug-ins/MapObject/mapobject_stock.c create mode 100644 plug-ins/MapObject/mapobject_stock.h delete mode 100644 plug-ins/MapObject/specref1.xpm delete mode 100644 plug-ins/MapObject/specref2.xpm diff --git a/ChangeLog b/ChangeLog index 57912cc656..f2343f481f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,40 @@ +2004-07-13 Sven Neumann + + * 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 - * 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 diff --git a/configure.in b/configure.in index 4ce792decd..6cdf6f60f6 100644 --- a/configure.in +++ b/configure.in @@ -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 diff --git a/libgimpwidgets/gimppixmap.c b/libgimpwidgets/gimppixmap.c index aab620dbc5..b80e497ed4 100644 --- a/libgimpwidgets/gimppixmap.c +++ b/libgimpwidgets/gimppixmap.c @@ -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); diff --git a/libgimpwidgets/gimppixmap.h b/libgimpwidgets/gimppixmap.h index 41b0eea982..882593ef73 100644 --- a/libgimpwidgets/gimppixmap.h +++ b/libgimpwidgets/gimppixmap.h @@ -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 */ + diff --git a/libgimpwidgets/gimpwidgets.c b/libgimpwidgets/gimpwidgets.c index 201d3713eb..2d58e33d8f 100644 --- a/libgimpwidgets/gimpwidgets.c +++ b/libgimpwidgets/gimpwidgets.c @@ -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" diff --git a/libgimpwidgets/gimpwidgets.h b/libgimpwidgets/gimpwidgets.h index d86bc4bf51..32e2fa4bc6 100644 --- a/libgimpwidgets/gimpwidgets.h +++ b/libgimpwidgets/gimpwidgets.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 */ diff --git a/plug-ins/Lighting/ChangeLog b/plug-ins/Lighting/ChangeLog deleted file mode 100644 index e64c9440a7..0000000000 --- a/plug-ins/Lighting/ChangeLog +++ /dev/null @@ -1,20 +0,0 @@ -Changes: -======== - -0.2.2: Fixed a bug in the preview code sometimes causing a SIGSEGV. - Thanks to Prabhanjan for reporting it. - -0.2.1: Fixed a bug in the calculation of the normals. Thanks to - Simon Budig 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 - diff --git a/plug-ins/Lighting/Makefile.am b/plug-ins/Lighting/Makefile.am index 9719f51212..299c084be1 100644 --- a/plug-ins/Lighting/Makefile.am +++ b/plug-ins/Lighting/Makefile.am @@ -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) \ diff --git a/plug-ins/Lighting/amb1.xpm b/plug-ins/Lighting/amb1.xpm deleted file mode 100644 index d9fb4a1b4e..0000000000 --- a/plug-ins/Lighting/amb1.xpm +++ /dev/null @@ -1,88 +0,0 @@ -/* 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 ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/plug-ins/Lighting/amb2.xpm b/plug-ins/Lighting/amb2.xpm deleted file mode 100644 index c9cc0eda5c..0000000000 --- a/plug-ins/Lighting/amb2.xpm +++ /dev/null @@ -1,58 +0,0 @@ -/* 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<#: ", -" <<< ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/plug-ins/Lighting/diffint1.xpm b/plug-ins/Lighting/diffint1.xpm deleted file mode 100644 index 323af173c3..0000000000 --- a/plug-ins/Lighting/diffint1.xpm +++ /dev/null @@ -1,44 +0,0 @@ -/* 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 ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/plug-ins/Lighting/diffint2.xpm b/plug-ins/Lighting/diffint2.xpm deleted file mode 100644 index 289db9eab9..0000000000 --- a/plug-ins/Lighting/diffint2.xpm +++ /dev/null @@ -1,80 +0,0 @@ -/* 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 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 ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/plug-ins/Lighting/high1.xpm b/plug-ins/Lighting/high1.xpm deleted file mode 100644 index b542308d05..0000000000 --- a/plug-ins/Lighting/high1.xpm +++ /dev/null @@ -1,75 +0,0 @@ -/* 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", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" .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 ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/plug-ins/Lighting/high2.xpm b/plug-ins/Lighting/high2.xpm deleted file mode 100644 index 49447a19fe..0000000000 --- a/plug-ins/Lighting/high2.xpm +++ /dev/null @@ -1,78 +0,0 @@ -/* XPM */ -char * high2_xpm[] = { -"32 32 43 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 #F7DEF7DEF7DE", -"9 c #71C675D671C6", -"0 c #514455555144", -"q c #FFFFFFFFFFFF", -"w c #BEFBBAEABEFB", -"e c #F7DEF3CEF7DE", -"r c #AEBAAAAAAEBA", -"t c #9E799A699E79", -"y c #8E388A288E38", -"u c #49244D344924", -"i c #861782078617", -"p c #69A66DB669A6", -"a c #79E779E779E7", -"s c #618565956185", -"d c #514451445144", -"f c #618561856185", -"g c #410345144103", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" .Xo ", -" .O+@#$.%& ", -" $*==*-#$.;& ", -" $=:>:=,+O<123 ", -" .*:>4>=*+O5X%67 ", -" O=>4>8:,+O5X%90 ", -" +=:>8qq-@w<1%93 ", -" .@*==:e=+#$rty93u ", -" X#-,*,*-#w> $@; \ + echo " $(srcdir)/$$image" >> $@; \ + done ) + +$(srcdir)/stock-pixbufs.h: stock-icons.list + gdk-pixbuf-csource --raw --build-list `cat stock-icons.list` > $(@F) diff --git a/plug-ins/Lighting/images/stock-intensity-ambient-high.png b/plug-ins/Lighting/images/stock-intensity-ambient-high.png new file mode 100644 index 0000000000000000000000000000000000000000..cb886ec93a04c0bac850fef2adec9fd40511b47f GIT binary patch literal 725 zcmV;`0xJE9P)knfck>_vU@yyaRA>aBy&NaQI)b@lY==q9Q6HA)1luCjh|c z^4Yi1<;L2+tM?aO?S0<9+7p7ryDv!$;D;XZLvtOc72_0um%QX90H>UC3NV|_rn4!) zWIP#9#`cBjO@Jc$`m~6IAo1>m!~lNa5kF7}mlflsx7DBkH=gAOPMDz&wY@@nJGdh6zBLou8+fS~~xT0E*QoB-RM%#6v%j z1m(CX#Qc2-ETyy45AV)SR~N#wB|u%{9VbrW$0I2W5|=-g|MS1R-sW|u`@wWbOGv{h zb_H2k08DNL6gve7AoeNHQ?3UaXj;`zb;{d0k}62Rn!w?IR* z-K@F@*YldAnwr;7-rV=V0$^nIPoBK-PXMq47B{*1O|ebf=n?c+@u$*R7S^M1nx$Eq z34zHC(Y_|TN?{Rkmb0AY0Eb7f-X0#U9*KMVFMyF11JYKoNw$J!zI~mUgmqzT6YpIB z1V&a8lUPlH-O#T=w7PBLYZIUgT>)m*uI}LA;Nalkurz)H6s^HzAFQ`=00000NkvXX Hu0mjfF&$Qf literal 0 HcmV?d00001 diff --git a/plug-ins/Lighting/images/stock-intensity-ambient-low.png b/plug-ins/Lighting/images/stock-intensity-ambient-low.png new file mode 100644 index 0000000000000000000000000000000000000000..fff7b450e6d64c7c7bf1f3c0f8854f1219da2b39 GIT binary patch literal 918 zcmV;H18Mw;P)h+H$dDn!YsJ!YJ@|0#aP4p{41tLN zfScn%`{o!p-TU_8bZ_a&-s{mHbW}a69#z9|T(6f-CQj)D0MG;gbkIj94AUkebppuo%JtTd$~D03g3auCcS=v$$q3My zVc3O=VFS`LZ0P~T#_Ddd0a*LiXKNn_>cK%!55vIyeH^%p6Y(Z3$0^n0h+BmUvjAr1 z3}yn%Waf;ua)v5}+)5M+vW6lgw-T)z0ASdKvS9y}E16%?#BP3CrcT#&TKjlQ;8beu~H!LqM{*B|#CSNbBDU(vzO_0O?Ie z%BtVDy+7i%cb^z$GV4VUpvPI{NYvb7hx~C@`nuaw%?GW(4O)Qo#$9!v^rb&-ll!Ra zcmAD!=j(kG9$pG5G(i;^a*(<@y`c1SE3*VdL`9B|_=t}4n<3Cu;it&rSd-w^H@% zMyaY(k;WM{FUpj-#uJg%j*s}DeV-7@6wwq-(bW4XJbWCcrUOX1k$|B&uE&`|GKDGC z=#Hl_n;_00Qp5WN2BMa>$i2_WcOtEWH)+N5kuD7!n;?=5%Z=JvWvULtH&N$-$a~Nk10OSflBnWeI7IOf`nZx+Z@2A^* ziE&`_VDn(}0NB~z+27gs{eMmX8g+W(Q=$%YLgH3zzYzR0I3CATm`EVbIAB-oid_N9 z#d5J+OfN)c0+7e!Z?nFZ7OS9Ksy8sk!1T7~@%LNY} zjd(cnfnYPCIGFu^@;U+HnX)zkX!NI{mLL*@9Hl)Sk3w$LRU$ecUmcR$d6bJE-lwrb zF1?2H4;T?9Z|4*M$iv^C^Fm?pO}HfIidT^cg^tlopw-r(^{RIr4fE zp*0dcV4gTxgeK(vxZl1%j(PzJe|7i$=hfZwdqD;k2tdt^z$BAQCRc+f)X4L3;sG%t z-fs^({WhS*s6A_qWtp%x0jRRFi`-Xs0Wg^_Jxzen}!U#t)c5D+Gh$0s03Jje?1_~Su5rmw^+`xc?Shz`U+0mo3ENu=JlL`h71_xtYr2Y?_5 zf*^?h%I;npr}6Qa#!b_IQhx&gWJOkF#cs2>oNtsw@2^SJG%R2t3jkQ?`7G?emt|ea za_-4i5GkaP0wCu(&pEy@&ICx~G*08DVId2L37eP-;#P>KM@d|d_Y45Q0v50UAc>MF ziH5E7AOduyZkhPFMP>x?0RRsBx0l1-UI-6M0M+BBz^ByJ@ST1psC_)Y-RJsy9L~W1 z9yeMAm``q;fGs*fHx^)eo!v%?x{?AT^cK~6cN3sX%uu?0sgGYx&$qWgw+>lA1Oa{r zxE8Z;Zb7?Gb*-Rg!}>&*oqWzezHEE}q7Rs_1lz=KtgA4h#+w0Gr?$Q&)OwA8nv=(B z9ds+KoSJfOYcUNuSxO;GfYaske7e|MVrTyaddu40*ShWm$WpwA8?~ uJ+4X}JMql~(4jLhwo{!T2!bGp#ryy~arOsx+IqME000037T$09a|e03@B4r6{~jQbNF)-8L~_eCi{D=~i;Oj98Z(U< z#*DL%KaDfS?)tk1Ce&*k?|Ci8yq4GUT8uGv_KPu5U8D2PH5h9ao5g04vHHRG*ZKit z%l5LpZ2yPG*jx6Ny~X-~8{rzaX~exj3C}EM7Bh?e{Br1i_wzXgfYbSl*QfKqNM=YG z$pGWi59Y?FS623oz52efx*GR;hmsP`qu#&p>qx5rpy-OO=zyY+PANJtxv7^YH-SR7 zkS%26Cn7New6a##%1Nzu6-7&{iY5$E^J-qr$6q%w19->c6GT5$T>$W{bLv}RLljNX z{s9Ac^c6j=Dtav8mqLBhw?ftQE#K^AOh6&~@@br{5Zi!gXKpO~QYf#Koa|Eqc$Q~+ z7C^~KgA$-qJ8pDpfN%L$y#Gze0GD*$y9A(w5=w-ieuZ;^y!z%zBY00gho43D%^(@^ zNXK1ZcKG?D+2K@*pW8rs0{GJ&4I&(kxG*3v(j_i&2|%l~N~_{M&CzExCz7{w_~F~m zVJdZJ25`*Mk0rANpo~qF0X0856-?>qaO^gKN1b<;3wNqVH76vzz0s+)Hvn3p>$D=) ziA!Pz?2dhTygLSd}t3*X>Gs9dJs{hEo!q_sw&f z#1^=5bgqM6S##S@-sZN&1%{vFVrT{(?6K#&I_^}Qs#CeTWyr;+BXV)`=nu>Q&cfQO zHw$Zw@ta$ZBv2qU)guP*DmtF5@PQk^;a66EbBhi~ew^{C9!&_3deXvg&4BBT>3xBT jJJlr;i9{li{58J;m%WPa_JJZQ00000NkvXXu0mjf-NJf& literal 0 HcmV?d00001 diff --git a/plug-ins/Lighting/images/stock-reflectivity-diffuse-low.png b/plug-ins/Lighting/images/stock-reflectivity-diffuse-low.png new file mode 100644 index 0000000000000000000000000000000000000000..6bdb5c43ffcdbc23abc76f91fd38abb9d8339235 GIT binary patch literal 441 zcmV;q0Y?6bP)AQ;xRm{%g9 zKmYGCI}5-t48t(YTv=R8c)NOi-mc2B{rqrx|2&))%Icb2$kTkw)5_9tbklGEKsWon zSx5lL(?aGc5MMsd@r6E^$pUDM8=^8kjy%n?DS{vmfZF)fL68N|*SH~c(-1!lWrfVM z>jm*Z6+rWi|BdNAKA9fiMsDOrfF0O@9sCZ2N>6zJUCpgFC_)j65b!Ne^DSV#cf$1^ z0Q4oLp7H>?jh+3O#)tNRHbdtJ zeY|u(8l%JsBm>Kg8JBP~Kf&t$#00000NkvXXu0mjfO&Yx^ literal 0 HcmV?d00001 diff --git a/plug-ins/Lighting/images/stock-reflectivity-highlight-high.png b/plug-ins/Lighting/images/stock-reflectivity-highlight-high.png new file mode 100644 index 0000000000000000000000000000000000000000..b43724bed728927552c1976808e50b27f4c418bf GIT binary patch literal 822 zcmV-61Ihe}P)4m# z2QLO4I77A?`Uf<6XrN;<6cX@YLj(B(9{dLaT|$-w8Ze$}NFfcO4k&T;41_knv4 z06a14dje>7o84x2?b+Td_Xm;D(q3t=v;xc~u}h-rT!08es z&FRf4FxnsOkM@D1oui$jo$SHn2H;|NF}xW1K5z3jZv%`MEXMWk1VBk8l?0SK>nk@2 z!V`BrPXJe2KR;e=We?(2UdA`iHa>5j0gN-wIKXVinGFDiBA|gVyI?UJV4T^EFI~SF z*Q<;J<%9A;`2g6iZ`Zf$zW>hwpruYTzAzdZ1PWI4m=v6kYXL?B;*0~O-O_Gp7pPTg zm0Be|h|B;`jmKwJ8w_gQa^8Hf91V!huPy?)UX6l$VF1+JNJ`#&N+yldOxkU`ZMXGx zOHFaIe82vmsNy~4#Q@OKUo^FZ5#=hWyE-*H*&2V6Eqxt_}h=m@!#iy3`!sn)i{YsCYelbd-3L&G#(fuN{@$mglJfx4rxqS;zWToWxRN_nafaprd%XsbpNEBHqxjpq! z6c0f0T#&W#X9Mswn8yQ5+OBS7WMpJyWVEt=0qM?~_IqQ+x&QzG07*qoM6N<$g0WC| A;Q#;t literal 0 HcmV?d00001 diff --git a/plug-ins/Lighting/images/stock-reflectivity-highlight-low.png b/plug-ins/Lighting/images/stock-reflectivity-highlight-low.png new file mode 100644 index 0000000000000000000000000000000000000000..88cc4fa6864561fd5f9cd20fc31245e3b4fb2cdf GIT binary patch literal 805 zcmV+=1KRwFP)37T$09a|e03@B4r6{~jQbNF)-8L~_eCi{D=~i;Oj98Z(U< z#*DL%KaDfS?)tk1Ce&*k?|Ci8yq4GUT8uGv_KPu5U8D2PH5h9ao5g04vHHRG*ZKit z%l5LpZ2yPG*jx6Ny~X-~8{rzaX~exj3C}EM7Bh?e{Br1i_wzXgfYbSl*QfKqNM=YG z$pGWi59Y?FS623oz52efx*GR;hmsP`qu#&p>qx5rpy-OO=zyY+PANJtxv7^YH-SR7 zkS%26Cn7New6a##%1Nzu6-7&{iY5$E^J-qr$6q%w19->c6GT5$T>$W{bLv}RLljNX z{s9Ac^c6j=Dtav8mqLBhw?ftQE#K^AOh6&~@@br{5Zi!gXKpO~QYf#Koa|Eqc$Q~+ z7C^~KgA$-qJ8pDpfN%L$y#Gze0GD*$y9A(w5=w-ieuZ;^y!z%zBY00gho43D%^(@^ zNXK1ZcKG?D+2K@*pW8rs0{GJ&4I&(kxG*3v(j_i&2|%l~N~_{M&CzExCz7{w_~F~m zVJdZJ25`*Mk0rANpo~qF0X0856-?>qaO^gKN1b<;3wNqVH76vzz0s+)Hvn3p>$D=) ziA!Pz?2dhTygLSd}t3*X>Gs9dJs{hEo!q_sw&f z#1^=5bgqM6S##S@-sZN&1%{vFVrT{(?6K#&I_^}Qs#CeTWyr;+BXV)`=nu>Q&cfQO zHw$Zw@ta$ZBv2qU)guP*DmtF5@PQk^;a66EbBhi~ew^{C9!&_3deXvg&4BBT>3xBT jJJlr;i9{li{58J;m%WPa_JJZQ00000NkvXXu0mjf-NJf& literal 0 HcmV?d00001 diff --git a/plug-ins/Lighting/images/stock-reflectivity-specular-high.png b/plug-ins/Lighting/images/stock-reflectivity-specular-high.png new file mode 100644 index 0000000000000000000000000000000000000000..fbd5f549c4ef6bbc1996a6d239e03726e0018ad7 GIT binary patch literal 842 zcmV-Q1GW5#P)Z1_lNO1_u8t)?Vwy-IMM~_aq2_xeoxo znD%`E9Go4T9h|Mb*t!aT5fQcPcHOQ6W%up-vI{70?kf)<0mfp|9}B=2zVHPw>Wn(0 z4sdgLb9i$I9Pb|Q9`EKaOko0CTwh#YTn7Pf@fL3ZjF&9N^*jlnq>@Sk%A59;mlnbo z4?SN1SKGfnUv1|v#G9gsZ=G&_**XOnXPj|>IgB$007_**3&Na|#T|>N z83#6+8_kU-u(Q9jzq20%|C|6+>a^oAQHMDZaSH$}*K#cvV9t7V@%JQRVYEP;alqcQ z_v}5OR;g8LmFz;4@)Cf0oZXeK*qvUuo`3hru4`f7!i5Wv2aGz?{;2b$C0n6Dk$^)C zF?{~IbE^O{H-eILUrD`lG4TYb^fl(=#ph{EKey~DuOC-@)TGTQr;vq32e&3t)?|Xm})81lhtn!3c6M!NsJ1>1@=Kz!I)u#y%^>|e3M39K< zL>N^Boenv9K<-hv(QR}a-5{Xk_Lo+O1PBRJk0&c2O+54p@%ZCGJZ6u?g?$T9WToV` zD)FT~V7U^CB3`%v1d6Pb+*W-QB?Hhxi}*zle=z}83-jjylhxG?3=9km3=E!(-_r|{ U{R6;8>Hq)$07*qoM6N<$f-g#Q$p8QV literal 0 HcmV?d00001 diff --git a/plug-ins/Lighting/images/stock-reflectivity-specular-low.png b/plug-ins/Lighting/images/stock-reflectivity-specular-low.png new file mode 100644 index 0000000000000000000000000000000000000000..2d69d411d69d884274e20b107f50a499e31f632e GIT binary patch literal 800 zcmV+*1K<3KP)&c zx&k=4I=MQz+IhA2%KbrP)M{BRs|A$nZ{L^efO1x@asUD_6Z7Fr0IqO_D}YIF(wp>v zyVJYVyHlWZ*g5PRW)CJe0E6*hJQ#Z(Z}T>91B@3+j7Pr{040@F5>U=!s2m-HD<1o< z0B-kxe!AVy9>klxjPG5(`@DAvFwQvR0IM+0DgaO@0}&8bDU?_RV4PJLU%NjXi#5i9 z-Lu`Z-810e=-}w!$n*X=0JPO<#Y3ZkL7-5I&q@CEq(U$eAkH{oHLa%A1RB*wwNXtE zA~OI~?^Go6R3QewXXgmO+8I_BXlE8el zl=BgwF4R|b5dloA%+6CPg;Kp#FV&;2t&3JZnFHd+DF;wKcsQT-AI_s(K;Uogzx}wm z|NC5!K?(Sx|cYqQ71me|~!841gjlyDofT*8r2n z+RFe0H6CnrGDyawL>TM{?bJx8%%kwJeQY1wo=3^;H>D5&@C{RqCwG8u-0v0Q>HDL2 zN*{@H`xcHe1J*Y)s2jd ejEszoUaVjD@17MQsn1{l0000 + +#include "lighting_stock.h" + +#include "images/stock-pixbufs.h" + + +static GtkIconFactory *lighting_icon_factory = NULL; + +static GtkStockItem lighting_stock_items[] = +{ + { STOCK_INTENSITY_AMBIENT_LOW, NULL, 0, 0, NULL }, + { STOCK_INTENSITY_AMBIENT_HIGH, NULL, 0, 0, NULL }, + { STOCK_INTENSITY_DIFFUSE_LOW, NULL, 0, 0, NULL }, + { STOCK_INTENSITY_DIFFUSE_HIGH, NULL, 0, 0, NULL }, + { STOCK_REFLECTIVITY_DIFFUSE_LOW, NULL, 0, 0, NULL }, + { STOCK_REFLECTIVITY_DIFFUSE_HIGH, NULL, 0, 0, NULL }, + { STOCK_REFLECTIVITY_SPECULAR_LOW, NULL, 0, 0, NULL }, + { STOCK_REFLECTIVITY_SPECULAR_HIGH, NULL, 0, 0, NULL }, + { STOCK_REFLECTIVITY_HIGHLIGHT_LOW, NULL, 0, 0, NULL }, + { STOCK_REFLECTIVITY_HIGHLIGHT_HIGH, NULL, 0, 0, NULL } +}; + + +static void +add_stock_icon (const gchar *stock_id, + GtkIconSize size, + const guint8 *inline_data) +{ + GtkIconSource *source; + GtkIconSet *set; + GdkPixbuf *pixbuf; + + source = gtk_icon_source_new (); + + gtk_icon_source_set_size (source, size); + gtk_icon_source_set_size_wildcarded (source, FALSE); + + pixbuf = gdk_pixbuf_new_from_inline (-1, inline_data, FALSE, NULL); + + gtk_icon_source_set_pixbuf (source, pixbuf); + g_object_unref (pixbuf); + + set = gtk_icon_set_new (); + + gtk_icon_set_add_source (set, source); + gtk_icon_source_free (source); + + gtk_icon_factory_add (lighting_icon_factory, stock_id, set); + + gtk_icon_set_unref (set); +} + +void +lighting_stock_init (void) +{ + static gboolean initialized = FALSE; + + if (initialized) + return; + + lighting_icon_factory = gtk_icon_factory_new (); + + add_stock_icon (STOCK_INTENSITY_AMBIENT_LOW, GTK_ICON_SIZE_BUTTON, + stock_intensity_ambient_low); + add_stock_icon (STOCK_INTENSITY_AMBIENT_HIGH, GTK_ICON_SIZE_BUTTON, + stock_intensity_ambient_high); + add_stock_icon (STOCK_INTENSITY_DIFFUSE_LOW, GTK_ICON_SIZE_BUTTON, + stock_intensity_diffuse_low); + add_stock_icon (STOCK_INTENSITY_DIFFUSE_HIGH, GTK_ICON_SIZE_BUTTON, + stock_intensity_diffuse_high); + add_stock_icon (STOCK_REFLECTIVITY_DIFFUSE_LOW, GTK_ICON_SIZE_BUTTON, + stock_reflectivity_diffuse_low); + add_stock_icon (STOCK_REFLECTIVITY_DIFFUSE_HIGH, GTK_ICON_SIZE_BUTTON, + stock_reflectivity_diffuse_high); + add_stock_icon (STOCK_REFLECTIVITY_SPECULAR_LOW, GTK_ICON_SIZE_BUTTON, + stock_reflectivity_specular_low); + add_stock_icon (STOCK_REFLECTIVITY_SPECULAR_HIGH, GTK_ICON_SIZE_BUTTON, + stock_reflectivity_specular_high); + add_stock_icon (STOCK_REFLECTIVITY_HIGHLIGHT_LOW, GTK_ICON_SIZE_BUTTON, + stock_reflectivity_highlight_low); + add_stock_icon (STOCK_REFLECTIVITY_HIGHLIGHT_HIGH, GTK_ICON_SIZE_BUTTON, + stock_reflectivity_highlight_high); + + gtk_icon_factory_add_default (lighting_icon_factory); + + gtk_stock_add_static (lighting_stock_items, + G_N_ELEMENTS (lighting_stock_items)); +} diff --git a/plug-ins/Lighting/lighting_stock.h b/plug-ins/Lighting/lighting_stock.h new file mode 100644 index 0000000000..5e7610406c --- /dev/null +++ b/plug-ins/Lighting/lighting_stock.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __LIGHTING_STOCK_H__ +#define __LIGHTING_STOCK_H__ + + +#define STOCK_INTENSITY_AMBIENT_LOW "intensity-ambient-low" +#define STOCK_INTENSITY_AMBIENT_HIGH "intensity-ambient-high" +#define STOCK_INTENSITY_DIFFUSE_LOW "intensity-diffuse-low" +#define STOCK_INTENSITY_DIFFUSE_HIGH "intensity-diffuse-high" +#define STOCK_REFLECTIVITY_DIFFUSE_LOW "reflectivity-diffuse-low" +#define STOCK_REFLECTIVITY_DIFFUSE_HIGH "reflectivity-diffuse-high" +#define STOCK_REFLECTIVITY_SPECULAR_LOW "reflectivity-specular-low" +#define STOCK_REFLECTIVITY_SPECULAR_HIGH "reflectivity-specular-high" +#define STOCK_REFLECTIVITY_HIGHLIGHT_LOW "reflectivity-highlight-low" +#define STOCK_REFLECTIVITY_HIGHLIGHT_HIGH "reflectivity-highlight-high" + + +void lighting_stock_init (void); + + +#endif /* __LIGHTING_STOCK_H__ */ diff --git a/plug-ins/Lighting/lighting_ui.c b/plug-ins/Lighting/lighting_ui.c index e2d51dd258..de34387688 100644 --- a/plug-ins/Lighting/lighting_ui.c +++ b/plug-ins/Lighting/lighting_ui.c @@ -27,20 +27,10 @@ #include "lighting_image.h" #include "lighting_apply.h" #include "lighting_preview.h" +#include "lighting_stock.h" #include "libgimp/stdplugins-intl.h" -#include "amb1.xpm" -#include "amb2.xpm" -#include "diffint1.xpm" -#include "diffint2.xpm" -#include "diffref1.xpm" -#include "diffref2.xpm" -#include "specref1.xpm" -#include "specref2.xpm" -#include "high1.xpm" -#include "high2.xpm" - extern LightingValues mapvals; @@ -498,7 +488,7 @@ create_light_page (void) gtk_widget_show (combo); gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, - _("L_ight yype:"), 0.0, 0.5, ebox, 1, FALSE); + _("L_ight type:"), 0.0, 0.5, ebox, 1, FALSE); gimp_help_set_help_data (ebox, _("Type of light source to apply"), NULL); @@ -660,8 +650,8 @@ create_material_page (void) GtkWidget *label; GtkWidget *hbox; GtkWidget *spinbutton; + GtkWidget *image; GtkObject *adj; - GtkWidget *pixmap; page = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (page), 12); @@ -681,10 +671,11 @@ create_material_page (void) /* Ambient intensity */ - pixmap = gimp_pixmap_new (amb1_xpm); + image = gtk_image_new_from_stock (STOCK_INTENSITY_AMBIENT_LOW, + GTK_ICON_SIZE_BUTTON); label = gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("_Ambient:"), 0.0, 0.5, - pixmap, 1, FALSE); + image, 1, FALSE); gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.ambient_int, 0, G_MAXFLOAT, 0.1, 1.0, 1.0, 0.0, 2); @@ -704,17 +695,19 @@ create_material_page (void) _("Amount of original color to show where no " "direct light falls"), NULL); - pixmap = gimp_pixmap_new (amb2_xpm); - gtk_table_attach (GTK_TABLE (table), pixmap, 3, 4, 0, 1, + image = gtk_image_new_from_stock (STOCK_INTENSITY_AMBIENT_HIGH, + GTK_ICON_SIZE_BUTTON); + gtk_table_attach (GTK_TABLE (table), image, 3, 4, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (pixmap); + gtk_widget_show (image); /* Diffuse intensity */ - pixmap = gimp_pixmap_new (diffint1_xpm); + image = gtk_image_new_from_stock (STOCK_INTENSITY_DIFFUSE_LOW, + GTK_ICON_SIZE_BUTTON); label = gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("_Diffuse:"), 0.0, 0.5, - pixmap, 1, FALSE); + image, 1, FALSE); gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.diffuse_int, @@ -735,10 +728,11 @@ create_material_page (void) _("Intensity of original color when lit by a light " "source"), NULL); - pixmap = gimp_pixmap_new (diffint2_xpm); - gtk_table_attach (GTK_TABLE (table), pixmap, 3, 4, 1, 2, + image = gtk_image_new_from_stock (STOCK_INTENSITY_DIFFUSE_HIGH, + GTK_ICON_SIZE_BUTTON); + gtk_table_attach (GTK_TABLE (table), image, 3, 4, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (pixmap); + gtk_widget_show (image); frame = gimp_frame_new (_("Reflectivity")); gtk_box_pack_start (GTK_BOX (page), frame, FALSE, FALSE, 0); @@ -755,10 +749,11 @@ create_material_page (void) /* Diffuse reflection */ - pixmap = gimp_pixmap_new (diffref1_xpm); + image = gtk_image_new_from_stock (STOCK_REFLECTIVITY_DIFFUSE_LOW, + GTK_ICON_SIZE_BUTTON); label = gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("D_iffuse:"), 0.0, 0.5, - pixmap, 1, FALSE); + image, 1, FALSE); gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.diffuse_ref, @@ -779,17 +774,19 @@ create_material_page (void) _("Higher values makes the object reflect more " "light (appear lighter)"), NULL); - pixmap = gimp_pixmap_new (diffref2_xpm); - gtk_table_attach (GTK_TABLE (table), pixmap, 3, 4, 0, 1, + image = gtk_image_new_from_stock (STOCK_REFLECTIVITY_DIFFUSE_HIGH, + GTK_ICON_SIZE_BUTTON); + gtk_table_attach (GTK_TABLE (table), image, 3, 4, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (pixmap); + gtk_widget_show (image); /* Specular reflection */ - pixmap = gimp_pixmap_new (specref1_xpm); + image = gtk_image_new_from_stock (STOCK_REFLECTIVITY_SPECULAR_LOW, + GTK_ICON_SIZE_BUTTON); label = gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("_Specular:"), 0.0, 0.5, - pixmap, 1, FALSE); + image, 1, FALSE); gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.specular_ref, @@ -811,17 +808,19 @@ create_material_page (void) _("Controls how intense the highlights will be"), NULL); - pixmap = gimp_pixmap_new (specref2_xpm); - gtk_table_attach (GTK_TABLE (table), pixmap, 3, 4, 1, 2, + image = gtk_image_new_from_stock (STOCK_REFLECTIVITY_SPECULAR_HIGH, + GTK_ICON_SIZE_BUTTON); + gtk_table_attach (GTK_TABLE (table), image, 3, 4, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (pixmap); + gtk_widget_show (image); /* Highlight */ - pixmap = gimp_pixmap_new (high1_xpm); + image = gtk_image_new_from_stock (STOCK_REFLECTIVITY_HIGHLIGHT_LOW, + GTK_ICON_SIZE_BUTTON); label = gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("_Highlight:"), 0.0, 0.5, - pixmap, 1, FALSE); + image, 1, FALSE); gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.highlight, @@ -842,10 +841,11 @@ create_material_page (void) _("Higher values makes the highlights more focused"), NULL); - pixmap = gimp_pixmap_new (high2_xpm); - gtk_table_attach (GTK_TABLE (table), pixmap, 3, 4, 2, 3, + image = gtk_image_new_from_stock (STOCK_REFLECTIVITY_HIGHLIGHT_HIGH, + GTK_ICON_SIZE_BUTTON); + gtk_table_attach (GTK_TABLE (table), image, 3, 4, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (pixmap); + gtk_widget_show (image); gtk_widget_show (page); @@ -1079,6 +1079,8 @@ main_dialog (GimpDrawable *drawable) gimp_ui_init ("Lighting", FALSE); + lighting_stock_init (); + appwin = gimp_dialog_new (_("Lighting Effects"), "Lighting", NULL, 0, gimp_standard_help_func, "plug-in-lighting", diff --git a/plug-ins/Lighting/specref1.xpm b/plug-ins/Lighting/specref1.xpm deleted file mode 100644 index fea662e764..0000000000 --- a/plug-ins/Lighting/specref1.xpm +++ /dev/null @@ -1,75 +0,0 @@ -/* XPM */ -char * specref1_xpm[] = { -"32 32 40 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 #71C675D671C6", -"9 c #514455555144", -"0 c #BEFBBAEABEFB", -"q c #AEBAAAAAAEBA", -"w c #9E799A699E79", -"e c #8E388A288E38", -"r c #49244D344924", -"t c #861782078617", -"y c #69A66DB669A6", -"u c #79E779E779E7", -"i c #618565956185", -"p c #514451445144", -"a c #618561856185", -"s c #410345144103", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" .Xo ", -" .O+@#$.%& ", -" $*==*-#$.;& ", -" $=:>:=,+O<123 ", -" .*:>4>=*+O5X%67 ", -" O=>4>>=,+O5X%89 ", -" +=:>>:*-@0<1%83 ", -" .@*===*,+#$qwe83r ", -" X#-,*,-+#0 c #E79DE38DE79D", -", c #D75CD34CD75C", -"< c #AEBAAEBAAEBA", -"1 c #9E799E799E79", -"2 c #861786178617", -"3 c #596559655965", -"4 c #E79DE79DE79D", -"5 c #EFBEEFBEEFBE", -"6 c #B6DAB2CAB6DA", -"7 c #71C671C671C6", -"8 c #492449244924", -"9 c #FFFFFBEEFFFF", -"0 c #FFFFFFFFFFFF", -"q c #71C675D671C6", -"w c #514455555144", -"e c #EFBEEBADEFBE", -"r c #BEFBBAEABEFB", -"t c #AEBAAAAAAEBA", -"y c #9E799A699E79", -"u c #8E388A288E38", -"i c #49244D344924", -"p c #861782078617", -"a c #69A66DB669A6", -"s c #79E779E779E7", -"d c #618565956185", -"f c #514451445144", -"g c #618561856185", -"h c #410345144103", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" .Xo ", -" .O+@#$.%& ", -" $*==*-#$.;& ", -" $=:>:=,+O<123 ", -" .*:4454*+O6X%78 ", -" O=>4900>+O6X%qw ", -" +=:5000e+r<1%q3 ", -" .@*=4009=#$tyuq3i ", -" X#-,*>e=@r 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 ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/plug-ins/MapObject/amb2.xpm b/plug-ins/MapObject/amb2.xpm deleted file mode 100644 index c9cc0eda5c..0000000000 --- a/plug-ins/MapObject/amb2.xpm +++ /dev/null @@ -1,58 +0,0 @@ -/* 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<#: ", -" <<< ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/plug-ins/MapObject/diffint1.xpm b/plug-ins/MapObject/diffint1.xpm deleted file mode 100644 index 323af173c3..0000000000 --- a/plug-ins/MapObject/diffint1.xpm +++ /dev/null @@ -1,44 +0,0 @@ -/* 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 ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/plug-ins/MapObject/diffint2.xpm b/plug-ins/MapObject/diffint2.xpm deleted file mode 100644 index 289db9eab9..0000000000 --- a/plug-ins/MapObject/diffint2.xpm +++ /dev/null @@ -1,80 +0,0 @@ -/* 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 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 ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/plug-ins/MapObject/high1.xpm b/plug-ins/MapObject/high1.xpm deleted file mode 100644 index b542308d05..0000000000 --- a/plug-ins/MapObject/high1.xpm +++ /dev/null @@ -1,75 +0,0 @@ -/* 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", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" .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 ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/plug-ins/MapObject/high2.xpm b/plug-ins/MapObject/high2.xpm deleted file mode 100644 index 49447a19fe..0000000000 --- a/plug-ins/MapObject/high2.xpm +++ /dev/null @@ -1,78 +0,0 @@ -/* XPM */ -char * high2_xpm[] = { -"32 32 43 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 #F7DEF7DEF7DE", -"9 c #71C675D671C6", -"0 c #514455555144", -"q c #FFFFFFFFFFFF", -"w c #BEFBBAEABEFB", -"e c #F7DEF3CEF7DE", -"r c #AEBAAAAAAEBA", -"t c #9E799A699E79", -"y c #8E388A288E38", -"u c #49244D344924", -"i c #861782078617", -"p c #69A66DB669A6", -"a c #79E779E779E7", -"s c #618565956185", -"d c #514451445144", -"f c #618561856185", -"g c #410345144103", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" .Xo ", -" .O+@#$.%& ", -" $*==*-#$.;& ", -" $=:>:=,+O<123 ", -" .*:>4>=*+O5X%67 ", -" O=>4>8:,+O5X%90 ", -" +=:>8qq-@w<1%93 ", -" .@*==:e=+#$rty93u ", -" X#-,*,*-#w + +#include "mapobject_stock.h" + +#include "../Lighting/images/stock-pixbufs.h" + + +static GtkIconFactory *mapobject_icon_factory = NULL; + +static GtkStockItem mapobject_stock_items[] = +{ + { STOCK_INTENSITY_AMBIENT_LOW, NULL, 0, 0, NULL }, + { STOCK_INTENSITY_AMBIENT_HIGH, NULL, 0, 0, NULL }, + { STOCK_INTENSITY_DIFFUSE_LOW, NULL, 0, 0, NULL }, + { STOCK_INTENSITY_DIFFUSE_HIGH, NULL, 0, 0, NULL }, + { STOCK_REFLECTIVITY_DIFFUSE_LOW, NULL, 0, 0, NULL }, + { STOCK_REFLECTIVITY_DIFFUSE_HIGH, NULL, 0, 0, NULL }, + { STOCK_REFLECTIVITY_SPECULAR_LOW, NULL, 0, 0, NULL }, + { STOCK_REFLECTIVITY_SPECULAR_HIGH, NULL, 0, 0, NULL }, + { STOCK_REFLECTIVITY_HIGHLIGHT_LOW, NULL, 0, 0, NULL }, + { STOCK_REFLECTIVITY_HIGHLIGHT_HIGH, NULL, 0, 0, NULL } +}; + + +static void +add_stock_icon (const gchar *stock_id, + GtkIconSize size, + const guint8 *inline_data) +{ + GtkIconSource *source; + GtkIconSet *set; + GdkPixbuf *pixbuf; + + source = gtk_icon_source_new (); + + gtk_icon_source_set_size (source, size); + gtk_icon_source_set_size_wildcarded (source, FALSE); + + pixbuf = gdk_pixbuf_new_from_inline (-1, inline_data, FALSE, NULL); + + gtk_icon_source_set_pixbuf (source, pixbuf); + g_object_unref (pixbuf); + + set = gtk_icon_set_new (); + + gtk_icon_set_add_source (set, source); + gtk_icon_source_free (source); + + gtk_icon_factory_add (mapobject_icon_factory, stock_id, set); + + gtk_icon_set_unref (set); +} + +void +mapobject_stock_init (void) +{ + static gboolean initialized = FALSE; + + if (initialized) + return; + + mapobject_icon_factory = gtk_icon_factory_new (); + + add_stock_icon (STOCK_INTENSITY_AMBIENT_LOW, GTK_ICON_SIZE_BUTTON, + stock_intensity_ambient_low); + add_stock_icon (STOCK_INTENSITY_AMBIENT_HIGH, GTK_ICON_SIZE_BUTTON, + stock_intensity_ambient_high); + add_stock_icon (STOCK_INTENSITY_DIFFUSE_LOW, GTK_ICON_SIZE_BUTTON, + stock_intensity_diffuse_low); + add_stock_icon (STOCK_INTENSITY_DIFFUSE_HIGH, GTK_ICON_SIZE_BUTTON, + stock_intensity_diffuse_high); + add_stock_icon (STOCK_REFLECTIVITY_DIFFUSE_LOW, GTK_ICON_SIZE_BUTTON, + stock_reflectivity_diffuse_low); + add_stock_icon (STOCK_REFLECTIVITY_DIFFUSE_HIGH, GTK_ICON_SIZE_BUTTON, + stock_reflectivity_diffuse_high); + add_stock_icon (STOCK_REFLECTIVITY_SPECULAR_LOW, GTK_ICON_SIZE_BUTTON, + stock_reflectivity_specular_low); + add_stock_icon (STOCK_REFLECTIVITY_SPECULAR_HIGH, GTK_ICON_SIZE_BUTTON, + stock_reflectivity_specular_high); + add_stock_icon (STOCK_REFLECTIVITY_HIGHLIGHT_LOW, GTK_ICON_SIZE_BUTTON, + stock_reflectivity_highlight_low); + add_stock_icon (STOCK_REFLECTIVITY_HIGHLIGHT_HIGH, GTK_ICON_SIZE_BUTTON, + stock_reflectivity_highlight_high); + + gtk_icon_factory_add_default (mapobject_icon_factory); + + gtk_stock_add_static (mapobject_stock_items, + G_N_ELEMENTS (mapobject_stock_items)); +} diff --git a/plug-ins/MapObject/mapobject_stock.h b/plug-ins/MapObject/mapobject_stock.h new file mode 100644 index 0000000000..d1c57e7144 --- /dev/null +++ b/plug-ins/MapObject/mapobject_stock.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 1995 Spencer Kimball and Peter Mattis + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __MAPOBJECT_STOCK_H__ +#define __MAPOBJECT_STOCK_H__ + + +#define STOCK_INTENSITY_AMBIENT_LOW "intensity-ambient-low" +#define STOCK_INTENSITY_AMBIENT_HIGH "intensity-ambient-high" +#define STOCK_INTENSITY_DIFFUSE_LOW "intensity-diffuse-low" +#define STOCK_INTENSITY_DIFFUSE_HIGH "intensity-diffuse-high" +#define STOCK_REFLECTIVITY_DIFFUSE_LOW "reflectivity-diffuse-low" +#define STOCK_REFLECTIVITY_DIFFUSE_HIGH "reflectivity-diffuse-high" +#define STOCK_REFLECTIVITY_SPECULAR_LOW "reflectivity-specular-low" +#define STOCK_REFLECTIVITY_SPECULAR_HIGH "reflectivity-specular-high" +#define STOCK_REFLECTIVITY_HIGHLIGHT_LOW "reflectivity-highlight-low" +#define STOCK_REFLECTIVITY_HIGHLIGHT_HIGH "reflectivity-highlight-high" + + +void mapobject_stock_init (void); + + +#endif /* __MAPOBJECT_STOCK_H__ */ diff --git a/plug-ins/MapObject/mapobject_ui.c b/plug-ins/MapObject/mapobject_ui.c index 7f8c34f31d..b9b84c0b13 100644 --- a/plug-ins/MapObject/mapobject_ui.c +++ b/plug-ins/MapObject/mapobject_ui.c @@ -13,20 +13,10 @@ #include "mapobject_apply.h" #include "mapobject_preview.h" #include "mapobject_main.h" +#include "mapobject_stock.h" #include "libgimp/stdplugins-intl.h" -#include "amb1.xpm" -#include "amb2.xpm" -#include "diffint1.xpm" -#include "diffint2.xpm" -#include "diffref1.xpm" -#include "diffref2.xpm" -#include "specref1.xpm" -#include "specref2.xpm" -#include "high1.xpm" -#include "high2.xpm" - GdkGC *gc = NULL; GtkWidget *previewarea = NULL; @@ -826,8 +816,8 @@ create_material_page (void) GtkWidget *label; GtkWidget *hbox; GtkWidget *spinbutton; + GtkWidget *image; GtkObject *adj; - GtkWidget *pixmap; page = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (page), 12); @@ -848,10 +838,11 @@ create_material_page (void) /* Ambient intensity */ - pixmap = gimp_pixmap_new (amb1_xpm); + image = gtk_image_new_from_stock (STOCK_INTENSITY_AMBIENT_LOW, + GTK_ICON_SIZE_BUTTON); label = gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Ambient:"), 0.0, 0.5, - pixmap, 1, FALSE); + image, 1, FALSE); gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.ambient_int, @@ -868,17 +859,19 @@ create_material_page (void) _("Amount of original color to show where no " "direct light falls"), NULL); - pixmap = gimp_pixmap_new (amb2_xpm); - gtk_table_attach (GTK_TABLE (table), pixmap, 3, 4, 0, 1, + image = gtk_image_new_from_stock (STOCK_INTENSITY_AMBIENT_HIGH, + GTK_ICON_SIZE_BUTTON); + gtk_table_attach (GTK_TABLE (table), image, 3, 4, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (pixmap); + gtk_widget_show (image); /* Diffuse intensity */ - pixmap = gimp_pixmap_new (diffint1_xpm); + image = gtk_image_new_from_stock (STOCK_INTENSITY_DIFFUSE_LOW, + GTK_ICON_SIZE_BUTTON); label = gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Diffuse:"), 0.0, 0.5, - pixmap, 1, FALSE); + image, 1, FALSE); gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.diffuse_int, @@ -895,10 +888,11 @@ create_material_page (void) _("Intensity of original color when lit by a light " "source"), NULL); - pixmap = gimp_pixmap_new (diffint2_xpm); - gtk_table_attach (GTK_TABLE (table), pixmap, 3, 4, 1, 2, + image = gtk_image_new_from_stock (STOCK_INTENSITY_DIFFUSE_HIGH, + GTK_ICON_SIZE_BUTTON); + gtk_table_attach (GTK_TABLE (table), image, 3, 4, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (pixmap); + gtk_widget_show (image); frame = gimp_frame_new (_("Reflectivity")); gtk_box_pack_start (GTK_BOX (page), frame, FALSE, FALSE, 0); @@ -916,10 +910,11 @@ create_material_page (void) /* Diffuse reflection */ - pixmap = gimp_pixmap_new (diffref1_xpm); + image = gtk_image_new_from_stock (STOCK_REFLECTIVITY_DIFFUSE_LOW, + GTK_ICON_SIZE_BUTTON); label = gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Diffuse:"), 0.0, 0.5, - pixmap, 1, FALSE); + image, 1, FALSE); gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.diffuse_ref, @@ -936,17 +931,19 @@ create_material_page (void) _("Higher values makes the object reflect more " "light (appear lighter)"), NULL); - pixmap = gimp_pixmap_new (diffref2_xpm); - gtk_table_attach (GTK_TABLE (table), pixmap, 3, 4, 0, 1, + image = gtk_image_new_from_stock (STOCK_REFLECTIVITY_DIFFUSE_HIGH, + GTK_ICON_SIZE_BUTTON); + gtk_table_attach (GTK_TABLE (table), image, 3, 4, 0, 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (pixmap); + gtk_widget_show (image); /* Specular reflection */ - pixmap = gimp_pixmap_new (specref1_xpm); + image = gtk_image_new_from_stock (STOCK_REFLECTIVITY_SPECULAR_LOW, + GTK_ICON_SIZE_BUTTON); label = gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Specular:"), 0.0, 0.5, - pixmap, 1, FALSE); + image, 1, FALSE); gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.specular_ref, @@ -963,17 +960,19 @@ create_material_page (void) _("Controls how intense the highlights will be"), NULL); - pixmap = gimp_pixmap_new (specref2_xpm); - gtk_table_attach (GTK_TABLE (table), pixmap, 3, 4, 1, 2, + image = gtk_image_new_from_stock (STOCK_REFLECTIVITY_SPECULAR_HIGH, + GTK_ICON_SIZE_BUTTON); + gtk_table_attach (GTK_TABLE (table), image, 3, 4, 1, 2, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (pixmap); + gtk_widget_show (image); /* Highlight */ - pixmap = gimp_pixmap_new (high1_xpm); + image = gtk_image_new_from_stock (STOCK_REFLECTIVITY_HIGHLIGHT_LOW, + GTK_ICON_SIZE_BUTTON); label = gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Highlight:"), 0.0, 0.5, - pixmap, 1, FALSE); + image, 1, FALSE); gtk_size_group_add_widget (group, label); spinbutton = gimp_spin_button_new (&adj, mapvals.material.highlight, @@ -990,10 +989,11 @@ create_material_page (void) _("Higher values makes the highlights more focused"), NULL); - pixmap = gimp_pixmap_new (high2_xpm); - gtk_table_attach (GTK_TABLE (table), pixmap, 3, 4, 2, 3, + image = gtk_image_new_from_stock (STOCK_REFLECTIVITY_HIGHLIGHT_HIGH, + GTK_ICON_SIZE_BUTTON); + gtk_table_attach (GTK_TABLE (table), image, 3, 4, 2, 3, GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); - gtk_widget_show (pixmap); + gtk_widget_show (image); gtk_widget_show (page); diff --git a/plug-ins/MapObject/specref1.xpm b/plug-ins/MapObject/specref1.xpm deleted file mode 100644 index fea662e764..0000000000 --- a/plug-ins/MapObject/specref1.xpm +++ /dev/null @@ -1,75 +0,0 @@ -/* XPM */ -char * specref1_xpm[] = { -"32 32 40 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 #71C675D671C6", -"9 c #514455555144", -"0 c #BEFBBAEABEFB", -"q c #AEBAAAAAAEBA", -"w c #9E799A699E79", -"e c #8E388A288E38", -"r c #49244D344924", -"t c #861782078617", -"y c #69A66DB669A6", -"u c #79E779E779E7", -"i c #618565956185", -"p c #514451445144", -"a c #618561856185", -"s c #410345144103", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" .Xo ", -" .O+@#$.%& ", -" $*==*-#$.;& ", -" $=:>:=,+O<123 ", -" .*:>4>=*+O5X%67 ", -" O=>4>>=,+O5X%89 ", -" +=:>>:*-@0<1%83 ", -" .@*===*,+#$qwe83r ", -" X#-,*,-+#0 c #E79DE38DE79D", -", c #D75CD34CD75C", -"< c #AEBAAEBAAEBA", -"1 c #9E799E799E79", -"2 c #861786178617", -"3 c #596559655965", -"4 c #E79DE79DE79D", -"5 c #EFBEEFBEEFBE", -"6 c #B6DAB2CAB6DA", -"7 c #71C671C671C6", -"8 c #492449244924", -"9 c #FFFFFBEEFFFF", -"0 c #FFFFFFFFFFFF", -"q c #71C675D671C6", -"w c #514455555144", -"e c #EFBEEBADEFBE", -"r c #BEFBBAEABEFB", -"t c #AEBAAAAAAEBA", -"y c #9E799A699E79", -"u c #8E388A288E38", -"i c #49244D344924", -"p c #861782078617", -"a c #69A66DB669A6", -"s c #79E779E779E7", -"d c #618565956185", -"f c #514451445144", -"g c #618561856185", -"h c #410345144103", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" .Xo ", -" .O+@#$.%& ", -" $*==*-#$.;& ", -" $=:>:=,+O<123 ", -" .*:4454*+O6X%78 ", -" O=>4900>+O6X%qw ", -" +=:5000e+r<1%q3 ", -" .@*=4009=#$tyuq3i ", -" X#-,*>e=@r #include -#include +#ifdef __GNUC__ +#warning GIMP_DISABLE_DEPRECATED +#endif +#undef GIMP_DISABLE_DEPRECATED #include #include