more cursor dispatch

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 080d7315089a5ebaa5451e9ad47b378dfdc3d56f..24c940267bd087b83c3a487923269c46bcb43466 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -7,7 +7,7 @@
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  * \author John Levon
- * \author André Pöntiz
+ * \author André Pönitz
  * \author Allan Rae
  * \author Dekel Tsur
  *
@@ -25,29 +25,32 @@
 #include "converter.h"
 #include "format.h"
 #include "gettext.h"
+#include "LColor.h"
 #include "lyxlex.h"
 #include "lyxfont.h"
 
-#include "support/tostr.h"
+#include "graphics/GraphicsTypes.h"
+
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "support/userinfo.h"
 #include "support/translator.h"
+#include "support/tostr.h"
+#include "support/userinfo.h"
 
-using namespace lyx::support;
+using lyx::support::ascii_lowercase;
+using lyx::support::ExpandPath;
+using lyx::support::GetEnv;
+using lyx::support::LibFileSearch;
+using lyx::support::token;
 
-using std::ostream;
-using std::ofstream;
 using std::cout;
-using std::ios;
 using std::endl;
 
-namespace lyx {
-namespace graphics {
-/// The translator between the DisplayType and the corresponding lyx string.
-extern Translator<DisplayType, string> displayTranslator;
-}
-}
+using std::ios;
+using std::ofstream;
+using std::ostream;
+using std::string;
+
 
 namespace {
 
@@ -349,7 +352,7 @@ int LyXRC::read(string const & filename)
 
                case RC_DISPLAY_GRAPHICS:
                        if (lexrc.next()) {
-                               display_graphics = lyx::graphics::displayTranslator.find(lexrc.getString());
+                               display_graphics = lyx::graphics::displayTranslator().find(lexrc.getString());
                        }
                        break;
 
@@ -760,7 +763,8 @@ int LyXRC::read(string const & filename)
                                break;
                        }
 
-                       if (!lcolor.setColor(lyx_name, x11_name)) {
+                       LColor::color col = lcolor.getFromLyXName(lyx_name);
+                       if (!lcolor.setColor(col, x11_name)) {
                                lyxerr << "Bad lyxrc set_color for "
                                        << lyx_name << endl;
 
@@ -1126,7 +1130,7 @@ void LyXRC::output(ostream & os) const
                        os << "# Display graphics within LyX\n"
                           << "# monochrome|grayscale|color|none\n"
                           << "\\display_graphics "
-                          << lyx::graphics::displayTranslator.find(display_graphics)
+                          << lyx::graphics::displayTranslator().find(display_graphics)
                           << '\n';
                }