]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiDocument.cpp
Andre's s/getBaseClass/baseClass/ cleanup.
[lyx.git] / src / frontends / qt4 / GuiDocument.cpp
index ad7e55b9e1238bf32c556eafa0b124c8e4a5f880..6adc1f52e9a7ce7c5c568410b03b9c4294a6b7f9 100644 (file)
 
 #include "GuiDocument.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 "support/gettext.h"
+#include "GuiBranches.h"
+#include "Language.h"
+#include "LaTeXFeatures.h"
+#include "LaTeXHighlighter.h"
 #include "Layout.h"
 #include "LengthCombo.h"
+#include "LyXRC.h" // defaultUnit
+#include "ModuleList.h"
+#include "OutputParams.h"
 #include "PanelStack.h"
+#include "PDFOptions.h"
 #include "qt_helpers.h"
-#include "Validator.h"
-
-// For the Branches module
-#include "GuiBranches.h"
-
-#include "LaTeXHighlighter.h"
-
-#include "frontend_helpers.h"
-#include "BufferParams.h"
-#include "Encoding.h"
-#include "gettext.h"
-#include "Language.h"
-#include "LyXRC.h" // defaultUnit
-#include "TextClassList.h"
 #include "Spacing.h"
-#include "PDFOptions.h"
+#include "TextClassList.h"
+#include "Validator.h"
 
 #include "insets/InsetListingsParams.h"
 
+#include "support/FileName.h"
+#include "support/filetools.h"
 #include "support/lstrings.h"
 
+#include "frontends/alert.h"
+
 #include <boost/bind.hpp>
 
 #include <QCloseEvent>
 #include <QTextCursor>
 
 #include <algorithm>
+#include <sstream>
 
-using lyx::support::token;
-using lyx::support::bformat;
-using lyx::support::findToken;
-using lyx::support::getVectorFromString;
-
-using std::distance;
-using std::make_pair;
-using std::pair;
-using std::vector;
-using std::string;
+using namespace std;
+using namespace lyx::support;
 
 
 ///
 template<class Pair>
-std::vector<typename Pair::second_type> const
-getSecond(std::vector<Pair> const & pr)
+vector<typename Pair::second_type> const
+getSecond(vector<Pair> const & pr)
 {
-        std::vector<typename Pair::second_type> tmp(pr.size());
-        std::transform(pr.begin(), pr.end(), tmp.begin(),
+        vector<typename Pair::second_type> tmp(pr.size());
+        transform(pr.begin(), pr.end(), tmp.begin(),
                                         boost::bind(&Pair::second, _1));
         return tmp;
 }
 
+
 char const * const tex_graphics[] =
 {
        "default", "dvips", "dvitops", "emtex",
@@ -135,6 +138,288 @@ vector<pair<string, lyx::docstring> > pagestyles;
 namespace lyx {
 namespace frontend {
 
+
+/// 
+QModelIndex getSelectedIndex(QListView * lv)
+{
+       QModelIndex retval = QModelIndex();
+       QModelIndexList selIdx = 
+                       lv->selectionModel()->selectedIndexes();
+       if (!selIdx.empty())
+               retval = selIdx.first();
+       return retval;
+}
+
+
+namespace {
+       vector<string> getRequiredList(string const & modName) 
+       {
+               LyXModule const * const mod = moduleList[modName];
+               if (!mod)
+                       return vector<string>(); //empty such thing
+               return mod->getRequiredModules();
+       }
+
+
+       vector<string> getExcludedList(string const & modName)
+       {
+               LyXModule const * const mod = moduleList[modName];
+               if (!mod)
+                       return vector<string>(); //empty such thing
+               return mod->getExcludedModules();
+       }
+
+
+       docstring getModuleDescription(string const & modName)
+       {
+               LyXModule const * const mod = moduleList[modName];
+               if (!mod)
+                       return _("Module not found!");
+               return _(mod->getDescription());
+       }
+
+
+       vector<string> getPackageList(string const & modName)
+       {
+               LyXModule const * const mod = moduleList[modName];
+               if (!mod)
+                       return vector<string>(); //empty such thing
+               return mod->getPackageList();
+       }
+
+
+       bool isModuleAvailable(string const & modName)
+       {
+               LyXModule * mod = moduleList[modName];
+               if (!mod)
+                       return false;
+               return mod->isAvailable();
+       }
+} //anonymous namespace
+
+
+ModuleSelMan::ModuleSelMan(
+       QListView * availableLV, 
+       QListView * selectedLV,
+       QPushButton * addPB, 
+       QPushButton * delPB, 
+       QPushButton * upPB, 
+       QPushButton * downPB,
+       GuiIdListModel * availableModel,
+       GuiIdListModel * selectedModel) :
+GuiSelectionManager(availableLV, selectedLV, addPB, delPB,
+                    upPB, downPB, availableModel, selectedModel) 
+{}
+       
+
+void ModuleSelMan::updateAddPB() 
+{
+       int const arows = availableModel->rowCount();
+       QModelIndexList const availSels = 
+                       availableLV->selectionModel()->selectedIndexes();
+       if (arows == 0 || availSels.isEmpty()  || isSelected(availSels.first())) {
+               addPB->setEnabled(false);
+               return;
+       }
+       
+       QModelIndex const & idx = availableLV->selectionModel()->currentIndex();
+       string const modName = getAvailableModel()->getIDString(idx.row());
+       vector<string> reqs = getRequiredList(modName);
+       vector<string> excl = getExcludedList(modName);
+       
+       if (reqs.empty() && excl.empty()) {
+               addPB->setEnabled(true);
+               return;
+       }
+
+       int const srows = selectedModel->rowCount();
+       vector<string> selModList;
+       for (int i = 0; i < srows; ++i)
+               selModList.push_back(getSelectedModel()->getIDString(i));
+
+       vector<string>::const_iterator selModStart = selModList.begin();
+       vector<string>::const_iterator selModEnd   = selModList.end();
+       
+       //Check whether some required module is available
+       if (!reqs.empty()) {
+               bool foundOne = false;
+               vector<string>::const_iterator it  = reqs.begin();
+               vector<string>::const_iterator end = reqs.end();
+               for (; it != end; ++it) {
+                       if (find(selModStart, selModEnd, *it) != selModEnd) {
+                               foundOne = true;
+                               break;
+                       }
+               }
+               if (!foundOne) {
+                       addPB->setEnabled(false);
+                       return;
+               }
+       }
+       
+       //Check whether any excluded module is being used
+       if (!excl.empty()) {
+               vector<string>::const_iterator it  = excl.begin();
+               vector<string>::const_iterator end = excl.end();
+               for (; it != end; ++it) {
+                       if (find(selModStart, selModEnd, *it) != selModEnd) {
+                               addPB->setEnabled(false);
+                               return;
+                       }
+               }
+       }
+
+       addPB->setEnabled(true);
+}
+
+
+void ModuleSelMan::updateDownPB()
+{
+       int const srows = selectedModel->rowCount();
+       if (srows == 0) {
+               downPB->setEnabled(false);
+               return;
+       }
+       QModelIndexList const selSels = 
+                       selectedLV->selectionModel()->selectedIndexes();
+       //disable if empty or last item is selected
+       if (selSels.empty() || selSels.first().row() == srows - 1) {
+               downPB->setEnabled(false);
+               return;
+       }
+       //determine whether immediately succeding element requires this one
+       QModelIndex const & curIdx = selectedLV->selectionModel()->currentIndex();
+       int curRow = curIdx.row();
+       if (curRow < 0 || curRow >= srows - 1) { //this shouldn't happen...
+               downPB->setEnabled(false);
+               return;
+       }
+       string const curModName = getSelectedModel()->getIDString(curRow);
+       string const nextModName = getSelectedModel()->getIDString(curRow + 1);
+
+       vector<string> reqs = getRequiredList(nextModName);
+
+       //if it doesn't require anything....
+       if (reqs.empty()) {
+               downPB->setEnabled(true);
+               return;
+       }
+
+       //FIXME This should perhaps be more flexible and check whether, even 
+       //if this one is required, there is also an earlier one that is required.
+       //enable it if this module isn't required
+       downPB->setEnabled(
+                       find(reqs.begin(), reqs.end(), curModName) == reqs.end());
+}
+
+void ModuleSelMan::updateUpPB() 
+{
+       int const srows = selectedModel->rowCount();
+       if (srows == 0) {
+               upPB->setEnabled(false);
+               return;
+       }
+       QModelIndexList const selSels = 
+                       selectedLV->selectionModel()->selectedIndexes();
+       //disable if empty or first item is selected
+       if (selSels.empty() || selSels.first().row() == 0) {
+               upPB->setEnabled(false);
+               return;
+       }
+
+       //determine whether immediately preceding element is required by this one
+       QModelIndex const & curIdx = selectedLV->selectionModel()->currentIndex();
+       int curRow = curIdx.row();
+       if (curRow <= -1 || curRow > srows - 1) { //sanity check
+               downPB->setEnabled(false);
+               return;
+       }
+       string const curModName = getSelectedModel()->getIDString(curRow);
+       vector<string> reqs = getRequiredList(curModName);
+       
+       //if this one doesn't require anything....
+       if (reqs.empty()) {
+               upPB->setEnabled(true);
+               return;
+       }
+
+       string preModName = getSelectedModel()->getIDString(curRow - 1);
+
+       //NOTE This is less flexible than it might be. You could check whether, even 
+       //if this one is required, there is also an earlier one that is required.
+       //enable it if the preceding module isn't required
+       upPB->setEnabled(find(reqs.begin(), reqs.end(), preModName) == reqs.end());
+}
+
+void ModuleSelMan::updateDelPB() 
+{
+       int const srows = selectedModel->rowCount();
+       if (srows == 0) {
+               deletePB->setEnabled(false);
+               return;
+       }
+       QModelIndexList const selSels = 
+                       selectedLV->selectionModel()->selectedIndexes();
+       if (selSels.empty() || selSels.first().row() < 0) {
+               deletePB->setEnabled(false);
+               return;
+       }
+       
+       //determine whether some LATER module requires this one
+       //NOTE Things are arranged so that this is the only way there
+       //can be a problem. At least, we hope so.
+       QModelIndex const & curIdx = 
+               selectedLV->selectionModel()->currentIndex();
+       int const curRow = curIdx.row();
+       if (curRow < 0 || curRow >= srows) { //this shouldn't happen
+               deletePB->setEnabled(false);
+               return;
+       }
+               
+       QString const curModName = curIdx.data().toString();
+       
+       //We're looking here for a reason NOT to enable the button. If we
+       //find one, we disable it and return. If we don't, we'll end up at
+       //the end of the function, and then we enable it.
+       for (int i = curRow + 1; i < srows; ++i) {
+               string const thisMod = getSelectedModel()->getIDString(i);
+               vector<string> reqs = getRequiredList(thisMod);
+               //does this one require us?
+               if (find(reqs.begin(), reqs.end(), fromqstr(curModName)) == reqs.end())
+                       //no...
+                       continue;
+
+               //OK, so this module requires us
+               //is there an EARLIER module that also satisfies the require?
+               //NOTE We demand that it be earlier to keep the list of modules
+               //consistent with the rule that a module must be proceeded by a
+               //required module. There would be more flexible ways to proceed,
+               //but that would be a lot more complicated, and the logic here is
+               //already complicated. (That's why I've left the debugging code.)
+               //lyxerr << "Testing " << thisMod << std::endl;
+               bool foundOne = false;
+               for (int j = 0; j < curRow; ++j) {
+                       string const mod = getSelectedModel()->getIDString(j);
+                       //lyxerr << "In loop: Testing " << mod << std::endl;
+                       //do we satisfy the require? 
+                       if (find(reqs.begin(), reqs.end(), mod) != reqs.end()) {
+                               //lyxerr << mod << " does the trick." << std::endl;
+                               foundOne = true;
+                               break;
+                       }
+               }
+               //did we find a module to satisfy the require?
+               if (!foundOne) {
+                       //lyxerr << "No matching module found." << std::endl;
+                       deletePB->setEnabled(false);
+                       return;
+               }
+       }
+       //lyxerr << "All's well that ends well." << std::endl;  
+       deletePB->setEnabled(true);
+}
+
+
 /////////////////////////////////////////////////////////////////////
 //
 // PreambleModule
@@ -205,13 +490,11 @@ void PreambleModule::closeEvent(QCloseEvent * e)
 
 
 
-GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
-       : GuiDialog(lv, "document")
+GuiDocument::GuiDocument(GuiView & lv)
+       : GuiDialog(lv, "document", qt_("Document Settings")), current_id_(0)
 {
        setupUi(this);
-       setController(new ControlDocument(*this));
-       setViewTitle(_("Document Settings"));
-
+       
        lang_ = getSecond(getLanguageData(false));
 
        connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
@@ -235,7 +518,7 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
                this, SLOT(change_adaptor()));
        connect(textLayoutModule->lspacingCO, SIGNAL(activated(int)),
                this, SLOT(setLSpacing(int)));
-       connect(textLayoutModule->lspacingLE, SIGNAL(textChanged(const QString&)),
+       connect(textLayoutModule->lspacingLE, SIGNAL(textChanged(const QString &)),
                this, SLOT(change_adaptor()));
        connect(textLayoutModule->skipRB, SIGNAL(clicked()),
                this, SLOT(change_adaptor()));
@@ -253,6 +536,8 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
                this, SLOT(enableSkip(bool)));
        connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()),
                this, SLOT(change_adaptor()));
+       connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()),
+               this, SLOT(setColSep()));
        connect(textLayoutModule->listingsED, SIGNAL(textChanged()),
                this, SLOT(change_adaptor()));
        connect(textLayoutModule->bypassCB, SIGNAL(clicked()), 
@@ -315,19 +600,19 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
 
        for (int n = 0; tex_fonts_roman[n][0]; ++n) {
                QString font = qt_(tex_fonts_roman_gui[n]);
-               if (!controller().isFontAvailable(tex_fonts_roman[n]))
+               if (!isFontAvailable(tex_fonts_roman[n]))
                        font += qt_(" (not installed)");
                fontModule->fontsRomanCO->addItem(font);
        }
        for (int n = 0; tex_fonts_sans[n][0]; ++n) {
                QString font = qt_(tex_fonts_sans_gui[n]);
-               if (!controller().isFontAvailable(tex_fonts_sans[n]))
+               if (!isFontAvailable(tex_fonts_sans[n]))
                        font += qt_(" (not installed)");
                fontModule->fontsSansCO->addItem(font);
        }
        for (int n = 0; tex_fonts_monospaced[n][0]; ++n) {
                QString font = qt_(tex_fonts_monospaced_gui[n]);
-               if (!controller().isFontAvailable(tex_fonts_monospaced[n]))
+               if (!isFontAvailable(tex_fonts_monospaced[n]))
                        font += qt_(" (not installed)");
                fontModule->fontsTypewriterCO->addItem(font);
        }
@@ -337,9 +622,9 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
        fontModule->fontsizeCO->addItem(qt_("11"));
        fontModule->fontsizeCO->addItem(qt_("12"));
 
-       for (int n = 0; ControlDocument::fontfamilies_gui[n][0]; ++n)
+       for (int n = 0; GuiDocument::fontfamilies_gui[n][0]; ++n)
                fontModule->fontsDefaultCO->addItem(
-                       qt_(ControlDocument::fontfamilies_gui[n]));
+                       qt_(GuiDocument::fontfamilies_gui[n]));
 
 
        pageLayoutModule = new UiWidget<Ui::PageLayoutUi>;
