--- a/Launcher.st	Fri Jan 17 16:20:48 1997 +0100
+++ b/Launcher.st	Fri Jan 17 18:02:34 1997 +0100
@@ -2005,48 +2005,19 @@
 miscSettings
     "open a dialog on misc other settings"
 
-    |box check logDoits shadows updChanges changeFileName returnFocus
-     loadBinaries compileLazy hostNameInLabel useManager hasManager 
-     repository repositoryHolder localSourceFirst 
-     showAccelerators sourceCacheDir cacheEntry
-     component localCheck oldIndent nm fn manager
-     keepMethodHistory showErrorNotifier showVerboseStack|
+    |box check shadows returnFocus
+     hostNameInLabel showAccelerators 
+     preemptive|
 
     "/ 
     "/ extract relevant system settings ...
     "/
-    keepMethodHistory := Class methodHistory notNil asValue.
-    logDoits := Smalltalk logDoits asValue.
     shadows := PopUpView shadows asValue.
     hostNameInLabel := StandardSystemView includeHostNameInLabel asValue.
     returnFocus := Dialog returnFocusWhenClosingModalBoxes asValue.
-    updChanges := Class updatingChanges asValue.
-    changeFileName := ObjectMemory nameForChanges asValue.
-
-    hasManager := AbstractSourceCodeManager notNil
-                  and:[AbstractSourceCodeManager isLoaded].
-
-    hasManager ifTrue:[
-        useManager := (manager := Smalltalk at:#SourceCodeManager) notNil asValue.
-        localSourceFirst := Class tryLocalSourceFirst asValue.
-        manager notNil ifTrue:[
-            repository := manager repositoryName.
-            repository notNil ifTrue:[
-                repositoryHolder := repository asValue
-            ]
-        ].
-    ] ifFalse:[
-        useManager := false.
-        localSourceFirst := false
-    ].
+
     showAccelerators := MenuView showAcceleratorKeys asValue.
-    showErrorNotifier := (Exception emergencyHandler == Launcher notifyingEmergencyHandler) asValue.
-    showVerboseStack := (DebugView defaultVerboseBacktrace ? false) asValue.
-
-    sourceCacheDir := nil asValue.
-
-    loadBinaries := Smalltalk loadBinaries asValue.
-    compileLazy := Autoload compileLazy asValue.
+    preemptive := Processor isTimeSlicing asValue.
 
     "/
     "/ create a box on those values ...
@@ -2054,75 +2025,6 @@
     box := DialogBox new.
     box label:(resources string:'Other settings').
 
-    box addCheckBox:(resources string:'remember changed methods (for previous method in browser)') on:keepMethodHistory.
-    box addCheckBox:(resources string:'log compiles in changes file') on:updChanges.
-    box addCheckBox:(resources string:'log doIts in changes file') on:logDoits.
-
-    component := box 
-                    addLabelledInputField:(resources string:'change file name:')
-                    adjust:#right
-                    on:changeFileName 
-                    tabable:true
-                    separateAtX:0.4.
-    component immediateAccept:true; acceptOnLeave:false.
-
-"/    y := box yPosition.
-"/    component := box addTextLabel:(resources string:'change file name:').
-"/    component width:0.5; adjust:#right; borderWidth:0.
-"/    box yPosition:y.
-"/    component := box addInputFieldOn:changeFileName tabable:true.
-"/    component width:0.5; left:0.5; immediateAccept:true; acceptOnLeave:false.
-
-    box addHorizontalLine.
-
-    box addCheckBox:(resources string:'lazy compilation when autoloading') on:compileLazy.
-    check := box addCheckBox:(resources string:'if present, load binary objects when autoloading') on:loadBinaries.
-    ObjectFileLoader isNil ifTrue:[
-        loadBinaries value:false.
-        check disable
-    ].
-
-    hasManager ifTrue:[
-        check := box addCheckBox:(resources string:'sourcecode from sourcecode management') on:useManager.
-        oldIndent := box leftIndent.
-        box leftIndent:30.
-
-        repositoryHolder notNil ifTrue:[
-            component := box 
-                            addLabelledInputField:(resources string:'repository:')
-                            adjust:#right
-                            on:repositoryHolder 
-                            tabable:true
-                            separateAtX:0.4.
-            component immediateAccept:true; acceptOnLeave:false.
-        ].
-
-        localCheck := box addCheckBox:(resources string:'if present, use local source (suppress checkout)') on:localSourceFirst.
-        localCheck enableChannel:useManager.
-
-        cacheEntry := box 
-                        addLabelledInputField:(resources string:'source cache dir:')
-                        adjust:#right
-                        on:sourceCacheDir 
-                        tabable:true
-                        separateAtX:0.4.
-        cacheEntry immediateAccept:true; acceptOnLeave:false.
-        box leftIndent:oldIndent.
-        cacheEntry enableChannel:useManager.
-
-        (AbstractSourceCodeManager isNil 
-        or:[AbstractSourceCodeManager defaultManager isNil]) ifTrue:[
-            useManager value:false.
-            cacheEntry disable.
-            check disable.
-            localCheck enable.
-        ] ifFalse:[
-            sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName).
-        ].
-    ].
-
-    box addHorizontalLine.
-
     box addCheckBox:(resources string:'shadows under popup views') on:shadows.
     box addCheckBox:(resources string:'boxes return focus to previously active view') on:returnFocus.
     box addCheckBox:(resources string:'hostname in window labels') on:hostNameInLabel.
