Re: [PATCH] QDocument (A4 specials)

[Juergen Spitzmueller]

John Levon wrote:
> > Fixes a small bug in QDocumentDialog: the A4 extra packages should also
> > be shown if default papersize is A4 and default chosen, furthermore only
> > in portrait mode. This is the case in Xforms and previous LyX versions.
>
> Seems like that change_adaptor will no longer be called now ?

Yes, you're right. Try this.

Thanks,
Jürgen. 

Index: src/frontends/qt2/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/qt2/ChangeLog,v
retrieving revision 1.389.2.3
diff -u -r1.389.2.3 ChangeLog
--- src/frontends/qt2/ChangeLog	2003/02/07 16:49:19	1.389.2.3
+++ src/frontends/qt2/ChangeLog	2003/02/09 09:17:34
@@ -1,3 +1,8 @@
+2003-02-09  Juergen Spitzmueller  <[EMAIL PROTECTED]>
+
+	* QDocumentDialog.[Ch]: Show A4 packages also when default papersize
+	is A4 (and default chosen) and only in portrait mode.
+
 2003-02-07  John Levon  <[EMAIL PROTECTED]>
 
 	* lyx_gui.C: delete lyxserver pipes (bug 865)
Index: src/frontends/qt2/QDocumentDialog.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/qt2/QDocumentDialog.C,v
retrieving revision 1.20
diff -u -r1.20 QDocumentDialog.C
--- src/frontends/qt2/QDocumentDialog.C	2003/01/16 10:56:48	1.20
+++ src/frontends/qt2/QDocumentDialog.C	2003/02/09 09:17:36
@@ -218,6 +218,8 @@
 		 this , SLOT(setCustomPapersize(int)));
 	connect(paperModule->papersizeCO, SIGNAL(activated(int)),
 		 this , SLOT(setCustomPapersize(int)));
+	connect(paperModule->portraitRB, SIGNAL(toggled(bool)),
+		 this , SLOT(portraitChanged()));
 
 	connect(paperModule->papersizeCO, SIGNAL(activated(int)),
 		 this , SLOT(change_adaptor()));
@@ -333,6 +335,10 @@
 		setSkip(layoutModule->skipCO->currentItem());
 }
 
+void QDocumentDialog::portraitChanged()
+{
+	setMargins(paperModule->papersizeCO->currentItem());
+}
 
 void QDocumentDialog::setMargins(int papersize)
 {
@@ -340,7 +346,9 @@
 	marginsModule->marginCO->clear();
 	marginsModule->marginCO->insertItem(qt_("Default"));
 	marginsModule->marginCO->insertItem(qt_("Custom"));
-	if (papersize == 6) {
+	bool a4size = (papersize == 6 || papersize == 0
+			&& lyxrc.default_papersize == BufferParams::PAPER_A4PAPER);
+	if (a4size && paperModule->portraitRB->isChecked()) {
 		marginsModule->marginCO->insertItem(qt_("Small margins"));
 		marginsModule->marginCO->insertItem(qt_("Very small margins"));
 		marginsModule->marginCO->insertItem(qt_("Very wide margins"));