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

fix the output of custom paper sizes

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8207 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2003-12-05 16:17:46 +00:00
parent 71e352f3f4
commit 5c80e7737b
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,8 @@
2003-12-05 Juergen Spitzmueller <j.spitzmueller@gmx.de>
* QDocument.C: use geometry on custom, A3, B3 and B4
papersizes.
2003-12-05 Angus Leeming <leeming@lyx.org> 2003-12-05 Angus Leeming <leeming@lyx.org>
* QVCLog.[Ch]: * QVCLog.[Ch]:

7
src/frontends/qt2/QDocument.C
View File

@ -337,6 +337,10 @@ void QDocument::apply()
params.papersize2 = VMARGIN_PAPER_TYPE( params.papersize2 = VMARGIN_PAPER_TYPE(
dialog_->pageLayoutModule->papersizeCO->currentItem()); dialog_->pageLayoutModule->papersizeCO->currentItem());
// custom, A3, B3 and B4 paper sizes need geometry
int psize = dialog_->pageLayoutModule->papersizeCO->currentItem();
bool geom_papersize = (psize == 1 || psize == 5 || psize == 8 || psize == 9);
params.paperwidth = widgetsToLength(dialog_->pageLayoutModule->paperwidthLE, params.paperwidth = widgetsToLength(dialog_->pageLayoutModule->paperwidthLE,
dialog_->pageLayoutModule->paperwidthUnitCO); dialog_->pageLayoutModule->paperwidthUnitCO);
@ -355,7 +359,8 @@ void QDocument::apply()
// margins // margins
params.use_geometry = params.use_geometry =
(dialog_->marginsModule->marginCO->currentItem() == 1); (dialog_->marginsModule->marginCO->currentItem() == 1
|| geom_papersize);
int margin = dialog_->marginsModule->marginCO->currentItem(); int margin = dialog_->marginsModule->marginCO->currentItem();
if (margin > 0) { if (margin > 0) {