Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / Color.cpp

diff --git a/src/Color.cpp b/src/Color.cpp
index 609c742e73a28e4f99936a659f85e12276ebb0fe..f08c9fbf53807a10e7d025fc20b62f4531169f1e 100644 (file)
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -78,7 +78,8 @@ string const X11hexname(RGBColor const & col)
 RGBColor rgbFromHexName(string const & x11hexname)
 {
        RGBColor c;
-       LASSERT(x11hexname.size() == 7 && x11hexname[0] == '#', /**/);
+       LASSERT(x11hexname.size() == 7 && x11hexname[0] == '#',
+               return c);
        c.r = hexstrToInt(x11hexname.substr(1, 2));
        c.g = hexstrToInt(x11hexname.substr(3, 2));
        c.b = hexstrToInt(x11hexname.substr(5, 2));
@@ -202,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" },
@@ -237,6 +249,7 @@ ColorSet::ColorSet()
        { Color_urllabel, N_("URL label"), "urllabel", "blue", "urllabel" },
        { Color_urltext, N_("URL text"), "urltext", "blue", "urltext" },
        { Color_depthbar, N_("depth bar"), "depthbar", "IndianRed", "depthbar" },
+       { Color_scroll, N_("scroll indicator"), "scroll", "IndianRed", "scroll" },
        { Color_language, N_("language"), "language", "Blue", "language" },
        { Color_command, N_("command inset"), "command", "black", "command" },
        { Color_commandbg, N_("command inset background"), "commandbg", "azure", "commandbg" },