X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.h;h=3567bae6ea4e196b0b07844a60443b020cd1dfc4;hb=dad3c8ce74d1ebea92973bea5ca44f97d660d38e;hp=931e8b70802e736fe5dc3a134b7e41c5d05c69d8;hpb=48f36f59e74cfdea1d33f9170671d33c45b8ba37;p=lyx.git diff --git a/src/LyXRC.h b/src/LyXRC.h index 931e8b7080..3567bae6ea 100644 --- a/src/LyXRC.h +++ b/src/LyXRC.h @@ -22,6 +22,8 @@ #include "support/strfwd.h" +#include +#include #include #include @@ -40,8 +42,6 @@ public: RC_ACCEPT_COMPOUND = 1, RC_ALT_LANG, RC_AUTOCORRECTION_MATH, - RC_PLAINTEXT_LINELEN, - RC_PLAINTEXT_ROFF_COMMAND, RC_AUTOREGIONDELETE, RC_AUTORESET_OPTIONS, RC_AUTOSAVE, @@ -65,27 +65,33 @@ public: RC_CONVERTER_CACHE_MAXAGE, RC_COPIER, RC_CURSOR_FOLLOWS_SCROLLBAR, - RC_MAC_LIKE_WORD_MOVEMENT, RC_DATE_INSERT_FORMAT, - RC_DEFFILE, + RC_DEFAULT_DECIMAL_POINT, RC_DEFAULT_LANGUAGE, RC_DEFAULT_VIEW_FORMAT, - RC_GUI_LANGUAGE, RC_DEFAULT_PAPERSIZE, + RC_DEFFILE, RC_DIALOGS_ICONIFY_WITH_MAIN, RC_DISPLAY_GRAPHICS, RC_DOCUMENTPATH, + RC_EDITOR_ALTERNATIVES, RC_ESC_CHARS, RC_EXAMPLEPATH, + RC_EXPORT_OVERWRITE, RC_FONT_ENCODING, RC_FORMAT, + RC_FORWARD_SEARCH_DVI, + RC_FORWARD_SEARCH_PDF, RC_FULL_SCREEN_LIMIT, RC_FULL_SCREEN_SCROLLBAR, RC_FULL_SCREEN_TABBAR, + RC_FULL_SCREEN_MENUBAR, RC_FULL_SCREEN_TOOLBARS, RC_FULL_SCREEN_WIDTH, RC_GEOMETRY_SESSION, RC_GROUP_LAYOUTS, + RC_GUI_LANGUAGE, + RC_HUNSPELLDIR_PATH, RC_INDEX_ALTERNATIVES, RC_INDEX_COMMAND, RC_INPUT, @@ -94,7 +100,6 @@ public: RC_KBMAP, RC_KBMAP_PRIMARY, RC_KBMAP_SECONDARY, - RC_LABEL_INIT_LENGTH, RC_LANGUAGE_AUTO_BEGIN, RC_LANGUAGE_AUTO_END, RC_LANGUAGE_COMMAND_BEGIN, @@ -105,13 +110,19 @@ public: RC_LANGUAGE_USE_BABEL, RC_LOADSESSION, RC_MACRO_EDIT_STYLE, + RC_MAC_DONTSWAP_CTRL_META, + RC_MAC_LIKE_WORD_MOVEMENT, RC_MAKE_BACKUP, RC_MARK_FOREIGN_LANGUAGE, RC_MOUSE_WHEEL_SPEED, RC_NOMENCL_COMMAND, RC_NUMLASTFILES, + 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, @@ -134,6 +145,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, @@ -145,13 +157,16 @@ 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_OPEN_BUFFERS_IN_TABS, + RC_SINGLE_CLOSE_TAB_BUTTON, RC_SORT_LAYOUTS, RC_SPELL_COMMAND, RC_SPELLCHECK_CONTINUOUSLY, + RC_SPELLCHECK_NOTES, + RC_SPELLCHECKER, RC_SPLITINDEX_COMMAND, RC_TEMPDIRPATH, RC_TEMPLATEPATH, @@ -168,11 +183,13 @@ public: 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_VIEWDVI_PAPEROPTION, RC_VIEWER, + RC_VIEWER_ALTERNATIVES, RC_VISUAL_CURSOR, RC_LAST }; @@ -189,6 +206,11 @@ private: /// int read(Lexer &); public: + /// + typedef std::set CommandSet; + /// maps a format to a set of commands that can be used to + /// edit or view it. + typedef std::map Alternatives; /// void write(support::FileName const & filename, bool ignore_system_lyxrc) const; @@ -249,13 +271,13 @@ public: /// command to run chktex incl. options std::string chktex_command; /// all available commands to run bibtex incl. options - std::vector bibtex_alternatives; + CommandSet bibtex_alternatives; /// command to run bibtex incl. options std::string bibtex_command; /// command to run japanese bibtex incl. options std::string jbibtex_command; /// all available index commands incl. options - std::vector index_alternatives; + CommandSet index_alternatives; /// command to run makeindex incl. options or other index programs std::string index_command; /// command to run japanese index program incl. options @@ -275,6 +297,8 @@ public: /// std::string thesaurusdir_path; /// + std::string hunspelldir_path; + /// bool auto_region_delete; /// flag telling whether lastfiles should be checked for existance bool auto_reset_options; @@ -286,6 +310,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 @@ -323,26 +349,24 @@ public: unsigned int plaintext_linelen; /// Accept compound words in spellchecker? bool spellchecker_accept_compound; - /// Pass input encoding switch to the spellchecker? - bool spellchecker_use_input_encoding; - /// Use alternate language? - bool spellchecker_use_alt_lang; - /// Use personal dictionary? - bool spellchecker_use_pers_dict; + /// End of paragraph markers? + 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 escape chars? - bool spellchecker_use_esc_chars; + /// Spellchecker engine: aspell, hunspell, etc + std::string spellchecker; /// Alternate language for spellchecker std::string spellchecker_alt_lang; - /// Alternate personal dictionary file for the spellchecker - std::string spellchecker_pers_dict; /// Escape characters std::string spellchecker_esc_chars; /// spellcheck continuously? bool spellcheck_continuously; + /// spellcheck notes and comments? + bool spellcheck_notes; /// bool use_kbmap; /// @@ -383,6 +407,12 @@ public: std::string gui_language; /// std::string default_view_format; + /// all available viewers + Alternatives viewer_alternatives; + /// all available editors + Alternatives editor_alternatives; + /// + bool mac_dontswap_ctrl_meta; /// bool mac_like_word_movement; /// @@ -400,8 +430,6 @@ public: /// bool dialogs_iconify_with_main; /// - int label_init_length; - /// bool display_graphics; /// bool show_banner; @@ -416,7 +444,7 @@ public: /// bool preview_hashed_labels; /// - std::string preview_scale_factor; + double preview_scale_factor; /// user name std::string user_name; /// user email @@ -443,6 +471,8 @@ public: bool full_screen_scrollbar; /// Toggle tabbar in fullscreen mode? bool full_screen_tabbar; + /// Toggle menubar in fullscreen mode? + bool full_screen_menubar; /// Limit the text width? bool full_screen_limit; /// Width of limited screen (in pixels) in fullscreen mode @@ -469,6 +499,25 @@ public: bool completion_popup_after_complete; /// bool open_buffers_in_tabs; + /// + bool single_close_tab_button; + /// + 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; + /// + enum ScrollWheelZoom { + SCROLL_WHEEL_ZOOM_OFF, + SCROLL_WHEEL_ZOOM_CTRL, + SCROLL_WHEEL_ZOOM_SHIFT, + SCROLL_WHEEL_ZOOM_ALT + }; + /// + ScrollWheelZoom scroll_wheel_zoom; }; @@ -483,6 +532,7 @@ public: operator LyXRC::PreviewStatus() const { return val_; } }; +void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new); /// extern LyXRC lyxrc;