#include "GuiApplication.h"
#include "GuiBranches.h"
+#include "GuiSelectionManager.h"
#include "LaTeXHighlighter.h"
#include "LengthCombo.h"
#include "PanelStack.h"
#include <QTextCursor>
#include <sstream>
+#include <vector>
#ifdef IN
#undef IN
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"), ""
};
};
-vector<pair<string, lyx::docstring> > pagestyles;
+char const * backref_opts[] =
+{
+ "false", "section", "slide", "page", ""
+};
+
+
+char const * backref_opts_gui[] =
+{
+ N_("Off"), N_("Section"), N_("Slide"), N_("Page"), ""
+};
+
+
+vector<pair<string, QString> > pagestyles;
} // anonymous namespace
: public binary_function<string, string, int>
{
public:
- int operator()(string const & lhs, string const & rhs) const
+ bool operator()(string const & lhs, string const & rhs) const
{
// Ordering criteria:
// 1. Availability of text class
}
namespace frontend {
-
-
-///
-QModelIndex getSelectedIndex(QListView * lv)
-{
- QModelIndex retval = QModelIndex();
- QModelIndexList selIdx =
- lv->selectionModel()->selectedIndexes();
- if (!selIdx.empty())
- retval = selIdx.first();
- return retval;
-}
-
-
namespace {
vector<string> getRequiredList(string const & modName)
//
/////////////////////////////////////////////////////////////////////
-ModuleSelectionManager::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)
-{}
-
+/// 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<GuiIdListModel *>(availableModel);
+ }
+ /// returns selectedModel as a GuiIdListModel
+ GuiIdListModel * getSelectedModel()
+ {
+ return dynamic_cast<GuiIdListModel *>(selectedModel);
+ }
+};
void ModuleSelectionManager::updateAddPB()
{
vector<string>::const_iterator selModStart = selModList.begin();
vector<string>::const_iterator selModEnd = selModList.end();
- //Check whether some required module is available
+ // Check whether some required module is available
if (!reqs.empty()) {
bool foundOne = false;
vector<string>::const_iterator it = reqs.begin();
}
}
- //Check whether any excluded module is being used
+ // 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();
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...
+ int const curRow = curIdx.row();
+ if (curRow < 0 || curRow >= srows - 1) { // invalid or last item
downPB->setEnabled(false);
return;
}
+
+ // determine whether immediately succeding element requires this one
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 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
+ // Enable it if this module isn't required.
+ // 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());
}
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);
+ if (curRow <= 0 || curRow > srows - 1) { // first item or invalid
+ upPB->setEnabled(false);
return;
}
string const curModName = getSelectedModel()->getIDString(curRow);
+
+ // determine whether immediately preceding element is required by this one
vector<string> reqs = getRequiredList(curModName);
- //if this one doesn't require anything....
+ // 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
+ // Enable it if the preceding module isn't required.
+ // 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.
upPB->setEnabled(find(reqs.begin(), reqs.end(), preModName) == reqs.end());
}
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
+ if (curRow < 0 || curRow >= srows) { // invalid index?
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.
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.
+ // 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);
//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;
+ // 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?
+ // 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;
+ // lyxerr << mod << " does the trick." << std::endl;
foundOne = true;
break;
}
}
- //did we find a module to satisfy the require?
+ // did we find a module to satisfy the require?
if (!foundOne) {
- //lyxerr << "No matching module found." << std::endl;
+ // lyxerr << "No matching module found." << std::endl;
deletePB->setEnabled(false);
return;
}
}
- //lyxerr << "All's well that ends well." << std::endl;
+ // lyxerr << "All's well that ends well." << std::endl;
deletePB->setEnabled(true);
}
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(const QString&)),
+ connect(marginsModule->columnsepLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
connect(marginsModule->columnsepUnit, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
latexModule = new UiWidget<Ui::LaTeXUi>;
// latex class
- connect(latexModule->optionsLE, SIGNAL(textChanged(const QString &)),
+ connect(latexModule->optionsLE, SIGNAL(textChanged(QString)),
+ this, SLOT(change_adaptor()));
+ connect(latexModule->defaultOptionsCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
connect(latexModule->psdriverCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
this, SLOT(change_adaptor()));
connect(latexModule->childDocGB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
- connect(latexModule->childDocLE, SIGNAL(textChanged(const QString &)),
+ connect(latexModule->childDocLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
connect(latexModule->childDocPB, SIGNAL(clicked()),
this, SLOT(browseMaster()));
- selectionManager =
+ selectionManager =
new ModuleSelectionManager(latexModule->availableLV,
latexModule->selectedLV,
latexModule->addPB, latexModule->deletePB,
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()));
this, SLOT(change_adaptor()));
connect(pdfSupportModule->colorlinksCB, SIGNAL(toggled(bool)),
this, SLOT(change_adaptor()));
- connect(pdfSupportModule->backrefCB, SIGNAL(toggled(bool)),
+ connect(pdfSupportModule->backrefCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
connect(pdfSupportModule->pdfusetitleCB, SIGNAL(toggled(bool)),
this, SLOT(change_adaptor()));
- connect(pdfSupportModule->pagebackrefCB, SIGNAL(toggled(bool)),
- this, SLOT(change_adaptor()));
connect(pdfSupportModule->fullscreenCB, SIGNAL(toggled(bool)),
this, SLOT(change_adaptor()));
- connect(pdfSupportModule->optionsLE, SIGNAL(textChanged(const QString &)),
+ connect(pdfSupportModule->optionsLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
+ for (int i = 0; backref_opts[i][0]; ++i)
+ pdfSupportModule->backrefCO->addItem(qt_(backref_opts_gui[i]));
+
// float
floatModule = new FloatPlacement;
connect(floatModule, SIGNAL(changed()),
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<string, docstring>(style, style_gui));
- pageLayoutModule->pagestyleCO->addItem(toqstr(style_gui));
+ QString style_gui = qt_(style);
+ pagestyles.push_back(pair<string, QString>(style, style_gui));
+ pageLayoutModule->pagestyleCO->addItem(style_gui);
}
if (sel == "default") {
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);
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.
+ // 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
+ // lot of TextClass objects very quickly....
if (!bp_.setBaseClass(classname)) {
Alert::error(_("Error"), _("Unable to set document class."));
return;
}
- if (lyxrc.auto_reset_options) {
+
+ // check whether the selected modules have changed.
+ bool modulesChanged = false;
+ unsigned int const srows = selectedModel()->rowCount();
+ if (srows != bp_.getModules().size())
+ modulesChanged = true;
+ else {
+ list<string>::const_iterator mit = bp_.getModules().begin();
+ list<string>::const_iterator men = bp_.getModules().end();
+ for (unsigned int i = 0; i < srows && mit != men; ++i, ++mit)
+ if (selectedModel()->getIDString(i) != *mit) {
+ modulesChanged = true;
+ break;
+ }
+ }
+
+ if (modulesChanged || 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 (ret == 0)
applyView();
}
- bp_.useClassDefaults();
- paramsToDialog(bp_);
- }
- // 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?
+ 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
+ // 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
+ // class. Otherwise, we still have the old one.
+ bp_.makeDocumentClass();
+ // the new class may require some default modules.
updateSelectedModules();
+ paramsToDialog();
}
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)
+ if (v.size() == 1)
return from_ascii(v[0]);
- else if (v.size() == 2) {
+ 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...
+ // 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)
void GuiDocument::updateNumbering()
{
- DocumentClass const & tclass = bp_.documentClass();
+ DocumentClass const & tclass = documentClass();
numberingModule->tocTW->setUpdatesEnabled(false);
numberingModule->tocTW->clear();
params.addLayoutModule(modules_sel_model_.getIDString(i));
// update the list of removed modules
params.clearRemovedModules();
- set<string> const & reqmods = params.baseClass()->defaultModules();
- set<string>::const_iterator rit = reqmods.begin();
- set<string>::const_iterator ren = reqmods.end();
+ list<string> const & reqmods = params.baseClass()->defaultModules();
+ list<string>::const_iterator rit = reqmods.begin();
+ list<string>::const_iterator ren = reqmods.end();
// check each of the required modules
for (; rit != ren; rit++) {
- vector<string>::const_iterator mit = params.getModules().begin();
- vector<string>::const_iterator men = params.getModules().end();
+ list<string>::const_iterator mit = params.getModules().begin();
+ list<string>::const_iterator men = params.getModules().end();
bool found = false;
for (; mit != men; mit++) {
if (*rit == *mit) {
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;
}
params.options =
fromqstr(latexModule->optionsLE->text());
+ params.use_default_options =
+ latexModule->defaultOptionsCB->isChecked();
+
if (latexModule->childDocGB->isChecked())
params.master =
fromqstr(latexModule->childDocLE->text());
pdf.pdfborder = pdfSupportModule->pdfborderCB->isChecked();
pdf.pdfusetitle = pdfSupportModule->pdfusetitleCB->isChecked();
pdf.colorlinks = pdfSupportModule->colorlinksCB->isChecked();
- pdf.backref = pdfSupportModule->backrefCB->isChecked();
- pdf.pagebackref = pdfSupportModule->pagebackrefCB->isChecked();
+ pdf.backref =
+ backref_opts[pdfSupportModule->backrefCO->currentIndex()];
if (pdfSupportModule->fullscreenCB->isChecked())
pdf.pagemode = pdf.pagemode_fullscreen;
else
}
-void GuiDocument::paramsToDialog(BufferParams const & params)
+void GuiDocument::paramsToDialog()
{
// set the default unit
Length::UNIT defaultUnit = Length::CM;
}
// preamble
- preambleModule->update(params, id());
+ preambleModule->update(bp_, id());
// biblio
biblioModule->citeDefaultRB->setChecked(
- params.citeEngine() == ENGINE_BASIC);
+ bp_.citeEngine() == ENGINE_BASIC);
biblioModule->citeNatbibRB->setChecked(
- params.citeEngine() == ENGINE_NATBIB_NUMERICAL ||
- params.citeEngine() == ENGINE_NATBIB_AUTHORYEAR);
+ bp_.citeEngine() == ENGINE_NATBIB_NUMERICAL ||
+ bp_.citeEngine() == ENGINE_NATBIB_AUTHORYEAR);
biblioModule->citeStyleCO->setCurrentIndex(
- params.citeEngine() == ENGINE_NATBIB_NUMERICAL);
+ bp_.citeEngine() == ENGINE_NATBIB_NUMERICAL);
biblioModule->citeJurabibRB->setChecked(
- params.citeEngine() == ENGINE_JURABIB);
+ bp_.citeEngine() == ENGINE_JURABIB);
biblioModule->bibtopicCB->setChecked(
- params.use_bibtopic);
+ bp_.use_bibtopic);
// language & quotes
int const pos = langModule->languageCO->findData(toqstr(
- params.language->lang()));
+ bp_.language->lang()));
langModule->languageCO->setCurrentIndex(pos);
langModule->quoteStyleCO->setCurrentIndex(
- params.quotes_language);
+ bp_.quotes_language);
bool default_enc = true;
- if (params.inputenc != "auto") {
+ if (bp_.inputenc != "auto") {
default_enc = false;
- if (params.inputenc == "default") {
+ if (bp_.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) {
+ if (it->latexName() == bp_.inputenc) {
enc_gui = it->guiName();
break;
}
numberingModule->setEnabled(true);
numberingModule->depthSL->setMinimum(min_toclevel - 1);
numberingModule->depthSL->setMaximum(max_toclevel);
- numberingModule->depthSL->setValue(params.secnumdepth);
+ numberingModule->depthSL->setValue(bp_.secnumdepth);
numberingModule->tocSL->setMaximum(min_toclevel - 1);
numberingModule->tocSL->setMaximum(max_toclevel);
- numberingModule->tocSL->setValue(params.tocdepth);
+ numberingModule->tocSL->setValue(bp_.tocdepth);
updateNumbering();
} else {
numberingModule->setEnabled(false);
}
// bullets
- bulletsModule->setBullet(0, params.user_defined_bullet(0));
- bulletsModule->setBullet(1, params.user_defined_bullet(1));
- bulletsModule->setBullet(2, params.user_defined_bullet(2));
- bulletsModule->setBullet(3, params.user_defined_bullet(3));
+ bulletsModule->setBullet(0, bp_.user_defined_bullet(0));
+ bulletsModule->setBullet(1, bp_.user_defined_bullet(1));
+ bulletsModule->setBullet(2, bp_.user_defined_bullet(2));
+ bulletsModule->setBullet(3, bp_.user_defined_bullet(3));
bulletsModule->init();
// packages
- int nitem = findToken(tex_graphics, params.graphicsDriver);
+ int nitem = findToken(tex_graphics, bp_.graphicsDriver);
if (nitem >= 0)
latexModule->psdriverCO->setCurrentIndex(nitem);
updateModuleInfo();
mathsModule->amsCB->setChecked(
- params.use_amsmath == BufferParams::package_on);
+ bp_.use_amsmath == BufferParams::package_on);
mathsModule->amsautoCB->setChecked(
- params.use_amsmath == BufferParams::package_auto);
+ bp_.use_amsmath == BufferParams::package_auto);
mathsModule->esintCB->setChecked(
- params.use_esint == BufferParams::package_on);
+ bp_.use_esint == BufferParams::package_on);
mathsModule->esintautoCB->setChecked(
- params.use_esint == BufferParams::package_auto);
+ bp_.use_esint == BufferParams::package_auto);
- switch (params.spacing().getSpace()) {
+ switch (bp_.spacing().getSpace()) {
case Spacing::Other: nitem = 3; break;
case Spacing::Double: nitem = 2; break;
case Spacing::Onehalf: nitem = 1; break;
}
// text layout
- string const & layoutID = params.baseClassID();
+ string const & layoutID = bp_.baseClassID();
setLayoutComboByIDString(layoutID);
updatePagestyle(documentClass().opt_pagestyle(),
- params.pagestyle);
+ bp_.pagestyle);
textLayoutModule->lspacingCO->setCurrentIndex(nitem);
- if (params.spacing().getSpace() == Spacing::Other) {
+ if (bp_.spacing().getSpace() == Spacing::Other) {
textLayoutModule->lspacingLE->setText(
- toqstr(params.spacing().getValueAsString()));
+ toqstr(bp_.spacing().getValueAsString()));
}
setLSpacing(nitem);
- if (params.paragraph_separation == BufferParams::ParagraphIndentSeparation)
+ if (bp_.paragraph_separation == BufferParams::ParagraphIndentSeparation)
textLayoutModule->indentRB->setChecked(true);
else
textLayoutModule->skipRB->setChecked(true);
int skip = 0;
- switch (params.getDefSkip().kind()) {
+ switch (bp_.getDefSkip().kind()) {
case VSpace::SMALLSKIP:
skip = 0;
break;
case VSpace::LENGTH:
{
skip = 3;
- string const length = params.getDefSkip().asLyXCommand();
+ string const length = bp_.getDefSkip().asLyXCommand();
lengthToWidgets(textLayoutModule->skipLE,
textLayoutModule->skipLengthCO,
length, defaultUnit);
setSkip(skip);
textLayoutModule->twoColumnCB->setChecked(
- params.columns == 2);
+ bp_.columns == 2);
// break listings_params to multiple lines
string lstparams =
- InsetListingsParams(params.listings_params).separatedParams();
+ InsetListingsParams(bp_.listings_params).separatedParams();
textLayoutModule->listingsED->setPlainText(toqstr(lstparams));
- if (!params.options.empty()) {
+ if (!bp_.options.empty()) {
latexModule->optionsLE->setText(
- toqstr(params.options));
+ toqstr(bp_.options));
} else {
latexModule->optionsLE->setText(QString());
}
- if (!params.master.empty()) {
+ // latex
+ latexModule->defaultOptionsCB->setChecked(
+ bp_.use_default_options);
+
+ if (!documentClass().options().empty()) {
+ latexModule->defaultOptionsLE->setText(
+ toqstr(documentClass().options()));
+ } else {
+ latexModule->defaultOptionsLE->setText(
+ toqstr(_("[No options predefined]")));
+ }
+
+ latexModule->defaultOptionsLE->setEnabled(
+ bp_.use_default_options
+ && !documentClass().options().empty());
+
+ latexModule->defaultOptionsCB->setEnabled(
+ !documentClass().options().empty());
+
+ if (!bp_.master.empty()) {
latexModule->childDocGB->setChecked(true);
latexModule->childDocLE->setText(
- toqstr(params.master));
+ toqstr(bp_.master));
} else {
latexModule->childDocLE->setText(QString());
latexModule->childDocGB->setChecked(false);
}
- floatModule->set(params.float_placement);
+ floatModule->set(bp_.float_placement);
// Fonts
updateFontsize(documentClass().opt_fontsize(),
- params.fontsize);
+ bp_.fontsize);
- int n = findToken(tex_fonts_roman, params.fontsRoman);
+ int n = findToken(tex_fonts_roman, bp_.fontsRoman);
if (n >= 0) {
fontModule->fontsRomanCO->setCurrentIndex(n);
romanChanged(n);
}
- n = findToken(tex_fonts_sans, params.fontsSans);
+ n = findToken(tex_fonts_sans, bp_.fontsSans);
if (n >= 0) {
fontModule->fontsSansCO->setCurrentIndex(n);
sansChanged(n);
}
- n = findToken(tex_fonts_monospaced, params.fontsTypewriter);
+ n = findToken(tex_fonts_monospaced, bp_.fontsTypewriter);
if (n >= 0) {
fontModule->fontsTypewriterCO->setCurrentIndex(n);
ttChanged(n);
}
- if (!params.fontsCJK.empty())
+ if (!bp_.fontsCJK.empty())
fontModule->cjkFontLE->setText(
- toqstr(params.fontsCJK));
+ toqstr(bp_.fontsCJK));
else
fontModule->cjkFontLE->setText(QString());
- fontModule->fontScCB->setChecked(params.fontsSC);
- fontModule->fontOsfCB->setChecked(params.fontsOSF);
- fontModule->scaleSansSB->setValue(params.fontsSansScale);
- fontModule->scaleTypewriterSB->setValue(params.fontsTypewriterScale);
- n = findToken(GuiDocument::fontfamilies, params.fontsDefaultFamily);
+ fontModule->fontScCB->setChecked(bp_.fontsSC);
+ fontModule->fontOsfCB->setChecked(bp_.fontsOSF);
+ fontModule->scaleSansSB->setValue(bp_.fontsSansScale);
+ fontModule->scaleTypewriterSB->setValue(bp_.fontsTypewriterScale);
+ n = findToken(GuiDocument::fontfamilies, bp_.fontsDefaultFamily);
if (n >= 0)
fontModule->fontsDefaultCO->setCurrentIndex(n);
// paper
- int const psize = params.papersize;
+ int const psize = bp_.papersize;
pageLayoutModule->papersizeCO->setCurrentIndex(psize);
setCustomPapersize(psize);
bool const landscape =
- params.orientation == ORIENTATION_LANDSCAPE;
+ bp_.orientation == ORIENTATION_LANDSCAPE;
pageLayoutModule->landscapeRB->setChecked(landscape);
pageLayoutModule->portraitRB->setChecked(!landscape);
pageLayoutModule->facingPagesCB->setChecked(
- params.sides == TwoSides);
+ bp_.sides == TwoSides);
lengthToWidgets(pageLayoutModule->paperwidthLE,
- pageLayoutModule->paperwidthUnitCO, params.paperwidth, defaultUnit);
+ pageLayoutModule->paperwidthUnitCO, bp_.paperwidth, defaultUnit);
lengthToWidgets(pageLayoutModule->paperheightLE,
- pageLayoutModule->paperheightUnitCO, params.paperheight, defaultUnit);
+ pageLayoutModule->paperheightUnitCO, bp_.paperheight, defaultUnit);
// margins
Ui::MarginsUi * m = marginsModule;
- setMargins(!params.use_geometry);
+ setMargins(!bp_.use_geometry);
lengthToWidgets(m->topLE, m->topUnit,
- params.topmargin, defaultUnit);
+ bp_.topmargin, defaultUnit);
lengthToWidgets(m->bottomLE, m->bottomUnit,
- params.bottommargin, defaultUnit);
+ bp_.bottommargin, defaultUnit);
lengthToWidgets(m->innerLE, m->innerUnit,
- params.leftmargin, defaultUnit);
+ bp_.leftmargin, defaultUnit);
lengthToWidgets(m->outerLE, m->outerUnit,
- params.rightmargin, defaultUnit);
+ bp_.rightmargin, defaultUnit);
lengthToWidgets(m->headheightLE, m->headheightUnit,
- params.headheight, defaultUnit);
+ bp_.headheight, defaultUnit);
lengthToWidgets(m->headsepLE, m->headsepUnit,
- params.headsep, defaultUnit);
+ bp_.headsep, defaultUnit);
lengthToWidgets(m->footskipLE, m->footskipUnit,
- params.footskip, defaultUnit);
+ bp_.footskip, defaultUnit);
lengthToWidgets(m->columnsepLE, m->columnsepUnit,
- params.columnsep, defaultUnit);
+ bp_.columnsep, defaultUnit);
- branchesModule->update(params);
+ branchesModule->update(bp_);
// PDF support
- PDFOptions const & pdf = params.pdfoptions();
+ PDFOptions const & pdf = bp_.pdfoptions();
pdfSupportModule->use_hyperrefGB->setChecked(pdf.use_hyperref);
pdfSupportModule->titleLE->setText(toqstr(pdf.title));
pdfSupportModule->authorLE->setText(toqstr(pdf.author));
pdfSupportModule->pdfborderCB->setChecked(pdf.pdfborder);
pdfSupportModule->pdfusetitleCB->setChecked(pdf.pdfusetitle);
pdfSupportModule->colorlinksCB->setChecked(pdf.colorlinks);
- pdfSupportModule->backrefCB->setChecked(pdf.backref);
- pdfSupportModule->pagebackrefCB->setChecked(pdf.pagebackref);
+
+ n = findToken(backref_opts, pdf.backref);
+ if (n >= 0)
+ pdfSupportModule->backrefCO->setCurrentIndex(n);
+
pdfSupportModule->fullscreenCB->setChecked
(pdf.pagemode == pdf.pagemode_fullscreen);
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, modInfo.name, modInfo.id,
- modInfo.description);
- }
+ 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,
+ mit->description);
}
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, modInfo.name, modInfo.id,
- modInfo.description);
- }
+ 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,
+ mit->description);
}
return;
}
bp_.useClassDefaults();
- paramsToDialog(bp_);
+ paramsToDialog();
}
-void GuiDocument::setLayoutComboByIDString(std::string const & idString)
+void GuiDocument::setLayoutComboByIDString(string const & idString)
{
int idx = classes_model_.findIDString(idString);
if (idx < 0)
bool GuiDocument::initialiseParams(string const &)
{
- BufferView * view = bufferview();
+ BufferView const * view = bufferview();
if (!view) {
bp_ = BufferParams();
- paramsToDialog(bp_);
+ paramsToDialog();
return true;
}
bp_ = view->buffer().params();
//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_);
+ paramsToDialog();
return true;
}
}
-vector<GuiDocument::modInfoStruct> const & GuiDocument::getModuleInfo()
+list<GuiDocument::modInfoStruct> const & GuiDocument::getModuleInfo()
{
return moduleNames_;
}
-vector<GuiDocument::modInfoStruct> const GuiDocument::getSelectedModules()
+list<GuiDocument::modInfoStruct> const GuiDocument::getSelectedModules()
{
- vector<string> const & mods = params().getModules();
- vector<string>::const_iterator it = mods.begin();
- vector<string>::const_iterator end = mods.end();
- vector<modInfoStruct> mInfo;
+ list<string> const & mods = params().getModules();
+ list<string>::const_iterator it = mods.begin();
+ list<string>::const_iterator end = mods.end();
+ list<modInfoStruct> mInfo;
for (; it != end; ++it) {
modInfoStruct m;
m.id = *it;
support::onlyPath(buffer().absFileName()));
if (isLyXFilename(master_file.absFilename())) {
Buffer * master = checkAndLoadLyXFile(master_file);
- buffer().setParent(master);
+ const_cast<Buffer &>(buffer()).setParent(master);
}
}
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));
"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 *>(bufferview());
+ bv->processUpdateFlags(Update::Force | Update::FitCursor);
}