reduce number of calls to LyXText::getFont

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index e7168c851118be0703e1bd15446000720f832943..36ec96f45b027951f4776528efd40d91926fd93e 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -462,6 +462,24 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
                break;
        }
 
+       case LFUN_INSET_APPLY: {
+               string const name = cmd.getArg(0);
+               InsetBase * inset = owner->getDialogs().getOpenInset(name);
+               if (inset) {
+                       FuncRequest fr(LFUN_INSET_MODIFY, cmd.argument);
+                       FuncStatus fs;
+                       bool const success = inset->getStatus(cur, fr, fs);
+                       // Every inset is supposed to handle this
+                       BOOST_ASSERT(success);
+                       flag |= fs;
+               } else {
+                       FuncRequest fr(LFUN_INSET_INSERT, cmd.argument);
+                       flag |= getStatus(fr);
+               }
+               enable = flag.enabled();
+               break;
+       }
+
        case LFUN_DIALOG_SHOW: {
                string const name = cmd.getArg(0);
                if (!buf)
@@ -475,10 +493,14 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
                                && lyxrc.print_command != "none";
                else if (name == "character" || name == "mathpanel")
                        enable = cur.inset().lyxCode() != InsetBase::ERT_CODE;
-               else if (name == "vclog")
-                       enable = buf->lyxvc().inUse();
                else if (name == "latexlog")
                        enable = IsFileReadable(buf->getLogName().second);
+#if !defined (USE_ASPELL) && !defined (USE_ISPELL) && !defined (USE_PSPELL)
+               else if (name == "spellchecker")
+                       enable = false;
+#endif
+               else if (name == "vclog")
+                       enable = buf->lyxvc().inUse();
                break;
        }
 
@@ -1324,6 +1346,22 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        break;
                }
 
+               case LFUN_INSET_APPLY: {
+                       string const name = cmd.getArg(0);
+                       InsetBase * inset = owner->getDialogs().getOpenInset(name);
+                       if (inset) {
+                               FuncRequest fr(LFUN_INSET_MODIFY, argument);
+                               inset->dispatch(view()->cursor(), fr);
+                       } else {
+                               FuncRequest fr(LFUN_INSET_INSERT, argument);
+                               dispatch(fr);
+                       }
+                       // ideally, the update flag should be set by the insets,
+                       // but this is not possible currently
+                       update = true;
+                       break;
+               }
+
                case LFUN_ALL_INSETS_TOGGLE: {
                        string action;
                        string const name = split(argument, action, ' ');
@@ -1437,12 +1475,14 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 
                        owner->message(_("Converting document to new document class..."));
                        ErrorList el;
-                       lyx::cap::SwitchLayoutsBetweenClasses(
+                       lyx::cap::SwitchBetweenClasses(
                                old_class, new_class,
                                buffer->paragraphs(), el);
 
                        bufferErrors(*buffer, el);
                        view()->showErrorList(_("Class switch"));
+                       updateCounters(*buffer);
+                       update = true;
                        break;
                }
 
@@ -1482,9 +1522,13 @@ 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.
-                       view()->update(true, update);
+                       if (update)
+                               view()->update(Update::FitCursor | Update::Force);
+                       else
+                               view()->update(Update::FitCursor);
 
                        // if we executed a mutating lfun, mark the buffer as dirty
+                       // FIXME: Why not use flag.enabled() but call getStatus again?
                        if (getStatus(cmd).enabled()
                                        && !lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer)
                                        && !lyxaction.funcHasFlag(cmd.action, LyXAction::ReadOnly))
@@ -1939,6 +1983,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
        case LyXRC::RC_SPELL_COMMAND:
        case LyXRC::RC_TEMPDIRPATH:
        case LyXRC::RC_TEMPLATEPATH:
+       case LyXRC::RC_TEX_ALLOWS_SPACES:
        case LyXRC::RC_UIFILE:
        case LyXRC::RC_USER_EMAIL:
        case LyXRC::RC_USER_NAME: