#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;
{ 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" },
"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 }
}
-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 _(it->second.guiname);
- return "none";
+ return from_ascii("none");
}
{
string const lcname = ascii_lowercase(lyxname);
if (pimpl_->lyxcolors.find(lcname) == pimpl_->lyxcolors.end()) {
- lyxerr[Debug::GUI]
+ LYXERR(Debug::GUI)
<< "LColor::setColor: Unknown color \""
<< lyxname << '"' << endl;
addColor(static_cast<color>(pimpl_->infotab.size()), lcname);
}
-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))
- return it->first;
- }
- return LColor::inherit;
-}
-
-
void LColor::addColor(LColor::color c, string const & lyxname) const
{
ColorEntry ce = { c, "", "", "", lyxname.c_str() };
LColor lcolor;
// An equally evil global system LColor instance
LColor system_lcolor;
+
+
+} // namespace lyx