* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
+ * \author Alejandro Aguilar Sierra
* \author John Levon
+ * \author Angus Leeming
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "GuiInclude.h"
-#include "ControlInclude.h"
-#include "support/os.h"
-#include "support/lstrings.h"
+#include "Buffer.h"
+#include "BufferParams.h"
+#include "FuncRequest.h"
+#include "LyXRC.h"
#include "qt_helpers.h"
#include "LyXRC.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
+#include "support/os.h"
+#include "support/FileName.h"
+#include "support/filetools.h"
+
#include "insets/InsetListingsParams.h"
+#include "insets/InsetInclude.h"
-#include <QPushButton>
#include <QCheckBox>
-#include <QCloseEvent>
#include <QLineEdit>
+#include <QPushButton>
-using std::string;
-using std::vector;
-
-using lyx::support::os::internal_path;
-using lyx::support::prefixIs;
-using lyx::support::getStringFromVector;
-using lyx::support::getVectorFromString;
+#include <utility>
+using namespace std;
+using namespace lyx::support;
+using namespace lyx::support::os;
namespace lyx {
namespace frontend {
-GuiIncludeDialog::GuiIncludeDialog(LyXView & lv)
- : GuiDialog(lv, "include")
+
+GuiInclude::GuiInclude(GuiView & lv)
+ : GuiDialog(lv, "include", qt_("Child Document")),
+ params_(insetCode("include"))
{
setupUi(this);
- setViewTitle(_("Child Document"));
- setController(new ControlInclude(*this));
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
connect(visiblespaceCB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
connect(filenameED, SIGNAL(textChanged(const QString &)),
this, SLOT(change_adaptor()));
- connect(editPB, SIGNAL(clicked()), this, SLOT(editClicked()));
- connect(browsePB, SIGNAL(clicked()), this, SLOT(browseClicked()));
+ connect(editPB, SIGNAL(clicked()), this, SLOT(edit()));
+ connect(browsePB, SIGNAL(clicked()), this, SLOT(browse()));
connect(typeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
connect(typeCO, SIGNAL(activated(int)), this, SLOT(typeChanged(int)));
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);
}
-ControlInclude & GuiIncludeDialog::controller()
-{
- return static_cast<ControlInclude &>(GuiDialog::controller());
-}
-
-
-void GuiIncludeDialog::change_adaptor()
+void GuiInclude::change_adaptor()
{
changed();
}
-docstring GuiIncludeDialog::validate_listings_params()
+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 GuiIncludeDialog::set_listings_msg()
+void GuiInclude::setListingsMsg()
{
+ // FIXME THREAD
static bool isOK = true;
docstring msg = validate_listings_params();
if (msg.empty()) {
}
-void GuiIncludeDialog::closeEvent(QCloseEvent * e)
-{
- slotClose();
- e->accept();
-}
-
-
-void GuiIncludeDialog::typeChanged(int v)
+void GuiInclude::typeChanged(int v)
{
switch (v) {
//case Include
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 GuiIncludeDialog::editClicked()
-{
- edit();
-}
-
-
-void GuiIncludeDialog::browseClicked()
-{
- browse();
-}
-
-
-void GuiIncludeDialog::updateContents()
+void GuiInclude::paramsToDialog(InsetCommandParams const & icp)
{
- InsetCommandParams const & params = controller().params();
-
- 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 = controller().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(params.getOptions());
+ 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();
it != pars.end(); ++it) {
if (prefixIs(*it, "caption=")) {
string cap = it->substr(8);
- if (cap[0] == '{' && cap[cap.size()-1] == '}') {
- captionLE->setText(toqstr(cap.substr(1, cap.size()-2)));
+ 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] == '}') {
- labelLE->setText(toqstr(lbl.substr(1, lbl.size()-2)));
+ labelLE->setText(toqstr(lbl.substr(1, lbl.size() - 2)));
*it = "";
}
}
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();
}
-void GuiIncludeDialog::applyView()
+void GuiInclude::applyView()
{
- InsetCommandParams params = controller().params();
-
- params["filename"] = from_utf8(internal_path(fromqstr(filenameED->text())));
- params.preview(previewCB->isChecked());
+ params_["filename"] = from_utf8(internal_path(fromqstr(filenameED->text())));
+ params_.preview(previewCB->isChecked());
int const item = typeCO->currentIndex();
if (item == 0) {
- params.setCmdName("include");
+ params_.setCmdName("include");
} else if (item == 1) {
- params.setCmdName("input");
+ 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());
par.addParam("caption", "{" + caption + "}");
if (!label.empty())
par.addParam("label", "{" + label + "}");
- params.setOptions(par.params());
+ string const listparams = par.params();
+ params_["lstparams"] = from_utf8(listparams);
} else {
if (visiblespaceCB->isChecked())
- params.setCmdName("verbatiminput*");
+ params_.setCmdName("verbatiminput*");
else
- params.setCmdName("verbatiminput");
+ params_.setCmdName("verbatiminput");
}
- controller().setParams(params);
+ params_["literal"] = literalCB->isChecked()
+ ? from_ascii("true") : from_ascii("false");
}
-void GuiIncludeDialog::browse()
+void GuiInclude::browse()
{
- ControlInclude::Type type;
+ Type type;
int const item = typeCO->currentIndex();
if (item == 0)
- type = ControlInclude::INCLUDE;
+ type = INCLUDE;
else if (item == 1)
- type = ControlInclude::INPUT;
+ type = INPUT;
else if (item == 2)
- type = ControlInclude::VERBATIM;
+ type = VERBATIM;
else
- type = ControlInclude::LISTINGS;
+ type = LISTINGS;
- docstring const & name =
- controller().browse(qstring_to_ucs4(filenameED->text()), type);
- if (!name.empty())
- filenameED->setText(toqstr(name));
+ QString name = browse(filenameED->text(), type);
+ if (!name.isEmpty())
+ filenameED->setText(name);
}
-void GuiIncludeDialog::edit()
+void GuiInclude::edit()
{
- if (isValid()) {
- string const file = fromqstr(filenameED->text());
+ if (!isValid())
+ return;
+ if (bc().policy().buttonStatus(ButtonPolicy::OKAY)) {
slotOK();
- controller().edit(file);
+ applyView();
+ } else
+ hideView();
+ dispatch(FuncRequest(LFUN_INSET_EDIT));
+}
+
+
+bool GuiInclude::isValid()
+{
+ return !filenameED->text().isEmpty() && validate_listings_params().empty();
+}
+
+
+QString GuiInclude::browse(QString const & in_name, Type in_type) const
+{
+ QString const title = qt_("Select document to include");
+
+ // input TeX, verbatim, or LyX file ?
+ QStringList filters;
+ switch (in_type) {
+ case INCLUDE:
+ case INPUT:
+ filters = fileFilters(qt_("LaTeX/LyX Documents (*.tex *.lyx)"));
+ break;
+ case VERBATIM:
+ case LISTINGS:
+ filters = fileFilters(QString());
+ break;
}
+
+ QString const docpath = toqstr(support::onlyPath(buffer().absFileName()));
+
+ return browseRelToParent(in_name, docpath, title, filters, false,
+ qt_("D&ocuments"), toqstr(lyxrc.document_path));
+}
+
+
+bool GuiInclude::initialiseParams(std::string const & sdata)
+{
+ InsetCommand::string2params(sdata, params_);
+ paramsToDialog(params_);
+ return true;
}
-bool GuiIncludeDialog::isValid()
+void GuiInclude::dispatchParams()
{
- return !filenameED->text().isEmpty() &&
- validate_listings_params().empty();
+ std::string const lfun = InsetCommand::params2string(params_);
+ dispatch(FuncRequest(getLfun(), lfun));
}
+
+Dialog * createGuiInclude(GuiView & lv) { return new GuiInclude(lv); }
+
+
} // namespace frontend
} // namespace lyx
-#include "GuiInclude_moc.cpp"
+#include "moc_GuiInclude.cpp"
projects / lyx.git / blobdiff