]> git.lyx.org Git - lyx.git/blobdiff - src/LyXFunc.cpp
Typo.
[lyx.git] / src / LyXFunc.cpp
index 88cd8c4a15bfc28000da8f803b1c41efc9a8d230..6a3db5bb8559c086dcc1db2b4096cd755988c9f9 100644 (file)
@@ -62,9 +62,9 @@
 #include "insets/InsetERT.h"
 #include "insets/InsetExternal.h"
 #include "insets/InsetFloat.h"
-#include "insets/InsetListings.h"
 #include "insets/InsetGraphics.h"
 #include "insets/InsetInclude.h"
+#include "insets/InsetListings.h"
 #include "insets/InsetNote.h"
 #include "insets/InsetSpace.h"
 #include "insets/InsetTabular.h"
@@ -389,7 +389,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
 
        if (cmd.action == LFUN_NOACTION) {
                flag.message(from_utf8(N_("Nothing to do")));
-               flag.enabled(false);
+               flag.setEnabled(false);
                return flag;
        }
 
@@ -399,7 +399,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
        case LFUN_THESAURUS_ENTRY:
 #endif
                flag.unknown(true);
-               flag.enabled(false);
+               flag.setEnabled(false);
                break;
 
        default:
@@ -422,7 +422,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
                // no, exit directly
                flag.message(from_utf8(N_("Command not allowed with"
                                    "out any document open")));
-               flag.enabled(false);
+               flag.setEnabled(false);
                return flag;
        }
 
@@ -433,54 +433,6 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
        bool enable = true;
        switch (cmd.action) {
 
-       // FIXME: these cases should be hidden in GuiApplication::getStatus().
-       case LFUN_WINDOW_CLOSE:
-               if (theApp())
-                       return theApp()->getStatus(cmd);
-               enable = false;
-               break;
-
-       // 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.
-               if (lyx_view_)
-                       return lyx_view_->getStatus(cmd);
-               else
-                       enable = false;
-               break;
-
-       // FIXME optimally this should be in Text::getStatus. In such a case the flags
-       // are not passed when using context menu. This way it works.
-       case LFUN_SET_GRAPHICS_GROUP: {
-               if (!view())
-                       break;
-               InsetGraphics * ins = InsetGraphics::getCurrentGraphicsInset(view()->cursor());
-               if (!ins)
-                       break;
-               if (!cmd.argument().empty())
-                       flag.setOnOff(to_utf8(cmd.argument()) == ins->getParams().groupId);
-               enable = true;
-               break;
-       }
-
-       case LFUN_TOOLBAR_TOGGLE:
-       case LFUN_INSET_APPLY:
-       case LFUN_BUFFER_WRITE:
-       case LFUN_BUFFER_WRITE_AS:
-       case LFUN_SPLIT_VIEW:
-       case LFUN_CLOSE_TAB_GROUP:
-       case LFUN_COMPLETION_POPUP:
-       case LFUN_COMPLETION_INLINE:
-       case LFUN_COMPLETION_COMPLETE:
-               if (lyx_view_)
-                       return lyx_view_->getStatus(cmd);
-               enable = false;
-               break;
-
        case LFUN_BUFFER_TOGGLE_READ_ONLY:
                flag.setOnOff(buf->isReadonly());
                break;
@@ -595,8 +547,6 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
                break;
        }
 
-       case LFUN_BUFFER_NEW:
-       case LFUN_BUFFER_NEW_TEMPLATE:
        case LFUN_WORD_FIND_FORWARD:
        case LFUN_WORD_FIND_BACKWARD:
        case LFUN_COMMAND_PREFIX:
@@ -612,7 +562,6 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
        case LFUN_BUFFER_AUTO_SAVE:
        case LFUN_RECONFIGURE:
        case LFUN_HELP_OPEN:
-       case LFUN_FILE_OPEN:
        case LFUN_DROP_LAYOUTS_CHOICE:
        case LFUN_MENU_OPEN:
        case LFUN_SERVER_GET_NAME:
@@ -630,12 +579,8 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
        case LFUN_BUFFER_EXPORT_CUSTOM:
        case LFUN_BUFFER_PRINT:
        case LFUN_PREFERENCES_SAVE:
-       case LFUN_SCREEN_FONT_UPDATE:
-       case LFUN_SET_COLOR:
        case LFUN_MESSAGE:
        case LFUN_INSET_EDIT:
-       case LFUN_ALL_INSETS_TOGGLE:
-       case LFUN_GRAPHICS_GROUPS_UNIFY:
        case LFUN_BUFFER_LANGUAGE:
        case LFUN_TEXTCLASS_APPLY:
        case LFUN_TEXTCLASS_LOAD:
@@ -647,12 +592,27 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
        case LFUN_LYXRC_APPLY:
        case LFUN_BUFFER_NEXT:
        case LFUN_BUFFER_PREVIOUS:
-       case LFUN_WINDOW_NEW:
-       case LFUN_LYX_QUIT:
                // these are handled in our dispatch()
                break;
 
        default:
+               if (!theApp()) {
+                       enable = false;
+                       break;
+               }
+               if (theApp()->getStatus(cmd, flag))
+                       break;
+
+               // Does the view know something?
+               if (!lyx_view_) {
+                       enable = false;
+                       break;
+               }
+               if (lyx_view_->getStatus(cmd, flag))
+                       break;
+
+               // If we have a BufferView, try cursor position and
+               // then the BufferView.
                if (!view()) {
                        enable = false;
                        break;
@@ -662,14 +622,14 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
        }
 
        if (!enable)
-               flag.enabled(false);
+               flag.setEnabled(false);
 
        // Can we use a readonly buffer?
        if (buf && buf->isReadonly()
            && !lyxaction.funcHasFlag(cmd.action, LyXAction::ReadOnly)
            && !lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer)) {
                flag.message(from_utf8(N_("Document is read-only")));
-               flag.enabled(false);
+               flag.setEnabled(false);
        }
 
        // Are we in a DELETED change-tracking region?
@@ -678,7 +638,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
            && !lyxaction.funcHasFlag(cmd.action, LyXAction::ReadOnly)
            && !lyxaction.funcHasFlag(cmd.action, LyXAction::NoBuffer)) {
                flag.message(from_utf8(N_("This portion of the document is deleted.")));
-               flag.enabled(false);
+               flag.setEnabled(false);
        }
 
        // the default error message if we disable the command
@@ -1412,82 +1372,11 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        break;
                }
 
-               case LFUN_SET_COLOR: {
-                       string lyx_name;
-                       string const x11_name = split(argument, lyx_name, ' ');
-                       if (lyx_name.empty() || x11_name.empty()) {
-                               setErrorMessage(from_ascii(N_(
-                                               "Syntax: set-color <lyx_name>"
-                                               " <x11_name>")));
-                               break;
-                       }
-
-                       bool const graphicsbg_changed =
-                               (lyx_name == lcolor.getLyXName(Color_graphicsbg) &&
-                                x11_name != lcolor.getX11Name(Color_graphicsbg));
-
-                       if (!lcolor.setColor(lyx_name, x11_name)) {
-                               setErrorMessage(
-                                               bformat(_("Set-color \"%1$s\" failed "
-                                                                      "- color is undefined or "
-                                                                      "may not be redefined"),
-                                                                          from_utf8(lyx_name)));
-                               break;
-                       }
-
-                       theApp()->updateColor(lcolor.getFromLyXName(lyx_name));
-
-                       if (graphicsbg_changed) {
-                               // FIXME: The graphics cache no longer has a changeDisplay method.
-#if 0
-                               graphics::GCache::get().changeDisplay(true);
-#endif
-                       }
-                       break;
-               }
-
                case LFUN_MESSAGE:
                        LASSERT(lyx_view_, /**/);
                        lyx_view_->message(from_utf8(argument));
                        break;
 
