2000-11-18  Michael Natterer  <mitch@gimp.org>

	* plug-ins/rcm/rcm_pixmaps.h: removed.

	* plug-ins/rcm/pixmaps/.cvsignore
	* plug-ins/rcm/pixmaps/rcm_360.xpm
	* plug-ins/rcm/pixmaps/rcm_a_b.xpm
	* plug-ins/rcm/pixmaps/rcm_ccw.xpm
	* plug-ins/rcm/pixmaps/rcm_cw.xpm: new files.

	* plug-ins/rcm/Makefile.am
	* plug-ins/rcm/rcm_callback.c
	* plug-ins/rcm/rcm_dialog.c: changed accordingly.

	The old method was producing warnings because not all pixmaps
	were used in all files. Also changed the XPMs a bit now that I
	could load them into the GIMP... they are still ugly, though.
This commit is contained in:
Michael Natterer 2000-11-18 02:38:05 +00:00 committed by Michael Natterer
parent 433046c3dd
commit e284e94bfc
10 changed files with 156 additions and 172 deletions

View File

@ -1,3 +1,21 @@
2000-11-18 Michael Natterer <mitch@gimp.org>
* plug-ins/rcm/rcm_pixmaps.h: removed.
* plug-ins/rcm/pixmaps/.cvsignore
* plug-ins/rcm/pixmaps/rcm_360.xpm
* plug-ins/rcm/pixmaps/rcm_a_b.xpm
* plug-ins/rcm/pixmaps/rcm_ccw.xpm
* plug-ins/rcm/pixmaps/rcm_cw.xpm: new files.
* plug-ins/rcm/Makefile.am
* plug-ins/rcm/rcm_callback.c
* plug-ins/rcm/rcm_dialog.c: changed accordingly.
The old method was producing warnings because not all pixmaps
were used in all files. Also changed the XPMs a bit now that I
could load them into the GIMP... they are still ugly, though.
2000-11-18 Michael Natterer <mitch@gimp.org>
* plug-ins/print/Makefile.am
@ -5,7 +23,7 @@
a different one to both sourceforge branches:
Don't define LOCALE in Makefile.am but check if the macro
INIT_I18N_UI exists and use in that case.
INIT_I18N_UI exists and use it in that case.
2000-11-18 Michael Natterer <mitch@gimp.org>

View File

@ -14,8 +14,13 @@ rcm_SOURCES = \
rcm_gdk.c \
rcm_gdk.h \
rcm_misc.c \
rcm_misc.h \
rcm_pixmaps.h
rcm_misc.h
EXTRA_DIST = \
pixmaps/rcm_360.xpm \
pixmaps/rcm_a_b.xpm \
pixmaps/rcm_ccw.xpm \
pixmaps/rcm_cw.xpm
AM_CPPFLAGS = \
-DLOCALEDIR=\""$(localedir)"\"

View File

@ -0,0 +1 @@
.xvpics

View File

@ -0,0 +1,29 @@
/* XPM */
static char * rcm_360_xpm[] = {
"24 24 2 1",
" c None",
". c #FF0000",
" ",
" ",
" ",
" ",
" ..... ",
" ......... ",
" ... ... ",
" .. .. ",
" .. .. ",
" .. .. ",
" ...... .. ",
" .. ",
" .. ",
" . .. ",
" ... .. ",
" ...... .. ",
" ... .. .. ",
" .. .. .. ",
" . ... ... ",
" ......... ",
" ..... ",
" ",
" ",
" "};

View File

@ -0,0 +1,29 @@
/* XPM */
static char * rcm_a_b_xpm[] = {
"24 24 2 1",
" c None",
". c #FF0000",
" ",
" ",
" . ",
" . .. ",
" . .. ",
" . ... ",
" ....... ",
" . .. .... ",
" . .. .... ",
" . .. ... ",
" . .. ... ",
" . ... ",
" . .. ",
" . .. ",
" . .. ",
" . .. . ",
" . .. .. .. ",
" . .. ... ",
" . .... ",
" . ... ",
" . . ",
" .................... ",
" ",
" "};

View File

@ -0,0 +1,29 @@
/* XPM */
static char * rcm_ccw_xpm[] = {
"24 24 2 1",
" c None",
". c #FF0000",
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ......... ",
" . ... ... ",
" .. .. .. ",
" ... .. .. ",
" ...... .. ",
" ... ",
" . ",
" . ",
" ... ",
" .. ...... ",
" .. .. ... ",
" .. .. .. ",
" ... ... . ",
" ......... ",
" ..... ",
" ",
" ",
" "};

View File

@ -0,0 +1,29 @@
/* XPM */
static char * rcm_cw_xpm[] = {
"24 24 2 1",
" c None",
". c #FF0000",
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ......... ",
" ... ... . ",
" .. .. .. ",
" .. .. ... ",
" .. ...... ",
" ... ",
" . ",
" . ",
" ... ",
" ...... .. ",
" ... .. .. ",
" .. .. .. ",
" . ... ... ",
" ......... ",
" ..... ",
" ",
" ",
" "};

View File

