X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.h;h=d1326685f05c5e790db980ecd1d36fbe76b26dea;hb=f7be88ce4c2bbc10c4691e614a54fca427a2e8fb;hp=ffcf3f650c10703218c5c96d75cee43652516e21;hpb=17729b93461966b1eaca8408432ec663ac587338;p=lyx.git diff --git a/src/LyXRC.h b/src/LyXRC.h index ffcf3f650c..d1326685f0 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,11 +65,12 @@ public: RC_CONVERTER_CACHE_MAXAGE, RC_COPIER, RC_CURSOR_FOLLOWS_SCROLLBAR, + RC_CURSOR_WIDTH, RC_DATE_INSERT_FORMAT, RC_DEFAULT_DECIMAL_POINT, - RC_DEFAULT_LANGUAGE, + 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, @@ -79,11 +80,12 @@ public: RC_EXAMPLEPATH, RC_EXPORT_OVERWRITE, RC_FONT_ENCODING, - RC_FORMAT, + 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, @@ -92,6 +94,7 @@ public: RC_GROUP_LAYOUTS, RC_GUI_LANGUAGE, RC_HUNSPELLDIR_PATH, + RC_ICON_SET, RC_INDEX_ALTERNATIVES, RC_INDEX_COMMAND, RC_INPUT, @@ -106,11 +109,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, @@ -119,9 +124,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, @@ -143,7 +146,6 @@ public: RC_PRINTTOPRINTER, RC_PRINT_ADAPTOUTPUT, RC_PRINT_COMMAND, - RC_RTL_SUPPORT, RC_SAVE_COMPRESSED, RC_SCREEN_DPI, RC_SCREEN_FONT_ROMAN, @@ -161,8 +163,8 @@ public: 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, @@ -171,25 +173,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 }; @@ -197,17 +197,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; /// @@ -215,7 +222,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; @@ -266,7 +273,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 @@ -356,6 +362,8 @@ public: 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 @@ -366,6 +374,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; /// @@ -377,7 +387,7 @@ public: /// std::string date_insert_format; /// - std::string language_package; + std::string language_custom_package; /// bool language_auto_begin; /// @@ -391,9 +401,14 @@ public: /// bool language_global_options; /// - bool language_use_babel; + enum LangPackageSelection { + LP_AUTO = 0, + LP_BABEL, + LP_CUSTOM, + LP_NONE + }; /// - bool rtl_support; + LangPackageSelection language_package_selection; /// bidi cursor movement: true = visual, false = logical bool visual_cursor; /// @@ -401,17 +416,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; /// @@ -446,6 +463,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 @@ -454,6 +475,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 @@ -470,6 +496,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 @@ -499,6 +527,8 @@ public: /// bool single_close_tab_button; /// + bool single_instance; + /// std::string forward_search_dvi; /// std::string forward_search_pdf; @@ -507,6 +537,8 @@ public: /// 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, @@ -515,20 +547,13 @@ public: }; /// ScrollWheelZoom scroll_wheel_zoom; + /// + 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); ///