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 07a1fb8f9fbeaf959b1eb8fdcb5f7e8d90718ce5..7f5c96bd1894ac0b2a4d5dd2c2917c1209d401a9 100644 (file)
--- a/src/frontends/qt4/GuiInclude.cpp
+++ b/src/frontends/qt4/GuiInclude.cpp
@@ -64,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);
 
@@ -108,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();
@@ -232,6 +232,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();
 }
 
 
@@ -291,8 +295,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));
 }
 
@@ -321,14 +328,14 @@ 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));
 }
 
 
 bool GuiInclude::initialiseParams(std::string const & data)
 {
-       InsetCommand::string2params("include", data, params_);
+       InsetCommand::string2params(data, params_);
        paramsToDialog(params_);
        return true;
 }
@@ -336,7 +343,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 +354,4 @@ Dialog * createGuiInclude(GuiView & lv) { return new GuiInclude(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiInclude_moc.cpp"
+#include "moc_GuiInclude.cpp"