X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FKeyMap.h;h=849ba0cdad6ee5f089a0ff1b478cb76128a0fe1d;hb=58cf1c5345104cb3071bf6788f65e4fae07ac749;hp=f6a82c082c0245b3aa2eb1a14932a55fe044519c;hpb=b032e2dfafbf1e86918dd0cd66e5de602edeee00;p=lyx.git diff --git a/src/KeyMap.h b/src/KeyMap.h index f6a82c082c..849ba0cdad 100644 --- a/src/KeyMap.h +++ b/src/KeyMap.h @@ -26,7 +26,7 @@ namespace lyx { namespace support { - class FileName; + class FileName; } /// Defines key maps and actions for key sequences @@ -42,7 +42,7 @@ public: }; enum BindReadType { MissingOK, //< It's OK if this file is missing. - Fallback, //< If missing, fallback to default "cua". This should only + Fallback, //< If missing, fallback to default "cua". This should only //< be used when attempting to read the user-secified bind file. Default //< Report error and return. }; @@ -65,7 +65,7 @@ public: unsigned int r = 0); - /// returns the function bound to this key sequence, or + /// returns the function bound to this key sequence, or /// FuncRequest::unknown if no binding exists for it. /// @param r an internal recursion counter // FIXME Surely there's a better way to do that? @@ -74,7 +74,7 @@ public: /// clear all bindings void clear(); - /** Parse a bind file. If a valid unbind_map is given, put \unbind + /** Parse a bind file. If a valid unbind_map is given, put \unbind * bindings to a separate KeyMap. This is used in the Shortcut preference * dialog where main and user bind files are loaded separately so \unbind * in user.bind can not nullify \bind in the master bind file. @@ -83,7 +83,7 @@ public: * @param unbind_map pointer to a KeyMap that holds \unbind bindings * @param rt how to respond if the file can't be found */ - bool read(std::string const & bind_file, KeyMap * unbind_map = 0, + bool read(std::string const & bind_file, KeyMap * unbind_map = 0, BindReadType rt = Default); /** write to a bind file. @@ -118,7 +118,8 @@ public: /// Given an action, print the keybindings. docstring printBindings(FuncRequest const & func, - KeySequence::outputFormat format) const; + KeySequence::outputFormat format, + bool const untranslated = false) const; struct Binding { Binding(FuncRequest const & r, KeySequence const & s, ItemType t) @@ -126,7 +127,7 @@ public: FuncRequest request; KeySequence sequence; KeyMap::ItemType tag; - }; + }; typedef std::vector BindingList; /** * Return all lfun and their associated bindings. @@ -185,7 +186,7 @@ private: */ Bindings findBindings(FuncRequest const & func, KeySequence const & prefix) const; - + void listBindings(BindingList & list, KeySequence const & prefix, ItemType tag) const;