[PATCH] QDocument (A4 specials)

[Juergen Spitzmueller]

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.

I think this can go into 1.3 too (the patch is against 1.3.1cvs, but it should 
also apply to HEAD).

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 02:07:01
@@ -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 02:07:03
@@ -230,7 +230,7 @@
 	connect(paperModule->paperheightUnitCO, SIGNAL(activated(int)),
 		 this , SLOT(change_adaptor()));
 	connect(paperModule->portraitRB, SIGNAL(toggled(bool)),
-		 this , SLOT(change_adaptor()));
+		 this , SLOT(portraitChanged()));
 	connect(paperModule->landscapeRB, SIGNAL(toggled(bool)),
 		 this , SLOT(change_adaptor()));
 	connect(paperModule->twoColumnCB, SIGNAL(toggled(bool)),
@@ -333,6 +333,10 @@
 		setSkip(layoutModule->skipCO->currentItem());
 }
 
+void QDocumentDialog::portraitChanged()
+{
+	setMargins(paperModule->papersizeCO->currentItem());
+}
 
 void QDocumentDialog::setMargins(int papersize)
 {
@@ -340,7 +344,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"));
Index: src/frontends/qt2/QDocumentDialog.h
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/qt2/QDocumentDialog.h,v
retrieving revision 1.10
diff -u -r1.10 QDocumentDialog.h
--- src/frontends/qt2/QDocumentDialog.h	2003/01/16 10:56:49	1.10
+++ src/frontends/qt2/QDocumentDialog.h	2003/02/09 02:07:03
@@ -57,6 +57,7 @@
 	void setCustomMargins(int);
 	void setSkip(int);
 	void enableSkip(bool);
+	void portraitChanged();
 	void classChanged();
 
 protected: