John's Layout Tabular UI improvements and Martins fixes to clearing the

[lyx.git] / src / LyXAction.C

diff --git a/src/LyXAction.C b/src/LyXAction.C
index faf8473734432f5849956c838ed8699ac4f59306..dd15b2ee5e4fbf7625e12e0cdf07b7118c7aab55 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -153,6 +153,7 @@ void LyXAction::init()
                  ReadOnly },
                { LFUN_CITATION_CREATE, "citation-insert",
                  N_("Insert citation"), Noop },
+               { LFUN_CITATION_INSERT, "", "internal only", Noop },
                { LFUN_EXEC_COMMAND, "command-execute", "", NoBuffer },
                { LFUN_PREFIX, "command-prefix",
                  N_("Execute command"), NoBuffer },
@@ -220,15 +221,8 @@ void LyXAction::init()
                  ReadOnly },
                { LFUN_HFILL, "hfill-insert",
                  N_("Insert horizontal fill"), Noop },
-               { LFUN_HELP_COPYRIGHT, "help-copyright",
-                 N_("Display copyright information"), NoBuffer },
-               { LFUN_HELP_CREDITS, "help-credits",
-                 N_("Show the list of people who helped writing LyX"), 
-                 NoBuffer},
                { LFUN_HELP_OPEN, "help-open", N_("Open a Help file"), 
                  NoBuffer|Argument},
-               { LFUN_HELP_VERSION, "help-version",
-                 N_("Show the actual LyX version"), NoBuffer},
                { LFUN_HTMLURL, "html-insert", "", Noop },
                { LFUN_HYPHENATION, "hyphenation-point-insert",
                  N_("Insert hyphenation point"), Noop },
@@ -258,13 +252,10 @@ void LyXAction::init()
                { LFUN_LAYOUT_COPY, "layout-copy",
                  N_("Copy paragraph environment type"), Noop },
                { LFUN_LAYOUT_DOCUMENT, "layout-document", "", ReadOnly },
-               { LFUN_LAYOUTNO, "", "internal only", Noop },
                { LFUN_LAYOUT_PARAGRAPH, "layout-paragraph", "", ReadOnly },
                { LFUN_LAYOUT_PASTE, "layout-paste",
                  N_("Paste paragraph environment type"), Noop },
                { LFUN_LAYOUT_PREAMBLE, "layout-preamble", "", ReadOnly },
-               { LFUN_LAYOUT_SAVE_DEFAULT, "layout-save-default", "",
-                 ReadOnly },
                { LFUN_LAYOUT_TABULAR, "layout-tabular",
                  N_("Open the tabular layout"), Noop },
                { LFUN_HOME, "line-begin",
@@ -290,6 +281,8 @@ void LyXAction::init()
                { LFUN_GREEK_TOGGLE, "math-greek-toggle", "", Noop },
                { LFUN_INSERT_MATH, "math-insert",
                  N_("Insert math symbol"), Noop },
+               { LFUN_SUBSCRIPT, "math-subscript", "", Noop },
+               { LFUN_SUPERSCRIPT, "math-superscript", "", Noop },
                { LFUN_MATH_LIMITS, "math-limits", "", Noop },
                { LFUN_MATH_MACRO, "math-macro", "", Noop },
                { LFUN_MATH_MUTATE, "math-mutate", "", Noop },
@@ -427,6 +420,8 @@ void LyXAction::init()
                { LFUN_ESCAPE, "escape", "", Noop },
                { LFUN_HELP_ABOUTLYX, "help-aboutlyx",
                  N_("Display information about LyX"), NoBuffer },
+               { LFUN_HELP_TEXINFO, "help-Texinfo",
+                 N_("Display information about the TeX installation"), NoBuffer },
                { LFUN_NOACTION, "", "", Noop }
        };
 
@@ -451,7 +446,7 @@ LyXAction::LyXAction()
 
 // Search for an existent pseudoaction, return LFUN_UNKNOWN_ACTION
 // if it doesn't exist.
-int LyXAction::searchActionArg(kb_action action, string const & arg) const
+kb_action LyXAction::searchActionArg(kb_action action, string const & arg) const
 {
        arg_map::const_iterator pit = lyx_arg_map.find(action);
 
@@ -479,7 +474,7 @@ int LyXAction::searchActionArg(kb_action action, string const & arg) const
                              << action << '|' 
                              << arg << "] = " << aci->second << endl;
 
-       return aci->second;
+       return kb_action(aci->second);
 }