#include "GuiDocument.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 "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/FileFilterList.h"
#include "support/filetools.h"
#include "support/lstrings.h"
-#include <boost/bind.hpp>
+#include "frontends/alert.h"
#include <QCloseEvent>
#include <QScrollBar>
#include <QTextCursor>
-#include <algorithm>
#include <sstream>
using namespace std;
+using namespace lyx::support;
-///
-template<class Pair>
-vector<typename Pair::second_type> const
-getSecond(vector<Pair> const & pr)
-{
- vector<typename Pair::second_type> tmp(pr.size());
- transform(pr.begin(), pr.end(), tmp.begin(),
- boost::bind(&Pair::second, _1));
- return tmp;
-}
+
+namespace {
char const * const tex_graphics[] =
{
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 {
-using support::token;
-using support::bformat;
-using support::findToken;
-using support::getVectorFromString;
+
+///
+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);
+}
+
/////////////////////////////////////////////////////////////////////
//
/////////////////////////////////////////////////////////////////////
-
GuiDocument::GuiDocument(GuiView & lv)
- : GuiDialog(lv, "document")
+ : GuiDialog(lv, "document", qt_("Document Settings")), current_id_(0)
{
setupUi(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()));
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()));
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(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(
marginsModule->headheightLE));
marginsModule->footskipLE->setValidator(unsignedLengthValidator(
marginsModule->footskipLE));
+ marginsModule->columnsepLE->setValidator(unsignedLengthValidator(
+ marginsModule->columnsepLE));
bc().addCheckedLineEdit(marginsModule->topLE,
marginsModule->topL);
marginsModule->headheightL);
bc().addCheckedLineEdit(marginsModule->footskipLE,
marginsModule->footskipL);
+ bc().addCheckedLineEdit(marginsModule->columnsepLE,
+ marginsModule->columnsepL);
langModule = new UiWidget<Ui::LanguageUi>;
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.
langModule->quoteStyleCO->addItem(qt_(">>text<<"));
-
numberingModule = new UiWidget<Ui::NumberingUi>;
// numbering
connect(numberingModule->depthSL, SIGNAL(valueChanged(int)),
latexModule = new UiWidget<Ui::LaTeXUi>;
// latex class
- connect(latexModule->classCO, SIGNAL(activated(int)),
- this, SLOT(change_adaptor()));
connect(latexModule->optionsLE, SIGNAL(textChanged(const QString &)),
this, SLOT(change_adaptor()));
connect(latexModule->psdriverCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
connect(latexModule->classCO, SIGNAL(activated(int)),
this, SLOT(classChanged()));
+ connect(latexModule->classCO, SIGNAL(activated(int)),
+ this, SLOT(change_adaptor()));
+ connect(latexModule->layoutPB, SIGNAL(clicked()),
+ this, SLOT(browseLayout()));
selectionManager =
- new GuiSelectionManager(latexModule->availableLV, latexModule->selectedLV,
+ new ModuleSelMan(latexModule->availableLV, latexModule->selectedLV,
latexModule->addPB, latexModule->deletePB,
latexModule->upPB, latexModule->downPB,
availableModel(), selectedModel());
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<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
// embedded files
embeddedFilesModule = new UiWidget<Ui::EmbeddedFilesUi>;
- connect(embeddedFilesModule->bundleCB, SIGNAL(toggled(bool)),
- this, SLOT(change_adaptor()));
connect(embeddedFilesModule->addPB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
+ this, SLOT(addExtraEmbeddedFile()));
connect(embeddedFilesModule->removePB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
+ this, SLOT(removeExtraEmbeddedFile()));
// PDF support
pdfSupportModule = new UiWidget<Ui::PDFSupportUi>;
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(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
void GuiDocument::showPreamble()
{
- docPS->setCurrentPanel(_("LaTeX Preamble"));
+ docPS->setCurrentPanel(qt_("LaTeX Preamble"));
}
}
-void GuiDocument::closeEvent(QCloseEvent * e)
-{
- slotClose();
- e->accept();
-}
-
-
void GuiDocument::setLSpacing(int item)
{
textLayoutModule->lspacingLE->setEnabled(item == 3);
}
+void GuiDocument::setColSep()
+{
+ setCustomMargins(marginsModule->marginCB->checkState() == Qt::Checked);
+}
+
+
void GuiDocument::setCustomMargins(bool custom)
{
marginsModule->topL->setEnabled(!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 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(),
+ LayoutFileList::Local);
+
+ 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()
{
- 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);
+ // 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;
+ }
+ } else if (prefixIs(classname, LayoutFileList::embeddedPrefix)) {
+ int const ret = Alert::prompt(_("Embedded layout"),
+ _("The layout file you have selected is an embedded layout that\n"
+ "is embedded to a buffer. You cannot make use of it unless\n"
+ "it is already embedded to this buffer.\n"),
+ 1, 1, _("&Set Layout"), _("&Cancel"));
+ if (ret == 1) {
+ 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();
- updateContents();
+ 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
- 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<string> 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())
- desc += " Requires " + pkgdesc + ".";
- 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<string> pkgList = getPackageList(modName);
+ docstring pkgdesc = formatStrVec(pkgList, _("and"));
+ if (!pkgdesc.empty()) {
+ if (!desc.empty())
+ desc += "\n";
+ desc += bformat(_("Package(s) required: %1$s."), pkgdesc);
+ }
+
+ pkgList = getRequiredList(modName);
+ if (!pkgList.empty()) {
+ vector<string> const reqDescs = idsToNames(pkgList);
+ pkgdesc = formatStrVec(reqDescs, _("or"));
+ if (!desc.empty())
+ desc += "\n";
+ desc += bformat(_("Module required: %1$s."), pkgdesc);
+ }
+
+ pkgList = getExcludedList(modName);
+ if (!pkgList.empty()) {
+ vector<string> const reqDescs = idsToNames(pkgList);
+ pkgdesc = formatStrVec(reqDescs, _( "and"));
+ if (!desc.empty())
+ desc += "\n";
+ desc += bformat(_("Modules excluded: %1$s."), pkgdesc);
}
+
+ if (!isModuleAvailable(modName)) {
+ if (!desc.empty())
+ desc += "\n";
+ desc += _("WARNING: Some packages are unavailable!");
+ }
+
+ latexModule->infoML->document()->setPlainText(toqstr(desc));
}
-void GuiDocument::updateEmbeddedFileList()
+void GuiDocument::setExtraEmbeddedFileList()
{
- embeddedFilesModule->filesLW->clear();
+ embeddedFilesModule->extraLW->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);
- }
+ 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 const label1 = qt_("Documents|#o#O");
+ QString const dir1 = toqstr(lyxrc.document_path);
+ FileFilterList const filter(_("LyX Layout (*.layout);;LaTeX Classes (*.{cls,sty});;BibTeX Databases (*.{bib,bst})"));
+ QString file = browseRelFile(QString(), bufferFilepath(),
+ qt_("Extra embedded file"), filter, true, label1, dir1);
+
+ if (file.isEmpty())
+ return;
+
+ if (embeddedFilesModule->extraLW->findItems(file, Qt::MatchExactly).empty())
+ embeddedFilesModule->extraLW->addItem(file);
+}
+
+
+void GuiDocument::removeExtraEmbeddedFile()
+{
+ int index = embeddedFilesModule->extraLW->currentRow();
+ delete embeddedFilesModule->extraLW->takeItem(index);
}
void GuiDocument::updateNumbering()
{
- TextClass const & tclass = bp_.getTextClass();
+ DocumentClass const & tclass = bp_.documentClass();
numberingModule->tocTW->setUpdatesEnabled(false);
numberingModule->tocTW->clear();
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);
}
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();
}
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<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;
params.use_esint = BufferParams::package_off;
}
- // text layout
- params.setJustBaseClass(latexModule->classCO->currentIndex());
-
if (pageLayoutModule->pagestyleCO->currentIndex() == 0)
params.pagestyle = "default";
else {
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.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.pagemode = pdf.pagemode_fullscreen;
else
pdf.pagemode.clear();
- pdf.quoted_options = fromqstr(pdfSupportModule->optionsLE->text());
+ pdf.quoted_options = pdf.quoted_options_check(
+ fromqstr(pdfSupportModule->optionsLE->text()));
// Embedded files
- // FIXME
+ 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(vector<A> const & vec, A const & val)
+static int findPos(QStringList const & vec, QString const & val)
{
- typename vector<A>::const_iterator it =
- find(vec.begin(), vec.end(), val);
- if (it == vec.end())
- return 0;
- return distance(vec.begin(), it);
+ for (int i = 0; i != vec.size(); ++i)
+ if (vec[i] == val)
+ return i;
+ return 0;
}
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(
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);
}
// 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);
floatModule->set(params.float_placement);
// Fonts
- updateFontsize(textClass().opt_fontsize(),
+ updateFontsize(documentClass().opt_fontsize(),
params.fontsize);
int n = findToken(tex_fonts_roman, params.fontsRoman);
lengthToWidgets(m->footskipLE, m->footskipUnit,
params.footskip, defaultUnit);
+ lengthToWidgets(m->columnsepLE, m->columnsepUnit,
+ params.columnsep, defaultUnit);
+
branchesModule->update(params);
// PDF support
pdfSupportModule->optionsLE->setText(
toqstr(pdf.quoted_options));
-
- // embedded files
- updateEmbeddedFileList();
+
+ setExtraEmbeddedFileList();
}
}
+void GuiDocument::updateAvailableModules()
+{
+ 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 GuiDocument::updateSelectedModules()
+{
+ // 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);
+ }
+}
+
+
void GuiDocument::updateContents()
{
- //update list of available modules
- QStringList strlist;
- vector<string> const modNames = getModuleNames();
- vector<string>::const_iterator it = modNames.begin();
- for (; it != modNames.end(); ++it)
- strlist.push_back(toqstr(*it));
- available_model_.setStringList(strlist);
- //and selected ones, too
- QStringList strlist2;
- vector<string> const & selMods = getSelectedModules();
- it = selMods.begin();
- for (; it != selMods.end(); ++it)
- strlist2.push_back(toqstr(*it));
- selected_model_.setStringList(strlist2);
+ 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();
}
+
+void GuiDocument::forceUpdate()
+{
+ // reset to force dialog update
+ current_id_ = 0;
+ updateContents();
+}
+
+
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();
+ 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();
+ return validate_listings_params().empty()
+ && (textLayoutModule->skipCO->currentIndex() != 3
+ || !textLayoutModule->skipLE->text().isEmpty());
}
bool GuiDocument::initialiseParams(string const &)
{
bp_ = buffer().params();
- loadModuleNames();
+ loadModuleInfo();
return true;
}
}
-vector<string> GuiDocument::getModuleNames()
+vector<GuiDocument::modInfoStruct> const & GuiDocument::getModuleInfo()
{
return moduleNames_;
}
-vector<string> const & GuiDocument::getSelectedModules()
+vector<GuiDocument::modInfoStruct> const GuiDocument::getSelectedModules()
{
- return params().getModules();
-}
-
-
-string GuiDocument::getModuleDescription(string const & modName) const
-{
- LyXModule const * const mod = moduleList[modName];
- if (!mod)
- return string("Module unavailable!");
- return mod->description;
-}
-
-
-vector<string>
-GuiDocument::getPackageList(string const & modName) const
-{
- LyXModule const * const mod = moduleList[modName];
- if (!mod)
- return vector<string>(); //empty such thing
- return mod->packageList;
+ vector<string> const & mods = params().getModules();
+ vector<string>::const_iterator it = mods.begin();
+ vector<string>::const_iterator end = mods.end();
+ vector<modInfoStruct> mInfo;
+ for (; it != end; ++it) {
+ modInfoStruct m;
+ m.id = *it;
+ LyXModule * mod = moduleList[*it];
+ if (mod)
+ m.name = mod->getName();
+ else
+ m.name = *it + " (Not Found)";
+ mInfo.push_back(m);
+ }
+ return mInfo;
}
-TextClass const & GuiDocument::textClass() const
+DocumentClass const & GuiDocument::documentClass() const
{
- return textclasslist[bp_.getBaseClass()];
+ return bp_.documentClass();
}
// Apply the BufferParams. Note that this will set the base class
// and then update the buffer's layout.
- //FIXME Could this be done last? Then, I think, we'd get the automatic
- //update mentioned in the next FIXME...
dispatch_bufferparams(*this, params(), LFUN_BUFFER_PARAMS_APPLY);
// Generate the colours requested by each new branch.
}
-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 = it->getName();
+ moduleNames_.push_back(m);
+ }
}
projects / lyx.git / blobdiff