From c1f5768846ac55998776b5248bfa39e99f21e048 Mon Sep 17 00:00:00 2001 From: Albert Cahalan Date: Thu, 13 Jan 2005 00:11:09 +0000 Subject: [PATCH] kid says: this is not good; I like two greys; a missing grey; I hate it; I do not like Tux Paint; I want two greys; I need two greys; I doesn't like that; I don't like this --- src/colors.h | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/src/colors.h b/src/colors.h index 220a7d80d..373612e22 100644 --- a/src/colors.h +++ b/src/colors.h @@ -17,17 +17,18 @@ enum { COLOR_BLACK, - COLOR_GRAY, + COLOR_DARKGREY, + COLOR_LIGHTGRAY, COLOR_WHITE, COLOR_RED, COLOR_ORANGE, COLOR_YELLOW, - COLOR_LIGHTGREEN, - COLOR_DARKGREEN, + COLOR_NEON, + COLOR_GREEN, COLOR_SKYBLUE, COLOR_BLUE, - COLOR_VIOLET, COLOR_PURPLE, + COLOR_MAGENTA, COLOR_PINK, COLOR_BROWN, COLOR_TAN, @@ -40,19 +41,20 @@ enum { const int color_hexes[NUM_COLORS][3] = { {0, 0, 0}, /* Black */ - {162, 162, 162}, /* Gray */ + {128, 128, 128}, /* Dark Gray */ + {192, 192, 192}, /* Light Grey */ {255, 255, 255}, /* White */ {255, 0, 0}, /* Red */ - {255, 162, 64}, /* Orange */ - {255, 255, 128}, /* Yellow */ - {160, 228, 128}, /* Light green */ - { 33, 148, 70}, /* Dark green */ - {156, 200, 245}, /* Light blue */ - { 85, 130, 255}, /* Blue */ - {186, 157, 255}, /* Violet */ - {150, 0, 150}, /* Purple */ + {255, 128, 0}, /* Orange */ + {255, 255, 0}, /* Yellow */ + {140, 255, 0}, /* Neon */ + { 33, 148, 33}, /* Green */ + {138, 168, 205}, /* Sky blue */ + { 0, 0, 255}, /* Blue */ + {128, 0, 128}, /* Purple */ + {255, 0, 255}, /* Magenta */ {255, 165, 211}, /* Pink */ - {128, 80, 0}, /* Brown */ + {128, 96, 0}, /* Brown */ {226, 189, 166}, /* Tan */ {247, 228, 219} /* Beige */ }; @@ -62,17 +64,18 @@ const int color_hexes[NUM_COLORS][3] = { const char * const color_names[NUM_COLORS] = { gettext_noop("Black!"), - gettext_noop("Gray!"), + gettext_noop("Dark Gray!"), // using both valid spellings + gettext_noop("Light Grey!"), // using both valid spellings gettext_noop("White!"), gettext_noop("Red!"), gettext_noop("Orange!"), gettext_noop("Yellow!"), - gettext_noop("Light green!"), - gettext_noop("Dark green!"), - gettext_noop("Light blue!"), + gettext_noop("Neon green!"), + gettext_noop("Green!"), + gettext_noop("Sky blue!"), gettext_noop("Blue!"), - gettext_noop("Violet!"), gettext_noop("Purple!"), + gettext_noop("Magenta!"), gettext_noop("Pink!"), gettext_noop("Brown!"), gettext_noop("Tan!"),