* fix spelling in comments to please John.

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

diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp
index 989509878a39ebe449bdca2050f55d37ba4cc37f..32c8f097a0b2c3aaa9530b8cd5e223ba3d08449f 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));
 }