diff --git a/ChangeLog b/ChangeLog index 2b3911d805..86760d78af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2000-11-18 Michael Natterer + + * 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 * 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 diff --git a/plug-ins/rcm/Makefile.am b/plug-ins/rcm/Makefile.am index 96c52d42c2..2b1edd9fc5 100644 --- a/plug-ins/rcm/Makefile.am +++ b/plug-ins/rcm/Makefile.am @@ -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)"\" diff --git a/plug-ins/rcm/pixmaps/.cvsignore b/plug-ins/rcm/pixmaps/.cvsignore new file mode 100644 index 0000000000..5c165d91d6 --- /dev/null +++ b/plug-ins/rcm/pixmaps/.cvsignore @@ -0,0 +1 @@ +.xvpics diff --git a/plug-ins/rcm/pixmaps/rcm_360.xpm b/plug-ins/rcm/pixmaps/rcm_360.xpm new file mode 100644 index 0000000000..eb3ccb35b0 --- /dev/null +++ b/plug-ins/rcm/pixmaps/rcm_360.xpm @@ -0,0 +1,29 @@ +/* XPM */ +static char * rcm_360_xpm[] = { +"24 24 2 1", +" c None", +". c #FF0000", +" ", +" ", +" ", +" ", +" ..... ", +" ......... ", +" ... ... ", +" .. .. ", +" .. .. ", +" .. .. ", +" ...... .. ", +" .. ", +" .. ", +" . .. ", +" ... .. ", +" ...... .. ", +" ... .. .. ", +" .. .. .. ", +" . ... ... ", +" ......... ", +" ..... ", +" ", +" ", +" "}; diff --git a/plug-ins/rcm/pixmaps/rcm_a_b.xpm b/plug-ins/rcm/pixmaps/rcm_a_b.xpm new file mode 100644 index 0000000000..cfdcb4a94f --- /dev/null +++ b/plug-ins/rcm/pixmaps/rcm_a_b.xpm @@ -0,0 +1,29 @@ +/* XPM */ +static char * rcm_a_b_xpm[] = { +"24 24 2 1", +" c None", +". c #FF0000", +" ", +" ", +" . ", +" . .. ", +" . .. ", +" . ... ", +" ....... ", +" . .. .... ", +" . .. .... ", +" . .. ... ", +" . .. ... ", +" . ... ", +" . .. ", +" . .. ", +" . .. ", +" . .. . ", +" . .. .. .. ", +" . .. ... ", +" . .... ", +" . ... ", +" . . ", +" .................... ", +" ", +" "}; diff --git a/plug-ins/rcm/pixmaps/rcm_ccw.xpm b/plug-ins/rcm/pixmaps/rcm_ccw.xpm new file mode 100644 index 0000000000..3a2c553cd7 --- /dev/null +++ b/plug-ins/rcm/pixmaps/rcm_ccw.xpm @@ -0,0 +1,29 @@ +/* XPM */ +static char * rcm_ccw_xpm[] = { +"24 24 2 1", +" c None", +". c #FF0000", +" ", +" ", +" ", +" ", +" ", +" ..... ", +" ......... ", +" . ... ... ", +" .. .. .. ", +" ... .. .. ", +" ...... .. ", +" ... ", +" . ", +" . ", +" ... ", +" .. ...... ", +" .. .. ... ", +" .. .. .. ", +" ... ... . ", +" ......... ", +" ..... ", +" ", +" ", +" "}; diff --git a/plug-ins/rcm/pixmaps/rcm_cw.xpm b/plug-ins/rcm/pixmaps/rcm_cw.xpm new file mode 100644 index 0000000000..84c14cccac --- /dev/null +++ b/plug-ins/rcm/pixmaps/rcm_cw.xpm @@ -0,0 +1,29 @@ +/* XPM */ +static char * rcm_cw_xpm[] = { +"24 24 2 1", +" c None", +". c #FF0000", +" ", +" ", +" ", +" ", +" ", +" ..... ", +" ......... ", +" ... ... . ", +" .. .. .. ", +" .. .. ... ", +" .. ...... ", +" ... ", +" . ", +" . ", +" ... ", +" ...... .. ", +" ... .. .. ", +" .. .. .. ", +" . ... ... ", +" ......... ", +" ..... ", +" ", +" ", +" "}; diff --git a/plug-ins/rcm/rcm_callback.c b/plug-ins/rcm/rcm_callback.c index 1c2c95273a..c77ff1f423 100644 --- a/plug-ins/rcm/rcm_callback.c +++ b/plug-ins/rcm/rcm_callback.c @@ -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) ? diff --git a/plug-ins/rcm/rcm_dialog.c b/plug-ins/rcm/rcm_dialog.c index 40f25348d9..6103ed2a1d 100644 --- a/plug-ins/rcm/rcm_dialog.c +++ b/plug-ins/rcm/rcm_dialog.c @@ -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); } /*---------------------------------------------------------------------------*/ diff --git a/plug-ins/rcm/rcm_pixmaps.h b/plug-ins/rcm/rcm_pixmaps.h deleted file mode 100644 index 79ae56b6d9..0000000000 --- a/plug-ins/rcm/rcm_pixmaps.h +++ /dev/null @@ -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", -" ", -" ", -" ", -" ", -" ", -" ..... ", -" +@#####$% ", -" .& *.$ ", -" +% +# . ", -" .@ $% # ", -" .# =.%-$$ ", -" @ ++$$ ", -" # ", -" ", -" @@. . ", -" -$@#@ ; ", -" $%> $* ", -" % $> @+ ", -" ;$ $+ ", -" *&&-=.$;* ", -" +$% ", -" ", -" ", -" "};