PrintingDialog.st
changeset 3095 ce3884b4f88d
parent 3048 c25233216ae1
child 3136 8b191d3ab353
--- a/PrintingDialog.st	Tue Oct 10 17:55:32 2006 +0200
+++ b/PrintingDialog.st	Tue Oct 10 17:55:36 2006 +0200
@@ -9,7 +9,6 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-
 "{ Package: 'stx:libwidg2' }"
 
 ApplicationModel subclass:#PrintingDialog
@@ -41,6 +40,34 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
+!
+
+documentation
+"
+    Opens a dialog to let user ask for a printer.
+
+    [author:]
+        Felix Madrid (fm@exept.de)
+
+    See more example in PrinterContext.
+"
+!
+
+examples
+"
+                                                        [exBegin]
+    | printerInfo printer |
+
+    printerInfo := PrintingDialog getPrinterInfo.
+    printerInfo isNil ifTrue:[^self].
+
+    printer := PrinterContext fromPrinterInfo: printerInfo.
+    printer startPrintJob: 'Some printJob from ST/X'.
+    printer endPrintJob.
+                                                        [exEnd]
+    see more example in PrinterContext.
+
+"
 ! !
 
 !PrintingDialog class methodsFor:'image specs'!
@@ -536,842 +563,811 @@
 !PrintingDialog class methodsFor:'opening'!
 
 getPrinterInfo
-"Returns a PrinterInfo by opening the Printer Dialog or by using the lastUserPrinterSettings"
-|useDefaultPrinter|
-self lastUsedPrinterSettings notNil 
-        ifTrue:[useDefaultPrinter := self confirmUsageOfDefaultPrinterSettings.
-                useDefaultPrinter isNil ifTrue:[^nil].
-                useDefaultPrinter ifTrue:[^self lastUsedPrinterSettings]
-].
-^self getPrinterInfoFromDialog
+    "Returns a PrinterInfo by opening the Printer Dialog or by using the lastUserPrinterSettings"
+    
+    |useDefaultPrinter|
 
