]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiDocument.cpp
Allow selection of a local layout file from the document->settings dialog.
[lyx.git] / src / frontends / qt4 / GuiDocument.cpp
index 5416079e6b32128737917fd647bd6acc81c5ac7d..d8d96144faa12bd878c09c0a3deb0e33b9c81e00 100644 (file)
@@ -4,6 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Edwin Leuven
+ * \author Richard Heck (modules)
  *
  * Full author contact details are available in file CREDITS.
  */
 
 #include "GuiDocument.h"
 
-#include "FloatPlacement.h"
-#include "LengthCombo.h"
-#include "PanelStack.h"
-#include "qt_helpers.h"
-#include "Validator.h"
-
-// For the Branches module
-#include "GuiBranches.h"
-
-#include "GuiViewSource.h" // For latexHighlighter use in the preamble.
-
+#include "LayoutFile.h"
+#include "BranchList.h"
+#include "buffer_funcs.h"
+#include "Buffer.h"
 #include "BufferParams.h"
+#include "BufferView.h"
+#include "Color.h"
 #include "Encoding.h"
-#include "gettext.h"
-#include "frontend_helpers.h" // getSecond()
+#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 "TextClassList.h"
+#include "ModuleList.h"
+#include "OutputParams.h"
+#include "PanelStack.h"
+#include "PDFOptions.h"
+#include "qt_helpers.h"
 #include "Spacing.h"
+#include "Validator.h"
 
 #include "insets/InsetListingsParams.h"
 
+#include "support/debug.h"
+#include "support/FileName.h"
+#include "support/FileFilterList.h"
+#include "support/filetools.h"
 #include "support/lstrings.h"
 
+#include "frontends/alert.h"
+
 #include <QCloseEvent>
 #include <QScrollBar>
 #include <QTextCursor>
 
-#include <algorithm>
+#include <sstream>
 
-using lyx::support::token;
-using lyx::support::bformat;
-using lyx::support::findToken;
-using lyx::support::getVectorFromString;
+using namespace std;
+using namespace lyx::support;
 
-using std::distance;
-using std::make_pair;
-using std::pair;
-using std::vector;
-using std::string;
 
+namespace {
 
 char const * const tex_graphics[] =
 {
@@ -116,9 +123,315 @@ char const * tex_fonts_monospaced_gui[] =
 vector<pair<string, lyx::docstring> > pagestyles;
 
 
+} // anonymous namespace
+
 namespace lyx {
+
+namespace {
+// used when sorting the textclass list.
+class less_textclass_avail_desc
+       : public binary_function<string, string, int>
+{
+public:
+       int operator()(string const & lhs, string const & rhs) const
+       {
+               // Ordering criteria:
+               //   1. Availability of text class
+               //   2. Description (lexicographic)
+               LayoutFile const & tc1 = LayoutFileList::get()[lhs];
+               LayoutFile const & tc2 = LayoutFileList::get()[rhs];
+               return (tc1.isTeXClassAvailable() && !tc2.isTeXClassAvailable()) ||
+                       (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() &&
+                        _(tc1.description()) < _(tc2.description()));
+       }
+};
+
+}
+
 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
@@ -188,15 +501,14 @@ 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));
+       QList<LanguagePair> langs = languageData(false);        
+       for (int i = 0; i != langs.size(); ++i)
+               lang_.append(langs[i].second);
 
        connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
        connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
@@ -219,7 +531,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()));
@@ -237,6 +549,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()), 
@@ -299,19 +613,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);
        }
@@ -321,9 +635,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>;
@@ -419,6 +733,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(
@@ -433,6 +751,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);
@@ -448,29 +768,28 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
                marginsModule->headheightL);
        bc().addCheckedLineEdit(marginsModule->footskipLE,
                marginsModule->footskipL);
+       bc().addCheckedLineEdit(marginsModule->columnsepLE,
+               marginsModule->columnsepL);
 
 
        langModule = new UiWidget<Ui::LanguageUi>;
-       connect(langModule->defaultencodingCB, SIGNAL(toggled(bool)),
-               langModule->encodingL, SLOT(setDisabled(bool)));
-       connect(langModule->defaultencodingCB, SIGNAL(toggled(bool)),
-               langModule->encodingCO, SLOT(setDisabled(bool)));
        // language & quote
        connect(langModule->languageCO, SIGNAL(activated(int)),
                this, SLOT(change_adaptor()));
