Launcher.st
changeset 595 5b51eac88d92
parent 594 01aba783dbc8
child 596 ad53df643d7e
--- a/Launcher.st	Fri May 31 13:21:59 1996 +0200
+++ b/Launcher.st	Fri May 31 22:10:44 1996 +0200
@@ -958,7 +958,7 @@
     box yPosition:y.
     component := box addInputFieldOn:sizeX tabable:true.
     component width:0.25; left:0.3; 
-              immediateAccept:true; acceptOnLeave:false; 
+              immediateAccept:false; acceptOnLeave:false; 
               cursorMovementWhenUpdating:#beginOfLine;
               converter:(PrintConverter new initForInteger).
 
@@ -969,7 +969,7 @@
     box yPosition:y.
     component := box addInputFieldOn:sizeY tabable:true.
     component width:0.25; left:0.65; 
-              immediateAccept:true; acceptOnLeave:false; 
+              immediateAccept:false; acceptOnLeave:false; 
               cursorMovementWhenUpdating:#beginOfLine;
               converter:(PrintConverter new initForInteger).
 
@@ -1009,7 +1009,7 @@
     ].
     box destroy
 
-    "Modified: 31.5.1996 / 13:14:26 / cg"
+    "Modified: 31.5.1996 / 21:00:58 / cg"
 !
 
 fontSettings
@@ -1507,8 +1507,9 @@
 
 printerSettings
     |box 
-     possiblePrinters possibleTypes printerType printCommand printerList
-     check y component oldIndent commandList|
+     possiblePrinters possibleTypes printerType printCommand 
+     possiblePageFormats pageFormat landscape format
+     check y y1 component oldIndent commandList row|
 
     possiblePrinters := PrinterStream withAllSubclasses asArray.
     possibleTypes := possiblePrinters collect:[:cls | cls printerTypeName].
@@ -1517,10 +1518,14 @@
     printerType selectionIndex:(possiblePrinters identityIndexOf:Printer).
     printCommand := Printer printCommand asValue.
 
+    pageFormat := SelectionInList new list:(PrinterStream defaultPageFormats).
+    pageFormat selection:(PrinterStream pageFormat).
+    landscape := PrinterStream landscape asValue.
+
     box := DialogBox new.
     box label:(resources string:'Printer settings').
 
-    printerList := box addPopUpList:(resources string:'printer type:') on:printerType.
+    box addPopUpList:(resources string:'printer type:') on:printerType.
 
     y := box yPosition.
     component := box addTextLabel:(resources string:'print command:').
@@ -1546,17 +1551,55 @@
 
     component list:commandList.
     box addVerticalSpace.
-
+    box addHorizontalLine.
+    box addVerticalSpace.
+
+    row := OrderedCollection new.
+    row add:(Label label:(resources string:'page format:')).
+    row add:(PopUpList on:pageFormat).
+    row add:(Label label:(resources string:'landscape:')).
+    row add:(CheckToggle on:landscape).
+
+    y := box yPosition.
+    box
+        addRow:(1 to:2)
+        fromX:0
+        toX:0.5
+        collect:[:idx | row at:idx]
+        tabable:false
+        horizontalLayout:#leftSpace
+        verticalLayout:#center.
+    y1 := box yPosition.
+    box yPosition:y.
+
+    box
+        addRow:(3 to:4)
+        fromX:0.5
+        toX:1.0
+        collect:[:idx | row at:idx]
+        tabable:false
+        horizontalLayout:#leftSpace
+        verticalLayout:#center.
+
+    box yPosition:(box yPosition max:y1).
+
+    box makeTabable:(row at:2).
+    box makeTabable:(row at:4).
+
+    box addVerticalSpace.
     box addAbortButton; addOkButton.
     box open.
 
     box accepted ifTrue:[
         Printer printCommand:printCommand value.
         Printer := possiblePrinters at:(printerType selectionIndex).
+
+        Printer pageFormat:(pageFormat selection).
+        Printer landscape:(landscape value).
     ].
     box destroy
 
-    "Modified: 29.5.1996 / 14:15:46 / cg"
+    "Modified: 31.5.1996 / 20:59:34 / cg"
 !
 
 viewStyleSetting 
@@ -2755,5 +2798,5 @@
 !NewLauncher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.136 1996-05-31 11:21:59 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.137 1996-05-31 20:10:44 cg Exp $'
 ! !