X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.h;h=af28ce0129a2cfe53c35786b69bfa2d5812790b5;hb=a187929721cac97a93b72a210ed6515b32ba788d;hp=e51c233ed94e5abb8fdf368f6551e7eafaf6ca7c;hpb=43d918379870567e0bd8d5c96427f554415a57ad;p=lyx.git diff --git a/src/LyXRC.h b/src/LyXRC.h index e51c233ed9..af28ce0129 100644 --- a/src/LyXRC.h +++ b/src/LyXRC.h @@ -4,11 +4,11 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean-Marc Lasgouttes * \author Angus Leeming * \author John Levon - * \author André Pönitz + * \author André Pönitz * \author Allan Rae * \author Dekel Tsur * @@ -22,7 +22,10 @@ #include "support/strfwd.h" +#include +#include #include +#include namespace lyx { @@ -38,13 +41,13 @@ public: enum LyXRCTags { RC_ACCEPT_COMPOUND = 1, RC_ALT_LANG, - RC_PLAINTEXT_ROFF_COMMAND, - RC_PLAINTEXT_LINELEN, + RC_AUTOCORRECTION_MATH, RC_AUTOREGIONDELETE, RC_AUTORESET_OPTIONS, RC_AUTOSAVE, RC_AUTO_NUMBER, RC_BACKUPDIR_PATH, + RC_BIBTEX_ALTERNATIVES, RC_BIBTEX_COMMAND, RC_BINDFILE, RC_CHECKLASTFILES, @@ -62,16 +65,15 @@ public: RC_CONVERTER_CACHE_MAXAGE, RC_COPIER, RC_CURSOR_FOLLOWS_SCROLLBAR, - RC_CUSTOM_EXPORT_COMMAND, - RC_CUSTOM_EXPORT_FORMAT, RC_DATE_INSERT_FORMAT, - RC_DEFFILE, RC_DEFAULT_LANGUAGE, - RC_GUI_LANGUAGE, + RC_DEFAULT_VIEW_FORMAT, RC_DEFAULT_PAPERSIZE, + RC_DEFFILE, RC_DIALOGS_ICONIFY_WITH_MAIN, RC_DISPLAY_GRAPHICS, RC_DOCUMENTPATH, + RC_EDITOR_ALTERNATIVES, RC_ESC_CHARS, RC_EXAMPLEPATH, RC_FONT_ENCODING, @@ -79,12 +81,18 @@ public: 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, + RC_JBIBTEX_COMMAND, + RC_JINDEX_COMMAND, RC_KBMAP, RC_KBMAP_PRIMARY, RC_KBMAP_SECONDARY, @@ -99,12 +107,18 @@ public: RC_LANGUAGE_USE_BABEL, RC_LOADSESSION, RC_MACRO_EDIT_STYLE, + 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, @@ -137,16 +151,21 @@ public: RC_SCREEN_FONT_TYPEWRITER, RC_SCREEN_FONT_TYPEWRITER_FOUNDRY, RC_SCREEN_ZOOM, + RC_SCROLL_BELOW_DOCUMENT, 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_SPELLCHECKER, + RC_SPLITINDEX_COMMAND, RC_TEMPDIRPATH, RC_TEMPLATEPATH, RC_TEX_ALLOWS_SPACES, RC_TEX_EXPECTS_WINDOWS_PATHS, + RC_THESAURUSDIRPATH, RC_UIFILE, RC_USELASTFILEPOS, RC_USER_EMAIL, @@ -162,6 +181,7 @@ public: RC_USE_SPELL_LIB, RC_VIEWDVI_PAPEROPTION, RC_VIEWER, + RC_VIEWER_ALTERNATIVES, RC_VISUAL_CURSOR, RC_LAST }; @@ -178,6 +198,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; @@ -231,20 +256,28 @@ public: std::string print_paper_flag; /// std::string print_paper_dimension_flag; - /// - std::string custom_export_command; - /// - std::string custom_export_format; /// 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 + 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 + 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 + std::string jindex_command; + /// command to generate multiple indices + std::string splitindex_command; + /// command to run makeindex incl. options for nomencl + std::string nomencl_command; /// std::string document_path; /// @@ -254,6 +287,10 @@ public: /// std::string tempdir_path; /// + 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; @@ -299,33 +336,23 @@ public: /// unsigned int autosave; /// - std::string plaintext_roff_command; - /// unsigned int plaintext_linelen; - /// use library instead of process - bool use_spell_lib; - /// Ispell command - std::string isp_command; /// Accept compound words in spellchecker? - bool isp_accept_compound; - /// Pass input encoding switch to ispell? - bool isp_use_input_encoding; - /// Use alternate language? - bool isp_use_alt_lang; - /// Use personal dictionary? - bool isp_use_pers_dict; + bool spellchecker_accept_compound; + /// End of paragraph markers? + bool paragraph_markers; /// Use tooltips? bool use_tooltip; /// Use pixmap cache? bool use_pixmap_cache; - /// Use escape chars? - bool isp_use_esc_chars; - /// Alternate language for ispell - std::string isp_alt_lang; - /// Alternate personal dictionary file for ispell - std::string isp_pers_dict; + /// Spellchecker engine: aspell, hunspell, etc + std::string spellchecker; + /// Alternate language for spellchecker + std::string spellchecker_alt_lang; /// Escape characters - std::string isp_esc_chars; + std::string spellchecker_esc_chars; + /// spellcheck continuously? + bool spellcheck_continuously; /// bool use_kbmap; /// @@ -365,8 +392,18 @@ public: /// std::string gui_language; /// + std::string default_view_format; + /// all available viewers + Alternatives viewer_alternatives; + /// all available editors + Alternatives editor_alternatives; + /// + bool mac_like_word_movement; + /// bool cursor_follows_scrollbar; /// + bool scroll_below_document; + /// enum MacroEditStyle { MACRO_EDIT_INLINE_BOX = 0, MACRO_EDIT_INLINE, @@ -393,7 +430,7 @@ public: /// bool preview_hashed_labels; /// - std::string preview_scale_factor; + double preview_scale_factor; /// user name std::string user_name; /// user email @@ -420,6 +457,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 @@ -435,6 +474,8 @@ public: /// int completion_inline_dots; /// + bool autocorrection_math; + /// double completion_popup_delay; /// bool completion_popup_math; @@ -444,6 +485,8 @@ public: bool completion_popup_after_complete; /// bool open_buffers_in_tabs; + /// + bool single_close_tab_button; }; @@ -458,12 +501,16 @@ public: operator LyXRC::PreviewStatus() const { return val_; } }; +void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new); /// extern LyXRC lyxrc; /// extern LyXRC system_lyxrc; +// used by at least frontends/qt4/GuiPref.cpp +const long maxlastfiles = 20; + } // namespace lyx #endif