#include "support/FileName.h"
#include "support/filetools.h"
#include "support/gettext.h"
+#include "support/lassert.h"
#include "support/lstrings.h"
#include "frontends/alert.h"
};
+char const * packages_gui[][4] =
+{
+ {"amsmath",
+ N_("&Use AMS math package automatically"),
+ N_("Use AMS &math package"),
+ N_("The AMS LaTeX packages are only used if symbols from the AMS math toolbars are inserted into formulas")},
+ {"esint",
+ N_("Use esint package &automatically"),
+ N_("Use &esint package"),
+ N_("The LaTeX package esint is only used if special integral symbols are inserted into formulas")},
+ {"mathdots",
+ N_("Use math&dots package automatically"),
+ N_("Use mathdo&ts package"),
+ N_("The LaTeX package mathdots is only used if the command \\iddots is inserted into formulas")},
+ {"mathtools",
+ N_("Use mathtools package automatically"),
+ N_("Use mathtools package"),
+ N_("The LaTeX package mathtools is only used if some mathematical relations are inserted into formulas")},
+ {"mhchem",
+ N_("Use mhchem &package automatically"),
+ N_("Use mh&chem package"),
+ N_("The LaTeX package mhchem is only used if either the command \\ce or \\cf is inserted into formulas")},
+ {"undertilde",
+ N_("Use u&ndertilde package automatically"),
+ N_("Use undertilde pac&kage"),
+ N_("The LaTeX package undertilde is only used if you use the math frame decoration 'utilde'")},
+ {"", "", "", ""}
+};
+
+
+vector<string> engine_types_;
vector<pair<string, QString> > pagestyles;
namespace frontend {
namespace {
-vector<string> getRequiredList(string const & modName)
+vector<string> getRequiredList(string const & modName)
{
LyXModule const * const mod = theModuleList[modName];
if (!mod)
}
+docstring getModuleCategory(string const & modName)
+{
+ LyXModule const * const mod = theModuleList[modName];
+ if (!mod)
+ return docstring();
+ return from_utf8(mod->category());
+}
+
+
docstring getModuleDescription(string const & modName)
{
LyXModule const * const mod = theModuleList[modName];
/////////////////////////////////////////////////////////////////////
/// SelectionManager for use with modules
-class ModuleSelectionManager : public GuiSelectionManager
+class ModuleSelectionManager : public GuiSelectionManager
{
public:
///
ModuleSelectionManager(
QTreeView * availableLV,
QListView * selectedLV,
- QPushButton * addPB,
- QPushButton * delPB,
- QPushButton * upPB,
+ QPushButton * addPB,
+ QPushButton * delPB,
+ QPushButton * upPB,
QPushButton * downPB,
GuiIdListModel * availableModel,
GuiIdListModel * selectedModel,
upPB, downPB, availableModel, selectedModel), container_(container)
{}
///
- void updateProvidedModules(LayoutModuleList const & pm)
+ void updateProvidedModules(LayoutModuleList const & pm)
{ provided_modules_ = pm.list(); }
///
- void updateExcludedModules(LayoutModuleList const & em)
+ void updateExcludedModules(LayoutModuleList const & em)
{ excluded_modules_ = em.list(); }
private:
///
///
virtual void updateDelPB();
/// returns availableModel as a GuiIdListModel
- GuiIdListModel * getAvailableModel()
+ GuiIdListModel * getAvailableModel()
{
return dynamic_cast<GuiIdListModel *>(availableModel);
}
/// returns selectedModel as a GuiIdListModel
- GuiIdListModel * getSelectedModel()
+ GuiIdListModel * getSelectedModel()
{
return dynamic_cast<GuiIdListModel *>(selectedModel);
}
list<string> provided_modules_;
/// similarly...
list<string> excluded_modules_;
- ///
+ ///
GuiDocument const * container_;
};
-void ModuleSelectionManager::updateAddPB()
+void ModuleSelectionManager::updateAddPB()
{
int const arows = availableModel->rowCount();
- QModelIndexList const avail_sels =
+ QModelIndexList const avail_sels =
availableLV->selectionModel()->selectedIndexes();
// disable if there aren't any modules (?), if none of them is chosen
QModelIndex const & idx = availableLV->selectionModel()->currentIndex();
string const modname = getAvailableModel()->getIDString(idx.row());
- bool const enable =
+ bool const enable =
container_->params().moduleCanBeAdded(modname);
addPB->setEnabled(enable);
}
}
// Enable it if this module isn't required.
- // FIXME This should perhaps be more flexible and check whether, even
+ // FIXME This should perhaps be more flexible and check whether, even
// if the next one is required, there is also an earlier one that will do.
downPB->setEnabled(
find(reqs.begin(), reqs.end(), curmodname) == reqs.end());
}
-void ModuleSelectionManager::updateUpPB()
+void ModuleSelectionManager::updateUpPB()
{
int const srows = selectedModel->rowCount();
if (srows == 0) {
// Enable it if the preceding module isn't required.
- // NOTE This is less flexible than it might be. We could check whether, even
+ // NOTE This is less flexible than it might be. We could check whether, even
// if the previous one is required, there is an earlier one that would do.
string const premod = getSelectedModel()->getIDString(curRow - 1);
upPB->setEnabled(find(reqs.begin(), reqs.end(), premod) == reqs.end());
}
-void ModuleSelectionManager::updateDelPB()
+void ModuleSelectionManager::updateDelPB()
{
int const srows = selectedModel->rowCount();
if (srows == 0) {
return;
}
- QModelIndex const & curidx =
+ QModelIndex const & curidx =
selectedLV->selectionModel()->currentIndex();
int const curRow = curidx.row();
if (curRow < 0 || curRow >= srows) { // invalid index?
for (int j = 0; j < curRow; ++j) {
string const mod = getSelectedModel()->getIDString(j);
// lyxerr << "In loop: Testing " << mod << endl;
- // do we satisfy the require?
+ // do we satisfy the require?
if (find(reqs.begin(), reqs.end(), mod) != reqs.end()) {
// lyxerr << mod << " does the trick." << endl;
foundone = true;
void LocalLayout::validate() {
static const QString valid = qt_("Layout is valid!");
static const QString vtext =
- toqstr("<p style=\"font-weight: bold; \">")
+ toqstr("<p style=\"font-weight: bold; \">")
+ valid + toqstr("</p>");
static const QString invalid = qt_("Layout is invalid!");
static const QString ivtext =
- toqstr("<p style=\"color: #c00000; font-weight: bold; \">")
+ toqstr("<p style=\"color: #c00000; font-weight: bold; \">")
+ invalid + toqstr("</p>");
- string const layout =
+ string const layout =
fromqstr(locallayoutTE->document()->toPlainText().trimmed());
if (layout.empty()) {
is_valid_ = true;
this, SLOT(change_adaptor()));
connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()),
this, SLOT(setColSep()));
+ connect(textLayoutModule->justCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
textLayoutModule->lspacingLE->setValidator(new QDoubleValidator(
textLayoutModule->lspacingLE));
this, SLOT(change_adaptor()));
connect(outputModule->strictCB, SIGNAL(stateChanged(int)),
this, SLOT(change_adaptor()));
+ connect(outputModule->cssCB, SIGNAL(stateChanged(int)),
+ this, SLOT(change_adaptor()));
connect(outputModule->mathoutCB, SIGNAL(currentIndexChanged(int)),
this, SLOT(change_adaptor()));
this, SLOT(change_adaptor()));
connect(pageLayoutModule->pagestyleCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
-
+
pageLayoutModule->pagestyleCO->addItem(qt_("Default"));
pageLayoutModule->pagestyleCO->addItem(qt_("empty"));
pageLayoutModule->pagestyleCO->addItem(qt_("plain"));
// biblio
biblioModule = new UiWidget<Ui::BiblioUi>;
+ connect(biblioModule->citeDefaultRB, SIGNAL(toggled(bool)),
+ this, SLOT(setNumerical(bool)));
+ connect(biblioModule->citeJurabibRB, SIGNAL(toggled(bool)),
+ this, SLOT(setAuthorYear(bool)));
connect(biblioModule->citeNatbibRB, SIGNAL(toggled(bool)),
biblioModule->citationStyleL, SLOT(setEnabled(bool)));
connect(biblioModule->citeNatbibRB, SIGNAL(toggled(bool)),
biblioModule->citeStyleCO, SLOT(setEnabled(bool)));
connect(biblioModule->citeDefaultRB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
+ this, SLOT(biblioChanged()));
connect(biblioModule->citeNatbibRB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
+ this, SLOT(biblioChanged()));
connect(biblioModule->citeStyleCO, SIGNAL(activated(int)),
- this, SLOT(change_adaptor()));
+ this, SLOT(biblioChanged()));
connect(biblioModule->citeJurabibRB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
+ this, SLOT(biblioChanged()));
connect(biblioModule->bibtopicCB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
+ this, SLOT(biblioChanged()));
connect(biblioModule->bibtexCO, SIGNAL(activated(int)),
this, SLOT(bibtexChanged(int)));
connect(biblioModule->bibtexOptionsLE, SIGNAL(textChanged(QString)),
- this, SLOT(change_adaptor()));
+ this, SLOT(biblioChanged()));
+ connect(biblioModule->bibtexStyleLE, SIGNAL(textChanged(QString)),
+ this, SLOT(biblioChanged()));
biblioModule->bibtexOptionsLE->setValidator(new NoNewLineValidator(
biblioModule->bibtexOptionsLE));
+ biblioModule->bibtexStyleLE->setValidator(new NoNewLineValidator(
+ biblioModule->bibtexStyleLE));
biblioModule->citeStyleCO->addItem(qt_("Author-year"));
biblioModule->citeStyleCO->addItem(qt_("Numerical"));
// maths
+ // FIXME This UI has problems:
+ // 1) It is not generic, packages_gui needs to be changed for each new package
+ // 2) Two checkboxes have 4 states, but one is invalid (both pressed)
+ // 3) The auto cb is not disabled if the use cb is checked
mathsModule = new UiWidget<Ui::MathsUi>;
- connect(mathsModule->amsautoCB, SIGNAL(toggled(bool)),
- mathsModule->amsCB, SLOT(setDisabled(bool)));
- connect(mathsModule->esintautoCB, SIGNAL(toggled(bool)),
- mathsModule->esintCB, SLOT(setDisabled(bool)));
- connect(mathsModule->mhchemautoCB, SIGNAL(toggled(bool)),
- mathsModule->mhchemCB, SLOT(setDisabled(bool)));
- connect(mathsModule->mathdotsautoCB, SIGNAL(toggled(bool)),
- mathsModule->mathdotsCB, SLOT(setDisabled(bool)));
- connect(mathsModule->undertildeautoCB, SIGNAL(toggled(bool)),
- mathsModule->undertildeCB, SLOT(setDisabled(bool)));
-
- connect(mathsModule->amsCB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
- connect(mathsModule->amsautoCB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
- connect(mathsModule->esintCB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
- connect(mathsModule->esintautoCB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
- connect(mathsModule->mhchemCB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
- connect(mathsModule->mhchemautoCB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
- connect(mathsModule->mathdotsCB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
- connect(mathsModule->mathdotsautoCB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
- connect(mathsModule->undertildeCB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
- connect(mathsModule->undertildeautoCB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
-
+ vector<string> const & packages = BufferParams::auto_packages();
+ for (size_t i = 0; i < packages.size(); ++i) {
+ // Use the order of BufferParams::auto_packages() for easier
+ // access in applyView() and paramsToDialog()
+ int n = 0;
+ for (n = 0; packages_gui[n][0][0]; n++)
+ if (packages_gui[n][0] == packages[i])
+ break;
+ // If this fires somebody changed
+ // BufferParams::auto_packages() without adjusting packages_gui
+ LASSERT(packages_gui[n][0][0], /**/);
+ QString autoText = qt_(packages_gui[n][1]);
+ QString alwaysText = qt_(packages_gui[n][2]);
+ QString autoTooltip = qt_(packages_gui[n][3]);
+ QString alwaysTooltip;
+ if (packages[i] == "amsmath")
+ alwaysTooltip =
+ qt_("The AMS LaTeX packages are always used");
+ else
+ alwaysTooltip = toqstr(bformat(
+ _("The LaTeX package %1$s is always used"),
+ from_ascii(packages[i])));
+ QCheckBox * autoCB = new QCheckBox(autoText, mathsModule);
+ QCheckBox * alwaysCB = new QCheckBox(alwaysText, mathsModule);
+ mathsModule->gridLayout->addWidget(autoCB, 2 * i, 0);
+ mathsModule->gridLayout->addWidget(alwaysCB, 2 * i + 1, 0);
+ autoCB->setToolTip(autoTooltip);
+ alwaysCB->setToolTip(alwaysTooltip);
+ connect(autoCB, SIGNAL(toggled(bool)),
+ alwaysCB, SLOT(setDisabled(bool)));
+ connect(autoCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+ connect(alwaysCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+ }
+ QSpacerItem * spacer = new QSpacerItem(20, 20, QSizePolicy::Minimum,
+ QSizePolicy::Expanding);
+ mathsModule->gridLayout->addItem(spacer, 2 * packages.size(), 0);
+
// latex class
latexModule = new UiWidget<Ui::LaTeXUi>;
this, SLOT(change_adaptor()));
connect(branchesModule, SIGNAL(renameBranches(docstring const &, docstring const &)),
this, SLOT(branchesRename(docstring const &, docstring const &)));
+ connect(branchesModule, SIGNAL(okPressed()), this, SLOT(slotOK()));
updateUnknownBranches();
preambleModule = new PreambleModule;
connect(preambleModule, SIGNAL(changed()),
this, SLOT(change_adaptor()));
-
+
localLayout = new LocalLayout;
connect(localLayout, SIGNAL(changed()),
this, SLOT(change_adaptor()));
listingsModule = new UiWidget<Ui::ListingsSettingsUi>;
connect(listingsModule->listingsED, SIGNAL(textChanged()),
this, SLOT(change_adaptor()));
- connect(listingsModule->bypassCB, SIGNAL(clicked()),
+ connect(listingsModule->bypassCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
- connect(listingsModule->bypassCB, SIGNAL(clicked()),
+ connect(listingsModule->bypassCB, SIGNAL(clicked()),
this, SLOT(setListingsMessage()));
connect(listingsModule->listingsED, SIGNAL(textChanged()),
this, SLOT(setListingsMessage()));
docPS->addPanel(pdfSupportModule, qt_("PDF Properties"));
docPS->addPanel(mathsModule, qt_("Math Options"));
docPS->addPanel(floatModule, qt_("Float Placement"));
- docPS->addPanel(listingsModule, qt_("Listings"));
+ docPS->addPanel(listingsModule, qt_("Listings[[inset]]"));
docPS->addPanel(bulletsModule, qt_("Bullets"));
docPS->addPanel(branchesModule, qt_("Branches"));
docPS->addPanel(outputModule, qt_("Output"));
includeonlys_.remove(child);
else
includeonlys_.push_back(child);
-
+
updateIncludeonlys();
changed();
}
// of the same parameters
static string param_cache;
static QString msg_cache;
-
+
if (listingsModule->bypassCB->isChecked())
return QString();
marginsModule->footskipLE->setEnabled(!custom);
marginsModule->footskipUnit->setEnabled(!custom);
- bool const enableColSep = !custom &&
+ bool const enableColSep = !custom &&
textLayoutModule->twoColumnCB->checkState() == Qt::Checked;
marginsModule->columnsepL->setEnabled(enableColSep);
marginsModule->columnsepLE->setEnabled(enableColSep);
font = tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()];
fontModule->fontScCB->setEnabled(providesSC(font));
fontModule->fontOsfCB->setEnabled(providesOSF(font));
-
+
fontModule->fontencLA->setEnabled(tex_fonts);
fontModule->fontencCO->setEnabled(tex_fonts);
if (!tex_fonts)
fontModule->fontsRomanCO->addItem(qt_("Default"), QString("default"));
fontModule->fontsSansCO->addItem(qt_("Default"), QString("default"));
fontModule->fontsTypewriterCO->addItem(qt_("Default"), QString("default"));
-
+
QFontDatabase fontdb;
QStringList families(fontdb.families());
for (QStringList::Iterator it = families.begin(); it != families.end(); ++it) {
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"
if (name.empty()) {
Alert::error(_("Error"),
- _("Unable to read local layout file."));
+ _("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) {
latexModule->classCO->setCurrentIndex(0);
} else
latexModule->classCO->setCurrentIndex(idx);
-
+
classChanged();
}
void GuiDocument::classChanged()
{
int idx = latexModule->classCO->currentIndex();
- if (idx < 0)
+ if (idx < 0)
return;
string const classname = classes_model_.getIDString(idx);
// We load the TextClass as soon as it is selected. This is
// necessary so that other options in the dialog can be updated
- // according to the new class. Note, however, that, if you use
- // the scroll wheel when sitting on the combo box, we'll load a
+ // according to the new class. Note, however, that, if you use
+ // the scroll wheel when sitting on the combo box, we'll load a
// lot of TextClass objects very quickly....
if (!bp_.setBaseClass(classname)) {
Alert::error(_("Error"), _("Unable to set document class."));
if (lyxrc.auto_reset_options)
bp_.useClassDefaults();
- // With the introduction of modules came a distinction between the base
- // class and the document class. The former corresponds to the main layout
+ // With the introduction of modules came a distinction between the base
+ // class and the document class. The former corresponds to the main layout
// file; the latter is that plus the modules (or the document-specific layout,
- // or whatever else there could be). Our parameters come from the document
- // class. So when we set the base class, we also need to recreate the document
+ // or whatever else there could be). Our parameters come from the document
+ // class. So when we set the base class, we also need to recreate the document
// class. Otherwise, we still have the old one.
bp_.makeDocumentClass();
paramsToDialog();
}
+void GuiDocument::biblioChanged()
+{
+ biblioChanged_ = true;
+ changed();
+}
+
+
void GuiDocument::bibtexChanged(int n)
{
biblioModule->bibtexOptionsLE->setEnabled(
biblioModule->bibtexCO->itemData(n).toString() != "default");
- changed();
+ biblioChanged();
+}
+
+
+void GuiDocument::setAuthorYear(bool authoryear)
+{
+ if (authoryear)
+ biblioModule->citeStyleCO->setCurrentIndex(0);
+ biblioChanged();
+}
+
+
+void GuiDocument::setNumerical(bool numerical)
+{
+ if (numerical)
+ biblioModule->citeStyleCO->setCurrentIndex(1);
+ biblioChanged();
+}
+
+
+void GuiDocument::updateEngineType(string const & items, CiteEngineType const & sel)
+{
+ engine_types_.clear();
+
+ int nn = 0;
+
+ for (int n = 0; !token(items, '|', n).empty(); ++n) {
+ nn += 1;
+ string style = token(items, '|', n);
+ engine_types_.push_back(style);
+ }
+
+ switch (sel) {
+ case ENGINE_TYPE_AUTHORYEAR:
+ biblioModule->citeStyleCO->setCurrentIndex(0);
+ break;
+ case ENGINE_TYPE_NUMERICAL:
+ biblioModule->citeStyleCO->setCurrentIndex(1);
+ break;
+ }
+
+ biblioModule->citationStyleL->setEnabled(nn > 1);
+ biblioModule->citeStyleCO->setEnabled(nn > 1);
+
+ if (nn != 1)
+ return;
+
+ // If the textclass allows only one of authoryear or numerical,
+ // we have no choice but to force that engine type.
+ if (engine_types_[0] == "authoryear")
+ biblioModule->citeStyleCO->setCurrentIndex(0);
+ else
+ biblioModule->citeStyleCO->setCurrentIndex(1);
}
namespace {
- // FIXME unicode
+ // FIXME unicode
// both of these should take a vector<docstring>
-
+
// 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)
+ docstring formatStrVec(vector<string> 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)
+ if (v.size() == 1)
return translateIfPossible(from_utf8(v[0]));
if (v.size() == 2) {
docstring retval = _("%1$s and %2$s");
docstring t2 = _("%1$s, %2$s");
docstring retval = translateIfPossible(from_utf8(v[0]));
for (int i = 1; i < vSize - 2; ++i)
- retval = bformat(t2, retval, translateIfPossible(from_utf8(v[i])));
+ retval = bformat(t2, retval, translateIfPossible(from_utf8(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, translateIfPossible(from_utf8(v[vSize - 2])),
translateIfPossible(from_utf8(v[vSize - 1])));
}
-
+
vector<string> idsToNames(vector<string> const & idList)
{
vector<string> retval;
for (; it != end; ++it) {
LyXModule const * const mod = theModuleList[*it];
if (!mod)
- retval.push_back(to_utf8(bformat(_("%1$s (unavailable)"),
+ retval.push_back(to_utf8(bformat(_("%1$s (unavailable)"),
translateIfPossible(from_utf8(*it)))));
else
retval.push_back(mod->getName());
void GuiDocument::updateModuleInfo()
{
selectionManager->update();
-
+
//Module description
bool const focus_on_selected = selectionManager->selectedFocused();
QAbstractItemView * lv;
if (focus_on_selected)
lv = modulesModule->selectedLV;
else
- lv= modulesModule->availableLV;
+ lv = modulesModule->availableLV;
if (lv->selectionModel()->selectedIndexes().isEmpty()) {
modulesModule->infoML->document()->clear();
return;
}
QModelIndex const & idx = lv->selectionModel()->currentIndex();
- GuiIdListModel const & id_model =
+ GuiIdListModel const & id_model =
focus_on_selected ? modules_sel_model_ : modules_av_model_;
string const modName = id_model.getIDString(idx.row());
docstring desc = getModuleDescription(modName);
desc += _("Module provided by document class.");
}
+ docstring cat = getModuleCategory(modName);
+ if (!cat.empty()) {
+ if (!desc.empty())
+ desc += "\n";
+ desc += bformat(_("Category: %1$s."), cat);
+ }
+
vector<string> pkglist = getPackageList(modName);
docstring pkgdesc = formatStrVec(pkglist, _("and"));
if (!pkgdesc.empty()) {
bp_.use_refstyle = latexModule->refstyleCB->isChecked();
// biblio
- bp_.setCiteEngine(ENGINE_BASIC);
-
- if (biblioModule->citeNatbibRB->isChecked()) {
- bool const use_numerical_citations =
- biblioModule->citeStyleCO->currentIndex();
- if (use_numerical_citations)
- bp_.setCiteEngine(ENGINE_NATBIB_NUMERICAL);
- else
- bp_.setCiteEngine(ENGINE_NATBIB_AUTHORYEAR);
+ if (biblioModule->citeNatbibRB->isChecked())
+ bp_.setCiteEngine("natbib");
+ else if (biblioModule->citeJurabibRB->isChecked())
+ bp_.setCiteEngine("jurabib");
+ else
+ bp_.setCiteEngine("basic");
- } else if (biblioModule->citeJurabibRB->isChecked())
- bp_.setCiteEngine(ENGINE_JURABIB);
+ if (biblioModule->citeStyleCO->currentIndex())
+ bp_.setCiteEngineType(ENGINE_TYPE_NUMERICAL);
+ else
+ bp_.setCiteEngineType(ENGINE_TYPE_AUTHORYEAR);
bp_.use_bibtopic =
biblioModule->bibtopicCB->isChecked();
+ bp_.biblio_style = fromqstr(biblioModule->bibtexStyleLE->text());
+
string const bibtex_command =
fromqstr(biblioModule->bibtexCO->itemData(
biblioModule->bibtexCO->currentIndex()).toString());
else
bp_.bibtex_command = bibtex_command + " " + bibtex_options;
+ if (biblioChanged_) {
+ buffer().invalidateBibinfoCache();
+ buffer().removeBiblioTempFiles();
+ }
+
// Indices
indicesModule->apply(bp_);
QString const lang = langModule->languageCO->itemData(
langModule->languageCO->currentIndex()).toString();
bp_.language = lyx::languages.getLanguage(fromqstr(lang));
-
+
QString const pack = langModule->languagePackageCO->itemData(
langModule->languagePackageCO->currentIndex()).toString();
if (pack == "custom")
// packages
bp_.graphics_driver =
tex_graphics[latexModule->psdriverCO->currentIndex()];
-
+
// text layout
int idx = latexModule->classCO->currentIndex();
if (idx >= 0) {
modulesToParams(bp_);
// Math
- if (mathsModule->amsautoCB->isChecked())
- bp_.use_amsmath = BufferParams::package_auto;
- else {
- if (mathsModule->amsCB->isChecked())
- bp_.use_amsmath = BufferParams::package_on;
- else
- bp_.use_amsmath = BufferParams::package_off;
- }
- if (mathsModule->esintautoCB->isChecked())
- bp_.use_esint = BufferParams::package_auto;
- else {
- if (mathsModule->esintCB->isChecked())
- bp_.use_esint = BufferParams::package_on;
- else
- bp_.use_esint = BufferParams::package_off;
- }
- if (mathsModule->mhchemautoCB->isChecked())
- bp_.use_mhchem = BufferParams::package_auto;
- else {
- if (mathsModule->mhchemCB->isChecked())
- bp_.use_mhchem = BufferParams::package_on;
- else
- bp_.use_mhchem = BufferParams::package_off;
- }
- if (mathsModule->mathdotsautoCB->isChecked())
- bp_.use_mathdots = BufferParams::package_auto;
- else {
- if (mathsModule->mathdotsCB->isChecked())
- bp_.use_mathdots = BufferParams::package_on;
- else
- bp_.use_mathdots = BufferParams::package_off;
- }
- if (mathsModule->undertildeautoCB->isChecked())
- bp_.use_undertilde = BufferParams::package_auto;
- else {
- if (mathsModule->undertildeCB->isChecked())
- bp_.use_undertilde = BufferParams::package_on;
- else
- bp_.use_undertilde = BufferParams::package_off;
+ vector<string> const & packages = BufferParams::auto_packages();
+ for (size_t n = 0; n < packages.size(); ++n) {
+ QCheckBox * autoCB = static_cast<QCheckBox *>(
+ mathsModule->gridLayout->itemAtPosition(2 * n, 0)->widget());
+ if (autoCB->isChecked())
+ bp_.use_package(packages[n], BufferParams::package_auto);
+ else {
+ QCheckBox * alwaysCB = static_cast<QCheckBox *>(
+ mathsModule->gridLayout->itemAtPosition(2 * n + 1, 0)->widget());
+ if (alwaysCB->isChecked())
+ bp_.use_package(packages[n], BufferParams::package_on);
+ else
+ bp_.use_package(packages[n], BufferParams::package_off);
+ }
}
-
+
// Page Layout
if (pageLayoutModule->pagestyleCO->currentIndex() == 0)
bp_.pagestyle = "default";
else
bp_.columns = 1;
+ bp_.justification = textLayoutModule->justCB->isChecked();
+
if (textLayoutModule->indentRB->isChecked()) {
// if paragraphs are separated by an indentation
bp_.paragraph_separation = BufferParams::ParagraphIndentSeparation;
bp_.useNonTeXFonts = nontexfonts;
bp_.output_sync = outputModule->outputsyncCB->isChecked();
+
bp_.output_sync_macro = fromqstr(outputModule->synccustomCB->currentText());
int mathfmt = outputModule->mathoutCB->currentIndex();
static_cast<BufferParams::MathOutput>(mathfmt);
bp_.html_math_output = mo;
bp_.html_be_strict = outputModule->strictCB->isChecked();
+ bp_.html_css_as_file = outputModule->cssCB->isChecked();
bp_.html_math_img_scale = outputModule->mathimgSB->value();
// fonts
latexModule->refstyleCB->setChecked(bp_.use_refstyle);
// biblio
+ string const cite_engine = bp_.citeEngine().list().front();
+
biblioModule->citeDefaultRB->setChecked(
- bp_.citeEngine() == ENGINE_BASIC);
+ cite_engine == "basic");
+
+ biblioModule->citeJurabibRB->setChecked(
+ cite_engine == "jurabib");
biblioModule->citeNatbibRB->setChecked(
- bp_.citeEngine() == ENGINE_NATBIB_NUMERICAL ||
- bp_.citeEngine() == ENGINE_NATBIB_AUTHORYEAR);
+ cite_engine == "natbib");
biblioModule->citeStyleCO->setCurrentIndex(
- bp_.citeEngine() == ENGINE_NATBIB_NUMERICAL);
+ bp_.citeEngineType() == ENGINE_TYPE_NUMERICAL);
- biblioModule->citeJurabibRB->setChecked(
- bp_.citeEngine() == ENGINE_JURABIB);
+ updateEngineType(documentClass().opt_enginetype(),
+ bp_.citeEngineType());
biblioModule->bibtopicCB->setChecked(
bp_.use_bibtopic);
+ biblioModule->bibtexStyleLE->setText(toqstr(bp_.biblio_style));
+
string command;
string options =
split(bp_.bibtex_command, command, ' ');
biblioModule->bibtexOptionsLE->setEnabled(
biblioModule->bibtexCO->currentIndex() != 0);
+ biblioChanged_ = false;
+
// indices
indicesModule->update(bp_);
if (nitem >= 0)
latexModule->psdriverCO->setCurrentIndex(nitem);
updateModuleInfo();
-
- mathsModule->amsCB->setChecked(
- bp_.use_amsmath == BufferParams::package_on);
- mathsModule->amsautoCB->setChecked(
- bp_.use_amsmath == BufferParams::package_auto);
-
- mathsModule->esintCB->setChecked(
- bp_.use_esint == BufferParams::package_on);
- mathsModule->esintautoCB->setChecked(
- bp_.use_esint == BufferParams::package_auto);
-
- mathsModule->mhchemCB->setChecked(
- bp_.use_mhchem == BufferParams::package_on);
- mathsModule->mhchemautoCB->setChecked(
- bp_.use_mhchem == BufferParams::package_auto);
-
- mathsModule->mathdotsCB->setChecked(
- bp_.use_mathdots == BufferParams::package_on);
- mathsModule->mathdotsautoCB->setChecked(
- bp_.use_mathdots == BufferParams::package_auto);
-
- mathsModule->undertildeCB->setChecked(
- bp_.use_undertilde == BufferParams::package_on);
- mathsModule->undertildeautoCB->setChecked(
- bp_.use_undertilde == BufferParams::package_auto);
+
+ vector<string> const & packages = BufferParams::auto_packages();
+ for (size_t n = 0; n < packages.size(); ++n) {
+ QCheckBox * alwaysCB = static_cast<QCheckBox *>(
+ mathsModule->gridLayout->itemAtPosition(2 * n + 1, 0)->widget());
+ alwaysCB->setChecked(bp_.use_package(packages[n]) == BufferParams::package_on);
+ QCheckBox * autoCB = static_cast<QCheckBox *>(
+ mathsModule->gridLayout->itemAtPosition(2 * n, 0)->widget());
+ autoCB->setChecked(bp_.use_package(packages[n]) == BufferParams::package_auto);
+ }
switch (bp_.spacing().getSpace()) {
case Spacing::Other: nitem = 3; break;
textLayoutModule->twoColumnCB->setChecked(
bp_.columns == 2);
+ textLayoutModule->justCB->setChecked(bp_.justification);
if (!bp_.options.empty()) {
latexModule->optionsLE->setText(
InsetListingsParams(bp_.listings_params).separatedParams();
listingsModule->listingsED->setPlainText(toqstr(lstparams));
- // Output
- // update combobox with formats
- updateDefaultFormat();
- int index = outputModule->defaultFormatCO->findData(toqstr(
- bp_.default_output_format));
- // set to default if format is not found
- if (index == -1)
- index = 0;
- outputModule->defaultFormatCO->setCurrentIndex(index);
+ // Fonts
bool const os_fonts_available =
bp_.baseClass()->outputType() == lyx::LATEX
&& LaTeXFeatures::isAvailable("fontspec");
fontModule->osFontsCB->setEnabled(os_fonts_available);
fontModule->osFontsCB->setChecked(
os_fonts_available && bp_.useNonTeXFonts);
-
- outputModule->outputsyncCB->setChecked(bp_.output_sync);
- outputModule->synccustomCB->setEditText(toqstr(bp_.output_sync_macro));
-
- outputModule->mathimgSB->setValue(bp_.html_math_img_scale);
- outputModule->mathoutCB->setCurrentIndex(bp_.html_math_output);
- outputModule->strictCB->setChecked(bp_.html_be_strict);
-
- // Fonts
updateFontsize(documentClass().opt_fontsize(),
bp_.fontsize);
fontModule->fontOsfCB->setChecked(bp_.fonts_old_figures);
fontModule->scaleSansSB->setValue(bp_.fonts_sans_scale);
fontModule->scaleTypewriterSB->setValue(bp_.fonts_typewriter_scale);
-
+
int nn = findToken(GuiDocument::fontfamilies, bp_.fonts_default_family);
if (nn >= 0)
fontModule->fontsDefaultCO->setCurrentIndex(nn);
fontModule->fontencLE->setText(toqstr(bp_.fontenc));
}
+ // Output
+ // This must be set _after_ fonts since updateDefaultFormat()
+ // checks osFontsCB settings.
+ // update combobox with formats
+ updateDefaultFormat();
+ int index = outputModule->defaultFormatCO->findData(toqstr(
+ bp_.default_output_format));
+ // set to default if format is not found
+ if (index == -1)
+ index = 0;
+ outputModule->defaultFormatCO->setCurrentIndex(index);
+
+ outputModule->outputsyncCB->setChecked(bp_.output_sync);
+ outputModule->synccustomCB->setEditText(toqstr(bp_.output_sync_macro));
+
+ outputModule->mathimgSB->setValue(bp_.html_math_img_scale);
+ outputModule->mathoutCB->setCurrentIndex(bp_.html_math_output);
+ outputModule->strictCB->setChecked(bp_.html_be_strict);
+ outputModule->cssCB->setChecked(bp_.html_css_as_file);
+
// paper
bool const extern_geometry =
documentClass().provides("geometry");
// PDF support
PDFOptions const & pdf = bp_.pdfoptions();
pdfSupportModule->use_hyperrefGB->setChecked(pdf.use_hyperref);
+ if (bp_.documentClass().provides("hyperref"))
+ pdfSupportModule->use_hyperrefGB->setTitle(qt_("C&ustomize Hyperref Options"));
+ else
+ pdfSupportModule->use_hyperrefGB->setTitle(qt_("&Use Hyperref Support"));
pdfSupportModule->titleLE->setText(toqstr(pdf.title));
pdfSupportModule->authorLE->setText(toqstr(pdf.author));
pdfSupportModule->subjectLE->setText(toqstr(pdf.subject));
}
-void GuiDocument::updateAvailableModules()
+void GuiDocument::updateAvailableModules()
{
modules_av_model_.clear();
list<modInfoStruct> const & modInfoList = getModuleInfo();
list<modInfoStruct>::const_iterator mit = modInfoList.begin();
list<modInfoStruct>::const_iterator men = modInfoList.end();
for (int i = 0; mit != men; ++mit, ++i)
- modules_av_model_.insertRow(i, mit->name, mit->id,
+ modules_av_model_.insertRow(i, mit->name, mit->id,
mit->description);
}
-void GuiDocument::updateSelectedModules()
+void GuiDocument::updateSelectedModules()
{
modules_sel_model_.clear();
list<modInfoStruct> const selModList = getSelectedModules();
list<modInfoStruct>::const_iterator mit = selModList.begin();
list<modInfoStruct>::const_iterator men = selModList.end();
for (int i = 0; mit != men; ++mit, ++i)
- modules_sel_model_.insertRow(i, mit->name, mit->id,
+ modules_sel_model_.insertRow(i, mit->name, mit->id,
mit->description);
}
{
int idx = classes_model_.findIDString(idString);
if (idx < 0)
- Alert::warning(_("Can't set layout!"),
+ Alert::warning(_("Can't set layout!"),
bformat(_("Unable to set layout for ID: %1$s"), from_utf8(idString)));
- else
+ else
latexModule->classCO->setCurrentIndex(idx);
}
bool GuiDocument::isValid()
{
- return
+ return
validateListingsParameters().isEmpty() &&
localLayout->isValid() &&
(
// if we're asking for skips between paragraphs
!textLayoutModule->skipRB->isChecked() ||
// then either we haven't chosen custom
- textLayoutModule->skipCO->currentIndex() != 3 ||
+ textLayoutModule->skipCO->currentIndex() != 3 ||
// or else a length has been given
!textLayoutModule->skipLE->text().isEmpty()
- ) &&
+ ) &&
(
// if we're asking for indentation
- !textLayoutModule->indentRB->isChecked() ||
+ !textLayoutModule->indentRB->isChecked() ||
// then either we haven't chosen custom
- textLayoutModule->indentCO->currentIndex() != 1 ||
+ textLayoutModule->indentCO->currentIndex() != 1 ||
// or else a length has been given
!textLayoutModule->indentLE->text().isEmpty()
);
}
-list<GuiDocument::modInfoStruct> const
+list<GuiDocument::modInfoStruct> const
GuiDocument::makeModuleInfo(LayoutModuleList const & mods)
{
LayoutModuleList::const_iterator it = mods.begin();
if (mod)
// FIXME Unicode
m.name = toqstr(translateIfPossible(from_utf8(mod->getName())));
- else
+ else
m.name = toqstr(*it) + toqstr(" (") + qt_("Not Found") + toqstr(")");
mInfo.push_back(m);
}
if (master->isChild(const_cast<Buffer *>(&buffer())))
const_cast<Buffer &>(buffer()).setParent(master);
else
- Alert::warning(_("Assigned master does not include this file"),
+ Alert::warning(_("Assigned master does not include this file"),
bformat(_("You must include this file in the document\n"
"'%1$s' in order to use the master document\n"
"feature."), from_utf8(params().master)));
} else
- Alert::warning(_("Could not load master"),
+ Alert::warning(_("Could not load master"),
bformat(_("The master document '%1$s'\n"
"could not be loaded."),
from_utf8(params().master)));
executeBranchRenaming();
// and clear changed branches cache
changedBranches_.clear();
-
+
// Generate the colours requested by indices.
IndicesList & indiceslist = params().indiceslist();
if (!indiceslist.empty()) {
if (pos > 0)
desc.truncate(pos + 1);
m.description = desc;
- moduleNames_.push_back(m);
+ if (it->category().substr(0, 8) != "Citation")
+ moduleNames_.push_back(m);
}
}
projects / features.git / blobdiff