#include "debug.h"
#include "gettext.h"
#include "support/lstrings.h"
+#if 1
+// only to get access to NEW_INSETS and NEW_TABULAR
+#include "lyxparagraph.h"
+#endif
using std::ostream;
using std::endl;
N_("Select to end of document"), ReadOnly },
{ LFUN_EXPORT, "buffer-export", N_("Export to"), ReadOnly },
{ LFUN_FAX, "buffer-fax", N_("Fax"), ReadOnly },
+#ifndef NEW_INSETS
{ LFUN_INSERTFOOTNOTE, "buffer-float-insert", "", Noop },
+#endif
{ LFUN_IMPORT, "buffer-import",
N_("Import document"), NoBuffer },
{ LFUN_BUFFERBULLETSSELECT, "buffer-itemize-bullets-select",
{ LFUN_MENUPRINT, "buffer-print", N_("Print"), ReadOnly },
{ LFUN_MENURELOAD, "buffer-reload",
N_("Revert to saved"), ReadOnly },
+ { LFUN_SWITCHBUFFER, "buffer-switch",
+ N_("Switch to an open document"), ReadOnly },
{ LFUN_READ_ONLY_TOGGLE, "buffer-toggle-read-only",
N_("Toggle read-only"), ReadOnly },
{ LFUN_RUNLATEX, "buffer-typeset", N_("Update DVI"),
{ LFUN_GOTOERROR, "error-next", N_("Go to next error"), Noop },
{ LFUN_REMOVEERRORS, "error-remove-all",
N_("Remove all error boxes"), ReadOnly },
- { LFUN_INSET_ERT, "ert-inset-insert",
+ { LFUN_INSET_ERT, "ert-insert",
N_("Insert a new ERT Inset"), Noop },
- { LFUN_INSET_EXTERNAL, "external-inset-insert",
+ { LFUN_INSET_EXTERNAL, "external-insert",
N_("Insert a new external inset"), Noop },
{ LFUN_FIGURE, "figure-insert", N_("Insert Figure"), Noop },
- { LFUN_INSERT_GRAPHICS, "graphics-insert",
+ { LFUN_INSET_GRAPHICS, "graphics-insert",
N_("Insert Graphics"), Noop },
{ LFUN_FILE_INSERT, "file-insert", "", Noop },
{ LFUN_FILE_INSERT_ASCII, "file-insert-ascii", "", Noop },
ReadOnly },
{ LFUN_UNDERLINE, "font-underline",
N_("Toggle font underline"), Noop },
+#ifndef NEW_INSETS
{ LFUN_FOOTMELT, "footnote-insert", N_("Insert Footnote"),
Noop },
- { LFUN_INSET_FOOTNOTE, "footnote-inset-insert",
+#else
+ { LFUN_INSET_FOOTNOTE, "footnote-insert",
N_("Insert Footnote"), Noop },
- { LFUN_INSET_MARGINAL, "marginalnote-inset-insert",
+#endif
+ { LFUN_INSET_MARGINAL, "marginalnote-insert",
N_("Insert Marginalnote"), Noop },
{ LFUN_RIGHTSEL, "forward-select", N_("Select next char"),
ReadOnly },
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 },
{ LFUN_LOTVIEW, "lot-view",
N_("View list of tables"), ReadOnly },
{ LFUN_QUIT, "lyx-quit", N_("Exit"), NoBuffer },
+#ifndef NEW_INSETS
{ LFUN_MARGINMELT, "marginpar-insert",
N_("Insert Margin note"), Noop },
+#endif
{ LFUN_MARK_OFF, "mark-off", "", ReadOnly },
{ LFUN_MARK_ON, "mark-on", "", ReadOnly },
{ LFUN_SETMARK, "mark-toggle", "", ReadOnly },
{ 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 },
{ LFUN_PARENTINSERT, "parent-insert", "", Noop },
{ LFUN_PASTE, "paste", N_("Paste") , Noop },
{ LFUN_SAVEPREFERENCES, "preferences-save",
- "Save Preferences", NoBuffer },
+ N_("Save Preferences"), NoBuffer },
{ LFUN_PASTESELECTION, "primary-selection-paste", "", Noop },
{ LFUN_PROTECTEDSPACE, "protected-space-insert",
N_("Insert protected space"), Noop },
{ LFUN_SHIFT_TAB, "tab-backward", "", Noop },
{ LFUN_TAB, "tab-forward", "", Noop },
{ LFUN_TABINSERT, "tab-insert", "", Noop },
+#ifndef NEW_TABULAR
{ LFUN_TABLE, "table-insert", N_("Insert Table"), Noop },
- { LFUN_INSET_TABULAR, "tabular-inset-insert",
+#endif
+ { LFUN_INSET_TABULAR, "tabular-insert",
N_("Insert a new Tabular Inset"), Noop },
{ LFUN_TEX, "tex-mode", N_("Toggle TeX style"), Noop },
- { LFUN_INSET_TEXT, "text-inset-insert",
+ { LFUN_INSET_TEXT, "text-insert",
N_("Insert a new Text Inset"), Noop },
{ LFUN_TOC_INSERT, "toc-insert",
N_("Insert table of contents"), Noop },
{ LFUN_DATE_INSERT, "date-insert", "", Noop },
{ LFUN_PARAGRAPH_SPACING, "paragraph-spacing", "", Noop },
{ LFUN_SET_COLOR, "set-color", "", Noop },
- { LFUN_INSET_MINIPAGE, "minipage-inset-insert", "", Noop },
- { LFUN_INSET_FLOAT, "float-inset-insert", "", Noop },
- { LFUN_INSET_LIST, "list-inset-insert", "", Noop },
- { LFUN_INSET_THEOREM, "theorem-inset-insert", "", Noop },
+ { LFUN_INSET_MINIPAGE, "minipage-insert", "", Noop },
+ { LFUN_INSET_FLOAT, "float-insert", "", Noop },
+ { LFUN_INSET_LIST, "list-insert", "", Noop },
+ { LFUN_INSET_THEOREM, "theorem-insert", "", Noop },
+ { LFUN_INSET_CAPTION, "caption-insert", "", Noop },
{ LFUN_NOACTION, "", "", Noop }
};
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();
}
return (*ici).second.attrib & flag;
} else {
// it really should exist, but...
- lyxerr << "No info about kb_action: " << action << '\n';
+ lyxerr << "LyXAction::funcHasFlag: "
+ "No info about kb_action: " << action << '\n';
return false;
}