@@ -2130,8 +2032,7 @@
 
     box addHorizontalLine.
 
-    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 addCheckBox:(resources string:'preemptive scheduling') on:preemptive.
 
     box 
         addHelpButtonFor:'Launcher/miscSettings.html';
@@ -2147,58 +2048,22 @@
     "/ update system settings
     "/
     box accepted ifTrue:[
-        Class keepMethodHistory:keepMethodHistory value.
-        Smalltalk logDoits:logDoits value.
         PopUpView shadows:shadows value.
-        Class updateChanges:updChanges value.
-        Autoload compileLazy:compileLazy value.
-        Smalltalk loadBinaries:loadBinaries value.
         StandardSystemView includeHostNameInLabel:hostNameInLabel value.
-        ObjectMemory nameForChanges:changeFileName value.
         Dialog returnFocusWhenClosingModalBoxes:returnFocus value.
         MenuView showAcceleratorKeys:showAccelerators value.
-
-        (hasManager and:[useManager value]) ifTrue:[
-            manager isNil ifTrue:[
-                Smalltalk at:#SourceCodeManager put:(AbstractSourceCodeManager defaultManager).
-                manager := Smalltalk at:#SourceCodeManager.
-            ].
-            Class tryLocalSourceFirst:(localSourceFirst value).
-            nm := sourceCacheDir value.
-            (fn := nm asFilename) exists ifFalse:[
-                (self confirm:(nm , ' does not exists\create ?' withCRs)) ifTrue:[
-                    fn makeDirectory; 
-                       makeReadableForAll;
-                       makeWritableForAll;
-                       makeExecutableForAll.
-                ]
-            ].
-            (fn exists 
-            and:[fn isDirectory
-            and:[fn isReadable
-            and:[fn isWritable]]]) ifTrue:[
-                AbstractSourceCodeManager cacheDirectoryName:(sourceCacheDir value).
-            ].
-            repositoryHolder notNil ifTrue:[
-                manager repositoryName:repositoryHolder value.
-                manager initialize
-            ].
-
-            showErrorNotifier value ifFalse:[
-                Exception emergencyHandler:nil
-            ] ifTrue:[
-                Exception emergencyHandler:(Launcher notifyingEmergencyHandler)
-            ].
-            DebugView defaultVerboseBacktrace:(showVerboseStack value).
-
-        ] ifFalse:[
-            Smalltalk at:#SourceCodeManager put:nil
+        Processor isTimeSlicing ~~ preemptive value ifTrue:[
+            preemptive value ifTrue:[
+                Processor startTimeSlicing
+            ] ifFalse:[
+                Processor stopTimeSlicing
+            ]
         ]
     ].
     box destroy
 
     "Modified: 9.9.1996 / 22:43:36 / stefan"
-    "Modified: 11.1.1997 / 12:21:43 / cg"
+    "Modified: 17.1.1997 / 17:50:22 / cg"
 !
 
 printerSettings
@@ -2686,6 +2551,191 @@
     "Modified: 8.1.1997 / 14:54:00 / cg"
 !
 
+sourceAndDebuggerSettings
+    "open a dialog on misc other settings"
+
+    |box check logDoits updChanges changeFileName
+     loadBinaries compileLazy useManager hasManager 
+     repository repositoryHolder localSourceFirst 
+     sourceCacheDir cacheEntry
+     component localCheck oldIndent nm fn manager
+     keepMethodHistory showErrorNotifier showVerboseStack|
+
+    "/ 
+    "/ extract relevant system settings ...
+    "/
+    keepMethodHistory := Class methodHistory notNil asValue.
+    logDoits := Smalltalk logDoits asValue.
+    updChanges := Class updatingChanges asValue.
+    changeFileName := ObjectMemory nameForChanges asValue.
+
+    hasManager := AbstractSourceCodeManager notNil
+                  and:[AbstractSourceCodeManager isLoaded].
+
+    hasManager ifTrue:[
+        useManager := (manager := Smalltalk at:#SourceCodeManager) notNil asValue.
+        localSourceFirst := Class tryLocalSourceFirst asValue.
+        manager notNil ifTrue:[
+            repository := manager repositoryName.
+            repository notNil ifTrue:[
+                repositoryHolder := repository asValue
+            ]
+        ].
+    ] ifFalse:[
+        useManager := false.
+        localSourceFirst := false
+    ].
+    showErrorNotifier := (Exception emergencyHandler == Launcher notifyingEmergencyHandler) asValue.
+    showVerboseStack := (DebugView defaultVerboseBacktrace ? false) asValue.
+
+    sourceCacheDir := nil asValue.
+
+    loadBinaries := Smalltalk loadBinaries asValue.
+    compileLazy := Autoload compileLazy asValue.
+
+    "/
+    "/ create a box on those values ...
+    "/
+    box := DialogBox new.
+    box label:(resources string:'Source & Debugger settings').
+
+    box addCheckBox:(resources string:'remember changed methods (for previous method in browser)') on:keepMethodHistory.
+    box addCheckBox:(resources string:'log compiles in changes file') on:updChanges.
+    box addCheckBox:(resources string:'log doIts in changes file') on:logDoits.
+
+    component := box 
+                    addLabelledInputField:(resources string:'change file name:')
+                    adjust:#right
+                    on:changeFileName 
+                    tabable:true
+                    separateAtX:0.4.
+    component immediateAccept:true; acceptOnLeave:false.
+
+"/    y := box yPosition.
+"/    component := box addTextLabel:(resources string:'change file name:').
+"/    component width:0.5; adjust:#right; borderWidth:0.
+"/    box yPosition:y.
+"/    component := box addInputFieldOn:changeFileName tabable:true.
+"/    component width:0.5; left:0.5; immediateAccept:true; acceptOnLeave:false.
+
+    box addHorizontalLine.
+
+    box addCheckBox:(resources string:'lazy compilation when autoloading') on:compileLazy.
+    check := box addCheckBox:(resources string:'if present, load binary objects when autoloading') on:loadBinaries.
+    ObjectFileLoader isNil ifTrue:[
+        loadBinaries value:false.
+        check disable
+    ].
+
+    hasManager ifTrue:[
+        check := box addCheckBox:(resources string:'sourcecode from sourcecode management') on:useManager.
+        oldIndent := box leftIndent.
+        box leftIndent:30.
+
+        repositoryHolder notNil ifTrue:[
+            component := box 
+                            addLabelledInputField:(resources string:'repository:')
+                            adjust:#right
+                            on:repositoryHolder 
+                            tabable:true
+                            separateAtX:0.4.
+            component immediateAccept:true; acceptOnLeave:false.
+        ].
+
+        localCheck := box addCheckBox:(resources string:'if present, use local source (suppress checkout)') on:localSourceFirst.
+        localCheck enableChannel:useManager.
+
+        cacheEntry := box 
+                        addLabelledInputField:(resources string:'source cache dir:')
+                        adjust:#right
+                        on:sourceCacheDir 
+                        tabable:true
+                        separateAtX:0.4.
+        cacheEntry immediateAccept:true; acceptOnLeave:false.
+        box leftIndent:oldIndent.
+        cacheEntry enableChannel:useManager.
+
+        (AbstractSourceCodeManager isNil 
+        or:[AbstractSourceCodeManager defaultManager isNil]) ifTrue:[
+            useManager value:false.
+            cacheEntry disable.
+            check disable.
+            localCheck enable.
+        ] ifFalse:[
+            sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName).
+        ].
+    ].
+
+    box addHorizontalLine.
+
+    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; 
+        addOkButton.
+
+    "/
+    "/ show the box ...
+    "/
+    box open.
+
+    "/
+    "/ update system settings
+    "/
+    box accepted ifTrue:[
+        Class keepMethodHistory:keepMethodHistory value.
+        Smalltalk logDoits:logDoits value.
+        Class updateChanges:updChanges value.
+        Autoload compileLazy:compileLazy value.
+        Smalltalk loadBinaries:loadBinaries value.
+        ObjectMemory nameForChanges:changeFileName value.
+
+        (hasManager and:[useManager value]) ifTrue:[
+            manager isNil ifTrue:[
+                Smalltalk at:#SourceCodeManager put:(AbstractSourceCodeManager defaultManager).
+                manager := Smalltalk at:#SourceCodeManager.
+            ].
+            Class tryLocalSourceFirst:(localSourceFirst value).
+            nm := sourceCacheDir value.
+            (fn := nm asFilename) exists ifFalse:[
+                (self confirm:(nm , ' does not exists\create ?' withCRs)) ifTrue:[
+                    fn makeDirectory; 
+                       makeReadableForAll;
+                       makeWritableForAll;
+                       makeExecutableForAll.
+                ]
+            ].
+            (fn exists 
+            and:[fn isDirectory
+            and:[fn isReadable
+            and:[fn isWritable]]]) ifTrue:[
+                AbstractSourceCodeManager cacheDirectoryName:(sourceCacheDir value).
+            ].
+            repositoryHolder notNil ifTrue:[
+                manager repositoryName:repositoryHolder value.
+                manager initialize
+            ].
+
+            showErrorNotifier value ifFalse:[
+                Exception emergencyHandler:nil
+            ] ifTrue:[
+                Exception emergencyHandler:(Launcher notifyingEmergencyHandler)
+            ].
+            DebugView defaultVerboseBacktrace:(showVerboseStack value).
+
+        ] ifFalse:[
+            Smalltalk at:#SourceCodeManager put:nil
+        ]
+    ].
+    box destroy
+
+    "Modified: 9.9.1996 / 22:43:36 / stefan"
+    "Modified: 11.1.1997 / 12:21:43 / cg"
+    "Created: 17.1.1997 / 17:39:33 / cg"
+!
+
 viewStyleSetting 
     "open a dialog on viewStyle related settings"
 
@@ -3667,6 +3717,7 @@
                                         'printer ...'
                                         'messages ...'
                                         'compilation ...'
+                                        'source & debugger ...'
                                         'object memory ...'
                                         'screen ...'
                                         'misc ...'
@@ -3682,6 +3733,7 @@
                                         #printerSettings 
                                         #messageSettings 
                                         #compilerSettings 
+                                        #sourceAndDebuggerSettings 
                                         #memorySettings 
                                         #displaySettings 
                                         #miscSettings
@@ -3692,6 +3744,7 @@
            receiver:self.
 
     "Created: 8.1.1997 / 14:07:00 / cg"
+    "Modified: 17.1.1997 / 17:40:00 / cg"
 !
 
 setupToolsMenu
@@ -4453,5 +4506,5 @@
 !Launcher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.234 1997-01-16 16:32:42 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.235 1997-01-17 17:02:34 cg Exp $'
 ! !