Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23102

Modified Files: Tag: branch-v0-39-2-extended g_all_guis.h u_main.tk Log Message: reverted back to 10 colors from 15 since the iemgui is too painful to modify to get everything working properly

Index: g_all_guis.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v retrieving revision 1.5.4.2 retrieving revision 1.5.4.3 diff -C2 -d -r1.5.4.2 -r1.5.4.3 *** g_all_guis.h 12 Jun 2007 03:58:12 -0000 1.5.4.2 --- g_all_guis.h 8 Jul 2007 21:56:30 -0000 1.5.4.3 *************** *** 11,45 **** #define IEM_GUI_COLNR_L_ORANGE 4 #define IEM_GUI_COLNR_L_YELLOW 5 ! #define IEM_GUI_COLNR_L_GREEN 7 ! #define IEM_GUI_COLNR_L_CYAN 9 ! #define IEM_GUI_COLNR_L_BLUE 11 ! #define IEM_GUI_COLNR_L_MAGENTA 13

! #define IEM_GUI_COLNR_LL_GREY 15 ! #define IEM_GUI_COLNR_M_GREY 16 ! #define IEM_GUI_COLNR_DD_GREY 17 ! #define IEM_GUI_COLNR_RED 18 ! #define IEM_GUI_COLNR_ORANGE 19 ! #define IEM_GUI_COLNR_YELLOW 21 ! #define IEM_GUI_COLNR_GREEN 23 ! #define IEM_GUI_COLNR_CYAN 25 ! #define IEM_GUI_COLNR_BLUE 27 ! #define IEM_GUI_COLNR_MAGENTA 29

! #define IEM_GUI_COLNR_L_GREY 30 ! #define IEM_GUI_COLNR_MD_GREY 31 ! #define IEM_GUI_COLNR_BLACK 32 ! #define IEM_GUI_COLNR_D_RED 33 ! #define IEM_GUI_COLNR_D_ORANGE 34 ! #define IEM_GUI_COLNR_D_YELLOW 35 ! #define IEM_GUI_COLNR_D_GREEN 37 ! #define IEM_GUI_COLNR_D_CYAN 39 ! #define IEM_GUI_COLNR_D_BLUE 41 ! #define IEM_GUI_COLNR_D_MAGENTA 43

#define IEM_GUI_COLOR_SELECTED 255 #define IEM_GUI_COLOR_NORMAL 0

! #define IEM_GUI_MAX_COLOR 45

#define IEM_GUI_DEFAULTSIZE 15 --- 11,45 ---- #define IEM_GUI_COLNR_L_ORANGE 4 #define IEM_GUI_COLNR_L_YELLOW 5 ! #define IEM_GUI_COLNR_L_GREEN 6 ! #define IEM_GUI_COLNR_L_CYAN 7 ! #define IEM_GUI_COLNR_L_BLUE 8 ! #define IEM_GUI_COLNR_L_MAGENTA 9

! #define IEM_GUI_COLNR_LL_GREY 10 ! #define IEM_GUI_COLNR_M_GREY 11 ! #define IEM_GUI_COLNR_DD_GREY 12 ! #define IEM_GUI_COLNR_RED 13 ! #define IEM_GUI_COLNR_ORANGE 14 ! #define IEM_GUI_COLNR_YELLOW 15 ! #define IEM_GUI_COLNR_GREEN 16 ! #define IEM_GUI_COLNR_CYAN 17 ! #define IEM_GUI_COLNR_BLUE 18 ! #define IEM_GUI_COLNR_MAGENTA 19

! #define IEM_GUI_COLNR_L_GREY 20 ! #define IEM_GUI_COLNR_MD_GREY 21 ! #define IEM_GUI_COLNR_BLACK 22 ! #define IEM_GUI_COLNR_D_RED 23 ! #define IEM_GUI_COLNR_D_ORANGE 24 ! #define IEM_GUI_COLNR_D_YELLOW 25 ! #define IEM_GUI_COLNR_D_GREEN 26 ! #define IEM_GUI_COLNR_D_CYAN 27 ! #define IEM_GUI_COLNR_D_BLUE 28 ! #define IEM_GUI_COLNR_D_MAGENTA 29

#define IEM_GUI_COLOR_SELECTED 255 #define IEM_GUI_COLOR_NORMAL 0

! #define IEM_GUI_MAX_COLOR 30

#define IEM_GUI_DEFAULTSIZE 15

Index: u_main.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_main.tk,v retrieving revision 1.17.2.15 retrieving revision 1.17.2.16 diff -C2 -d -r1.17.2.15 -r1.17.2.16 *** u_main.tk 19 May 2007 14:49:23 -0000 1.17.2.15 --- u_main.tk 8 Jul 2007 21:56:30 -0000 1.17.2.16 *************** *** 2738,2748 **** -side right -anchor e -expand yes -fill both -pady 7

! # 15-panel color scheme by Mary Ann Benedetto http://piR2.org frame $id.colors.r1 pack $id.colors.r1 -side top ! foreach i { 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14} \ ! hexcol { 0xffffff 0xdfdfdf 0xbbbbbb 0xffC7C6 0xffE3C6 \ ! 0xFEFFC6 0xe1FFC6 0xc6FFC7 0xc6FFE3 0xc6FEFF \ ! 0xc6E1FF 0xc7C6FF 0xe3C6FF 0xffC6FE 0xffC6E1 } \ { label $id.colors.r1.c$i -background [format "#%6.6x" $hexcol] \ --- 2738,2747 ---- -side right -anchor e -expand yes -fill both -pady 7

