remove almost all traces of old table

[lyx.git] / src / LyXAction.C

diff --git a/src/LyXAction.C b/src/LyXAction.C
index fae2dc2a4bd2b363921b1671c9d720d7bd988cc1..5347503888a9402b89b2539ca99cab168070fe9e 100644 (file)
--- 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",
@@ -355,11 +367,10 @@ void LyXAction::init()
                { LFUN_RECONFIGURE, "reconfigure",
                  N_("Reconfigure"), NoBuffer },
                { LFUN_REDO, "redo", N_("Redo"), Noop },
-               { LFUN_REFBACK, "reference-back", "", ReadOnly },
-               { LFUN_REFGOTO, "reference-goto", "", ReadOnly },
-               { LFUN_INSERT_REF, "reference-insert",
+               { LFUN_REF_BACK, "reference-back", "", ReadOnly },
+               { LFUN_REF_GOTO, "reference-goto", "", ReadOnly },
+               { LFUN_REF_INSERT, "reference-insert",
                  N_("Insert cross reference"), ReadOnly },
-               { LFUN_REFTOGGLE, "reference-toggle", "", Noop },
                { LFUN_NEXT, "screen-down", "", ReadOnly },
                { LFUN_NEXTSEL, "screen-down-select", "", ReadOnly },
                { LFUN_CENTER, "screen-recenter", "", ReadOnly },
@@ -383,9 +394,8 @@ void LyXAction::init()
                { 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 },
-#endif
+               { LFUN_DIALOG_TABULAR_INSERT, "dialog-tabular-insert",
+                 N_("Open Insert Tabular Dialog"), Noop },
                { LFUN_TABULAR_FEATURE, "tabular-feature",
                  N_("Tabular Features"), Noop },
                { LFUN_INSET_TABULAR, "tabular-insert",
@@ -406,6 +416,7 @@ void LyXAction::init()
                { LFUN_UP, "up", "", ReadOnly },
                { LFUN_UPSEL, "up-select", "", ReadOnly },
                { LFUN_URL, "url-insert", "", Noop },
+               { LFUN_INSERT_URL, "", "", Noop },
                { LFUN_VC_CHECKIN, "vc-check-in", "", ReadOnly },
                { LFUN_VC_CHECKOUT, "vc-check-out", "", ReadOnly },
                { LFUN_VC_HISTORY, "vc-history", "", ReadOnly },
@@ -433,6 +444,7 @@ void LyXAction::init()
                { 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_NOACTION, "", "", Noop }
        };
 
@@ -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;