More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / lyx_main.h

diff --git a/src/lyx_main.h b/src/lyx_main.h
index b495b41ced1271e7efa4a76a53eb2114939ee2bd..ba840c422f9afcf33536eb7b259d2c24aa1f731e 100644 (file)
--- a/src/lyx_main.h
+++ b/src/lyx_main.h
@@ -15,75 +15,71 @@
 #ifndef LYX_MAIN_H
 #define LYX_MAIN_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include <csignal>
 
 #include "LString.h"
+#include <boost/utility.hpp>
 
 class LyXGUI;
 class LyXRC;
 class LastFiles;
 class Buffer;
+class kb_keymap;
 
-
+///
 extern string system_lyxdir;
+///
 extern string user_lyxdir;
+///
 extern string system_tempdir;
-
+///
 extern LastFiles * lastfiles; /* we should hopefully be able to move this
                              * inside the LyX class */
 
-extern LyXRC * lyxrc;
-
 
 /**
   This is the main LyX object it encapsulates most of the other objects.
 */
-class LyX {
+class LyX : public noncopyable {
 public:
-       /**@name Constructors and Deconstructors */
-       //@{
        /// the only allowed constructor
        LyX(int * argc, char * argv[]); // constructor
-       // Always is useful a destructor
+       /// Always is useful a destructor
        ~LyX();
-       //@}
 
-       /**@name Pointers to... */
-       //@{
        ///
        LyXGUI * lyxGUI;  // should be only one of this
-       //@}
 private:
-       /**@name Constructors and Deconstructors */
-       //@{
-       /// not allowed
-       LyX(const LyX &) {} // not allowed
-       /// not allowed
-       LyX() {} // not allowed
-       //@}
-
-       /**@name Private variables */
-       //@{
        /// does this user start lyx for the first time?
        bool first_start;
        ///
        string batch_command;
        ///
-       struct sigaction act_;
-       //@}
-       /**@name Private Members */
-       //@{
-       ///
        void runtime();
        ///
-       void init(int * argc, char * argv[]);
+       void init(int * argc, char * argv[], bool);
+       ///
+       void defaultKeyBindings(kb_keymap * kbmap);
        ///
-       void queryUserLyXDir();
+       void deadKeyBindings(kb_keymap * kbmap);
        ///
-        void ReadRcFile(string const & name);
+       void queryUserLyXDir(bool explicit_userdir);
+       /** Search for and read the LyXRC file name, return
+           true if successfull.
+       */
+        bool ReadRcFile(string const & name);
+       /// Read the ui file `name'
+       void ReadUIFile(string const & name);
+       /// Read the languages file `name'
+       void ReadLangugesFile(string const & name);
+       /// Read the encodings file `name'
+       void ReadEncodingsFile(string const & name);
         ///
        bool easyParse(int * argc, char * argv[]);
-       //@}
 };
 
 #endif