* lyx_1_6.py:

[lyx.git] / src / LyXAction.h

diff --git a/src/LyXAction.h b/src/LyXAction.h
index 4411b16269cac11da73ca67dd286ac563787e4bc..6f952d54e98a4c8ff8b1ca9a855acd8b6fc49e1c 100644 (file)
--- a/src/LyXAction.h
+++ b/src/LyXAction.h
@@ -13,9 +13,7 @@
 #ifndef LYXACTION_H
 #define LYXACTION_H
 
-#include "lfuns.h"
-
-#include <boost/utility.hpp>
+#include "FuncCode.h"
 
 #include <map>
 #include <string>
@@ -24,34 +22,49 @@
 namespace lyx {
 
 class FuncRequest;
+class LyXErr;
 
 /**
- * This class is a container for LyX actions. It also
- * stores and managers "pseudo-actions". Pseudo-actions
- * are not part of the kb_action enum, but are created
- * dynamically, for encapsulating a real action and an
- * argument. They are used for things like the menus.
+ * This class is a container for LyX actions. It associates a name to
+ * most of them and describes some of their properties.
  */
-class LyXAction : boost::noncopyable {
+class LyXAction {
+public:
+       /// category of an action, used in the Shortcuts dialog
+       enum func_type {
+               Hidden,  //< Not listed for configuration
+               Edit,    //< Cursor and mouse movement, copy/paste etc
+               Math,    //< Mathematics
+               Buffer,  //< Buffer and window related
+               Layout,  //< Font, Layout and textclass related
+               System,  //< Lyx preference, server etc
+       };
+
 private:
        /// information for an action
-       struct func_info {
+       struct FuncInfo {
                /// the action name
                std::string name;
                /// the func_attrib values set
                unsigned int attrib;
+               /// the category of this func
+               func_type type;
        };
 
 public:
+       /// noncopyable
+       LyXAction(LyXAction const &);
+       void operator=(LyXAction const &);
+
        /// type for map between a function name and its action
-       typedef std::map<std::string, kb_action> func_map;
+       typedef std::map<std::string, FuncCode> func_map;
        /// type for map between an action and its info
-       typedef std::map<kb_action, func_info> info_map;
+       typedef std::map<FuncCode, FuncInfo> info_map;
 
        /// possible "permissions" for an action
        enum func_attrib {
                Noop = 0, //< nothing special about this func
-               ReadOnly = 1, //< can be used in RO mode (perhaps this should change)
+               ReadOnly = 1, //< can be used in RO mode (perhaps this should change); no automatic markDirty
                NoBuffer = 2, //< Can be used when there is no document open
                Argument = 4, //< Requires argument
                NoUpdate = 8, //< Does not (usually) require update
@@ -68,10 +81,12 @@ public:
        FuncRequest lookupFunc(std::string const & func_name) const;
 
        /// Return the name (and argument) associated with the given (pseudo) action
-       std::string const getActionName(kb_action action) const;
+       std::string const getActionName(FuncCode action) const;
+
+       func_type const getActionType(FuncCode action) const;
 
        /// True if the command has `flag' set
-       bool funcHasFlag(kb_action action, func_attrib flag) const;
+       bool funcHasFlag(FuncCode action, func_attrib flag) const;
 
        /// iterator across all real actions
        typedef func_map::const_iterator const_func_iterator;
@@ -86,7 +101,7 @@ private:
        /// populate the action container with our actions
        void init();
        /// add the given action
-       void newFunc(kb_action, std::string const & name, unsigned int attrib);
+       void newFunc(FuncCode, std::string const & name, unsigned int attrib, func_type type);
 
        /**
         * This is a list of all the LyXFunc names with the
@@ -103,6 +118,8 @@ private:
        info_map lyx_info_map;
 };
 
+LyXErr & operator<<(LyXErr &, FuncCode);
+
 /// singleton instance
 extern LyXAction lyxaction;