Revoke change made the other day to make menus appear as bold.

Change variable names in lyxrc and in FormPreferences to reflect the
new meanings, e.g. popup_normal_font, popup_bold_font, popup_font_encoding.
Change preference dialog labels to suit.

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 114f7d55cbd42304d0a3feedd6233f597d2e6b09..db7fabbba1421f95bd7ee0a6e855ab56e168b159 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-10  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * lyxrc.example: change the names of some variables in line with lyxrc.C
+
 2002-01-10  Dekel Tsur  <dekelts@tau.ac.il>
 
        * reLyX/BasicLyX.pm: Add support for amsmath environments.

diff --git a/lib/lyxrc.example b/lib/lyxrc.example
index 71f5e6917e98db7d01596adc7442e2e820c70d79..c9bab7030230373db93ee7758cd174024c00b304 100644 (file)
--- a/lib/lyxrc.example
+++ b/lib/lyxrc.example
@@ -210,20 +210,20 @@
 # the same as what LaTeX calls latin1.
 #\screen_font_encoding iso8859-2
 
-# The norm for the menu/popups fonts. The default is an empty string, which
+# The norm for the popup fonts. The default is an empty string, which
 # causes to use the screen fonts norm (defined by \screen_font_encoding).
-#\screen_font_encoding_menu iso8859-2
+#\popup_font_encoding iso8859-2
 
 
-# The font for popups. It is set to 
+# The normal font for popups. It is set to 
 #    <font_popup>-*-*-*-?-*-*-*-*-<font_encoding>.
 # The default  is:
-#\screen_font_popup "-*-helvetica-medium-r"
+#\popup_font_name "-*-helvetica-medium-r"
 
-# The font for menus (and groups titles in popups). It is set to 
+# The bold font for popups. It is set to 
 #    <font_menu>-*-*-*-?-*-*-*-*-<font_encoding>.
 # The default  is:
-#\screen_font_menu "-*-helvetica-bold-r"
+#\popup_bold_font "-*-helvetica-bold-r"
 
 # The font sizes used for calculating the scaling of the screen fonts.
 # You should only have to change these if the fonts on your screen look bad,

diff --git a/src/ChangeLog b/src/ChangeLog
index a1c8ed9e68833c8529dd2180ff322bda9701a999..b9aaf44572a772e5115aaed9046ed6353a481cf4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2002-01-10  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * lyxrc.[Ch]: change names and descriptions of popup font variables to
+       reflect their actual use. Provide compatibility code for older lyxrc
+       files.
+       
+       * lyx_gui.C (init): revoke change of 2002-01-07 of popup font style to
+       FL_NORMAL_STYLE.
+       change names of popup font variables in line with the changes to lyxrc.C
+
 2002-01-10  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * buffer.C (asciiParagraph): avoid outputing a word twice after

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index e8c54d6a1cb20d54087ab3a29e2d834b9e2ecbc4..45d41f131594cb4ed2b7558fb258d814421d4660 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-10  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * FormPreferences.C:
+       * forms/form_preferences.fd: change names and descriptions of popup
+       font variables to reflect their actual use.
+
+       * Menubar_pimpl.C: return MENU_LABEL_STYLE to FL_NORMAL_STYLE.
+
 2002-01-10  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * FormPreferences.C (input): allow empty values for document_path

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 929a6efe38b0ee433ff6db40b6d58af3749c1a39..111efd4b6f4ea9c1883df08288c5cf00a0f1a4b5 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -1468,11 +1468,11 @@ FD_form_interface const * FormPreferences::Interface::dialog()
 
 void FormPreferences::Interface::apply() const
 {
-       lyxrc.popup_font_name =
-               fl_get_input(dialog_->input_popup_font);
-       lyxrc.menu_font_name = fl_get_input(dialog_->input_menu_font);
-       lyxrc.font_norm_menu =
-               fl_get_input(dialog_->input_popup_encoding);
+       lyxrc.popup_normal_font =
+               fl_get_input(dialog_->input_popup_normal_font);
+       lyxrc.popup_bold_font = fl_get_input(dialog_->input_popup_bold_font);
+       lyxrc.popup_font_encoding =
+               fl_get_input(dialog_->input_popup_font_encoding);
        lyxrc.bind_file = fl_get_input(dialog_->input_bind_file);
        lyxrc.ui_file = fl_get_input(dialog_->input_ui_file);
        lyxrc.override_x_deadkeys =
@@ -1484,16 +1484,16 @@ void FormPreferences::Interface::build()
 {
        dialog_.reset(parent_.build_interface());
 
-       fl_set_input_return(dialog_->input_popup_font, FL_RETURN_CHANGED);
-       fl_set_input_return(dialog_->input_menu_font, FL_RETURN_CHANGED);
-       fl_set_input_return(dialog_->input_popup_encoding, FL_RETURN_CHANGED);
+       fl_set_input_return(dialog_->input_popup_normal_font, FL_RETURN_CHANGED);
+       fl_set_input_return(dialog_->input_popup_bold_font, FL_RETURN_CHANGED);
+       fl_set_input_return(dialog_->input_popup_font_encoding, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_bind_file, FL_RETURN_CHANGED);
        fl_set_input_return(dialog_->input_ui_file, FL_RETURN_CHANGED);
 
        // set up the feedback mechanism
-       setPreHandler(dialog_->input_popup_font);
-       setPreHandler(dialog_->input_menu_font);
-       setPreHandler(dialog_->input_popup_encoding);
+       setPreHandler(dialog_->input_popup_normal_font);
+       setPreHandler(dialog_->input_popup_bold_font);
+       setPreHandler(dialog_->input_popup_font_encoding);
        setPreHandler(dialog_->input_bind_file);
        setPreHandler(dialog_->button_bind_file_browse);
        setPreHandler(dialog_->input_ui_file);
@@ -1507,12 +1507,12 @@ FormPreferences::Interface::feedback(FL_OBJECT const * const ob) const
 {
        string str;
 
-       if (ob == dialog_->input_popup_font)
-               str = lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_POPUP);
-       else if (ob == dialog_->input_menu_font)
-               str = lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_MENU);
-       else if (ob == dialog_->input_popup_encoding)
-               str = lyxrc.getDescription(LyXRC::RC_SCREEN_FONT_ENCODING_MENU);
+       if (ob == dialog_->input_popup_normal_font)
+               str = lyxrc.getDescription(LyXRC::RC_POPUP_NORMAL_FONT);
+       else if (ob == dialog_->input_popup_bold_font)
+               str = lyxrc.getDescription(LyXRC::RC_POPUP_BOLD_FONT);
+       else if (ob == dialog_->input_popup_font_encoding)
+               str = lyxrc.getDescription(LyXRC::RC_POPUP_FONT_ENCODING);
        else if (ob == dialog_->input_bind_file)
                str = lyxrc.getDescription(LyXRC::RC_BINDFILE);
        else if (ob == dialog_->input_ui_file)
@@ -1557,12 +1557,12 @@ bool FormPreferences::Interface::input(FL_OBJECT const * const ob)
 
 void FormPreferences::Interface::update()
 {
-       fl_set_input(dialog_->input_popup_font,
-                    lyxrc.popup_font_name.c_str());
-       fl_set_input(dialog_->input_menu_font,
-                    lyxrc.menu_font_name.c_str());
-       fl_set_input(dialog_->input_popup_encoding,
-                    lyxrc.font_norm_menu.c_str());
+       fl_set_input(dialog_->input_popup_normal_font,
+                    lyxrc.popup_normal_font.c_str());
+       fl_set_input(dialog_->input_popup_bold_font,
+                    lyxrc.popup_bold_font.c_str());
+       fl_set_input(dialog_->input_popup_font_encoding,
+                    lyxrc.popup_font_encoding.c_str());
        fl_set_input(dialog_->input_bind_file,
                     lyxrc.bind_file.c_str());
        fl_set_input(dialog_->input_ui_file,

diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C
index 81b1c3ebb01fe78c14729ddc36ae26b3e2c96ad9..67a5439767ac3e09f17d8c7ddf3721b5f6396694 100644 (file)
--- a/src/frontends/xforms/Menubar_pimpl.C
+++ b/src/frontends/xforms/Menubar_pimpl.C
@@ -43,7 +43,7 @@ namespace {
 
 // Some constants
 int const MENU_LABEL_SIZE = FL_NORMAL_SIZE;
-int const MENU_LABEL_STYLE = FL_BOLD_STYLE;
+int const MENU_LABEL_STYLE = FL_NORMAL_STYLE;
 int const mheight = 30;
 int const mbheight= 22;
 // where to place the menubar?

diff --git a/src/frontends/xforms/form_preferences.C b/src/frontends/xforms/form_preferences.C
index 9b267ba0de0fd1b01e6975881e6ab8e61801ecdb..cafb17a8f77063dd5b0fe12bd3627817bbe6d98b 100644 (file)
--- a/src/frontends/xforms/form_preferences.C
+++ b/src/frontends/xforms/form_preferences.C
@@ -202,15 +202,17 @@ FD_form_interface * FormPreferences::build_interface()
   fdui->form = fl_bgn_form(FL_NO_BOX, 450, 350);
   fdui->form->u_vdata = this;
   obj = fl_add_box(FL_FLAT_BOX, 0, 0, 450, 350, "");
-  fdui->input_popup_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 30, 200, 30, _("Popup Font"));
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 20, 425, 110, _("Popup Fonts & Encoding"));
+  fdui->input_popup_normal_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 30, 200, 30, _("Normal Font"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_menu_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 60, 200, 30, _("Menu Font"));
+  fdui->input_popup_bold_font = obj = fl_add_input(FL_NORMAL_INPUT, 230, 60, 200, 30, _("Bold Font"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->input_popup_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 230, 90, 200, 30, _("Popup Encoding"));
+  fdui->input_popup_font_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 230, 90, 200, 30, _("Popup Encoding"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 150, 425, 85, _("Layout & Bindings"));
   {
     char const * const dummy = N_("User Interface file|#U");
     fdui->input_ui_file = obj = fl_add_input(FL_NORMAL_INPUT, 160, 160, 170, 30, idex(_(dummy)));
@@ -239,6 +241,7 @@ FD_form_interface * FormPreferences::build_interface()
   }
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
+  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 255, 425, 45, _("Dead Keys"));
   {
     char const * const dummy = N_("Override X Window dead-keys|#O");
     fdui->check_override_x_dead_keys = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 95, 265, 30, 30, idex(_(dummy)));
@@ -247,9 +250,6 @@ FD_form_interface * FormPreferences::build_interface()
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
     fl_set_button(obj, 1);
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 20, 425, 110, _("Fonts & Encoding"));
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 150, 425, 85, _("Layout & Bindings"));
-  obj = fl_add_labelframe(FL_ENGRAVED_FRAME, 15, 255, 425, 45, _("Dead Keys"));
   fl_end_form();
 
   fdui->form->fdui = fdui;

diff --git a/src/frontends/xforms/form_preferences.h b/src/frontends/xforms/form_preferences.h
index 906dc576b834851a909ab5b6e9f3d43e7c2ed247..e15bf459fd2fb8def965d4bbfe51a855aada9abc 100644 (file)
--- a/src/frontends/xforms/form_preferences.h
+++ b/src/frontends/xforms/form_preferences.h
@@ -80,9 +80,9 @@ struct FD_form_interface {
        ~FD_form_interface();
 
        FL_FORM *form;
-       FL_OBJECT *input_popup_font;
-       FL_OBJECT *input_menu_font;
-       FL_OBJECT *input_popup_encoding;
+       FL_OBJECT *input_popup_normal_font;
+       FL_OBJECT *input_popup_bold_font;
+       FL_OBJECT *input_popup_font_encoding;
        FL_OBJECT *input_ui_file;
        FL_OBJECT *button_ui_file_browse;
        FL_OBJECT *input_bind_file;

diff --git a/src/frontends/xforms/forms/form_preferences.fd b/src/frontends/xforms/forms/form_preferences.fd
index 84a0da0f691cde74cda240862c86c6de495d6979..9b0cee9dd9a73c97e6942e5584b0716e6c2866d0 100644 (file)
--- a/src/frontends/xforms/forms/form_preferences.fd
+++ b/src/frontends/xforms/forms/form_preferences.fd
@@ -616,6 +616,24 @@ name:
 callback: 
 argument: 
 
+--------------------
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 15 20 425 110
+boxtype: FL_NO_BOX
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_TOP_LEFT
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: Popup Fonts & Encoding
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
@@ -626,11 +644,11 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Popup Font
+label: Normal Font
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_popup_font
+name: input_popup_normal_font
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -644,11 +662,11 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Menu Font
+label: Bold Font
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_menu_font
+name: input_popup_bold_font
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
@@ -666,10 +684,28 @@ label: Popup Encoding
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: input_popup_encoding
+name: input_popup_font_encoding
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
+--------------------
+class: FL_LABELFRAME
+type: ENGRAVED_FRAME
+box: 15 150 425 85
+boxtype: FL_NO_BOX
+colors: FL_BLACK FL_COL1
+alignment: FL_ALIGN_TOP_LEFT
+style: FL_NORMAL_STYLE
+size: FL_DEFAULT_SIZE
+lcol: FL_BLACK
+label: Layout & Bindings
+shortcut: 
+resize: FL_RESIZE_ALL
+gravity: FL_NoGravity FL_NoGravity
+name: 
+callback: 
+argument: 
+
 --------------------
 class: FL_INPUT
 type: NORMAL_INPUT
@@ -742,54 +778,17 @@ name: button_bind_file_browse
 callback: C_FormBaseDeprecatedInputCB
 argument: 0
 
---------------------
-class: FL_CHECKBUTTON
-type: PUSH_BUTTON
-box: 95 265 30 30
-boxtype: FL_NO_BOX
-colors: FL_COL1 FL_YELLOW
-alignment: FL_ALIGN_CENTER
-style: FL_NORMAL_STYLE
-size: FL_NORMAL_SIZE
-lcol: FL_BLACK
-label: Override X Window dead-keys|#O
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: check_override_x_dead_keys
-callback: C_FormBaseDeprecatedInputCB
-argument: 0
-       value: 1
-
---------------------
-class: FL_LABELFRAME
-type: ENGRAVED_FRAME
-box: 15 20 425 110
-boxtype: FL_NO_BOX
-colors: FL_BLACK FL_COL1
-alignment: FL_ALIGN_TOP_LEFT
-style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
-lcol: FL_BLACK
-label: Fonts & Encoding
-shortcut: 
-resize: FL_RESIZE_ALL
-gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
-
 --------------------
 class: FL_LABELFRAME
 type: ENGRAVED_FRAME
-box: 15 150 425 85
+box: 15 255 425 45
 boxtype: FL_NO_BOX
 colors: FL_BLACK FL_COL1
 alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Layout & Bindings
+label: Dead Keys
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -798,22 +797,23 @@ callback:
 argument: 
 
 --------------------
-class: FL_LABELFRAME
-type: ENGRAVED_FRAME
-box: 15 255 425 45
+class: FL_CHECKBUTTON
+type: PUSH_BUTTON
+box: 95 265 30 30
 boxtype: FL_NO_BOX
-colors: FL_BLACK FL_COL1
-alignment: FL_ALIGN_TOP_LEFT
+colors: FL_COL1 FL_YELLOW
+alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
-size: FL_DEFAULT_SIZE
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Dead Keys
+label: Override X Window dead-keys|#O
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: 
-callback: 
-argument: 
+name: check_override_x_dead_keys
+callback: C_FormBaseDeprecatedInputCB
+argument: 0
+       value: 1
 
 =============== FORM ===============
 Name: form_colors

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 30f3f06dfe4fa880da351b0c2a12c5f9b80c5a9a..9bb2bf2b82eb95cb7495defce2e53ea5370e9902 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -194,16 +194,16 @@ void LyXGUI::init()
 
        create_forms();
 
-       if (lyxrc.font_norm_menu.empty())
-               lyxrc.font_norm_menu = lyxrc.font_norm;
+       if (lyxrc.popup_font_encoding.empty())
+               lyxrc.popup_font_encoding = lyxrc.font_norm;
        // Set the font name for popups and menus
-        string boldfontname = lyxrc.menu_font_name 
+        string boldfontname = lyxrc.popup_bold_font
                               + "-*-*-*-?-*-*-*-*-"  
-                              + lyxrc.font_norm_menu;
+                              + lyxrc.popup_font_encoding;
                // "?" means "scale that font"
-        string fontname = lyxrc.popup_font_name 
+        string fontname = lyxrc.popup_normal_font 
                               + "-*-*-*-?-*-*-*-*-"  
-                              + lyxrc.font_norm_menu;
+                              + lyxrc.popup_font_encoding;
 
        int bold = fl_set_font_name(FL_BOLD_STYLE, boldfontname.c_str());
        int normal = fl_set_font_name(FL_NORMAL_STYLE, fontname.c_str());
@@ -237,7 +237,7 @@ void LyXGUI::init()
        // in setDefaults() (Matthias 140496)
        // Moved from ::LyXGUI to ::init to allow popup font customization 
        // (petr 120997).
-       fl_setpup_fontstyle(FL_BOLD_STYLE);
+       fl_setpup_fontstyle(FL_NORMAL_STYLE);
        fl_setpup_fontsize(FL_NORMAL_SIZE);
        fl_setpup_color(FL_MCOL, FL_BLACK);
        fl_set_goodies_font(FL_NORMAL_STYLE, FL_NORMAL_SIZE);

diff --git a/src/lyxrc.C b/src/lyxrc.C
index b7a5035676978abdc7d8b4f2751c053ca3029af9..9828ec4bcc58885c9bc303996ca7ee3990bea133 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -92,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 },
@@ -114,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 },
@@ -204,11 +210,11 @@ 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 = "";
        override_x_deadkeys = true;
        autosave = 300;
        auto_region_delete = true;
@@ -651,16 +657,6 @@ int LyXRC::read(string const & filename)
                                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();
@@ -668,9 +664,19 @@ int LyXRC::read(string const & filename)
                        }
                        break;
 
-               case RC_SCREEN_FONT_ENCODING_MENU:
+               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())
-                               font_norm_menu = lexrc.getString();
+                               popup_font_encoding = lexrc.getString();
                        break;
 
                case RC_SET_COLOR:
@@ -1133,6 +1139,21 @@ void LyXRC::output(ostream & os) const
                   << "# 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";
@@ -1183,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] ||
@@ -1555,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";
@@ -1762,19 +1768,19 @@ string const LyXRC::getDescription(LyXRCTags tag)
                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;
                

diff --git a/src/lyxrc.h b/src/lyxrc.h
index 823c0f33ba2f1a8bcf20f2d0cf6114a17b68a6ac..6b79a006204527e947264620c44a58f7966e8989 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -54,10 +54,10 @@ enum LyXRCTags {
        RC_SCREEN_FONT_ROMAN,
        RC_SCREEN_FONT_SANS,
        RC_SCREEN_FONT_TYPEWRITER,
-       RC_SCREEN_FONT_MENU,
-       RC_SCREEN_FONT_POPUP,
        RC_SCREEN_FONT_ENCODING,
-       RC_SCREEN_FONT_ENCODING_MENU,
+       RC_POPUP_BOLD_FONT,
+       RC_POPUP_NORMAL_FONT,
+       RC_POPUP_FONT_ENCODING,
        RC_SET_COLOR,
        RC_AUTOSAVE,
        RC_DOCUMENTPATH,
@@ -241,9 +241,9 @@ enum LyXRCTags {
        ///
        string typewriter_font_name;
        ///
-       string menu_font_name;
+       string popup_bold_font;
        ///
-       string popup_font_name;
+       string popup_normal_font;
        ///
        string font_norm;
        ///
@@ -270,7 +270,7 @@ enum LyXRCTags {
        ///
        void set_font_norm_type();
        ///
-       string font_norm_menu;
+       string popup_font_encoding;
        ///
        unsigned int autosave;
        ///