fix compilation pb ; update eu.po

[lyx.git] / src / LyXAction.C

diff --git a/src/LyXAction.C b/src/LyXAction.C
index f6313f3b5ebeeb0d2502a1269d0f792bc4a32904..f789969da6000d1384ccefe5aa766c40ce9b64d2 100644 (file)
--- 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 },
@@ -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,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"),
@@ -143,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 },
@@ -154,7 +143,7 @@ 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 },
@@ -200,13 +189,13 @@ void LyXAction::init()
                { 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_FLOATSOPERATE, "floats-operate", "", ReadOnly },
                { 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"),
@@ -223,13 +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_RIGHTSEL, "forward-select", N_("Select next char"),
                  ReadOnly },
                { LFUN_HFILL, "hfill-insert",
@@ -303,10 +287,6 @@ void LyXAction::init()
                { 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 },
@@ -323,9 +303,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 },
@@ -429,6 +409,15 @@ 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_NOACTION, "", "", Noop }
        };
 
@@ -675,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();
 }