-
-               case LFUN_ALL_INSETS_TOGGLE: {
-                       LASSERT(lyx_view_, /**/);
-                       string action;
-                       string const name = split(argument, action, ' ');
-                       InsetCode const inset_code = insetCode(name);
-
-                       Cursor & cur = view()->cursor();
-                       FuncRequest fr(LFUN_INSET_TOGGLE, action);
-
-                       Inset & inset = lyx_view_->buffer()->inset();
-                       InsetIterator it  = inset_iterator_begin(inset);
-                       InsetIterator const end = inset_iterator_end(inset);
-                       for (; it != end; ++it) {
-                               if (!it->asInsetMath()
-                                   && (inset_code == NO_CODE
-                                   || inset_code == it->lyxCode())) {
-                                       Cursor tmpcur = cur;
-                                       tmpcur.pushBackward(*it);
-                                       it->dispatch(tmpcur, fr);
-                               }
-                       }
-                       updateFlags = Update::Force | Update::FitCursor;
-                       break;
-               }
-
-               case LFUN_GRAPHICS_GROUPS_UNIFY: {
-                       LASSERT(lyx_view_, /**/);
-                       if (argument.empty() || !lyx_view_->buffer())
-                               break;
-                       //view()->cursor().recordUndoFullDocument(); let inset-apply do that job
-                       InsetGraphics::unifyGraphicsGroups(*lyx_view_->buffer(), argument);
-                       lyx_view_->buffer()->markDirty();
-                       updateFlags = Update::Force | Update::FitCursor;
-                       break;
-               }
-
                case LFUN_BUFFER_LANGUAGE: {
                        LASSERT(lyx_view_, /**/);
                        Buffer & buffer = *lyx_view_->buffer();
@@ -1532,7 +1421,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        LASSERT(lyx_view_, /**/);
                        
                        Buffer * buffer = lyx_view_->buffer();
-                       DocumentClass * oldClass = buffer->params().documentClassPtr();
+                       DocumentClass const * const oldClass = buffer->params().documentClassPtr();
                        Cursor & cur = view()->cursor();
                        cur.recordUndoFullDocument();
                        
@@ -1561,7 +1450,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                case LFUN_LAYOUT_MODULES_CLEAR: {
                        LASSERT(lyx_view_, /**/);
                        Buffer * buffer = lyx_view_->buffer();
-                       DocumentClass * oldClass = buffer->params().documentClassPtr();
+                       DocumentClass const * const oldClass = buffer->params().documentClassPtr();
                        view()->cursor().recordUndoFullDocument();
                        buffer->params().clearLayoutModules();
                        buffer->params().makeDocumentClass();
@@ -1573,7 +1462,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                case LFUN_LAYOUT_MODULE_ADD: {
                        LASSERT(lyx_view_, /**/);
                        Buffer * buffer = lyx_view_->buffer();
-                       DocumentClass * oldClass = buffer->params().documentClassPtr();
+                       DocumentClass const * const oldClass = buffer->params().documentClassPtr();
                        view()->cursor().recordUndoFullDocument();
                        buffer->params().addLayoutModule(argument);
                        buffer->params().makeDocumentClass();
@@ -1598,7 +1487,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                break;
 
                        //Save the old, possibly modular, layout for use in conversion.
-                       DocumentClass * oldDocClass = buffer->params().documentClassPtr();
+                       DocumentClass const * const oldDocClass = buffer->params().documentClassPtr();
                        view()->cursor().recordUndoFullDocument();
                        buffer->params().setBaseClass(argument);
                        buffer->params().makeDocumentClass();
@@ -1610,7 +1499,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                case LFUN_LAYOUT_RELOAD: {
                        LASSERT(lyx_view_, /**/);
                        Buffer * buffer = lyx_view_->buffer();
-                       DocumentClass * oldClass = buffer->params().documentClassPtr();
+                       DocumentClass const * const oldClass = buffer->params().documentClassPtr();
                        LayoutFileIndex bc = buffer->params().baseClassID();
                        LayoutFileList::get().reset(bc);
                        buffer->params().setBaseClass(bc);
@@ -1640,6 +1529,9 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 
                        actOnUpdatedPrefs(lyxrc_orig, lyxrc);
 
+                       // Set the language defined by the user.
+                       LyX::ref().setRcGuiLanguage();
+
                        theApp()->resetGui();
 
                        /// We force the redraw in any case because there might be
@@ -1859,7 +1751,7 @@ bool LyXFunc::wasMetaKey() const
 }
 
 
-void LyXFunc::updateLayout(DocumentClass * oldlayout,Buffer * buffer)
+void LyXFunc::updateLayout(DocumentClass const * const oldlayout, Buffer * buffer)
 {
        lyx_view_->message(_("Converting document to new document class..."));
        
@@ -1919,6 +1811,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
        case LyXRC::RC_CUSTOM_EXPORT_FORMAT:
        case LyXRC::RC_DATE_INSERT_FORMAT:
        case LyXRC::RC_DEFAULT_LANGUAGE:
+       case LyXRC::RC_GUI_LANGUAGE:
        case LyXRC::RC_DEFAULT_PAPERSIZE:
        case LyXRC::RC_DEFFILE:
        case LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN: