X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiInclude.cpp;h=32c8f097a0b2c3aaa9530b8cd5e223ba3d08449f;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=7caf50fb188c850f262995896abc80b60ffd1cdf;hpb=5158ef3ee93fa060491b3aac2603d1b272178476;p=lyx.git

diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp
index 7caf50fb18..32c8f097a0 100644
--- a/src/frontends/qt4/GuiInclude.cpp
+++ b/src/frontends/qt4/GuiInclude.cpp
@@ -15,17 +15,15 @@
 #include "GuiInclude.h"
 
 #include "Buffer.h"
-#include "Format.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "LyXRC.h"
 
 #include "qt_helpers.h"
 #include "LyXRC.h"
 
-#include "support/os.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/FileFilterList.h"
+#include "support/os.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
 
@@ -66,9 +64,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);
 
@@ -110,7 +108,7 @@ docstring GuiInclude::validate_listings_params()
 }
 
 
-void GuiInclude::set_listings_msg()
+void GuiInclude::setListingsMsg()
 {
 	static bool isOK = true;
 	docstring msg = validate_listings_params();
@@ -168,7 +166,7 @@ void GuiInclude::typeChanged(int v)
 }
 
 
-void GuiInclude::updateContents()
+void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
 {
 	filenameED->setText(toqstr(params_["filename"]));
 
@@ -234,6 +232,10 @@ void GuiInclude::updateContents()
 		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();
 }
 
 
@@ -258,7 +260,7 @@ 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*");
@@ -290,11 +292,15 @@ void GuiInclude::browse()
 
 void GuiInclude::edit()
 {
-	if (isValid()) {
-		string const file = fromqstr(filenameED->text());
+	if (!isValid())
+		return;
+	string const file = fromqstr(filenameED->text());
+	if (bc().policy().buttonStatus(ButtonPolicy::OKAY)) {
 		slotOK();
-		edit(file);
-	}
+		applyView();
+	} else
+		hideView();
+	dispatch(FuncRequest(LFUN_INSET_EDIT));
 }
 
 
@@ -309,11 +315,11 @@ 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 ?
-	FileFilterList filters;
+	QStringList filters;
 	switch (in_type) {
 	case INCLUDE:
 	case INPUT:
-		filters = FileFilterList(_("LaTeX/LyX Documents (*.tex *.lyx)"));
+		filters = fileFilters(qt_("LaTeX/LyX Documents (*.tex *.lyx)"));
 		break;
 	case VERBATIM:
 	case LISTINGS:
@@ -327,22 +333,10 @@ QString GuiInclude::browse(QString const & in_name, Type in_type) const
 }
 
 
-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(), 
-			makeAbsPath(file, support::onlyPath(buffer().absFileName())),
-			"text");
-}
-
-
 bool GuiInclude::initialiseParams(std::string const & data)
 {
 	InsetCommand::string2params("include", data, params_);
+	paramsToDialog(params_);
 	return true;
 }
 
@@ -360,4 +354,4 @@ Dialog * createGuiInclude(GuiView & lv) { return new GuiInclude(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiInclude_moc.cpp"
+#include "moc_GuiInclude.cpp"