]> git.lyx.org Git - lyx.git/blobdiff - src/LyXAction.C
In for a penny, in for a pound. Consistent use of // -*- C++ -*-
[lyx.git] / src / LyXAction.C
index e2ff7d3b71be497235add2e048e2d39099393d27..25c91a8bd21e065d5303bef1f78bc83aab4feeb8 100644 (file)
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 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
 
 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
@@ -73,9 +62,16 @@ void LyXAction::init()
        // occupies after the init is completed. It compiles several
        // magnitudes faster.
        
-       static bool init = false;
+       static bool init;
        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 },
@@ -119,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_CHILD_CREATE, "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 },
@@ -128,9 +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 },
-#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"),
@@ -202,8 +195,9 @@ void LyXAction::init()
                { LFUN_FILE_OPEN, "file-open", _("Open a file"), NoBuffer },
                { LFUN_MENUSEARCH, "find-replace", N_("Find & Replace"),
                  ReadOnly },
-               { LFUN_INSET_FLOAT, "float-insert", "", Noop },
-               { LFUN_FLOATSOPERATE, "floats-operate", "", ReadOnly },
+               { LFUN_INSET_FLOAT, "float-insert", "Insert a Float", Noop },
+               { LFUN_INSET_WIDE_FLOAT, "float-wide-insert",
+                 "Insert a wide Float", 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"),
@@ -220,13 +214,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_RIGHTSEL, "forward-select", N_("Select next char"),
                  ReadOnly },
                { LFUN_HFILL, "hfill-insert",
@@ -267,7 +256,7 @@ void LyXAction::init()
                { LFUN_LAYOUT_COPY, "layout-copy",
                  N_("Copy paragraph environment type"), Noop },
                { LFUN_LAYOUT_DOCUMENT, "layout-document", "", ReadOnly },
-               { LFUN_LAYOUTNO, "layout-number", "", Noop }, // internal only
+               { LFUN_LAYOUTNO, "", "internal only", Noop },
                { LFUN_LAYOUT_PARAGRAPH, "layout-paragraph", "", ReadOnly },
                { LFUN_LAYOUT_PASTE, "layout-paste",
                  N_("Paste paragraph environment type"), Noop },
@@ -285,25 +274,9 @@ void LyXAction::init()
                { 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",
-                 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 },
                { LFUN_INSET_MARGINAL, "marginalnote-insert",
                  N_("Insert Marginalnote"), Noop },
-#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 },
@@ -320,9 +293,9 @@ 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 },
@@ -406,7 +379,7 @@ void LyXAction::init()
                { LFUN_UP, "up", "", ReadOnly },
                { LFUN_UPSEL, "up-select", "", ReadOnly },
                { LFUN_URL, "url-insert", "", Noop },
-               { LFUN_INSERT_URL, "", "", Noop },
+               { LFUN_INSERT_URL, "", "internal only", Noop },
                { LFUN_VC_CHECKIN, "vc-check-in", "", ReadOnly },
                { LFUN_VC_CHECKOUT, "vc-check-out", "", ReadOnly },
                { LFUN_VC_HISTORY, "vc-history", "", ReadOnly },
@@ -426,6 +399,17 @@ void LyXAction::init()
                { LFUN_WORDRIGHTSEL, "word-forward-select", "", ReadOnly },
                { LFUN_LOWCASE_WORD, "word-lowcase", "", Noop },
                { LFUN_UPCASE_WORD, "word-upcase", "", Noop },
+               { 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_FLOAT_LIST, "float-list", "Insert a float list", Noop },
+               { LFUN_ESCAPE, "escape", "", Noop },
                { LFUN_NOACTION, "", "", Noop }
        };
 
@@ -672,7 +656,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();
 }