X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxrc.C;h=3831760b44648442190fda92949012cef80c69eb;hb=98c966c64594611e469313314abd1e59524adb4a;hp=ebaa3dccf3dfe36e048595cc36ea24f6e7748e38;hpb=55bf6460f304a4632af2136a62c8a82fb86053f3;p=lyx.git diff --git a/src/lyxrc.C b/src/lyxrc.C index ebaa3dccf3..3831760b44 100644 --- a/src/lyxrc.C +++ b/src/lyxrc.C @@ -1,8 +1,8 @@ /* This file is part of * ====================================================== - * + * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich * Copyright 1995-2001 The LyX Team. * @@ -23,10 +23,8 @@ #include "lyxrc.h" #include "kbmap.h" #include "LyXAction.h" -#include "lyxserver.h" #include "lyx_main.h" #include "intl.h" -#include "tex-strings.h" #include "support/path.h" #include "support/filetools.h" #include "lyxtext.h" @@ -52,6 +50,7 @@ keyword_item lyxrcTags[] = { { "\\ascii_roff_command", LyXRC::RC_ASCIIROFF_COMMAND }, { "\\auto_number", LyXRC::RC_AUTO_NUMBER }, { "\\auto_region_delete", LyXRC::RC_AUTOREGIONDELETE }, + { "\\auto_reset_options", LyXRC::RC_AUTORESET_OPTIONS }, { "\\autosave", LyXRC::RC_AUTOSAVE }, { "\\backupdir_path", LyXRC::RC_BACKUPDIR_PATH }, { "\\bind", LyXRC::RC_BIND }, @@ -65,6 +64,8 @@ keyword_item lyxrcTags[] = { { "\\date_insert_format", LyXRC::RC_DATE_INSERT_FORMAT }, { "\\default_language", LyXRC::RC_DEFAULT_LANGUAGE }, { "\\default_papersize", LyXRC::RC_DEFAULT_PAPERSIZE }, + { "\\dialogs_iconify_with_main", LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN }, + { "\\display_graphics", LyXRC::RC_DISPLAY_GRAPHICS }, { "\\display_shortcuts", LyXRC::RC_DISPLAY_SHORTCUTS }, { "\\document_path", LyXRC::RC_DOCUMENTPATH }, { "\\escape_chars", LyXRC::RC_ESC_CHARS }, @@ -91,6 +92,9 @@ keyword_item lyxrcTags[] = { { "\\num_lastfiles", LyXRC::RC_NUMLASTFILES }, { "\\override_x_deadkeys", LyXRC::RC_OVERRIDE_X_DEADKEYS }, { "\\personal_dictionary", LyXRC::RC_PERS_DICT }, + { "\\popup_bold_font", LyXRC::RC_POPUP_BOLD_FONT }, + { "\\popup_font_encoding", LyXRC::RC_POPUP_FONT_ENCODING }, + { "\\popup_normal_font", LyXRC::RC_POPUP_NORMAL_FONT }, { "\\print_adapt_output", LyXRC::RC_PRINT_ADAPTOUTPUT }, { "\\print_collcopies_flag", LyXRC::RC_PRINTCOLLCOPIESFLAG }, { "\\print_command", LyXRC::RC_PRINT_COMMAND }, @@ -101,8 +105,8 @@ keyword_item lyxrcTags[] = { { "\\print_landscape_flag", LyXRC::RC_PRINTLANDSCAPEFLAG }, { "\\print_oddpage_flag", LyXRC::RC_PRINTODDPAGEFLAG }, { "\\print_pagerange_flag", LyXRC::RC_PRINTPAGERANGEFLAG }, - { "\\print_paper_dimension_flag", LyXRC::RC_PRINTPAPERDIMENSIONFLAG }, - { "\\print_paper_flag", LyXRC::RC_PRINTPAPERFLAG }, + { "\\print_paper_dimension_flag", LyXRC::RC_PRINTPAPERDIMENSIONFLAG }, + { "\\print_paper_flag", LyXRC::RC_PRINTPAPERFLAG }, { "\\print_reverse_flag", LyXRC::RC_PRINTREVERSEFLAG }, { "\\print_spool_command", LyXRC::RC_PRINTSPOOL_COMMAND }, { "\\print_spool_printerprefix", LyXRC::RC_PRINTSPOOL_PRINTERPREFIX }, @@ -113,9 +117,12 @@ keyword_item lyxrcTags[] = { { "\\rtl", LyXRC::RC_RTL_SUPPORT }, { "\\screen_dpi", LyXRC::RC_SCREEN_DPI }, { "\\screen_font_encoding", LyXRC::RC_SCREEN_FONT_ENCODING }, - { "\\screen_font_encoding_menu", LyXRC::RC_SCREEN_FONT_ENCODING_MENU }, - { "\\screen_font_menu", LyXRC::RC_SCREEN_FONT_MENU }, - { "\\screen_font_popup", LyXRC::RC_SCREEN_FONT_POPUP }, + // compatibility with versions older than 1.2.0 only Angus 10 Jan 2002 + { "\\screen_font_encoding_menu", LyXRC::RC_POPUP_FONT_ENCODING }, + // compatibility with versions older than 1.2.0 only Angus 10 Jan 2002 + { "\\screen_font_menu", LyXRC::RC_POPUP_BOLD_FONT }, + // compatibility with versions older than 1.2.0 only Angus 10 Jan 2002 + { "\\screen_font_popup", LyXRC::RC_POPUP_NORMAL_FONT }, { "\\screen_font_roman", LyXRC::RC_SCREEN_FONT_ROMAN }, { "\\screen_font_sans", LyXRC::RC_SCREEN_FONT_SANS }, { "\\screen_font_scalable", LyXRC::RC_SCREEN_FONT_SCALABLE }, @@ -138,7 +145,7 @@ keyword_item lyxrcTags[] = { #endif { "\\use_tempdir", LyXRC::RC_USETEMPDIR }, { "\\view_dvi_paper_option", LyXRC::RC_VIEWDVI_PAPEROPTION }, - { "\\viewer" ,LyXRC::RC_VIEWER}, + { "\\viewer" ,LyXRC::RC_VIEWER}, { "\\wheel_jump", LyXRC::RC_WHEEL_JUMP } }; @@ -148,7 +155,7 @@ const int lyxrcCount = sizeof(lyxrcTags) / sizeof(keyword_item); } // namespace anon -LyXRC::LyXRC() +LyXRC::LyXRC() { setDefaults(); } @@ -175,11 +182,11 @@ void LyXRC::setDefaults() { print_file_extension = ".ps"; print_paper_flag = "-t"; print_paper_dimension_flag = "-T"; - document_path = GetEnvPath("HOME"); + document_path.erase(); tempdir_path = "/tmp"; use_tempdir = true; ps_command = "gs"; - view_dvi_paper_option = "-paper"; + view_dvi_paper_option.erase(); default_papersize = BufferParams::PAPER_USLETTER; custom_export_format = "ps"; chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38"; @@ -203,23 +210,25 @@ void LyXRC::setDefaults() { roman_font_name = "-*-times"; sans_font_name = "-*-helvetica"; typewriter_font_name = "-*-courier"; - menu_font_name = "-*-helvetica-bold-r"; - popup_font_name = "-*-helvetica-medium-r"; + popup_bold_font = "-*-helvetica-bold-r"; + popup_normal_font = "-*-helvetica-medium-r"; font_norm = "iso8859-1"; font_norm_type = ISO_8859_1; - font_norm_menu = ""; + popup_font_encoding.erase(); override_x_deadkeys = true; autosave = 300; auto_region_delete = true; + auto_reset_options = false; ascii_linelen = 65; num_lastfiles = 4; check_lastfiles = true; make_backup = true; - backupdir_path = ""; + backupdir_path.erase(); exit_confirmation = true; + display_graphics = "color"; display_shortcuts = true; // Spellchecker settings: -#ifdef USE_PSPELL +#ifdef USE_PSPELL use_pspell = true; #endif isp_command = "ispell"; @@ -238,7 +247,6 @@ void LyXRC::setDefaults() { language_use_babel = true; language_package = "\\usepackage{babel}"; language_command_begin = "\\selectlanguage{$$lang}"; - language_command_end = "\\selectlanguage{$$lang}"; language_command_local = "\\foreignlanguage{$$lang}{"; default_language = "english"; // @@ -248,6 +256,7 @@ void LyXRC::setDefaults() { date_insert_format = "%A, %e %B %Y"; show_banner = true; cursor_follows_scrollbar = false; + dialogs_iconify_with_main = false; label_init_length = 3; /// These variables are not stored on disk (perhaps they @@ -275,18 +284,19 @@ void LyXRC::readBindFileIfNeeded() ReadBindFile(bind_file); } + int LyXRC::read(string const & filename) -{ +{ LyXLex lexrc(lyxrcTags, lyxrcCount); if (lyxerr.debugging(Debug::PARSER)) lexrc.printTable(lyxerr); - + lexrc.setFile(filename); - if (!lexrc.IsOK()) return -2; - + if (!lexrc.isOK()) return -2; + lyxerr[Debug::LYXRC] << "Reading '" << filename << "'..." << endl; - - while (lexrc.IsOK()) { + + while (lexrc.isOK()) { // By using two switches we take advantage of the compiler // telling us if we have missed a LyXRCTags element in // the second switch. @@ -298,16 +308,17 @@ int LyXRC::read(string const & filename) switch (le) { case LyXLex::LEX_UNDEF: lexrc.printError("Unknown tag `$$Token'"); - continue; + continue; case LyXLex::LEX_FEOF: - continue; + continue; default: break; } switch (static_cast(le)) { case RC_INPUT: // Include file - if (lexrc.next()) { - string tmp = LibFileSearch(string(), - lexrc.GetString()); + if (lexrc.next()) { + string const tmp = + LibFileSearch(string(), + lexrc.getString()); if (read(tmp)) { lexrc.printError("Error reading " "included file: "+tmp); @@ -316,7 +327,7 @@ int LyXRC::read(string const & filename) break; case RC_BINDFILE: // RVDK_PATCH_5 if (lexrc.next()) { - string tmp(lexrc.GetString()); + string const tmp(lexrc.getString()); if (hasBindFile) // We are already in the // "actually read bind file" @@ -329,332 +340,343 @@ int LyXRC::read(string const & filename) bind_file = tmp; } break; - - case RC_UIFILE: + + case RC_UIFILE: if (lexrc.next()) { - ui_file = lexrc.GetString(); + ui_file = lexrc.getString(); } break; - + case RC_EXIT_CONFIRMATION: if (lexrc.next()) - exit_confirmation = lexrc.GetBool(); + exit_confirmation = lexrc.getBool(); + break; + + case RC_AUTORESET_OPTIONS: + if (lexrc.next()) + auto_reset_options = lexrc.getBool(); + break; + + case RC_DISPLAY_GRAPHICS: + if (lexrc.next()) + display_graphics = lexrc.getString(); break; - + case RC_DISPLAY_SHORTCUTS: if (lexrc.next()) - display_shortcuts = lexrc.GetBool(); + display_shortcuts = lexrc.getBool(); break; - + case RC_KBMAP: if (lexrc.next()) - use_kbmap = lexrc.GetBool(); + use_kbmap = lexrc.getBool(); break; - + case RC_KBMAP_PRIMARY: if (lexrc.next()) { - string kmap(lexrc.GetString()); + string const kmap(lexrc.getString()); if (kmap.empty()) { // nothing - } else if (!LibFileSearch("kbd", kmap, - "kmap").empty()) + } else if (!LibFileSearch("kbd", kmap, + "kmap").empty()) primary_kbmap = kmap; - else + else lexrc.printError("LyX: Keymap `$$Token' not found"); } break; - + case RC_KBMAP_SECONDARY: if (lexrc.next()) { - string kmap(lexrc.GetString()); + string const kmap(lexrc.getString()); if (kmap.empty()) { // nothing - } else if (!LibFileSearch("kbd", kmap, - "kmap").empty()) + } else if (!LibFileSearch("kbd", kmap, + "kmap").empty()) secondary_kbmap = kmap; - else + else lexrc.printError("LyX: Keymap `$$Token' not found"); } break; - + case RC_FONT_ENCODING: if (lexrc.next()) - fontenc = lexrc.GetString(); + fontenc = lexrc.getString(); break; - + case RC_PRINTER: if (lexrc.next()) - printer = lexrc.GetString(); + printer = lexrc.getString(); break; - + case RC_PRINT_COMMAND: if (lexrc.next()) - print_command = lexrc.GetString(); + print_command = lexrc.getString(); break; - + case RC_PRINTEVENPAGEFLAG: if (lexrc.next()) - print_evenpage_flag = lexrc.GetString(); + print_evenpage_flag = lexrc.getString(); break; - + case RC_PRINTODDPAGEFLAG: if (lexrc.next()) - print_oddpage_flag = lexrc.GetString(); + print_oddpage_flag = lexrc.getString(); break; - + case RC_PRINTPAGERANGEFLAG: if (lexrc.next()) - print_pagerange_flag = lexrc.GetString(); + print_pagerange_flag = lexrc.getString(); break; - + case RC_PRINTCOPIESFLAG: if (lexrc.next()) - print_copies_flag = lexrc.GetString(); + print_copies_flag = lexrc.getString(); break; - + case RC_PRINTCOLLCOPIESFLAG: if (lexrc.next()) - print_collcopies_flag = lexrc.GetString(); + print_collcopies_flag = lexrc.getString(); break; - + case RC_PRINTREVERSEFLAG: if (lexrc.next()) - print_reverse_flag = lexrc.GetString(); + print_reverse_flag = lexrc.getString(); break; - + case RC_PRINTLANDSCAPEFLAG: if (lexrc.next()) - print_landscape_flag = lexrc.GetString(); + print_landscape_flag = lexrc.getString(); break; - + case RC_PRINTTOPRINTER: if (lexrc.next()) - print_to_printer = lexrc.GetString(); + print_to_printer = lexrc.getString(); break; - + case RC_PRINT_ADAPTOUTPUT: if (lexrc.next()) - print_adapt_output = lexrc.GetBool(); + print_adapt_output = lexrc.getBool(); break; - + case RC_PRINTTOFILE: if (lexrc.next()) - print_to_file = lexrc.GetString(); + print_to_file = lexrc.getString(); break; - + case RC_PRINTFILEEXTENSION: if (lexrc.next()) - print_file_extension = lexrc.GetString(); + print_file_extension = lexrc.getString(); break; - + case RC_PRINTEXSTRAOPTIONS: if (lexrc.next()) - print_extra_options = lexrc.GetString(); + print_extra_options = lexrc.getString(); break; - + case RC_PRINTSPOOL_COMMAND: if (lexrc.next()) - print_spool_command = lexrc.GetString(); + print_spool_command = lexrc.getString(); break; - + case RC_PRINTSPOOL_PRINTERPREFIX: if (lexrc.next()) - print_spool_printerprefix = lexrc.GetString(); + print_spool_printerprefix = lexrc.getString(); break; - - case RC_PRINTPAPERDIMENSIONFLAG: + + case RC_PRINTPAPERDIMENSIONFLAG: if (lexrc.next()) - print_paper_dimension_flag = lexrc.GetString(); + print_paper_dimension_flag = lexrc.getString(); break; - - case RC_PRINTPAPERFLAG: + + case RC_PRINTPAPERFLAG: if (lexrc.next()) - print_paper_flag = lexrc.GetString(); + print_paper_flag = lexrc.getString(); break; - + case RC_CUSTOM_EXPORT_COMMAND: if (lexrc.next()) - custom_export_command = lexrc.GetString(); + custom_export_command = lexrc.getString(); break; - + case RC_CUSTOM_EXPORT_FORMAT: if (lexrc.next()) - custom_export_format = lexrc.GetString(); + custom_export_format = lexrc.getString(); break; case RC_DEFAULT_PAPERSIZE: - if (lexrc.next()) { - string size = lowercase(lexrc.GetString()); + if (lexrc.next()) { + string const size = + lowercase(lexrc.getString()); if (size == "usletter") - default_papersize = + default_papersize = BufferParams::PAPER_USLETTER; else if (size == "legal") - default_papersize = + default_papersize = BufferParams::PAPER_LEGALPAPER; else if (size == "executive") - default_papersize = + default_papersize = BufferParams::PAPER_EXECUTIVEPAPER; else if (size == "a3") - default_papersize = + default_papersize = BufferParams::PAPER_A3PAPER; else if (size == "a4") - default_papersize = + default_papersize = BufferParams::PAPER_A4PAPER; else if (size == "a5") - default_papersize = + default_papersize = BufferParams::PAPER_A5PAPER; else if (size == "b5") - default_papersize = + default_papersize = BufferParams::PAPER_B5PAPER; } break; case RC_VIEWDVI_PAPEROPTION: if (lexrc.next()) - view_dvi_paper_option = lexrc.GetString(); - else - view_dvi_paper_option = ""; + view_dvi_paper_option = lexrc.getString(); + else + view_dvi_paper_option.erase(); break; case RC_PS_COMMAND: if (lexrc.next()) - ps_command = lexrc.GetString(); + ps_command = lexrc.getString(); break; - + case RC_CHKTEX_COMMAND: if (lexrc.next()) - chktex_command = lexrc.GetString(); + chktex_command = lexrc.getString(); break; - + case RC_SCREEN_DPI: if (lexrc.next()) - dpi = lexrc.GetInteger(); + dpi = lexrc.getInteger(); break; - + case RC_SCREEN_ZOOM: if (lexrc.next()) - zoom = lexrc.GetInteger(); + zoom = lexrc.getInteger(); break; case RC_WHEEL_JUMP: if (lexrc.next()) - wheel_jump = lexrc.GetInteger(); + wheel_jump = lexrc.getInteger(); break; - + case RC_SCREEN_FONT_SIZES: if (lexrc.next()) font_sizes[LyXFont::SIZE_TINY] = - lexrc.GetFloat(); + lexrc.getFloat(); if (lexrc.next()) font_sizes[LyXFont::SIZE_SCRIPT] = - lexrc.GetFloat(); + lexrc.getFloat(); if (lexrc.next()) font_sizes[LyXFont::SIZE_FOOTNOTE] = - lexrc.GetFloat(); + lexrc.getFloat(); if (lexrc.next()) font_sizes[LyXFont::SIZE_SMALL] = - lexrc.GetFloat(); + lexrc.getFloat(); if (lexrc.next()) font_sizes[LyXFont::SIZE_NORMAL] = - lexrc.GetFloat(); + lexrc.getFloat(); if (lexrc.next()) font_sizes[LyXFont::SIZE_LARGE] = - lexrc.GetFloat(); + lexrc.getFloat(); if (lexrc.next()) font_sizes[LyXFont::SIZE_LARGER] = - lexrc.GetFloat(); + lexrc.getFloat(); if (lexrc.next()) font_sizes[LyXFont::SIZE_LARGEST] = - lexrc.GetFloat(); + lexrc.getFloat(); if (lexrc.next()) font_sizes[LyXFont::SIZE_HUGE] = - lexrc.GetFloat(); + lexrc.getFloat(); if (lexrc.next()) font_sizes[LyXFont::SIZE_HUGER] = - lexrc.GetFloat(); + lexrc.getFloat(); break; - - case RC_SCREEN_FONT_SCALABLE: - if (lexrc.next()) - use_scalable_fonts = lexrc.GetBool(); + + case RC_SCREEN_FONT_SCALABLE: + if (lexrc.next()) + use_scalable_fonts = lexrc.getBool(); break; - + case RC_AUTOSAVE: if (lexrc.next()) - autosave = lexrc.GetInteger(); + autosave = lexrc.getInteger(); break; - + case RC_DOCUMENTPATH: if (lexrc.next()) { - document_path = ExpandPath(lexrc.GetString()); + document_path = ExpandPath(lexrc.getString()); } break; - + case RC_TEMPLATEPATH: if (lexrc.next()) - template_path = ExpandPath(lexrc.GetString()); + template_path = ExpandPath(lexrc.getString()); break; - + case RC_TEMPDIRPATH: if (lexrc.next()) - tempdir_path = ExpandPath(lexrc.GetString()); + tempdir_path = ExpandPath(lexrc.getString()); break; - + case RC_USETEMPDIR: if (lexrc.next()) - use_tempdir = lexrc.GetBool(); + use_tempdir = lexrc.getBool(); break; - + case RC_LASTFILES: if (lexrc.next()) - lastfiles = ExpandPath(lexrc.GetString()); + lastfiles = ExpandPath(lexrc.getString()); break; - - case RC_NUMLASTFILES: - if (lexrc.next()) - num_lastfiles = lexrc.GetInteger(); + + case RC_NUMLASTFILES: + if (lexrc.next()) + num_lastfiles = lexrc.getInteger(); break; - - case RC_CHECKLASTFILES: - if (lexrc.next()) - check_lastfiles = lexrc.GetBool(); + + case RC_CHECKLASTFILES: + if (lexrc.next()) + check_lastfiles = lexrc.getBool(); break; - + case RC_SCREEN_FONT_ROMAN: if (lexrc.next()) - roman_font_name = lexrc.GetString(); + roman_font_name = lexrc.getString(); break; - + case RC_SCREEN_FONT_SANS: if (lexrc.next()) - sans_font_name = lexrc.GetString(); + sans_font_name = lexrc.getString(); break; - + case RC_SCREEN_FONT_TYPEWRITER: if (lexrc.next()) - typewriter_font_name = lexrc.GetString(); - break; - - case RC_SCREEN_FONT_MENU: - if (lexrc.next()) - menu_font_name = lexrc.GetString(); - break; - - case RC_SCREEN_FONT_POPUP: - if (lexrc.next()) - popup_font_name = lexrc.GetString(); + typewriter_font_name = lexrc.getString(); break; - + case RC_SCREEN_FONT_ENCODING: if (lexrc.next()) { - font_norm = lexrc.GetString(); + font_norm = lexrc.getString(); set_font_norm_type(); } break; - case RC_SCREEN_FONT_ENCODING_MENU: + case RC_POPUP_BOLD_FONT: if (lexrc.next()) - font_norm_menu = lexrc.GetString(); + popup_bold_font = lexrc.getString(); + break; + + case RC_POPUP_NORMAL_FONT: + if (lexrc.next()) + popup_normal_font = lexrc.getString(); + break; + + case RC_POPUP_FONT_ENCODING: + if (lexrc.next()) + popup_font_encoding = lexrc.getString(); break; case RC_SET_COLOR: @@ -662,14 +684,14 @@ int LyXRC::read(string const & filename) string lyx_name, x11_name; if (lexrc.next()) { - lyx_name = lexrc.GetString(); + lyx_name = lexrc.getString(); } else { lexrc.printError("Missing color tag."); break; } - + if (lexrc.next()) { - x11_name = lexrc.GetString(); + x11_name = lexrc.getString(); } else { lexrc.printError("Missing color name for color : `$$Token'"); break; @@ -683,10 +705,10 @@ int LyXRC::read(string const & filename) } case RC_AUTOREGIONDELETE: // Auto region delete defaults to true - if (lexrc.next()) - auto_region_delete = lexrc.GetBool(); + if (lexrc.next()) + auto_region_delete = lexrc.getBool(); break; - + case RC_BIND: { // we should not do an explicit binding before @@ -695,23 +717,24 @@ int LyXRC::read(string const & filename) readBindFileIfNeeded(); // !!!chb, dynamic key binding... - int action, res = 0; + int action = 0; + string::size_type res = 0; string seq, cmd; - + if (lexrc.next()) { - seq = lexrc.GetString(); + seq = lexrc.getString(); } else { lexrc.printError("RC_BIND: Missing key sequence"); break; } - + if (lexrc.next(true)) { - cmd = lexrc.GetString(); + cmd = lexrc.getString(); } else { lexrc.printError("RC_BIND: missing command"); break; } - + if ((action = lyxaction.LookupFunc(cmd))>= 0) { if (lyxerr.debugging(Debug::LYXRC)) { lyxerr << "RC_BIND: Sequence `" @@ -719,13 +742,13 @@ int LyXRC::read(string const & filename) << cmd << "' Action `" << action << '\'' << endl; } - res = toplevel_keymap->bind(seq, action); - if (res != 0 + res = toplevel_keymap->bind(seq, kb_action(action)); + if (res != string::npos && lyxerr.debugging(Debug::LYXRC)) { lexrc.printError( "RC_BIND: " "Invalid key sequence `" - + seq + '\''); + + seq + '\''); } } else {// cmd is the last token read. lexrc.printError( @@ -735,190 +758,195 @@ int LyXRC::read(string const & filename) } case RC_OVERRIDE_X_DEADKEYS: if (lexrc.next()) - override_x_deadkeys = lexrc.GetBool(); + override_x_deadkeys = lexrc.getBool(); break; case RC_SERVERPIPE: if (lexrc.next()) - lyxpipes = ExpandPath(lexrc.GetString()); + lyxpipes = ExpandPath(lexrc.getString()); break; - + case RC_CURSOR_FOLLOWS_SCROLLBAR: if (lexrc.next()) - cursor_follows_scrollbar = lexrc.GetBool(); + cursor_follows_scrollbar = lexrc.getBool(); + break; + + case RC_DIALOGS_ICONIFY_WITH_MAIN: + if (lexrc.next()) + dialogs_iconify_with_main = lexrc.getBool(); break; case RC_ASCIIROFF_COMMAND: - if (lexrc.next()) - ascii_roff_command = lexrc.GetString(); + if (lexrc.next()) + ascii_roff_command = lexrc.getString(); break; case RC_ASCII_LINELEN: if (lexrc.next()) - ascii_linelen = lexrc.GetInteger(); + ascii_linelen = lexrc.getInteger(); break; // Spellchecker settings: #ifdef USE_PSPELL case RC_USE_PSPELL: if (lexrc.next()) - use_pspell = lexrc.GetBool(); + use_pspell = lexrc.getBool(); break; #endif case RC_SPELL_COMMAND: if (lexrc.next()) - isp_command = lexrc.GetString(); + isp_command = lexrc.getString(); break; case RC_ACCEPT_COMPOUND: if (lexrc.next()) - isp_accept_compound = lexrc.GetBool(); + isp_accept_compound = lexrc.getBool(); break; case RC_USE_INP_ENC: if (lexrc.next()) - isp_use_input_encoding = lexrc.GetBool(); + isp_use_input_encoding = lexrc.getBool(); break; case RC_USE_ALT_LANG: if (lexrc.next()) - isp_use_alt_lang = lexrc.GetBool(); + isp_use_alt_lang = lexrc.getBool(); break; case RC_USE_PERS_DICT: if (lexrc.next()) - isp_use_pers_dict = lexrc.GetBool(); + isp_use_pers_dict = lexrc.getBool(); break; case RC_USE_ESC_CHARS: if (lexrc.next()) - isp_use_esc_chars = lexrc.GetBool(); + isp_use_esc_chars = lexrc.getBool(); break; case RC_ALT_LANG: if (lexrc.next()) - isp_alt_lang = lexrc.GetString(); + isp_alt_lang = lexrc.getString(); break; case RC_PERS_DICT: if (lexrc.next()) - isp_pers_dict = lexrc.GetString(); + isp_pers_dict = lexrc.getString(); break; case RC_ESC_CHARS: if (lexrc.next()) - isp_esc_chars = lexrc.GetString(); + isp_esc_chars = lexrc.getString(); break; case RC_MAKE_BACKUP: - if (lexrc.next()) - make_backup = lexrc.GetBool(); + if (lexrc.next()) + make_backup = lexrc.getBool(); break; case RC_BACKUPDIR_PATH: if (lexrc.next()) - backupdir_path = ExpandPath(lexrc.GetString()); + backupdir_path = ExpandPath(lexrc.getString()); break; case RC_DATE_INSERT_FORMAT: if (lexrc.next()) - date_insert_format = lexrc.GetString(); + date_insert_format = lexrc.getString(); break; case RC_LANGUAGE_PACKAGE: if (lexrc.next()) - language_package = lexrc.GetString(); + language_package = lexrc.getString(); break; case RC_LANGUAGE_AUTO_BEGIN: if (lexrc.next()) - language_auto_begin = lexrc.GetBool(); + language_auto_begin = lexrc.getBool(); break; case RC_LANGUAGE_AUTO_END: if (lexrc.next()) - language_auto_end = lexrc.GetBool(); + language_auto_end = lexrc.getBool(); break; case RC_LANGUAGE_GLOBAL_OPTIONS: if (lexrc.next()) - language_global_options = lexrc.GetBool(); + language_global_options = lexrc.getBool(); break; case RC_LANGUAGE_USE_BABEL: if (lexrc.next()) - language_use_babel = lexrc.GetBool(); + language_use_babel = lexrc.getBool(); break; case RC_LANGUAGE_COMMAND_BEGIN: if (lexrc.next()) - language_command_begin = lexrc.GetString(); + language_command_begin = lexrc.getString(); break; case RC_LANGUAGE_COMMAND_END: if (lexrc.next()) - language_command_end = lexrc.GetString(); + language_command_end = lexrc.getString(); break; case RC_LANGUAGE_COMMAND_LOCAL: if (lexrc.next()) - language_command_local = lexrc.GetString(); + language_command_local = lexrc.getString(); break; case RC_RTL_SUPPORT: if (lexrc.next()) - rtl_support = lexrc.GetBool(); + rtl_support = lexrc.getBool(); break; case RC_AUTO_NUMBER: if (lexrc.next()) - auto_number = lexrc.GetBool(); + auto_number = lexrc.getBool(); break; case RC_MARK_FOREIGN_LANGUAGE: if (lexrc.next()) - mark_foreign_language = lexrc.GetBool(); + mark_foreign_language = lexrc.getBool(); break; case RC_SHOW_BANNER: if (lexrc.next()) - show_banner = lexrc.GetBool(); + show_banner = lexrc.getBool(); break; - + case RC_NEW_ASK_FILENAME: if (lexrc.next()) - new_ask_filename = lexrc.GetBool(); + new_ask_filename = lexrc.getBool(); break; case RC_CONVERTER: { string from, to, command, flags; if (lexrc.next()) - from = lexrc.GetString(); + from = lexrc.getString(); if (lexrc.next()) - to = lexrc.GetString(); + to = lexrc.getString(); if (lexrc.next()) - command = lexrc.GetString(); + command = lexrc.getString(); if (lexrc.next()) - flags = lexrc.GetString(); + flags = lexrc.getString(); if (command.empty() || command == "none") - converters.Delete(from, to); + converters.erase(from, to); else - converters.Add(from, to, command, flags); + converters.add(from, to, command, flags); break; } case RC_VIEWER: { string format, command; if (lexrc.next()) - format = lexrc.GetString(); + format = lexrc.getString(); if (lexrc.next()) - command = lexrc.GetString(); - formats.SetViewer(format, command); + command = lexrc.getString(); + formats.setViewer(format, command); break; } case RC_FORMAT: { string format, extension, prettyname, shortcut; if (lexrc.next()) - format = lexrc.GetString(); + format = lexrc.getString(); if (lexrc.next()) - extension = lexrc.GetString(); + extension = lexrc.getString(); if (lexrc.next()) - prettyname = lexrc.GetString(); + prettyname = lexrc.getString(); if (lexrc.next()) - shortcut = lexrc.GetString(); + shortcut = lexrc.getString(); if (prettyname.empty()) { - if (converters.FormatIsUsed(format)) + if (converters.formatIsUsed(format)) lyxerr << "Can't delete format " << format << endl; else - formats.Delete(format); + formats.erase(format); } else - formats.Add(format, extension, prettyname, + formats.add(format, extension, prettyname, shortcut); break; } case RC_DEFAULT_LANGUAGE: if (lexrc.next()) - default_language = lexrc.GetString(); + default_language = lexrc.getString(); break; case RC_LABEL_INIT_LENGTH: if (lexrc.next()) - label_init_length = lexrc.GetInteger(); + label_init_length = lexrc.getInteger(); break; case RC_LAST: break; // this is just a dummy @@ -926,8 +954,8 @@ int LyXRC::read(string const & filename) } /// Update converters data-structures - converters.Update(formats); - converters.BuildGraph(); + converters.update(formats); + converters.buildGraph(); return 0; } @@ -964,7 +992,7 @@ void LyXRC::output(ostream & os) const << "# This file is written by LyX, if you want to make your own\n" << "# modifications you should do them from inside LyX and save\n" << "\n"; - + // Why the switch you might ask. It is a trick to ensure that all // the elements in the LyXRCTags enum is handled. As you can see // there are no breaks at all. So it is just a huge fall-through. @@ -987,7 +1015,7 @@ void LyXRC::output(ostream & os) const os << "\n#\n" << "# MISC SECTION ######################################\n" << "#\n\n"; - + case RC_SHOW_BANNER: if (show_banner != system_lyxrc.show_banner) { os << "# Set to false to inhibit the startup banner.\n" @@ -1005,6 +1033,13 @@ void LyXRC::output(ostream & os) const << "\\auto_region_delete " << tostr(auto_region_delete) << "\n"; } + case RC_AUTORESET_OPTIONS: + if (auto_reset_options != system_lyxrc.auto_reset_options) { + os << "# Set to false to inhibit automatic reset of\n" + << "# the class options to defaults on class change.\n" + << "\\auto_reset_options " << tostr(auto_reset_options) + << "\n"; + } case RC_AUTOSAVE: if (autosave != system_lyxrc.autosave) { os << "# The time interval between auto-saves in seconds.\n" @@ -1017,18 +1052,26 @@ void LyXRC::output(ostream & os) const << "\\exit_confirmation " << tostr(exit_confirmation) << "\n"; } + case RC_DISPLAY_GRAPHICS: + if (display_graphics != system_lyxrc.display_graphics) { + os << "# Display graphics within LyX\n" + << "# no|mono|gray|color\n" + << "\\display_graphics " << display_graphics + << "\n"; + } + case RC_DISPLAY_SHORTCUTS: if (display_shortcuts != system_lyxrc.display_shortcuts) { os << "# Display name of the last command executed,\n" - << "# with a list of short-cuts in the minibuffer.\n" + << "# with a list of short-cuts in the minibuffer.\n" << "\\display_shortcuts " << tostr(display_shortcuts) << "\n"; } case RC_VIEWDVI_PAPEROPTION: - if (view_dvi_paper_option + if (view_dvi_paper_option != system_lyxrc.view_dvi_paper_option) { os << "# Options used to specify paper size to the\n" - << "# view_dvi_command\n" + << "# view_dvi_command (e.g. -paper)\n" << "\\view_dvi_paper_option \"" << view_dvi_paper_option << "\"\n"; } @@ -1095,7 +1138,22 @@ void LyXRC::output(ostream & os) const os << "\n#\n" << "# SCREEN & FONTS SECTION ############################\n" << "#\n\n"; - + + case RC_POPUP_NORMAL_FONT: + if (popup_normal_font != system_lyxrc.popup_normal_font) { + os << "\\popup_normal_font \"" << popup_normal_font + << "\"\n"; + } + case RC_POPUP_BOLD_FONT: + if (popup_bold_font != system_lyxrc.popup_bold_font) { + os << "\\popup_bold_font \"" << popup_bold_font + << "\"\n"; + } + case RC_POPUP_FONT_ENCODING: + if (popup_font_encoding != system_lyxrc.popup_font_encoding) { + os << "\\popup_font_encoding \"" << popup_font_encoding + << "\"\n"; + } case RC_SCREEN_DPI: if (dpi != system_lyxrc.dpi) { os << "\\screen_dpi " << dpi << "\n"; @@ -1114,6 +1172,12 @@ void LyXRC::output(ostream & os) const os << "\\cursor_follows_scrollbar " << tostr(cursor_follows_scrollbar) << "\n"; } + case RC_DIALOGS_ICONIFY_WITH_MAIN: + if (dialogs_iconify_with_main + != system_lyxrc.dialogs_iconify_with_main) { + os << "\\dialogs_iconify_with_main " + << tostr(dialogs_iconify_with_main) << "\n"; + } case RC_SCREEN_FONT_ROMAN: if (roman_font_name != system_lyxrc.roman_font_name) { os << "\\screen_font_roman \"" << roman_font_name @@ -1140,16 +1204,6 @@ void LyXRC::output(ostream & os) const os << "\\screen_font_encoding \"" << font_norm << "\"\n"; } - case RC_SCREEN_FONT_POPUP: - if (popup_font_name != system_lyxrc.popup_font_name) { - os << "\\screen_font_popup \"" << popup_font_name - << "\"\n"; - } - case RC_SCREEN_FONT_MENU: - if (menu_font_name != system_lyxrc.menu_font_name) { - os << "\\screen_font_menu \"" << menu_font_name - << "\"\n"; - } case RC_SCREEN_FONT_SIZES: if (font_sizes[LyXFont::SIZE_TINY] != system_lyxrc.font_sizes[LyXFont::SIZE_TINY] || @@ -1186,15 +1240,15 @@ void LyXRC::output(ostream & os) const << " " << font_sizes[LyXFont::SIZE_HUGER] << "\n"; } - + os << "\n#\n" << "# COLOR SECTION ###################################\n" << "#\n\n"; - + case RC_SET_COLOR: - for (int i = 0; i < LColor::ignore; ++i ) { + for (int i = 0; i < LColor::ignore; ++i) { LColor::color lc = static_cast(i); - + string const col(lcolor.getX11Name(lc)); if (col != system_lcolor.getX11Name(lc)) { os << "\\set_color \"" @@ -1202,11 +1256,11 @@ void LyXRC::output(ostream & os) const << col << "\"\n"; } } - + os << "\n#\n" << "# PRINTER SECTION ###################################\n" << "#\n\n"; - + case RC_PRINTER: if (printer != system_lyxrc.printer) { os << "\\printer \"" << printer << "\"\n"; @@ -1264,7 +1318,7 @@ void LyXRC::output(ostream & os) const } case RC_PRINTCOPIESFLAG: if (print_copies_flag != system_lyxrc.print_copies_flag) { - os << "\\print_copies_flag \"" << print_copies_flag + os << "\\print_copies_flag \"" << print_copies_flag << "\"\n"; } case RC_PRINTCOLLCOPIESFLAG: @@ -1304,7 +1358,7 @@ void LyXRC::output(ostream & os) const os << "\n#\n" << "# EXPORT SECTION ####################################\n" << "#\n\n"; - + case RC_CUSTOM_EXPORT_COMMAND: if (custom_export_command != system_lyxrc.custom_export_command) { @@ -1322,7 +1376,7 @@ void LyXRC::output(ostream & os) const os << "\n#\n" << "# TEX SECTION #######################################\n" << "#\n\n"; - + case RC_FONT_ENCODING: if (fontenc != system_lyxrc.fontenc) { os << "\\font_encoding \"" << fontenc << "\"\n"; @@ -1390,7 +1444,7 @@ void LyXRC::output(ostream & os) const #ifdef USE_PSPELL case RC_USE_PSPELL: if (use_pspell != system_lyxrc.use_pspell) { - os << "\\use_pspell \"" << use_pspell << "\"\n"; + os << "\\use_pspell " << tostr(use_pspell) << "\n"; } #endif case RC_SPELL_COMMAND: @@ -1488,12 +1542,12 @@ void LyXRC::output(ostream & os) const } case RC_LANGUAGE_AUTO_BEGIN: if (language_auto_begin != system_lyxrc.language_auto_begin) { - os << "\\language_auto_begin " + os << "\\language_auto_begin " << tostr(language_auto_begin) << "\n"; } case RC_LANGUAGE_AUTO_END: if (language_auto_end != system_lyxrc.language_auto_end) { - os << "\\language_auto_end " + os << "\\language_auto_end " << tostr(language_auto_end) << "\n"; } case RC_MARK_FOREIGN_LANGUAGE: @@ -1512,11 +1566,6 @@ void LyXRC::output(ostream & os) const os << "\\override_x_deadkeys " << tostr(override_x_deadkeys) << "\n"; } - case RC_SCREEN_FONT_ENCODING_MENU: - if (font_norm_menu != system_lyxrc.font_norm_menu) { - os << "\\screen_font_encoding_menu \"" << font_norm_menu - << "\"\n"; - } case RC_AUTO_NUMBER: if (auto_number != system_lyxrc.auto_number) { os << "\\auto_number " << tostr(auto_number) << "\n"; @@ -1540,7 +1589,7 @@ void LyXRC::output(ostream & os) const for (Formats::const_iterator cit = formats.begin(); cit != formats.end(); ++cit) { Format const * format = - system_formats.GetFormat(cit->name()); + system_formats.getFormat(cit->name()); if (!format || format->extension() != cit->extension() || format->prettyname() != cit->prettyname() || @@ -1554,14 +1603,14 @@ void LyXRC::output(ostream & os) const // New/modifed formats for (Formats::const_iterator cit = system_formats.begin(); cit != system_formats.end(); ++cit) - if (!formats.GetFormat(cit->name())) - os << "\\format \"" << cit->name() + if (!formats.getFormat(cit->name())) + os << "\\format \"" << cit->name() << "\" \"\" \"\" \"\"\n"; case RC_VIEWER: for (Formats::const_iterator cit = formats.begin(); cit != formats.end(); ++cit) { - Format const * format = - system_formats.GetFormat(cit->name()); + Format const * format = + system_formats.getFormat(cit->name()); if ((!format || format->viewer() != cit->viewer()) && (format || !cit->viewer().empty())) os << "\\viewer \"" << cit->name() << "\" \"" @@ -1577,7 +1626,7 @@ void LyXRC::output(ostream & os) const for (Converters::const_iterator cit = converters.begin(); cit != converters.end(); ++cit) { Converter const * converter = - system_converters.GetConverter(cit->from, + system_converters.getConverter(cit->from, cit->to); if (!converter || converter->command != cit->command || @@ -1591,8 +1640,8 @@ void LyXRC::output(ostream & os) const // New/modifed converters for (Converters::const_iterator cit = system_converters.begin(); cit != system_converters.end(); ++cit) - if (!converters.GetConverter(cit->from, cit->to)) - os << "\\converter \"" << cit->from + if (!converters.getConverter(cit->from, cit->to)) + os << "\\converter \"" << cit->from << "\" \"" << cit->to << "\" \"\" \"\"\n"; } os.flush(); @@ -1604,6 +1653,10 @@ void LyXRC::set_font_norm_type() font_norm_type = ISO_10646_1; else if (font_norm == "iso8859-1") font_norm_type = ISO_8859_1; + else if (font_norm == "iso8859-3") + font_norm_type = ISO_8859_3; + else if (font_norm == "iso8859-4") + font_norm_type = ISO_8859_4; else if (font_norm == "iso8859-6.8x") font_norm_type = ISO_8859_6_8; else if (font_norm == "iso8859-9") @@ -1615,23 +1668,23 @@ void LyXRC::set_font_norm_type() } -string const LyXRC::getDescription(LyXRCTags tag) +string const LyXRC::getDescription(LyXRCTags tag) { string str; - + switch (tag) { case RC_FONT_ENCODING: str = N_("The font encoding used for the LaTeX2e fontenc package. T1 is highly recommended for non-English languages."); break; - + case RC_PRINTER: str = N_("The default printer to print on. If none is specified, LyX will use the environment variable PRINTER."); break; - + case RC_PRINT_COMMAND: str = N_("Your favorite print program, e.g. \"dvips\", \"dvilj4\"."); break; - + case RC_PRINTEVENPAGEFLAG: str = N_("The option to print only even pages."); break; @@ -1660,125 +1713,129 @@ string const LyXRC::getDescription(LyXRCTags tag) str = N_("The option to print out in landscape."); break; - case RC_PRINTPAPERFLAG: + case RC_PRINTPAPERFLAG: str = N_("The option to specify paper type."); break; case RC_PRINTPAPERDIMENSIONFLAG: str = N_("Option to specify the dimensions of the print paper."); break; - + case RC_PRINTTOPRINTER: str = N_("Option to pass to the print program to print on a specific printer."); break; - + case RC_PRINT_ADAPTOUTPUT: str = N_("Select for LyX to pass the name of the destination printer to your print command."); break; - + case RC_PRINTTOFILE: str = N_("Option to pass to the print program to print to a file."); break; - + case RC_PRINTFILEEXTENSION: str = N_("Extension of printer program output file. Usually \".ps\"."); break; - + case RC_PRINTEXSTRAOPTIONS: str = N_("Extra options to pass to printing program after everything else, but before the filename of the DVI file to be printed."); break; - + case RC_PRINTSPOOL_COMMAND: str = N_("When set, this printer option automatically prints to a file and then calls a separate print spooling program on that file with the given name and arguments."); break; - + case RC_PRINTSPOOL_PRINTERPREFIX: str = N_("If you specify a printer name in the print dialog, the following argument is prepended along with the printer name after the spool command."); break; - + case RC_SCREEN_DPI: str = N_("DPI (dots per inch) of your monitor is auto-detected by LyX. If that goes wrong, override the setting here."); break; - + case RC_SCREEN_ZOOM: //xgettext:no-c-format str = N_("The zoom percentage for screen fonts. A setting of 100% will make the fonts roughly the same size as on paper."); break; - + case RC_SCREEN_FONT_SIZES: str = N_("The font sizes used for calculating the scaling of the screen fonts."); break; - + case RC_SCREEN_FONT_ROMAN: case RC_SCREEN_FONT_SANS: case RC_SCREEN_FONT_TYPEWRITER: str = N_("The screen fonts used to display the text while editing."); break; - - case RC_SCREEN_FONT_MENU: - str = N_("The font for menus (and groups titles in popups)."); + + case RC_POPUP_BOLD_FONT: + str = N_("The bold font in the dialogs."); break; - - case RC_SCREEN_FONT_POPUP: - str = N_("The font for popups."); + + case RC_POPUP_NORMAL_FONT: + str = N_("The normal font in the dialogs."); break; - + case RC_SCREEN_FONT_ENCODING: str = N_("The encoding for the screen fonts."); break; - - case RC_SCREEN_FONT_ENCODING_MENU: + + case RC_POPUP_FONT_ENCODING: str = N_("The encoding for the menu/popups fonts."); break; - + case RC_SET_COLOR: break; - + case RC_AUTOSAVE: str = N_("The time interval between auto-saves (in seconds). 0 means no auto-save."); break; - + case RC_DOCUMENTPATH: - str = N_("The default path for your documents."); + str = N_("The default path for your documents. An empty value selects the directory LyX was started from."); break; - + case RC_TEMPLATEPATH: - str = N_("The path that LyX will set when offering to choose a template."); + str = N_("The path that LyX will set when offering to choose a template. An empty value selects the directory LyX was started from."); break; - + case RC_TEMPDIRPATH: str = N_("LyX will place its temporary directories in this path. They will be deleted when you quit LyX."); break; - + case RC_USETEMPDIR: str = N_("Select if you wish to use a temporary directory structure to store temporary TeX output."); break; - + case RC_LASTFILES: str = N_("The file where the last-files information should be stored."); break; - + case RC_AUTOREGIONDELETE: str = N_("De-select if you don't want the current selection to be replaced automatically by what you type."); break; - + + case RC_AUTORESET_OPTIONS: + str = N_("De-select if you don't want the class options to be reset to defaults after class change."); + break; + case RC_OVERRIDE_X_DEADKEYS: str = N_("Select if LyX is to take over the handling of the dead keys (a.k.a. accent keys) that may be defined for your keyboard."); break; - + case RC_SERVERPIPE: str = N_("This starts the lyxserver. The pipes get an additional extension \".in\" and \".out\". Only for advanced users."); break; - + case RC_BINDFILE: str = N_("Keybindings file. Can either specify an absolute path, or LyX will look in its global and local bind/ directories."); break; - + case RC_UIFILE: str = N_("The UI (user interface) file. Can either specify an absolute path, or LyX will look in its global and local ui/ directories."); break; - + case RC_KBMAP: case RC_KBMAP_PRIMARY: case RC_KBMAP_SECONDARY: @@ -1788,80 +1845,89 @@ string const LyXRC::getDescription(LyXRCTags tag) case RC_ASCIIROFF_COMMAND: str = N_("Use to define an external program to render tables in the ASCII output. E.g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file. If \"none\" is specified, an internal routine is used."); break; - + case RC_ASCII_LINELEN: str = N_("This is the maximum line length of an exported ASCII file (LaTeX, SGML or plain text)."); break; - + case RC_NUMLASTFILES: str = N_("Maximal number of lastfiles. Up to 9 can appear in the file menu."); break; - + case RC_CHECKLASTFILES: str = N_("Select to check whether the lastfiles still exist."); break; - + case RC_VIEWDVI_PAPEROPTION: + str = N_("Specify the paper command to DVI viewer (leave empty or use \"-paper\")"); break; - + case RC_DEFAULT_PAPERSIZE: str = N_("Specify the default paper size."); break; - + case RC_PS_COMMAND: break; - + case RC_ACCEPT_COMPOUND: str = N_("Consider run-together words, such as \"diskdrive\" for \"disk drive\", as legal words?"); break; - + case RC_SPELL_COMMAND: str = N_("What command runs the spell checker?"); break; - + case RC_USE_INP_ENC: str = N_("Specify whether to pass the -T input encoding option to ispell. Enable this if you can't spellcheck words with international letters in them. This may not work with all dictionaries."); break; - + case RC_USE_ALT_LANG: case RC_ALT_LANG: str = N_("Specify an alternate language. The default is to use the language of the document."); break; - + case RC_USE_PERS_DICT: case RC_PERS_DICT: str = N_("Specify an alternate personal dictionary file. E.g. \".ispell_english\"."); break; - + case RC_USE_ESC_CHARS: case RC_ESC_CHARS: str = N_("Specify additional chars that can be part of a word."); break; - + case RC_SCREEN_FONT_SCALABLE: - str = N_("Allow the use of scalable screen fonts? If false, LyX will use the closest existing size for a match. Use this if the scalable fonts look bad and you have many fixed size fonts."); + str = N_("Allow bitmap fonts to be resized. If you are using a bitmap font, selecting this option may make some fonts look blocky in LyX. Deselecting this option makes LyX use the nearest bitmap font size available, instead of scaling."); break; - + case RC_CHKTEX_COMMAND: str = N_("Define how to run chktex. E.g. \"chktex -n11 -n1 -n3 -n6 -n9 -22 -n25 -n30 -n38\" Refer to the ChkTeX documentation."); break; - + case RC_CURSOR_FOLLOWS_SCROLLBAR: str = N_("LyX normally doesn't update the cursor position if you move the scrollbar. Set to true if you'd prefer to always have the cursor on screen."); break; - + + case RC_DIALOGS_ICONIFY_WITH_MAIN: + str = N_("Iconify the dialogs when the main window is iconified. (Affects only dialogs shown after the change has been made.)"); + break; + case RC_EXIT_CONFIRMATION: str = N_("Sets whether LyX asks for a second confirmation to exit when you have changed documents. (LyX will still ask to save changed documents.)"); break; - + + case RC_DISPLAY_GRAPHICS: + str = N_("Select how LyX will display any graphics."); + break; + case RC_DISPLAY_SHORTCUTS: str = N_("LyX continously displays names of last command executed, along with a list of defined short-cuts for it in the minibuffer. Set to false if LyX seems slow."); break; - + case RC_MAKE_BACKUP: str = N_("De-select if you don't want LyX to create backup files."); break; - + case RC_BACKUPDIR_PATH: str = N_("The path for storing backup files. If it is an empty string, LyX will store the backup file in the same directory as the original file."); break; @@ -1869,11 +1935,11 @@ string const LyXRC::getDescription(LyXRCTags tag) case RC_RTL_SUPPORT: str = N_("Select to enable support of right-to-left languages (e.g. Hebrew, Arabic)."); break; - + case RC_MARK_FOREIGN_LANGUAGE: str = N_("Select to control the highlighting of words with a language foreign to that of the document."); break; - + case RC_LANGUAGE_PACKAGE: str = N_("The latex command for loading the language package. E.g. \"\\usepackage{babel}\", \"\\usepackage{omega}\"."); break; @@ -1885,19 +1951,19 @@ string const LyXRC::getDescription(LyXRCTags tag) case RC_LANGUAGE_USE_BABEL: str = N_("De-select if you don't want babel to be used when the language of the document is the default language."); break; - + case RC_LANGUAGE_AUTO_BEGIN: str = N_("Select if a language switching command is needed at the beginning of the document."); break; - + case RC_LANGUAGE_AUTO_END: str = N_("Select if a language switching command is needed at the end of the document."); break; - + case RC_LANGUAGE_COMMAND_BEGIN: str = N_("The latex command for changing from the language of the document to another language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the name of the second language."); break; - + case RC_LANGUAGE_COMMAND_END: str = N_("The latex command for changing back to the language of the document."); break; @@ -1910,28 +1976,28 @@ string const LyXRC::getDescription(LyXRCTags tag) //xgettext:no-c-format str = N_("This accepts the normal strftime formats; see man strftime for full details. E.g.\"%A, %e. %B %Y\"."); break; - + case RC_SHOW_BANNER: str = N_("De-select if you don't want the startup banner."); break; - + case RC_WHEEL_JUMP: str = N_("The wheel movement factor (for mice with wheels or five button mice)."); break; - + case RC_CONVERTER: break; - + case RC_VIEWER: break; - + case RC_FORMAT: break; - + case RC_NEW_ASK_FILENAME: str = N_("This sets the behaviour if you want to be asked for a filename when creating a new document or wait until you save it and be asked then."); break; - + case RC_DEFAULT_LANGUAGE: str = N_("New documents will be assigned this language."); break; @@ -1939,7 +2005,7 @@ string const LyXRC::getDescription(LyXRCTags tag) case RC_LABEL_INIT_LENGTH: str = N_("Maximum number of words in the initialization string for a new label"); break; - + default: break; }