X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXAction.C;h=b3b12158f9819b04b22d100547048c1aa11f04bd;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=ddef58b000315ac1a3a1ad792891cec235c99386;hpb=c9c6ed0b7fbccbbed8b5ef48d05cfefa5acfb99e;p=lyx.git

diff --git a/src/LyXAction.C b/src/LyXAction.C
index ddef58b000..b3b12158f9 100644
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -22,8 +22,11 @@
 
 #include <boost/assert.hpp>
 
-using lyx::support::split;
-using lyx::support::trim;
+
+namespace lyx {
+
+using support::split;
+using support::trim;
 
 using std::endl;
 using std::string;
@@ -99,6 +102,7 @@ void LyXAction::init()
 		{ LFUN_APPENDIX, "appendix", Noop },
 		{ LFUN_BOOKMARK_GOTO, "bookmark-goto", ReadOnly },
 		{ LFUN_BOOKMARK_SAVE, "bookmark-save", ReadOnly },
+		{ LFUN_BOOKMARK_CLEAR, "bookmark-clear", ReadOnly },
 		{ LFUN_BREAK_LINE, "break-line", Noop },
 		{ LFUN_BREAK_PARAGRAPH, "break-paragraph", Noop },
 		{ LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT, "break-paragraph-keep-layout", Noop },
@@ -258,13 +262,12 @@ void LyXAction::init()
 		{ LFUN_REDO, "redo", Noop },
 		{ LFUN_LABEL_GOTO, "label-goto", ReadOnly },
 		{ LFUN_REFERENCE_NEXT, "reference-next", ReadOnly },
-		{ LFUN_SCREEN_DOWN, "screen-down", ReadOnly | NoUpdate},
+		{ LFUN_SCREEN_DOWN, "screen-down", ReadOnly },
 		{ LFUN_SCREEN_DOWN_SELECT, "screen-down-select", ReadOnly },
 		{ LFUN_SCREEN_FONT_UPDATE, "screen-font-update", NoBuffer },
 		{ LFUN_SCREEN_RECENTER, "screen-recenter", ReadOnly },
-		{ LFUN_SCREEN_UP, "screen-up", ReadOnly | NoUpdate},
+		{ LFUN_SCREEN_UP, "screen-up", ReadOnly },
 		{ LFUN_SCREEN_UP_SELECT, "screen-up-select", ReadOnly },
-		{ LFUN_INSET_SCROLL, "inset-scroll", ReadOnly },
 		{ LFUN_SELF_INSERT, "self-insert", SingleParUpdate },
 		{ LFUN_SPACE_INSERT, "space-insert", Noop },
 		{ LFUN_SERVER_CHAR_AFTER, "server-char-after", ReadOnly },
@@ -313,9 +316,9 @@ void LyXAction::init()
 		{ LFUN_CHARS_TRANSPOSE, "chars-transpose", Noop },
 		{ LFUN_FLOAT_LIST, "float-list", Noop },
 		{ LFUN_ESCAPE, "escape", ReadOnly },
-		{ LFUN_TOOLTIPS_TOGGLE, "tooltips-toggle", NoBuffer },
 		{ LFUN_CHANGES_TRACK, "changes-track", Noop },
 		{ LFUN_CHANGES_OUTPUT, "changes-output", Noop },
+		{ LFUN_CHANGE_NEXT, "change-next", ReadOnly },
 		{ LFUN_CHANGES_MERGE, "changes-merge", Noop },
 		{ LFUN_CHANGE_ACCEPT, "change-accept", Noop },
 		{ LFUN_CHANGE_REJECT, "change-reject", Noop },
@@ -323,16 +326,15 @@ void LyXAction::init()
 		{ LFUN_ALL_CHANGES_REJECT, "all-changes-reject", Noop },
 		{ LFUN_DIALOG_SHOW, "dialog-show", NoBuffer },
 		{ LFUN_DIALOG_SHOW_NEW_INSET, "dialog-show-new-inset", Noop },
-		{ LFUN_DIALOG_SHOW_NEXT_INSET, "dialog-show-next-inset", Noop },
 		{ LFUN_DIALOG_UPDATE, "dialog-update", NoBuffer },
 		{ LFUN_DIALOG_HIDE, "dialog-hide", Noop },
 		{ LFUN_DIALOG_DISCONNECT_INSET, "dialog-disconnect-inset", Noop },
 		{ LFUN_INSET_APPLY, "inset-apply", Noop },
+		{ LFUN_INSET_DISSOLVE, "inset-dissolve", Noop },
 		{ LFUN_INSET_INSERT, "inset-insert", Noop },
 		{ LFUN_INSET_MODIFY, "", Noop },
 		{ LFUN_INSET_DIALOG_UPDATE, "", Noop },
 		{ LFUN_INSET_SETTINGS, "inset-settings", ReadOnly },
-		{ LFUN_INSET_DIALOG_SHOW, "inset-dialog-show", Noop },
 		{ LFUN_PARAGRAPH_PARAMS_APPLY, "paragraph-params-apply", Noop },
 		{ LFUN_PARAGRAPH_UPDATE, "", Noop },
 		{ LFUN_EXTERNAL_EDIT, "external-edit", Noop },
@@ -361,6 +363,13 @@ void LyXAction::init()
 		{ LFUN_MOUSE_TRIPLE, "", ReadOnly },
 		{ LFUN_PARAGRAPH_MOVE_DOWN, "paragraph-move-down", Noop },
 		{ LFUN_PARAGRAPH_MOVE_UP, "paragraph-move-up", Noop },
+		{ LFUN_WINDOW_NEW, "window-new", NoBuffer },
+		{ LFUN_WINDOW_CLOSE, "window-close", NoBuffer },
+		{ LFUN_UNICODE_INSERT, "unicode-insert", Noop },
+		{ LFUN_TOOLBAR_TOGGLE_STATE, "", NoBuffer },
+		{ LFUN_NOMENCL_INSERT, "nomencl-insert", Noop },
+		{ LFUN_NOMENCL_PRINT, "nomencl-print", Noop },
+
 		{ LFUN_NOACTION, "", Noop }
 	};
 
@@ -433,3 +442,6 @@ ostream & operator<<(ostream & o, kb_action action)
 {
 	return o << int(action);
 }
+
+
+} // namespace lyx