X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiInclude.cpp;h=7f5c96bd1894ac0b2a4d5dd2c2917c1209d401a9;hb=82d6524298e37613703e901495f22002994679f3;hp=41c5a05a681c510e65148f0075e66b45c85d4516;hpb=a0a04e4886fe33f06c3b1b2351d2a26eee681854;p=lyx.git

diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp
index 41c5a05a68..7f5c96bd18 100644
--- a/src/frontends/qt4/GuiInclude.cpp
+++ b/src/frontends/qt4/GuiInclude.cpp
@@ -14,20 +14,17 @@
 
 #include "GuiInclude.h"
 
-#include "frontend_helpers.h"
-
 #include "Buffer.h"
-#include "Format.h"
 #include "FuncRequest.h"
-#include "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"
 
 #include "insets/InsetListingsParams.h"
@@ -35,35 +32,23 @@
 
 #include <QPushButton>
 #include <QCheckBox>
-#include <QCloseEvent>
 #include <QLineEdit>
 
 #include <utility>
 
-using std::string;
-using std::vector;
-using std::pair;
-using std::string;
-
+using namespace std;
+using namespace lyx::support;
+using namespace lyx::support::os;
 
 namespace lyx {
 namespace frontend {
 
-using support::FileFilterList;
-using support::FileName;
-using support::makeAbsPath;
-using support::onlyPath;
-using support::os::internal_path;
-using support::prefixIs;
-using support::getStringFromVector;
-using support::getVectorFromString;
 
-
-GuiInclude::GuiInclude(LyXView & lv)
-	: GuiCommand(lv, "include")
+GuiInclude::GuiInclude(GuiView & lv)
+	: GuiDialog(lv, "include", qt_("Child Document")),
+	  params_(insetCode("include"))
 {
 	setupUi(this);
-	setViewTitle(_("Child Document"));
 
 	connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
 	connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
@@ -79,9 +64,9 @@ GuiInclude::GuiInclude(LyXView & 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);
 
@@ -123,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();
@@ -140,13 +125,6 @@ void GuiInclude::set_listings_msg()
 }
 
 
-void GuiInclude::closeEvent(QCloseEvent * e)
-{
-	slotClose();
-	e->accept();
-}
-
-
 void GuiInclude::typeChanged(int v)
 {
 	switch (v) {
@@ -188,7 +166,7 @@ void GuiInclude::typeChanged(int v)
 }
 
 
-void GuiInclude::updateContents()
+void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
 {
 	filenameED->setText(toqstr(params_["filename"]));
 
@@ -254,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();
 }
 
 
@@ -278,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*");
@@ -302,19 +284,23 @@ void GuiInclude::browse()
 	else
 		type = LISTINGS;
 
-	docstring const & name = 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 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));
 }
 
 
@@ -324,46 +310,48 @@ bool GuiInclude::isValid()
 }
 
 
-docstring GuiInclude::browse(docstring const & in_name, Type in_type) const
+QString GuiInclude::browse(QString const & in_name, Type in_type) const
 {
-	docstring const title = _("Select document to include");
+	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:
 		break;
 	}
 
-	docstring const docpath = from_utf8(onlyPath(buffer().absFileName()));
+	QString const docpath = toqstr(support::onlyPath(buffer().absFileName()));
 
-	return browseRelFile(in_name, docpath, title, filters, false, 
-		_("Documents|#o#O"), from_utf8(lyxrc.document_path));
+	return browseRelToParent(in_name, docpath, title, filters, false,
+		qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
 }
 
 
-void GuiInclude::edit(string const & file)
+bool GuiInclude::initialiseParams(std::string const & data)
 {
-	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, onlyPath(buffer().absFileName())),
-			"text");
+	InsetCommand::string2params(data, params_);
+	paramsToDialog(params_);
+	return true;
+}
+
+
+void GuiInclude::dispatchParams()
+{
+	std::string const lfun = InsetCommand::params2string(params_);
+	dispatch(FuncRequest(getLfun(), lfun));
 }
 
 
-Dialog * createGuiInclude(LyXView & lv) { return new GuiInclude(lv); }
+Dialog * createGuiInclude(GuiView & lv) { return new GuiInclude(lv); }
 
 
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiInclude_moc.cpp"
+#include "moc_GuiInclude.cpp"