! # color scheme by Mary Ann Benedetto http://piR2.org frame $id.colors.r1 pack $id.colors.r1 -side top ! foreach i { 0 1 2 3 4 5 6 7 8 9} \ ! hexcol { 0xFFFFFF 0xDFDFDF 0xBBBBBB 0xFFC7C6 0xFFE3C6 \ ! 0xFEFFC6 0xC6FFC7 0xc6FEFF 0xC7C6FF 0xE3C6FF } \ { label $id.colors.r1.c$i -background [format "#%6.6x" $hexcol] \ *************** *** 2753,2765 **** pack $id.colors.r1.c0 $id.colors.r1.c1 $id.colors.r1.c2 $id.colors.r1.c3 \ $id.colors.r1.c4 $id.colors.r1.c5 $id.colors.r1.c6 $id.colors.r1.c7 \ ! $id.colors.r1.c8 $id.colors.r1.c9 $id.colors.r1.c10 $id.colors.r1.c11 \ ! $id.colors.r1.c12 $id.colors.r1.c13 $id.colors.r1.c14 -side left

frame $id.colors.r2 pack $id.colors.r2 -side top ! foreach i { 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 } \ ! hexcol { 0x9f9f9f 0x7c7c7c 0x606060 0xFF0400 0xFF8300 \ ! 0xFAFF00 0x9CFF00 0x00FF04 0x00FF83 0x00FAFF \ ! 0x3C50FB 0x0400FF 0x9C00FF 0xFF00FA 0xFF007B } \ { label $id.colors.r2.c$i -background [format "#%6.6x" $hexcol] \ --- 2752,2762 ---- pack $id.colors.r1.c0 $id.colors.r1.c1 $id.colors.r1.c2 $id.colors.r1.c3 \ $id.colors.r1.c4 $id.colors.r1.c5 $id.colors.r1.c6 $id.colors.r1.c7 \ ! $id.colors.r1.c8 $id.colors.r1.c9 -side left

frame $id.colors.r2 pack $id.colors.r2 -side top ! foreach i { 0 1 2 3 4 5 6 7 8 9 } \ ! hexcol { 0x9F9F9F 0x7C7C7C 0x606060 0xFF0400 0xFF8300 \ ! 0xFAFF00 0x00FF04 0x00FAFF 0x0400FF 0x9C00FF } \ { label $id.colors.r2.c$i -background [format "#%6.6x" $hexcol] \ *************** *** 2771,2783 **** pack $id.colors.r2.c0 $id.colors.r2.c1 $id.colors.r2.c2 $id.colors.r2.c3 \ $id.colors.r2.c4 $id.colors.r2.c5 $id.colors.r2.c6 $id.colors.r2.c7 \ ! $id.colors.r2.c8 $id.colors.r2.c9 $id.colors.r2.c10 $id.colors.r2.c11 \ ! $id.colors.r2.c12 $id.colors.r2.c13 $id.colors.r2.c14 -side left

frame $id.colors.r3 pack $id.colors.r3 -side top ! foreach i { 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 } \ hexcol { 0x404040 0x202020 0x000000 0x551312 0x553512 \ ! 0x535512 0x354D0F 0x0F4710 0x0C393B 0x0E4345 \ ! 0x171F61 0x131255 0x2F004D 0x551253 0x551232 } \ { label $id.colors.r3.c$i -background [format "#%6.6x" $hexcol] \ --- 2768,2778 ---- pack $id.colors.r2.c0 $id.colors.r2.c1 $id.colors.r2.c2 $id.colors.r2.c3 \ $id.colors.r2.c4 $id.colors.r2.c5 $id.colors.r2.c6 $id.colors.r2.c7 \ ! $id.colors.r2.c8 $id.colors.r2.c9 -side left

frame $id.colors.r3 pack $id.colors.r3 -side top ! foreach i { 0 1 2 3 4 5 6 7 8 9 } \ hexcol { 0x404040 0x202020 0x000000 0x551312 0x553512 \ ! 0x535512 0x0F4710 0x0E4345 0x131255 0x2F004D } \ { label $id.colors.r3.c$i -background [format "#%6.6x" $hexcol] \ *************** *** 2789,2794 **** pack $id.colors.r3.c0 $id.colors.r3.c1 $id.colors.r3.c2 $id.colors.r3.c3 \ $id.colors.r3.c4 $id.colors.r3.c5 $id.colors.r3.c6 $id.colors.r3.c7 \ ! $id.colors.r3.c8 $id.colors.r3.c9 $id.colors.r3.c10 $id.colors.r3.c11 \ ! $id.colors.r3.c12 $id.colors.r3.c13 $id.colors.r3.c14 -side left

frame $id.cao -pady 10 --- 2784,2788 ---- pack $id.colors.r3.c0 $id.colors.r3.c1 $id.colors.r3.c2 $id.colors.r3.c3 \ $id.colors.r3.c4 $id.colors.r3.c5 $id.colors.r3.c6 $id.colors.r3.c7 \ ! $id.colors.r3.c8 $id.colors.r3.c9 -side left

frame $id.cao -pady 10