checkin from browser
authorClaus Gittinger <cg@exept.de>
Thu, 20 May 1999 18:42:03 +0200
changeset 2164 fd79997e6ce0
parent 2163 2e5d99376c84
child 2165 db340546f304
checkin from browser
AbstractLauncherApplication.st
--- a/AbstractLauncherApplication.st	Thu May 20 18:41:33 1999 +0200
+++ b/AbstractLauncherApplication.st	Thu May 20 18:42:03 1999 +0200
@@ -1456,7 +1456,7 @@
      sizes sizeNames sizeList sizeX sizeY deepIcons
      isColorMonitor useFixPalette useFixGrayPalette idx ditherStyles ditherSyms ditherList
      y component screen visual clipEncodings clipEncodingSyms clipEncodingList resources
-     activateOnClick|
+     |
 
     resources := requestor class classResources.
 
@@ -1483,9 +1483,6 @@
     deepIcons := screen supportsDeepIcons asValue.
     useFixPalette := screen fixColors notNil asValue.
     useFixGrayPalette := screen fixGrayColors notNil asValue.
-    screen platformName = 'WIN32' ifTrue:[
-        activateOnClick := (screen activateOnClick:nil) asValue.
-    ].
 
     sizeList := SelectionInList with:sizeNames.
     sizeX := screen widthInMillimeter asValue.
@@ -1596,11 +1593,6 @@
     box addVerticalSpace.
     box addCheckBox:(resources string:'Allow colored/grayscale icons') on:deepIcons.
 
-    activateOnClick notNil ifTrue:[
-        box addVerticalSpace.
-        box addCheckBox:(resources string:'Activate for focus') on:activateOnClick.
-    ].
-
     box addVerticalSpace; addHorizontalLine; addVerticalSpace.
 
     component := box addPopUpList:(resources string:'ClipBoard encoding:') on:clipEncodingList.
@@ -1639,10 +1631,6 @@
         screen widthInMillimeter:sizeX value.
         screen heightInMillimeter:sizeY value.
 
