X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDocument.cpp;h=dcc118de19c589df76857ec6bb5f3a99916f1672;hb=d45ca67d1d3e2d4fdc344cd2a1517725bc91723a;hp=bfedf55bf066530255519b8ccc5d17bf3d372c3e;hpb=a65738065959c266cd07df02994478b4fa10f6f1;p=lyx.git diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index bfedf55bf0..dcc118de19 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -13,6 +13,14 @@ #include "GuiDocument.h" +#include "GuiApplication.h" +#include "GuiBranches.h" +#include "GuiSelectionManager.h" +#include "LaTeXHighlighter.h" +#include "LengthCombo.h" +#include "PanelStack.h" +#include "Validator.h" + #include "LayoutFile.h" #include "BranchList.h" #include "buffer_funcs.h" @@ -23,31 +31,27 @@ #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 #include #include #include @@ -67,15 +71,21 @@ namespace { 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"), "" }; @@ -124,7 +134,7 @@ char const * tex_fonts_monospaced_gui[] = }; -vector > pagestyles; +vector > pagestyles; } // anonymous namespace @@ -137,7 +147,7 @@ class less_textclass_avail_desc : public binary_function { 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 @@ -153,82 +163,101 @@ public: } namespace frontend { +namespace { + +vector getRequiredList(string const & modName) +{ + LyXModule const * const mod = moduleList[modName]; + if (!mod) + return vector(); //empty such thing + return mod->getRequiredModules(); +} -/// -QModelIndex getSelectedIndex(QListView * lv) +vector 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(); //empty such thing + return mod->getExcludedModules(); } -namespace { - vector getRequiredList(string const & modName) - { - LyXModule const * const mod = moduleList[modName]; - if (!mod) - return vector(); //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 getExcludedList(string const & modName) - { - LyXModule const * const mod = moduleList[modName]; - if (!mod) - return vector(); //empty such thing - return mod->getExcludedModules(); - } +vector getPackageList(string const & modName) +{ + LyXModule const * const mod = moduleList[modName]; + if (!mod) + return vector(); //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 getPackageList(string const & modName) - { - LyXModule const * const mod = moduleList[modName]; - if (!mod) - return vector(); //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(availableModel); + } + /// returns selectedModel as a GuiIdListModel + GuiIdListModel * getSelectedModel() + { + return dynamic_cast(selectedModel); + } +}; + +void ModuleSelectionManager::updateAddPB() { int const arows = availableModel->rowCount(); QModelIndexList const availSels = @@ -289,7 +318,7 @@ void ModuleSelMan::updateAddPB() } -void ModuleSelMan::updateDownPB() +void ModuleSelectionManager::updateDownPB() { int const srows = selectedModel->rowCount(); if (srows == 0) { @@ -328,7 +357,7 @@ void ModuleSelMan::updateDownPB() find(reqs.begin(), reqs.end(), curModName) == reqs.end()); } -void ModuleSelMan::updateUpPB() +void ModuleSelectionManager::updateUpPB() { int const srows = selectedModel->rowCount(); if (srows == 0) { @@ -367,7 +396,7 @@ void ModuleSelMan::updateUpPB() upPB->setEnabled(find(reqs.begin(), reqs.end(), preModName) == reqs.end()); } -void ModuleSelMan::updateDelPB() +void ModuleSelectionManager::updateDelPB() { int const srows = selectedModel->rowCount(); if (srows == 0) { @@ -442,7 +471,7 @@ void ModuleSelMan::updateDelPB() // ///////////////////////////////////////////////////////////////////// -PreambleModule::PreambleModule(): current_id_(0) +PreambleModule::PreambleModule() : current_id_(0) { // This is not a memory leak. The object will be destroyed // with this. @@ -471,7 +500,7 @@ void PreambleModule::update(BufferParams const & params, BufferId id) 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(); @@ -506,14 +535,10 @@ void PreambleModule::closeEvent(QCloseEvent * e) GuiDocument::GuiDocument(GuiView & lv) - : GuiDialog(lv, "document", qt_("Document Settings")), current_id_(0) + : GuiDialog(lv, "document", qt_("Document Settings")) { setupUi(this); - QList langs = languageData(false); - for (int i = 0; i != langs.size(); ++i) - lang_.append(langs[i].second); - connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply())); connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose())); @@ -560,9 +585,9 @@ GuiDocument::GuiDocument(GuiView & lv) 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( @@ -606,6 +631,8 @@ GuiDocument::GuiDocument(GuiView & lv) 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)), @@ -709,35 +736,35 @@ GuiDocument::GuiDocument(GuiView & lv) 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())); @@ -789,19 +816,20 @@ GuiDocument::GuiDocument(GuiView & lv) connect(langModule->quoteStyleCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); // language & quotes - - QList::const_iterator lit = langs.begin(); - QList::const_iterator lend = langs.end(); - for (; lit != lend; ++lit) - langModule->languageCO->addItem(lit->first); + 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''")); @@ -866,7 +894,9 @@ GuiDocument::GuiDocument(GuiView & lv) latexModule = new UiWidget; // 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())); @@ -876,9 +906,18 @@ GuiDocument::GuiDocument(GuiView & lv) 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(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()); @@ -928,13 +967,13 @@ GuiDocument::GuiDocument(GuiView & lv) 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())); @@ -958,7 +997,7 @@ GuiDocument::GuiDocument(GuiView & lv) 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 @@ -1013,40 +1052,41 @@ void GuiDocument::change_adaptor() } -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); } } @@ -1194,11 +1234,11 @@ void GuiDocument::updatePagestyle(string const & items, string const & sel) 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(style, style_gui)); - pageLayoutModule->pagestyleCO->addItem(toqstr(style_gui)); + QString style_gui = qt_(style); + pagestyles.push_back(pair(style, style_gui)); + pageLayoutModule->pagestyleCO->addItem(style_gui); } if (sel == "default") { @@ -1210,8 +1250,7 @@ void GuiDocument::updatePagestyle(string const & items, string const & sel) 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); @@ -1230,16 +1269,25 @@ void GuiDocument::browseLayout() if (!file.endsWith(".layout")) return; - FileName layoutFile = makeAbsPath(fromqstr(file), + 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"), @@ -1258,30 +1306,32 @@ void GuiDocument::browseLayout() 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() { 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 @@ -1300,8 +1350,14 @@ void GuiDocument::classChanged() 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_); } @@ -1311,17 +1367,17 @@ namespace { docstring formatStrVec(vector 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) @@ -1462,9 +1518,25 @@ void GuiDocument::apply(BufferParams & params) 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; @@ -1490,8 +1562,9 @@ void GuiDocument::apply(BufferParams & params) } params.quotes_language = lga; - int const pos = langModule->languageCO->currentIndex(); - params.language = lyx::languages.getLanguage(fromqstr(lang_[pos])); + QString const lang = langModule->languageCO->itemData( + langModule->languageCO->currentIndex()).toString(); + params.language = lyx::languages.getLanguage(fromqstr(lang)); // numbering if (params.documentClass().hasTocLevels()) { @@ -1500,10 +1573,10 @@ void GuiDocument::apply(BufferParams & params) } // 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 = @@ -1522,6 +1595,27 @@ void GuiDocument::apply(BufferParams & params) vector selModList; for (int i = 0; i < srows; ++i) params.addLayoutModule(modules_sel_model_.getIDString(i)); + // update the list of removed modules + params.clearRemovedModules(); + list const & reqmods = params.baseClass()->defaultModules(); + list::const_iterator rit = reqmods.begin(); + list::const_iterator ren = reqmods.end(); + // check each of the required modules + for (; rit != ren; rit++) { + vector::const_iterator mit = params.getModules().begin(); + vector::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; @@ -1544,9 +1638,8 @@ void GuiDocument::apply(BufferParams & params) 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; } @@ -1610,6 +1703,15 @@ void GuiDocument::apply(BufferParams & params) params.options = fromqstr(latexModule->optionsLE->text()); + params.use_default_options = + latexModule->defaultOptionsCB->isChecked(); + + if (latexModule->childDocGB->isChecked()) + params.master = + fromqstr(latexModule->childDocLE->text()); + else + params.master = string(); + params.float_placement = floatModule->get(); // fonts @@ -1622,6 +1724,9 @@ void GuiDocument::apply(BufferParams & params) params.fontsTypewriter = tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()]; + params.fontsCJK = + fromqstr(fontModule->cjkFontLE->text()); + params.fontsSansScale = fontModule->scaleSansSB->value(); params.fontsTypewriterScale = fontModule->scaleTypewriterSB->value(); @@ -1708,22 +1813,7 @@ void GuiDocument::apply(BufferParams & params) } -static int findPos(QStringList const & vec, QString const & val) -{ - for (int i = 0; i != vec.size(); ++i) - if (vec[i] == val) - return i; - return 0; -} - - -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; @@ -1769,7 +1859,8 @@ void GuiDocument::updateParams(BufferParams const & params) params.use_bibtopic); // language & quotes - int const pos = findPos(lang_, toqstr(params.language->lang())); + int const pos = langModule->languageCO->findData(toqstr( + params.language->lang())); langModule->languageCO->setCurrentIndex(pos); langModule->quoteStyleCO->setCurrentIndex( @@ -1781,8 +1872,17 @@ void GuiDocument::updateParams(BufferParams const & params) 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 @@ -1901,6 +2001,33 @@ void GuiDocument::updateParams(BufferParams const & params) 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( + toqstr(params.master)); + } else { + latexModule->childDocLE->setText(QString()); + latexModule->childDocGB->setChecked(false); + } + floatModule->set(params.float_placement); // Fonts @@ -1925,6 +2052,12 @@ void GuiDocument::updateParams(BufferParams const & params) 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); @@ -2055,26 +2188,8 @@ void GuiDocument::updateSelectedModules() 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; } @@ -2096,7 +2211,7 @@ void GuiDocument::useClassDefaults() return; } bp_.useClassDefaults(); - forceUpdate(); + paramsToDialog(bp_); } @@ -2113,7 +2228,7 @@ void GuiDocument::setLayoutComboByIDString(std::string const & idString) bool GuiDocument::isValid() { - return validate_listings_params().empty() + return validateListingsParameters().isEmpty() && (textLayoutModule->skipCO->currentIndex() != 3 || !textLayoutModule->skipLE->text().isEmpty()); } @@ -2131,8 +2246,21 @@ char const * GuiDocument::fontfamilies_gui[5] = { bool GuiDocument::initialiseParams(string const &) { - bp_ = buffer().params(); + 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; } @@ -2145,7 +2273,8 @@ void GuiDocument::clearParams() BufferId GuiDocument::id() const { - return &buffer(); + BufferView const * const view = bufferview(); + return view? &view->buffer() : 0; } @@ -2201,15 +2330,24 @@ void GuiDocument::dispatchParams() // 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); + const_cast(buffer()).setParent(master); + } + } + // Generate the colours requested by each new branch. BranchList & branchlist = params().branchlist(); if (!branchlist.empty()) { 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)); @@ -2220,7 +2358,8 @@ void GuiDocument::dispatchParams() "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()); + bv->processUpdateFlags(Update::Force | Update::FitCursor); }