#include "GuiInclude.h"
#include "Buffer.h"
-#include "Format.h"
+#include "BufferParams.h"
#include "FuncRequest.h"
#include "LyXRC.h"
#include "insets/InsetListingsParams.h"
#include "insets/InsetInclude.h"
-#include <QPushButton>
#include <QCheckBox>
#include <QLineEdit>
+#include <QPushButton>
#include <utility>
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);
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()) {
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);
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") {
} 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);
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<string> pars = getVectorFromString(par.separatedParams(), "\n");
for (vector<string>::iterator it = pars.begin();
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] == '}') {
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();
}
} 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());
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");
}
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));
}
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));
}
} // namespace frontend
} // namespace lyx
-#include "GuiInclude_moc.cpp"
+#include "moc_GuiInclude.cpp"
projects / lyx.git / blobdiff