-       connect(langModule->defaultencodingCB, SIGNAL(clicked()),
+       connect(langModule->defaultencodingRB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(langModule->otherencodingRB, SIGNAL(clicked()),
                this, SLOT(change_adaptor()));
        connect(langModule->encodingCO, SIGNAL(activated(int)),
                this, SLOT(change_adaptor()));
        connect(langModule->quoteStyleCO, SIGNAL(activated(int)),
                this, SLOT(change_adaptor()));
        // language & quotes
-       vector<LanguagePair> const langs = getLanguageData(false);
-       vector<LanguagePair>::const_iterator lit  = langs.begin();
-       vector<LanguagePair>::const_iterator lend = langs.end();
-       for (; lit != lend; ++lit) {
-               langModule->languageCO->addItem(toqstr(lit->first));
-       }
+
+       QList<LanguagePair>::const_iterator lit  = langs.begin();
+       QList<LanguagePair>::const_iterator lend = langs.end();
+       for (; lit != lend; ++lit)
+               langModule->languageCO->addItem(lit->first);
 
        // Always put the default encoding in the first position.
        // It is special because the displayed text is translated.
@@ -488,7 +807,6 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
        langModule->quoteStyleCO->addItem(qt_(">>text<<"));
 
 
-
        numberingModule = new UiWidget<Ui::NumberingUi>;
        // numbering
        connect(numberingModule->depthSL, SIGNAL(valueChanged(int)),
@@ -544,29 +862,46 @@ 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()));
-       // packages
+       connect(latexModule->classCO, SIGNAL(activated(int)),
+               this, SLOT(change_adaptor()));
+       connect(latexModule->layoutPB, SIGNAL(clicked()),
+               this, SLOT(browseLayout()));
+       
+       selectionManager = 
+               new ModuleSelMan(latexModule->availableLV, latexModule->selectedLV, 
+                       latexModule->addPB, latexModule->deletePB, 
+                       latexModule->upPB, latexModule->downPB, 
+                       availableModel(), selectedModel());
+       connect(selectionManager, SIGNAL(updateHook()),
+               this, SLOT(updateModuleInfo()));
+       connect(selectionManager, SIGNAL(updateHook()),
+               this, SLOT(change_adaptor()));
+       
+       // postscript drivers
        for (int n = 0; tex_graphics[n][0]; ++n) {
                QString enc = qt_(tex_graphics_gui[n]);
                latexModule->psdriverCO->addItem(enc);
        }
-       // latex
-       for (TextClassList::const_iterator cit = textclasslist.begin();
-            cit != textclasslist.end(); ++cit) {
-               if (cit->isTeXClassAvailable()) {
-                       latexModule->classCO->addItem(toqstr(cit->description()));
-               } else {
-                       docstring item =
-                               bformat(_("Unavailable: %1$s"), from_utf8(cit->description()));
-                       latexModule->classCO->addItem(toqstr(item));
-               }
+       // latex classes
+       latexModule->classCO->setModel(&classes_model_);
+       LayoutFileList const & bcl = LayoutFileList::get();
+       vector<LayoutFileIndex> classList = bcl.classList();
+       sort(classList.begin(), classList.end(), less_textclass_avail_desc());
+
+       vector<LayoutFileIndex>::const_iterator cit  = classList.begin();
+       vector<LayoutFileIndex>::const_iterator cen = classList.end();
+       for (int i = 0; cit != cen; ++cit, ++i) {
+               LayoutFile const & tc = bcl[*cit];
+               docstring item = (tc.isTeXClassAvailable()) ?
+                       from_utf8(tc.description()) :
+                       bformat(_("Unavailable: %1$s"), from_utf8(tc.description()));
+               classes_model_.insertRow(i, toqstr(item), *cit);
        }
 
        // branches
@@ -584,26 +919,72 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
        connect(bulletsModule, SIGNAL(changed()),
                this, SLOT(change_adaptor()));
 
+       // embedded files
+       embeddedFilesModule = new UiWidget<Ui::EmbeddedFilesUi>;
+       connect(embeddedFilesModule->addPB, SIGNAL(clicked()),
+               this, SLOT(addExtraEmbeddedFile()));
+       connect(embeddedFilesModule->removePB, SIGNAL(clicked()),
+               this, SLOT(removeExtraEmbeddedFile()));
+
+       // PDF support
+       pdfSupportModule = new UiWidget<Ui::PDFSupportUi>;
+
+       connect(pdfSupportModule->use_hyperrefGB, SIGNAL(toggled(bool)),
+               this, SLOT(change_adaptor()));
+       connect(pdfSupportModule->titleLE, SIGNAL(textChanged(const QString &)),
+               this, SLOT(change_adaptor()));
+       connect(pdfSupportModule->authorLE, SIGNAL(textChanged(const QString &)),
+               this, SLOT(change_adaptor()));
+       connect(pdfSupportModule->subjectLE, SIGNAL(textChanged(const QString &)),
+               this, SLOT(change_adaptor()));
+       connect(pdfSupportModule->keywordsLE, SIGNAL(textChanged(const QString &)),
+               this, SLOT(change_adaptor()));
+       connect(pdfSupportModule->bookmarksGB, SIGNAL(toggled(bool)),
+               this, SLOT(change_adaptor()));
+       connect(pdfSupportModule->bookmarksnumberedCB, SIGNAL(toggled(bool)),
+               this, SLOT(change_adaptor()));
+       connect(pdfSupportModule->bookmarksopenGB, SIGNAL(toggled(bool)),
+               this, SLOT(change_adaptor()));
+       connect(pdfSupportModule->bookmarksopenlevelSB, SIGNAL(valueChanged(int)),
+               this, SLOT(change_adaptor()));
+       connect(pdfSupportModule->breaklinksCB, SIGNAL(toggled(bool)),
+               this, SLOT(change_adaptor()));
+       connect(pdfSupportModule->pdfborderCB, SIGNAL(toggled(bool)),
+               this, SLOT(change_adaptor()));
+       connect(pdfSupportModule->colorlinksCB, SIGNAL(toggled(bool)),
+               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)),
+               this, SLOT(change_adaptor()));
+       connect(pdfSupportModule->optionsLE, SIGNAL(textChanged(const QString &)),
+               this, SLOT(change_adaptor()));
 
        // float
        floatModule = new FloatPlacement;
        connect(floatModule, SIGNAL(changed()),
                this, SLOT(change_adaptor()));
 
