X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeySequence.cpp;h=f1530c886686370a916fdd6c87cfd56a13865ca5;hb=3b6fec38357949da2675dd4524282f1c790eff6e;hp=a0f2f5bda2c3a970535a75600a7d702867852b4b;hpb=e9d943aeb8bbe5fb211977c84160813cfcbecb34;p=lyx.git diff --git a/src/KeySequence.cpp b/src/KeySequence.cpp index a0f2f5bda2..f1530c8866 100644 --- a/src/KeySequence.cpp +++ b/src/KeySequence.cpp @@ -125,8 +125,7 @@ size_t KeySequence::parse(string const & s) } } - // empty sequence? - if (sequence.size() == 0) + if (sequence.empty()) return 0; // everything is fine @@ -134,7 +133,7 @@ size_t KeySequence::parse(string const & s) } -docstring const KeySequence::print(outputFormat format) const +docstring const KeySequence::print(outputFormat format, bool const untranslated) const { docstring buf; @@ -143,10 +142,10 @@ docstring const KeySequence::print(outputFormat format) const for (size_t i = 0; i != length; ++i) { switch (format) { case Portable: - buf += sequence[i].print(modifiers[i].first, false); + buf += sequence[i].print(modifiers[i].first, false, untranslated); break; case ForGui: - buf += sequence[i].print(modifiers[i].first, true); + buf += sequence[i].print(modifiers[i].first, true, untranslated); break; case BindFile: KeyModifier mod = modifiers[i].first; @@ -160,7 +159,7 @@ docstring const KeySequence::print(outputFormat format) const buf += "M-"; if (mod & ShiftModifier) buf += "S-"; - + buf += from_utf8(sequence[i].getSymbolName()); break; }