remove unused code

[lyx.git] / src / LyXFunc.cpp

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 138865d87c1f017ca657514d86d5a311044f8ce6..8cd2d66906122667452902f9d5ad33cc3d584ddd 100644 (file)
--- 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"
@@ -105,10 +106,11 @@ namespace {
 
 // This function runs "configure" and then rereads lyx.defaults to
 // reconfigure the automatic settings.
-void reconfigure(LyXView & lv, string const & option)
+void reconfigure(LyXView * lv, string const & option)
 {
        // emit message signal.
-       lv.message(_("Running configure..."));
+       if (lv)
+               lv->message(_("Running configure..."));
 
        // Run configure in user lyx directory
        PathChanger p(package().user_support());
@@ -118,7 +120,8 @@ void reconfigure(LyXView & lv, string const & option)
        int ret = one.startscript(Systemcall::Wait, configure_command);
        p.pop();
        // emit message signal.
-       lv.message(_("Reloading configuration..."));
+       if (lv)
+               lv->message(_("Reloading configuration..."));
        lyxrc.read(libFileSearch(string(), "lyxrc.defaults"));
        // Re-read packages.lst
        LaTeXFeatures::getAvailable();
@@ -214,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;
 
@@ -293,7 +296,8 @@ void LyXFunc::processKeySym(KeySymbol const & keysym, KeyModifier state)
 
        if (keysym.isModifier()) {
                LYXERR(Debug::KEY, "isModifier true");
-               lyx_view_->restartCursor();
+               if (lyx_view_)
+                       lyx_view_->restartCursor();
                return;
        }
 
@@ -384,7 +388,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
        //lyxerr << "LyXFunc::getStatus: cmd: " << cmd << endl;
        FuncStatus flag;
 
-       Buffer * buf = lyx_view_? lyx_view_->buffer() : 0;
+       Buffer * buf = lyx_view_ ? lyx_view_->buffer() : 0;
 
        if (cmd.action == LFUN_NOACTION) {
                flag.message(from_utf8(N_("Nothing to do")));
@@ -442,11 +446,11 @@ 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:
-               if (cmd.argument() == "prefs"
-                   || cmd.argument() == "aboutlyx")
-                       enable = true;
-               else if (lyx_view_)
+               // 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;
@@ -606,8 +610,7 @@ 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_TOGGLE_CURSOR_FOLLOWS_SCROLLBAR:
+       case LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE:
        case LFUN_KEYMAP_OFF:
        case LFUN_KEYMAP_PRIMARY:
        case LFUN_KEYMAP_SECONDARY:
@@ -718,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;
@@ -735,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;
@@ -812,16 +815,6 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                }
 
                // --- Menus -----------------------------------------------
-               case LFUN_BUFFER_NEW:
-                       lyx_view_->newDocument(argument, false);
-                       updateFlags = Update::None;
-                       break;
-
-               case LFUN_BUFFER_NEW_TEMPLATE:
-                       lyx_view_->newDocument(argument, true);
-                       updateFlags = Update::None;
-                       break;
-
                case LFUN_BUFFER_CLOSE:
                        lyx_view_->closeBuffer();
                        updateFlags = Update::None;
@@ -1039,9 +1032,8 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        break;
 
                case LFUN_RECONFIGURE:
-                       BOOST_ASSERT(lyx_view_);
                        // argument is any additional parameter to the configure.py command
-                       reconfigure(*lyx_view_, argument);
+                       reconfigure(lyx_view_, argument);
                        break;
 
                case LFUN_HELP_OPEN: {
@@ -1244,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);
@@ -1324,7 +1321,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        break;
                }
 
-               case LFUN_TOGGLE_CURSOR_FOLLOWS_SCROLLBAR:
+               case LFUN_CURSOR_FOLLOWS_SCROLLBAR_TOGGLE:
                        BOOST_ASSERT(lyx_view_);
                        lyxrc.cursor_follows_scrollbar = !lyxrc.cursor_follows_scrollbar;
                        break;
@@ -1579,7 +1576,8 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        BOOST_ASSERT(lyx_view_);
                        Buffer * buffer = lyx_view_->buffer();
 
-                       if (!loadLayoutFile(argument, buffer->filePath()))
+                       if (!loadLayoutFile(argument, buffer->temppath()) &&
+                               !loadLayoutFile(argument, buffer->filePath()))
                                break;
 
                        LayoutFile const * old_layout = buffer->params().baseClass();
@@ -1605,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;
@@ -1612,6 +1611,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                }
 
                case LFUN_TEXTCLASS_LOAD:
+                       loadLayoutFile(argument, lyx_view_->buffer()->temppath()) ||
                        loadLayoutFile(argument, lyx_view_->buffer()->filePath());
                        break;
 
@@ -1657,8 +1657,11 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                // Nothing more to do.
                                return;
 
+                       // Everything below is only for active lyx_view_
+                       if (lyx_view_ == 0)
+                               break;
+
                        // Let the current LyXView dispatch its own actions.
-                       BOOST_ASSERT(lyx_view_);
                        if (lyx_view_->dispatch(cmd)) {
                                if (lyx_view_->view())
                                        updateFlags = lyx_view_->view()->cursor().result().update();
@@ -1715,8 +1718,11 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                            && !lyxaction.funcHasFlag(action, LyXAction::ReadOnly))
                                lyx_view_->buffer()->markDirty();                       
 
-                       //Do we have a selection?
+                       // Do we have a selection?
                        theSelection().haveSelection(view()->cursor().selection());
+                       
+                       // update gui
+                       lyx_view_->restartCursor();
                }
        }
        if (lyx_view_) {
@@ -1811,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())
@@ -1883,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:
@@ -1916,6 +1923,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
        case LyXRC::RC_EXAMPLEPATH:
        case LyXRC::RC_FONT_ENCODING:
        case LyXRC::RC_FORMAT:
+       case LyXRC::RC_GROUP_LAYOUTS:
        case LyXRC::RC_INDEX_COMMAND:
        case LyXRC::RC_INPUT:
        case LyXRC::RC_KBMAP:
@@ -1976,6 +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_OPEN_BUFFERS_IN_TABS:
        case LyXRC::RC_SPELL_COMMAND:
        case LyXRC::RC_TEMPDIRPATH:
        case LyXRC::RC_TEMPLATEPATH: