* src/insets/insetbase.h

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index edbbbcf51112ee788e20991e799e481d6c0f9a21..95b1a857723c7c8e979af4f2e652596d5f9a3e7e 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -150,6 +150,10 @@ struct LyX::Singletons
 {
        Singletons(): iconv(ucs4_codeset, "UTF-8")
        {
+               // Set the default User Interface language as soon as possible.
+               // The language used will be derived from the environment
+               // variables.
+               messages_["GUI"] = Messages();
        }
        /// our function handler
        LyXFunc lyxfunc_;
@@ -172,8 +176,14 @@ struct LyX::Singletons
        /// Files to load at start.
        vector<FileName> files_to_load_;
 
-       ///
+       /// The messages translators.
        map<string, Messages> messages_;
+
+       /// The file converters.
+       Converters converters_;
+
+       // The system converters copy after reading lyxrc.defaults.
+       Converters system_converters_;
 };
 
 ///
@@ -301,6 +311,18 @@ kb_keymap & LyX::topLevelKeymap()
 }
 
 
+Converters & LyX::converters()
+{
+       return pimpl_->converters_;
+}
+
+
+Converters & LyX::systemConverters()
+{
+       return pimpl_->system_converters_;
+}
+
+
 IconvProcessor & LyX::iconvProcessor()
 {
        return pimpl_->iconv;
@@ -800,6 +822,9 @@ bool LyX::init()
        if (!readRcFile("lyxrc.dist"))
                return false;
 
+       // Set the language defined by the distributor.
+       //setGuiLanguage(lyxrc.gui_language);
+
        // Set the PATH correctly.
 #if !defined (USE_POSIX_PACKAGING)
        // Add the directory containing the LyX executable to the path
@@ -831,7 +856,7 @@ bool LyX::init()
 
        system_lyxrc = lyxrc;
        system_formats = formats;
-       system_converters = converters;
+       pimpl_->system_converters_ = pimpl_->converters_;
        system_movers = movers;
        system_lcolor = lcolor;
 
@@ -850,8 +875,8 @@ bool LyX::init()
                return false;
 
        if (use_gui) {
-               // Set the User Interface language.
-               pimpl_->messages_["GUI"] = Messages();
+               // Set the language defined by the user.
+               //setGuiLanguage(lyxrc.gui_language);
 
                // Set up bindings
                pimpl_->toplevel_keymap_.reset(new kb_keymap);
@@ -1435,6 +1460,18 @@ kb_keymap & theTopLevelKeymap()
 }
 
 
+Converters & theConverters()
+{
+       return  LyX::ref().converters();
+}
+
+
+Converters & theSystemConverters()
+{
+       return  LyX::ref().systemConverters();
+}
+
+
 IconvProcessor & utf8ToUcs4()
 {
        return LyX::ref().iconvProcessor();