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 9cdad1dfa7ae1267f65f0f3d8baf1555b73b16d9..7f5c96bd1894ac0b2a4d5dd2c2917c1209d401a9 100644 (file)
--- a/src/frontends/qt4/GuiInclude.cpp
+++ b/src/frontends/qt4/GuiInclude.cpp
@@ -15,21 +15,16 @@
 #include "GuiInclude.h"
 
 #include "Buffer.h"
-#include "EmbeddedFiles.h"
-#include "Format.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "LyXRC.h"
 
 #include "qt_helpers.h"
 #include "LyXRC.h"
 
-#include "frontends/alert.h"
-
-#include "support/os.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/ExceptionMessage.h"
-#include "support/FileFilterList.h"
+#include "support/os.h"
+#include "support/FileName.h"
 #include "support/filetools.h"
 
 #include "insets/InsetListingsParams.h"
@@ -50,7 +45,8 @@ namespace frontend {
 
 
 GuiInclude::GuiInclude(GuiView & lv)
-       : GuiCommand(lv, "include", qt_("Child Document"))
+       : GuiDialog(lv, "include", qt_("Child Document")),
+         params_(insetCode("include"))
 {
        setupUi(this);
 
@@ -62,16 +58,15 @@ GuiInclude::GuiInclude(GuiView & lv)
                this, SLOT(change_adaptor()));
        connect(editPB, SIGNAL(clicked()), this, SLOT(edit()));
        connect(browsePB, SIGNAL(clicked()), this, SLOT(browse()));
-       connect(embedCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
        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(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);
 
@@ -113,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();
@@ -171,10 +166,9 @@ void GuiInclude::typeChanged(int v)
 }
 
 
-void GuiInclude::updateContents()
+void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
 {
        filenameED->setText(toqstr(params_["filename"]));
-       embedCB->setCheckState(params_["embed"].empty() ?  Qt::Unchecked : Qt::Checked);
 
        visiblespaceCB->setChecked(false);
        visiblespaceCB->setEnabled(false);
@@ -238,25 +232,16 @@ 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();
 }
 
 
 void GuiInclude::applyView()
 {
        params_["filename"] = from_utf8(internal_path(fromqstr(filenameED->text())));
-       params_["embed"].clear();
-       try {
-               Buffer & buf = buffer();
-               EmbeddedFile file(to_utf8(params_["filename"]), buf.filePath());
-               file.setEmbed(embedCB->checkState() == Qt::Checked);
-               // move file around if needed, an exception may be raised.
-               file.enable(buf.embedded(), buf, true);
-               // if things are OK..., set params_["embed"]
-               params_["embed"] = file.embedded() ? from_utf8(file.inzipName()) : docstring();
-       } catch (ExceptionMessage const & message) {
-               Alert::error(message.title_, message.details_);
-               // params_["embed"] will be empty if a file is failed to embed
-       }
        params_.preview(previewCB->isChecked());
 
        int const item = typeCO->currentIndex();
@@ -275,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*");
@@ -307,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));
 }
 
 
@@ -326,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:
@@ -339,21 +328,23 @@ QString GuiInclude::browse(QString const & in_name, Type in_type) const
 
        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));
 }
 
 
-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, support::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));
 }
 
 
@@ -363,4 +354,4 @@ Dialog * createGuiInclude(GuiView & lv) { return new GuiInclude(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiInclude_moc.cpp"
+#include "moc_GuiInclude.cpp"