#include "GuiApplication.h"
#include "GuiBranches.h"
+#include "GuiSelectionManager.h"
#include "LaTeXHighlighter.h"
#include "LengthCombo.h"
#include "PanelStack.h"
#include "frontends/alert.h"
+#include <QAbstractItemModel>
#include <QCloseEvent>
#include <QScrollBar>
#include <QTextCursor>
char const * const tex_graphics[] =
{
- "default", "dvips", "dvitops", "emtex",
- "ln", "oztex", "textures", "none", ""
+ "default", "dvialw", "dvilaser", "dvipdf", "dvipdfm", "dvipdfmx",
+ "dvips", "dvipsone", "dvitops", "dviwin", "dviwindo", "dvi2ps", "emtex",
+ "ln", "oztex", "pctexhp", "pctexps", "pctexwin", "pctex32", "pdftex",
+ "psprint", "pubps", "tcidvi", "textures", "truetex", "vtex", "xdvi",
+ "xetex", "none", ""
};
char const * const tex_graphics_gui[] =
{
- N_("Default"), "Dvips", "DVItoPS", "EmTeX",
- "LN", "OzTeX", "Textures", N_("None"), ""
+ N_("Default"), "dvialw", "DviLaser", "dvipdf", "DVIPDFM", "DVIPDFMx",
+ "Dvips", "DVIPSONE", "DVItoPS", "DVIWIN", "DVIWindo", "dvi2ps", "EmTeX",
+ "LN", "OzTeX", "pctexhp", "pctexps", "pctexwin", "PCTeX32", "pdfTeX",
+ "psprint", "pubps", "tcidvi", "Textures", "TrueTeX", "VTeX", "xdvi",
+ "XeTeX", N_("None"), ""
};
};
-vector<pair<string, lyx::docstring> > pagestyles;
+vector<pair<string, QString> > pagestyles;
} // anonymous namespace
: public binary_function<string, string, int>
{
public:
- int operator()(string const & lhs, string const & rhs) const
+ bool operator()(string const & lhs, string const & rhs) const
{
// Ordering criteria:
// 1. Availability of text class
}
namespace frontend {
+namespace {
+
+vector<string> getRequiredList(string const & modName)
+{
+ LyXModule const * const mod = moduleList[modName];
+ if (!mod)
+ return vector<string>(); //empty such thing
+ return mod->getRequiredModules();
+}
-///
-QModelIndex getSelectedIndex(QListView * lv)
+vector<string> getExcludedList(string const & modName)
{
- QModelIndex retval = QModelIndex();
- QModelIndexList selIdx =
- lv->selectionModel()->selectedIndexes();
- if (!selIdx.empty())
- retval = selIdx.first();
- return retval;
+ LyXModule const * const mod = moduleList[modName];
+ if (!mod)
+ return vector<string>(); //empty such thing
+ return mod->getExcludedModules();
}
-namespace {
- vector<string> getRequiredList(string const & modName)
- {
- LyXModule const * const mod = moduleList[modName];
- if (!mod)
- return vector<string>(); //empty such thing
- return mod->getRequiredModules();
- }
+docstring getModuleDescription(string const & modName)
+{
+ LyXModule const * const mod = moduleList[modName];
+ if (!mod)
+ return _("Module not found!");
+ return _(mod->getDescription());
+}
- vector<string> getExcludedList(string const & modName)
- {
- LyXModule const * const mod = moduleList[modName];
- if (!mod)
- return vector<string>(); //empty such thing
- return mod->getExcludedModules();
- }
+vector<string> getPackageList(string const & modName)
+{
+ LyXModule const * const mod = moduleList[modName];
+ if (!mod)
+ return vector<string>(); //empty such thing
+ return mod->getPackageList();
+}
- docstring getModuleDescription(string const & modName)
- {
- LyXModule const * const mod = moduleList[modName];
- if (!mod)
- return _("Module not found!");
- return _(mod->getDescription());
- }
+bool isModuleAvailable(string const & modName)
+{
+ LyXModule * mod = moduleList[modName];
+ if (!mod)
+ return false;
+ return mod->isAvailable();
+}
+} // anonymous namespace
- vector<string> getPackageList(string const & modName)
- {
- LyXModule const * const mod = moduleList[modName];
- if (!mod)
- return vector<string>(); //empty such thing
- return mod->getPackageList();
- }
+/////////////////////////////////////////////////////////////////////
+//
+// ModuleSelectionManager
+//
+/////////////////////////////////////////////////////////////////////
- bool isModuleAvailable(string const & modName)
- {
- LyXModule * mod = moduleList[modName];
- if (!mod)
- return false;
- return mod->isAvailable();
- }
-} //anonymous namespace
-
-
-ModuleSelMan::ModuleSelMan(
- QListView * availableLV,
- QListView * selectedLV,
- QPushButton * addPB,
- QPushButton * delPB,
- QPushButton * upPB,
- QPushButton * downPB,
- GuiIdListModel * availableModel,
- GuiIdListModel * selectedModel) :
-GuiSelectionManager(availableLV, selectedLV, addPB, delPB,
+/// SelectionManager for use with modules
+class ModuleSelectionManager : public GuiSelectionManager
+{
+public:
+ ModuleSelectionManager(
+ QListView * availableLV,
+ QListView * selectedLV,
+ QPushButton * addPB,
+ QPushButton * delPB,
+ QPushButton * upPB,
+ QPushButton * downPB,
+ GuiIdListModel * availableModel,
+ GuiIdListModel * selectedModel)
+ : GuiSelectionManager(availableLV, selectedLV, addPB, delPB,
upPB, downPB, availableModel, selectedModel)
-{}
+ {}
-void ModuleSelMan::updateAddPB()
+private:
+ ///
+ virtual void updateAddPB();
+ ///
+ virtual void updateUpPB();
+ ///
+ virtual void updateDownPB();
+ ///
+ virtual void updateDelPB();
+ /// returns availableModel as a GuiIdListModel
+ GuiIdListModel * getAvailableModel()
+ {
+ return dynamic_cast<GuiIdListModel *>(availableModel);
+ }
+ /// returns selectedModel as a GuiIdListModel
+ GuiIdListModel * getSelectedModel()
+ {
+ return dynamic_cast<GuiIdListModel *>(selectedModel);
+ }
+};
+
+void ModuleSelectionManager::updateAddPB()
{
int const arows = availableModel->rowCount();
QModelIndexList const availSels =
}
-void ModuleSelMan::updateDownPB()
+void ModuleSelectionManager::updateDownPB()
{
int const srows = selectedModel->rowCount();
if (srows == 0) {
find(reqs.begin(), reqs.end(), curModName) == reqs.end());
}
-void ModuleSelMan::updateUpPB()
+void ModuleSelectionManager::updateUpPB()
{
int const srows = selectedModel->rowCount();
if (srows == 0) {
upPB->setEnabled(find(reqs.begin(), reqs.end(), preModName) == reqs.end());
}
-void ModuleSelMan::updateDelPB()
+void ModuleSelectionManager::updateDelPB()
{
int const srows = selectedModel->rowCount();
if (srows == 0) {
//
/////////////////////////////////////////////////////////////////////
-PreambleModule::PreambleModule(): current_id_(0)
+PreambleModule::PreambleModule() : current_id_(0)
{
// This is not a memory leak. The object will be destroyed
// with this.
Coords::const_iterator it = preamble_coords_.find(current_id_);
if (it == preamble_coords_.end())
// First time we open this one.
- preamble_coords_[current_id_] = make_pair(0,0);
+ preamble_coords_[current_id_] = make_pair(0, 0);
else {
// Restore saved coords.
QTextCursor cur = preambleTE->textCursor();
GuiDocument::GuiDocument(GuiView & lv)
- : GuiDialog(lv, "document", qt_("Document Settings")), current_id_(0)
+ : GuiDialog(lv, "document", qt_("Document Settings"))
{
setupUi(this);
connect(textLayoutModule->bypassCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
connect(textLayoutModule->bypassCB, SIGNAL(clicked()),
- this, SLOT(set_listings_msg()));
+ this, SLOT(setListingsMessage()));
connect(textLayoutModule->listingsED, SIGNAL(textChanged()),
- this, SLOT(set_listings_msg()));
+ this, SLOT(setListingsMessage()));
textLayoutModule->listingsTB->setPlainText(
qt_("Input listings parameters on the right. Enter ? for a list of parameters."));
textLayoutModule->lspacingLE->setValidator(new QDoubleValidator(
this, SLOT(change_adaptor()));
connect(fontModule->fontsizeCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
+ connect(fontModule->cjkFontLE, SIGNAL(textChanged(const QString &)),
+ this, SLOT(change_adaptor()));
connect(fontModule->scaleSansSB, SIGNAL(valueChanged(int)),
this, SLOT(change_adaptor()));
connect(fontModule->scaleTypewriterSB, SIGNAL(valueChanged(int)),
this, SLOT(setCustomMargins(bool)));
connect(marginsModule->marginCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
- connect(marginsModule->topLE, SIGNAL(textChanged(const QString &)),
+ connect(marginsModule->topLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
connect(marginsModule->topUnit, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
- connect(marginsModule->bottomLE, SIGNAL(textChanged(const QString &)),
+ connect(marginsModule->bottomLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
connect(marginsModule->bottomUnit, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
- connect(marginsModule->innerLE, SIGNAL(textChanged(const QString &)),
+ connect(marginsModule->innerLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
connect(marginsModule->innerUnit, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
- connect(marginsModule->outerLE, SIGNAL(textChanged(const QString &)),
+ connect(marginsModule->outerLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
connect(marginsModule->outerUnit, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
- connect(marginsModule->headheightLE, SIGNAL(textChanged(const QString &)),
+ connect(marginsModule->headheightLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
connect(marginsModule->headheightUnit, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
- connect(marginsModule->headsepLE, SIGNAL(textChanged(const QString &)),
+ connect(marginsModule->headsepLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
connect(marginsModule->headsepUnit, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
- connect(marginsModule->footskipLE, SIGNAL(textChanged(const QString&)),
+ connect(marginsModule->footskipLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
connect(marginsModule->footskipUnit, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
- connect(marginsModule->columnsepLE, SIGNAL(textChanged(const QString&)),
+ connect(marginsModule->columnsepLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
connect(marginsModule->columnsepUnit, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
connect(langModule->quoteStyleCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
// language & quotes
- langModule->languageCO->setModel(guiApp->languageModel());
+ QAbstractItemModel * language_model = guiApp->languageModel();
+ // FIXME: it would be nice if sorting was enabled/disabled via a checkbox.
+ language_model->sort(0);
+ langModule->languageCO->setModel(language_model);
// Always put the default encoding in the first position.
- // It is special because the displayed text is translated.
- langModule->encodingCO->addItem(qt_("LaTeX default"));
+ langModule->encodingCO->addItem(qt_("Language Default (no inputenc)"));
+ QStringList encodinglist;
Encodings::const_iterator it = encodings.begin();
Encodings::const_iterator const end = encodings.end();
for (; it != end; ++it)
- langModule->encodingCO->addItem(toqstr(it->latexName()));
+ encodinglist.append(qt_(it->guiName()));
+ encodinglist.sort();
+ langModule->encodingCO->addItems(encodinglist);
langModule->quoteStyleCO->addItem(qt_("``text''"));
langModule->quoteStyleCO->addItem(qt_("''text''"));
latexModule = new UiWidget<Ui::LaTeXUi>;
// latex class
- connect(latexModule->optionsLE, SIGNAL(textChanged(const QString &)),
+ connect(latexModule->optionsLE, SIGNAL(textChanged(QString)),
+ this, SLOT(change_adaptor()));
+ connect(latexModule->defaultOptionsCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
connect(latexModule->psdriverCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
this, SLOT(change_adaptor()));
connect(latexModule->layoutPB, SIGNAL(clicked()),
this, SLOT(browseLayout()));
+ connect(latexModule->layoutPB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
connect(latexModule->childDocGB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
- connect(latexModule->childDocLE, SIGNAL(textChanged(const QString &)),
+ connect(latexModule->childDocLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
connect(latexModule->childDocPB, SIGNAL(clicked()),
this, SLOT(browseMaster()));
- selectionManager =
- new ModuleSelMan(latexModule->availableLV, latexModule->selectedLV,
+ selectionManager =
+ new ModuleSelectionManager(latexModule->availableLV,
+ latexModule->selectedLV,
latexModule->addPB, latexModule->deletePB,
latexModule->upPB, latexModule->downPB,
availableModel(), selectedModel());
connect(pdfSupportModule->use_hyperrefGB, SIGNAL(toggled(bool)),
this, SLOT(change_adaptor()));
- connect(pdfSupportModule->titleLE, SIGNAL(textChanged(const QString &)),
+ connect(pdfSupportModule->titleLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
- connect(pdfSupportModule->authorLE, SIGNAL(textChanged(const QString &)),
+ connect(pdfSupportModule->authorLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
- connect(pdfSupportModule->subjectLE, SIGNAL(textChanged(const QString &)),
+ connect(pdfSupportModule->subjectLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
- connect(pdfSupportModule->keywordsLE, SIGNAL(textChanged(const QString &)),
+ connect(pdfSupportModule->keywordsLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
connect(pdfSupportModule->bookmarksGB, SIGNAL(toggled(bool)),
this, SLOT(change_adaptor()));
this, SLOT(change_adaptor()));
connect(pdfSupportModule->fullscreenCB, SIGNAL(toggled(bool)),
this, SLOT(change_adaptor()));
- connect(pdfSupportModule->optionsLE, SIGNAL(textChanged(const QString &)),
+ connect(pdfSupportModule->optionsLE, SIGNAL(textChanged(QString)),
this, SLOT(change_adaptor()));
// float
}
-docstring GuiDocument::validate_listings_params()
+QString GuiDocument::validateListingsParameters()
{
// use a cache here to avoid repeated validation
// of the same parameters
- static string param_cache = string();
- static docstring msg_cache = docstring();
+ static string param_cache;
+ static QString msg_cache;
if (textLayoutModule->bypassCB->isChecked())
- return docstring();
+ return QString();
string params = fromqstr(textLayoutModule->listingsED->toPlainText());
if (params != param_cache) {
param_cache = params;
- msg_cache = InsetListingsParams(params).validate();
+ msg_cache = toqstr(InsetListingsParams(params).validate());
}
return msg_cache;
}
-void GuiDocument::set_listings_msg()
+void GuiDocument::setListingsMessage()
{
static bool isOK = true;
- docstring msg = validate_listings_params();
- if (msg.empty()) {
+ QString msg = validateListingsParameters();
+ if (msg.isEmpty()) {
if (isOK)
return;
isOK = true;
// listingsTB->setTextColor("black");
textLayoutModule->listingsTB->setPlainText(
- qt_("Input listings parameters on the right. Enter ? for a list of parameters."));
+ qt_("Input listings parameters on the right. "
+ "Enter ? for a list of parameters."));
} else {
isOK = false;
// listingsTB->setTextColor("red");
- textLayoutModule->listingsTB->setPlainText(toqstr(msg));
+ textLayoutModule->listingsTB->setPlainText(msg);
}
}
pageLayoutModule->pagestyleCO->clear();
pageLayoutModule->pagestyleCO->addItem(qt_("Default"));
- for (int n = 0; !token(items,'|',n).empty(); ++n) {
+ for (int n = 0; !token(items, '|', n).empty(); ++n) {
string style = token(items, '|', n);
- docstring style_gui = _(style);
- pagestyles.push_back(pair<string, docstring>(style, style_gui));
- pageLayoutModule->pagestyleCO->addItem(toqstr(style_gui));
+ QString style_gui = qt_(style);
+ pagestyles.push_back(pair<string, QString>(style, style_gui));
+ pageLayoutModule->pagestyleCO->addItem(style_gui);
}
if (sel == "default") {
for (size_t i = 0; i < pagestyles.size(); ++i)
if (pagestyles[i].first == sel)
- nn = pageLayoutModule->pagestyleCO->findText(
- toqstr(pagestyles[i].second));
+ nn = pageLayoutModule->pagestyleCO->findText(pagestyles[i].second);
if (nn > 0)
pageLayoutModule->pagestyleCO->setCurrentIndex(nn);
FileName layoutFile = support::makeAbsPath(fromqstr(file),
fromqstr(bufferFilepath()));
+ int const ret = Alert::prompt(_("Local layout file"),
+ _("The layout file you have selected is a local layout\n"
+ "file, not one in the system or user directory. Your\n"
+ "document may not work with this layout if you do not\n"
+ "keep the layout file in the document directory."),
+ 1, 1, _("&Set Layout"), _("&Cancel"));
+ if (ret == 1)
+ return;
+
// load the layout file
LayoutFileList & bcl = LayoutFileList::get();
string classname = layoutFile.onlyFileName();
- LayoutFileIndex name = bcl.addLayoutFile(
+ // this will update an existing layout if that layout has been loaded before.
+ LayoutFileIndex name = bcl.addLocalLayout(
classname.substr(0, classname.size() - 7),
- layoutFile.onlyPath().absFilename(),
- LayoutFileList::Local);
+ layoutFile.onlyPath().absFilename());
if (name.empty()) {
Alert::error(_("Error"),
latexModule->classCO->setCurrentIndex(0);
} else
latexModule->classCO->setCurrentIndex(idx);
+
classChanged();
}
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
applyView();
}
bp_.useClassDefaults();
- forceUpdate();
}
+ // FIXME There's a little bug here connected with auto_reset, namely,
+ // that, if the preceding is skipped and the user has changed the
+ // modules before changing the class, those changes will be lost on
+ // update. But maybe that's what we want?
+ updateSelectedModules();
+ bp_.makeDocumentClass();
+ paramsToDialog(bp_);
}
docstring formatStrVec(vector<string> const & v, docstring const & s)
{
//this mess formats the list as "v[0], v[1], ..., [s] v[n]"
- int const vSize = v.size();
if (v.size() == 0)
return docstring();
- else if (v.size() == 1)
+ if (v.size() == 1)
return from_ascii(v[0]);
- else if (v.size() == 2) {
+ if (v.size() == 2) {
docstring retval = _("%1$s and %2$s");
retval = subst(retval, _("and"), s);
return bformat(retval, from_ascii(v[0]), from_ascii(v[1]));
}
- //The idea here is to format all but the last two items...
+ // 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_ascii(v[0]);
for (int i = 1; i < vSize - 2; ++i)
int i = langModule->encodingCO->currentIndex();
if (i == 0)
params.inputenc = "default";
- else
- params.inputenc =
- fromqstr(langModule->encodingCO->currentText());
+ else {
+ QString const enc_gui =
+ langModule->encodingCO->currentText();
+ Encodings::const_iterator it = encodings.begin();
+ Encodings::const_iterator const end = encodings.end();
+ bool found = false;
+ for (; it != end; ++it) {
+ if (qt_(it->guiName()) == enc_gui) {
+ params.inputenc = it->latexName();
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ // should not happen
+ lyxerr << "GuiDocument::apply: Unknown encoding! Resetting to default" << endl;
+ params.inputenc = "default";
+ }
+ }
}
InsetQuotes::QuoteLanguage lga = InsetQuotes::EnglishQuotes;
}
// bullets
- params.user_defined_bullet(0) = bulletsModule->getBullet(0);
- params.user_defined_bullet(1) = bulletsModule->getBullet(1);
- params.user_defined_bullet(2) = bulletsModule->getBullet(2);
- params.user_defined_bullet(3) = bulletsModule->getBullet(3);
+ params.user_defined_bullet(0) = bulletsModule->bullet(0);
+ params.user_defined_bullet(1) = bulletsModule->bullet(1);
+ params.user_defined_bullet(2) = bulletsModule->bullet(2);
+ params.user_defined_bullet(3) = bulletsModule->bullet(3);
// packages
params.graphicsDriver =
vector<string> selModList;
for (int i = 0; i < srows; ++i)
params.addLayoutModule(modules_sel_model_.getIDString(i));
+ // update the list of removed modules
+ params.clearRemovedModules();
+ list<string> const & reqmods = params.baseClass()->defaultModules();
+ list<string>::const_iterator rit = reqmods.begin();
+ list<string>::const_iterator ren = reqmods.end();
+ // check each of the required modules
+ for (; rit != ren; rit++) {
+ vector<string>::const_iterator mit = params.getModules().begin();
+ vector<string>::const_iterator men = params.getModules().end();
+ bool found = false;
+ for (; mit != men; mit++) {
+ if (*rit == *mit) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ // the module isn't present so must have been removed by the user
+ params.addRemovedModule(*rit);
+ }
+ }
if (mathsModule->amsautoCB->isChecked()) {
params.use_amsmath = BufferParams::package_auto;
if (pageLayoutModule->pagestyleCO->currentIndex() == 0)
params.pagestyle = "default";
else {
- docstring style_gui =
- qstring_to_ucs4(pageLayoutModule->pagestyleCO->currentText());
- for (size_t i = 0; i < pagestyles.size(); ++i)
+ QString style_gui = pageLayoutModule->pagestyleCO->currentText();
+ for (size_t i = 0; i != pagestyles.size(); ++i)
if (pagestyles[i].second == style_gui)
params.pagestyle = pagestyles[i].first;
}
params.options =
fromqstr(latexModule->optionsLE->text());
+ params.use_default_options =
+ latexModule->defaultOptionsCB->isChecked();
+
if (latexModule->childDocGB->isChecked())
params.master =
fromqstr(latexModule->childDocLE->text());
params.fontsTypewriter =
tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()];
+ params.fontsCJK =
+ fromqstr(fontModule->cjkFontLE->text());
+
params.fontsSansScale = fontModule->scaleSansSB->value();
params.fontsTypewriterScale = fontModule->scaleTypewriterSB->value();
}
-void GuiDocument::updateParams()
-{
- updateParams(bp_);
-}
-
-
-void GuiDocument::updateParams(BufferParams const & params)
+void GuiDocument::paramsToDialog(BufferParams const & params)
{
// set the default unit
Length::UNIT defaultUnit = Length::CM;
if (params.inputenc == "default") {
langModule->encodingCO->setCurrentIndex(0);
} else {
+ string enc_gui;
+ Encodings::const_iterator it = encodings.begin();
+ Encodings::const_iterator const end = encodings.end();
+ for (; it != end; ++it) {
+ if (it->latexName() == params.inputenc) {
+ enc_gui = it->guiName();
+ break;
+ }
+ }
int const i = langModule->encodingCO->findText(
- toqstr(params.inputenc));
+ qt_(enc_gui));
if (i >= 0)
langModule->encodingCO->setCurrentIndex(i);
else
latexModule->optionsLE->setText(QString());
}
+ latexModule->defaultOptionsCB->setChecked(
+ params.use_default_options);
+
+ if (!documentClass().options().empty()) {
+ latexModule->defaultOptionsLE->setText(
+ toqstr(documentClass().options()));
+ } else {
+ latexModule->defaultOptionsLE->setText(
+ toqstr(_("[No options predefined]")));
+ }
+
+ latexModule->defaultOptionsLE->setEnabled(
+ params.use_default_options
+ && !documentClass().options().empty());
+
+ latexModule->defaultOptionsCB->setEnabled(
+ !documentClass().options().empty());
+
if (!params.master.empty()) {
latexModule->childDocGB->setChecked(true);
latexModule->childDocLE->setText(
ttChanged(n);
}
+ if (!params.fontsCJK.empty())
+ fontModule->cjkFontLE->setText(
+ toqstr(params.fontsCJK));
+ else
+ fontModule->cjkFontLE->setText(QString());
+
fontModule->fontScCB->setChecked(params.fontsSC);
fontModule->fontOsfCB->setChecked(params.fontsOSF);
fontModule->scaleSansSB->setValue(params.fontsSansScale);
void GuiDocument::updateContents()
{
- if (id() == current_id_)
- return;
-
- updateAvailableModules();
- updateSelectedModules();
-
- //FIXME It'd be nice to make sure here that the selected
- //modules are consistent: That required modules are actually
- //selected, and that we don't have conflicts. If so, we could
- //at least pop up a warning.
- updateParams(bp_);
- current_id_ = id();
-}
-
-
-void GuiDocument::forceUpdate()
-{
- // reset to force dialog update
- current_id_ = 0;
- updateContents();
+ // Nothing to do here as the document settings is not cursor dependant.
+ return;
}
return;
}
bp_.useClassDefaults();
- forceUpdate();
+ paramsToDialog(bp_);
}
bool GuiDocument::isValid()
{
- return validate_listings_params().empty()
+ return validateListingsParameters().isEmpty()
&& (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;
+ BufferView const * view = bufferview();
+ if (!view) {
+ bp_ = BufferParams();
+ paramsToDialog(bp_);
+ return true;
+ }
+ bp_ = view->buffer().params();
loadModuleInfo();
+ updateAvailableModules();
+ updateSelectedModules();
+ //FIXME It'd be nice to make sure here that the selected
+ //modules are consistent: That required modules are actually
+ //selected, and that we don't have conflicts. If so, we could
+ //at least pop up a warning.
+ paramsToDialog(bp_);
return true;
}
BufferId GuiDocument::id() const
{
- return &buffer();
+ BufferView const * const view = bufferview();
+ return view? &view->buffer() : 0;
}
support::onlyPath(buffer().absFileName()));
if (isLyXFilename(master_file.absFilename())) {
Buffer * master = checkAndLoadLyXFile(master_file);
- buffer().setParent(master);
+ const_cast<Buffer &>(buffer()).setParent(master);
}
}
BranchList::const_iterator it = branchlist.begin();
BranchList::const_iterator const end = branchlist.end();
for (; it != end; ++it) {
- docstring const & current_branch = it->getBranch();
+ docstring const & current_branch = it->branch();
Branch const * branch = branchlist.find(current_branch);
- string const x11hexname = X11hexname(branch->getColor());
+ string const x11hexname = X11hexname(branch->color());
// display the new color
docstring const str = current_branch + ' ' + from_ascii(x11hexname);
dispatch(FuncRequest(LFUN_SET_COLOR, str));
"assign branch"));
}
// FIXME: If we used an LFUN, we would not need those two lines:
- bufferview()->processUpdateFlags(Update::Force | Update::FitCursor);
+ BufferView * bv = const_cast<BufferView *>(bufferview());
+ bv->processUpdateFlags(Update::Force | Update::FitCursor);
}
projects / lyx.git / blobdiff