* Painter.h:

[lyx.git] / src / lyxrc.h

diff --git a/src/lyxrc.h b/src/lyxrc.h
index 016ac5ee98ff35e9d3e91a066d905693e87b401e..b47cb8fa77a5f0f1180479ee5091ee931ea3c00d 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -24,10 +24,13 @@
 #include <iosfwd>
 #include <string>
 
+
+namespace lyx {
+
 class LyXLex;
 
 /// This contains the runtime configuration of LyX
-class LyXRC //: public noncopyable {
+class LyXRC //: public noncopyable 
 // after 1.1.6 I will use a LyXRCStruct here and then this can be made
 // noncopyable again.  For now I want to minimise changes.  ARRae 20001010
 {
@@ -51,7 +54,6 @@ public:
                RC_CURSOR_FOLLOWS_SCROLLBAR,
                RC_CUSTOM_EXPORT_COMMAND,
                RC_CUSTOM_EXPORT_FORMAT,
-               RC_CYGWIN_PATH_FIX,
                RC_DATE_INSERT_FORMAT,
                RC_DEFAULT_LANGUAGE,
                RC_DEFAULT_PAPERSIZE,
@@ -75,7 +77,8 @@ public:
                RC_LANGUAGE_GLOBAL_OPTIONS,
                RC_LANGUAGE_PACKAGE,
                RC_LANGUAGE_USE_BABEL,
-               RC_LASTFILES,
+               RC_USELASTFILEPOS,
+               RC_LOADSESSION,
                RC_MAKE_BACKUP,
                RC_MARK_FOREIGN_LANGUAGE,
                RC_NUMLASTFILES,
@@ -116,6 +119,9 @@ public:
                RC_SCREEN_FONT_SIZES,
                RC_SCREEN_FONT_TYPEWRITER,
                RC_SCREEN_FONT_TYPEWRITER_FOUNDRY,
+               RC_SCREEN_GEOMETRY_HEIGHT,
+               RC_SCREEN_GEOMETRY_WIDTH,
+               RC_SCREEN_GEOMETRY_XYSAVED,
                RC_SCREEN_ZOOM,
                RC_SERVERPIPE,
                RC_SET_COLOR,
@@ -124,6 +130,7 @@ public:
                RC_TEMPDIRPATH,
                RC_TEMPLATEPATH,
                RC_TEX_ALLOWS_SPACES,
+               RC_TEX_EXPECTS_WINDOWS_PATHS,
                RC_UIFILE,
                RC_USER_EMAIL,
                RC_USER_NAME,
@@ -135,7 +142,6 @@ public:
                RC_USE_SPELL_LIB,
                RC_VIEWDVI_PAPEROPTION,
                RC_VIEWER,
-               RC_WHEEL_JUMP,
                RC_LAST
        };
 
@@ -227,18 +233,24 @@ public:
        bool auto_reset_options;
        ///
        bool check_lastfiles;
-       /// filename for lastfiles file
-       std::string lastfiles;
        /// maximal number of lastfiles
        unsigned int num_lastfiles;
+       /// whether or not go to saved position when opening a file
+       bool use_lastfilepos;
+       /// load files from last session automatically
+       bool load_session;
        /// shall a backup file be created
        bool make_backup;
        /// A directory for storing backup files
        std::string backupdir_path;
+       /// Width of MainWindow. if 0, value from last session will be used
+       int geometry_width;
+       /// Height of MainWindow, if 0, value from last session will be used
+       int geometry_height;
+       /// Whether or not save/restore windows position as session info
+       bool geometry_xysaved;
        /// Zoom factor for screen fonts
        unsigned int zoom;
-       /// parameter for button_4 and button_5 (scrollwheel)
-       unsigned int wheel_jump;
        /// Screen font sizes in points for each font size
        std::string font_sizes[10];
        /// Allow the use of scalable fonts? Default is yes.
@@ -357,7 +369,7 @@ public:
        ///
        int label_init_length;
        ///
-       lyx::graphics::DisplayType display_graphics;
+       graphics::DisplayType display_graphics;
        ///
        bool show_banner;
        ///
@@ -376,8 +388,8 @@ public:
        std::string user_name;
        /// user email
        std::string user_email;
-       ///
-       bool cygwin_path_fix;
+       /// True if the TeX engine cannot handle posix paths
+       bool windows_style_tex_paths;
        /// True if the TeX engine can handle file names containing spaces
        bool tex_allows_spaces;
        /** Prepend paths to the PATH environment variable.
@@ -403,4 +415,7 @@ public:
 extern LyXRC lyxrc;
 ///
 extern LyXRC system_lyxrc;
+
+} // namespace lyx
+
 #endif