X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiInclude.cpp;h=edbf7a19c42f96617fb991253ba3df1137368ce2;hb=b7f6b979d0f889f08e735f35378bb20ba3788b4b;hp=66a49dfb8f007b300bc6dd8af0101e1375062457;hpb=4064d2c468bff8e5d5f4cdd4442d52087d1b137e;p=lyx.git diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp index 66a49dfb8f..edbf7a19c4 100644 --- a/src/frontends/qt4/GuiInclude.cpp +++ b/src/frontends/qt4/GuiInclude.cpp @@ -14,60 +14,42 @@ #include "GuiInclude.h" -#include "frontend_helpers.h" - #include "Buffer.h" -#include "Format.h" +#include "BufferParams.h" #include "FuncRequest.h" -#include "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 #include -#include #include +#include #include -using std::string; -using std::vector; -using std::pair; -using std::string; - +using namespace std; +using namespace lyx::support; +using namespace lyx::support::os; namespace lyx { namespace frontend { -using support::FileFilterList; -using support::FileName; -using support::makeAbsPath; -using support::onlyPath; -using support::os::internal_path; -using support::prefixIs; -using support::getStringFromVector; -using support::getVectorFromString; - - -/// Flags what action is taken by Kernel::dispatch() -static std::string const lfun_name_ = "include"; - -GuiInclude::GuiInclude(LyXView & lv) - : GuiDialog(lv, "include"), params_(INCLUDE_CODE) +GuiInclude::GuiInclude(GuiView & lv) + : GuiDialog(lv, "include", qt_("Child Document")), + params_(insetCode("include")) { setupUi(this); - setViewTitle(_("Child Document")); connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose())); @@ -83,9 +65,9 @@ GuiInclude::GuiInclude(LyXView & 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); @@ -110,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()) { @@ -144,13 +119,6 @@ void GuiInclude::set_listings_msg() } -void GuiInclude::closeEvent(QCloseEvent * e) -{ - slotClose(); - e->accept(); -} - - void GuiInclude::typeChanged(int v) { switch (v) { @@ -185,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"])); @@ -211,7 +179,8 @@ void GuiInclude::updateContents() if (cmdname != "include" && cmdname != "verbatiminput" && cmdname != "verbatiminput*" && - cmdname != "lstinputlisting") + cmdname != "lstinputlisting" && + cmdname != "inputminted") cmdname = "input"; if (cmdname == "include") { @@ -231,11 +200,11 @@ 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); - InsetListingsParams par(params_.getOptions()); + InsetListingsParams par(to_utf8(params_["lstparams"])); // extract caption and label and put them into their respective editboxes vector pars = getVectorFromString(par.separatedParams(), "\n"); for (vector::iterator it = pars.begin(); @@ -245,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] == '}') { @@ -258,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(); } @@ -272,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()); @@ -281,7 +257,8 @@ void GuiInclude::applyView() par.addParam("caption", "{" + caption + "}"); if (!label.empty()) par.addParam("label", "{" + label + "}"); - params_.setOptions(par.params()); + string const listparams = par.params(); + params_["lstparams"] = from_utf8(listparams); } else { if (visiblespaceCB->isChecked()) params_.setCmdName("verbatiminput*"); @@ -305,19 +282,22 @@ void GuiInclude::browse() else type = LISTINGS; - docstring const & name = browse(qstring_to_ucs4(filenameED->text()), type); - if (!name.empty()) - filenameED->setText(toqstr(name)); + QString name = browse(filenameED->text(), type); + if (!name.isEmpty()) + filenameED->setText(name); } 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)); } @@ -327,68 +307,49 @@ bool GuiInclude::isValid() } -bool GuiInclude::initialiseParams(string const & data) +QString GuiInclude::browse(QString const & in_name, Type in_type) const { - InsetCommandMailer::string2params(lfun_name_, data, params_); - return true; -} - - -void GuiInclude::clearParams() -{ - params_.clear(); -} - - -void GuiInclude::dispatchParams() -{ - dispatch(FuncRequest(getLfun(), InsetCommandMailer::params2string(lfun_name_, params_))); -} - - -docstring GuiInclude::browse(docstring const & in_name, Type in_type) const -{ - docstring const title = _("Select document to include"); + 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; } - pair dir1(_("Documents|#o#O"), - from_utf8(lyxrc.document_path)); + QString const docpath = toqstr(support::onlyPath(buffer().absFileName())); + + return browseRelToParent(in_name, docpath, title, filters, false, + qt_("Documents|#o#O"), toqstr(lyxrc.document_path)); +} - docstring const docpath = from_utf8(onlyPath(buffer().absFileName())); - return browseRelFile(in_name, docpath, title, - filters, false, dir1); +bool GuiInclude::initialiseParams(std::string const & data) +{ + InsetCommand::string2params(data, params_); + paramsToDialog(params_); + return true; } -void GuiInclude::edit(string const & file) +void GuiInclude::dispatchParams() { - 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, onlyPath(buffer().absFileName())), - "text"); + std::string const lfun = InsetCommand::params2string(params_); + dispatch(FuncRequest(getLfun(), lfun)); } -Dialog * createGuiInclude(LyXView & lv) { return new GuiInclude(lv); } +Dialog * createGuiInclude(GuiView & lv) { return new GuiInclude(lv); } } // namespace frontend } // namespace lyx -#include "GuiInclude_moc.cpp" +#include "moc_GuiInclude.cpp"