#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"
{ "\\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 },
{ "\\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 },
{ "\\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 },
{ "\\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 },
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 = "";
+ 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";
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 = "mono";
display_shortcuts = true;
// Spellchecker settings:
#ifdef USE_PSPELL
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";
//
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
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();
break;
-
+
case RC_KBMAP:
if (lexrc.next())
use_kbmap = lexrc.getBool();
if (lexrc.next())
view_dvi_paper_option = lexrc.getString();
else
- view_dvi_paper_option = "";
+ view_dvi_paper_option.erase();
break;
case RC_PS_COMMAND:
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();
- break;
-
case RC_SCREEN_FONT_ENCODING:
if (lexrc.next()) {
font_norm = lexrc.getString();
}
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:
readBindFileIfNeeded();
// !!!chb, dynamic key binding...
- int action, res = 0;
+ int action = 0;
+ string::size_type res = 0;
string seq, cmd;
if (lexrc.next()) {
<< 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: "
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();
<< "\\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"
<< "\\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"
<< "# 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";
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
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] ||
#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:
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";
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")
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;
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:
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;
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_("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;
projects / lyx.git / blobdiff