X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLColor.C;h=5923d26ce8b83df3a5ac17933eb653a179b6e771;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=62b55f2e6c625eca837d2076833e3383afeab374;hpb=7c184e5426e83e536645fe76365c11cba22f8ea8;p=lyx.git

diff --git a/src/LColor.C b/src/LColor.C
index 62b55f2e6c..5923d26ce8 100644
--- a/src/LColor.C
+++ b/src/LColor.C
@@ -145,8 +145,8 @@ LColor::LColor()
 	     "LightSteelBlue", "tabularonoffline" },
 	{ bottomarea, N_("bottom area"), "bottomarea", "grey40", "bottomarea" },
 	{ pagebreak, N_("page break"), "pagebreak", "RoyalBlue", "pagebreak" },
-	{ buttonframe, N_("frame of button"), "buttonframe", "#A9ABB5", "buttonframe" },
-	{ buttonbg, N_("button background"), "buttonbg", "linen", "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" },
@@ -174,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 to_utf8(_(it->second.guiname));
-	return "none";
+		return _(it->second.guiname);
+	return from_ascii("none");
 }
 
 
@@ -250,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(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() };