X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.h;h=28149595ad305697e1a3532b33b4714465390788;hb=5a8b8ba8e11360a716465b9c6c7c0dc48f37f552;hp=45e203af7e0f026e608a1340ef229bc2f691229d;hpb=8f5d4a3fcbcd5875b689740269489adca163366c;p=lyx.git diff --git a/src/LyXRC.h b/src/LyXRC.h index 45e203af7e..28149595ad 100644 --- a/src/LyXRC.h +++ b/src/LyXRC.h @@ -18,14 +18,13 @@ #ifndef LYXRC_H #define LYXRC_H -#include "paper.h" +#include "Length.h" #include "support/strfwd.h" #include #include #include -#include namespace lyx { @@ -57,6 +56,7 @@ public: RC_COMPLETION_INLINE_MATH, RC_COMPLETION_INLINE_TEXT, RC_COMPLETION_INLINE_DOTS, + RC_COMPLETION_MINLENGTH, RC_COMPLETION_POPUP_DELAY, RC_COMPLETION_POPUP_MATH, RC_COMPLETION_POPUP_TEXT, @@ -65,10 +65,12 @@ public: RC_CONVERTER_CACHE_MAXAGE, RC_COPIER, RC_CURSOR_FOLLOWS_SCROLLBAR, + RC_CURSOR_WIDTH, RC_DATE_INSERT_FORMAT, - RC_DEFAULT_LANGUAGE, + RC_DEFAULT_DECIMAL_POINT, + RC_DEFAULT_LENGTH_UNIT, + RC_DEFAULT_OTF_VIEW_FORMAT, RC_DEFAULT_VIEW_FORMAT, - RC_DEFAULT_PAPERSIZE, RC_DEFFILE, RC_DIALOGS_ICONIFY_WITH_MAIN, RC_DISPLAY_GRAPHICS, @@ -76,10 +78,15 @@ public: RC_EDITOR_ALTERNATIVES, RC_ESC_CHARS, RC_EXAMPLEPATH, + RC_EXPORT_OVERWRITE, RC_FONT_ENCODING, - RC_FORMAT, + RC_FORCE_PAINT_SINGLE_CHAR, + RC_FILEFORMAT, + RC_FORWARD_SEARCH_DVI, + RC_FORWARD_SEARCH_PDF, RC_FULL_SCREEN_LIMIT, RC_FULL_SCREEN_SCROLLBAR, + RC_FULL_SCREEN_STATUSBAR, RC_FULL_SCREEN_TABBAR, RC_FULL_SCREEN_MENUBAR, RC_FULL_SCREEN_TOOLBARS, @@ -88,6 +95,7 @@ public: RC_GROUP_LAYOUTS, RC_GUI_LANGUAGE, RC_HUNSPELLDIR_PATH, + RC_ICON_SET, RC_INDEX_ALTERNATIVES, RC_INDEX_COMMAND, RC_INPUT, @@ -102,11 +110,13 @@ public: RC_LANGUAGE_COMMAND_END, RC_LANGUAGE_COMMAND_LOCAL, RC_LANGUAGE_GLOBAL_OPTIONS, - RC_LANGUAGE_PACKAGE, - RC_LANGUAGE_USE_BABEL, + RC_LANGUAGE_CUSTOM_PACKAGE, + RC_LANGUAGE_PACKAGE_SELECTION, RC_LOADSESSION, + RC_LYXRCFORMAT, RC_MACRO_EDIT_STYLE, - RC_MAC_LIKE_WORD_MOVEMENT, + RC_MAC_DONTSWAP_CTRL_META, + RC_MAC_LIKE_CURSOR_MOVEMENT, RC_MAKE_BACKUP, RC_MARK_FOREIGN_LANGUAGE, RC_MOUSE_WHEEL_SPEED, @@ -115,9 +125,7 @@ public: RC_OPEN_BUFFERS_IN_TABS, RC_PARAGRAPH_MARKERS, RC_PATH_PREFIX, - RC_PERS_DICT, RC_PLAINTEXT_LINELEN, - RC_PLAINTEXT_ROFF_COMMAND, RC_PREVIEW, RC_PREVIEW_HASHED_LABELS, RC_PREVIEW_SCALE_FACTOR, @@ -140,6 +148,7 @@ public: RC_PRINT_ADAPTOUTPUT, RC_PRINT_COMMAND, RC_RTL_SUPPORT, + RC_SAVE_COMPRESSED, RC_SCREEN_DPI, RC_SCREEN_FONT_ROMAN, RC_SCREEN_FONT_ROMAN_FOUNDRY, @@ -151,12 +160,13 @@ public: RC_SCREEN_FONT_TYPEWRITER_FOUNDRY, RC_SCREEN_ZOOM, RC_SCROLL_BELOW_DOCUMENT, + RC_SCROLL_WHEEL_ZOOM, RC_SERVERPIPE, RC_SET_COLOR, RC_SHOW_BANNER, RC_SINGLE_CLOSE_TAB_BUTTON, + RC_SINGLE_INSTANCE, RC_SORT_LAYOUTS, - RC_SPELL_COMMAND, RC_SPELLCHECK_CONTINUOUSLY, RC_SPELLCHECK_NOTES, RC_SPELLCHECKER, @@ -165,24 +175,23 @@ public: RC_TEMPLATEPATH, RC_TEX_ALLOWS_SPACES, RC_TEX_EXPECTS_WINDOWS_PATHS, + RC_TEXINPUTS_PREFIX, RC_THESAURUSDIRPATH, RC_UIFILE, RC_USELASTFILEPOS, RC_USER_EMAIL, RC_USER_NAME, - RC_USETEMPDIR, - RC_USE_ALT_LANG, RC_USE_CONVERTER_CACHE, - RC_USE_ESC_CHARS, - RC_USE_INP_ENC, - RC_USE_PERS_DICT, + RC_USE_SYSTEM_COLORS, RC_USE_TOOLTIP, RC_USE_PIXMAP_CACHE, - RC_USE_SPELL_LIB, + RC_USE_QIMAGE, + RC_USE_SYSTEM_THEME_ICONS, RC_VIEWDVI_PAPEROPTION, RC_VIEWER, RC_VIEWER_ALTERNATIVES, RC_VISUAL_CURSOR, + RC_CLOSE_BUFFER_WITH_LAST_VIEW, RC_LAST }; @@ -190,17 +199,24 @@ public: LyXRC(); /// void setDefaults(); + /// \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); /// - int read(support::FileName const & filename); - /// - int read(std::istream &); + bool read(std::istream &); private: + enum ReturnValues { + ReadOK, + ReadError, + FormatMismatch + }; /// - int read(Lexer &); + ReturnValues read(Lexer &, bool check_format); public: - /// + /// typedef std::set CommandSet; - /// maps a format to a set of commands that can be used to + /// maps a format to a set of commands that can be used to /// edit or view it. typedef std::map Alternatives; /// @@ -208,7 +224,7 @@ public: bool ignore_system_lyxrc) const; /// write rc. If a specific tag is given, only output that one. void write(std::ostream & os, - bool ignore_system_lyxrc, + bool ignore_system_lyxrc, std::string const & tag = std::string()) const; /// void print() const; @@ -259,7 +275,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 @@ -302,6 +317,8 @@ public: bool use_lastfilepos; /// load files from last session automatically bool load_session; + /// do we save new documents as compressed by default + bool save_compressed; /// shall a backup file be created bool make_backup; /// A directory for storing backup files @@ -343,8 +360,12 @@ public: bool paragraph_markers; /// Use tooltips? bool use_tooltip; + /// Use the colors from current system theme? + bool use_system_colors; /// Use pixmap cache? bool use_pixmap_cache; + /// Use QImage backend? + bool use_qimage; /// Spellchecker engine: aspell, hunspell, etc std::string spellchecker; /// Alternate language for spellchecker @@ -355,6 +376,8 @@ public: bool spellcheck_continuously; /// spellcheck notes and comments? bool spellcheck_notes; + /// minimum length of words to complete + unsigned int completion_minlength; /// bool use_kbmap; /// @@ -366,7 +389,7 @@ public: /// std::string date_insert_format; /// - std::string language_package; + std::string language_custom_package; /// bool language_auto_begin; /// @@ -380,7 +403,14 @@ public: /// bool language_global_options; /// - bool language_use_babel; + enum LangPackageSelection { + LP_AUTO = 0, + LP_BABEL, + LP_CUSTOM, + LP_NONE + }; + /// + LangPackageSelection language_package_selection; /// bool rtl_support; /// bidi cursor movement: true = visual, false = logical @@ -390,17 +420,19 @@ public: /// bool mark_foreign_language; /// - std::string default_language; - /// std::string gui_language; /// + std::string default_otf_view_format; + /// std::string default_view_format; /// all available viewers Alternatives viewer_alternatives; /// all available editors Alternatives editor_alternatives; /// - bool mac_like_word_movement; + bool mac_dontswap_ctrl_meta; + /// + bool mac_like_cursor_movement; /// bool cursor_follows_scrollbar; /// @@ -435,6 +467,10 @@ public: std::string user_name; /// user email std::string user_email; + /// icon set name + std::string icon_set; + /// whether to use the icons from the theme + bool use_system_theme_icons; /// 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 @@ -443,6 +479,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 @@ -459,6 +500,8 @@ public: bool full_screen_tabbar; /// Toggle menubar in fullscreen mode? bool full_screen_menubar; + /// Toggle statusbar in fullscreen mode? + bool full_screen_statusbar; /// Limit the text width? bool full_screen_limit; /// Width of limited screen (in pixels) in fullscreen mode @@ -487,20 +530,36 @@ public: bool open_buffers_in_tabs; /// bool single_close_tab_button; + /// + bool single_instance; + /// + std::string forward_search_dvi; + /// + std::string forward_search_pdf; + /// + int export_overwrite; + /// 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, + SCROLL_WHEEL_ZOOM_SHIFT, + SCROLL_WHEEL_ZOOM_ALT + }; + /// + ScrollWheelZoom scroll_wheel_zoom; + /// + bool force_paint_single_char; + /// + int cursor_width; + /// One of: yes, no, ask + std::string close_buffer_with_last_view; }; -/** \c LyXRC_PreviewStatus is a wrapper for LyXRC::PreviewStatus. - * It can be forward-declared and passed as a function argument without - * having to expose LyXRC.h. - */ -class LyXRC_PreviewStatus { - LyXRC::PreviewStatus val_; -public: - LyXRC_PreviewStatus(LyXRC::PreviewStatus val) : val_(val) {} - operator LyXRC::PreviewStatus() const { return val_; } -}; - void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new); ///