hg/stx-libtool: comparison AbstractLauncherApplication.st

equal deleted inserted replaced

-:bb2070a26bd2
+:f8c010698b75
 component adjust:#left.
 box addInputFieldOn:valueHolder tabable:true.
 box addVerticalSpace:10.
 box addHelpButtonFor:'programming/language.html#RESOURCEDEFS'.
-box addAbortButton; addOkButton.
+box addAbortAndOkButtons.
 box showAtPointer.
 box destroy.
 box accepted ifTrue:[
 box leftIndent:oldIndent.
 box yPosition:(yMax max: box yPosition).
 box
 addHelpButtonFor:'Launcher/compilerSettings.html';
-addAbortButton;
+addAbortAndOkButtons.
-addOkButton.
 warnEnabler value.
 box open.
 box accepted ifTrue:[
 resources := requestor class classResources.
 listOfSizes := resources at:'LIST_OF_OFFERED_SCREEN_SIZES' default:#default.
 listOfSizes == #default ifTrue:[
-	"/ nothing in resource file; offer at least some.
+"/ nothing in resource file; offer at least some.
-	sizeInfos := #(
+sizeInfos := #(
-			   ( '11.3'' (235mm x 175mm) LCD'   (235 175)    )
+( '11.3'' (235mm x 175mm) LCD'   (235 175)    )
-			   ( '17''   (325mm x 245mm)'       (325 245)    )
+( '17''   (325mm x 245mm)'       (325 245)    )
-			   ( '19''   (340mm x 270mm)'       (340 270)    )
+( '19''   (340mm x 270mm)'       (340 270)    )
-			   ( '20''   (350mm x 280mm)'       (350 280)    )
+( '20''   (350mm x 280mm)'       (350 280)    )
-			   ( '21''   (365mm x 285mm)'       (365 285)    )
+( '21''   (365mm x 285mm)'       (365 285)    )
-		       ).
+).
 ] ifFalse:[
-	sizeInfos := resources array:listOfSizes.
+sizeInfos := resources array:listOfSizes.
 ].
 sizeNames := sizeInfos collect:[:entry | entry at:1].
 sizes := sizeInfos collect:[:entry | entry at:2].
 screen := Screen current.
 clipEncodingList selectionIndex:(clipEncodingSyms indexOf:screen clipBoardEncoding ifAbsent:1).
 ditherList := SelectionInList new.
 (visual == #StaticGray or:[visual == #GrayScale]) ifTrue:[
-	ditherStyles := #('threshold' 'ordered dither' 'error diffusion').
+ditherStyles := #('threshold' 'ordered dither' 'error diffusion').
-	ditherSyms := #(threshold ordered floydSteinberg).
+ditherSyms := #(threshold ordered floydSteinberg).
 ] ifFalse:[
-	visual ~~ #TrueColor ifTrue:[
+visual ~~ #TrueColor ifTrue:[
-	    ditherStyles := #('nearest color' 'error diffusion').
+ditherStyles := #('nearest color' 'error diffusion').
-	    ditherSyms := #(ordered floydSteinberg).
+ditherSyms := #(ordered floydSteinberg).
-	]
+]
 ].
 ditherSyms notNil ifTrue:[
-	ditherList list:ditherStyles.
+ditherList list:ditherStyles.
-	ditherList selectionIndex:(ditherSyms indexOf:(Image ditherAlgorithm) ifAbsent:#threshold).
+ditherList selectionIndex:(ditherSyms indexOf:(Image ditherAlgorithm) ifAbsent:#threshold).
 ].
 box := DialogBox new.
 box label:(resources string:'Display screen settings').
 (box addTextLabel:(resources string:'Actual visible screen area:'))
-	adjust:#left.
+adjust:#left.
 (box addPopUpList:(resources string:'common sizes:') on:sizeList)
-	label:'monitor size'.
+label:'monitor size'.
 idx := sizes findFirst:[:entry |
-				((entry at:1) = sizeX value)
+((entry at:1) = sizeX value)
-				and:[((entry at:2) = sizeY value)]
+and:[((entry at:2) = sizeY value)]
-			   ].
+].
 idx ~~ 0 ifTrue:[
-	sizeList selectionIndex:idx
+sizeList selectionIndex:idx
 ].
 sizeList onChangeSend:#value to:[
-					|idx|
+|idx|
-					idx := sizeList selectionIndex.
+idx := sizeList selectionIndex.
-					sizeX value:((sizes at:idx) at:1).
+sizeX value:((sizes at:idx) at:1).
-					sizeY value:((sizes at:idx) at:2).
+sizeY value:((sizes at:idx) at:2).
-				    ].
+].
 y := box yPosition.
 component := box addTextLabel:(resources string:'screen size:').
 component width:0.3; adjust:#right; borderWidth:0.
 box yPosition:y.
 component := box addInputFieldOn:nil tabable:true.
 component width:0.25; left:0.3;
-	      immediateAccept:false; acceptOnLeave:false;
+immediateAccept:false; acceptOnLeave:false;
-	      cursorMovementWhenUpdating:#beginOfLine;
+cursorMovementWhenUpdating:#beginOfLine;
-	      converter:(PrintConverter new initForInteger);
+converter:(PrintConverter new initForInteger);
-	      model:sizeX.
+model:sizeX.
 box yPosition:y.
 component := box addTextLabel:(' x ').
 component width:0.1; left:0.55; adjust:#center; borderWidth:0.
 box yPosition:y.
 component := box addInputFieldOn:nil tabable:true.
 component width:0.25; left:0.65;
