X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLColor.C;h=5923d26ce8b83df3a5ac17933eb653a179b6e771;hb=3f8fa07c6ed38218d6a4048f2993a512aa942c96;hp=0ea92a1e12052691ead27d79b74317a9ca6ea450;hpb=1c155241d88fa2106565711ef94396be42b912a9;p=lyx.git diff --git a/src/LColor.C b/src/LColor.C index 0ea92a1e12..5923d26ce8 100644 --- a/src/LColor.C +++ b/src/LColor.C @@ -1,25 +1,36 @@ -/* This file is part of - * ====================================================== +/** + * \file LColor.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * LyX, The Document Processor + * \author Asger Alstrup + * \author Lars Gullik Bjønnes + * \author Matthias Ettrich + * \author Jean-Marc Lasgouttes + * \author John Levon + * \author André Pönitz + * \author Martin Vermeer * - * Copyright 1998-2001 The LyX Team - * - *======================================================*/ + * Full author contact details are available in file CREDITS. + */ #include #include "debug.h" -#include "LColor.h" -#include "support/LAssert.h" #include "gettext.h" +#include "LColor.h" #include "support/lstrings.h" #include -using namespace lyx::support; + +namespace lyx { + +using support::compare_ascii_no_case; +using support::ascii_lowercase; using std::endl; +using std::string; namespace { @@ -34,10 +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 @@ -51,17 +63,27 @@ struct LColor::Pimpl { /// initialise a color entry void fill(ColorEntry const & entry) { - information & in = infotab[entry.lcolor]; - in.guiname = entry.guiname; + information in; + in.lyxname = entry.lyxname; in.latexname = entry.latexname; in.x11name = entry.x11name; - in.lyxname = entry.lyxname; + in.guiname = entry.guiname; + infotab[entry.lcolor] = in; + lyxcolors[entry.lyxname] = entry.lcolor; + latexcolors[entry.latexname] = entry.lcolor; } /// typedef std::map InfoTab; /// the table of color information InfoTab infotab; + + 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; + }; @@ -85,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" }, @@ -122,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 } @@ -143,108 +164,121 @@ LColor::LColor(LColor const & c) LColor::~LColor() -{ - delete pimpl_; -} +{} -void LColor::operator=(LColor const & c) +LColor & LColor::operator=(LColor tmp) { - LColor tmp(c); - std::swap(pimpl_, tmp.pimpl_); + 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 ici = pimpl_->infotab.find(c); - if (ici != pimpl_->infotab.end()) - return _(ici->second.guiname); - return "none"; + Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c); + if (it != pimpl_->infotab.end()) + return _(it->second.guiname); + return from_ascii("none"); } string const LColor::getX11Name(LColor::color c) const { - Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.find(c); - if (ici != pimpl_->infotab.end()) - return ici->second.x11name; + Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c); + if (it != pimpl_->infotab.end()) + return it->second.x11name; lyxerr << "LyX internal error: Missing color" - " entry in LColor.C for " << int(c) << '\n'; - lyxerr << "Using black.\n"; + " entry in LColor.C for " << c << '\n' + << "Using black." << endl; return "black"; } string const LColor::getLaTeXName(LColor::color c) const { - Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.find(c); - if (ici != pimpl_->infotab.end()) - return ici->second.latexname; + Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c); + if (it != pimpl_->infotab.end()) + return it->second.latexname; return "black"; } string const LColor::getLyXName(LColor::color c) const { - Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.find(c); - if (ici != pimpl_->infotab.end()) - return ici->second.lyxname; + Pimpl::InfoTab::const_iterator it = pimpl_->infotab.find(c); + if (it != pimpl_->infotab.end()) + return it->second.lyxname; return "black"; } -void LColor::setColor(LColor::color col, string const & x11name) +bool LColor::setColor(LColor::color col, string const & x11name) { - Pimpl::InfoTab::iterator iti = pimpl_->infotab.find(col); - if (iti != pimpl_->infotab.end()) { - iti->second.x11name = x11name; - return; + Pimpl::InfoTab::iterator it = pimpl_->infotab.find(col); + if (it == pimpl_->infotab.end()) { + lyxerr << "Color " << col << " not found in database." + << std::endl; + return false; } - lyxerr << "LyX internal error: color and such.\n"; - Assert(false); -} - - -bool LColor::setColor(string const & lyxname, string const & x11name) -{ - color col = getFromLyXName(lyxname); // "inherit" is returned for colors not in the database // (and anyway should not be redefined) - if (col == inherit || col == ignore) { - lyxerr << "Color " << lyxname << " is undefined or may not be" - " redefined" << endl; + if (col == none || col == inherit || col == ignore) { + lyxerr << "Color " << getLyXName(col) + << " may not be redefined" << endl; return false; } - setColor (col, x11name); + + it->second.x11name = x11name; return true; } -LColor::color LColor::getFromGUIName(string const & guiname) const +bool LColor::setColor(string const & lyxname, string const &x11name) { - Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.begin(); - Pimpl::InfoTab::const_iterator end = pimpl_->infotab.end(); - for (; ici != end; ++ici) { - if (!compare_ascii_no_case(_(ici->second.guiname), guiname)) - return ici->first; + string const lcname = ascii_lowercase(lyxname); + 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 LColor::inherit; + + return setColor(pimpl_->lyxcolors[lcname], x11name); +} + + +void LColor::addColor(LColor::color c, string const & lyxname) const +{ + ColorEntry ce = { c, "", "", "", lyxname.c_str() }; + pimpl_->fill(ce); } LColor::color LColor::getFromLyXName(string const & lyxname) const { - Pimpl::InfoTab::const_iterator ici = pimpl_->infotab.begin(); - Pimpl::InfoTab::const_iterator end = pimpl_->infotab.end(); - for (; ici != end; ++ici) { - if (!compare_ascii_no_case(ici->second.lyxname, lyxname)) - return ici->first; + string const lcname = ascii_lowercase(lyxname); + if (pimpl_->lyxcolors.find(lcname) == pimpl_->lyxcolors.end()) { + lyxerr << "LColor::getFromLyXName: Unknown color \"" + << lyxname << '"' << endl; + return none; } - return LColor::inherit; + + 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]; } @@ -252,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