Allows editing when the Prefs dialog is opened; fix bug 3140:

[lyx.git] / src / lyxrc.h

diff --git a/src/lyxrc.h b/src/lyxrc.h
index 02ceec178f83b0f346efa7e3d0751c42e8f264ee..ceed6f936974b808058ae620b2b1e7e746feb3d5 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -24,10 +24,15 @@
 #include <iosfwd>
 #include <string>
 
+
+namespace lyx {
+
+namespace support { class FileName; }
+
 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
 {
@@ -35,8 +40,8 @@ public:
        enum LyXRCTags {
                RC_ACCEPT_COMPOUND = 1,
                RC_ALT_LANG,
-               RC_ASCIIROFF_COMMAND,
-               RC_ASCII_LINELEN,
+               RC_PLAINTEXT_ROFF_COMMAND,
+               RC_PLAINTEXT_LINELEN,
                RC_AUTOREGIONDELETE,
                RC_AUTORESET_OPTIONS,
                RC_AUTOSAVE,
@@ -47,6 +52,7 @@ public:
                RC_CHECKLASTFILES,
                RC_CHKTEX_COMMAND,
                RC_CONVERTER,
+               RC_CONVERTER_CACHE_MAXAGE,
                RC_COPIER,
                RC_CURSOR_FOLLOWS_SCROLLBAR,
                RC_CUSTOM_EXPORT_COMMAND,
@@ -133,13 +139,13 @@ public:
                RC_USER_NAME,
                RC_USETEMPDIR,
                RC_USE_ALT_LANG,
+               RC_USE_CONVERTER_CACHE,
                RC_USE_ESC_CHARS,
                RC_USE_INP_ENC,
                RC_USE_PERS_DICT,
                RC_USE_SPELL_LIB,
                RC_VIEWDVI_PAPEROPTION,
                RC_VIEWER,
-               RC_WHEEL_JUMP,
                RC_LAST
        };
 
@@ -148,7 +154,7 @@ public:
        ///
        void setDefaults();
        ///
-       int read(std::string const & filename);
+       int read(support::FileName const & filename);
        ///
        int read(std::istream &);
 private:
@@ -156,15 +162,15 @@ private:
        int read(LyXLex &);
 public:
        ///
-       void write(std::string const & filename,
+       void write(support::FileName const & filename,
                   bool ignore_system_lyxrc) const;
        ///
        void write(std::ostream & os,
                   bool ignore_system_lyxrc) const;
        ///
        void print() const;
-       ///
-       static std::string const getDescription(LyXRCTags);
+       // FIXME unused (was used for xforms. Do we still need this?)
+       //static docstring const getDescription(LyXRCTags);
        ///
        std::string bind_file;
        ///
@@ -249,9 +255,6 @@ public:
        bool geometry_xysaved;
        /// Zoom factor for screen fonts
        unsigned int zoom;
-       /// parameter for button_4 and button_5 (scrollwheel)
-       /// Only used by the xforms frontend
-       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.
@@ -306,9 +309,9 @@ public:
        ///
        unsigned int autosave;
        ///
-       std::string ascii_roff_command;
+       std::string plaintext_roff_command;
        ///
-       unsigned int ascii_linelen;
+       unsigned int plaintext_linelen;
        /// use library instead of process
        bool use_spell_lib;
        /// Ispell command
@@ -370,7 +373,7 @@ public:
        ///
        int label_init_length;
        ///
-       lyx::graphics::DisplayType display_graphics;
+       graphics::DisplayType display_graphics;
        ///
        bool show_banner;
        ///
@@ -397,6 +400,10 @@ public:
         *  The string is input, stored and output in native format.
         */
        std::string path_prefix;
+       /// Use the cache for file converters?
+       bool use_converter_cache;
+       /// The maximum age of cache files in seconds
+       unsigned int converter_cache_maxage;
 };
 
 
@@ -416,4 +423,7 @@ public:
 extern LyXRC lyxrc;
 ///
 extern LyXRC system_lyxrc;
+
+} // namespace lyx
+
 #endif