anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

John's scalable font message and preferences inner_tab rename patch

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3405 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Allan Rae 2002-01-17 10:53:14 +00:00
parent 17a937723c
commit 605797c1b4
8 changed files with 58 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2002-01-17 John Levon <moz@compsoc.man.ac.uk>
* lyxrc.C: improve help for use_scalable_fonts
2002-01-17 Allan Rae <rae@lyx.org> 2002-01-17 Allan Rae <rae@lyx.org>
* lyx_cb.C (ShowMessage): make sure we have a user and an owner. * lyx_cb.C (ShowMessage): make sure we have a user and an owner.

8
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,11 @@
2002-01-17 John Levon <moz@compsoc.man.ac.uk>
* forms/form_preferences.fd:
* form_preferences.h:
* form_preferences.C:
* FormPreferences.h:
* FormPreferences.C: use better variable name
2002-01-17 John Levon <moz@compsoc.man.ac.uk> 2002-01-17 John Levon <moz@compsoc.man.ac.uk>
* forms/form_preferences.fd: change "Use Scalable Fonts" * forms/form_preferences.fd: change "Use Scalable Fonts"

58
src/frontends/xforms/FormPreferences.C
View File

@ -97,19 +97,19 @@ void FormPreferences::redraw()
FL_FORM * form3 = 0; FL_FORM * form3 = 0;
if (form2 == converters_tab_->form) 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) 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) 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) 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) 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) if (form3 && form3->visible)
fl_redraw_form(form3); fl_redraw_form(form3);
@ -127,7 +127,7 @@ void FormPreferences::showSpellPref()
{ {
show(); show();
fl_set_folder(dialog_->tabfolder_prefs, lang_opts_tab_->form); 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 @@ void FormPreferences::hide()
{ {
// We need to hide the active tabfolder otherwise we get a // We need to hide the active tabfolder otherwise we get a
// BadDrawable error from X window and LyX crashes without saving. // BadDrawable error from X window and LyX crashes without saving.
FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder_prefs); FL_FORM * inner_form = fl_get_active_folder(dialog_->tabfolder_prefs);
if (outer_form if (inner_form
&& outer_form->visible) { && inner_form->visible) {
fl_hide_form(outer_form); fl_hide_form(inner_form);
} }
FormBaseDeprecated::hide(); FormBaseDeprecated::hide();
} }
@ -169,11 +169,11 @@ void FormPreferences::build()
bc().setRestore(dialog_->button_restore); bc().setRestore(dialog_->button_restore);
// build the tab folders // build the tab folders
converters_tab_.reset(build_outer_tab()); converters_tab_.reset(build_inner_tab());
look_n_feel_tab_.reset(build_outer_tab()); look_n_feel_tab_.reset(build_inner_tab());
inputs_tab_.reset(build_outer_tab()); inputs_tab_.reset(build_inner_tab());
outputs_tab_.reset(build_outer_tab()); outputs_tab_.reset(build_inner_tab());
lang_opts_tab_.reset(build_outer_tab()); lang_opts_tab_.reset(build_inner_tab());
// build actual tabfolder contents // build actual tabfolder contents
// these will become nested tabfolders // these will become nested tabfolders
@ -209,49 +209,49 @@ void FormPreferences::build()
// now build the nested tabfolders // now build the nested tabfolders
// Starting with look and feel // 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"),
screen_fonts_.dialog()->form); screen_fonts_.dialog()->form);
fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer, fl_addto_tabfolder(look_n_feel_tab_->tabfolder_inner,
_("Interface"), _("Interface"),
interface_.dialog()->form); interface_.dialog()->form);
fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer, fl_addto_tabfolder(look_n_feel_tab_->tabfolder_inner,
_("Colors"), _("Colors"),
colors_.dialog()->form); colors_.dialog()->form);
fl_addto_tabfolder(look_n_feel_tab_->tabfolder_outer, fl_addto_tabfolder(look_n_feel_tab_->tabfolder_inner,
_("Misc"), _("Misc"),
lnf_misc_.dialog()->form); lnf_misc_.dialog()->form);
// then build converters // then build converters
fl_addto_tabfolder(converters_tab_->tabfolder_outer, fl_addto_tabfolder(converters_tab_->tabfolder_inner,
_("Formats"), _("Formats"),
formats_.dialog()->form); formats_.dialog()->form);
fl_addto_tabfolder(converters_tab_->tabfolder_outer, fl_addto_tabfolder(converters_tab_->tabfolder_inner,
_("Converters"), _("Converters"),
converters_.dialog()->form); converters_.dialog()->form);
// then build inputs // then build inputs
// Paths should probably go in a few outer_tab called Files // Paths should probably go in a few inner_tab called Files
fl_addto_tabfolder(inputs_tab_->tabfolder_outer, fl_addto_tabfolder(inputs_tab_->tabfolder_inner,
_("Paths"), _("Paths"),
paths_.dialog()->form); paths_.dialog()->form);
fl_addto_tabfolder(inputs_tab_->tabfolder_outer, fl_addto_tabfolder(inputs_tab_->tabfolder_inner,
_("Misc"), _("Misc"),
inputs_misc_.dialog()->form); inputs_misc_.dialog()->form);
// then building outputs // then building outputs
fl_addto_tabfolder(outputs_tab_->tabfolder_outer, fl_addto_tabfolder(outputs_tab_->tabfolder_inner,
_("Printer"), _("Printer"),
printer_.dialog()->form); printer_.dialog()->form);
fl_addto_tabfolder(outputs_tab_->tabfolder_outer, fl_addto_tabfolder(outputs_tab_->tabfolder_inner,
_("Misc"), _("Misc"),
outputs_misc_.dialog()->form); outputs_misc_.dialog()->form);
// then building usage // then building usage
fl_addto_tabfolder(lang_opts_tab_->tabfolder_outer, fl_addto_tabfolder(lang_opts_tab_->tabfolder_inner,
_("Spell checker"), _("Spell checker"),
spelloptions_.dialog()->form); spelloptions_.dialog()->form);
fl_addto_tabfolder(lang_opts_tab_->tabfolder_outer, fl_addto_tabfolder(lang_opts_tab_->tabfolder_inner,
_("Language"), _("Language"),
language_.dialog()->form); language_.dialog()->form);
} }
@ -1643,7 +1643,7 @@ void FormPreferences::Language::build()
fl_deactivate_object(dialog_->choice_default_lang); fl_deactivate_object(dialog_->choice_default_lang);
combo_default_lang.reset(new Combox(FL_COMBOX_DROPLIST)); combo_default_lang.reset(new Combox(FL_COMBOX_DROPLIST));
combo_default_lang->add(obj->x, obj->y, obj->w, obj->h, 400, 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); parent_.dialog_->tabfolder_prefs);
combo_default_lang->shortcut("#L",1); combo_default_lang->shortcut("#L",1);
combo_default_lang->setcallback(ComboCB, &parent_); combo_default_lang->setcallback(ComboCB, &parent_);

