Keep dialog connected to cross-ref inset after Apply.

[lyx.git] / src / TextClass.cpp

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 9a8db85502daeba297ebd526902739824814001f..785c7a908066047a3946fec8501192f3afa94d6a 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -1868,25 +1868,26 @@ Layout TextClass::createBasicLayout(docstring const & name, bool unknown) const
 }
 
 
-DocumentClassPtr getDocumentClass(
-               LayoutFile const & baseClass, LayoutModuleList const & modlist,
-               string const & cengine, bool const clone)
+DocumentClassPtr getDocumentClass(LayoutFile const & baseClass, LayoutModuleList const & modlist,
+               string const & cengine, bool clone, bool internal)
 {
+       bool const show_warnings = !clone && !internal;
        DocumentClassPtr doc_class =
            DocumentClassPtr(new DocumentClass(baseClass));
        for (auto const & mod : modlist) {
                LyXModule * lm = theModuleList[mod];
                if (!lm) {
-                       docstring const msg =
-                                               bformat(_("The module %1$s has been requested by\n"
-                                               "this document but has not been found in the list of\n"
-                                               "available modules. If you recently installed it, you\n"
-                                               "probably need to reconfigure LyX.\n"), from_utf8(mod));
-                       if (!clone)
+                       if (show_warnings) {
+                               docstring const msg =
+                                       bformat(_("The module %1$s has been requested by\n"
+                                       "this document but has not been found in the list of\n"
+                                       "available modules. If you recently installed it, you\n"
+                                       "probably need to reconfigure LyX.\n"), from_utf8(mod));
                                frontend::Alert::warning(_("Module not available"), msg);
+                       }
                        continue;
                }
-               if (!lm->isAvailable() && !clone) {
+               if (!lm->isAvailable() && show_warnings) {
                        docstring const prereqs = from_utf8(getStringFromVector(lm->prerequisites(), "\n\t"));
                        docstring const msg =
                                bformat(_("The module %1$s requires a package that is not\n"
@@ -1901,7 +1902,7 @@ DocumentClassPtr getDocumentClass(
                FileName layout_file = libFileSearch("layouts", lm->getFilename());
                if (!doc_class->read(layout_file, TextClass::MODULE)) {
                        docstring const msg =
-                                               bformat(_("Error reading module %1$s\n"), from_utf8(mod));
+                               bformat(_("Error reading module %1$s\n"), from_utf8(mod));
                        frontend::Alert::warning(_("Read Error"), msg);
                }
        }
@@ -1911,14 +1912,15 @@ DocumentClassPtr getDocumentClass(
 
        LyXCiteEngine * ce = theCiteEnginesList[cengine];
        if (!ce) {
-               docstring const msg =
-                                       bformat(_("The cite engine %1$s has been requested by\n"
-                                       "this document but has not been found in the list of\n"
-                                       "available engines. If you recently installed it, you\n"
-                                       "probably need to reconfigure LyX.\n"), from_utf8(cengine));
-               if (!clone)
+               if (show_warnings) {
+                       docstring const msg =
+                               bformat(_("The cite engine %1$s has been requested by\n"
+                               "this document but has not been found in the list of\n"
+                               "available engines. If you recently installed it, you\n"
+                               "probably need to reconfigure LyX.\n"), from_utf8(cengine));
                        frontend::Alert::warning(_("Cite Engine not available"), msg);
-       } else if (!ce->isAvailable() && !clone) {
+               }
+       } else if (!ce->isAvailable() && show_warnings) {
                docstring const prereqs = from_utf8(getStringFromVector(ce->prerequisites(), "\n\t"));
                docstring const msg =
                        bformat(_("The cite engine %1$s requires a package that is not\n"
@@ -1933,7 +1935,7 @@ DocumentClassPtr getDocumentClass(
                FileName layout_file = libFileSearch("citeengines", ce->getFilename());
                if (!doc_class->read(layout_file, TextClass::CITE_ENGINE)) {
                        docstring const msg =
-                                               bformat(_("Error reading cite engine %1$s\n"), from_utf8(cengine));
+                               bformat(_("Error reading cite engine %1$s\n"), from_utf8(cengine));
                        frontend::Alert::warning(_("Read Error"), msg);
                }
        }