diff -r bffaafb77e62 -r fe9512d11598 PrintingDialog.st --- a/PrintingDialog.st Thu Mar 26 23:15:51 2009 +0100 +++ b/PrintingDialog.st Mon Mar 30 15:48:26 2009 +0200 @@ -597,28 +597,7 @@ !PrintingDialog class methodsFor:'opening'! getPrinterInfo - "Returns a PrinterInfo by opening the Printer Dialog or by using the lastUserPrinterSettings" - - |useDefaultPrinter| - - self lastUsedPrinterSettings notNil ifTrue:[ - AskForConfirmUsageOfDefaultPrinterSettings ifTrue:[ - useDefaultPrinter := self confirmUsageOfDefaultPrinterSettings. - useDefaultPrinter isNil ifTrue:[ - ^ nil - ]. - ] ifFalse:[ - useDefaultPrinter := true. - ]. - useDefaultPrinter ifTrue:[ - ^ self lastUsedPrinterSettings - ] - ]. - ^ self getPrinterInfoFromDialog - - "Created: / 02-08-2006 / 16:46:50 / fm" - "Modified: / 03-08-2006 / 11:28:12 / fm" - "Modified: / 10-10-2006 / 17:44:51 / cg" + ^ self getPrinterInfoWithoutDialog:false ! getPrinterInfoFromDialog @@ -633,6 +612,34 @@ "Created: / 02-08-2006 / 16:46:50 / fm" "Modified: / 03-08-2006 / 11:28:12 / fm" "Modified: / 10-10-2006 / 17:44:56 / cg" +! + +getPrinterInfoWithoutDialog:withoutDialog + "Returns a PrinterInfo by opening the Printer Dialog or by using the lastUserPrinterSettings" + + |useDefaultPrinter| + + self lastUsedPrinterSettings notNil ifTrue:[ + withoutDialog ifTrue:[ + AskForConfirmUsageOfDefaultPrinterSettings ifTrue:[ + useDefaultPrinter := self confirmUsageOfDefaultPrinterSettings. + useDefaultPrinter isNil ifTrue:[ + ^ nil + ]. + ] ifFalse:[ + useDefaultPrinter := true. + ]. + ]. + + useDefaultPrinter ifTrue:[ + ^ self lastUsedPrinterSettings + ] + ]. + ^ self getPrinterInfoFromDialog + + "Created: / 02-08-2006 / 16:46:50 / fm" + "Modified: / 03-08-2006 / 11:28:12 / fm" + "Modified: / 10-10-2006 / 17:44:51 / cg" ! ! !PrintingDialog class methodsFor:'queries'! @@ -1422,7 +1429,7 @@ !PrintingDialog class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg2/PrintingDialog.st,v 1.18 2009-01-29 09:11:18 sr Exp $' + ^ '$Header: /cvs/stx/stx/libwidg2/PrintingDialog.st,v 1.19 2009-03-30 13:48:26 sr Exp $' ! ! PrintingDialog initialize!