-       docPS->addPanel(latexModule, _("Document Class"));
-       docPS->addPanel(fontModule, _("Fonts"));
-       docPS->addPanel(textLayoutModule, _("Text Layout"));
-       docPS->addPanel(pageLayoutModule, _("Page Layout"));
-       docPS->addPanel(marginsModule, _("Page Margins"));
-       docPS->addPanel(langModule, _("Language"));
-       docPS->addPanel(numberingModule, _("Numbering & TOC"));
-       docPS->addPanel(biblioModule, _("Bibliography"));
-       docPS->addPanel(mathsModule, _("Math Options"));
-       docPS->addPanel(floatModule, _("Float Placement"));
-       docPS->addPanel(bulletsModule, _("Bullets"));
-       docPS->addPanel(branchesModule, _("Branches"));
-       docPS->addPanel(preambleModule, _("LaTeX Preamble"));
-       docPS->setCurrentPanel(_("Document Class"));
+       docPS->addPanel(latexModule, qt_("Document Class"));
+       docPS->addPanel(fontModule, qt_("Fonts"));
+       docPS->addPanel(textLayoutModule, qt_("Text Layout"));
+       docPS->addPanel(pageLayoutModule, qt_("Page Layout"));
+       docPS->addPanel(marginsModule, qt_("Page Margins"));
+       docPS->addPanel(langModule, qt_("Language"));
+       docPS->addPanel(numberingModule, qt_("Numbering & TOC"));
+       docPS->addPanel(biblioModule, qt_("Bibliography"));
+       docPS->addPanel(pdfSupportModule, qt_("PDF Properties"));
+       docPS->addPanel(mathsModule, qt_("Math Options"));
+       docPS->addPanel(floatModule, qt_("Float Placement"));
+       docPS->addPanel(bulletsModule, qt_("Bullets"));
+       docPS->addPanel(branchesModule, qt_("Branches"));
+       docPS->addPanel(embeddedFilesModule, qt_("Embedded Files"));
+       docPS->addPanel(preambleModule, qt_("LaTeX Preamble"));
+       docPS->setCurrentPanel(qt_("Document Class"));
 // FIXME: hack to work around resizing bug in Qt >= 4.2
 // bug verified with Qt 4.2.{0-3} (JSpitzm)
 #if QT_VERSION >= 0x040200
@@ -612,37 +993,31 @@ GuiDocumentDialog::GuiDocumentDialog(LyXView & lv)
 }
 
 
-ControlDocument & GuiDocumentDialog::controller() const
-{
-       return static_cast<ControlDocument &>(Dialog::controller());
-}
-
-
-void GuiDocumentDialog::showPreamble()
+void GuiDocument::showPreamble()
 {
-       docPS->setCurrentPanel(_("LaTeX Preamble"));
+       docPS->setCurrentPanel(qt_("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
@@ -661,7 +1036,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();
@@ -680,20 +1055,13 @@ void GuiDocumentDialog::set_listings_msg()
 }
 
 
-void GuiDocumentDialog::closeEvent(QCloseEvent * e)
-{
-       slotWMHide();
-       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);
@@ -701,7 +1069,7 @@ void GuiDocumentDialog::setSkip(int item)
 }
 
 
-void GuiDocumentDialog::enableSkip(bool skip)
+void GuiDocument::enableSkip(bool skip)
 {
        textLayoutModule->skipCO->setEnabled(skip);
        textLayoutModule->skipLE->setEnabled(skip);
@@ -710,19 +1078,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);
 
@@ -736,7 +1104,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);
@@ -765,10 +1139,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"));
@@ -786,33 +1166,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();
@@ -842,20 +1222,218 @@ void GuiDocumentDialog::updatePagestyle(string const & items, string const & sel
 }
 
 
-void GuiDocumentDialog::classChanged()
+void GuiDocument::browseLayout()
+{
+       QString const label1 = qt_("Layouts|#o#O");
+       QString const dir1 = toqstr(lyxrc.document_path);
+       FileFilterList const filter(_("LyX Layout (*.layout)"));
+       QString file = browseRelFile(QString(), bufferFilepath(),
+               qt_("Local layout file"), filter, false,
+               label1, dir1);
+
+       if (!suffixIs(fromqstr(file), ".layout"))
+               return;
+
+       FileName layoutFile = makeAbsPath(fromqstr(file),
+               fromqstr(bufferFilepath()));
+       
+       // load the layout file
+       LayoutFileList & bcl = LayoutFileList::get();
+       string classname = layoutFile.onlyFileName();
+       LayoutFileIndex name = bcl.addLayoutFile(
+               classname.substr(0, classname.size() - 7),
+               layoutFile.onlyPath().absFilename());
+
+       if (name.empty()) {
+               Alert::error(_("Error"),
+                       _("Unable to read local layout file."));                
+               return;
+       }
+
+       // do not trigger classChanged if there is no change.
+       if (latexModule->classCO->currentText() == toqstr(name))
+               return;
+               
+       // add to combo box
+       int idx = latexModule->classCO->findText(toqstr(name));
+       if (idx == -1) {
+               classes_model_.insertRow(0, toqstr(name), name);
+               latexModule->classCO->setCurrentIndex(0);
+       } else
+               latexModule->classCO->setCurrentIndex(idx);
+       classChanged();
+}
+
+
+void GuiDocument::classChanged()
+{
+       int idx = latexModule->classCO->currentIndex();
+       if (idx < 0) 
+               return;
+       string const classname = classes_model_.getIDString(idx);
+       // check if this is a local layout file
+       if (prefixIs(classname, LayoutFileList::localPrefix)) {
+               int const ret = Alert::prompt(_("Local layout file"),
+                               _("The layout file you have selected is a local layout\n"
+                                 "file, not one in the system or user directory. Your\n"
+                                 "document may not work with this layout if you do not\n"
+                                 "keep the layout file in the same directory."),
+                                 1, 1, _("&Set Layout"), _("&Cancel"));
+               if (ret == 1) {
+                       // try to reset the layout combo
+                       setLayoutComboByIDString(bp_.baseClassID());
+                       return;
+               }
+       }
+       if (!bp_.setBaseClass(classname)) {
+               Alert::error(_("Error"), _("Unable to set document class."));
+               return;
+       }
+       if (lyxrc.auto_reset_options) {
+               if (applyPB->isEnabled()) {
+                       int const ret = Alert::prompt(_("Unapplied changes"),
+                                       _("Some changes in the dialog were not yet applied.\n"
+                                       "If you do not apply now, they will be lost after this action."),
+                                       1, 1, _("&Apply"), _("&Dismiss"));
+                       if (ret == 0)
+                               applyView();
+               }
+               bp_.useClassDefaults();
+               forceUpdate();
+       }
+}
+
+
+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
+       bool const focusOnSelected = selectionManager->selectedFocused();
+       QListView const * const lv = 
+                       focusOnSelected ? latexModule->selectedLV : latexModule->availableLV;
+       if (lv->selectionModel()->selectedIndexes().isEmpty()) {
+               latexModule->infoML->document()->clear();
+               return;
+       }
+       QModelIndex const & idx = lv->selectionModel()->currentIndex();
+       GuiIdListModel const & idModel = 
+                       focusOnSelected  ? modules_sel_model_ : modules_av_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::setExtraEmbeddedFileList()
+{
+       embeddedFilesModule->extraLW->clear();
+       // add current embedded files
+       vector<string> const & files = buffer().params().extraEmbeddedFiles();
+       vector<string>::const_iterator fit = files.begin();
+       vector<string>::const_iterator fit_end = files.end();
+       for (; fit != fit_end; ++fit)
+               embeddedFilesModule->extraLW->addItem(toqstr(*fit));
+}
+
+
+void GuiDocument::addExtraEmbeddedFile()
+{
+       QString file = browseRelFile(QString(), bufferFilepath(),
+               qt_("Extra embedded file"), FileFilterList(), true);
+
+       if (embeddedFilesModule->extraLW->findItems(file, Qt::MatchExactly).empty())
+               embeddedFilesModule->extraLW->addItem(file);
+}
+
+
+void GuiDocument::removeExtraEmbeddedFile()
 {
-       BufferParams & params = controller().params();
-       textclass_type const tc = latexModule->classCO->currentIndex();
-       params.setJustBaseClass(tc);
-       if (lyxrc.auto_reset_options)
-               params.useClassDefaults();
-       update_contents();
+       int index = embeddedFilesModule->extraLW->currentRow();
+       delete embeddedFilesModule->extraLW->takeItem(index);
 }
 
 
-void GuiDocumentDialog::updateNumbering()
+void GuiDocument::updateNumbering()
 {
-       TextClass const & tclass = controller().params().getTextClass();
+       DocumentClass const & tclass = bp_.documentClass();
 
        numberingModule->tocTW->setUpdatesEnabled(false);
        numberingModule->tocTW->clear();
@@ -864,15 +1442,15 @@ 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) {
+
+       DocumentClass::const_iterator lit = tclass.begin();
+       DocumentClass::const_iterator len = tclass.end();
+       for (; lit != len; ++lit) {
+               int const toclevel = lit->toclevel;
+               if (toclevel != Layout::NOT_IN_TOC && lit->labeltype == LABEL_COUNTER) {
                        item = new QTreeWidgetItem(numberingModule->tocTW);
-                       item->setText(0, toqstr(translateIfPossible((*cit)->name())));
+                       item->setText(0, toqstr(translateIfPossible(lit->name())));
                        item->setText(1, (toclevel <= depth) ? yes : no);
                        item->setText(2, (toclevel <= toc) ? yes : no);
                }
@@ -882,7 +1460,8 @@ void GuiDocumentDialog::updateNumbering()
        numberingModule->tocTW->update();
 }
 
-void GuiDocumentDialog::apply(BufferParams & params)
+
+void GuiDocument::apply(BufferParams & params)
 {
        // preamble
        preambleModule->apply(params);
@@ -905,7 +1484,7 @@ void GuiDocumentDialog::apply(BufferParams & params)
                biblioModule->bibtopicCB->isChecked();
 
        // language & quotes
-       if (langModule->defaultencodingCB->isChecked()) {
+       if (langModule->defaultencodingRB->isChecked()) {
                params.inputenc = "auto";
        } else {
                int i = langModule->encodingCO->currentIndex();
@@ -940,10 +1519,10 @@ void GuiDocumentDialog::apply(BufferParams & params)
        params.quotes_language = lga;
 
        int const pos = langModule->languageCO->currentIndex();
-       params.language = lyx::languages.getLanguage(lang_[pos]);
+       params.language = lyx::languages.getLanguage(fromqstr(lang_[pos]));
 
        // numbering
-       if (params.getTextClass().hasTocLevels()) {
+       if (params.documentClass().hasTocLevels()) {
                params.tocdepth = numberingModule->tocSL->value();
                params.secnumdepth = numberingModule->depthSL->value();
        }
@@ -957,6 +1536,20 @@ void GuiDocumentDialog::apply(BufferParams & params)
        // packages
        params.graphicsDriver =
                tex_graphics[latexModule->psdriverCO->currentIndex()];
+       
+       // text layout
+       int idx = latexModule->classCO->currentIndex();
+       if (idx >= 0) {
+               string const classname = classes_model_.getIDString(idx);
+               params.setBaseClass(classname);
+       }
+
+       // Modules
+       params.clearLayoutModules();
+       int const srows = modules_sel_model_.rowCount();
+       vector<string> selModList;
+       for (int i = 0; i < srows; ++i)
+               params.addLayoutModule(modules_sel_model_.getIDString(i));
 
        if (mathsModule->amsautoCB->isChecked()) {
                params.use_amsmath = BufferParams::package_auto;
@@ -976,9 +1569,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 {
@@ -1068,7 +1658,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)
@@ -1092,9 +1682,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;
@@ -1102,48 +1692,76 @@ void GuiDocumentDialog::apply(BufferParams & params)
                params.orientation = ORIENTATION_PORTRAIT;
 
        // margins
-       params.use_geometry =
-               (!marginsModule->marginCB->isChecked()
-               || geom_papersize);
+       params.use_geometry = !marginsModule->marginCB->isChecked()
+               || geom_papersize;
 
-       Ui::MarginsUi const * m(marginsModule);
+       Ui::MarginsUi const * m = marginsModule;
 
        params.leftmargin = widgetsToLength(m->innerLE, m->innerUnit);
-
        params.topmargin = widgetsToLength(m->topLE, m->topUnit);
-
        params.rightmargin = widgetsToLength(m->outerLE, m->outerUnit);
-
        params.bottommargin = widgetsToLength(m->bottomLE, m->bottomUnit);
-
        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);
+
+       // PDF support
+       PDFOptions & pdf = params.pdfoptions();
+       pdf.use_hyperref = pdfSupportModule->use_hyperrefGB->isChecked();
+       pdf.title = fromqstr(pdfSupportModule->titleLE->text());
+       pdf.author = fromqstr(pdfSupportModule->authorLE->text());
+       pdf.subject = fromqstr(pdfSupportModule->subjectLE->text());
+       pdf.keywords = fromqstr(pdfSupportModule->keywordsLE->text());
+
+       pdf.bookmarks = pdfSupportModule->bookmarksGB->isChecked();
+       pdf.bookmarksnumbered = pdfSupportModule->bookmarksnumberedCB->isChecked();
+       pdf.bookmarksopen = pdfSupportModule->bookmarksopenGB->isChecked();
+       pdf.bookmarksopenlevel = pdfSupportModule->bookmarksopenlevelSB->value();
+
+       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();
+       if (pdfSupportModule->fullscreenCB->isChecked())
+               pdf.pagemode = pdf.pagemode_fullscreen;
+       else
+               pdf.pagemode.clear();
+       pdf.quoted_options = pdf.quoted_options_check(
+                               fromqstr(pdfSupportModule->optionsLE->text()));
+
+       // Embedded files
+       vector<string> & files = params.extraEmbeddedFiles();
+       files.clear();
+       for (int i = 0; i < embeddedFilesModule->extraLW->count(); ++i) {
+               QListWidgetItem * item = embeddedFilesModule->extraLW->item(i);
+               files.push_back(fromqstr(item->text()));
+       }
 }
 
 
-/** Return the position of val in the vector if found.
-    If not found, return 0.
- */
-template<class A>
-static size_t findPos(std::vector<A> const & vec, A const & val)
+static int findPos(QStringList const & vec, QString const & val)
+{
+       for (int i = 0; i != vec.size(); ++i)
+               if (vec[i] == val)
+                       return i;
+       return 0;
+}
+
+
+void GuiDocument::updateParams()
 {
-       typename std::vector<A>::const_iterator it =
-               std::find(vec.begin(), vec.end(), val);
-       if (it == vec.end())
-               return 0;
-       return distance(vec.begin(), it);
+       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;
@@ -1167,7 +1785,7 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
        }
 
        // preamble
-       preambleModule->update(params, controller().id());
+       preambleModule->update(params, id());
 
        // biblio
        biblioModule->citeDefaultRB->setChecked(
@@ -1187,17 +1805,15 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
                params.use_bibtopic);
 
        // language & quotes
-       int const pos = int(findPos(lang_,
-                                   params.language->lang()));
+       int const pos = findPos(lang_, toqstr(params.language->lang()));
        langModule->languageCO->setCurrentIndex(pos);
 
        langModule->quoteStyleCO->setCurrentIndex(
                params.quotes_language);
 
-       langModule->defaultencodingCB->setChecked(true);
-
+       bool default_enc = true;
        if (params.inputenc != "auto") {
-               langModule->defaultencodingCB->setChecked(false);
+               default_enc = false;
                if (params.inputenc == "default") {
                        langModule->encodingCO->setCurrentIndex(0);
                } else {
@@ -1207,14 +1823,16 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
                                langModule->encodingCO->setCurrentIndex(i);
                        else
                                // unknown encoding. Set to default.
-                               langModule->defaultencodingCB->setChecked(true);
+                               default_enc = true;
                }
        }
+       langModule->defaultencodingRB->setChecked(default_enc);
+       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 = documentClass().min_toclevel();
+       int const max_toclevel = documentClass().max_toclevel();
+       if (documentClass().hasTocLevels()) {
                numberingModule->setEnabled(true);
                numberingModule->depthSL->setMinimum(min_toclevel - 1);
                numberingModule->depthSL->setMaximum(max_toclevel);
@@ -1239,7 +1857,8 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
        int nitem = findToken(tex_graphics, params.graphicsDriver);
        if (nitem >= 0)
                latexModule->psdriverCO->setCurrentIndex(nitem);
-
+       updateModuleInfo();
+       
        mathsModule->amsCB->setChecked(
                params.use_amsmath == BufferParams::package_on);
        mathsModule->amsautoCB->setChecked(
@@ -1258,9 +1877,10 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
        }
 
        // text layout
-       latexModule->classCO->setCurrentIndex(params.getBaseClass());
+       string const & layoutID = params.baseClassID();
+       setLayoutComboByIDString(layoutID);
 
-       updatePagestyle(controller().textClass().opt_pagestyle(),
+       updatePagestyle(documentClass().opt_pagestyle(),
                                 params.pagestyle);
 
        textLayoutModule->lspacingCO->setCurrentIndex(nitem);
@@ -1270,12 +1890,10 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
        }
        setLSpacing(nitem);
 
-       if (params.paragraph_separation
-           == BufferParams::PARSEP_INDENT) {
+       if (params.paragraph_separation == BufferParams::PARSEP_INDENT)
                textLayoutModule->indentRB->setChecked(true);
-       } else {
+       else
                textLayoutModule->skipRB->setChecked(true);
-       }
 
        int skip = 0;
        switch (params.getDefSkip().kind()) {
@@ -1322,7 +1940,7 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
        floatModule->set(params.float_placement);
 
        // Fonts
-       updateFontsize(controller().textClass().opt_fontsize(),
+       updateFontsize(documentClass().opt_fontsize(),
                        params.fontsize);
 
        int n = findToken(tex_fonts_roman, params.fontsRoman);
@@ -1347,7 +1965,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);
 
@@ -1362,7 +1980,7 @@ void GuiDocumentDialog::updateParams(BufferParams const & params)
        pageLayoutModule->portraitRB->setChecked(!landscape);
 
        pageLayoutModule->facingPagesCB->setChecked(
-               params.sides == TextClass::TwoSides);
+               params.sides == TwoSides);
 
 
        lengthToWidgets(pageLayoutModule->paperwidthLE,
@@ -1397,47 +2015,335 @@ 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
+       PDFOptions const & pdf = params.pdfoptions();
+       pdfSupportModule->use_hyperrefGB->setChecked(pdf.use_hyperref);
+       pdfSupportModule->titleLE->setText(toqstr(pdf.title));
+       pdfSupportModule->authorLE->setText(toqstr(pdf.author));
+       pdfSupportModule->subjectLE->setText(toqstr(pdf.subject));
+       pdfSupportModule->keywordsLE->setText(toqstr(pdf.keywords));
+
+       pdfSupportModule->bookmarksGB->setChecked(pdf.bookmarks);
+       pdfSupportModule->bookmarksnumberedCB->setChecked(pdf.bookmarksnumbered);
+       pdfSupportModule->bookmarksopenGB->setChecked(pdf.bookmarksopen);
+
+       pdfSupportModule->bookmarksopenlevelSB->setValue(pdf.bookmarksopenlevel);
+
+       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);
+       pdfSupportModule->fullscreenCB->setChecked
+               (pdf.pagemode == pdf.pagemode_fullscreen);
+
+       pdfSupportModule->optionsLE->setText(
+               toqstr(pdf.quoted_options));
+       
+       setExtraEmbeddedFileList();
 }
 
 
-void GuiDocumentDialog::applyView()
+void GuiDocument::applyView()
 {
-       apply(controller().params());
+       apply(params());
 }
 
 
-void GuiDocumentDialog::update_contents()
+void GuiDocument::saveDocDefault()
 {
-       updateParams(controller().params());
+       // we have to apply the params first
+       applyView();
+       saveAsDefault();
 }
 
 
-void GuiDocumentDialog::saveDocDefault()
+void GuiDocument::updateAvailableModules() 
 {
-       // we have to apply the params first
-       applyView();
-       controller().saveAsDefault();
+       modules_av_model_.clear();
+       vector<modInfoStruct> const modInfoList = getModuleInfo();
+       int const mSize = modInfoList.size();
+       for (int i = 0; i != mSize; ++i) {
+               modInfoStruct const & modInfo = modInfoList[i];
+               modules_av_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
+       }
 }
 
 
-void GuiDocumentDialog::useClassDefaults()
+void GuiDocument::updateSelectedModules() 
 {
-       BufferParams & params = controller().params();
+       // and selected ones, too
+       modules_sel_model_.clear();
+       vector<modInfoStruct> const selModList = getSelectedModules();
+       int const sSize = selModList.size();
+       for (int i = 0; i != sSize; ++i) {
+               modInfoStruct const & modInfo = selModList[i];
+               modules_sel_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
+       }
+}
 
-       params.setJustBaseClass(latexModule->classCO->currentIndex());
 
-       params.useClassDefaults();
-       update_contents();
+void GuiDocument::updateContents()
+{
+       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();
 }
 
 
-bool GuiDocumentDialog::isValid()
+void GuiDocument::forceUpdate()
 {
-       return validate_listings_params().empty();
+       // reset to force dialog update
+       current_id_ = 0;
+       updateContents();
 }
 
 
+void GuiDocument::useClassDefaults()
+{
+       if (applyPB->isEnabled()) {
+               int const ret = Alert::prompt(_("Unapplied changes"),
+                               _("Some changes in the dialog were not yet applied.\n"
+                                 "If you do not apply now, they will be lost after this action."),
+                               1, 1, _("&Apply"), _("&Dismiss"));
+               if (ret == 0)
+                       applyView();
+       }
+
+       int idx = latexModule->classCO->currentIndex();
+       string const classname = classes_model_.getIDString(idx);
+       if (!bp_.setBaseClass(classname)) {
+               Alert::error(_("Error"), _("Unable to set document class."));
+               return;
+       }
+       bp_.useClassDefaults();
+       forceUpdate();
+}
+
+
+void GuiDocument::setLayoutComboByIDString(std::string const & idString)
+{
+       int idx = classes_model_.findIDString(idString);
+       if (idx < 0)
+               Alert::warning(_("Can't set layout!"), 
+                       bformat(_("Unable to set layout for ID: %1$s"), from_utf8(idString)));
+       else 
+               latexModule->classCO->setCurrentIndex(idx);
+}
+
+
+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;
+}
+
+
+DocumentClass const & GuiDocument::documentClass() const
+{
+       return bp_.documentClass();
+}
+
+
+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
+{
+       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