Embedding: merge lyx::EmbeddedFiles to lyx::support::EmbeddedFileList

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

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 8a36a89ed96663533d9a78ec46076861bba0b6c5..ad08b559da5eba1e1d41cb055cb9024436fd0d11 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -56,6 +56,7 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 ///
 template<class Pair>
@@ -133,11 +134,6 @@ vector<pair<string, lyx::docstring> > pagestyles;
 namespace lyx {
 namespace frontend {
 
-using support::token;
-using support::bformat;
-using support::findToken;
-using support::getVectorFromString;
-
 /////////////////////////////////////////////////////////////////////
 //
 // PreambleModule
@@ -917,7 +913,7 @@ void GuiDocument::updatePagestyle(string const & items, string const & sel)
 void GuiDocument::classChanged()
 {
        textclass_type const tc = latexModule->classCO->currentIndex();
-       bp_.setJustBaseClass(tc);
+       bp_.setBaseClass(tc);
        if (lyxrc.auto_reset_options)
                bp_.useClassDefaults();
        updateContents();
@@ -955,8 +951,16 @@ void GuiDocument::updateModuleInfo()
                        }
                        pkgdesc += pkgList[i];
                }
-               if (!pkgdesc.empty())
-                       desc += " Requires " + pkgdesc + ".";
+               if (!pkgdesc.empty()) {
+                       if (!desc.empty())
+                               desc += " ";
+                       desc += ("Requires " + pkgdesc + ".");
+               }
+               if (!isModuleAvailable(modName)) {
+                       if (!desc.empty())
+                               desc += "\n";
+                       desc += "WARNING: Some packages are unavailable!";
+               }
                latexModule->infoML->document()->setPlainText(toqstr(desc));
        }
 }
@@ -966,10 +970,10 @@ void GuiDocument::updateEmbeddedFileList()
 {
        embeddedFilesModule->filesLW->clear();
        // add current embedded files
-       EmbeddedFiles & files = buffer().embeddedFiles();
-       files.update();
-       EmbeddedFiles::EmbeddedFileList::iterator fit = files.begin();
-       EmbeddedFiles::EmbeddedFileList::iterator fit_end = files.end();
+       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)
@@ -1093,13 +1097,15 @@ void GuiDocument::apply(BufferParams & params)
        params.graphicsDriver =
                tex_graphics[latexModule->psdriverCO->currentIndex()];
        
+       // text layout
+       params.setBaseClass(latexModule->classCO->currentIndex());
+
        // Modules
        params.clearLayoutModules();
        QStringList const selMods = selectedModel()->stringList();
        for (int i = 0; i != selMods.size(); ++i)
                params.addLayoutModule(lyx::fromqstr(selMods[i]));
 
-
        if (mathsModule->amsautoCB->isChecked()) {
                params.use_amsmath = BufferParams::package_auto;
        } else {
@@ -1118,9 +1124,6 @@ void GuiDocument::apply(BufferParams & params)
                        params.use_esint = BufferParams::package_off;
        }
 
-       // text layout
-       params.setJustBaseClass(latexModule->classCO->currentIndex());
-
        if (pageLayoutModule->pagestyleCO->currentIndex() == 0)
                params.pagestyle = "default";
        else {
@@ -1635,7 +1638,7 @@ void GuiDocument::updateContents()
 
 void GuiDocument::useClassDefaults()
 {
-       bp_.setJustBaseClass(latexModule->classCO->currentIndex());
+       bp_.setBaseClass(latexModule->classCO->currentIndex());
        bp_.useClassDefaults();
        updateContents();
 }
@@ -1693,13 +1696,12 @@ string GuiDocument::getModuleDescription(string const & modName) const
 {
        LyXModule const * const mod = moduleList[modName];
        if (!mod)
-               return string("Module unavailable!");
+               return string("Module not found!");
        return mod->description;
 }
 
 
-vector<string>
-GuiDocument::getPackageList(string const & modName) const
+vector<string> GuiDocument::getPackageList(string const & modName) const
 {
        LyXModule const * const mod = moduleList[modName];
        if (!mod)
@@ -1708,6 +1710,15 @@ GuiDocument::getPackageList(string const & modName) const
 }
 
 
+bool GuiDocument::isModuleAvailable(string const & modName) const
+{
+       LyXModule * mod = moduleList[modName];
+       if (!mod)
+               return false;
+       return mod->isAvailable();
+}
+
+
 TextClass const & GuiDocument::textClass() const
 {
        return textclasslist[bp_.getBaseClass()];
@@ -1732,8 +1743,6 @@ void GuiDocument::dispatchParams()
 
        // Apply the BufferParams. Note that this will set the base class
        // and then update the buffer's layout.
-       //FIXME Could this be done last? Then, I think, we'd get the automatic
-       //update mentioned in the next FIXME...
        dispatch_bufferparams(*this, params(), LFUN_BUFFER_PARAMS_APPLY);
 
        // Generate the colours requested by each new branch.