X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=252bbfb36d4c3c28c8a1a3feaa9f3355dfa2d296;hb=1712e4f35e3e8cb132f731dca773f7767a241bf6;hp=a717a6b84e5158ecb49d51059123b0b0ab28fc7c;hpb=326e228107579652d104951156ab98efe8aec64b;p=lyx.git diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index a717a6b84e..252bbfb36d 100644 --- a/src/LyXRC.cpp +++ b/src/LyXRC.cpp @@ -43,6 +43,7 @@ #include #include +#include using namespace std; using namespace lyx::support; @@ -84,6 +85,7 @@ LexerKeyword lyxrcTags[] = { { "\\cursor_follows_scrollbar", LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR }, { "\\date_insert_format", LyXRC::RC_DATE_INSERT_FORMAT }, { "\\def_file", LyXRC::RC_DEFFILE }, + { "\\default_decimal_point", LyXRC::RC_DEFAULT_DECIMAL_POINT }, { "\\default_language", LyXRC::RC_DEFAULT_LANGUAGE }, { "\\default_papersize", LyXRC::RC_DEFAULT_PAPERSIZE }, { "\\default_view_format", LyXRC::RC_DEFAULT_VIEW_FORMAT }, @@ -171,6 +173,7 @@ LexerKeyword lyxrcTags[] = { { "\\screen_font_typewriter_foundry", LyXRC::RC_SCREEN_FONT_TYPEWRITER_FOUNDRY }, { "\\screen_zoom", LyXRC::RC_SCREEN_ZOOM }, { "\\scroll_below_document", LyXRC::RC_SCROLL_BELOW_DOCUMENT }, + { "\\scroll_wheel_zoom", LyXRC::RC_SCROLL_WHEEL_ZOOM }, { "\\serverpipe", LyXRC::RC_SERVERPIPE }, { "\\set_color", LyXRC::RC_SET_COLOR }, { "\\show_banner", LyXRC::RC_SHOW_BANNER }, @@ -196,6 +199,7 @@ LexerKeyword lyxrcTags[] = { { "\\use_pixmap_cache", LyXRC::RC_USE_PIXMAP_CACHE }, // compatibility with versions older than 1.4.0 only { "\\use_pspell", LyXRC::RC_USE_SPELL_LIB }, + { "\\use_system_colors", LyXRC::RC_USE_SYSTEM_COLORS }, // compatibility with versions older than 1.4.0 only { "\\use_tempdir", LyXRC::RC_USETEMPDIR }, { "\\use_tooltip", LyXRC::RC_USE_TOOLTIP }, @@ -283,7 +287,10 @@ void LyXRC::setDefaults() backupdir_path.erase(); display_graphics = true; // Spellchecker settings: -#if defined(USE_ASPELL) +// FIXME: this check should test the target platform (darwin) +#if defined(USE_MACOSX_PACKAGING) + spellchecker = "native"; +#elif defined(USE_ASPELL) spellchecker = "aspell"; #elif defined(USE_HUNSPELL) spellchecker = "hunspell"; @@ -315,6 +322,7 @@ void LyXRC::setDefaults() date_insert_format = "%x"; cursor_follows_scrollbar = false; scroll_below_document = false; + scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_CTRL; paragraph_markers = false; mac_like_word_movement = false; macro_edit_style = MACRO_EDIT_INLINE_BOX; @@ -323,6 +331,7 @@ void LyXRC::setDefaults() preview_hashed_labels = false; preview_scale_factor = 1.0; use_converter_cache = true; + use_system_colors = false; use_tooltip = true; use_pixmap_cache = false; converter_cache_maxage = 6 * 30 * 24 * 3600; // 6 months @@ -352,6 +361,7 @@ void LyXRC::setDefaults() completion_inline_text = false; completion_inline_dots = -1; completion_inline_delay = 0.2; + default_decimal_point = "."; } @@ -906,6 +916,9 @@ int LyXRC::read(Lexer & lexrc) case RC_ACCEPT_COMPOUND: lexrc >> spellchecker_accept_compound; break; + case RC_USE_SYSTEM_COLORS: + lexrc >> use_system_colors; + break; case RC_USE_TOOLTIP: lexrc >> use_tooltip; break; @@ -939,6 +952,9 @@ int LyXRC::read(Lexer & lexrc) backupdir_path = expandPath(backupdir_path); } break; + case RC_DEFAULT_DECIMAL_POINT: + lexrc >> default_decimal_point; + break; case RC_DATE_INSERT_FORMAT: lexrc >> date_insert_format; break; @@ -1186,6 +1202,23 @@ int LyXRC::read(Lexer & lexrc) } } break; + case RC_SCROLL_WHEEL_ZOOM: + if (lexrc.next()) { + string const tmp = lexrc.getString(); + if (tmp == "ctrl") + scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_CTRL; + else if (tmp == "shift") + scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_SHIFT; + else if (tmp == "alt") + scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_ALT; + else { + scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_OFF; + if (tmp != "off" && tmp != "false") + LYXERR0("Unrecognized scroll_wheel_zoom status \"" + << tmp << '"'); + } + } + break; // Obsoteted in 1.4.0 case RC_USETEMPDIR: @@ -1428,6 +1461,13 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c case PAPER_B3: case PAPER_B4: case PAPER_B6: + case PAPER_C0: + case PAPER_C1: + case PAPER_C2: + case PAPER_C3: + case PAPER_C4: + case PAPER_C5: + case PAPER_C6: case PAPER_JISB0: case PAPER_JISB1: case PAPER_JISB2: @@ -2347,6 +2387,15 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c // obsoleted in 2.0 if (tag != RC_LAST) break; + case RC_USE_SYSTEM_COLORS: + if (ignore_system_lyxrc || + use_system_colors != system_lyxrc.use_system_colors) { + os << "\\use_system_colors " + << convert(use_system_colors) + << '\n'; + } + if (tag != RC_LAST) + break; case RC_USE_TOOLTIP: if (ignore_system_lyxrc || use_tooltip != system_lyxrc.use_tooltip) { @@ -2380,6 +2429,14 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c if (tag != RC_LAST) break; + case RC_DEFAULT_DECIMAL_POINT: + if (ignore_system_lyxrc || + default_decimal_point != system_lyxrc.default_decimal_point) { + os << "\\default_decimal_point " << default_decimal_point << '\n'; + } + if (tag != RC_LAST) + break; + case RC_SPELLCHECKER: if (ignore_system_lyxrc || spellchecker != system_lyxrc.spellchecker) { @@ -2547,6 +2604,29 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c if (tag != RC_LAST) break; + case RC_SCROLL_WHEEL_ZOOM: + if (ignore_system_lyxrc || + scroll_wheel_zoom != system_lyxrc.scroll_wheel_zoom) { + string status; + switch (scroll_wheel_zoom) { + case SCROLL_WHEEL_ZOOM_OFF: + status = "off"; + break; + case SCROLL_WHEEL_ZOOM_CTRL: + status = "ctrl"; + break; + case SCROLL_WHEEL_ZOOM_SHIFT: + status = "shift"; + break; + case SCROLL_WHEEL_ZOOM_ALT: + status = "alt"; + break; + } + os << "\\scroll_wheel_zoom " << status << '\n'; + } + if (tag != RC_LAST) + break; + os << "\n#\n" << "# FORMATS SECTION ##########################\n" << "#\n\n"; @@ -2866,6 +2946,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_USE_ESC_CHARS: case LyXRC::RC_USE_INP_ENC: case LyXRC::RC_USE_PERS_DICT: + case LyXRC::RC_USE_SYSTEM_COLORS: case LyXRC::RC_USE_TOOLTIP: case LyXRC::RC_USE_PIXMAP_CACHE: case LyXRC::RC_USE_SPELL_LIB: @@ -2884,6 +2965,8 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_FORWARD_SEARCH_DVI: case LyXRC::RC_FORWARD_SEARCH_PDF: case LyXRC::RC_EXPORT_OVERWRITE: + case LyXRC::RC_DEFAULT_DECIMAL_POINT: + case LyXRC::RC_SCROLL_WHEEL_ZOOM: case LyXRC::RC_LAST: break; } @@ -3314,6 +3397,10 @@ string const LyXRC::getDescription(LyXRCTags tag) case RC_USETEMPDIR: break; + case RC_USE_USE_SYSTEM_COLORS: + str = _("Enable use the system colors for some things like main window background and selection."); + break; + case RC_USE_TOOLTIP: str = _("Enable the automatic appearance of tool tips in the work area."); break;