X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLColor.C;h=5923d26ce8b83df3a5ac17933eb653a179b6e771;hb=e5a46922e916a06ad1b958d5895cc3cfb4f13d2c;hp=1642e4f6c35cd2f270f45792c7c4069997569467;hpb=68b7ef25fb7d2da230d3eb11d6737701abfc2e64;p=lyx.git diff --git a/src/LColor.C b/src/LColor.C index 1642e4f6c3..5923d26ce8 100644 --- a/src/LColor.C +++ b/src/LColor.C @@ -23,8 +23,11 @@ #include -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; @@ -33,7 +36,7 @@ using std::string; namespace { struct ColorEntry { - int lcolor; + LColor::color lcolor; char const * guiname; char const * latexname; char const * x11name; @@ -42,9 +45,11 @@ struct ColorEntry { } -struct LColor::Pimpl { +class LColor::Pimpl { +public: /// - struct information { + class information { + public: /// the name as it appears in the GUI string guiname; /// the name used in LaTeX @@ -59,22 +64,25 @@ struct LColor::Pimpl { void fill(ColorEntry const & entry) { information in; - in.lyxname = string(entry.lyxname); - in.latexname = string(entry.latexname); - in.x11name = string(entry.x11name); - in.guiname = string(entry.guiname); + in.lyxname = entry.lyxname; + in.latexname = entry.latexname; + in.x11name = entry.x11name; + in.guiname = entry.guiname; infotab[entry.lcolor] = in; - transform[string(entry.lyxname)] = int(entry.lcolor); + lyxcolors[entry.lyxname] = entry.lcolor; + latexcolors[entry.latexname] = entry.lcolor; } /// - typedef std::map InfoTab; + typedef std::map InfoTab; /// the table of color information InfoTab infotab; - typedef std::map Transform; - /// the transform between colour name string and integer code. - Transform transform; + typedef std::map Transform; + /// the transform between LyX color name string and integer code. + Transform lyxcolors; + /// the transform between LaTeX color name string and integer code. + Transform latexcolors; }; @@ -99,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" }, @@ -136,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 } @@ -160,19 +167,19 @@ LColor::~LColor() {} -void LColor::operator=(LColor const & c) +LColor & LColor::operator=(LColor tmp) { - LColor tmp(c); boost::swap(pimpl_, tmp.pimpl_); + return *this; } -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"); } @@ -183,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 " << int(c) << '\n' + " entry in LColor.C for " << c << '\n' << "Using black." << endl; return "black"; } @@ -232,27 +239,14 @@ bool LColor::setColor(LColor::color col, string const & x11name) bool LColor::setColor(string const & lyxname, string const &x11name) { string const lcname = ascii_lowercase(lyxname); - if (pimpl_->transform.find(lcname) == pimpl_->transform.end()) { + if (pimpl_->lyxcolors.find(lcname) == pimpl_->lyxcolors.end()) { lyxerr[Debug::GUI] << "LColor::setColor: Unknown color \"" << lyxname << '"' << endl; addColor(static_cast(pimpl_->infotab.size()), lcname); } - return setColor(static_cast(pimpl_->transform[lcname]), - 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(_(it->second.guiname), guiname)) - return static_cast(it->first); - } - return LColor::inherit; + return setColor(pimpl_->lyxcolors[lcname], x11name); } @@ -266,13 +260,25 @@ void LColor::addColor(LColor::color c, string const & lyxname) const LColor::color LColor::getFromLyXName(string const & lyxname) const { string const lcname = ascii_lowercase(lyxname); - if (pimpl_->transform.find(lcname) == pimpl_->transform.end()) { + if (pimpl_->lyxcolors.find(lcname) == pimpl_->lyxcolors.end()) { lyxerr << "LColor::getFromLyXName: Unknown color \"" << lyxname << '"' << endl; return none; } - return static_cast(pimpl_->transform[lcname]); + return pimpl_->lyxcolors[lcname]; +} + + +LColor::color LColor::getFromLaTeXName(string const & latexname) const +{ + if (pimpl_->latexcolors.find(latexname) == pimpl_->latexcolors.end()) { + lyxerr << "LColor::getFromLaTeXName: Unknown color \"" + << latexname << '"' << endl; + return none; + } + + return pimpl_->latexcolors[latexname]; } @@ -280,3 +286,6 @@ LColor::color LColor::getFromLyXName(string const & lyxname) const LColor lcolor; // An equally evil global system LColor instance LColor system_lcolor; + + +} // namespace lyx