Fix reloading of local layout file (bug #11120)

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

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 0ff70a897cf549a7530c1196a38265d408258a2a..645d12a3794dcae7d354ba13f65fcb1b2a39e731 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -68,11 +68,12 @@
 #include "frontends/alert.h"
 
 #include <QAbstractItemModel>
-#include <QHeaderView>
+#include <QButtonGroup>
 #include <QColor>
 #include <QColorDialog>
 #include <QCloseEvent>
 #include <QFontDatabase>
+#include <QHeaderView>
 #include <QScrollBar>
 #include <QTextBoundaryFinder>
 #include <QTextCursor>
@@ -555,6 +556,8 @@ void PreambleModule::closeEvent(QCloseEvent * e)
 LocalLayout::LocalLayout(QWidget * parent)
        : UiWidget<Ui::LocalLayoutUi>(parent), current_id_(0), validated_(false)
 {
+       locallayoutTE->setFont(guiApp->typewriterSystemFont());
+       locallayoutTE->setWordWrapMode(QTextOption::NoWrap);
        connect(locallayoutTE, SIGNAL(textChanged()), this, SLOT(textChanged()));
        connect(validatePB, SIGNAL(clicked()), this, SLOT(validatePressed()));
        connect(convertPB, SIGNAL(clicked()), this, SLOT(convertPressed()));
@@ -2464,7 +2467,7 @@ void GuiDocument::classChanged()
        // according to the new class. Note, however, that, if you use
        // the scroll wheel when sitting on the combo box, we'll load a
        // lot of TextClass objects very quickly....
-       if (!bp_.setBaseClass(classname)) {
+       if (!bp_.setBaseClass(classname, buffer().layoutPos())) {
                Alert::error(_("Error"), _("Unable to set document class."));
                return;
        }
@@ -2829,6 +2832,10 @@ void GuiDocument::updateModuleInfo()
                desc += bformat(_("Modules excluded: %1$s."), pkgdesc);
        }
 
+       if (!desc.empty())
+               desc += "\n";
+       desc += bformat(_("Filename: %1$s.module."), from_utf8(modName));
+
        if (!isModuleAvailable(modName)) {
                if (!desc.empty())
                        desc += "\n";
@@ -2879,7 +2886,7 @@ void GuiDocument::updateDefaultFormat()
        int const idx = latexModule->classCO->currentIndex();
        if (idx >= 0) {
                string const classname = fromqstr(latexModule->classCO->getData(idx));
-               param_copy.setBaseClass(classname);
+               param_copy.setBaseClass(classname, buffer().layoutPos());
                param_copy.makeDocumentClass(true);
        }
        outputModule->defaultFormatCO->blockSignals(true);
@@ -3037,7 +3044,7 @@ void GuiDocument::applyView()
        int idx = latexModule->classCO->currentIndex();
        if (idx >= 0) {
                string const classname = fromqstr(latexModule->classCO->getData(idx));
-               bp_.setBaseClass(classname);
+               bp_.setBaseClass(classname, buffer().layoutPos());
        }
 
        // Modules
@@ -4231,7 +4238,7 @@ void GuiDocument::useClassDefaults()
 
        int idx = latexModule->classCO->currentIndex();
        string const classname = fromqstr(latexModule->classCO->getData(idx));
-       if (!bp_.setBaseClass(classname)) {
+       if (!bp_.setBaseClass(classname, buffer().layoutPos())) {
                Alert::error(_("Error"), _("Unable to set document class."));
                return;
        }