#include "GuiInclude.h"
#include "Buffer.h"
-#include "Format.h"
#include "FuncRequest.h"
#include "LyXRC.h"
connect(captionLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(labelLE, SIGNAL(textChanged(const QString&)), 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;
+ return InsetListingsParams(params).validate();
}
-void GuiInclude::set_listings_msg()
+void GuiInclude::setListingsMsg()
{
+ // FIXME THREAD
static bool isOK = true;
docstring msg = validate_listings_params();
if (msg.empty()) {
}
-void GuiInclude::updateContents()
+void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
{
filenameED->setText(toqstr(params_["filename"]));
string extra = getStringFromVector(pars);
listingsED->setPlainText(toqstr(InsetListingsParams(extra).separatedParams()));
}
+
+ // Make sure that the bc is in the INITIAL state
+ if (bc().policy().buttonStatus(ButtonPolicy::OKAY))
+ bc().restore();
}
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*");
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,
+ return browseRelToParent(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");
-}
-
-
bool GuiInclude::initialiseParams(std::string const & data)
{
- InsetCommand::string2params("include", data, params_);
+ InsetCommand::string2params(data, 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"