X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FColor.cpp;h=54a4743d91f4eab572c748d4376b9d731fbc52b4;hb=38c2cde0d8695ac5287bae218c4a33a2acf18ef8;hp=161ebbad090cc69542601a8a22ac0388df625a6d;hpb=9c55af4a223ce4db29d643251109e245665344bd;p=lyx.git diff --git a/src/Color.cpp b/src/Color.cpp index 161ebbad09..54a4743d91 100644 --- a/src/Color.cpp +++ b/src/Color.cpp @@ -90,7 +90,7 @@ RGBColor rgbFromHexName(string const & x11hexname) string const outputLaTeXColor(RGBColor const & color) { // this routine returns a LaTeX readable color string in the form - // "red, green, blue" where the colors are a number in the range 0-1 + // "red, green, blue" where the colors are a number in the range 0-1 int red = color.r; int green = color.g; int blue = color.b; @@ -152,7 +152,7 @@ RGBColor const RGBColorFromLaTeX(string const & color) } -Color::Color(ColorCode base_color) : baseColor(base_color), +Color::Color(ColorCode base_color) : baseColor(base_color), mergeColor(Color_ignore) {} @@ -163,7 +163,7 @@ bool Color::operator==(Color const & color) const } -bool Color::operator!=(Color const & color) const +bool Color::operator!=(Color const & color) const { return baseColor != color.baseColor; } @@ -203,11 +203,22 @@ ColorSet::ColorSet() { Color_none, N_("none"), "none", "black", "none" }, { Color_black, N_("black"), "black", "black", "black" }, { Color_white, N_("white"), "white", "white", "white" }, - { Color_red, N_("red"), "red", "red", "red" }, - { Color_green, N_("green"), "green", "green", "green" }, { Color_blue, N_("blue"), "blue", "blue", "blue" }, + { Color_brown, N_("brown"), "brown", "brown", "brown" }, { Color_cyan, N_("cyan"), "cyan", "cyan", "cyan" }, + { Color_darkgray, N_("darkgray"), "darkgray", "darkgray", "darkgray" }, + { Color_gray, N_("gray"), "gray", "gray", "gray" }, + { Color_green, N_("green"), "green", "green", "green" }, + { Color_lightgray, N_("lightgray"), "lightgray", "lightgray", "lightgray" }, + { Color_lime, N_("lime"), "lime", "lime", "lime" }, { Color_magenta, N_("magenta"), "magenta", "magenta", "magenta" }, + { Color_olive, N_("olive"), "olive", "olive", "olive" }, + { Color_orange, N_("orange"), "orange", "orange", "orange" }, + { Color_pink, N_("pink"), "pink", "pink", "pink" }, + { Color_purple, N_("purple"), "purple", "purple", "purple" }, + { Color_red, N_("red"), "red", "red", "red" }, + { Color_teal, N_("teal"), "teal", "teal", "teal" }, + { Color_violet, N_("violet"), "violet", "violet", "violet" }, { Color_yellow, N_("yellow"), "yellow", "yellow", "yellow" }, { Color_cursor, N_("cursor"), "cursor", "black", "cursor" }, { Color_background, N_("background"), "background", "linen", "background" }, @@ -243,6 +254,10 @@ ColorSet::ColorSet() { Color_command, N_("command inset"), "command", "black", "command" }, { Color_commandbg, N_("command inset background"), "commandbg", "azure", "commandbg" }, { Color_commandframe, N_("command inset frame"), "commandframe", "black", "commandframe" }, + { Color_command_broken, N_("command inset (broken reference)"), "command", "white", "command" }, + { Color_buttonbg_broken, N_("button background (broken reference)"), "commandbg", "Red", "commandbg_broken" }, + { Color_buttonframe_broken, N_("button frame (broken reference)"), "commandframe", "Red", "commandframe_broken" }, + { Color_buttonhoverbg_broken, N_("button background (broken reference) under focus"), "buttonhoverbg", "#DB0B0B", "buttonhoverbg_broken" }, { Color_special, N_("special character"), "special", "RoyalBlue", "special" }, { Color_math, N_("math"), "math", "DarkBlue", "math" }, { Color_mathbg, N_("math background"), "mathbg", "linen", "mathbg" }, @@ -258,36 +273,35 @@ ColorSet::ColorSet() { Color_mathmacroblend, N_("math macro blended out"), "mathmacroblend", "black", "mathmacroblend" }, { Color_mathmacrooldarg, N_("math macro old parameter"), "mathmacrooldarg", grey80, "mathmacrooldarg" }, { Color_mathmacronewarg, N_("math macro new parameter"), "mathmacronewarg", "black", "mathmacronewarg" }, - { Color_collapsable, N_("collapsable inset text"), "collapsable", "DarkRed", "collapsable" }, - { Color_collapsableframe, N_("collapsable inset frame"), "collapsableframe", "IndianRed", "collapsableframe" }, + { Color_collapsible, N_("collapsible inset text"), "collapsible", "DarkRed", "collapsible" }, + { Color_collapsibleframe, N_("collapsible inset frame"), "collapsibleframe", "IndianRed", "collapsibleframe" }, { Color_insetbg, N_("inset background"), "insetbg", grey80, "insetbg" }, { Color_insetframe, N_("inset frame"), "insetframe", "IndianRed", "insetframe" }, { Color_error, N_("LaTeX error"), "error", "Red", "error" }, { Color_eolmarker, N_("end-of-line marker"), "eolmarker", "Brown", "eolmarker" }, { Color_appendix, N_("appendix marker"), "appendix", "Brown", "appendix" }, { Color_changebar, N_("change bar"), "changebar", "Blue", "changebar" }, - { Color_deletedtext, N_("deleted text"), "deletedtext", "#ff0000", "deletedtext" }, - { Color_addedtext, N_("added text"), "addedtext", "#0000ff", "addedtext" }, - { Color_changedtextauthor1, N_("changed text 1st author"), "changedtextauthor1", "#0000ff", "changedtextauthor1" }, - { Color_changedtextauthor2, N_("changed text 2nd author"), "changedtextauthor2", "#ff00ff", "changedtextauthor2" }, - { Color_changedtextauthor3, N_("changed text 3rd author"), "changedtextauthor3", "#ff0000", "changedtextauthor3" }, - { Color_changedtextauthor4, N_("changed text 4th author"), "changedtextauthor4", "#aa00ff", "changedtextauthor4" }, - { Color_changedtextauthor5, N_("changed text 5th author"), "changedtextauthor5", "#55aa00", "changedtextauthor5" }, - { Color_deletedtextmodifier, N_("deleted text modifier"), "deletedtextmodifier", "white", "deletedtextmodifier" }, + { Color_deletedtext, N_("deleted text (output)"), "deletedtext", "#ff0000", "deletedtext" }, + { Color_addedtext, N_("added text (output)"), "addedtext", "#0000ff", "addedtext" }, + { Color_addedtextauthor1, N_("added text (workarea, 1st author)"), "changedtextauthor1", "#0000ff", "changedtextauthor1" }, + { Color_addedtextauthor2, N_("added text (workarea, 2nd author)"), "changedtextauthor2", "#ff00ff", "changedtextauthor2" }, + { Color_addedtextauthor3, N_("added text (workarea, 3rd author)"), "changedtextauthor3", "#ff0000", "changedtextauthor3" }, + { Color_addedtextauthor4, N_("added text (workarea, 4th author)"), "changedtextauthor4", "#aa00ff", "changedtextauthor4" }, + { Color_addedtextauthor5, N_("added text (workarea, 5th author)"), "changedtextauthor5", "#55aa00", "changedtextauthor5" }, + { Color_deletedtextmodifier, N_("deleted text modifier (workarea)"), "deletedtextmodifier", "white", "deletedtextmodifier" }, { Color_added_space, N_("added space markers"), "added_space", "Brown", "added_space" }, { Color_tabularline, N_("table line"), "tabularline", "black", "tabularline" }, - { Color_tabularonoffline, N_("table on/off line"), "tabularonoffline", - "LightSteelBlue", "tabularonoffline" }, + { Color_tabularonoffline, N_("table on/off line"), "tabularonoffline", "LightSteelBlue", "tabularonoffline" }, { Color_bottomarea, N_("bottom area"), "bottomarea", grey40, "bottomarea" }, { Color_newpage, N_("new page"), "newpage", "Blue", "newpage" }, { Color_pagebreak, N_("page break / line break"), "pagebreak", "RoyalBlue", "pagebreak" }, - { Color_buttonframe, N_("frame of button"), "buttonframe", "#dcd2c8", "buttonframe" }, + { Color_buttonframe, N_("button frame"), "buttonframe", "#dcd2c8", "buttonframe" }, { Color_buttonbg, N_("button background"), "buttonbg", "#dcd2c8", "buttonbg" }, { Color_buttonhoverbg, N_("button background under focus"), "buttonhoverbg", "#C7C7CA", "buttonhoverbg" }, { Color_paragraphmarker, N_("paragraph marker"), "paragraphmarker", grey80, "paragraphmarker"}, { Color_previewframe, N_("preview frame"), "previewframe", "black", "previewframe"}, { Color_inherit, N_("inherit"), "inherit", "black", "inherit" }, - { Color_regexpframe, N_("regexp frame"), "green", "green", "green" }, + { Color_regexpframe, N_("regexp frame"), "regexpframe", "green", "regexpframe" }, { Color_ignore, N_("ignore"), "ignore", "black", "ignore" }, { Color_ignore, 0, 0, 0, 0 } };