+    self lastUsedPrinterSettings notNil ifTrue:[
+        useDefaultPrinter := self confirmUsageOfDefaultPrinterSettings.
+        useDefaultPrinter isNil ifTrue:[
+            ^ nil
+        ].
+        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"
 !
 
 getPrinterInfoFromDialog
-"Opens the Printer Dialog and returns a PrinterInfo after selecting a printer and defining the printing settings"
-|dialog|       
-dialog := self new.
-dialog openModal.
-^dialog answer.
+    "Opens the Printer Dialog and returns a PrinterInfo after selecting a printer and defining the printing settings"
+    
+    |dialog|
+
+    dialog := self new.
+    dialog openModal.
+    ^ dialog answer.
 
     "Created: / 02-08-2006 / 16:46:50 / fm"
     "Modified: / 03-08-2006 / 11:28:12 / fm"
+    "Modified: / 10-10-2006 / 17:44:56 / cg"
 ! !
 
 !PrintingDialog class methodsFor:'queries'!
 
 confirmUsageOfDefaultPrinterSettings
+    "ask if printing should be done with the last printer.
+     Return true, false or nil (for cancel)"
 
-^Dialog confirmWithCancel:'Do you want to print with current settings of printer: ', 
-                        self lastUsedPrinterSettings userFriendlyName ,'?'
-                       labels:#('Cancel' 'Open dialog' 'Print')
-                      default:3.    
+    ^ Dialog 
+        confirmWithCancel:
+            (self resources 
+                string:'Do you want to print with current settings of printer: "%1" ?'
+                with:self lastUsedPrinterSettings userFriendlyName allBold)
+        labels:(self resources array:#( 'Cancel' 'Open Dialog' 'Print' ))
+        default:3.
+
+    "
+     self confirmUsageOfDefaultPrinterSettings 
+    "
+
+    "Modified: / 10-10-2006 / 17:44:36 / cg"
 ! !
 
 !PrintingDialog class methodsFor:'settings'!
 
 lastUsedPrinterSettings
-
-^LastUsedPrinterSettings
+    ^ LastUsedPrinterSettings
 
     "Created: / 04-08-2006 / 13:24:18 / fm"
+    "Modified: / 10-10-2006 / 17:45:00 / cg"
 !
 
-lastUsedPrinterSettings: aPrinterInfo
-
-LastUsedPrinterSettings := aPrinterInfo
+lastUsedPrinterSettings:aPrinterInfo 
+    LastUsedPrinterSettings := aPrinterInfo
 
     "Created: / 04-08-2006 / 13:24:18 / fm"
+    "Modified: / 10-10-2006 / 17:45:07 / cg"
 !
 
 printersSettings
-
-PrintersSettings isNil ifTrue:[PrintersSettings := Dictionary new].
-^PrintersSettings
+    PrintersSettings isNil ifTrue:[
+        PrintersSettings := Dictionary new
+    ].
+    ^ PrintersSettings
 
     "Created: / 04-08-2006 / 13:24:18 / fm"
+    "Modified: / 10-10-2006 / 17:45:22 / cg"
 !
 
-printersSettingsAt: printerName 
-
-^self printersSettings at: printerName ifAbsent:[nil]
+printersSettingsAt:printerName 
+    ^ self printersSettings at:printerName ifAbsent:[ nil ]
 
     "Created: / 04-08-2006 / 13:51:04 / fm"
+    "Modified: / 10-10-2006 / 17:45:25 / cg"
 !
 
-printersSettingsAt: printerName ifAbsentPut: aPrinterInfo
-
-self printersSettings at: printerName ifAbsentPut: aPrinterInfo
+printersSettingsAt:printerName ifAbsentPut:aPrinterInfo 
+    self printersSettings at:printerName ifAbsentPut:aPrinterInfo
 
     "Created: / 04-08-2006 / 13:50:40 / fm"
+    "Modified: / 10-10-2006 / 17:45:29 / cg"
 !
 
-printersSettingsAt: printerName put: aPrinterInfo
-
-self printersSettings at: printerName put: aPrinterInfo
+printersSettingsAt:printerName put:aPrinterInfo 
+    self printersSettings at:printerName put:aPrinterInfo
 
     "Created: / 04-08-2006 / 13:52:11 / fm"
+    "Modified: / 10-10-2006 / 17:45:32 / cg"
 ! !
 
 !PrintingDialog class methodsFor:'tables'!
 
-orientationAt: anInteger
-
-^self orientationTable at: anInteger ifAbsent:[nil]
+orientationAt:anInteger 
+    ^ self orientationTable at:anInteger ifAbsent:[ nil ]
 
     "Created: / 28-07-2006 / 16:48:24 / fm"
+    "Modified: / 10-10-2006 / 17:45:13 / cg"
 !
 
 orientationTable
-
-^Dictionary new
-    at: 1 put: #portrait;
-    at: 2 put: #landscape;
-    yourself
+    ^ (Dictionary new)
+        at:1 put:#portrait;
+        at:2 put:#landscape;
+        yourself
 
     "Created: / 28-07-2006 / 16:47:36 / fm"
+    "Modified: / 10-10-2006 / 17:45:17 / cg"
 ! !
 
 !PrintingDialog methodsFor:'accessing'!
 
 answer
-   "Returns aPrinterInfo with all choosen settings if the print button has been pressed. Otherwise returns nil"
-
-^answer
+    "Returns aPrinterInfo with all choosen settings if the print button has been pressed. Otherwise returns nil"
+    
+    ^ answer
 
     "Created: / 02-08-2006 / 17:04:16 / fm"
+    "Modified: / 10-10-2006 / 17:45:44 / cg"
 !
 
 collateImage
-
-^self collateHolder value
-    ifTrue:[self class collateImage]
-    ifFalse:[self class nonCollateImage]
+    ^ self collateHolder value 
+        ifTrue:[ self class collateImage ]
+        ifFalse:[ self class nonCollateImage ]
 
     "Created: / 31-07-2006 / 15:41:01 / fm"
     "Modified: / 01-08-2006 / 10:02:37 / fm"
+    "Modified: / 10-10-2006 / 17:45:48 / cg"
 !
 
 defaultPrinter
-
-   ^self printers detect:[:each | each printerName = PrinterContext defaultPrinterName]
-                    ifNone:[nil]
+    ^ self printers 
+        detect:[:each | each printerName = PrinterContext defaultPrinterName ]
+        ifNone:[ nil ]
 
     "Created: / 03-08-2006 / 15:26:07 / fm"
+    "Modified: / 10-10-2006 / 17:45:52 / cg"
 !
 
-defaultPrinterIndex                                
-
-^self printers value indexOf: self defaultPrinter
+defaultPrinterIndex
+    ^ self printers value indexOf:self defaultPrinter
 
     "Created: / 03-08-2006 / 15:20:04 / fm"
+    "Modified: / 10-10-2006 / 17:45:55 / cg"
 !
 
 orientationImage
-
-^self isPortraitSelected
-    ifTrue:[self class portraitImage]
-    ifFalse:[self class landscapeImage]
+    ^ self isPortraitSelected 
+        ifTrue:[ self class portraitImage ]
+        ifFalse:[ self class landscapeImage ]
 
     "Modified: / 28-07-2006 / 14:51:45 / fm"
+    "Modified: / 10-10-2006 / 17:45:58 / cg"
 !
 
 orientationSymbol
-
-^self class orientationAt: self selectedPrinter orientation
+    ^ self class orientationAt:self selectedPrinter orientation
 
     "Created: / 01-08-2006 / 12:07:33 / fm"
+    "Modified: / 10-10-2006 / 17:46:01 / cg"
 !
 
 paperSizeNameFromSelectedPrinter
-
-self isSelectedPrinterAvailable ifFalse:[^nil].
-^self selectedPrinter paperSizeName
+    self isSelectedPrinterAvailable ifFalse:[
+        ^ nil
+    ].
+    ^ self selectedPrinter paperSizeName
 
     "Created: / 31-07-2006 / 16:21:17 / fm"
+    "Modified: / 10-10-2006 / 17:46:04 / cg"
 !
 
 paperSizeNames
-
-^AbstractOperatingSystem::PrinterInfo paperSizeNames
+    ^ AbstractOperatingSystem::PrinterInfo paperSizeNames
 
     "Created: / 31-07-2006 / 15:43:13 / fm"
+    "Modified: / 10-10-2006 / 17:46:07 / cg"
 !
 
 printerUserFriendlyNames
-
-^self printers collect:[:each | each userFriendlyName]
+    ^ self printers collect:[:each | each userFriendlyName ]
 
     "Created: / 28-07-2006 / 12:20:07 / fm"
     "Modified: / 03-08-2006 / 12:50:03 / fm"
+    "Modified: / 10-10-2006 / 17:46:10 / cg"
 !
 
 printers
-
-printers isEmptyOrNil ifTrue:[printers := OperatingSystem getPrinters].
-^printers
+    printers isEmptyOrNil ifTrue:[
+        printers := OperatingSystem getPrinters
+    ].
+    ^ printers
 
     "Created: / 28-07-2006 / 12:01:52 / fm"
     "Modified: / 31-07-2006 / 16:22:39 / fm"
+    "Modified: / 10-10-2006 / 17:46:13 / cg"
 !
 
 selectedPrinter
-
-self hasSelectedPrinter ifFalse:[^nil].
-^self printers at: self selectedPrinterHolder value 
-               ifAbsent:[nil]
+    self hasSelectedPrinter ifFalse:[
+        ^ nil
+    ].
+    ^ self printers at:self selectedPrinterHolder value ifAbsent:[ nil ]
 
     "Created: / 28-07-2006 / 11:35:38 / fm"
+    "Modified: / 10-10-2006 / 17:46:16 / cg"
 ! !
 
 !PrintingDialog methodsFor:'aspects'!
 
 collateActionEnabledHolder
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-    "*** (and replace this comment by something more useful ;-)"
-
     collateActionEnabledHolder isNil ifTrue:[
         collateActionEnabledHolder := false asValue.
- ].
+    ].
     ^ collateActionEnabledHolder.
 
     "Created: / 01-08-2006 / 09:31:24 / fm"
+    "Modified: / 10-10-2006 / 17:46:29 / cg"
 !
 
 collateHolder
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-    "*** (and replace this comment by something more useful ;-)"
-
     collateHolder isNil ifTrue:[
         collateHolder := false asValue.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/       collateHolder addDependent:self.
         collateHolder onChangeSend:#collateHolderChanged to:self.
     ].
     ^ collateHolder.
 
     "Created: / 31-07-2006 / 15:39:48 / fm"
     "Modified: / 01-08-2006 / 09:54:25 / fm"
+    "Modified: / 10-10-2006 / 17:46:35 / cg"
 !
 
 numberOfCopiesHolder
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-    "*** (and replace this comment by something more useful ;-)"
-
     numberOfCopiesHolder isNil ifTrue:[
         numberOfCopiesHolder := 0 asValue.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/       numberOfCopiesHolder addDependent:self.
         numberOfCopiesHolder onChangeSend:#numberOfCopiesHolderChanged to:self.
     ].
     ^ numberOfCopiesHolder.
 
     "Created: / 28-07-2006 / 11:21:51 / fm"
     "Modified: / 01-08-2006 / 12:19:25 / fm"
+    "Modified: / 10-10-2006 / 17:46:40 / cg"
 !
 
 numberOfCopiesTextEnabledHolder
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-    "*** (and replace this comment by something more useful ;-)"
-
     numberOfCopiesTextEnabledHolder isNil ifTrue:[
         numberOfCopiesTextEnabledHolder := false asValue.
- ].
+    ].
     ^ numberOfCopiesTextEnabledHolder.
 
     "Created: / 31-07-2006 / 13:11:45 / fm"
+    "Modified: / 10-10-2006 / 17:46:46 / cg"
 !
 
 okButtonEnabledHolder
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-    "*** (and replace this comment by something more useful ;-)"
-
     okButtonEnabledHolder isNil ifTrue:[
         okButtonEnabledHolder := false asValue.
- ].
+    ].
     ^ okButtonEnabledHolder.
 
     "Created: / 31-07-2006 / 13:12:41 / fm"
+    "Modified: / 10-10-2006 / 17:46:52 / cg"
 !
 
 orientationRadioButtonEnabledHolder
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-    "*** (and replace this comment by something more useful ;-)"
-
     orientationRadioButtonEnabledHolder isNil ifTrue:[
         orientationRadioButtonEnabledHolder := false asValue.
- ].
+    ].
     ^ orientationRadioButtonEnabledHolder.
 
     "Created: / 31-07-2006 / 13:12:25 / fm"
+    "Modified: / 10-10-2006 / 17:46:58 / cg"
 !
 
 paperSizeEnabledHolder
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-    "*** (and replace this comment by something more useful ;-)"
-
     paperSizeEnabledHolder isNil ifTrue:[
         paperSizeEnabledHolder := false asValue.
- ].
+    ].
     ^ paperSizeEnabledHolder.
 
     "Created: / 01-08-2006 / 09:39:53 / fm"
+    "Modified: / 10-10-2006 / 17:47:03 / cg"
 !
 
 paperSizeListHolder
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-    "*** (and replace this comment by something more useful ;-)"
-
     paperSizeListHolder isNil ifTrue:[
         paperSizeListHolder := List new asValue.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/       printerListHolder addDependent:self.
-"/       printerListHolder onChangeSend:#printerListHolderChanged to:self.
     ].
     ^ paperSizeListHolder.
 
     "Created: / 31-07-2006 / 15:29:40 / fm"
+    "Modified: / 10-10-2006 / 17:47:10 / cg"
 !
 
 printerListHolder
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-    "*** (and replace this comment by something more useful ;-)"
-
     printerListHolder isNil ifTrue:[
         printerListHolder := ValueHolder new.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/       printerListHolder addDependent:self.
-"/       printerListHolder onChangeSend:#printerListHolderChanged to:self.
     ].
     ^ printerListHolder.
 
     "Created: / 28-07-2006 / 11:21:51 / fm"
     "Modified: / 31-07-2006 / 15:54:31 / fm"
+    "Modified: / 10-10-2006 / 17:47:16 / cg"
 !
 
 selectedOrientationHolder
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-    "*** (and replace this comment by something more useful ;-)"
-
     selectedOrientationHolder isNil ifTrue:[
         selectedOrientationHolder := #portrait asValue.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/       selectedOrientationHolder addDependent:self.
-       selectedOrientationHolder onChangeSend:#selectedOrientationHolderChanged to:self.
+        selectedOrientationHolder onChangeSend:#selectedOrientationHolderChanged
+            to:self.
     ].
     ^ selectedOrientationHolder.
 
     "Created: / 28-07-2006 / 11:21:51 / fm"
     "Modified: / 28-07-2006 / 14:19:02 / fm"
+    "Modified: / 10-10-2006 / 17:47:25 / cg"
 !
 
 selectedPaperSizeHolder
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-    "*** (and replace this comment by something more useful ;-)"
-
     selectedPaperSizeHolder isNil ifTrue:[
         selectedPaperSizeHolder := ValueHolder new.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/       selectedPaperSizeHolder addDependent:self.
         selectedPaperSizeHolder onChangeSend:#selectedPaperSizeHolderChanged to:self.
     ].
     ^ selectedPaperSizeHolder.
 
     "Created: / 31-07-2006 / 15:39:26 / fm"
     "Modified: / 01-08-2006 / 09:26:53 / fm"
+    "Modified: / 10-10-2006 / 17:47:29 / cg"
 !
 
 selectedPrinterHolder
-    "automatically generated by UIPainter ..."
-
-    "*** the code below creates a default model when invoked."
-    "*** (which may not be the one you wanted)"
-    "*** Please change as required and accept it in the browser."
-    "*** (and replace this comment by something more useful ;-)"
-
     selectedPrinterHolder isNil ifTrue:[
         selectedPrinterHolder := ValueHolder new.
-"/ if your app needs to be notified of changes, uncomment one of the lines below:
-"/       selectedPrinterHolder addDependent:self.
-"/       selectedPrinterHolder onChangeSend:#selectedPrinterHolderChanged to:self.
     ].
     ^ selectedPrinterHolder.
 
     "Created: / 28-07-2006 / 11:21:51 / fm"
+    "Modified: / 10-10-2006 / 17:47:34 / cg"
 !
 
-setupActionEnabledHolder                                 
-
+setupActionEnabledHolder
     setupActionEnabledHolder isNil ifTrue:[
-        setupActionEnabledHolder := false asValue. 
+        setupActionEnabledHolder := false asValue.
     ].
     ^ setupActionEnabledHolder.
 
     "Created: / 28-07-2006 / 12:14:48 / fm"
+    "Modified: / 10-10-2006 / 17:47:38 / cg"
 ! !
 
 !PrintingDialog methodsFor:'initialization & release'!
 
-collateImagePostBuild: aLabel
-
-collateImageLabel := aLabel
+collateImagePostBuild:aLabel 
+    collateImageLabel := aLabel
 
     "Created: / 31-07-2006 / 15:26:22 / fm"
+    "Modified: / 10-10-2006 / 17:47:44 / cg"
 !
 
-commentLabelPostBuild: aLabel
-
-commentLabel := aLabel
+commentLabelPostBuild:aLabel 
+    commentLabel := aLabel
 
     "Created: / 01-08-2006 / 15:04:09 / fm"
+    "Modified: / 10-10-2006 / 17:47:47 / cg"
 !
 
-driverNameLabelPostBuild: aLabel
-
-driverNameLabel := aLabel
+driverNameLabelPostBuild:aLabel 
+    driverNameLabel := aLabel
 
     "Created: / 01-08-2006 / 15:04:27 / fm"
+    "Modified: / 10-10-2006 / 17:47:50 / cg"
 !
 
-locationLabelPostBuild: aLabel
-
-locationLabel := aLabel
+locationLabelPostBuild:aLabel 
+    locationLabel := aLabel
 
     "Created: / 01-08-2006 / 15:04:18 / fm"
+    "Modified: / 10-10-2006 / 17:47:53 / cg"
 !
 
