X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXFunc.cpp;h=ee4702067d5cc75a9b817a00af64c086c2f48b0b;hb=027563eec2d2a1b81391b221f9ca40d823713235;hp=a290de8d95b00d06de7c29f58bb2cbcbc7fdd7cd;hpb=5d112c185c8feaf24f87002b09746b0b5e3373d2;p=lyx.git

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index a290de8d95..ee4702067d 100644
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -66,6 +66,7 @@
 #include "insets/InsetGraphics.h"
 #include "insets/InsetInclude.h"
 #include "insets/InsetNote.h"
+#include "insets/InsetSpace.h"
 #include "insets/InsetTabular.h"
 #include "insets/InsetVSpace.h"
 #include "insets/InsetWrap.h"
@@ -216,7 +217,7 @@ void LyXFunc::setLyXView(LyXView * lv)
 }
 
 
-void LyXFunc::handleKeyFunc(kb_action action)
+void LyXFunc::handleKeyFunc(FuncCode action)
 {
 	char_type c = encoded_last_key;
 
@@ -445,11 +446,11 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 	// FIXME: these cases should be hidden in GuiView::getStatus().
 	case LFUN_DIALOG_TOGGLE:
 	case LFUN_DIALOG_SHOW:
+	case LFUN_UI_TOGGLE:
 	case LFUN_DIALOG_UPDATE:
-		if (cmd.argument() == "prefs"
-		    || cmd.argument() == "aboutlyx")
-			enable = true;
-		else if (lyx_view_)
+		// FIXME: add special handling for about and prefs dialogs here
+		// which do not depend on GuiView.
+		if (lyx_view_)
 			return lyx_view_->getStatus(cmd);
 		else
 			enable = false;
@@ -609,7 +610,6 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 	case LFUN_DIALOG_HIDE:
 	case LFUN_DIALOG_DISCONNECT_INSET:
 	case LFUN_BUFFER_CHILD_OPEN:
-	case LFUN_UI_TOGGLE:
 	case LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE:
 	case LFUN_KEYMAP_OFF:
 	case LFUN_KEYMAP_PRIMARY:
@@ -721,7 +721,7 @@ bool loadLayoutFile(string const & name, string const & buf_path)
 
 	LayoutFile & tc = LayoutFileList::get()[name];
 	if (!tc.load(buf_path)) {
-		docstring s = bformat(_("The document class %1$s."
+		docstring s = bformat(_("The document class %1$s "
 				   "could not be loaded."), from_utf8(name));
 		Alert::error(_("Could not load class"), s);
 		return false;
@@ -738,7 +738,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new);
 void LyXFunc::dispatch(FuncRequest const & cmd)
 {
 	string const argument = to_utf8(cmd.argument());
-	kb_action const action = cmd.action;
+	FuncCode const action = cmd.action;
 
 	LYXERR(Debug::ACTION, "\nLyXFunc::dispatch: cmd: " << cmd);
 	//lyxerr << "LyXFunc::dispatch: cmd: " << cmd << endl;
@@ -815,16 +815,6 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 		}
 
 		// --- Menus -----------------------------------------------
-		case LFUN_BUFFER_NEW:
-			lyx_view_->newDocument(argument, false);
-			updateFlags = Update::None;
-			break;
-
-		case LFUN_BUFFER_NEW_TEMPLATE:
-			lyx_view_->newDocument(argument, true);
-			updateFlags = Update::None;
-			break;
-
 		case LFUN_BUFFER_CLOSE:
 			lyx_view_->closeBuffer();
 			updateFlags = Update::None;
@@ -1246,6 +1236,11 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 				data = InsetNoteMailer::params2string(p);
 				break;
 			} 
+			case SPACE_CODE: {
+				InsetSpaceParams p;
+				data = InsetSpaceMailer::params2string(p);
+				break;
+			} 
 			case VSPACE_CODE: {
 				VSpace space;
 				data = InsetVSpaceMailer::params2string(space);
@@ -1821,7 +1816,7 @@ void LyXFunc::setMessage(docstring const & m) const
 }
 
 
-docstring const LyXFunc::viewStatusMessage()
+docstring LyXFunc::viewStatusMessage()
 {
 	// When meta-fake key is pressed, show the key sequence so far + "M-".
 	if (wasMetaKey())
@@ -1893,6 +1888,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_BIBTEX_COMMAND:
 	case LyXRC::RC_BINDFILE:
 	case LyXRC::RC_CHECKLASTFILES:
+	case LyXRC::RC_COMPLETION_CURSOR_TEXT:
 	case LyXRC::RC_COMPLETION_INLINE_DELAY:
 	case LyXRC::RC_COMPLETION_INLINE_DOTS:
 	case LyXRC::RC_COMPLETION_INLINE_MATH:
@@ -1926,6 +1922,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_EXAMPLEPATH:
 	case LyXRC::RC_FONT_ENCODING:
 	case LyXRC::RC_FORMAT:
+	case LyXRC::RC_GROUP_LAYOUTS:
 	case LyXRC::RC_INDEX_COMMAND:
 	case LyXRC::RC_INPUT:
 	case LyXRC::RC_KBMAP:
@@ -1986,6 +1983,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_SERVERPIPE:
 	case LyXRC::RC_SET_COLOR:
 	case LyXRC::RC_SHOW_BANNER:
+	case LyXRC::RC_OPEN_BUFFERS_IN_TABS:
 	case LyXRC::RC_SPELL_COMMAND:
 	case LyXRC::RC_TEMPDIRPATH:
 	case LyXRC::RC_TEMPLATEPATH: