X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDocument.cpp;h=dcc118de19c589df76857ec6bb5f3a99916f1672;hb=d45ca67d1d3e2d4fdc344cd2a1517725bc91723a;hp=7063e9e0e2d2c228a6e356280e8d2dc1db4b54e4;hpb=80e98c5b715f7f239d67dc8d96f4db311c5c0fd3;p=lyx.git diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index 7063e9e0e2..dcc118de19 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -13,73 +13,79 @@ #include "GuiDocument.h" +#include "GuiApplication.h" +#include "GuiBranches.h" +#include "GuiSelectionManager.h" +#include "LaTeXHighlighter.h" +#include "LengthCombo.h" +#include "PanelStack.h" +#include "Validator.h" + +#include "LayoutFile.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 "Spacing.h" -#include "TextClassList.h" -#include "Validator.h" #include "insets/InsetListingsParams.h" +#include "support/debug.h" #include "support/FileName.h" #include "support/filetools.h" +#include "support/gettext.h" #include "support/lstrings.h" -#include +#include "frontends/alert.h" +#include #include #include #include -#include #include +#ifdef IN +#undef IN +#endif + + using namespace std; using namespace lyx::support; -/// -template -vector const -getSecond(vector const & pr) -{ - vector tmp(pr.size()); - transform(pr.begin(), pr.end(), tmp.begin(), - boost::bind(&Pair::second, _1)); - return tmp; -} + +namespace { char const * const tex_graphics[] = { - "default", "dvips", "dvitops", "emtex", - "ln", "oztex", "textures", "none", "" + "default", "dvialw", "dvilaser", "dvipdf", "dvipdfm", "dvipdfmx", + "dvips", "dvipsone", "dvitops", "dviwin", "dviwindo", "dvi2ps", "emtex", + "ln", "oztex", "pctexhp", "pctexps", "pctexwin", "pctex32", "pdftex", + "psprint", "pubps", "tcidvi", "textures", "truetex", "vtex", "xdvi", + "xetex", "none", "" }; char const * const tex_graphics_gui[] = { - N_("Default"), "Dvips", "DVItoPS", "EmTeX", - "LN", "OzTeX", "Textures", N_("None"), "" + N_("Default"), "dvialw", "DviLaser", "dvipdf", "DVIPDFM", "DVIPDFMx", + "Dvips", "DVIPSONE", "DVItoPS", "DVIWIN", "DVIWindo", "dvi2ps", "EmTeX", + "LN", "OzTeX", "pctexhp", "pctexps", "pctexwin", "PCTeX32", "pdfTeX", + "psprint", "pubps", "tcidvi", "Textures", "TrueTeX", "VTeX", "xdvi", + "XeTeX", N_("None"), "" }; @@ -128,11 +134,336 @@ char const * tex_fonts_monospaced_gui[] = }; -vector > pagestyles; +vector > pagestyles; +} // anonymous namespace + namespace lyx { + +namespace { +// used when sorting the textclass list. +class less_textclass_avail_desc + : public binary_function +{ +public: + bool 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 { +namespace { + +vector getRequiredList(string const & modName) +{ + LyXModule const * const mod = moduleList[modName]; + if (!mod) + return vector(); //empty such thing + return mod->getRequiredModules(); +} + + +vector getExcludedList(string const & modName) +{ + LyXModule const * const mod = moduleList[modName]; + if (!mod) + return vector(); //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 getPackageList(string const & modName) +{ + LyXModule const * const mod = moduleList[modName]; + if (!mod) + return vector(); //empty such thing + return mod->getPackageList(); +} + + +bool isModuleAvailable(string const & modName) +{ + LyXModule * mod = moduleList[modName]; + if (!mod) + return false; + return mod->isAvailable(); +} + +} // anonymous namespace + + +///////////////////////////////////////////////////////////////////// +// +// ModuleSelectionManager +// +///////////////////////////////////////////////////////////////////// + +/// SelectionManager for use with modules +class ModuleSelectionManager : public GuiSelectionManager +{ +public: + ModuleSelectionManager( + 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) + {} + + +private: + /// + virtual void updateAddPB(); + /// + virtual void updateUpPB(); + /// + virtual void updateDownPB(); + /// + virtual void updateDelPB(); + /// returns availableModel as a GuiIdListModel + GuiIdListModel * getAvailableModel() + { + return dynamic_cast(availableModel); + } + /// returns selectedModel as a GuiIdListModel + GuiIdListModel * getSelectedModel() + { + return dynamic_cast(selectedModel); + } +}; + +void ModuleSelectionManager::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 reqs = getRequiredList(modName); + vector excl = getExcludedList(modName); + + if (reqs.empty() && excl.empty()) { + addPB->setEnabled(true); + return; + } + + int const srows = selectedModel->rowCount(); + vector selModList; + for (int i = 0; i < srows; ++i) + selModList.push_back(getSelectedModel()->getIDString(i)); + + vector::const_iterator selModStart = selModList.begin(); + vector::const_iterator selModEnd = selModList.end(); + + //Check whether some required module is available + if (!reqs.empty()) { + bool foundOne = false; + vector::const_iterator it = reqs.begin(); + vector::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::const_iterator it = excl.begin(); + vector::const_iterator end = excl.end(); + for (; it != end; ++it) { + if (find(selModStart, selModEnd, *it) != selModEnd) { + addPB->setEnabled(false); + return; + } + } + } + + addPB->setEnabled(true); +} + + +void ModuleSelectionManager::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 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 ModuleSelectionManager::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 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 ModuleSelectionManager::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 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); +} + ///////////////////////////////////////////////////////////////////// // @@ -140,7 +471,7 @@ namespace frontend { // ///////////////////////////////////////////////////////////////////// -PreambleModule::PreambleModule(): current_id_(0) +PreambleModule::PreambleModule() : current_id_(0) { // This is not a memory leak. The object will be destroyed // with this. @@ -169,7 +500,7 @@ void PreambleModule::update(BufferParams const & params, BufferId id) Coords::const_iterator it = preamble_coords_.find(current_id_); if (it == preamble_coords_.end()) // First time we open this one. - preamble_coords_[current_id_] = make_pair(0,0); + preamble_coords_[current_id_] = make_pair(0, 0); else { // Restore saved coords. QTextCursor cur = preambleTE->textCursor(); @@ -203,14 +534,10 @@ void PreambleModule::closeEvent(QCloseEvent * e) ///////////////////////////////////////////////////////////////////// - GuiDocument::GuiDocument(GuiView & lv) - : GuiDialog(lv, "document") + : GuiDialog(lv, "document", qt_("Document Settings")) { setupUi(this); - setViewTitle(_("Document Settings")); - - lang_ = getSecond(getLanguageData(false)); connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply())); @@ -233,7 +560,7 @@ GuiDocument::GuiDocument(GuiView & 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())); @@ -251,14 +578,16 @@ GuiDocument::GuiDocument(GuiView & 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()), this, SLOT(change_adaptor())); connect(textLayoutModule->bypassCB, SIGNAL(clicked()), - this, SLOT(set_listings_msg())); + this, SLOT(setListingsMessage())); connect(textLayoutModule->listingsED, SIGNAL(textChanged()), - this, SLOT(set_listings_msg())); + this, SLOT(setListingsMessage())); textLayoutModule->listingsTB->setPlainText( qt_("Input listings parameters on the right. Enter ? for a list of parameters.")); textLayoutModule->lspacingLE->setValidator(new QDoubleValidator( @@ -302,6 +631,8 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(change_adaptor())); connect(fontModule->fontsizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); + connect(fontModule->cjkFontLE, SIGNAL(textChanged(const QString &)), + this, SLOT(change_adaptor())); connect(fontModule->scaleSansSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor())); connect(fontModule->scaleTypewriterSB, SIGNAL(valueChanged(int)), @@ -405,34 +736,38 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(setCustomMargins(bool))); connect(marginsModule->marginCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); - connect(marginsModule->topLE, SIGNAL(textChanged(const QString &)), + connect(marginsModule->topLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(marginsModule->topUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(marginsModule->bottomLE, SIGNAL(textChanged(const QString &)), + connect(marginsModule->bottomLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(marginsModule->bottomUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(marginsModule->innerLE, SIGNAL(textChanged(const QString &)), + connect(marginsModule->innerLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(marginsModule->innerUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(marginsModule->outerLE, SIGNAL(textChanged(const QString &)), + connect(marginsModule->outerLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(marginsModule->outerUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(marginsModule->headheightLE, SIGNAL(textChanged(const QString &)), + connect(marginsModule->headheightLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(marginsModule->headheightUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(marginsModule->headsepLE, SIGNAL(textChanged(const QString &)), + connect(marginsModule->headsepLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(marginsModule->headsepUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(marginsModule->footskipLE, SIGNAL(textChanged(const QString&)), + connect(marginsModule->footskipLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(marginsModule->footskipUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor())); + connect(marginsModule->columnsepLE, SIGNAL(textChanged(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( @@ -447,6 +782,8 @@ GuiDocument::GuiDocument(GuiView & lv) marginsModule->headheightLE)); marginsModule->footskipLE->setValidator(unsignedLengthValidator( marginsModule->footskipLE)); + marginsModule->columnsepLE->setValidator(unsignedLengthValidator( + marginsModule->columnsepLE)); bc().addCheckedLineEdit(marginsModule->topLE, marginsModule->topL); @@ -462,6 +799,8 @@ GuiDocument::GuiDocument(GuiView & lv) marginsModule->headheightL); bc().addCheckedLineEdit(marginsModule->footskipLE, marginsModule->footskipL); + bc().addCheckedLineEdit(marginsModule->columnsepLE, + marginsModule->columnsepL); langModule = new UiWidget; @@ -477,20 +816,20 @@ GuiDocument::GuiDocument(GuiView & lv) connect(langModule->quoteStyleCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); // language & quotes - vector const langs = getLanguageData(false); - vector::const_iterator lit = langs.begin(); - vector::const_iterator lend = langs.end(); - for (; lit != lend; ++lit) { - langModule->languageCO->addItem(toqstr(lit->first)); - } + QAbstractItemModel * language_model = guiApp->languageModel(); + // FIXME: it would be nice if sorting was enabled/disabled via a checkbox. + language_model->sort(0); + langModule->languageCO->setModel(language_model); // Always put the default encoding in the first position. - // It is special because the displayed text is translated. - langModule->encodingCO->addItem(qt_("LaTeX default")); + langModule->encodingCO->addItem(qt_("Language Default (no inputenc)")); + QStringList encodinglist; Encodings::const_iterator it = encodings.begin(); Encodings::const_iterator const end = encodings.end(); for (; it != end; ++it) - langModule->encodingCO->addItem(toqstr(it->latexName())); + encodinglist.append(qt_(it->guiName())); + encodinglist.sort(); + langModule->encodingCO->addItems(encodinglist); langModule->quoteStyleCO->addItem(qt_("``text''")); langModule->quoteStyleCO->addItem(qt_("''text''")); @@ -500,7 +839,6 @@ GuiDocument::GuiDocument(GuiView & lv) langModule->quoteStyleCO->addItem(qt_(">>text<<")); - numberingModule = new UiWidget; // numbering connect(numberingModule->depthSL, SIGNAL(valueChanged(int)), @@ -556,17 +894,30 @@ GuiDocument::GuiDocument(GuiView & lv) latexModule = new UiWidget; // latex class - connect(latexModule->classCO, SIGNAL(activated(int)), + connect(latexModule->optionsLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); - connect(latexModule->optionsLE, SIGNAL(textChanged(const QString &)), + connect(latexModule->defaultOptionsCB, SIGNAL(clicked()), 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())); + connect(latexModule->layoutPB, SIGNAL(clicked()), + this, SLOT(browseLayout())); + connect(latexModule->layoutPB, SIGNAL(clicked()), + this, SLOT(change_adaptor())); + connect(latexModule->childDocGB, SIGNAL(clicked()), + this, SLOT(change_adaptor())); + connect(latexModule->childDocLE, SIGNAL(textChanged(QString)), + this, SLOT(change_adaptor())); + connect(latexModule->childDocPB, SIGNAL(clicked()), + this, SLOT(browseMaster())); - selectionManager = - new GuiSelectionManager(latexModule->availableLV, latexModule->selectedLV, + selectionManager = + new ModuleSelectionManager(latexModule->availableLV, + latexModule->selectedLV, latexModule->addPB, latexModule->deletePB, latexModule->upPB, latexModule->downPB, availableModel(), selectedModel()); @@ -581,18 +932,19 @@ GuiDocument::GuiDocument(GuiView & lv) latexModule->psdriverCO->addItem(enc); } // latex classes - //FIXME This seems too involved with the kernel. Some of this - //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) { - 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)); - } + latexModule->classCO->setModel(&classes_model_); + LayoutFileList const & bcl = LayoutFileList::get(); + vector classList = bcl.classList(); + sort(classList.begin(), classList.end(), less_textclass_avail_desc()); + + vector::const_iterator cit = classList.begin(); + vector::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 @@ -610,27 +962,18 @@ GuiDocument::GuiDocument(GuiView & lv) connect(bulletsModule, SIGNAL(changed()), this, SLOT(change_adaptor())); - // embedded files - embeddedFilesModule = new UiWidget; - 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; connect(pdfSupportModule->use_hyperrefGB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); - connect(pdfSupportModule->titleLE, SIGNAL(textChanged(const QString &)), + connect(pdfSupportModule->titleLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); - connect(pdfSupportModule->authorLE, SIGNAL(textChanged(const QString &)), + connect(pdfSupportModule->authorLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); - connect(pdfSupportModule->subjectLE, SIGNAL(textChanged(const QString &)), + connect(pdfSupportModule->subjectLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); - connect(pdfSupportModule->keywordsLE, SIGNAL(textChanged(const QString &)), + connect(pdfSupportModule->keywordsLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(pdfSupportModule->bookmarksGB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); @@ -654,7 +997,7 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(change_adaptor())); connect(pdfSupportModule->fullscreenCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); - connect(pdfSupportModule->optionsLE, SIGNAL(textChanged(const QString &)), + connect(pdfSupportModule->optionsLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); // float @@ -662,22 +1005,21 @@ GuiDocument::GuiDocument(GuiView & lv) 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(pdfSupportModule, _("PDF Properties")); - docPS->addPanel(mathsModule, _("Math Options")); - 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")); + 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(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 @@ -688,7 +1030,7 @@ GuiDocument::GuiDocument(GuiView & lv) void GuiDocument::showPreamble() { - docPS->setCurrentPanel(_("LaTeX Preamble")); + docPS->setCurrentPanel(qt_("LaTeX Preamble")); } @@ -710,51 +1052,45 @@ void GuiDocument::change_adaptor() } -docstring GuiDocument::validate_listings_params() +QString GuiDocument::validateListingsParameters() { // use a cache here to avoid repeated validation // of the same parameters - static string param_cache = string(); - static docstring msg_cache = docstring(); + static string param_cache; + static QString msg_cache; if (textLayoutModule->bypassCB->isChecked()) - return docstring(); + return QString(); string params = fromqstr(textLayoutModule->listingsED->toPlainText()); if (params != param_cache) { param_cache = params; - msg_cache = InsetListingsParams(params).validate(); + msg_cache = toqstr(InsetListingsParams(params).validate()); } return msg_cache; } -void GuiDocument::set_listings_msg() +void GuiDocument::setListingsMessage() { static bool isOK = true; - docstring msg = validate_listings_params(); - if (msg.empty()) { + QString msg = validateListingsParameters(); + if (msg.isEmpty()) { if (isOK) return; isOK = true; // listingsTB->setTextColor("black"); textLayoutModule->listingsTB->setPlainText( - qt_("Input listings parameters on the right. Enter ? for a list of parameters.")); + qt_("Input listings parameters on the right. " + "Enter ? for a list of parameters.")); } else { isOK = false; // listingsTB->setTextColor("red"); - textLayoutModule->listingsTB->setPlainText(toqstr(msg)); + textLayoutModule->listingsTB->setPlainText(msg); } } -void GuiDocument::closeEvent(QCloseEvent * e) -{ - slotClose(); - e->accept(); -} - - void GuiDocument::setLSpacing(int item) { textLayoutModule->lspacingLE->setEnabled(item == 3); @@ -804,6 +1140,12 @@ void GuiDocument::setCustomPapersize(int papersize) } +void GuiDocument::setColSep() +{ + setCustomMargins(marginsModule->marginCB->checkState() == Qt::Checked); +} + + void GuiDocument::setCustomMargins(bool custom) { marginsModule->topL->setEnabled(!custom); @@ -833,6 +1175,12 @@ void GuiDocument::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); } @@ -886,11 +1234,11 @@ void GuiDocument::updatePagestyle(string const & items, string const & sel) pageLayoutModule->pagestyleCO->clear(); pageLayoutModule->pagestyleCO->addItem(qt_("Default")); - for (int n = 0; !token(items,'|',n).empty(); ++n) { + for (int n = 0; !token(items, '|', n).empty(); ++n) { string style = token(items, '|', n); - docstring style_gui = _(style); - pagestyles.push_back(pair(style, style_gui)); - pageLayoutModule->pagestyleCO->addItem(toqstr(style_gui)); + QString style_gui = qt_(style); + pagestyles.push_back(pair(style, style_gui)); + pageLayoutModule->pagestyleCO->addItem(style_gui); } if (sel == "default") { @@ -902,98 +1250,218 @@ void GuiDocument::updatePagestyle(string const & items, string const & sel) for (size_t i = 0; i < pagestyles.size(); ++i) if (pagestyles[i].first == sel) - nn = pageLayoutModule->pagestyleCO->findText( - toqstr(pagestyles[i].second)); + nn = pageLayoutModule->pagestyleCO->findText(pagestyles[i].second); if (nn > 0) pageLayoutModule->pagestyleCO->setCurrentIndex(nn); } +void GuiDocument::browseLayout() +{ + QString const label1 = qt_("Layouts|#o#O"); + QString const dir1 = toqstr(lyxrc.document_path); + QStringList const filter(qt_("LyX Layout (*.layout)")); + QString file = browseRelFile(QString(), bufferFilepath(), + qt_("Local layout file"), filter, false, + label1, dir1); + + if (!file.endsWith(".layout")) + return; + + FileName layoutFile = support::makeAbsPath(fromqstr(file), + fromqstr(bufferFilepath())); + + 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 document directory."), + 1, 1, _("&Set Layout"), _("&Cancel")); + if (ret == 1) + return; + + // load the layout file + LayoutFileList & bcl = LayoutFileList::get(); + string classname = layoutFile.onlyFileName(); + // this will update an existing layout if that layout has been loaded before. + LayoutFileIndex name = bcl.addLocalLayout( + 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::browseMaster() +{ + QString const title = qt_("Select master document"); + QString const dir1 = toqstr(lyxrc.document_path); + QString const old = latexModule->childDocLE->text(); + QString const docpath = toqstr(support::onlyPath(buffer().absFileName())); + QStringList const filter(qt_("LyX Files (*.lyx)")); + QString file = browseRelFile(old, docpath, title, filter, false, + qt_("Documents|#o#O"), toqstr(lyxrc.document_path)); + + latexModule->childDocLE->setText(file); +} + + void GuiDocument::classChanged() { - textclass_type const tc = latexModule->classCO->currentIndex(); - bp_.setJustBaseClass(tc); - if (lyxrc.auto_reset_options) + int idx = latexModule->classCO->currentIndex(); + if (idx < 0) + return; + string const classname = classes_model_.getIDString(idx); + + // FIXME Note that by doing things this way, we load the TextClass + // as soon as it is selected. So, if you use the scroll wheel when + // sitting on the combo box, we'll load a lot of TextClass objects + // very quickly. This could be changed. + 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(); - updateContents(); + } + // FIXME There's a little bug here connected with auto_reset, namely, + // that, if the preceding is skipped and the user has changed the + // modules before changing the class, those changes will be lost on + // update. But maybe that's what we want? + updateSelectedModules(); + bp_.makeDocumentClass(); + paramsToDialog(bp_); +} + + +namespace { + // This is an insanely complicated attempt to make this sort of thing + // work with RTL languages. + docstring formatStrVec(vector const & v, docstring const & s) + { + //this mess formats the list as "v[0], v[1], ..., [s] v[n]" + if (v.size() == 0) + return docstring(); + if (v.size() == 1) + return from_ascii(v[0]); + 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... + int const vSize = v.size(); + 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 idsToNames(vector const & idList) + { + vector retval; + vector::const_iterator it = idList.begin(); + vector::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 = getModuleDescription(modName); - vector pkgList = 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()) { - if (!desc.empty()) - desc += " "; - desc += ("Requires " + pkgdesc + "."); - } - if (!isModuleAvailable(modName)) { - if (!desc.empty()) - desc += "\n"; - desc += "WARNING: Some packages are unavailable!"; - } - latexModule->infoML->document()->setPlainText(toqstr(desc)); + 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 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 const reqDescs = idsToNames(pkgList); + pkgdesc = formatStrVec(reqDescs, _("or")); + if (!desc.empty()) + desc += "\n"; + desc += bformat(_("Module required: %1$s."), pkgdesc); + } -void GuiDocument::updateEmbeddedFileList() -{ - embeddedFilesModule->filesLW->clear(); - // add current embedded files - EmbeddedFiles & files = buffer().embeddedFiles(); - files.update(); - EmbeddedFiles::EmbeddedFileList::iterator fit = files.begin(); - EmbeddedFiles::EmbeddedFileList::iterator fit_end = files.end(); - 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); + pkgList = getExcludedList(modName); + if (!pkgList.empty()) { + vector 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::updateNumbering() { - TextClass const & tclass = bp_.getTextClass(); + DocumentClass const & tclass = bp_.documentClass(); numberingModule->tocTW->setUpdatesEnabled(false); numberingModule->tocTW->clear(); @@ -1002,15 +1470,15 @@ void GuiDocument::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); } @@ -1027,18 +1495,18 @@ void GuiDocument::apply(BufferParams & params) preambleModule->apply(params); // biblio - params.setCiteEngine(biblio::ENGINE_BASIC); + params.setCiteEngine(ENGINE_BASIC); if (biblioModule->citeNatbibRB->isChecked()) { bool const use_numerical_citations = biblioModule->citeStyleCO->currentIndex(); if (use_numerical_citations) - params.setCiteEngine(biblio::ENGINE_NATBIB_NUMERICAL); + params.setCiteEngine(ENGINE_NATBIB_NUMERICAL); else - params.setCiteEngine(biblio::ENGINE_NATBIB_AUTHORYEAR); + params.setCiteEngine(ENGINE_NATBIB_AUTHORYEAR); } else if (biblioModule->citeJurabibRB->isChecked()) - params.setCiteEngine(biblio::ENGINE_JURABIB); + params.setCiteEngine(ENGINE_JURABIB); params.use_bibtopic = biblioModule->bibtopicCB->isChecked(); @@ -1050,59 +1518,104 @@ void GuiDocument::apply(BufferParams & params) int i = langModule->encodingCO->currentIndex(); if (i == 0) params.inputenc = "default"; - else - params.inputenc = - fromqstr(langModule->encodingCO->currentText()); + else { + QString const enc_gui = + langModule->encodingCO->currentText(); + Encodings::const_iterator it = encodings.begin(); + Encodings::const_iterator const end = encodings.end(); + bool found = false; + for (; it != end; ++it) { + if (qt_(it->guiName()) == enc_gui) { + params.inputenc = it->latexName(); + found = true; + break; + } + } + if (!found) { + // should not happen + lyxerr << "GuiDocument::apply: Unknown encoding! Resetting to default" << endl; + params.inputenc = "default"; + } + } } - InsetQuotes::quote_language lga = InsetQuotes::EnglishQ; + InsetQuotes::QuoteLanguage lga = InsetQuotes::EnglishQuotes; switch (langModule->quoteStyleCO->currentIndex()) { case 0: - lga = InsetQuotes::EnglishQ; + lga = InsetQuotes::EnglishQuotes; break; case 1: - lga = InsetQuotes::SwedishQ; + lga = InsetQuotes::SwedishQuotes; break; case 2: - lga = InsetQuotes::GermanQ; + lga = InsetQuotes::GermanQuotes; break; case 3: - lga = InsetQuotes::PolishQ; + lga = InsetQuotes::PolishQuotes; break; case 4: - lga = InsetQuotes::FrenchQ; + lga = InsetQuotes::FrenchQuotes; break; case 5: - lga = InsetQuotes::DanishQ; + lga = InsetQuotes::DanishQuotes; break; } params.quotes_language = lga; - int const pos = langModule->languageCO->currentIndex(); - params.language = lyx::languages.getLanguage(lang_[pos]); + QString const lang = langModule->languageCO->itemData( + langModule->languageCO->currentIndex()).toString(); + params.language = lyx::languages.getLanguage(fromqstr(lang)); // numbering - if (params.getTextClass().hasTocLevels()) { + if (params.documentClass().hasTocLevels()) { params.tocdepth = numberingModule->tocSL->value(); params.secnumdepth = numberingModule->depthSL->value(); } // bullets - params.user_defined_bullet(0) = bulletsModule->getBullet(0); - params.user_defined_bullet(1) = bulletsModule->getBullet(1); - params.user_defined_bullet(2) = bulletsModule->getBullet(2); - params.user_defined_bullet(3) = bulletsModule->getBullet(3); + params.user_defined_bullet(0) = bulletsModule->bullet(0); + params.user_defined_bullet(1) = bulletsModule->bullet(1); + params.user_defined_bullet(2) = bulletsModule->bullet(2); + params.user_defined_bullet(3) = bulletsModule->bullet(3); // 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(); - QStringList const selMods = selectedModel()->stringList(); - for (int i = 0; i != selMods.size(); ++i) - params.addLayoutModule(lyx::fromqstr(selMods[i])); - + int const srows = modules_sel_model_.rowCount(); + vector selModList; + for (int i = 0; i < srows; ++i) + params.addLayoutModule(modules_sel_model_.getIDString(i)); + // update the list of removed modules + params.clearRemovedModules(); + list const & reqmods = params.baseClass()->defaultModules(); + list::const_iterator rit = reqmods.begin(); + list::const_iterator ren = reqmods.end(); + // check each of the required modules + for (; rit != ren; rit++) { + vector::const_iterator mit = params.getModules().begin(); + vector::const_iterator men = params.getModules().end(); + bool found = false; + for (; mit != men; mit++) { + if (*rit == *mit) { + found = true; + break; + } + } + if (!found) { + // the module isn't present so must have been removed by the user + params.addRemovedModule(*rit); + } + } if (mathsModule->amsautoCB->isChecked()) { params.use_amsmath = BufferParams::package_auto; @@ -1122,15 +1635,11 @@ void GuiDocument::apply(BufferParams & params) params.use_esint = BufferParams::package_off; } - // text layout - params.setJustBaseClass(latexModule->classCO->currentIndex()); - if (pageLayoutModule->pagestyleCO->currentIndex() == 0) params.pagestyle = "default"; else { - docstring style_gui = - qstring_to_ucs4(pageLayoutModule->pagestyleCO->currentText()); - for (size_t i = 0; i < pagestyles.size(); ++i) + QString style_gui = pageLayoutModule->pagestyleCO->currentText(); + for (size_t i = 0; i != pagestyles.size(); ++i) if (pagestyles[i].second == style_gui) params.pagestyle = pagestyles[i].first; } @@ -1161,9 +1670,9 @@ void GuiDocument::apply(BufferParams & params) InsetListingsParams(fromqstr(textLayoutModule->listingsED->toPlainText())).params(); if (textLayoutModule->indentRB->isChecked()) - params.paragraph_separation = BufferParams::PARSEP_INDENT; + params.paragraph_separation = BufferParams::ParagraphIndentSeparation; else - params.paragraph_separation = BufferParams::PARSEP_SKIP; + params.paragraph_separation = BufferParams::ParagraphSkipSeparation; switch (textLayoutModule->skipCO->currentIndex()) { case 0: @@ -1194,6 +1703,15 @@ void GuiDocument::apply(BufferParams & params) params.options = fromqstr(latexModule->optionsLE->text()); + params.use_default_options = + latexModule->defaultOptionsCB->isChecked(); + + if (latexModule->childDocGB->isChecked()) + params.master = + fromqstr(latexModule->childDocLE->text()); + else + params.master = string(); + params.float_placement = floatModule->get(); // fonts @@ -1206,6 +1724,9 @@ void GuiDocument::apply(BufferParams & params) params.fontsTypewriter = tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()]; + params.fontsCJK = + fromqstr(fontModule->cjkFontLE->text()); + params.fontsSansScale = fontModule->scaleSansSB->value(); params.fontsTypewriterScale = fontModule->scaleTypewriterSB->value(); @@ -1248,11 +1769,10 @@ void GuiDocument::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); @@ -1261,6 +1781,7 @@ void GuiDocument::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); @@ -1287,34 +1808,12 @@ void GuiDocument::apply(BufferParams & params) pdf.pagemode = pdf.pagemode_fullscreen; else pdf.pagemode.clear(); - pdf.quoted_options = fromqstr(pdfSupportModule->optionsLE->text()); - - // Embedded files - // FIXME -} - - -/** Return the position of val in the vector if found. - If not found, return 0. - */ -template -static size_t findPos(vector const & vec, A const & val) -{ - typename vector::const_iterator it = - find(vec.begin(), vec.end(), val); - if (it == vec.end()) - return 0; - return distance(vec.begin(), it); -} - - -void GuiDocument::updateParams() -{ - updateParams(bp_); + pdf.quoted_options = pdf.quoted_options_check( + fromqstr(pdfSupportModule->optionsLE->text())); } -void GuiDocument::updateParams(BufferParams const & params) +void GuiDocument::paramsToDialog(BufferParams const & params) { // set the default unit Length::UNIT defaultUnit = Length::CM; @@ -1344,24 +1843,24 @@ void GuiDocument::updateParams(BufferParams const & params) // biblio biblioModule->citeDefaultRB->setChecked( - params.getEngine() == biblio::ENGINE_BASIC); + params.citeEngine() == ENGINE_BASIC); biblioModule->citeNatbibRB->setChecked( - params.getEngine() == biblio::ENGINE_NATBIB_NUMERICAL || - params.getEngine() == biblio::ENGINE_NATBIB_AUTHORYEAR); + params.citeEngine() == ENGINE_NATBIB_NUMERICAL || + params.citeEngine() == ENGINE_NATBIB_AUTHORYEAR); biblioModule->citeStyleCO->setCurrentIndex( - params.getEngine() == biblio::ENGINE_NATBIB_NUMERICAL); + params.citeEngine() == ENGINE_NATBIB_NUMERICAL); biblioModule->citeJurabibRB->setChecked( - params.getEngine() == biblio::ENGINE_JURABIB); + params.citeEngine() == ENGINE_JURABIB); biblioModule->bibtopicCB->setChecked( params.use_bibtopic); // language & quotes - int const pos = int(findPos(lang_, - params.language->lang())); + int const pos = langModule->languageCO->findData(toqstr( + params.language->lang())); langModule->languageCO->setCurrentIndex(pos); langModule->quoteStyleCO->setCurrentIndex( @@ -1373,8 +1872,17 @@ void GuiDocument::updateParams(BufferParams const & params) if (params.inputenc == "default") { langModule->encodingCO->setCurrentIndex(0); } else { + string enc_gui; + Encodings::const_iterator it = encodings.begin(); + Encodings::const_iterator const end = encodings.end(); + for (; it != end; ++it) { + if (it->latexName() == params.inputenc) { + enc_gui = it->guiName(); + break; + } + } int const i = langModule->encodingCO->findText( - toqstr(params.inputenc)); + qt_(enc_gui)); if (i >= 0) langModule->encodingCO->setCurrentIndex(i); else @@ -1386,9 +1894,9 @@ void GuiDocument::updateParams(BufferParams const & params) langModule->otherencodingRB->setChecked(!default_enc); // numbering - int const min_toclevel = textClass().min_toclevel(); - int const max_toclevel = textClass().max_toclevel(); - if (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); @@ -1433,9 +1941,10 @@ void GuiDocument::updateParams(BufferParams const & params) } // text layout - latexModule->classCO->setCurrentIndex(params.getBaseClass()); - - updatePagestyle(textClass().opt_pagestyle(), + string const & layoutID = params.baseClassID(); + setLayoutComboByIDString(layoutID); + + updatePagestyle(documentClass().opt_pagestyle(), params.pagestyle); textLayoutModule->lspacingCO->setCurrentIndex(nitem); @@ -1445,7 +1954,7 @@ void GuiDocument::updateParams(BufferParams const & params) } setLSpacing(nitem); - if (params.paragraph_separation == BufferParams::PARSEP_INDENT) + if (params.paragraph_separation == BufferParams::ParagraphIndentSeparation) textLayoutModule->indentRB->setChecked(true); else textLayoutModule->skipRB->setChecked(true); @@ -1492,10 +2001,37 @@ void GuiDocument::updateParams(BufferParams const & params) latexModule->optionsLE->setText(QString()); } + latexModule->defaultOptionsCB->setChecked( + params.use_default_options); + + if (!documentClass().options().empty()) { + latexModule->defaultOptionsLE->setText( + toqstr(documentClass().options())); + } else { + latexModule->defaultOptionsLE->setText( + toqstr(_("[No options predefined]"))); + } + + latexModule->defaultOptionsLE->setEnabled( + params.use_default_options + && !documentClass().options().empty()); + + latexModule->defaultOptionsCB->setEnabled( + !documentClass().options().empty()); + + if (!params.master.empty()) { + latexModule->childDocGB->setChecked(true); + latexModule->childDocLE->setText( + toqstr(params.master)); + } else { + latexModule->childDocLE->setText(QString()); + latexModule->childDocGB->setChecked(false); + } + floatModule->set(params.float_placement); // Fonts - updateFontsize(textClass().opt_fontsize(), + updateFontsize(documentClass().opt_fontsize(), params.fontsize); int n = findToken(tex_fonts_roman, params.fontsRoman); @@ -1516,6 +2052,12 @@ void GuiDocument::updateParams(BufferParams const & params) ttChanged(n); } + if (!params.fontsCJK.empty()) + fontModule->cjkFontLE->setText( + toqstr(params.fontsCJK)); + else + fontModule->cjkFontLE->setText(QString()); + fontModule->fontScCB->setChecked(params.fontsSC); fontModule->fontOsfCB->setChecked(params.fontsOSF); fontModule->scaleSansSB->setValue(params.fontsSansScale); @@ -1570,6 +2112,9 @@ void GuiDocument::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 @@ -1597,9 +2142,6 @@ void GuiDocument::updateParams(BufferParams const & params) pdfSupportModule->optionsLE->setText( toqstr(pdf.quoted_options)); - - // embedded files - updateEmbeddedFileList(); } @@ -1617,37 +2159,78 @@ void GuiDocument::saveDocDefault() } -void GuiDocument::updateContents() +void GuiDocument::updateAvailableModules() +{ + modules_av_model_.clear(); + vector 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, modInfo.name, modInfo.id, + modInfo.description); + } +} + + +void GuiDocument::updateSelectedModules() { - //update list of available modules - QStringList strlist; - vector const modNames = getModuleNames(); - vector::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 const & selMods = getSelectedModules(); - it = selMods.begin(); - for (; it != selMods.end(); ++it) - strlist2.push_back(toqstr(*it)); - selected_model_.setStringList(strlist2); + // and selected ones, too + modules_sel_model_.clear(); + vector 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, modInfo.name, modInfo.id, + modInfo.description); + } +} + - updateParams(bp_); +void GuiDocument::updateContents() +{ + // Nothing to do here as the document settings is not cursor dependant. + return; } + void GuiDocument::useClassDefaults() { - bp_.setJustBaseClass(latexModule->classCO->currentIndex()); + 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(); - updateContents(); + paramsToDialog(bp_); +} + + +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(); + return validateListingsParameters().isEmpty() + && (textLayoutModule->skipCO->currentIndex() != 3 + || !textLayoutModule->skipLE->text().isEmpty()); } @@ -1663,8 +2246,21 @@ char const * GuiDocument::fontfamilies_gui[5] = { bool GuiDocument::initialiseParams(string const &) { - bp_ = buffer().params(); - loadModuleNames(); + BufferView const * view = bufferview(); + if (!view) { + bp_ = BufferParams(); + paramsToDialog(bp_); + return true; + } + bp_ = view->buffer().params(); + loadModuleInfo(); + 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. + paramsToDialog(bp_); return true; } @@ -1677,55 +2273,45 @@ void GuiDocument::clearParams() BufferId GuiDocument::id() const { - return &buffer(); + BufferView const * const view = bufferview(); + return view? &view->buffer() : 0; } -vector GuiDocument::getModuleNames() +vector const & GuiDocument::getModuleInfo() { return moduleNames_; } -vector const & GuiDocument::getSelectedModules() -{ - return params().getModules(); -} - - -string GuiDocument::getModuleDescription(string const & modName) const -{ - LyXModule const * const mod = moduleList[modName]; - if (!mod) - return string("Module not found!"); - return mod->description; -} - - -vector GuiDocument::getPackageList(string const & modName) const -{ - LyXModule const * const mod = moduleList[modName]; - if (!mod) - return vector(); //empty such thing - return mod->packageList; -} - - -bool GuiDocument::isModuleAvailable(string const & modName) const -{ - LyXModule * mod = moduleList[modName]; - return mod->isAvailable(); +vector const GuiDocument::getSelectedModules() +{ + vector const & mods = params().getModules(); + vector::const_iterator it = mods.begin(); + vector::const_iterator end = mods.end(); + vector mInfo; + for (; it != end; ++it) { + modInfoStruct m; + m.id = *it; + LyXModule * mod = moduleList[*it]; + if (mod) + m.name = qt_(mod->getName()); + else + m.name = toqstr(*it) + toqstr(" (") + qt_("Not Found") + toqstr(")"); + mInfo.push_back(m); + } + return mInfo; } -TextClass const & GuiDocument::textClass() const +DocumentClass const & GuiDocument::documentClass() const { - return textclasslist[bp_.getBaseClass()]; + return bp_.documentClass(); } static void dispatch_bufferparams(Dialog const & dialog, - BufferParams const & bp, kb_action lfun) + BufferParams const & bp, FuncCode lfun) { ostringstream ss; ss << "\\begin_header\n"; @@ -1742,19 +2328,26 @@ void GuiDocument::dispatchParams() // Apply the BufferParams. Note that this will set the base class // and then update the buffer's layout. - //FIXME Could this be done last? Then, I think, we'd get the automatic - //update mentioned in the next FIXME... dispatch_bufferparams(*this, params(), LFUN_BUFFER_PARAMS_APPLY); + if (!params().master.empty()) { + FileName const master_file = support::makeAbsPath(params().master, + support::onlyPath(buffer().absFileName())); + if (isLyXFilename(master_file.absFilename())) { + Buffer * master = checkAndLoadLyXFile(master_file); + const_cast(buffer()).setParent(master); + } + } + // 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(); + docstring const & current_branch = it->branch(); Branch const * branch = branchlist.find(current_branch); - string const x11hexname = X11hexname(branch->getColor()); + string const x11hexname = X11hexname(branch->color()); // display the new color docstring const str = current_branch + ' ' + from_ascii(x11hexname); dispatch(FuncRequest(LFUN_SET_COLOR, str)); @@ -1765,7 +2358,8 @@ void GuiDocument::dispatchParams() "assign branch")); } // FIXME: If we used an LFUN, we would not need those two lines: - bufferview()->processUpdateFlags(Update::Force | Update::FitCursor); + BufferView * bv = const_cast(bufferview()); + bv->processUpdateFlags(Update::Force | Update::FitCursor); } @@ -1836,14 +2430,23 @@ bool GuiDocument::providesScale(string const & font) const } -void GuiDocument::loadModuleNames () +void GuiDocument::loadModuleInfo() { moduleNames_.clear(); - LyXModuleList::const_iterator it = moduleList.begin(); - for (; it != moduleList.end(); ++it) - moduleNames_.push_back(it->name); - if (!moduleNames_.empty()) - sort(moduleNames_.begin(), moduleNames_.end()); + LyXModuleList::const_iterator it = moduleList.begin(); + LyXModuleList::const_iterator end = moduleList.end(); + for (; it != end; ++it) { + modInfoStruct m; + m.id = it->getID(); + m.name = qt_(it->getName()); + // this is supposed to give us the first sentence of the description + QString desc = qt_(it->getDescription()); + int const pos = desc.indexOf("."); + if (pos > 0) + desc.truncate(pos + 1); + m.description = desc; + moduleNames_.push_back(m); + } }