X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLColor.C;h=2f2a9ff06f57b6ed41e0947f28d83f4be9198a11;hb=2c832e6578ae146a2b51967cbc78cd640959f196;hp=33cf10686d3aaa1f3197ee6763e9f18f52e5f7b6;hpb=02ab1bf675bec2f1f2f101da1a22bbb2aeee01ca;p=lyx.git

diff --git a/src/LColor.C b/src/LColor.C
index 33cf10686d..2f2a9ff06f 100644
--- a/src/LColor.C
+++ b/src/LColor.C
@@ -23,8 +23,11 @@
 
 #include <map>
 
-using lyx::support::compare_ascii_no_case;
-using lyx::support::ascii_lowercase;
+
+namespace lyx {
+
+using support::compare_ascii_no_case;
+using support::ascii_lowercase;
 
 using std::endl;
 using std::string;
@@ -104,12 +107,13 @@ LColor::LColor()
 	{ selection, N_("selection"), "selection", "LightBlue", "selection" },
 	{ latex, N_("LaTeX text"), "latex", "DarkRed", "latex" },
 	{ preview, N_("previewed snippet"), "preview", "black", "preview" },
-	{ note, N_("note"), "note", "yellow", "note" },
+	{ note, N_("note"), "note", "blue", "note" },
 	{ notebg, N_("note background"), "notebg", "yellow", "notebg" },
 	{ comment, N_("comment"), "comment", "magenta", "comment" },
 	{ commentbg, N_("comment background"), "commentbg", "linen", "commentbg" },
 	{ greyedout, N_("greyedout inset"), "greyedout", "red", "greyedout" },
 	{ greyedoutbg, N_("greyedout inset background"), "greyedoutbg", "linen", "greyedoutbg" },
+	{ shadedbg, N_("shaded box"), "shaded", "#ff0000", "shaded" },
 	{ depthbar, N_("depth bar"), "depthbar", "IndianRed", "depthbar" },
 	{ language, N_("language"), "language", "Blue", "language" },
 	{ command, N_("command inset"), "command", "black", "command" },
@@ -141,11 +145,9 @@ LColor::LColor()
 	     "LightSteelBlue", "tabularonoffline" },
 	{ bottomarea, N_("bottom area"), "bottomarea", "grey40", "bottomarea" },
 	{ pagebreak, N_("page break"), "pagebreak", "RoyalBlue", "pagebreak" },
-	{ top, N_("top of button"), "top", "grey90", "top" },
-	{ bottom, N_("bottom of button"), "bottom", "grey60", "bottom" },
-	{ left, N_("left of button"), "left", "grey90", "left" },
-	{ right, N_("right of button"), "right", "grey60", "right" },
-	{ buttonbg, N_("button background"), "buttonbg", "grey80", "buttonbg" },
+	{ buttonframe, N_("frame of button"), "buttonframe", "#dcd2c8", "buttonframe" },
+	{ buttonbg, N_("button background"), "buttonbg", "#dcd2c8", "buttonbg" },
+	{ buttonhoverbg, N_("button background under focus"), "buttonhoverbg", "#C7C7CA", "buttonhoverbg" },
 	{ inherit, N_("inherit"), "inherit", "black", "inherit" },
 	{ ignore, N_("ignore"), "ignore", "black", "ignore" },
 	{ ignore, 0, 0, 0, 0 }
@@ -176,7 +178,7 @@ string const LColor::getGUIName(LColor::color c) const
 {
 	Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c);
 	if (it != pimpl_->infotab.end())
-		return _(it->second.guiname);
+		return to_utf8(_(it->second.guiname));
 	return "none";
 }
 
@@ -188,7 +190,7 @@ string const LColor::getX11Name(LColor::color c) const
 		return it->second.x11name;
 
 	lyxerr << "LyX internal error: Missing color"
-	          " entry in LColor.C for " << c << '\n'
+		  " entry in LColor.C for " << c << '\n'
 	       << "Using black." << endl;
 	return "black";
 }
@@ -253,7 +255,7 @@ LColor::color LColor::getFromGUIName(string const & guiname) const
 	Pimpl::InfoTab::const_iterator it = pimpl_->infotab.begin();
 	Pimpl::InfoTab::const_iterator end = pimpl_->infotab.end();
 	for (; it != end; ++it) {
-		if (!compare_ascii_no_case(_(it->second.guiname), guiname))
+		if (!compare_ascii_no_case(to_utf8(_(it->second.guiname)), guiname))
 			return it->first;
 	}
 	return LColor::inherit;
@@ -296,3 +298,6 @@ LColor::color LColor::getFromLaTeXName(string const & latexname) const
 LColor lcolor;
 // An equally evil global system LColor instance
 LColor system_lcolor;
+
+
+} // namespace lyx