X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXAction.C;h=5347503888a9402b89b2539ca99cab168070fe9e;hb=3ff3b95d3c7fdc814cb774221370964da4e283ce;hp=bd8d6bce31a83f0f9f38c38ab99bc79e6bda24e1;hpb=096db9161eedd0c270a5fadef7dde2f12908dc90;p=lyx.git diff --git a/src/LyXAction.C b/src/LyXAction.C index bd8d6bce31..5347503888 100644 --- a/src/LyXAction.C +++ b/src/LyXAction.C @@ -19,9 +19,14 @@ #include "gettext.h" #include "support/lstrings.h" #if 1 -// only to get access to NEW_INSETS and NEW_TABULAR +// only to get access to NEW_INSETS #include "lyxparagraph.h" #endif +#if 1 +// only to get access to NEW_EXPORT +#include "exporter.h" +#endif + using std::ostream; using std::endl; @@ -149,6 +154,10 @@ void LyXAction::init() N_("Switch to an open document"), ReadOnly }, { LFUN_READ_ONLY_TOGGLE, "buffer-toggle-read-only", N_("Toggle read-only"), ReadOnly }, +#ifdef NEW_EXPORT + { LFUN_UPDATE, "buffer-update", N_("Update"), ReadOnly }, + { LFUN_PREVIEW, "buffer-view", N_("View") , ReadOnly }, +#else { LFUN_RUNLATEX, "buffer-typeset", N_("Update DVI"), ReadOnly }, { LFUN_RUNDVIPS, "buffer-typeset-ps", @@ -156,6 +165,7 @@ void LyXAction::init() { LFUN_PREVIEW, "buffer-view", N_("View DVI") , ReadOnly }, { LFUN_PREVIEWPS, "buffer-view-ps", N_("View PostScript") , ReadOnly }, +#endif { LFUN_MENUWRITE, "buffer-write", N_("Save"), ReadOnly }, { LFUN_MENUWRITEAS, "buffer-write-as", N_("Save As"), ReadOnly }, @@ -338,6 +348,8 @@ void LyXAction::init() N_("Go one paragraph down"), ReadOnly }, { LFUN_DOWN_PARAGRAPHSEL, "paragraph-down-select", N_("Select next paragraph"), ReadOnly }, + { LFUN_GOTO_PARAGRAPH, "paragraph-goto", + N_("Go to paragraph"), ReadOnly }, { LFUN_UP_PARAGRAPH, "paragraph-up", N_("Go one paragraph up"), ReadOnly }, { LFUN_UP_PARAGRAPHSEL, "paragraph-up-select", @@ -357,7 +369,7 @@ void LyXAction::init() { LFUN_REDO, "redo", N_("Redo"), Noop }, { LFUN_REF_BACK, "reference-back", "", ReadOnly }, { LFUN_REF_GOTO, "reference-goto", "", ReadOnly }, - { LFUN_REF_CREATE, "reference-insert", + { LFUN_REF_INSERT, "reference-insert", N_("Insert cross reference"), ReadOnly }, { LFUN_NEXT, "screen-down", "", ReadOnly }, { LFUN_NEXTSEL, "screen-down-select", "", ReadOnly }, @@ -597,7 +609,7 @@ int LyXAction::getApproxFunc(string const & func) const } -string LyXAction::getApproxFuncName(string const & func) const +string const LyXAction::getApproxFuncName(string const & func) const { int f = getApproxFunc(func); // This will return empty string if f isn't an action. @@ -605,7 +617,7 @@ string LyXAction::getApproxFuncName(string const & func) const } -string LyXAction::getActionName(int action) const +string const LyXAction::getActionName(int action) const { kb_action ac; string arg; @@ -627,7 +639,7 @@ string LyXAction::getActionName(int action) const // Returns one line help associated with a (pseudo)action, i.e. appends // the argument of the action if necessary -string LyXAction::helpText(int pseudoaction) const +string const LyXAction::helpText(int pseudoaction) const { string help, arg; kb_action action;