another fix

[lyx.git] / src / lyxrc.h

diff --git a/src/lyxrc.h b/src/lyxrc.h
index 6481577b105c4a36a6b2cf07605576774d37a795..a8a1951aebd7ebd1619ae84adf7ef1c58513bc64 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- *      
+ *
  *           Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
  *
@@ -17,6 +17,7 @@
 #endif
 
 #include "bufferparams.h" // Just to get the enum BufferParams::PAPER_SIZE (sic)
+#include "graphics/GraphicsTypes.h"
 
 // #include <boost/utility.hpp>
 
@@ -44,7 +45,7 @@ enum LyXRCTags {
        RC_PRINTEXSTRAOPTIONS,
        RC_PRINTSPOOL_COMMAND,
        RC_PRINTSPOOL_PRINTERPREFIX,
-        RC_PRINTPAPERFLAG,
+       RC_PRINTPAPERFLAG,
        RC_PRINTPAPERDIMENSIONFLAG,
        RC_CUSTOM_EXPORT_COMMAND,
        RC_CUSTOM_EXPORT_FORMAT,
@@ -54,10 +55,10 @@ enum LyXRCTags {
        RC_SCREEN_FONT_ROMAN,
        RC_SCREEN_FONT_SANS,
        RC_SCREEN_FONT_TYPEWRITER,
-       RC_SCREEN_FONT_MENU,
-       RC_SCREEN_FONT_POPUP,
        RC_SCREEN_FONT_ENCODING,
-       RC_SCREEN_FONT_ENCODING_MENU,
+       RC_POPUP_BOLD_FONT,
+       RC_POPUP_NORMAL_FONT,
+       RC_POPUP_FONT_ENCODING,
        RC_SET_COLOR,
        RC_AUTOSAVE,
        RC_DOCUMENTPATH,
@@ -96,8 +97,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,11 +116,13 @@ 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_PREVIEW,
+       RC_PREVIEW_HASHED_LABELS,
+       RC_PREVIEW_SCALE_FACTOR,
+#ifdef USE_PSPELL
        RC_USE_PSPELL,
 #endif
        RC_LAST
@@ -133,13 +134,13 @@ enum LyXRCTags {
        ///
        void setDefaults();
        ///
-       int read (string const & filename);
+       int read(string const & filename);
        ///
        void readBindFileIfNeeded();
        ///
        void write(string const & filename) const;
        ///
-        void print() const;
+       void print() const;
        ///
        void output(std::ostream & os) const;
        ///
@@ -178,14 +179,14 @@ enum LyXRCTags {
        string print_extra_options;
        ///
        string print_spool_command;
-        ///
+       ///
        string print_spool_printerprefix;
        ///
        string print_paper_flag;
        ///
        string print_paper_dimension_flag;
        ///
-        string custom_export_command;
+       string custom_export_command;
        ///
        string custom_export_format;
        ///
@@ -194,8 +195,8 @@ enum LyXRCTags {
        string ps_command;
        /// option for telling the dvi viewer about the paper size
        string view_dvi_paper_option;
-        /// default paper size for local xdvi/dvips/ghostview/whatever
-        BufferParams::PAPER_SIZE default_papersize;
+       /// default paper size for local xdvi/dvips/ghostview/whatever
+       BufferParams::PAPER_SIZE default_papersize;
        /// command to run chktex incl. options
        string chktex_command;
        ///
@@ -241,9 +242,9 @@ enum LyXRCTags {
        ///
        string typewriter_font_name;
        ///
-       string menu_font_name;
+       string popup_bold_font;
        ///
-       string popup_font_name;
+       string popup_normal_font;
        ///
        string font_norm;
        ///
@@ -253,6 +254,10 @@ enum LyXRCTags {
                ///
                ISO_8859_1,
                ///
+               ISO_8859_3,
+               ///
+               ISO_8859_4,
+               ///
                ISO_8859_6_8,
                ///
                ISO_8859_9,
@@ -266,7 +271,7 @@ enum LyXRCTags {
        ///
        void set_font_norm_type();
        ///
-       string font_norm_menu;
+       string popup_font_encoding;
        ///
        unsigned int autosave;
        ///
@@ -274,7 +279,7 @@ enum LyXRCTags {
        ///
        unsigned int ascii_linelen;
        /// Ispell command
-#ifdef USE_PSPELL      
+#ifdef USE_PSPELL
        bool use_pspell;
 #endif
        string isp_command;
@@ -296,10 +301,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;
        ///
@@ -321,7 +322,7 @@ enum LyXRCTags {
        ///
        string language_command_local;
        ///
-       bool language_global_options; 
+       bool language_global_options;
        ///
        bool language_use_babel;
        ///
@@ -330,13 +331,9 @@ enum LyXRCTags {
        bool auto_number;
        ///
        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;
@@ -345,7 +342,16 @@ enum LyXRCTags {
        ///
        int label_init_length;
        ///
-       string display_graphics;
+       grfx::DisplayType display_graphics;
+       ///
+       bool show_banner;
+       ///
+       bool preview;
+       ///
+       bool preview_hashed_labels;
+       ///
+       float preview_scale_factor;
+       
 private:
        /// Is a bind file already (or currently) read?
        bool hasBindFile;