* lyx_gui: parse_lyxrc() and getStatus() methods deleted.

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 6eb2b59217967004e9b76e8a74d914954cf87095..6945cc176d652c568ed21445c216133108fa55b2 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -51,6 +51,7 @@
 #include "lyxlex.h"
 #include "lyxrc.h"
 #include "lyxrow.h"
+#include "lyxserver.h"
 #include "lyxtextclasslist.h"
 #include "lyxvc.h"
 #include "paragraph.h"
@@ -75,6 +76,7 @@
 #include "frontends/Alert.h"
 #include "frontends/Dialogs.h"
 #include "frontends/FileDialog.h"
+#include "frontends/FontLoader.h"
 #include "frontends/lyx_gui.h"
 #include "frontends/LyXKeySym.h"
 #include "frontends/LyXView.h"
@@ -138,8 +140,6 @@ namespace biblio = lyx::biblio;
 namespace fs = boost::filesystem;
 
 
-extern BufferList bufferlist;
-
 extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
 
 // (alkis)
@@ -368,8 +368,13 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const
                flag.unknown(true);
                flag.enabled(false);
                break;
+
+       case LFUN_TOOLTIPS_TOGGLE:
+               flag.unknown(true);
+               break;
+
        default:
-               flag |= lyx_gui::getStatus(cmd);
+               break;
        }
 
        if (flag.unknown()) {
@@ -1082,15 +1087,15 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 
                // --- buffers ----------------------------------------
                case LFUN_BUFFER_SWITCH:
-                       owner->setBuffer(bufferlist.getBuffer(argument));
+                       owner->setBuffer(theApp->bufferList().getBuffer(argument));
                        break;
 
                case LFUN_BUFFER_NEXT:
-                       owner->setBuffer(bufferlist.next(view()->buffer()));
+                       owner->setBuffer(theApp->bufferList().next(view()->buffer()));
                        break;
 
                case LFUN_BUFFER_PREVIOUS:
-                       owner->setBuffer(bufferlist.previous(view()->buffer()));
+                       owner->setBuffer(theApp->bufferList().previous(view()->buffer()));
                        break;
 
                case LFUN_FILE_NEW:
@@ -1130,14 +1135,14 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                        if (prefixIs(file_name, package().temp_dir())) {
                                // Needed by inverse dvi search. If it is a file
                                // in tmpdir, call the apropriated function
-                               owner->setBuffer(bufferlist.getBufferFromTmp(file_name));
+                               owner->setBuffer(theApp->bufferList().getBufferFromTmp(file_name));
                        } else {
                                // Must replace extension of the file to be .lyx
                                // and get full path
                                string const s = changeExtension(file_name, ".lyx");
                                // Either change buffer or load the file
-                               if (bufferlist.exists(s)) {
-                                       owner->setBuffer(bufferlist.getBuffer(s));
+                               if (theApp->bufferList().exists(s)) {
+                                       owner->setBuffer(theApp->bufferList().getBuffer(s));
                                } else {
                                        owner->loadLyXFile(s);
                                }
@@ -1287,8 +1292,8 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                         makeDisplayPath(filename) + lyx::from_ascii("..."));
                        view()->savePosition(0);
                        string const parentfilename = owner->buffer()->fileName();
-                       if (bufferlist.exists(filename))
-                               owner->setBuffer(bufferlist.getBuffer(filename));
+                       if (theApp->bufferList().exists(filename))
+                               owner->setBuffer(theApp->bufferList().getBuffer(filename));
                        else
                                owner->loadLyXFile(filename);
                        // Set the parent name of the child document.
@@ -1353,7 +1358,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                case LFUN_SCREEN_FONT_UPDATE:
                        // handle the screen font changes.
                        lyxrc.set_font_norm_type();
-                       lyx_gui::update_fonts();
+                       theApp->fontLoader().update();
                        // All visible buffers will need resize
                        view()->resize();
                        break;
@@ -1703,7 +1708,7 @@ void LyXFunc::menuNew(string const & name, bool fromTemplate)
        if (filename.empty()) {
                filename = addName(lyxrc.document_path,
                            "newfile" + convert<string>(++newfile_number) + ".lyx");
-               while (bufferlist.exists(filename) || fs::is_readable(filename)) {
+               while (theApp->bufferList().exists(filename) || fs::is_readable(filename)) {
                        ++newfile_number;
                        filename = addName(lyxrc.document_path,
                                           "newfile" +  convert<string>(newfile_number) +
@@ -1864,8 +1869,8 @@ void LyXFunc::doImport(string const & argument)
        string const lyxfile = changeExtension(filename, ".lyx");
 
        // Check if the document already is open
-       if (lyx_gui::use_gui && bufferlist.exists(lyxfile)) {
-               if (!bufferlist.close(bufferlist.getBuffer(lyxfile), true)) {
+       if (lyx_gui::use_gui && theApp->bufferList().exists(lyxfile)) {
+               if (!theApp->bufferList().close(theApp->bufferList().getBuffer(lyxfile), true)) {
                        owner->message(_("Canceled."));
                        return;
                }
@@ -1898,14 +1903,14 @@ void LyXFunc::closeBuffer()
        // save current cursor position
        LyX::ref().session().saveFilePosition(owner->buffer()->fileName(),
                boost::tie(view()->cursor().pit(), view()->cursor().pos()) );
-       if (bufferlist.close(owner->buffer(), true) && !quitting) {
-               if (bufferlist.empty()) {
+       if (theApp->bufferList().close(owner->buffer(), true) && !quitting) {
+               if (theApp->bufferList().empty()) {
                        // need this otherwise SEGV may occur while
                        // trying to set variables that don't exist
                        // since there's no current buffer
                        owner->getDialogs().hideBufferDependent();
                } else {
-                       owner->setBuffer(bufferlist.first());
+                       owner->setBuffer(theApp->bufferList().first());
                }
        }
 }