]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiDocument.cpp
Embed: allow the use of embedded layout and class (.cls, .sty) files.
[lyx.git] / src / frontends / qt4 / GuiDocument.cpp
index 7ad3bd4f8332d585c9ec7f84a87ae9fdf5237f17..045d0b9cd1ef16809c298f3cf09b5e49b9caabd3 100644 (file)
 
 #include "GuiDocument.h"
 
+#include "LayoutFile.h"
 #include "BranchList.h"
 #include "buffer_funcs.h"
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Color.h"
-#include "EmbeddedFiles.h"
 #include "Encoding.h"
 #include "FloatPlacement.h"
 #include "FuncRequest.h"
 #include "PDFOptions.h"
 #include "qt_helpers.h"
 #include "Spacing.h"
-#include "TextClassList.h"
 #include "Validator.h"
 
 #include "insets/InsetListingsParams.h"
 
+#include "support/debug.h"
 #include "support/FileName.h"
+#include "support/FileFilterList.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
 
 #include "frontends/alert.h"
 
-#include <boost/bind.hpp>
-
 #include <QCloseEvent>
 #include <QScrollBar>
 #include <QTextCursor>
 
-#include <algorithm>
 #include <sstream>
 
 using namespace std;
 using namespace lyx::support;
 
 
-///
-template<class Pair>
-vector<typename Pair::second_type> const
-getSecond(vector<Pair> const & pr)
-{
-        vector<typename Pair::second_type> tmp(pr.size());
-        transform(pr.begin(), pr.end(), tmp.begin(),
-                                        boost::bind(&Pair::second, _1));
-        return tmp;
-}
-
+namespace {
 
 char const * const tex_graphics[] =
 {
@@ -135,7 +123,31 @@ char const * tex_fonts_monospaced_gui[] =
 vector<pair<string, lyx::docstring> > pagestyles;
 
 
+} // anonymous namespace
+
 namespace lyx {
+
+namespace {
+// used when sorting the textclass list.
+class less_textclass_avail_desc
+       : public binary_function<string, string, int>
+{
+public:
+       int operator()(string const & lhs, string const & rhs) const
+       {
+               // Ordering criteria:
+               //   1. Availability of text class
+               //   2. Description (lexicographic)
+               LayoutFile const & tc1 = LayoutFileList::get()[lhs];
+               LayoutFile const & tc2 = LayoutFileList::get()[rhs];
+               return (tc1.isTeXClassAvailable() && !tc2.isTeXClassAvailable()) ||
+                       (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() &&
+                        _(tc1.description()) < _(tc2.description()));
+       }
+};
+
+}
+
 namespace frontend {
 
 
@@ -489,13 +501,14 @@ void PreambleModule::closeEvent(QCloseEvent * e)
 /////////////////////////////////////////////////////////////////////
 
 
-
 GuiDocument::GuiDocument(GuiView & lv)
        : GuiDialog(lv, "document", qt_("Document Settings")), current_id_(0)
 {
        setupUi(this);
-       
-       lang_ = getSecond(getLanguageData(false));
+
+       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()));
@@ -772,12 +785,11 @@ GuiDocument::GuiDocument(GuiView & lv)
        connect(langModule->quoteStyleCO, SIGNAL(activated(int)),
                this, SLOT(change_adaptor()));
        // language & quotes
-       vector<LanguagePair> const langs = getLanguageData(false);
-       vector<LanguagePair>::const_iterator lit  = langs.begin();
-       vector<LanguagePair>::const_iterator lend = langs.end();
-       for (; lit != lend; ++lit) {
-               langModule->languageCO->addItem(toqstr(lit->first));
-       }
+
+       QList<LanguagePair>::const_iterator lit  = langs.begin();
+       QList<LanguagePair>::const_iterator lend = langs.end();
+       for (; lit != lend; ++lit)
+               langModule->languageCO->addItem(lit->first);
 
        // Always put the default encoding in the first position.
        // It is special because the displayed text is translated.
@@ -795,7 +807,6 @@ GuiDocument::GuiDocument(GuiView & lv)
        langModule->quoteStyleCO->addItem(qt_(">>text<<"));
 
 
-
        numberingModule = new UiWidget<Ui::NumberingUi>;
        // numbering
        connect(numberingModule->depthSL, SIGNAL(valueChanged(int)),
@@ -859,6 +870,8 @@ GuiDocument::GuiDocument(GuiView & lv)
                this, SLOT(classChanged()));
        connect(latexModule->classCO, SIGNAL(activated(int)),
                this, SLOT(change_adaptor()));
+       connect(latexModule->layoutPB, SIGNAL(clicked()),
+               this, SLOT(browseLayout()));
        
        selectionManager = 
                new ModuleSelMan(latexModule->availableLV, latexModule->selectedLV, 
@@ -876,18 +889,19 @@ GuiDocument::GuiDocument(GuiView & lv)
                latexModule->psdriverCO->addItem(enc);
        }
        // latex classes
-       //FIXME This seems too involved with the kernel. Some of this
-       //should be moved to the kernel---which should perhaps just
-       //give us a list of entries or something of the sort.
-       for (TextClassList::const_iterator cit = textclasslist.begin();
-            cit != textclasslist.end(); ++cit) {
-               if (cit->isTeXClassAvailable()) {
-                       latexModule->classCO->addItem(toqstr(cit->description()));
-               } else {
-                       docstring item =
-                               bformat(_("Unavailable: %1$s"), from_utf8(cit->description()));
-                       latexModule->classCO->addItem(toqstr(item));
-               }
+       latexModule->classCO->setModel(&classes_model_);
+       LayoutFileList const & bcl = LayoutFileList::get();
+       vector<LayoutFileIndex> classList = bcl.classList();
+       sort(classList.begin(), classList.end(), less_textclass_avail_desc());
+
+       vector<LayoutFileIndex>::const_iterator cit  = classList.begin();
+       vector<LayoutFileIndex>::const_iterator cen = classList.end();
+       for (int i = 0; cit != cen; ++cit, ++i) {
+               LayoutFile const & tc = bcl[*cit];
+               docstring item = (tc.isTeXClassAvailable()) ?
+                       from_utf8(tc.description()) :
+                       bformat(_("Unavailable: %1$s"), from_utf8(tc.description()));
+               classes_model_.insertRow(i, toqstr(item), *cit);
        }
 
        // branches
@@ -907,12 +921,10 @@ GuiDocument::GuiDocument(GuiView & lv)
 
        // embedded files
        embeddedFilesModule = new UiWidget<Ui::EmbeddedFilesUi>;
-       connect(embeddedFilesModule->bundleCB, SIGNAL(toggled(bool)),
-               this, SLOT(change_adaptor()));
        connect(embeddedFilesModule->addPB, SIGNAL(clicked()),
-               this, SLOT(change_adaptor()));
+               this, SLOT(addExtraEmbeddedFile()));
        connect(embeddedFilesModule->removePB, SIGNAL(clicked()),
-               this, SLOT(change_adaptor()));
+               this, SLOT(removeExtraEmbeddedFile()));
 
        // PDF support
        pdfSupportModule = new UiWidget<Ui::PDFSupportUi>;
@@ -957,22 +969,22 @@ GuiDocument::GuiDocument(GuiView & lv)
        connect(floatModule, SIGNAL(changed()),
                this, SLOT(change_adaptor()));
 
-       docPS->addPanel(latexModule, _("Document Class"));
-       docPS->addPanel(fontModule, _("Fonts"));
-       docPS->addPanel(textLayoutModule, _("Text Layout"));
-       docPS->addPanel(pageLayoutModule, _("Page Layout"));
-       docPS->addPanel(marginsModule, _("Page Margins"));
-       docPS->addPanel(langModule, _("Language"));
-       docPS->addPanel(numberingModule, _("Numbering & TOC"));
-       docPS->addPanel(biblioModule, _("Bibliography"));
-       docPS->addPanel(pdfSupportModule, _("PDF Properties"));
-       docPS->addPanel(mathsModule, _("Math Options"));
-       docPS->addPanel(floatModule, _("Float Placement"));
-       docPS->addPanel(bulletsModule, _("Bullets"));
-       docPS->addPanel(branchesModule, _("Branches"));
-       docPS->addPanel(embeddedFilesModule, _("Embedded Files"));
-       docPS->addPanel(preambleModule, _("LaTeX Preamble"));
-       docPS->setCurrentPanel(_("Document Class"));
+       docPS->addPanel(latexModule, qt_("Document Class"));
+       docPS->addPanel(fontModule, qt_("Fonts"));
+       docPS->addPanel(textLayoutModule, qt_("Text Layout"));
+       docPS->addPanel(pageLayoutModule, qt_("Page Layout"));
+       docPS->addPanel(marginsModule, qt_("Page Margins"));
+       docPS->addPanel(langModule, qt_("Language"));
+       docPS->addPanel(numberingModule, qt_("Numbering & TOC"));
+       docPS->addPanel(biblioModule, qt_("Bibliography"));
+       docPS->addPanel(pdfSupportModule, qt_("PDF Properties"));
+       docPS->addPanel(mathsModule, qt_("Math Options"));
+       docPS->addPanel(floatModule, qt_("Float Placement"));
+       docPS->addPanel(bulletsModule, qt_("Bullets"));
+       docPS->addPanel(branchesModule, qt_("Branches"));
+       docPS->addPanel(embeddedFilesModule, qt_("Embedded Files"));
+       docPS->addPanel(preambleModule, qt_("LaTeX Preamble"));
+       docPS->setCurrentPanel(qt_("Document Class"));
 // FIXME: hack to work around resizing bug in Qt >= 4.2
 // bug verified with Qt 4.2.{0-3} (JSpitzm)
 #if QT_VERSION >= 0x040200
@@ -983,7 +995,7 @@ GuiDocument::GuiDocument(GuiView & lv)
 
 void GuiDocument::showPreamble()
 {
-       docPS->setCurrentPanel(_("LaTeX Preamble"));
+       docPS->setCurrentPanel(qt_("LaTeX Preamble"));
 }
 
 
@@ -1210,14 +1222,88 @@ void GuiDocument::updatePagestyle(string const & items, string const & sel)
 }
 
 
+void GuiDocument::browseLayout()
+{
+       QString const label1 = qt_("Layouts|#o#O");
+       QString const dir1 = toqstr(lyxrc.document_path);
+       FileFilterList const filter(_("LyX Layout (*.layout)"));
+       QString file = browseRelFile(QString(), bufferFilepath(),
+               qt_("Local layout file"), filter, false,
+               label1, dir1);
+
+       if (!suffixIs(fromqstr(file), ".layout"))
+               return;
+
+       FileName layoutFile = makeAbsPath(fromqstr(file),
+               fromqstr(bufferFilepath()));
+       
+       // load the layout file
+       LayoutFileList & bcl = LayoutFileList::get();
+       string classname = layoutFile.onlyFileName();
+       LayoutFileIndex name = bcl.addLayoutFile(
+               classname.substr(0, classname.size() - 7),
+               layoutFile.onlyPath().absFilename(),
+               LayoutFileList::Local);
+
+       if (name.empty()) {
+               Alert::error(_("Error"),
+                       _("Unable to read local layout file."));                
+               return;
+       }
+
+       // do not trigger classChanged if there is no change.
+       if (latexModule->classCO->currentText() == toqstr(name))
+               return;
+               
+       // add to combo box
+       int idx = latexModule->classCO->findText(toqstr(name));
+       if (idx == -1) {
+               classes_model_.insertRow(0, toqstr(name), name);
+               latexModule->classCO->setCurrentIndex(0);
+       } else
+               latexModule->classCO->setCurrentIndex(idx);
+       classChanged();
+}
+
+
 void GuiDocument::classChanged()
 {
-       TextClassIndex const tc = latexModule->classCO->currentIndex();
-       bp_.setBaseClass(tc);
+       int idx = latexModule->classCO->currentIndex();
+       if (idx < 0) 
+               return;
+       string const classname = classes_model_.getIDString(idx);
+       // check if this is a local layout file
+       if (prefixIs(classname, LayoutFileList::localPrefix)) {
+               int const ret = Alert::prompt(_("Local layout file"),
+                               _("The layout file you have selected is a local layout\n"
+                                 "file, not one in the system or user directory. Your\n"
+                                 "document may not work with this layout if you do not\n"
+                                 "keep the layout file in the same directory."),
+                                 1, 1, _("&Set Layout"), _("&Cancel"));
+               if (ret == 1) {
+                       // try to reset the layout combo
+                       setLayoutComboByIDString(bp_.baseClassID());
+                       return;
+               }
+       } else if (prefixIs(classname, LayoutFileList::embeddedPrefix)) {
+               int const ret = Alert::prompt(_("Embedded layout"),
+                               _("The layout file you have selected is an embedded layout that\n"
+                                 "is embedded to a buffer. You cannot make use of it unless\n"
+                                 "it is already embedded to this buffer.\n"),
+                                 1, 1, _("&Set Layout"), _("&Cancel"));
+               if (ret == 1) {
+                       setLayoutComboByIDString(bp_.baseClassID());
+                       return;
+               }
+       }
+       if (!bp_.setBaseClass(classname)) {
+               Alert::error(_("Error"), _("Unable to set document class."));
+               return;
+       }
        if (lyxrc.auto_reset_options) {
                if (applyPB->isEnabled()) {
                        int const ret = Alert::prompt(_("Unapplied changes"),
-                                       _("Some changes in the dialog were not yet applied."
+                                       _("Some changes in the dialog were not yet applied.\n"
                                        "If you do not apply now, they will be lost after this action."),
                                        1, 1, _("&Apply"), _("&Dismiss"));
                        if (ret == 0)
@@ -1287,7 +1373,7 @@ void GuiDocument::updateModuleInfo()
        }
        QModelIndex const & idx = lv->selectionModel()->currentIndex();
        GuiIdListModel const & idModel = 
-                       focusOnSelected  ? selected_model_ : available_model_;
+                       focusOnSelected  ? modules_sel_model_ : modules_av_model_;
        string const modName = idModel.getIDString(idx.row());
        docstring desc = getModuleDescription(modName);
 
@@ -1327,34 +1413,44 @@ void GuiDocument::updateModuleInfo()
 }
 
 
-void GuiDocument::updateEmbeddedFileList()
+void GuiDocument::setExtraEmbeddedFileList()
 {
-       embeddedFilesModule->filesLW->clear();
+       embeddedFilesModule->extraLW->clear();
        // add current embedded files
-       EmbeddedFileList & files = buffer().embeddedFiles();
-       files.update(buffer());
-       EmbeddedFileList::iterator fit = files.begin();
-       EmbeddedFileList::iterator fit_end = files.end();
-       for (; fit != fit_end; ++fit) {
-               QString label = toqstr(fit->relFilename(buffer().filePath()));
-               if (fit->refCount() > 1)
-                       label += " (" + QString::number(fit->refCount()) + ")";
-               QListWidgetItem * item = new QListWidgetItem(label);
-               item->setFlags(item->flags() | Qt::ItemIsSelectable
-                       | Qt::ItemIsUserCheckable);
-               if(fit->embedded())
-                       item->setCheckState(Qt::Checked);
-               else
-                       item->setCheckState(Qt::Unchecked);
-               // index of the currently used ParConstIterator
-               embeddedFilesModule->filesLW->addItem(item);
-       }
+       vector<string> const & files = buffer().params().extraEmbeddedFiles();
+       vector<string>::const_iterator fit = files.begin();
+       vector<string>::const_iterator fit_end = files.end();
+       for (; fit != fit_end; ++fit)
+               embeddedFilesModule->extraLW->addItem(toqstr(*fit));
+}
+
+
+void GuiDocument::addExtraEmbeddedFile()
+{
+       QString const label1 = qt_("Documents|#o#O");
+       QString const dir1 = toqstr(lyxrc.document_path);
+       FileFilterList const filter(_("LyX Layout (*.layout);;LaTeX Classes (*.{cls,sty});;BibTeX Databases (*.{bib,bst})"));
+       QString file = browseRelFile(QString(), bufferFilepath(),
+               qt_("Extra embedded file"), filter, true, label1, dir1);
+
+       if (file.isEmpty())
+               return;
+
+       if (embeddedFilesModule->extraLW->findItems(file, Qt::MatchExactly).empty())
+               embeddedFilesModule->extraLW->addItem(file);
+}
+
+
+void GuiDocument::removeExtraEmbeddedFile()
+{
+       int index = embeddedFilesModule->extraLW->currentRow();
+       delete embeddedFilesModule->extraLW->takeItem(index);
 }
 
 
 void GuiDocument::updateNumbering()
 {
-       TextClass const & tclass = bp_.textClass();
+       DocumentClass const & tclass = bp_.documentClass();
 
        numberingModule->tocTW->setUpdatesEnabled(false);
        numberingModule->tocTW->clear();
@@ -1364,12 +1460,14 @@ void GuiDocument::updateNumbering()
        QString const no = qt_("No");
        QString const yes = qt_("Yes");
        QTreeWidgetItem * item = 0;
-       for (size_t i = 0; i != tclass.layoutCount(); ++i) {
-               Layout const & lt = *tclass.layout(i);
-               int const toclevel = lt.toclevel;
-               if (toclevel != Layout::NOT_IN_TOC && lt.labeltype == LABEL_COUNTER) {
+
+       DocumentClass::const_iterator lit = tclass.begin();
+       DocumentClass::const_iterator len = tclass.end();
+       for (; lit != len; ++lit) {
+               int const toclevel = lit->toclevel;
+               if (toclevel != Layout::NOT_IN_TOC && lit->labeltype == LABEL_COUNTER) {
                        item = new QTreeWidgetItem(numberingModule->tocTW);
-                       item->setText(0, toqstr(translateIfPossible(lt.name())));
+                       item->setText(0, toqstr(translateIfPossible(lit->name())));
                        item->setText(1, (toclevel <= depth) ? yes : no);
                        item->setText(2, (toclevel <= toc) ? yes : no);
                }
@@ -1438,10 +1536,10 @@ void GuiDocument::apply(BufferParams & params)
        params.quotes_language = lga;
 
        int const pos = langModule->languageCO->currentIndex();
-       params.language = lyx::languages.getLanguage(lang_[pos]);
+       params.language = lyx::languages.getLanguage(fromqstr(lang_[pos]));
 
        // numbering
-       if (params.textClass().hasTocLevels()) {
+       if (params.documentClass().hasTocLevels()) {
                params.tocdepth = numberingModule->tocSL->value();
                params.secnumdepth = numberingModule->depthSL->value();
        }
@@ -1457,14 +1555,18 @@ void GuiDocument::apply(BufferParams & params)
                tex_graphics[latexModule->psdriverCO->currentIndex()];
        
        // text layout
-       params.setBaseClass(latexModule->classCO->currentIndex());
+       int idx = latexModule->classCO->currentIndex();
+       if (idx >= 0) {
+               string const classname = classes_model_.getIDString(idx);
+               params.setBaseClass(classname);
+       }
 
        // Modules
        params.clearLayoutModules();
-       int const srows = selected_model_.rowCount();
+       int const srows = modules_sel_model_.rowCount();
        vector<string> selModList;
        for (int i = 0; i < srows; ++i)
-               params.addLayoutModule(selected_model_.getIDString(i));
+               params.addLayoutModule(modules_sel_model_.getIDString(i));
 
        if (mathsModule->amsautoCB->isChecked()) {
                params.use_amsmath = BufferParams::package_auto;
@@ -1607,11 +1709,10 @@ void GuiDocument::apply(BufferParams & params)
                params.orientation = ORIENTATION_PORTRAIT;
 
        // margins
-       params.use_geometry =
-               (!marginsModule->marginCB->isChecked()
-               || geom_papersize);
+       params.use_geometry = !marginsModule->marginCB->isChecked()
+               || geom_papersize;
 
-       Ui::MarginsUi const * m(marginsModule);
+       Ui::MarginsUi const * m = marginsModule;
 
        params.leftmargin = widgetsToLength(m->innerLE, m->innerUnit);
        params.topmargin = widgetsToLength(m->topLE, m->topUnit);
@@ -1647,24 +1748,25 @@ void GuiDocument::apply(BufferParams & params)
                pdf.pagemode = pdf.pagemode_fullscreen;
        else
                pdf.pagemode.clear();
-       pdf.quoted_options = fromqstr(pdfSupportModule->optionsLE->text());
+       pdf.quoted_options = pdf.quoted_options_check(
+                               fromqstr(pdfSupportModule->optionsLE->text()));
 
        // Embedded files
-       // FIXME
+       vector<string> & files = params.extraEmbeddedFiles();
+       files.clear();
+       for (int i = 0; i < embeddedFilesModule->extraLW->count(); ++i) {
+               QListWidgetItem * item = embeddedFilesModule->extraLW->item(i);
+               files.push_back(fromqstr(item->text()));
+       }
 }
 
 
-/** Return the position of val in the vector if found.
-    If not found, return 0.
- */
-template<class A>
-static size_t findPos(vector<A> const & vec, A const & val)
+static int findPos(QStringList const & vec, QString const & val)
 {
-       typename vector<A>::const_iterator it =
-               find(vec.begin(), vec.end(), val);
-       if (it == vec.end())
-               return 0;
-       return distance(vec.begin(), it);
+       for (int i = 0; i != vec.size(); ++i)
+               if (vec[i] == val)
+                       return i;
+       return 0;
 }
 
 
@@ -1720,8 +1822,7 @@ void GuiDocument::updateParams(BufferParams const & params)
                params.use_bibtopic);
 
        // language & quotes
-       int const pos = int(findPos(lang_,
-                                   params.language->lang()));
+       int const pos = findPos(lang_, toqstr(params.language->lang()));
        langModule->languageCO->setCurrentIndex(pos);
 
        langModule->quoteStyleCO->setCurrentIndex(
@@ -1746,9 +1847,9 @@ void GuiDocument::updateParams(BufferParams const & params)
        langModule->otherencodingRB->setChecked(!default_enc);
 
        // numbering
-       int const min_toclevel = textClass().min_toclevel();
-       int const max_toclevel = textClass().max_toclevel();
-       if (textClass().hasTocLevels()) {
+       int const min_toclevel = documentClass().min_toclevel();
+       int const max_toclevel = documentClass().max_toclevel();
+       if (documentClass().hasTocLevels()) {
                numberingModule->setEnabled(true);
                numberingModule->depthSL->setMinimum(min_toclevel - 1);
                numberingModule->depthSL->setMaximum(max_toclevel);
@@ -1793,9 +1894,10 @@ void GuiDocument::updateParams(BufferParams const & params)
        }
 
        // text layout
-       latexModule->classCO->setCurrentIndex(params.baseClass());
-       
-       updatePagestyle(textClass().opt_pagestyle(),
+       string const & layoutID = params.baseClassID();
+       setLayoutComboByIDString(layoutID);
+
+       updatePagestyle(documentClass().opt_pagestyle(),
                                 params.pagestyle);
 
        textLayoutModule->lspacingCO->setCurrentIndex(nitem);
@@ -1855,7 +1957,7 @@ void GuiDocument::updateParams(BufferParams const & params)
        floatModule->set(params.float_placement);
 
        // Fonts
-       updateFontsize(textClass().opt_fontsize(),
+       updateFontsize(documentClass().opt_fontsize(),
                        params.fontsize);
 
        int n = findToken(tex_fonts_roman, params.fontsRoman);
@@ -1960,9 +2062,8 @@ void GuiDocument::updateParams(BufferParams const & params)
 
        pdfSupportModule->optionsLE->setText(
                toqstr(pdf.quoted_options));
-
-       // embedded files
-       updateEmbeddedFileList();
+       
+       setExtraEmbeddedFileList();
 }
 
 
@@ -1982,25 +2083,25 @@ void GuiDocument::saveDocDefault()
 
 void GuiDocument::updateAvailableModules() 
 {
-       available_model_.clear();
+       modules_av_model_.clear();
        vector<modInfoStruct> const modInfoList = getModuleInfo();
        int const mSize = modInfoList.size();
-       for (int i = 0; i < mSize; ++i) {
+       for (int i = 0; i != mSize; ++i) {
                modInfoStruct const & modInfo = modInfoList[i];
-               available_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
+               modules_av_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
        }
 }
 
 
 void GuiDocument::updateSelectedModules() 
 {
-       //and selected ones, too
-       selected_model_.clear();
+       // and selected ones, too
+       modules_sel_model_.clear();
        vector<modInfoStruct> const selModList = getSelectedModules();
        int const sSize = selModList.size();
-       for (int i = 0; i < sSize; ++i) {
+       for (int i = 0; i != sSize; ++i) {
                modInfoStruct const & modInfo = selModList[i];
-               selected_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
+               modules_sel_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
        }
 }
 
@@ -2034,24 +2135,40 @@ void GuiDocument::useClassDefaults()
 {
        if (applyPB->isEnabled()) {
                int const ret = Alert::prompt(_("Unapplied changes"),
-                               _("Some changes in the dialog were not yet applied."
+                               _("Some changes in the dialog were not yet applied.\n"
                                  "If you do not apply now, they will be lost after this action."),
                                1, 1, _("&Apply"), _("&Dismiss"));
                if (ret == 0)
                        applyView();
        }
 
-       bp_.setBaseClass(latexModule->classCO->currentIndex());
+       int idx = latexModule->classCO->currentIndex();
+       string const classname = classes_model_.getIDString(idx);
+       if (!bp_.setBaseClass(classname)) {
+               Alert::error(_("Error"), _("Unable to set document class."));
+               return;
+       }
        bp_.useClassDefaults();
        forceUpdate();
 }
 
 
+void GuiDocument::setLayoutComboByIDString(std::string const & idString)
+{
+       int idx = classes_model_.findIDString(idString);
+       if (idx < 0)
+               Alert::warning(_("Can't set layout!"), 
+                       bformat(_("Unable to set layout for ID: %1$s"), from_utf8(idString)));
+       else 
+               latexModule->classCO->setCurrentIndex(idx);
+}
+
+
 bool GuiDocument::isValid()
 {
-       return (validate_listings_params().empty() &&
-               (textLayoutModule->skipCO->currentIndex() != 3 ||
-                !textLayoutModule->skipLE->text().isEmpty()));
+       return validate_listings_params().empty()
+               && (textLayoutModule->skipCO->currentIndex() != 3
+                       || !textLayoutModule->skipLE->text().isEmpty());
 }
 
 
@@ -2111,9 +2228,9 @@ vector<GuiDocument::modInfoStruct> const GuiDocument::getSelectedModules()
 }
 
 
-TextClass const & GuiDocument::textClass() const
+DocumentClass const & GuiDocument::documentClass() const
 {
-       return textclasslist[bp_.baseClass()];
+       return bp_.documentClass();
 }