remove lyxrc variables that where only used by xforms

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17565 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index b8c978cd7fa41fa24be94a19440d116b01fd6277..71192b1b779a762b2717bad7262f1fe88db1dfa8 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -2190,9 +2190,6 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
                        support::prependEnvPath("PATH", lyxrc.path_prefix);
                }
        case LyXRC::RC_PERS_DICT:
-       case LyXRC::RC_POPUP_BOLD_FONT:
-       case LyXRC::RC_POPUP_FONT_ENCODING:
-       case LyXRC::RC_POPUP_NORMAL_FONT:
        case LyXRC::RC_PREVIEW:
        case LyXRC::RC_PREVIEW_HASHED_LABELS:
        case LyXRC::RC_PREVIEW_SCALE_FACTOR:

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 8208bb2103d240b3632203685e0692ac3c14e77b..285731bf90d26dc056fed990c6e2bc9a7910301c 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -114,9 +114,6 @@ keyword_item lyxrcTags[] = {
        { "\\personal_dictionary", LyXRC::RC_PERS_DICT },
        { "\\plaintext_linelen", LyXRC::RC_PLAINTEXT_LINELEN },
        { "\\plaintext_roff_command", LyXRC::RC_PLAINTEXT_ROFF_COMMAND },
-       { "\\popup_bold_font", LyXRC::RC_POPUP_BOLD_FONT },
-       { "\\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 },
@@ -141,12 +138,6 @@ keyword_item lyxrcTags[] = {
        { "\\rtl", LyXRC::RC_RTL_SUPPORT },
        { "\\screen_dpi", LyXRC::RC_SCREEN_DPI },
        { "\\screen_font_encoding", LyXRC::RC_SCREEN_FONT_ENCODING },
-       // 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_roman_foundry", LyXRC::RC_SCREEN_FONT_ROMAN_FOUNDRY },
        { "\\screen_font_sans", LyXRC::RC_SCREEN_FONT_SANS },
@@ -246,11 +237,8 @@ void LyXRC::setDefaults() {
        roman_font_name = "";
        sans_font_name = "";
        typewriter_font_name = "";
-       popup_bold_font = "-*-helvetica-bold-r";
-       popup_normal_font = "-*-helvetica-medium-r";
        font_norm = "iso8859-1";
        font_norm_type = ISO_8859_1;
-       popup_font_encoding.erase();
        autosave = 300;
        auto_region_delete = true;
        auto_reset_options = false;
@@ -816,24 +804,6 @@ int LyXRC::read(LyXLex & lexrc)
                        }
                        break;
 
-               case RC_POPUP_BOLD_FONT:
-                       if (lexrc.next()) {
-                               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:
                {
                        string lyx_name, x11_name;
@@ -1497,24 +1467,6 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc) const
                   << "# SCREEN & FONTS SECTION ############################\n"
                   << "#\n\n";
 
-       case RC_POPUP_NORMAL_FONT:
-               if (ignore_system_lyxrc ||
-                   popup_normal_font != system_lyxrc.popup_normal_font) {
-                       os << "\\popup_normal_font \"" << popup_normal_font
-                          << "\"\n";
-               }
-       case RC_POPUP_BOLD_FONT:
-               if (ignore_system_lyxrc ||
-                   popup_bold_font != system_lyxrc.popup_bold_font) {
-                       os << "\\popup_bold_font \"" << popup_bold_font
-                          << "\"\n";
-               }
-       case RC_POPUP_FONT_ENCODING:
-               if (ignore_system_lyxrc ||
-                   popup_font_encoding != system_lyxrc.popup_font_encoding) {
-                       os << "\\popup_font_encoding \"" << popup_font_encoding
-                          << "\"\n";
-               }
        case RC_SCREEN_DPI:
                if (ignore_system_lyxrc ||
                    dpi != system_lyxrc.dpi) {
@@ -2350,18 +2302,6 @@ string const LyXRC::getDescription(LyXRCTags tag)
                str = _("Specify an alternate personal dictionary file. E.g. \".ispell_english\".");
                break;
 
-       case RC_POPUP_BOLD_FONT:
-               str = _("The bold font in the dialogs.");
-               break;
-
-       case RC_POPUP_FONT_ENCODING:
-               str = _("The encoding for the menu/popups fonts.");
-               break;
-
-       case RC_POPUP_NORMAL_FONT:
-               str = _("The normal font in the dialogs.");
-               break;
-
        case RC_PREVIEW:
                str = _("Shows a typeset preview of things such as math");
                break;

diff --git a/src/lyxrc.h b/src/lyxrc.h
index ceed6f936974b808058ae620b2b1e7e746feb3d5..eef4d55296eb660a7c13fb8db1a161981dc2f346 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -87,9 +87,6 @@ public:
                RC_NUMLASTFILES,
                RC_PATH_PREFIX,
                RC_PERS_DICT,
-               RC_POPUP_BOLD_FONT,
-               RC_POPUP_FONT_ENCODING,
-               RC_POPUP_NORMAL_FONT,
                RC_PREVIEW,
                RC_PREVIEW_HASHED_LABELS,
                RC_PREVIEW_SCALE_FACTOR,
@@ -276,10 +273,6 @@ public:
        ///
        std::string typewriter_font_foundry;
        ///
-       std::string popup_bold_font;
-       ///
-       std::string popup_normal_font;
-       ///
        std::string font_norm;
        ///
        enum FontEncoding {
@@ -305,8 +298,6 @@ public:
        ///
        void set_font_norm_type();
        ///
-       std::string popup_font_encoding;
-       ///
        unsigned int autosave;
        ///
        std::string plaintext_roff_command;