Various fixes, removed "default" language, inserted new lyxrc tag

[lyx.git] / src / lyxrc.h

diff --git a/src/lyxrc.h b/src/lyxrc.h
index 7eec3c242fb2c7c75381b647410e836b67c298e1..5db59f319899e962e1b6ccfb2de7454fb64a2ed9 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -16,12 +16,13 @@
 #pragma interface
 #endif
 
-#include "ToolbarDefaults.h"
 #include "bufferparams.h"
+#include "support/utility.hpp"
 
 /// This contains the runtime configuration of LyX
-class LyXRC {
+class LyXRC : public noncopyable {
 public:
+       ///
        LyXRC();
        ///
        void setDefaults();
@@ -38,10 +39,10 @@ public:
        ///
        int ReadBindFile(string const & name = "cua");
        ///
-       ToolbarDefaults toolbardefaults;
-       ///
        string bind_file;
        ///
+       string ui_file;
+       ///
        string printer;
        ///
        string print_command;
@@ -93,10 +94,13 @@ public:
        string dvi_to_ps_command;
         /// program for performing literate programming
         string literate_command;
+       ///
         string literate_extension;
+       ///
         string literate_error_filter;
         /// program for compiling
         string build_command;
+       ///
         string build_error_filter;
        /// program for running relyx
        string relyx_command;
@@ -140,6 +144,8 @@ public:
        string backupdir_path;
        /// 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
        float font_sizes[10];
        /// Allow the use of scalable fonts? Default is yes.
@@ -163,6 +169,19 @@ public:
        ///
        string font_norm;
        ///
+       enum FontEncoding {
+               ///
+               ISO_10646_1,
+               ///
+               ISO_8859_6_8,
+               ///
+               OTHER_ENCODING
+       };
+       ///
+       FontEncoding font_norm_type;
+       ///
+       void set_font_norm_type();
+       ///
        string font_norm_menu;
        ///
        unsigned int autosave;
@@ -240,8 +259,14 @@ public:
        string docbook_to_html_command;
        ///
        string docbook_to_pdf_command;
+       ///
+       bool new_ask_filename;
+       ///
+       string default_language;
 };
 
+///
 extern LyXRC lyxrc;
-
+///
+//extern LyXRC system_lyxrc;
 #endif