diff --git a/i18n/strings.en-US b/i18n/strings.en-US index a27f83e27..478c92afd 100644 --- a/i18n/strings.en-US +++ b/i18n/strings.en-US @@ -99,57 +99,20 @@ # 5xx Colors 500 bold 501 underline -502 bold_underline -503 black -504 red -505 green -506 yellow -507 blue -508 magenta -509 cyan -510 white -511 bold_black -512 bold_red -513 bold_green -514 bold_yellow -515 bold_blue -516 bold_magenta -517 bold_cyan -518 bold_white -519 underline_black -520 underline_red -521 underline_green -522 underline_yellow -523 underline_blue -524 underline_magenta -525 underline_cyan -526 underline_white -527 bold_underline_black -528 bold_underline_red -529 bold_underline_green -530 bold_underline_yellow -531 bold_underline_blue -532 bold_underline_magenta -533 bold_underline_cyan -534 bold_underline_white -535 on_black -536 on_red -537 on_green -538 on_yellow -539 on_blue -540 on_magenta -541 on_cyan -542 on_white -543 on_bright_black -544 on_bright_red -545 on_bright_green -546 on_bright_yellow -547 on_bright_blue -548 on_bright_magenta -549 on_bright_cyan -550 on_bright_white -551 off -552 Unknown color name +502 on +503 bright + +504 black +505 red +506 green +507 yellow +508 blue +509 magenta +510 cyan +511 white + +520 off +521 Unknown color name # 6xx Config diff --git a/src/Color.cpp b/src/Color.cpp index 2f7a42417..1c1fe87f8 100644 --- a/src/Color.cpp +++ b/src/Color.cpp @@ -42,16 +42,16 @@ static struct int index; // offset red=3 (therefore fg=33, bg=43) } allColors[] = { - // Color.h enum i18n.h English Index - { Color::nocolor, 0, "none", 0}, - { Color::black, COLOR_BLACK, "black", 1}, // fg 29+0 bg 39+0 - { Color::red, COLOR_RED, "red", 2}, - { Color::green, COLOR_GREEN, "green", 3}, - { Color::yellow, COLOR_YELLOW, "yellow", 4}, - { Color::blue, COLOR_BLUE, "blue", 5}, - { Color::magenta, COLOR_MAGENTA, "magenta", 6}, - { Color::cyan, COLOR_CYAN, "cyan", 7}, - { Color::white, COLOR_WHITE, "white", 8}, + // Color.h enum i18n.h English Index + { Color::nocolor, 0, "none", 0}, + { Color::black, CCOLOR_BLACK, "black", 1}, // fg 29+0 bg 39+0 + { Color::red, CCOLOR_RED, "red", 2}, + { Color::green, CCOLOR_GREEN, "green", 3}, + { Color::yellow, CCOLOR_YELLOW, "yellow", 4}, + { Color::blue, CCOLOR_BLUE, "blue", 5}, + { Color::magenta, CCOLOR_MAGENTA, "magenta", 6}, + { Color::cyan, CCOLOR_CYAN, "cyan", 7}, + { Color::white, CCOLOR_WHITE, "white", 8}, }; diff --git a/src/i18n.h b/src/i18n.h index a9e1be3ac..e1c6a72e5 100644 --- a/src/i18n.h +++ b/src/i18n.h @@ -134,59 +134,21 @@ // 4xx Columns // 5xx Colors -#define COLOR_BOLD 500 -#define COLOR_UL 501 -#define COLOR_B_UL 502 -#define COLOR_BLACK 503 -#define COLOR_RED 504 -#define COLOR_GREEN 505 -#define COLOR_YELLOW 506 -#define COLOR_BLUE 507 -#define COLOR_MAGENTA 508 -#define COLOR_CYAN 509 -#define COLOR_WHITE 510 -#define COLOR_B_BLACK 511 -#define COLOR_B_RED 512 -#define COLOR_B_GREEN 513 -#define COLOR_B_YELLOW 514 -#define COLOR_B_BLUE 515 -#define COLOR_B_MAGENTA 516 -#define COLOR_B_CYAN 517 -#define COLOR_B_WHITE 518 -#define COLOR_UL_BLACK 519 -#define COLOR_UL_RED 520 -#define COLOR_UL_GREEN 521 -#define COLOR_UL_YELLOW 522 -#define COLOR_UL_BLUE 523 -#define COLOR_UL_MAGENTA 524 -#define COLOR_UL_CYAN 525 -#define COLOR_UL_WHITE 526 -#define COLOR_B_UL_BLACK 527 -#define COLOR_B_UL_RED 528 -#define COLOR_B_UL_GREEN 529 -#define COLOR_B_UL_YELLOW 530 -#define COLOR_B_UL_BLUE 531 -#define COLOR_B_UL_MAGENTA 532 -#define COLOR_B_UL_CYAN 533 -#define COLOR_B_UL_WHITE 534 -#define COLOR_ON_BLACK 535 -#define COLOR_ON_RED 536 -#define COLOR_ON_GREEN 537 -#define COLOR_ON_YELLOW 538 -#define COLOR_ON_BLUE 539 -#define COLOR_ON_MAGENTA 540 -#define COLOR_ON_CYAN 541 -#define COLOR_ON_WHITE 542 -#define COLOR_ON_BRIGHT_BLACK 543 -#define COLOR_ON_BRIGHT_RED 544 -#define COLOR_ON_BRIGHT_GREEN 545 -#define COLOR_ON_BRIGHT_YELLOW 546 -#define COLOR_ON_BRIGHT_BLUE 547 -#define COLOR_ON_BRIGHT_MAGENTA 548 -#define COLOR_ON_BRIGHT_CYAN 549 -#define COLOR_ON_BRIGHT_WHITE 550 -#define COLOR_OFF 551 -#define COLOR_UNKNOWN 552 +#define CCOLOR_BOLD 500 +#define CCOLOR_UNDERLINE 501 +#define CCOLOR_ON 502 +#define CCOLOR_BRIGHT 503 +#define CCOLOR_BLACK 504 +#define CCOLOR_RED 505 +#define CCOLOR_GREEN 506 +#define CCOLOR_YELLOW 507 +#define CCOLOR_BLUE 508 +#define CCOLOR_MAGENTA 509 +#define CCOLOR_CYAN 510 +#define CCOLOR_WHITE 511 + +#define CCOLOR_OFF 520 +#define CCOLOR_UNKNOWN 521 // 6xx Config