X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeySequence.h;h=6e46abac2c95a583a76bc48ded8e14383ab5702f;hb=56f525cec31fb0b489928e61116e14a86444cdd1;hp=c5b9527578b29f669158aaea3457eae873bc6855;hpb=91baeb2c5579790ecac82e71f963da649b3808c2;p=lyx.git diff --git a/src/KeySequence.h b/src/KeySequence.h index c5b9527578..6e46abac2c 100644 --- a/src/KeySequence.h +++ b/src/KeySequence.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean-Marc Lasgouttes * * Full author contact details are available in file CREDITS. @@ -40,12 +40,12 @@ public: /** * Add a key to the key sequence and look it up in the curmap * if the latter is defined. - * @param keysym the key to add + * @param key the key to add * @param mod modifier mask * @param nmod which modifiers to mask out for equality test * @return the action matching this key sequence or LFUN_UNKNOWN_ACTION */ - FuncRequest const & addkey(KeySymbol const & keysym, KeyModifier mod, + FuncRequest const & addkey(KeySymbol const & key, KeyModifier mod, KeyModifier nmod = NoModifier); /** @@ -66,13 +66,13 @@ public: ForGui, //< use platform specific translations and special characters BindFile //< the format used in lyx bind files }; - + /** * Return the current sequence as a string. * @param format output format * @see parse() */ - docstring const print(outputFormat format) const; + docstring const print(outputFormat format, bool const untranslated = false) const; /** * Return the current sequence and available options as @@ -82,9 +82,6 @@ public: */ docstring const printOptions(bool forgui) const; - /// Mark the sequence as deleted. - void mark_deleted(); - /// Reset sequence to become "deleted" void reset(); @@ -99,13 +96,13 @@ public: /// length of sequence size_t length() const { return sequence.size(); } +private: /// Keymap to use if a new sequence is starting KeyMap * stdmap; /// Keymap to use for the next key KeyMap * curmap; -private: /** * Array holding the current key sequence as KeySyms. * If sequence[length - 1] < 0xff it can be used as ISO8859 char