#include "FloatPlacement.h"
#include "Format.h"
#include "FuncRequest.h"
+#include "HSpace.h"
#include "IndicesList.h"
#include "Language.h"
#include "LaTeXFeatures.h"
#include "frontends/alert.h"
#include <QAbstractItemModel>
+#include <QHeaderView>
#include <QColor>
#include <QColorDialog>
#include <QCloseEvent>
// 2. Description (lexicographic)
LayoutFile const & tc1 = LayoutFileList::get()[lhs];
LayoutFile const & tc2 = LayoutFileList::get()[rhs];
- int const rel = compare_no_case(
+ int const order = compare_no_case(
translateIfPossible(from_utf8(tc1.description())),
translateIfPossible(from_utf8(tc2.description())));
return (tc1.isTeXClassAvailable() && !tc2.isTeXClassAvailable()) ||
- (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() && rel < 0);
+ (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() && order < 0);
}
};
vector<string> getRequiredList(string const & modName)
{
- LyXModule const * const mod = moduleList[modName];
+ LyXModule const * const mod = theModuleList[modName];
if (!mod)
return vector<string>(); //empty such thing
return mod->getRequiredModules();
vector<string> getExcludedList(string const & modName)
{
- LyXModule const * const mod = moduleList[modName];
+ LyXModule const * const mod = theModuleList[modName];
if (!mod)
return vector<string>(); //empty such thing
return mod->getExcludedModules();
docstring getModuleDescription(string const & modName)
{
- LyXModule const * const mod = moduleList[modName];
+ LyXModule const * const mod = theModuleList[modName];
if (!mod)
return _("Module not found!");
// FIXME Unicode
vector<string> getPackageList(string const & modName)
{
- LyXModule const * const mod = moduleList[modName];
+ LyXModule const * const mod = theModuleList[modName];
if (!mod)
return vector<string>(); //empty such thing
return mod->getPackageList();
bool isModuleAvailable(string const & modName)
{
- LyXModule * mod = moduleList[modName];
+ LyXModule const * const mod = theModuleList[modName];
if (!mod)
return false;
return mod->isAvailable();
public:
///
ModuleSelectionManager(
- QListView * availableLV,
+ QTreeView * availableLV,
QListView * selectedLV,
QPushButton * addPB,
QPushButton * delPB,
return dynamic_cast<GuiIdListModel *>(selectedModel);
}
/// keeps a list of the modules the text class provides
- std::list<std::string> provided_modules_;
+ list<string> provided_modules_;
/// similarly...
- std::list<std::string> excluded_modules_;
+ list<string> excluded_modules_;
///
GuiDocument const * container_;
};
// 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;
+ // lyxerr << "Testing " << thisMod << endl;
bool foundone = false;
for (int j = 0; j < curRow; ++j) {
string const mod = getSelectedModel()->getIDString(j);
- // lyxerr << "In loop: Testing " << mod << std::endl;
+ // lyxerr << "In loop: Testing " << mod << 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." << endl;
foundone = true;
break;
}
}
// did we find a module to satisfy the require?
if (!foundone) {
- // lyxerr << "No matching module found." << std::endl;
+ // lyxerr << "No matching module found." << endl;
deletePB->setEnabled(false);
return;
}
}
- // lyxerr << "All's well that ends well." << std::endl;
+ // lyxerr << "All's well that ends well." << endl;
deletePB->setEnabled(true);
}
this, SLOT(setLSpacing(int)));
connect(textLayoutModule->lspacingLE, SIGNAL(textChanged(const QString &)),
this, SLOT(change_adaptor()));
- connect(textLayoutModule->skipRB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
+
connect(textLayoutModule->indentRB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
+ connect(textLayoutModule->indentRB, SIGNAL(toggled(bool)),
+ textLayoutModule->indentCO, SLOT(setEnabled(bool)));
+ connect(textLayoutModule->indentCO, SIGNAL(activated(int)),
+ this, SLOT(change_adaptor()));
+ connect(textLayoutModule->indentCO, SIGNAL(activated(int)),
+ this, SLOT(setIndent(int)));
+ connect(textLayoutModule->indentLE, SIGNAL(textChanged(const QString &)),
+ this, SLOT(change_adaptor()));
+ connect(textLayoutModule->indentLengthCO, SIGNAL(activated(int)),
+ this, SLOT(change_adaptor()));
+
+ connect(textLayoutModule->skipRB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+ connect(textLayoutModule->skipRB, SIGNAL(toggled(bool)),
+ textLayoutModule->skipCO, SLOT(setEnabled(bool)));
connect(textLayoutModule->skipCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
+ connect(textLayoutModule->skipCO, SIGNAL(activated(int)),
+ this, SLOT(setSkip(int)));
connect(textLayoutModule->skipLE, SIGNAL(textChanged(const QString &)),
this, SLOT(change_adaptor()));
connect(textLayoutModule->skipLengthCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
- connect(textLayoutModule->skipCO, SIGNAL(activated(int)),
- this, SLOT(setSkip(int)));
+
+ connect(textLayoutModule->indentRB, SIGNAL(toggled(bool)),
+ this, SLOT(enableIndent(bool)));
connect(textLayoutModule->skipRB, SIGNAL(toggled(bool)),
this, SLOT(enableSkip(bool)));
+
connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()),
this, SLOT(setColSep()));
- connect(textLayoutModule->listingsED, SIGNAL(textChanged()),
- this, SLOT(change_adaptor()));
- connect(textLayoutModule->bypassCB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
- connect(textLayoutModule->bypassCB, SIGNAL(clicked()),
- this, SLOT(setListingsMessage()));
- connect(textLayoutModule->listingsED, SIGNAL(textChanged()),
- this, SLOT(setListingsMessage()));
- textLayoutModule->listingsTB->setPlainText(
- qt_("Input listings parameters on the right. Enter ? for a list of parameters."));
+
textLayoutModule->lspacingLE->setValidator(new QDoubleValidator(
textLayoutModule->lspacingLE));
- textLayoutModule->skipLE->setValidator(unsignedLengthValidator(
+ textLayoutModule->indentLE->setValidator(unsignedLengthValidator(
+ textLayoutModule->indentLE));
+ textLayoutModule->skipLE->setValidator(unsignedGlueLengthValidator(
textLayoutModule->skipLE));
+ textLayoutModule->indentCO->addItem(qt_("Default"));
+ textLayoutModule->indentCO->addItem(qt_("Custom"));
textLayoutModule->skipCO->addItem(qt_("SmallSkip"));
textLayoutModule->skipCO->addItem(qt_("MedSkip"));
textLayoutModule->skipCO->addItem(qt_("BigSkip"));
- textLayoutModule->skipCO->addItem(qt_("Length"));
- // remove the %-items from the unit choice
- textLayoutModule->skipLengthCO->noPercents();
+ textLayoutModule->skipCO->addItem(qt_("Custom"));
textLayoutModule->lspacingCO->insertItem(
Spacing::Single, qt_("Single"));
textLayoutModule->lspacingCO->insertItem(
Spacing::Double, qt_("Double"));
textLayoutModule->lspacingCO->insertItem(
Spacing::Other, qt_("Custom"));
-
// initialize the length validator
+ bc().addCheckedLineEdit(textLayoutModule->indentLE);
bc().addCheckedLineEdit(textLayoutModule->skipLE);
+ // master/child handling
+ masterChildModule = new UiWidget<Ui::MasterChildUi>;
+
+ connect(masterChildModule->childrenTW, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),
+ this, SLOT(includeonlyClicked(QTreeWidgetItem *, int)));
+ connect(masterChildModule->includeonlyRB, SIGNAL(toggled(bool)),
+ masterChildModule->childrenTW, SLOT(setEnabled(bool)));
+ connect(masterChildModule->includeonlyRB, SIGNAL(toggled(bool)),
+ masterChildModule->maintainAuxCB, SLOT(setEnabled(bool)));
+ connect(masterChildModule->includeallRB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+ connect(masterChildModule->includeonlyRB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+ connect(masterChildModule->maintainAuxCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+ masterChildModule->childrenTW->setColumnCount(2);
+ masterChildModule->childrenTW->headerItem()->setText(0, qt_("Child Document"));
+ masterChildModule->childrenTW->headerItem()->setText(1, qt_("Include to Output"));
+ masterChildModule->childrenTW->resizeColumnToContents(1);
+ masterChildModule->childrenTW->resizeColumnToContents(2);
+
// output
outputModule = new UiWidget<Ui::OutputUi>;
this, SLOT(ttChanged(int)));
connect(fontModule->fontsDefaultCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
+ connect(fontModule->fontencCO, SIGNAL(activated(int)),
+ this, SLOT(change_adaptor()));
+ connect(fontModule->fontencCO, SIGNAL(activated(int)),
+ this, SLOT(fontencChanged(int)));
+ connect(fontModule->fontencLE, SIGNAL(textChanged(const QString &)),
+ this, SLOT(change_adaptor()));
connect(fontModule->fontsizeCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
connect(fontModule->cjkFontLE, SIGNAL(textChanged(const QString &)),
fontModule->fontsizeCO->addItem(qt_("11"));
fontModule->fontsizeCO->addItem(qt_("12"));
+ fontModule->fontencCO->addItem(qt_("Default"));
+ fontModule->fontencCO->addItem(qt_("Custom"));
+ fontModule->fontencCO->addItem(qt_("None (no fontenc)"));
+
for (int n = 0; GuiDocument::fontfamilies_gui[n][0]; ++n)
fontModule->fontsDefaultCO->addItem(
qt_(GuiDocument::fontfamilies_gui[n]));
pageLayoutModule = new UiWidget<Ui::PageLayoutUi>;
// page layout
connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)),
- this, SLOT(setCustomPapersize(int)));
+ this, SLOT(papersizeChanged(int)));
connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)),
- this, SLOT(setCustomPapersize(int)));
+ this, SLOT(papersizeChanged(int)));
connect(pageLayoutModule->portraitRB, SIGNAL(clicked()),
this, SLOT(portraitChanged()));
connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)),
mathsModule->amsCB, SLOT(setDisabled(bool)));
connect(mathsModule->esintautoCB, SIGNAL(toggled(bool)),
mathsModule->esintCB, SLOT(setDisabled(bool)));
+ connect(mathsModule->mhchemautoCB, SIGNAL(toggled(bool)),
+ mathsModule->mhchemCB, SLOT(setDisabled(bool)));
// maths
connect(mathsModule->amsCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
this, SLOT(change_adaptor()));
connect(mathsModule->esintautoCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
+ connect(mathsModule->mhchemCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+ connect(mathsModule->mhchemautoCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
latexModule = new UiWidget<Ui::LaTeXUi>;
// latex class
this, SLOT(change_adaptor()));
connect(latexModule->childDocPB, SIGNAL(clicked()),
this, SLOT(browseMaster()));
+ connect(latexModule->suppressDateCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
// postscript drivers
for (int n = 0; tex_graphics[n][0]; ++n) {
// Modules
modulesModule = new UiWidget<Ui::ModulesUi>;
-
+ modulesModule->availableLV->header()->setVisible(false);
selectionManager =
new ModuleSelectionManager(modulesModule->availableLV,
modulesModule->selectedLV,
connect(floatModule, SIGNAL(changed()),
this, SLOT(change_adaptor()));
+ // listings
+ listingsModule = new UiWidget<Ui::ListingsSettingsUi>;
+ connect(listingsModule->listingsED, SIGNAL(textChanged()),
+ this, SLOT(change_adaptor()));
+ connect(listingsModule->bypassCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+ connect(listingsModule->bypassCB, SIGNAL(clicked()),
+ this, SLOT(setListingsMessage()));
+ connect(listingsModule->listingsED, SIGNAL(textChanged()),
+ this, SLOT(setListingsMessage()));
+ listingsModule->listingsTB->setPlainText(
+ qt_("Input listings parameters below. Enter ? for a list of parameters."));
+
docPS->addPanel(latexModule, qt_("Document Class"));
+ docPS->addPanel(masterChildModule, qt_("Child Documents"));
docPS->addPanel(modulesModule, qt_("Modules"));
docPS->addPanel(fontModule, qt_("Fonts"));
docPS->addPanel(textLayoutModule, qt_("Text Layout"));
docPS->addPanel(pdfSupportModule, qt_("PDF Properties"));
docPS->addPanel(mathsModule, qt_("Math Options"));
docPS->addPanel(floatModule, qt_("Float Placement"));
+ docPS->addPanel(listingsModule, qt_("Listings"));
docPS->addPanel(bulletsModule, qt_("Bullets"));
docPS->addPanel(branchesModule, qt_("Branches"));
docPS->addPanel(outputModule, qt_("Output"));
}
+void GuiDocument::includeonlyClicked(QTreeWidgetItem * item, int)
+{
+ if (item == 0)
+ return;
+
+ string child = fromqstr(item->text(0));
+ if (child.empty())
+ return;
+
+ if (std::find(includeonlys_.begin(),
+ includeonlys_.end(), child) != includeonlys_.end())
+ includeonlys_.remove(child);
+ else
+ includeonlys_.push_back(child);
+
+ updateIncludeonlys();
+ changed();
+}
+
+
QString GuiDocument::validateListingsParameters()
{
// use a cache here to avoid repeated validation
static string param_cache;
static QString msg_cache;
- if (textLayoutModule->bypassCB->isChecked())
+ if (listingsModule->bypassCB->isChecked())
return QString();
- string params = fromqstr(textLayoutModule->listingsED->toPlainText());
+ string params = fromqstr(listingsModule->listingsED->toPlainText());
if (params != param_cache) {
param_cache = params;
msg_cache = toqstr(InsetListingsParams(params).validate());
return;
isOK = true;
// listingsTB->setTextColor("black");
- textLayoutModule->listingsTB->setPlainText(
- qt_("Input listings parameters on the right. "
+ listingsModule->listingsTB->setPlainText(
+ qt_("Input listings parameters below. "
"Enter ? for a list of parameters."));
} else {
isOK = false;
// listingsTB->setTextColor("red");
- textLayoutModule->listingsTB->setPlainText(msg);
+ listingsModule->listingsTB->setPlainText(msg);
}
}
}
+void GuiDocument::setIndent(int item)
+{
+ bool const enable = (item == 1);
+ textLayoutModule->indentLE->setEnabled(enable);
+ textLayoutModule->indentLengthCO->setEnabled(enable);
+ textLayoutModule->skipLE->setEnabled(false);
+ textLayoutModule->skipLengthCO->setEnabled(false);
+ isValid();
+}
+
+
+void GuiDocument::enableIndent(bool indent)
+{
+ textLayoutModule->skipLE->setEnabled(!indent);
+ textLayoutModule->skipLengthCO->setEnabled(!indent);
+ if (indent)
+ setIndent(textLayoutModule->indentCO->currentIndex());
+}
+
+
void GuiDocument::setSkip(int item)
{
bool const enable = (item == 3);
textLayoutModule->skipLE->setEnabled(enable);
textLayoutModule->skipLengthCO->setEnabled(enable);
+ isValid();
}
void GuiDocument::enableSkip(bool skip)
{
- textLayoutModule->skipCO->setEnabled(skip);
- textLayoutModule->skipLE->setEnabled(skip);
- textLayoutModule->skipLengthCO->setEnabled(skip);
+ textLayoutModule->indentLE->setEnabled(!skip);
+ textLayoutModule->indentLengthCO->setEnabled(!skip);
if (skip)
setSkip(textLayoutModule->skipCO->currentIndex());
}
}
-void GuiDocument::setCustomPapersize(int papersize)
+void GuiDocument::papersizeChanged(int paper_size)
{
- bool const custom = (papersize == 1);
+ setCustomPapersize(paper_size == 1);
+}
+
+void GuiDocument::setCustomPapersize(bool custom)
+{
pageLayoutModule->paperwidthL->setEnabled(custom);
pageLayoutModule->paperwidthLE->setEnabled(custom);
pageLayoutModule->paperwidthUnitCO->setEnabled(custom);
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);
+ fontModule->fontencLE->setEnabled(!xetex);
}
}
+void GuiDocument::fontencChanged(int item)
+{
+ fontModule->fontencLE->setEnabled(item == 1);
+}
+
+
void GuiDocument::romanChanged(int item)
{
if (outputModule->xetexCB->isChecked())
QString file = browseRelFile(old, docpath, title, filter, false,
qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
- latexModule->childDocLE->setText(file);
+ if (!file.isEmpty())
+ latexModule->childDocLE->setText(file);
}
vector<string>::const_iterator it = idList.begin();
vector<string>::const_iterator end = idList.end();
for (; it != end; ++it) {
- LyXModule const * const mod = moduleList[*it];
+ LyXModule const * const mod = theModuleList[*it];
if (!mod)
retval.push_back(*it + " (Unavailable)");
else
//Module description
bool const focus_on_selected = selectionManager->selectedFocused();
- QListView const * const lv =
- focus_on_selected ? modulesModule->selectedLV : modulesModule->availableLV;
+ QAbstractItemView * lv;
+ if (focus_on_selected)
+ lv = modulesModule->selectedLV;
+ else
+ lv= modulesModule->availableLV;
if (lv->selectionModel()->selectedIndexes().isEmpty()) {
modulesModule->infoML->document()->clear();
return;
}
+bool GuiDocument::isChildIncluded(string const & child)
+{
+ if (includeonlys_.empty())
+ return false;
+ return (std::find(includeonlys_.begin(),
+ includeonlys_.end(), child) != includeonlys_.end());
+}
+
+
void GuiDocument::applyView()
{
// preamble
preambleModule->apply(bp_);
+ // date
+ bp_.suppress_date = latexModule->suppressDateCB->isChecked();
+
// biblio
bp_.setCiteEngine(ENGINE_BASIC);
QString const lang = langModule->languageCO->itemData(
langModule->languageCO->currentIndex()).toString();
- bp_.language = languages.getLanguage(fromqstr(lang));
+ bp_.language = lyx::languages.getLanguage(fromqstr(lang));
// numbering
if (bp_.documentClass().hasTocLevels()) {
// Modules
modulesToParams(bp_);
+ // Math
if (mathsModule->amsautoCB->isChecked()) {
bp_.use_amsmath = BufferParams::package_auto;
} else {
else
bp_.use_amsmath = BufferParams::package_off;
}
-
if (mathsModule->esintautoCB->isChecked())
bp_.use_esint = BufferParams::package_auto;
else {
else
bp_.use_esint = BufferParams::package_off;
}
+ if (mathsModule->mhchemautoCB->isChecked())
+ bp_.use_mhchem = BufferParams::package_auto;
+ else {
+ if (mathsModule->mhchemCB->isChecked())
+ bp_.use_mhchem = BufferParams::package_on;
+ else
+ bp_.use_mhchem = BufferParams::package_off;
+ }
+ // Page Layout
if (pageLayoutModule->pagestyleCO->currentIndex() == 0)
bp_.pagestyle = "default";
else {
bp_.pagestyle = pagestyles[i].first;
}
+ // Text Layout
switch (textLayoutModule->lspacingCO->currentIndex()) {
case 0:
bp_.spacing().set(Spacing::Single);
break;
case 3:
bp_.spacing().set(Spacing::Other,
- fromqstr(textLayoutModule->lspacingLE->text()));
+ widgetToDoubleStr(textLayoutModule->lspacingLE));
break;
}
else
bp_.columns = 1;
- // text should have passed validation
- bp_.listings_params =
- InsetListingsParams(fromqstr(textLayoutModule->listingsED->toPlainText())).params();
-
- if (textLayoutModule->indentRB->isChecked())
+ if (textLayoutModule->indentRB->isChecked()) {
+ // if paragraphs are separated by an indentation
bp_.paragraph_separation = BufferParams::ParagraphIndentSeparation;
- else
+ switch (textLayoutModule->indentCO->currentIndex()) {
+ case 0:
+ bp_.setIndentation(HSpace(HSpace::DEFAULT));
+ break;
+ case 1: {
+ HSpace indent = HSpace(
+ widgetsToLength(textLayoutModule->indentLE,
+ textLayoutModule->indentLengthCO)
+ );
+ bp_.setIndentation(indent);
+ break;
+ }
+ default:
+ // this should never happen
+ bp_.setIndentation(HSpace(HSpace::DEFAULT));
+ break;
+ }
+ } else {
+ // if paragraphs are separated by a skip
bp_.paragraph_separation = BufferParams::ParagraphSkipSeparation;
-
- switch (textLayoutModule->skipCO->currentIndex()) {
- case 0:
- bp_.setDefSkip(VSpace(VSpace::SMALLSKIP));
- break;
- case 1:
- bp_.setDefSkip(VSpace(VSpace::MEDSKIP));
- break;
- case 2:
- bp_.setDefSkip(VSpace(VSpace::BIGSKIP));
- break;
- case 3:
- {
- VSpace vs = VSpace(
- widgetsToLength(textLayoutModule->skipLE,
+ switch (textLayoutModule->skipCO->currentIndex()) {
+ case 0:
+ bp_.setDefSkip(VSpace(VSpace::SMALLSKIP));
+ break;
+ case 1:
+ bp_.setDefSkip(VSpace(VSpace::MEDSKIP));
+ break;
+ case 2:
+ bp_.setDefSkip(VSpace(VSpace::BIGSKIP));
+ break;
+ case 3:
+ {
+ VSpace vs = VSpace(
+ widgetsToLength(textLayoutModule->skipLE,
textLayoutModule->skipLengthCO)
- );
- bp_.setDefSkip(vs);
- break;
- }
- default:
- // DocumentDefskipCB assures that this never happens
- // so Assert then !!! - jbl
- bp_.setDefSkip(VSpace(VSpace::MEDSKIP));
- break;
+ );
+ bp_.setDefSkip(vs);
+ break;
+ }
+ default:
+ // this should never happen
+ bp_.setDefSkip(VSpace(VSpace::MEDSKIP));
+ break;
+ }
}
bp_.options =
else
bp_.master = string();
+ // Master/Child
+ bp_.clearIncludedChildren();
+ if (masterChildModule->includeonlyRB->isChecked()) {
+ list<string>::const_iterator it = includeonlys_.begin();
+ for (; it != includeonlys_.end() ; ++it) {
+ bp_.addIncludedChildren(*it);
+ }
+ }
+ bp_.maintain_unincluded_children =
+ masterChildModule->maintainAuxCB->isChecked();
+
+ // Float Placement
bp_.float_placement = floatModule->get();
+ // Listings
+ // text should have passed validation
+ bp_.listings_params =
+ InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params();
+
// output
bp_.defaultOutputFormat = fromqstr(outputModule->defaultFormatCO->itemData(
outputModule->defaultFormatCO->currentIndex()).toString());
tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()];
}
+ if (fontModule->fontencCO->currentIndex() == 0)
+ bp_.fontenc = "global";
+ else if (fontModule->fontencCO->currentIndex() == 1)
+ bp_.fontenc = fromqstr(fontModule->fontencLE->text());
+ else if (fontModule->fontencCO->currentIndex() == 2)
+ bp_.fontenc = "default";
+
bp_.fontsCJK =
fromqstr(fontModule->cjkFontLE->text());
bp_.footskip = widgetsToLength(m->footskipLE, m->footskipUnit);
bp_.columnsep = widgetsToLength(m->columnsepLE, m->columnsepUnit);
+ // branches
branchesModule->apply(bp_);
// PDF support
// preamble
preambleModule->update(bp_, id());
+ // date
+ latexModule->suppressDateCB->setChecked(bp_.suppress_date);
+
// biblio
biblioModule->citeDefaultRB->setChecked(
bp_.citeEngine() == ENGINE_BASIC);
mathsModule->esintautoCB->setChecked(
bp_.use_esint == BufferParams::package_auto);
+ mathsModule->mhchemCB->setChecked(
+ bp_.use_mhchem == BufferParams::package_on);
+ mathsModule->mhchemautoCB->setChecked(
+ bp_.use_mhchem == BufferParams::package_auto);
+
switch (bp_.spacing().getSpace()) {
case Spacing::Other: nitem = 3; break;
case Spacing::Double: nitem = 2; break;
textLayoutModule->lspacingCO->setCurrentIndex(nitem);
if (bp_.spacing().getSpace() == Spacing::Other) {
- textLayoutModule->lspacingLE->setText(
- toqstr(bp_.spacing().getValueAsString()));
+ doubleToWidget(textLayoutModule->lspacingLE,
+ bp_.spacing().getValueAsString());
}
setLSpacing(nitem);
- if (bp_.paragraph_separation == BufferParams::ParagraphIndentSeparation)
+ if (bp_.paragraph_separation == BufferParams::ParagraphIndentSeparation) {
textLayoutModule->indentRB->setChecked(true);
- else
+ string indentation = bp_.getIndentation().asLyXCommand();
+ int indent = 0;
+ if (indentation != "default") {
+ lengthToWidgets(textLayoutModule->indentLE,
+ textLayoutModule->indentLengthCO,
+ indentation, defaultUnit);
+ indent = 1;
+ }
+ textLayoutModule->indentCO->setCurrentIndex(indent);
+ setIndent(indent);
+ } else {
textLayoutModule->skipRB->setChecked(true);
-
- int skip = 0;
- switch (bp_.getDefSkip().kind()) {
- case VSpace::SMALLSKIP:
- skip = 0;
- break;
- case VSpace::MEDSKIP:
- skip = 1;
- break;
- case VSpace::BIGSKIP:
- skip = 2;
- break;
- case VSpace::LENGTH:
- {
- skip = 3;
- string const length = bp_.getDefSkip().asLyXCommand();
- lengthToWidgets(textLayoutModule->skipLE,
- textLayoutModule->skipLengthCO,
- length, defaultUnit);
- break;
- }
- default:
- skip = 0;
- break;
+ int skip = 0;
+ switch (bp_.getDefSkip().kind()) {
+ case VSpace::SMALLSKIP:
+ skip = 0;
+ break;
+ case VSpace::MEDSKIP:
+ skip = 1;
+ break;
+ case VSpace::BIGSKIP:
+ skip = 2;
+ break;
+ case VSpace::LENGTH:
+ {
+ skip = 3;
+ string const length = bp_.getDefSkip().asLyXCommand();
+ lengthToWidgets(textLayoutModule->skipLE,
+ textLayoutModule->skipLengthCO,
+ length, defaultUnit);
+ break;
+ }
+ default:
+ skip = 0;
+ break;
+ }
+ textLayoutModule->skipCO->setCurrentIndex(skip);
+ setSkip(skip);
}
- textLayoutModule->skipCO->setCurrentIndex(skip);
- setSkip(skip);
textLayoutModule->twoColumnCB->setChecked(
bp_.columns == 2);
- // break listings_params to multiple lines
- string lstparams =
- InsetListingsParams(bp_.listings_params).separatedParams();
- textLayoutModule->listingsED->setPlainText(toqstr(lstparams));
-
if (!bp_.options.empty()) {
latexModule->optionsLE->setText(
toqstr(bp_.options));
latexModule->childDocGB->setChecked(false);
}
+ // Master/Child
+ std::vector<Buffer *> children = buffer().getChildren(false);
+ if (children.empty()) {
+ masterChildModule->childrenTW->clear();
+ includeonlys_.clear();
+ docPS->showPanel(qt_("Child Documents"), false);
+ if (docPS->isCurrentPanel(qt_("Child Documents")))
+ docPS->setCurrentPanel(qt_("Document Class"));
+ } else {
+ docPS->showPanel(qt_("Child Documents"), true);
+ masterChildModule->setEnabled(true);
+ includeonlys_ = bp_.getIncludedChildren();
+ updateIncludeonlys();
+ }
+ masterChildModule->maintainAuxCB->setChecked(
+ bp_.maintain_unincluded_children);
+
+ // Float Settings
floatModule->set(bp_.float_placement);
+ // ListingsSettings
+ // break listings_params to multiple lines
+ string lstparams =
+ InsetListingsParams(bp_.listings_params).separatedParams();
+ listingsModule->listingsED->setPlainText(toqstr(lstparams));
+
// Output
// update combobox with formats
updateDefaultFormat();
bp_.fontsize);
if (bp_.useXetex) {
+ 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);
}
}
} 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);
if (nn >= 0)
fontModule->fontsDefaultCO->setCurrentIndex(nn);
+ if (bp_.fontenc == "global")
+ fontModule->fontencCO->setCurrentIndex(0);
+ else if (bp_.fontenc == "default")
+ fontModule->fontencCO->setCurrentIndex(2);
+ else {
+ fontModule->fontencCO->setCurrentIndex(1);
+ fontModule->fontencLE->setText(toqstr(bp_.fontenc));
+ }
+
// paper
bool const extern_geometry =
documentClass().provides("geometry");
int const psize = bp_.papersize;
pageLayoutModule->papersizeCO->setCurrentIndex(psize);
- setCustomPapersize(!extern_geometry && psize);
+ setCustomPapersize(!extern_geometry && psize == 1);
pageLayoutModule->papersizeCO->setEnabled(!extern_geometry);
bool const landscape =
// Make sure that the bc is in the INITIAL state
if (bc().policy().buttonStatus(ButtonPolicy::RESTORE))
bc().restore();
+
+ // clear changed branches cache
+ changedBranches_.clear();
}
}
+void GuiDocument::updateIncludeonlys()
+{
+ masterChildModule->childrenTW->clear();
+ QString const no = qt_("No");
+ QString const yes = qt_("Yes");
+
+ if (includeonlys_.empty()) {
+ masterChildModule->includeallRB->setChecked(true);
+ masterChildModule->childrenTW->setEnabled(false);
+ masterChildModule->maintainAuxCB->setEnabled(false);
+ } else {
+ masterChildModule->includeonlyRB->setChecked(true);
+ masterChildModule->childrenTW->setEnabled(true);
+ 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();
+ bool has_unincluded = false;
+ bool all_unincluded = true;
+ for (; it != end; ++it) {
+ item = new QTreeWidgetItem(masterChildModule->childrenTW);
+ // FIXME Unicode
+ string const name =
+ to_utf8(makeRelPath(from_utf8((*it)->fileName().absFilename()),
+ from_utf8(buffer().filePath())));
+ item->setText(0, toqstr(name));
+ item->setText(1, isChildIncluded(name) ? yes : no);
+ if (!isChildIncluded(name))
+ has_unincluded = true;
+ else
+ all_unincluded = false;
+ }
+ // Both if all childs are included and if none is included
+ // is equal to "include all" (i.e., ommit \includeonly).
+ // Thus, reset the GUI.
+ if (!has_unincluded || all_unincluded) {
+ masterChildModule->includeallRB->setChecked(true);
+ masterChildModule->childrenTW->setEnabled(false);
+ includeonlys_.clear();
+ }
+ // If all are included, we need to update again.
+ if (!has_unincluded)
+ updateIncludeonlys();
+}
+
+
void GuiDocument::updateContents()
{
// Nothing to do here as the document settings is not cursor dependant.
{
return validateListingsParameters().isEmpty()
&& (textLayoutModule->skipCO->currentIndex() != 3
- || !textLayoutModule->skipLE->text().isEmpty());
+ || !textLayoutModule->skipLE->text().isEmpty()
+ || textLayoutModule->indentRB->isChecked())
+ && (textLayoutModule->indentCO->currentIndex() != 1
+ || !textLayoutModule->indentLE->text().isEmpty()
+ || textLayoutModule->skipRB->isChecked());
}
for (; it != end; ++it) {
modInfoStruct m;
m.id = *it;
- LyXModule * mod = moduleList[*it];
+ LyXModule const * const mod = theModuleList[*it];
if (mod)
// FIXME Unicode
m.name = toqstr(translateIfPossible(from_utf8(mod->getName())));
dispatch(FuncRequest(LFUN_ALL_INSETS_TOGGLE,
"assign branch"));
}
+ // rename branches in the document
+ executeBranchRenaming();
+ // and clear changed branches cache
+ changedBranches_.clear();
+
// Generate the colours requested by indices.
IndicesList & indiceslist = params().indiceslist();
if (!indiceslist.empty()) {
IndicesList::const_iterator it = indiceslist.begin();
IndicesList::const_iterator const end = indiceslist.end();
for (; it != end; ++it) {
- docstring const & current_index = it->index();
- Index const * index = indiceslist.find(current_index);
+ docstring const & current_index = it->shortcut();
+ Index const * index = indiceslist.findShortcut(current_index);
string const x11hexname = X11hexname(index->color());
// display the new color
docstring const str = current_index + ' ' + from_ascii(x11hexname);
void GuiDocument::loadModuleInfo()
{
moduleNames_.clear();
- LyXModuleList::const_iterator it = moduleList.begin();
- LyXModuleList::const_iterator end = moduleList.end();
+ LyXModuleList::const_iterator it = theModuleList.begin();
+ LyXModuleList::const_iterator end = theModuleList.end();
for (; it != end; ++it) {
modInfoStruct m;
m.id = it->getID();
void GuiDocument::branchesRename(docstring const & oldname, docstring const & newname)
{
- docstring const arg = '"' + oldname + '"' + " " + '"' + newname + '"';
- dispatch(FuncRequest(LFUN_BRANCHES_RENAME, arg));
+ map<docstring, docstring>::iterator it = changedBranches_.begin();
+ for (; it != changedBranches_.end() ; ++it) {
+ if (it->second == oldname) {
+ // branch has already been renamed
+ it->second = newname;
+ return;
+ }
+ }
+ // store new name
+ changedBranches_[oldname] = newname;
+}
+
+
+void GuiDocument::executeBranchRenaming() const
+{
+ map<docstring, docstring>::const_iterator it = changedBranches_.begin();
+ for (; it != changedBranches_.end() ; ++it) {
+ docstring const arg = '"' + it->first + '"' + " " + '"' + it->second + '"';
+ dispatch(FuncRequest(LFUN_BRANCHES_RENAME, arg));
+ }
}
projects / lyx.git / blobdiff