Didn't mean to include this.

[lyx.git] / src / LyXRC.h

diff --git a/src/LyXRC.h b/src/LyXRC.h
index e8114e7e6a666e7ed335b879e56c26ed28fa342d..f80c7b5f517ddfe736afab3d571b216a8928764c 100644 (file)
--- a/src/LyXRC.h
+++ b/src/LyXRC.h
@@ -19,6 +19,7 @@
 #define LYXRC_H
 
 #include "paper.h"
+#include "Length.h"
 
 #include "support/strfwd.h"
 
@@ -65,11 +66,12 @@ public:
                RC_CONVERTER_CACHE_MAXAGE,
                RC_COPIER,
                RC_CURSOR_FOLLOWS_SCROLLBAR,
+               RC_CURSOR_WIDTH,
                RC_DATE_INSERT_FORMAT,
                RC_DEFAULT_DECIMAL_POINT,
+               RC_DEFAULT_LENGTH_UNIT,
                RC_DEFAULT_LANGUAGE,
                RC_DEFAULT_VIEW_FORMAT,
-               RC_DEFAULT_PAPERSIZE,
                RC_DEFFILE,
                RC_DIALOGS_ICONIFY_WITH_MAIN,
                RC_DISPLAY_GRAPHICS,
@@ -79,6 +81,7 @@ public:
                RC_EXAMPLEPATH,
                RC_EXPORT_OVERWRITE,
                RC_FONT_ENCODING,
+               RC_FORCE_PAINT_SINGLE_CHAR,
                RC_FILEFORMAT,
                RC_FORWARD_SEARCH_DVI,
                RC_FORWARD_SEARCH_PDF,
@@ -92,6 +95,7 @@ public:
                RC_GROUP_LAYOUTS,
                RC_GUI_LANGUAGE,
                RC_HUNSPELLDIR_PATH,
+               RC_ICON_SET,
                RC_INDEX_ALTERNATIVES,
                RC_INDEX_COMMAND,
                RC_INPUT,
@@ -171,6 +175,7 @@ public:
                RC_TEMPLATEPATH,
                RC_TEX_ALLOWS_SPACES,
                RC_TEX_EXPECTS_WINDOWS_PATHS,
+               RC_TEXINPUTS_PREFIX,
                RC_THESAURUSDIRPATH,
                RC_UIFILE,
                RC_USELASTFILEPOS,
@@ -191,22 +196,20 @@ public:
        LyXRC();
        ///
        void setDefaults();
-       ///
-       bool read(support::FileName const & filename);
+       /// \param check_format: whether to try to convert the file format,
+       /// if it is not current. this should only be true, really, for the
+       /// user's own preferences file.
+       bool read(support::FileName const & filename, bool check_format);
        ///
        bool read(std::istream &);
-       ///
+private:
        enum ReturnValues {
                ReadOK,
-               FileError,
                ReadError,
                FormatMismatch
        };
-private:
-       ///
-       ReturnValues readWithoutConv(support::FileName const &);
        ///
-       ReturnValues read(Lexer &);
+       ReturnValues read(Lexer &, bool check_format);
 public:
        ///
        typedef std::set<std::string> CommandSet;
@@ -269,7 +272,6 @@ public:
        /// option for telling the dvi viewer about the paper size
        std::string view_dvi_paper_option;
        /// default paper size for local xdvi/dvips/ghostview/whatever
-       PAPER_SIZE default_papersize;
        /// command to run chktex incl. options
        std::string chktex_command;
        /// all available commands to run bibtex incl. options
@@ -458,6 +460,8 @@ public:
        std::string user_name;
        /// user email
        std::string user_email;
+       /// icon set name
+       std::string icon_set;
        /// 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
@@ -466,6 +470,11 @@ public:
         *  The string is input, stored and output in native format.
         */
        std::string path_prefix;
+       /** Prepend paths to the TEXINPUTS environment variable.
+        *  The string is input, stored and output in native format.
+        *  A '.' here stands for the current document directory.
+        */
+       std::string texinputs_prefix;
        /// Use the cache for file converters?
        bool use_converter_cache;
        /// The maximum age of cache files in seconds
@@ -521,6 +530,8 @@ public:
        /// Default decimal point when aligning table columns on decimal
        std::string default_decimal_point;
        ///
+       Length::UNIT default_length_unit;
+       ///
        enum ScrollWheelZoom {
                SCROLL_WHEEL_ZOOM_OFF,
                SCROLL_WHEEL_ZOOM_CTRL,
@@ -529,6 +540,10 @@ public:
        };
        ///
        ScrollWheelZoom scroll_wheel_zoom;
+       ///
+       bool force_paint_single_char;
+       ///
+       int cursor_width;
 };