s/kb_action/FuncCode/g

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

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 944c65bfdea44b3e633ad2229672ea2149274525..327d2d367bd562a18bfc78c5412959a8d0408fee 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1242,7 +1242,8 @@ void GuiDocument::browseLayout()
        string classname = layoutFile.onlyFileName();
        LayoutFileIndex name = bcl.addLayoutFile(
                classname.substr(0, classname.size() - 7),
-               layoutFile.onlyPath().absFilename());
+               layoutFile.onlyPath().absFilename(),
+               LayoutFileList::Local);
 
        if (name.empty()) {
                Alert::error(_("Error"),
@@ -1284,6 +1285,16 @@ void GuiDocument::classChanged()
                        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."));
@@ -1501,25 +1512,25 @@ void GuiDocument::apply(BufferParams & params)
                                fromqstr(langModule->encodingCO->currentText());
        }
 
-       InsetQuotes::quote_language lga = InsetQuotes::EnglishQ;
+       InsetQuotes::QuoteLanguage lga = InsetQuotes::EnglishQuotes;
        switch (langModule->quoteStyleCO->currentIndex()) {
        case 0:
-               lga = InsetQuotes::EnglishQ;
+               lga = InsetQuotes::EnglishQuotes;
                break;
        case 1:
-               lga = InsetQuotes::SwedishQ;
+               lga = InsetQuotes::SwedishQuotes;
                break;
        case 2:
-               lga = InsetQuotes::GermanQ;
+               lga = InsetQuotes::GermanQuotes;
                break;
        case 3:
-               lga = InsetQuotes::PolishQ;
+               lga = InsetQuotes::PolishQuotes;
                break;
        case 4:
-               lga = InsetQuotes::FrenchQ;
+               lga = InsetQuotes::FrenchQuotes;
                break;
        case 5:
-               lga = InsetQuotes::DanishQ;
+               lga = InsetQuotes::DanishQuotes;
                break;
        }
        params.quotes_language = lga;
@@ -1611,9 +1622,9 @@ void GuiDocument::apply(BufferParams & params)
                InsetListingsParams(fromqstr(textLayoutModule->listingsED->toPlainText())).params();
 
        if (textLayoutModule->indentRB->isChecked())
-               params.paragraph_separation = BufferParams::PARSEP_INDENT;
+               params.paragraph_separation = BufferParams::ParagraphIndentSeparation;
        else
-               params.paragraph_separation = BufferParams::PARSEP_SKIP;
+               params.paragraph_separation = BufferParams::ParagraphSkipSeparation;
 
        switch (textLayoutModule->skipCO->currentIndex()) {
        case 0:
@@ -1795,17 +1806,17 @@ void GuiDocument::updateParams(BufferParams const & params)
 
        // biblio
        biblioModule->citeDefaultRB->setChecked(
-               params.getEngine() == biblio::ENGINE_BASIC);
+               params.citeEngine() == biblio::ENGINE_BASIC);
 
        biblioModule->citeNatbibRB->setChecked(
-               params.getEngine() == biblio::ENGINE_NATBIB_NUMERICAL ||
-               params.getEngine() == biblio::ENGINE_NATBIB_AUTHORYEAR);
+               params.citeEngine() == biblio::ENGINE_NATBIB_NUMERICAL ||
+               params.citeEngine() == biblio::ENGINE_NATBIB_AUTHORYEAR);
 
        biblioModule->citeStyleCO->setCurrentIndex(
-               params.getEngine() == biblio::ENGINE_NATBIB_NUMERICAL);
+               params.citeEngine() == biblio::ENGINE_NATBIB_NUMERICAL);
 
        biblioModule->citeJurabibRB->setChecked(
-               params.getEngine() == biblio::ENGINE_JURABIB);
+               params.citeEngine() == biblio::ENGINE_JURABIB);
 
        biblioModule->bibtopicCB->setChecked(
                params.use_bibtopic);
@@ -1896,7 +1907,7 @@ void GuiDocument::updateParams(BufferParams const & params)
        }
        setLSpacing(nitem);
 
-       if (params.paragraph_separation == BufferParams::PARSEP_INDENT)
+       if (params.paragraph_separation == BufferParams::ParagraphIndentSeparation)
                textLayoutModule->indentRB->setChecked(true);
        else
                textLayoutModule->skipRB->setChecked(true);
@@ -2224,7 +2235,7 @@ DocumentClass const & GuiDocument::documentClass() const
 
 
 static void dispatch_bufferparams(Dialog const & dialog,
-       BufferParams const & bp, kb_action lfun)
+       BufferParams const & bp, FuncCode lfun)
 {
        ostringstream ss;
        ss << "\\begin_header\n";