X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=1c0609331c64129eab055dcbae0e82807f8cc628;hb=ac3f391b46d25784f3129e24658b73c4bc15febf;hp=c41d16579a561f329df155573e14ad54ddd6b3b1;hpb=8921a18a89c9a60ab6bb84fa37e1baafcc1a1cb5;p=lyx.git diff --git a/src/LyX.cpp b/src/LyX.cpp index c41d16579a..1c0609331c 100644 --- a/src/LyX.cpp +++ b/src/LyX.cpp @@ -44,6 +44,8 @@ #include "frontends/alert.h" #include "frontends/Application.h" +#include "graphics/Previews.h" + #include "support/lassert.h" #include "support/debug.h" #include "support/environment.h" @@ -164,6 +166,9 @@ struct LyX::Impl bool first_start; /// the parsed command line batch command if any vector batch_commands; + + /// + graphics::Previews preview_; }; /// @@ -178,11 +183,12 @@ frontend::Application * theApp() LyX::~LyX() { + singleton_ = 0; delete pimpl_; } -void LyX::exit(int exit_code) const +void lyx_exit(int exit_code) { if (exit_code) // Something wrong happened so better save everything, just in @@ -202,20 +208,6 @@ void LyX::exit(int exit_code) const } -LyX & LyX::ref() -{ - LASSERT(singleton_, /**/); - return *singleton_; -} - - -LyX const & LyX::cref() -{ - LASSERT(singleton_, /**/); - return *singleton_; -} - - LyX::LyX() : first_start(false) { @@ -224,105 +216,7 @@ LyX::LyX() } -BufferList & LyX::bufferList() -{ - return pimpl_->buffer_list_; -} - - -BufferList const & LyX::bufferList() const -{ - return pimpl_->buffer_list_; -} - - -Session & LyX::session() -{ - LASSERT(pimpl_->session_.get(), /**/); - return *pimpl_->session_.get(); -} - - -Session const & LyX::session() const -{ - LASSERT(pimpl_->session_.get(), /**/); - return *pimpl_->session_.get(); -} - - -LyXFunc & LyX::lyxFunc() -{ - return pimpl_->lyxfunc_; -} - - -LyXFunc const & LyX::lyxFunc() const -{ - return pimpl_->lyxfunc_; -} - - -Server & LyX::server() -{ - LASSERT(pimpl_->lyx_server_.get(), /**/); - return *pimpl_->lyx_server_.get(); -} - - -Server const & LyX::server() const -{ - LASSERT(pimpl_->lyx_server_.get(), /**/); - return *pimpl_->lyx_server_.get(); -} - - -ServerSocket & LyX::socket() -{ - LASSERT(pimpl_->lyx_socket_.get(), /**/); - return *pimpl_->lyx_socket_.get(); -} - - -ServerSocket const & LyX::socket() const -{ - LASSERT(pimpl_->lyx_socket_.get(), /**/); - return *pimpl_->lyx_socket_.get(); -} - - -frontend::Application & LyX::application() -{ - LASSERT(pimpl_->application_.get(), /**/); - return *pimpl_->application_.get(); -} - - -frontend::Application const & LyX::application() const -{ - LASSERT(pimpl_->application_.get(), /**/); - return *pimpl_->application_.get(); -} - - -CmdDef & LyX::topLevelCmdDef() -{ - return pimpl_->toplevel_cmddef_; -} - - -Converters & LyX::converters() -{ - return pimpl_->converters_; -} - - -Converters & LyX::systemConverters() -{ - return pimpl_->system_converters_; -} - - -Messages & LyX::getMessages(string const & language) +Messages & LyX::messages(string const & language) { map::iterator it = pimpl_->messages_.find(language); @@ -337,15 +231,22 @@ Messages & LyX::getMessages(string const & language) } -Messages & LyX::getGuiMessages() +void setRcGuiLanguage() { - return pimpl_->messages_["GUI"]; -} - - -void LyX::setGuiLanguage(string const & language) -{ - pimpl_->messages_["GUI"] = Messages(language); + LASSERT(singleton_, /**/); + if (lyxrc.gui_language == "auto") + return; + Language const * language = languages.getLanguage(lyxrc.gui_language); + if (language) { + LYXERR(Debug::LOCALE, "Setting LANGUAGE to " << language->code()); + if (!setEnv("LANGUAGE", language->code())) + LYXERR(Debug::LOCALE, "\t... failed!"); + } + LYXERR(Debug::LOCALE, "Setting LC_ALL to en_US"); + if (!setEnv("LC_ALL", "en_US")) + LYXERR(Debug::LOCALE, "\t... failed!"); + Messages::init(); + singleton_->pimpl_->messages_["GUI"] = Messages(); } @@ -362,7 +263,7 @@ int LyX::exec(int & argc, char * argv[]) } catch (ExceptionMessage const & message) { if (message.type_ == ErrorException) { Alert::error(message.title_, message.details_); - exit(1); + lyx_exit(1); } else if (message.type_ == WarningException) { Alert::warning(message.title_, message.details_); } @@ -410,6 +311,10 @@ int LyX::exec(int & argc, char * argv[]) // Let the frontend parse and remove all arguments that it knows pimpl_->application_.reset(createApplication(argc, argv)); + // Reestablish our defaults, as Qt overwrites them + // after createApplication() + locale_init(); + // Parse and remove all known arguments in the LyX singleton // Give an error for all remaining ones. int exit_status = init(argc, argv); @@ -420,7 +325,7 @@ int LyX::exec(int & argc, char * argv[]) prepareExit(); return exit_status; } - + // FIXME /* Create a CoreApplication class that will provide the main event loop * and the socket callback registering. With Qt4, only QtCore @@ -463,14 +368,21 @@ void LyX::prepareExit() // do any other cleanup procedures now if (package().temp_dir() != package().system_temp_dir()) { - LYXERR(Debug::INFO, "Deleting tmp dir " - << package().temp_dir().absFilename()); - - if (!package().temp_dir().destroyDirectory()) { + string const abs_tmpdir = package().temp_dir().absFilename(); + if (!contains(package().temp_dir().absFilename(), "lyx_tmpdir")) { docstring const msg = - bformat(_("Unable to remove the temporary directory %1$s"), - from_utf8(package().temp_dir().absFilename())); - Alert::warning(_("Unable to remove temporary directory"), msg); + bformat(_("%1$s does not appear like a LyX created temporary directory."), + from_utf8(abs_tmpdir)); + Alert::warning(_("Cannot remove temporary directory"), msg); + } else { + LYXERR(Debug::INFO, "Deleting tmp dir " + << package().temp_dir().absFilename()); + if (!package().temp_dir().destroyDirectory()) { + docstring const msg = + bformat(_("Unable to remove the temporary directory %1$s"), + from_utf8(package().temp_dir().absFilename())); + Alert::warning(_("Unable to remove temporary directory"), msg); + } } } @@ -524,17 +436,6 @@ int LyX::init(int & argc, char * argv[]) } -void LyX::addFileToLoad(string const & fname) -{ - vector::const_iterator cit = find( - pimpl_->files_to_load_.begin(), pimpl_->files_to_load_.end(), - fname); - - if (cit == pimpl_->files_to_load_.end()) - pimpl_->files_to_load_.push_back(fname); -} - - bool LyX::loadFiles() { LASSERT(!use_gui, /**/); @@ -567,7 +468,14 @@ bool LyX::loadFiles() } -void LyX::execBatchCommands() +void execBatchCommands() +{ + LASSERT(singleton_, /**/); + singleton_->execCommands(); +} + + +void LyX::execCommands() { // The advantage of doing this here is that the event loop // is already started. So any need for interaction will be @@ -671,7 +579,7 @@ static void error_handler(int err_sig) // We have received a signal indicating a fatal error, so // try and save the data ASAP. - LyX::cref().emergencyCleanup(); + emergencyCleanup(); // These lyxerr calls may or may not work: @@ -768,7 +676,7 @@ bool LyX::init() return false; // Set the language defined by the distributor. - //setGuiLanguage(lyxrc.gui_language); + setRcGuiLanguage(); // Set the PATH correctly. #if !defined (USE_POSIX_PACKAGING) @@ -799,6 +707,9 @@ bool LyX::init() // Read lyxrc.dist again to be able to override viewer auto-detection. readRcFile("lyxrc.dist"); + // Set again the language defined by the distributor. + setRcGuiLanguage(); + system_lyxrc = lyxrc; system_formats = formats; pimpl_->system_converters_ = pimpl_->converters_; @@ -814,6 +725,9 @@ bool LyX::init() if (!readLanguagesFile("languages")) return false; + // Set the language defined by the user. + setRcGuiLanguage(); + // Load the layouts LYXERR(Debug::INIT, "Reading layouts..."); if (!LyXSetStyle()) @@ -825,9 +739,6 @@ bool LyX::init() // because InsetInfo needs to know these to produce // the correct output - // Set the language defined by the user. - //setGuiLanguage(lyxrc.gui_language); - // Set up command definitions pimpl_->toplevel_cmddef_.read(lyxrc.def_file); @@ -850,12 +761,12 @@ bool LyX::init() if (document_path.exists() && document_path.isDirectory()) package().document_dir() = document_path; - package().temp_dir() = createLyXTmpDir(FileName(lyxrc.tempdir_path)); + package().set_temp_dir(createLyXTmpDir(FileName(lyxrc.tempdir_path))); if (package().temp_dir().empty()) { Alert::error(_("Could not create temporary directory"), bformat(_("Could not create a temporary directory in\n" - "%1$s. Make sure that this\n" - "path exists and is writable and try again."), + "\"%1$s\"\n" + "Make sure that this path exists and is writable and try again."), from_utf8(lyxrc.tempdir_path))); // createLyXTmpDir() tries sufficiently hard to create a // usable temp dir, so the probability to come here is @@ -879,19 +790,19 @@ bool LyX::init() } -void LyX::emergencyCleanup() const +void emergencyCleanup() { // what to do about tmpfiles is non-obvious. we would // like to delete any we find, but our lyxdir might // contain documents etc. which might be helpful on // a crash - pimpl_->buffer_list_.emergencyWriteAll(); + singleton_->pimpl_->buffer_list_.emergencyWriteAll(); if (use_gui) { - if (pimpl_->lyx_server_) - pimpl_->lyx_server_->emergencyCleanup(); - pimpl_->lyx_server_.reset(); - pimpl_->lyx_socket_.reset(); + if (singleton_->pimpl_->lyx_server_) + singleton_->pimpl_->lyx_server_->emergencyCleanup(); + singleton_->pimpl_->lyx_server_.reset(); + singleton_->pimpl_->lyx_socket_.reset(); } } @@ -1210,25 +1121,29 @@ void LyX::easyParse(int & argc, char * argv[]) FuncStatus getStatus(FuncRequest const & action) { - return LyX::ref().lyxFunc().getStatus(action); + LASSERT(singleton_, /**/); + return singleton_->pimpl_->lyxfunc_.getStatus(action); } void dispatch(FuncRequest const & action) { - LyX::ref().lyxFunc().dispatch(action); + LASSERT(singleton_, /**/); + singleton_->pimpl_->lyxfunc_.dispatch(action); } BufferList & theBufferList() { - return LyX::ref().bufferList(); + LASSERT(singleton_, /**/); + return singleton_->pimpl_->buffer_list_; } LyXFunc & theLyXFunc() { - return LyX::ref().lyxFunc(); + LASSERT(singleton_, /**/); + return singleton_->pimpl_->lyxfunc_; } @@ -1236,7 +1151,8 @@ Server & theServer() { // FIXME: this should not be use_gui dependent LASSERT(use_gui, /**/); - return LyX::ref().server(); + LASSERT(singleton_, /**/); + return *singleton_->pimpl_->lyx_server_.get(); } @@ -1244,61 +1160,92 @@ ServerSocket & theServerSocket() { // FIXME: this should not be use_gui dependent LASSERT(use_gui, /**/); - return LyX::ref().socket(); + LASSERT(singleton_, /**/); + return *singleton_->pimpl_->lyx_socket_.get(); } KeyMap & theTopLevelKeymap() { - return LyX::ref().pimpl_->toplevel_keymap_; + LASSERT(singleton_, /**/); + return singleton_->pimpl_->toplevel_keymap_; } Converters & theConverters() { - return LyX::ref().converters(); + LASSERT(singleton_, /**/); + return singleton_->pimpl_->converters_; } Converters & theSystemConverters() { - return LyX::ref().systemConverters(); + LASSERT(singleton_, /**/); + return singleton_->pimpl_->system_converters_; } Movers & theMovers() { - return LyX::ref().pimpl_->movers_; + LASSERT(singleton_, /**/); + return singleton_->pimpl_->movers_; } Mover const & getMover(string const & fmt) { - return LyX::ref().pimpl_->movers_(fmt); + LASSERT(singleton_, /**/); + return singleton_->pimpl_->movers_(fmt); } void setMover(string const & fmt, string const & command) { - LyX::ref().pimpl_->movers_.set(fmt, command); + LASSERT(singleton_, /**/); + singleton_->pimpl_->movers_.set(fmt, command); } Movers & theSystemMovers() { - return LyX::ref().pimpl_->system_movers_; + LASSERT(singleton_, /**/); + return singleton_->pimpl_->system_movers_; } Messages & getMessages(string const & language) { - return LyX::ref().getMessages(language); + LASSERT(singleton_, /**/); + return singleton_->messages(language); } Messages & getGuiMessages() { - return LyX::ref().getGuiMessages(); + LASSERT(singleton_, /**/); + return singleton_->pimpl_->messages_["GUI"]; +} + + +graphics::Previews & thePreviews() +{ + LASSERT(singleton_, /**/); + return singleton_->pimpl_->preview_; +} + + +Session & theSession() +{ + LASSERT(singleton_, /**/); + return *singleton_->pimpl_->session_.get(); +} + + +CmdDef & theTopLevelCmdDef() +{ + LASSERT(singleton_, /**/); + return singleton_->pimpl_->toplevel_cmddef_; } } // namespace lyx