#include <sstream>
+#ifdef IN
+#undef IN
+#endif
+
+
using namespace std;
using namespace lyx::support;
connect(bulletsModule, SIGNAL(changed()),
this, SLOT(change_adaptor()));
- // embedded files
- embeddedFilesModule = new UiWidget<Ui::EmbeddedFilesUi>;
- connect(embeddedFilesModule->addPB, SIGNAL(clicked()),
- this, SLOT(addExtraEmbeddedFile()));
- connect(embeddedFilesModule->removePB, SIGNAL(clicked()),
- this, SLOT(removeExtraEmbeddedFile()));
-
// PDF support
pdfSupportModule = new UiWidget<Ui::PDFSupportUi>;
docPS->addPanel(floatModule, qt_("Float Placement"));
docPS->addPanel(bulletsModule, qt_("Bullets"));
docPS->addPanel(branchesModule, qt_("Branches"));
- docPS->addPanel(embeddedFilesModule, qt_("Embedded Files"));
docPS->addPanel(preambleModule, qt_("LaTeX Preamble"));
docPS->setCurrentPanel(qt_("Document Class"));
// FIXME: hack to work around resizing bug in Qt >= 4.2
string classname = layoutFile.onlyFileName();
LayoutFileIndex name = bcl.addLayoutFile(
classname.substr(0, classname.size() - 7),
- layoutFile.onlyPath().absFilename());
+ layoutFile.onlyPath().absFilename(),
+ LayoutFileList::Local);
if (name.empty()) {
Alert::error(_("Error"),
return;
}
}
+ // FIXME Note that by doing things this way, we load the TextClass
+ // as soon as it is selected. So, if you use the scroll wheel when
+ // sitting on the combo box, we'll load a lot of TextClass objects
+ // very quickly. This could be changed.
if (!bp_.setBaseClass(classname)) {
Alert::error(_("Error"), _("Unable to set document class."));
return;
}
-void GuiDocument::setExtraEmbeddedFileList()
-{
- embeddedFilesModule->extraLW->clear();
- // add current embedded files
- vector<string> const & files = buffer().params().extraEmbeddedFiles();
- vector<string>::const_iterator fit = files.begin();
- vector<string>::const_iterator fit_end = files.end();
- for (; fit != fit_end; ++fit)
- embeddedFilesModule->extraLW->addItem(toqstr(*fit));
-}
-
-
-void GuiDocument::addExtraEmbeddedFile()
-{
- QString file = browseRelFile(QString(), bufferFilepath(),
- qt_("Extra embedded file"), FileFilterList(), true);
-
- if (embeddedFilesModule->extraLW->findItems(file, Qt::MatchExactly).empty())
- embeddedFilesModule->extraLW->addItem(file);
-}
-
-
-void GuiDocument::removeExtraEmbeddedFile()
-{
- int index = embeddedFilesModule->extraLW->currentRow();
- delete embeddedFilesModule->extraLW->takeItem(index);
-}
-
-
void GuiDocument::updateNumbering()
{
DocumentClass const & tclass = bp_.documentClass();
fromqstr(langModule->encodingCO->currentText());
}
- InsetQuotes::quote_language lga = InsetQuotes::EnglishQ;
+ InsetQuotes::QuoteLanguage lga = InsetQuotes::EnglishQuotes;
switch (langModule->quoteStyleCO->currentIndex()) {
case 0:
- lga = InsetQuotes::EnglishQ;
+ lga = InsetQuotes::EnglishQuotes;
break;
case 1:
- lga = InsetQuotes::SwedishQ;
+ lga = InsetQuotes::SwedishQuotes;
break;
case 2:
- lga = InsetQuotes::GermanQ;
+ lga = InsetQuotes::GermanQuotes;
break;
case 3:
- lga = InsetQuotes::PolishQ;
+ lga = InsetQuotes::PolishQuotes;
break;
case 4:
- lga = InsetQuotes::FrenchQ;
+ lga = InsetQuotes::FrenchQuotes;
break;
case 5:
- lga = InsetQuotes::DanishQ;
+ lga = InsetQuotes::DanishQuotes;
break;
}
params.quotes_language = lga;
InsetListingsParams(fromqstr(textLayoutModule->listingsED->toPlainText())).params();
if (textLayoutModule->indentRB->isChecked())
- params.paragraph_separation = BufferParams::PARSEP_INDENT;
+ params.paragraph_separation = BufferParams::ParagraphIndentSeparation;
else
- params.paragraph_separation = BufferParams::PARSEP_SKIP;
+ params.paragraph_separation = BufferParams::ParagraphSkipSeparation;
switch (textLayoutModule->skipCO->currentIndex()) {
case 0:
pdf.pagemode.clear();
pdf.quoted_options = pdf.quoted_options_check(
fromqstr(pdfSupportModule->optionsLE->text()));
-
- // Embedded files
- vector<string> & files = params.extraEmbeddedFiles();
- files.clear();
- for (int i = 0; i < embeddedFilesModule->extraLW->count(); ++i) {
- QListWidgetItem * item = embeddedFilesModule->extraLW->item(i);
- files.push_back(fromqstr(item->text()));
- }
}
// biblio
biblioModule->citeDefaultRB->setChecked(
- params.getEngine() == biblio::ENGINE_BASIC);
+ params.citeEngine() == biblio::ENGINE_BASIC);
biblioModule->citeNatbibRB->setChecked(
- params.getEngine() == biblio::ENGINE_NATBIB_NUMERICAL ||
- params.getEngine() == biblio::ENGINE_NATBIB_AUTHORYEAR);
+ params.citeEngine() == biblio::ENGINE_NATBIB_NUMERICAL ||
+ params.citeEngine() == biblio::ENGINE_NATBIB_AUTHORYEAR);
biblioModule->citeStyleCO->setCurrentIndex(
- params.getEngine() == biblio::ENGINE_NATBIB_NUMERICAL);
+ params.citeEngine() == biblio::ENGINE_NATBIB_NUMERICAL);
biblioModule->citeJurabibRB->setChecked(
- params.getEngine() == biblio::ENGINE_JURABIB);
+ params.citeEngine() == biblio::ENGINE_JURABIB);
biblioModule->bibtopicCB->setChecked(
params.use_bibtopic);
}
setLSpacing(nitem);
- if (params.paragraph_separation == BufferParams::PARSEP_INDENT)
+ if (params.paragraph_separation == BufferParams::ParagraphIndentSeparation)
textLayoutModule->indentRB->setChecked(true);
else
textLayoutModule->skipRB->setChecked(true);
pdfSupportModule->optionsLE->setText(
toqstr(pdf.quoted_options));
-
- setExtraEmbeddedFileList();
}
void GuiDocument::updateAvailableModules()
{
modules_av_model_.clear();
- vector<modInfoStruct> const modInfoList = getModuleInfo();
+ vector<modInfoStruct> const & modInfoList = getModuleInfo();
int const mSize = modInfoList.size();
for (int i = 0; i != mSize; ++i) {
modInfoStruct const & modInfo = modInfoList[i];
- modules_av_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
+ modules_av_model_.insertRow(i, modInfo.name, modInfo.id,
+ modInfo.description);
}
}
int const sSize = selModList.size();
for (int i = 0; i != sSize; ++i) {
modInfoStruct const & modInfo = selModList[i];
- modules_sel_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
+ modules_sel_model_.insertRow(i, modInfo.name, modInfo.id,
+ modInfo.description);
}
}
m.id = *it;
LyXModule * mod = moduleList[*it];
if (mod)
- m.name = mod->getName();
+ m.name = qt_(mod->getName());
else
- m.name = *it + " (Not Found)";
+ m.name = toqstr(*it) + toqstr(" (") + qt_("Not Found") + toqstr(")");
mInfo.push_back(m);
}
return mInfo;
static void dispatch_bufferparams(Dialog const & dialog,
- BufferParams const & bp, kb_action lfun)
+ BufferParams const & bp, FuncCode lfun)
{
ostringstream ss;
ss << "\\begin_header\n";
for (; it != end; ++it) {
modInfoStruct m;
m.id = it->getID();
- m.name = it->getName();
+ m.name = qt_(it->getName());
+ // this is supposed to give us the first sentence of the description
+ QString desc = qt_(it->getDescription());
+ int const pos = desc.indexOf(".");
+ if (pos > 0)
+ desc.truncate(pos + 1);
+ m.description = desc;
moduleNames_.push_back(m);
}
}