X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiInclude.cpp;h=edbf7a19c42f96617fb991253ba3df1137368ce2;hb=b7f6b979d0f889f08e735f35378bb20ba3788b4b;hp=07a1fb8f9fbeaf959b1eb8fdcb5f7e8d90718ce5;hpb=3ddfec9ae0c56827deff42a63b3dfd701ce02539;p=lyx.git

diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp
index 07a1fb8f9f..edbf7a19c4 100644
--- a/src/frontends/qt4/GuiInclude.cpp
+++ b/src/frontends/qt4/GuiInclude.cpp
@@ -15,6 +15,7 @@
 #include "GuiInclude.h"
 
 #include "Buffer.h"
+#include "BufferParams.h"
 #include "FuncRequest.h"
 #include "LyXRC.h"
 
@@ -30,9 +31,9 @@
 #include "insets/InsetListingsParams.h"
 #include "insets/InsetInclude.h"
 
-#include <QPushButton>
 #include <QCheckBox>
 #include <QLineEdit>
+#include <QPushButton>
 
 #include <utility>
 
@@ -64,9 +65,9 @@ GuiInclude::GuiInclude(GuiView & lv)
 	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);
 
@@ -91,25 +92,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()) {
@@ -159,7 +153,7 @@ 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);
@@ -185,7 +179,8 @@ void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
 	if (cmdname != "include" &&
 	    cmdname != "verbatiminput" &&
 	    cmdname != "verbatiminput*" &&
-		cmdname != "lstinputlisting")
+	    cmdname != "lstinputlisting" &&
+	    cmdname != "inputminted")
 		cmdname = "input";
 
 	if (cmdname == "include") {
@@ -205,7 +200,7 @@ void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
 		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);
@@ -219,7 +214,7 @@ void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
 				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] == '}') {
@@ -232,6 +227,10 @@ void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
 		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();
 }
 
 
@@ -246,7 +245,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());
@@ -290,9 +292,11 @@ void GuiInclude::edit()
 {
 	if (!isValid())
 		return;
-	string const file = fromqstr(filenameED->text());
-	slotOK();
-	applyView();
+	if (bc().policy().buttonStatus(ButtonPolicy::OKAY)) {
+		slotOK();
+		applyView();
+	} else
+		hideView();
 	dispatch(FuncRequest(LFUN_INSET_EDIT));
 }
 
@@ -316,19 +320,20 @@ 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, 
+	return browseRelToParent(in_name, docpath, title, filters, false,
 		qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
 }
 
 
 bool GuiInclude::initialiseParams(std::string const & data)
 {
-	InsetCommand::string2params("include", data, params_);
+	InsetCommand::string2params(data, params_);
 	paramsToDialog(params_);
 	return true;
 }
@@ -336,7 +341,7 @@ bool GuiInclude::initialiseParams(std::string const & data)
 
 void GuiInclude::dispatchParams()
 {
-	std::string const lfun = InsetCommand::params2string("include", params_);
+	std::string const lfun = InsetCommand::params2string(params_);
 	dispatch(FuncRequest(getLfun(), lfun));
 }
 
@@ -347,4 +352,4 @@ Dialog * createGuiInclude(GuiView & lv) { return new GuiInclude(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiInclude_moc.cpp"
+#include "moc_GuiInclude.cpp"