X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXRC.cpp;h=f7c085c64c3cb6e4c3aa372b126ea1ffc66ff216;hb=861c6167ca5f1329e16dd788489a7c03772e2332;hp=8a1910e260448b80dcf574125dfd893f36cefd6e;hpb=389352b3fb920514c89ebb5fbb1b8311bfc698dc;p=lyx.git diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp index 8a1910e260..f7c085c64c 100644 --- a/src/LyXRC.cpp +++ b/src/LyXRC.cpp @@ -23,6 +23,8 @@ #include "Converter.h" #include "FontEnums.h" #include "Format.h" +#include "FuncCode.h" +#include "FuncRequest.h" #include "Lexer.h" #include "LyX.h" #include "Mover.h" @@ -59,7 +61,7 @@ namespace { // The format should also be updated in configure.py, and conversion code // should be added to prefs2prefs_prefs.py. -static unsigned int const LYXRC_FILEFORMAT = 27; // spitz: add flavor value to needaux flag +static unsigned int const LYXRC_FILEFORMAT = 32; // spitz: add \ct_markup_copied // when adding something to this array keep it sorted! LexerKeyword lyxrcTags[] = { { "\\accept_compound", LyXRC::RC_ACCEPT_COMPOUND }, @@ -90,11 +92,12 @@ LexerKeyword lyxrcTags[] = { { "\\converter", LyXRC::RC_CONVERTER }, { "\\converter_cache_maxage", LyXRC::RC_CONVERTER_CACHE_MAXAGE }, { "\\copier", LyXRC::RC_COPIER }, + { "\\ct_additions_underlined", LyXRC::RC_CT_ADDITIONS_UNDERLINED }, + { "\\ct_markup_copied", LyXRC::RC_CT_MARKUP_COPIED }, { "\\cursor_follows_scrollbar", LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR }, { "\\cursor_width", LyXRC::RC_CURSOR_WIDTH }, - { "\\date_insert_format", LyXRC::RC_DATE_INSERT_FORMAT }, { "\\def_file", LyXRC::RC_DEFFILE }, - { "\\default_decimal_point", LyXRC::RC_DEFAULT_DECIMAL_POINT }, + { "\\default_decimal_point", LyXRC::RC_DEFAULT_DECIMAL_SEP }, { "\\default_length_unit", LyXRC::RC_DEFAULT_LENGTH_UNIT }, { "\\default_otf_view_format", LyXRC::RC_DEFAULT_OTF_VIEW_FORMAT }, { "\\default_platex_view_format", LyXRC::RC_DEFAULT_PLATEX_VIEW_FORMAT }, @@ -158,6 +161,7 @@ LexerKeyword lyxrcTags[] = { { "\\print_paper_dimension_flag", LyXRC::RC_PRINTPAPERDIMENSIONFLAG }, { "\\print_paper_flag", LyXRC::RC_PRINTPAPERFLAG }, { "\\pygmentize_command", LyXRC::RC_PYGMENTIZE_COMMAND }, + { "\\respect_os_kbd_language", LyXRC::RC_RESPECT_OS_KBD_LANGUAGE }, { "\\save_compressed", LyXRC::RC_SAVE_COMPRESSED }, { "\\save_origin", LyXRC::RC_SAVE_ORIGIN }, { "\\screen_dpi", LyXRC::RC_SCREEN_DPI }, @@ -194,12 +198,12 @@ LexerKeyword lyxrcTags[] = { { "\\use_converter_needauth_forbidden", LyXRC::RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN }, { "\\use_lastfilepos", LyXRC::RC_USELASTFILEPOS }, { "\\use_native_filedialog", LyXRC::RC_USE_NATIVE_FILEDIALOG }, - { "\\use_pixmap_cache", LyXRC::RC_USE_PIXMAP_CACHE }, // compatibility with versions older than 1.4.0 only { "\\use_system_colors", LyXRC::RC_USE_SYSTEM_COLORS }, { "\\use_system_theme_icons", LyXRC::RC_USE_SYSTEM_THEME_ICONS }, { "\\use_tooltip", LyXRC::RC_USE_TOOLTIP }, { "\\user_email", LyXRC::RC_USER_EMAIL }, + { "\\user_initials", LyXRC::RC_USER_INITIALS }, { "\\user_name", LyXRC::RC_USER_NAME }, { "\\view_dvi_paper_option", LyXRC::RC_VIEWDVI_PAPEROPTION }, // compatibility with versions older than 1.4.0 only @@ -211,162 +215,6 @@ LexerKeyword lyxrcTags[] = { const int lyxrcCount = sizeof(lyxrcTags) / sizeof(lyxrcTags[0]); -} // namespace - - -LyXRC::LyXRC() -{ - setDefaults(); -} - - -void LyXRC::setDefaults() -{ - icon_set = string(); - use_system_theme_icons = false; - bind_file = "cua"; - def_file = "default"; - ui_file = "default"; - // The current document directory - texinputs_prefix = "."; - print_landscape_flag = "-t landscape"; - print_paper_flag = "-t"; - print_paper_dimension_flag = "-T"; - document_path.erase(); - view_dvi_paper_option.erase(); - default_view_format = "pdf2"; - default_otf_view_format = "pdf4"; - default_platex_view_format = "pdf3"; - chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38"; - bibtex_command = "automatic"; - index_command = "makeindex -c -q"; - nomencl_command = "makeindex -s nomencl.ist"; - pygmentize_command = string(); - dpi = 75; - // Because a screen is typically wider than a piece of paper: - defaultZoom = 150; - currentZoom = defaultZoom; - allow_geometry_session = true; - // Default LaTeX font size: - font_sizes[FONT_SIZE_TINY] = "5.0"; - font_sizes[FONT_SIZE_SCRIPT] = "7.0"; - font_sizes[FONT_SIZE_FOOTNOTE] = "8.0"; - font_sizes[FONT_SIZE_SMALL] = "9.0"; - font_sizes[FONT_SIZE_NORMAL] = "10.0"; - font_sizes[FONT_SIZE_LARGE] = "12.0"; - font_sizes[FONT_SIZE_LARGER] = "14.4"; - font_sizes[FONT_SIZE_LARGEST] = "17.26"; - font_sizes[FONT_SIZE_HUGE] = "20.74"; - font_sizes[FONT_SIZE_HUGER] = "24.88"; - use_scalable_fonts = true; - roman_font_name = ""; - sans_font_name = ""; - typewriter_font_name = ""; - autosave = 300; - auto_region_delete = true; - auto_reset_options = false; - plaintext_linelen = 65; - mouse_wheel_speed = 1.0; - num_lastfiles = 20; - check_lastfiles = true; - use_lastfilepos = true; - use_native_filedialog = true; - load_session = false; - make_backup = true; - save_compressed = false; - save_origin = false; - backupdir_path.erase(); - display_graphics = true; - // Spellchecker settings: -// FIXME: this check should test the target platform (darwin) -#if defined(USE_MACOSX_PACKAGING) - spellchecker = "native"; -#elif defined(USE_ENCHANT) - spellchecker = "enchant"; -#elif defined(USE_ASPELL) - spellchecker = "aspell"; -#elif defined(USE_HUNSPELL) - spellchecker = "hunspell"; -#else - spellchecker = "aspell"; -#endif - spellchecker_accept_compound = false; - spellcheck_continuously = false; - completion_minlength = 6; - spellcheck_notes = true; - use_kbmap = false; - visual_cursor = false; - auto_number = true; - mark_foreign_language = true; - language_auto_begin = true; - language_auto_end = true; - language_global_options = true; - language_package_selection = LP_AUTO; - language_custom_package = "\\usepackage{babel}"; - language_command_begin = "\\selectlanguage{$$lang}"; - language_command_local = "\\foreignlanguage{$$lang}{"; - sort_layouts = false; - group_layouts = true; - gui_language = "auto"; - show_banner = true; - windows_style_tex_paths = false; - tex_allows_spaces = false; - date_insert_format = "%x"; - cursor_follows_scrollbar = false; - scroll_below_document = false; - scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_CTRL; - paragraph_markers = false; - mac_dontswap_ctrl_meta = false; - mac_like_cursor_movement = false; - macro_edit_style = MACRO_EDIT_INLINE_BOX; - dialogs_iconify_with_main = false; - preview = PREVIEW_OFF; - preview_hashed_labels = false; - preview_scale_factor = 1.0; - use_converter_cache = true; - use_converter_needauth_forbidden = true; - use_converter_needauth = true; - use_system_colors = false; - use_tooltip = true; - use_pixmap_cache = false; - converter_cache_maxage = 6 * 30 * 24 * 3600; // 6 months - user_name = to_utf8(support::user_name()); - user_email = to_utf8(support::user_email()); - open_buffers_in_tabs = true; - single_close_tab_button = false; - single_instance = true; - forward_search_dvi = string(); - forward_search_pdf = string(); - export_overwrite = NO_FILES; - - // Fullscreen settings - full_screen_limit = false; - full_screen_toolbars = true; - full_screen_tabbar = true; - full_screen_menubar = true; - full_screen_statusbar = true; - full_screen_scrollbar = true; - full_screen_width = 700; - - completion_cursor_text = true; - completion_popup_math = true; - completion_popup_text = false; - completion_popup_delay = 2.0; - completion_popup_after_complete = true; - autocorrection_math = false; - completion_inline_math = true; - completion_inline_text = false; - completion_inline_dots = -1; - completion_inline_delay = 0.2; - default_decimal_point = "."; - default_length_unit = Length::CM; - cursor_width = 1; - close_buffer_with_last_view = "yes"; - mouse_middlebutton_paste = true; -} - - -namespace { void oldFontFormat(string & family, string & foundry) { @@ -633,16 +481,16 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) break; case RC_SCREEN_FONT_SIZES: - lexrc >> font_sizes[FONT_SIZE_TINY]; - lexrc >> font_sizes[FONT_SIZE_SCRIPT]; - lexrc >> font_sizes[FONT_SIZE_FOOTNOTE]; - lexrc >> font_sizes[FONT_SIZE_SMALL]; - lexrc >> font_sizes[FONT_SIZE_NORMAL]; - lexrc >> font_sizes[FONT_SIZE_LARGE]; - lexrc >> font_sizes[FONT_SIZE_LARGER]; - lexrc >> font_sizes[FONT_SIZE_LARGEST]; - lexrc >> font_sizes[FONT_SIZE_HUGE]; - lexrc >> font_sizes[FONT_SIZE_HUGER]; + lexrc >> font_sizes[TINY_SIZE]; + lexrc >> font_sizes[SCRIPT_SIZE]; + lexrc >> font_sizes[FOOTNOTE_SIZE]; + lexrc >> font_sizes[SMALL_SIZE]; + lexrc >> font_sizes[NORMAL_SIZE]; + lexrc >> font_sizes[LARGE_SIZE]; + lexrc >> font_sizes[LARGER_SIZE]; + lexrc >> font_sizes[LARGEST_SIZE]; + lexrc >> font_sizes[HUGE_SIZE]; + lexrc >> font_sizes[HUGER_SIZE]; break; case RC_SCREEN_FONT_SCALABLE: @@ -825,6 +673,14 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) lyxpipes = os::internal_path(lexrc.getString()); break; + case RC_CT_ADDITIONS_UNDERLINED: + lexrc >> ct_additions_underlined; + break; + + case RC_CT_MARKUP_COPIED: + lexrc >> ct_markup_copied; + break; + case RC_CURSOR_FOLLOWS_SCROLLBAR: lexrc >> cursor_follows_scrollbar; break; @@ -879,9 +735,6 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) case RC_USE_TOOLTIP: lexrc >> use_tooltip; break; - case RC_USE_PIXMAP_CACHE: - lexrc >> use_pixmap_cache; - break; case RC_SPELLCHECKER: lexrc >> spellchecker; break; @@ -910,16 +763,13 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) if (lexrc.next()) backupdir_path = os::internal_path(lexrc.getString()); break; - case RC_DEFAULT_DECIMAL_POINT: - lexrc >> default_decimal_point; + case RC_DEFAULT_DECIMAL_SEP: + lexrc >> default_decimal_sep; break; case RC_DEFAULT_LENGTH_UNIT: if (lexrc.next()) default_length_unit = (Length::UNIT) lexrc.getInteger(); break; - case RC_DATE_INSERT_FORMAT: - lexrc >> date_insert_format; - break; case RC_LANGUAGE_CUSTOM_PACKAGE: lexrc >> language_custom_package; break; @@ -959,6 +809,9 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) case RC_LANGUAGE_COMMAND_LOCAL: lexrc >> language_command_local; break; + case RC_RESPECT_OS_KBD_LANGUAGE: + lexrc >> respect_os_kbd_language; + break; case RC_VISUAL_CURSOR: lexrc >> visual_cursor; break; @@ -1042,6 +895,8 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) flgs |= Format::zipped_native; else if (flag == "menu=export") flgs |= Format::export_menu; + else if (flag == "menu=none") + flgs |= Format::no_menu; else LYXERR0("Ignoring unknown flag `" << flag << "' for format `" @@ -1127,6 +982,9 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format) case RC_USER_EMAIL: lexrc >> user_email; break; + case RC_USER_INITIALS: + lexrc >> user_initials; + break; case RC_PATH_PREFIX: lexrc >> path_prefix; @@ -1592,15 +1450,6 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c if (tag != RC_LAST) break; // fall through - case RC_DATE_INSERT_FORMAT: - if (ignore_system_lyxrc || - date_insert_format != system_lyxrc.date_insert_format) { - os << "\\date_insert_format \"" << date_insert_format - << "\"\n"; - } - if (tag != RC_LAST) - break; - // fall through case RC_USER_NAME: os << "\\user_name \"" << user_name << "\"\n"; if (tag != RC_LAST) @@ -1611,6 +1460,11 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c if (tag != RC_LAST) break; // fall through + case RC_USER_INITIALS: + os << "\\user_initials \"" << user_initials << "\"\n"; + if (tag != RC_LAST) + break; + // fall through case RC_SHOW_BANNER: if (ignore_system_lyxrc || show_banner != system_lyxrc.show_banner) { @@ -1742,6 +1596,26 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c if (tag != RC_LAST) break; // fall through + case RC_CT_ADDITIONS_UNDERLINED: + if (ignore_system_lyxrc || + ct_additions_underlined + != system_lyxrc.ct_additions_underlined) { + os << "\\ct_additions_underlined " + << convert(ct_additions_underlined) << '\n'; + } + if (tag != RC_LAST) + break; + // fall through + case RC_CT_MARKUP_COPIED: + if (ignore_system_lyxrc || + ct_markup_copied + != system_lyxrc.ct_markup_copied) { + os << "\\ct_markup_copied " + << convert(ct_markup_copied) << '\n'; + } + if (tag != RC_LAST) + break; + // fall through case RC_CURSOR_FOLLOWS_SCROLLBAR: if (ignore_system_lyxrc || cursor_follows_scrollbar @@ -1892,40 +1766,40 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c // fall through case RC_SCREEN_FONT_SIZES: if (ignore_system_lyxrc || - font_sizes[FONT_SIZE_TINY] - != system_lyxrc.font_sizes[FONT_SIZE_TINY] || - font_sizes[FONT_SIZE_SCRIPT] - != system_lyxrc.font_sizes[FONT_SIZE_SCRIPT] || - font_sizes[FONT_SIZE_FOOTNOTE] - != system_lyxrc.font_sizes[FONT_SIZE_FOOTNOTE] || - font_sizes[FONT_SIZE_SMALL] - != system_lyxrc.font_sizes[FONT_SIZE_SMALL] || - font_sizes[FONT_SIZE_NORMAL] - != system_lyxrc.font_sizes[FONT_SIZE_NORMAL] || - font_sizes[FONT_SIZE_LARGE] - != system_lyxrc.font_sizes[FONT_SIZE_LARGE] || - font_sizes[FONT_SIZE_LARGER] - != system_lyxrc.font_sizes[FONT_SIZE_LARGER] || - font_sizes[FONT_SIZE_LARGEST] - != system_lyxrc.font_sizes[FONT_SIZE_LARGEST] || - font_sizes[FONT_SIZE_HUGE] - != system_lyxrc.font_sizes[FONT_SIZE_HUGE] || - font_sizes[FONT_SIZE_HUGER] - != system_lyxrc.font_sizes[FONT_SIZE_HUGER]) { + font_sizes[TINY_SIZE] + != system_lyxrc.font_sizes[TINY_SIZE] || + font_sizes[SCRIPT_SIZE] + != system_lyxrc.font_sizes[SCRIPT_SIZE] || + font_sizes[FOOTNOTE_SIZE] + != system_lyxrc.font_sizes[FOOTNOTE_SIZE] || + font_sizes[SMALL_SIZE] + != system_lyxrc.font_sizes[SMALL_SIZE] || + font_sizes[NORMAL_SIZE] + != system_lyxrc.font_sizes[NORMAL_SIZE] || + font_sizes[LARGE_SIZE] + != system_lyxrc.font_sizes[LARGE_SIZE] || + font_sizes[LARGER_SIZE] + != system_lyxrc.font_sizes[LARGER_SIZE] || + font_sizes[LARGEST_SIZE] + != system_lyxrc.font_sizes[LARGEST_SIZE] || + font_sizes[HUGE_SIZE] + != system_lyxrc.font_sizes[HUGE_SIZE] || + font_sizes[HUGER_SIZE] + != system_lyxrc.font_sizes[HUGER_SIZE]) { streamsize old_prec = os.precision(); os.setf(ios::fixed); os.precision(2); os << "\\screen_font_sizes" - << ' ' << font_sizes[FONT_SIZE_TINY] - << ' ' << font_sizes[FONT_SIZE_SCRIPT] - << ' ' << font_sizes[FONT_SIZE_FOOTNOTE] - << ' ' << font_sizes[FONT_SIZE_SMALL] - << ' ' << font_sizes[FONT_SIZE_NORMAL] - << ' ' << font_sizes[FONT_SIZE_LARGE] - << ' ' << font_sizes[FONT_SIZE_LARGER] - << ' ' << font_sizes[FONT_SIZE_LARGEST] - << ' ' << font_sizes[FONT_SIZE_HUGE] - << ' ' << font_sizes[FONT_SIZE_HUGER] + << ' ' << font_sizes[TINY_SIZE] + << ' ' << font_sizes[SCRIPT_SIZE] + << ' ' << font_sizes[FOOTNOTE_SIZE] + << ' ' << font_sizes[SMALL_SIZE] + << ' ' << font_sizes[NORMAL_SIZE] + << ' ' << font_sizes[LARGE_SIZE] + << ' ' << font_sizes[LARGER_SIZE] + << ' ' << font_sizes[LARGEST_SIZE] + << ' ' << font_sizes[HUGE_SIZE] + << ' ' << font_sizes[HUGER_SIZE] << '\n'; os.precision(old_prec); os.unsetf(ios::fixed); @@ -2428,26 +2302,16 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c if (tag != RC_LAST) break; // fall through - case RC_USE_PIXMAP_CACHE: - if (ignore_system_lyxrc || - use_pixmap_cache != system_lyxrc.use_pixmap_cache) { - os << "\\use_pixmap_cache " - << convert(use_pixmap_cache) - << '\n'; - } - if (tag != RC_LAST) - break; - // fall through os << "\n#\n" << "# LANGUAGE SUPPORT SECTION ##########################\n" << "#\n\n"; // fall through - case RC_DEFAULT_DECIMAL_POINT: + case RC_DEFAULT_DECIMAL_SEP: if (ignore_system_lyxrc || - default_decimal_point != system_lyxrc.default_decimal_point) { - os << "\\default_decimal_point " << default_decimal_point << '\n'; + default_decimal_sep != system_lyxrc.default_decimal_sep) { + os << "\\default_decimal_point \"" << default_decimal_sep << "\"" << '\n'; } if (tag != RC_LAST) break; @@ -2602,6 +2466,15 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c os << "\\mark_foreign_language " << convert(mark_foreign_language) << '\n'; } + // fall through + case RC_RESPECT_OS_KBD_LANGUAGE: + if (ignore_system_lyxrc || + respect_os_kbd_language + != system_lyxrc.respect_os_kbd_language) { + os << "\\respect_os_kbd_language " << + convert(respect_os_kbd_language) << '\n'; + } + //fall through if (tag != RC_LAST) break; @@ -2689,6 +2562,7 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c format->documentFormat() != cit->documentFormat() || format->vectorFormat() != cit->vectorFormat() || format->inExportMenu() != cit->inExportMenu() || + format->noMenu() != cit->noMenu() || format->mime() != cit->mime()) { os << "\\format \"" << cit->name() << "\" \"" << cit->extensions() << "\" \"" @@ -2911,9 +2785,10 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_CONVERTER: case LyXRC::RC_CONVERTER_CACHE_MAXAGE: case LyXRC::RC_COPIER: + case LyXRC::RC_CT_ADDITIONS_UNDERLINED: + case LyXRC::RC_CT_MARKUP_COPIED: case LyXRC::RC_CURSOR_FOLLOWS_SCROLLBAR: case LyXRC::RC_SCROLL_BELOW_DOCUMENT: - case LyXRC::RC_DATE_INSERT_FORMAT: case LyXRC::RC_GUI_LANGUAGE: case LyXRC::RC_DEFAULT_OTF_VIEW_FORMAT: case LyXRC::RC_DEFAULT_PLATEX_VIEW_FORMAT: @@ -2960,18 +2835,27 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_MACRO_EDIT_STYLE: case LyXRC::RC_MAKE_BACKUP: case LyXRC::RC_MARK_FOREIGN_LANGUAGE: + case LyXRC::RC_RESPECT_OS_KBD_LANGUAGE: case LyXRC::RC_MOUSE_WHEEL_SPEED: case LyXRC::RC_MOUSE_MIDDLEBUTTON_PASTE: case LyXRC::RC_NUMLASTFILES: case LyXRC::RC_PARAGRAPH_MARKERS: case LyXRC::RC_PATH_PREFIX: if (lyxrc_orig.path_prefix != lyxrc_new.path_prefix) { - prependEnvPath("PATH", lyxrc_new.path_prefix); + prependEnvPath("PATH", replaceEnvironmentPath(lyxrc_new.path_prefix)); // Resets python path support::os::python(true); } // fall through case LyXRC::RC_PREVIEW: + if (lyxrc_orig.preview != lyxrc_new.preview) { + // Update all previews of all documents. + /* FIXME: this can be very expensive. It would be cheaper + * to kill all existing previews and update visible + * previews.*/ + theBufferList().updatePreviews(); + } + // fall through case LyXRC::RC_PREVIEW_HASHED_LABELS: case LyXRC::RC_PREVIEW_SCALE_FACTOR: case LyXRC::RC_PRINTLANDSCAPEFLAG: @@ -2980,6 +2864,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_SAVE_COMPRESSED: case LyXRC::RC_SAVE_ORIGIN: case LyXRC::RC_SCREEN_DPI: + case LyXRC::RC_SCREEN_FONT_ROMAN: case LyXRC::RC_SCREEN_FONT_ROMAN_FOUNDRY: case LyXRC::RC_SCREEN_FONT_SANS: @@ -2988,8 +2873,20 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_SCREEN_FONT_SIZES: case LyXRC::RC_SCREEN_FONT_TYPEWRITER: case LyXRC::RC_SCREEN_FONT_TYPEWRITER_FOUNDRY: - case LyXRC::RC_GEOMETRY_SESSION: case LyXRC::RC_SCREEN_ZOOM: + if (lyxrc_orig.roman_font_name != lyxrc_new.roman_font_name + || lyxrc_orig.sans_font_name != lyxrc_new.sans_font_name + || lyxrc_orig.typewriter_font_name != lyxrc_new.typewriter_font_name + || lyxrc_orig.roman_font_foundry != lyxrc_new.roman_font_foundry + || lyxrc_orig.sans_font_foundry != lyxrc_new.sans_font_foundry + || lyxrc_orig.use_scalable_fonts != lyxrc_new.use_scalable_fonts + || lyxrc_orig.font_sizes != lyxrc_new.font_sizes + || lyxrc_orig.typewriter_font_foundry != lyxrc_new.typewriter_font_foundry + || lyxrc_orig.defaultZoom != lyxrc_new.defaultZoom) { + dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE)); + } + // fall through + case LyXRC::RC_GEOMETRY_SESSION: case LyXRC::RC_SERVERPIPE: case LyXRC::RC_SET_COLOR: case LyXRC::RC_SHOW_BANNER: @@ -3013,6 +2910,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_THESAURUSDIRPATH: case LyXRC::RC_UIFILE: case LyXRC::RC_USER_EMAIL: + case LyXRC::RC_USER_INITIALS: case LyXRC::RC_USER_NAME: case LyXRC::RC_USE_CONVERTER_CACHE: case LyXRC::RC_USE_CONVERTER_NEEDAUTH_FORBIDDEN: @@ -3020,7 +2918,6 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) case LyXRC::RC_USE_NATIVE_FILEDIALOG: case LyXRC::RC_USE_SYSTEM_COLORS: case LyXRC::RC_USE_TOOLTIP: - case LyXRC::RC_USE_PIXMAP_CACHE: case LyXRC::RC_USE_SYSTEM_THEME_ICONS: case LyXRC::RC_VIEWDVI_PAPEROPTION: case LyXRC::RC_SINGLE_CLOSE_TAB_BUTTON: @@ -3040,7 +2937,7 @@ 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_DEFAULT_DECIMAL_SEP: case LyXRC::RC_DEFAULT_LENGTH_UNIT: case LyXRC::RC_SCROLL_WHEEL_ZOOM: case LyXRC::RC_CURSOR_WIDTH: @@ -3049,6 +2946,15 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new) } +set LyXRC::getRCs() +{ + set res; + for (int i = 0; i != lyxrcCount; ++i) + res.insert(ltrim(lyxrcTags[i].tag, "\\")); + return res; +} + + #if 0 string const LyXRC::getDescription(LyXRCTags tag) { @@ -3144,11 +3050,6 @@ string const LyXRC::getDescription(LyXRCTags tag) str = _("Show a small box around a Math Macro with the macro name when the cursor is inside."); break; - case RC_DATE_INSERT_FORMAT: - //xgettext:no-c-format - str = _("This accepts the normal strftime formats; see man strftime for full details. E.g.\"%A, %e. %B %Y\"."); - break; - case RC_DEFFILE: str = _("Command definition file. Can either specify an absolute path, or LyX will look in its global and local commands/ directories."); break; @@ -3257,6 +3158,10 @@ string const LyXRC::getDescription(LyXRCTags tag) str = _("Select to control the highlighting of words with a language foreign to that of the document."); break; + case RC_RESPECT_OS_KBD_LANGUAGE: + str = _("Select to use the current keyboard language, as set from the operating system, as default input language."); + break; + case RC_MOUSE_WHEEL_SPEED: str = _("The scrolling speed of the mouse wheel."); break; @@ -3430,10 +3335,6 @@ string const LyXRC::getDescription(LyXRCTags tag) str = _("Enable the automatic appearance of tool tips in the work area."); break; - case RC_USE_PIXMAP_CACHE: - str = _("Enable the pixmap cache that might improve performance on Mac and Windows."); - break; - case RC_VIEWDVI_PAPEROPTION: _("Specify the paper command to DVI viewer (leave empty or use \"-paper\")"); break;