]> git.lyx.org Git - lyx.git/blobdiff - src/LyXAction.C
remove almost all traces of old table
[lyx.git] / src / LyXAction.C
index e2abaa1dcf2c29cbd2b301f00622e7f56a2f7c69..5347503888a9402b89b2539ca99cab168070fe9e 100644 (file)
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
 #include "debug.h"
 #include "gettext.h"
 #include "support/lstrings.h"
+#if 1
+// 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;
 
 /*  
      NAMING RULES FOR USER-COMMANDS
@@ -64,7 +76,7 @@ void LyXAction::init()
        // instead of calling newFunc numerous times because of compilation
        // times. Since the array is not static we get back the memory it
        // occupies after the init is completed. It compiles several
-       //magnitudes faster.
+       // magnitudes faster.
        
        static bool init = false;
        if (init) return;
@@ -103,7 +115,8 @@ void LyXAction::init()
                { LFUN_BREAKPARAGRAPHKEEPLAYOUT, "break-paragraph-keep-layout",
                  "", Noop },
                { LFUN_BREAKPARAGRAPH_SKIP, "break-paragraph-skip", "", Noop },
-               { LFUN_BUILDPROG, "build-program", _("Build program"), Noop },
+               { LFUN_BUILDPROG, "build-program", 
+                 N_("Build program"), ReadOnly },
                { LFUN_AUTOSAVE, "buffer-auto-save", N_("Autosave"), Noop },
                { LFUN_BEGINNINGBUF, "buffer-begin",
                  N_("Go to beginning of document"), ReadOnly },
@@ -119,22 +132,32 @@ void LyXAction::init()
                  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",
                  "", Noop },
+               { LFUN_BUFFER_PRINT, "buffer-print-xtl", N_("Print"),
+                 ReadOnly },
+               { LFUN_PRINTER_PARAMS_GET, "printer-params-get",
+                 N_("Get the printer parameters"), ReadOnly },
                { 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_PREVBUFFER, "buffer-previous",
-                 N_("Switch to previous document"), ReadOnly },
                { 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 },
+#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",
@@ -142,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 },
@@ -150,7 +174,7 @@ void LyXAction::init()
                  ReadOnly },
                { LFUN_RIGHT, "char-forward", N_("Go one char forward"),
                  ReadOnly },
-               { LFUN_INSERT_CITATION, "citation-insert",
+               { LFUN_CITATION_CREATE, "citation-insert",
                  N_("Insert citation"), Noop },
                { LFUN_EXEC_COMMAND, "command-execute", "", NoBuffer },
                { LFUN_PREFIX, "command-prefix",
@@ -179,7 +203,13 @@ void LyXAction::init()
                { 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-insert",
+                 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_INSET_GRAPHICS, "graphics-insert",
+                 N_("Insert Graphics"), Noop },
                { LFUN_FILE_INSERT, "file-insert", "", Noop },
                { LFUN_FILE_INSERT_ASCII, "file-insert-ascii", "", Noop },
                { LFUN_FILE_NEW, "file-new", "", NoBuffer },
@@ -202,16 +232,32 @@ 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",
                  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_INDEX_INSERT, "index-insert",
+               { LFUN_INDEX_CREATE, "index-insert",
                  N_("Insert index item"), Noop },
                { LFUN_INDEX_INSERT_LAST, "index-insert-last",
                  N_("Insert last index item"), Noop },
@@ -227,6 +273,7 @@ void LyXAction::init()
                  ReadOnly },
                { LFUN_INSERT_LABEL, "label-insert", N_("Insert Label"),
                  Noop },
+               { LFUN_LANGUAGE, "language", N_("Change language"), Noop },
                { LFUN_LATEX_LOG, "latex-view-log", N_("View LaTeX log"),
                  ReadOnly },
                { LFUN_LAYOUT, "layout", "", Noop },
@@ -243,7 +290,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",
@@ -254,13 +304,21 @@ void LyXAction::init()
                  N_("Select to end of line"), ReadOnly },
                { LFUN_LOA_INSERT, "loa-insert",
                  N_("Insert list of algorithms"), Noop },
+               { LFUN_LOAVIEW, "loa-view",
+                 N_("View list of algorithms"), ReadOnly },
                { LFUN_LOF_INSERT, "lof-insert",
                  N_("Insert list of figures"), Noop },
+               { LFUN_LOFVIEW, "lof-view",
+                 N_("View list of figures"), ReadOnly },
                { LFUN_LOT_INSERT, "lot-insert",
                  N_("Insert list of tables"), 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 },
@@ -277,6 +335,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 },
@@ -289,14 +348,18 @@ 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",
                  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",
-                 "Save Preferences", NoBuffer },
+                 N_("Save Preferences"), NoBuffer },
                { LFUN_PASTESELECTION, "primary-selection-paste", "", Noop },
                { LFUN_PROTECTEDSPACE, "protected-space-insert",
                  N_("Insert protected space"), Noop },
@@ -304,16 +367,17 @@ 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",
-                 N_("Insert cross reference"), Noop },
-               { LFUN_REFTOGGLE, "reference-toggle", "", Noop },
+               { LFUN_REF_BACK, "reference-back", "", ReadOnly },
+               { LFUN_REF_GOTO, "reference-goto", "", ReadOnly },
+               { LFUN_REF_INSERT, "reference-insert",
+                 N_("Insert cross reference"), ReadOnly },
                { LFUN_NEXT, "screen-down", "", ReadOnly },
                { LFUN_NEXTSEL, "screen-down-select", "", ReadOnly },
                { LFUN_CENTER, "screen-recenter", "", ReadOnly },
                { LFUN_PRIOR, "screen-up", "", ReadOnly },
                { LFUN_PRIORSEL, "screen-up-select", "", ReadOnly },
+               { LFUN_SCROLL_INSET, "inset-scroll", N_("Scroll inset"),
+                 ReadOnly },
                { LFUN_SELFINSERT, "self-insert", "", Noop },
                { LFUN_CHARATCURSOR, "server-char-after", "", ReadOnly },
                { LFUN_GETFONT, "server-get-font", "", ReadOnly },
@@ -327,10 +391,18 @@ void LyXAction::init()
                { LFUN_SETXY, "server-set-xy", "", ReadOnly },
                { 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_TABLE, "table-insert", N_("Insert Table"), Noop },
+               { 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",
+                 N_("Insert a new Tabular Inset"), Noop },
                { LFUN_TEX, "tex-mode", N_("Toggle TeX style"), Noop },
+               { LFUN_INSET_TEXT, "text-insert",
+                 N_("Insert a new Text Inset"), Noop },
                { LFUN_TOC_INSERT, "toc-insert",
                  N_("Insert table of contents"), Noop },
                { LFUN_TOCVIEW, "toc-view",
@@ -344,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 },
@@ -363,6 +436,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_NOACTION, "", "", Noop }
        };
 
@@ -491,9 +573,10 @@ int LyXAction::LookupFunc(string const & func) const
 }
 
 
-#ifdef WITH_WARNINGS
-#warning Not working as it should.
-#endif
+//#ifdef WITH_WARNINGS
+//#warning Not working as it should.
+//#endif
+// I have no clue what is wrong with it... (Lgb)
 int LyXAction::getApproxFunc(string const & func) const
        // This func should perhaps also be able to return a list of all
        // actions that has func as a prefix. That should actually be quite
@@ -526,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.
@@ -534,18 +617,29 @@ string LyXAction::getApproxFuncName(string const & func) const
 }
 
 
-string LyXAction::getActionName(int action) const
+string const 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();
 }
 
 
 // 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;
@@ -591,7 +685,8 @@ bool LyXAction::funcHasFlag(kb_action action,
                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;
        }