Fix bug #7540. Patch based upon one added to bug report by Max Funk.

[lyx.git] / src / frontends / qt4 / GuiInclude.cpp

diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp
index 2c99e278065eaa624d18a145e5262cd8a80dcd63..7f5c96bd1894ac0b2a4d5dd2c2917c1209d401a9 100644 (file)
--- a/src/frontends/qt4/GuiInclude.cpp
+++ b/src/frontends/qt4/GuiInclude.cpp
@@ -15,17 +15,16 @@
 #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"
 
 #include "insets/InsetListingsParams.h"
@@ -33,31 +32,23 @@
 
 #include <QPushButton>
 #include <QCheckBox>
-#include <QCloseEvent>
 #include <QLineEdit>
 
 #include <utility>
 
 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(GuiView & lv)
-       : GuiCommand(lv, "include")
+       : 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()));
@@ -73,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);
 
@@ -117,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();
@@ -134,13 +125,6 @@ void GuiInclude::set_listings_msg()
 }
 
 
-void GuiInclude::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiInclude::typeChanged(int v)
 {
        switch (v) {
@@ -182,7 +166,7 @@ void GuiInclude::typeChanged(int v)
 }
 
 
-void GuiInclude::updateContents()
+void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
 {
        filenameED->setText(toqstr(params_["filename"]));
 
@@ -248,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();
 }
 
 
@@ -272,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*");
@@ -296,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));
 }
 
 
@@ -318,39 +310,41 @@ 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));
 }
 
 
@@ -360,4 +354,4 @@ Dialog * createGuiInclude(GuiView & lv) { return new GuiInclude(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiInclude_moc.cpp"
+#include "moc_GuiInclude.cpp"