-orientationImagePostBuild: aLabel
-
-orientationImageLabel := aLabel
+orientationImagePostBuild:aLabel 
+    orientationImageLabel := aLabel
 
     "Created: / 28-07-2006 / 14:24:51 / fm"
+    "Modified: / 10-10-2006 / 17:47:56 / cg"
 !
 
-postBuildWith:aBuilder
-
-super postBuildWith:aBuilder.
-self updatePrintersList.
-self updatePaperSizeList.
-self clearProperties.
-self selectDefaultPrinter.
+postBuildWith:aBuilder 
+    super postBuildWith:aBuilder.
+    self updatePrintersList.
+    self updatePaperSizeList.
+    self clearProperties.
+    self selectDefaultPrinter.
 
     "Created: / 02-08-2006 / 16:41:26 / fm"
     "Modified: / 03-08-2006 / 15:28:56 / fm"
+    "Modified: / 10-10-2006 / 17:47:59 / cg"
 !
 
 selectDefaultPrinter
-
-self selectedPrinterHolder value: self defaultPrinterIndex.
-self printerSelectionChanged.
+    self selectedPrinterHolder value:self defaultPrinterIndex.
+    self printerSelectionChanged.
 
     "Modified: / 03-08-2006 / 15:29:35 / fm"
+    "Modified: / 10-10-2006 / 17:48:02 / cg"
 !
 
-statusLabelPostBuild: aLabel
-
-statusLabel := aLabel
+statusLabelPostBuild:aLabel 
+    statusLabel := aLabel
 
     "Created: / 01-08-2006 / 13:43:32 / fm"
+    "Modified: / 10-10-2006 / 17:48:04 / cg"
 ! !
 
 !PrintingDialog methodsFor:'queries'!
 
 collateActionEnabled
-
-^self isSelectedPrinterAvailable and:[self numberOfCopiesHolder value > 1]
+    ^ self isSelectedPrinterAvailable and:[ self numberOfCopiesHolder value > 1 ]
 
     "Created: / 01-08-2006 / 09:32:48 / fm"
+    "Modified: / 10-10-2006 / 17:48:10 / cg"
 !
 
 hasSelectedPrinter
-
-    ^self selectedPrinterHolder value notNil
+    ^ self selectedPrinterHolder value notNil
 
     "Modified: / 28-07-2006 / 11:34:10 / fm"
+    "Modified: / 10-10-2006 / 17:48:13 / cg"
 !
 
 isPortraitSelected
-
-^self selectedOrientationHolder value = #portrait
+    ^ self selectedOrientationHolder value = #portrait
 
     "Created: / 28-07-2006 / 14:48:59 / fm"
+    "Modified: / 10-10-2006 / 17:48:16 / cg"
 !
 
 isSelectedPaperSize
-
-^self selectedPaperSizeHolder value notEmptyOrNil and:[(self selectedPaperSizeHolder value = self unknownPaperSizeNameDescription) not]
+    ^ self selectedPaperSizeHolder value notEmptyOrNil 
+      and:[ (self selectedPaperSizeHolder value ~= self unknownPaperSizeNameDescription)]
 
     "Created: / 31-07-2006 / 16:05:59 / fm"
     "Modified: / 01-08-2006 / 12:18:56 / fm"
+    "Modified: / 10-10-2006 / 17:48:48 / cg"
 !
 
 isSelectedPrinterAvailable
-
-^self hasSelectedPrinter and:[self selectedPrinter isAvailable]
+    ^ self hasSelectedPrinter and:[ self selectedPrinter isAvailable ]
 
     "Created: / 31-07-2006 / 13:08:18 / fm"
+    "Modified: / 10-10-2006 / 17:48:52 / cg"
 !
 
 numberOfCopiesTextEnabled
-
-^self isSelectedPrinterAvailable
+    ^ self isSelectedPrinterAvailable
 
     "Created: / 31-07-2006 / 13:17:55 / fm"
+    "Modified: / 10-10-2006 / 17:48:54 / cg"
 !
 
 okButtonEnabled
-
-^self isSelectedPrinterAvailable
+    ^ self isSelectedPrinterAvailable
 
     "Created: / 31-07-2006 / 13:17:37 / fm"
+    "Modified: / 10-10-2006 / 17:49:22 / cg"
 !
 
 orientationRadioButtonEnabled
-
-^self isSelectedPrinterAvailable
+    ^ self isSelectedPrinterAvailable
 
     "Created: / 31-07-2006 / 13:17:45 / fm"
+    "Modified: / 10-10-2006 / 17:49:31 / cg"
 !
 
 paperSizeEnabled
-
-^self isSelectedPrinterAvailable
+    ^ self isSelectedPrinterAvailable
 
     "Created: / 01-08-2006 / 09:39:30 / fm"
+    "Modified: / 10-10-2006 / 17:49:35 / cg"
 !
 
-setupActionEnabled 
-
-^self isSelectedPrinterAvailable
+setupActionEnabled
+    ^ self isSelectedPrinterAvailable
 
     "Created: / 28-07-2006 / 12:16:56 / fm"
     "Modified: / 31-07-2006 / 13:17:19 / fm"
+    "Modified: / 10-10-2006 / 17:49:39 / cg"
 ! !
 
 !PrintingDialog methodsFor:'settings'!
 
 addOrRecoverPrinterSettings
-|settings currentPrinter |
-currentPrinter := self selectedPrinter.
-settings := self class printersSettingsAt: currentPrinter printerName.
-settings notNil 
-    ifTrue:[
-        currentPrinter orientation: settings orientation.
-        currentPrinter paperSize: settings paperSize.
+    |settings currentPrinter|
+
+    currentPrinter := self selectedPrinter.
+    settings := self class printersSettingsAt:currentPrinter printerName.
+    settings notNil ifTrue:[
+        currentPrinter orientation:settings orientation.
+        currentPrinter paperSize:settings paperSize.
     ].
-^self updatePrinterInPrintersSettings
+    ^ self updatePrinterInPrintersSettings
 
     "Created: / 04-08-2006 / 13:57:36 / fm"
+    "Modified: / 10-10-2006 / 17:49:43 / cg"
 !
 
 updatePrinterInPrintersSettings
-
-self class printersSettingsAt: self selectedPrinter printerName 
-                    put: self selectedPrinter.
+    self class printersSettingsAt:self selectedPrinter printerName
+        put:self selectedPrinter.
 
     "Created: / 04-08-2006 / 13:58:21 / fm"
+    "Modified: / 10-10-2006 / 17:49:46 / cg"
 ! !
 
 !PrintingDialog methodsFor:'unknownPaperSize'!
 
 addUnknownPaperSize
-
-self paperSizeListHolder value add: self unknownPaperSizeNameDescription
+    self paperSizeListHolder value add:self unknownPaperSizeNameDescription
 
     "Created: / 31-07-2006 / 16:24:18 / fm"
+    "Modified: / 10-10-2006 / 17:49:54 / cg"
 !
 
 removeUnknownPaperSize
-
-self paperSizeListHolder value remove: self unknownPaperSizeNameDescription 
-                         ifAbsent:[nil]
+    self paperSizeListHolder value 
+        remove:self unknownPaperSizeNameDescription
+        ifAbsent:[ nil ]
 
     "Created: / 31-07-2006 / 15:50:01 / fm"
+    "Modified: / 10-10-2006 / 17:49:57 / cg"
 !
 
 unknownPaperSizeNameDescription
-
-^'Unknown - Size defined in Printer settings'.
+    ^ 'Unknown - Size defined in Printer settings'.
 
     "Created: / 31-07-2006 / 15:50:18 / fm"
     "Modified: / 01-08-2006 / 11:42:31 / fm"
+    "Modified: / 10-10-2006 / 17:50:00 / cg"
 ! !
 
 !PrintingDialog methodsFor:'update'!
 
 clearProperties
-
-self numberOfCopiesHolder value: 0.
-self selectedPaperSizeHolder value: ''.
-statusLabel label: ''.
-driverNameLabel label: ''.
-locationLabel label: ''.
-commentLabel label: ''.
+    self numberOfCopiesHolder value:0.
+    self selectedPaperSizeHolder value:''.
+    statusLabel label:''.
+    driverNameLabel label:''.
+    locationLabel label:''.
+    commentLabel label:''.
 
     "Created: / 01-08-2006 / 12:17:46 / fm"
     "Modified: / 01-08-2006 / 15:07:19 / fm"
+    "Modified: / 10-10-2006 / 17:50:18 / cg"
 !
 
 updateCollateImage
-
-   collateImageLabel label: self collateImage; 
-                         redraw.
-   collateImageLabel flush
+    collateImageLabel
+        label:self collateImage;
+        redraw.
+    collateImageLabel flush
 
     "Created: / 01-08-2006 / 10:02:12 / fm"
+    "Modified: / 10-10-2006 / 17:50:21 / cg"
 !
 
 updateInfo
-
-statusLabel label: self selectedPrinter status.
-driverNameLabel label: self selectedPrinter pDriverName.
-locationLabel label: self selectedPrinter location.
-commentLabel label: self selectedPrinter comment.
+    statusLabel label:self selectedPrinter status.
+    driverNameLabel label:self selectedPrinter pDriverName.
+    locationLabel label:self selectedPrinter location.
+    commentLabel label:self selectedPrinter comment.
 
     "Created: / 01-08-2006 / 15:05:08 / fm"
+    "Modified: / 10-10-2006 / 17:50:24 / cg"
 !
 
 updateLastUsedPrinterSettings
+    self class lastUsedPrinterSettings:self selectedPrinter.
 
-self class lastUsedPrinterSettings: self selectedPrinter.
+    "Modified: / 10-10-2006 / 17:50:26 / cg"
 !
 
 updateModifiedCollate
-
-self collateHolder value: self selectedPrinter collate.
+    self collateHolder value:self selectedPrinter collate.
 
     "Created: / 01-08-2006 / 11:50:10 / fm"
+    "Modified: / 10-10-2006 / 17:50:28 / cg"
 !
 
 updateModifiedNumberOfCopies
-
-self numberOfCopiesHolder value: self selectedPrinter copies.
+    self numberOfCopiesHolder value:self selectedPrinter copies.
 
     "Created: / 01-08-2006 / 11:48:26 / fm"
+    "Modified: / 10-10-2006 / 17:50:30 / cg"
 !
 
 updateModifiedOrientation
-
-self selectedOrientationHolder value: self orientationSymbol.
+    self selectedOrientationHolder value:self orientationSymbol.
 
     "Created: / 01-08-2006 / 11:46:58 / fm"
+    "Modified: / 10-10-2006 / 17:50:32 / cg"
 !
 
 updateModifiedPageSize
-|sizeName|
-sizeName:= self selectedPrinter paperSizeName.
-sizeName isNil 
-    ifTrue:[self addUnknownPaperSize.
-            sizeName:= self unknownPaperSizeNameDescription]
-    ifFalse:[self removeUnknownPaperSize.].
-self selectedPaperSizeHolder value: sizeName.
+    |sizeName|
+
+    sizeName := self selectedPrinter paperSizeName.
+    sizeName isNil ifTrue:[
+        self addUnknownPaperSize.
+        sizeName := self unknownPaperSizeNameDescription
+    ] ifFalse:[
+        self removeUnknownPaperSize.
+    ].
+    self selectedPaperSizeHolder value:sizeName.
 
     "Created: / 01-08-2006 / 11:47:24 / fm"
+    "Modified: / 10-10-2006 / 17:50:34 / cg"
 !
 
-updateModifiedProperties     
-
-self isSelectedPrinterAvailable ifFalse:[^self clearProperties].
-self updateModifiedOrientation.
-self updateModifiedPageSize.
-self updateModifiedNumberOfCopies.
-self updateModifiedCollate.
-self updateInfo.
+updateModifiedProperties
+    self isSelectedPrinterAvailable ifFalse:[
+        ^ self clearProperties
+    ].
+    self updateModifiedOrientation.
+    self updateModifiedPageSize.
+    self updateModifiedNumberOfCopies.
+    self updateModifiedCollate.
+    self updateInfo.
 
     "Modified: / 01-08-2006 / 15:05:01 / fm"
+    "Modified: / 10-10-2006 / 17:50:36 / cg"
 !
 
 updateOrientationImage
-
-   orientationImageLabel label: self orientationImage; 
-                         redraw.
-   orientationImageLabel flush
+    orientationImageLabel
+        label:self orientationImage;
+        redraw.
+    orientationImageLabel flush
 
     "Created: / 28-07-2006 / 14:38:31 / fm"
+    "Modified: / 10-10-2006 / 17:50:38 / cg"
 !
 
 updatePaperSizeList
-
-self paperSizeListHolder value: self paperSizeNames
+    self paperSizeListHolder value:self paperSizeNames
 
     "Created: / 31-07-2006 / 15:24:20 / fm"
     "Modified: / 31-07-2006 / 16:25:19 / fm"
+    "Modified: / 10-10-2006 / 17:50:40 / cg"
 !
 
 updatePrintersList
-
-self printerListHolder value: self printerUserFriendlyNames
+    self printerListHolder value:self printerUserFriendlyNames
 
     "Created: / 28-07-2006 / 11:56:14 / fm"
+    "Modified: / 10-10-2006 / 17:50:42 / cg"
 !
 
 updateValueHolders
-
-self setupActionEnabledHolder value: self setupActionEnabled.
-self okButtonEnabledHolder value: self okButtonEnabled.
-self orientationRadioButtonEnabledHolder value: self orientationRadioButtonEnabled.
-self numberOfCopiesTextEnabledHolder value: self numberOfCopiesTextEnabled.
-self collateActionEnabledHolder value: self collateActionEnabled.
-self paperSizeEnabledHolder value: self paperSizeEnabled
+    self setupActionEnabledHolder value:self setupActionEnabled.
+    self okButtonEnabledHolder value:self okButtonEnabled.
+    self orientationRadioButtonEnabledHolder value:self orientationRadioButtonEnabled.
+    self numberOfCopiesTextEnabledHolder value:self numberOfCopiesTextEnabled.
+    self collateActionEnabledHolder value:self collateActionEnabled.
+    self paperSizeEnabledHolder value:self paperSizeEnabled
 
     "Created: / 28-07-2006 / 12:16:07 / fm"
     "Modified: / 01-08-2006 / 09:39:22 / fm"
+    "Modified: / 10-10-2006 / 17:50:49 / cg"
 ! !
 
 !PrintingDialog methodsFor:'update properties'!
 
 updateCollate
-
-self isSelectedPrinterAvailable ifFalse:[^self].
-self selectedPrinter collate: self collateHolder value
+    self isSelectedPrinterAvailable ifFalse:[
+        ^ self
+    ].
+    self selectedPrinter collate:self collateHolder value
 
     "Created: / 01-08-2006 / 09:55:30 / fm"
+    "Modified: / 10-10-2006 / 17:51:01 / cg"
 !
 
 updateNumberOfCopies
-
-self isSelectedPrinterAvailable ifFalse:[^self].
-self selectedPrinter copies: self numberOfCopiesHolder value
+    self isSelectedPrinterAvailable ifFalse:[
+        ^ self
+    ].
+    self selectedPrinter copies:self numberOfCopiesHolder value
 
     "Created: / 31-07-2006 / 13:54:16 / fm"
+    "Modified: / 10-10-2006 / 17:51:09 / cg"
 !
 
 updatePaperSize
-
-(self isSelectedPrinterAvailable and:[self isSelectedPaperSize]) ifFalse:[^self].
-self selectedPrinter paperSizeName: self selectedPaperSizeHolder value
+    (self isSelectedPrinterAvailable and:[ self isSelectedPaperSize ]) ifFalse:[
+        ^ self
+    ].
+    self selectedPrinter paperSizeName:self selectedPaperSizeHolder value
 
     "Created: / 31-07-2006 / 16:04:32 / fm"
     "Modified: / 02-08-2006 / 11:43:12 / fm"
+    "Modified: / 10-10-2006 / 17:51:11 / cg"
 !
 
-updatePrinterOrientation 
+updatePrinterOrientation
+    |selectedPrinter|
 
-self isSelectedPrinterAvailable ifFalse:[^self].
-self isPortraitSelected
-    ifTrue:[self selectedPrinter setPortraitOrientation]
-    ifFalse:[self selectedPrinter setLandscapeOrientation]
+    self isSelectedPrinterAvailable ifFalse:[
+        ^ self
+    ].
+    selectedPrinter := self selectedPrinter.
+    self isPortraitSelected ifTrue:[
+        selectedPrinter setPortraitOrientation
+    ] ifFalse:[
+        selectedPrinter setLandscapeOrientation
+    ]
 
     "Created: / 28-07-2006 / 15:47:37 / fm"
     "Modified: / 31-07-2006 / 13:53:32 / fm"
+    "Modified: / 10-10-2006 / 17:52:46 / cg"
 ! !
 
 !PrintingDialog methodsFor:'user actions'!
 
 accept
-
-answer := self selectedPrinter.
-self updateLastUsedPrinterSettings.
-self close
+    answer := self selectedPrinter.
+    self updateLastUsedPrinterSettings.
+    self close
 
     "Created: / 31-07-2006 / 13:52:48 / fm"
     "Modified: / 03-08-2006 / 15:31:17 / fm"
+    "Modified: / 10-10-2006 / 17:53:13 / cg"
 !
 
 collateHolderChanged
-
-self updateCollate.
-self updateCollateImage.
+    self updateCollate.
+    self updateCollateImage.
 
     "Created: / 01-08-2006 / 09:55:10 / fm"
+    "Modified: / 10-10-2006 / 17:53:17 / cg"
 !
 
 numberOfCopiesHolderChanged
-self updateNumberOfCopies.
-self updateValueHolders.
+    self updateNumberOfCopies.
+    self updateValueHolders.
 
     "Created: / 01-08-2006 / 09:37:53 / fm"
     "Modified: / 01-08-2006 / 10:49:39 / fm"
+    "Modified: / 10-10-2006 / 17:53:22 / cg"
 !
 
 openSetup
-
-self selectedPrinter isNil ifTrue:[^self].
-self selectedPrinter openPropertiesDialog 
-    ifTrue:[
-        self updatePrinterInPrintersSettings. 
-        self updateModifiedProperties].
+    self selectedPrinter isNil ifTrue:[
+        ^ self
+    ].
+    self selectedPrinter openPropertiesDialog ifTrue:[
+        self updatePrinterInPrintersSettings.
+        self updateModifiedProperties
+    ].
 
     "Created: / 28-07-2006 / 11:38:22 / fm"
     "Modified: / 04-08-2006 / 14:05:49 / fm"
+    "Modified: / 10-10-2006 / 17:53:27 / cg"
 !
 
 printerSelectionChanged
-
-self addOrRecoverPrinterSettings.
-self updateModifiedProperties.
-self updateValueHolders.
+    self addOrRecoverPrinterSettings.
+    self updateModifiedProperties.
+    self updateValueHolders.
 
     "Created: / 28-07-2006 / 11:32:41 / fm"
     "Modified: / 04-08-2006 / 13:55:06 / fm"
+    "Modified: / 10-10-2006 / 17:53:30 / cg"
 !
 
 selectedOrientationHolderChanged
-
-self updateOrientationImage.
-self updatePrinterOrientation
+    self updateOrientationImage.
+    self updatePrinterOrientation
 
     "Created: / 28-07-2006 / 14:19:25 / fm"
     "Modified: / 28-07-2006 / 15:46:15 / fm"
+    "Modified: / 10-10-2006 / 17:53:36 / cg"
 !
 
 selectedPaperSizeHolderChanged
-
-self updatePaperSize.
-self removeUnknownPaperSize
+    self updatePaperSize.
+    self removeUnknownPaperSize
 
     "Created: / 01-08-2006 / 09:27:24 / fm"
+    "Modified: / 10-10-2006 / 17:53:38 / cg"
 ! !
 
 !PrintingDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/PrintingDialog.st,v 1.4 2006-08-25 10:52:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/PrintingDialog.st,v 1.5 2006-10-10 15:55:36 cg Exp $'
 ! !