{
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();
}
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);
}
// output
outputModule = new UiWidget<Ui::OutputUi>;
- connect(outputModule->xetexCB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
- connect(outputModule->xetexCB, SIGNAL(toggled(bool)),
- this, SLOT(xetexChanged(bool)));
connect(outputModule->defaultFormatCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
connect(outputModule->mathimgSB, SIGNAL(valueChanged(double)),
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()),
+ this, SLOT(change_adaptor()));
+ connect(fontModule->osFontsCB, SIGNAL(toggled(bool)),
+ this, SLOT(osFontsChanged(bool)));
connect(fontModule->fontsRomanCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
connect(fontModule->fontsRomanCO, SIGNAL(activated(int)),
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(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
this, SLOT(change_adaptor()));
connect(biblioModule->bibtexCO, SIGNAL(activated(int)),
this, SLOT(bibtexChanged(int)));
- connect(biblioModule->bibtexOptionsED, SIGNAL(textChanged(QString)),
+ connect(biblioModule->bibtexOptionsLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
+ biblioModule->bibtexOptionsLE->setValidator(new NoNewLineValidator(
+ biblioModule->bibtexOptionsLE));
+
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()));
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
this, SLOT(browseMaster()));
connect(latexModule->suppressDateCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
+ 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) {
// 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]));
docPS->addPanel(latexModule, qt_("Document Class"));
docPS->addPanel(masterChildModule, qt_("Child Documents"));
docPS->addPanel(modulesModule, qt_("Modules"));
+ docPS->addPanel(localLayout, qt_("Local Layout"));
docPS->addPanel(fontModule, qt_("Fonts"));
docPS->addPanel(textLayoutModule, qt_("Text Layout"));
docPS->addPanel(pageLayoutModule, qt_("Page Layout"));
docPS->addPanel(branchesModule, qt_("Branches"));
docPS->addPanel(outputModule, qt_("Output"));
docPS->addPanel(preambleModule, qt_("LaTeX Preamble"));
- docPS->addPanel(localLayout, qt_("Local Layout"));
docPS->setCurrentPanel(qt_("Document Class"));
// FIXME: hack to work around resizing bug in Qt >= 4.2
// bug verified with Qt 4.2.{0-3} (JSpitzm)
// 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();
}
-void GuiDocument::xetexChanged(bool xetex)
+void GuiDocument::osFontsChanged(bool nontexfonts)
{
+ bool const tex_fonts = !nontexfonts;
updateFontlist();
updateDefaultFormat();
- langModule->encodingCO->setEnabled(!xetex &&
+ langModule->encodingCO->setEnabled(tex_fonts &&
!langModule->defaultencodingRB->isChecked());
- langModule->defaultencodingRB->setEnabled(!xetex);
- langModule->otherencodingRB->setEnabled(!xetex);
+ langModule->defaultencodingRB->setEnabled(tex_fonts);
+ langModule->otherencodingRB->setEnabled(tex_fonts);
- fontModule->fontsDefaultCO->setEnabled(!xetex);
- fontModule->fontsDefaultLA->setEnabled(!xetex);
- fontModule->cjkFontLE->setEnabled(!xetex);
- fontModule->cjkFontLA->setEnabled(!xetex);
+ fontModule->fontsDefaultCO->setEnabled(tex_fonts);
+ fontModule->fontsDefaultLA->setEnabled(tex_fonts);
+ fontModule->cjkFontLE->setEnabled(tex_fonts);
+ fontModule->cjkFontLA->setEnabled(tex_fonts);
string font;
- if (!xetex)
+ if (tex_fonts)
font = tex_fonts_sans[fontModule->fontsSansCO->currentIndex()];
bool scaleable = providesScale(font);
fontModule->scaleSansSB->setEnabled(scaleable);
fontModule->scaleSansLA->setEnabled(scaleable);
- if (!xetex)
+ if (tex_fonts)
font = tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()];
scaleable = providesScale(font);
fontModule->scaleTypewriterSB->setEnabled(scaleable);
fontModule->scaleTypewriterLA->setEnabled(scaleable);
- if (!xetex)
+ if (tex_fonts)
font = tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()];
fontModule->fontScCB->setEnabled(providesSC(font));
fontModule->fontOsfCB->setEnabled(providesOSF(font));
- fontModule->fontencLA->setEnabled(!xetex);
- fontModule->fontencCO->setEnabled(!xetex);
- if (xetex)
+ fontModule->fontencLA->setEnabled(tex_fonts);
+ fontModule->fontencCO->setEnabled(tex_fonts);
+ if (!tex_fonts)
fontModule->fontencLE->setEnabled(false);
else
fontencChanged(fontModule->fontencCO->currentIndex());
fontModule->fontsTypewriterCO->clear();
// With XeTeX, we have access to all system fonts, but not the LaTeX fonts
- if (outputModule->xetexCB->isChecked()) {
- fontModule->fontsRomanCO->addItem(qt_("Default"));
- fontModule->fontsSansCO->addItem(qt_("Default"));
- fontModule->fontsTypewriterCO->addItem(qt_("Default"));
+ if (fontModule->osFontsCB->isChecked()) {
+ 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]));
}
}
void GuiDocument::romanChanged(int item)
{
- if (outputModule->xetexCB->isChecked())
+ if (fontModule->osFontsCB->isChecked())
return;
string const font = tex_fonts_roman[item];
fontModule->fontScCB->setEnabled(providesSC(font));
void GuiDocument::sansChanged(int item)
{
- if (outputModule->xetexCB->isChecked())
+ if (fontModule->osFontsCB->isChecked())
return;
string const font = tex_fonts_sans[item];
bool scaleable = providesScale(font);
void GuiDocument::ttChanged(int item)
{
- if (outputModule->xetexCB->isChecked())
+ if (fontModule->osFontsCB->isChecked())
return;
string const font = tex_fonts_monospaced[item];
bool scaleable = providesScale(font);
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);
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::languagePackageChanged(int i)
+{
+ langModule->languagePackageLE->setEnabled(
+ langModule->languagePackageCO->itemData(i).toString() == "custom");
+}
+
+
void GuiDocument::bibtexChanged(int n)
{
- biblioModule->bibtexOptionsED->setEnabled(n != 0);
+ biblioModule->bibtexOptionsLE->setEnabled(
+ biblioModule->bibtexCO->itemData(n).toString() != "default");
changed();
}
namespace {
+ // 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)
if (v.size() == 0)
return docstring();
if (v.size() == 1)
- return from_utf8(v[0]);
+ return translateIfPossible(from_utf8(v[0]));
if (v.size() == 2) {
docstring retval = _("%1$s and %2$s");
retval = subst(retval, _("and"), s);
- return bformat(retval, from_utf8(v[0]), from_utf8(v[1]));
+ return bformat(retval, translateIfPossible(from_utf8(v[0])),
+ translateIfPossible(from_utf8(v[1])));
}
// The idea here is to format all but the last two items...
int const vSize = v.size();
docstring t2 = _("%1$s, %2$s");
- docstring retval = from_utf8(v[0]);
+ docstring retval = translateIfPossible(from_utf8(v[0]));
for (int i = 1; i < vSize - 2; ++i)
- retval = bformat(t2, retval, 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, from_utf8(v[vSize - 2]), from_utf8(v[vSize - 1]));
+ return bformat(t, retval, translateIfPossible(from_utf8(v[vSize - 2])),
+ translateIfPossible(from_utf8(v[vSize - 1])));
}
vector<string> idsToNames(vector<string> const & idList)
for (; it != end; ++it) {
LyXModule const * const mod = theModuleList[*it];
if (!mod)
- retval.push_back(to_utf8(bformat(_("%1$s (unavailable)"), from_utf8(*it))));
+ retval.push_back(to_utf8(bformat(_("%1$s (unavailable)"),
+ translateIfPossible(from_utf8(*it)))));
else
retval.push_back(mod->getName());
}
pkgdesc = formatStrVec(reqdescs, _("or"));
if (!desc.empty())
desc += "\n";
- desc += bformat(_("Module required: %1$s."), pkgdesc);
+ desc += bformat(_("Modules required: %1$s."), pkgdesc);
}
pkglist = getExcludedList(modName);
if (!bufferview())
return;
// make a copy in order to consider unapplied changes
- Buffer * tmpbuf = buffer().clone();
- tmpbuf->params().useXetex = outputModule->xetexCB->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;
}
// date
bp_.suppress_date = latexModule->suppressDateCB->isChecked();
+ bp_.use_refstyle = latexModule->refstyleCB->isChecked();
// biblio
bp_.setCiteEngine(ENGINE_BASIC);
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
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")
+ bp_.lang_package =
+ fromqstr(langModule->languagePackageLE->text());
+ else
+ bp_.lang_package = fromqstr(pack);
//color
bp_.backgroundcolor = set_backgroundcolor;
bp_.user_defined_bullet(3) = bulletsModule->bullet(3);
// packages
- bp_.graphicsDriver =
+ bp_.graphics_driver =
tex_graphics[latexModule->psdriverCO->currentIndex()];
// text layout
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)
InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params();
// output
- bp_.defaultOutputFormat = fromqstr(outputModule->defaultFormatCO->itemData(
+ bp_.default_output_format = fromqstr(outputModule->defaultFormatCO->itemData(
outputModule->defaultFormatCO->currentIndex()).toString());
- bool const xetex = outputModule->xetexCB->isChecked();
- bp_.useXetex = xetex;
+ bool const nontexfonts = fontModule->osFontsCB->isChecked();
+ bp_.useNonTeXFonts = nontexfonts;
bp_.output_sync = outputModule->outputsyncCB->isChecked();
bp_.output_sync_macro = fromqstr(outputModule->synccustomCB->currentText());
bp_.html_math_img_scale = outputModule->mathimgSB->value();
// fonts
- if (xetex) {
- if (fontModule->fontsRomanCO->currentIndex() == 0)
- bp_.fontsRoman = "default";
- else
- bp_.fontsRoman =
- fromqstr(fontModule->fontsRomanCO->currentText());
-
- if (fontModule->fontsSansCO->currentIndex() == 0)
- bp_.fontsSans = "default";
- else
- bp_.fontsSans =
- fromqstr(fontModule->fontsSansCO->currentText());
-
- if (fontModule->fontsTypewriterCO->currentIndex() == 0)
- bp_.fontsTypewriter = "default";
- else
- bp_.fontsTypewriter =
- fromqstr(fontModule->fontsTypewriterCO->currentText());
- } else {
- bp_.fontsRoman =
- tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()];
-
- bp_.fontsSans =
- tex_fonts_sans[fontModule->fontsSansCO->currentIndex()];
-
- bp_.fontsTypewriter =
- 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";
else if (fontModule->fontencCO->currentIndex() == 2)
bp_.fontenc = "default";
- bp_.fontsCJK =
+ bp_.fonts_cjk =
fromqstr(fontModule->cjkFontLE->text());
- bp_.fontsSansScale = fontModule->scaleSansSB->value();
+ bp_.fonts_sans_scale = fontModule->scaleSansSB->value();
- bp_.fontsTypewriterScale = fontModule->scaleTypewriterSB->value();
+ bp_.fonts_typewriter_scale = fontModule->scaleTypewriterSB->value();
- bp_.fontsSC = fontModule->fontScCB->isChecked();
+ bp_.fonts_expert_sc = fontModule->fontScCB->isChecked();
- bp_.fontsOSF = fontModule->fontOsfCB->isChecked();
+ bp_.fonts_old_figures = fontModule->fontOsfCB->isChecked();
- if (xetex)
- bp_.fontsDefaultFamily = "default";
+ if (nontexfonts)
+ bp_.fonts_default_family = "default";
else
- bp_.fontsDefaultFamily = GuiDocument::fontfamilies[
+ bp_.fonts_default_family = GuiDocument::fontfamilies[
fontModule->fontsDefaultCO->currentIndex()];
if (fontModule->fontsizeCO->currentIndex() == 0)
// date
latexModule->suppressDateCB->setChecked(bp_.suppress_date);
+ latexModule->refstyleCB->setChecked(bp_.use_refstyle);
// biblio
biblioModule->citeDefaultRB->setChecked(
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(
bulletsModule->init();
// packages
- int nitem = findToken(tex_graphics, bp_.graphicsDriver);
+ int nitem = findToken(tex_graphics, bp_.graphics_driver);
if (nitem >= 0)
latexModule->psdriverCO->setCurrentIndex(nitem);
updateModuleInfo();
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;
}
// Master/Child
- std::vector<Buffer *> children;
- if (bufferview())
- children = buffer().getChildren(false);
- if (children.empty()) {
+ if (!bufferview() || !buffer().hasChildren()) {
masterChildModule->childrenTW->clear();
includeonlys_.clear();
docPS->showPanel(qt_("Child Documents"), false);
// update combobox with formats
updateDefaultFormat();
int index = outputModule->defaultFormatCO->findData(toqstr(
- bp_.defaultOutputFormat));
+ bp_.default_output_format));
// set to default if format is not found
if (index == -1)
index = 0;
outputModule->defaultFormatCO->setCurrentIndex(index);
- outputModule->xetexCB->setEnabled(bp_.baseClass()->outputType() == lyx::LATEX);
- outputModule->xetexCB->setChecked(
- bp_.baseClass()->outputType() == lyx::LATEX && bp_.useXetex);
+ 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));
updateFontsize(documentClass().opt_fontsize(),
bp_.fontsize);
- if (bp_.useXetex) {
+ 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_.fontsRoman)) {
- fontModule->fontsRomanCO->setCurrentIndex(i);
- return;
- }
- }
-
- for (int i = 0; i < fontModule->fontsSansCO->count(); ++i) {
- if (fontModule->fontsSansCO->itemText(i) == toqstr(bp_.fontsSans)) {
- fontModule->fontsSansCO->setCurrentIndex(i);
- return;
- }
- }
- for (int i = 0; i < fontModule->fontsTypewriterCO->count(); ++i) {
- if (fontModule->fontsTypewriterCO->itemText(i) ==
- toqstr(bp_.fontsTypewriter)) {
- fontModule->fontsTypewriterCO->setCurrentIndex(i);
- return;
- }
- }
} else {
fontModule->fontencLA->setEnabled(true);
fontModule->fontencCO->setEnabled(true);
fontModule->fontencLE->setEnabled(true);
- int n = findToken(tex_fonts_roman, bp_.fontsRoman);
- if (n >= 0) {
- fontModule->fontsRomanCO->setCurrentIndex(n);
- romanChanged(n);
- }
-
- n = findToken(tex_fonts_sans, bp_.fontsSans);
- if (n >= 0) {
- fontModule->fontsSansCO->setCurrentIndex(n);
- sansChanged(n);
- }
-
- n = findToken(tex_fonts_monospaced, bp_.fontsTypewriter);
- if (n >= 0) {
- fontModule->fontsTypewriterCO->setCurrentIndex(n);
- ttChanged(n);
- }
+ romanChanged(rpos);
+ sansChanged(spos);
+ ttChanged(tpos);
}
- if (!bp_.fontsCJK.empty())
+ if (!bp_.fonts_cjk.empty())
fontModule->cjkFontLE->setText(
- toqstr(bp_.fontsCJK));
+ toqstr(bp_.fonts_cjk));
else
fontModule->cjkFontLE->setText(QString());
- fontModule->fontScCB->setChecked(bp_.fontsSC);
- fontModule->fontOsfCB->setChecked(bp_.fontsOSF);
- fontModule->scaleSansSB->setValue(bp_.fontsSansScale);
- fontModule->scaleTypewriterSB->setValue(bp_.fontsTypewriterScale);
+ fontModule->fontScCB->setChecked(bp_.fonts_expert_sc);
+ 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_.fontsDefaultFamily);
+ int nn = findToken(GuiDocument::fontfamilies, bp_.fonts_default_family);
if (nn >= 0)
fontModule->fontsDefaultCO->setCurrentIndex(nn);
masterChildModule->maintainAuxCB->setEnabled(true);
}
QTreeWidgetItem * item = 0;
- std::vector<Buffer *> children = buffer().getChildren(false);
- vector<Buffer *>::const_iterator it = children.begin();
- vector<Buffer *>::const_iterator end = children.end();
+ ListOfBuffers children = buffer().getChildren();
+ ListOfBuffers::const_iterator it = children.begin();
+ ListOfBuffers::const_iterator end = children.end();
bool has_unincluded = false;
bool all_unincluded = true;
for (; it != end; ++it) {
dispatch(FuncRequest(LFUN_SET_COLOR, str));
}
}
- // FIXME: If we used an LFUN, we would not need those two lines:
+ // FIXME LFUN
+ // If we used an LFUN, we would not need these two lines:
BufferView * bv = const_cast<BufferView *>(bufferview());
bv->processUpdateFlags(Update::Force | Update::FitCursor);
}
bool GuiDocument::providesOSF(string const & font) const
{
- if (outputModule->xetexCB->isChecked())
+ if (fontModule->osFontsCB->isChecked())
// FIXME: we should check if the fonts really
// have OSF support. But how?
return true;
bool GuiDocument::providesSC(string const & font) const
{
- if (outputModule->xetexCB->isChecked())
+ if (fontModule->osFontsCB->isChecked())
return false;
if (font == "palatino")
return isFontAvailable("mathpazo");
bool GuiDocument::providesScale(string const & font) const
{
- if (outputModule->xetexCB->isChecked())
+ if (fontModule->osFontsCB->isChecked())
return true;
return font == "helvet" || font == "luximono"
|| font == "berasans" || font == "beramono";
projects / lyx.git / blobdiff