X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxrc.h;h=9d70eacee8e6bb2d9cb2836e93a0da6ca0f9fa9e;hb=fe390e9da1538e20eabbc98977d845295f8e563d;hp=1a7c1fa04250fb62c63c0aef9263757e6da90d51;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git

diff --git a/src/lyxrc.h b/src/lyxrc.h
index 1a7c1fa042..9d70eacee8 100644
--- 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,8 +93,6 @@ enum LyXRCTags {
 	RC_CHKTEX_COMMAND,
 	RC_CURSOR_FOLLOWS_SCROLLBAR,
 	RC_DIALOGS_ICONIFY_WITH_MAIN,
-	RC_EXIT_CONFIRMATION,
-	RC_DISPLAY_SHORTCUTS,
 	RC_MAKE_BACKUP,
 	RC_BACKUPDIR_PATH,
 	RC_RTL_SUPPORT,
@@ -117,13 +112,15 @@ enum LyXRCTags {
 	RC_CONVERTER,
 	RC_VIEWER,
 	RC_FORMAT,
-	RC_NEW_ASK_FILENAME,
 	RC_DEFAULT_LANGUAGE,
 	RC_LABEL_INIT_LENGTH,
 	RC_DISPLAY_GRAPHICS,
-#ifdef USE_PSPELL
-	RC_USE_PSPELL,
-#endif
+	RC_PREVIEW,
+	RC_PREVIEW_HASHED_LABELS,
+	RC_PREVIEW_SCALE_FACTOR,
+	RC_USE_SPELL_LIB,
+	RC_USER_NAME,
+	RC_USER_EMAIL,
 	RC_LAST
 };
 
@@ -133,7 +130,7 @@ enum LyXRCTags {
 	///
 	void setDefaults();
 	///
-	int read (string const & filename);
+	int read(string const & filename);
 	///
 	void readBindFileIfNeeded();
 	///
@@ -188,8 +185,6 @@ enum LyXRCTags {
 	string custom_export_command;
 	///
 	string custom_export_format;
-	///
-	bool pdf_mode;
 	/// postscript interpreter (in general "gs", if it is installed)
 	string ps_command;
 	/// option for telling the dvi viewer about the paper size
@@ -230,8 +225,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;
 	///
@@ -241,6 +234,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;
@@ -277,10 +276,9 @@ enum LyXRCTags {
 	string ascii_roff_command;
 	///
 	unsigned int ascii_linelen;
+	/// use library instead of process
+	bool use_spell_lib;
 	/// Ispell command
-#ifdef USE_PSPELL
-	bool use_pspell;
-#endif
 	string isp_command;
 	/// Accept compound words in spellchecker?
 	bool isp_accept_compound;
@@ -300,10 +298,6 @@ enum LyXRCTags {
 	string isp_esc_chars;
 	///
 	bool use_kbmap;
-	/// Ask for confirmation of exit when there are unsaved documents?
-	bool exit_confirmation;
-	/// Should we display short-cut information in the minibuffer?
-	bool display_shortcuts;
 	///
 	string primary_kbmap;
 	///
@@ -335,12 +329,6 @@ enum LyXRCTags {
 	///
 	bool mark_foreign_language;
 	///
-	bool show_banner;
-	/// Do we have to use a GUI?
-	bool use_gui;
-	///
-	bool new_ask_filename;
-	///
 	string default_language;
 	///
 	bool cursor_follows_scrollbar;
@@ -349,7 +337,20 @@ enum LyXRCTags {
 	///
 	int label_init_length;
 	///
-	string display_graphics;
+	lyx::graphics::DisplayType display_graphics;
+	///
+	bool show_banner;
+	///
+	bool preview;
+	///
+	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;