@ -49,9 +49,12 @@
#include "rcm_misc.h"
#include "rcm_gdk.h"
#include "rcm_dialog.h"
#include "rcm_pixmaps.h"
#include "rcm_callback.h"
#include "pixmaps/rcm_ccw.xpm"
#include "pixmaps/rcm_cw.xpm"
/*---------------------------------------------------------------------------*/
/* Misc functions */
/*---------------------------------------------------------------------------*/
@ -144,7 +147,7 @@ rcm_cw_ccw (GtkWidget *button,
circle->angle->cw_ccw *= -1;
rcm_set_pixmap(&circle->cw_ccw_pixmap, circle->cw_ccw_button->parent,
circle->cw_ccw_box, (circle->angle->cw_ccw>0) ? rcm_cw : rcm_ccw);
circle->cw_ccw_box, (circle->angle->cw_ccw>0) ? rcm_cw_xpm : rcm_ccw_xpm);
gtk_label_set_text (GTK_LABEL (circle->cw_ccw_label),
(circle->angle->cw_ccw>0) ?

View File

@ -50,11 +50,15 @@
#include "rcm.h"
#include "rcm_misc.h"
#include "rcm_pixmaps.h"
#include "rcm_gdk.h"
#include "rcm_callback.h"
#include "rcm_dialog.h"
#include "pixmaps/rcm_360.xpm"
#include "pixmaps/rcm_a_b.xpm"
#include "pixmaps/rcm_cw.xpm"
/*---------------------------------------------------------------------------*/
/* Defines */
/*---------------------------------------------------------------------------*/
@ -189,9 +193,9 @@ rcm_create_pixmap_button (GtkWidget **label,
void
rcm_set_pixmaps (RcmCircle *circle)
{
rcm_set_pixmap(&circle->cw_ccw_pixmap, circle->cw_ccw_button->parent, circle->cw_ccw_box, rcm_cw);
rcm_set_pixmap(&circle->a_b_pixmap, circle->a_b_button->parent, circle->a_b_box, rcm_a_b);
rcm_set_pixmap(&circle->f360_pixmap, circle->f360_button->parent, circle->f360_box, rcm_360);
rcm_set_pixmap(&circle->cw_ccw_pixmap, circle->cw_ccw_button->parent, circle->cw_ccw_box, rcm_cw_xpm);
rcm_set_pixmap(&circle->a_b_pixmap, circle->a_b_button->parent, circle->a_b_box, rcm_a_b_xpm);
rcm_set_pixmap(&circle->f360_pixmap, circle->f360_button->parent, circle->f360_box, rcm_360_xpm);
}
/*---------------------------------------------------------------------------*/

View File

@ -1,163 +0,0 @@
/* XPM */
static char * rcm_360[] = {
"24 24 15 1",
" c None",
". c #E50466",
"+ c #E50365",
"@ c #F20233",
"# c #FF0000",
"$ c #FE0000",
"% c #FB000C",
"& c #F50126",
"* c #F80119",
"= c #F20132",
"- c #EB034C",
"; c #EB024C",
"> c #F80019",
", c #E20472",
"' c #E80359",
" ",
" ",
" ",
" ",
" ...+++ ",
" @###$$$% ",
" $& @*$ ",
" $= * ",
" %& @% ",
" -$ $; ",
" >#$$$$# -$ ",
" $ ",
" $ ",
" $- $ ",
" $,%@ $ ",
" %>$ =% $> ",
" @ > $+ ",
" @ @% @& ",
" ' &$ $& ",
" =#......$= ",
" ###$$$ ",
" ",
" ",
" "};
/* XPM */
static char * rcm_a_b[] = {
"24 24 14 1",
" c None",
". c #FE0000",
"+ c #E50466",
"@ c #FF0000",
"# c #F20233",
"$ c #F50126",
"% c #F80019",
"& c #FB000C",
"* c #F20132",
"= c #EB024C",
"- c #E50365",
"; c #EB034C",
"> c #E80359",
", c #F80119",
" ",
" . + ",
" @ #$ ",
" @ @% ",
" @@@#+ ",
" .@$ $&# ",
" @$$ *$ ",
" . =# -*; ",
" . = $> ",
" @ * $= ",
" . #= ",
" @ $> ",
" @ .- ",
" . ;* ",
" @ ; ",
" @ +. ",
" @ , ",
" . #> > ",
" . >$ >* #> ",
" @ =# * , ",
" @ =$&, ",
" . &.% ",
" .;++++++++++++++,.#+++ ",
" .@@....@@@@...........$"};
/* XPM */
static char * rcm_ccw[] = {
"24 24 13 1",
" c None",
". c #F20233",
"+ c #EB034C",
"@ c #FF0000",
"# c #F20132",
"$ c #FB000C",
"% c #F50126",
"& c #FE0000",
"* c #E50365",
"= c #EB024C",
"- c #E50466",
"; c #F80019",
"> c #F80119",
" ",
" ",
" ",
" ",
" ",
" ..... ",
" +@#####$% ",
" &#* &# ",
" . .% +% ",
" . +& $# ",
" @&+=#- .# ",
" @&%% $ ",
" # ",
" ",
" . .$$ ",
" ; $#$&= ",
" -& >=& ",
" %$ >& + ",
" %& &; ",
" *;@.-+&&* ",
" =@% ",
" ",
" ",
" "};
/* XPM */
static char * rcm_cw[] = {
"24 24 13 1",
" c None",
". c #F20233",
"+ c #F50126",
"@ c #FB000C",
"# c #F20132",
"$ c #FE0000",
"% c #EB024C",
"& c #FF0000",
"* c #E50365",
"= c #E50466",
"- c #EB034C",
"; c #F80019",
"> c #F80119",
" ",
" ",
" ",
" ",
" ",
" ..... ",
" +@#####$% ",
" .& *.$ ",
" +% +# . ",
" .@ $% # ",
" .# =.%-$$ ",
" @ ++$$ ",
" # ",
" ",
" @@. . ",
" -$@#@ ; ",
" $%> $* ",
" % $> @+ ",
" ;$ $+ ",
" *&&-=.$;* ",
" +$% ",
" ",
" ",
" "};