anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fontsize3.diff

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3961 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2002-04-10 14:06:14 +00:00
parent 6f5d53a937
commit 3c01fa17e6
3 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontends/xforms/ChangeLog
View File

@ -3,6 +3,13 @@
* xformsGImage.C (clip): no need to check if the width, height are > 0
because the BoundingBox would be empty() in this weren't the case.
2002-04-08 Juergen Spitzmueller <j.spitzmueller@gmx.de>
* FormDocument.[Ch]: Add a new method UpdateClassParams
which is used in CheckChoiceClass to update the fontsizes
and other necessary stuff (pagestyle) on class change
(hopefully finally fix bug #306)
2002-04-08 Lars Gullik Bjønnes <larsbj@birdstep.com>
* forms/Makefile.am (SUFFIXES): instead of .SUFFIXES

44
src/frontends/xforms/FormDocument.C
View File

@ -964,28 +964,38 @@ void FormDocument::bullets_apply()
bullets_apply(lv_->buffer()->params);
}
void FormDocument::UpdateClassParams(BufferParams const & params)
{
// These are the params that have to be updated on any class change
// (even if the class defaults are not used) (JSpitzm 2002-04-08)
LyXTextClass const & tclass = textclasslist[params.textclass];
combo_doc_class->select(tclass.description());
fl_clear_choice(class_->choice_doc_fontsize);
fl_addto_choice(class_->choice_doc_fontsize, "default");
fl_addto_choice(class_->choice_doc_fontsize,
tclass.opt_fontsize().c_str());
fl_set_choice_text(class_->choice_doc_fontsize,
params.fontsize.c_str());
fl_clear_choice(class_->choice_doc_pagestyle);
fl_addto_choice(class_->choice_doc_pagestyle, "default");
fl_addto_choice(class_->choice_doc_pagestyle,
tclass.opt_pagestyle().c_str());
fl_set_choice_text(class_->choice_doc_pagestyle,
params.pagestyle.c_str());
}
void FormDocument::class_update(BufferParams const & params)
{
if (!class_.get())
return;
LyXTextClass const & tclass = textclasslist[params.textclass];
UpdateClassParams(params);
combo_doc_class->select(tclass.description());
fl_set_choice_text(class_->choice_doc_fonts, params.fonts.c_str());
fl_clear_choice(class_->choice_doc_fontsize);
fl_addto_choice(class_->choice_doc_fontsize, "default");
fl_addto_choice(class_->choice_doc_fontsize,
tclass.opt_fontsize().c_str());
fl_set_choice(class_->choice_doc_fontsize,
tokenPos(tclass.opt_fontsize(), '|', params.fontsize)+2);
fl_clear_choice(class_->choice_doc_pagestyle);
fl_addto_choice(class_->choice_doc_pagestyle, "default");
fl_addto_choice(class_->choice_doc_pagestyle,
tclass.opt_pagestyle().c_str());
fl_set_choice(class_->choice_doc_pagestyle,
tokenPos(tclass.opt_pagestyle(), '|', params.pagestyle)+2);
fl_set_choice_text(class_->choice_doc_fonts,
params.fonts.c_str());
fl_set_button(class_->radio_doc_indent, 0);
fl_set_button(class_->radio_doc_skip, 0);
if (params.paragraph_separation == BufferParams::PARSEP_INDENT)
@ -1459,8 +1469,10 @@ void FormDocument::CheckChoiceClass(FL_OBJECT * ob, long)
params.useClassDefaults();
UpdateLayoutDocument(params);
} else {
// update the params which are needed in any case
// (fontsizes, pagestyle)
params.textclass = tc;
UpdateLayoutDocument(params);
UpdateClassParams(params);
}
} else {

2
src/frontends/xforms/FormDocument.h
View File

@ -108,6 +108,8 @@ private:
void CheckChoiceClass(FL_OBJECT * ob, long);
///
void UpdateLayoutDocument(BufferParams const & params);
///
void UpdateClassParams(BufferParams const & params);
///
void paper_update(BufferParams const &);