@@ -435,6 +720,10 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
                this, SLOT(change_adaptor()));
        connect(marginsModule->footskipUnit, SIGNAL(activated(int)),
                this, SLOT(change_adaptor()));
+       connect(marginsModule->columnsepLE, SIGNAL(textChanged(const QString&)),
+               this, SLOT(change_adaptor()));
+       connect(marginsModule->columnsepUnit, SIGNAL(activated(int)),
+               this, SLOT(change_adaptor()));
        marginsModule->topLE->setValidator(unsignedLengthValidator(
                marginsModule->topLE));
        marginsModule->bottomLE->setValidator(unsignedLengthValidator(
@@ -449,6 +738,8 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
                marginsModule->headheightLE));
        marginsModule->footskipLE->setValidator(unsignedLengthValidator(
                marginsModule->footskipLE));
+       marginsModule->columnsepLE->setValidator(unsignedLengthValidator(
+               marginsModule->columnsepLE));
 
        bc().addCheckedLineEdit(marginsModule->topLE,
                marginsModule->topL);
@@ -464,6 +755,8 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
                marginsModule->headheightL);
        bc().addCheckedLineEdit(marginsModule->footskipLE,
                marginsModule->footskipL);
+       bc().addCheckedLineEdit(marginsModule->columnsepLE,
+               marginsModule->columnsepL);
 
 
        langModule = new UiWidget<Ui::LanguageUi>;
@@ -558,17 +851,17 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
 
        latexModule = new UiWidget<Ui::LaTeXUi>;
        // latex class
-       connect(latexModule->classCO, SIGNAL(activated(int)),
-               this, SLOT(change_adaptor()));
        connect(latexModule->optionsLE, SIGNAL(textChanged(const QString &)),
                this, SLOT(change_adaptor()));
        connect(latexModule->psdriverCO, SIGNAL(activated(int)),
                this, SLOT(change_adaptor()));
        connect(latexModule->classCO, SIGNAL(activated(int)),
                this, SLOT(classChanged()));
+       connect(latexModule->classCO, SIGNAL(activated(int)),
+               this, SLOT(change_adaptor()));
        
        selectionManager = 
-               new GuiSelectionManager(latexModule->availableLV, latexModule->selectedLV, 
+               new ModuleSelMan(latexModule->availableLV, latexModule->selectedLV, 
                        latexModule->addPB, latexModule->deletePB, 
                        latexModule->upPB, latexModule->downPB, 
                        availableModel(), selectedModel());
@@ -584,7 +877,7 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
        }
        // latex classes
        //FIXME This seems too involved with the kernel. Some of this
-       //should be moved to the controller---which should perhaps just
+       //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) {
@@ -612,6 +905,15 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
        connect(bulletsModule, SIGNAL(changed()),
                this, SLOT(change_adaptor()));
 
+       // 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()));
+       connect(embeddedFilesModule->removePB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+
        // PDF support
        pdfSupportModule = new UiWidget<Ui::PDFSupportUi>;
 
@@ -641,6 +943,8 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
                this, SLOT(change_adaptor()));
        connect(pdfSupportModule->backrefCB, SIGNAL(toggled(bool)),
                this, SLOT(change_adaptor()));
+       connect(pdfSupportModule->pdfusetitleCB, SIGNAL(toggled(bool)),
+               this, SLOT(change_adaptor()));
        connect(pdfSupportModule->pagebackrefCB, SIGNAL(toggled(bool)),
                this, SLOT(change_adaptor()));
        connect(pdfSupportModule->fullscreenCB, SIGNAL(toggled(bool)),
@@ -666,6 +970,7 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
        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"));
 // FIXME: hack to work around resizing bug in Qt >= 4.2
@@ -676,37 +981,31 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
 }
 
 
-ControlDocument & GuiDocumentDialog::controller()
-{
-       return static_cast<ControlDocument &>(GuiDialog::controller());
-}
-
-
-void GuiDocumentDialog::showPreamble()
+void GuiDocument::showPreamble()
 {
        docPS->setCurrentPanel(_("LaTeX Preamble"));
 }
 
 
-void GuiDocumentDialog::saveDefaultClicked()
+void GuiDocument::saveDefaultClicked()
 {
        saveDocDefault();
 }
 
 
-void GuiDocumentDialog::useDefaultsClicked()
+void GuiDocument::useDefaultsClicked()
 {
        useClassDefaults();
 }
 
 
-void GuiDocumentDialog::change_adaptor()
+void GuiDocument::change_adaptor()
 {
        changed();
 }
 
 
-docstring GuiDocumentDialog::validate_listings_params()
+docstring GuiDocument::validate_listings_params()
 {
        // use a cache here to avoid repeated validation
        // of the same parameters
@@ -725,7 +1024,7 @@ docstring GuiDocumentDialog::validate_listings_params()
 }
 
 
-void GuiDocumentDialog::set_listings_msg()
+void GuiDocument::set_listings_msg()
 {
        static bool isOK = true;
        docstring msg = validate_listings_params();
@@ -744,20 +1043,13 @@ void GuiDocumentDialog::set_listings_msg()
 }
 
 
-void GuiDocumentDialog::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
-void GuiDocumentDialog::setLSpacing(int item)
+void GuiDocument::setLSpacing(int item)
 {
        textLayoutModule->lspacingLE->setEnabled(item == 3);
 }
 
 
-void GuiDocumentDialog::setSkip(int item)
+void GuiDocument::setSkip(int item)
 {
        bool const enable = (item == 3);
        textLayoutModule->skipLE->setEnabled(enable);
@@ -765,7 +1057,7 @@ void GuiDocumentDialog::setSkip(int item)
 }
 
 
-void GuiDocumentDialog::enableSkip(bool skip)
+void GuiDocument::enableSkip(bool skip)
 {
        textLayoutModule->skipCO->setEnabled(skip);
        textLayoutModule->skipLE->setEnabled(skip);
@@ -774,19 +1066,19 @@ void GuiDocumentDialog::enableSkip(bool skip)
                setSkip(textLayoutModule->skipCO->currentIndex());
 }
 
-void GuiDocumentDialog::portraitChanged()
+void GuiDocument::portraitChanged()
 {
        setMargins(pageLayoutModule->papersizeCO->currentIndex());
 }
 
-void GuiDocumentDialog::setMargins(bool custom)
+void GuiDocument::setMargins(bool custom)
 {
        marginsModule->marginCB->setChecked(custom);
        setCustomMargins(custom);
 }
 
 
-void GuiDocumentDialog::setCustomPapersize(int papersize)
+void GuiDocument::setCustomPapersize(int papersize)
 {
        bool const custom = (papersize == 1);
 
@@ -800,7 +1092,13 @@ void GuiDocumentDialog::setCustomPapersize(int papersize)
 }
 
 
-void GuiDocumentDialog::setCustomMargins(bool custom)
+void GuiDocument::setColSep()
+{
+       setCustomMargins(marginsModule->marginCB->checkState() == Qt::Checked);
+}
+
+
+void GuiDocument::setCustomMargins(bool custom)
 {
        marginsModule->topL->setEnabled(!custom);
        marginsModule->topLE->setEnabled(!custom);
@@ -829,10 +1127,16 @@ void GuiDocumentDialog::setCustomMargins(bool custom)
        marginsModule->footskipL->setEnabled(!custom);
        marginsModule->footskipLE->setEnabled(!custom);
        marginsModule->footskipUnit->setEnabled(!custom);
+
+       bool const enableColSep = !custom && 
+                       textLayoutModule->twoColumnCB->checkState() == Qt::Checked;
+       marginsModule->columnsepL->setEnabled(enableColSep);
+       marginsModule->columnsepLE->setEnabled(enableColSep);
+       marginsModule->columnsepUnit->setEnabled(enableColSep);
 }
 
 
-void GuiDocumentDialog::updateFontsize(string const & items, string const & sel)
+void GuiDocument::updateFontsize(string const & items, string const & sel)
 {
        fontModule->fontsizeCO->clear();
        fontModule->fontsizeCO->addItem(qt_("Default"));
@@ -850,33 +1154,33 @@ void GuiDocumentDialog::updateFontsize(string const & items, string const & sel)
 }
 
 
-void GuiDocumentDialog::romanChanged(int item)
+void GuiDocument::romanChanged(int item)
 {
        string const font = tex_fonts_roman[item];
-       fontModule->fontScCB->setEnabled(controller().providesSC(font));
-       fontModule->fontOsfCB->setEnabled(controller().providesOSF(font));
+       fontModule->fontScCB->setEnabled(providesSC(font));
+       fontModule->fontOsfCB->setEnabled(providesOSF(font));
 }
 
 
-void GuiDocumentDialog::sansChanged(int item)
+void GuiDocument::sansChanged(int item)
 {
        string const font = tex_fonts_sans[item];
-       bool scaleable = controller().providesScale(font);
+       bool scaleable = providesScale(font);
        fontModule->scaleSansSB->setEnabled(scaleable);
        fontModule->scaleSansLA->setEnabled(scaleable);
 }
 
 
-void GuiDocumentDialog::ttChanged(int item)
+void GuiDocument::ttChanged(int item)
 {
        string const font = tex_fonts_monospaced[item];
-       bool scaleable = controller().providesScale(font);
+       bool scaleable = providesScale(font);
        fontModule->scaleTypewriterSB->setEnabled(scaleable);
        fontModule->scaleTypewriterLA->setEnabled(scaleable);
 }
 
 
-void GuiDocumentDialog::updatePagestyle(string const & items, string const & sel)
+void GuiDocument::updatePagestyle(string const & items, string const & sel)
 {
        pagestyles.clear();
        pageLayoutModule->pagestyleCO->clear();
@@ -906,58 +1210,151 @@ void GuiDocumentDialog::updatePagestyle(string const & items, string const & sel
 }
 
 
-void GuiDocumentDialog::classChanged()
+void GuiDocument::classChanged()
 {
-       BufferParams & params = controller().params();
        textclass_type const tc = latexModule->classCO->currentIndex();
-       params.setJustBaseClass(tc);
-       if (lyxrc.auto_reset_options)
-               params.useClassDefaults();
-       updateContents();
+       bp_.setBaseClass(tc);
+       if (lyxrc.auto_reset_options) {
+               if (applyPB->isEnabled()) {
+                       int const ret = Alert::prompt(_("Unapplied changes"),
+                                       _("Some changes in the dialog were not yet applied."
+                                       "If you do not apply now, they will be lost after this action."),
+                                       1, 1, _("&Apply"), _("&Dismiss"));
+                       if (ret == 0)
+                               applyView();
+               }
+               bp_.useClassDefaults();
+               forceUpdate();
+       }
 }
 
 
-void GuiDocumentDialog::updateModuleInfo()
+namespace {
+       //This is an insanely complicated attempt to make this sort of thing
+       //work with RTL languages.
+       docstring formatStrVec(vector<string> const & v, docstring const & s) 
+       {
+               //this mess formats the list as "v[0], v[1], ..., [s] v[n]"
+               int const vSize = v.size();
+               if (v.size() == 0)
+                       return docstring();
+               else if (v.size() == 1) 
+                       return from_ascii(v[0]);
+               else if (v.size() == 2) {
+                       docstring retval = _("%1$s and %2$s");
+                       retval = subst(retval, _("and"), s);
+                       return bformat(retval, from_ascii(v[0]), from_ascii(v[1]));
+               }
+               //The idea here is to format all but the last two items...
+               docstring t2 = _("%1$s, %2$s");
+               docstring retval = from_ascii(v[0]);
+               for (int i = 1; i < vSize - 2; ++i)
+                       retval = bformat(t2, retval, from_ascii(v[i])); 
+               //...and then to  plug them, and the last two, into this schema
+               docstring t = _("%1$s, %2$s, and %3$s");
+               t = subst(t, _("and"), s);
+               return bformat(t, retval, from_ascii(v[vSize - 2]), from_ascii(v[vSize - 1]));
+       }
+       
+       vector<string> idsToNames(vector<string> const & idList)
+       {
+               vector<string> retval;
+               vector<string>::const_iterator it  = idList.begin();
+               vector<string>::const_iterator end = idList.end();
+               for (; it != end; ++it) {
+                       LyXModule const * const mod = moduleList[*it];
+                       if (!mod)
+                               retval.push_back(*it + " (Unavailable)");
+                       else
+                               retval.push_back(mod->getName());
+               }
+               return retval;
+       }
+}
+
+
+void GuiDocument::updateModuleInfo()
 {
        selectionManager->update();
+       
        //Module description
-       QListView const * const lv = selectionManager->selectedFocused() ?
-                                    latexModule->selectedLV :
-                       latexModule->availableLV;
-       if (lv->selectionModel()->selectedIndexes().isEmpty())
+       bool const focusOnSelected = selectionManager->selectedFocused();
+       QListView const * const lv = 
+                       focusOnSelected ? latexModule->selectedLV : latexModule->availableLV;
+       if (lv->selectionModel()->selectedIndexes().isEmpty()) {
                latexModule->infoML->document()->clear();
-       else {
-               QModelIndex const idx = lv->selectionModel()->currentIndex();
-               string const modName = fromqstr(idx.data().toString());
-               string desc = controller().getModuleDescription(modName);
-               vector<string> pkgList = controller().getPackageList(modName);
-               string pkgdesc;
-               //this mess formats the package list as "pkg1, pkg2, and pkg3"
-               int const pkgListSize = pkgList.size();
-               for (int i = 0; i < pkgListSize; ++i) {
-                       if (i == 1) {
-                               if (i == pkgListSize - 1) //last element
-                                       pkgdesc += " and ";
-                               else
-                                       pkgdesc += ", ";
-                       } else if (i > 1) {
-                               if (i == pkgListSize - 1) //last element
-                                       pkgdesc += ", and ";
-                               else
-                                       pkgdesc += ", ";
-                       }
-                       pkgdesc += pkgList[i];
-               }
-               if (!pkgdesc.empty())
-                       desc += " Requires " + pkgdesc + ".";
-               latexModule->infoML->document()->setPlainText(toqstr(desc));
+               return;
+       }
+       QModelIndex const & idx = lv->selectionModel()->currentIndex();
+       GuiIdListModel const & idModel = 
+                       focusOnSelected  ? selected_model_ : available_model_;
+       string const modName = idModel.getIDString(idx.row());
+       docstring desc = getModuleDescription(modName);
+
+       vector<string> pkgList = getPackageList(modName);
+       docstring pkgdesc = formatStrVec(pkgList, _("and"));
+       if (!pkgdesc.empty()) {
+               if (!desc.empty())
+                       desc += "\n";
+               desc += bformat(_("Package(s) required: %1$s."), pkgdesc);
+       }
+
+       pkgList = getRequiredList(modName);
+       if (!pkgList.empty()) {
+               vector<string> const reqDescs = idsToNames(pkgList);
+               pkgdesc = formatStrVec(reqDescs, _("or"));
+               if (!desc.empty())
+                       desc += "\n";
+               desc += bformat(_("Module required: %1$s."), pkgdesc);
+       }
+
+       pkgList = getExcludedList(modName);
+       if (!pkgList.empty()) {
+               vector<string> const reqDescs = idsToNames(pkgList);
+               pkgdesc = formatStrVec(reqDescs, _( "and"));
+               if (!desc.empty())
+                       desc += "\n";
+               desc += bformat(_("Modules excluded: %1$s."), pkgdesc);
+       }
+
+       if (!isModuleAvailable(modName)) {
+               if (!desc.empty())
+                       desc += "\n";
+               desc += _("WARNING: Some packages are unavailable!");
+       }
+
+       latexModule->infoML->document()->setPlainText(toqstr(desc));
+}
+
+
+void GuiDocument::updateEmbeddedFileList()
+{
+       embeddedFilesModule->filesLW->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);
        }
 }
 
 