-	      immediateAccept:false; acceptOnLeave:false;
+immediateAccept:false; acceptOnLeave:false;
-	      cursorMovementWhenUpdating:#beginOfLine;
+cursorMovementWhenUpdating:#beginOfLine;
-	      converter:(PrintConverter new initForInteger);
+converter:(PrintConverter new initForInteger);
-	      model:sizeY.
+model:sizeY.
 box yPosition:y.
 component := box addTextLabel:('(mm)').
 component width:0.1; left:0.9; adjust:#center; borderWidth:0.
 box addVerticalSpace; addHorizontalLine; addVerticalSpace.
 (box addTextLabel:(resources string:'Screen: depth: %1 visual: %2  (%3)'
-				 with:Screen current depth printString
+with:Screen current depth printString
-				 with:Screen current visualType
+with:Screen current visualType
-				 with:Screen current serverVendor))
+with:Screen current serverVendor))
-	adjust:#left.
+adjust:#left.
 box addVerticalSpace; addHorizontalLine; addVerticalSpace.
 box addCheckBox:(resources string:'color monitor') on:isColorMonitor.
 visual == #PseudoColor ifTrue:[
-	box addVerticalSpace.
+box addVerticalSpace.
-	component := box addCheckBox:(resources string:'use fix color palette %1' with:'(4x8x4)') on:useFixPalette.
+component := box addCheckBox:(resources string:'use fix color palette %1' with:'(4x8x4)') on:useFixPalette.
-	box addVerticalSpace.
+box addVerticalSpace.
-	component := box addCheckBox:(resources string:'use fix gray color palette %1' with:'(32)') on:useFixGrayPalette.
+component := box addCheckBox:(resources string:'use fix gray color palette %1' with:'(32)') on:useFixGrayPalette.
 ].
 ditherSyms notNil ifTrue:[
-	box addVerticalSpace.
+box addVerticalSpace.
-	component := box addPopUpList:(resources string:'image display:') on:ditherList.
+component := box addPopUpList:(resources string:'image display:') on:ditherList.
-	component defaultLabel:'image display'.
+component defaultLabel:'image display'.
-	component superView horizontalLayout:#leftSpace.
+component superView horizontalLayout:#leftSpace.
 ].
 box addVerticalSpace.
 box addCheckBox:(resources string:'allow colored/grayscale icons') on:deepIcons.
 component := box addPopUpList:(resources string:'clipBoard encoding:') on:clipEncodingList.
 component superView horizontalLayout:#leftSpace.
 box
-	addHelpButtonFor:'Launcher/screenSettings.html';
+addHelpButtonFor:'Launcher/screenSettings.html';
-	addAbortButton; addOkButton.
+addAbortAndOkButtons.
 box open.
 box accepted ifTrue:[
-	Image flushDeviceImages.
+Image flushDeviceImages.
-	screen visualType == #PseudoColor ifTrue:[
+screen visualType == #PseudoColor ifTrue:[
-	    useFixPalette value ifTrue:[
+useFixPalette value ifTrue:[
-		Color colorAllocationFailSignal handle:[:ex |
+Color colorAllocationFailSignal handle:[:ex |
-		    self warn:(resources string:'Could not allocate colors.').
+self warn:(resources string:'Could not allocate colors.').
-		] do:[
+] do:[
-		    Color getColorsRed:4 green:8 blue:4 on:screen
+Color getColorsRed:4 green:8 blue:4 on:screen
-		]
+]
-	    ] ifFalse:[
+] ifFalse:[
-		screen releaseFixColors
+screen releaseFixColors
-	    ].
+].
-	    useFixGrayPalette value ifTrue:[
+useFixGrayPalette value ifTrue:[
-		Color colorAllocationFailSignal handle:[:ex |
+Color colorAllocationFailSignal handle:[:ex |
-		    self warn:(resources string:'Could not allocate colors.').
+self warn:(resources string:'Could not allocate colors.').
-		] do:[
+] do:[
-		    Color getGrayColors:32 on:screen
+Color getGrayColors:32 on:screen
-		]
+]
-	    ] ifFalse:[
+] ifFalse:[
-		screen releaseFixGrayColors
+screen releaseFixGrayColors
-	    ]
+]
-	].
+].
-	screen hasColors:isColorMonitor value.
+screen hasColors:isColorMonitor value.
-	screen widthInMillimeter:sizeX value.
+screen widthInMillimeter:sizeX value.
-	screen heightInMillimeter:sizeY value.
+screen heightInMillimeter:sizeY value.
-	screen supportsDeepIcons:deepIcons value.
+screen supportsDeepIcons:deepIcons value.
-	ditherSyms notNil ifTrue:[
+ditherSyms notNil ifTrue:[
-	    Image ditherAlgorithm:(ditherSyms at:ditherList selectionIndex).
+Image ditherAlgorithm:(ditherSyms at:ditherList selectionIndex).
-	].
+].
-	requestor withWaitCursorDo:[
+requestor withWaitCursorDo:[
-	    View defaultStyle:(View defaultStyle).
+View defaultStyle:(View defaultStyle).
-	].
+].
-	screen clipBoardEncoding:(clipEncodingSyms at:clipEncodingList selectionIndex).
+screen clipBoardEncoding:(clipEncodingSyms at:clipEncodingList selectionIndex).
 ].
 box destroy
 "Modified: 9.9.1996 / 22:43:04 / stefan"
 "Modified: 21.7.1997 / 19:26:49 / cg"
 box addHorizontalLine.
 box
 addHelpButtonFor:'Launcher/editSettings.html';
-addAbortButton;
+addAbortAndOkButtons.
-addOkButton.
 "/
 "/ show the box ...
 "/
 box open.
 ]).
 "/ box addHorizontalLine.
 "/    box addHelpButtonFor:'Launcher/javaSettings.html'.
-box addAbortButton; addOkButton.
+box addAbortAndOkButtons.
 box open.
 box accepted ifTrue:[
 JavaMethod forceByteCodeDisplay:showJavaByteCode value.
 JavaVM audioEnabled:audio value.
 You have been warned.') adjust:#left.
 box addHorizontalLine.
 component := box
-		    addLabelledInputField:(resources string:'size of newSpace:')
+addLabelledInputField:(resources string:'size of newSpace:')
-		    adjust:#right
+adjust:#right
-		    on:nil "/ newSpaceSize
+on:nil "/ newSpaceSize
-		    tabable:true
+tabable:true
-		    separateAtX:0.7.
+separateAtX:0.7.
 component acceptOnLeave:false.
 component converter:(PrintConverter new initForNumber).
 component model:newSpaceSize.
 fields add:component.
 box addHorizontalLine.
 component := box
-		    addLabelledInputField:(resources string:'incremental GC allocation trigger:')
+addLabelledInputField:(resources string:'incremental GC allocation trigger:')
-		    adjust:#right
+adjust:#right
-		    on:nil "/ igcLimit
+on:nil "/ igcLimit
-		    tabable:true
+tabable:true
-		    separateAtX:0.7.
+separateAtX:0.7.
 component acceptOnLeave:false.
 component converter:(PrintConverter new initForNumber).
 component model:igcLimit.
 fields add:component.
 box addTextLabel:'(start IGC whenever this amount has been allocated)'.
 box addHorizontalLine.
 component := box
-		    addLabelledInputField:(resources string:'incremental GC freespace trigger:')
+addLabelledInputField:(resources string:'incremental GC freespace trigger:')
-		    adjust:#right
+adjust:#right
-		    on:nil "/ igcFreeLimit
+on:nil "/ igcFreeLimit
-		    tabable:true
+tabable:true
-		    separateAtX:0.7.
+separateAtX:0.7.
 component acceptOnLeave:false.
 component converter:(PrintConverter new initForNumber).
 component model:igcFreeLimit.
 fields add:component.
 box addTextLabel:'(start IGC whenever freespace drops below this)'.
 box addHorizontalLine.
 component := box
-		    addLabelledInputField:(resources string:'incremental GC amount:')
+addLabelledInputField:(resources string:'incremental GC amount:')
-		    adjust:#right
+adjust:#right
-		    on:nil "/ igcFreeAmount
+on:nil "/ igcFreeAmount
-		    tabable:true
+tabable:true
-		    separateAtX:0.7.
+separateAtX:0.7.
 component acceptOnLeave:false.
 component converter:(PrintConverter new initForNumber).
 component model:igcFreeAmount.
 fields add:component.
 box addTextLabel:'(try to keep this amount for peak requests)'.
 box addHorizontalLine.
 component := box
-		    addLabelledInputField:(resources string:'oldspace increment:')
+addLabelledInputField:(resources string:'oldspace increment:')
-		    adjust:#right
+adjust:#right
-		    on:nil "/ oldIncr
+on:nil "/ oldIncr
-		    tabable:true
+tabable:true
-		    separateAtX:0.7.
+separateAtX:0.7.
 component acceptOnLeave:false.
 component converter:(PrintConverter new initForNumber).
 component model:oldIncr.
 fields add:component.
 box addTextLabel:'(increase oldSpace in chunks of this size)'.
 box addHorizontalLine.
 component := box
-		    addLabelledInputField:(resources string:'oldspace compress limit:')
+addLabelledInputField:(resources string:'oldspace compress limit:')
-		    adjust:#right
+adjust:#right
-		    on:nil "/ compressLimit
+on:nil "/ compressLimit
-		    tabable:true
+tabable:true
-		    separateAtX:0.7.
+separateAtX:0.7.
 component acceptOnLeave:false.
 component converter:(PrintConverter new initForNumber).
 component model:compressLimit.
 fields add:component.
 box addTextLabel:'(suppress compressing GC if more memory is in use)'.
 box addHorizontalLine.
 component := box
-		    addLabelledInputField:(resources string:'stack limit:')
+addLabelledInputField:(resources string:'stack limit:')
-		    adjust:#right
+adjust:#right
-		    on:nil
+on:nil
-		    tabable:true
+tabable:true
-		    separateAtX:0.7.
+separateAtX:0.7.
 component acceptOnLeave:false.
 component converter:(PrintConverter new initForNumber).
 component model:stackLimit.
 fields add:component.
 box addTextLabel:'(trigger recursionInterrupt if more stack is used by a process)'.
 box addHorizontalLine.
 ObjectMemory supportsJustInTimeCompilation ifTrue:[
-	component := box
+component := box
-			addLabelledInputField:(resources string:'dynamic code limit:')
+addLabelledInputField:(resources string:'dynamic code limit:')
-			adjust:#right
+adjust:#right
-			on:nil
+on:nil
-			tabable:true
+tabable:true
-			separateAtX:0.7.
+separateAtX:0.7.
-	component acceptOnLeave:false.
+component acceptOnLeave:false.
-	component converter:(PrintConverter new initForNumberOrNil).
+component converter:(PrintConverter new initForNumberOrNil).
-	component model:codeLimit.
+component model:codeLimit.
-	fields add:component.
+fields add:component.
-	box addTextLabel:'(flush dynamic compiled code to stay within this limit)'.
+box addTextLabel:'(flush dynamic compiled code to stay within this limit)'.
-	box addHorizontalLine.
+box addHorizontalLine.
-	component := box
+component := box
-			addLabelledInputField:(resources string:'dynamic code GC trigger:')
+addLabelledInputField:(resources string:'dynamic code GC trigger:')
-			adjust:#right
+adjust:#right
-			on:nil
+on:nil
-			tabable:true
+tabable:true
-			separateAtX:0.7.
+separateAtX:0.7.
-	component acceptOnLeave:false.
+component acceptOnLeave:false.
-	component converter:(PrintConverter new initForNumberOrNil).
+component converter:(PrintConverter new initForNumberOrNil).
-	component model:codeTrigger.
+component model:codeTrigger.
-	fields add:component.
+fields add:component.
-	box addTextLabel:'(start incremental GC whenever this amount of code has been allocated)'.
+box addTextLabel:'(start incremental GC whenever this amount of code has been allocated)'.
-	box addHorizontalLine.
+box addHorizontalLine.
 ].
-box addAbortButton; addOkButton.
+box addAbortAndOkButtons.
 box
-	addHelpButtonFor:'Launcher/memorySettings.html'.
+addHelpButtonFor:'Launcher/memorySettings.html'.
 "/
 "/ show the box ...
 "/
 box open.
 "/
 "/ update system settings
 "/
 box accepted ifTrue:[
-	fields do:[:comp | comp accept].
+fields do:[:comp | comp accept].
-	igcFreeAmount value ~~ ObjectMemory freeSpaceGCAmount ifTrue:[
+igcFreeAmount value ~~ ObjectMemory freeSpaceGCAmount ifTrue:[
-	    ObjectMemory freeSpaceGCAmount:igcFreeAmount value.
+ObjectMemory freeSpaceGCAmount:igcFreeAmount value.
-	].
+].
-	igcFreeLimit value ~~ ObjectMemory freeSpaceGCLimit ifTrue:[
+igcFreeLimit value ~~ ObjectMemory freeSpaceGCLimit ifTrue:[
-	    ObjectMemory freeSpaceGCLimit:igcFreeLimit value.
+ObjectMemory freeSpaceGCLimit:igcFreeLimit value.
-	].
+].
-	igcLimit value ~~ ObjectMemory incrementalGCLimit ifTrue:[
+igcLimit value ~~ ObjectMemory incrementalGCLimit ifTrue:[
-	    ObjectMemory incrementalGCLimit:igcLimit value.
+ObjectMemory incrementalGCLimit:igcLimit value.
-	].
+].
-	newSpaceSize value ~~ ObjectMemory newSpaceSize ifTrue:[
+newSpaceSize value ~~ ObjectMemory newSpaceSize ifTrue:[
-	    ObjectMemory newSpaceSize:newSpaceSize value.
+ObjectMemory newSpaceSize:newSpaceSize value.
-	].
+].
-	oldIncr value ~~ ObjectMemory oldSpaceIncrement ifTrue:[
+oldIncr value ~~ ObjectMemory oldSpaceIncrement ifTrue:[
-	    ObjectMemory oldSpaceIncrement:oldIncr value.
+ObjectMemory oldSpaceIncrement:oldIncr value.
-	].
+].
-	stackLimit value ~~ Process defaultMaximumStackSize ifTrue:[
+stackLimit value ~~ Process defaultMaximumStackSize ifTrue:[
-	    Process defaultMaximumStackSize:stackLimit value.
+Process defaultMaximumStackSize:stackLimit value.
-	].
+].
-	ObjectMemory oldSpaceCompressLimit:compressLimit value.
+ObjectMemory oldSpaceCompressLimit:compressLimit value.
-	ObjectMemory dynamicCodeLimit:codeLimit value.
+ObjectMemory dynamicCodeLimit:codeLimit value.
-	ObjectMemory dynamicCodeGCTrigger:codeTrigger value.
+ObjectMemory dynamicCodeGCTrigger:codeTrigger value.
 ].
 box destroy
 "Modified: 27.2.1997 / 16:50:12 / cg"
 !
 box addCheckBox:(resources string:'Display error messages (Xlib, Xtlib ...)') on:displayErrors.
 box addCheckBox:(resources string:'Other info messages') on:classInfos.
 box addHelpButtonFor:'Launcher/messageSettings.html'.
-box addAbortButton; addOkButton.
+box addAbortAndOkButtons.
 box open.
 box accepted ifTrue:[
-	ObjectMemory infoPrinting:vmInfo value.
+ObjectMemory infoPrinting:vmInfo value.
-	ObjectMemory debugPrinting:vmErrors value.
+ObjectMemory debugPrinting:vmErrors value.
-	Object infoPrinting:classInfos value.
+Object infoPrinting:classInfos value.
-	DeviceWorkstation errorPrinting:displayErrors value.
+DeviceWorkstation errorPrinting:displayErrors value.
 ].
 box destroy
 "Modified: 27.1.1997 / 17:46:01 / cg"
 !
 ].
 box leftIndent:0.
 box
 addHelpButtonFor:'Launcher/miscSettings.html';
-addAbortButton;
+addAbortAndOkButtons.
-addOkButton.
 "/
 "/ show the box ...
 "/
 box open.
 commandListPop width:0.75; left:0.25; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
 "/ some common print commands ...
 commandList := resources at:'PRINT_COMMANDS' ifAbsent:nil.
 commandList isNil ifTrue:[
-	commandList := PrinterStream defaultCommands.
+commandList := PrinterStream defaultCommands.
-	commandList isNil ifTrue:[
+commandList isNil ifTrue:[
-	    commandList := #('lpr'
+commandList := #('lpr'
-			     'lp'
+'lp'
-			    ).
+).
-	]
+]
 ].
 commandListPop list:commandList.
 box addVerticalSpace; addHorizontalLine; addVerticalSpace.
 landscapeLabel borderWidth:0.
 row add:(landscapeComponent := CheckToggle on:landscape).
 y := box yPosition.
 box
-	addRow:(1 to:2)
+addRow:(1 to:2)
-	fromX:0
+fromX:0
-	toX:0.5
+toX:0.5
-	collect:[:idx | row at:idx]
+collect:[:idx | row at:idx]
-	tabable:false
+tabable:false
-	horizontalLayout:#leftSpace
+horizontalLayout:#leftSpace
-	verticalLayout:#center.
+verticalLayout:#center.
 y1 := box yPosition.
 box yPosition:y.
 box
