X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffrontends%2Fqt4%2FGuiInclude.cpp;h=36fb9a07f7b2e55c8809d9a343ce467747a9459a;hb=c7496a11b2f0bd714b6c2ee0f7189ff420e014ce;hp=0dd8ac11e91a59e2a09e2a02495d0752c00170c7;hpb=b271b9f0f62a81998411dd3e00d673562211c1ad;p=lyx.git diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp index 0dd8ac11e9..36fb9a07f7 100644 --- a/src/frontends/qt4/GuiInclude.cpp +++ b/src/frontends/qt4/GuiInclude.cpp @@ -15,7 +15,7 @@ #include "GuiInclude.h" #include "Buffer.h" -#include "Format.h" +#include "BufferParams.h" #include "FuncRequest.h" #include "LyXRC.h" @@ -31,9 +31,9 @@ #include "insets/InsetListingsParams.h" #include "insets/InsetInclude.h" -#include #include #include +#include #include @@ -64,10 +64,11 @@ GuiInclude::GuiInclude(GuiView & lv) connect(previewCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(captionLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor())); connect(labelLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor())); + connect(literalCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(listingsED, SIGNAL(textChanged()), this, SLOT(change_adaptor())); - connect(listingsED, SIGNAL(textChanged()), this, SLOT(set_listings_msg())); + connect(listingsED, SIGNAL(textChanged()), this, SLOT(setListingsMsg())); connect(bypassCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); - connect(bypassCB, SIGNAL(clicked()), this, SLOT(set_listings_msg())); + connect(bypassCB, SIGNAL(clicked()), this, SLOT(setListingsMsg())); setFocusProxy(filenameED); @@ -92,25 +93,18 @@ void GuiInclude::change_adaptor() docstring GuiInclude::validate_listings_params() { - // use a cache here to avoid repeated validation - // of the same parameters - static string param_cache = string(); - static docstring msg_cache = docstring(); - if (typeCO->currentIndex() != 3 || bypassCB->isChecked()) return docstring(); - string params = fromqstr(listingsED->toPlainText()); - if (params != param_cache) { - param_cache = params; - msg_cache = InsetListingsParams(params).validate(); - } - return msg_cache; + InsetListingsParams lstparams(params); + lstparams.setMinted(buffer().params().use_minted); + return lstparams.validate(); } -void GuiInclude::set_listings_msg() +void GuiInclude::setListingsMsg() { + // FIXME THREAD static bool isOK = true; docstring msg = validate_listings_params(); if (msg.empty()) { @@ -160,16 +154,16 @@ void GuiInclude::typeChanged(int v) listingsGB->setEnabled(false); break; } - //see this thread + //see this thread // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg118471.html //for the reason this is here. okPB->setDefault(true); } -void GuiInclude::updateContents() +void GuiInclude::paramsToDialog(InsetCommandParams const & icp) { - filenameED->setText(toqstr(params_["filename"])); + filenameED->setText(toqstr(icp["filename"])); visiblespaceCB->setChecked(false); visiblespaceCB->setEnabled(false); @@ -182,11 +176,12 @@ void GuiInclude::updateContents() listingsTB->setPlainText( qt_("Input listing parameters on the right. Enter ? for a list of parameters.")); - string cmdname = params_.getCmdName(); + string cmdname = icp.getCmdName(); if (cmdname != "include" && cmdname != "verbatiminput" && cmdname != "verbatiminput*" && - cmdname != "lstinputlisting") + cmdname != "lstinputlisting" && + cmdname != "inputminted") cmdname = "input"; if (cmdname == "include") { @@ -195,7 +190,7 @@ void GuiInclude::updateContents() } else if (cmdname == "input") { typeCO->setCurrentIndex(1); previewCB->setEnabled(true); - previewCB->setChecked(params_.preview()); + previewCB->setChecked(icp.preview()); } else if (cmdname == "verbatiminput*") { typeCO->setCurrentIndex(2); @@ -206,11 +201,11 @@ void GuiInclude::updateContents() typeCO->setCurrentIndex(2); visiblespaceCB->setEnabled(true); - } else if (cmdname == "lstinputlisting") { + } else if (cmdname == "lstinputlisting" || cmdname == "inputminted") { typeCO->setCurrentIndex(3); listingsGB->setEnabled(true); listingsED->setEnabled(true); - InsetListingsParams par(to_utf8(params_["lstparams"])); + InsetListingsParams par(to_utf8(icp["lstparams"])); // extract caption and label and put them into their respective editboxes vector pars = getVectorFromString(par.separatedParams(), "\n"); for (vector::iterator it = pars.begin(); @@ -220,7 +215,7 @@ void GuiInclude::updateContents() if (cap[0] == '{' && cap[cap.size() - 1] == '}') { captionLE->setText(toqstr(cap.substr(1, cap.size() - 2))); *it = ""; - } + } } else if (prefixIs(*it, "label=")) { string lbl = it->substr(6); if (lbl[0] == '{' && lbl[lbl.size()-1] == '}') { @@ -233,6 +228,11 @@ void GuiInclude::updateContents() string extra = getStringFromVector(pars); listingsED->setPlainText(toqstr(InsetListingsParams(extra).separatedParams())); } + literalCB->setChecked(icp["literal"] == "true"); + + // Make sure that the bc is in the INITIAL state + if (bc().policy().buttonStatus(ButtonPolicy::OKAY)) + bc().restore(); } @@ -247,7 +247,10 @@ void GuiInclude::applyView() } else if (item == 1) { params_.setCmdName("input"); } else if (item == 3) { - params_.setCmdName("lstinputlisting"); + if (buffer().params().use_minted) + params_.setCmdName("inputminted"); + else + params_.setCmdName("lstinputlisting"); // the parameter string should have passed validation InsetListingsParams par(fromqstr(listingsED->toPlainText())); string caption = fromqstr(captionLE->text()); @@ -257,13 +260,15 @@ void GuiInclude::applyView() if (!label.empty()) par.addParam("label", "{" + label + "}"); string const listparams = par.params(); - params_["lstparams"] = from_ascii(listparams); + params_["lstparams"] = from_utf8(listparams); } else { if (visiblespaceCB->isChecked()) params_.setCmdName("verbatiminput*"); else params_.setCmdName("verbatiminput"); } + params_["literal"] = literalCB->isChecked() + ? from_ascii("true") : from_ascii("false"); } @@ -289,11 +294,14 @@ void GuiInclude::browse() void GuiInclude::edit() { - if (isValid()) { - string const file = fromqstr(filenameED->text()); + if (!isValid()) + return; + if (bc().policy().buttonStatus(ButtonPolicy::OKAY)) { slotOK(); - edit(file); - } + applyView(); + } else + hideView(); + dispatch(FuncRequest(LFUN_INSET_EDIT)); } @@ -316,39 +324,28 @@ QString GuiInclude::browse(QString const & in_name, Type in_type) const break; case VERBATIM: case LISTINGS: + filters = fileFilters(QString()); break; } QString const docpath = toqstr(support::onlyPath(buffer().absFileName())); - return browseRelFile(in_name, docpath, title, filters, false, - qt_("Documents|#o#O"), toqstr(lyxrc.document_path)); -} - - -void GuiInclude::edit(string const & file) -{ - string const ext = support::getExtension(file); - if (ext == "lyx") - dispatch(FuncRequest(LFUN_BUFFER_CHILD_OPEN, file)); - else - // tex file or other text file in verbatim mode - formats.edit(buffer(), - support::makeAbsPath(file, support::onlyPath(buffer().absFileName())), - "text"); + return browseRelToParent(in_name, docpath, title, filters, false, + qt_("D&ocuments"), toqstr(lyxrc.document_path)); } -bool GuiInclude::initialiseParams(std::string const & data) +bool GuiInclude::initialiseParams(std::string const & sdata) { - InsetCommand::string2params("include", data, params_); + InsetCommand::string2params(sdata, params_); + paramsToDialog(params_); return true; } void GuiInclude::dispatchParams() { - std::string const lfun = InsetCommand::params2string("include", params_); + std::string const lfun = InsetCommand::params2string(params_); dispatch(FuncRequest(getLfun(), lfun)); } @@ -359,4 +356,4 @@ Dialog * createGuiInclude(GuiView & lv) { return new GuiInclude(lv); } } // namespace frontend } // namespace lyx -#include "GuiInclude_moc.cpp" +#include "moc_GuiInclude.cpp"