Oops...

[lyx.git] / src / lyxrc.h

diff --git a/src/lyxrc.h b/src/lyxrc.h
index ba1a8beb61e459b791f9bbc77e96e2622e0784a3..532f00a6c427b9f2c979e44aec5842e35f997790 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -1,22 +1,17 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
+/**
+ * \file lyxrc.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
- *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS
+ */
 
 #ifndef LYXRC_H
 #define LYXRC_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "bufferparams.h" // Just to get the enum BufferParams::PAPER_SIZE (sic)
+#include "graphics/GraphicsTypes.h"
 
 // #include <boost/utility.hpp>
 
@@ -54,6 +49,9 @@ enum LyXRCTags {
        RC_SCREEN_FONT_ROMAN,
        RC_SCREEN_FONT_SANS,
        RC_SCREEN_FONT_TYPEWRITER,
+       RC_SCREEN_FONT_ROMAN_FOUNDRY,
+       RC_SCREEN_FONT_SANS_FOUNDRY,
+       RC_SCREEN_FONT_TYPEWRITER_FOUNDRY,
        RC_SCREEN_FONT_ENCODING,
        RC_POPUP_BOLD_FONT,
        RC_POPUP_NORMAL_FONT,
@@ -68,7 +66,6 @@ enum LyXRCTags {
        RC_AUTOREGIONDELETE,
        RC_AUTORESET_OPTIONS,
        RC_BIND,
-       RC_OVERRIDE_X_DEADKEYS,
        RC_SERVERPIPE,
        RC_INPUT,
        RC_BINDFILE,
@@ -96,7 +93,6 @@ enum LyXRCTags {
        RC_CHKTEX_COMMAND,
        RC_CURSOR_FOLLOWS_SCROLLBAR,
        RC_DIALOGS_ICONIFY_WITH_MAIN,
-       RC_EXIT_CONFIRMATION,
        RC_MAKE_BACKUP,
        RC_BACKUPDIR_PATH,
        RC_RTL_SUPPORT,
@@ -116,7 +112,6 @@ enum LyXRCTags {
        RC_CONVERTER,
        RC_VIEWER,
        RC_FORMAT,
-       RC_NEW_ASK_FILENAME,
        RC_DEFAULT_LANGUAGE,
        RC_LABEL_INIT_LENGTH,
        RC_DISPLAY_GRAPHICS,
@@ -126,6 +121,8 @@ enum LyXRCTags {
 #ifdef USE_PSPELL
        RC_USE_PSPELL,
 #endif
+       RC_USER_NAME,
+       RC_USER_EMAIL,
        RC_LAST
 };
 
@@ -232,8 +229,6 @@ enum LyXRCTags {
        bool use_scalable_fonts;
        /// DPI of monitor
        float dpi;
-       /// Whether lyx should handle deadkeys by itself
-       bool override_x_deadkeys;
        ///
        string fontenc;
        ///
@@ -243,6 +238,12 @@ enum LyXRCTags {
        ///
        string typewriter_font_name;
        ///
+       string roman_font_foundry;
+       ///
+       string sans_font_foundry;
+       ///
+       string typewriter_font_foundry;
+       ///
        string popup_bold_font;
        ///
        string popup_normal_font;
@@ -302,8 +303,6 @@ enum LyXRCTags {
        string isp_esc_chars;
        ///
        bool use_kbmap;
-       /// Ask for confirmation of exit when there are unsaved documents?
-       bool exit_confirmation;
        ///
        string primary_kbmap;
        ///
@@ -337,8 +336,6 @@ enum LyXRCTags {
        /// Do we have to use a GUI?
        bool use_gui;
        ///
-       bool new_ask_filename;
-       ///
        string default_language;
        ///
        bool cursor_follows_scrollbar;
@@ -347,7 +344,7 @@ enum LyXRCTags {
        ///
        int label_init_length;
        ///
-       string display_graphics;
+       grfx::DisplayType display_graphics;
        ///
        bool show_banner;
        ///
@@ -356,7 +353,11 @@ enum LyXRCTags {
        bool preview_hashed_labels;
        ///
        float preview_scale_factor;
-       
+       /// user name
+       string user_name;
+       /// user email
+       string user_email;
+
 private:
        /// Is a bind file already (or currently) read?
        bool hasBindFile;