-        activateOnClick notNil ifTrue:[
-            screen activateOnClick:activateOnClick value.
-        ].
-
         screen supportsDeepIcons:deepIcons value.
         ditherSyms notNil ifTrue:[
             Image ditherAlgorithm:(ditherSyms at:ditherList selectionIndex).
@@ -1657,7 +1645,7 @@
     box destroy
 
     "Modified: / 9.9.1996 / 22:43:04 / stefan"
-    "Modified: / 20.5.1999 / 18:24:56 / cg"
+    "Modified: / 20.5.1999 / 18:35:21 / cg"
 !
 
 editSettingsFor:requestor
@@ -2357,12 +2345,12 @@
 
     rDoitsEnabled := rDoitLogging := rDoitErrorLogging := false.
     (hasRDoitServer := RDoItServer notNil) ifTrue:[
-	RDoItServer isLoaded ifTrue:[
-	    rDoitsEnabled := RDoItServer serverRunning.
-	    rDoitLogging := RDoItServer isLogging.
-	    rDoitErrorLogging := RDoItServer isErrorLogging.
-	    rDoitErrorDebugging := RDoItServer isErrorCatching not.
-	]
+        RDoItServer isLoaded ifTrue:[
+            rDoitsEnabled := RDoItServer serverRunning.
+            rDoitLogging := RDoItServer isLogging.
+            rDoitErrorLogging := RDoItServer isErrorLogging.
+            rDoitErrorDebugging := RDoItServer isErrorCatching not.
+        ]
     ].
     org_rDoitsEnabled := rDoitsEnabled.
     org_rDoitLogging := rDoitLogging.
@@ -2401,7 +2389,7 @@
 
     check := box addCheckBox:(resources string:'Remote doits enabled') on:rDoitsEnabled.
     hasRDoitServer ifFalse:[
-	check disable
+        check disable
     ].
     box leftIndent:20.
     y := box yPosition.
@@ -2409,26 +2397,26 @@
     check width:0.4.
     check enableChannel:rDoitsEnabled.
     hasRDoitServer ifFalse:[
-	check disable
+        check disable
     ].
     box yPosition:y.
     check := box addCheckBox:(resources string:'Log requests') on:rDoitLogging.
     check left:0.4; width:0.5.
     check enableChannel:rDoitsEnabled.
     hasRDoitServer ifFalse:[
-	check disable
+        check disable
     ].
     check := box addCheckBox:(resources string:'Debug errors') on:rDoitErrorDebugging.
     check width:0.4.
     check enableChannel:rDoitsEnabled.
     hasRDoitServer ifFalse:[
-	check disable
+        check disable
     ].
     box leftIndent:0.
 
     box 
-	addHelpButtonFor:'Launcher/miscSettings.html';
-	addAbortAndOkButtons.
+        addHelpButtonFor:'Launcher/miscSettings.html';
+        addAbortAndOkButtons.
 
     "/
     "/ show the box ...
@@ -2439,74 +2427,73 @@
     "/ update system settings
     "/
     box accepted ifTrue:[
-	PopUpView shadows:shadows value.
-	hostNameInLabelHolder value ~~ hostNameInLabel ifTrue:[ 
-	    StandardSystemView includeHostNameInLabel:hostNameInLabelHolder value.
-
-	    Screen allScreens do:[:aDisplay |
-		aDisplay allViewsDo:[:aView |
-		    |l|
-
-		    aView isTopView ifTrue:[
-			l := aView label.
-			l notNil ifTrue:[
-			    aView label:(l , ' '); label:l.  "/ force a change
-			]
-		    ]
-		]
-	    ]
-	].
-
-	VariablePanelController opaqueResize:opaqueVariablePanelResize value.
-
-	StandardSystemView returnFocusWhenClosingModalBoxes:returnFocus value.
-	StandardSystemView takeFocusWhenMapped:takeFocus value.
-	UserPreferences current focusFollowsMouse:focusFollowsMouse value.
-
-	Display activateOnClick:(activateOnClick value).
-
-	MenuView showAcceleratorKeys:showAccelerators value.
-	Processor isTimeSlicing ~~ preemptive value ifTrue:[
-	    preemptive value ifTrue:[
-		Processor startTimeSlicing
-	    ] ifFalse:[
-		Processor stopTimeSlicing
-	    ]
-	].
-	Processor supportDynamicPriorities ~~ dynamicPrios value ifTrue:[
-	    Processor supportDynamicPriorities:dynamicPrios value
-	].
-
-	hasRDoitServer ifTrue:[
-	    (rDoitLogging value ~~ org_rDoitLogging
-	    or:[rDoitErrorDebugging value ~~ org_rDoitErrorDebugging
-	    or:[rDoitErrorLogging value ~~ org_rDoitErrorLogging
-	    or:[rDoitsEnabled value ~~ org_rDoitsEnabled]]]) ifTrue:[
-		RDoItServer autoload.
-		RDoItServer logging:(rDoitLogging value).
-		RDoItServer errorLogging:(rDoitErrorLogging value).
-		RDoItServer errorCatching:(rDoitErrorDebugging value not).
-		rDoitsEnabled := rDoitsEnabled value.
-		rDoitsEnabled ~~ RDoItServer serverRunning ifTrue:[
-		    rDoitsEnabled ifFalse:[
-			RDoItServer killAll
-		    ] ifTrue:[
-			RDoItServer start.
-			"/ must wait a bit; give it a chance to
-			"/ really start (before checking)
-			Delay waitForSeconds:0.2.
-			RDoItServer serverRunning ifFalse:[
-			    self warn:'RDoit startup failed (see stderr).'
-			]
-		    ]
-		].
-	    ].
-	]
+        PopUpView shadows:shadows value.
+        hostNameInLabelHolder value ~~ hostNameInLabel ifTrue:[ 
+            StandardSystemView includeHostNameInLabel:hostNameInLabelHolder value.
+
+            Screen allScreens do:[:aDisplay |
+                aDisplay allViewsDo:[:aView |
+                    |l|
+
+                    aView isTopView ifTrue:[
+                        l := aView label.
+                        l notNil ifTrue:[
+                            aView label:(l , ' '); label:l.  "/ force a change
+                        ]
+                    ]
+                ]
+            ]
+        ].
+
+        VariablePanelController opaqueResize:opaqueVariablePanelResize value.
+
+        StandardSystemView returnFocusWhenClosingModalBoxes:returnFocus value.
+        StandardSystemView takeFocusWhenMapped:takeFocus value.
+        UserPreferences current focusFollowsMouse:focusFollowsMouse value.
+        Screen current activateOnClick:(activateOnClick value).
+
+        MenuView showAcceleratorKeys:showAccelerators value.
+        Processor isTimeSlicing ~~ preemptive value ifTrue:[
+            preemptive value ifTrue:[
+                Processor startTimeSlicing
+            ] ifFalse:[
+                Processor stopTimeSlicing
+            ]
+        ].
+        Processor supportDynamicPriorities ~~ dynamicPrios value ifTrue:[
+            Processor supportDynamicPriorities:dynamicPrios value
+        ].
+
+        hasRDoitServer ifTrue:[
+            (rDoitLogging value ~~ org_rDoitLogging
+            or:[rDoitErrorDebugging value ~~ org_rDoitErrorDebugging
+            or:[rDoitErrorLogging value ~~ org_rDoitErrorLogging
+            or:[rDoitsEnabled value ~~ org_rDoitsEnabled]]]) ifTrue:[
+                RDoItServer autoload.
+                RDoItServer logging:(rDoitLogging value).
+                RDoItServer errorLogging:(rDoitErrorLogging value).
+                RDoItServer errorCatching:(rDoitErrorDebugging value not).
+                rDoitsEnabled := rDoitsEnabled value.
+                rDoitsEnabled ~~ RDoItServer serverRunning ifTrue:[
+                    rDoitsEnabled ifFalse:[
+                        RDoItServer killAll
+                    ] ifTrue:[
+                        RDoItServer start.
+                        "/ must wait a bit; give it a chance to
+                        "/ really start (before checking)
+                        Delay waitForSeconds:0.2.
+                        RDoItServer serverRunning ifFalse:[
+                            self warn:'RDoit startup failed (see stderr).'
+                        ]
+                    ]
+                ].
+            ].
+        ]
     ].
     box destroy
 
     "Modified: / 9.9.1996 / 22:43:36 / stefan"
-    "Modified: / 6.1.1999 / 14:15:53 / cg"
+    "Modified: / 20.5.1999 / 18:33:55 / cg"
 !
 
 printerSettingsFor:requestor
@@ -4353,5 +4340,5 @@
 !AbstractLauncherApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.30 1999-05-20 16:33:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.31 1999-05-20 16:42:03 cg Exp $'
 ! !