X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiListings.cpp;h=d41724f15bfa5a126aad3c097664efdcbea4f7bd;hb=b7f6b979d0f889f08e735f35378bb20ba3788b4b;hp=dba31748cdbc83540b0491ee23080724690e91ab;hpb=c9ea6e6eef090b863fb54445010f24443b15eb23;p=lyx.git diff --git a/src/frontends/qt4/GuiListings.cpp b/src/frontends/qt4/GuiListings.cpp index dba31748cd..d41724f15b 100644 --- a/src/frontends/qt4/GuiListings.cpp +++ b/src/frontends/qt4/GuiListings.cpp @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author Bo Peng - * \author Jürgen Spitzmüller + * \author Jürgen Spitzmüller * * Full author contact details are available in file CREDITS. */ @@ -13,44 +13,43 @@ #include "GuiListings.h" -#include "ControlListings.h" #include "qt_helpers.h" + +#include "Buffer.h" +#include "BufferParams.h" +#include "FuncRequest.h" + +#include "insets/InsetListings.h" #include "insets/InsetListingsParams.h" -#include "debug.h" #include "support/convert.h" +#include "support/debug.h" +#include "support/gettext.h" #include "support/lstrings.h" #include -#include #include #include #include - -using std::string; -using std::vector; -using lyx::support::findToken; -using lyx::support::getVectorFromString; -using lyx::support::getStringFromVector; -using lyx::support::prefixIs; -using lyx::support::suffixIs; -using lyx::support::contains; +using namespace std; +using namespace lyx::support; namespace lyx { namespace frontend { + ///////////////////////////////////////////////////////////////////// // -// GuiListingsDialog +// GuiListings // ///////////////////////////////////////////////////////////////////// -char const * languages[] = +char const * languages_supported[] = { "no language", "ABAP", "ACSL", "Ada", "ALGOL", "Assembler", "Awk", "bash", "Basic", "C", "C++", "Caml", "Clean", "Cobol", "Comal 80", "command.com", "Comsol", "csh", "Delphi", - "Eiffel", "Elan", "Euphoria", "Fortran", "Gnuplot", "Haskell", "HTML", "IDL", "inform", + "Eiffel", "Elan", "erlang", "Euphoria", "Fortran", "Gnuplot", "Haskell", "HTML", "IDL", "inform", "Java", "JVMIS", "ksh", "Lingo", "Lisp", "Logo", "make", "Mathematica", "Matlab", "Mercury", "MetaPost", "Miranda", "ML", "Modula-2", "MuPAD", "NASTRAN", "Oberon-2", "OCL", "Octave", "Oz", "Pascal", "Perl", "PHP", "PL/I", "Plasm", "PostScript", "POV", "Prolog", "Promela", @@ -62,7 +61,7 @@ char const * languages[] = char const * languages_gui[] = { N_("No language"), "ABAP", "ACSL", "Ada", "ALGOL", "Assembler", "Awk", "bash", "Basic", "C", "C++", "Caml", "Clean", "Cobol", "Comal 80", "command.com", "Comsol", "csh", "Delphi", - "Eiffel", "Elan", "Euphoria", "Fortran", "Gnuplot", "Haskell", "HTML", "IDL", "inform", + "Eiffel", "Elan", "Erlang", "Euphoria", "Fortran", "Gnuplot", "Haskell", "HTML", "IDL", "inform", "Java", "JVMIS", "ksh", "Lingo", "Lisp", "Logo", "make", "Mathematica", "Matlab", "Mercury", "MetaPost", "Miranda", "ML", "Modula-2", "MuPAD", "NASTRAN", "Oberon-2", "OCL", "Octave", "Oz", "Pascal", "Perl", "PHP", "PL/I", "Plasm", "PostScript", "POV", "Prolog", "Promela", @@ -163,12 +162,10 @@ char const * font_styles_gui[] = -GuiListingsDialog::GuiListingsDialog(LyXView & lv) - : GuiDialog(lv, "listings") +GuiListings::GuiListings(GuiView & lv) + : GuiDialog(lv, "listings", qt_("Program Listing Settings")) { setupUi(this); - setViewTitle(_("Program Listing Settings")); - setController(new ControlListings(*this)); connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply())); @@ -182,17 +179,17 @@ GuiListingsDialog::GuiListingsDialog(LyXView & lv) this, SLOT(change_adaptor())); connect(floatCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); - connect(placementLE, SIGNAL(textChanged(const QString&)), + connect(placementLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(numberSideCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor())); - connect(numberStepLE, SIGNAL(textChanged(const QString&)), + connect(numberStepLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(numberFontSizeCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor())); - connect(firstlineLE, SIGNAL(textChanged(const QString&)), + connect(firstlineLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); - connect(lastlineLE, SIGNAL(textChanged(const QString&)), + connect(lastlineLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(fontsizeCO, SIGNAL(currentIndexChanged(int)), this, SLOT(change_adaptor())); @@ -204,19 +201,21 @@ GuiListingsDialog::GuiListingsDialog(LyXView & lv) this, SLOT(change_adaptor())); connect(spaceInStringCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); + connect(tabsizeSB, SIGNAL(valueChanged(int)), + this, SLOT(change_adaptor())); connect(extendedcharsCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(listingsED, SIGNAL(textChanged()), this, SLOT(change_adaptor())); connect(listingsED, SIGNAL(textChanged()), - this, SLOT(set_listings_msg())); + this, SLOT(setListingsMsg())); connect(bypassCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(bypassCB, SIGNAL(clicked()), - this, SLOT(set_listings_msg())); + this, SLOT(setListingsMsg())); - for (int n = 0; languages[n][0]; ++n) + for (int n = 0; languages_supported[n][0]; ++n) languageCO->addItem(qt_(languages_gui[n])); for (int n = 0; font_styles[n][0]; ++n) @@ -234,43 +233,31 @@ GuiListingsDialog::GuiListingsDialog(LyXView & lv) lastlineLE->setValidator(new QIntValidator(0, 1000000, this)); placementLE->setValidator(new QRegExpValidator(QRegExp("[\\*tbph]*"), this)); + bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy); bc().setOK(okPB); bc().setApply(applyPB); bc().setCancel(closePB); listingsTB->setPlainText( qt_("Input listing parameters on the right. Enter ? for a list of parameters.")); - update_contents(); - -} - + updateContents(); -ControlListings & GuiListingsDialog::controller() const -{ - return static_cast(Dialog::controller()); -} - - -void GuiListingsDialog::closeEvent(QCloseEvent * e) -{ - slotWMHide(); - e->accept(); } -void GuiListingsDialog::change_adaptor() +void GuiListings::change_adaptor() { changed(); } -string GuiListingsDialog::construct_params() +string GuiListings::construct_params() { - string language = languages[languageCO->currentIndex()]; + string language = languages_supported[qMax(0, languageCO->currentIndex())]; string dialect; string const dialect_gui = fromqstr(dialectCO->currentText()); if (dialectCO->currentIndex() > 0) { - for (size_t i = 0; i < nr_dialects; ++i) { + for (size_t i = 0; i != nr_dialects; ++i) { if (dialect_gui == dialects[i].gui && dialects[i].language == language && !dialects[i].is_default) { @@ -286,7 +273,7 @@ string GuiListingsDialog::construct_params() placement = fromqstr(placementLE->text()); string numberSide; - switch (numberSideCO->currentIndex()) { + switch (qMax(0, numberSideCO->currentIndex())) { case 0: numberSide = "none"; break; @@ -301,26 +288,52 @@ string GuiListingsDialog::construct_params() break; } string stepnumber = fromqstr(numberStepLE->text()); - string numberfontsize = font_sizes[numberFontSizeCO->currentIndex()]; + string numberfontsize = font_sizes[qMax(0, numberFontSizeCO->currentIndex())]; string firstline = fromqstr(firstlineLE->text()); string lastline = fromqstr(lastlineLE->text()); - string fontsize = font_sizes[fontsizeCO->currentIndex()]; - string fontstyle = font_styles[fontstyleCO->currentIndex()]; + string fontsize = font_sizes[qMax(0, fontsizeCO->currentIndex())]; + string fontstyle = font_styles[qMax(0, fontstyleCO->currentIndex())]; string basicstyle; - if (fontsize != "default") - basicstyle = "\\" + fontsize; - if (fontstyle != "default") - basicstyle += "\\" + fontstyle; + string mintedsize; + bool const use_minted = buffer().params().use_minted; + if (fontsize != "default") { + if (use_minted) + mintedsize = "\\" + fontsize; + else + basicstyle = "\\" + fontsize; + } + if (fontstyle != "default") { + if (use_minted) + basicstyle = fontstyle.substr(0, 2); + else + basicstyle += "\\" + fontstyle; + } bool breakline = breaklinesCB->isChecked(); bool space = spaceCB->isChecked(); + int tabsize = tabsizeSB->value(); bool spaceInString = spaceInStringCB->isChecked(); bool extendedchars = extendedcharsCB->isChecked(); string extra = fromqstr(listingsED->toPlainText()); // compose a string InsetListingsParams par; - if (language != "no language" && !contains(extra, "language=")) { + par.setMinted(use_minted); + if (use_minted) { + if (language == "no language" && !contains(extra, "language=")) { + string const & blp = buffer().params().listings_params; + size_t start = blp.find("language="); + if (start != string::npos) { + start += strlen("language="); + size_t len = blp.find(",", start); + if (len != string::npos) + len -= start; + par.addParam("language", blp.substr(start, len)); + } else + par.addParam("language", "TeX"); + } else + par.addParam("language", language); + } else if (language != "no language" && !contains(extra, "language=")) { if (dialect.empty()) par.addParam("language", language); else @@ -333,7 +346,7 @@ string GuiListingsDialog::construct_params() par.addParam("float", placement); if (numberSide != "none") par.addParam("numbers", numberSide); - if (numberfontsize != "default" && numberSide != "none") + if (numberfontsize != "default" && numberSide != "none" && !use_minted) par.addParam("numberstyle", "\\" + numberfontsize); if (!stepnumber.empty() && numberSide != "none") par.addParam("stepnumber", stepnumber); @@ -342,41 +355,35 @@ string GuiListingsDialog::construct_params() if (!lastline.empty()) par.addParam("lastline", lastline); if (!basicstyle.empty()) - par.addParam("basicstyle", basicstyle); + par.addParam(use_minted ? "fontfamily" : "basicstyle", basicstyle); + if (!mintedsize.empty()) + par.addParam("fontsize", mintedsize); if (breakline) par.addParam("breaklines", "true"); if (space) par.addParam("showspaces", "true"); - if (!spaceInString) + if (!spaceInString && !use_minted) par.addParam("showstringspaces", "false"); - if (extendedchars) + if (tabsize != 8) + par.addParam("tabsize", convert(tabsize)); + if (extendedchars && !use_minted) par.addParam("extendedchars", "true"); par.addParams(extra); return par.params(); } -docstring GuiListingsDialog::validate_listings_params() +docstring GuiListings::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 (bypassCB->isChecked()) return docstring(); - - string params = construct_params(); - if (params != param_cache) { - param_cache = params; - msg_cache = InsetListingsParams(params).validate(); - } - return msg_cache; + return InsetListingsParams(construct_params()).validate(); } -void GuiListingsDialog::set_listings_msg() +void GuiListings::setListingsMsg() { + // FIXME THREAD static bool isOK = true; docstring msg = validate_listings_params(); if (msg.empty()) { @@ -392,7 +399,7 @@ void GuiListingsDialog::set_listings_msg() } -void GuiListingsDialog::on_floatCB_stateChanged(int state) +void GuiListings::on_floatCB_stateChanged(int state) { if (state == Qt::Checked) { inlineCB->setChecked(false); @@ -402,7 +409,7 @@ void GuiListingsDialog::on_floatCB_stateChanged(int state) } -void GuiListingsDialog::on_inlineCB_stateChanged(int state) +void GuiListings::on_inlineCB_stateChanged(int state) { if (state == Qt::Checked) { floatCB->setChecked(false); @@ -411,22 +418,22 @@ void GuiListingsDialog::on_inlineCB_stateChanged(int state) } -void GuiListingsDialog::on_numberSideCO_currentIndexChanged(int index) +void GuiListings::on_numberSideCO_currentIndexChanged(int index) { numberStepLE->setEnabled(index > 0); numberFontSizeCO->setEnabled(index > 0); } -void GuiListingsDialog::on_languageCO_currentIndexChanged(int index) +void GuiListings::on_languageCO_currentIndexChanged(int index) { dialectCO->clear(); // 0 is "no dialect" int default_dialect = 0; dialectCO->addItem(qt_("No dialect")); - string const language = languages[index]; + string const language = languages_supported[index]; - for (size_t i = 0; i < nr_dialects; ++i) { + for (size_t i = 0; i != nr_dialects; ++i) { if (language == dialects[i].language) { dialectCO->addItem(qt_(dialects[i].gui)); if (dialects[i].is_default) @@ -435,20 +442,20 @@ void GuiListingsDialog::on_languageCO_currentIndexChanged(int index) } } dialectCO->setCurrentIndex(default_dialect); - dialectCO->setEnabled(dialectCO->count() > 1); + dialectCO->setEnabled(dialectCO->count() > 1 + && !buffer().params().use_minted); } -void GuiListingsDialog::applyView() +void GuiListings::applyView() { - InsetListingsParams & params = controller().params(); - params.setInline(inlineCB->isChecked()); - params.setParams(construct_params()); - controller().setParams(params); + params_.setMinted(buffer().params().use_minted); + params_.setInline(inlineCB->isChecked()); + params_.setParams(construct_params()); } -static string plainParam(std::string const & par) +static string plainParam(string const & par) { // remove enclosing braces if (prefixIs(par, "{") && suffixIs(par, "}")) @@ -457,12 +464,13 @@ static string plainParam(std::string const & par) } -void GuiListingsDialog::update_contents() +void GuiListings::updateContents() { + bool const use_minted = buffer().params().use_minted; // set default values listingsTB->setPlainText( qt_("Input listing parameters on the right. Enter ? for a list of parameters.")); - languageCO->setCurrentIndex(findToken(languages, "no language")); + languageCO->setCurrentIndex(findToken(languages_supported, "no language")); dialectCO->setCurrentIndex(0); floatCB->setChecked(false); placementLE->clear(); @@ -476,17 +484,17 @@ void GuiListingsDialog::update_contents() breaklinesCB->setChecked(false); spaceCB->setChecked(false); spaceInStringCB->setChecked(true); + tabsizeSB->setValue(8); extendedcharsCB->setChecked(false); // set values from param string - InsetListingsParams & params = controller().params(); - inlineCB->setChecked(params.isInline()); - if (params.isInline()) { + inlineCB->setChecked(params_.isInline()); + if (params_.isInline()) { floatCB->setChecked(false); placementLE->setEnabled(false); } // break other parameters and set values - vector pars = getVectorFromString(params.separatedParams(), "\n"); + vector pars = getVectorFromString(params_.separatedParams(), "\n"); // process each of them for (vector::iterator it = pars.begin(); it != pars.end(); ++it) { @@ -497,12 +505,13 @@ void GuiListingsDialog::update_contents() string dialect; bool in_gui = false; if (prefixIs(arg, "[") && contains(arg, "]")) { - string::size_type end_dialect = arg.find("]"); + size_t end_dialect = arg.find("]"); dialect = arg.substr(1, end_dialect - 1); language = arg.substr(end_dialect + 1); - } else + } else { language = arg; - int n = findToken(languages, language); + } + int n = findToken(languages_supported, language); if (n >= 0) { languageCO->setCurrentIndex(n); in_gui = true; @@ -510,7 +519,7 @@ void GuiListingsDialog::update_contents() // on_languageCO_currentIndexChanged should have set dialects if (!dialect.empty()) { string dialect_gui; - for (size_t i = 0; i < nr_dialects; ++i) { + for (size_t i = 0; i != nr_dialects; ++i) { if (dialect == dialects[i].dialect && dialects[i].language == language) { dialect_gui = dialects[i].gui; @@ -526,7 +535,7 @@ void GuiListingsDialog::update_contents() if (in_gui) *it = ""; languageCO->setEnabled(in_gui); - dialectCO->setEnabled( + dialectCO->setEnabled(!use_minted && in_gui && dialectCO->count() > 1); } else if (prefixIs(*it, "float")) { floatCB->setChecked(true); @@ -594,6 +603,36 @@ void GuiListingsDialog::update_contents() } *it = ""; } + } else if (prefixIs(*it, "fontsize=")) { + string size; + for (int n = 0; font_sizes[n][0]; ++n) { + string const s = font_sizes[n]; + if (contains(*it, "\\" + s)) { + size = "\\" + s; + break; + } + } + if (!size.empty()) { + int n = findToken(font_sizes, size.substr(1)); + if (n >= 0) + fontsizeCO->setCurrentIndex(n); + } + *it = ""; + } else if (prefixIs(*it, "fontfamily=")) { + string style; + for (int n = 0; font_styles[n][0]; ++n) { + string const s = font_styles[n]; + if (contains(*it, "=" + s.substr(0,2))) { + style = "\\" + s; + break; + } + } + if (!style.empty()) { + int n = findToken(font_styles, style.substr(1)); + if (n >= 0) + fontstyleCO->setCurrentIndex(n); + } + *it = ""; } else if (prefixIs(*it, "breaklines=")) { breaklinesCB->setChecked(contains(*it, "true")); *it = ""; @@ -603,6 +642,9 @@ void GuiListingsDialog::update_contents() } else if (prefixIs(*it, "showstringspaces=")) { spaceInStringCB->setChecked(contains(*it, "true")); *it = ""; + } else if (prefixIs(*it, "tabsize=")) { + tabsizeSB->setValue(convert(plainParam(it->substr(8)))); + *it = ""; } else if (prefixIs(*it, "extendedchars=")) { extendedcharsCB->setChecked(contains(*it, "true")); *it = ""; @@ -610,22 +652,57 @@ void GuiListingsDialog::update_contents() } numberStepLE->setEnabled(numberSideCO->currentIndex() > 0); - numberFontSizeCO->setEnabled(numberSideCO->currentIndex() > 0); + numberFontSizeCO->setEnabled(numberSideCO->currentIndex() > 0 + && !use_minted); + spaceInStringCB->setEnabled(!use_minted); + extendedcharsCB->setEnabled(!use_minted); // parameters that can be handled by widgets are cleared // the rest is put to the extra edit box. string extra = getStringFromVector(pars); listingsED->setPlainText(toqstr(InsetListingsParams(extra).separatedParams())); + params_.setMinted(use_minted); } -bool GuiListingsDialog::isValid() +bool GuiListings::isValid() { return validate_listings_params().empty(); } +bool GuiListings::initialiseParams(string const & data) +{ + InsetListings::string2params(data, params_); + return true; +} + + +void GuiListings::clearParams() +{ + params_.clear(); + params_.setMinted(buffer().params().use_minted); +} + + +void GuiListings::dispatchParams() +{ + string const lfun = InsetListings::params2string(params_); + dispatch(FuncRequest(getLfun(), lfun)); +} + + +void GuiListings::setParams(InsetListingsParams const & params) +{ + params_ = params; + params_.setMinted(buffer().params().use_minted); +} + + +Dialog * createGuiListings(GuiView & lv) { return new GuiListings(lv); } + + } // namespace frontend } // namespace lyx -#include "GuiListings_moc.cpp" +#include "moc_GuiListings.cpp"