notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move pink for proper order, and use "Light Grey"

Browse source
This commit is contained in:
Albert Cahalan 2004-12-21 01:18:12 +00:00
parent 5c5e54266d
commit 85ef258f24
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/colors.h
View file

@ -17,11 +17,10 @@
enum { enum {
COLOR_BLACK, COLOR_BLACK,
COLOR_GREY, COLOR_DARKGREY,
COLOR_SILVER, COLOR_LIGHTGRAY,
COLOR_WHITE, COLOR_WHITE,
COLOR_RED, COLOR_RED,
COLOR_PINK,
COLOR_ORANGE, COLOR_ORANGE,
COLOR_YELLOW, COLOR_YELLOW,
COLOR_NEON, COLOR_NEON,
@ -30,6 +29,7 @@ enum {
COLOR_BLUE, COLOR_BLUE,
COLOR_PURPLE, COLOR_PURPLE,
COLOR_MAGENTA, COLOR_MAGENTA,
COLOR_PINK,
COLOR_BROWN, COLOR_BROWN,
COLOR_TAN, COLOR_TAN,
COLOR_BEIGE, COLOR_BEIGE,
@ -41,11 +41,10 @@ enum {
const int color_hexes[NUM_COLORS][3] = { const int color_hexes[NUM_COLORS][3] = {
{0, 0, 0}, /* Black */ {0, 0, 0}, /* Black */
{128, 128, 128}, /* Gray */ {128, 128, 128}, /* Dark Gray */
{192, 192, 192}, /* Silver */ {192, 192, 192}, /* Light Grey */
{255, 255, 255}, /* White */ {255, 255, 255}, /* White */
{255, 0, 0}, /* Red */ {255, 0, 0}, /* Red */
{255, 165, 211}, /* Pink */
{255, 128, 0}, /* Orange */ {255, 128, 0}, /* Orange */
{255, 255, 0}, /* Yellow */ {255, 255, 0}, /* Yellow */
{140, 255, 0}, /* Neon */ {140, 255, 0}, /* Neon */
@ -54,6 +53,7 @@ const int color_hexes[NUM_COLORS][3] = {
{ 0, 0, 255}, /* Blue */ { 0, 0, 255}, /* Blue */
{128, 0, 128}, /* Purple */ {128, 0, 128}, /* Purple */
{255, 0, 255}, /* Magenta */ {255, 0, 255}, /* Magenta */
{255, 165, 211}, /* Pink */
{128, 96, 0}, /* Brown */ {128, 96, 0}, /* Brown */
{226, 189, 166}, /* Tan */ {226, 189, 166}, /* Tan */
{247, 228, 219} /* Beige */ {247, 228, 219} /* Beige */
@ -64,11 +64,10 @@ const int color_hexes[NUM_COLORS][3] = {
const char * const color_names[NUM_COLORS] = { const char * const color_names[NUM_COLORS] = {
gettext_noop("Black!"), gettext_noop("Black!"),
gettext_noop("Gray!"), gettext_noop("Dark Gray!"), // using both valid spellings
gettext_noop("Silver!"), gettext_noop("Light Grey!"), // using both valid spellings
gettext_noop("White!"), gettext_noop("White!"),
gettext_noop("Red!"), gettext_noop("Red!"),
gettext_noop("Pink!"),
gettext_noop("Orange!"), gettext_noop("Orange!"),
gettext_noop("Yellow!"), gettext_noop("Yellow!"),
gettext_noop("Neon green!"), gettext_noop("Neon green!"),
@ -77,6 +76,7 @@ const char * const color_names[NUM_COLORS] = {
gettext_noop("Blue!"), gettext_noop("Blue!"),
gettext_noop("Purple!"), gettext_noop("Purple!"),
gettext_noop("Magenta!"), gettext_noop("Magenta!"),
gettext_noop("Pink!"),
gettext_noop("Brown!"), gettext_noop("Brown!"),
gettext_noop("Tan!"), gettext_noop("Tan!"),
gettext_noop("Beige!") gettext_noop("Beige!")