Fix dialog handling of Insert Plain Text

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index b6d1df8d4b59027fe8d10a292490deacd7c09c9f..695fccc6242736ac95951acada2f053bf8e7e57a 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -48,7 +48,6 @@
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
-#include "frontends/LyXView.h"
 
 #include "support/environment.h"
 #include "support/filetools.h"
@@ -99,7 +98,6 @@ using support::package;
 using support::prependEnvPath;
 using support::rtrim;
 using support::Systemcall;
-using frontend::LyXView;
 
 namespace Alert = frontend::Alert;
 namespace os = support::os;
@@ -430,8 +428,6 @@ int LyX::exec(int & argc, char * argv[])
        // Let the frontend parse and remove all arguments that it knows
        pimpl_->application_.reset(createApplication(argc, argv));
 
-       initGuiFont();
-
        // Parse and remove all known arguments in the LyX singleton
        // Give an error for all remaining ones.
        int exit_status = init(argc, argv);
@@ -629,7 +625,8 @@ void LyX::execBatchCommands()
 
 void LyX::restoreGuiSession()
 {
-       LyXView * view = newLyXView();
+       // create the main window
+       pimpl_->application_->createView(geometryArg);
 
        // if there is no valid class list, do not load any file. 
        if (textclasslist.empty())
@@ -640,7 +637,7 @@ void LyX::restoreGuiSession()
        if (!pimpl_->files_to_load_.empty()) {
                for_each(pimpl_->files_to_load_.begin(),
                        pimpl_->files_to_load_.end(),
-                       bind(&LyXView::loadLyXFile, view, _1, true));
+                       bind(&LyXFunc::loadAndViewFile, pimpl_->lyxfunc_, _1, true));
                // clear this list to save a few bytes of RAM
                pimpl_->files_to_load_.clear();
                pimpl_->session_->lastOpened().clear();
@@ -651,7 +648,7 @@ void LyX::restoreGuiSession()
                // last session, and should be already there (regular files), or should
                // not be added at all (help files).
                for_each(lastopened.begin(), lastopened.end(),
-                       bind(&LyXView::loadLyXFile, view, _1, false));
+                       bind(&LyXFunc::loadAndViewFile, pimpl_->lyxfunc_, _1, false));
 
                // clear this list to save a few bytes of RAM
                pimpl_->session_->lastOpened().clear();
@@ -665,24 +662,6 @@ void LyX::restoreGuiSession()
                        continue;
                updateLabels(*buf);
        }
-
-       // FIXME: Switch to the last loaded Buffer. This must not be the first one
-       // because the Buffer won't be connected in this case. The correct solution
-       // would be to avoid the manual connection of the current Buffer in LyXView.
-       if (!pimpl_->buffer_list_.empty())
-               view->setBuffer(pimpl_->buffer_list_.last());
-}
-
-
-LyXView * LyX::newLyXView()
-{
-       if (!lyx::use_gui)
-               return 0;
-
-       // create the main window
-       LyXView * view = &pimpl_->application_->createView(geometryArg);
-
-       return view;
 }
 
 /*
@@ -792,20 +771,6 @@ void LyX::printError(ErrorItem const & ei)
 }
 
 
-void LyX::initGuiFont()
-{
-       if (lyxrc.roman_font_name.empty())
-               lyxrc.roman_font_name = pimpl_->application_->romanFontName();
-
-       if (lyxrc.sans_font_name.empty())
-               lyxrc.sans_font_name = pimpl_->application_->sansFontName();
-
-       if (lyxrc.typewriter_font_name.empty())
-               lyxrc.typewriter_font_name
-                       = pimpl_->application_->typewriterFontName();
-}
-
-
 bool LyX::init()
 {
 #ifdef SIGHUP