#include "GuiDocument.h"
-#include "BaseClassList.h"
+#include "GuiApplication.h"
+#include "GuiBranches.h"
+#include "LaTeXHighlighter.h"
+#include "LengthCombo.h"
+#include "PanelStack.h"
+#include "Validator.h"
+
+#include "LayoutFile.h"
#include "BranchList.h"
#include "buffer_funcs.h"
#include "Buffer.h"
#include "BufferParams.h"
#include "BufferView.h"
#include "Color.h"
-#include "EmbeddedFiles.h"
#include "Encoding.h"
#include "FloatPlacement.h"
#include "FuncRequest.h"
-#include "support/gettext.h"
-#include "GuiBranches.h"
#include "Language.h"
#include "LaTeXFeatures.h"
-#include "LaTeXHighlighter.h"
#include "Layout.h"
-#include "LengthCombo.h"
#include "LyXRC.h" // defaultUnit
#include "ModuleList.h"
#include "OutputParams.h"
-#include "PanelStack.h"
#include "PDFOptions.h"
#include "qt_helpers.h"
#include "Spacing.h"
-#include "Validator.h"
#include "insets/InsetListingsParams.h"
+#include "support/debug.h"
#include "support/FileName.h"
#include "support/filetools.h"
+#include "support/gettext.h"
#include "support/lstrings.h"
#include "frontends/alert.h"
-#include <boost/bind.hpp>
-
#include <QCloseEvent>
#include <QScrollBar>
+#include <QStandardItemModel.h>
#include <QTextCursor>
-#include <algorithm>
#include <sstream>
+#ifdef IN
+#undef IN
+#endif
+
+
using namespace std;
using namespace lyx::support;
-///
-template<class Pair>
-vector<typename Pair::second_type> const
-getSecond(vector<Pair> const & pr)
-{
- vector<typename Pair::second_type> tmp(pr.size());
- transform(pr.begin(), pr.end(), tmp.begin(),
- boost::bind(&Pair::second, _1));
- return tmp;
-}
-
+namespace {
char const * const tex_graphics[] =
{
vector<pair<string, lyx::docstring> > pagestyles;
+} // anonymous namespace
+
namespace lyx {
+
+namespace {
+// used when sorting the textclass list.
+class less_textclass_avail_desc
+ : public binary_function<string, string, int>
+{
+public:
+ int operator()(string const & lhs, string const & rhs) const
+ {
+ // Ordering criteria:
+ // 1. Availability of text class
+ // 2. Description (lexicographic)
+ LayoutFile const & tc1 = LayoutFileList::get()[lhs];
+ LayoutFile const & tc2 = LayoutFileList::get()[rhs];
+ return (tc1.isTeXClassAvailable() && !tc2.isTeXClassAvailable()) ||
+ (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() &&
+ _(tc1.description()) < _(tc2.description()));
+ }
+};
+
+}
+
namespace frontend {
/////////////////////////////////////////////////////////////////////
-
GuiDocument::GuiDocument(GuiView & lv)
: GuiDialog(lv, "document", qt_("Document Settings")), current_id_(0)
{
setupUi(this);
-
- lang_ = getSecond(getLanguageData(false));
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
connect(langModule->quoteStyleCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
// language & quotes
- vector<LanguagePair> const langs = getLanguageData(false);
- vector<LanguagePair>::const_iterator lit = langs.begin();
- vector<LanguagePair>::const_iterator lend = langs.end();
- for (; lit != lend; ++lit) {
- langModule->languageCO->addItem(toqstr(lit->first));
- }
+ langModule->languageCO->setModel(guiApp->languageModel());
// Always put the default encoding in the first position.
// It is special because the displayed text is translated.
langModule->quoteStyleCO->addItem(qt_(">>text<<"));
-
numberingModule = new UiWidget<Ui::NumberingUi>;
// numbering
connect(numberingModule->depthSL, SIGNAL(valueChanged(int)),
this, SLOT(classChanged()));
connect(latexModule->classCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
+ connect(latexModule->layoutPB, SIGNAL(clicked()),
+ this, SLOT(browseLayout()));
+ connect(latexModule->childDocGB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+ connect(latexModule->childDocLE, SIGNAL(textChanged(const QString &)),
+ this, SLOT(change_adaptor()));
+ connect(latexModule->childDocPB, SIGNAL(clicked()),
+ this, SLOT(browseMaster()));
selectionManager =
new ModuleSelMan(latexModule->availableLV, latexModule->selectedLV,
latexModule->psdriverCO->addItem(enc);
}
// latex classes
- //FIXME This seems too involved with the kernel. Some of this
- //should be moved to the kernel---which should perhaps just
- //give us a list of entries or something of the sort.
- for (BaseClassList::const_iterator cit = baseclasslist.begin();
- cit != baseclasslist.end(); ++cit) {
- if (cit->isTeXClassAvailable()) {
- latexModule->classCO->addItem(toqstr(cit->description()));
- } else {
- docstring item =
- bformat(_("Unavailable: %1$s"), from_utf8(cit->description()));
- latexModule->classCO->addItem(toqstr(item));
- }
+ latexModule->classCO->setModel(&classes_model_);
+ LayoutFileList const & bcl = LayoutFileList::get();
+ vector<LayoutFileIndex> classList = bcl.classList();
+ sort(classList.begin(), classList.end(), less_textclass_avail_desc());
+
+ vector<LayoutFileIndex>::const_iterator cit = classList.begin();
+ vector<LayoutFileIndex>::const_iterator cen = classList.end();
+ for (int i = 0; cit != cen; ++cit, ++i) {
+ LayoutFile const & tc = bcl[*cit];
+ docstring item = (tc.isTeXClassAvailable()) ?
+ from_utf8(tc.description()) :
+ bformat(_("Unavailable: %1$s"), from_utf8(tc.description()));
+ classes_model_.insertRow(i, toqstr(item), *cit);
}
// branches
connect(bulletsModule, SIGNAL(changed()),
this, SLOT(change_adaptor()));
- // embedded files
- embeddedFilesModule = new UiWidget<Ui::EmbeddedFilesUi>;
- connect(embeddedFilesModule->bundleCB, SIGNAL(toggled(bool)),
- this, SLOT(change_adaptor()));
- connect(embeddedFilesModule->addPB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
- connect(embeddedFilesModule->removePB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
-
// PDF support
pdfSupportModule = new UiWidget<Ui::PDFSupportUi>;
connect(floatModule, SIGNAL(changed()),
this, SLOT(change_adaptor()));
- docPS->addPanel(latexModule, _("Document Class"));
- docPS->addPanel(fontModule, _("Fonts"));
- docPS->addPanel(textLayoutModule, _("Text Layout"));
- docPS->addPanel(pageLayoutModule, _("Page Layout"));
- docPS->addPanel(marginsModule, _("Page Margins"));
- docPS->addPanel(langModule, _("Language"));
- docPS->addPanel(numberingModule, _("Numbering & TOC"));
- docPS->addPanel(biblioModule, _("Bibliography"));
- docPS->addPanel(pdfSupportModule, _("PDF Properties"));
- docPS->addPanel(mathsModule, _("Math Options"));
- docPS->addPanel(floatModule, _("Float Placement"));
- docPS->addPanel(bulletsModule, _("Bullets"));
- docPS->addPanel(branchesModule, _("Branches"));
- docPS->addPanel(embeddedFilesModule, _("Embedded Files"));
- docPS->addPanel(preambleModule, _("LaTeX Preamble"));
- docPS->setCurrentPanel(_("Document Class"));
+ docPS->addPanel(latexModule, qt_("Document Class"));
+ docPS->addPanel(fontModule, qt_("Fonts"));
+ docPS->addPanel(textLayoutModule, qt_("Text Layout"));
+ docPS->addPanel(pageLayoutModule, qt_("Page Layout"));
+ docPS->addPanel(marginsModule, qt_("Page Margins"));
+ docPS->addPanel(langModule, qt_("Language"));
+ docPS->addPanel(numberingModule, qt_("Numbering & TOC"));
+ docPS->addPanel(biblioModule, qt_("Bibliography"));
+ docPS->addPanel(pdfSupportModule, qt_("PDF Properties"));
+ docPS->addPanel(mathsModule, qt_("Math Options"));
+ docPS->addPanel(floatModule, qt_("Float Placement"));
+ docPS->addPanel(bulletsModule, qt_("Bullets"));
+ docPS->addPanel(branchesModule, qt_("Branches"));
+ docPS->addPanel(preambleModule, qt_("LaTeX Preamble"));
+ 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)
#if QT_VERSION >= 0x040200
void GuiDocument::showPreamble()
{
- docPS->setCurrentPanel(_("LaTeX Preamble"));
+ docPS->setCurrentPanel(qt_("LaTeX Preamble"));
}
}
+void GuiDocument::browseLayout()
+{
+ 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(),
+ qt_("Local layout file"), filter, false,
+ label1, dir1);
+
+ if (!file.endsWith(".layout"))
+ return;
+
+ FileName layoutFile = support::makeAbsPath(fromqstr(file),
+ fromqstr(bufferFilepath()));
+
+ // load the layout file
+ LayoutFileList & bcl = LayoutFileList::get();
+ string classname = layoutFile.onlyFileName();
+ LayoutFileIndex name = bcl.addLayoutFile(
+ classname.substr(0, classname.size() - 7),
+ layoutFile.onlyPath().absFilename(),
+ LayoutFileList::Local);
+
+ if (name.empty()) {
+ Alert::error(_("Error"),
+ _("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) {
+ classes_model_.insertRow(0, toqstr(name), name);
+ latexModule->classCO->setCurrentIndex(0);
+ } else
+ latexModule->classCO->setCurrentIndex(idx);
+ classChanged();
+}
+
+
+void GuiDocument::browseMaster()
+{
+ QString const title = qt_("Select master document");
+ QString const dir1 = toqstr(lyxrc.document_path);
+ 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,
+ qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
+
+ latexModule->childDocLE->setText(file);
+}
+
+
void GuiDocument::classChanged()
{
- BaseClassIndex const tc = latexModule->classCO->currentIndex();
- bp_.setBaseClass(tc);
+ int idx = latexModule->classCO->currentIndex();
+ if (idx < 0)
+ return;
+ string const classname = classes_model_.getIDString(idx);
+ // check if this is a local layout file
+ if (prefixIs(classname, LayoutFileList::localPrefix)) {
+ 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"
+ "document may not work with this layout if you do not\n"
+ "keep the layout file in the same directory."),
+ 1, 1, _("&Set Layout"), _("&Cancel"));
+ if (ret == 1) {
+ // try to reset the layout combo
+ setLayoutComboByIDString(bp_.baseClassID());
+ 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;
+ }
if (lyxrc.auto_reset_options) {
if (applyPB->isEnabled()) {
int const ret = Alert::prompt(_("Unapplied changes"),
- _("Some changes in the dialog were not yet applied."
+ _("Some changes in the dialog were not yet applied.\n"
"If you do not apply now, they will be lost after this action."),
1, 1, _("&Apply"), _("&Dismiss"));
if (ret == 0)
}
QModelIndex const & idx = lv->selectionModel()->currentIndex();
GuiIdListModel const & idModel =
- focusOnSelected ? selected_model_ : available_model_;
+ focusOnSelected ? modules_sel_model_ : modules_av_model_;
string const modName = idModel.getIDString(idx.row());
docstring desc = getModuleDescription(modName);
}
-void GuiDocument::updateEmbeddedFileList()
-{
- embeddedFilesModule->filesLW->clear();
- // add current embedded files
- EmbeddedFileList & files = buffer().embeddedFiles();
- files.update(buffer());
- EmbeddedFileList::iterator fit = files.begin();
- EmbeddedFileList::iterator fit_end = files.end();
- for (; fit != fit_end; ++fit) {
- QString label = toqstr(fit->relFilename(buffer().filePath()));
- if (fit->refCount() > 1)
- label += " (" + QString::number(fit->refCount()) + ")";
- QListWidgetItem * item = new QListWidgetItem(label);
- item->setFlags(item->flags() | Qt::ItemIsSelectable
- | Qt::ItemIsUserCheckable);
- if(fit->embedded())
- item->setCheckState(Qt::Checked);
- else
- item->setCheckState(Qt::Unchecked);
- // index of the currently used ParConstIterator
- embeddedFilesModule->filesLW->addItem(item);
- }
-}
-
-
void GuiDocument::updateNumbering()
{
- TextClass const & tclass = bp_.textClass();
+ DocumentClass const & tclass = bp_.documentClass();
numberingModule->tocTW->setUpdatesEnabled(false);
numberingModule->tocTW->clear();
QString const no = qt_("No");
QString const yes = qt_("Yes");
QTreeWidgetItem * item = 0;
- for (size_t i = 0; i != tclass.layoutCount(); ++i) {
- Layout const & lt = *tclass.layout(i);
- int const toclevel = lt.toclevel;
- if (toclevel != Layout::NOT_IN_TOC && lt.labeltype == LABEL_COUNTER) {
+
+ DocumentClass::const_iterator lit = tclass.begin();
+ DocumentClass::const_iterator len = tclass.end();
+ for (; lit != len; ++lit) {
+ int const toclevel = lit->toclevel;
+ if (toclevel != Layout::NOT_IN_TOC && lit->labeltype == LABEL_COUNTER) {
item = new QTreeWidgetItem(numberingModule->tocTW);
- item->setText(0, toqstr(translateIfPossible(lt.name())));
+ item->setText(0, toqstr(translateIfPossible(lit->name())));
item->setText(1, (toclevel <= depth) ? yes : no);
item->setText(2, (toclevel <= toc) ? yes : no);
}
preambleModule->apply(params);
// biblio
- params.setCiteEngine(biblio::ENGINE_BASIC);
+ params.setCiteEngine(ENGINE_BASIC);
if (biblioModule->citeNatbibRB->isChecked()) {
bool const use_numerical_citations =
biblioModule->citeStyleCO->currentIndex();
if (use_numerical_citations)
- params.setCiteEngine(biblio::ENGINE_NATBIB_NUMERICAL);
+ params.setCiteEngine(ENGINE_NATBIB_NUMERICAL);
else
- params.setCiteEngine(biblio::ENGINE_NATBIB_AUTHORYEAR);
+ params.setCiteEngine(ENGINE_NATBIB_AUTHORYEAR);
} else if (biblioModule->citeJurabibRB->isChecked())
- params.setCiteEngine(biblio::ENGINE_JURABIB);
+ params.setCiteEngine(ENGINE_JURABIB);
params.use_bibtopic =
biblioModule->bibtopicCB->isChecked();
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;
- int const pos = langModule->languageCO->currentIndex();
- params.language = lyx::languages.getLanguage(lang_[pos]);
+ QString const lang = langModule->languageCO->itemData(
+ langModule->languageCO->currentIndex()).toString();
+ params.language = lyx::languages.getLanguage(fromqstr(lang));
// numbering
- if (params.textClass().hasTocLevels()) {
+ if (params.documentClass().hasTocLevels()) {
params.tocdepth = numberingModule->tocSL->value();
params.secnumdepth = numberingModule->depthSL->value();
}
tex_graphics[latexModule->psdriverCO->currentIndex()];
// text layout
- params.setBaseClass(latexModule->classCO->currentIndex());
+ int idx = latexModule->classCO->currentIndex();
+ if (idx >= 0) {
+ string const classname = classes_model_.getIDString(idx);
+ params.setBaseClass(classname);
+ }
// Modules
params.clearLayoutModules();
- int const srows = selected_model_.rowCount();
+ int const srows = modules_sel_model_.rowCount();
vector<string> selModList;
for (int i = 0; i < srows; ++i)
- params.addLayoutModule(selected_model_.getIDString(i));
+ params.addLayoutModule(modules_sel_model_.getIDString(i));
if (mathsModule->amsautoCB->isChecked()) {
params.use_amsmath = BufferParams::package_auto;
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:
params.options =
fromqstr(latexModule->optionsLE->text());
+ if (latexModule->childDocGB->isChecked())
+ params.master =
+ fromqstr(latexModule->childDocLE->text());
+ else
+ params.master = string();
+
params.float_placement = floatModule->get();
// fonts
params.orientation = ORIENTATION_PORTRAIT;
// margins
- params.use_geometry =
- (!marginsModule->marginCB->isChecked()
- || geom_papersize);
+ params.use_geometry = !marginsModule->marginCB->isChecked()
+ || geom_papersize;
- Ui::MarginsUi const * m(marginsModule);
+ Ui::MarginsUi const * m = marginsModule;
params.leftmargin = widgetsToLength(m->innerLE, m->innerUnit);
params.topmargin = widgetsToLength(m->topLE, m->topUnit);
pdf.pagemode = pdf.pagemode_fullscreen;
else
pdf.pagemode.clear();
- pdf.quoted_options = fromqstr(pdfSupportModule->optionsLE->text());
-
- // Embedded files
- // FIXME
-}
-
-
-/** Return the position of val in the vector if found.
- If not found, return 0.
- */
-template<class A>
-static size_t findPos(vector<A> const & vec, A const & val)
-{
- typename vector<A>::const_iterator it =
- find(vec.begin(), vec.end(), val);
- if (it == vec.end())
- return 0;
- return distance(vec.begin(), it);
+ pdf.quoted_options = pdf.quoted_options_check(
+ fromqstr(pdfSupportModule->optionsLE->text()));
}
// biblio
biblioModule->citeDefaultRB->setChecked(
- params.getEngine() == biblio::ENGINE_BASIC);
+ params.citeEngine() == ENGINE_BASIC);
biblioModule->citeNatbibRB->setChecked(
- params.getEngine() == biblio::ENGINE_NATBIB_NUMERICAL ||
- params.getEngine() == biblio::ENGINE_NATBIB_AUTHORYEAR);
+ params.citeEngine() == ENGINE_NATBIB_NUMERICAL ||
+ params.citeEngine() == ENGINE_NATBIB_AUTHORYEAR);
biblioModule->citeStyleCO->setCurrentIndex(
- params.getEngine() == biblio::ENGINE_NATBIB_NUMERICAL);
+ params.citeEngine() == ENGINE_NATBIB_NUMERICAL);
biblioModule->citeJurabibRB->setChecked(
- params.getEngine() == biblio::ENGINE_JURABIB);
+ params.citeEngine() == ENGINE_JURABIB);
biblioModule->bibtopicCB->setChecked(
params.use_bibtopic);
// language & quotes
- int const pos = int(findPos(lang_,
- params.language->lang()));
+ int const pos = langModule->languageCO->findData(toqstr(
+ params.language->lang()));
langModule->languageCO->setCurrentIndex(pos);
langModule->quoteStyleCO->setCurrentIndex(
langModule->otherencodingRB->setChecked(!default_enc);
// numbering
- int const min_toclevel = textClass().min_toclevel();
- int const max_toclevel = textClass().max_toclevel();
- if (textClass().hasTocLevels()) {
+ int const min_toclevel = documentClass().min_toclevel();
+ int const max_toclevel = documentClass().max_toclevel();
+ if (documentClass().hasTocLevels()) {
numberingModule->setEnabled(true);
numberingModule->depthSL->setMinimum(min_toclevel - 1);
numberingModule->depthSL->setMaximum(max_toclevel);
}
// text layout
- latexModule->classCO->setCurrentIndex(params.baseClass());
-
- updatePagestyle(textClass().opt_pagestyle(),
+ string const & layoutID = params.baseClassID();
+ setLayoutComboByIDString(layoutID);
+
+ updatePagestyle(documentClass().opt_pagestyle(),
params.pagestyle);
textLayoutModule->lspacingCO->setCurrentIndex(nitem);
}
setLSpacing(nitem);
- if (params.paragraph_separation == BufferParams::PARSEP_INDENT)
+ if (params.paragraph_separation == BufferParams::ParagraphIndentSeparation)
textLayoutModule->indentRB->setChecked(true);
else
textLayoutModule->skipRB->setChecked(true);
latexModule->optionsLE->setText(QString());
}
+ if (!params.master.empty()) {
+ latexModule->childDocGB->setChecked(true);
+ latexModule->childDocLE->setText(
+ toqstr(params.master));
+ } else {
+ latexModule->childDocLE->setText(QString());
+ latexModule->childDocGB->setChecked(false);
+ }
+
floatModule->set(params.float_placement);
// Fonts
- updateFontsize(textClass().opt_fontsize(),
+ updateFontsize(documentClass().opt_fontsize(),
params.fontsize);
int n = findToken(tex_fonts_roman, params.fontsRoman);
pdfSupportModule->optionsLE->setText(
toqstr(pdf.quoted_options));
-
- // embedded files
- updateEmbeddedFileList();
}
void GuiDocument::updateAvailableModules()
{
- available_model_.clear();
- vector<modInfoStruct> const modInfoList = getModuleInfo();
+ modules_av_model_.clear();
+ vector<modInfoStruct> const & modInfoList = getModuleInfo();
int const mSize = modInfoList.size();
- for (int i = 0; i < mSize; ++i) {
+ for (int i = 0; i != mSize; ++i) {
modInfoStruct const & modInfo = modInfoList[i];
- available_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
+ modules_av_model_.insertRow(i, modInfo.name, modInfo.id,
+ modInfo.description);
}
}
void GuiDocument::updateSelectedModules()
{
- //and selected ones, too
- selected_model_.clear();
+ // and selected ones, too
+ modules_sel_model_.clear();
vector<modInfoStruct> const selModList = getSelectedModules();
int const sSize = selModList.size();
- for (int i = 0; i < sSize; ++i) {
+ for (int i = 0; i != sSize; ++i) {
modInfoStruct const & modInfo = selModList[i];
- selected_model_.insertRow(i, qt_(modInfo.name), modInfo.id);
+ modules_sel_model_.insertRow(i, modInfo.name, modInfo.id,
+ modInfo.description);
}
}
{
if (applyPB->isEnabled()) {
int const ret = Alert::prompt(_("Unapplied changes"),
- _("Some changes in the dialog were not yet applied."
+ _("Some changes in the dialog were not yet applied.\n"
"If you do not apply now, they will be lost after this action."),
1, 1, _("&Apply"), _("&Dismiss"));
if (ret == 0)
applyView();
}
- bp_.setBaseClass(latexModule->classCO->currentIndex());
+ int idx = latexModule->classCO->currentIndex();
+ string const classname = classes_model_.getIDString(idx);
+ if (!bp_.setBaseClass(classname)) {
+ Alert::error(_("Error"), _("Unable to set document class."));
+ return;
+ }
bp_.useClassDefaults();
forceUpdate();
}
+void GuiDocument::setLayoutComboByIDString(std::string const & idString)
+{
+ int idx = classes_model_.findIDString(idString);
+ if (idx < 0)
+ Alert::warning(_("Can't set layout!"),
+ bformat(_("Unable to set layout for ID: %1$s"), from_utf8(idString)));
+ else
+ latexModule->classCO->setCurrentIndex(idx);
+}
+
+
bool GuiDocument::isValid()
{
- return (validate_listings_params().empty() &&
- (textLayoutModule->skipCO->currentIndex() != 3 ||
- !textLayoutModule->skipLE->text().isEmpty()));
+ return validate_listings_params().empty()
+ && (textLayoutModule->skipCO->currentIndex() != 3
+ || !textLayoutModule->skipLE->text().isEmpty());
}
bool GuiDocument::initialiseParams(string const &)
{
bp_ = buffer().params();
+ // Force update on next updateContent() round.
+ current_id_ = 0;
loadModuleInfo();
return true;
}
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;
}
-TextClass const & GuiDocument::textClass() const
+DocumentClass const & GuiDocument::documentClass() const
{
- return baseclasslist[bp_.baseClass()];
+ return bp_.documentClass();
}
static void dispatch_bufferparams(Dialog const & dialog,
- BufferParams const & bp, kb_action lfun)
+ BufferParams const & bp, FuncCode lfun)
{
ostringstream ss;
ss << "\\begin_header\n";
// and then update the buffer's layout.
dispatch_bufferparams(*this, params(), LFUN_BUFFER_PARAMS_APPLY);
+ if (!params().master.empty()) {
+ FileName const master_file = support::makeAbsPath(params().master,
+ support::onlyPath(buffer().absFileName()));
+ if (isLyXFilename(master_file.absFilename())) {
+ Buffer * master = checkAndLoadLyXFile(master_file);
+ buffer().setParent(master);
+ }
+ }
+
// Generate the colours requested by each new branch.
BranchList & branchlist = params().branchlist();
if (!branchlist.empty()) {
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);
}
}
projects / lyx.git / blobdiff