namespace frontend {
namespace {
-vector<string> getRequiredList(string const & modName)
+vector<string> getRequiredList(string const & modName)
{
LyXModule const * const mod = theModuleList[modName];
if (!mod)
/////////////////////////////////////////////////////////////////////
/// 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;
{
connect(locallayoutTE, SIGNAL(textChanged()), this, SLOT(textChanged()));
connect(validatePB, SIGNAL(clicked()), this, SLOT(validatePressed()));
+ connect(convertPB, SIGNAL(clicked()), this, SLOT(convertPressed()));
}
static const QString unknown = qt_("Press button to check validity...");
is_valid_ = false;
- infoLB->setText(unknown);
+ validLB->setText(unknown);
validatePB->setEnabled(true);
+ convertPB->setEnabled(false);
+ changed();
+}
+
+
+void LocalLayout::convert() {
+ string const layout =
+ fromqstr(locallayoutTE->document()->toPlainText().trimmed());
+ string const newlayout = TextClass::convert(layout);
+ LYXERR0(newlayout);
+ if (newlayout.empty()) {
+ Alert::error(_("Conversion Failed!"),
+ _("Failed to convert local layout to current format."));
+ } else {
+ locallayoutTE->setPlainText(toqstr(newlayout));
+ }
+ validate();
+}
+
+
+void LocalLayout::convertPressed() {
+ convert();
changed();
}
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;
- infoLB->setText("");
+ validatePB->setEnabled(false);
+ validLB->setText("");
+ convertPB->hide();
+ convertLB->hide();
} else {
- is_valid_ = TextClass::validate(layout);
- infoLB->setText(is_valid_ ? vtext : ivtext);
+ TextClass::ReturnValues const ret = TextClass::validate(layout);
+ is_valid_ = (ret == TextClass::OK) || (ret == TextClass::OK_OLDFORMAT);
+ validatePB->setEnabled(false);
+ validLB->setText(is_valid_ ? vtext : ivtext);
+ if (ret == TextClass::OK_OLDFORMAT) {
+ convertPB->show();
+ convertPB->setEnabled(true);
+ convertLB->setText(qt_("Convert to current format"));
+ convertLB->show();
+ } else {
+ convertPB->hide();
+ convertLB->hide();
+ }
}
- validatePB->setEnabled(false);
}
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()));
outputModule->synccustomCB->addItem("\\synctex=-1");
outputModule->synccustomCB->addItem("\\usepackage[active]{srcltx}");
+ outputModule->synccustomCB->setValidator(new NoNewLineValidator(
+ outputModule->synccustomCB));
+
// fonts
fontModule = new UiWidget<Ui::FontUi>;
connect(fontModule->osFontsCB, SIGNAL(clicked()),
connect(fontModule->fontOsfCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
+ fontModule->fontencLE->setValidator(new NoNewLineValidator(
+ fontModule->fontencLE));
+ fontModule->cjkFontLE->setValidator(new NoNewLineValidator(
+ fontModule->cjkFontLE));
+
updateFontlist();
fontModule->fontsizeCO->addItem(qt_("Default"));
fontModule->fontsDefaultCO->addItem(
qt_(GuiDocument::fontfamilies_gui[n]));
+ if (!LaTeXFeatures::isAvailable("fontspec"))
+ fontModule->osFontsCB->setToolTip(
+ qt_("Use OpenType and TrueType fonts directly (requires XeTeX or LuaTeX)\n"
+ "You need to install the package \"fontspec\" to use this feature"));
+
// page layout
pageLayoutModule = new UiWidget<Ui::PageLayoutUi>;
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"));
this, SLOT(change_adaptor()));
connect(langModule->quoteStyleCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
+ connect(langModule->languagePackageCO, SIGNAL(activated(int)),
+ this, SLOT(change_adaptor()));
+ connect(langModule->languagePackageLE, SIGNAL(textChanged(QString)),
+ this, SLOT(change_adaptor()));
+ connect(langModule->languagePackageCO, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(languagePackageChanged(int)));
+
+ langModule->languagePackageLE->setValidator(new NoNewLineValidator(
+ langModule->languagePackageLE));
QAbstractItemModel * language_model = guiApp->languageModel();
// FIXME: it would be nice if sorting was enabled/disabled via a checkbox.
langModule->quoteStyleCO->addItem(qt_("<<text>>"));
langModule->quoteStyleCO->addItem(qt_(">>text<<"));
+ langModule->languagePackageCO->addItem(
+ qt_("Default"), toqstr("default"));
+ langModule->languagePackageCO->addItem(
+ qt_("Automatic"), toqstr("auto"));
+ langModule->languagePackageCO->addItem(
+ qt_("Always Babel"), toqstr("babel"));
+ langModule->languagePackageCO->addItem(
+ qt_("Custom"), toqstr("custom"));
+ langModule->languagePackageCO->addItem(
+ qt_("None[[language package]]"), toqstr("none"));
+
// color
colorModule = new UiWidget<Ui::ColorUi>;
numberingModule->tocTW->headerItem()->setText(0, qt_("Example"));
numberingModule->tocTW->headerItem()->setText(1, qt_("Numbered"));
numberingModule->tocTW->headerItem()->setText(2, qt_("Appears in TOC"));
+ numberingModule->tocTW->header()->setResizeMode(QHeaderView::ResizeToContents);
// biblio
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->bibtexOptionsED, SIGNAL(textChanged(QString)),
- this, SLOT(change_adaptor()));
+ connect(biblioModule->bibtexOptionsLE, SIGNAL(textChanged(QString)),
+ 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"));
biblioModule->citeStyleCO->setCurrentIndex(0);
-
+
+ // NOTE: we do not provide "custom" here for security reasons!
biblioModule->bibtexCO->clear();
biblioModule->bibtexCO->addItem(qt_("Default"), QString("default"));
for (set<string>::const_iterator it = lyxrc.bibtex_alternatives.begin();
QString const command = toqstr(*it).left(toqstr(*it).indexOf(" "));
biblioModule->bibtexCO->addItem(command, command);
}
-
+
// indices
indicesModule = new GuiIndices;
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->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()));
+
// latex class
latexModule = new UiWidget<Ui::LaTeXUi>;
connect(latexModule->refstyleCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
+ latexModule->optionsLE->setValidator(new NoNewLineValidator(
+ latexModule->optionsLE));
+ latexModule->childDocLE->setValidator(new NoNewLineValidator(
+ latexModule->childDocLE));
+
// postscript drivers
for (int n = 0; tex_graphics[n][0]; ++n) {
QString enc = qt_(tex_graphics_gui[n]);
preambleModule = new PreambleModule;
connect(preambleModule, SIGNAL(changed()),
this, SLOT(change_adaptor()));
-
+
localLayout = new LocalLayout;
connect(localLayout, SIGNAL(changed()),
this, SLOT(change_adaptor()));
// Modules
modulesModule = new UiWidget<Ui::ModulesUi>;
modulesModule->availableLV->header()->setVisible(false);
+ modulesModule->availableLV->header()->setResizeMode(QHeaderView::ResizeToContents);
+ modulesModule->availableLV->header()->setStretchLastSection(false);
selectionManager =
new ModuleSelectionManager(modulesModule->availableLV,
modulesModule->selectedLV,
connect(pdfSupportModule->optionsLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
+ pdfSupportModule->titleLE->setValidator(new NoNewLineValidator(
+ pdfSupportModule->titleLE));
+ pdfSupportModule->authorLE->setValidator(new NoNewLineValidator(
+ pdfSupportModule->authorLE));
+ pdfSupportModule->subjectLE->setValidator(new NoNewLineValidator(
+ pdfSupportModule->subjectLE));
+ pdfSupportModule->keywordsLE->setValidator(new NoNewLineValidator(
+ pdfSupportModule->keywordsLE));
+ pdfSupportModule->optionsLE->setValidator(new NoNewLineValidator(
+ pdfSupportModule->optionsLE));
+
for (int i = 0; backref_opts[i][0]; ++i)
pdfSupportModule->backrefCO->addItem(qt_(backref_opts_gui[i]));
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()));
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);
// set the button color and text
colorModule->backgroundPB->setStyleSheet(
colorButtonStyleSheet(newColor));
- colorModule->backgroundPB->setText(toqstr("Change..."));
+ colorModule->backgroundPB->setText(qt_("&Change..."));
// save color
set_backgroundcolor = rgbFromHexName(fromqstr(newColor.name()));
is_backgroundcolor = true;
void GuiDocument::deleteBackgroundColor()
{
- // set the button color back to default by setting an epmty StyleSheet
+ // set the button color back to default by setting an empty StyleSheet
colorModule->backgroundPB->setStyleSheet(QLatin1String(""));
// change button text
- colorModule->backgroundPB->setText(toqstr("Default..."));
+ colorModule->backgroundPB->setText(qt_("&Default..."));
// save default color (white)
set_backgroundcolor = rgbFromHexName("#ffffff");
is_backgroundcolor = false;
// set the button color and text
colorModule->fontColorPB->setStyleSheet(
colorButtonStyleSheet(newColor));
- colorModule->fontColorPB->setText(toqstr("Change..."));
+ colorModule->fontColorPB->setText(qt_("&Change..."));
// save color
set_fontcolor = rgbFromHexName(fromqstr(newColor.name()));
is_fontcolor = true;
void GuiDocument::deleteFontColor()
{
- // set the button color back to default by setting an epmty StyleSheet
+ // set the button color back to default by setting an empty StyleSheet
colorModule->fontColorPB->setStyleSheet(QLatin1String(""));
// change button text
- colorModule->fontColorPB->setText(toqstr("Default..."));
+ colorModule->fontColorPB->setText(qt_("&Default..."));
// save default color (black)
set_fontcolor = rgbFromHexName("#000000");
is_fontcolor = false;
void GuiDocument::deleteNoteFontColor()
{
- // set the button color back to light gray
+ // set the button color back to pref
+ theApp()->getRgbColor(Color_greyedouttext, set_notefontcolor);
colorModule->noteFontColorPB->setStyleSheet(
- colorButtonStyleSheet(QColor(204, 204, 204, 255)));
- // save light gray as the set color
- set_notefontcolor = rgbFromHexName("#cccccc");
+ colorButtonStyleSheet(rgb2qcolor(set_notefontcolor)));
changed();
}
void GuiDocument::deleteBoxBackgroundColor()
{
- // set the button color back to red
+ // set the button color back to pref
+ theApp()->getRgbColor(Color_shadedbg, set_boxbgcolor);
colorModule->boxBackgroundPB->setStyleSheet(
- colorButtonStyleSheet(QColor(Qt::red)));
- // save red as the set color
- set_boxbgcolor = rgbFromHexName("#ff0000");
+ colorButtonStyleSheet(rgb2qcolor(set_boxbgcolor)));
changed();
}
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)
// With XeTeX, we have access to all system fonts, but not the LaTeX fonts
if (fontModule->osFontsCB->isChecked()) {
- fontModule->fontsRomanCO->addItem(qt_("Default"));
- fontModule->fontsSansCO->addItem(qt_("Default"));
- fontModule->fontsTypewriterCO->addItem(qt_("Default"));
-
+ 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) {
- fontModule->fontsRomanCO->addItem(*it);
- fontModule->fontsSansCO->addItem(*it);
- fontModule->fontsTypewriterCO->addItem(*it);
+ fontModule->fontsRomanCO->addItem(*it, *it);
+ fontModule->fontsSansCO->addItem(*it, *it);
+ fontModule->fontsTypewriterCO->addItem(*it, *it);
}
return;
}
QString font = qt_(tex_fonts_roman_gui[n]);
if (!isFontAvailable(tex_fonts_roman[n]))
font += qt_(" (not installed)");
- fontModule->fontsRomanCO->addItem(font);
+ fontModule->fontsRomanCO->addItem(font, qt_(tex_fonts_roman[n]));
}
for (int n = 0; tex_fonts_sans[n][0]; ++n) {
QString font = qt_(tex_fonts_sans_gui[n]);
if (!isFontAvailable(tex_fonts_sans[n]))
font += qt_(" (not installed)");
- fontModule->fontsSansCO->addItem(font);
+ fontModule->fontsSansCO->addItem(font, qt_(tex_fonts_sans[n]));
}
for (int n = 0; tex_fonts_monospaced[n][0]; ++n) {
QString font = qt_(tex_fonts_monospaced_gui[n]);
if (!isFontAvailable(tex_fonts_monospaced[n]))
font += qt_(" (not installed)");
- fontModule->fontsTypewriterCO->addItem(font);
+ fontModule->fontsTypewriterCO->addItem(font, qt_(tex_fonts_monospaced[n]));
}
}
QString const label1 = qt_("Layouts|#o#O");
QString const dir1 = toqstr(lyxrc.document_path);
QStringList const filter(qt_("LyX Layout (*.layout)"));
- QString file = browseRelFile(QString(), bufferFilePath(),
+ QString file = browseRelToParent(QString(), bufferFilePath(),
qt_("Local layout file"), filter, false,
label1, dir1);
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();
}
QString const old = latexModule->childDocLE->text();
QString const docpath = toqstr(support::onlyPath(buffer().absFileName()));
QStringList const filter(qt_("LyX Files (*.lyx)"));
- QString file = browseRelFile(old, docpath, title, filter, false,
+ QString file = browseRelToSub(old, docpath, title, filter, false,
qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
if (!file.isEmpty())
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::bibtexChanged(int n)
+void GuiDocument::languagePackageChanged(int i)
+{
+ langModule->languagePackageLE->setEnabled(
+ langModule->languagePackageCO->itemData(i).toString() == "custom");
+}
+
+
+void GuiDocument::biblioChanged()
{
- biblioModule->bibtexOptionsED->setEnabled(n != 0);
+ buffer().invalidateBibinfoCache();
+ buffer().removeBiblioTempFiles();
changed();
}
+void GuiDocument::bibtexChanged(int n)
+{
+ biblioModule->bibtexOptionsLE->setEnabled(
+ biblioModule->bibtexCO->itemData(n).toString() != "default");
+ biblioChanged();
+}
+
+
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;
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);
if (!bufferview())
return;
// make a copy in order to consider unapplied changes
- Buffer * tmpbuf = buffer().clone();
- tmpbuf->params().useNonTeXFonts =
- fontModule->osFontsCB->isChecked();
- int idx = latexModule->classCO->currentIndex();
+ BufferParams param_copy = buffer().params();
+ param_copy.useNonTeXFonts = fontModule->osFontsCB->isChecked();
+ int const idx = latexModule->classCO->currentIndex();
if (idx >= 0) {
string const classname = classes_model_.getIDString(idx);
- tmpbuf->params().setBaseClass(classname);
- tmpbuf->params().makeDocumentClass();
+ param_copy.setBaseClass(classname);
+ param_copy.makeDocumentClass();
}
outputModule->defaultFormatCO->blockSignals(true);
outputModule->defaultFormatCO->clear();
outputModule->defaultFormatCO->addItem(qt_("Default"),
QVariant(QString("default")));
typedef vector<Format const *> Formats;
- Formats formats = tmpbuf->exportableFormats(true);
+ Formats formats = param_copy.exportableFormats(true);
Formats::const_iterator cit = formats.begin();
Formats::const_iterator end = formats.end();
for (; cit != end; ++cit)
outputModule->defaultFormatCO->addItem(qt_((*cit)->prettyname()),
QVariant(toqstr((*cit)->name())));
outputModule->defaultFormatCO->blockSignals(false);
- // delete the copy
- delete tmpbuf;
}
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());
string const bibtex_options =
- fromqstr(biblioModule->bibtexOptionsED->text());
+ fromqstr(biblioModule->bibtexOptionsLE->text());
if (bibtex_command == "default" || bibtex_options.empty())
bp_.bibtex_command = bibtex_command;
else
langModule->languageCO->currentIndex()).toString();
bp_.language = lyx::languages.getLanguage(fromqstr(lang));
+ QString const pack = langModule->languagePackageCO->itemData(
+ langModule->languagePackageCO->currentIndex()).toString();
+ if (pack == "custom")
+ bp_.lang_package =
+ fromqstr(langModule->languagePackageLE->text());
+ else
+ bp_.lang_package = fromqstr(pack);
+
//color
bp_.backgroundcolor = set_backgroundcolor;
bp_.isbackgroundcolor = is_backgroundcolor;
// packages
bp_.graphics_driver =
tex_graphics[latexModule->psdriverCO->currentIndex()];
-
+
// text layout
int idx = latexModule->classCO->currentIndex();
if (idx >= 0) {
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;
+ }
+
// 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
- if (nontexfonts) {
- if (fontModule->fontsRomanCO->currentIndex() == 0)
- bp_.fonts_roman = "default";
- else
- bp_.fonts_roman =
- fromqstr(fontModule->fontsRomanCO->currentText());
-
- if (fontModule->fontsSansCO->currentIndex() == 0)
- bp_.fonts_sans = "default";
- else
- bp_.fonts_sans =
- fromqstr(fontModule->fontsSansCO->currentText());
-
- if (fontModule->fontsTypewriterCO->currentIndex() == 0)
- bp_.fonts_typewriter = "default";
- else
- bp_.fonts_typewriter =
- fromqstr(fontModule->fontsTypewriterCO->currentText());
- } else {
- bp_.fonts_roman =
- tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()];
-
- bp_.fonts_sans =
- tex_fonts_sans[fontModule->fontsSansCO->currentIndex()];
-
- bp_.fonts_typewriter =
- tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()];
- }
+ bp_.fonts_roman =
+ fromqstr(fontModule->fontsRomanCO->
+ itemData(fontModule->fontsRomanCO->currentIndex()).toString());
+
+ bp_.fonts_sans =
+ fromqstr(fontModule->fontsSansCO->
+ itemData(fontModule->fontsSansCO->currentIndex()).toString());
+
+ bp_.fonts_typewriter =
+ fromqstr(fontModule->fontsTypewriterCO->
+ itemData(fontModule->fontsTypewriterCO->currentIndex()).toString());
if (fontModule->fontencCO->currentIndex() == 0)
bp_.fontenc = "global";
void GuiDocument::paramsToDialog()
{
// set the default unit
- Length::UNIT const defaultUnit = Length::defaultUnit();
+ Length::UNIT const default_unit = Length::defaultUnit();
// preamble
preambleModule->update(bp_, id());
biblioModule->bibtopicCB->setChecked(
bp_.use_bibtopic);
+ biblioModule->bibtexStyleLE->setText(toqstr(bp_.biblio_style));
+
string command;
string options =
split(bp_.bibtex_command, command, ' ');
int const bpos = biblioModule->bibtexCO->findData(toqstr(command));
if (bpos != -1) {
biblioModule->bibtexCO->setCurrentIndex(bpos);
- biblioModule->bibtexOptionsED->setText(toqstr(options).trimmed());
+ biblioModule->bibtexOptionsLE->setText(toqstr(options).trimmed());
} else {
- biblioModule->bibtexCO->setCurrentIndex(0);
- biblioModule->bibtexOptionsED->clear();
+ // We reset to default if we do not know the specified compiler
+ // This is for security reasons
+ biblioModule->bibtexCO->setCurrentIndex(
+ biblioModule->bibtexCO->findData(toqstr("default")));
+ biblioModule->bibtexOptionsLE->clear();
}
- biblioModule->bibtexOptionsED->setEnabled(
+ biblioModule->bibtexOptionsLE->setEnabled(
biblioModule->bibtexCO->currentIndex() != 0);
// indices
langModule->defaultencodingRB->setChecked(default_enc);
langModule->otherencodingRB->setChecked(!default_enc);
+ int const p = langModule->languagePackageCO->findData(toqstr(bp_.lang_package));
+ if (p == -1) {
+ langModule->languagePackageCO->setCurrentIndex(
+ langModule->languagePackageCO->findData("custom"));
+ langModule->languagePackageLE->setText(toqstr(bp_.lang_package));
+ } else {
+ langModule->languagePackageCO->setCurrentIndex(p);
+ langModule->languagePackageLE->clear();
+ }
+
//color
if (bp_.isfontcolor) {
colorModule->fontColorPB->setStyleSheet(
if (nitem >= 0)
latexModule->psdriverCO->setCurrentIndex(nitem);
updateModuleInfo();
-
+
mathsModule->amsCB->setChecked(
bp_.use_amsmath == BufferParams::package_on);
mathsModule->amsautoCB->setChecked(
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);
+
switch (bp_.spacing().getSpace()) {
case Spacing::Other: nitem = 3; break;
case Spacing::Double: nitem = 2; break;
if (indentation != "default") {
lengthToWidgets(textLayoutModule->indentLE,
textLayoutModule->indentLengthCO,
- indentation, defaultUnit);
+ indentation, default_unit);
indent = 1;
}
textLayoutModule->indentCO->setCurrentIndex(indent);
string const length = bp_.getDefSkip().asLyXCommand();
lengthToWidgets(textLayoutModule->skipLE,
textLayoutModule->skipLengthCO,
- length, defaultUnit);
+ length, default_unit);
break;
}
default:
textLayoutModule->twoColumnCB->setChecked(
bp_.columns == 2);
+ textLayoutModule->justCB->setChecked(bp_.justification);
if (!bp_.options.empty()) {
latexModule->optionsLE->setText(
updateDefaultFormat();
int index = outputModule->defaultFormatCO->findData(toqstr(
bp_.default_output_format));
- // set to default if format is not found
+ // set to default if format is not found
if (index == -1)
index = 0;
outputModule->defaultFormatCO->setCurrentIndex(index);
- fontModule->osFontsCB->setEnabled(bp_.baseClass()->outputType() == lyx::LATEX);
+ bool const os_fonts_available =
+ bp_.baseClass()->outputType() == lyx::LATEX
+ && LaTeXFeatures::isAvailable("fontspec");
+ fontModule->osFontsCB->setEnabled(os_fonts_available);
fontModule->osFontsCB->setChecked(
- bp_.baseClass()->outputType() == lyx::LATEX && bp_.useNonTeXFonts);
+ 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);
+ outputModule->cssCB->setChecked(bp_.html_css_as_file);
// Fonts
updateFontsize(documentClass().opt_fontsize(),
bp_.fontsize);
- if (bp_.useNonTeXFonts) {
+ QString font = toqstr(bp_.fonts_roman);
+ int rpos = fontModule->fontsRomanCO->findData(font);
+ if (rpos == -1) {
+ rpos = fontModule->fontsRomanCO->count();
+ fontModule->fontsRomanCO->addItem(font + qt_(" (not installed)"), font);
+ }
+ fontModule->fontsRomanCO->setCurrentIndex(rpos);
+
+ font = toqstr(bp_.fonts_sans);
+ int spos = fontModule->fontsSansCO->findData(font);
+ if (spos == -1) {
+ spos = fontModule->fontsSansCO->count();
+ fontModule->fontsSansCO->addItem(font + qt_(" (not installed)"), font);
+ }
+ fontModule->fontsSansCO->setCurrentIndex(spos);
+
+ font = toqstr(bp_.fonts_typewriter);
+ int tpos = fontModule->fontsTypewriterCO->findData(font);
+ if (tpos == -1) {
+ tpos = fontModule->fontsTypewriterCO->count();
+ fontModule->fontsTypewriterCO->addItem(font + qt_(" (not installed)"), font);
+ }
+ fontModule->fontsTypewriterCO->setCurrentIndex(tpos);
+
+ if (bp_.useNonTeXFonts && os_fonts_available) {
fontModule->fontencLA->setEnabled(false);
fontModule->fontencCO->setEnabled(false);
fontModule->fontencLE->setEnabled(false);
- for (int i = 0; i < fontModule->fontsRomanCO->count(); ++i) {
- if (fontModule->fontsRomanCO->itemText(i) == toqstr(bp_.fonts_roman)) {
- fontModule->fontsRomanCO->setCurrentIndex(i);
- break;
- }
- }
-
- for (int i = 0; i < fontModule->fontsSansCO->count(); ++i) {
- if (fontModule->fontsSansCO->itemText(i) == toqstr(bp_.fonts_sans)) {
- fontModule->fontsSansCO->setCurrentIndex(i);
- break;
- }
- }
- for (int i = 0; i < fontModule->fontsTypewriterCO->count(); ++i) {
- if (fontModule->fontsTypewriterCO->itemText(i) ==
- toqstr(bp_.fonts_typewriter)) {
- fontModule->fontsTypewriterCO->setCurrentIndex(i);
- break;
- }
- }
} else {
fontModule->fontencLA->setEnabled(true);
fontModule->fontencCO->setEnabled(true);
fontModule->fontencLE->setEnabled(true);
- int n = findToken(tex_fonts_roman, bp_.fonts_roman);
- if (n >= 0) {
- fontModule->fontsRomanCO->setCurrentIndex(n);
- romanChanged(n);
- }
-
- n = findToken(tex_fonts_sans, bp_.fonts_sans);
- if (n >= 0) {
- fontModule->fontsSansCO->setCurrentIndex(n);
- sansChanged(n);
- }
-
- n = findToken(tex_fonts_monospaced, bp_.fonts_typewriter);
- if (n >= 0) {
- fontModule->fontsTypewriterCO->setCurrentIndex(n);
- ttChanged(n);
- }
+ romanChanged(rpos);
+ sansChanged(spos);
+ ttChanged(tpos);
}
if (!bp_.fonts_cjk.empty())
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);
bp_.sides == TwoSides);
lengthToWidgets(pageLayoutModule->paperwidthLE,
- pageLayoutModule->paperwidthUnitCO, bp_.paperwidth, defaultUnit);
+ pageLayoutModule->paperwidthUnitCO, bp_.paperwidth, default_unit);
lengthToWidgets(pageLayoutModule->paperheightLE,
- pageLayoutModule->paperheightUnitCO, bp_.paperheight, defaultUnit);
+ pageLayoutModule->paperheightUnitCO, bp_.paperheight, default_unit);
// margins
Ui::MarginsUi * m = marginsModule;
setMargins();
lengthToWidgets(m->topLE, m->topUnit,
- bp_.topmargin, defaultUnit);
+ bp_.topmargin, default_unit);
lengthToWidgets(m->bottomLE, m->bottomUnit,
- bp_.bottommargin, defaultUnit);
+ bp_.bottommargin, default_unit);
lengthToWidgets(m->innerLE, m->innerUnit,
- bp_.leftmargin, defaultUnit);
+ bp_.leftmargin, default_unit);
lengthToWidgets(m->outerLE, m->outerUnit,
- bp_.rightmargin, defaultUnit);
+ bp_.rightmargin, default_unit);
lengthToWidgets(m->headheightLE, m->headheightUnit,
- bp_.headheight, defaultUnit);
+ bp_.headheight, default_unit);
lengthToWidgets(m->headsepLE, m->headsepUnit,
- bp_.headsep, defaultUnit);
+ bp_.headsep, default_unit);
lengthToWidgets(m->footskipLE, m->footskipUnit,
- bp_.footskip, defaultUnit);
+ bp_.footskip, default_unit);
lengthToWidgets(m->columnsepLE, m->columnsepUnit,
- bp_.columnsep, defaultUnit);
+ bp_.columnsep, default_unit);
// branches
updateUnknownBranches();
// 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()) {
projects / lyx.git / blobdiff