move languageData() out of qt_helpers.cpp

[lyx.git] / src / frontends / qt4 / GuiDocument.cpp

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 2ba63bacbf160ca44b800f1c41ccf879b7c29598..815912207c1079f19ecea0fc9a232ebf0906976f 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -510,10 +510,6 @@ GuiDocument::GuiDocument(GuiView & lv)
 {
        setupUi(this);
 
-       QList<LanguagePair> langs = languageData(false);        
-       for (int i = 0; i != langs.size(); ++i)
-               lang_.append(langs[i].second);
-
        connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
        connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
        connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
@@ -790,10 +786,12 @@ GuiDocument::GuiDocument(GuiView & lv)
                this, SLOT(change_adaptor()));
        // language & quotes
 
-       QList<LanguagePair>::const_iterator lit  = langs.begin();
-       QList<LanguagePair>::const_iterator lend = langs.end();
-       for (; lit != lend; ++lit)
-               langModule->languageCO->addItem(lit->first);
+       Languages::const_iterator lit = languages.begin();
+       Languages::const_iterator lend = languages.end();
+       for (; lit != lend; ++lit) {
+               lang_.append(toqstr(lit->second.lang()));
+               langModule->languageCO->addItem(qt_(lit->second.display()));
+       }
 
        // Always put the default encoding in the first position.
        // It is special because the displayed text is translated.
@@ -2167,6 +2165,8 @@ char const * GuiDocument::fontfamilies_gui[5] = {
 bool GuiDocument::initialiseParams(string const &)
 {
        bp_ = buffer().params();
+       // Force update on next updateContent() round.
+       current_id_ = 0;
        loadModuleInfo();
        return true;
 }