Add bypass validation checkboxes to listings related dialogs

[features.git] / src / frontends / qt4 / QDocument.cpp

diff --git a/src/frontends/qt4/QDocument.cpp b/src/frontends/qt4/QDocument.cpp
index a917134d2b76e55206a3950b3b6bea8bae26a5cc..f895d30d4d3cffad34244dad6f66f418999430a5 100644 (file)
--- a/src/frontends/qt4/QDocument.cpp
+++ b/src/frontends/qt4/QDocument.cpp
@@ -222,6 +222,8 @@ QDocumentDialog::QDocumentDialog(QDocument * form)
                this, SLOT(change_adaptor()));
        connect(textLayoutModule->listingsED, SIGNAL(textChanged()),
                this, SLOT(change_adaptor()));
+       connect(textLayoutModule->bypassCB, SIGNAL(clicked()), 
+               this, SLOT(change_adaptor()));
        connect(textLayoutModule->listingsED, SIGNAL(textChanged()),
                this, SLOT(validate_listings_params()));
        textLayoutModule->listingsTB->setPlainText(
@@ -622,20 +624,23 @@ void QDocumentDialog::change_adaptor()
 void QDocumentDialog::validate_listings_params()
 {
        static bool isOK = true;
-       try {
-               InsetListingsParams par(fromqstr(textLayoutModule->listingsED->toPlainText()));
-               if (!isOK) {
-                       isOK = true;
-                       // listingsTB->setTextColor("black");
-                       textLayoutModule->listingsTB->setPlainText(
-                               qt_("Input listings parameters on the right. Enter ? for a list of parameters."));
-                       okPB->setEnabled(true);
-                       applyPB->setEnabled(true);
-               }
-       } catch (invalidParam & e) {
+       InsetListingsParams par(fromqstr(textLayoutModule->listingsED->toPlainText()));
+       docstring msg;
+       if (!textLayoutModule->bypassCB->isChecked())
+               msg = par.validate();
+       if (msg.empty()) {
+               if (isOK)
+                       return;
+               isOK = true;
+               // listingsTB->setTextColor("black");
+               textLayoutModule->listingsTB->setPlainText(
+                       qt_("Input listings parameters on the right. Enter ? for a list of parameters."));
+               okPB->setEnabled(true);
+               applyPB->setEnabled(true);
+       } else {
                isOK = false;
                // listingsTB->setTextColor("red");
-               textLayoutModule->listingsTB->setPlainText(toqstr(e.what()));
+               textLayoutModule->listingsTB->setPlainText(toqstr(msg));
                okPB->setEnabled(false);
                applyPB->setEnabled(false);
        }