X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.h;h=6c6db63c0e0b464d6043b7ce1f73011c69c0fa56;hb=1a74f3d1035cfbdb5e21947448e5af2b9ec152f0;hp=be52628497873086926627bff0cfc08f3519240a;hpb=32268e2632df5ee325d9a3589e514590b62fb65f;p=lyx.git diff --git a/src/LyX.h b/src/LyX.h index be52628497..6c6db63c0e 100644 --- a/src/LyX.h +++ b/src/LyX.h @@ -4,7 +4,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean-Marc Lasgouttes * \author John Levon * @@ -14,30 +14,25 @@ #ifndef LYX_H #define LYX_H -#include -#include - -#include +#include "support/strfwd.h" namespace lyx { -namespace support { -class FileName; -} - -class Buffer; class BufferList; +class CmdDef; class Converters; class ErrorItem; -class Inset; +class FuncRequest; +class FuncStatus; +class KeyMap; class LyXFunc; -class Server; -class ServerSocket; class Messages; class Mover; class Movers; +class Server; +class ServerSocket; class Session; -class KeyMap; +class SpellChecker; extern bool use_gui; @@ -46,8 +41,12 @@ class Application; class LyXView; } +namespace graphics { +class Previews; +} + /// initial startup -class LyX : boost::noncopyable { +class LyX { public: LyX(); @@ -56,64 +55,14 @@ public: /// Execute LyX. int exec(int & argc, char * argv[]); - static LyX & ref(); - static LyX const & cref(); - - /// in the case of failure - void emergencyCleanup() const; - - /// - BufferList & bufferList(); - BufferList const & bufferList() const; - /// - Session & session(); - Session const & session() const; - /// - LyXFunc & lyxFunc(); - LyXFunc const & lyxFunc() const; - /// - Server & server(); - Server const & server() const; - /// - ServerSocket & socket(); - ServerSocket const & socket() const; - - /// - frontend::Application & application(); - frontend::Application const & application() const; - - /// - KeyMap & topLevelKeymap(); - KeyMap const & topLevelKeymap() const; - - /// - Converters & converters(); - Converters & systemConverters(); - - /// - Messages & getMessages(std::string const & language); - /// - Messages & getGuiMessages(); - /// - void setGuiLanguage(std::string const & language); - /// frontend::LyXView * newLyXView(); - /** redraw \c inset in all the BufferViews in which it is currently - * visible. If successful return a pointer to the owning Buffer. - */ - Buffer const * const updateInset(Inset const *) const; - - void hideDialogs(std::string const & name, Inset * inset) const; - - /// Execute batch commands if available. - void execBatchCommands(); - - /// - void addFileToLoad(support::FileName const &); - private: + /// noncopyable + LyX(LyX const &); + void operator=(LyX const &); + /// Do some cleanup in preparation of an exit. void prepareExit(); @@ -126,24 +75,18 @@ private: */ int init(int & argc, char * argv[]); + /// Execute batch commands if available. + void execCommands(); + /// Load files passed at command-line. + /// return true on success false if we encounter an error /** This method is used only in non-GUI mode. */ - void loadFiles(); - - /// Create a View, load files and restore GUI Session. - void restoreGuiSession(); - - /// Initialize RC font for the GUI. - void initGuiFont(); + bool loadFiles(); /// initial LyX set up bool init(); - /// set up the default key bindings - void defaultKeyBindings(KeyMap * kbmap); - /// set up the default dead key bindings if requested - void deadKeyBindings(KeyMap * kbmap); /** Check for the existence of the user's support directory and, * if not present, create it. Exits the program if the directory * cannot be created. @@ -153,8 +96,6 @@ private: bool queryUserLyXDir(bool explicit_userdir); /// read lyxrc/preferences bool readRcFile(std::string const & name); - /// read the given ui (menu/toolbar) file - bool readUIFile(std::string const & name, bool include = false); /// read the given languages file bool readLanguagesFile(std::string const & name); /// read the encodings. @@ -167,22 +108,57 @@ private: /// shows up a parsing error on screen void printError(ErrorItem const &); - /// has this user started lyx for the first time? - bool first_start; - /// the parsed command line batch command if any - std::string batch_command; + /// + Messages & messages(std::string const & language); /// Use the Pimpl idiom to hide the internals. - struct Singletons; - boost::scoped_ptr pimpl_; + // Mostly used for singletons. + struct Impl; + Impl * pimpl_; + /// has this user started lyx for the first time? + bool first_start; + + friend FuncStatus getStatus(FuncRequest const & action); + friend void dispatch(FuncRequest const & action); + friend BufferList & theBufferList(); + friend LyXFunc & theLyXFunc(); + friend Server & theServer(); + friend ServerSocket & theServerSocket(); + friend Converters & theConverters(); + friend Converters & theSystemConverters(); + friend Messages & getMessages(std::string const & language); + friend Messages & getGuiMessages(); + friend KeyMap & theTopLevelKeymap(); friend Movers & theMovers(); friend Mover const & getMover(std::string const & fmt); friend void setMover(std::string const & fmt, std::string const & command); friend Movers & theSystemMovers(); friend frontend::Application * theApp(); + friend graphics::Previews & thePreviews(); + friend Session & theSession(); + friend CmdDef & theTopLevelCmdDef(); + friend SpellChecker * theSpellChecker(); + friend void setSpellChecker(); + friend void setRcGuiLanguage(); + friend void emergencyCleanup(); + friend void execBatchCommands(); + friend void lyx_exit(int exit_code); }; + +/// in the case of failure +void emergencyCleanup(); +/// Try to exit LyX properly. +/// \p exit_code is 0 by default, if a non zero value is passed, +/// emergencyCleanup() will be called before exiting. +void lyx_exit(int exit_code); +/// Set the language defined by the user. +void setRcGuiLanguage(); +/// Execute batch commands if available. +void execBatchCommands(); + } // namespace lyx #endif // LYX_H +