Angus insetindex patch + protect patch from Dekel

[lyx.git] / src / LyXAction.C

diff --git a/src/LyXAction.C b/src/LyXAction.C
index f9380b4ece79702a5ce9cf0459cb2fb4cbc10447..6c52cc69233de38621c76f4a465c472b085e064c 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -164,7 +164,7 @@ void LyXAction::init()
                  ReadOnly },
                { LFUN_RIGHT, "char-forward", N_("Go one char forward"),
                  ReadOnly },
-               { LFUN_CREATE_CITATION, "citation-insert",
+               { LFUN_CITATION_CREATE, "citation-insert",
                  N_("Insert citation"), Noop },
                { LFUN_EXEC_COMMAND, "command-execute", "", NoBuffer },
                { LFUN_PREFIX, "command-prefix",
@@ -247,9 +247,9 @@ void LyXAction::init()
                { LFUN_HTMLURL, "html-insert", "", Noop },
                { LFUN_HYPHENATION, "hyphenation-point-insert",
                  N_("Insert hyphenation point"), Noop },
-               { LFUN_INDEX_INSERT, "index-insert",
+               { LFUN_INDEX_CREATE, "index-insert",
                  N_("Insert index item"), Noop },
-               { LFUN_INDEX_INSERT_LAST, "index-insert-last",
+               { LFUN_INDEX_CREATE_LAST, "index-insert-last",
                  N_("Insert last index item"), Noop },
                { LFUN_INDEX_PRINT, "index-print", N_("Insert index list"),
                  Noop },
@@ -280,7 +280,10 @@ void LyXAction::init()
                { LFUN_LAYOUT_QUOTES, "layout-quotes", "", ReadOnly },
                { LFUN_LAYOUT_SAVE_DEFAULT, "layout-save-default", "",
                  ReadOnly },
-               { LFUN_LAYOUT_TABLE, "layout-table", "", Noop },
+               { LFUN_LAYOUT_TABLE, "layout-table",
+                 N_("Open the table layout"), Noop },
+               { LFUN_LAYOUT_TABULAR, "layout-tabular",
+                 N_("Open the tabular layout"), Noop },
                { LFUN_HOME, "line-begin",
                  N_("Go to beginning of line"), ReadOnly },
                { LFUN_HOMESEL, "line-begin-select",
@@ -322,6 +325,7 @@ void LyXAction::init()
                { LFUN_MATH_MODE, "math-mode", N_("Math mode"), Noop },
                { LFUN_MATH_NONUMBER, "math-nonumber", "", Noop },
                { LFUN_MATH_NUMBER, "math-number", "", Noop },
+               { LFUN_MATH_PANEL, "math-panel", "", Noop },
                { LFUN_MATH_SIZE, "math-size", "", Noop },
                { LFUN_MELT, "melt", N_("Melt"), Noop },
                { LFUN_MENU_OPEN_BY_NAME, "menu-open", "", NoBuffer },
@@ -340,6 +344,8 @@ void LyXAction::init()
                  N_("Select previous paragraph"), ReadOnly },
                { LFUN_PARENTINSERT, "parent-insert", "", Noop },
                { LFUN_PASTE, "paste", N_("Paste") , Noop },
+               { LFUN_DIALOG_PREFERENCES, "dialog-preferences",
+                 N_("Edit Preferences"), NoBuffer },
                { LFUN_SAVEPREFERENCES, "preferences-save",
                  N_("Save Preferences"), NoBuffer },
                { LFUN_PASTESELECTION, "primary-selection-paste", "", Noop },
@@ -378,6 +384,8 @@ void LyXAction::init()
 #ifndef NEW_TABULAR
                { LFUN_TABLE, "table-insert", N_("Insert Table"), Noop },
 #endif
+               { LFUN_TABULAR_FEATURE, "tabular-feature",
+                 N_("Tabular Features"), Noop },
                { LFUN_INSET_TABULAR, "tabular-insert",
                  N_("Insert a new Tabular Inset"), Noop },
                { LFUN_TEX, "tex-mode", N_("Toggle TeX style"), Noop },
@@ -597,10 +605,21 @@ string LyXAction::getApproxFuncName(string const & func) const
 
 string LyXAction::getActionName(int action) const
 {
-       info_map::const_iterator iit =
-               lyx_info_map.find(static_cast<kb_action>(action));
-
-       return iit != lyx_info_map.end() ? (*iit).second.name : string();
+       kb_action ac;
+       string arg;
+       if (isPseudoAction(action)) {
+               ac = retrieveActionArg(action, arg);
+               arg = " " +arg;
+       } 
+       else
+               ac = static_cast<kb_action>(action);
+
+       info_map::const_iterator iit = lyx_info_map.find(ac);
+
+       if (iit != lyx_info_map.end())
+               return (*iit).second.name + arg;
+       else 
+               return string();
 }