remove obsolete FIXMEs

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 03cacfeae15360603a571211de5ff5e90bbedec3..dbda91f6c8d513a28b6d636f8e9c8cf4dddacc09 100644 (file)
--- 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,12 +577,6 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
                break;
        }
 
-       case LFUN_TOOLBAR_TOGGLE_STATE: {
-               ToolbarBackend::Flags flags = lyx_view_->getToolbarState(to_utf8(cmd.argument()));
-               if (!(flags & ToolbarBackend::AUTO))
-                       flag.setOnOff(flags & ToolbarBackend::ON);
-               break;
-       }
 
        // this one is difficult to get right. As a half-baked
        // solution, we consider only the first action of the sequence
@@ -1254,6 +1252,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                            name == "bibtex" ||
                            name == "index" ||
                            name == "label" ||
+                           name == "nomenclature" ||
                            name == "ref" ||
                            name == "toc" ||
                            name == "url") {
@@ -1723,7 +1722,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                needSecondUpdate = view()->fitCursor();
 
                        if (needSecondUpdate || updateFlags != Update::None) {
-                               view()->buffer()->changed();
+                               view()->buffer()->changed(updateFlags & Update::SinglePar);
                        }
                        lyx_view_->updateStatusBar();
 
@@ -1738,26 +1737,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) {