-	addRow:(3 to:4)
+addRow:(3 to:4)
-	fromX:0.5
+fromX:0.5
-	toX:1.0
+toX:1.0
-	collect:[:idx | row at:idx]
+collect:[:idx | row at:idx]
-	tabable:false
+tabable:false
-	horizontalLayout:#leftSpace
+horizontalLayout:#leftSpace
-	verticalLayout:#center.
+verticalLayout:#center.
 box yPosition:(box yPosition max:y1).
 box makeTabable:(formatComponent).
 box makeTabable:(landscapeComponent).
 box addVerticalSpace; addHorizontalLine; addVerticalSpace.
 y := box yPosition.
 topMarginComponent := box
-	addLabelledInputField:(resources string:'top margin:')
+addLabelledInputField:(resources string:'top margin:')
-	adjust:#right
+adjust:#right
-	on:nil "/ topMargin
+on:nil "/ topMargin
-	tabable:true
+tabable:true
-	from:0.0 to:0.5
+from:0.0 to:0.5
-	separateAtX:0.6.
+separateAtX:0.6.
 topMarginComponent converter:(PrintConverter new initForNumber).
 topMarginComponent model:topMargin.
 y1 := box yPosition.
 box yPosition:y.
 unitList := SelectionInList with:#('inch' 'mm').
 unitList selectionIndex:1.
 component := box addComponent:(PopUpList on:unitList).
 component
-	left:0.6;
+left:0.6;
-	width:0.3.
+width:0.3.
 box yPosition:y1.
 leftMarginComponent := box
-	addLabelledInputField:(resources string:'left margin:')
+addLabelledInputField:(resources string:'left margin:')
-	adjust:#right
+adjust:#right
-	on:nil "/ leftMargin
+on:nil "/ leftMargin
-	tabable:true
+tabable:true
-	from:0.0 to:0.5
+from:0.0 to:0.5
-	separateAtX:0.6.
+separateAtX:0.6.
 leftMarginComponent converter:(PrintConverter new initForNumber).
 leftMarginComponent model:leftMargin.
 rightMarginComponent := box
-	addLabelledInputField:(resources string:'right margin:')
+addLabelledInputField:(resources string:'right margin:')
-	adjust:#right
+adjust:#right
-	on:nil "/ rightMargin
+on:nil "/ rightMargin
-	tabable:true
+tabable:true
-	from:0.0 to:0.5
+from:0.0 to:0.5
-	separateAtX:0.6.
+separateAtX:0.6.
 rightMarginComponent converter:(PrintConverter new initForNumber).
 rightMarginComponent model:rightMargin.
 bottomMarginComponent := box
-	addLabelledInputField:(resources string:'bottom margin:')
+addLabelledInputField:(resources string:'bottom margin:')
-	adjust:#right
+adjust:#right
-	on:nil "/ bottomMargin
+on:nil "/ bottomMargin
-	tabable:true
+tabable:true
-	from:0.0 to:0.5
+from:0.0 to:0.5
-	separateAtX:0.6.
+separateAtX:0.6.
 bottomMarginComponent converter:(PrintConverter new initForNumber).
 bottomMarginComponent model:bottomMargin.
 box addHorizontalLine.
 supportsColorComponent := box addCheckBox:(resources string:'Color printer') on:supportsColor.
 box addVerticalSpace.
 updater := [ |p fg hasPageSize hasMargins|
-		       printerType selectionIndex ~~ 0 ifTrue:[
+printerType selectionIndex ~~ 0 ifTrue:[
-			   p := possiblePrinters at:(printerType selectionIndex).
+p := possiblePrinters at:(printerType selectionIndex).
-			   hasPageSize := p supportsPageSizes.
+hasPageSize := p supportsPageSizes.
-			   hasMargins := p supportsMargins.
+hasMargins := p supportsMargins.
-		       ] ifFalse:[
+] ifFalse:[
-			   hasPageSize := false.
+hasPageSize := false.
-			   hasMargins := false.
+hasMargins := false.
-		       ].
+].
-		       hasPageSize ifTrue:[
+hasPageSize ifTrue:[
-			  fg := Button new foregroundColor.
+fg := Button new foregroundColor.
-			  formatComponent enable.
+formatComponent enable.
-			  landscapeComponent enable.
+landscapeComponent enable.
-			  formatComponent label:p pageFormat.
+formatComponent label:p pageFormat.
-			  pageFormat value:(p pageFormat).
+pageFormat value:(p pageFormat).
-			  landscape value:(p landscape).
+landscape value:(p landscape).
-		       ] ifFalse:[
+] ifFalse:[
-			  fg := Button new disabledForegroundColor.
+fg := Button new disabledForegroundColor.
-			  formatComponent disable.
+formatComponent disable.
-			  landscapeComponent disable.
+landscapeComponent disable.
-			  formatComponent label:'unknown'.
+formatComponent label:'unknown'.
-			  landscape value:nil.
+landscape value:nil.
-		       ].
+].
-		       hasMargins ifTrue:[
+hasMargins ifTrue:[
-			  unitList selectionIndex == 2 ifTrue:[
+unitList selectionIndex == 2 ifTrue:[
-			      unit := #mm
+unit := #mm
-			  ] ifFalse:[
+] ifFalse:[
-			      unit := #inch
+unit := #inch
-			  ].
+].
-			  topMargin value:(UnitConverter convert:p topMargin from:#inch to:unit).
+topMargin value:(UnitConverter convert:p topMargin from:#inch to:unit).
-			  leftMargin value:(UnitConverter convert:p leftMargin from:#inch to:unit).
+leftMargin value:(UnitConverter convert:p leftMargin from:#inch to:unit).
-			  rightMargin value:(UnitConverter convert:p rightMargin from:#inch to:unit).
+rightMargin value:(UnitConverter convert:p rightMargin from:#inch to:unit).
-			  bottomMargin value:(UnitConverter convert:p bottomMargin from:#inch to:unit).
+bottomMargin value:(UnitConverter convert:p bottomMargin from:#inch to:unit).
-			  topMarginComponent enable.
+topMarginComponent enable.
-			  leftMarginComponent enable.
+leftMarginComponent enable.
-			  rightMarginComponent enable.
+rightMarginComponent enable.
-			  bottomMarginComponent enable.
+bottomMarginComponent enable.
-		       ] ifFalse:[
+] ifFalse:[
-			  topMarginComponent disable.
+topMarginComponent disable.
-			  leftMarginComponent disable.
+leftMarginComponent disable.
-			  rightMarginComponent disable.
+rightMarginComponent disable.
-			  bottomMarginComponent disable.
+bottomMarginComponent disable.
-		       ].
+].
-		       formatLabel foregroundColor:fg.
+formatLabel foregroundColor:fg.
-		       landscapeLabel foregroundColor:fg.
+landscapeLabel foregroundColor:fg.
-		       p notNil ifTrue:[
+p notNil ifTrue:[
-			   commandList := p defaultCommands.
+commandList := p defaultCommands.
-			   commandList notNil ifTrue:[
+commandList notNil ifTrue:[
-				commandListPop list:commandList
+commandListPop list:commandList
-			   ].
+].
-			   printCommand value:(p printCommand).
+printCommand value:(p printCommand).
-		       ].
+].
-		       p supportsPostscript ifFalse:[
+p supportsPostscript ifFalse:[
-			   supportsColorComponent disable.
+supportsColorComponent disable.
-			   supportsColor value:false
+supportsColor value:false
-		       ] ifTrue:[
+] ifTrue:[
-			   supportsColorComponent enable.
+supportsColorComponent enable.
-			   supportsColor value:(Printer supportsColor).
+supportsColor value:(Printer supportsColor).
-		       ]
+]
-		     ].
+].
 unitList onChangeSend:#value to:updater.
 printerType onChangeSend:#value to:updater.
 updater value.
 box addVerticalSpace;
-	addHelpButtonFor:'Launcher/printerSettings.html';
+addHelpButtonFor:'Launcher/printerSettings.html';
-	addAbortButton; addOkButton.
+addAbortAndOkButtons.
 box open.
 box accepted ifTrue:[
-	Printer := possiblePrinters at:(printerType selectionIndex).
+Printer := possiblePrinters at:(printerType selectionIndex).
-	Printer printCommand:printCommand value.
+Printer printCommand:printCommand value.
-	Printer supportsPageSizes ifTrue:[
+Printer supportsPageSizes ifTrue:[
-	    Printer pageFormat:(pageFormat selection).
+Printer pageFormat:(pageFormat selection).
-	    Printer landscape:(landscape value).
+Printer landscape:(landscape value).
-	].
+].
-	Printer supportsMargins ifTrue:[
+Printer supportsMargins ifTrue:[
-	    unitList selectionIndex == 2 ifTrue:[
+unitList selectionIndex == 2 ifTrue:[
-		unit := #mm
+unit := #mm
-	    ] ifFalse:[
+] ifFalse:[
-		unit := #inch
+unit := #inch
-	    ].
+].
-	    Printer topMargin:(UnitConverter convert:topMargin value from:unit to:#inch).
+Printer topMargin:(UnitConverter convert:topMargin value from:unit to:#inch).
-	    Printer leftMargin:(UnitConverter convert:leftMargin value from:unit to:#inch).
+Printer leftMargin:(UnitConverter convert:leftMargin value from:unit to:#inch).
-	    Printer rightMargin:(UnitConverter convert:rightMargin value from:unit to:#inch).
+Printer rightMargin:(UnitConverter convert:rightMargin value from:unit to:#inch).
-	    Printer bottomMargin:(UnitConverter convert:bottomMargin value from:unit to:#inch).
+Printer bottomMargin:(UnitConverter convert:bottomMargin value from:unit to:#inch).
-	].
+].
-	Printer supportsPostscript ifTrue:[
+Printer supportsPostscript ifTrue:[
-	    Printer supportsColor:supportsColor value.
+Printer supportsColor:supportsColor value.
-	].
+].
 ].
 box destroy
 "Modified: 9.9.1996 / 22:43:51 / stefan"
 "Modified: 28.2.1997 / 14:00:13 / cg"
 box addCheckBox:(resources string:'show error notifier before opening debugger') on:showErrorNotifier.
 box addCheckBox:(resources string:'verbose backtrace by default in debugger') on:showVerboseStack.
 box
 addHelpButtonFor:'Launcher/sourceSettings.html';
-addAbortButton;
+addAbortAndOkButtons.
-addOkButton.
 "/
 "/ show the box ...
 "/
 box open.
 ].
 ].
 box
 addHelpButtonFor:'Launcher/compilerSettings.html';
-addAbortButton;
+addAbortAndOkButtons.
-addOkButton.
 box open.
 box accepted ifTrue:[
 thisIsADemoVersion  ifFalse:[
 box addHorizontalLine.
 box addCheckBox:(resources string:'Use hierarchical inspector') on:useNewInspector.
 box
 addHelpButtonFor:'Launcher/toolSettings.html';
-addAbortButton;
+addAbortAndOkButtons.
-addOkButton.
 "/
 "/ show the box ...
 "/
 box open.
 "
 search resources directory for a list of .style files ...
 "
 someRsrcFile := Smalltalk getSystemFileName:('resources' asFilename constructString:'normal.style').
 someRsrcFile notNil ifTrue:[
-	resourceDir := someRsrcFile asFilename directoryName
+resourceDir := someRsrcFile asFilename directoryName
 ] ifFalse:[
-	resourceDir := Smalltalk getSystemFileName:'resources'.
+resourceDir := Smalltalk getSystemFileName:'resources'.
 ].
 resourceDir isNil ifTrue:[
-	self warn:'no styles found (missing ''resources'' directory)'.
+self warn:'no styles found (missing ''resources'' directory)'.
-	^ self
+^ self
 ].
 dir := resourceDir asFilename directoryContents.
 list := SelectionInList new.
 listUpdater := [
-	|listOfStyles lastSelection|
+|listOfStyles lastSelection|
-	lastSelection := list selection.
+lastSelection := list selection.
-	listOfStyles := dir select:[:aFileName | aFileName asFilename hasSuffix:'style'].
+listOfStyles := dir select:[:aFileName | aFileName asFilename hasSuffix:'style'].
-	listOfStyles := listOfStyles collect:[:aFileName | aFileName asFilename withoutSuffix name].
+listOfStyles := listOfStyles collect:[:aFileName | aFileName asFilename withoutSuffix name].
-	Filename isCaseSensitive ifFalse:[
+Filename isCaseSensitive ifFalse:[
-	    listOfStyles := listOfStyles collect:[:aStyleName | aStyleName asLowercase].
+listOfStyles := listOfStyles collect:[:aStyleName | aStyleName asLowercase].
-	].
+].
-	listOfStyles remove:'generic' ifAbsent:nil; remove:'mswindows3' ifAbsent:nil.
+listOfStyles remove:'generic' ifAbsent:nil; remove:'mswindows3' ifAbsent:nil.
-	showStandardStylesOnly value ifTrue:[
+showStandardStylesOnly value ifTrue:[
-	    listOfStyles := listOfStyles select:[:aStyleName | standardStyles includes:aStyleName].
+listOfStyles := listOfStyles select:[:aStyleName | standardStyles includes:aStyleName].
-	].
+].
-	listOfStyles sort.
+listOfStyles sort.
-	list list:listOfStyles.
+list list:listOfStyles.
-	list selection:lastSelection.
+list selection:lastSelection.
 ].
 listUpdater value.
 showStandardStylesOnly onChangeSend:#value to:listUpdater.
 infoForwarder := [
-			|nm sheet comment|
+|nm sheet comment|
-			comment := ''.
+comment := ''.
-			nm := list selection.
+nm := list selection.
-			nm notNil ifTrue:[
+nm notNil ifTrue:[
-			    sheet := ViewStyle fromFile:(nm , '.style').
+sheet := ViewStyle fromFile:(nm , '.style').
-			    comment := (sheet at:#comment ifAbsent:'') withoutSeparators.
+comment := (sheet at:#comment ifAbsent:'') withoutSeparators.
-			].
+].
-			comment := comment withCRs asStringCollection.
+comment := comment withCRs asStringCollection.
-			comment size == 1 ifTrue:[
+comment size == 1 ifTrue:[
-			    comment := comment first
+comment := comment first
-			].
+].
-			infoLabel label:comment
+infoLabel label:comment
-		       ].
+].
 list onChangeSend:#value to:infoForwarder.
 box := Dialog new.
 box label:(resources string:'Style selection').
 box addVerticalSpace.
 (infoLabel := box addTextLabel:'\\' withCRs) adjust:#centerLeft.
-box addAbortButton.
+box addAbortAndOkButtons.
 "/ mhmh - the newLauncher does not yet handle apply (without close) correctly
 "/    b := box addButton:(Button label:(resources string:'apply')).
 "/    b action:[didApply := true. requestor changeViewStyleTo:(list selection)].
-box addOkButton.
 (standardStyles includes:View defaultStyle) ifFalse:[
-	showStandardStylesOnly value:false
+showStandardStylesOnly value:false
 ].
 list selection:(View defaultStyle).
 box stickAtBottomWithVariableHeight:scrView.
 box stickAtBottomWithFixHeight:infoLabel.
 didApply := false.
 box open.
 box destroy.
 box accepted ifTrue:[
-	((newStyle := list selection) ~= View defaultStyle
+((newStyle := list selection) ~= View defaultStyle
-	or:[didApply ~~ true]) ifTrue:[
+or:[didApply ~~ true]) ifTrue:[
-	    requestor changeViewStyleTo:newStyle.
+requestor changeViewStyleTo:newStyle.
-	].
+].
 ].
 "
 self viewStyleSettingsFor:nil
 "
 |box y cvsRootHolder component resources defaultsList|
 resources := requestor class classResources.
 OperatingSystem isUNIXlike ifTrue:[
-	defaultsList := #('/files/CVS' '/CVS' 'host:/files/CVS' 'host:/CVS').
+defaultsList := #('/files/CVS' '/CVS' 'host:/files/CVS' 'host:/CVS').
 ] ifFalse:[
-	OperatingSystem isMSDOSlike ifTrue:[
+OperatingSystem isMSDOSlike ifTrue:[
-	    defaultsList := #(':local:c:\files\CVS' ':local:c:\CVS' 'host:/files/CVS' 'host:/CVS').
+defaultsList := #(':local:c:\files\CVS' ':local:c:\CVS' 'host:/files/CVS' 'host:/CVS').
-	] ifFalse:[
+] ifFalse:[
-	    defaultsList := #('host:/files/CVS' 'host:/CVS').
+defaultsList := #('host:/files/CVS' 'host:/CVS').
-	]
+]
 ].
 cvsRootHolder := CVSSourceCodeManager repositoryName ? '/files/CVS'.
 cvsRootHolder := cvsRootHolder asValue.
 "/                    separateAtX:0.5.
 "/    component acceptOnLeave:false.
 "/    component model:cvsRootHolder.
 box
-	addHelpButtonFor:'Launcher/sourceSettings.html';
+addHelpButtonFor:'Launcher/sourceSettings.html';
-	addAbortButton;
+addAbortAndOkButtons.
-	addOkButton.
 "/
 "/ show the box ...
 "/
 box extent:400@300.
 "/
 "/ update system settings
 "/
 box accepted ifTrue:[
-	CVSSourceCodeManager initializeForRepository:cvsRootHolder value
+CVSSourceCodeManager initializeForRepository:cvsRootHolder value
 ].
 box destroy
 "Modified: / 16.4.1998 / 17:18:16 / ca"
 "Modified: / 12.8.1998 / 17:09:02 / cg"
 model == allOfThem ifTrue:[
 box addVerticalSpace
 ]
 ].
-box addAbortButton; addOkButton.
+box addAbortAndOkButtons.
 defaultButton := Button label:(resources string:'defaults').
 (DialogBox styleSheet at:'dialogBox.okAtLeft') ifTrue:[
 box addButton:defaultButton after:nil.
 ] ifFalse:[
 syntaxColoringBox enable.  colorMenu enable.  syntaxEmphasisesBox enable.  syntaxColoringResetBox enable.
 box
 "/        addHelpButtonFor:'Launcher/sourceSettings.html';
-addAbortButton;
+addAbortAndOkButtons.
-addOkButton.
 "/
 "/ show the box ...
 "/
 box extent:400@300.
 ! !
 !AbstractLauncherApplication class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.14 1999-03-06 01:59:44 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.15 1999-03-06 02:15:15 cg Exp $'
 ! !

changeset 2048	f8c010698b75
parent 2047	bb2070a26bd2
child 2064	ce441db4cd5a