From 7533e7a0a18fad7ccb0b395017d790a07698d87a Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 25 Dec 2016 17:23:07 +0100 Subject: [PATCH] Use master buffer params for quote style + some formatting polishment --- src/frontends/qt4/Menus.cpp | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp index 3ea36f5fe7..1119cc3c7c 100644 --- a/src/frontends/qt4/Menus.cpp +++ b/src/frontends/qt4/Menus.cpp @@ -1688,31 +1688,40 @@ void MenuDefinition::expandQuotes(BufferView const * bv) MenuDefinition iqs; MenuDefinition rqs; MenuDefinition xqs; - InsetQuotesParams::QuoteStyle globalqs = bv->buffer().params().quotes_style; + InsetQuotesParams::QuoteStyle globalqs = + bv->buffer().masterBuffer()->params().quotes_style; FuncRequest cmd = FuncRequest(LFUN_INSET_MODIFY, from_ascii("changetype xld")); - docstring desc = bformat(_("%1$stext (dynamic)"), docstring(1, quoteparams.getQuoteChar(globalqs, InsetQuotesParams::PrimaryQuotes, - InsetQuotesParams::OpeningQuote))); + docstring desc = bformat(_("%1$stext (dynamic)"), + docstring(1, quoteparams.getQuoteChar(globalqs, + InsetQuotesParams::PrimaryQuotes, + InsetQuotesParams::OpeningQuote))); if (prefixIs(qtype, "x")) add(MenuItem(MenuItem::Command, toqstr(desc), cmd)); else xqs.add(MenuItem(MenuItem::Command, toqstr(desc), cmd)); cmd = FuncRequest(LFUN_INSET_MODIFY, from_ascii("changetype xls")); - desc = bformat(_("%1$stext (dynamic)"), docstring(1, quoteparams.getQuoteChar(globalqs, InsetQuotesParams::SecondaryQuotes, - InsetQuotesParams::OpeningQuote))); + desc = bformat(_("%1$stext (dynamic)"), + docstring(1, quoteparams.getQuoteChar(globalqs, + InsetQuotesParams::SecondaryQuotes, + InsetQuotesParams::OpeningQuote))); if (prefixIs(qtype, "x")) add(MenuItem(MenuItem::Command, toqstr(desc), cmd)); else xqs.add(MenuItem(MenuItem::Command, toqstr(desc), cmd)); cmd = FuncRequest(LFUN_INSET_MODIFY, from_ascii("changetype xrd")); - desc = bformat(_("text%1$s (dynamic)"), docstring(1, quoteparams.getQuoteChar(globalqs, InsetQuotesParams::PrimaryQuotes, - InsetQuotesParams::ClosingQuote))); + desc = bformat(_("text%1$s (dynamic)"), + docstring(1, quoteparams.getQuoteChar(globalqs, + InsetQuotesParams::PrimaryQuotes, + InsetQuotesParams::ClosingQuote))); if (prefixIs(qtype, "x")) add(MenuItem(MenuItem::Command, toqstr(desc), cmd)); else xqs.add(MenuItem(MenuItem::Command, toqstr(desc), cmd)); cmd = FuncRequest(LFUN_INSET_MODIFY, from_ascii("changetype xrs")); - desc = bformat(_("text%1$s (dynamic)"), docstring(1, quoteparams.getQuoteChar(globalqs, InsetQuotesParams::SecondaryQuotes, - InsetQuotesParams::ClosingQuote))); + desc = bformat(_("text%1$s (dynamic)"), + docstring(1, quoteparams.getQuoteChar(globalqs, + InsetQuotesParams::SecondaryQuotes, + InsetQuotesParams::ClosingQuote))); if (prefixIs(qtype, "x")) add(MenuItem(MenuItem::Command, toqstr(desc), cmd)); else -- 2.39.5