X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.h;h=908c60119f501ea23f827382f5d64c42f464479b;hb=86e0dfa3e11957318ca4f3f549248326aa806eb4;hp=f3b0f3c3b900a5554f4434e2685baf2a3d0e88ad;hpb=99d1627a471b92f403598d03dfc861ddc3c11be0;p=lyx.git

diff --git a/src/lyx_main.h b/src/lyx_main.h
index f3b0f3c3b9..908c60119f 100644
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -1,47 +1,60 @@
 // -*- C++ -*-
 /**
  * \file lyx_main.h
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author unknown
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef LYX_MAIN_H
 #define LYX_MAIN_H
 
-#include "LString.h"
-
 #include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
 
-#include <csignal>
+#include <list>
+#include <string>
 
-class LyXRC;
-class LastFiles;
 class Buffer;
+class ErrorItem;
+class InsetBase;
+class LastFiles;
+class LyXView;
 class kb_keymap;
 
 
-/// e.g. $HOME/.lyx/
-extern string user_lyxdir;
-/// e.g. /usr/share/lyx/
-extern string system_lyxdir;
-/// e.g. /tmp
-extern string system_tempdir;
-/// last files loaded
-extern boost::scoped_ptr<LastFiles> lastfiles;
-
-
 /// initial startup
 class LyX : boost::noncopyable {
 public:
-	LyX(int & argc, char * argv[]);
+	static void exec(int & argc, char * argv[]);
+	static LyX & ref();
+	static LyX const & cref();
 
 	/// in the case of failure
-	static void emergencyCleanup();
+	void emergencyCleanup() const;
+
+	LastFiles & lastfiles();
+	LastFiles const & lastfiles() const;
+
+	void addLyXView(boost::shared_ptr<LyXView> const & lyxview);
+
+	/** 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(InsetBase const *) const;
 
 private:
+	static boost::scoped_ptr<LyX> singleton_;
+
+	LyX();
+	void priv_exec(int & argc, char * argv[]);
+
 	/// initial LyX set up
 	void init(bool);
 	/// set up the default key bindings
@@ -50,21 +63,29 @@ private:
 	void deadKeyBindings(kb_keymap * kbmap);
 	/// check, set up and configure the user dir if necessary
 	void queryUserLyXDir(bool explicit_userdir);
-	/// return true if the given prefs file was successfully read
-	bool readRcFile(string const & name);
+	/// read lyxrc/preferences
+	void readRcFile(std::string const & name);
 	/// read the given ui (menu/toolbar) file
-	void readUIFile(string const & name);
+	void readUIFile(std::string const & name);
 	/// read the given languages file
-	void readLanguagesFile(string const & name);
+	void readLanguagesFile(std::string const & name);
 	/// read the given encodings file
-	void readEncodingsFile(string const & name);
+	void readEncodingsFile(std::string const & name);
 	/// parsing of non-gui LyX options. Returns true if gui
 	bool easyParse(int & argc, char * argv[]);
+	/// 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
-	string batch_command;
+	std::string batch_command;
+
+	/// last files loaded
+	boost::scoped_ptr<LastFiles> lastfiles_;
+	///
+	typedef std::list<boost::shared_ptr<LyXView> > ViewList;
+	ViewList views_;
 };
 
 #endif // LYX_MAIN_H