14
src/frontends/xforms/FormPreferences.h
View File

@ -39,7 +39,7 @@ struct FD_form_inputs_misc;
struct FD_form_interface; struct FD_form_interface;
struct FD_form_language; struct FD_form_language;
struct FD_form_lnf_misc; struct FD_form_lnf_misc;
struct FD_form_outer_tab; struct FD_form_inner_tab;
struct FD_form_outputs_misc; struct FD_form_outputs_misc;
struct FD_form_paths; struct FD_form_paths;
struct FD_form_preferences; struct FD_form_preferences;
@ -101,7 +101,7 @@ private:
/// Fdesign generated methods /// Fdesign generated methods
FD_form_preferences * build_preferences(); FD_form_preferences * build_preferences();
/// ///
FD_form_outer_tab * build_outer_tab(); FD_form_inner_tab * build_inner_tab();
/// ///
FD_form_colors * build_colors(); FD_form_colors * build_colors();
/// ///
@ -130,15 +130,15 @@ private:
/// Real GUI implementation. /// Real GUI implementation.
boost::scoped_ptr<FD_form_preferences> dialog_; boost::scoped_ptr<FD_form_preferences> dialog_;
/// Converters tabfolder /// 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 /// 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 /// 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 /// Outputs tabfolder
boost::scoped_ptr<FD_form_outer_tab> outputs_tab_; boost::scoped_ptr<FD_form_inner_tab> outputs_tab_;
/// Spellchecker, language stuff, etc /// 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. /** Flag whether a warning has been posted to the text window.
If so, don't redraw the window when the mouse leaves an object. */ If so, don't redraw the window when the mouse leaves an object. */

8
src/frontends/xforms/form_preferences.C
View File

@ -64,22 +64,22 @@ FD_form_preferences * FormPreferences::build_preferences()
} }
/*---------------------------------------*/ /*---------------------------------------*/
FD_form_outer_tab::~FD_form_outer_tab() FD_form_inner_tab::~FD_form_inner_tab()
{ {
if ( form->visible ) fl_hide_form( form ); if ( form->visible ) fl_hide_form( form );
fl_free_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; 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 = fl_bgn_form(FL_NO_BOX, 455, 375);
fdui->form->u_vdata = this; fdui->form->u_vdata = this;
obj = fl_add_box(FL_FLAT_BOX, 0, 0, 455, 375, ""); 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_set_object_boxtype(obj, FL_FLAT_BOX);
fl_end_form(); fl_end_form();

6
src/frontends/xforms/form_preferences.h
View File

@ -48,11 +48,11 @@ struct FD_form_preferences {
FL_OBJECT *button_cancel; FL_OBJECT *button_cancel;
FL_OBJECT *text_warning; FL_OBJECT *text_warning;
}; };
struct FD_form_outer_tab { struct FD_form_inner_tab {
~FD_form_outer_tab(); ~FD_form_inner_tab();
FL_FORM *form; FL_FORM *form;
FL_OBJECT *tabfolder_outer; FL_OBJECT *tabfolder_inner;
}; };
struct FD_form_screen_fonts { struct FD_form_screen_fonts {
~FD_form_screen_fonts(); ~FD_form_screen_fonts();

4
src/frontends/xforms/forms/form_preferences.fd
View File

@ -158,7 +158,7 @@ callback:
argument: argument:
=============== FORM =============== =============== FORM ===============
Name: form_outer_tab Name: form_inner_tab
Width: 455 Width: 455
Height: 375 Height: 375
Number of Objects: 2 Number of Objects: 2
@ -195,7 +195,7 @@ label:
shortcut: shortcut:
resize: FL_RESIZE_NONE resize: FL_RESIZE_NONE
gravity: FL_NoGravity FL_NoGravity gravity: FL_NoGravity FL_NoGravity
name: tabfolder_outer name: tabfolder_inner
callback: callback:
argument: argument:

2
src/lyxrc.C
View File

@ -1897,7 +1897,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
break; break;
case RC_SCREEN_FONT_SCALABLE: 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; break;
case RC_CHKTEX_COMMAND: case RC_CHKTEX_COMMAND: