On Thu, Jan 17, 2002 at 05:18:35PM +1000, Allan Rae wrote:
> Actually, the help message that appears when the cursor is over the
> checkbox is very misleading. Care to rewrite that as well?
best I can do in the limited space (lyx-doc has more ...)
thanks
john
--
"Hey, we could invent a programming paradigm where the program is expressed as
a series of statements to be executed in a fixed order."
- Khendon
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.534
diff -u -r1.534 ChangeLog
--- src/ChangeLog 2002/01/17 06:43:33 1.534
+++ src/ChangeLog 2002/01/17 07:41:13
@@ -1,3 +1,7 @@
+2002-01-17 John Levon <[EMAIL PROTECTED]>
+
+ * lyxrc.C: improve help for use_scalable_fonts
+
2002-01-17 Allan Rae <[EMAIL PROTECTED]>
* lyx_cb.C (ShowMessage): make sure we have a user and an owner.
Index: src/lyxrc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxrc.C,v
retrieving revision 1.110
diff -u -r1.110 lyxrc.C
--- src/lyxrc.C 2002/01/16 16:07:09 1.110
+++ src/lyxrc.C 2002/01/17 07:41:21
@@ -1897,7 +1897,7 @@
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:
Index: src/frontends/xforms/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/ChangeLog,v
retrieving revision 1.251
diff -u -r1.251 ChangeLog
--- src/frontends/xforms/ChangeLog 2002/01/17 06:43:34 1.251
+++ src/frontends/xforms/ChangeLog 2002/01/17 07:41:42
@@ -1,5 +1,13 @@
2002-01-17 John Levon <[EMAIL PROTECTED]>
+ * forms/form_preferences.fd:
+ * form_preferences.h:
+ * form_preferences.C:
+ * FormPreferences.h:
+ * FormPreferences.C: use better variable name
+
+2002-01-17 John Levon <[EMAIL PROTECTED]>
+
* forms/form_preferences.fd: change "Use Scalable Fonts"
to "Rescale bitmap fonts"
Index: src/frontends/xforms/FormPreferences.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormPreferences.C,v
retrieving revision 1.93
diff -u -r1.93 FormPreferences.C
--- src/frontends/xforms/FormPreferences.C 2002/01/16 19:24:23 1.93
+++ src/frontends/xforms/FormPreferences.C 2002/01/17 07:41:50
@@ -97,19 +97,19 @@
FL_FORM * form3 = 0;
if (form2 == converters_tab_->form)
- form3 = fl_get_active_folder(converters_tab_->tabfolder_outer);
+ form3 = fl_get_active_folder(converters_tab_->tabfolder_inner);
else if (form2 == look_n_feel_tab_->form)
- form3 = fl_get_active_folder(look_n_feel_tab_->tabfolder_outer);
+ form3 = fl_get_active_folder(look_n_feel_tab_->tabfolder_inner);
else if (form2 == inputs_tab_->form)
- form3 = fl_get_active_folder(inputs_tab_->tabfolder_outer);
+ form3 = fl_get_active_folder(inputs_tab_->tabfolder_inner);
else if (form2 == outputs_tab_->form)
- form3 = fl_get_active_folder(outputs_tab_->tabfolder_outer);
+ form3 = fl_get_active_folder(outputs_tab_->tabfolder_inner);
else if (form2 == lang_opts_tab_->form)
- form3 = fl_get_active_folder(lang_opts_tab_->tabfolder_outer);
+ form3 = fl_get_active_folder(lang_opts_tab_->tabfolder_inner);
if (form3 && form3->visible)
fl_redraw_form(form3);
@@ -127,7 +127,7 @@
{
show();
fl_set_folder(dialog_->tabfolder_prefs, lang_opts_tab_->form);
- fl_set_folder(lang_opts_tab_->tabfolder_outer, spelloptions_.dialog()->form);
+ fl_set_folder(lang_opts_tab_->tabfolder_inner, spelloptions_.dialog()->form);
}
@@ -149,10 +149,10 @@
{
// We need to hide the active tabfolder otherwise we get a
// BadDrawable error from X window and LyX crashes without saving.
- FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder_prefs);
- if (outer_form
- && outer_form->visible) {
- fl_hide_form(outer_form);
+ FL_FORM * inner_form = fl_get_active_folder(dialog_->tabfolder_prefs);
+ if (inner_form
+ && inner_form->visible) {
+ fl_hide_form(inner_form);
}
FormBaseDeprecated::hide();
}
@@ -169,11 +169,11 @@
bc().setRestore(dialog_->button_restore);
// build the tab folders
- converters_tab_.reset(build_outer_tab());
- look_n_feel_tab_.reset(build_outer_tab());
- inputs_tab_.reset(build_outer_tab());
- outputs_tab_.reset(build_outer_tab());
- lang_opts_tab_.reset(build_outer_tab());
+ converters_tab_.reset(build_inner_tab());
+ look_n_feel_tab_.reset(build_inner_tab());
+ inputs_tab_.reset(build_inner_tab());
+ outputs_tab_.reset(build_inner_tab());
+ lang_opts_tab_.reset(build_inner_tab());
// build actual tabfolder contents
// these will become nested tabfolders
@@ -209,49 +209,49 @@
// now build the nested tabfolders
// Starting with look and feel
- fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer,
+ fl_addto_tabfolder(look_n_feel_tab_->tabfolder_inner,
_("Screen Fonts"),
screen_fonts_.dialog()->form);
- fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer,
+ fl_addto_tabfolder(look_n_feel_tab_->tabfolder_inner,
_("Interface"),
interface_.dialog()->form);
- fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer,
+ fl_addto_tabfolder(look_n_feel_tab_->tabfolder_inner,
_("Colors"),
colors_.dialog()->form);
- fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer,
+ fl_addto_tabfolder(look_n_feel_tab_->tabfolder_inner,
_("Misc"),
lnf_misc_.dialog()->form);
// then build converters
- fl_addto_tabfolder(converters_tab_->tabfolder_outer,
+ fl_addto_tabfolder(converters_tab_->tabfolder_inner,
_("Formats"),
formats_.dialog()->form);
- fl_addto_tabfolder(converters_tab_->tabfolder_outer,
+ fl_addto_tabfolder(converters_tab_->tabfolder_inner,
_("Converters"),
converters_.dialog()->form);
// then build inputs
- // Paths should probably go in a few outer_tab called Files
- fl_addto_tabfolder(inputs_tab_->tabfolder_outer,
+ // Paths should probably go in a few inner_tab called Files
+ fl_addto_tabfolder(inputs_tab_->tabfolder_inner,
_("Paths"),
paths_.dialog()->form);
- fl_addto_tabfolder(inputs_tab_->tabfolder_outer,
+ fl_addto_tabfolder(inputs_tab_->tabfolder_inner,
_("Misc"),
inputs_misc_.dialog()->form);
// then building outputs
- fl_addto_tabfolder(outputs_tab_->tabfolder_outer,
+ fl_addto_tabfolder(outputs_tab_->tabfolder_inner,
_("Printer"),
printer_.dialog()->form);
- fl_addto_tabfolder(outputs_tab_->tabfolder_outer,
+ fl_addto_tabfolder(outputs_tab_->tabfolder_inner,
_("Misc"),
outputs_misc_.dialog()->form);
// then building usage
- fl_addto_tabfolder(lang_opts_tab_->tabfolder_outer,
+ fl_addto_tabfolder(lang_opts_tab_->tabfolder_inner,
_("Spell checker"),
spelloptions_.dialog()->form);
- fl_addto_tabfolder(lang_opts_tab_->tabfolder_outer,
+ fl_addto_tabfolder(lang_opts_tab_->tabfolder_inner,
_("Language"),
language_.dialog()->form);
}
@@ -1643,7 +1643,7 @@
fl_deactivate_object(dialog_->choice_default_lang);
combo_default_lang.reset(new Combox(FL_COMBOX_DROPLIST));
combo_default_lang->add(obj->x, obj->y, obj->w, obj->h, 400,
- parent_.lang_opts_tab_->tabfolder_outer,
+ parent_.lang_opts_tab_->tabfolder_inner,
parent_.dialog_->tabfolder_prefs);
combo_default_lang->shortcut("#L",1);
combo_default_lang->setcallback(ComboCB, &parent_);
Index: src/frontends/xforms/FormPreferences.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormPreferences.h,v
retrieving revision 1.47
diff -u -r1.47 FormPreferences.h
--- src/frontends/xforms/FormPreferences.h 2002/01/14 12:54:50 1.47
+++ src/frontends/xforms/FormPreferences.h 2002/01/17 07:41:53
@@ -39,7 +39,7 @@
struct FD_form_interface;
struct FD_form_language;
struct FD_form_lnf_misc;
-struct FD_form_outer_tab;
+struct FD_form_inner_tab;
struct FD_form_outputs_misc;
struct FD_form_paths;
struct FD_form_preferences;
@@ -101,7 +101,7 @@
/// Fdesign generated methods
FD_form_preferences * build_preferences();
///
- FD_form_outer_tab * build_outer_tab();
+ FD_form_inner_tab * build_inner_tab();
///
FD_form_colors * build_colors();
///
@@ -130,15 +130,15 @@
/// Real GUI implementation.
boost::scoped_ptr<FD_form_preferences> dialog_;
/// Converters tabfolder
- boost::scoped_ptr<FD_form_outer_tab> converters_tab_;
+ boost::scoped_ptr<FD_form_inner_tab> converters_tab_;
/// reLyX and other import/input stuff
- boost::scoped_ptr<FD_form_outer_tab> inputs_tab_;
+ boost::scoped_ptr<FD_form_inner_tab> inputs_tab_;
/// HCI configuration
- boost::scoped_ptr<FD_form_outer_tab> look_n_feel_tab_;
+ boost::scoped_ptr<FD_form_inner_tab> look_n_feel_tab_;
/// Outputs tabfolder
- boost::scoped_ptr<FD_form_outer_tab> outputs_tab_;
+ boost::scoped_ptr<FD_form_inner_tab> outputs_tab_;
/// Spellchecker, language stuff, etc
- boost::scoped_ptr<FD_form_outer_tab> lang_opts_tab_;
+ boost::scoped_ptr<FD_form_inner_tab> lang_opts_tab_;
/** Flag whether a warning has been posted to the text window.
If so, don't redraw the window when the mouse leaves an object. */
Index: src/frontends/xforms/form_preferences.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/form_preferences.C,v
retrieving revision 1.50
diff -u -r1.50 form_preferences.C
--- src/frontends/xforms/form_preferences.C 2002/01/17 06:43:34 1.50
+++ src/frontends/xforms/form_preferences.C 2002/01/17 07:41:56
@@ -64,22 +64,22 @@
}
/*---------------------------------------*/
-FD_form_outer_tab::~FD_form_outer_tab()
+FD_form_inner_tab::~FD_form_inner_tab()
{
if ( form->visible ) fl_hide_form( form );
fl_free_form( form );
}
-FD_form_outer_tab * FormPreferences::build_outer_tab()
+FD_form_inner_tab * FormPreferences::build_inner_tab()
{
FL_OBJECT *obj;
- FD_form_outer_tab *fdui = new FD_form_outer_tab;
+ FD_form_inner_tab *fdui = new FD_form_inner_tab;
fdui->form = fl_bgn_form(FL_NO_BOX, 455, 375);
fdui->form->u_vdata = this;
obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 375, "");
- fdui->tabfolder_outer = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 0, 0, 455, 375,
"");
+ fdui->tabfolder_inner = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 0, 0, 455, 375,
+"");
fl_set_object_boxtype(obj, FL_FLAT_BOX);
fl_end_form();
Index: src/frontends/xforms/form_preferences.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/form_preferences.h,v
retrieving revision 1.36
diff -u -r1.36 form_preferences.h
--- src/frontends/xforms/form_preferences.h 2002/01/10 15:14:22 1.36
+++ src/frontends/xforms/form_preferences.h 2002/01/17 07:41:56
@@ -48,11 +48,11 @@
FL_OBJECT *button_cancel;
FL_OBJECT *text_warning;
};
-struct FD_form_outer_tab {
- ~FD_form_outer_tab();
+struct FD_form_inner_tab {
+ ~FD_form_inner_tab();
FL_FORM *form;
- FL_OBJECT *tabfolder_outer;
+ FL_OBJECT *tabfolder_inner;
};
struct FD_form_screen_fonts {
~FD_form_screen_fonts();
Index: src/frontends/xforms/forms/form_preferences.fd
===================================================================
RCS file:
/usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/forms/form_preferences.fd,v
retrieving revision 1.43
diff -u -r1.43 form_preferences.fd
--- src/frontends/xforms/forms/form_preferences.fd 2002/01/17 06:43:34 1.43
+++ src/frontends/xforms/forms/form_preferences.fd 2002/01/17 07:41:57
@@ -158,7 +158,7 @@
argument:
=============== FORM ===============
-Name: form_outer_tab
+Name: form_inner_tab
Width: 455
Height: 375
Number of Objects: 2
@@ -195,7 +195,7 @@
shortcut:
resize: FL_RESIZE_NONE
gravity: FL_NoGravity FL_NoGravity
-name: tabfolder_outer
+name: tabfolder_inner
callback:
argument:
