X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxfunc.C;h=7de71684d5d8267f2de39d929e5b4b88325e2ce3;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=cefad6372dd6d242ab3d1923b176b9410254cb0d;hpb=eaa33dca6def75e9bf48582073c75b256821fd25;p=lyx.git

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index cefad6372d..7de71684d5 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -352,16 +352,20 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 		flag.message(from_utf8(N_("Exiting")));
 		flag.enabled(true);
 		return flag;
-	}  else if (cmd.action == LFUN_BOOKMARK_GOTO) {
+	} else if (cmd.action == LFUN_BOOKMARK_GOTO) {
 		// bookmarks can be valid even if there is no opened buffer
 		flag.enabled(LyX::ref().session().bookmarks().isValid(convert<unsigned int>(to_utf8(cmd.argument()))));
 		return flag;
 	} else if (cmd.action == LFUN_BOOKMARK_CLEAR) {
 		flag.enabled(LyX::ref().session().bookmarks().size() > 0);
 		return flag;
+	} else if (cmd.action == LFUN_TOOLBAR_TOGGLE_STATE) {
+		ToolbarBackend::Flags flags = lyx_view_->getToolbarState(to_utf8(cmd.argument()));
+		if (!(flags & ToolbarBackend::AUTO))
+			flag.setOnOff(flags & ToolbarBackend::ON);
+		return flag;
 	}
 
-
 	LCursor & cur = view()->cursor();
 
 	/* In LyX/Mac, when a dialog is open, the menus of the
@@ -373,7 +377,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 	   http://bugzilla.lyx.org/show_bug.cgi?id=1941#c4
 	*/
 	Buffer * buf;
-	if (cmd.origin == FuncRequest::UI && !lyx_view_->hasFocus())
+	if (cmd.origin == FuncRequest::MENU && !lyx_view_->hasFocus())
 		buf = 0;
 	else
 		buf = lyx_view_->buffer();
@@ -573,6 +577,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 		break;
 	}
 
+
 	// this one is difficult to get right. As a half-baked
 	// solution, we consider only the first action of the sequence
 	case LFUN_COMMAND_SEQUENCE: {
@@ -635,7 +640,6 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 	case LFUN_BUFFER_PREVIOUS:
 	case LFUN_WINDOW_NEW:
 	case LFUN_WINDOW_CLOSE:
-	case LFUN_TOOLBAR_TOGGLE_STATE:
 		// these are handled in our dispatch()
 		break;
 
@@ -1248,6 +1252,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			    name == "bibtex" ||
 			    name == "index" ||
 			    name == "label" ||
+			    name == "nomenclature" ||
 			    name == "ref" ||
 			    name == "toc" ||
 			    name == "url") {
@@ -1710,15 +1715,11 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			// Redraw screen unless explicitly told otherwise.
 			// This also initializes the position cache for all insets
 			// in (at least partially) visible top-level paragraphs.
-			bool needSecondUpdate = false;
-			if (updateFlags != Update::None)
-				view()->update(updateFlags);
-			else
-				needSecondUpdate = view()->fitCursor();
+			std::pair<bool, bool> needSecondUpdate = view()->update(updateFlags);
+
+			if (needSecondUpdate.first)
+				view()->buffer()->changed(needSecondUpdate.second);
 
-			if (needSecondUpdate || updateFlags != Update::None) {
-				view()->buffer()->changed();
-			}
 			lyx_view_->updateStatusBar();
 
 			// if we executed a mutating lfun, mark the buffer as dirty
@@ -1732,26 +1733,18 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 			}
 		}
 	}
-	if (!quitting)
-		// FIXME UNICODE: _() does not support anything but ascii.
-		// Do we need a to_ascii() method?
+	if (!quitting) {
+		lyx_view_->updateMenubar();
+		lyx_view_->updateToolbars();
 		sendDispatchMessage(getMessage(), cmd);
+	}
 }
 
 
 void LyXFunc::sendDispatchMessage(docstring const & msg, FuncRequest const & cmd)
 {
-	/* When an action did not originate from the UI/kbd, it makes
-	 * sense to avoid updating the GUI. It turns out that this
-	 * fixes bug 1941, for reasons that are described here:
-	 * http://bugzilla.lyx.org/show_bug.cgi?id=1941#c4
-	 */
-	if (cmd.origin != FuncRequest::INTERNAL) {
-		lyx_view_->updateMenubar();
-		lyx_view_->updateToolbars();
-	}
-
-	const bool verbose = (cmd.origin == FuncRequest::UI
+	const bool verbose = (cmd.origin == FuncRequest::MENU
+			      || cmd.origin == FuncRequest::TOOLBAR
 			      || cmd.origin == FuncRequest::COMMANDBUFFER);
 
 	if (cmd.action == LFUN_SELF_INSERT || !verbose) {
@@ -2095,6 +2088,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_LOADSESSION:
 	case LyXRC::RC_CHKTEX_COMMAND:
 	case LyXRC::RC_CONVERTER:
+	case LyXRC::RC_CONVERTER_CACHE_MAXAGE:
 	case LyXRC::RC_COPIER:
 	case LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR:
 	case LyXRC::RC_CUSTOM_EXPORT_COMMAND:
@@ -2191,6 +2185,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 	case LyXRC::RC_USER_NAME:
 	case LyXRC::RC_USETEMPDIR:
 	case LyXRC::RC_USE_ALT_LANG:
+	case LyXRC::RC_USE_CONVERTER_CACHE:
 	case LyXRC::RC_USE_ESC_CHARS:
 	case LyXRC::RC_USE_INP_ENC:
 	case LyXRC::RC_USE_PERS_DICT: