some more changes

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 331d0d39a86e8c12d4256bf8dafcda89166df46b..7ad40b5f08d40bba5050fd4e70844d5fc0ac2439 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -88,7 +88,6 @@ keyword_item lyxrcTags[] = {
        { "\\lastfiles", LyXRC::RC_LASTFILES },
        { "\\make_backup", LyXRC::RC_MAKE_BACKUP },
        { "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE },
-       { "\\new_ask_filename", LyXRC::RC_NEW_ASK_FILENAME },
        { "\\num_lastfiles", LyXRC::RC_NUMLASTFILES },
        { "\\override_x_deadkeys", LyXRC::RC_OVERRIDE_X_DEADKEYS },
        { "\\personal_dictionary", LyXRC::RC_PERS_DICT },
@@ -96,6 +95,8 @@ keyword_item lyxrcTags[] = {
        { "\\popup_font_encoding", LyXRC::RC_POPUP_FONT_ENCODING },
        { "\\popup_normal_font", LyXRC::RC_POPUP_NORMAL_FONT },
        { "\\preview", LyXRC::RC_PREVIEW },
+       { "\\preview_hashed_labels", LyXRC::RC_PREVIEW_HASHED_LABELS },
+       { "\\preview_scale_factor", LyXRC::RC_PREVIEW_SCALE_FACTOR },
        { "\\print_adapt_output", LyXRC::RC_PRINT_ADAPTOUTPUT },
        { "\\print_collcopies_flag", LyXRC::RC_PRINTCOLLCOPIESFLAG },
        { "\\print_command", LyXRC::RC_PRINT_COMMAND },
@@ -248,8 +249,6 @@ void LyXRC::setDefaults() {
        language_command_begin = "\\selectlanguage{$$lang}";
        language_command_local = "\\foreignlanguage{$$lang}{";
        default_language = "english";
-       //
-       new_ask_filename = false;
 
        //
        date_insert_format = "%A, %e %B %Y";
@@ -257,6 +256,8 @@ void LyXRC::setDefaults() {
        dialogs_iconify_with_main = false;
        label_init_length = 3;
        preview = false;
+       preview_hashed_labels  = false;
+       preview_scale_factor = 0.9;
 
        /// These variables are not stored on disk (perhaps they
        // should be moved from the LyXRC class).
@@ -878,10 +879,6 @@ int LyXRC::read(string const & filename)
                                mark_foreign_language = lexrc.getBool();
                        break;
 
-               case RC_NEW_ASK_FILENAME:
-                       if (lexrc.next())
-                               new_ask_filename = lexrc.getBool();
-                       break;
                case RC_CONVERTER: {
                        string from, to, command, flags;
                        if (lexrc.next())
@@ -949,6 +946,16 @@ int LyXRC::read(string const & filename)
                                preview = lexrc.getBool();
                        break;
 
+               case RC_PREVIEW_HASHED_LABELS:
+                       if (lexrc.next())
+                               preview_hashed_labels = lexrc.getBool();
+                       break;
+
+               case RC_PREVIEW_SCALE_FACTOR:
+                       if (lexrc.next())
+                               preview_scale_factor = lexrc.getFloat();
+                       break;
+
                case RC_LAST: break; // this is just a dummy
                }
        }
@@ -1133,6 +1140,19 @@ void LyXRC::output(ostream & os) const
                        os << "\\preview " << tostr(preview) << "\n";
                }
 
+       case RC_PREVIEW_HASHED_LABELS:
+               if (preview_hashed_labels !=
+                   system_lyxrc.preview_hashed_labels) {
+                       os << "\\preview_hashed_labels "
+                          << tostr(preview_hashed_labels) << "\n";
+               }
+
+       case RC_PREVIEW_SCALE_FACTOR:
+               if (preview_scale_factor != system_lyxrc.preview_scale_factor) {
+                       os << "\\preview_scale_factor "
+                          << preview_scale_factor << "\n";
+               }
+
                os << "\n#\n"
                   << "# SCREEN & FONTS SECTION ############################\n"
                   << "#\n\n";
@@ -1568,11 +1588,6 @@ void LyXRC::output(ostream & os) const
                if (auto_number != system_lyxrc.auto_number) {
                        os << "\\auto_number " << tostr(auto_number) << "\n";
                }
-       case RC_NEW_ASK_FILENAME:
-               if (new_ask_filename != system_lyxrc.new_ask_filename) {
-                       os << "\\new_ask_filename " << tostr(new_ask_filename)
-                          << "\n";
-               }
        case RC_DEFAULT_LANGUAGE:
                if (default_language != system_lyxrc.default_language) {
                        os << "\\default_language " << default_language << "\n";
@@ -2001,7 +2016,15 @@ string const LyXRC::getDescription(LyXRCTags tag)
                break;
 
        case RC_PREVIEW:
-               str = _("Shows a typeset preview besides formulas");
+               str = _("Shows a typeset preview of things such as math");
+               break;
+
+       case RC_PREVIEW_HASHED_LABELS:
+               str = _("Previewed equations will have \"(#)\" labels rather than numbered ones");
+               break;
+
+       case RC_PREVIEW_SCALE_FACTOR:
+               str = _("Scale the preview size to suit.");
                break;
 
        default: