Do not compute caret geometry when we are not ready to do so.

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

diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp
index 7caf50fb188c850f262995896abc80b60ffd1cdf..edbf7a19c42f96617fb991253ba3df1137368ce2 100644 (file)
--- a/src/frontends/qt4/GuiInclude.cpp
+++ b/src/frontends/qt4/GuiInclude.cpp
@@ -15,26 +15,25 @@
 #include "GuiInclude.h"
 
 #include "Buffer.h"
-#include "Format.h"
+#include "BufferParams.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"
 #include "insets/InsetInclude.h"
 
-#include <QPushButton>
 #include <QCheckBox>
 #include <QLineEdit>
+#include <QPushButton>
 
 #include <utility>
 
@@ -66,9 +65,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);
 
@@ -93,25 +92,18 @@ void GuiInclude::change_adaptor()
 
 docstring GuiInclude::validate_listings_params()
 {
-       // use a cache here to avoid repeated validation
-       // of the same parameters
-       static string param_cache = string();
-       static docstring msg_cache = docstring();
-       
        if (typeCO->currentIndex() != 3 || bypassCB->isChecked())
                return docstring();
-
        string params = fromqstr(listingsED->toPlainText());
-       if (params != param_cache) {
-               param_cache = params;
-               msg_cache = InsetListingsParams(params).validate();
-       }
-       return msg_cache;
+       InsetListingsParams lstparams(params);
+       lstparams.setMinted(buffer().params().use_minted);
+       return lstparams.validate();
 }
 
 
-void GuiInclude::set_listings_msg()
+void GuiInclude::setListingsMsg()
 {
+       // FIXME THREAD
        static bool isOK = true;
        docstring msg = validate_listings_params();
        if (msg.empty()) {
@@ -161,14 +153,14 @@ void GuiInclude::typeChanged(int v)
                        listingsGB->setEnabled(false);
                        break;
        }
-       //see this thread 
+       //see this thread
        //  http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg118471.html
        //for the reason this is here.
        okPB->setDefault(true);
 }
 
 
-void GuiInclude::updateContents()
+void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
 {
        filenameED->setText(toqstr(params_["filename"]));
 
@@ -187,7 +179,8 @@ void GuiInclude::updateContents()
        if (cmdname != "include" &&
            cmdname != "verbatiminput" &&
            cmdname != "verbatiminput*" &&
-               cmdname != "lstinputlisting")
+           cmdname != "lstinputlisting" &&
+           cmdname != "inputminted")
                cmdname = "input";
 
        if (cmdname == "include") {
@@ -207,7 +200,7 @@ void GuiInclude::updateContents()
                typeCO->setCurrentIndex(2);
                visiblespaceCB->setEnabled(true);
 
-       } else if (cmdname == "lstinputlisting") {
+       } else if (cmdname == "lstinputlisting" || cmdname == "inputminted") {
                typeCO->setCurrentIndex(3);
                listingsGB->setEnabled(true);
                listingsED->setEnabled(true);
@@ -221,7 +214,7 @@ void GuiInclude::updateContents()
                                if (cap[0] == '{' && cap[cap.size() - 1] == '}') {
                                        captionLE->setText(toqstr(cap.substr(1, cap.size() - 2)));
                                        *it = "";
-                               } 
+                               }
                        } else if (prefixIs(*it, "label=")) {
                                string lbl = it->substr(6);
                                if (lbl[0] == '{' && lbl[lbl.size()-1] == '}') {
@@ -234,6 +227,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();
 }
 
 
@@ -248,7 +245,10 @@ void GuiInclude::applyView()
        } else if (item == 1) {
                params_.setCmdName("input");
        } else if (item == 3) {
-               params_.setCmdName("lstinputlisting");
+               if (buffer().params().use_minted)
+                       params_.setCmdName("inputminted");
+               else
+                       params_.setCmdName("lstinputlisting");
                // the parameter string should have passed validation
                InsetListingsParams par(fromqstr(listingsED->toPlainText()));
                string caption = fromqstr(captionLE->text());
@@ -258,7 +258,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*");
@@ -290,11 +290,14 @@ void GuiInclude::browse()
 
 void GuiInclude::edit()
 {
-       if (isValid()) {
-               string const file = fromqstr(filenameED->text());
+       if (!isValid())
+               return;
+       if (bc().policy().buttonStatus(ButtonPolicy::OKAY)) {
                slotOK();
-               edit(file);
-       }
+               applyView();
+       } else
+               hideView();
+       dispatch(FuncRequest(LFUN_INSET_EDIT));
 }
 
 
@@ -309,47 +312,36 @@ 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:
+               filters = fileFilters(QString());
                break;
        }
 
        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)
-{
-       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");
-}
-
-
 bool GuiInclude::initialiseParams(std::string const & data)
 {
-       InsetCommand::string2params("include", data, params_);
+       InsetCommand::string2params(data, params_);
+       paramsToDialog(params_);
        return true;
 }
 
 
 void GuiInclude::dispatchParams()
 {
-       std::string const lfun = InsetCommand::params2string("include", params_);
+       std::string const lfun = InsetCommand::params2string(params_);
        dispatch(FuncRequest(getLfun(), lfun));
 }
 
@@ -360,4 +352,4 @@ Dialog * createGuiInclude(GuiView & lv) { return new GuiInclude(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiInclude_moc.cpp"
+#include "moc_GuiInclude.cpp"