X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXAction.C;h=f789969da6000d1384ccefe5aa766c40ce9b64d2;hb=53c5edb99e5566fd7c0a1192a697b7b7796919d8;hp=d89f4ffd39000c1f2ce300e4c15c59f57b3810c1;hpb=85f8bf7445db373d95bad64faede475e0f6f9049;p=lyx.git diff --git a/src/LyXAction.C b/src/LyXAction.C index d89f4ffd39..f789969da6 100644 --- a/src/LyXAction.C +++ b/src/LyXAction.C @@ -18,10 +18,6 @@ #include "debug.h" #include "gettext.h" #include "support/lstrings.h" -#if 1 -// only to get access to NEW_INSETS -#include "lyxparagraph.h" -#endif using std::ostream; using std::endl; @@ -42,7 +38,7 @@ using std::endl; (May 19 1996, 12:04, RvdK) */ - + // These are globals. LyXAction lyxaction; @@ -58,13 +54,6 @@ void LyXAction::newFunc(kb_action action, string const & name, } -struct lfun_item { - kb_action action; - char const * name; - char const * helpText; - unsigned int attrib; -}; - void LyXAction::init() { // This function was changed to use the array below in initalization @@ -76,6 +65,13 @@ void LyXAction::init() static bool init = false; if (init) return; + struct lfun_item { + kb_action action; + char const * name; + char const * helpText; + unsigned int attrib; + }; + lfun_item items[] = { { LFUN_ACUTE, "accent-acute", "", Noop }, { LFUN_BREVE, "accent-breve", "", Noop }, @@ -105,6 +101,8 @@ void LyXAction::init() { LFUN_INSERT_BIBTEX, "bibtex-insert", N_("Insert bibtex"), Noop }, { LFUN_BIBTEX_STYLE, "bibtex-style", "", Noop }, + { LFUN_BOOKMARK_GOTO, "bookmark-goto", "", ReadOnly }, + { LFUN_BOOKMARK_SAVE, "bookmark-save", "", ReadOnly }, { LFUN_BREAKLINE, "break-line", "", Noop }, { LFUN_BREAKPARAGRAPH, "break-paragraph", "", Noop }, { LFUN_BREAKPARAGRAPHKEEPLAYOUT, "break-paragraph-keep-layout", @@ -117,7 +115,7 @@ void LyXAction::init() N_("Go to beginning of document"), ReadOnly }, { LFUN_BEGINNINGBUFSEL, "buffer-begin-select", N_("Select to beginning of document"), ReadOnly }, - { LFUN_CHILDINSERT, "buffer-child-insert", "", Noop }, + { LFUN_CHILD_INSERT, "buffer-child-insert", "", Noop }, { LFUN_CHILDOPEN, "buffer-child-open", "", ReadOnly }, { LFUN_RUNCHKTEX, "buffer-chktex", N_("Check TeX"), ReadOnly }, { LFUN_CLOSEBUFFER, "buffer-close", N_("Close"), ReadOnly }, @@ -126,12 +124,6 @@ void LyXAction::init() { LFUN_ENDBUFSEL, "buffer-end-select", N_("Select to end of document"), ReadOnly }, { LFUN_EXPORT, "buffer-export", N_("Export to"), ReadOnly }, -#if 0 - { LFUN_FAX, "buffer-fax", N_("Fax"), ReadOnly }, -#endif -#ifndef NEW_INSETS - { LFUN_INSERTFOOTNOTE, "buffer-float-insert", "", Noop }, -#endif { LFUN_IMPORT, "buffer-import", N_("Import document"), NoBuffer }, { LFUN_BUFFER_PRINT, "buffer-print-xtl", N_("Print"), @@ -141,7 +133,6 @@ void LyXAction::init() { LFUN_MENUNEW, "buffer-new", N_("New document") , NoBuffer }, { LFUN_MENUNEWTMPLT,"buffer-new-template", N_("New document from template"), NoBuffer }, - { LFUN_MENUOPEN, "buffer-open", N_("Open"), NoBuffer }, { LFUN_MENUPRINT, "buffer-print", N_("Print"), ReadOnly }, { LFUN_MENURELOAD, "buffer-reload", N_("Revert to saved"), ReadOnly }, @@ -152,9 +143,10 @@ void LyXAction::init() { LFUN_UPDATE, "buffer-update", N_("Update"), ReadOnly }, { LFUN_PREVIEW, "buffer-view", N_("View") , ReadOnly }, { LFUN_MENUWRITE, "buffer-write", N_("Save"), ReadOnly }, - { LFUN_MENUWRITEAS, "buffer-write-as", N_("Save As"), + { LFUN_WRITEAS, "buffer-write-as", N_("Save As"), ReadOnly }, { LFUN_CANCEL, "cancel", N_("Cancel"), NoBuffer }, + { LFUN_INSET_CAPTION, "caption-insert", "", Noop }, { LFUN_LEFT, "char-backward", N_("Go one char back"), ReadOnly }, { LFUN_RIGHT, "char-forward", N_("Go one char forward"), @@ -167,6 +159,7 @@ void LyXAction::init() { LFUN_SEQUENCE, "command-sequence", "", Noop }, { LFUN_COPY, "copy", N_("Copy"), ReadOnly }, { LFUN_CUT, "cut", N_("Cut"), Noop }, + { LFUN_DATE_INSERT, "date-insert", "", Noop }, { LFUN_BACKSPACE, "delete-backward", "", Noop }, { LFUN_BACKSPACE_SKIP, "delete-backward-skip", "", Noop }, { LFUN_DELETE, "delete-forward", "", Noop }, @@ -192,15 +185,17 @@ void LyXAction::init() N_("Insert a new ERT Inset"), Noop }, { LFUN_INSET_EXTERNAL, "external-insert", N_("Insert a new external inset"), Noop }, - { LFUN_FIGURE, "figure-insert", N_("Insert Figure"), Noop }, + { LFUN_FIGURE, "figure-insert", N_("Insert Graphics"), Noop }, { LFUN_INSET_GRAPHICS, "graphics-insert", N_("Insert Graphics"), Noop }, { LFUN_FILE_INSERT, "file-insert", "", Noop }, - { LFUN_FILE_INSERT_ASCII, "file-insert-ascii", "", Noop }, + { LFUN_FILE_INSERT_ASCII, "file-insert-ascii", _("Insert ASCII files as lines"), Noop }, + { LFUN_FILE_INSERT_ASCII_PARA, "file-insert-ascii-para", _("Insert ASCII file as a paragraph"), Noop }, { LFUN_FILE_NEW, "file-new", "", NoBuffer }, - { LFUN_FILE_OPEN, "file-open", "", NoBuffer }, + { LFUN_FILE_OPEN, "file-open", _("Open a file"), NoBuffer }, { LFUN_MENUSEARCH, "find-replace", N_("Find & Replace"), ReadOnly }, + { LFUN_INSET_FLOAT, "float-insert", "", Noop }, { LFUN_BOLD, "font-bold", N_("Toggle bold"), Noop }, { LFUN_CODE, "font-code", N_("Toggle code style"), Noop }, { LFUN_DEFAULT, "font-default", N_("Default font style"), @@ -217,15 +212,8 @@ void LyXAction::init() ReadOnly }, { LFUN_UNDERLINE, "font-underline", N_("Toggle font underline"), Noop }, -#ifndef NEW_INSETS - { LFUN_FOOTMELT, "footnote-insert", N_("Insert Footnote"), - Noop }, -#else { LFUN_INSET_FOOTNOTE, "footnote-insert", N_("Insert Footnote"), Noop }, -#endif - { LFUN_INSET_MARGINAL, "marginalnote-insert", - N_("Insert Marginalnote"), Noop }, { LFUN_RIGHTSEL, "forward-select", N_("Select next char"), ReadOnly }, { LFUN_HFILL, "hfill-insert", @@ -283,6 +271,7 @@ void LyXAction::init() { LFUN_END, "line-end", N_("Go to end of line"), ReadOnly }, { LFUN_ENDSEL, "line-end-select", N_("Select to end of line"), ReadOnly }, + { LFUN_INSET_LIST, "list-insert", "", Noop }, { LFUN_LOA_INSERT, "loa-insert", N_("Insert list of algorithms"), Noop }, { LFUN_LOAVIEW, "loa-view", @@ -296,10 +285,8 @@ void LyXAction::init() { 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_INSET_MARGINAL, "marginalnote-insert", + N_("Insert Marginalnote"), Noop }, { LFUN_MARK_OFF, "mark-off", "", ReadOnly }, { LFUN_MARK_ON, "mark-on", "", ReadOnly }, { LFUN_SETMARK, "mark-toggle", "", ReadOnly }, @@ -316,12 +303,13 @@ 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_EXTERN, "math-extern", "", 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_MENU_SEPARATOR, "menu-separator-insert", "", Noop }, { LFUN_META_FAKE, "meta-prefix", "", NoBuffer }, + { LFUN_INSET_MINIPAGE, "minipage-insert", "", Noop }, { LFUN_INSERT_NOTE, "note-insert", "", Noop }, { LFUN_GOTONOTE, "note-next", "", ReadOnly }, { LFUN_OPENSTUFF, "open-stuff", "", ReadOnly }, @@ -331,6 +319,7 @@ void LyXAction::init() N_("Select next paragraph"), ReadOnly }, { LFUN_GOTO_PARAGRAPH, "paragraph-goto", N_("Go to paragraph"), ReadOnly }, + { LFUN_PARAGRAPH_SPACING, "paragraph-spacing", "", Noop }, { LFUN_UP_PARAGRAPH, "paragraph-up", N_("Go one paragraph up"), ReadOnly }, { LFUN_UP_PARAGRAPHSEL, "paragraph-up-select", @@ -348,12 +337,14 @@ void LyXAction::init() { LFUN_RECONFIGURE, "reconfigure", N_("Reconfigure"), NoBuffer }, { LFUN_REDO, "redo", N_("Redo"), Noop }, - { LFUN_REF_BACK, "reference-back", "", ReadOnly }, { LFUN_REF_GOTO, "reference-goto", "", ReadOnly }, { LFUN_REF_INSERT, "reference-insert", N_("Insert cross reference"), ReadOnly }, + { LFUN_REFERENCE_GOTO, "reference-next", "", ReadOnly }, { LFUN_NEXT, "screen-down", "", ReadOnly }, { LFUN_NEXTSEL, "screen-down-select", "", ReadOnly }, + { LFUN_SCREEN_FONT_UPDATE, "screen-font-update", + "", NoBuffer }, { LFUN_CENTER, "screen-recenter", "", ReadOnly }, { LFUN_PRIOR, "screen-up", "", ReadOnly }, { LFUN_PRIORSEL, "screen-up-select", "", ReadOnly }, @@ -370,13 +361,13 @@ void LyXAction::init() { LFUN_GOTOFILEROW, "server-goto-file-row", "", Noop }, { LFUN_NOTIFY, "server-notify", "", ReadOnly }, { LFUN_SETXY, "server-set-xy", "", ReadOnly }, + { LFUN_SET_COLOR, "set-color", "", ReadOnly|NoBuffer }, { LFUN_SPELLCHECK, "spellchecker", "", Noop }, - { LFUN_INSERT_MATH, "symbol-insert", "", Noop }, { LFUN_SHIFT_TAB, "tab-backward", "", Noop }, { LFUN_TAB, "tab-forward", "", Noop }, { LFUN_TABINSERT, "tab-insert", "", Noop }, { LFUN_DIALOG_TABULAR_INSERT, "dialog-tabular-insert", - N_("Open Insert Tabular Dialog"), Noop }, + N_("Insert Table"), Noop }, { LFUN_TABULAR_FEATURE, "tabular-feature", N_("Tabular Features"), Noop }, { LFUN_INSET_TABULAR, "tabular-insert", @@ -384,6 +375,7 @@ void LyXAction::init() { LFUN_TEX, "tex-mode", N_("Toggle TeX style"), Noop }, { LFUN_INSET_TEXT, "text-insert", N_("Insert a new Text Inset"), Noop }, + { LFUN_INSET_THEOREM, "theorem-insert", "", Noop }, { LFUN_TOC_INSERT, "toc-insert", N_("Insert table of contents"), Noop }, { LFUN_TOCVIEW, "toc-view", @@ -417,15 +409,15 @@ void LyXAction::init() { LFUN_WORDRIGHTSEL, "word-forward-select", "", ReadOnly }, { LFUN_LOWCASE_WORD, "word-lowcase", "", Noop }, { LFUN_UPCASE_WORD, "word-upcase", "", Noop }, - { LFUN_DATE_INSERT, "date-insert", "", Noop }, - { LFUN_PARAGRAPH_SPACING, "paragraph-spacing", "", Noop }, - { LFUN_SET_COLOR, "set-color", "", 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_SCREEN_FONT_UPDATE, "screen-font-update", "", NoBuffer }, + { LFUN_MESSAGE, "message", + N_("Show message in minibuffer"), NoBuffer }, + { LFUN_MESSAGE_PUSH, "message-push", + N_("Push old message and show this one in minibuffer"), + NoBuffer }, + { LFUN_MESSAGE_POP, "message-pop", + N_("Pop old message and show it in the minibuffer"), + NoBuffer }, + { LFUN_TRANSPOSE_CHARS, "chars-transpose", "", Noop }, { LFUN_NOACTION, "", "", Noop } }; @@ -461,7 +453,7 @@ int LyXAction::searchActionArg(kb_action action, string const & arg) const << endl; return LFUN_UNKNOWN_ACTION; } - + arg_item::const_iterator aci = (*pit).second.find(arg); if (aci == (*pit).second.end()) { @@ -485,7 +477,7 @@ int LyXAction::searchActionArg(kb_action action, string const & arg) const // Returns a pseudo-action given an action and its argument. int LyXAction::getPseudoAction(kb_action action, string const & arg) const { - int psdaction = searchActionArg(action, arg); + int const psdaction = searchActionArg(action, arg); if (isPseudoAction(psdaction)) return psdaction; @@ -517,7 +509,7 @@ int LyXAction::getPseudoAction(kb_action action, string const & arg) const kb_action LyXAction::retrieveActionArg(int pseudo, string & arg) const { arg.erase(); // clear it to be sure. - + pseudo_map::const_iterator pit = lyx_pseudo_map.find(pseudo); if (pit != lyx_pseudo_map.end()) { @@ -540,7 +532,7 @@ int LyXAction::LookupFunc(string const & func) const // split action and arg string actstr; - string argstr = split(func, actstr, ' '); + string const argstr = split(func, actstr, ' '); lyxerr[Debug::ACTION] << "Action: " << actstr << '\n'; lyxerr[Debug::ACTION] << "Arg : " << argstr << '\n'; @@ -593,7 +585,7 @@ int LyXAction::getApproxFunc(string const & func) const string const LyXAction::getApproxFuncName(string const & func) const { - int f = getApproxFunc(func); + int const f = getApproxFunc(func); // This will return empty string if f isn't an action. return getActionName(f); } @@ -672,7 +664,18 @@ bool LyXAction::funcHasFlag(kb_action action, "No info about kb_action: " << action << '\n'; return false; } +} + +LyXAction::const_func_iterator LyXAction::func_begin() const +{ + return lyx_func_map.begin(); +} + + +LyXAction::const_func_iterator LyXAction::func_end() const +{ + return lyx_func_map.end(); }