X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXFunc.cpp;h=8cd2d66906122667452902f9d5ad33cc3d584ddd;hb=821e2764074c58791988e220ffa774fea926959a;hp=07807ac030341345878b64d9f133f84b0b9615c2;hpb=40144c3f78675e8d31d731fd34e9e560d4795a70;p=lyx.git

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 07807ac030..8cd2d66906 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,6 +446,7 @@ 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:
 		// FIXME: add special handling for about and prefs dialogs here
 		// which do not depend on GuiView.
@@ -608,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:
@@ -720,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;
@@ -737,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;
@@ -1235,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);
@@ -1597,6 +1603,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			DocumentClass * oldClass = buffer->params().documentClassPtr();
 			LayoutFileIndex bc = buffer->params().baseClassID();
 			LayoutFileList::get().reset(bc);
+			buffer->params().setBaseClass(bc);
 			buffer->params().makeDocumentClass();
 			updateLayout(oldClass, buffer);
 			updateFlags = Update::Force | Update::FitCursor;
@@ -1810,7 +1817,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())
@@ -1882,6 +1889,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:
@@ -1976,7 +1984,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_SINGLE_WINDOW:
+	case LyXRC::RC_OPEN_BUFFERS_IN_TABS:
 	case LyXRC::RC_SPELL_COMMAND:
 	case LyXRC::RC_TEMPDIRPATH:
 	case LyXRC::RC_TEMPLATEPATH: