Store and use QImage rather than QPixmap.

[lyx.git] / src / LColor.C

diff --git a/src/LColor.C b/src/LColor.C
index 1db6b189dbf8d61766c87a58d2eda2abfb88652c..1642e4f6c35cd2f270f45792c7c4069997569467 100644 (file)
--- a/src/LColor.C
+++ b/src/LColor.C
@@ -223,12 +223,27 @@ bool LColor::setColor(LColor::color col, string const & x11name)
                       << " may not be redefined" << endl;
                return false;
        }
-       
+
        it->second.x11name = x11name;
        return true;
 }
 
 
+bool LColor::setColor(string const & lyxname, string const &x11name)
+{
+       string const lcname = ascii_lowercase(lyxname);
+       if (pimpl_->transform.find(lcname) == pimpl_->transform.end()) {
+               lyxerr[Debug::GUI]
+                       << "LColor::setColor: Unknown color \""
+                      << lyxname << '"' << endl;
+               addColor(static_cast<color>(pimpl_->infotab.size()), lcname);
+       }
+
+       return setColor(static_cast<LColor::color>(pimpl_->transform[lcname]),
+                       x11name);
+}
+
+
 LColor::color LColor::getFromGUIName(string const & guiname) const
 {
        Pimpl::InfoTab::const_iterator it = pimpl_->infotab.begin();
@@ -252,9 +267,9 @@ LColor::color LColor::getFromLyXName(string const & lyxname) const
 {
        string const lcname = ascii_lowercase(lyxname);
        if (pimpl_->transform.find(lcname) == pimpl_->transform.end()) {
-               lyxerr << "LColor::getFromLyXName: Unknown color \"" 
+               lyxerr << "LColor::getFromLyXName: Unknown color \""
                       << lyxname << '"' << endl;
-               addColor(static_cast<color>(pimpl_->infotab.size()), lcname);
+               return none;
        }
 
        return static_cast<LColor::color>(pimpl_->transform[lcname]);