X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLColor.C;h=5923d26ce8b83df3a5ac17933eb653a179b6e771;hb=ba62665f966508db5a4de6864f4aa7374c5a5356;hp=b63f716fbd59a400f8745d6e1dcc2db0dfc6b4be;hpb=43b77ba2d722cdb8a9437926f839c1dcbf3c0b89;p=lyx.git

diff --git a/src/LColor.C b/src/LColor.C
index b63f716fbd..5923d26ce8 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,7 +107,7 @@ 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" },
@@ -142,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 }
@@ -173,12 +174,12 @@ LColor & LColor::operator=(LColor tmp)
 }
 
 
-string const LColor::getGUIName(LColor::color c) const
+docstring const LColor::getGUIName(LColor::color c) const
 {
 	Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c);
 	if (it != pimpl_->infotab.end())
-		return lyx::to_utf8(_(it->second.guiname));
-	return "none";
+		return _(it->second.guiname);
+	return from_ascii("none");
 }
 
 
@@ -249,18 +250,6 @@ bool LColor::setColor(string const & lyxname, string const &x11name)
 }
 
 
-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(lyx::to_utf8(_(it->second.guiname)), guiname))
-			return it->first;
-	}
-	return LColor::inherit;
-}
-
-
 void LColor::addColor(LColor::color c, string const & lyxname) const
 {
 	ColorEntry ce = { c, "", "", "", lyxname.c_str() };
@@ -297,3 +286,6 @@ LColor::color LColor::getFromLaTeXName(string const & latexname) const
 LColor lcolor;
 // An equally evil global system LColor instance
 LColor system_lcolor;
+
+
+} // namespace lyx