-void GuiDocumentDialog::updateNumbering()
+void GuiDocument::updateNumbering()
 {
-       TextClass const & tclass = controller().params().getTextClass();
+       TextClass const & tclass = bp_.textClass();
 
        numberingModule->tocTW->setUpdatesEnabled(false);
        numberingModule->tocTW->clear();
@@ -966,15 +1363,13 @@ void GuiDocumentDialog::updateNumbering()
        int const toc = numberingModule->tocSL->value();
        QString const no = qt_("No");
        QString const yes = qt_("Yes");
-       TextClass::const_iterator end = tclass.end();
-       TextClass::const_iterator cit = tclass.begin();
        QTreeWidgetItem * item = 0;
-       for ( ; cit != end ; ++cit) {
-               int const toclevel = (*cit)->toclevel;
-               if (toclevel != Layout::NOT_IN_TOC
-                   && (*cit)->labeltype == LABEL_COUNTER) {
+       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) {
                        item = new QTreeWidgetItem(numberingModule->tocTW);
-                       item->setText(0, toqstr(translateIfPossible((*cit)->name())));
+                       item->setText(0, toqstr(translateIfPossible(lt.name())));
                        item->setText(1, (toclevel <= depth) ? yes : no);
                        item->setText(2, (toclevel <= toc) ? yes : no);
                }
@@ -985,7 +1380,7 @@ void GuiDocumentDialog::updateNumbering()
 }
 
 
-void GuiDocumentDialog::apply(BufferParams & params)
+void GuiDocument::apply(BufferParams & params)
 {
        // preamble
        preambleModule->apply(params);
@@ -1046,7 +1441,7 @@ void GuiDocumentDialog::apply(BufferParams & params)
        params.language = lyx::languages.getLanguage(lang_[pos]);
 
        // numbering
-       if (params.getTextClass().hasTocLevels()) {
+       if (params.textClass().hasTocLevels()) {
                params.tocdepth = numberingModule->tocSL->value();
                params.secnumdepth = numberingModule->depthSL->value();
        }
@@ -1061,12 +1456,15 @@ void GuiDocumentDialog::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]));
-
+       int const srows = selected_model_.rowCount();
+       vector<string> selModList;
+       for (int i = 0; i < srows; ++i)
+               params.addLayoutModule(selected_model_.getIDString(i));
 
        if (mathsModule->amsautoCB->isChecked()) {
                params.use_amsmath = BufferParams::package_auto;
@@ -1086,9 +1484,6 @@ void GuiDocumentDialog::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 {
@@ -1178,7 +1573,7 @@ void GuiDocumentDialog::apply(BufferParams & params)
 
        params.fontsOSF = fontModule->fontOsfCB->isChecked();
 
-       params.fontsDefaultFamily = ControlDocument::fontfamilies[
+       params.fontsDefaultFamily = GuiDocument::fontfamilies[
                fontModule->fontsDefaultCO->currentIndex()];
 
        if (fontModule->fontsizeCO->currentIndex() == 0)
@@ -1202,9 +1597,9 @@ void GuiDocumentDialog::apply(BufferParams & params)
                pageLayoutModule->paperheightUnitCO);
 
        if (pageLayoutModule->facingPagesCB->isChecked())
-               params.sides = TextClass::TwoSides;
+               params.sides = TwoSides;
        else
-               params.sides = TextClass::OneSide;
+               params.sides = OneSide;
 
        if (pageLayoutModule->landscapeRB->isChecked())
                params.orientation = ORIENTATION_LANDSCAPE;
@@ -1225,6 +1620,7 @@ void GuiDocumentDialog::apply(BufferParams & params)
        params.headheight = widgetsToLength(m->headheightLE, m->headheightUnit);
        params.headsep = widgetsToLength(m->headsepLE, m->headsepUnit);
        params.footskip = widgetsToLength(m->footskipLE, m->footskipUnit);
+       params.columnsep = widgetsToLength(m->columnsepLE, m->columnsepUnit);
 
        branchesModule->apply(params);
 
@@ -1243,6 +1639,7 @@ void GuiDocumentDialog::apply(BufferParams & params)
 
        pdf.breaklinks = pdfSupportModule->breaklinksCB->isChecked();
        pdf.pdfborder = pdfSupportModule->pdfborderCB->isChecked();
+       pdf.pdfusetitle = pdfSupportModule->pdfusetitleCB->isChecked();
        pdf.colorlinks = pdfSupportModule->colorlinksCB->isChecked();
        pdf.backref = pdfSupportModule->backrefCB->isChecked();
        pdf.pagebackref = pdfSupportModule->pagebackrefCB->isChecked();
@@ -1251,8 +1648,9 @@ void GuiDocumentDialog::apply(BufferParams & params)
        else
                pdf.pagemode.clear();
        pdf.quoted_options = fromqstr(pdfSupportModule->optionsLE->text());
-       if (pdf.use_hyperref || !pdf.empty())
-               pdf.store_options = true;
+
+       // Embedded files
+       // FIXME
 }
 
 
@@ -1260,27 +1658,25 @@ void GuiDocumentDialog::apply(BufferParams & params)
     If not found, return 0.
  */
 template<class A>
-static size_t findPos(std::vector<A> const & vec, A const & val)
+static size_t findPos(vector<A> const & vec, A const & val)
 {
-       typename std::vector<A>::const_iterator it =
-               std::find(vec.begin(), vec.end(), val);
+       typename vector<A>::const_iterator it =
+               find(vec.begin(), vec.end(), val);
        if (it == vec.end())
                return 0;
        return distance(vec.begin(), it);
 }
 
 
-void GuiDocumentDialog::updateParams()
+void GuiDocument::updateParams()
 {
-       BufferParams const & params = controller().params();
-       updateParams(params);
+       updateParams(bp_);
 }
 
 
-void GuiDocumentDialog::updateParams(BufferParams const & params)
+void GuiDocument::updateParams(BufferParams const & params)
 {
        // set the default unit
-       // FIXME: move to controller
        Length::UNIT defaultUnit = Length::CM;
        switch (lyxrc.default_papersize) {
                case PAPER_DEFAULT: break;
@@ -1304,7 +1700,7 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
        }
 
        // preamble
-       preambleModule->update(params, controller().id());
+       preambleModule->update(params, id());
 
        // biblio
        biblioModule->citeDefaultRB->setChecked(
@@ -1350,9 +1746,9 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
        langModule->otherencodingRB->setChecked(!default_enc);
 
        // numbering
-       int const min_toclevel = controller().textClass().min_toclevel();
-       int const max_toclevel = controller().textClass().max_toclevel();
-       if (controller().textClass().hasTocLevels()) {
+       int const min_toclevel = textClass().min_toclevel();
+       int const max_toclevel = textClass().max_toclevel();
+       if (textClass().hasTocLevels()) {
                numberingModule->setEnabled(true);
                numberingModule->depthSL->setMinimum(min_toclevel - 1);
                numberingModule->depthSL->setMaximum(max_toclevel);
@@ -1397,9 +1793,9 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
        }
 
        // text layout
-       latexModule->classCO->setCurrentIndex(params.getBaseClass());
+       latexModule->classCO->setCurrentIndex(params.baseClass());
        
-       updatePagestyle(controller().textClass().opt_pagestyle(),
+       updatePagestyle(textClass().opt_pagestyle(),
                                 params.pagestyle);
 
        textLayoutModule->lspacingCO->setCurrentIndex(nitem);
@@ -1459,7 +1855,7 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
        floatModule->set(params.float_placement);
 
        // Fonts
-       updateFontsize(controller().textClass().opt_fontsize(),
+       updateFontsize(textClass().opt_fontsize(),
                        params.fontsize);
 
        int n = findToken(tex_fonts_roman, params.fontsRoman);
@@ -1484,7 +1880,7 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
        fontModule->fontOsfCB->setChecked(params.fontsOSF);
        fontModule->scaleSansSB->setValue(params.fontsSansScale);
        fontModule->scaleTypewriterSB->setValue(params.fontsTypewriterScale);
-       n = findToken(ControlDocument::fontfamilies, params.fontsDefaultFamily);
+       n = findToken(GuiDocument::fontfamilies, params.fontsDefaultFamily);
        if (n >= 0)
                fontModule->fontsDefaultCO->setCurrentIndex(n);
 
@@ -1499,7 +1895,7 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
        pageLayoutModule->portraitRB->setChecked(!landscape);
 
        pageLayoutModule->facingPagesCB->setChecked(
-               params.sides == TextClass::TwoSides);
+               params.sides == TwoSides);
 
 
        lengthToWidgets(pageLayoutModule->paperwidthLE,
@@ -1534,6 +1930,9 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
        lengthToWidgets(m->footskipLE, m->footskipUnit,
                params.footskip, defaultUnit);
 
+       lengthToWidgets(m->columnsepLE, m->columnsepUnit,
+               params.columnsep, defaultUnit);
+
        branchesModule->update(params);
 
        // PDF support
@@ -1552,6 +1951,7 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
 
        pdfSupportModule->breaklinksCB->setChecked(pdf.breaklinks);
        pdfSupportModule->pdfborderCB->setChecked(pdf.pdfborder);
+       pdfSupportModule->pdfusetitleCB->setChecked(pdf.pdfusetitle);
        pdfSupportModule->colorlinksCB->setChecked(pdf.colorlinks);
        pdfSupportModule->backrefCB->setChecked(pdf.backref);
        pdfSupportModule->pagebackrefCB->setChecked(pdf.pagebackref);
@@ -1560,59 +1960,290 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
 
        pdfSupportModule->optionsLE->setText(
                toqstr(pdf.quoted_options));
+
+       // embedded files
+       updateEmbeddedFileList();
 }
 
 
-void GuiDocumentDialog::applyView()
+void GuiDocument::applyView()
 {
-       apply(controller().params());
+       apply(params());
 }
 
 
-void GuiDocumentDialog::saveDocDefault()
+void GuiDocument::saveDocDefault()
 {
        // we have to apply the params first
        applyView();
-       controller().saveAsDefault();
+       saveAsDefault();
 }
 
 
-void GuiDocumentDialog::updateContents()
+void GuiDocument::updateAvailableModules() 
+{
+       available_model_.clear();
+       vector<modInfoStruct> const modInfoList = getModuleInfo();
+       int const mSize = modInfoList.size();
+       for (int i = 0; i < mSize; ++i) {
+               modInfoStruct const & modInfo = modInfoList[i];
+               available_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
+       }
+}
+
+
+void GuiDocument::updateSelectedModules() 
 {
-       //update list of available modules
-       QStringList strlist;
-       vector<string> const modNames = controller().getModuleNames();
-       vector<string>::const_iterator it = modNames.begin();
-       for (; it != modNames.end(); ++it)
-               strlist.push_back(toqstr(*it));
-       available_model_.setStringList(strlist);
        //and selected ones, too
-       QStringList strlist2;
-       vector<string> const & selMods = controller().getSelectedModules();
-       it = selMods.begin();
-       for (; it != selMods.end(); ++it)
-               strlist2.push_back(toqstr(*it));
-       selected_model_.setStringList(strlist2);
-
-       updateParams(controller().params());
+       selected_model_.clear();
+       vector<modInfoStruct> const selModList = getSelectedModules();
+       int const sSize = selModList.size();
+       for (int i = 0; i < sSize; ++i) {
+               modInfoStruct const & modInfo = selModList[i];
+               selected_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
+       }
 }
 
-void GuiDocumentDialog::useClassDefaults()
+
+void GuiDocument::updateContents()
 {
-       BufferParams & params = controller().params();
+       if (id() == current_id_)
+               return;
+
+       updateAvailableModules();
+       updateSelectedModules();
+       
+       //FIXME It'd be nice to make sure here that the selected
+       //modules are consistent: That required modules are actually
+       //selected, and that we don't have conflicts. If so, we could
+       //at least pop up a warning.
+       updateParams(bp_);
+       current_id_ = id();
+}
+
 
-       params.setJustBaseClass(latexModule->classCO->currentIndex());
-       params.useClassDefaults();
+void GuiDocument::forceUpdate()
+{
+       // reset to force dialog update
+       current_id_ = 0;
        updateContents();
 }
 
 
-bool GuiDocumentDialog::isValid()
+void GuiDocument::useClassDefaults()
+{
+       if (applyPB->isEnabled()) {
+               int const ret = Alert::prompt(_("Unapplied changes"),
+                               _("Some changes in the dialog were not yet applied."
+                                 "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());
+       bp_.useClassDefaults();
+       forceUpdate();
+}
+
+
+bool GuiDocument::isValid()
+{
+       return (validate_listings_params().empty() &&
+               (textLayoutModule->skipCO->currentIndex() != 3 ||
+                !textLayoutModule->skipLE->text().isEmpty()));
+}
+
+
+char const * const GuiDocument::fontfamilies[5] = {
+       "default", "rmdefault", "sfdefault", "ttdefault", ""
+};
+
+
+char const * GuiDocument::fontfamilies_gui[5] = {
+       N_("Default"), N_("Roman"), N_("Sans Serif"), N_("Typewriter"), ""
+};
+
+
+bool GuiDocument::initialiseParams(string const &)
+{
+       bp_ = buffer().params();
+       loadModuleInfo();
+       return true;
+}
+
+
+void GuiDocument::clearParams()
+{
+       bp_ = BufferParams();
+}
+
+
+BufferId GuiDocument::id() const
+{
+       return &buffer();
+}
+
+
+vector<GuiDocument::modInfoStruct> const & GuiDocument::getModuleInfo()
+{
+       return moduleNames_;
+}
+
+
+vector<GuiDocument::modInfoStruct> const GuiDocument::getSelectedModules()
+{
+       vector<string> const & mods = params().getModules();
+       vector<string>::const_iterator it =  mods.begin();
+       vector<string>::const_iterator end = mods.end();
+       vector<modInfoStruct> mInfo;
+       for (; it != end; ++it) {
+               modInfoStruct m;
+               m.id = *it;
+               LyXModule * mod = moduleList[*it];
+               if (mod)
+                       m.name = mod->getName();
+               else 
+                       m.name = *it + " (Not Found)";
+               mInfo.push_back(m);
+       }
+       return mInfo;
+}
+
+
+TextClass const & GuiDocument::textClass() const
+{
+       return textclasslist[bp_.baseClass()];
+}
+
+
+static void dispatch_bufferparams(Dialog const & dialog,
+       BufferParams const & bp, kb_action lfun)
+{
+       ostringstream ss;
+       ss << "\\begin_header\n";
+       bp.writeFile(ss);
+       ss << "\\end_header\n";
+       dialog.dispatch(FuncRequest(lfun, ss.str()));
+}
+
+
+void GuiDocument::dispatchParams()
+{
+       // This must come first so that a language change is correctly noticed
+       setLanguage();
+
+       // Apply the BufferParams. Note that this will set the base class
+       // and then update the buffer's layout.
+       dispatch_bufferparams(*this, params(), LFUN_BUFFER_PARAMS_APPLY);
+
+       // Generate the colours requested by each new branch.
+       BranchList & branchlist = params().branchlist();
+       if (!branchlist.empty()) {
+               BranchList::const_iterator it = branchlist.begin();
+               BranchList::const_iterator const end = branchlist.end();
+               for (; it != end; ++it) {
+                       docstring const & current_branch = it->getBranch();
+                       Branch const * branch = branchlist.find(current_branch);
+                       string const x11hexname = X11hexname(branch->getColor());
+                       // display the new color
+                       docstring const str = current_branch + ' ' + from_ascii(x11hexname);
+                       dispatch(FuncRequest(LFUN_SET_COLOR, str));
+               }
+
+               // Open insets of selected branches, close deselected ones
+               dispatch(FuncRequest(LFUN_ALL_INSETS_TOGGLE,
+                       "assign branch"));
+       }
+       // FIXME: If we used an LFUN, we would not need those two lines:
+       bufferview()->processUpdateFlags(Update::Force | Update::FitCursor);
+}
+
+
+void GuiDocument::setLanguage() const
+{
+       Language const * const newL = bp_.language;
+       if (buffer().params().language == newL)
+               return;
+
+       string const & lang_name = newL->lang();
+       dispatch(FuncRequest(LFUN_BUFFER_LANGUAGE, lang_name));
+}
+
+
+void GuiDocument::saveAsDefault() const
 {
-       return validate_listings_params().empty();
+       dispatch_bufferparams(*this, params(), LFUN_BUFFER_SAVE_AS_DEFAULT);
 }
 
 
+bool GuiDocument::isFontAvailable(string const & font) const
+{
+       if (font == "default" || font == "cmr"
+           || font == "cmss" || font == "cmtt")
+               // these are standard
+               return true;
+       if (font == "lmodern" || font == "lmss" || font == "lmtt")
+               return LaTeXFeatures::isAvailable("lmodern");
+       if (font == "times" || font == "palatino"
+                || font == "helvet" || font == "courier")
+               return LaTeXFeatures::isAvailable("psnfss");
+       if (font == "cmbr" || font == "cmtl")
+               return LaTeXFeatures::isAvailable("cmbright");
+       if (font == "utopia")
+               return LaTeXFeatures::isAvailable("utopia")
+                       || LaTeXFeatures::isAvailable("fourier");
+       if (font == "beraserif" || font == "berasans"
+               || font == "beramono")
+               return LaTeXFeatures::isAvailable("bera");
+       return LaTeXFeatures::isAvailable(font);
+}
+
+
+bool GuiDocument::providesOSF(string const & font) const
+{
+       if (font == "cmr")
+               return isFontAvailable("eco");
+       if (font == "palatino")
+               return isFontAvailable("mathpazo");
+       return false;
+}
+
+
+bool GuiDocument::providesSC(string const & font) const
+{
+       if (font == "palatino")
+               return isFontAvailable("mathpazo");
+       if (font == "utopia")
+               return isFontAvailable("fourier");
+       return false;
+}
+
+
+bool GuiDocument::providesScale(string const & font) const
+{
+       return font == "helvet" || font == "luximono"
+               || font == "berasans"  || font == "beramono";
+}
+
+
+void GuiDocument::loadModuleInfo()
+{
+       moduleNames_.clear();
+       LyXModuleList::const_iterator it  = moduleList.begin();
+       LyXModuleList::const_iterator end = moduleList.end();
+       for (; it != end; ++it) {
+               modInfoStruct m;
+               m.id = it->getID();
+               m.name = it->getName();
+               moduleNames_.push_back(m);
+       }
+}
+
+
+Dialog * createGuiDocument(GuiView & lv) { return new GuiDocument(lv); }
+
+
 } // namespace frontend
 } // namespace lyx