"LightSteelBlue", "tabularonoffline" },
{ bottomarea, N_("bottom area"), "bottomarea", "grey40", "bottomarea" },
{ pagebreak, N_("page break"), "pagebreak", "RoyalBlue", "pagebreak" },
- { buttonframe, N_("frame of button"), "buttonframe", "#A9ABB5", "buttonframe" },
+ { 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" },
}
-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");
}
}
-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() };