Merge jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 23 Mar 2016 07:52:39 +0000
branchjv
changeset 16168 71fa776ca1bb
parent 16158 327c1ef06be8 (current diff)
parent 16167 d52aef915bd9 (diff)
child 16212 bfd1155bb87f
Merge
AbstractFileBrowser.st
AbstractSettingsApplication.st
AbstractSourceCodeManagementSettingsAppl.st
SettingsDialog.st
Tools__NewSystemBrowser.st
--- a/.hgtags	Fri Mar 11 07:02:34 2016 +0100
+++ b/.hgtags	Wed Mar 23 07:52:39 2016 +0000
@@ -22,6 +22,7 @@
 36540512da66279fe8fb5bdf209d65d251a9ada8 expecco_1_9_1_iX
 3bfb972e185cf6ffe1d0f331fb97cb2ed09224e7 expecco_2_8_0
 3bfb972e185cf6ffe1d0f331fb97cb2ed09224e7 expecco_2_8_0a
+3bfb972e185cf6ffe1d0f331fb97cb2ed09224e7 expecco_2_8_0b
 3c5c447870be2c64987755e855cb397c50a93a63 expecco_2_6_0
 3c5c447870be2c64987755e855cb397c50a93a63 expecco_2_6_0_49_windows_final
 3c5c447870be2c64987755e855cb397c50a93a63 expecco_2_6_1
--- a/AbstractFileBrowser.st	Fri Mar 11 07:02:34 2016 +0100
+++ b/AbstractFileBrowser.st	Wed Mar 23 07:52:39 2016 +0000
@@ -360,6 +360,12 @@
     baseName := path baseName.
     suffix := path suffix.
 
+    cmd := UserPreferences current defaultFileOpenCommandFor:suffix.
+    cmd notNil ifTrue:[
+        aBox initialText:(cmd bindWith:fileName pathName).
+        ^ self
+    ].
+    
     mime := MIMETypes mimeTypeForSuffix:suffix.
 "/    mime notNil ifTrue:[
 "/        cmd := self initialCommandForMIME:mime file:path
@@ -2988,7 +2994,7 @@
     "setup and launch a querybox to ask for a unix command.
      Then evaluate aBlock passing the command-string as argument."
 
-    |box osName commandString|
+    |box osName commandString alwaysOpenLikeThisHolder openCmd suffix|
 
     osName := OperatingSystem platformName.
 
@@ -3000,10 +3006,19 @@
     fileName notNil ifTrue:[
         self initialCommandFor:fileName into:box.
     ].
+    alwaysOpenLikeThisHolder := false asValue.
+    box verticalPanel add:((CheckBox label:'Always use this command for this file type') model:alwaysOpenLikeThisHolder).
     box directory:(self getDirWithoutFileName:fileName).
-    box show.
-    box destroy.
-
+    box open.
+    
+    "/ box destroy.
+    alwaysOpenLikeThisHolder value ifTrue:[
+        openCmd := commandString upTo:$".
+        suffix := fileName suffix.
+        UserPreferences current defaultFileOpenCommandFor:suffix put:(openCmd,' "%1"').
+        self halt.
+    ].
+    
     commandString notNil ifTrue:[
         aBlock value:commandString
     ].
--- a/AbstractSettingsApplication.st	Fri Mar 11 07:02:34 2016 +0100
+++ b/AbstractSettingsApplication.st	Wed Mar 23 07:52:39 2016 +0000
@@ -1,6 +1,6 @@
 "
  COPYRIGHT (c) 2002 by eXept Software AG
-	      All Rights Reserved
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -14,385 +14,402 @@
 "{ NameSpace: Smalltalk }"
 
 ApplicationModel subclass:#AbstractSettingsApplication
-	instanceVariableNames:'settingsString currentUserPrefs modifiedChannel settingsDialog
-		requestor didModifySettings'
-	classVariableNames:''
-	poolDictionaries:''
-	category:'Interface-Smalltalk'
+        instanceVariableNames:'settingsString currentUserPrefs modifiedChannel settingsDialog
+                requestor didModifySettings acceptChannel'
+        classVariableNames:''
+        poolDictionaries:''
+        category:'Interface-Smalltalk'
 !
 
 AbstractSettingsApplication subclass:#AllSettingsAppl
-	instanceVariableNames:'buildDirectory localBuild selectedCompiler usedCompilerForBuild
-		selectedSettingHolder settingsList'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'buildDirectory localBuild selectedCompiler usedCompilerForBuild
+                selectedSettingHolder settingsList'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#BuildSettingsAppl
-	instanceVariableNames:'buildDirectory localBuild selectedCompiler usedCompilerForBuild'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'buildDirectory localBuild selectedCompiler usedCompilerForBuild'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#ByteCodeCompilerSettingsAppl
-	instanceVariableNames:'warnings warnSTX warnDollar warnOldStyle warnCommonMistakes
-		warnUnderscore warnCompatibility warnUnusedVars
-		warnAboutWrongVariableNames warnAboutBadComments
-		warnInconsistentReturnValues
-		warnAboutNonLowercaseLocalVariableNames allowQualifiedNames
-		allowDollar allowReservedWordsAsSelectors allowOldStyleAssignment
-		allowUnderscore allowDolphinExtensions allowSqueakExtensions
-		allowVisualAgeESSymbolLiterals allowVisualAgePrimitives
-		allowFixedPointLiterals justInTimeCompilation canLoadBinaries
-		constantFoldingSelection keepSource constantFolding
-		constantFoldingOptions fullDebugSupport immutableArrays
-		immutableStrings enableUnderscore enableDollar
-		allowEmptyStatements warnAboutPossibleSTCCompilationProblems
-		warnAboutReferenceToPrivateClass warnAboutShortLocalVariableNames
-		warnAboutPossiblyUnimplementedSelectors
-		allowExtendedBinarySelectors warnAboutMissingMethodComment
-		allowAssignmentToPoolVariable warnPlausibilityChecks'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'warnings warnSTX warnDollar warnOldStyle warnCommonMistakes
+                warnUnderscore warnCompatibility warnUnusedVars
+                warnAboutWrongVariableNames warnAboutBadComments
+                warnInconsistentReturnValues
+                warnAboutNonLowercaseLocalVariableNames allowQualifiedNames
+                allowDollar allowReservedWordsAsSelectors allowOldStyleAssignment
+                allowUnderscore allowDolphinExtensions allowSqueakExtensions
+                allowVisualAgeESSymbolLiterals allowVisualAgePrimitives
+                allowFixedPointLiterals justInTimeCompilation canLoadBinaries
+                constantFoldingSelection keepSource constantFolding
+                constantFoldingOptions fullDebugSupport immutableArrays
+                immutableStrings enableUnderscore enableDollar
+                allowEmptyStatements warnAboutPossibleSTCCompilationProblems
+                warnAboutReferenceToPrivateClass warnAboutShortLocalVariableNames
+                warnAboutPossiblyUnimplementedSelectors
+                allowExtendedBinarySelectors warnAboutMissingMethodComment
+                allowAssignmentToPoolVariable warnPlausibilityChecks'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#ChangeFileSettingsAppl
-	instanceVariableNames:'classInfos vmInfo vmErrors displayErrors logDoits updChanges
-		changeFileName beepForInfoDialog beepForWarningDialog
-		beepForErrorDialog flyByHelp beepEnabled beepInEditor'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'classInfos vmInfo vmErrors displayErrors logDoits updChanges
+                changeFileName beepForInfoDialog beepForWarningDialog
+                beepForErrorDialog flyByHelp beepEnabled beepInEditor'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#CodeGeneratorSettingsAppl
-	instanceVariableNames:'generateComments generateCommentsForGetters
-		generateCommentsForSetters'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'generateComments generateCommentsForGetters
+                generateCommentsForSetters'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#CommunicationLoggingSettingsAppl
-	instanceVariableNames:'logHTTPRequests logSOAPRequests'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'logHTTPRequests logSOAPRequests'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#DebuggerSettingsAppl
-	instanceVariableNames:'showErrorNotifier verboseBacktraceInDebugger
-		allowSendMailFromDebugger useNewLayoutInDebugger
-		hideSupportCodeInDebugger'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'showErrorNotifier verboseBacktraceInDebugger
+                allowSendMailFromDebugger useNewLayoutInDebugger
+                hideSupportCodeInDebugger'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#DisplaySettingsAppl
-	instanceVariableNames:'isColorMonitor useFixGrayPaletteLabel useFixPalette sizeY
-		clipEncodingListSelection sizeX monitorList ditherList
-		clipEncodingList ditherListSelection deepIcons monitorSelection
-		useFixPaletteLabel visualIsPseudoColor ditherSymsNotNil
-		useFixGrayPalette sizeInfos screen ditherStyles ditherSyms
-		screenDepthVisualLabelHolder maxCopyBufferSize usedWidth
-		usedHeight enableVMWareDrawingBugWorkaround'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'isColorMonitor useFixGrayPaletteLabel useFixPalette sizeY
+                clipEncodingListSelection sizeX monitorList ditherList
+                clipEncodingList ditherListSelection deepIcons monitorSelection
+                useFixPaletteLabel visualIsPseudoColor ditherSymsNotNil
+                useFixGrayPalette sizeInfos screen ditherStyles ditherSyms
+                screenDepthVisualLabelHolder maxCopyBufferSize usedWidth
+                usedHeight enableVMWareDrawingBugWorkaround'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#EditSettingsAppl
-	instanceVariableNames:'st80EditingMode tabsIs4 st80DoubleClickSelectMode
-		searchDialogIsModal startTextDragWithControl
-		extendedWordSelectMode whitespaceWordSelectMode
-		enforceContentsDropForFiles selectAllWhenClickingBeyondEnd
-		showAcceptCancelBarInBrowser useCodeView2InTools
-		autoIndentInCodeView immediateCodeCompletion
-		codeCompletionOnControlKey codeCompletionOnTabKey
-		selectionExtensionMode'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'st80EditingMode tabsIs4 st80DoubleClickSelectMode
+                searchDialogIsModal startTextDragWithControl
+                extendedWordSelectMode whitespaceWordSelectMode
+                enforceContentsDropForFiles selectAllWhenClickingBeyondEnd
+                showAcceptCancelBarInBrowser useCodeView2InTools
+                autoIndentInCodeView immediateCodeCompletion
+                codeCompletionOnControlKey codeCompletionOnTabKey
+                selectionExtensionMode'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#GeneralCompilerSettingsAppl
-	instanceVariableNames:'st80EditingMode tabsIs4 st80DoubleClickSelectMode
-		searchDialogIsModal startTextDragWithControl catchClassRedefs
-		fullHistoryUpdate historyLines keepSourceSelection keepSource
-		hasHistoryManager canLoadBinaries loadBinaries catchMethodRedefs
-		userNameInHistoryHolder'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'st80EditingMode tabsIs4 st80DoubleClickSelectMode
+                searchDialogIsModal startTextDragWithControl catchClassRedefs
+                fullHistoryUpdate historyLines keepSourceSelection keepSource
+                hasHistoryManager canLoadBinaries loadBinaries catchMethodRedefs
+                userNameInHistoryHolder'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#HTTPStartServerSettingsApplication
-	instanceVariableNames:'portNumberChannel informationLabel hasNoCreatedServerChannel
-		hasCreatedServerChannel useFcgiHolder
-		hasWebServerClassesNotLoadedHolder'
-	classVariableNames:'CreatedServers'
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'portNumberChannel informationLabel hasNoCreatedServerChannel
+                hasCreatedServerChannel useFcgiHolder
+                hasWebServerClassesNotLoadedHolder'
+        classVariableNames:'CreatedServers'
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#KbdMappingSettingsAppl
-	instanceVariableNames:'selectedRawKey macroTextHolder selectedFunctionKey
-		labelTextHolder changeMapHolder currentKeyHolder functionKeyList
-		rawKeyList mappings'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'selectedRawKey macroTextHolder selectedFunctionKey
+                labelTextHolder changeMapHolder currentKeyHolder functionKeyList
+                rawKeyList mappings'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#LanguageSettingsAppl
-	instanceVariableNames:'languageHolder languageIndexHolder languageList
-		languageListHolder listOfLanguages translatedLanguages
-		noticeLabelHolder currentFlagAndLanguageChannel
-		currentLanguageLabel perLanguageResources useSystemLanguageHolder'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'languageHolder languageIndexHolder languageList
+                languageListHolder listOfLanguages translatedLanguages
+                noticeLabelHolder currentFlagAndLanguageChannel
+                currentLanguageLabel perLanguageResources useSystemLanguageHolder'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#MemorySettingsAppl
-	instanceVariableNames:'newSpaceSize maxOldSpace fastMoreLimit warningLabelHolder
-		codeTrigger codeLimit oldIncr compressLimit igcFreeLimit igcLimit
-		igcFreeAmount stackLimit supportsJustInTimeCompilation
-		methodCodeSizeLimit'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'newSpaceSize maxOldSpace fastMoreLimit warningLabelHolder
+                codeTrigger codeLimit oldIncr compressLimit igcFreeLimit igcLimit
+                igcFreeAmount stackLimit supportsJustInTimeCompilation
+                methodCodeSizeLimit'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
+!
+
+AbstractSettingsApplication subclass:#MiscBridgeCommunicationSettingsAppl
+        instanceVariableNames:'smallTeamServerEnabled selectedSmallTeamHost listOfSmallTeamHosts
+                smallTeamHostEntry dotNetBridgeVerbose dotNetBridgeRunsInIDE
+                smalltalkBridgeEnabled smalltalkBridgeVerbose'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#MiscCommunicationSettingsAppl
-	instanceVariableNames:'remoteBrowsingEnabled windowMigrationEnabled
-		windowMigrationPassword windowMigrationAuthenticate
-		enablePasswordCheck smallTeamServerEnabled selectedSmallTeamHost
-		listOfSmallTeamHosts smallTeamHostEntry addHostEnabled
-		removeHostEnabled acceptChannel smtpServerName
-		dotNetBridgeVerbose dotNetBridgeRunsInIDE smalltalkBridgeEnabled
-		smalltalkBridgeVerbose'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'smtpServerName'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#MiscDisplay2SettingsAppl
-	instanceVariableNames:'nativeWidgets nativeDialogs shadows opaqueVariablePanelResize
-		opaqueTableColumnResize lowerOnRightClickInTitle
-		lowerOnShiftClickInTitle displaySupportsNativeFileDialogs
-		nativeFileDialogs cartoonToolTipStyle'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'nativeWidgets nativeDialogs shadows opaqueVariablePanelResize
+                opaqueTableColumnResize lowerOnRightClickInTitle
+                lowerOnShiftClickInTitle displaySupportsNativeFileDialogs
+                nativeFileDialogs cartoonToolTipStyle'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#MiscDisplaySettingsAppl
-	instanceVariableNames:'returnFocus focusFollowsMouse mouseWheelFocusFollowsMouse
-		beepEnabled takeFocus activateOnClick
-		formatHostNameinWindowLabels hostNameInLabelHolder
-		showAccelerators newWindowLabelFormat formatHostNameWindowLabel
-		selectOnRightClick popUpMenuOnRelease
-		showRightButtonMenuOnRelease formatHostNameWindowLabel1
-		formatHostNameWindowLabel2 allowMouseWheelZoom
-		forceWindowsIntoMonitorBounds button2WithAltKey
-		autoRaiseOnFocusIn shouldRememberLastExtent
-		menuPanelTakesFocusOnClick'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'returnFocus focusFollowsMouse mouseWheelFocusFollowsMouse
+                beepEnabled takeFocus activateOnClick
+                formatHostNameinWindowLabels hostNameInLabelHolder
+                showAccelerators newWindowLabelFormat formatHostNameWindowLabel
+                selectOnRightClick popUpMenuOnRelease
+                showRightButtonMenuOnRelease formatHostNameWindowLabel1
+                formatHostNameWindowLabel2 allowMouseWheelZoom
+                forceWindowsIntoMonitorBounds button2WithAltKey
+                autoRaiseOnFocusIn shouldRememberLastExtent
+                menuPanelTakesFocusOnClick'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
+!
+
+AbstractSettingsApplication subclass:#MiscSmalltalkCommunicationSettingsAppl
+        instanceVariableNames:'remoteBrowsingEnabled windowMigrationEnabled
+                windowMigrationPassword windowMigrationAuthenticate
+                enablePasswordCheck smallTeamServerEnabled selectedSmallTeamHost
+                listOfSmallTeamHosts smallTeamHostEntry addHostEnabled
+                removeHostEnabled smalltalkBridgeEnabled smalltalkBridgeVerbose
+                smallTeamViaXMPPEnabled selectedXMPPSmallTeamUser
+                xmppSmallTeamUserEntry listOfXMPPSmallTeamUsers
+                smallteamXMPPServer smallteamXMPPUser smallteamXMPPPassword'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#OsiSettingsAppl
-	instanceVariableNames:'osiACSEConnectionLogging osiROSEErrorLogging osiCMISEErrorLogging
-		osiACSEErrorLogging osiROSEPresent osiCMISEPresent
-		osiCMISEMessageLogging osiACSEDataLogging
-		osiROSEInvokationLogging osiACSEPresent osiROSEResponseLogging'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'osiACSEConnectionLogging osiROSEErrorLogging osiCMISEErrorLogging
+                osiACSEErrorLogging osiROSEPresent osiCMISEPresent
+                osiCMISEMessageLogging osiACSEDataLogging
+                osiROSEInvokationLogging osiACSEPresent osiROSEResponseLogging'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#PrinterSettingsAppl
-	instanceVariableNames:'selectedUnit supportsColor topMargin rightMargin bottomMargin
-		landscape pageFormatList pageFormat unitList leftMargin
-		possiblePrinters printerType printerTypeSelection
-		printCommandList commandList printCommand printFilename
-		enableFormat enablelandscape enableMargins enableColorBox
-		printerIsDrivenByCommand printerSupportsPrintingToFile
-		supportsPageFormatSetting supportsMarginSetting
-		supportsColorSetting'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'selectedUnit supportsColor topMargin rightMargin bottomMargin
+                landscape pageFormatList pageFormat unitList leftMargin
+                possiblePrinters printerType printerTypeSelection
+                printCommandList commandList printCommand printFilename
+                enableFormat enablelandscape enableMargins enableColorBox
+                printerIsDrivenByCommand printerSupportsPrintingToFile
+                supportsPageFormatSetting supportsMarginSetting
+                supportsColorSetting'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#ProcessorSchedulerSettingsAppl
-	instanceVariableNames:'dynamicPrios preemptive'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'dynamicPrios preemptive'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#RDoItServerSettingsAppl
-	instanceVariableNames:'rDoitLogging rDoitsEnabled rDoitErrorLogging hasRDoitServer
-		rDoitErrorDebugging rDoitServerPortOrPath
-		rDoitEnabledOnlyViaLocalConnection scriptingEnabled
-		scriptingEnabledOnlyViaLocalConnection scriptingErrorDebugging
-		scriptingErrorLogging scriptingLogging scriptingServerPortOrPath
-		rDoitOnlyViaLocalConnection'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'rDoitLogging rDoitsEnabled rDoitErrorLogging hasRDoitServer
+                rDoitErrorDebugging rDoitServerPortOrPath
+                rDoitEnabledOnlyViaLocalConnection scriptingEnabled
+                scriptingEnabledOnlyViaLocalConnection scriptingErrorDebugging
+                scriptingErrorLogging scriptingLogging scriptingServerPortOrPath
+                rDoitOnlyViaLocalConnection'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#SQLServerSettingsAppl
-	instanceVariableNames:'sqlServerEnabled sqlSmalltalkServerEnabled sqlLogging
-		sqlDataLogging sqlErrorLogging hasSQLServer sqlErrorDebugging
-		sqlServerPort sqlStatementLogging'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'sqlServerEnabled sqlSmalltalkServerEnabled sqlLogging
+                sqlDataLogging sqlErrorLogging hasSQLServer sqlErrorDebugging
+                sqlServerPort sqlStatementLogging'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#STCCompilerSettingsAppl
-	instanceVariableNames:'cc ccOptions stcIncludes linkCommand stc linkArgs linkSharedArgs
-		canLoadBinaries stcDefines stcLibraries stcOptions stcLibraryPath
-		stcCompilationSelection stcCompilationList makeCommand
-		stcKeepCIntermediate supportedCCompilerSelection verbose'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'cc ccOptions stcIncludes linkCommand stc linkArgs linkSharedArgs
+                canLoadBinaries stcDefines stcLibraries stcOptions stcLibraryPath
+                stcCompilationSelection stcCompilationList makeCommand
+                stcKeepCIntermediate supportedCCompilerSelection verbose'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#SourceCodeFormatSettingsAppl
-	instanceVariableNames:'spaceAfterKeywordSelector emptyLineAfterTemporaries tabIndent
-		autoFormat cStyleBlocks editorText maxLengthForSingleLineBlocks
-		blockArgumentsOnNewLine spaceAfterReturnToken
-		spaceAroundTemporaries spaceAfterBlockStart spaceBeforeBlockEnd
-		oldUserPreferences reformatLocked'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'spaceAfterKeywordSelector emptyLineAfterTemporaries tabIndent
+                autoFormat cStyleBlocks editorText maxLengthForSingleLineBlocks
+                blockArgumentsOnNewLine spaceAfterReturnToken
+                spaceAroundTemporaries spaceAfterBlockStart spaceBeforeBlockEnd
+                oldUserPreferences reformatLocked'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#SourceCodeManagementSettingsAppl
-	instanceVariableNames:'sourceCacheDir useManager availableManagers condenseSourceCache
-		setupSourceCodeManager checkClassesWhenCheckingIn
-		formattingConfiguration flushSourceCache localSourceFirst
-		repositoryHolder manager repository listOfModules
-		managerTypePerModule addPerModuleRoot removeEnabled
-		perModuleRootModule acceptChannel removePerModuleRoot
-		perModuleRoot selectedPerModuleRoot rootsPerModule
-		selectedManagerTypeIndexHolder managerIsCVSSourceCodeManager
-		managerIsStoreSourceCodeManager perModuleFieldsEnableHolder
-		managerIsSmallTeamSourceCodeManager verboseSourceCodeAccess
-		keepMethodSource packageToAddHolder managerTypeIndexToAddHolder
-		managerTypeToAddHolder managerPerMatchingModule
-		selectedManagerPerMatchingModuleHolder'
-	classVariableNames:'RecentlyUsedCVSRoots RecentlyUsedStoreHosts
-		RecentlyUsedSmallTeamHosts LastStoreHost LastStoreUser
-		LastStorePassword FillCacheProcess'
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'sourceCacheDir useManager availableManagers condenseSourceCache
+                setupSourceCodeManager checkClassesWhenCheckingIn
+                formattingConfiguration flushSourceCache localSourceFirst
+                repositoryHolder manager repository listOfModules
+                managerTypePerModule addPerModuleRoot removeEnabled
+                perModuleRootModule removePerModuleRoot
+                perModuleRoot selectedPerModuleRoot rootsPerModule
+                selectedManagerTypeIndexHolder managerIsCVSSourceCodeManager
+                managerIsStoreSourceCodeManager perModuleFieldsEnableHolder
+                managerIsSmallTeamSourceCodeManager verboseSourceCodeAccess
+                keepMethodSource packageToAddHolder managerTypeIndexToAddHolder
+                managerTypeToAddHolder managerPerMatchingModule
+                selectedManagerPerMatchingModuleHolder'
+        classVariableNames:'RecentlyUsedCVSRoots RecentlyUsedStoreHosts
+                RecentlyUsedSmallTeamHosts LastStoreHost LastStoreUser
+                LastStorePassword FillCacheProcess'
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 SimpleDialog subclass:#PerModuleManagerSettingDialog
-	instanceVariableNames:'packageHolder managerNameHolder availableManagers'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication::SourceCodeManagementSettingsAppl
+        instanceVariableNames:'packageHolder managerNameHolder availableManagers'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication::SourceCodeManagementSettingsAppl
 !
 
 AbstractSettingsApplication subclass:#StyleSettingsAppl
-	instanceVariableNames:'showStandardStylesOnly styleList selectedStyle
-		styleDirectoryContents infoLabelHolder noticeLabelHolder
-		previewVisibleHolder'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'showStandardStylesOnly styleList selectedStyle
+                styleDirectoryContents infoLabelHolder noticeLabelHolder
+                previewVisibleHolder'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#SyntaxColorSettingsAppl
-	instanceVariableNames:'coloredText syntaxColor syntaxColors resetList resetListSelection
-		fullSelectorCheck syntaxColoring oldUserPreferences
-		syntaxFontSelector syntaxFonts syntaxElementList
-		syntaxElementSelection syntaxEmphasisList syntaxEmphasisSelection
-		emphasisDictionary resetListDictionary'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'coloredText syntaxColor syntaxColors resetList resetListSelection
+                fullSelectorCheck syntaxColoring oldUserPreferences
+                syntaxFontSelector syntaxFonts syntaxElementList
+                syntaxElementSelection syntaxEmphasisList syntaxEmphasisSelection
+                emphasisDictionary resetListDictionary'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#SystemBrowserSettingsAppl
-	instanceVariableNames:'showAcceptCancelBarInBrowser useSearchBarInBrowser
-		showMethodTemplate useCodeView2InTools
-		showEmbeddedTestRunnerInBrowser showBookmarkBar
-		webBrowserLikeLayout sortAndIndentClassesByInheritance
-		showLocalHistory showGlobalHistory useInPlaceSearchInBrowserLists
-		sourceCodeManagementMenuLayout confirmRefactorings
-		smallLintRulesetDefault'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'showAcceptCancelBarInBrowser useSearchBarInBrowser
+                showMethodTemplate useCodeView2InTools
+                showEmbeddedTestRunnerInBrowser showBookmarkBar
+                webBrowserLikeLayout sortAndIndentClassesByInheritance
+                showLocalHistory showGlobalHistory useInPlaceSearchInBrowserLists
+                sourceCodeManagementMenuLayout confirmRefactorings
+                smallLintRulesetDefault'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#SystemMessageSettingsAppl
-	instanceVariableNames:'classInfos vmInfo vmErrors displayErrors logDoits updChanges
-		changeFileName beepForInfoDialog beepForWarningDialog
-		beepForErrorDialog flyByHelp beepEnabled beepInEditor
-		toolTipAutoHideDelay sendMessagesAlsoToTranscript
-		onlyShowTooltipsForActiveWindow'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'classInfos vmInfo vmErrors displayErrors logDoits updChanges
+                changeFileName beepForInfoDialog beepForWarningDialog
+                beepForErrorDialog flyByHelp beepEnabled beepInEditor
+                toolTipAutoHideDelay sendMessagesAlsoToTranscript
+                onlyShowTooltipsForActiveWindow'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#TerminalViewSettingsAppl
-	instanceVariableNames:'terminalOutputIsUTF8 terminalInputIsUTF8'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'terminalOutputIsUTF8 terminalInputIsUTF8'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#ToolboxSettingsAppl
-	instanceVariableNames:'changesBrowserClassName fileBrowserClassName'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'changesBrowserClassName fileBrowserClassName'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 ApplicationModel subclass:#ClassToolSetting
-	instanceVariableNames:'optionValueHolder optionValueList optionLabelHolder
-		optionSelectionHolder optionLabelList optionCustomValueHolder
-		optionCustomValueVisibleHolder optionCustomValueBackgroundHolder'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication::ToolboxSettingsAppl
+        instanceVariableNames:'optionValueHolder optionValueList optionLabelHolder
+                optionSelectionHolder optionLabelList optionCustomValueHolder
+                optionCustomValueVisibleHolder optionCustomValueBackgroundHolder'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication::ToolboxSettingsAppl
 !
 
 AbstractSettingsApplication subclass:#ToolsSettingsAppl
-	instanceVariableNames:'useNewVersionDiffBrowser transcriptBufferSize useNewInspector
-		showClockInLauncher useNewChangesBrowser useNewFileBrowser
-		useNewSystemBrowser useNewFileDialog useNewSettingsApplication
-		useProcessMonitorV2 useSmalltalkDocumentViewer useTestRunner2
-		showTipOfTheDayAtStartup autoRaiseTranscript eclipseStyleMenus
-		useNewChangeSetBrowser useCodeView2InTools
-		externalDiffCommandTemplate'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'useNewVersionDiffBrowser transcriptBufferSize useNewInspector
+                showClockInLauncher useNewChangesBrowser useNewFileBrowser
+                useNewSystemBrowser useNewFileDialog useNewSettingsApplication
+                useProcessMonitorV2 useSmalltalkDocumentViewer useTestRunner2
+                showTipOfTheDayAtStartup autoRaiseTranscript eclipseStyleMenus
+                useNewChangeSetBrowser useCodeView2InTools
+                externalDiffCommandTemplate'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 AbstractSettingsApplication subclass:#WorkspaceSettingsAppl
-	instanceVariableNames:'usersModuleName workspaceDirectory'
-	classVariableNames:''
-	poolDictionaries:''
-	privateIn:AbstractSettingsApplication
+        instanceVariableNames:'usersModuleName workspaceDirectory'
+        classVariableNames:''
+        poolDictionaries:''
+        privateIn:AbstractSettingsApplication
 !
 
 !AbstractSettingsApplication class methodsFor:'documentation'!
@@ -400,7 +417,7 @@
 copyright
 "
  COPYRIGHT (c) 2002 by eXept Software AG
-	      All Rights Reserved
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -421,16 +438,16 @@
 
     typical use:
 
-	|settingsList settingsApp|
-
-	settingsList := NewLauncher settingsList.
-
-	settingsApp := SettingsDialog new.
-	'settingsApp requestor:requestingApplication'.
-	settingsApp installSettingsEntries:settingsList.
-	settingsApp allButOpen.
-	settingsApp window label:('ST/X Settings').
-	settingsApp openWindow.
+        |settingsList settingsApp|
+
+        settingsList := NewLauncher settingsList.
+
+        settingsApp := SettingsDialog new.
+        'settingsApp requestor:requestingApplication'.
+        settingsApp installSettingsEntries:settingsList.
+        settingsApp allButOpen.
+        settingsApp window label:('ST/X Settings').
+        settingsApp openWindow.
 
 "
 ! !
@@ -487,57 +504,57 @@
        name: windowSpecForDialog
        window:
       (WindowSpec
-	 label: 'NewApplication'
-	 name: 'NewApplication'
-	 labelChannel: settingsString
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 531 488)
+         label: 'NewApplication'
+         name: 'NewApplication'
+         labelChannel: settingsString
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 531 488)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (SubCanvasSpec
-	     name: 'Content'
-	     layout: (LayoutFrame 7 0 0 0 -7 1 -40 1)
-	     level: 0
-	     hasHorizontalScrollBar: true
-	     hasVerticalScrollBar: true
-	     minorKey: windowSpec
-	     createNewBuilder: false
-	   )
-	  (HorizontalPanelViewSpec
-	     name: 'BottonPanel'
-	     layout: (LayoutFrame 5 0 -40 1 -7 1 0 1)
-	     horizontalLayout: right
-	     verticalLayout: center
-	     horizontalSpace: 3
-	     verticalSpace: 3
-	     reverseOrderIfOKAtLeft: true
-	     component:
-	    (SpecCollection
-	       collection: (
-		(ActionButtonSpec
-		   label: 'Cancel'
-		   name: 'CancelButton'
-		   translateLabel: true
-		   model: doCancel
-		   extent: (Point 159 25)
-		 )
-		(ActionButtonSpec
-		   label: 'OK'
-		   name: 'OKButton'
-		   translateLabel: true
-		   model: doAccept
-		   enableChannel: modifiedChannel
-		   isDefault: true
-		   defaultable: true
-		   extent: (Point 159 25)
-		 )
-		)
-
-	     )
-	   )
-	  )
+         collection: (
+          (SubCanvasSpec
+             name: 'Content'
+             layout: (LayoutFrame 7 0 0 0 -7 1 -40 1)
+             level: 0
+             hasHorizontalScrollBar: true
+             hasVerticalScrollBar: true
+             minorKey: windowSpec
+             createNewBuilder: false
+           )
+          (HorizontalPanelViewSpec
+             name: 'BottonPanel'
+             layout: (LayoutFrame 5 0 -40 1 -7 1 0 1)
+             horizontalLayout: right
+             verticalLayout: center
+             horizontalSpace: 3
+             verticalSpace: 3
+             reverseOrderIfOKAtLeft: true
+             component:
+            (SpecCollection
+               collection: (
+                (ActionButtonSpec
+                   label: 'Cancel'
+                   name: 'CancelButton'
+                   translateLabel: true
+                   model: doCancel
+                   extent: (Point 159 25)
+                 )
+                (ActionButtonSpec
+                   label: 'OK'
+                   name: 'OKButton'
+                   translateLabel: true
+                   model: doAccept
+                   enableChannel: modifiedChannel
+                   isDefault: true
+                   defaultable: true
+                   extent: (Point 159 25)
+                 )
+                )
+
+             )
+           )
+          )
 
        )
      )
@@ -633,23 +650,23 @@
     |result|
 
     self hasUnsavedChanges ifTrue:[
-	askForChangeOnRelease ifTrue:[
-	    result := self confirmWithCancel:(self resources
-				string:'Apply changes made in %1 ?'
-				with:(resources string:settingsString) allBold).
-	] ifFalse:[
-	    result := true.
-	].
-
-	result isNil ifTrue:[
-	    ^ false
-	].
-	result ifTrue:[
-	    self saveSettings
-	] ifFalse:[
-	    "/ reload current settings to show the right thing when re-entering.
-	    self readSettings
-	]
+        askForChangeOnRelease ifTrue:[
+            result := self confirmWithCancel:(self resources
+                                string:'Apply changes made in %1 ?'
+                                with:(resources string:settingsString) allBold).
+        ] ifFalse:[
+            result := true.
+        ].
+
+        result isNil ifTrue:[
+            ^ false
+        ].
+        result ifTrue:[
+            self saveSettings
+        ] ifFalse:[
+            "/ reload current settings to show the right thing when re-entering.
+            self readSettings
+        ]
     ].
     ^ true
 
@@ -664,8 +681,8 @@
 
 saveSettingsIfUnsavedChangesArePresent
     self hasUnsavedChanges ifTrue:[
-	self saveSettings.
-	self modifiedChannel value:false
+        self saveSettings.
+        self modifiedChannel value:false
     ].
 !
 
@@ -688,7 +705,7 @@
 modifiedChannel
 
     modifiedChannel isNil ifTrue:[
-	modifiedChannel := false asValue.
+        modifiedChannel := false asValue.
     ].
     ^ modifiedChannel
 ! !
@@ -700,24 +717,24 @@
      The object is typically the current userPreferences object, or a flag-holder, such
      as ParserFlags.
      Using this, and a list of aspect selectors replaces code like:
-	someone aspect1 ~= (self aspect1 value) ifTrue:[^ true].
-	someone aspect2 ~= (self aspect2 value) ifTrue:[^ true].
-	...
-	someone aspectN ~= (self aspectN value) ifTrue:[^ true].
-	^ false
+        someone aspect1 ~= (self aspect1 value) ifTrue:[^ true].
+        someone aspect2 ~= (self aspect2 value) ifTrue:[^ true].
+        ...
+        someone aspectN ~= (self aspectN value) ifTrue:[^ true].
+        ^ false
      Prerequisite:
-	local aspects must be named like corresponding aspect methods in the flag-provider.
+        local aspects must be named like corresponding aspect methods in the flag-provider.
     "
 
     aListOfAspects do:[:eachAspectSymbol |
-	(self myAspectHolderFor:eachAspectSymbol) value ~= (anAspectProvider perform:eachAspectSymbol) ifTrue:[
-	    self debuggingCodeFor:#cg is:[
-		Transcript showCR:'settings aspect is different: ',eachAspectSymbol.
-		Transcript showCR:'  here: ',((self perform:eachAspectSymbol) value) printString.
-		Transcript showCR:'  there: ',((anAspectProvider perform:eachAspectSymbol) value) printString.
-	    ].
-	    ^ true
-	].
+        (self myAspectHolderFor:eachAspectSymbol) value ~= (anAspectProvider perform:eachAspectSymbol) ifTrue:[
+            self debuggingCodeFor:#cg is:[
+                Transcript showCR:'settings aspect is different: ',eachAspectSymbol.
+                Transcript showCR:'  here: ',((self perform:eachAspectSymbol) value) printString.
+                Transcript showCR:'  there: ',((anAspectProvider perform:eachAspectSymbol) value) printString.
+            ].
+            ^ true
+        ].
     ].
     ^ false
 
@@ -729,17 +746,17 @@
     "/ but I am tired of having to add all those aspect getters.
 
     ^ self
-	perform:aspectSymbol
-	ifNotUnderstood:[
-	    |holder|
-
-	    self createBuilder.
-	    (holder := builder bindingAt:aspectSymbol) isNil ifTrue:[
-		builder aspectAt:aspectSymbol put:(holder := nil asValue).
-		holder onChangeSend:#updateModifiedChannel to:self.
-	    ].
-	    holder
-	].
+        perform:aspectSymbol
+        ifNotUnderstood:[
+            |holder|
+
+            self createBuilder.
+            (holder := builder bindingAt:aspectSymbol) isNil ifTrue:[
+                builder aspectAt:aspectSymbol put:(holder := nil asValue).
+                holder onChangeSend:#updateModifiedChannel to:self.
+            ].
+            holder
+        ].
 !
 
 readAspects:aListOfAspects from:anAspectProvider
@@ -747,18 +764,18 @@
      The object is typically the current userPreferences object, or a flag-holder, such
      as ParserFlags.
      Using this, and a list of aspect selectors replaces code like:
-	self aspect1 value:(someone aspect1).
-	self aspect2 value:(someone aspect2).
-	...
-	self aspectN value:(someone aspectN).
+        self aspect1 value:(someone aspect1).
+        self aspect2 value:(someone aspect2).
+        ...
+        self aspectN value:(someone aspectN).
      Prerequisite:
-	local aspects must be named like corresponding aspect methods in the flag-provider.
+        local aspects must be named like corresponding aspect methods in the flag-provider.
     "
 
     aListOfAspects do:[:eachAspectSymbol |
-	(self myAspectHolderFor:eachAspectSymbol)
-	    value:(anAspectProvider perform:eachAspectSymbol)
-	    withoutNotifying:self
+        (self myAspectHolderFor:eachAspectSymbol)
+            value:(anAspectProvider perform:eachAspectSymbol)
+            withoutNotifying:self
     ].
 
     "Modified: / 08-02-2011 / 09:11:03 / cg"
@@ -769,18 +786,18 @@
      The object is typically the current userPreferences object, or a flag-holder, such
      as ParserFlags.
      Using this, and a list of aspect selectors replaces code like:
-	someone aspect1:(self aspect1 value).
-	someone aspect2:(self aspect2 value).
-	...
-	someone aspectN:(self aspectN value).
+        someone aspect1:(self aspect1 value).
+        someone aspect2:(self aspect2 value).
+        ...
+        someone aspectN:(self aspectN value).
      Prerequisite:
-	local aspects must be named like corresponding aspect methods in the flag-provider.
+        local aspects must be named like corresponding aspect methods in the flag-provider.
     "
 
     aListOfAspects do:[:eachAspectSymbol |
-	anAspectProvider
-	    perform:eachAspectSymbol asMutator
-	    with:(self myAspectHolderFor:eachAspectSymbol) value
+        anAspectProvider
+            perform:eachAspectSymbol asMutator
+            with:(self myAspectHolderFor:eachAspectSymbol) value
     ].
 
     "Modified: / 24-08-2010 / 16:52:42 / sr"
@@ -887,11 +904,11 @@
 
     filename := self helpFilename.
     filename isNil ifTrue:[
-	self warn:(self resources string:'Sorry - no Help available here.').
-	^ self.
+        self warn:(self resources string:'Sorry - no Help available here.').
+        ^ self.
     ].
     self withWaitCursorDo:[
-	HTMLDocumentView openFullOnHelpFile:filename
+        HTMLDocumentView openFullOnHelpFile:filename
     ].
 !
 
@@ -1078,12 +1095,12 @@
 
     buildDir := buildDirectory value.
     buildDir isEmptyOrNil ifTrue:[
-	^ self.
+        ^ self.
     ].
     buildDir := buildDir asFilename.
     (buildDir exists and:[Dialog confirm:('Really delete <1p> ?' expandMacrosWith:buildDir physicalPathName)]) ifTrue:[
-	buildDir recursiveRemove.
-	buildDir makeDirectory.
+        buildDir recursiveRemove.
+        buildDir makeDirectory.
     ].
 ! !
 
@@ -1099,8 +1116,8 @@
 
 buildDirectory
     buildDirectory isNil ifTrue:[
-	buildDirectory := ValueHolder new.
-	buildDirectory onChangeSend:#updateModifiedChannel to:self
+        buildDirectory := ValueHolder new.
+        buildDirectory onChangeSend:#updateModifiedChannel to:self
     ].
     ^ buildDirectory.
 !
@@ -1143,8 +1160,8 @@
 
 localBuild
     localBuild isNil ifTrue:[
-	localBuild := UserPreferences current localBuild asValue.
-	localBuild onChangeSend:#updateModifiedChannel to:self
+        localBuild := UserPreferences current localBuild asValue.
+        localBuild onChangeSend:#updateModifiedChannel to:self
     ].
     ^ localBuild.
 !
@@ -1187,8 +1204,8 @@
 
 usedCompilerForBuild
     usedCompilerForBuild isNil ifTrue:[
-	usedCompilerForBuild := nil asValue.
-	usedCompilerForBuild onChangeSend:#updateModifiedChannel to:self
+        usedCompilerForBuild := nil asValue.
+        usedCompilerForBuild onChangeSend:#updateModifiedChannel to:self
     ].
     ^ usedCompilerForBuild.
 
@@ -1205,8 +1222,8 @@
 
 postBuildDirectoryField:aField
     aField historyList value:(Array
-	with:(OperatingSystem getHomeDirectory asFilename construct:'stx_build') pathName
-	with:(Filename currentDirectory construct:'stx_build') pathName)
+        with:(OperatingSystem getHomeDirectory asFilename construct:'stx_build') pathName
+        with:(Filename currentDirectory construct:'stx_build') pathName)
 ! !
 
 !AbstractSettingsApplication::AllSettingsAppl methodsFor:'queries'!
@@ -1472,12 +1489,12 @@
 
     buildDir := buildDirectory value.
     buildDir isEmptyOrNil ifTrue:[
-	^ self.
+        ^ self.
     ].
     buildDir := buildDir asFilename.
     (buildDir exists and:[Dialog confirm:('Really delete <1p> ?' expandMacrosWith:buildDir physicalPathName)]) ifTrue:[
-	buildDir recursiveRemove.
-	buildDir makeDirectory.
+        buildDir recursiveRemove.
+        buildDir makeDirectory.
     ].
 ! !
 
@@ -1493,8 +1510,8 @@
 
 buildDirectory
     buildDirectory isNil ifTrue:[
-	buildDirectory := ValueHolder new.
-	buildDirectory onChangeSend:#updateModifiedChannel to:self
+        buildDirectory := ValueHolder new.
+        buildDirectory onChangeSend:#updateModifiedChannel to:self
     ].
     ^ buildDirectory.
 !
@@ -1511,16 +1528,16 @@
 
 localBuild
     localBuild isNil ifTrue:[
-	localBuild := UserPreferences current localBuild asValue.
-	localBuild onChangeSend:#updateModifiedChannel to:self
+        localBuild := UserPreferences current localBuild asValue.
+        localBuild onChangeSend:#updateModifiedChannel to:self
     ].
     ^ localBuild.
 !
 
 usedCompilerForBuild
     usedCompilerForBuild isNil ifTrue:[
-	usedCompilerForBuild := nil asValue.
-	usedCompilerForBuild onChangeSend:#updateModifiedChannel to:self
+        usedCompilerForBuild := nil asValue.
+        usedCompilerForBuild onChangeSend:#updateModifiedChannel to:self
     ].
     ^ usedCompilerForBuild.
 
@@ -1537,8 +1554,8 @@
 
 postBuildDirectoryField:aField
     aField historyList value:(Array
-	with:(OperatingSystem getHomeDirectory asFilename construct:'stx_build') pathName
-	with:(Filename currentDirectory construct:'stx_build') pathName)
+        with:(OperatingSystem getHomeDirectory asFilename construct:'stx_build') pathName
+        with:(Filename currentDirectory construct:'stx_build') pathName)
 ! !
 
 !AbstractSettingsApplication::BuildSettingsAppl methodsFor:'queries'!
@@ -1781,453 +1798,453 @@
        name: windowSpec
        window:
       (WindowSpec
-	 label: 'Byte Code Compiler Settings'
-	 name: 'Byte Code Compiler Settings'
-	 flags: 1
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 665 706)
+         label: 'Byte Code Compiler Settings'
+         name: 'Byte Code Compiler Settings'
+         flags: 1
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 665 706)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (VerticalPanelViewSpec
-	     name: 'VerticalPanel1'
-	     layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-	     horizontalLayout: fit
-	     verticalLayout: top
-	     horizontalSpace: 3
-	     verticalSpace: 3
-	     component:
-	    (SpecCollection
-	       collection: (
-		(CheckBoxSpec
-		   label: 'Just in Time Compilation to Machine Code'
-		   name: 'JustInTimeCompilation'
-		   model: justInTimeCompilation
-		   translateLabel: true
-		   extent: (Point 665 25)
-		 )
-		(DividerSpec
-		   name: 'Separator3'
-		   extent: (Point 665 3)
-		 )
-		(ViewSpec
-		   name: 'Box1'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (VerticalPanelViewSpec
-			 name: 'VerticalPanel1_1'
-			 layout: (LayoutFrame 0 0 0 0 -20 0.5 0 1)
-			 horizontalLayout: fit
-			 verticalLayout: top
-			 horizontalSpace: 3
-			 verticalSpace: 0
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Allow Underscore in Identifiers'
-			       name: 'AllowUnderscoreInIdentifiers'
-			       activeHelpKey: allowUnderscoreInIdentifier
-			       model: allowUnderscoreInIdentifier
-			       translateLabel: true
-			       extent: (Point 313 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Allow Dollar in Identifiers'
-			       name: 'AllowDollarInIdentifiers'
-			       activeHelpKey: allowDollarInIdentifier
-			       model: allowDollarInIdentifier
-			       translateLabel: true
-			       extent: (Point 313 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Allow VW3 QualifiedNames'
-			       name: 'AllowVW3QualifiedNames'
-			       activeHelpKey: allowQualifiedNames
-			       model: allowQualifiedNames
-			       translateLabel: true
-			       extent: (Point 313 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Allow OldStyle Assignment (_)'
-			       name: 'AllowOldStyleAssignment'
-			       activeHelpKey: allowOldStyleAssignment
-			       model: allowOldStyleAssignment
-			       translateLabel: true
-			       extent: (Point 313 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Allow Reserved Words as Selector (self)'
-			       name: 'AllowReservedWordsAsSelector'
-			       activeHelpKey: allowReservedWordsAsSelectors
-			       model: allowReservedWordsAsSelectors
-			       translateLabel: true
-			       extent: (Point 313 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Allow Extended Binary Selectors'
-			       name: 'CheckBox4'
-			       activeHelpKey: allowExtendedBinarySelectors
-			       model: allowExtendedBinarySelectors
-			       translateLabel: true
-			       extent: (Point 313 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Allow Assignment to Pool Variable'
-			       name: 'CheckBox6'
-			       activeHelpKey: allowAssignmentToPoolVariable
-			       model: allowAssignmentToPoolVariable
-			       translateLabel: true
-			       extent: (Point 313 22)
-			     )
-			    )
-
-			 )
-		       )
-		      (VerticalPanelViewSpec
-			 name: 'VerticalPanel1_2'
-			 layout: (LayoutFrame 0 0.5 0 0 0 1 0 1)
-			 horizontalLayout: left
-			 verticalLayout: top
-			 horizontalSpace: 3
-			 verticalSpace: 0
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Allow Squeak Extensions'
-			       name: 'AllowSqueakExtensions'
-			       activeHelpKey: allowSqueakExtensions
-			       model: allowSqueakExtensions
-			       translateLabel: true
-			       extent: (Point 665 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Allow Dolphin Extensions'
-			       name: 'AllowDolphinExtensions'
-			       activeHelpKey: allowDolphinExtensions
-			       model: allowDolphinExtensions
-			       translateLabel: true
-			       extent: (Point 665 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Allow VisualAge ES-Symbols'
-			       name: 'AllowVisualAgeESSymbolLiterals'
-			       activeHelpKey: allowVisualAgeESSymbolLiterals
-			       model: allowVisualAgeESSymbolLiterals
-			       translateLabel: true
-			       extent: (Point 665 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Allow VisualAge Primitives'
-			       name: 'CheckBox8'
-			       activeHelpKey: allowVisualAgePrimitives
-			       model: allowVisualAgePrimitives
-			       translateLabel: true
-			       extent: (Point 665 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Allow FixedPoint-Number Literals'
-			       name: 'AllowFixedPointLiterals'
-			       activeHelpKey: allowFixedPointLiterals
-			       model: allowFixedPointLiterals
-			       translateLabel: true
-			       extent: (Point 665 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Allow Empty Statements'
-			       name: 'AllowEmptyStatements'
-			       activeHelpKey: allowEmptyStatements
-			       model: allowEmptyStatements
-			       translateLabel: true
-			       extent: (Point 665 22)
-			     )
-			    )
-
-			 )
-		       )
-		      )
-
-		   )
-		   extent: (Point 665 157)
-		 )
-		(DividerSpec
-		   name: 'Separator4'
-		   extent: (Point 665 1)
-		 )
-		(CheckBoxSpec
-		   label: 'Warnings'
-		   name: 'Warnings'
-		   activeHelpKey: warnings
-		   model: warnings
-		   translateLabel: true
-		   extent: (Point 665 22)
-		 )
-		(ViewSpec
-		   name: 'Box2'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (VerticalPanelViewSpec
-			 name: 'VerticalPanel2_1'
-			 layout: (LayoutFrame 20 0 0 0 0 0.5 0 1)
-			 horizontalLayout: fit
-			 verticalLayout: top
-			 horizontalSpace: 3
-			 verticalSpace: 0
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'ST/X Extensions'
-			       name: 'STXExtensions'
-			       activeHelpKey: warnSTXSpecials
-			       enableChannel: warnings
-			       model: warnSTXSpecials
-			       translateLabel: true
-			       extent: (Point 313 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Reference to Private Class'
-			       name: 'CheckBox1'
-			       activeHelpKey: warnAboutReferenceToPrivateClass
-			       enableChannel: warnings
-			       model: warnAboutReferenceToPrivateClass
-			       translateLabel: true
-			       extent: (Point 313 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Underscores in Identifiers'
-			       name: 'UnderscoresInIdentifiers'
-			       activeHelpKey: warnUnderscoreInIdentifier
-			       enableChannel: enableUnderscore
-			       model: warnUnderscoreInIdentifier
-			       translateLabel: true
-			       extent: (Point 313 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Dollars in Identifiers'
-			       name: 'DollarsInIdentifiers'
-			       activeHelpKey: warnDollarInIdentifier
-			       enableChannel: enableDollar
-			       model: warnDollarInIdentifier
-			       translateLabel: true
-			       extent: (Point 313 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'OldStyle Assignment'
-			       name: 'OldStyleAssignment'
-			       activeHelpKey: warnOldStyleAssignment
-			       enableChannel: warnings
-			       model: warnOldStyleAssignment
-			       translateLabel: true
-			       extent: (Point 313 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Possible Incompatibilities'
-			       name: 'PossibleIncompatibilities'
-			       activeHelpKey: warnPossibleIncompatibilities
-			       enableChannel: warnings
-			       model: warnPossibleIncompatibilities
-			       translateLabel: true
-			       extent: (Point 313 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Possible STC Compilation Problems'
-			       name: 'PossibleSTCCompilationProblems'
-			       activeHelpKey: warnAboutPossibleSTCCompilationProblems
-			       enableChannel: warnings
-			       model: warnAboutPossibleSTCCompilationProblems
-			       translateLabel: true
-			       extent: (Point 313 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Possibly Unimplemented Selectors'
-			       name: 'CheckBox3'
-			       activeHelpKey: warnAboutPossiblyUnimplementedSelectors
-			       enableChannel: warnings
-			       model: warnAboutPossiblyUnimplementedSelectors
-			       translateLabel: true
-			       extent: (Point 313 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Plausibility Checks'
-			       name: 'CheckBox7'
-			       activeHelpKey: warnPlausibilityChecks
-			       enableChannel: warnings
-			       model: warnPlausibilityChecks
-			       translateLabel: true
-			       extent: (Point 313 22)
-			     )
-			    )
-
-			 )
-		       )
-		      (VerticalPanelViewSpec
-			 name: 'VerticalPanel2_2'
-			 layout: (LayoutFrame -1 0.5 0 0 0 1 0 1)
-			 horizontalLayout: left
-			 verticalLayout: top
-			 horizontalSpace: 3
-			 verticalSpace: 0
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Unused Method Variables'
-			       name: 'UnusedMethodVariables'
-			       enableChannel: warnings
-			       model: warnUnusedVars
-			       translateLabel: true
-			       extent: (Point 600 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Bad Variable Names (non-English article)'
-			       name: 'BadVariableNames'
-			       enableChannel: warnings
-			       model: warnAboutWrongVariableNames
-			       translateLabel: true
-			       extent: (Point 600 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Bad (Non-Lowercase) Local Variable Names'
-			       name: 'BadLocalVariableNames'
-			       enableChannel: warnings
-			       model: warnAboutNonLowercaseLocalVariableNames
-			       translateLabel: true
-			       extent: (Point 600 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Bad (Short) Local Variable Names'
-			       name: 'CheckBox2'
-			       enableChannel: warnings
-			       model: warnAboutShortLocalVariableNames
-			       translateLabel: true
-			       extent: (Point 600 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Bad (empty) Comments'
-			       name: 'BadComments'
-			       enableChannel: warnings
-			       model: warnAboutBadComments
-			       translateLabel: true
-			       extent: (Point 600 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Method-Comment Missing '
-			       name: 'CheckBox5'
-			       enableChannel: warnings
-			       model: warnAboutMissingMethodComment
-			       translateLabel: true
-			       extent: (Point 600 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Inconsistent Return Values'
-			       name: 'InconsistentReturnValues'
-			       enableChannel: warnings
-			       model: warnInconsistentReturnValues
-			       translateLabel: true
-			       extent: (Point 600 22)
-			     )
-			    (CheckBoxSpec
-			       label: 'Common Mistakes'
-			       name: 'CommonMistakes'
-			       enableChannel: warnings
-			       model: warnCommonMistakes
-			       translateLabel: true
-			       extent: (Point 600 22)
-			     )
-			    )
-
-			 )
-		       )
-		      )
-
-		   )
-		   extent: (Point 665 206)
-		 )
-		(ViewSpec
-		   name: 'Box4'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (ActionButtonSpec
-			 label: 'Reenable Suppressed Warnings Now'
-			 name: 'Button1'
-			 layout: (LayoutOrigin 0 0.5 0 0)
-			 translateLabel: true
-			 model: reenableSuppressedWarnings
-		       )
-		      )
-
-		   )
-		   extent: (Point 665 30)
-		 )
-		(DividerSpec
-		   name: 'Separator5'
-		   extent: (Point 665 2)
-		 )
-		(CheckBoxSpec
-		   label: 'Literal Strings are Immutable'
-		   name: 'LiteralStringsAreImmutable'
-		   activeHelpKey: stringsAreImmutable
-		   model: stringsAreImmutable
-		   translateLabel: true
-		   extent: (Point 665 22)
-		 )
-		(CheckBoxSpec
-		   label: 'Literal Arrays are Immutable'
-		   name: 'CheckBox9'
-		   activeHelpKey: arraysAreImmutable
-		   model: arraysAreImmutable
-		   translateLabel: true
-		   extent: (Point 665 22)
-		 )
-		(CheckBoxSpec
-		   label: 'Full Debug Info'
-		   name: 'FullDebugInfo'
-		   activeHelpKey: fullDebugInfo
-		   model: fullDebugSupport
-		   translateLabel: true
-		   extent: (Point 665 22)
-		 )
-		(DividerSpec
-		   name: 'Separator6'
-		   extent: (Point 665 2)
-		 )
-		(ViewSpec
-		   name: 'Box3'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Constant Folding:'
-			 name: 'ConstantFoldingLabel'
-			 layout: (LayoutFrame 0 0 0 0 306 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (PopUpListSpec
-			 label: 'PopUp List'
-			 name: 'ConstantFolding'
-			 layout: (LayoutFrame 313 0 0 0 -5 1 22 0)
-			 tabable: true
-			 model: constantFoldingSelection
-			 menu: constantFolding
-			 useIndex: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 665 22)
-		 )
-		)
-
-	     )
-	   )
-	  )
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel1'
+             layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+             horizontalLayout: fit
+             verticalLayout: top
+             horizontalSpace: 3
+             verticalSpace: 3
+             component:
+            (SpecCollection
+               collection: (
+                (CheckBoxSpec
+                   label: 'Just in Time Compilation to Machine Code'
+                   name: 'JustInTimeCompilation'
+                   model: justInTimeCompilation
+                   translateLabel: true
+                   extent: (Point 665 25)
+                 )
+                (DividerSpec
+                   name: 'Separator3'
+                   extent: (Point 665 3)
+                 )
+                (ViewSpec
+                   name: 'Box1'
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (VerticalPanelViewSpec
+                         name: 'VerticalPanel1_1'
+                         layout: (LayoutFrame 0 0 0 0 -20 0.5 0 1)
+                         horizontalLayout: fit
+                         verticalLayout: top
+                         horizontalSpace: 3
+                         verticalSpace: 0
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Allow Underscore in Identifiers'
+                               name: 'AllowUnderscoreInIdentifiers'
+                               activeHelpKey: allowUnderscoreInIdentifier
+                               model: allowUnderscoreInIdentifier
+                               translateLabel: true
+                               extent: (Point 313 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Allow Dollar in Identifiers'
+                               name: 'AllowDollarInIdentifiers'
+                               activeHelpKey: allowDollarInIdentifier
+                               model: allowDollarInIdentifier
+                               translateLabel: true
+                               extent: (Point 313 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Allow VW3 QualifiedNames'
+                               name: 'AllowVW3QualifiedNames'
+                               activeHelpKey: allowQualifiedNames
+                               model: allowQualifiedNames
+                               translateLabel: true
+                               extent: (Point 313 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Allow OldStyle Assignment (_)'
+                               name: 'AllowOldStyleAssignment'
+                               activeHelpKey: allowOldStyleAssignment
+                               model: allowOldStyleAssignment
+                               translateLabel: true
+                               extent: (Point 313 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Allow Reserved Words as Selector (self)'
+                               name: 'AllowReservedWordsAsSelector'
+                               activeHelpKey: allowReservedWordsAsSelectors
+                               model: allowReservedWordsAsSelectors
+                               translateLabel: true
+                               extent: (Point 313 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Allow Extended Binary Selectors'
+                               name: 'CheckBox4'
+                               activeHelpKey: allowExtendedBinarySelectors
+                               model: allowExtendedBinarySelectors
+                               translateLabel: true
+                               extent: (Point 313 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Allow Assignment to Pool Variable'
+                               name: 'CheckBox6'
+                               activeHelpKey: allowAssignmentToPoolVariable
+                               model: allowAssignmentToPoolVariable
+                               translateLabel: true
+                               extent: (Point 313 22)
+                             )
+                            )
+
+                         )
+                       )
+                      (VerticalPanelViewSpec
+                         name: 'VerticalPanel1_2'
+                         layout: (LayoutFrame 0 0.5 0 0 0 1 0 1)
+                         horizontalLayout: left
+                         verticalLayout: top
+                         horizontalSpace: 3
+                         verticalSpace: 0
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Allow Squeak Extensions'
+                               name: 'AllowSqueakExtensions'
+                               activeHelpKey: allowSqueakExtensions
+                               model: allowSqueakExtensions
+                               translateLabel: true
+                               extent: (Point 665 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Allow Dolphin Extensions'
+                               name: 'AllowDolphinExtensions'
+                               activeHelpKey: allowDolphinExtensions
+                               model: allowDolphinExtensions
+                               translateLabel: true
+                               extent: (Point 665 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Allow VisualAge ES-Symbols'
+                               name: 'AllowVisualAgeESSymbolLiterals'
+                               activeHelpKey: allowVisualAgeESSymbolLiterals
+                               model: allowVisualAgeESSymbolLiterals
+                               translateLabel: true
+                               extent: (Point 665 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Allow VisualAge Primitives'
+                               name: 'CheckBox8'
+                               activeHelpKey: allowVisualAgePrimitives
+                               model: allowVisualAgePrimitives
+                               translateLabel: true
+                               extent: (Point 665 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Allow FixedPoint-Number Literals'
+                               name: 'AllowFixedPointLiterals'
+                               activeHelpKey: allowFixedPointLiterals
+                               model: allowFixedPointLiterals
+                               translateLabel: true
+                               extent: (Point 665 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Allow Empty Statements'
+                               name: 'AllowEmptyStatements'
+                               activeHelpKey: allowEmptyStatements
+                               model: allowEmptyStatements
+                               translateLabel: true
+                               extent: (Point 665 22)
+                             )
+                            )
+
+                         )
+                       )
+                      )
+
+                   )
+                   extent: (Point 665 157)
+                 )
+                (DividerSpec
+                   name: 'Separator4'
+                   extent: (Point 665 1)
+                 )
+                (CheckBoxSpec
+                   label: 'Warnings'
+                   name: 'Warnings'
+                   activeHelpKey: warnings
+                   model: warnings
+                   translateLabel: true
+                   extent: (Point 665 22)
+                 )
+                (ViewSpec
+                   name: 'Box2'
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (VerticalPanelViewSpec
+                         name: 'VerticalPanel2_1'
+                         layout: (LayoutFrame 20 0 0 0 0 0.5 0 1)
+                         horizontalLayout: fit
+                         verticalLayout: top
+                         horizontalSpace: 3
+                         verticalSpace: 0
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'ST/X Extensions'
+                               name: 'STXExtensions'
+                               activeHelpKey: warnSTXSpecials
+                               enableChannel: warnings
+                               model: warnSTXSpecials
+                               translateLabel: true
+                               extent: (Point 313 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Reference to Private Class'
+                               name: 'CheckBox1'
+                               activeHelpKey: warnAboutReferenceToPrivateClass
+                               enableChannel: warnings
+                               model: warnAboutReferenceToPrivateClass
+                               translateLabel: true
+                               extent: (Point 313 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Underscores in Identifiers'
+                               name: 'UnderscoresInIdentifiers'
+                               activeHelpKey: warnUnderscoreInIdentifier
+                               enableChannel: enableUnderscore
+                               model: warnUnderscoreInIdentifier
+                               translateLabel: true
+                               extent: (Point 313 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Dollars in Identifiers'
+                               name: 'DollarsInIdentifiers'
+                               activeHelpKey: warnDollarInIdentifier
+                               enableChannel: enableDollar
+                               model: warnDollarInIdentifier
+                               translateLabel: true
+                               extent: (Point 313 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'OldStyle Assignment'
+                               name: 'OldStyleAssignment'
+                               activeHelpKey: warnOldStyleAssignment
+                               enableChannel: warnings
+                               model: warnOldStyleAssignment
+                               translateLabel: true
+                               extent: (Point 313 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Possible Incompatibilities'
+                               name: 'PossibleIncompatibilities'
+                               activeHelpKey: warnPossibleIncompatibilities
+                               enableChannel: warnings
+                               model: warnPossibleIncompatibilities
+                               translateLabel: true
+                               extent: (Point 313 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Possible STC Compilation Problems'
+                               name: 'PossibleSTCCompilationProblems'
+                               activeHelpKey: warnAboutPossibleSTCCompilationProblems
+                               enableChannel: warnings
+                               model: warnAboutPossibleSTCCompilationProblems
+                               translateLabel: true
+                               extent: (Point 313 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Possibly Unimplemented Selectors'
+                               name: 'CheckBox3'
+                               activeHelpKey: warnAboutPossiblyUnimplementedSelectors
+                               enableChannel: warnings
+                               model: warnAboutPossiblyUnimplementedSelectors
+                               translateLabel: true
+                               extent: (Point 313 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Plausibility Checks'
+                               name: 'CheckBox7'
+                               activeHelpKey: warnPlausibilityChecks
+                               enableChannel: warnings
+                               model: warnPlausibilityChecks
+                               translateLabel: true
+                               extent: (Point 313 22)
+                             )
+                            )
+
+                         )
+                       )
+                      (VerticalPanelViewSpec
+                         name: 'VerticalPanel2_2'
+                         layout: (LayoutFrame -1 0.5 0 0 0 1 0 1)
+                         horizontalLayout: left
+                         verticalLayout: top
+                         horizontalSpace: 3
+                         verticalSpace: 0
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Unused Method Variables'
+                               name: 'UnusedMethodVariables'
+                               enableChannel: warnings
+                               model: warnUnusedVars
+                               translateLabel: true
+                               extent: (Point 600 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Bad Variable Names (non-English article)'
+                               name: 'BadVariableNames'
+                               enableChannel: warnings
+                               model: warnAboutWrongVariableNames
+                               translateLabel: true
+                               extent: (Point 600 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Bad (Non-Lowercase) Local Variable Names'
+                               name: 'BadLocalVariableNames'
+                               enableChannel: warnings
+                               model: warnAboutNonLowercaseLocalVariableNames
+                               translateLabel: true
+                               extent: (Point 600 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Bad (Short) Local Variable Names'
+                               name: 'CheckBox2'
+                               enableChannel: warnings
+                               model: warnAboutShortLocalVariableNames
+                               translateLabel: true
+                               extent: (Point 600 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Bad (empty) Comments'
+                               name: 'BadComments'
+                               enableChannel: warnings
+                               model: warnAboutBadComments
+                               translateLabel: true
+                               extent: (Point 600 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Method-Comment Missing '
+                               name: 'CheckBox5'
+                               enableChannel: warnings
+                               model: warnAboutMissingMethodComment
+                               translateLabel: true
+                               extent: (Point 600 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Inconsistent Return Values'
+                               name: 'InconsistentReturnValues'
+                               enableChannel: warnings
+                               model: warnInconsistentReturnValues
+                               translateLabel: true
+                               extent: (Point 600 22)
+                             )
+                            (CheckBoxSpec
+                               label: 'Common Mistakes'
+                               name: 'CommonMistakes'
+                               enableChannel: warnings
+                               model: warnCommonMistakes
+                               translateLabel: true
+                               extent: (Point 600 22)
+                             )
+                            )
+
+                         )
+                       )
+                      )
+
+                   )
+                   extent: (Point 665 206)
+                 )
+                (ViewSpec
+                   name: 'Box4'
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (ActionButtonSpec
+                         label: 'Reenable Suppressed Warnings Now'
+                         name: 'Button1'
+                         layout: (LayoutOrigin 0 0.5 0 0)
+                         translateLabel: true
+                         model: reenableSuppressedWarnings
+                       )
+                      )
+
+                   )
+                   extent: (Point 665 30)
+                 )
+                (DividerSpec
+                   name: 'Separator5'
+                   extent: (Point 665 2)
+                 )
+                (CheckBoxSpec
+                   label: 'Literal Strings are Immutable'
+                   name: 'LiteralStringsAreImmutable'
+                   activeHelpKey: stringsAreImmutable
+                   model: stringsAreImmutable
+                   translateLabel: true
+                   extent: (Point 665 22)
+                 )
+                (CheckBoxSpec
+                   label: 'Literal Arrays are Immutable'
+                   name: 'CheckBox9'
+                   activeHelpKey: arraysAreImmutable
+                   model: arraysAreImmutable
+                   translateLabel: true
+                   extent: (Point 665 22)
+                 )
+                (CheckBoxSpec
+                   label: 'Full Debug Info'
+                   name: 'FullDebugInfo'
+                   activeHelpKey: fullDebugInfo
+                   model: fullDebugSupport
+                   translateLabel: true
+                   extent: (Point 665 22)
+                 )
+                (DividerSpec
+                   name: 'Separator6'
+                   extent: (Point 665 2)
+                 )
+                (ViewSpec
+                   name: 'Box3'
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Constant Folding:'
+                         name: 'ConstantFoldingLabel'
+                         layout: (LayoutFrame 0 0 0 0 306 0 22 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (PopUpListSpec
+                         label: 'PopUp List'
+                         name: 'ConstantFolding'
+                         layout: (LayoutFrame 313 0 0 0 -5 1 22 0)
+                         tabable: true
+                         model: constantFoldingSelection
+                         menu: constantFolding
+                         useIndex: true
+                       )
+                      )
+
+                   )
+                   extent: (Point 665 22)
+                 )
+                )
+
+             )
+           )
+          )
 
        )
      )
@@ -2237,22 +2254,22 @@
 
 basicReadSettings
     self
-	readAspects:(self simpleAspects)
-	from:ParserFlags.
+        readAspects:(self simpleAspects)
+        from:ParserFlags.
 
     self constantFoldingSelection
-	value:(self class constantFoldingOptions indexOf:Compiler foldConstants ifAbsent:3).
+        value:(self class constantFoldingOptions indexOf:Compiler foldConstants ifAbsent:3).
 
     self supportsJustInTimeCompilation ifTrue:[
-	self fullDebugSupport value:(ObjectMemory fullSingleStepSupport ? false)
+        self fullDebugSupport value:(ObjectMemory fullSingleStepSupport ? false)
     ] ifFalse:[
-	self fullDebugSupport value:(ParserFlags fullLineNumberInfo)
+        self fullDebugSupport value:(ParserFlags fullLineNumberInfo)
     ].
 
     self supportsJustInTimeCompilation ifTrue:[
-	self justInTimeCompilation value:(ObjectMemory justInTimeCompilation ? false)
+        self justInTimeCompilation value:(ObjectMemory justInTimeCompilation ? false)
     ] ifFalse:[
-	self justInTimeCompilation value:false
+        self justInTimeCompilation value:false
     ].
 
     self warnAboutMissingMethodComment value:(UserPreferences current enforceComment).
@@ -2262,21 +2279,21 @@
 
 basicSaveSettings
     self
-	writeAspects:(self simpleAspects)
-	to:ParserFlags.
+        writeAspects:(self simpleAspects)
+        to:ParserFlags.
 
     ParserFlags lineNumberInfo:(self fullDebugSupport value ifTrue:[#full] ifFalse:[true]).
 
     Compiler foldConstants:(self class constantFoldingOptions at:self constantFoldingSelection value).
 
     self supportsJustInTimeCompilation ifTrue:[
-	| justInTime |
-	justInTime := self justInTimeCompilation value.
-	justInTime ifTrue:[
-	    Smalltalk allMethodsDo:[:m | m checked:false].
-	].
-	ObjectMemory justInTimeCompilation:justInTime.
-	ObjectMemory fullSingleStepSupport:self fullDebugSupport value.
+        | justInTime |
+        justInTime := self justInTimeCompilation value.
+        justInTime ifTrue:[
+            Smalltalk allMethodsDo:[:m | m checked:false].
+        ].
+        ObjectMemory justInTimeCompilation:justInTime.
+        ObjectMemory fullSingleStepSupport:self fullDebugSupport value.
     ].
 
     UserPreferences current enforceComment:(self warnAboutMissingMethodComment value).
@@ -2292,42 +2309,42 @@
 
 simpleAspects
     ^
-	    #(
-		warnings
-		warnCommonMistakes
-		warnPossibleIncompatibilities
-		warnDollarInIdentifier
-		warnOldStyleAssignment
-		warnSTXSpecials
-		warnUnderscoreInIdentifier
-		warnUnusedVars
-		warnAboutWrongVariableNames
-		warnAboutBadComments
-		warnInconsistentReturnValues
-		warnAboutNonLowercaseLocalVariableNames
-		warnAboutShortLocalVariableNames
-		warnAboutPossibleSTCCompilationProblems
-		warnAboutReferenceToPrivateClass
-		warnAboutPossiblyUnimplementedSelectors
-		warnPlausibilityChecks
-
-		allowDollarInIdentifier
-		allowDolphinExtensions
-		allowOldStyleAssignment
-		allowQualifiedNames
-		allowReservedWordsAsSelectors
-		allowSqueakExtensions
-		allowUnderscoreInIdentifier
-		allowVisualAgeESSymbolLiterals
-		allowVisualAgePrimitives
-		allowFixedPointLiterals
-		allowEmptyStatements
-		allowExtendedBinarySelectors
-
-		arraysAreImmutable
-		stringsAreImmutable
-		allowAssignmentToPoolVariable
-	    )
+            #(
+                warnings
+                warnCommonMistakes
+                warnPossibleIncompatibilities
+                warnDollarInIdentifier
+                warnOldStyleAssignment
+                warnSTXSpecials
+                warnUnderscoreInIdentifier
+                warnUnusedVars
+                warnAboutWrongVariableNames
+                warnAboutBadComments
+                warnInconsistentReturnValues
+                warnAboutNonLowercaseLocalVariableNames
+                warnAboutShortLocalVariableNames
+                warnAboutPossibleSTCCompilationProblems
+                warnAboutReferenceToPrivateClass
+                warnAboutPossiblyUnimplementedSelectors
+                warnPlausibilityChecks
+
+                allowDollarInIdentifier
+                allowDolphinExtensions
+                allowOldStyleAssignment
+                allowQualifiedNames
+                allowReservedWordsAsSelectors
+                allowSqueakExtensions
+                allowUnderscoreInIdentifier
+                allowVisualAgeESSymbolLiterals
+                allowVisualAgePrimitives
+                allowFixedPointLiterals
+                allowEmptyStatements
+                allowExtendedBinarySelectors
+
+                arraysAreImmutable
+                stringsAreImmutable
+                allowAssignmentToPoolVariable
+            )
 
     "Created: / 20-11-2006 / 22:37:17 / cg"
 !
@@ -2342,8 +2359,8 @@
 allowAssignmentToPoolVariable
 
     allowAssignmentToPoolVariable isNil ifTrue:[
-	allowAssignmentToPoolVariable := ParserFlags allowAssignmentToPoolVariable asValue.
-	allowAssignmentToPoolVariable onChangeSend:#updateModifiedChannel to:self.
+        allowAssignmentToPoolVariable := ParserFlags allowAssignmentToPoolVariable asValue.
+        allowAssignmentToPoolVariable onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ allowAssignmentToPoolVariable.
 
@@ -2353,9 +2370,9 @@
 allowDollarInIdentifier
 
     allowDollar isNil ifTrue:[
-	allowDollar := ParserFlags allowDollarInIdentifier asValue.
-	allowDollar onChangeSend:#updateModifiedChannel to:self.
-	allowDollar addDependent:self.
+        allowDollar := ParserFlags allowDollarInIdentifier asValue.
+        allowDollar onChangeSend:#updateModifiedChannel to:self.
+        allowDollar addDependent:self.
     ].
     ^ allowDollar.
 !
@@ -2363,8 +2380,8 @@
 allowDolphinExtensions
 
     allowDolphinExtensions isNil ifTrue:[
-	allowDolphinExtensions := ParserFlags allowDolphinExtensions asValue.
-	allowDolphinExtensions onChangeSend:#updateModifiedChannel to:self.
+        allowDolphinExtensions := ParserFlags allowDolphinExtensions asValue.
+        allowDolphinExtensions onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ allowDolphinExtensions.
 !
@@ -2372,9 +2389,9 @@
 allowEmptyStatements
 
     allowEmptyStatements isNil ifTrue:[
-	allowEmptyStatements := ParserFlags allowEmptyStatements asValue.
-	allowEmptyStatements onChangeSend:#updateModifiedChannel to:self.
-	"/ allowEmptyStatements addDependent:self.
+        allowEmptyStatements := ParserFlags allowEmptyStatements asValue.
+        allowEmptyStatements onChangeSend:#updateModifiedChannel to:self.
+        "/ allowEmptyStatements addDependent:self.
     ].
     ^ allowEmptyStatements.
 
@@ -2384,8 +2401,8 @@
 allowExtendedBinarySelectors
 
     allowExtendedBinarySelectors isNil ifTrue:[
-	allowExtendedBinarySelectors := (ParserFlags allowExtendedBinarySelectors ? false) asValue.
-	allowExtendedBinarySelectors onChangeSend:#updateModifiedChannel to:self.
+        allowExtendedBinarySelectors := (ParserFlags allowExtendedBinarySelectors ? false) asValue.
+        allowExtendedBinarySelectors onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ allowExtendedBinarySelectors.
 !
@@ -2393,8 +2410,8 @@
 allowFixedPointLiterals
 
     allowFixedPointLiterals isNil ifTrue:[
-	allowFixedPointLiterals := (ParserFlags allowFixedPointLiterals ? false) asValue.
-	allowFixedPointLiterals onChangeSend:#updateModifiedChannel to:self.
+        allowFixedPointLiterals := (ParserFlags allowFixedPointLiterals ? false) asValue.
+        allowFixedPointLiterals onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ allowFixedPointLiterals.
 !
@@ -2402,8 +2419,8 @@
 allowOldStyleAssignment
 
     allowOldStyleAssignment isNil ifTrue:[
-	allowOldStyleAssignment := ParserFlags allowOldStyleAssignment asValue.
-	allowOldStyleAssignment onChangeSend:#updateModifiedChannel to:self.
+        allowOldStyleAssignment := ParserFlags allowOldStyleAssignment asValue.
+        allowOldStyleAssignment onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ allowOldStyleAssignment.
 !
@@ -2411,8 +2428,8 @@
 allowQualifiedNames
 
     allowQualifiedNames isNil ifTrue:[
-	allowQualifiedNames := ParserFlags allowQualifiedNames asValue.
-	allowQualifiedNames onChangeSend:#updateModifiedChannel to:self.
+        allowQualifiedNames := ParserFlags allowQualifiedNames asValue.
+        allowQualifiedNames onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ allowQualifiedNames.
 !
@@ -2420,8 +2437,8 @@
 allowReservedWordsAsSelectors
 
     allowReservedWordsAsSelectors isNil ifTrue:[
-	allowReservedWordsAsSelectors := ParserFlags allowReservedWordsAsSelectors asValue.
-	allowReservedWordsAsSelectors onChangeSend:#updateModifiedChannel to:self.
+        allowReservedWordsAsSelectors := ParserFlags allowReservedWordsAsSelectors asValue.
+        allowReservedWordsAsSelectors onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ allowReservedWordsAsSelectors.
 !
@@ -2429,8 +2446,8 @@
 allowSqueakExtensions
 
     allowSqueakExtensions isNil ifTrue:[
-	allowSqueakExtensions := ParserFlags allowSqueakExtensions asValue.
-	allowSqueakExtensions onChangeSend:#updateModifiedChannel to:self.
+        allowSqueakExtensions := ParserFlags allowSqueakExtensions asValue.
+        allowSqueakExtensions onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ allowSqueakExtensions.
 !
@@ -2438,9 +2455,9 @@
 allowUnderscoreInIdentifier
 
     allowUnderscore isNil ifTrue:[
-	allowUnderscore := ParserFlags allowUnderscoreInIdentifier asValue.
-	allowUnderscore onChangeSend:#updateModifiedChannel to:self.
-	allowUnderscore addDependent:self.
+        allowUnderscore := ParserFlags allowUnderscoreInIdentifier asValue.
+        allowUnderscore onChangeSend:#updateModifiedChannel to:self.
+        allowUnderscore addDependent:self.
     ].
     ^ allowUnderscore.
 !
@@ -2448,8 +2465,8 @@
 allowVisualAgeESSymbolLiterals
 
     allowVisualAgeESSymbolLiterals isNil ifTrue:[
-	allowVisualAgeESSymbolLiterals := ParserFlags allowVisualAgeESSymbolLiterals asValue.
-	allowVisualAgeESSymbolLiterals onChangeSend:#updateModifiedChannel to:self.
+        allowVisualAgeESSymbolLiterals := ParserFlags allowVisualAgeESSymbolLiterals asValue.
+        allowVisualAgeESSymbolLiterals onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ allowVisualAgeESSymbolLiterals.
 !
@@ -2457,8 +2474,8 @@
 allowVisualAgePrimitives
 
     allowVisualAgePrimitives isNil ifTrue:[
-	allowVisualAgePrimitives := ParserFlags allowVisualAgePrimitives asValue.
-	allowVisualAgePrimitives onChangeSend:#updateModifiedChannel to:self.
+        allowVisualAgePrimitives := ParserFlags allowVisualAgePrimitives asValue.
+        allowVisualAgePrimitives onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ allowVisualAgePrimitives.
 
@@ -2468,8 +2485,8 @@
 arraysAreImmutable
 
     immutableArrays isNil ifTrue:[
-	immutableArrays := ParserFlags arraysAreImmutable asValue.
-	immutableArrays onChangeSend:#updateModifiedChannel to:self.
+        immutableArrays := ParserFlags arraysAreImmutable asValue.
+        immutableArrays onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ immutableArrays.
 !
@@ -2477,7 +2494,7 @@
 constantFolding
 
     constantFolding isNil ifTrue:[
-	constantFolding := (resources array:(self class constantFoldingStrings)) asList.
+        constantFolding := (resources array:(self class constantFoldingStrings)) asList.
     ].
     ^ constantFolding.
 !
@@ -2485,7 +2502,7 @@
 constantFoldingOptions
 
     constantFoldingOptions isNil ifTrue:[
-	constantFoldingOptions := self class constantFoldingOptions.
+        constantFoldingOptions := self class constantFoldingOptions.
     ].
     ^ constantFoldingOptions.
 !
@@ -2493,10 +2510,10 @@
 constantFoldingSelection
 
     constantFoldingSelection isNil ifTrue:[
-	| index |
-	index := self class constantFoldingOptions indexOf:Compiler foldConstants ifAbsent:3.
-	constantFoldingSelection := index asValue.
-	constantFoldingSelection onChangeSend:#updateModifiedChannel to:self.
+        | index |
+        index := self class constantFoldingOptions indexOf:Compiler foldConstants ifAbsent:3.
+        constantFoldingSelection := index asValue.
+        constantFoldingSelection onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ constantFoldingSelection.
 !
@@ -2504,15 +2521,15 @@
 enableDollar
 
     enableDollar isNil ifTrue:[
-	enableDollar := true asValue.
-	enableDollar addDependent:self.
+        enableDollar := true asValue.
+        enableDollar addDependent:self.
     ].
     ^ enableDollar.
 !
 
 enableUnderscore
     enableUnderscore isNil ifTrue:[
-	enableUnderscore := true asValue.
+        enableUnderscore := true asValue.
     ].
     ^ enableUnderscore.
 !
@@ -2520,12 +2537,12 @@
 fullDebugSupport
 
     fullDebugSupport isNil ifTrue:[
-	self supportsJustInTimeCompilation ifTrue:[
-	    fullDebugSupport := (ObjectMemory fullSingleStepSupport ? false) asValue.
-	] ifFalse:[
-	    fullDebugSupport := (ParserFlags fullLineNumberInfo) asValue.
-	].
-	fullDebugSupport onChangeSend:#updateModifiedChannel to:self.
+        self supportsJustInTimeCompilation ifTrue:[
+            fullDebugSupport := (ObjectMemory fullSingleStepSupport ? false) asValue.
+        ] ifFalse:[
+            fullDebugSupport := (ParserFlags fullLineNumberInfo) asValue.
+        ].
+        fullDebugSupport onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ fullDebugSupport.
 
@@ -2535,12 +2552,12 @@
 justInTimeCompilation
 
     justInTimeCompilation isNil ifTrue:[
-	self supportsJustInTimeCompilation ifTrue:[
-	    justInTimeCompilation := (ObjectMemory justInTimeCompilation ? false) asValue.
-	] ifFalse:[
-	    justInTimeCompilation := false asValue.
-	].
-	justInTimeCompilation onChangeSend:#updateModifiedChannel to:self.
+        self supportsJustInTimeCompilation ifTrue:[
+            justInTimeCompilation := (ObjectMemory justInTimeCompilation ? false) asValue.
+        ] ifFalse:[
+            justInTimeCompilation := false asValue.
+        ].
+        justInTimeCompilation onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ justInTimeCompilation.
 !
@@ -2548,16 +2565,16 @@
 stringsAreImmutable
 
     immutableStrings isNil ifTrue:[
-	immutableStrings := ParserFlags arraysAreImmutable asValue.
-	immutableStrings onChangeSend:#updateModifiedChannel to:self.
+        immutableStrings := ParserFlags arraysAreImmutable asValue.
+        immutableStrings onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ immutableStrings.
 !
 
 warnAboutBadComments
     warnAboutBadComments isNil ifTrue:[
-	warnAboutBadComments := ParserFlags warnAboutBadComments asValue.
-	warnAboutBadComments onChangeSend:#updateModifiedChannel to:self.
+        warnAboutBadComments := ParserFlags warnAboutBadComments asValue.
+        warnAboutBadComments onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnAboutBadComments.
 !
@@ -2565,8 +2582,8 @@
 warnAboutMissingMethodComment
 
     warnAboutMissingMethodComment isNil ifTrue:[
-	warnAboutMissingMethodComment := UserPreferences current enforceComment asValue.
-	warnAboutMissingMethodComment onChangeSend:#updateModifiedChannel to:self.
+        warnAboutMissingMethodComment := UserPreferences current enforceComment asValue.
+        warnAboutMissingMethodComment onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnAboutMissingMethodComment.
 
@@ -2575,8 +2592,8 @@
 
 warnAboutNonLowercaseLocalVariableNames
     warnAboutNonLowercaseLocalVariableNames isNil ifTrue:[
-	warnAboutNonLowercaseLocalVariableNames := ParserFlags warnAboutNonLowercaseLocalVariableNames asValue.
-	warnAboutNonLowercaseLocalVariableNames onChangeSend:#updateModifiedChannel to:self.
+        warnAboutNonLowercaseLocalVariableNames := ParserFlags warnAboutNonLowercaseLocalVariableNames asValue.
+        warnAboutNonLowercaseLocalVariableNames onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnAboutNonLowercaseLocalVariableNames.
 
@@ -2586,8 +2603,8 @@
 warnAboutPossibleSTCCompilationProblems
 
     warnAboutPossibleSTCCompilationProblems isNil ifTrue:[
-	warnAboutPossibleSTCCompilationProblems := ParserFlags warnAboutPossibleSTCCompilationProblems asValue.
-	warnAboutPossibleSTCCompilationProblems onChangeSend:#updateModifiedChannel to:self.
+        warnAboutPossibleSTCCompilationProblems := ParserFlags warnAboutPossibleSTCCompilationProblems asValue.
+        warnAboutPossibleSTCCompilationProblems onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnAboutPossibleSTCCompilationProblems.
 
@@ -2597,8 +2614,8 @@
 warnAboutPossiblyUnimplementedSelectors
 
     warnAboutPossiblyUnimplementedSelectors isNil ifTrue:[
-	warnAboutPossiblyUnimplementedSelectors := ParserFlags warnAboutPossiblyUnimplementedSelectors asValue.
-	warnAboutPossiblyUnimplementedSelectors onChangeSend:#updateModifiedChannel to:self.
+        warnAboutPossiblyUnimplementedSelectors := ParserFlags warnAboutPossiblyUnimplementedSelectors asValue.
+        warnAboutPossiblyUnimplementedSelectors onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnAboutPossiblyUnimplementedSelectors.
 
@@ -2607,24 +2624,24 @@
 
 warnAboutReferenceToPrivateClass
     warnAboutReferenceToPrivateClass isNil ifTrue:[
-	warnAboutReferenceToPrivateClass := ParserFlags warnAboutReferenceToPrivateClass asValue.
-	warnAboutReferenceToPrivateClass onChangeSend:#updateModifiedChannel to:self.
+        warnAboutReferenceToPrivateClass := ParserFlags warnAboutReferenceToPrivateClass asValue.
+        warnAboutReferenceToPrivateClass onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnAboutReferenceToPrivateClass.
 !
 
 warnAboutShortLocalVariableNames
     warnAboutShortLocalVariableNames isNil ifTrue:[
-	warnAboutShortLocalVariableNames := ParserFlags warnAboutShortLocalVariableNames asValue.
-	warnAboutShortLocalVariableNames onChangeSend:#updateModifiedChannel to:self.
+        warnAboutShortLocalVariableNames := ParserFlags warnAboutShortLocalVariableNames asValue.
+        warnAboutShortLocalVariableNames onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnAboutShortLocalVariableNames.
 !
 
 warnAboutWrongVariableNames
     warnAboutWrongVariableNames isNil ifTrue:[
-	warnAboutWrongVariableNames := ParserFlags warnAboutWrongVariableNames asValue.
-	warnAboutWrongVariableNames onChangeSend:#updateModifiedChannel to:self.
+        warnAboutWrongVariableNames := ParserFlags warnAboutWrongVariableNames asValue.
+        warnAboutWrongVariableNames onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnAboutWrongVariableNames.
 !
@@ -2632,8 +2649,8 @@
 warnCommonMistakes
 
     warnCommonMistakes isNil ifTrue:[
-	warnCommonMistakes := ParserFlags warnCommonMistakes asValue.
-	warnCommonMistakes onChangeSend:#updateModifiedChannel to:self.
+        warnCommonMistakes := ParserFlags warnCommonMistakes asValue.
+        warnCommonMistakes onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnCommonMistakes.
 !
@@ -2641,16 +2658,16 @@
 warnDollarInIdentifier
 
     warnDollar isNil ifTrue:[
-	warnDollar := ParserFlags warnDollarInIdentifier asValue.
-	warnDollar onChangeSend:#updateModifiedChannel to:self.
+        warnDollar := ParserFlags warnDollarInIdentifier asValue.
+        warnDollar onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnDollar.
 !
 
 warnInconsistentReturnValues
     warnInconsistentReturnValues isNil ifTrue:[
-	warnInconsistentReturnValues := ParserFlags warnInconsistentReturnValues asValue.
-	warnInconsistentReturnValues onChangeSend:#updateModifiedChannel to:self.
+        warnInconsistentReturnValues := ParserFlags warnInconsistentReturnValues asValue.
+        warnInconsistentReturnValues onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnInconsistentReturnValues.
 !
@@ -2658,8 +2675,8 @@
 warnOldStyleAssignment
 
     warnOldStyle isNil ifTrue:[
-	warnOldStyle := ParserFlags warnOldStyleAssignment asValue.
-	warnOldStyle onChangeSend:#updateModifiedChannel to:self.
+        warnOldStyle := ParserFlags warnOldStyleAssignment asValue.
+        warnOldStyle onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnOldStyle.
 !
@@ -2667,8 +2684,8 @@
 warnPlausibilityChecks
 
     warnPlausibilityChecks isNil ifTrue:[
-	warnPlausibilityChecks := ParserFlags warnPlausibilityChecks asValue.
-	warnPlausibilityChecks onChangeSend:#updateModifiedChannel to:self.
+        warnPlausibilityChecks := ParserFlags warnPlausibilityChecks asValue.
+        warnPlausibilityChecks onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnPlausibilityChecks.
 
@@ -2680,8 +2697,8 @@
      are to be warned about"
 
     warnCompatibility isNil ifTrue:[
-	warnCompatibility := ParserFlags warnPossibleIncompatibilities asValue.
-	warnCompatibility onChangeSend:#updateModifiedChannel to:self.
+        warnCompatibility := ParserFlags warnPossibleIncompatibilities asValue.
+        warnCompatibility onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnCompatibility.
 !
@@ -2689,8 +2706,8 @@
 warnSTXSpecials
 
     warnSTX isNil ifTrue:[
-	warnSTX := ParserFlags warnSTXSpecials asValue.
-	warnSTX onChangeSend:#updateModifiedChannel to:self.
+        warnSTX := ParserFlags warnSTXSpecials asValue.
+        warnSTX onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnSTX.
 !
@@ -2698,8 +2715,8 @@
 warnUnderscoreInIdentifier
 
     warnUnderscore isNil ifTrue:[
-	warnUnderscore := ParserFlags warnUnderscoreInIdentifier asValue.
-	warnUnderscore onChangeSend:#updateModifiedChannel to:self.
+        warnUnderscore := ParserFlags warnUnderscoreInIdentifier asValue.
+        warnUnderscore onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnUnderscore.
 !
@@ -2707,8 +2724,8 @@
 warnUnusedVars
 
     warnUnusedVars isNil ifTrue:[
-	warnUnusedVars := ParserFlags warnUnusedVars asValue.
-	warnUnusedVars onChangeSend:#updateModifiedChannel to:self.
+        warnUnusedVars := ParserFlags warnUnusedVars asValue.
+        warnUnusedVars onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnUnusedVars.
 !
@@ -2716,10 +2733,10 @@
 warnings
 
     warnings isNil ifTrue:[
-	warnings := ParserFlags warnings asValue.
-	warnings addDependent:self.
-	warnings changed.
-	warnings onChangeSend:#updateModifiedChannel to:self.
+        warnings := ParserFlags warnings asValue.
+        warnings addDependent:self.
+        warnings changed.
+        warnings onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ warnings.
 ! !
@@ -2728,18 +2745,18 @@
 
 update:something with:aParameter from:changedObject
     changedObject == self warnings ifTrue:[
-	changedObject value ifTrue:[
-	    self enableUnderscore value:self allowUnderscoreInIdentifier value.
-	    self enableDollar value:self allowDollarInIdentifier value.
-	] ifFalse:[
-	    self enableUnderscore value:false.
-	    self enableDollar value:false.
-	].
-	^ self
+        changedObject value ifTrue:[
+            self enableUnderscore value:self allowUnderscoreInIdentifier value.
+            self enableDollar value:self allowDollarInIdentifier value.
+        ] ifFalse:[
+            self enableUnderscore value:false.
+            self enableDollar value:false.
+        ].
+        ^ self
     ].
     (changedObject == self allowDollarInIdentifier or:[changedObject == self allowUnderscoreInIdentifier]) ifTrue:[
-	self warnings changed.
-	^ self
+        self warnings changed.
+        ^ self
     ].
 
     super update:something with:aParameter from:changedObject
@@ -2755,8 +2772,8 @@
 
 hasUnsavedChanges
     (self
-	hasChangedAspectIn:(self simpleAspects)
-	asComparedTo:ParserFlags) ifTrue:[^ true].
+        hasChangedAspectIn:(self simpleAspects)
+        asComparedTo:ParserFlags) ifTrue:[^ true].
 
     ((self supportsJustInTimeCompilation value ifTrue:[ObjectMemory fullSingleStepSupport ? false] ifFalse:[ParserFlags fullLineNumberInfo]) ~= self fullDebugSupport value) ifTrue:[^ true].
     ((Compiler foldConstants) ~= (self class constantFoldingOptions at:self constantFoldingSelection value)) ifTrue:[^ true].
@@ -2850,77 +2867,77 @@
        name: windowSpec
        window:
       (WindowSpec
-	 label: 'Changes Settings'
-	 name: 'Changes Settings'
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 561 478)
+         label: 'Changes Settings'
+         name: 'Changes Settings'
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 561 478)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (VerticalPanelViewSpec
-	     name: 'VerticalPanel2'
-	     layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-	     horizontalLayout: fitSpace
-	     verticalLayout: topSpace
-	     horizontalSpace: 5
-	     verticalSpace: 5
-	     component:
-	    (SpecCollection
-	       collection: (
-		(FramedBoxSpec
-		   label: 'Change File'
-		   name: 'FramedBox2'
-		   labelPosition: topLeft
-		   translateLabel: true
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (CheckBoxSpec
-			 label: 'Log changed classes and methods in the Changefile'
-			 name: 'CheckBox1'
-			 layout: (LayoutFrame 5 0 5 0 -5 1 35 0)
-			 activeHelpKey: updChanges
-			 model: updChanges
-			 translateLabel: true
-		       )
-		      (CheckBoxSpec
-			 label: 'Log doIts in the Changefile'
-			 name: 'CheckBox2'
-			 layout: (LayoutFrame 5 0 35 0 -5 1 65 0)
-			 activeHelpKey: logDoits
-			 model: logDoits
-			 translateLabel: true
-		       )
-		      (LabelSpec
-			 label: 'Changefile Name:'
-			 name: 'ChangefileNameLabel'
-			 layout: (AlignmentOrigin 239 0 80 0 1 0.5)
-			 activeHelpKey: changeFileName
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (FilenameInputFieldSpec
-			 name: 'FilenameEntryField1'
-			 layout: (LayoutFrame 237 0 65 0 0 1 95 0)
-			 activeHelpKey: changeFileName
-			 model: changeFileName
-			 immediateAccept: true
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 551 136)
-		 )
-		)
-
-	     )
-	   )
-	  )
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel2'
+             layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+             horizontalLayout: fitSpace
+             verticalLayout: topSpace
+             horizontalSpace: 5
+             verticalSpace: 5
+             component:
+            (SpecCollection
+               collection: (
+                (FramedBoxSpec
+                   label: 'Change File'
+                   name: 'FramedBox2'
+                   labelPosition: topLeft
+                   translateLabel: true
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (CheckBoxSpec
+                         label: 'Log changed classes and methods in the Changefile'
+                         name: 'CheckBox1'
+                         layout: (LayoutFrame 5 0 5 0 -5 1 35 0)
+                         activeHelpKey: updChanges
+                         model: updChanges
+                         translateLabel: true
+                       )
+                      (CheckBoxSpec
+                         label: 'Log doIts in the Changefile'
+                         name: 'CheckBox2'
+                         layout: (LayoutFrame 5 0 35 0 -5 1 65 0)
+                         activeHelpKey: logDoits
+                         model: logDoits
+                         translateLabel: true
+                       )
+                      (LabelSpec
+                         label: 'Changefile Name:'
+                         name: 'ChangefileNameLabel'
+                         layout: (AlignmentOrigin 239 0 80 0 1 0.5)
+                         activeHelpKey: changeFileName
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (FilenameInputFieldSpec
+                         name: 'FilenameEntryField1'
+                         layout: (LayoutFrame 237 0 65 0 0 1 95 0)
+                         activeHelpKey: changeFileName
+                         model: changeFileName
+                         immediateAccept: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      )
+
+                   )
+                   extent: (Point 551 136)
+                 )
+                )
+
+             )
+           )
+          )
 
        )
      )
@@ -2930,7 +2947,7 @@
 
 basicReadSettings
     self changeFileName value:(currentUserPrefs changeFileName
-			       ? ObjectMemory nameForChanges).
+                               ? ObjectMemory nameForChanges).
     self logDoits value:Smalltalk logDoits.
     self updChanges value:Class updatingChanges.
 
@@ -2965,8 +2982,8 @@
 
 changeFileName
     changeFileName isNil ifTrue:[
-	changeFileName := ObjectMemory nameForChanges asValue.
-	changeFileName onChangeSend:#updateModifiedChannel to:self
+        changeFileName := ObjectMemory nameForChanges asValue.
+        changeFileName onChangeSend:#updateModifiedChannel to:self
     ].
     ^ changeFileName.
 
@@ -2975,8 +2992,8 @@
 
 logDoits
     logDoits isNil ifTrue:[
-	logDoits := Smalltalk logDoits asValue.
-	logDoits onChangeSend:#updateModifiedChannel to:self
+        logDoits := Smalltalk logDoits asValue.
+        logDoits onChangeSend:#updateModifiedChannel to:self
     ].
     ^ logDoits.
 
@@ -2985,8 +3002,8 @@
 
 updChanges
     updChanges isNil ifTrue:[
-	updChanges := Class updatingChanges asValue.
-	updChanges onChangeSend:#updateModifiedChannel to:self
+        updChanges := Class updatingChanges asValue.
+        updChanges onChangeSend:#updateModifiedChannel to:self
     ].
     ^ updChanges.
 
@@ -3005,9 +3022,9 @@
     self logDoits value ~= Smalltalk logDoits ifTrue:[^ true].
     self updChanges value ~= Class updatingChanges ifTrue:[^ true].
     currentUserPrefs changeFileName isNil ifTrue:[
-	self changeFileName value ~= ObjectMemory nameForChanges ifTrue:[^ true].
+        self changeFileName value ~= ObjectMemory nameForChanges ifTrue:[^ true].
     ] ifFalse:[
-	self changeFileName value ~= currentUserPrefs changeFileName ifTrue:[^ true].
+        self changeFileName value ~= currentUserPrefs changeFileName ifTrue:[^ true].
     ].
     ^ false
 
@@ -3061,55 +3078,55 @@
        name: windowSpec
        window:
       (WindowSpec
-	 label: 'Tool Settings'
-	 name: 'Tool Settings'
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 607 786)
+         label: 'Tool Settings'
+         name: 'Tool Settings'
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 607 786)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (VerticalPanelViewSpec
-	     name: 'VerticalPanel2'
-	     layout: (LayoutFrame 0 0.0 0 0 0 1.0 342 0)
-	     horizontalLayout: fit
-	     verticalLayout: top
-	     horizontalSpace: 3
-	     verticalSpace: 3
-	     component:
-	    (SpecCollection
-	       collection: (
-		(CheckBoxSpec
-		   label: 'Generate Comments'
-		   name: 'GenerateComments'
-		   activeHelpKey: generateComments
-		   model: generateComments
-		   translateLabel: true
-		   extent: (Point 607 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Generate Comments in Getters'
-		   name: 'GenerateCommentsInGetters'
-		   activeHelpKey: generateCommentsInGetters
-		   enableChannel: generateComments
-		   model: generateCommentsInGetters
-		   translateLabel: true
-		   extent: (Point 607 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Generate Comments in Setters'
-		   name: 'GenerateCommentsInSetters'
-		   activeHelpKey: generateCommentsInSetters
-		   enableChannel: generateComments
-		   model: generateCommentsInSetters
-		   translateLabel: true
-		   extent: (Point 607 30)
-		 )
-		)
-
-	     )
-	   )
-	  )
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel2'
+             layout: (LayoutFrame 0 0.0 0 0 0 1.0 342 0)
+             horizontalLayout: fit
+             verticalLayout: top
+             horizontalSpace: 3
+             verticalSpace: 3
+             component:
+            (SpecCollection
+               collection: (
+                (CheckBoxSpec
+                   label: 'Generate Comments'
+                   name: 'GenerateComments'
+                   activeHelpKey: generateComments
+                   model: generateComments
+                   translateLabel: true
+                   extent: (Point 607 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Generate Comments in Getters'
+                   name: 'GenerateCommentsInGetters'
+                   activeHelpKey: generateCommentsInGetters
+                   enableChannel: generateComments
+                   model: generateCommentsInGetters
+                   translateLabel: true
+                   extent: (Point 607 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Generate Comments in Setters'
+                   name: 'GenerateCommentsInSetters'
+                   activeHelpKey: generateCommentsInSetters
+                   enableChannel: generateComments
+                   model: generateCommentsInSetters
+                   translateLabel: true
+                   extent: (Point 607 30)
+                 )
+                )
+
+             )
+           )
+          )
 
        )
      )
@@ -3127,24 +3144,24 @@
 
 generateComments
     generateComments isNil ifTrue:[
-	generateComments := UserPreferences current generateComments asValue.
-	generateComments onChangeSend:#updateModifiedChannel to:self
+        generateComments := UserPreferences current generateComments asValue.
+        generateComments onChangeSend:#updateModifiedChannel to:self
     ].
     ^ generateComments.
 !
 
 generateCommentsForGetters
     generateCommentsForGetters isNil ifTrue:[
-	generateCommentsForGetters := UserPreferences current generateCommentsForGetters asValue.
-	generateCommentsForGetters onChangeSend:#updateModifiedChannel to:self
+        generateCommentsForGetters := UserPreferences current generateCommentsForGetters asValue.
+        generateCommentsForGetters onChangeSend:#updateModifiedChannel to:self
     ].
     ^ generateCommentsForGetters.
 !
 
 generateCommentsForSetters
     generateCommentsForSetters isNil ifTrue:[
-	generateCommentsForSetters := UserPreferences current generateCommentsForSetters asValue.
-	generateCommentsForSetters onChangeSend:#updateModifiedChannel to:self
+        generateCommentsForSetters := UserPreferences current generateCommentsForSetters asValue.
+        generateCommentsForSetters onChangeSend:#updateModifiedChannel to:self
     ].
     ^ generateCommentsForSetters.
 ! !
@@ -3179,8 +3196,8 @@
     <resource: #image>
 
     ^Icon
-	constantNamed:'AbstractSettingsApplication::CommunicationLoggingSettingsAppl class defaultIcon1'
-	ifAbsentPut:[(Depth8Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+        constantNamed:'AbstractSettingsApplication::CommunicationLoggingSettingsAppl class defaultIcon1'
+        ifAbsentPut:[(Depth8Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ECP4MCP4MCP4MCP4MCP4@@A @F@@CAPHB@ HB@ HB@ HBB (E@@@X@A @@0TB@ HB@ HB@ HB@ (JAP@@@@@@@@LE
 @ 4MCP4MCPHB@ (JB T@@@@@@@@CAPHB@ HB@ HB@ HJB (E@@@@@@@@@0TBCP4MCP4M@ HBB (JAP@@@@@@@@LE@ HB@ HB@ HB@ (JB T@@@@@@@@CAPHM
 CP4MCP4B@ (JB (E@@@@@@@@@0TB@ HB@ HB@ HJB (JAP@@@@@@@@LE@ 4MCP4MCPHBB (JB T@@A(XF@@CAPHB@ HB@ HB@ (JB (E@ @@@@@@@0TB@ HB
@@ -3236,43 +3253,43 @@
        name: windowSpec
        window:
       (WindowSpec
-	 label: 'Com-Logging settings'
-	 name: 'Com-Logging settings'
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 445 401)
+         label: 'Com-Logging settings'
+         name: 'Com-Logging settings'
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 445 401)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (VerticalPanelViewSpec
-	     name: 'VerticalPanel1'
-	     layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-	     horizontalLayout: fitSpace
-	     verticalLayout: topSpace
-	     horizontalSpace: 5
-	     verticalSpace: 3
-	     component:
-	    (SpecCollection
-	       collection: (
-		(CheckBoxSpec
-		   label: 'Log Outgoing HTTP Requests on Transcript'
-		   name: 'LogHTTPRequests'
-		   model: logHTTPRequests
-		   translateLabel: true
-		   extent: (Point 435 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Log Outgoing SOAP Requests on Transcript'
-		   name: 'LogSOAPRequests'
-		   model: logSOAPRequests
-		   translateLabel: true
-		   extent: (Point 435 30)
-		 )
-		)
-
-	     )
-	   )
-	  )
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel1'
+             layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+             horizontalLayout: fitSpace
+             verticalLayout: topSpace
+             horizontalSpace: 5
+             verticalSpace: 3
+             component:
+            (SpecCollection
+               collection: (
+                (CheckBoxSpec
+                   label: 'Log Outgoing HTTP Requests on Transcript'
+                   name: 'LogHTTPRequests'
+                   model: logHTTPRequests
+                   translateLabel: true
+                   extent: (Point 435 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Log Outgoing SOAP Requests on Transcript'
+                   name: 'LogSOAPRequests'
+                   model: logSOAPRequests
+                   translateLabel: true
+                   extent: (Point 435 30)
+                 )
+                )
+
+             )
+           )
+          )
 
        )
      )
@@ -3289,16 +3306,16 @@
 
 logHTTPRequests
     logHTTPRequests isNil ifTrue:[
-	logHTTPRequests := false asValue.
-	logHTTPRequests onChangeSend:#updateModifiedChannel to:self
+        logHTTPRequests := false asValue.
+        logHTTPRequests onChangeSend:#updateModifiedChannel to:self
     ].
     ^ logHTTPRequests.
 !
 
 logSOAPRequests
     logSOAPRequests isNil ifTrue:[
-	logSOAPRequests := false asValue.
-	logSOAPRequests onChangeSend:#updateModifiedChannel to:self
+        logSOAPRequests := false asValue.
+        logSOAPRequests onChangeSend:#updateModifiedChannel to:self
     ].
     ^ logSOAPRequests.
 ! !
@@ -3374,124 +3391,124 @@
        name: windowSpec
        window:
       (WindowSpec
-	 label: 'Debugger Settings'
-	 name: 'Debugger Settings'
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 600 320)
+         label: 'Debugger Settings'
+         name: 'Debugger Settings'
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 600 320)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (VerticalPanelViewSpec
-	     name: 'VerticalPanel2'
-	     layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-	     horizontalLayout: fit
-	     verticalLayout: top
-	     horizontalSpace: 3
-	     verticalSpace: 0
-	     component:
-	    (SpecCollection
-	       collection: (
-		(ViewSpec
-		   name: 'ShowErrorNotifierBox'
-		   activeHelpKey: showErrorNotifier
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (CheckBoxSpec
-			 label: 'Show Error Notifier before Opening Debugger'
-			 name: 'ShowErrorNotifierCheckBox'
-			 layout: (LayoutFrame 5 0 0 0 -5 1 30 0)
-			 activeHelpKey: showErrorNotifier
-			 model: showErrorNotifier
-			 translateLabel: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'UseNewLayoutInDebuggerBox'
-		   activeHelpKey: useNewLayout
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (CheckBoxSpec
-			 label: 'Use New Layout'
-			 name: 'UseNewLayoutInDebuggerCheckBox'
-			 layout: (LayoutFrame 5 0 0 0 -5 1 30 0)
-			 activeHelpKey: useNewLayout
-			 model: useNewLayoutInDebugger
-			 translateLabel: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'ShowVerboseStackBox'
-		   activeHelpKey: showVerboseStack
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (CheckBoxSpec
-			 label: 'Verbose Backtrace by Default in Debugger'
-			 name: 'ShowVerboseStackCheckBox'
-			 layout: (LayoutFrame 5 0 0 0 -5 1 30 0)
-			 activeHelpKey: showVerboseStack
-			 model: verboseBacktraceInDebugger
-			 translateLabel: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'HideEnumerationCodeBox'
-		   activeHelpKey: hideSupportCode
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (CheckBoxSpec
-			 label: 'Hide Support Code (Implementation of Enumerations, Exceptions, etc.)'
-			 name: 'CheckBox1'
-			 layout: (LayoutFrame 5 0 0 0 -5 1 30 0)
-			 activeHelpKey: hideSupportCode
-			 model: hideSupportCodeInDebugger
-			 translateLabel: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'AllowSendingMailFromDebuggerBox'
-		   activeHelpKey: allowSendingMail
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (CheckBoxSpec
-			 label: 'Allow Sending of Error Reports from Debugger'
-			 name: 'AllowSendingMailFromDebuggerCheckBox'
-			 layout: (LayoutFrame 5 0 0 0 -5 1 30 0)
-			 activeHelpKey: allowSendingMail
-			 model: allowSendMailFromDebugger
-			 translateLabel: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		)
-
-	     )
-	   )
-	  )
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel2'
+             layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+             horizontalLayout: fit
+             verticalLayout: top
+             horizontalSpace: 3
+             verticalSpace: 0
+             component:
+            (SpecCollection
+               collection: (
+                (ViewSpec
+                   name: 'ShowErrorNotifierBox'
+                   activeHelpKey: showErrorNotifier
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (CheckBoxSpec
+                         label: 'Show Error Notifier before Opening Debugger'
+                         name: 'ShowErrorNotifierCheckBox'
+                         layout: (LayoutFrame 5 0 0 0 -5 1 30 0)
+                         activeHelpKey: showErrorNotifier
+                         model: showErrorNotifier
+                         translateLabel: true
+                       )
+                      )
+
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'UseNewLayoutInDebuggerBox'
+                   activeHelpKey: useNewLayout
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (CheckBoxSpec
+                         label: 'Use New Layout'
+                         name: 'UseNewLayoutInDebuggerCheckBox'
+                         layout: (LayoutFrame 5 0 0 0 -5 1 30 0)
+                         activeHelpKey: useNewLayout
+                         model: useNewLayoutInDebugger
+                         translateLabel: true
+                       )
+                      )
+
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'ShowVerboseStackBox'
+                   activeHelpKey: showVerboseStack
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (CheckBoxSpec
+                         label: 'Verbose Backtrace by Default in Debugger'
+                         name: 'ShowVerboseStackCheckBox'
+                         layout: (LayoutFrame 5 0 0 0 -5 1 30 0)
+                         activeHelpKey: showVerboseStack
+                         model: verboseBacktraceInDebugger
+                         translateLabel: true
+                       )
+                      )
+
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'HideEnumerationCodeBox'
+                   activeHelpKey: hideSupportCode
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (CheckBoxSpec
+                         label: 'Hide Support Code (Implementation of Enumerations, Exceptions, etc.)'
+                         name: 'CheckBox1'
+                         layout: (LayoutFrame 5 0 0 0 -5 1 30 0)
+                         activeHelpKey: hideSupportCode
+                         model: hideSupportCodeInDebugger
+                         translateLabel: true
+                       )
+                      )
+
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'AllowSendingMailFromDebuggerBox'
+                   activeHelpKey: allowSendingMail
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (CheckBoxSpec
+                         label: 'Allow Sending of Error Reports from Debugger'
+                         name: 'AllowSendingMailFromDebuggerCheckBox'
+                         layout: (LayoutFrame 5 0 0 0 -5 1 30 0)
+                         activeHelpKey: allowSendingMail
+                         model: allowSendMailFromDebugger
+                         translateLabel: true
+                       )
+                      )
+
+                   )
+                   extent: (Point 600 30)
+                 )
+                )
+
+             )
+           )
+          )
 
        )
      )
@@ -3523,8 +3540,8 @@
 allowSendMailFromDebugger
 
     allowSendMailFromDebugger isNil ifTrue:[
-	allowSendMailFromDebugger := currentUserPrefs allowSendMailFromDebugger asValue.
-	allowSendMailFromDebugger onChangeSend:#updateModifiedChannel to:self
+        allowSendMailFromDebugger := currentUserPrefs allowSendMailFromDebugger asValue.
+        allowSendMailFromDebugger onChangeSend:#updateModifiedChannel to:self
     ].
     ^ allowSendMailFromDebugger.
 !
@@ -3541,8 +3558,8 @@
 hideSupportCodeInDebugger
 
     hideSupportCodeInDebugger isNil ifTrue:[
-	hideSupportCodeInDebugger := (UserPreferences current hideSupportCodeInDebugger ? true) asValue.
-	hideSupportCodeInDebugger onChangeSend:#updateModifiedChannel to:self
+        hideSupportCodeInDebugger := (UserPreferences current hideSupportCodeInDebugger ? true) asValue.
+        hideSupportCodeInDebugger onChangeSend:#updateModifiedChannel to:self
     ].
     ^ hideSupportCodeInDebugger.
 
@@ -3552,8 +3569,8 @@
 showErrorNotifier
 
     showErrorNotifier isNil ifTrue:[
-	showErrorNotifier := (NoHandlerError emergencyHandler == AbstractLauncherApplication notifyingEmergencyHandler) asValue.
-	showErrorNotifier onChangeSend:#updateModifiedChannel to:self
+        showErrorNotifier := (NoHandlerError emergencyHandler == AbstractLauncherApplication notifyingEmergencyHandler) asValue.
+        showErrorNotifier onChangeSend:#updateModifiedChannel to:self
     ].
     ^ showErrorNotifier.
 !
@@ -3561,8 +3578,8 @@
 useNewLayoutInDebugger
 
     useNewLayoutInDebugger isNil ifTrue:[
-	useNewLayoutInDebugger := (UserPreferences current useNewLayoutInDebugger) asValue.
-	useNewLayoutInDebugger onChangeSend:#updateModifiedChannel to:self
+        useNewLayoutInDebugger := (UserPreferences current useNewLayoutInDebugger) asValue.
+        useNewLayoutInDebugger onChangeSend:#updateModifiedChannel to:self
     ].
     ^ useNewLayoutInDebugger.
 !
@@ -3674,243 +3691,243 @@
        name: windowSpec
        window:
       (WindowSpec
-	 label: 'Display Screen Settings'
-	 name: 'Display Screen Settings'
-	 flags: 1
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 604 500)
+         label: 'Display Screen Settings'
+         name: 'Display Screen Settings'
+         flags: 1
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 604 500)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (LabelSpec
-	     label: 'Actual Visible Screen Area:'
-	     name: 'ActualVisibleScreenAreaLabel'
-	     layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 30 0)
-	     translateLabel: true
-	     adjust: left
-	   )
-	  (LabelSpec
-	     label: 'Common Sizes:'
-	     name: 'CommonSizesLabel'
-	     layout: (LayoutFrame 5 0 39 0 227 0 69 0)
-	     translateLabel: true
-	     adjust: right
-	   )
-	  (PopUpListSpec
-	     label: 'monitor size'
-	     name: 'MonitorSelectionPopUpList'
-	     layout: (LayoutFrame 230 0 39 0 -5 1 69 0)
-	     tabable: true
-	     model: monitorSelection
-	     menu: monitorList
-	     useIndex: true
-	   )
-	  (LabelSpec
-	     label: 'Screen Size:'
-	     name: 'ScreenSizeLabel'
-	     layout: (LayoutFrame 5 0 72 0 227 0 102 0)
-	     translateLabel: true
-	     adjust: right
-	   )
-	  (InputFieldSpec
-	     name: 'SizeXEntryField'
-	     layout: (LayoutFrame 230 0 72 0 297 0 102 0)
-	     model: sizeX
-	     type: number
-	     immediateAccept: true
-	     acceptOnReturn: true
-	     acceptOnTab: true
-	     acceptOnLostFocus: true
-	     acceptOnPointerLeave: true
-	   )
-	  (LabelSpec
-	     label: ' x '
-	     name: 'xLabel'
-	     layout: (LayoutFrame 298 0 72 0 319 0 102 0)
-	     translateLabel: true
-	   )
-	  (InputFieldSpec
-	     name: 'SizeYEntryField'
-	     layout: (LayoutFrame 320 0 72 0 387 0 102 0)
-	     model: sizeY
-	     type: number
-	     immediateAccept: true
-	     acceptOnReturn: true
-	     acceptOnTab: true
-	     acceptOnLostFocus: true
-	     acceptOnPointerLeave: true
-	   )
-	  (LabelSpec
-	     label: '(mm)'
-	     name: 'mmLabel'
-	     layout: (LayoutFrame 399 0 72 0 445 0 102 0)
-	     translateLabel: true
-	     adjust: left
-	   )
-	  (LabelSpec
-	     label: 'Limit Usable Area To:'
-	     name: 'Label1'
-	     layout: (LayoutFrame 5 0 110 0 227 0 140 0)
-	     translateLabel: true
-	     adjust: right
-	   )
-	  (InputFieldSpec
-	     name: 'EntryField1'
-	     layout: (LayoutFrame 230 0 110 0 297 0 140 0)
-	     model: usedWidth
-	     type: number
-	     immediateAccept: true
-	     acceptOnReturn: true
-	     acceptOnTab: true
-	     acceptOnLostFocus: true
-	     acceptOnPointerLeave: true
-	   )
-	  (LabelSpec
-	     label: ' x '
-	     name: 'Label2'
-	     layout: (LayoutFrame 298 0 110 0 319 0 140 0)
-	     translateLabel: true
-	   )
-	  (InputFieldSpec
-	     name: 'EntryField2'
-	     layout: (LayoutFrame 320 0 110 0 387 0 140 0)
-	     model: usedHeight
-	     type: number
-	     immediateAccept: true
-	     acceptOnReturn: true
-	     acceptOnTab: true
-	     acceptOnLostFocus: true
-	     acceptOnPointerLeave: true
-	   )
-	  (LabelSpec
-	     label: '(Pixel)'
-	     name: 'Label3'
-	     layout: (LayoutFrame 399 0 110 0 445 0 140 0)
-	     translateLabel: true
-	     adjust: left
-	   )
-	  (ActionButtonSpec
-	     label: 'Restore'
-	     name: 'Button1'
-	     layout: (AlignmentOrigin 462 0 126 0 0 0.5)
-	     model: restoreUsableExtent
-	   )
-	  (DividerSpec
-	     name: 'Separator1'
-	     layout: (LayoutFrame 0 0.0 143 0 0 1.0 147 0)
-	   )
-	  (LabelSpec
-	     name: 'ScreenDepthVisualLabel'
-	     layout: (LayoutFrame 0 0.0 151 0.0 0 1.0 181 0)
-	     translateLabel: true
-	     labelChannel: screenDepthVisualLabelHolder
-	     adjust: left
-	   )
-	  (DividerSpec
-	     name: 'Separator2'
-	     layout: (LayoutFrame 0 0.0 182 0 0 1.0 186 0)
-	   )
-	  (CheckBoxSpec
-	     label: 'Color Monitor'
-	     name: 'ColorMonitorCheckBox'
-	     layout: (LayoutFrame 5 0 193 0 250 0 223 0)
-	     model: isColorMonitor
-	     translateLabel: true
-	   )
-	  (CheckBoxSpec
-	     label: 'Use Fix Color Palette'
-	     name: 'FixColorPaletteCheckBox'
-	     layout: (LayoutFrame 5 0 223 0 301 0 253 0)
-	     enableChannel: visualIsPseudoColor
-	     model: useFixPalette
-	     translateLabel: true
-	     labelChannel: useFixPaletteLabel
-	   )
-	  (CheckBoxSpec
-	     label: 'Use Fix Gray Color Palette'
-	     name: 'UseFixGrayPaletteCheckBox'
-	     layout: (LayoutFrame 5 0 257 0 301 0 287 0)
-	     enableChannel: visualIsPseudoColor
-	     model: useFixGrayPalette
-	     translateLabel: true
-	     labelChannel: useFixGrayPaletteLabel
-	   )
-	  (LabelSpec
-	     label: 'Image Display:'
-	     name: 'ImageDisplayLabel'
-	     layout: (LayoutFrame 5 0 294 0 227 0 324 0)
-	     translateLabel: true
-	     adjust: right
-	   )
-	  (PopUpListSpec
-	     label: 'image display'
-	     name: 'DitherListPopUpList'
-	     layout: (LayoutFrame 230 0 294 0 -30 1 324 0)
-	     tabable: true
-	     model: ditherListSelection
-	     enableChannel: ditherSymsNotNil
-	     menu: ditherList
-	     useIndex: true
-	   )
-	  (CheckBoxSpec
-	     label: 'Allow Colored/Grayscale Icons'
-	     name: 'AllowColoredGrayscaleIconsCheckBox'
-	     layout: (LayoutFrame 5 0 334 0 301 0 364 0)
-	     model: deepIcons
-	     translateLabel: true
-	   )
-	  (DividerSpec
-	     name: 'Separator3'
-	     layout: (LayoutFrame 0 0.0 368 0 0 1.0 372 0)
-	   )
-	  (LabelSpec
-	     label: 'ClipBoard Encoding:'
-	     name: 'ClipBoardEncodingLabel'
-	     layout: (LayoutFrame 4 0 383 0 274 0 413 0)
-	     translateLabel: true
-	     adjust: right
-	   )
-	  (PopUpListSpec
-	     label: 'image display'
-	     name: 'ClipEncodingListPopUpList'
-	     layout: (LayoutFrame 275 0 383 0 -30 1 413 0)
-	     tabable: true
-	     model: clipEncodingListSelection
-	     menu: clipEncodingList
-	     useIndex: true
-	   )
-	  (LabelSpec
-	     label: 'Max. CopyBuffer Size:'
-	     name: 'MaxCopyBufferSizeLabel'
-	     layout: (LayoutFrame 4 0 418 0 274 0 448 0)
-	     translateLabel: true
-	     adjust: right
-	   )
-	  (InputFieldSpec
-	     name: 'MaxCopyBufferEntryField'
-	     layout: (LayoutFrame 275 0 418 0 370 0 448 0)
-	     model: maxCopyBufferSize
-	     type: fileSize
-	     immediateAccept: true
-	     acceptOnReturn: true
-	     acceptOnTab: true
-	     acceptOnLostFocus: true
-	     acceptOnPointerLeave: true
-	   )
-	  (DividerSpec
-	     name: 'Separator4'
-	     layout: (LayoutFrame 0 0.0 454 0 0 1.0 458 0)
-	   )
-	  (CheckBoxSpec
-	     label: 'Enable VMWare Drawing Bug Workaround (Limit Number of Buffered Operations)'
-	     name: 'CheckBox1'
-	     layout: (LayoutFrame 5 0 464 0 0 1 486 0)
-	     model: enableVMWareDrawingBugWorkaround
-	     activeHelpKey: enableVMWareDrawingBugWorkaround
-	     translateLabel: true
-	   )
-	  )
+         collection: (
+          (LabelSpec
+             label: 'Actual Visible Screen Area:'
+             name: 'ActualVisibleScreenAreaLabel'
+             layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 30 0)
+             translateLabel: true
+             adjust: left
+           )
+          (LabelSpec
+             label: 'Common Sizes:'
+             name: 'CommonSizesLabel'
+             layout: (LayoutFrame 5 0 39 0 227 0 69 0)
+             translateLabel: true
+             adjust: right
+           )
+          (PopUpListSpec
+             label: 'monitor size'
+             name: 'MonitorSelectionPopUpList'
+             layout: (LayoutFrame 230 0 39 0 -5 1 69 0)
+             tabable: true
+             model: monitorSelection
+             menu: monitorList
+             useIndex: true
+           )
+          (LabelSpec
+             label: 'Screen Size:'
+             name: 'ScreenSizeLabel'
+             layout: (LayoutFrame 5 0 72 0 227 0 102 0)
+             translateLabel: true
+             adjust: right
+           )
+          (InputFieldSpec
+             name: 'SizeXEntryField'
+             layout: (LayoutFrame 230 0 72 0 297 0 102 0)
+             model: sizeX
+             type: number
+             immediateAccept: true
+             acceptOnReturn: true
+             acceptOnTab: true
+             acceptOnLostFocus: true
+             acceptOnPointerLeave: true
+           )
+          (LabelSpec
+             label: ' x '
+             name: 'xLabel'
+             layout: (LayoutFrame 298 0 72 0 319 0 102 0)
+             translateLabel: true
+           )
+          (InputFieldSpec
+             name: 'SizeYEntryField'
+             layout: (LayoutFrame 320 0 72 0 387 0 102 0)
+             model: sizeY
+             type: number
+             immediateAccept: true
+             acceptOnReturn: true
+             acceptOnTab: true
+             acceptOnLostFocus: true
+             acceptOnPointerLeave: true
+           )
+          (LabelSpec
+             label: '(mm)'
+             name: 'mmLabel'
+             layout: (LayoutFrame 399 0 72 0 445 0 102 0)
+             translateLabel: true
+             adjust: left
+           )
+          (LabelSpec
+             label: 'Limit Usable Area To:'
+             name: 'Label1'
+             layout: (LayoutFrame 5 0 110 0 227 0 140 0)
+             translateLabel: true
+             adjust: right
+           )
+          (InputFieldSpec
+             name: 'EntryField1'
+             layout: (LayoutFrame 230 0 110 0 297 0 140 0)
+             model: usedWidth
+             type: number
+             immediateAccept: true
+             acceptOnReturn: true
+             acceptOnTab: true
+             acceptOnLostFocus: true
+             acceptOnPointerLeave: true
+           )
+          (LabelSpec
+             label: ' x '
+             name: 'Label2'
+             layout: (LayoutFrame 298 0 110 0 319 0 140 0)
+             translateLabel: true
+           )
+          (InputFieldSpec
+             name: 'EntryField2'
+             layout: (LayoutFrame 320 0 110 0 387 0 140 0)
+             model: usedHeight
+             type: number
+             immediateAccept: true
+             acceptOnReturn: true
+             acceptOnTab: true
+             acceptOnLostFocus: true
+             acceptOnPointerLeave: true
+           )
+          (LabelSpec
+             label: '(Pixel)'
+             name: 'Label3'
+             layout: (LayoutFrame 399 0 110 0 445 0 140 0)
+             translateLabel: true
+             adjust: left
+           )
+          (ActionButtonSpec
+             label: 'Restore'
+             name: 'Button1'
+             layout: (AlignmentOrigin 462 0 126 0 0 0.5)
+             model: restoreUsableExtent
+           )
+          (DividerSpec
+             name: 'Separator1'
+             layout: (LayoutFrame 0 0.0 143 0 0 1.0 147 0)
+           )
+          (LabelSpec
+             name: 'ScreenDepthVisualLabel'
+             layout: (LayoutFrame 0 0.0 151 0.0 0 1.0 181 0)
+             translateLabel: true
+             labelChannel: screenDepthVisualLabelHolder
+             adjust: left
+           )
+          (DividerSpec
+             name: 'Separator2'
+             layout: (LayoutFrame 0 0.0 182 0 0 1.0 186 0)
+           )
+          (CheckBoxSpec
+             label: 'Color Monitor'
+             name: 'ColorMonitorCheckBox'
+             layout: (LayoutFrame 5 0 193 0 250 0 223 0)
+             model: isColorMonitor
+             translateLabel: true
+           )
+          (CheckBoxSpec
+             label: 'Use Fix Color Palette'
+             name: 'FixColorPaletteCheckBox'
+             layout: (LayoutFrame 5 0 223 0 301 0 253 0)
+             enableChannel: visualIsPseudoColor
+             model: useFixPalette
+             translateLabel: true
+             labelChannel: useFixPaletteLabel
+           )
+          (CheckBoxSpec
+             label: 'Use Fix Gray Color Palette'
+             name: 'UseFixGrayPaletteCheckBox'
+             layout: (LayoutFrame 5 0 257 0 301 0 287 0)
+             enableChannel: visualIsPseudoColor
+             model: useFixGrayPalette
+             translateLabel: true
+             labelChannel: useFixGrayPaletteLabel
+           )
+          (LabelSpec
+             label: 'Image Display:'
+             name: 'ImageDisplayLabel'
+             layout: (LayoutFrame 5 0 294 0 227 0 324 0)
+             translateLabel: true
+             adjust: right
+           )
+          (PopUpListSpec
+             label: 'image display'
+             name: 'DitherListPopUpList'
+             layout: (LayoutFrame 230 0 294 0 -30 1 324 0)
+             tabable: true
+             model: ditherListSelection
+             enableChannel: ditherSymsNotNil
+             menu: ditherList
+             useIndex: true
+           )
+          (CheckBoxSpec
+             label: 'Allow Colored/Grayscale Icons'
+             name: 'AllowColoredGrayscaleIconsCheckBox'
+             layout: (LayoutFrame 5 0 334 0 301 0 364 0)
+             model: deepIcons
+             translateLabel: true
+           )
+          (DividerSpec
+             name: 'Separator3'
+             layout: (LayoutFrame 0 0.0 368 0 0 1.0 372 0)
+           )
+          (LabelSpec
+             label: 'ClipBoard Encoding:'
+             name: 'ClipBoardEncodingLabel'
+             layout: (LayoutFrame 4 0 383 0 274 0 413 0)
+             translateLabel: true
+             adjust: right
+           )
+          (PopUpListSpec
+             label: 'image display'
+             name: 'ClipEncodingListPopUpList'
+             layout: (LayoutFrame 275 0 383 0 -30 1 413 0)
+             tabable: true
+             model: clipEncodingListSelection
+             menu: clipEncodingList
+             useIndex: true
+           )
+          (LabelSpec
+             label: 'Max. CopyBuffer Size:'
+             name: 'MaxCopyBufferSizeLabel'
+             layout: (LayoutFrame 4 0 418 0 274 0 448 0)
+             translateLabel: true
+             adjust: right
+           )
+          (InputFieldSpec
+             name: 'MaxCopyBufferEntryField'
+             layout: (LayoutFrame 275 0 418 0 370 0 448 0)
+             model: maxCopyBufferSize
+             type: fileSize
+             immediateAccept: true
+             acceptOnReturn: true
+             acceptOnTab: true
+             acceptOnLostFocus: true
+             acceptOnPointerLeave: true
+           )
+          (DividerSpec
+             name: 'Separator4'
+             layout: (LayoutFrame 0 0.0 454 0 0 1.0 458 0)
+           )
+          (CheckBoxSpec
+             label: 'Enable VMWare Drawing Bug Workaround (Limit Number of Buffered Operations)'
+             name: 'CheckBox1'
+             layout: (LayoutFrame 5 0 464 0 0 1 486 0)
+             model: enableVMWareDrawingBugWorkaround
+             activeHelpKey: enableVMWareDrawingBugWorkaround
+             translateLabel: true
+           )
+          )
 
        )
      )
@@ -3933,12 +3950,12 @@
     self deepIcons value:screen supportsDeepIcons.
 
     ditherSyms notNil ifTrue:[
-	self ditherListSelection
-	    value:(ditherSyms indexOf:(Image ditherAlgorithm) ifAbsent:#threshold)
+        self ditherListSelection
+            value:(ditherSyms indexOf:(Image ditherAlgorithm) ifAbsent:#threshold)
     ].
     self clipEncodingListSelection
-	value:(self class clipEncodingSyms indexOf:screen clipboardEncoding
-		ifAbsent:1).
+        value:(self class clipEncodingSyms indexOf:screen clipboardEncoding
+                ifAbsent:1).
 
     "Modified: / 19-11-2013 / 10:25:51 / cg"
 !
@@ -3949,25 +3966,25 @@
     Image flushDeviceImages.
 
     screen visualType == #PseudoColor ifTrue:[
-	self useFixPalette value ifTrue:[
-	    Color colorAllocationFailSignal handle:[:ex |
-		self warn:'Could not allocate colors.'.
-	    ] do:[
-		Color getColorsRed:4 green:8 blue:4 on:screen
-	    ]
-	] ifFalse:[
-	    screen releaseFixColors
-	].
-
-	self useFixGrayPalette value ifTrue:[
-	    Color colorAllocationFailSignal handle:[:ex |
-		self warn:'Could not allocate colors.'.
-	    ] do:[
-		Color getGrayColors:32 on:screen
-	    ]
-	] ifFalse:[
-	    screen releaseFixGrayColors
-	]
+        self useFixPalette value ifTrue:[
+            Color colorAllocationFailSignal handle:[:ex |
+                self warn:'Could not allocate colors.'.
+            ] do:[
+                Color getColorsRed:4 green:8 blue:4 on:screen
+            ]
+        ] ifFalse:[
+            screen releaseFixColors
+        ].
+
+        self useFixGrayPalette value ifTrue:[
+            Color colorAllocationFailSignal handle:[:ex |
+                self warn:'Could not allocate colors.'.
+            ] do:[
+                Color getGrayColors:32 on:screen
+            ]
+        ] ifFalse:[
+            screen releaseFixGrayColors
+        ]
     ].
     screen hasColors:self isColorMonitor value.
     screen widthInMillimeter:self sizeX value.
@@ -3978,11 +3995,11 @@
 
     screen supportsDeepIcons:self deepIcons value.
     ditherSyms notNil ifTrue:[
-	Image ditherAlgorithm:(ditherSyms at:self ditherListSelection value).
+        Image ditherAlgorithm:(ditherSyms at:self ditherListSelection value).
     ].
 
     WindowGroup activeGroup withWaitCursorDo:[
-	View defaultStyle:(View defaultStyle).
+        View defaultStyle:(View defaultStyle).
     ].
 
     screen clipboardEncoding:(self class clipEncodingSyms at:self clipEncodingListSelection value).
@@ -4000,7 +4017,7 @@
 clipEncodingList
 
     clipEncodingList isNil ifTrue:[
-	clipEncodingList := (resources array:self class clipEncodingStrings) asValue.
+        clipEncodingList := (resources array:self class clipEncodingStrings) asValue.
 "/ if your app needs to be notified of changes, uncomment one of the lines below:
 "/       clipEncodingList addDependent:self.
 "/       clipEncodingList onChangeSend:#clipEncodingListChanged to:self.
@@ -4011,8 +4028,8 @@
 clipEncodingListSelection
 
     clipEncodingListSelection isNil ifTrue:[
-	clipEncodingListSelection := (self class clipEncodingSyms indexOf:screen clipboardEncoding ifAbsent:1) asValue.
-	clipEncodingListSelection onChangeSend:#updateModifiedChannel to:self.
+        clipEncodingListSelection := (self class clipEncodingSyms indexOf:screen clipboardEncoding ifAbsent:1) asValue.
+        clipEncodingListSelection onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ clipEncodingListSelection.
 !
@@ -4020,8 +4037,8 @@
 deepIcons
 
     deepIcons isNil ifTrue:[
-	deepIcons := screen supportsDeepIcons asValue.
-	deepIcons onChangeSend:#updateModifiedChannel to:self.
+        deepIcons := screen supportsDeepIcons asValue.
+        deepIcons onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ deepIcons.
 !
@@ -4029,7 +4046,7 @@
 ditherList
 
     ditherList isNil ifTrue:[
-	ditherList := ValueHolder new.
+        ditherList := ValueHolder new.
     ].
     ^ ditherList.
 !
@@ -4037,12 +4054,12 @@
 ditherListSelection
 
     ditherListSelection isNil ifTrue:[
-	ditherSyms notNil ifTrue:[
-	    ditherListSelection := (ditherSyms indexOf:(Image ditherAlgorithm) ifAbsent:#threshold) asValue.
-	] ifFalse:[
-	    ditherListSelection := ValueHolder new.
-	].
-	ditherListSelection onChangeSend:#updateModifiedChannel to:self.
+        ditherSyms notNil ifTrue:[
+            ditherListSelection := (ditherSyms indexOf:(Image ditherAlgorithm) ifAbsent:#threshold) asValue.
+        ] ifFalse:[
+            ditherListSelection := ValueHolder new.
+        ].
+        ditherListSelection onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ ditherListSelection.
 !
@@ -4050,7 +4067,7 @@
 ditherSymsNotNil
 
     ditherSymsNotNil isNil ifTrue:[
-	ditherSymsNotNil := ditherSyms notNil asValue.
+        ditherSymsNotNil := ditherSyms notNil asValue.
     ].
     ^ ditherSymsNotNil.
 !
@@ -4058,8 +4075,8 @@
 enableVMWareDrawingBugWorkaround
 
     enableVMWareDrawingBugWorkaround isNil ifTrue:[
-	enableVMWareDrawingBugWorkaround := false asValue.
-	enableVMWareDrawingBugWorkaround onChangeSend:#updateModifiedChannel to:self.
+        enableVMWareDrawingBugWorkaround := false asValue.
+        enableVMWareDrawingBugWorkaround onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ enableVMWareDrawingBugWorkaround.
 
@@ -4069,8 +4086,8 @@
 isColorMonitor
 
     isColorMonitor isNil ifTrue:[
-	isColorMonitor := screen hasColors asValue.
-	isColorMonitor onChangeSend:#updateModifiedChannel to:self.
+        isColorMonitor := screen hasColors asValue.
+        isColorMonitor onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ isColorMonitor.
 !
@@ -4078,10 +4095,10 @@
 maxCopyBufferSize
 
     maxCopyBufferSize isNil ifTrue:[
-	maxCopyBufferSize := (8*1024*1024) asValue.
-	maxCopyBufferSize addDependent:self.
-	maxCopyBufferSize changed.
-	maxCopyBufferSize onChangeSend:#updateModifiedChannel to:self.
+        maxCopyBufferSize := (8*1024*1024) asValue.
+        maxCopyBufferSize addDependent:self.
+        maxCopyBufferSize changed.
+        maxCopyBufferSize onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ maxCopyBufferSize.
 !
@@ -4089,7 +4106,7 @@
 monitorList
 
     monitorList isNil ifTrue:[
-	monitorList := (resources array:(sizeInfos collect:[:entry | entry at:1])) asList.
+        monitorList := (resources array:(sizeInfos collect:[:entry | entry at:1])) asList.
     ].
     ^ monitorList.
 !
@@ -4097,10 +4114,10 @@
 monitorSelection
 
     monitorSelection isNil ifTrue:[
-	monitorSelection := ValueHolder new.
-	monitorSelection addDependent:self.
-	monitorSelection onChangeSend:#updateModifiedChannel to:self.
-	monitorSelection changed.
+        monitorSelection := ValueHolder new.
+        monitorSelection addDependent:self.
+        monitorSelection onChangeSend:#updateModifiedChannel to:self.
+        monitorSelection changed.
     ].
     ^ monitorSelection.
 !
@@ -4108,10 +4125,10 @@
 screenDepthVisualLabelHolder
 
     screenDepthVisualLabelHolder isNil ifTrue:[
-	screenDepthVisualLabelHolder := (resources string:'Screen: Depth: %1 Visual: %2  (%3)'
-				 with:screen depth printString
-				 with:screen visualType
-				 with:screen serverVendor) asValue.
+        screenDepthVisualLabelHolder := (resources string:'Screen: Depth: %1 Visual: %2  (%3)'
+                                 with:screen depth printString
+                                 with:screen visualType
+                                 with:screen serverVendor) asValue.
     ].
     ^ screenDepthVisualLabelHolder.
 !
@@ -4119,10 +4136,10 @@
 sizeX
 
     sizeX isNil ifTrue:[
-	sizeX := screen widthInMillimeter asValue.
-	sizeX addDependent:self.
-	sizeX changed.
-	sizeX onChangeSend:#updateModifiedChannel to:self.
+        sizeX := screen widthInMillimeter asValue.
+        sizeX addDependent:self.
+        sizeX changed.
+        sizeX onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ sizeX.
 !
@@ -4130,10 +4147,10 @@
 sizeY
 
     sizeY isNil ifTrue:[
-	sizeY := screen heightInMillimeter asValue.
-	sizeY addDependent:self.
-	sizeY changed.
-	sizeY onChangeSend:#updateModifiedChannel to:self.
+        sizeY := screen heightInMillimeter asValue.
+        sizeY addDependent:self.
+        sizeY changed.
+        sizeY onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ sizeY.
 !
@@ -4141,8 +4158,8 @@
 useFixGrayPalette
 
     useFixGrayPalette isNil ifTrue:[
-	useFixGrayPalette := screen fixGrayColors notNil asValue.
-	useFixGrayPalette onChangeSend:#updateModifiedChannel to:self.
+        useFixGrayPalette := screen fixGrayColors notNil asValue.
+        useFixGrayPalette onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ useFixGrayPalette.
 !
@@ -4150,7 +4167,7 @@
 useFixGrayPaletteLabel
 
     useFixGrayPaletteLabel isNil ifTrue:[
-	useFixGrayPaletteLabel := (resources string:'Use Fix Gray Color Palette %1' with:'(32)') asValue.
+        useFixGrayPaletteLabel := (resources string:'Use Fix Gray Color Palette %1' with:'(32)') asValue.
     ].
     ^ useFixGrayPaletteLabel.
 !
@@ -4158,8 +4175,8 @@
 useFixPalette
 
     useFixPalette isNil ifTrue:[
-	useFixPalette := screen fixColors notNil asValue.
-	useFixPalette onChangeSend:#updateModifiedChannel to:self.
+        useFixPalette := screen fixColors notNil asValue.
+        useFixPalette onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ useFixPalette.
 !
@@ -4167,27 +4184,27 @@
 useFixPaletteLabel
 
     useFixPaletteLabel isNil ifTrue:[
-	useFixPaletteLabel := (resources string:'Use Fix Color Palette %1' with:'(4x8x4)') asValue.
+        useFixPaletteLabel := (resources string:'Use Fix Color Palette %1' with:'(4x8x4)') asValue.
     ].
     ^ useFixPaletteLabel.
 !
 
 usedHeight
     usedHeight isNil ifTrue:[
-	usedHeight := screen usableHeight asValue.
-	usedHeight addDependent:self.
-	usedHeight changed.
-	usedHeight onChangeSend:#updateModifiedChannel to:self.
+        usedHeight := screen usableHeight asValue.
+        usedHeight addDependent:self.
+        usedHeight changed.
+        usedHeight onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ usedHeight.
 !
 
 usedWidth
     usedWidth isNil ifTrue:[
-	usedWidth := screen usableWidth asValue.
-	usedWidth addDependent:self.
-	usedWidth changed.
-	usedWidth onChangeSend:#updateModifiedChannel to:self.
+        usedWidth := screen usableWidth asValue.
+        usedWidth addDependent:self.
+        usedWidth changed.
+        usedWidth onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ usedWidth.
 !
@@ -4195,8 +4212,8 @@
 visualIsPseudoColor
 
     visualIsPseudoColor isNil ifTrue:[
-	visualIsPseudoColor := (screen visualType == #PseudoColor) asValue.
-	visualIsPseudoColor onChangeSend:#updateModifiedChannel to:self.
+        visualIsPseudoColor := (screen visualType == #PseudoColor) asValue.
+        visualIsPseudoColor onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ visualIsPseudoColor.
 ! !
@@ -4209,10 +4226,10 @@
 
     sel := self monitorSelection value.
     (sel notNil and:[sel ~~ 0]) ifTrue:[
-	sizeInfoEntry := sizeInfos at:sel.
-	sizes := sizeInfoEntry at:2.
-	self sizeX value:(sizes at:1).
-	self sizeY value:(sizes at:2).
+        sizeInfoEntry := sizeInfos at:sel.
+        sizes := sizeInfoEntry at:2.
+        self sizeX value:(sizes at:1).
+        self sizeY value:(sizes at:2).
     ].
 !
 
@@ -4221,22 +4238,22 @@
 
     sizes := sizeInfos collect:[:entry | entry at:2].
     idx := sizes findFirst:[:entry |
-				((entry at:1) = sizeX value)
-				and:[((entry at:2) = sizeY value)]
-			   ].
+                                ((entry at:1) = sizeX value)
+                                and:[((entry at:2) = sizeY value)]
+                           ].
     idx ~~ 0 ifTrue:[
-	self monitorSelection value:idx
+        self monitorSelection value:idx
     ].
 !
 
 update:something with:aParameter from:changedObject
     changedObject == self monitorSelection ifTrue:[
-	self monitorSelectionChanged.
-	^ self.
+        self monitorSelectionChanged.
+        ^ self.
     ].
     (changedObject == self sizeX or:[changedObject == self sizeY]) ifTrue:[
-	self sizeXorYChanged.
-	^ self.
+        self sizeXorYChanged.
+        ^ self.
     ].
 
     super update:something with:aParameter from:changedObject
@@ -4258,26 +4275,26 @@
 
     listOfSizes := self class classResources at:'LIST_OF_OFFERED_SCREEN_SIZES' default:#default.
     listOfSizes == #default ifTrue:[
-	"/ nothing in resource file; offer at least some.
-	sizeInfos := #(
-			   ( '11.3'' (235mm x 175mm) LCD'   (235 175)    )
-			   ( '17''   (325mm x 245mm)'       (325 245)    )
-			   ( '19''   (340mm x 270mm)'       (340 270)    )
-			   ( '20''   (350mm x 280mm)'       (350 280)    )
-			   ( '21''   (365mm x 285mm)'       (365 285)    )
-		       ).
+        "/ nothing in resource file; offer at least some.
+        sizeInfos := #(
+                           ( '11.3'' (235mm x 175mm) LCD'   (235 175)    )
+                           ( '17''   (325mm x 245mm)'       (325 245)    )
+                           ( '19''   (340mm x 270mm)'       (340 270)    )
+                           ( '20''   (350mm x 280mm)'       (350 280)    )
+                           ( '21''   (365mm x 285mm)'       (365 285)    )
+                       ).
     ] ifFalse:[
-	sizeInfos := resources array:listOfSizes.
+        sizeInfos := resources array:listOfSizes.
     ].
     visual := screen visualType.
     (visual == #StaticGray or:[visual == #GrayScale]) ifTrue:[
-	ditherStyles := self class staticGrayOrGrayScaleDitherStrings.
-	ditherSyms := self class staticGrayOrGrayScaleDitherSyms.
+        ditherStyles := self class staticGrayOrGrayScaleDitherStrings.
+        ditherSyms := self class staticGrayOrGrayScaleDitherSyms.
     ] ifFalse:[
-	visual ~~ #TrueColor ifTrue:[
-	    ditherStyles := self class trueColorDitherStrings.
-	    ditherSyms := self class trueColorDitherSyms.
-	]
+        visual ~~ #TrueColor ifTrue:[
+            ditherStyles := self class trueColorDitherStrings.
+            ditherSyms := self class trueColorDitherSyms.
+        ]
     ].
     super initialize.
 
@@ -4297,7 +4314,7 @@
 
     self deepIcons value ~= screen supportsDeepIcons ifTrue:[^ true].
     ditherSyms notNil ifTrue:[
-	self ditherListSelection value ~= (ditherSyms indexOf:(Image ditherAlgorithm) ifAbsent:#threshold) ifTrue:[^ true].
+        self ditherListSelection value ~= (ditherSyms indexOf:(Image ditherAlgorithm) ifAbsent:#threshold) ifTrue:[^ true].
     ].
     self clipEncodingListSelection value ~= (self class clipEncodingSyms indexOf:screen clipboardEncoding ifAbsent:1) ifTrue:[^ true].
     ^ false
@@ -4682,20 +4699,20 @@
 
 commonAspects
     ^ #(
-	#useCodeView2InTools
-	 #showAcceptCancelBarInBrowser
-	 #searchDialogIsModal
-	 #startTextDragWithControl
-	 #st80EditMode
-	 #extendedWordSelectMode
-	 #whitespaceWordSelectMode
-	 #selectAllWhenClickingBeyondEnd
-	 #autoIndentInCodeView
-	 #immediateCodeCompletion
-	 #codeCompletionOnControlKey
-	 #codeCompletionOnTabKey
-	 #codeCompletionViewKeyboardNavigationNeedsModifier
-	 #selectionExtensionMode
+        #useCodeView2InTools
+         #showAcceptCancelBarInBrowser
+         #searchDialogIsModal
+         #startTextDragWithControl
+         #st80EditMode
+         #extendedWordSelectMode
+         #whitespaceWordSelectMode
+         #selectAllWhenClickingBeyondEnd
+         #autoIndentInCodeView
+         #immediateCodeCompletion
+         #codeCompletionOnControlKey
+         #codeCompletionOnTabKey
+         #codeCompletionViewKeyboardNavigationNeedsModifier
+         #selectionExtensionMode
     )
 
     "Modified: / 07-03-2012 / 14:33:40 / cg"
@@ -4728,64 +4745,64 @@
 
 autoIndentInCodeView
     autoIndentInCodeView isNil ifTrue:[
-	autoIndentInCodeView := false asValue.
-	autoIndentInCodeView onChangeSend:#updateModifiedChannel to:self.
+        autoIndentInCodeView := false asValue.
+        autoIndentInCodeView onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ autoIndentInCodeView.
 !
 
 codeCompletionOnControlKey
     codeCompletionOnControlKey isNil ifTrue:[
-	codeCompletionOnControlKey := false asValue.
-	codeCompletionOnControlKey onChangeSend:#updateModifiedChannel to:self.
+        codeCompletionOnControlKey := false asValue.
+        codeCompletionOnControlKey onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ codeCompletionOnControlKey.
 !
 
 codeCompletionOnTabKey
     codeCompletionOnTabKey isNil ifTrue:[
-	codeCompletionOnTabKey := false asValue.
-	codeCompletionOnTabKey onChangeSend:#updateModifiedChannel to:self.
+        codeCompletionOnTabKey := false asValue.
+        codeCompletionOnTabKey onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ codeCompletionOnTabKey.
 !
 
 enforceContentsDropForFiles
     enforceContentsDropForFiles isNil ifTrue:[
-	enforceContentsDropForFiles := true asValue.
-	enforceContentsDropForFiles onChangeSend:#updateModifiedChannel to:self.
+        enforceContentsDropForFiles := true asValue.
+        enforceContentsDropForFiles onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ enforceContentsDropForFiles.
 !
 
 extendedWordSelectMode
     extendedWordSelectMode isNil ifTrue:[
-	extendedWordSelectMode := true asValue.
-	extendedWordSelectMode onChangeSend:#updateModifiedChannel to:self.
+        extendedWordSelectMode := true asValue.
+        extendedWordSelectMode onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ extendedWordSelectMode.
 !
 
 immediateCodeCompletion
     immediateCodeCompletion isNil ifTrue:[
-	immediateCodeCompletion := false asValue.
-	immediateCodeCompletion onChangeSend:#updateModifiedChannel to:self.
+        immediateCodeCompletion := false asValue.
+        immediateCodeCompletion onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ immediateCodeCompletion.
 !
 
 searchDialogIsModal
     searchDialogIsModal isNil ifTrue:[
-	searchDialogIsModal := true asValue.
-	searchDialogIsModal onChangeSend:#updateModifiedChannel to:self.
+        searchDialogIsModal := true asValue.
+        searchDialogIsModal onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ searchDialogIsModal.
 !
 
 selectAllWhenClickingBeyondEnd
     selectAllWhenClickingBeyondEnd isNil ifTrue:[
-	selectAllWhenClickingBeyondEnd := true asValue.
-	selectAllWhenClickingBeyondEnd onChangeSend:#updateModifiedChannel to:self.
+        selectAllWhenClickingBeyondEnd := true asValue.
+        selectAllWhenClickingBeyondEnd onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ selectAllWhenClickingBeyondEnd.
 
@@ -4794,8 +4811,8 @@
 
 selectionExtensionMode
     selectionExtensionMode isNil ifTrue:[
-	selectionExtensionMode := #traditional asValue.
-	selectionExtensionMode onChangeSend:#updateModifiedChannel to:self.
+        selectionExtensionMode := #traditional asValue.
+        selectionExtensionMode onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ selectionExtensionMode.
 
@@ -4813,48 +4830,48 @@
 
 showAcceptCancelBarInBrowser
     showAcceptCancelBarInBrowser isNil ifTrue:[
-	showAcceptCancelBarInBrowser := false asValue.
-	showAcceptCancelBarInBrowser onChangeSend:#updateModifiedChannel to:self
+        showAcceptCancelBarInBrowser := false asValue.
+        showAcceptCancelBarInBrowser onChangeSend:#updateModifiedChannel to:self
     ].
     ^ showAcceptCancelBarInBrowser.
 !
 
 st80DoubleClickSelectMode
     st80DoubleClickSelectMode isNil ifTrue:[
-	st80DoubleClickSelectMode := true asValue.
-	st80DoubleClickSelectMode onChangeSend:#updateModifiedChannel to:self.
+        st80DoubleClickSelectMode := true asValue.
+        st80DoubleClickSelectMode onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ st80DoubleClickSelectMode.
 !
 
 st80EditMode
     st80EditingMode isNil ifTrue:[
-	st80EditingMode := true asValue.
-	st80EditingMode onChangeSend:#updateModifiedChannel to:self.
+        st80EditingMode := true asValue.
+        st80EditingMode onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ st80EditingMode.
 !
 
 startTextDragWithControl
     startTextDragWithControl isNil ifTrue:[
-	startTextDragWithControl := true asValue.
-	startTextDragWithControl onChangeSend:#updateModifiedChannel to:self.
+        startTextDragWithControl := true asValue.
+        startTextDragWithControl onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ startTextDragWithControl.
 !
 
 tabsIs4
     tabsIs4 isNil ifTrue:[
-	tabsIs4 := true asValue.
-	tabsIs4 onChangeSend:#updateModifiedChannel to:self.
+        tabsIs4 := true asValue.
+        tabsIs4 onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ tabsIs4.
 !
 
 useCodeView2InTools
     useCodeView2InTools isNil ifTrue:[
-	useCodeView2InTools := ValueHolder new.
-	useCodeView2InTools onChangeSend:#updateModifiedChannel to:self
+        useCodeView2InTools := ValueHolder new.
+        useCodeView2InTools onChangeSend:#updateModifiedChannel to:self
 
     ].
     ^ useCodeView2InTools
@@ -4864,8 +4881,8 @@
 
 whitespaceWordSelectMode
     whitespaceWordSelectMode isNil ifTrue:[
-	whitespaceWordSelectMode := true asValue.
-	whitespaceWordSelectMode onChangeSend:#updateModifiedChannel to:self.
+        whitespaceWordSelectMode := true asValue.
+        whitespaceWordSelectMode onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ whitespaceWordSelectMode.
 ! !
@@ -4985,138 +5002,138 @@
        name: windowSpec
        window:
       (WindowSpec
-	 label: 'General Compiler Settings'
-	 name: 'General Compiler Settings'
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 600 320)
+         label: 'General Compiler Settings'
+         name: 'General Compiler Settings'
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 600 320)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (VerticalPanelViewSpec
-	     name: 'VerticalPanel2'
-	     layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-	     horizontalLayout: fit
-	     verticalLayout: top
-	     horizontalSpace: 3
-	     verticalSpace: 3
-	     component:
-	    (SpecCollection
-	       collection: (
-		(CheckBoxSpec
-		   label: 'Catch Method Redefinitions'
-		   name: 'CatchMethodRedefinitions'
-		   model: catchMethodRedefs
-		   translateLabel: true
-		   extent: (Point 600 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Catch Class Redefinitions'
-		   name: 'CatchClassRedefinitions'
-		   model: catchClassRedefs
-		   translateLabel: true
-		   extent: (Point 600 30)
-		 )
-		(DividerSpec
-		   name: 'Separator2'
-		   extent: (Point 600 3)
-		 )
-		(CheckBoxSpec
-		   label: 'Keep History Line in Methods'
-		   name: 'KeepHistoryLineinMethods'
-		   model: historyLines
-		   translateLabel: true
-		   extent: (Point 600 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Keep Full Class History'
-		   name: 'KeepFullClassHistory'
-		   enableChannel: hasHistoryManager
-		   model: fullHistoryUpdate
-		   translateLabel: true
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'Box2'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Username in History:'
-			 name: 'Label1'
-			 layout: (LayoutFrame 0 0 0 0 200 0 30 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField1'
-			 layout: (LayoutFrame 200 0 0 0 347 0 30 0)
-			 model: userNameInHistoryHolder
-			 immediateAccept: true
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: false
-			 acceptOnPointerLeave: true
-		       )
-		      (LabelSpec
-			 label: '(leave empty for login-name)'
-			 name: 'Label2'
-			 layout: (LayoutFrame 354 0 0 0 554 0 30 0)
-			 translateLabel: true
-			 adjust: left
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(DividerSpec
-		   name: 'Separator3'
-		   extent: (Point 600 3)
-		 )
-		(ViewSpec
-		   name: 'Box1'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'FileIn Source Mode:'
-			 name: 'FileInSourceModeLabel'
-			 layout: (AlignmentOrigin 282 0 15 0 1 0.5)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (PopUpListSpec
-			 label: 'PopUp List'
-			 name: 'KeepSourceSelection'
-			 layout: (LayoutFrame 279 0 0 0 -5 1 30 0)
-			 tabable: true
-			 model: keepSourceSelection
-			 menu: keepSource
-			 useIndex: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(DividerSpec
-		   name: 'Separator1'
-		   extent: (Point 600 3)
-		 )
-		(CheckBoxSpec
-		   label: 'If Present, Load Binary Objects when Autoloading'
-		   name: 'LoadBinaryObjectsWhenAutoloading'
-		   enableChannel: canLoadBinaries
-		   model: loadBinaries
-		   translateLabel: true
-		   extent: (Point 600 30)
-		 )
-		)
-
-	     )
-	   )
-	  )
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel2'
+             layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+             horizontalLayout: fit
+             verticalLayout: top
+             horizontalSpace: 3
+             verticalSpace: 3
+             component:
+            (SpecCollection
+               collection: (
+                (CheckBoxSpec
+                   label: 'Catch Method Redefinitions'
+                   name: 'CatchMethodRedefinitions'
+                   model: catchMethodRedefs
+                   translateLabel: true
+                   extent: (Point 600 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Catch Class Redefinitions'
+                   name: 'CatchClassRedefinitions'
+                   model: catchClassRedefs
+                   translateLabel: true
+                   extent: (Point 600 30)
+                 )
+                (DividerSpec
+                   name: 'Separator2'
+                   extent: (Point 600 3)
+                 )
+                (CheckBoxSpec
+                   label: 'Keep History Line in Methods'
+                   name: 'KeepHistoryLineinMethods'
+                   model: historyLines
+                   translateLabel: true
+                   extent: (Point 600 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Keep Full Class History'
+                   name: 'KeepFullClassHistory'
+                   enableChannel: hasHistoryManager
+                   model: fullHistoryUpdate
+                   translateLabel: true
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'Box2'
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Username in History:'
+                         name: 'Label1'
+                         layout: (LayoutFrame 0 0 0 0 200 0 30 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField1'
+                         layout: (LayoutFrame 200 0 0 0 347 0 30 0)
+                         model: userNameInHistoryHolder
+                         immediateAccept: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: false
+                         acceptOnPointerLeave: true
+                       )
+                      (LabelSpec
+                         label: '(leave empty for login-name)'
+                         name: 'Label2'
+                         layout: (LayoutFrame 354 0 0 0 554 0 30 0)
+                         translateLabel: true
+                         adjust: left
+                       )
+                      )
+
+                   )
+                   extent: (Point 600 30)
+                 )
+                (DividerSpec
+                   name: 'Separator3'
+                   extent: (Point 600 3)
+                 )
+                (ViewSpec
+                   name: 'Box1'
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'FileIn Source Mode:'
+                         name: 'FileInSourceModeLabel'
+                         layout: (AlignmentOrigin 282 0 15 0 1 0.5)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (PopUpListSpec
+                         label: 'PopUp List'
+                         name: 'KeepSourceSelection'
+                         layout: (LayoutFrame 279 0 0 0 -5 1 30 0)
+                         tabable: true
+                         model: keepSourceSelection
+                         menu: keepSource
+                         useIndex: true
+                       )
+                      )
+
+                   )
+                   extent: (Point 600 30)
+                 )
+                (DividerSpec
+                   name: 'Separator1'
+                   extent: (Point 600 3)
+                 )
+                (CheckBoxSpec
+                   label: 'If Present, Load Binary Objects when Autoloading'
+                   name: 'LoadBinaryObjectsWhenAutoloading'
+                   enableChannel: canLoadBinaries
+                   model: loadBinaries
+                   translateLabel: true
+                   extent: (Point 600 30)
+                 )
+                )
+
+             )
+           )
+          )
 
        )
      )
@@ -5126,19 +5143,19 @@
 
 basicReadSettings
     self keepSourceSelection value:(self class keepSourceOptions
-		indexOf:ClassCategoryReader sourceMode
-		ifAbsent:1).
+                indexOf:ClassCategoryReader sourceMode
+                ifAbsent:1).
     self catchClassRedefs value:(Class catchClassRedefinitions ? false).
     self catchMethodRedefs value:(Class catchMethodRedefinitions ? false).
     self canLoadBinaries value ifTrue:[
-	self loadBinaries value:Smalltalk loadBinaries
+        self loadBinaries value:Smalltalk loadBinaries
     ] ifFalse:[
-	self loadBinaries value:false
+        self loadBinaries value:false
     ].
     self hasHistoryManager ifTrue:[
-	self fullHistoryUpdate value:(HistoryManager fullHistoryUpdate ? false)
+        self fullHistoryUpdate value:(HistoryManager fullHistoryUpdate ? false)
     ] ifFalse:[
-	self fullHistoryUpdate value:false
+        self fullHistoryUpdate value:false
     ].
     self historyLines value:self hasHistoryManager.
     self userNameInHistoryHolder value:(UserPreferences current historyManagerSignature).
@@ -5154,14 +5171,14 @@
     Class catchClassRedefinitions:self catchClassRedefs value.
     Class catchMethodRedefinitions:self catchMethodRedefs value.
     HistoryManager notNil ifTrue:[
-	HistoryManager fullHistoryUpdate:self fullHistoryUpdate value.
-	self historyLines value ifTrue:[
-	    HistoryManager activate
-	] ifFalse:[
-	    HistoryManager deactivate
-	].
-	nm := (self userNameInHistoryHolder value ? '') withoutSeparators asNilIfEmpty.
-	UserPreferences current historyManagerSignature:nm.
+        HistoryManager fullHistoryUpdate:self fullHistoryUpdate value.
+        self historyLines value ifTrue:[
+            HistoryManager activate
+        ] ifFalse:[
+            HistoryManager deactivate
+        ].
+        nm := (self userNameInHistoryHolder value ? '') withoutSeparators asNilIfEmpty.
+        UserPreferences current historyManagerSignature:nm.
     ].
     Smalltalk loadBinaries:self loadBinaries value.
 
@@ -5174,7 +5191,7 @@
 canLoadBinaries
 
     canLoadBinaries isNil ifTrue:[
-	canLoadBinaries := (ObjectFileLoader notNil and:[ObjectFileLoader canLoadObjectFiles]) asValue.
+        canLoadBinaries := (ObjectFileLoader notNil and:[ObjectFileLoader canLoadObjectFiles]) asValue.
     ].
     ^ canLoadBinaries.
 !
@@ -5182,8 +5199,8 @@
 catchClassRedefs
 
     catchClassRedefs isNil ifTrue:[
-	catchClassRedefs := (Class catchClassRedefinitions ? false) asValue.
-	catchClassRedefs onChangeSend:#updateModifiedChannel to:self.
+        catchClassRedefs := (Class catchClassRedefinitions ? false) asValue.
+        catchClassRedefs onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ catchClassRedefs.
 !
@@ -5191,8 +5208,8 @@
 catchMethodRedefs
 
     catchMethodRedefs isNil ifTrue:[
-	catchMethodRedefs := (Class catchMethodRedefinitions ? false) asValue.
-	catchMethodRedefs onChangeSend:#updateModifiedChannel to:self.
+        catchMethodRedefs := (Class catchMethodRedefinitions ? false) asValue.
+        catchMethodRedefs onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ catchMethodRedefs.
 !
@@ -5200,12 +5217,12 @@
 fullHistoryUpdate
 
     fullHistoryUpdate isNil ifTrue:[
-	self hasHistoryManager ifTrue:[
-	    fullHistoryUpdate := (HistoryManager fullHistoryUpdate ? false) asValue.
-	] ifFalse:[
-	    fullHistoryUpdate := false asValue.
-	].
-	fullHistoryUpdate onChangeSend:#updateModifiedChannel to:self.
+        self hasHistoryManager ifTrue:[
+            fullHistoryUpdate := (HistoryManager fullHistoryUpdate ? false) asValue.
+        ] ifFalse:[
+            fullHistoryUpdate := false asValue.
+        ].
+        fullHistoryUpdate onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ fullHistoryUpdate.
 !
@@ -5218,8 +5235,8 @@
 historyLines
 
     historyLines isNil ifTrue:[
-	historyLines := self hasHistoryManager asValue.
-	historyLines onChangeSend:#updateModifiedChannel to:self.
+        historyLines := self hasHistoryManager asValue.
+        historyLines onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ historyLines.
 !
@@ -5227,7 +5244,7 @@
 keepSource
 
     keepSource isNil ifTrue:[
-	keepSource := (resources array:(self class keepSourceStrings)) asList.
+        keepSource := (resources array:(self class keepSourceStrings)) asList.
     ].
     ^ keepSource.
 !
@@ -5235,8 +5252,8 @@
 keepSourceSelection
 
     keepSourceSelection isNil ifTrue:[
-	keepSourceSelection := (self class keepSourceOptions indexOf:ClassCategoryReader sourceMode ifAbsent:1) asValue.
-	keepSourceSelection onChangeSend:#updateModifiedChannel to:self.
+        keepSourceSelection := (self class keepSourceOptions indexOf:ClassCategoryReader sourceMode ifAbsent:1) asValue.
+        keepSourceSelection onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ keepSourceSelection.
 !
@@ -5244,12 +5261,12 @@
 loadBinaries
 
     loadBinaries isNil ifTrue:[
-	self canLoadBinaries value ifTrue:[
-	    loadBinaries:=  Smalltalk loadBinaries asValue
-	] ifFalse:[
-	    loadBinaries:=  false asValue
-	].
-	loadBinaries onChangeSend:#updateModifiedChannel to:self.
+        self canLoadBinaries value ifTrue:[
+            loadBinaries:=  Smalltalk loadBinaries asValue
+        ] ifFalse:[
+            loadBinaries:=  false asValue
+        ].
+        loadBinaries onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ loadBinaries.
 
@@ -5259,8 +5276,8 @@
 userNameInHistoryHolder
 
     userNameInHistoryHolder isNil ifTrue:[
-	userNameInHistoryHolder := '' asValue.
-	userNameInHistoryHolder onChangeSend:#updateModifiedChannel to:self.
+        userNameInHistoryHolder := '' asValue.
+        userNameInHistoryHolder onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ userNameInHistoryHolder.
 
@@ -5345,8 +5362,8 @@
     <resource: #image>
 
     ^Icon
-	constantNamed:#'AbstractSettingsApplication::HTTPStartServerSettingsApplication class defaultIcon'
-	ifAbsentPut:[(Depth8Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+        constantNamed:#'AbstractSettingsApplication::HTTPStartServerSettingsApplication class defaultIcon'
+        ifAbsentPut:[(Depth8Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 @@@@@@DB@0PC@0HBAP@@@@@@@@@@@@@@@@TFA0 IB ,KB00E@@@@@@@@@@@@@@4NC1@QD!!LKB08KE@T@@@@@@@@@@@TUE!!\PDA@XFQ(NF10]AP@@@@@@@@DF
 BQ8PDA@PDAH_E $HE"@@@@@@@@@BHP$VDA@PB00"H2P$IRX''J@@@@@@@JR(WG!!@PB2,+J2,+J2,+J2,+@@@@@@P,DA@PDB,-K"4-K2</K24(L@@@@@@1L#L3
 DQ@+K"8.K"84MR86AS@@@@@@M3 IBP 9J28:N3,<OC4(O T0@@@@@C<*BP$IPB,6O#8>O#8>O#XEL@@@@@@APSHIBQ\+K"8.K"8.KR >AS@@@@@@K!!P2BQ8P
@@ -5545,7 +5562,7 @@
 
 createdServers
     CreatedServers isNil ifTrue:[
-	CreatedServers := Set new.
+        CreatedServers := Set new.
     ].
     ^ CreatedServers
 !
@@ -5565,9 +5582,9 @@
 
     serverClass := self serverClass.
     (serverClass notNil and:[serverClass isLoaded]) ifTrue:[
-	self serverClass runningServers
-	    removeDependent:self;
-	    addDependent:self.
+        self serverClass runningServers
+            removeDependent:self;
+            addDependent:self.
     ].
     self createServerSubApplicationsForRunningServers.
     self createdServerChanged.
@@ -5585,8 +5602,8 @@
     "create a FastCGI server"
 
     FCGIServer isNil ifTrue:[
-	self warn:'The FCGIServer-class is missing - cannot create server.'.
-	^ self.
+        self warn:'The FCGIServer-class is missing - cannot create server.'.
+        ^ self.
     ].
     ^ self createServerForClass:FCGIServer.
 
@@ -5597,8 +5614,8 @@
     "create a default server - i.e. a HTTP server"
 
     HTTPServer isNil ifTrue:[
-	self warn:'The HTTPServer-class is missing - cannot create server.'.
-	^ self.
+        self warn:'The HTTPServer-class is missing - cannot create server.'.
+        ^ self.
     ].
     ^ self createServerForClass:self serverClass.
 
@@ -5642,30 +5659,30 @@
     |newServer port runningServers|
 
     serverClass isNil ifTrue:[
-	self warn:'The server class is missing - cannot create server.'.
-	^ self.
+        self warn:'The server class is missing - cannot create server.'.
+        ^ self.
     ].
 
     self withWaitCursorDo:[
-	port := self portNumberChannel value.
-	runningServers := serverClass runningServers.
-	runningServers notEmpty ifTrue:[
-	    runningServers do:[:aServer |
-		aServer port = port asInteger ifTrue:[
-		    Dialog warn:'There is already a server for port ', port asString.
-		    ^ self
-		]
-	    ]
-	].
-	runningServers addDependent:self.
-
-	(port = serverClass defaultPort) ifTrue:[
-	    newServer := serverClass newServerWithDefaultServiceListOn:port.
-	] ifFalse:[
-	    newServer := serverClass newServerOnPort:port.
-	].
-	self class addCreatedServer:newServer.
-	self createServerApplicationFor:newServer.
+        port := self portNumberChannel value.
+        runningServers := serverClass runningServers.
+        runningServers notEmpty ifTrue:[
+            runningServers do:[:aServer |
+                aServer port = port asInteger ifTrue:[
+                    Dialog warn:'There is already a server for port ', port asString.
+                    ^ self
+                ]
+            ]
+        ].
+        runningServers addDependent:self.
+
+        (port = serverClass defaultPort) ifTrue:[
+            newServer := serverClass newServerWithDefaultServiceListOn:port.
+        ] ifFalse:[
+            newServer := serverClass newServerOnPort:port.
+        ].
+        self class addCreatedServer:newServer.
+        self createServerApplicationFor:newServer.
     ]
 !
 
@@ -5674,31 +5691,31 @@
 
     serverClass := self serverClass.
     fileName := Dialog requestFileName:'Select a Server Settings File'
-	    default:(serverClass settingsFilename)
-	    pattern:'*.xml'.
+            default:(serverClass settingsFilename)
+            pattern:'*.xml'.
 
     fileName isEmptyOrNil ifTrue:[ ^ self].
     self withWaitCursorDo:[
-	newServer := serverClass serverFromSettingsFile:(fileName asFilename).
-	newServer notNil ifTrue:[
-	    newServerPort := newServer port.
-	    runningServers := serverClass runningServers.
-	    runningServers notEmpty ifTrue:[
-		[self hasServerForPort:newServerPort] whileTrue:[
-		    answer := Dialog
-			request:('There is already a server for port <1p>. Please select another one' expandMacrosWith:newServerPort)
-			initialAnswer:self portNumberChannel value printString.
-		    answer isEmptyOrNil ifTrue:[
-			^ self
-		    ].
-		    newServerPort := Number readFromString:answer.
-		]
-	    ].
-	    newServer port:newServerPort.
-	    runningServers addDependent:self.
-	    self class addCreatedServer:newServer.
-	    self createServerApplicationFor:newServer.
-	].
+        newServer := serverClass serverFromSettingsFile:(fileName asFilename).
+        newServer notNil ifTrue:[
+            newServerPort := newServer port.
+            runningServers := serverClass runningServers.
+            runningServers notEmpty ifTrue:[
+                [self hasServerForPort:newServerPort] whileTrue:[
+                    answer := Dialog
+                        request:('There is already a server for port <1p>. Please select another one' expandMacrosWith:newServerPort)
+                        initialAnswer:self portNumberChannel value printString.
+                    answer isEmptyOrNil ifTrue:[
+                        ^ self
+                    ].
+                    newServerPort := Number readFromString:answer.
+                ]
+            ].
+            newServer port:newServerPort.
+            runningServers addDependent:self.
+            self class addCreatedServer:newServer.
+            self createServerApplicationFor:newServer.
+        ].
     ].
 
     "Modified: / 25-01-2007 / 16:40:57 / cg"
@@ -5710,18 +5727,18 @@
     serverClass := self serverClass.
 
     (serverClass notNil and:[ serverClass isLoaded ]) ifFalse:[
-	^ self
+        ^ self
     ].
 
     serverToStart := serverClass runningServers asNewSet.
     serverToStart addAll:self class createdServers.
     serverToStart isEmpty ifTrue:[
-	^ self
+        ^ self
     ].
     serverToStart := serverToStart select:[:s | s port notNil].
     serverToStart := serverToStart asSortedCollection:[:a :b | a port < b port].
     serverToStart do:[:eachServerInstance |
-	self createServerApplicationFor:eachServerInstance.
+        self createServerApplicationFor:eachServerInstance.
     ]
 
     "Modified: / 26-08-2012 / 10:25:23 / cg"
@@ -5733,7 +5750,7 @@
     serverClass := self serverClass.
     ^ serverClass notNil
       and:[ serverClass runningServers
-		contains:[:eachServer| eachServer port = newServerPort]].
+                contains:[:eachServer| eachServer port = newServerPort]].
 
     "Modified: / 25-01-2007 / 16:39:48 / cg"
 !
@@ -5754,7 +5771,7 @@
 
     serverClass := self serverClass.
     serverClass isLoaded ifTrue:[
-	serverClass terminateAllServers.
+        serverClass terminateAllServers.
     ].
     self class removeAllCreatedServer.
     self removeAllServerSubApplications.
@@ -5768,17 +5785,17 @@
 
     serverClass := self serverClass.
     (serverClass notNil and:[serverClass isLoaded]) ifTrue:[
-	instances := serverClass runningServers asNewSet.
-	instances addAll:((settingsDialog getAllChildrenAppsForApplication:self)
-			  collect:[:aApp| aApp httpServerInstance]).
-	instances := instances select:[:i | i port notNil].
-	highestUsedPortNr := instances
-				inject:(serverClass defaultPort - 1)
-				into:[:maxSoFar :thisServer | thisServer port max:maxSoFar].
-
-	portToUse := highestUsedPortNr + 1
+        instances := serverClass runningServers asNewSet.
+        instances addAll:((settingsDialog getAllChildrenAppsForApplication:self)
+                          collect:[:aApp| aApp httpServerInstance]).
+        instances := instances select:[:i | i port notNil].
+        highestUsedPortNr := instances
+                                inject:(serverClass defaultPort - 1)
+                                into:[:maxSoFar :thisServer | thisServer port max:maxSoFar].
+
+        portToUse := highestUsedPortNr + 1
     ] ifFalse:[
-	portToUse := 8080
+        portToUse := 8080
     ].
     self portNumberChannel value:portToUse.
 
@@ -5789,20 +5806,20 @@
 
 hasCreatedServerChannel
     hasCreatedServerChannel isNil ifTrue:[
-	hasCreatedServerChannel := true asValue.
+        hasCreatedServerChannel := true asValue.
     ].
     ^ hasCreatedServerChannel.
 !
 
 hasWebServerClassesLoadedHolder
     ^ BlockValue
-	forLogicalNot:(self hasWebServerClassesNotLoadedHolder)
+        forLogicalNot:(self hasWebServerClassesNotLoadedHolder)
 !
 
 hasWebServerClassesNotLoadedHolder
     hasWebServerClassesNotLoadedHolder isNil ifTrue:[
-	hasWebServerClassesNotLoadedHolder := true asValue.
-	hasWebServerClassesNotLoadedHolder value:(self hasHTTPServerClass not or:[self hasFCGIServerClass not]).
+        hasWebServerClassesNotLoadedHolder := true asValue.
+        hasWebServerClassesNotLoadedHolder value:(self hasHTTPServerClass not or:[self hasFCGIServerClass not]).
     ].
     ^ hasWebServerClassesNotLoadedHolder.
 !
@@ -5811,8 +5828,8 @@
     |info|
 
     info := resources
-	string:'HTTPSTARTINFO'
-	default:
+        string:'HTTPSTARTINFO'
+        default:
 'This dialog enables you to create (possibly multiple) HTTP Server processes.
 (i.e. it is possible to serve multiple ports)
 
@@ -5820,9 +5837,9 @@
 configure its services, and finally start it up.'.
 
     self hasHTTPServerClass ifFalse:[
-	info := info ,
-		'\\' withCRs,
-		(resources string:'ATTENTION: Disabled because HTTPServer class is missing.') allBold
+        info := info ,
+                '\\' withCRs,
+                (resources string:'ATTENTION: Disabled because HTTPServer class is missing.') allBold
     ].
     ^ info
 
@@ -5832,7 +5849,7 @@
 portNumberChannel
 
     portNumberChannel isNil ifTrue:[
-	portNumberChannel := ValueHolder new.
+        portNumberChannel := ValueHolder new.
     ].
     ^ portNumberChannel.
 ! !
@@ -5855,8 +5872,8 @@
 
     serverClass := self serverClass.
     (serverClass isLoaded and:[changedObject == serverClass runningServers]) ifTrue:[
-	self runningServersChanged.
-	^ self.
+        self runningServersChanged.
+        ^ self.
     ].
     super update:something with:aParameter from:changedObject
 
@@ -5876,7 +5893,7 @@
 
     serverClass := self serverClass.
     (serverClass notNil and:[serverClass isLoaded]) ifTrue:[
-	serverClass runningServers removeDependent:self.
+        serverClass runningServers removeDependent:self.
     ].
     super release
 
@@ -5887,7 +5904,7 @@
 
 hasCreatedServer
     ^ (settingsDialog getAllChildrenAppsForApplication:self childrenClass:HTTPServerSettingsAppl)
-	notEmpty
+        notEmpty
 !
 
 hasFCGIServerClass
@@ -6259,14 +6276,14 @@
 
 labelTextHolder
     labelTextHolder isNil ifTrue:[
-	labelTextHolder := ValueHolder new.
+        labelTextHolder := ValueHolder new.
     ].
     ^ labelTextHolder.
 !
 
 macroTextHolder
     macroTextHolder isNil ifTrue:[
-	macroTextHolder := ValueHolder new.
+        macroTextHolder := ValueHolder new.
     ].
     ^ macroTextHolder.
 !
@@ -6274,7 +6291,7 @@
 rawKeyList
 
     rawKeyList isNil ifTrue:[
-	rawKeyList := List new.
+        rawKeyList := List new.
     ].
     ^ rawKeyList.
 !
@@ -6282,8 +6299,8 @@
 selectedFunctionKey
 
     selectedFunctionKey isNil ifTrue:[
-	selectedFunctionKey := ValueHolder new.
-	selectedFunctionKey addDependent:self.
+        selectedFunctionKey := ValueHolder new.
+        selectedFunctionKey addDependent:self.
     ].
     ^ selectedFunctionKey.
 !
@@ -6291,8 +6308,8 @@
 selectedRawKey
 
     selectedRawKey isNil ifTrue:[
-	selectedRawKey := ValueHolder new.
-	selectedRawKey addDependent:self.
+        selectedRawKey := ValueHolder new.
+        selectedRawKey addDependent:self.
     ].
     ^ selectedRawKey.
 ! !
@@ -6314,32 +6331,32 @@
 
     f := self selectedFunctionKey value.
     (f startsWith:'Cmd') ifTrue:[
-	f := f copyFrom:4
+        f := f copyFrom:4
     ].
     macro := currentUserPrefs functionKeySequences
-		at:(f asSymbol) ifAbsent:nil.
+                at:(f asSymbol) ifAbsent:nil.
     macro notNil ifTrue:[
-	macro := macro asStringCollection.
-	indent := macro
-		     inject:99999 into:[:min :element |
-			 |stripped|
-
-			 stripped := element withoutLeadingSeparators.
-			 stripped isEmpty ifTrue:[
-			     min
-			 ] ifFalse:[
-			     min min:(element size - stripped size)
-			 ]
-		     ].
-	indent ~~ 0 ifTrue:[
-	    macro := macro collect:[:line |
-			 line size > indent ifTrue:[
-			    line copyFrom:indent+1
-			 ] ifFalse:[
-			    line
-			 ].
-		    ]
-	].
+        macro := macro asStringCollection.
+        indent := macro
+                     inject:99999 into:[:min :element |
+                         |stripped|
+
+                         stripped := element withoutLeadingSeparators.
+                         stripped isEmpty ifTrue:[
+                             min
+                         ] ifFalse:[
+                             min min:(element size - stripped size)
+                         ]
+                     ].
+        indent ~~ 0 ifTrue:[
+            macro := macro collect:[:line |
+                         line size > indent ifTrue:[
+                            line copyFrom:indent+1
+                         ] ifFalse:[
+                            line
+                         ].
+                    ]
+        ].
     ].
     macroTextHolder value:macro.
 !
@@ -6714,7 +6731,7 @@
     ResourcePack flushCachedResourcePacks.
     perLanguageResources := nil.
     self withWaitCursorDo:[
-	self updateForChangedLanguage.
+        self updateForChangedLanguage.
     ].
 
 "/    Smalltalk language:(Smalltalk language).
@@ -6737,23 +6754,23 @@
 
 currentFlagAndLanguageChannel
     currentFlagAndLanguageChannel isNil ifTrue:[
-	currentFlagAndLanguageChannel := self currentLanguage asValue.
+        currentFlagAndLanguageChannel := self currentLanguage asValue.
     ].
     ^ currentFlagAndLanguageChannel.
 !
 
 currentLanguageLabel
     currentLanguageLabel isNil ifTrue:[
-	currentLanguageLabel := ValueHolder new.
-	self setCurrentLanguageLabel.
+        currentLanguageLabel := ValueHolder new.
+        self setCurrentLanguageLabel.
     ].
     ^ currentLanguageLabel.
 !
 
 languageHolder
     languageHolder isNil ifTrue:[
-	languageHolder := self currentLanguage asValue.
-	languageHolder onChangeSend:#updateModifiedChannel to:self.
+        languageHolder := self currentLanguage asValue.
+        languageHolder onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ languageHolder.
 !
@@ -6768,23 +6785,23 @@
 
 languageIndexHolder
     languageIndexHolder isNil ifTrue:[
-	languageIndexHolder := (self currentLanguageIndex) asValue.
-	languageIndexHolder onChangeSend:#languageIndexChanged to:self.
+        languageIndexHolder := (self currentLanguageIndex) asValue.
+        languageIndexHolder onChangeSend:#languageIndexChanged to:self.
     ].
     ^ languageIndexHolder.
 !
 
 languageListHolder
     languageListHolder isNil ifTrue:[
-	languageListHolder := self languageList asValue.
+        languageListHolder := self languageList asValue.
     ].
     ^ languageListHolder.
 !
 
 noticeLabelHolder
     noticeLabelHolder isNil ifTrue:[
-	noticeLabelHolder := ValueHolder new.
-	self setNoticeLabel.
+        noticeLabelHolder := ValueHolder new.
+        self setNoticeLabel.
     ].
     ^ noticeLabelHolder.
 !
@@ -6795,7 +6812,7 @@
 
 setNoticeLabel
     noticeLabelHolder
-	value: ((resources at:'LANG_MSG' default:'Select a Language') withCRs).
+        value: ((resources at:'LANG_MSG' default:'Select a Language') withCRs).
 !
 
 useSystemLanguageHolder
@@ -7125,511 +7142,511 @@
        name: windowSpec
        window:
       (WindowSpec
-	 label: 'Memory Manager Settings'
-	 name: 'Memory Manager Settings'
-	 flags: 1
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 705 722)
+         label: 'Memory Manager Settings'
+         name: 'Memory Manager Settings'
+         flags: 1
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 705 722)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (LabelSpec
-	     label: 'Label'
-	     name: 'Label1'
-	     layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 50 0)
-	     translateLabel: true
-	     labelChannel: warningLabelHolder
-	     adjust: left
-	   )
-	  (VerticalPanelViewSpec
-	     name: 'VerticalPanel1'
-	     layout: (LayoutFrame 0 0.0 50 0 0 1.0 0 1.0)
-	     horizontalLayout: fit
-	     verticalLayout: top
-	     horizontalSpace: 0
-	     verticalSpace: 3
-	     ignoreInvisibleComponents: true
-	     component:
-	    (SpecCollection
-	       collection: (
-		(LabelSpec
-		   label: 'Limits:'
-		   name: 'Label54'
-		   translateLabel: true
-		   adjust: left
-		   extent: (Point 705 22)
-		 )
-		(ViewSpec
-		   name: 'StackLimitBox'
-		   activeHelpKey: stackLimit
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Stack Limit:'
-			 name: 'Label38'
-			 layout: (LayoutFrame 0 0 8 0 265 0 28 0)
-			 activeHelpKey: stackLimit
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField20'
-			 layout: (LayoutFrame 270 0 3 0 360 0 33 0)
-			 activeHelpKey: stackLimit
-			 enableChannel: supportsJustInTimeCompilation
-			 model: stackLimit
-			 type: fileSize
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      (LabelSpec
-			 label: '(Trigger recursionInterrupt if more stack is used by a process)'
-			 name: 'Label39'
-			 layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
-			 activeHelpKey: stackLimit
-			 translateLabel: true
-			 adjust: left
-		       )
-		      )
-
-		   )
-		   extent: (Point 705 30)
-		 )
-		(ViewSpec
-		   name: 'NewSpaceSizeBox'
-		   activeHelpKey: newSpaceSize
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Size of NewSpace:'
-			 name: 'Label44'
-			 layout: (LayoutFrame 0 0 8 0 265 0 28 0)
-			 activeHelpKey: newSpaceSize
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField23'
-			 layout: (LayoutFrame 270 0 3 0 360 0 33 0)
-			 activeHelpKey: newSpaceSize
-			 model: newSpaceSize
-			 type: fileSize
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      (LabelSpec
-			 label: '(Size of Space where new objects are created)'
-			 name: 'Label45'
-			 layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
-			 activeHelpKey: newSpaceSize
-			 translateLabel: true
-			 adjust: left
-		       )
-		      )
-
-		   )
-		   extent: (Point 705 30)
-		 )
-		(ViewSpec
-		   name: 'MaximumMemoryLimitBox'
-		   activeHelpKey: maxOldSpace
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (InputFieldSpec
-			 name: 'EntryField24'
-			 layout: (LayoutFrame 270 0 3 0 360 0 33 0)
-			 activeHelpKey: maxOldSpace
-			 model: maxOldSpace
-			 type: fileSize
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      (LabelSpec
-			 label: 'Maximum Memory Limit:'
-			 name: 'Label46'
-			 layout: (LayoutFrame 0 0 8 0 265 0 28 0)
-			 activeHelpKey: maxOldSpace
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (LabelSpec
-			 label: '(Never allocate more than this amount of memory)'
-			 name: 'Label47'
-			 layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
-			 activeHelpKey: maxOldSpace
-			 translateLabel: true
-			 adjust: left
-		       )
-		      )
-
-		   )
-		   extent: (Point 705 30)
-		 )
-		(ViewSpec
-		   name: 'QuickAllocationLimitBox'
-		   activeHelpKey: fastMoreLimit
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Quick Allocation Limit:'
-			 name: 'Label26'
-			 layout: (LayoutFrame 0 0 8 0 265 0 28 0)
-			 activeHelpKey: fastMoreLimit
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField14'
-			 layout: (LayoutFrame 270 0 3 0 360 0 33 0)
-			 activeHelpKey: fastMoreLimit
-			 model: fastMoreLimit
-			 type: fileSize
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      (LabelSpec
-			 label: '(Quickly allocate more memory (suppress GC) up to this limit)'
-			 name: 'Label27'
-			 layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
-			 activeHelpKey: fastMoreLimit
-			 translateLabel: true
-			 adjust: left
-		       )
-		      )
-
-		   )
-		   extent: (Point 705 30)
-		 )
-		(ViewSpec
-		   name: 'OldspaceIncrementBox'
-		   activeHelpKey: oldIncr
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Oldspace Increment:'
-			 name: 'Label34'
-			 layout: (LayoutFrame 0 0 8 0 265 0 28 0)
-			 activeHelpKey: oldIncr
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField18'
-			 layout: (LayoutFrame 270 0 3 0 360 0 33 0)
-			 activeHelpKey: oldIncr
-			 model: oldIncr
-			 type: fileSize
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      (LabelSpec
-			 label: '(Increase oldSpace in chunks of this size)'
-			 name: 'Label35'
-			 layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
-			 activeHelpKey: oldIncr
-			 translateLabel: true
-			 adjust: left
-		       )
-		      )
-
-		   )
-		   extent: (Point 705 30)
-		 )
-		(ViewSpec
-		   name: 'OldSpaceCompressLimitBox'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Oldspace Compress Limit:'
-			 name: 'Label36'
-			 layout: (LayoutFrame 0 0 8 0 265 0 28 0)
-			 activeHelpKey: compressLimit
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField19'
-			 layout: (LayoutFrame 270 0 3 0 360 0 33 0)
-			 activeHelpKey: compressLimit
-			 model: compressLimit
-			 type: fileSize
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      (LabelSpec
-			 label: '(Use 2-pass compressing GC if > 0 and more memory is in use)'
-			 name: 'Label37'
-			 layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
-			 activeHelpKey: compressLimit
-			 translateLabel: true
-			 adjust: left
-		       )
-		      )
-
-		   )
-		   extent: (Point 705 30)
-		 )
-		(ViewSpec
-		   name: 'CodeLimitBox'
-		   activeHelpKey: codeLimit
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Dynamic code Limit:'
-			 name: 'Label40'
-			 layout: (LayoutFrame 0 0 8 0 265 0 28 0)
-			 activeHelpKey: codeLimit
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField21'
-			 layout: (LayoutFrame 270 0 3 0 360 0 33 0)
-			 activeHelpKey: codeLimit
-			 enableChannel: supportsJustInTimeCompilation
-			 model: codeLimit
-			 type: fileSize
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      (LabelSpec
-			 label: '(Flush dynamic compiled code to stay within this limit)'
-			 name: 'Label41'
-			 layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
-			 activeHelpKey: codeLimit
-			 translateLabel: true
-			 adjust: left
-		       )
-		      )
-
-		   )
-		   extent: (Point 705 30)
-		 )
-		(ViewSpec
-		   name: 'MethodSizeLimitBox'
-		   activeHelpKey: methodCodeSizeLimit
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Method Code Size Limit:'
-			 name: 'Label52'
-			 layout: (LayoutFrame 0 0 8 0 265 0 28 0)
-			 activeHelpKey: methodCodeSizeLimit
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField27'
-			 layout: (LayoutFrame 270 0 3 0 360 0 33 0)
-			 activeHelpKey: methodCodeSizeLimit
-			 enableChannel: supportsJustInTimeCompilation
-			 model: methodCodeSizeLimit
-			 type: fileSize
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      (LabelSpec
-			 label: '(Do not JIT, if an individual method''s code size exceeds this)'
-			 name: 'Label53'
-			 layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
-			 activeHelpKey: methodCodeSizeLimit
-			 translateLabel: true
-			 adjust: left
-		       )
-		      )
-
-		   )
-		   extent: (Point 705 30)
-		 )
-		(LabelSpec
-		   label: 'Triggers:'
-		   name: 'Label55'
-		   translateLabel: true
-		   adjust: left
-		   extent: (Point 705 22)
-		 )
-		(ViewSpec
-		   name: 'IncrementalGCAllocationTriggerBox'
-		   activeHelpKey: igcLimit
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Incremental GC Allocation Trigger:'
-			 name: 'Label48'
-			 layout: (LayoutFrame 0 0 8 0 265 0 28 0)
-			 activeHelpKey: igcLimit
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField25'
-			 layout: (LayoutFrame 270 0 3 0 360 0 33 0)
-			 activeHelpKey: igcLimit
-			 model: igcLimit
-			 type: fileSize
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      (LabelSpec
-			 label: '(Start IGC whenever this has been newly allocated)'
-			 name: 'Label49'
-			 layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
-			 activeHelpKey: igcLimit
-			 translateLabel: true
-			 adjust: left
-		       )
-		      )
-
-		   )
-		   extent: (Point 705 30)
-		 )
-		(ViewSpec
-		   name: 'IncrementalGCFreespaceTriggerBox'
-		   activeHelpKey: igcFreeLimit
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Incremental GC Freespace Trigger:'
-			 name: 'Label50'
-			 layout: (LayoutFrame 0 0 8 0 265 0 28 0)
-			 activeHelpKey: igcFreeLimit
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField26'
-			 layout: (LayoutFrame 270 0 3 0 360 0 33 0)
-			 activeHelpKey: igcFreeLimit
-			 model: igcFreeLimit
-			 type: fileSize
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      (LabelSpec
-			 label: '(Start IGC whenever freespace drops below this)'
-			 name: 'Label51'
-			 layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
-			 activeHelpKey: igcFreeLimit
-			 translateLabel: true
-			 adjust: left
-		       )
-		      )
-
-		   )
-		   extent: (Point 705 30)
-		 )
-		(ViewSpec
-		   name: 'CodeTriggerBox'
-		   activeHelpKey: codeTrigger
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Incremental GC Dynamic Code Trigger:'
-			 name: 'Label42'
-			 layout: (LayoutFrame 0 0 8 0 265 0 28 0)
-			 activeHelpKey: codeTrigger
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField22'
-			 layout: (LayoutFrame 270 0 3 0 360 0 33 0)
-			 activeHelpKey: codeTrigger
-			 model: codeTrigger
-			 type: fileSize
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      (LabelSpec
-			 label: '(Start incremental GC whenever this amount of code has been allocated)'
-			 name: 'Label43'
-			 layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
-			 activeHelpKey: codeTrigger
-			 translateLabel: true
-			 adjust: left
-		       )
-		      )
-
-		   )
-		   extent: (Point 705 30)
-		 )
-		(ViewSpec
-		   name: 'GCAmountBox'
-		   activeHelpKey: igcFreeAmount
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Incremental GC Amount:'
-			 name: 'Label32'
-			 layout: (LayoutFrame 0 0 8 0 265 0 28 0)
-			 activeHelpKey: igcFreeAmount
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField17'
-			 layout: (LayoutFrame 270 0 3 0 360 0 33 0)
-			 activeHelpKey: igcFreeAmount
-			 model: igcFreeAmount
-			 type: fileSize
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      (LabelSpec
-			 label: '(Try to keep this amount for peak requests)'
-			 name: 'Label33'
-			 layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
-			 activeHelpKey: igcFreeAmount
-			 translateLabel: true
-			 adjust: left
-		       )
-		      )
-
-		   )
-		   extent: (Point 705 30)
-		 )
-		)
-
-	     )
-	   )
-	  )
+         collection: (
+          (LabelSpec
+             label: 'Label'
+             name: 'Label1'
+             layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 50 0)
+             translateLabel: true
+             labelChannel: warningLabelHolder
+             adjust: left
+           )
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel1'
+             layout: (LayoutFrame 0 0.0 50 0 0 1.0 0 1.0)
+             horizontalLayout: fit
+             verticalLayout: top
+             horizontalSpace: 0
+             verticalSpace: 3
+             ignoreInvisibleComponents: true
+             component:
+            (SpecCollection
+               collection: (
+                (LabelSpec
+                   label: 'Limits:'
+                   name: 'Label54'
+                   translateLabel: true
+                   adjust: left
+                   extent: (Point 705 22)
+                 )
+                (ViewSpec
+                   name: 'StackLimitBox'
+                   activeHelpKey: stackLimit
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Stack Limit:'
+                         name: 'Label38'
+                         layout: (LayoutFrame 0 0 8 0 265 0 28 0)
+                         activeHelpKey: stackLimit
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField20'
+                         layout: (LayoutFrame 270 0 3 0 360 0 33 0)
+                         activeHelpKey: stackLimit
+                         enableChannel: supportsJustInTimeCompilation
+                         model: stackLimit
+                         type: fileSize
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      (LabelSpec
+                         label: '(Trigger recursionInterrupt if more stack is used by a process)'
+                         name: 'Label39'
+                         layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
+                         activeHelpKey: stackLimit
+                         translateLabel: true
+                         adjust: left
+                       )
+                      )
+
+                   )
+                   extent: (Point 705 30)
+                 )
+                (ViewSpec
+                   name: 'NewSpaceSizeBox'
+                   activeHelpKey: newSpaceSize
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Size of NewSpace:'
+                         name: 'Label44'
+                         layout: (LayoutFrame 0 0 8 0 265 0 28 0)
+                         activeHelpKey: newSpaceSize
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField23'
+                         layout: (LayoutFrame 270 0 3 0 360 0 33 0)
+                         activeHelpKey: newSpaceSize
+                         model: newSpaceSize
+                         type: fileSize
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      (LabelSpec
+                         label: '(Size of Space where new objects are created)'
+                         name: 'Label45'
+                         layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
+                         activeHelpKey: newSpaceSize
+                         translateLabel: true
+                         adjust: left
+                       )
+                      )
+
+                   )
+                   extent: (Point 705 30)
+                 )
+                (ViewSpec
+                   name: 'MaximumMemoryLimitBox'
+                   activeHelpKey: maxOldSpace
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (InputFieldSpec
+                         name: 'EntryField24'
+                         layout: (LayoutFrame 270 0 3 0 360 0 33 0)
+                         activeHelpKey: maxOldSpace
+                         model: maxOldSpace
+                         type: fileSize
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      (LabelSpec
+                         label: 'Maximum Memory Limit:'
+                         name: 'Label46'
+                         layout: (LayoutFrame 0 0 8 0 265 0 28 0)
+                         activeHelpKey: maxOldSpace
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (LabelSpec
+                         label: '(Never allocate more than this amount of memory)'
+                         name: 'Label47'
+                         layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
+                         activeHelpKey: maxOldSpace
+                         translateLabel: true
+                         adjust: left
+                       )
+                      )
+
+                   )
+                   extent: (Point 705 30)
+                 )
+                (ViewSpec
+                   name: 'QuickAllocationLimitBox'
+                   activeHelpKey: fastMoreLimit
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Quick Allocation Limit:'
+                         name: 'Label26'
+                         layout: (LayoutFrame 0 0 8 0 265 0 28 0)
+                         activeHelpKey: fastMoreLimit
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField14'
+                         layout: (LayoutFrame 270 0 3 0 360 0 33 0)
+                         activeHelpKey: fastMoreLimit
+                         model: fastMoreLimit
+                         type: fileSize
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      (LabelSpec
+                         label: '(Quickly allocate more memory (suppress GC) up to this limit)'
+                         name: 'Label27'
+                         layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
+                         activeHelpKey: fastMoreLimit
+                         translateLabel: true
+                         adjust: left
+                       )
+                      )
+
+                   )
+                   extent: (Point 705 30)
+                 )
+                (ViewSpec
+                   name: 'OldspaceIncrementBox'
+                   activeHelpKey: oldIncr
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Oldspace Increment:'
+                         name: 'Label34'
+                         layout: (LayoutFrame 0 0 8 0 265 0 28 0)
+                         activeHelpKey: oldIncr
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField18'
+                         layout: (LayoutFrame 270 0 3 0 360 0 33 0)
+                         activeHelpKey: oldIncr
+                         model: oldIncr
+                         type: fileSize
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      (LabelSpec
+                         label: '(Increase oldSpace in chunks of this size)'
+                         name: 'Label35'
+                         layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
+                         activeHelpKey: oldIncr
+                         translateLabel: true
+                         adjust: left
+                       )
+                      )
+
+                   )
+                   extent: (Point 705 30)
+                 )
+                (ViewSpec
+                   name: 'OldSpaceCompressLimitBox'
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Oldspace Compress Limit:'
+                         name: 'Label36'
+                         layout: (LayoutFrame 0 0 8 0 265 0 28 0)
+                         activeHelpKey: compressLimit
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField19'
+                         layout: (LayoutFrame 270 0 3 0 360 0 33 0)
+                         activeHelpKey: compressLimit
+                         model: compressLimit
+                         type: fileSize
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      (LabelSpec
+                         label: '(Use 2-pass compressing GC if > 0 and more memory is in use)'
+                         name: 'Label37'
+                         layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
+                         activeHelpKey: compressLimit
+                         translateLabel: true
+                         adjust: left
+                       )
+                      )
+
+                   )
+                   extent: (Point 705 30)
+                 )
+                (ViewSpec
+                   name: 'CodeLimitBox'
+                   activeHelpKey: codeLimit
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Dynamic code Limit:'
+                         name: 'Label40'
+                         layout: (LayoutFrame 0 0 8 0 265 0 28 0)
+                         activeHelpKey: codeLimit
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField21'
+                         layout: (LayoutFrame 270 0 3 0 360 0 33 0)
+                         activeHelpKey: codeLimit
+                         enableChannel: supportsJustInTimeCompilation
+                         model: codeLimit
+                         type: fileSize
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      (LabelSpec
+                         label: '(Flush dynamic compiled code to stay within this limit)'
+                         name: 'Label41'
+                         layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
+                         activeHelpKey: codeLimit
+                         translateLabel: true
+                         adjust: left
+                       )
+                      )
+
+                   )
+                   extent: (Point 705 30)
+                 )
+                (ViewSpec
+                   name: 'MethodSizeLimitBox'
+                   activeHelpKey: methodCodeSizeLimit
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Method Code Size Limit:'
+                         name: 'Label52'
+                         layout: (LayoutFrame 0 0 8 0 265 0 28 0)
+                         activeHelpKey: methodCodeSizeLimit
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField27'
+                         layout: (LayoutFrame 270 0 3 0 360 0 33 0)
+                         activeHelpKey: methodCodeSizeLimit
+                         enableChannel: supportsJustInTimeCompilation
+                         model: methodCodeSizeLimit
+                         type: fileSize
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      (LabelSpec
+                         label: '(Do not JIT, if an individual method''s code size exceeds this)'
+                         name: 'Label53'
+                         layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
+                         activeHelpKey: methodCodeSizeLimit
+                         translateLabel: true
+                         adjust: left
+                       )
+                      )
+
+                   )
+                   extent: (Point 705 30)
+                 )
+                (LabelSpec
+                   label: 'Triggers:'
+                   name: 'Label55'
+                   translateLabel: true
+                   adjust: left
+                   extent: (Point 705 22)
+                 )
+                (ViewSpec
+                   name: 'IncrementalGCAllocationTriggerBox'
+                   activeHelpKey: igcLimit
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Incremental GC Allocation Trigger:'
+                         name: 'Label48'
+                         layout: (LayoutFrame 0 0 8 0 265 0 28 0)
+                         activeHelpKey: igcLimit
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField25'
+                         layout: (LayoutFrame 270 0 3 0 360 0 33 0)
+                         activeHelpKey: igcLimit
+                         model: igcLimit
+                         type: fileSize
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      (LabelSpec
+                         label: '(Start IGC whenever this has been newly allocated)'
+                         name: 'Label49'
+                         layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
+                         activeHelpKey: igcLimit
+                         translateLabel: true
+                         adjust: left
+                       )
+                      )
+
+                   )
+                   extent: (Point 705 30)
+                 )
+                (ViewSpec
+                   name: 'IncrementalGCFreespaceTriggerBox'
+                   activeHelpKey: igcFreeLimit
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Incremental GC Freespace Trigger:'
+                         name: 'Label50'
+                         layout: (LayoutFrame 0 0 8 0 265 0 28 0)
+                         activeHelpKey: igcFreeLimit
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField26'
+                         layout: (LayoutFrame 270 0 3 0 360 0 33 0)
+                         activeHelpKey: igcFreeLimit
+                         model: igcFreeLimit
+                         type: fileSize
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      (LabelSpec
+                         label: '(Start IGC whenever freespace drops below this)'
+                         name: 'Label51'
+                         layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
+                         activeHelpKey: igcFreeLimit
+                         translateLabel: true
+                         adjust: left
+                       )
+                      )
+
+                   )
+                   extent: (Point 705 30)
+                 )
+                (ViewSpec
+                   name: 'CodeTriggerBox'
+                   activeHelpKey: codeTrigger
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Incremental GC Dynamic Code Trigger:'
+                         name: 'Label42'
+                         layout: (LayoutFrame 0 0 8 0 265 0 28 0)
+                         activeHelpKey: codeTrigger
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField22'
+                         layout: (LayoutFrame 270 0 3 0 360 0 33 0)
+                         activeHelpKey: codeTrigger
+                         model: codeTrigger
+                         type: fileSize
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      (LabelSpec
+                         label: '(Start incremental GC whenever this amount of code has been allocated)'
+                         name: 'Label43'
+                         layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
+                         activeHelpKey: codeTrigger
+                         translateLabel: true
+                         adjust: left
+                       )
+                      )
+
+                   )
+                   extent: (Point 705 30)
+                 )
+                (ViewSpec
+                   name: 'GCAmountBox'
+                   activeHelpKey: igcFreeAmount
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Incremental GC Amount:'
+                         name: 'Label32'
+                         layout: (LayoutFrame 0 0 8 0 265 0 28 0)
+                         activeHelpKey: igcFreeAmount
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField17'
+                         layout: (LayoutFrame 270 0 3 0 360 0 33 0)
+                         activeHelpKey: igcFreeAmount
+                         model: igcFreeAmount
+                         type: fileSize
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      (LabelSpec
+                         label: '(Try to keep this amount for peak requests)'
+                         name: 'Label33'
+                         layout: (LayoutFrame 364 0.0 7 0 0 1.0 27 0)
+                         activeHelpKey: igcFreeAmount
+                         translateLabel: true
+                         adjust: left
+                       )
+                      )
+
+                   )
+                   extent: (Point 705 30)
+                 )
+                )
+
+             )
+           )
+          )
 
        )
      )
@@ -7689,8 +7706,8 @@
 codeLimit
 
     codeLimit isNil ifTrue:[
-	codeLimit := ObjectMemory dynamicCodeLimit asValue.
-	codeLimit onChangeSend:#updateModifiedChannel to:self
+        codeLimit := ObjectMemory dynamicCodeLimit asValue.
+        codeLimit onChangeSend:#updateModifiedChannel to:self
     ].
     ^ codeLimit.
 !
@@ -7698,8 +7715,8 @@
 codeTrigger
 
     codeTrigger isNil ifTrue:[
-	codeTrigger := ObjectMemory dynamicCodeGCTrigger asValue.
-	codeTrigger onChangeSend:#updateModifiedChannel to:self
+        codeTrigger := ObjectMemory dynamicCodeGCTrigger asValue.
+        codeTrigger onChangeSend:#updateModifiedChannel to:self
     ].
     ^ codeTrigger.
 !
@@ -7707,8 +7724,8 @@
 compressLimit
 
     compressLimit isNil ifTrue:[
-	compressLimit := ObjectMemory oldSpaceCompressLimit asValue.
-	compressLimit onChangeSend:#updateModifiedChannel to:self
+        compressLimit := ObjectMemory oldSpaceCompressLimit asValue.
+        compressLimit onChangeSend:#updateModifiedChannel to:self
     ].
     ^ compressLimit.
 !
@@ -7716,8 +7733,8 @@
 fastMoreLimit
 
     fastMoreLimit isNil ifTrue:[
-	fastMoreLimit := (ObjectMemory fastMoreOldSpaceLimit:-1) asValue.
-	fastMoreLimit onChangeSend:#updateModifiedChannel to:self
+        fastMoreLimit := (ObjectMemory fastMoreOldSpaceLimit:-1) asValue.
+        fastMoreLimit onChangeSend:#updateModifiedChannel to:self
     ].
     ^ fastMoreLimit.
 !
@@ -7725,8 +7742,8 @@
 igcFreeAmount
 
     igcFreeAmount isNil ifTrue:[
-	igcFreeAmount := ObjectMemory freeSpaceGCAmount asValue.
-	igcFreeAmount onChangeSend:#updateModifiedChannel to:self
+        igcFreeAmount := ObjectMemory freeSpaceGCAmount asValue.
+        igcFreeAmount onChangeSend:#updateModifiedChannel to:self
     ].
     ^ igcFreeAmount.
 !
@@ -7734,8 +7751,8 @@
 igcFreeLimit
 
     igcFreeLimit isNil ifTrue:[
-	igcFreeLimit := ObjectMemory freeSpaceGCLimit asValue.
-	igcFreeLimit onChangeSend:#updateModifiedChannel to:self
+        igcFreeLimit := ObjectMemory freeSpaceGCLimit asValue.
+        igcFreeLimit onChangeSend:#updateModifiedChannel to:self
     ].
     ^ igcFreeLimit.
 !
@@ -7743,8 +7760,8 @@
 igcLimit
 
     igcLimit isNil ifTrue:[
-	igcLimit := ObjectMemory incrementalGCLimit asValue.
-	igcLimit onChangeSend:#updateModifiedChannel to:self
+        igcLimit := ObjectMemory incrementalGCLimit asValue.
+        igcLimit onChangeSend:#updateModifiedChannel to:self
     ].
     ^ igcLimit.
 !
@@ -7752,8 +7769,8 @@
 maxOldSpace
 
     maxOldSpace isNil ifTrue:[
-	maxOldSpace := ObjectMemory maxOldSpace asValue.
-	maxOldSpace onChangeSend:#updateModifiedChannel to:self
+        maxOldSpace := ObjectMemory maxOldSpace asValue.
+        maxOldSpace onChangeSend:#updateModifiedChannel to:self
     ].
     ^ maxOldSpace.
 !
@@ -7761,8 +7778,8 @@
 methodCodeSizeLimit
 
     methodCodeSizeLimit isNil ifTrue:[
-	methodCodeSizeLimit := (ObjectMemory codeSizeLimitForDynamicCompilation:-1) asValue.
-	methodCodeSizeLimit onChangeSend:#updateModifiedChannel to:self
+        methodCodeSizeLimit := (ObjectMemory codeSizeLimitForDynamicCompilation:-1) asValue.
+        methodCodeSizeLimit onChangeSend:#updateModifiedChannel to:self
     ].
     ^ methodCodeSizeLimit.
 
@@ -7772,8 +7789,8 @@
 newSpaceSize
 
     newSpaceSize isNil ifTrue:[
-	newSpaceSize := ObjectMemory newSpaceSize asValue.
-	newSpaceSize onChangeSend:#updateModifiedChannel to:self
+        newSpaceSize := ObjectMemory newSpaceSize asValue.
+        newSpaceSize onChangeSend:#updateModifiedChannel to:self
     ].
     ^ newSpaceSize.
 !
@@ -7781,8 +7798,8 @@
 oldIncr
 
     oldIncr isNil ifTrue:[
-	oldIncr := ObjectMemory oldSpaceIncrement asValue.
-	oldIncr onChangeSend:#updateModifiedChannel to:self
+        oldIncr := ObjectMemory oldSpaceIncrement asValue.
+        oldIncr onChangeSend:#updateModifiedChannel to:self
     ].
     ^ oldIncr.
 !
@@ -7790,8 +7807,8 @@
 stackLimit
 
     stackLimit isNil ifTrue:[
-	stackLimit := Process defaultMaximumStackSize asValue.
-	stackLimit onChangeSend:#updateModifiedChannel to:self
+        stackLimit := Process defaultMaximumStackSize asValue.
+        stackLimit onChangeSend:#updateModifiedChannel to:self
     ].
     ^ stackLimit.
 !
@@ -7804,7 +7821,7 @@
 warningLabelHolder
 
     warningLabelHolder isNil ifTrue:[
-	warningLabelHolder := ValueHolder new.
+        warningLabelHolder := ValueHolder new.
     ].
     ^ warningLabelHolder.
 ! !
@@ -7820,10 +7837,10 @@
 initialize
     super initialize.
     self warningLabelHolder
-	value:(StringCollection
-		with:(resources string:'Warning - invalid settings may result in failures or poor performance.')
-		with:(resources string:'You have been warned.') allBold
-	       ).
+        value:(StringCollection
+                with:(resources string:'Warning - invalid settings may result in failures or poor performance.')
+                with:(resources string:'You have been warned.') allBold
+               ).
 ! !
 
 !AbstractSettingsApplication::MemorySettingsAppl methodsFor:'queries'!
@@ -7849,6 +7866,396 @@
     "Modified: / 12-08-2010 / 15:33:12 / cg"
 ! !
 
+!AbstractSettingsApplication::MiscBridgeCommunicationSettingsAppl class methodsFor:'help specs'!
+
+flyByHelpSpec
+    "This resource specification was automatically generated
+     by the UIHelpTool of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIHelpTool may not be able to read the specification."
+
+    "
+     UIHelpTool openOnClass:AbstractSettingsApplication::MiscDisplaySettingsAppl
+    "
+
+    <resource: #help>
+
+    ^ super flyByHelpSpec addPairsFrom:#(
+
+#smtpServer
+'The host name of your SMTP (mail transfer) server.\This is only needed for the debugger''s "Send Error Report via Mail" menu function,\so you can leave this empty if you don''t need or want this function'
+
+#windowMigration
+'The window migration service allows is available for X-display systems only.\It allows a window to be fetched from your screen and moved to another X-display' 
+
+#remoteBrowsing
+'The remote browsing service allows for another ST/X system''s browser to request a classes source from your running system'
+
+#smallTeam
+'The smallTeam framework distributes notifications to team members when code is changed in  browser.\This allows for team members to track and follow your changes in real time'
+
+#dotNetBridge
+'The dotNet bridge extension allows transparent access and message sending to .NET classes and instances.'
+
+#smalltalkBridgeServer
+'The smalltalk bridge server extension allows distributed processing\via transparent access and message sending from other ST/X systems.'
+)
+! !
+
+!AbstractSettingsApplication::MiscBridgeCommunicationSettingsAppl class methodsFor:'image specs'!
+
+defaultIcon
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self defaultIcon inspect
+     ImageEditor openOnClass:self andSelector:#defaultIcon
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'AbstractSettingsApplication::MiscBridgeCommunicationSettingsAppl defaultIcon'
+        ifAbsentPut:[(Depth4Image width:22 height:22) bits:(ByteArray fromPackedString:'
+@@!!8@@@@@@BG @@@!!1]P@@@@AWE8@@!!1 '' @@@BGFB^@!!1 5Q8@@BCFCUG !!DWQPH@@BDQMHD \QFA] @@@1DXE6X"DQ]VY&Y"HQE5I&@!!]QI&Y&XBEED"TG
+]QD&Y&IPL5ERQ5 !!TV@@ACVBEQIF$REXP@@DX1HU!!@$''HXP@@@T2L!!!!@@GI(@@@@AVL&!!@@@UGP@@@@G]TM@@@@@P@@@@@A5A@@@@@@@@@@@@@@@@@@@@@@@
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@b') colorMapFromArray:#[0 0 0 224 224 224 64 64 64 96 96 96 128 128 128 192 192 192 32 32 32 96 96 96 160 160 160 96 96 96] mask:((ImageMask width:22 height:22) bits:(ByteArray fromPackedString:'G@C O G0_0O8?8_<?(_<?8_<???<???<???<?8_<?8_<_0O8O G0O@G B@A@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'); yourself); yourself]
+! !
+
+!AbstractSettingsApplication::MiscBridgeCommunicationSettingsAppl class methodsFor:'interface specs'!
+
+windowSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:AbstractSettingsApplication::MiscBridgeCommunicationSettingsAppl andSelector:#windowSpec
+     AbstractSettingsApplication::MiscBridgeCommunicationSettingsAppl new openInterface:#windowSpec
+     AbstractSettingsApplication::MiscBridgeCommunicationSettingsAppl open
+    "
+
+    <resource: #canvas>
+
+    ^ 
+    #(FullSpec
+       name: windowSpec
+       window: 
+      (WindowSpec
+         label: 'Communication Settings'
+         name: 'Communication Settings'
+         flags: 1
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 738 671)
+       )
+       component: 
+      (SpecCollection
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel1'
+             layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+             horizontalLayout: fit
+             verticalLayout: top
+             horizontalSpace: 3
+             verticalSpace: 3
+             component: 
+            (SpecCollection
+               collection: (
+                (FramedBoxSpec
+                   label: '.NET Bridge'
+                   name: 'FramedBox1'
+                   activeHelpKey: dotNetBridge
+                   labelPosition: topLeft
+                   translateLabel: true
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (VerticalPanelViewSpec
+                         name: 'VerticalPanel3'
+                         layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+                         horizontalLayout: left
+                         verticalLayout: center
+                         horizontalSpace: 3
+                         verticalSpace: 3
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (ViewSpec
+                               name: 'Box6'
+                               component: 
+                              (SpecCollection
+                                 collection: (
+                                  (CheckBoxSpec
+                                     label: 'Verbose'
+                                     name: 'CheckBox5'
+                                     layout: (LayoutFrame 5 0 0 0 600 0 25 0)
+                                     enableChannel: hasDotNetBridge
+                                     model: dotNetBridgeVerbose
+                                     translateLabel: true
+                                   )
+                                  )
+                                
+                               )
+                               extent: (Point 696 25)
+                             )
+                            (ViewSpec
+                               name: 'Box7'
+                               component: 
+                              (SpecCollection
+                                 collection: (
+                                  (CheckBoxSpec
+                                     label: 'Bridge Runs in IDE'
+                                     name: 'CheckBox6'
+                                     layout: (LayoutFrame 5 0 0 0 600 0 25 0)
+                                     enableChannel: hasDotNetBridge
+                                     model: dotNetBridgeRunsInIDE
+                                     translateLabel: true
+                                   )
+                                  )
+                                
+                               )
+                               extent: (Point 696 25)
+                             )
+                            )
+                          
+                         )
+                       )
+                      (ActionButtonSpec
+                         label: 'Close all Connections'
+                         name: 'Button1'
+                         layout: (LayoutFrame -228 1 27 0 -3 1 49 0)
+                         translateLabel: true
+                         tabable: true
+                         model: closeAllDotNetConnections
+                         enableChannel: hasDotNetBridge
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 738 92)
+                 )
+                (FramedBoxSpec
+                   label: 'Smalltalk Bridge Server'
+                   name: 'FramedBox2'
+                   activeHelpKey: smalltalkBridgeServer
+                   labelPosition: topLeft
+                   translateLabel: true
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (VerticalPanelViewSpec
+                         name: 'VerticalPanel4'
+                         layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+                         horizontalLayout: left
+                         verticalLayout: center
+                         horizontalSpace: 3
+                         verticalSpace: 3
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (ViewSpec
+                               name: 'Box8'
+                               component: 
+                              (SpecCollection
+                                 collection: (
+                                  (CheckBoxSpec
+                                     label: 'Bridge Server Enabled'
+                                     name: 'CheckBox7'
+                                     layout: (LayoutFrame 5 0 0 0 600 0 25 0)
+                                     model: smalltalkBridgeEnabled
+                                     translateLabel: true
+                                   )
+                                  )
+                                
+                               )
+                               extent: (Point 696 25)
+                             )
+                            (ViewSpec
+                               name: 'Box9'
+                               component: 
+                              (SpecCollection
+                                 collection: (
+                                  (CheckBoxSpec
+                                     label: 'Verbose'
+                                     name: 'CheckBox8'
+                                     layout: (LayoutFrame 5 0 0 0 600 0 25 0)
+                                     enableChannel: hasSmalltalkBridge
+                                     model: smalltalkBridgeVerbose
+                                     translateLabel: true
+                                   )
+                                  )
+                                
+                               )
+                               extent: (Point 696 25)
+                             )
+                            )
+                          
+                         )
+                       )
+                      (ActionButtonSpec
+                         label: 'Close all Connections'
+                         name: 'Button2'
+                         layout: (LayoutFrame -228 1 27 0 -3 1 49 0)
+                         translateLabel: true
+                         tabable: true
+                         model: closeAllSmalltalkBridgeConnections
+                         enableChannel: hasSmalltalkBridge
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 738 101)
+                 )
+                )
+              
+             )
+           )
+          )
+        
+       )
+     )
+! !
+
+!AbstractSettingsApplication::MiscBridgeCommunicationSettingsAppl methodsFor:'actions'!
+
+aspects
+    ^ #(
+                smtpServerName
+                dotNetBridgeRunsInIDE
+                dotNetBridgeVerbose
+            )
+!
+
+basicReadSettings
+    super basicReadSettings.
+
+    BRIDGE::SmalltalkBridge notNil ifTrue:[
+        self smalltalkBridgeVerbose value:(BRIDGE::SmalltalkBridge verbose).
+    ].
+!
+
+basicSaveSettings
+    super basicSaveSettings.
+
+    BRIDGE::SmalltalkBridge notNil ifTrue:[
+        BRIDGE::SmalltalkBridge verbose:(self smalltalkBridgeVerbose value).
+    ].
+! !
+
+!AbstractSettingsApplication::MiscBridgeCommunicationSettingsAppl methodsFor:'aspects'!
+
+acceptChannel
+
+    acceptChannel isNil ifTrue:[
+        acceptChannel := TriggerValue new.
+    ].
+    ^ acceptChannel.
+
+    "Created: / 12-11-2006 / 19:04:09 / cg"
+!
+
+dotNetBridgeRunsInIDE
+
+    dotNetBridgeRunsInIDE isNil ifTrue:[
+        dotNetBridgeRunsInIDE := false asValue.
+        dotNetBridgeRunsInIDE onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ dotNetBridgeRunsInIDE.
+!
+
+dotNetBridgeVerbose
+
+    dotNetBridgeVerbose isNil ifTrue:[
+        dotNetBridgeVerbose := false asValue.
+        dotNetBridgeVerbose onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ dotNetBridgeVerbose.
+!
+
+hasDotNetBridge
+    ^ DOTNET::DotNet notNil and:[ DOTNET::DotNet isLoaded ].
+!
+
+hasSmalltalkBridge
+    ^ BRIDGE::SmalltalkBridge notNil and:[ BRIDGE::SmalltalkBridge isLoaded ].
+!
+
+smalltalkBridgeEnabled
+
+    smalltalkBridgeEnabled isNil ifTrue:[
+        smalltalkBridgeEnabled := false asValue.
+        smalltalkBridgeEnabled onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ smalltalkBridgeEnabled.
+!
+
+smalltalkBridgeVerbose
+
+    smalltalkBridgeVerbose isNil ifTrue:[
+        smalltalkBridgeVerbose := false asValue.
+        smalltalkBridgeVerbose onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ smalltalkBridgeVerbose.
+! !
+
+!AbstractSettingsApplication::MiscBridgeCommunicationSettingsAppl methodsFor:'help'!
+
+helpFilename
+    ^ 'Launcher/communicationsSettings.html'
+! !
+
+!AbstractSettingsApplication::MiscBridgeCommunicationSettingsAppl methodsFor:'initialization & release'!
+
+initialize
+    super initialize.
+    self readSettings.
+! !
+
+!AbstractSettingsApplication::MiscBridgeCommunicationSettingsAppl methodsFor:'queries'!
+
+hasRemoteBrowsingSupport
+
+    ^ SmalltalkShareServer notNil
+!
+
+hasUnsavedChanges
+    (super hasUnsavedChanges) ifTrue:[^ true].
+
+    BRIDGE::SmalltalkBridge notNil ifTrue:[
+        BRIDGE::SmalltalkBridge verbose ~= (self smalltalkBridgeVerbose value) ifTrue:[^ true].
+        BRIDGE::SmalltalkBridge singletonInstanceOrNil notNil ifTrue:[
+            (self smalltalkBridgeEnabled value) ifFalse:[^ true].
+        ] ifFalse:[
+        (self smalltalkBridgeEnabled value) ifTrue:[^ true].
+        ].
+    ] ifFalse:[
+        (self smalltalkBridgeEnabled value) ifTrue:[^ true].
+    ].
+    ^ false
+! !
+
+!AbstractSettingsApplication::MiscBridgeCommunicationSettingsAppl methodsFor:'user actions'!
+
+closeAllDotNetConnections
+    DOTNET::DotNet notNil ifTrue:[
+        DOTNET::DotNet exitAllInstances
+    ].
+!
+
+closeAllSmalltalkBridgeConnections
+    BRIDGE::SmalltalkBridge notNil ifTrue:[
+        BRIDGE::SmalltalkBridge exitAllInstances
+    ].
+! !
+
 !AbstractSettingsApplication::MiscCommunicationSettingsAppl class methodsFor:'help specs'!
 
 flyByHelpSpec
@@ -7904,8 +8311,8 @@
     <resource: #image>
 
     ^Icon
-	constantNamed:#'AbstractSettingsApplication::MiscCommunicationSettingsAppl class defaultIcon'
-	ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(4 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+        constantNamed:#'AbstractSettingsApplication::MiscCommunicationSettingsAppl class defaultIcon'
+        ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(4 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 @@!!8@@@@@@BG @@@!!1]P@@@@AWE8@@!!1 '' @@@BGFB^@!!1 5Q8@@BGFBUG !!DWQPH@@B@Q]HD \QFA] @@A1DXE6X"DQ]VY&Y"HQE5I&@ ]QHD@FHBAED"TG
 ]QD$Q5IVI5ERQ5 !!TVPW]BUBEQIF$REXPT^FY1HV!!@$''HXPXIWU"]!!!!%@GI(BAFGUV\&!!FT@UGQ"PQEW^D]EYP@@PFHHETU5A@U%@@@@I@BGTRT@U%@@@@AH
 P"DQ]PU%@@@@@EBUHQU5U%@@@@@@@B !!YHU%@@@@@@@E@ UFY%@@@@@@@@APIH@@@@@@@@@@@@T@@@@@@@@b') ; colorMapFromArray:#[0 0 0 224 224 224 64 64 64 96 96 96 128 128 128 192 192 192 32 32 32 96 96 96 160 160 160 96 96 96]; mask:((ImageMask new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'G@C O G0_0O8?8_<?(W<?8_<???<=:^<???<???<???<_??<O??<O??<B?=\@?<8@?=0@?? @O?@@W>@@K @@D@@') ; yourself); yourself]
@@ -7953,7 +8360,7 @@
             (SpecCollection
                collection: (
                 (FramedBoxSpec
-                   label: 'SMTP Server'
+                   label: 'SMTP (Mail) Server'
                    name: 'SMTPServerBox1'
                    activeHelpKey: smtpServer
                    labelPosition: topLeft
@@ -7963,7 +8370,7 @@
                      collection: (
                       (ViewSpec
                          name: 'Box5'
-                         layout: (LayoutFrame 0 0 5 0 0 1 28 0)
+                         layout: (LayoutFrame 0 0 10 0 0 1 35 0)
                          component: 
                         (SpecCollection
                            collection: (
@@ -7990,379 +8397,7 @@
                       )
                     
                    )
-                   extent: (Point 738 67)
-                 )
-                (FramedBoxSpec
-                   label: 'Window migration'
-                   name: 'WindowMicrationSetupBox'
-                   activeHelpKey: windowMigration
-                   labelPosition: topLeft
-                   translateLabel: true
-                   component: 
-                  (SpecCollection
-                     collection: (
-                      (VerticalPanelViewSpec
-                         name: 'VerticalPanel2'
-                         layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-                         horizontalLayout: left
-                         verticalLayout: center
-                         horizontalSpace: 3
-                         verticalSpace: 3
-                         component: 
-                        (SpecCollection
-                           collection: (
-                            (ViewSpec
-                               name: 'Box2'
-                               component: 
-                              (SpecCollection
-                                 collection: (
-                                  (CheckBoxSpec
-                                     label: 'Window migration enabled'
-                                     name: 'CheckBox2'
-                                     layout: (LayoutFrame 5 0 0 0 600 0 22 0)
-                                     enableChannel: hasWindowMigrationServer
-                                     model: windowMigrationEnabled
-                                     translateLabel: true
-                                   )
-                                  )
-                                
-                               )
-                               extent: (Point 696 23)
-                             )
-                            (ViewSpec
-                               name: 'Box3'
-                               component: 
-                              (SpecCollection
-                                 collection: (
-                                  (CheckBoxSpec
-                                     label: 'Password check'
-                                     name: 'CheckBox3'
-                                     layout: (LayoutFrame 5 0 -2 0 600 0 20 0)
-                                     enableChannel: enablePasswordCheck
-                                     model: windowMigrationAuthenticate
-                                     translateLabel: true
-                                   )
-                                  )
-                                
-                               )
-                               extent: (Point 696 22)
-                             )
-                            (ViewSpec
-                               name: 'Box4'
-                               component: 
-                              (SpecCollection
-                                 collection: (
-                                  (LabelSpec
-                                     label: 'Password:'
-                                     name: 'Label3'
-                                     layout: (LayoutFrame 0 0 0 0 150 0 22 0)
-                                     translateLabel: true
-                                     adjust: right
-                                     enableDisableColorChannel: enablePasswordCheck
-                                   )
-                                  (InputFieldSpec
-                                     name: 'EntryField1'
-                                     layout: (LayoutFrame 150 0 0 0 400 0 22 0)
-                                     enableChannel: windowMigrationAuthenticate
-                                     model: windowMigrationPassword
-                                     type: password
-                                     acceptOnReturn: true
-                                     acceptOnTab: true
-                                     acceptOnLostFocus: true
-                                     acceptOnPointerLeave: true
-                                   )
-                                  )
-                                
-                               )
-                               extent: (Point 696 22)
-                             )
-                            )
-                          
-                         )
-                       )
-                      )
-                    
-                   )
-                   extent: (Point 738 113)
-                 )
-                (FramedBoxSpec
-                   label: 'Remote Browsing'
-                   name: 'RemoteBrowsingSetupBox'
-                   activeHelpKey: remoteBrowsing
-                   labelPosition: topLeft
-                   translateLabel: true
-                   component: 
-                  (SpecCollection
-                     collection: (
-                      (ViewSpec
-                         name: 'Box1'
-                         layout: (LayoutFrame 0 0 5 0 0 1 28 0)
-                         component: 
-                        (SpecCollection
-                           collection: (
-                            (CheckBoxSpec
-                               label: 'Remote browsing enabled'
-                               name: 'CheckBox1'
-                               layout: (LayoutFrame 5 0 0 0 600 0 22 0)
-                               enableChannel: hasRemoteBrowsingSupport
-                               model: remoteBrowsingEnabled
-                               translateLabel: true
-                             )
-                            )
-                          
-                         )
-                       )
-                      )
-                    
-                   )
-                   extent: (Point 738 64)
-                 )
-                (FramedBoxSpec
-                   label: 'SmallTeam Change Distribution'
-                   name: 'SmallTeamSetupBox'
-                   activeHelpKey: smallTeam
-                   visibilityChannel: managerIsCVSSourceCodeManager
-                   labelPosition: topLeft
-                   translateLabel: true
-                   component: 
-                  (SpecCollection
-                     collection: (
-                      (ViewSpec
-                         name: 'enableBox'
-                         layout: (LayoutFrame 0 0 8 0 0 1 31 0)
-                         component: 
-                        (SpecCollection
-                           collection: (
-                            (CheckBoxSpec
-                               label: 'SmallTeam Server enabled'
-                               name: 'CheckBox4'
-                               layout: (LayoutFrame 5 0 0 0 600 0 22 0)
-                               enableChannel: smallTeamServerAvailable
-                               model: smallTeamServerEnabled
-                               translateLabel: true
-                             )
-                            )
-                          
-                         )
-                       )
-                      (LabelSpec
-                         label: 'SmallTeam Hosts:'
-                         name: 'smallTeamHostsLabel'
-                         layout: (LayoutFrame 0 0.0 37 0 60 0.25 59 0)
-                         translateLabel: true
-                         adjust: right
-                         enableDisableColorChannel: smallTeamServerAvailable
-                       )
-                      (SequenceViewSpec
-                         name: 'smallTeamHostsList'
-                         layout: (LayoutFrame 64 0.25 37 0 0 1 131 0)
-                         enableChannel: smallTeamServerEnabled
-                         tabable: true
-                         model: selectedSmallTeamHost
-                         hasHorizontalScrollBar: true
-                         hasVerticalScrollBar: true
-                         miniScrollerHorizontal: true
-                         useIndex: false
-                         sequenceList: listOfSmallTeamHosts
-                       )
-                      (LabelSpec
-                         label: 'Host:'
-                         name: 'hostLabel'
-                         layout: (LayoutFrame 0 0.0 142 0 60 0.25 159 0)
-                         translateLabel: true
-                         adjust: right
-                         enableDisableColorChannel: smallTeamServerAvailable
-                       )
-                      (InputFieldSpec
-                         name: 'smallTeamHostEntryField'
-                         layout: (LayoutFrame 64 0.25 138 0 0 1 160 0)
-                         enableChannel: smallTeamServerEnabled
-                         tabable: true
-                         model: smallTeamHostEntry
-                         acceptChannel: acceptChannel
-                         acceptOnPointerLeave: true
-                       )
-                      (HorizontalPanelViewSpec
-                         name: 'HorizontalPanel2'
-                         layout: (LayoutFrame 64 0.25 165 0 -1 1 190 0)
-                         horizontalLayout: fitSpace
-                         verticalLayout: center
-                         horizontalSpace: 3
-                         verticalSpace: 3
-                         component: 
-                        (SpecCollection
-                           collection: (
-                            (ActionButtonSpec
-                               label: 'Add'
-                               name: 'addButton'
-                               translateLabel: true
-                               tabable: true
-                               model: addSmallTeamHost
-                               enableChannel: addHostEnabled
-                               extent: (Point 221 22)
-                             )
-                            (ActionButtonSpec
-                               label: 'Remove'
-                               name: 'removeButton'
-                               translateLabel: true
-                               tabable: true
-                               model: removeSmallTeamHost
-                               enableChannel: removeHostEnabled
-                               extent: (Point 221 22)
-                             )
-                            )
-                          
-                         )
-                       )
-                      )
-                    
-                   )
-                   extent: (Point 738 226)
-                 )
-                (FramedBoxSpec
-                   label: '.NET Bridge'
-                   name: 'FramedBox1'
-                   activeHelpKey: dotNetBridge
-                   labelPosition: topLeft
-                   translateLabel: true
-                   component: 
-                  (SpecCollection
-                     collection: (
-                      (VerticalPanelViewSpec
-                         name: 'VerticalPanel3'
-                         layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-                         horizontalLayout: left
-                         verticalLayout: center
-                         horizontalSpace: 3
-                         verticalSpace: 3
-                         component: 
-                        (SpecCollection
-                           collection: (
-                            (ViewSpec
-                               name: 'Box6'
-                               component: 
-                              (SpecCollection
-                                 collection: (
-                                  (CheckBoxSpec
-                                     label: 'Verbose'
-                                     name: 'CheckBox5'
-                                     layout: (LayoutFrame 5 0 2 0 600 0 25 0)
-                                     enableChannel: hasDotNetBridge
-                                     model: dotNetBridgeVerbose
-                                     translateLabel: true
-                                   )
-                                  )
-                                
-                               )
-                               extent: (Point 696 25)
-                             )
-                            (ViewSpec
-                               name: 'Box7'
-                               component: 
-                              (SpecCollection
-                                 collection: (
-                                  (CheckBoxSpec
-                                     label: 'Bridge Runs in IDE'
-                                     name: 'CheckBox6'
-                                     layout: (LayoutFrame 5 0 2 0 600 0 25 0)
-                                     enableChannel: hasDotNetBridge
-                                     model: dotNetBridgeRunsInIDE
-                                     translateLabel: true
-                                   )
-                                  )
-                                
-                               )
-                               extent: (Point 696 25)
-                             )
-                            )
-                          
-                         )
-                       )
-                      (ActionButtonSpec
-                         label: 'Close all Connections'
-                         name: 'Button1'
-                         layout: (LayoutFrame -228 1 27 0 -3 1 49 0)
-                         translateLabel: true
-                         tabable: true
-                         model: closeAllDotNetConnections
-                         enableChannel: hasDotNetBridge
-                       )
-                      )
-                    
-                   )
-                   extent: (Point 738 92)
-                 )
-                (FramedBoxSpec
-                   label: 'Smalltalk Bridge Server'
-                   name: 'FramedBox2'
-                   activeHelpKey: smalltalkBridgeServer
-                   labelPosition: topLeft
-                   translateLabel: true
-                   component: 
-                  (SpecCollection
-                     collection: (
-                      (VerticalPanelViewSpec
-                         name: 'VerticalPanel4'
-                         layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-                         horizontalLayout: left
-                         verticalLayout: center
-                         horizontalSpace: 3
-                         verticalSpace: 3
-                         component: 
-                        (SpecCollection
-                           collection: (
-                            (ViewSpec
-                               name: 'Box8'
-                               component: 
-                              (SpecCollection
-                                 collection: (
-                                  (CheckBoxSpec
-                                     label: 'Bridge Server Enabled'
-                                     name: 'CheckBox7'
-                                     layout: (LayoutFrame 5 0 2 0 600 0 25 0)
-                                     model: smalltalkBridgeEnabled
-                                     translateLabel: true
-                                   )
-                                  )
-                                
-                               )
-                               extent: (Point 696 22)
-                             )
-                            (ViewSpec
-                               name: 'Box9'
-                               component: 
-                              (SpecCollection
-                                 collection: (
-                                  (CheckBoxSpec
-                                     label: 'Verbose'
-                                     name: 'CheckBox8'
-                                     layout: (LayoutFrame 5 0 2 0 600 0 25 0)
-                                     enableChannel: hasSmalltalkBridge
-                                     model: smalltalkBridgeVerbose
-                                     translateLabel: true
-                                   )
-                                  )
-                                
-                               )
-                               extent: (Point 696 23)
-                             )
-                            )
-                          
-                         )
-                       )
-                      (ActionButtonSpec
-                         label: 'Close all Connections'
-                         name: 'Button2'
-                         layout: (LayoutFrame -228 1 27 0 -3 1 49 0)
-                         translateLabel: true
-                         tabable: true
-                         model: closeAllSmalltalkBridgeConnections
-                         enableChannel: hasSmalltalkBridge
-                       )
-                      )
-                    
-                   )
-                   extent: (Point 738 90)
+                   extent: (Point 738 81)
                  )
                 )
               
@@ -8379,110 +8414,7 @@
 aspects
     ^ #(
                 smtpServerName
-                dotNetBridgeRunsInIDE
-                dotNetBridgeVerbose
             )
-!
-
-basicReadSettings
-    |pw auth|
-
-    super basicReadSettings.
-
-    SmallTeam notNil ifTrue:[
-        self smallTeamServerEnabled value:(SmallTeam isLoaded and:[SmallTeam serverRunning]).
-        self listOfSmallTeamHosts contents:(SmallTeam connectedHosts).
-    ].
-
-    self remoteBrowsingEnabled
-        value:(self hasRemoteBrowsingSupport
-               and:[SmalltalkShareServer isLoaded and:[SmalltalkShareServer serverRunning]]).
-
-    self windowMigrationEnabled
-        value:(self hasWindowMigrationServer
-               and:[ WindowMigrationServer isLoaded
-               and:[ WindowMigrationServer serverRunning ]]).
-
-
-    pw := nil.
-    auth := false.
-    (self hasWindowMigrationServer and:[WindowMigrationServer isLoaded]) ifTrue:[
-        pw := WindowMigrationServer password.
-        auth := self windowMigrationPassword value notNil
-    ].
-
-    self windowMigrationPassword value:pw.
-    self windowMigrationAuthenticate value:auth
-
-    "Modified: / 20-09-2007 / 16:04:59 / cg"
-!
-
-basicSaveSettings
-    super basicSaveSettings.
-
-    BRIDGE::SmalltalkBridge notNil ifTrue:[
-        BRIDGE::SmalltalkBridge verbose:(self smalltalkBridgeVerbose value).
-    ].
-
-    (SmallTeam notNil) ifTrue:[
-        SmallTeam connectedHosts copy do:[:host |
-            (self listOfSmallTeamHosts includes:host) ifFalse:[
-                SmallTeam removeHost:host.
-            ].
-        ].
-
-        self listOfSmallTeamHosts do:[:eachHost |
-            SmallTeam addHost:eachHost.
-        ].
-        self smallTeamServerEnabled value ifTrue:[
-            SmallTeam startServer
-        ] ifFalse:[
-            SmallTeam stopServer
-        ].
-    ].
-
-    self hasRemoteBrowsingSupport ifTrue:[
-        self remoteBrowsingEnabled value ifFalse:[
-            SmalltalkShareServer serverRunning ifTrue:[
-                SmalltalkShareServer killAll
-            ].
-        ] ifTrue:[
-            SmalltalkShareServer serverRunning ifFalse:[
-                SmalltalkShareServer start.
-                "/ must wait a bit; give it a chance to
-                "/ really start (before checking)
-                Delay waitForSeconds:0.5.
-                SmalltalkShareServer serverRunning ifFalse:[
-                    self warn:'SmalltalkShareServer startup failed (see stderr).'
-                ]
-            ].
-        ].
-    ].
-
-    self hasWindowMigrationServer ifTrue:[
-        self windowMigrationAuthenticate value ifTrue:[
-            WindowMigrationServer password:self windowMigrationPassword value.
-        ] ifFalse:[
-            WindowMigrationServer password:nil
-        ].
-        self windowMigrationEnabled value ifFalse:[
-            WindowMigrationServer serverRunning ifTrue:[
-                WindowMigrationServer stop
-            ].
-        ] ifTrue:[
-            WindowMigrationServer serverRunning ifFalse:[
-                WindowMigrationServer start.
-                "/ must wait a bit; give it a chance to
-                "/ really start (before checking)
-                Delay waitForSeconds:0.5.
-                WindowMigrationServer serverRunning ifFalse:[
-                    self warn:'WindowMigrationServer startup failed (see stderr).'
-                ]
-            ].
-        ].
-    ].
-
-    "Modified: / 20-09-2007 / 16:05:01 / cg"
 ! !
 
 !AbstractSettingsApplication::MiscCommunicationSettingsAppl methodsFor:'aspects'!
@@ -8490,195 +8422,22 @@
 acceptChannel
 
     acceptChannel isNil ifTrue:[
-	acceptChannel := TriggerValue new.
+        acceptChannel := TriggerValue new.
     ].
     ^ acceptChannel.
 
     "Created: / 12-11-2006 / 19:04:09 / cg"
 !
 
-dotNetBridgeRunsInIDE
-
-    dotNetBridgeRunsInIDE isNil ifTrue:[
-	dotNetBridgeRunsInIDE := false asValue.
-	dotNetBridgeRunsInIDE onChangeSend:#updateModifiedChannel to:self.
-    ].
-    ^ dotNetBridgeRunsInIDE.
-!
-
-dotNetBridgeVerbose
-
-    dotNetBridgeVerbose isNil ifTrue:[
-	dotNetBridgeVerbose := false asValue.
-	dotNetBridgeVerbose onChangeSend:#updateModifiedChannel to:self.
-    ].
-    ^ dotNetBridgeVerbose.
-!
-
-enablePasswordCheck
-
-    enablePasswordCheck isNil ifTrue:[
-	self hasWindowMigrationServer ifFalse:[
-	    enablePasswordCheck := false asValue.
-	] ifTrue:[
-	    enablePasswordCheck := self windowMigrationEnabled.
-	].
-    ].
-    ^ enablePasswordCheck.
-!
-
-hasDotNetBridge
-    ^ DOTNET::DotNet notNil and:[ DOTNET::DotNet isLoaded ].
-!
-
-hasSmalltalkBridge
-    ^ BRIDGE::SmalltalkBridge notNil and:[ BRIDGE::SmalltalkBridge isLoaded ].
-!
-
-listOfSmallTeamHosts
-
-    listOfSmallTeamHosts isNil ifTrue:[
-	listOfSmallTeamHosts := List new.
-	listOfSmallTeamHosts onChangeSend:#updateModifiedChannel to:self.
-    ].
-    ^ listOfSmallTeamHosts.
-
-    "Created: / 12-11-2006 / 19:06:35 / cg"
-!
-
-remoteBrowsingEnabled
-
-    remoteBrowsingEnabled isNil ifTrue:[
-	remoteBrowsingEnabled := true asValue.
-	remoteBrowsingEnabled onChangeSend:#updateModifiedChannel to:self.
-    ].
-    ^ remoteBrowsingEnabled.
-!
-
-removeHostEnabled
-    ^ BlockValue
-	forLogical:self smallTeamServerEnabled
-	and:(BlockValue
-		with:[:h | h notEmptyOrNil]
-		argument:self selectedSmallTeamHost)
-
-    "Created: / 12-11-2006 / 19:01:42 / cg"
-    "Modified: / 08-03-2007 / 23:02:36 / cg"
-!
-
-selectedSmallTeamHost
-
-    selectedSmallTeamHost isNil ifTrue:[
-	selectedSmallTeamHost := nil asValue.
-	selectedSmallTeamHost addDependent:self
-    ].
-    ^ selectedSmallTeamHost.
-
-    "Created: / 12-11-2006 / 19:11:01 / cg"
-!
-
-smallTeamHostEntry
-
-    smallTeamHostEntry isNil ifTrue:[
-	smallTeamHostEntry := nil asValue.
-	smallTeamHostEntry onChangeSend:#updateModifiedChannel to:self.
-    ].
-    ^ smallTeamHostEntry.
-
-    "Created: / 12-11-2006 / 19:07:06 / cg"
-!
-
-smallTeamServerAvailable
-    ^ SmallTeam notNil.
-
-    "Created: / 12-11-2006 / 18:56:20 / cg"
-!
-
-smallTeamServerEnabled
-
-    smallTeamServerEnabled isNil ifTrue:[
-	smallTeamServerEnabled := false asValue.
-	smallTeamServerEnabled onChangeSend:#updateModifiedChannel to:self.
-    ].
-    ^ smallTeamServerEnabled.
-
-    "Created: / 12-11-2006 / 18:56:11 / cg"
-!
-
-smalltalkBridgeEnabled
-
-    smalltalkBridgeEnabled isNil ifTrue:[
-        smalltalkBridgeEnabled := false asValue.
-        smalltalkBridgeEnabled onChangeSend:#updateModifiedChannel to:self.
-    ].
-    ^ smalltalkBridgeEnabled.
-!
-
-smalltalkBridgeVerbose
-
-    smalltalkBridgeVerbose isNil ifTrue:[
-        smalltalkBridgeVerbose := false asValue.
-        smalltalkBridgeVerbose onChangeSend:#updateModifiedChannel to:self.
-    ].
-    ^ smalltalkBridgeVerbose.
-!
-
 smtpServerName
 
     smtpServerName isNil ifTrue:[
-	smtpServerName := '' asValue.
-	smtpServerName onChangeSend:#updateModifiedChannel to:self.
+        smtpServerName := '' asValue.
+        smtpServerName onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ smtpServerName.
 
     "Created: / 20-09-2007 / 16:04:39 / cg"
-!
-
-windowMigrationAuthenticate
-
-    windowMigrationAuthenticate isNil ifTrue:[
-	windowMigrationAuthenticate := true asValue.
-	windowMigrationAuthenticate onChangeSend:#updateModifiedChannel to:self.
-    ].
-    ^ windowMigrationAuthenticate.
-!
-
-windowMigrationEnabled
-
-    windowMigrationEnabled isNil ifTrue:[
-	windowMigrationEnabled := true asValue.
-	windowMigrationEnabled onChangeSend:#updateModifiedChannel to:self.
-    ].
-    ^ windowMigrationEnabled.
-!
-
-windowMigrationPassword
-
-    windowMigrationPassword isNil ifTrue:[
-	windowMigrationPassword := ValueHolder new.
-	windowMigrationPassword onChangeSend:#updateModifiedChannel to:self.
-    ].
-    ^ windowMigrationPassword.
-! !
-
-!AbstractSettingsApplication::MiscCommunicationSettingsAppl methodsFor:'change & update'!
-
-selectedSmallTeamHostChanged
-    self acceptChannel value:true.
-    self smallTeamHostEntry value:( self selectedSmallTeamHost value).
-
-    "Created: / 12-11-2006 / 19:09:49 / cg"
-!
-
-update:someting with:aParameter from:changedObject
-    changedObject == selectedSmallTeamHost ifTrue:[
-	self selectedSmallTeamHostChanged.
-	^ self
-    ].
-
-    super update:someting with:aParameter from:changedObject
-
-    "Created: / 12-11-2006 / 19:09:40 / cg"
 ! !
 
 !AbstractSettingsApplication::MiscCommunicationSettingsAppl methodsFor:'help'!
@@ -8696,101 +8455,11 @@
 
 !AbstractSettingsApplication::MiscCommunicationSettingsAppl methodsFor:'queries'!
 
-addHostEnabled
-    ^ self smallTeamServerEnabled
-
-    "Created: / 12-11-2006 / 19:01:37 / cg"
-!
-
-hasRemoteBrowsingSupport
-
-    ^ SmalltalkShareServer notNil
-!
-
 hasUnsavedChanges
     (super hasUnsavedChanges) ifTrue:[^ true].
-
-    BRIDGE::SmalltalkBridge notNil ifTrue:[
-        BRIDGE::SmalltalkBridge verbose ~= (self smalltalkBridgeVerbose value) ifTrue:[^ true].
-        BRIDGE::SmalltalkBridge singletonInstanceOrNil notNil ifTrue:[
-            (self smalltalkBridgeEnabled value) ifFalse:[^ true].
-        ] ifFalse:[
-        (self smalltalkBridgeEnabled value) ifTrue:[^ true].
-        ].
-    ] ifFalse:[
-        (self smalltalkBridgeEnabled value) ifTrue:[^ true].
-    ].
-
-    SmallTeam notNil ifTrue:[
-        self smallTeamServerEnabled value ~= (SmallTeam isLoaded and:[SmallTeam serverRunning]) ifTrue:[^ true].
-        self listOfSmallTeamHosts asSet ~= (SmallTeam connectedHosts asSet) ifTrue:[^ true].
-    ].
-
-    (self hasRemoteBrowsingSupport and:[SmalltalkShareServer isLoaded]) ifTrue:[
-        self remoteBrowsingEnabled value ~~ SmalltalkShareServer serverRunning ifTrue:[^ true].
-    ].
-    self hasWindowMigrationServer ifTrue:[
-        WindowMigrationServer isLoaded ifFalse:[
-            self windowMigrationEnabled value ifTrue:[
-                WindowMigrationServer autoload.
-            ].
-        ].
-        (self windowMigrationEnabled value ~~ WindowMigrationServer serverRunning) ifTrue:[^ true].
-        (self windowMigrationPassword value ~= WindowMigrationServer password)  ifTrue:[^ true].
-        (self windowMigrationAuthenticate value ~= self windowMigrationPassword value notNil) ifTrue:[^ true].
-    ].
     ^ false
 
     "Modified: / 20-09-2007 / 16:04:56 / cg"
-!
-
-hasWindowMigrationServer
-
-    ^ WindowMigrationServer notNil
-! !
-
-!AbstractSettingsApplication::MiscCommunicationSettingsAppl methodsFor:'user actions'!
-
-addSmallTeamHost
-    |host|
-
-    acceptChannel value:true.
-
-    host := self smallTeamHostEntry value.
-
-    host size > 0 ifTrue:[
-	self listOfSmallTeamHosts add:host
-    ].
-
-    "Modified: / 12-11-2006 / 19:06:22 / cg"
-!
-
-closeAllDotNetConnections
-    DOTNET::DotNet notNil ifTrue:[
-        DOTNET::DotNet exitAllInstances
-    ].
-!
-
-closeAllSmalltalkBridgeConnections
-    BRIDGE::SmalltalkBridge notNil ifTrue:[
-        BRIDGE::SmalltalkBridge exitAllInstances
-    ].
-!
-
-removeSmallTeamHost
-    |host|
-
-    acceptChannel value:true.
-
-    host := self selectedSmallTeamHost value.
-
-    host size > 0 ifTrue:[
-	self selectedSmallTeamHost value:nil.
-	self listOfSmallTeamHosts remove:host ifAbsent:[ self window beep ].
-	self smallTeamHostEntry value:''.
-    ].
-
-    "Modified: / 12-11-2006 / 19:15:05 / cg"
 ! !
 
 !AbstractSettingsApplication::MiscDisplay2SettingsAppl class methodsFor:'help specs'!
@@ -8887,132 +8556,132 @@
        name: windowSpec
        window:
       (WindowSpec
-	 label: 'Display settings 2'
-	 name: 'Display settings 2'
-	 flags: 1
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 671 591)
+         label: 'Display settings 2'
+         name: 'Display settings 2'
+         flags: 1
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 671 591)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (VerticalPanelViewSpec
-	     name: 'VerticalPanel1'
-	     layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-	     horizontalLayout: fitSpace
-	     verticalLayout: topSpace
-	     horizontalSpace: 5
-	     verticalSpace: 3
-	     component:
-	    (SpecCollection
-	       collection: (
-		(CheckBoxSpec
-		   label: 'Use Native Widgets (Experimental & Unfinished Feature)'
-		   name: 'NativeWidgets'
-		   activeHelpKey: nativeWidgets
-		   enableChannel: displaySupportsNativeWidgets
-		   model: nativeWidgets
-		   translateLabel: true
-		   extent: (Point 661 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Use Native Dialogs (Experimental & Unfinished Feature)'
-		   name: 'NativeDialogs'
-		   activeHelpKey: nativeDialogs
-		   enableChannel: displaySupportsNativeDialogs
-		   model: nativeDialogs
-		   translateLabel: true
-		   extent: (Point 661 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Use Native File Dialogs (Experimental & Unfinished Feature)'
-		   name: 'CheckBox1'
-		   activeHelpKey: nativeFileDialogs
-		   enableChannel: displaySupportsNativeFileDialogs
-		   model: nativeFileDialogs
-		   translateLabel: true
-		   extent: (Point 661 30)
-		 )
-		(ViewSpec
-		   name: 'SeparatingSpace1'
-		   extent: (Point 661 5)
-		 )
-		(DividerSpec
-		   name: 'Separator1'
-		   extent: (Point 661 4)
-		 )
-		(ViewSpec
-		   name: 'SeparatingSpace2'
-		   extent: (Point 661 5)
-		 )
-		(CheckBoxSpec
-		   label: 'Shadows under PopUp Views'
-		   name: 'shadows'
-		   activeHelpKey: shadows
-		   model: shadows
-		   translateLabel: true
-		   extent: (Point 661 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Cartoon Tooltip Style'
-		   name: 'CheckBox2'
-		   activeHelpKey: cartoonToolTipStyle
-		   enableChannel: displaySupportsArbitraryShapedViews
-		   model: cartoonToolTipStyle
-		   translateLabel: true
-		   extent: (Point 661 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Opaque Variable Panel Resizing'
-		   name: 'opaqueVariablePanelResize'
-		   activeHelpKey: opaqueVariablePanelResizing
-		   model: opaqueVariablePanelResizing
-		   translateLabel: true
-		   extent: (Point 661 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Opaque Table Column Resizing'
-		   name: 'opaqueTableColumnResize'
-		   activeHelpKey: opaqueTableColumnResizing
-		   model: opaqueTableColumnResizing
-		   translateLabel: true
-		   extent: (Point 661 30)
-		 )
-		(ViewSpec
-		   name: 'SeparatingSpace3'
-		   extent: (Point 661 4)
-		 )
-		(DividerSpec
-		   name: 'Separator3'
-		   extent: (Point 661 3)
-		 )
-		(ViewSpec
-		   name: 'SeparatingSpace4'
-		   extent: (Point 661 3)
-		 )
-		(CheckBoxSpec
-		   label: 'Right-Click in Title brings Window to Back'
-		   name: 'lowerOnRightClickInTitle'
-		   activeHelpKey: lowerOnRightClickInTitle
-		   enableChannel: isWindowsDisplay
-		   model: lowerOnRightClickInTitle
-		   translateLabel: true
-		   extent: (Point 661 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Shift-Click in Title brings Window to Back'
-		   name: 'lowerOnShiftClickInTitle'
-		   activeHelpKey: lowerOnShiftClickInTitle
-		   enableChannel: isWindowsDisplay
-		   model: lowerOnShiftClickInTitle
-		   translateLabel: true
-		   extent: (Point 661 30)
-		 )
-		)
-
-	     )
-	   )
-	  )
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel1'
+             layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+             horizontalLayout: fitSpace
+             verticalLayout: topSpace
+             horizontalSpace: 5
+             verticalSpace: 3
+             component:
+            (SpecCollection
+               collection: (
+                (CheckBoxSpec
+                   label: 'Use Native Widgets (Experimental & Unfinished Feature)'
+                   name: 'NativeWidgets'
+                   activeHelpKey: nativeWidgets
+                   enableChannel: displaySupportsNativeWidgets
+                   model: nativeWidgets
+                   translateLabel: true
+                   extent: (Point 661 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Use Native Dialogs (Experimental & Unfinished Feature)'
+                   name: 'NativeDialogs'
+                   activeHelpKey: nativeDialogs
+                   enableChannel: displaySupportsNativeDialogs
+                   model: nativeDialogs
+                   translateLabel: true
+                   extent: (Point 661 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Use Native File Dialogs (Experimental & Unfinished Feature)'
+                   name: 'CheckBox1'
+                   activeHelpKey: nativeFileDialogs
+                   enableChannel: displaySupportsNativeFileDialogs
+                   model: nativeFileDialogs
+                   translateLabel: true
+                   extent: (Point 661 30)
+                 )
+                (ViewSpec
+                   name: 'SeparatingSpace1'
+                   extent: (Point 661 5)
+                 )
+                (DividerSpec
+                   name: 'Separator1'
+                   extent: (Point 661 4)
+                 )
+                (ViewSpec
+                   name: 'SeparatingSpace2'
+                   extent: (Point 661 5)
+                 )
+                (CheckBoxSpec
+                   label: 'Shadows under PopUp Views'
+                   name: 'shadows'
+                   activeHelpKey: shadows
+                   model: shadows
+                   translateLabel: true
+                   extent: (Point 661 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Cartoon Tooltip Style'
+                   name: 'CheckBox2'
+                   activeHelpKey: cartoonToolTipStyle
+                   enableChannel: displaySupportsArbitraryShapedViews
+                   model: cartoonToolTipStyle
+                   translateLabel: true
+                   extent: (Point 661 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Opaque Variable Panel Resizing'
+                   name: 'opaqueVariablePanelResize'
+                   activeHelpKey: opaqueVariablePanelResizing
+                   model: opaqueVariablePanelResizing
+                   translateLabel: true
+                   extent: (Point 661 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Opaque Table Column Resizing'
+                   name: 'opaqueTableColumnResize'
+                   activeHelpKey: opaqueTableColumnResizing
+                   model: opaqueTableColumnResizing
+                   translateLabel: true
+                   extent: (Point 661 30)
+                 )
+                (ViewSpec
+                   name: 'SeparatingSpace3'
+                   extent: (Point 661 4)
+                 )
+                (DividerSpec
+                   name: 'Separator3'
+                   extent: (Point 661 3)
+                 )
+                (ViewSpec
+                   name: 'SeparatingSpace4'
+                   extent: (Point 661 3)
+                 )
+                (CheckBoxSpec
+                   label: 'Right-Click in Title brings Window to Back'
+                   name: 'lowerOnRightClickInTitle'
+                   activeHelpKey: lowerOnRightClickInTitle
+                   enableChannel: isWindowsDisplay
+                   model: lowerOnRightClickInTitle
+                   translateLabel: true
+                   extent: (Point 661 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Shift-Click in Title brings Window to Back'
+                   name: 'lowerOnShiftClickInTitle'
+                   activeHelpKey: lowerOnShiftClickInTitle
+                   enableChannel: isWindowsDisplay
+                   model: lowerOnShiftClickInTitle
+                   translateLabel: true
+                   extent: (Point 661 30)
+                 )
+                )
+
+             )
+           )
+          )
 
        )
      )
@@ -9102,8 +8771,8 @@
 
 cartoonToolTipStyle
     cartoonToolTipStyle isNil ifTrue:[
-	cartoonToolTipStyle := false asValue.
-	cartoonToolTipStyle onChangeSend:#updateModifiedChannel to:self
+        cartoonToolTipStyle := false asValue.
+        cartoonToolTipStyle onChangeSend:#updateModifiedChannel to:self
     ].
     ^ cartoonToolTipStyle.
 !
@@ -9124,32 +8793,32 @@
 
 lowerOnRightClickInTitle
     lowerOnRightClickInTitle isNil ifTrue:[
-	lowerOnRightClickInTitle := true asValue.
-	lowerOnRightClickInTitle onChangeSend:#updateModifiedChannel to:self
+        lowerOnRightClickInTitle := true asValue.
+        lowerOnRightClickInTitle onChangeSend:#updateModifiedChannel to:self
     ].
     ^ lowerOnRightClickInTitle.
 !
 
 lowerOnShiftClickInTitle
     lowerOnShiftClickInTitle isNil ifTrue:[
-	lowerOnShiftClickInTitle := true asValue.
-	lowerOnShiftClickInTitle onChangeSend:#updateModifiedChannel to:self
+        lowerOnShiftClickInTitle := true asValue.
+        lowerOnShiftClickInTitle onChangeSend:#updateModifiedChannel to:self
     ].
     ^ lowerOnShiftClickInTitle.
 !
 
 nativeDialogs
     nativeDialogs isNil ifTrue:[
-	nativeDialogs := Screen current nativeDialogs asValue.
-	nativeDialogs onChangeSend:#updateModifiedChannel to:self
+        nativeDialogs := Screen current nativeDialogs asValue.
+        nativeDialogs onChangeSend:#updateModifiedChannel to:self
     ].
     ^ nativeDialogs.
 !
 
 nativeFileDialogs
     nativeFileDialogs isNil ifTrue:[
-	nativeFileDialogs := Screen current nativeFileDialogs asValue.
-	nativeFileDialogs onChangeSend:#updateModifiedChannel to:self
+        nativeFileDialogs := Screen current nativeFileDialogs asValue.
+        nativeFileDialogs onChangeSend:#updateModifiedChannel to:self
     ].
     ^ nativeFileDialogs
 
@@ -9158,32 +8827,32 @@
 
 nativeWidgets
     nativeWidgets isNil ifTrue:[
-	nativeWidgets := Screen current nativeWidgets asValue.
-	nativeWidgets onChangeSend:#updateModifiedChannel to:self
+        nativeWidgets := Screen current nativeWidgets asValue.
+        nativeWidgets onChangeSend:#updateModifiedChannel to:self
     ].
     ^ nativeWidgets.
 !
 
 opaqueTableColumnResizing
     opaqueTableColumnResize isNil ifTrue:[
-	opaqueTableColumnResize := true asValue.
-	opaqueTableColumnResize onChangeSend:#updateModifiedChannel to:self
+        opaqueTableColumnResize := true asValue.
+        opaqueTableColumnResize onChangeSend:#updateModifiedChannel to:self
     ].
     ^ opaqueTableColumnResize.
 !
 
 opaqueVariablePanelResizing
     opaqueVariablePanelResize isNil ifTrue:[
-	opaqueVariablePanelResize := true asValue.
-	opaqueVariablePanelResize onChangeSend:#updateModifiedChannel to:self
+        opaqueVariablePanelResize := true asValue.
+        opaqueVariablePanelResize onChangeSend:#updateModifiedChannel to:self
     ].
     ^ opaqueVariablePanelResize.
 !
 
 shadows
     shadows isNil ifTrue:[
-	shadows := PopUpView shadows asValue.
-	shadows onChangeSend:#updateModifiedChannel to:self
+        shadows := PopUpView shadows asValue.
+        shadows onChangeSend:#updateModifiedChannel to:self
     ].
     ^ shadows.
 ! !
@@ -9314,8 +8983,8 @@
     <resource: #image>
 
     ^Icon
-	constantNamed:'AbstractSettingsApplication::MiscDisplaySettingsAppl class defaultIcon'
-	ifAbsentPut:[(Depth8Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+        constantNamed:'AbstractSettingsApplication::MiscDisplaySettingsAppl class defaultIcon'
+        ifAbsentPut:[(Depth8Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(8)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 @@@@@@@@@@@@@@DA@@@@@@@@@@@@@@@@@@@@@@@@@@DB@0D@@@@@@@@@@@@@@@@@@@@@@@DB@0LD@P@@@@@@@@@@@@@@@@@@@@DB@0LDA@DA@@@@@@@@@@@@
 @@@@@@TB@ HDA@XF@PD@@@@@@@@@@@@@@@TB@ HB@ \FA  H@P@@@@@@@@@@@@TB@ HB@ HBB@XIB@ A@@@@@@@@@@TB@ HB@ HB@ (KB@ KB0DC@@@@@@TB
 @ HB@ HB@ HB@ ,KB0LC@P@@@@@@APHB@ HB@ HBB (JB0LC@0HL@@4MCP4MCP4MCP4MCP4MCP4AC HE@@@MCPHCC0<PDQHRD1PB@0LM@ DE@@@@CP4B@0<O
@@ -9673,12 +9342,12 @@
     |newFormat|
 
     newFormat := Dialog
-		request:'Define the Format of Window Labels:\\  %1 - Label\  %2 - Hostname\  %3 - Username\  %4 - ProcessId\'
-			withCRs
-		initialAnswer:newWindowLabelFormat.
+                request:'Define the Format of Window Labels:\\  %1 - Label\  %2 - Hostname\  %3 - Username\  %4 - ProcessId\'
+                        withCRs
+                initialAnswer:newWindowLabelFormat.
     newFormat size > 0 ifTrue:[
-	newWindowLabelFormat := newFormat.
-	self updateModifiedChannel
+        newWindowLabelFormat := newFormat.
+        self updateModifiedChannel
     ]
 ! !
 
@@ -9686,16 +9355,16 @@
 
 activateOnClick
     activateOnClick isNil ifTrue:[
-	activateOnClick := true asValue.
-	activateOnClick onChangeSend:#updateModifiedChannel to:self
+        activateOnClick := true asValue.
+        activateOnClick onChangeSend:#updateModifiedChannel to:self
     ].
     ^ activateOnClick.
 !
 
 allowMouseWheelZoom
     allowMouseWheelZoom isNil ifTrue:[
-	allowMouseWheelZoom := true asValue.
-	allowMouseWheelZoom onChangeSend:#updateModifiedChannel to:self
+        allowMouseWheelZoom := true asValue.
+        allowMouseWheelZoom onChangeSend:#updateModifiedChannel to:self
     ].
     ^ allowMouseWheelZoom.
 !
@@ -9719,24 +9388,24 @@
 
 autoRaiseOnFocusIn
     autoRaiseOnFocusIn isNil ifTrue:[
-	autoRaiseOnFocusIn := true asValue.
-	autoRaiseOnFocusIn onChangeSend:#updateModifiedChannel to:self
+        autoRaiseOnFocusIn := true asValue.
+        autoRaiseOnFocusIn onChangeSend:#updateModifiedChannel to:self
     ].
     ^ autoRaiseOnFocusIn.
 !
 
 beepEnabled
     beepEnabled isNil ifTrue:[
-	beepEnabled := true asValue.
-	beepEnabled onChangeSend:#updateModifiedChannel to:self
+        beepEnabled := true asValue.
+        beepEnabled onChangeSend:#updateModifiedChannel to:self
     ].
     ^ beepEnabled.
 !
 
 button2WithAltKey
     button2WithAltKey isNil ifTrue:[
-	button2WithAltKey := false asValue.
-	button2WithAltKey onChangeSend:#updateModifiedChannel to:self
+        button2WithAltKey := false asValue.
+        button2WithAltKey onChangeSend:#updateModifiedChannel to:self
     ].
     ^ button2WithAltKey.
 !
@@ -9751,16 +9420,16 @@
 
 focusFollowsMouse
     focusFollowsMouse isNil ifTrue:[
-	focusFollowsMouse := true asValue.
-	focusFollowsMouse onChangeSend:#updateModifiedChannel to:self
+        focusFollowsMouse := true asValue.
+        focusFollowsMouse onChangeSend:#updateModifiedChannel to:self
     ].
     ^ focusFollowsMouse.
 !
 
 forceWindowsIntoMonitorBounds
     forceWindowsIntoMonitorBounds isNil ifTrue:[
-	forceWindowsIntoMonitorBounds := true asValue.
-	forceWindowsIntoMonitorBounds onChangeSend:#updateModifiedChannel to:self
+        forceWindowsIntoMonitorBounds := true asValue.
+        forceWindowsIntoMonitorBounds onChangeSend:#updateModifiedChannel to:self
     ].
     ^ forceWindowsIntoMonitorBounds.
 
@@ -9769,8 +9438,8 @@
 
 formatHostNameWindowLabel
     formatHostNameWindowLabel isNil ifTrue:[
-	formatHostNameWindowLabel :=
-	    (resources string:'Window Label Format:').
+        formatHostNameWindowLabel :=
+            (resources string:'Window Label Format:').
     ].
     ^ formatHostNameWindowLabel.
 
@@ -9780,8 +9449,8 @@
 
 formatHostNameWindowLabel1
     formatHostNameWindowLabel1 isNil ifTrue:[
-	formatHostNameWindowLabel1 :=
-	    (resources stringWithCRs:'%1 - Label\%2 - Hostname\%3 - Username')
+        formatHostNameWindowLabel1 :=
+            (resources stringWithCRs:'%1 - Label\%2 - Hostname\%3 - Username')
     ].
     ^ formatHostNameWindowLabel1.
 
@@ -9791,8 +9460,8 @@
 
 formatHostNameWindowLabel2
     formatHostNameWindowLabel2 isNil ifTrue:[
-	formatHostNameWindowLabel2 :=
-	    (resources stringWithCRs:'%4 - ProcessId\%5 - TOP-Directory\%6 - TOP-Path').
+        formatHostNameWindowLabel2 :=
+            (resources stringWithCRs:'%4 - ProcessId\%5 - TOP-Directory\%6 - TOP-Path').
     ].
     ^ formatHostNameWindowLabel2.
 
@@ -9802,37 +9471,37 @@
 
 hostNameInLabelHolder
     hostNameInLabelHolder isNil ifTrue:[
-	hostNameInLabelHolder := true asValue.
-	hostNameInLabelHolder onChangeSend:#updateModifiedChannel to:self
+        hostNameInLabelHolder := true asValue.
+        hostNameInLabelHolder onChangeSend:#updateModifiedChannel to:self
     ].
     ^ hostNameInLabelHolder.
 !
 
 menuPanelTakesFocusOnClick
     menuPanelTakesFocusOnClick isNil ifTrue:[
-	menuPanelTakesFocusOnClick := false asValue.
-	menuPanelTakesFocusOnClick onChangeSend:#updateModifiedChannel to:self
+        menuPanelTakesFocusOnClick := false asValue.
+        menuPanelTakesFocusOnClick onChangeSend:#updateModifiedChannel to:self
     ].
     ^ menuPanelTakesFocusOnClick.
 !
 
 mouseWheelFocusFollowsMouse
     mouseWheelFocusFollowsMouse isNil ifTrue:[
-	mouseWheelFocusFollowsMouse := true asValue.
-	mouseWheelFocusFollowsMouse onChangeSend:#updateModifiedChannel to:self
+        mouseWheelFocusFollowsMouse := true asValue.
+        mouseWheelFocusFollowsMouse onChangeSend:#updateModifiedChannel to:self
     ].
     ^ mouseWheelFocusFollowsMouse.
 !
 
 mouseWheelFocusFollowsMouseEnabled
     ^ BlockValue
-	forLogicalNot:(self focusFollowsMouse).
+        forLogicalNot:(self focusFollowsMouse).
 !
 
 newWindowLabelFormat
     newWindowLabelFormat isNil ifTrue:[
-	newWindowLabelFormat := true asValue.
-	newWindowLabelFormat onChangeSend:#updateModifiedChannel to:self
+        newWindowLabelFormat := true asValue.
+        newWindowLabelFormat onChangeSend:#updateModifiedChannel to:self
     ].
     ^ newWindowLabelFormat.
 
@@ -9841,24 +9510,24 @@
 
 returnFocus
     returnFocus isNil ifTrue:[
-	returnFocus := true asValue.
-	returnFocus onChangeSend:#updateModifiedChannel to:self
+        returnFocus := true asValue.
+        returnFocus onChangeSend:#updateModifiedChannel to:self
     ].
     ^ returnFocus.
 !
 
 selectOnRightClick
     selectOnRightClick isNil ifTrue:[
-	selectOnRightClick := true asValue.
-	selectOnRightClick onChangeSend:#updateModifiedChannel to:self
+        selectOnRightClick := true asValue.
+        selectOnRightClick onChangeSend:#updateModifiedChannel to:self
     ].
     ^ selectOnRightClick.
 !
 
 shouldRememberLastExtent
     shouldRememberLastExtent isNil ifTrue:[
-	shouldRememberLastExtent := true asValue.
-	shouldRememberLastExtent onChangeSend:#updateModifiedChannel to:self
+        shouldRememberLastExtent := true asValue.
+        shouldRememberLastExtent onChangeSend:#updateModifiedChannel to:self
     ].
     ^ shouldRememberLastExtent.
 
@@ -9867,24 +9536,24 @@
 
 showAccelerators
     showAccelerators isNil ifTrue:[
-	showAccelerators := true asValue.
-	showAccelerators onChangeSend:#updateModifiedChannel to:self
+        showAccelerators := true asValue.
+        showAccelerators onChangeSend:#updateModifiedChannel to:self
     ].
     ^ showAccelerators.
 !
 
 showRightButtonMenuOnRelease
     showRightButtonMenuOnRelease isNil ifTrue:[
-	showRightButtonMenuOnRelease := true asValue.
-	showRightButtonMenuOnRelease onChangeSend:#updateModifiedChannel to:self
+        showRightButtonMenuOnRelease := true asValue.
+        showRightButtonMenuOnRelease onChangeSend:#updateModifiedChannel to:self
     ].
     ^ showRightButtonMenuOnRelease.
 !
 
 takeFocus
     takeFocus isNil ifTrue:[
-	takeFocus := true asValue.
-	takeFocus onChangeSend:#updateModifiedChannel to:self
+        takeFocus := true asValue.
+        takeFocus onChangeSend:#updateModifiedChannel to:self
     ].
     ^ takeFocus.
 ! !
@@ -9910,6 +9579,1005 @@
     ^ false
 ! !
 
+!AbstractSettingsApplication::MiscSmalltalkCommunicationSettingsAppl class methodsFor:'help specs'!
+
+flyByHelpSpec
+    "This resource specification was automatically generated
+     by the UIHelpTool of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIHelpTool may not be able to read the specification."
+
+    "
+     UIHelpTool openOnClass:AbstractSettingsApplication::MiscDisplaySettingsAppl
+    "
+
+    <resource: #help>
+
+    ^ super flyByHelpSpec addPairsFrom:#(
+
+#smtpServer
+'The host name of your SMTP (mail transfer) server.\This is only needed for the debugger''s "Send Error Report via Mail" menu function,\so you can leave this empty if you don''t need or want this function'
+
+#windowMigration
+'The window migration service is available for X-display systems only.\It allows a window to be fetched from your screen and moved to another X-display' 
+
+#remoteBrowsing
+'The remote browsing service allows for another ST/X system''s browser to request a classes source from your running system'
+
+#smallTeamCommon
+'The smallTeam framework distributes notifications to team members when code is changed in a browser.\This allows for team members to track and follow your changes in real time.'
+
+#smallTeam
+'This enables the smallteam server in a local network.\Changes are interchanged with the listed partner hosts'
+
+#smallTeamHosts
+'List of hosts with which change notifications are to be exchanged (local team members)'
+
+#smallTeamHostToAdd
+'Name of host to add (with button below)'
+
+#addSmallTeamHost
+'Add the above hostname to the list of team members'
+
+#removeSmallTeamHost
+'Remove the selected hostname from the list of team members'
+
+#smallTeamViaXMPP
+'This enables the smallteam server in a global network.\Changes are interchanged via XMPP with the listed XMPP partners'
+
+#xmppServer
+'The xmpp server which distributes your xmpp messages (you need a login account there)'
+
+#xmppLoginUser
+'Your login username on the above xmpp server'
+
+#xmppLoginPassword
+'Your login password on the above xmpp server'
+
+#smallTeamXMPPUsers
+'List of users with which change notifications are to be exchanged (global team members)'
+
+#smallTeamXMPPUserToAdd
+'Name of user to add (with button below)'
+
+#addSmallTeamXMPPUser
+'Add the above username to the list of team members'
+
+#removeSmallTeamXMPPUser
+'Remove the selected username from the list of team members'
+
+#dotNetBridge
+'The dotNet bridge extension allows transparent access and message sending to .NET classes and instances.'
+
+#smalltalkBridgeServer
+'The smalltalk bridge server extension allows distributed processing\via transparent access and message sending from other ST/X systems.'
+)
+! !
+
+!AbstractSettingsApplication::MiscSmalltalkCommunicationSettingsAppl class methodsFor:'image specs'!
+
+defaultIcon
+    "This resource specification was automatically generated
+     by the ImageEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the ImageEditor may not be able to read the specification."
+
+    "
+     self defaultIcon inspect
+     ImageEditor openOnClass:self andSelector:#defaultIcon
+     Icon flushCachedIcons
+    "
+
+    <resource: #image>
+
+    ^Icon
+        constantNamed:'AbstractSettingsApplication::MiscSmalltalkCommunicationSettingsAppl defaultIcon'
+        ifAbsentPut:[(Depth4Image width:22 height:22) bits:(ByteArray fromPackedString:'
+@@!!8@@@@@@BG @@@!!1]P@@@@AWE8@@!!1 '' @@@BGFB^@!!1 5Q8@@BCFCUG !!DWQPH@@BDQMHD \QFA] @@@1DXE6X"DQ]VY&Y"HQE5I&@!!]QI&Y&XBEED"TG
+]QD&Y&IPL5ERQ5 !!TV@@ACVBEQIF$REXP@@DX1HU!!@$''HXP@@@T2L!!!!@@GI(@@@@AVL&!!@@@UGP@@@@G]TM@@@@@P@@@@@A5A@@@@@@@@@@@@@@@@@@@@@@@
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@b') colorMapFromArray:#[0 0 0 224 224 224 64 64 64 96 96 96 128 128 128 192 192 192 32 32 32 96 96 96 160 160 160 96 96 96] mask:((ImageMask width:22 height:22) bits:(ByteArray fromPackedString:'G@C O G0_0O8?8_<?(_<?8_<???<???<???<?8_<?8_<_0O8O G0O@G B@A@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'); yourself); yourself]
+! !
+
+!AbstractSettingsApplication::MiscSmalltalkCommunicationSettingsAppl class methodsFor:'interface specs'!
+
+windowSpec
+    "This resource specification was automatically generated
+     by the UIPainter of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIPainter may not be able to read the specification."
+
+    "
+     UIPainter new openOnClass:AbstractSettingsApplication::MiscSmalltalkCommunicationSettingsAppl andSelector:#windowSpec
+     AbstractSettingsApplication::MiscSmalltalkCommunicationSettingsAppl new openInterface:#windowSpec
+     AbstractSettingsApplication::MiscSmalltalkCommunicationSettingsAppl open
+    "
+
+    <resource: #canvas>
+
+    ^ 
+    #(FullSpec
+       name: windowSpec
+       window: 
+      (WindowSpec
+         label: 'Smalltalk Communication Settings'
+         name: 'Smalltalk Communication Settings'
+         flags: 1
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 751 766)
+       )
+       component: 
+      (SpecCollection
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel1'
+             layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+             horizontalLayout: fit
+             verticalLayout: top
+             horizontalSpace: 3
+             verticalSpace: 3
+             component: 
+            (SpecCollection
+               collection: (
+                (FramedBoxSpec
+                   label: 'Window migration'
+                   name: 'WindowMicrationSetupBox'
+                   activeHelpKey: windowMigration
+                   labelPosition: topLeft
+                   translateLabel: true
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (VerticalPanelViewSpec
+                         name: 'VerticalPanel2'
+                         layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+                         horizontalLayout: left
+                         verticalLayout: center
+                         horizontalSpace: 3
+                         verticalSpace: 3
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (ViewSpec
+                               name: 'Box2'
+                               component: 
+                              (SpecCollection
+                                 collection: (
+                                  (CheckBoxSpec
+                                     label: 'Window migration enabled'
+                                     name: 'CheckBox2'
+                                     layout: (LayoutFrame 5 0 0 0 600 0 25 0)
+                                     enableChannel: hasWindowMigrationServer
+                                     model: windowMigrationEnabled
+                                     translateLabel: true
+                                   )
+                                  )
+                                
+                               )
+                               extent: (Point 696 25)
+                             )
+                            (ViewSpec
+                               name: 'Box3'
+                               component: 
+                              (SpecCollection
+                                 collection: (
+                                  (CheckBoxSpec
+                                     label: 'Password check'
+                                     name: 'CheckBox3'
+                                     layout: (LayoutFrame 5 0 0 0 600 0 25 0)
+                                     enableChannel: enablePasswordCheck
+                                     model: windowMigrationAuthenticate
+                                     translateLabel: true
+                                   )
+                                  )
+                                
+                               )
+                               extent: (Point 696 25)
+                             )
+                            (ViewSpec
+                               name: 'Box4'
+                               component: 
+                              (SpecCollection
+                                 collection: (
+                                  (LabelSpec
+                                     label: 'Password:'
+                                     name: 'Label3'
+                                     layout: (LayoutFrame 0 0 0 0 150 0 25 0)
+                                     translateLabel: true
+                                     adjust: right
+                                     enableDisableColorChannel: enablePasswordCheck
+                                   )
+                                  (InputFieldSpec
+                                     name: 'EntryField1'
+                                     layout: (LayoutFrame 150 0 0 0 400 0 25 0)
+                                     enableChannel: windowMigrationAuthenticate
+                                     model: windowMigrationPassword
+                                     type: password
+                                     acceptOnReturn: true
+                                     acceptOnTab: true
+                                     acceptOnLostFocus: true
+                                     acceptOnPointerLeave: true
+                                   )
+                                  )
+                                
+                               )
+                               extent: (Point 696 25)
+                             )
+                            )
+                          
+                         )
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 751 120)
+                 )
+                (FramedBoxSpec
+                   label: 'Remote Browsing'
+                   name: 'RemoteBrowsingSetupBox'
+                   activeHelpKey: remoteBrowsing
+                   labelPosition: topLeft
+                   translateLabel: true
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (ViewSpec
+                         name: 'Box1'
+                         layout: (LayoutFrame 0 0 5 0 0 1 30 0)
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Remote browsing enabled'
+                               name: 'CheckBox1'
+                               layout: (LayoutFrame 5 0 0 0 600 0 25 0)
+                               enableChannel: hasRemoteBrowsingSupport
+                               model: remoteBrowsingEnabled
+                               translateLabel: true
+                             )
+                            )
+                          
+                         )
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 751 70)
+                 )
+                (FramedBoxSpec
+                   label: 'SmallTeam Change Distribution'
+                   name: 'SmallTeamSetupBox'
+                   activeHelpKey: smallTeamCommon
+                   labelPosition: topLeft
+                   translateLabel: true
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (ViewSpec
+                         name: 'enableBox'
+                         layout: (LayoutFrame 0 0 8 0 0 1 33 0)
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'SmallTeam Server enabled'
+                               name: 'CheckBox4'
+                               layout: (LayoutFrame 5 0 0 0 600 0 25 0)
+                               enableChannel: smallTeamServerAvailable
+                               model: smallTeamServerEnabled
+                               translateLabel: true
+                               activeHelpKey: smallTeam
+                             )
+                            )
+                          
+                         )
+                       )
+                      (LabelSpec
+                         label: 'SmallTeam Hosts:'
+                         name: 'smallTeamHostsLabel'
+                         layout: (LayoutFrame 0 0.0 37 0 60 0.25 62 0)
+                         translateLabel: true
+                         adjust: right
+                         enableDisableColorChannel: smallTeamServerAvailable
+                         activeHelpKey: smallTeamHosts
+                       )
+                      (SequenceViewSpec
+                         name: 'smallTeamHostsList'
+                         layout: (LayoutFrame 64 0.25 37 0 0 1 131 0)
+                         enableChannel: smallTeamServerEnabled
+                         tabable: true
+                         model: selectedSmallTeamHost
+                         hasHorizontalScrollBar: true
+                         hasVerticalScrollBar: true
+                         miniScrollerHorizontal: true
+                         useIndex: false
+                         sequenceList: listOfSmallTeamHosts
+                         activeHelpKey: smallTeamHosts
+                       )
+                      (LabelSpec
+                         label: 'Host:'
+                         name: 'hostLabel'
+                         layout: (LayoutFrame 0 0.0 137 0 60 0.25 162 0)
+                         translateLabel: true
+                         adjust: right
+                         enableDisableColorChannel: smallTeamServerEnabled
+                         activeHelpKey: smallTeamHostToAdd
+                       )
+                      (InputFieldSpec
+                         name: 'smallTeamHostEntryField'
+                         layout: (LayoutFrame 64 0.25 138 0 0 1 163 0)
+                         enableChannel: smallTeamServerEnabled
+                         tabable: true
+                         model: smallTeamHostEntry
+                         acceptChannel: acceptChannel
+                         acceptOnPointerLeave: true
+                         activeHelpKey: smallTeamHostToAdd
+                       )
+                      (HorizontalPanelViewSpec
+                         name: 'HorizontalPanel2'
+                         layout: (LayoutFrame 64 0.25 168 0 -1 1 193 0)
+                         horizontalLayout: fitSpace
+                         verticalLayout: center
+                         horizontalSpace: 3
+                         verticalSpace: 3
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (ActionButtonSpec
+                               label: 'Add'
+                               name: 'addButton'
+                               translateLabel: true
+                               tabable: true
+                               model: addSmallTeamHost
+                               enableChannel: addHostEnabled
+                               extent: (Point 226 22)
+                               activeHelpKey: addSmallTeamHost
+                             )
+                            (ActionButtonSpec
+                               label: 'Remove'
+                               name: 'removeButton'
+                               translateLabel: true
+                               tabable: true
+                               model: removeSmallTeamHost
+                               enableChannel: removeHostEnabled
+                               extent: (Point 226 22)
+                               activeHelpKey: removeSmallTeamHost
+                             )
+                            )
+                          
+                         )
+                       )
+                      (CheckBoxSpec
+                         label: 'XMPP SmallTeam enabled'
+                         name: 'CheckBox5'
+                         layout: (LayoutFrame 5 0 197 0 600 0 222 0)
+                         enableChannel: smallTeamViaXMPPAvailable
+                         model: smallTeamViaXMPPEnabled
+                         translateLabel: true
+                         activeHelpKey: smallTeamViaXMPP
+                       )
+                      (LabelSpec
+                         label: 'XMPP Team Members:'
+                         name: 'Label4'
+                         layout: (LayoutFrame 0 0.0 323 0 60 0.25 348 0)
+                         translateLabel: true
+                         adjust: right
+                         enableDisableColorChannel: smallTeamViaXMPPEnabled
+                         activeHelpKey: smallTeamXMPPUsers
+                       )
+                      (SequenceViewSpec
+                         name: 'List1'
+                         layout: (LayoutFrame 64 0.25 323 0 0 1 417 0)
+                         enableChannel: smallTeamViaXMPPEnabled
+                         tabable: true
+                         model: selectedXMPPSmallTeamUser
+                         hasHorizontalScrollBar: true
+                         hasVerticalScrollBar: true
+                         miniScrollerHorizontal: true
+                         useIndex: false
+                         sequenceList: listOfXMPPSmallTeamUsers
+                         activeHelpKey: smallTeamXMPPUsers
+                       )
+                      (LabelSpec
+                         label: 'Member:'
+                         name: 'Label5'
+                         layout: (LayoutFrame 0 0.0 423 0 60 0.25 448 0)
+                         translateLabel: true
+                         adjust: right
+                         enableDisableColorChannel: smallTeamViaXMPPEnabled
+                         activeHelpKey: smallTeamXMPPUserToAdd
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField2'
+                         layout: (LayoutFrame 64 0.25 424 0 0 1 449 0)
+                         enableChannel: smallTeamViaXMPPEnabled
+                         tabable: true
+                         model: xmppSmallTeamUserEntry
+                         acceptChannel: acceptChannel
+                         acceptOnPointerLeave: true
+                         activeHelpKey: smallTeamXMPPUserToAdd
+                       )
+                      (HorizontalPanelViewSpec
+                         name: 'HorizontalPanel3'
+                         layout: (LayoutFrame 64 0.25 455 0 -1 1 480 0)
+                         horizontalLayout: fitSpace
+                         verticalLayout: center
+                         horizontalSpace: 3
+                         verticalSpace: 3
+                         component: 
+                        (SpecCollection
+                           collection: (
+                            (ActionButtonSpec
+                               label: 'Add'
+                               name: 'Button3'
+                               translateLabel: true
+                               tabable: true
+                               model: addSmallTeamHost
+                               enableChannel: addXMPPUserEnabled
+                               extent: (Point 226 22)
+                               activeHelpKey: addSmallTeamXMPPUser
+                             )
+                            (ActionButtonSpec
+                               label: 'Remove'
+                               name: 'Button4'
+                               translateLabel: true
+                               tabable: true
+                               model: removeSmallTeamHost
+                               enableChannel: removeXMPPUserEnabled
+                               extent: (Point 226 22)
+                               activeHelpKey: removeSmallTeamXMPPUser
+                             )
+                            )
+                          
+                         )
+                       )
+                      (LabelSpec
+                         label: 'XMPP Server:'
+                         name: 'Label6'
+                         layout: (LayoutFrame 0 0.0 227 0 60 0.25 252 0)
+                         translateLabel: true
+                         adjust: right
+                         enableDisableColorChannel: smallTeamViaXMPPEnabled
+                         activeHelpKey: xmppServer
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField3'
+                         layout: (LayoutFrame 64 0.25 228 0 0 1 253 0)
+                         enableChannel: smallTeamViaXMPPEnabled
+                         tabable: true
+                         model: smallteamXMPPServer
+                         acceptChannel: acceptChannel
+                         acceptOnPointerLeave: true
+                         activeHelpKey: xmppServer
+                       )
+                      (LabelSpec
+                         label: 'XMPP Username:'
+                         name: 'Label7'
+                         layout: (LayoutFrame 0 0.0 258 0 60 0.25 283 0)
+                         translateLabel: true
+                         adjust: right
+                         enableDisableColorChannel: smallTeamViaXMPPEnabled
+                         activeHelpKey: xmppLoginUser
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField4'
+                         layout: (LayoutFrame 64 0.25 259 0 0 1 284 0)
+                         enableChannel: smallTeamViaXMPPEnabled
+                         tabable: true
+                         model: smallteamXMPPUser
+                         acceptChannel: acceptChannel
+                         acceptOnPointerLeave: true
+                         activeHelpKey: xmppLoginUser
+                       )
+                      (LabelSpec
+                         label: 'XMPP Password:'
+                         name: 'Label8'
+                         layout: (LayoutFrame 0 0.0 288 0 60 0.25 313 0)
+                         translateLabel: true
+                         adjust: right
+                         enableDisableColorChannel: smallTeamViaXMPPEnabled
+                         activeHelpKey: xmppLoginPassword
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField5'
+                         layout: (LayoutFrame 64 0.25 289 0 0 1 314 0)
+                         enableChannel: smallTeamViaXMPPEnabled
+                         tabable: true
+                         model: smallteamXMPPPassword
+                         type: password
+                         acceptChannel: acceptChannel
+                         acceptOnPointerLeave: true
+                         activeHelpKey: xmppLoginPassword
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 751 521)
+                 )
+                )
+              
+             )
+           )
+          )
+        
+       )
+     )
+! !
+
+!AbstractSettingsApplication::MiscSmalltalkCommunicationSettingsAppl methodsFor:'actions'!
+
+aspects
+    ^ #(
+                smallteamViaXMPPEnabled
+                smallteamXMPPPassword
+                smallteamXMPPUser
+                smallteamXMPPServer
+            )
+!
+
+basicReadSettings
+    |pw auth|
+
+    super basicReadSettings.
+
+    SmallTeam notNil ifTrue:[
+        self smallTeamServerEnabled value:(SmallTeam isLoaded and:[SmallTeam serverRunning]).
+        self listOfSmallTeamHosts contents:(SmallTeam connectedHosts).
+    ].
+
+    self remoteBrowsingEnabled
+        value:(self hasRemoteBrowsingSupport
+               and:[SmalltalkShareServer isLoaded and:[SmalltalkShareServer serverRunning]]).
+
+    self windowMigrationEnabled
+        value:(self hasWindowMigrationServer
+               and:[ WindowMigrationServer isLoaded
+               and:[ WindowMigrationServer serverRunning ]]).
+
+
+    pw := nil.
+    auth := false.
+    (self hasWindowMigrationServer and:[WindowMigrationServer isLoaded]) ifTrue:[
+        pw := WindowMigrationServer password.
+        auth := self windowMigrationPassword value notNil
+    ].
+
+    self windowMigrationPassword value:pw.
+    self windowMigrationAuthenticate value:auth
+
+    "Modified: / 20-09-2007 / 16:04:59 / cg"
+!
+
+basicSaveSettings
+    super basicSaveSettings.
+    self smallTeamServerAvailable ifTrue:[
+        SmallTeam connectedHosts copy do:[:host | 
+            (self listOfSmallTeamHosts includes:host) ifFalse:[
+                SmallTeam removeHost:host.
+            ].
+        ].
+        self listOfSmallTeamHosts do:[:eachHost | 
+            SmallTeam addHost:eachHost.
+        ].
+        self smallTeamServerEnabled value ifTrue:[
+            SmallTeam startServer
+        ] ifFalse:[
+            SmallTeam stopServer
+        ].
+    ].
+    self smallTeamViaXMPPAvailable ifTrue:[
+        SmallTeamXMPPRoboter listOfXMPPUsers copy do:[:user | 
+            (self listOfXMPPSmallTeamUsers includes:user) ifFalse:[
+                SmallTeamXMPPRoboter removeUser:user.
+            ].
+        ].
+        self listOfXMPPSmallTeamUsers do:[:eachUser | 
+            SmallTeamXMPPRoboter addUser:eachUser.
+        ].
+        currentUserPrefs smallteamXMPPServer:(self smallteamXMPPServer value).
+        currentUserPrefs smallteamXMPPUser:(self smallteamXMPPUser value).
+        currentUserPrefs smallteamXMPPPassword:(self smallteamXMPPPassword value).
+        self smallTeamViaXMPPEnabled value ifTrue:[
+            SmallTeamXMPPRoboter startServer
+        ] ifFalse:[
+            SmallTeamXMPPRoboter stopServer
+        ].
+    ].
+    self hasRemoteBrowsingSupport ifTrue:[
+        self remoteBrowsingEnabled value ifFalse:[
+            SmalltalkShareServer serverRunning ifTrue:[
+                SmalltalkShareServer killAll
+            ].
+        ] ifTrue:[
+            SmalltalkShareServer serverRunning ifFalse:[
+                SmalltalkShareServer start.
+                 
+                "/ must wait a bit; give it a chance to
+                "/ really start (before checking)
+                
+                Delay waitForSeconds:0.5.
+                SmalltalkShareServer serverRunning ifFalse:[
+                    self warn:'SmalltalkShareServer startup failed (see stderr).'
+                ]
+            ].
+        ].
+    ].
+    self hasWindowMigrationServer ifTrue:[
+        self windowMigrationAuthenticate value ifTrue:[
+            WindowMigrationServer password:self windowMigrationPassword value.
+        ] ifFalse:[
+            WindowMigrationServer password:nil
+        ].
+        self windowMigrationEnabled value ifFalse:[
+            WindowMigrationServer serverRunning ifTrue:[
+                WindowMigrationServer stop
+            ].
+        ] ifTrue:[
+            WindowMigrationServer serverRunning ifFalse:[
+                WindowMigrationServer start.
+                 
+                "/ must wait a bit; give it a chance to
+                "/ really start (before checking)
+                
+                Delay waitForSeconds:0.5.
+                WindowMigrationServer serverRunning ifFalse:[
+                    self warn:'WindowMigrationServer startup failed (see stderr).'
+                ]
+            ].
+        ].
+    ].
+
+    "Modified: / 20-09-2007 / 16:05:01 / cg"
+! !
+
+!AbstractSettingsApplication::MiscSmalltalkCommunicationSettingsAppl methodsFor:'aspects'!
+
+acceptChannel
+
+    acceptChannel isNil ifTrue:[
+        acceptChannel := TriggerValue new.
+    ].
+    ^ acceptChannel.
+
+    "Created: / 12-11-2006 / 19:04:09 / cg"
+!
+
+addHostEnabled
+    ^ self smallTeamServerEnabled
+!
+
+addXMPPUserEnabled
+    ^ self smallTeamViaXMPPEnabled
+!
+
+enablePasswordCheck
+
+    enablePasswordCheck isNil ifTrue:[
+        self hasWindowMigrationServer ifFalse:[
+            enablePasswordCheck := false asValue.
+        ] ifTrue:[
+            enablePasswordCheck := self windowMigrationEnabled.
+        ].
+    ].
+    ^ enablePasswordCheck.
+!
+
+listOfSmallTeamHosts
+
+    listOfSmallTeamHosts isNil ifTrue:[
+        listOfSmallTeamHosts := List new.
+        listOfSmallTeamHosts onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ listOfSmallTeamHosts.
+
+    "Created: / 12-11-2006 / 19:06:35 / cg"
+!
+
+listOfXMPPSmallTeamUsers
+
+    listOfXMPPSmallTeamUsers isNil ifTrue:[
+        listOfXMPPSmallTeamUsers := List new.
+        listOfXMPPSmallTeamUsers onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ listOfXMPPSmallTeamUsers.
+!
+
+remoteBrowsingEnabled
+
+    remoteBrowsingEnabled isNil ifTrue:[
+        remoteBrowsingEnabled := true asValue.
+        remoteBrowsingEnabled onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ remoteBrowsingEnabled.
+!
+
+removeHostEnabled
+    ^ BlockValue
+        forLogical:self smallTeamServerEnabled
+        and:(BlockValue
+                with:[:h | h notEmptyOrNil]
+                argument:self selectedSmallTeamHost)
+
+    "Created: / 12-11-2006 / 19:01:42 / cg"
+    "Modified: / 08-03-2007 / 23:02:36 / cg"
+!
+
+removeXMPPUserEnabled
+    ^ BlockValue
+        forLogical:self smallTeamViaXMPPEnabled
+        and:(BlockValue
+                with:[:h | h notEmptyOrNil]
+                argument:self selectedXMPPSmallTeamUser)
+!
+
+selectedSmallTeamHost
+
+    selectedSmallTeamHost isNil ifTrue:[
+        selectedSmallTeamHost := nil asValue.
+        selectedSmallTeamHost onChangeSend:#selectedSmallTeamHostChanged to:self.
+    ].
+    ^ selectedSmallTeamHost.
+
+    "Created: / 12-11-2006 / 19:11:01 / cg"
+!
+
+selectedXMPPSmallTeamUser
+
+    selectedXMPPSmallTeamUser isNil ifTrue:[
+        selectedXMPPSmallTeamUser := nil asValue.
+        selectedXMPPSmallTeamUser onChangeSend:#selectedXMPPSmallTeamUserChanged to:self.
+    ].
+    ^ selectedXMPPSmallTeamUser.
+!
+
+smallTeamHostEntry
+
+    smallTeamHostEntry isNil ifTrue:[
+        smallTeamHostEntry := nil asValue.
+        smallTeamHostEntry onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ smallTeamHostEntry.
+
+    "Created: / 12-11-2006 / 19:07:06 / cg"
+!
+
+smallTeamServerAvailable
+    ^ SmallTeam notNil.
+
+    "Created: / 12-11-2006 / 18:56:20 / cg"
+!
+
+smallTeamServerEnabled
+
+    smallTeamServerEnabled isNil ifTrue:[
+        smallTeamServerEnabled := false asValue.
+        smallTeamServerEnabled onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ smallTeamServerEnabled.
+
+    "Created: / 12-11-2006 / 18:56:11 / cg"
+!
+
+smallTeamViaXMPPAvailable
+    ^ SmallTeam notNil 
+        and:[ JBCClient notNil and:[ SmallTeamXMPPRoboter notNil ] ].
+!
+
+smallTeamViaXMPPEnabled
+
+    smallTeamViaXMPPEnabled isNil ifTrue:[
+        smallTeamViaXMPPEnabled := false asValue.
+        smallTeamViaXMPPEnabled onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ smallTeamViaXMPPEnabled.
+!
+
+smalltalkBridgeEnabled
+
+    smalltalkBridgeEnabled isNil ifTrue:[
+        smalltalkBridgeEnabled := false asValue.
+        smalltalkBridgeEnabled onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ smalltalkBridgeEnabled.
+!
+
+smalltalkBridgeVerbose
+
+    smalltalkBridgeVerbose isNil ifTrue:[
+        smalltalkBridgeVerbose := false asValue.
+        smalltalkBridgeVerbose onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ smalltalkBridgeVerbose.
+!
+
+smallteamXMPPPassword
+
+    smallteamXMPPPassword isNil ifTrue:[
+        smallteamXMPPPassword := '' asValue.
+        smallteamXMPPPassword onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ smallteamXMPPPassword.
+!
+
+smallteamXMPPServer
+
+    smallteamXMPPServer isNil ifTrue:[
+        smallteamXMPPServer := '' asValue.
+        smallteamXMPPServer onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ smallteamXMPPServer.
+!
+
+smallteamXMPPUser
+
+    smallteamXMPPUser isNil ifTrue:[
+        smallteamXMPPUser := '' asValue.
+        smallteamXMPPUser onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ smallteamXMPPUser.
+!
+
+windowMigrationAuthenticate
+
+    windowMigrationAuthenticate isNil ifTrue:[
+        windowMigrationAuthenticate := true asValue.
+        windowMigrationAuthenticate onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ windowMigrationAuthenticate.
+!
+
+windowMigrationEnabled
+
+    windowMigrationEnabled isNil ifTrue:[
+        windowMigrationEnabled := true asValue.
+        windowMigrationEnabled onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ windowMigrationEnabled.
+!
+
+windowMigrationPassword
+
+    windowMigrationPassword isNil ifTrue:[
+        windowMigrationPassword := ValueHolder new.
+        windowMigrationPassword onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ windowMigrationPassword.
+!
+
+xmppSmallTeamUserEntry
+
+    xmppSmallTeamUserEntry isNil ifTrue:[
+        xmppSmallTeamUserEntry := nil asValue.
+        xmppSmallTeamUserEntry onChangeSend:#updateModifiedChannel to:self.
+    ].
+    ^ xmppSmallTeamUserEntry.
+! !
+
+!AbstractSettingsApplication::MiscSmalltalkCommunicationSettingsAppl methodsFor:'change & update'!
+
+selectedSmallTeamHostChanged
+    self acceptChannel value:true.
+    self smallTeamHostEntry value:( self selectedSmallTeamHost value).
+
+    "Created: / 12-11-2006 / 19:09:49 / cg"
+!
+
+selectedXMPPSmallTeamUserChanged
+    self acceptChannel value:true.
+    self xmppSmallTeamUserEntry value:( self selectedXMPPSmallTeamUser value).
+! !
+
+!AbstractSettingsApplication::MiscSmalltalkCommunicationSettingsAppl methodsFor:'help'!
+
+helpFilename
+    ^ 'Launcher/communicationsSettings.html'
+! !
+
+!AbstractSettingsApplication::MiscSmalltalkCommunicationSettingsAppl methodsFor:'initialization & release'!
+
+initialize
+    super initialize.
+    self readSettings.
+! !
+
+!AbstractSettingsApplication::MiscSmalltalkCommunicationSettingsAppl methodsFor:'queries'!
+
+hasRemoteBrowsingSupport
+
+    ^ SmalltalkShareServer notNil
+!
+
+hasUnsavedChanges
+    (super hasUnsavedChanges) ifTrue:[
+        ^ true
+    ].
+    (self smallTeamServerAvailable) ifTrue:[
+        self smallTeamServerEnabled value 
+            ~= (SmallTeam isLoaded and:[ SmallTeam serverRunning ]) ifTrue:[ ^ true ].
+        self listOfSmallTeamHosts asSet ~= (SmallTeam connectedHosts asSet) ifTrue:[
+            ^ true
+        ].
+    ].
+    (self smallTeamViaXMPPAvailable) ifTrue:[
+        self smallTeamViaXMPPEnabled value ~= (SmallTeamXMPPRoboter isLoaded 
+                    and:[ SmallTeamXMPPRoboter serverRunning ]) ifTrue:[
+            ^ true
+        ].
+        self listOfXMPPSmallTeamUsers asSet 
+            ~= ((SmallTeamXMPPRoboter listOfXMPPUsers ? #()) asSet) ifTrue:[ ^ true ].
+        self smallteamXMPPServer value ~= (currentUserPrefs smallteamXMPPServer) ifTrue:[
+            ^ true
+        ].
+        self smallteamXMPPUser value ~= (currentUserPrefs smallteamXMPPUser) ifTrue:[
+            ^ true
+        ].
+        self smallteamXMPPPassword value 
+            ~= (currentUserPrefs smallteamXMPPPassword) ifTrue:[ ^ true ].
+    ].
+    (self hasRemoteBrowsingSupport and:[ SmalltalkShareServer isLoaded ]) ifTrue:[
+        self remoteBrowsingEnabled value ~~ SmalltalkShareServer serverRunning ifTrue:[
+            ^ true
+        ].
+    ].
+    self hasWindowMigrationServer ifTrue:[
+        WindowMigrationServer isLoaded ifFalse:[
+            self windowMigrationEnabled value ifTrue:[
+                WindowMigrationServer autoload.
+            ].
+        ].
+        (self windowMigrationEnabled value ~~ WindowMigrationServer serverRunning) ifTrue:[
+            ^ true
+        ].
+        (self windowMigrationPassword value ~= WindowMigrationServer password) ifTrue:[
+            ^ true
+        ].
+        (self windowMigrationAuthenticate value 
+            ~= self windowMigrationPassword value notNil) ifTrue:[ ^ true ].
+    ].
+    ^ false
+
+    "Modified: / 20-09-2007 / 16:04:56 / cg"
+!
+
+hasWindowMigrationServer
+
+    ^ WindowMigrationServer notNil
+! !
+
+!AbstractSettingsApplication::MiscSmalltalkCommunicationSettingsAppl methodsFor:'user actions'!
+
+addSmallTeamHost
+    |host|
+
+    acceptChannel value:true.
+
+    host := self smallTeamHostEntry value.
+
+    host size > 0 ifTrue:[
+        self listOfSmallTeamHosts add:host
+    ].
+
+    "Modified: / 12-11-2006 / 19:06:22 / cg"
+!
+
+removeSmallTeamHost
+    |host|
+
+    acceptChannel value:true.
+
+    host := self selectedSmallTeamHost value.
+
+    host size > 0 ifTrue:[
+        self selectedSmallTeamHost value:nil.
+        self listOfSmallTeamHosts remove:host ifAbsent:[ self window beep ].
+        self smallTeamHostEntry value:''.
+    ].
+
+    "Modified: / 12-11-2006 / 19:15:05 / cg"
+! !
+
 !AbstractSettingsApplication::OsiSettingsAppl class methodsFor:'image specs'!
 
 defaultIcon
@@ -9937,204 +10605,204 @@
 
     ^
      #(FullSpec
-	name: windowSpec
-	window:
+        name: windowSpec
+        window:
        (WindowSpec
-	  label: 'OSI Protocols Settings'
-	  name: 'OSI Protocols Settings'
-	  min: (Point 10 10)
-	  bounds: (Rectangle 0 0 600 550)
-	)
-	component:
+          label: 'OSI Protocols Settings'
+          name: 'OSI Protocols Settings'
+          min: (Point 10 10)
+          bounds: (Rectangle 0 0 600 550)
+        )
+        component:
        (SpecCollection
-	  collection: (
-	   (VerticalPanelViewSpec
-	      name: 'VerticalPanel2'
-	      layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-	      horizontalLayout: fit
-	      verticalLayout: top
-	      horizontalSpace: 3
-	      verticalSpace: 3
-	      component:
-	     (SpecCollection
-		collection: (
-		 (LabelSpec
-		    label: 'ACSE'
-		    name: 'Label1'
-		    translateLabel: true
-		    extent: (Point 600 22)
-		  )
-		 (ViewSpec
-		    name: 'Box1a'
-		    component:
-		   (SpecCollection
-		      collection: (
-		       (CheckBoxSpec
-			  label: 'Log Errors'
-			  name: 'CheckBox1'
-			  layout: (LayoutFrame 25 0 0 0 -2 0.33 22 0)
-			  enableChannel: osiACSEPresent
-			  model: osiACSEErrorLogging
-			  translateLabel: true
-			)
-		       )
-
-		    )
-		    extent: (Point 600 27)
-		  )
-		 (ViewSpec
-		    name: 'Box1b'
-		    component:
-		   (SpecCollection
-		      collection: (
-		       (CheckBoxSpec
-			  label: 'Log Connections'
-			  name: 'CheckBox10'
-			  layout: (LayoutFrame 25 0 0 0 -2 0.66 22 0)
-			  enableChannel: osiACSEPresent
-			  model: osiACSEConnectionLogging
-			  translateLabel: true
-			)
-		       )
-
-		    )
-		    extent: (Point 600 26)
-		  )
-		 (ViewSpec
-		    name: 'Box1c'
-		    component:
-		   (SpecCollection
-		      collection: (
-		       (CheckBoxSpec
-			  label: 'Log Data Transfer'
-			  name: 'CheckBox14'
-			  layout: (LayoutFrame 25 0 0 0 -2 1 22 0)
-			  enableChannel: osiACSEPresent
-			  model: osiACSEDataLogging
-			  translateLabel: true
-			)
-		       )
-
-		    )
-		    extent: (Point 600 26)
-		  )
-		 (DividerSpec
-		    name: 'Separator1'
-		    extent: (Point 600 4)
-		  )
-		 (LabelSpec
-		    label: 'ROSE'
-		    name: 'Label2'
-		    translateLabel: true
-		    extent: (Point 600 22)
-		  )
-		 (ViewSpec
-		    name: 'Box4a'
-		    component:
-		   (SpecCollection
-		      collection: (
-		       (CheckBoxSpec
-			  label: 'Log Errors'
-			  name: 'CheckBox4'
-			  layout: (LayoutFrame 25 0 0 0 -2 0.33 22 0)
-			  enableChannel: osiROSEPresent
-			  model: osiROSEErrorLogging
-			  translateLabel: true
-			)
-		       )
-
-		    )
-		    extent: (Point 600 25)
-		  )
-		 (ViewSpec
-		    name: 'Box4b'
-		    component:
-		   (SpecCollection
-		      collection: (
-		       (CheckBoxSpec
-			  label: 'Log Invoactions'
-			  name: 'CheckBox16'
-			  layout: (LayoutFrame 25 0 0 0 -2 0.66 22 0)
-			  enableChannel: osiROSEPresent
-			  model: osiROSEInvokationLogging
-			  translateLabel: true
-			)
-		       )
-
-		    )
-		    extent: (Point 600 25)
-		  )
-		 (ViewSpec
-		    name: 'Box4c'
-		    component:
-		   (SpecCollection
-		      collection: (
-		       (CheckBoxSpec
-			  label: 'Log Responses'
-			  name: 'CheckBox20'
-			  layout: (LayoutFrame 25 0 0 0 -2 1 22 0)
-			  enableChannel: osiROSEPresent
-			  model: osiROSEResponseLogging
-			  translateLabel: true
-			)
-		       )
-
-		    )
-		    extent: (Point 600 25)
-		  )
-		 (DividerSpec
-		    name: 'Separator2'
-		    extent: (Point 600 3)
-		  )
-		 (LabelSpec
-		    label: 'CMISE'
-		    name: 'Label3'
-		    translateLabel: true
-		    extent: (Point 600 22)
-		  )
-		 (ViewSpec
-		    name: 'Box7a'
-		    component:
-		   (SpecCollection
-		      collection: (
-		       (CheckBoxSpec
-			  label: 'Log Errors'
-			  name: 'CheckBox7'
-			  layout: (LayoutFrame 25 0 0 0 -2 0.33 22 0)
-			  enableChannel: osiCMISEPresent
-			  model: osiCMISEErrorLogging
-			  translateLabel: true
-			)
-		       )
-
-		    )
-		    extent: (Point 600 22)
-		  )
-		 (ViewSpec
-		    name: 'Box7b'
-		    component:
-		   (SpecCollection
-		      collection: (
-		       (CheckBoxSpec
-			  label: 'Log Messages'
-			  name: 'CheckBox22'
-			  layout: (LayoutFrame 25 0 0 0 -2 0.66 22 0)
-			  enableChannel: osiCMISEPresent
-			  model: osiCMISEMessageLogging
-			  translateLabel: true
-			)
-		       )
-
-		    )
-		    extent: (Point 600 22)
-		  )
-		 )
-
-	      )
-	    )
-	   )
-
-	)
+          collection: (
+           (VerticalPanelViewSpec
+              name: 'VerticalPanel2'
+              layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+              horizontalLayout: fit
+              verticalLayout: top
+              horizontalSpace: 3
+              verticalSpace: 3
+              component:
+             (SpecCollection
+                collection: (
+                 (LabelSpec
+                    label: 'ACSE'
+                    name: 'Label1'
+                    translateLabel: true
+                    extent: (Point 600 22)
+                  )
+                 (ViewSpec
+                    name: 'Box1a'
+                    component:
+                   (SpecCollection
+                      collection: (
+                       (CheckBoxSpec
+                          label: 'Log Errors'
+                          name: 'CheckBox1'
+                          layout: (LayoutFrame 25 0 0 0 -2 0.33 22 0)
+                          enableChannel: osiACSEPresent
+                          model: osiACSEErrorLogging
+                          translateLabel: true
+                        )
+                       )
+
+                    )
+                    extent: (Point 600 27)
+                  )
+                 (ViewSpec
+                    name: 'Box1b'
+                    component:
+                   (SpecCollection
+                      collection: (
+                       (CheckBoxSpec
+                          label: 'Log Connections'
+                          name: 'CheckBox10'
+                          layout: (LayoutFrame 25 0 0 0 -2 0.66 22 0)
+                          enableChannel: osiACSEPresent
+                          model: osiACSEConnectionLogging
+                          translateLabel: true
+                        )
+                       )
+
+                    )
+                    extent: (Point 600 26)
+                  )
+                 (ViewSpec
+                    name: 'Box1c'
+                    component:
+                   (SpecCollection
+                      collection: (
+                       (CheckBoxSpec
+                          label: 'Log Data Transfer'
+                          name: 'CheckBox14'
+                          layout: (LayoutFrame 25 0 0 0 -2 1 22 0)
+                          enableChannel: osiACSEPresent
+                          model: osiACSEDataLogging
+                          translateLabel: true
+                        )
+                       )
+
+                    )
+                    extent: (Point 600 26)
+                  )
+                 (DividerSpec
+                    name: 'Separator1'
+                    extent: (Point 600 4)
+                  )
+                 (LabelSpec
+                    label: 'ROSE'
+                    name: 'Label2'
+                    translateLabel: true
+                    extent: (Point 600 22)
+                  )
+                 (ViewSpec
+                    name: 'Box4a'
+                    component:
+                   (SpecCollection
+                      collection: (
+                       (CheckBoxSpec
+                          label: 'Log Errors'
+                          name: 'CheckBox4'
+                          layout: (LayoutFrame 25 0 0 0 -2 0.33 22 0)
+                          enableChannel: osiROSEPresent
+                          model: osiROSEErrorLogging
+                          translateLabel: true
+                        )
+                       )
+
+                    )
+                    extent: (Point 600 25)
+                  )
+                 (ViewSpec
+                    name: 'Box4b'
+                    component:
+                   (SpecCollection
+                      collection: (
+                       (CheckBoxSpec
+                          label: 'Log Invoactions'
+                          name: 'CheckBox16'
+                          layout: (LayoutFrame 25 0 0 0 -2 0.66 22 0)
+                          enableChannel: osiROSEPresent
+                          model: osiROSEInvokationLogging
+                          translateLabel: true
+                        )
+                       )
+
+                    )
+                    extent: (Point 600 25)
+                  )
+                 (ViewSpec
+                    name: 'Box4c'
+                    component:
+                   (SpecCollection
+                      collection: (
+                       (CheckBoxSpec
+                          label: 'Log Responses'
+                          name: 'CheckBox20'
+                          layout: (LayoutFrame 25 0 0 0 -2 1 22 0)
+                          enableChannel: osiROSEPresent
+                          model: osiROSEResponseLogging
+                          translateLabel: true
+                        )
+                       )
+
+                    )
+                    extent: (Point 600 25)
+                  )
+                 (DividerSpec
+                    name: 'Separator2'
+                    extent: (Point 600 3)
+                  )
+                 (LabelSpec
+                    label: 'CMISE'
+                    name: 'Label3'
+                    translateLabel: true
+                    extent: (Point 600 22)
+                  )
+                 (ViewSpec
+                    name: 'Box7a'
+                    component:
+                   (SpecCollection
+                      collection: (
+                       (CheckBoxSpec
+                          label: 'Log Errors'
+                          name: 'CheckBox7'
+                          layout: (LayoutFrame 25 0 0 0 -2 0.33 22 0)
+                          enableChannel: osiCMISEPresent
+                          model: osiCMISEErrorLogging
+                          translateLabel: true
+                        )
+                       )
+
+                    )
+                    extent: (Point 600 22)
+                  )
+                 (ViewSpec
+                    name: 'Box7b'
+                    component:
+                   (SpecCollection
+                      collection: (
+                       (CheckBoxSpec
+                          label: 'Log Messages'
+                          name: 'CheckBox22'
+                          layout: (LayoutFrame 25 0 0 0 -2 0.66 22 0)
+                          enableChannel: osiCMISEPresent
+                          model: osiCMISEMessageLogging
+                          translateLabel: true
+                        )
+                       )
+
+                    )
+                    extent: (Point 600 22)
+                  )
+                 )
+
+              )
+            )
+           )
+
+        )
       )
 ! !
 
@@ -10145,36 +10813,36 @@
     self osiROSEPresent value:(OSI::ROSE notNil and:[OSI::ROSE isLoaded]).
     self osiCMISEPresent value:(OSI::CMISE notNil and:[OSI::CMISE isLoaded]).
     self osiACSEPresent value ifTrue:[
-	self osiACSEErrorLogging value:OSI::ACSE errorLogging.
-	self osiACSEConnectionLogging value:OSI::ACSE connectionLogging.
-	self osiACSEDataLogging value:OSI::ACSE dataLogging
+        self osiACSEErrorLogging value:OSI::ACSE errorLogging.
+        self osiACSEConnectionLogging value:OSI::ACSE connectionLogging.
+        self osiACSEDataLogging value:OSI::ACSE dataLogging
     ].
     self osiROSEPresent value ifTrue:[
-	self osiROSEErrorLogging value:OSI::ROSE errorLogging.
-	self osiROSEInvokationLogging value:OSI::ROSE invocationLogging.
-	self osiROSEResponseLogging value:OSI::ROSE responseLogging
+        self osiROSEErrorLogging value:OSI::ROSE errorLogging.
+        self osiROSEInvokationLogging value:OSI::ROSE invocationLogging.
+        self osiROSEResponseLogging value:OSI::ROSE responseLogging
     ].
     self osiCMISEPresent value ifTrue:[
-	self osiCMISEErrorLogging value:OSI::CMISE errorLogging.
-	self osiCMISEMessageLogging value:OSI::CMISE messageLogging
+        self osiCMISEErrorLogging value:OSI::CMISE errorLogging.
+        self osiCMISEMessageLogging value:OSI::CMISE messageLogging
     ].
 !
 
 basicSaveSettings
 
     self osiACSEPresent value ifTrue:[
-	OSI::ACSE errorLogging:self osiACSEErrorLogging value.
-	OSI::ACSE connectionLogging:self osiACSEConnectionLogging value.
-	OSI::ACSE dataLogging:self osiACSEDataLogging value.
+        OSI::ACSE errorLogging:self osiACSEErrorLogging value.
+        OSI::ACSE connectionLogging:self osiACSEConnectionLogging value.
+        OSI::ACSE dataLogging:self osiACSEDataLogging value.
     ].
     self osiROSEPresent value ifTrue:[
-	OSI::ROSE errorLogging:self osiROSEErrorLogging value.
-	OSI::ROSE invocationLogging:self osiROSEInvokationLogging value.
-	OSI::ROSE responseLogging:self osiROSEResponseLogging value.
+        OSI::ROSE errorLogging:self osiROSEErrorLogging value.
+        OSI::ROSE invocationLogging:self osiROSEInvokationLogging value.
+        OSI::ROSE responseLogging:self osiROSEResponseLogging value.
     ].
     self osiCMISEPresent value ifTrue:[
-	OSI::CMISE errorLogging:self osiCMISEErrorLogging value.
-	OSI::CMISE messageLogging:self osiCMISEMessageLogging value.
+        OSI::CMISE errorLogging:self osiCMISEErrorLogging value.
+        OSI::CMISE messageLogging:self osiCMISEMessageLogging value.
     ].
 ! !
 
@@ -10182,7 +10850,7 @@
 
 osiACSEConnectionLogging
     osiACSEConnectionLogging isNil ifTrue:[
-	osiACSEConnectionLogging := true asValue.
+        osiACSEConnectionLogging := true asValue.
     ].
     ^ osiACSEConnectionLogging.
 !
@@ -10190,56 +10858,56 @@
 osiACSEDataLogging
 
     osiACSEDataLogging isNil ifTrue:[
-	osiACSEDataLogging := true asValue.
+        osiACSEDataLogging := true asValue.
     ].
     ^ osiACSEDataLogging.
 !
 
 osiACSEErrorLogging
     osiACSEErrorLogging isNil ifTrue:[
-	osiACSEErrorLogging := true asValue.
+        osiACSEErrorLogging := true asValue.
     ].
     ^ osiACSEErrorLogging.
 !
 
 osiACSEPresent
     osiACSEPresent isNil ifTrue:[
-	osiACSEPresent := true asValue.
+        osiACSEPresent := true asValue.
     ].
     ^ osiACSEPresent.
 !
 
 osiCMISEErrorLogging
     osiCMISEErrorLogging isNil ifTrue:[
-	osiCMISEErrorLogging := true asValue.
+        osiCMISEErrorLogging := true asValue.
     ].
     ^ osiCMISEErrorLogging.
 !
 
 osiCMISEMessageLogging
     osiCMISEMessageLogging isNil ifTrue:[
-	osiCMISEMessageLogging := true asValue.
+        osiCMISEMessageLogging := true asValue.
     ].
     ^ osiCMISEMessageLogging.
 !
 
 osiCMISEPresent
     osiCMISEPresent isNil ifTrue:[
-	osiCMISEPresent := true asValue.
+        osiCMISEPresent := true asValue.
     ].
     ^ osiCMISEPresent.
 !
 
 osiROSEErrorLogging
     osiROSEErrorLogging isNil ifTrue:[
-	osiROSEErrorLogging := true asValue.
+        osiROSEErrorLogging := true asValue.
     ].
     ^ osiROSEErrorLogging.
 !
 
 osiROSEInvokationLogging
     osiROSEInvokationLogging isNil ifTrue:[
-	osiROSEInvokationLogging := true asValue.
+        osiROSEInvokationLogging := true asValue.
     ].
     ^ osiROSEInvokationLogging.
 !
@@ -10247,7 +10915,7 @@
 osiROSEPresent
 
     osiROSEPresent isNil ifTrue:[
-	osiROSEPresent := true asValue.
+        osiROSEPresent := true asValue.
     ].
     ^ osiROSEPresent.
 !
@@ -10255,7 +10923,7 @@
 osiROSEResponseLogging
 
     osiROSEResponseLogging isNil ifTrue:[
-	osiROSEResponseLogging := true asValue.
+        osiROSEResponseLogging := true asValue.
     ].
     ^ osiROSEResponseLogging.
 ! !
@@ -10271,17 +10939,17 @@
 hasUnsavedChanges
 
     ^ ((
-	(self osiACSEPresent value and:[
-	self osiACSEErrorLogging value ~= OSI::ACSE errorLogging or:[
-	self osiACSEConnectionLogging value ~= OSI::ACSE connectionLogging or:[
-	self osiACSEDataLogging value ~= OSI::ACSE dataLogging]]]) or:[
-	self osiROSEPresent value and:[
-	    self osiROSEErrorLogging value ~= OSI::ROSE errorLogging or:[
-	    self osiROSEInvokationLogging value ~= OSI::ROSE invocationLogging or:[
-	    self osiROSEResponseLogging value ~= OSI::ROSE responseLogging]]]]) or:[
-	(self osiCMISEPresent value) and:[
-	self osiCMISEErrorLogging value ~= OSI::CMISE errorLogging or:[
-	self osiCMISEMessageLogging value ~= OSI::CMISE messageLogging]]])
+        (self osiACSEPresent value and:[
+        self osiACSEErrorLogging value ~= OSI::ACSE errorLogging or:[
+        self osiACSEConnectionLogging value ~= OSI::ACSE connectionLogging or:[
+        self osiACSEDataLogging value ~= OSI::ACSE dataLogging]]]) or:[
+        self osiROSEPresent value and:[
+            self osiROSEErrorLogging value ~= OSI::ROSE errorLogging or:[
+            self osiROSEInvokationLogging value ~= OSI::ROSE invocationLogging or:[
+            self osiROSEResponseLogging value ~= OSI::ROSE responseLogging]]]]) or:[
+        (self osiCMISEPresent value) and:[
+        self osiCMISEErrorLogging value ~= OSI::CMISE errorLogging or:[
+        self osiCMISEMessageLogging value ~= OSI::CMISE messageLogging]]])
 ! !
 
 !AbstractSettingsApplication::PrinterSettingsAppl class methodsFor:'image specs'!
@@ -10314,303 +10982,303 @@
        name: windowSpec
        window:
       (WindowSpec
-	 label: 'Printer Settings'
-	 name: 'Printer Settings'
-	 flags: 1
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 614 458)
+         label: 'Printer Settings'
+         name: 'Printer Settings'
+         flags: 1
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 614 458)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (VerticalPanelViewSpec
-	     name: 'VerticalPanel1'
-	     layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-	     horizontalLayout: fit
-	     verticalLayout: top
-	     horizontalSpace: 3
-	     verticalSpace: 3
-	     component:
-	    (SpecCollection
-	       collection: (
-		(ViewSpec
-		   name: 'PrinterSelectBox'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Printer Type:'
-			 name: 'PrinterTypeLabel'
-			 layout: (LayoutFrame 0 0 5 0 181 0 35 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (ComboListSpec
-			 name: 'PrinterTypeComboList'
-			 layout: (LayoutFrame 183 0 5 0 -5 1 35 0)
-			 model: printerTypeSelection
-			 comboList: printerType
-			 useIndex: true
-		       )
-		      (LabelSpec
-			 label: 'Print Command:'
-			 name: 'PrinterCommandLabel'
-			 layout: (LayoutFrame 0 0 38 0 181 0 68 0)
-			 visibilityChannel: printerIsDrivenByCommand
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (ComboBoxSpec
-			 name: 'CommandComboBox'
-			 layout: (LayoutFrame 183 0 38 0 -5 1 68 0)
-			 visibilityChannel: printerIsDrivenByCommand
-			 enableChannel: printCommandEnabled
-			 model: printCommand
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: false
-			 comboList: printCommandList
-			 useIndex: false
-		       )
-		      (LabelSpec
-			 label: 'Print to File:'
-			 name: 'PrinterFileLabel'
-			 layout: (LayoutFrame 0 0 71 0 181 0 101 0)
-			 visibilityChannel: printerSupportsPrintingToFile
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (FilenameInputFieldSpec
-			 name: 'PrinterFileEntryField'
-			 layout: (LayoutFrame 183 0 71 0 -5 1 101 0)
-			 visibilityChannel: printerSupportsPrintingToFile
-			 model: printFilename
-			 immediateAccept: true
-			 acceptOnLeave: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: false
-		       )
-		      )
-
-		   )
-		   extent: (Point 614 108)
-		 )
-		(ViewSpec
-		   name: 'FormatBox'
-		   visibilityChannel: supportsPageFormatSetting
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (DividerSpec
-			 name: 'Separator1'
-			 layout: (LayoutFrame 0 0 4 0 0 1 7 0)
-		       )
-		      (LabelSpec
-			 label: 'Page Format:'
-			 name: 'PageFormatLabel'
-			 layout: (LayoutFrame 0 0 11 0 181 0 41 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (PopUpListSpec
-			 label: 'PopUp List'
-			 name: 'PageFormatPopUpList'
-			 layout: (LayoutFrame 183 0 11 0 333 0 41 0)
-			 tabable: true
-			 model: pageFormat
-			 enableChannel: enableFormat
-			 menu: pageFormatList
-		       )
-		      (CheckBoxSpec
-			 label: 'Landscape'
-			 name: 'LandscapeCheckBox'
-			 layout: (LayoutFrame 380 0 11 0 -5 1 41 0)
-			 enableChannel: enablelandscape
-			 model: landscape
-			 translateLabel: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 614 43)
-		 )
-		(ViewSpec
-		   name: 'MarginBox'
-		   visibilityChannel: supportsMarginSetting
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (DividerSpec
-			 name: 'Separator5'
-			 layout: (LayoutFrame 0 0 0 0 0 1 3 0)
-		       )
-		      (VerticalPanelViewSpec
-			 name: 'VerticalPanel2'
-			 layout: (LayoutFrame 0 0.0 4 0.0 0 1.0 4 1.0)
-			 horizontalLayout: fit
-			 verticalLayout: top
-			 horizontalSpace: 3
-			 verticalSpace: 3
-			 component:
-			(SpecCollection
-			   collection: (
-			    (ViewSpec
-			       name: 'Box1'
-			       component:
-			      (SpecCollection
-				 collection: (
-				  (LabelSpec
-				     label: 'Top Margin:'
-				     name: 'TopMarginLabel'
-				     layout: (LayoutFrame 0 0 0 0 181 0 30 0)
-				     translateLabel: true
-				     adjust: right
-				   )
-				  (InputFieldSpec
-				     name: 'TopMarginEntryField'
-				     layout: (LayoutFrame 183 0 0 0 283 0 30 0)
-				     enableChannel: enableMargins
-				     model: topMargin
-				     type: numberOrNil
-				     acceptOnReturn: true
-				     acceptOnTab: true
-				     acceptOnLostFocus: true
-				     acceptOnPointerLeave: true
-				   )
-				  (PopUpListSpec
-				     label: 'PopUp List'
-				     name: 'PopUpList2'
-				     layout: (LayoutFrame -155 1 0 0 -5 1 30 0)
-				     tabable: true
-				     model: selectedUnit
-				     menu: unitList
-				     useIndex: true
-				   )
-				  )
-
-			       )
-			       extent: (Point 614 30)
-			     )
-			    (ViewSpec
-			       name: 'Box2'
-			       component:
-			      (SpecCollection
-				 collection: (
-				  (LabelSpec
-				     label: 'Left Margin:'
-				     name: 'LeftMarginLabel'
-				     layout: (LayoutFrame 0 0 0 0 181 0 30 0)
-				     translateLabel: true
-				     adjust: right
-				   )
-				  (InputFieldSpec
-				     name: 'LeftMarginEntryField'
-				     layout: (LayoutFrame 183 0 0 0 283 0 30 0)
-				     enableChannel: enableMargins
-				     model: leftMargin
-				     type: numberOrNil
-				     acceptOnReturn: true
-				     acceptOnTab: true
-				     acceptOnLostFocus: true
-				     acceptOnPointerLeave: true
-				   )
-				  )
-
-			       )
-			       extent: (Point 614 30)
-			     )
-			    (ViewSpec
-			       name: 'Box3'
-			       component:
-			      (SpecCollection
-				 collection: (
-				  (LabelSpec
-				     label: 'Right Margin:'
-				     name: 'RightMarginLabel'
-				     layout: (LayoutFrame 0 0 0 0 181 0 30 0)
-				     translateLabel: true
-				     adjust: right
-				   )
-				  (InputFieldSpec
-				     name: 'RightMarginEntryField'
-				     layout: (LayoutFrame 183 0 0 0 283 0 30 0)
-				     enableChannel: enableMargins
-				     model: rightMargin
-				     type: numberOrNil
-				     acceptOnReturn: true
-				     acceptOnTab: true
-				     acceptOnLostFocus: true
-				     acceptOnPointerLeave: true
-				   )
-				  )
-
-			       )
-			       extent: (Point 614 30)
-			     )
-			    (ViewSpec
-			       name: 'Box4'
-			       component:
-			      (SpecCollection
-				 collection: (
-				  (LabelSpec
-				     label: 'Bottom Margin:'
-				     name: 'BottomMarginLabel'
-				     layout: (LayoutFrame 0 0 0 0 181 0 30 0)
-				     translateLabel: true
-				     adjust: right
-				   )
-				  (InputFieldSpec
-				     name: 'BottomMarginEntryField'
-				     layout: (LayoutFrame 183 0 0 0 283 0 30 0)
-				     enableChannel: enableMargins
-				     model: bottomMargin
-				     type: numberOrNil
-				     acceptOnReturn: true
-				     acceptOnTab: true
-				     acceptOnLostFocus: true
-				     acceptOnPointerLeave: true
-				   )
-				  )
-
-			       )
-			       extent: (Point 614 30)
-			     )
-			    )
-
-			 )
-		       )
-		      )
-
-		   )
-		   extent: (Point 614 143)
-		 )
-		(ViewSpec
-		   name: 'ColorBox'
-		   visibilityChannel: supportsColorSetting
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (DividerSpec
-			 name: 'Separator6'
-			 layout: (LayoutFrame 0 0 0 0 0 1 3 0)
-		       )
-		      (CheckBoxSpec
-			 label: 'Color Printer'
-			 name: 'ColorPrinterCheckBox'
-			 layout: (LayoutFrame 183 0 4 0 782 0 34 0)
-			 enableChannel: enableColorBox
-			 model: supportsColor
-			 translateLabel: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 614 34)
-		 )
-		)
-
-	     )
-	   )
-	  )
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel1'
+             layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+             horizontalLayout: fit
+             verticalLayout: top
+             horizontalSpace: 3
+             verticalSpace: 3
+             component:
+            (SpecCollection
+               collection: (
+                (ViewSpec
+                   name: 'PrinterSelectBox'
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Printer Type:'
+                         name: 'PrinterTypeLabel'
+                         layout: (LayoutFrame 0 0 5 0 181 0 35 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (ComboListSpec
+                         name: 'PrinterTypeComboList'
+                         layout: (LayoutFrame 183 0 5 0 -5 1 35 0)
+                         model: printerTypeSelection
+                         comboList: printerType
+                         useIndex: true
+                       )
+                      (LabelSpec
+                         label: 'Print Command:'
+                         name: 'PrinterCommandLabel'
+                         layout: (LayoutFrame 0 0 38 0 181 0 68 0)
+                         visibilityChannel: printerIsDrivenByCommand
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (ComboBoxSpec
+                         name: 'CommandComboBox'
+                         layout: (LayoutFrame 183 0 38 0 -5 1 68 0)
+                         visibilityChannel: printerIsDrivenByCommand
+                         enableChannel: printCommandEnabled
+                         model: printCommand
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: false
+                         comboList: printCommandList
+                         useIndex: false
+                       )
+                      (LabelSpec
+                         label: 'Print to File:'
+                         name: 'PrinterFileLabel'
+                         layout: (LayoutFrame 0 0 71 0 181 0 101 0)
+                         visibilityChannel: printerSupportsPrintingToFile
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (FilenameInputFieldSpec
+                         name: 'PrinterFileEntryField'
+                         layout: (LayoutFrame 183 0 71 0 -5 1 101 0)
+                         visibilityChannel: printerSupportsPrintingToFile
+                         model: printFilename
+                         immediateAccept: true
+                         acceptOnLeave: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: false
+                       )
+                      )
+
+                   )
+                   extent: (Point 614 108)
+                 )
+                (ViewSpec
+                   name: 'FormatBox'
+                   visibilityChannel: supportsPageFormatSetting
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (DividerSpec
+                         name: 'Separator1'
+                         layout: (LayoutFrame 0 0 4 0 0 1 7 0)
+                       )
+                      (LabelSpec
+                         label: 'Page Format:'
+                         name: 'PageFormatLabel'
+                         layout: (LayoutFrame 0 0 11 0 181 0 41 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (PopUpListSpec
+                         label: 'PopUp List'
+                         name: 'PageFormatPopUpList'
+                         layout: (LayoutFrame 183 0 11 0 333 0 41 0)
+                         tabable: true
+                         model: pageFormat
+                         enableChannel: enableFormat
+                         menu: pageFormatList
+                       )
+                      (CheckBoxSpec
+                         label: 'Landscape'
+                         name: 'LandscapeCheckBox'
+                         layout: (LayoutFrame 380 0 11 0 -5 1 41 0)
+                         enableChannel: enablelandscape
+                         model: landscape
+                         translateLabel: true
+                       )
+                      )
+
+                   )
+                   extent: (Point 614 43)
+                 )
+                (ViewSpec
+                   name: 'MarginBox'
+                   visibilityChannel: supportsMarginSetting
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (DividerSpec
+                         name: 'Separator5'
+                         layout: (LayoutFrame 0 0 0 0 0 1 3 0)
+                       )
+                      (VerticalPanelViewSpec
+                         name: 'VerticalPanel2'
+                         layout: (LayoutFrame 0 0.0 4 0.0 0 1.0 4 1.0)
+                         horizontalLayout: fit
+                         verticalLayout: top
+                         horizontalSpace: 3
+                         verticalSpace: 3
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (ViewSpec
+                               name: 'Box1'
+                               component:
+                              (SpecCollection
+                                 collection: (
+                                  (LabelSpec
+                                     label: 'Top Margin:'
+                                     name: 'TopMarginLabel'
+                                     layout: (LayoutFrame 0 0 0 0 181 0 30 0)
+                                     translateLabel: true
+                                     adjust: right
+                                   )
+                                  (InputFieldSpec
+                                     name: 'TopMarginEntryField'
+                                     layout: (LayoutFrame 183 0 0 0 283 0 30 0)
+                                     enableChannel: enableMargins
+                                     model: topMargin
+                                     type: numberOrNil
+                                     acceptOnReturn: true
+                                     acceptOnTab: true
+                                     acceptOnLostFocus: true
+                                     acceptOnPointerLeave: true
+                                   )
+                                  (PopUpListSpec
+                                     label: 'PopUp List'
+                                     name: 'PopUpList2'
+                                     layout: (LayoutFrame -155 1 0 0 -5 1 30 0)
+                                     tabable: true
+                                     model: selectedUnit
+                                     menu: unitList
+                                     useIndex: true
+                                   )
+                                  )
+
+                               )
+                               extent: (Point 614 30)
+                             )
+                            (ViewSpec
+                               name: 'Box2'
+                               component:
+                              (SpecCollection
+                                 collection: (
+                                  (LabelSpec
+                                     label: 'Left Margin:'
+                                     name: 'LeftMarginLabel'
+                                     layout: (LayoutFrame 0 0 0 0 181 0 30 0)
+                                     translateLabel: true
+                                     adjust: right
+                                   )
+                                  (InputFieldSpec
+                                     name: 'LeftMarginEntryField'
+                                     layout: (LayoutFrame 183 0 0 0 283 0 30 0)
+                                     enableChannel: enableMargins
+                                     model: leftMargin
+                                     type: numberOrNil
+                                     acceptOnReturn: true
+                                     acceptOnTab: true
+                                     acceptOnLostFocus: true
+                                     acceptOnPointerLeave: true
+                                   )
+                                  )
+
+                               )
+                               extent: (Point 614 30)
+                             )
+                            (ViewSpec
+                               name: 'Box3'
+                               component:
+                              (SpecCollection
+                                 collection: (
+                                  (LabelSpec
+                                     label: 'Right Margin:'
+                                     name: 'RightMarginLabel'
+                                     layout: (LayoutFrame 0 0 0 0 181 0 30 0)
+                                     translateLabel: true
+                                     adjust: right
+                                   )
+                                  (InputFieldSpec
+                                     name: 'RightMarginEntryField'
+                                     layout: (LayoutFrame 183 0 0 0 283 0 30 0)
+                                     enableChannel: enableMargins
+                                     model: rightMargin
+                                     type: numberOrNil
+                                     acceptOnReturn: true
+                                     acceptOnTab: true
+                                     acceptOnLostFocus: true
+                                     acceptOnPointerLeave: true
+                                   )
+                                  )
+
+                               )
+                               extent: (Point 614 30)
+                             )
+                            (ViewSpec
+                               name: 'Box4'
+                               component:
+                              (SpecCollection
+                                 collection: (
+                                  (LabelSpec
+                                     label: 'Bottom Margin:'
+                                     name: 'BottomMarginLabel'
+                                     layout: (LayoutFrame 0 0 0 0 181 0 30 0)
+                                     translateLabel: true
+                                     adjust: right
+                                   )
+                                  (InputFieldSpec
+                                     name: 'BottomMarginEntryField'
+                                     layout: (LayoutFrame 183 0 0 0 283 0 30 0)
+                                     enableChannel: enableMargins
+                                     model: bottomMargin
+                                     type: numberOrNil
+                                     acceptOnReturn: true
+                                     acceptOnTab: true
+                                     acceptOnLostFocus: true
+                                     acceptOnPointerLeave: true
+                                   )
+                                  )
+
+                               )
+                               extent: (Point 614 30)
+                             )
+                            )
+
+                         )
+                       )
+                      )
+
+                   )
+                   extent: (Point 614 143)
+                 )
+                (ViewSpec
+                   name: 'ColorBox'
+                   visibilityChannel: supportsColorSetting
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (DividerSpec
+                         name: 'Separator6'
+                         layout: (LayoutFrame 0 0 0 0 0 1 3 0)
+                       )
+                      (CheckBoxSpec
+                         label: 'Color Printer'
+                         name: 'ColorPrinterCheckBox'
+                         layout: (LayoutFrame 183 0 4 0 782 0 34 0)
+                         enableChannel: enableColorBox
+                         model: supportsColor
+                         translateLabel: true
+                       )
+                      )
+
+                   )
+                   extent: (Point 614 34)
+                 )
+                )
+
+             )
+           )
+          )
 
        )
      )
@@ -10620,19 +11288,19 @@
 
 basicReadSettings
     Printer notNil ifTrue:[
-	self
-	    readAspects:
-		#(
-		    topMargin
-		    bottomMargin
-		    leftMargin
-		    rightMargin
-		    landscape
-		    printCommand
-		    printFilename
-		    supportsColor
-		)
-	    from:Printer.
+        self
+            readAspects:
+                #(
+                    topMargin
+                    bottomMargin
+                    leftMargin
+                    rightMargin
+                    landscape
+                    printCommand
+                    printFilename
+                    supportsColor
+                )
+            from:Printer.
     ].
 
     self printerTypeSelection value:(self possiblePrinters identityIndexOf:Printer ifAbsent:1).
@@ -10650,23 +11318,23 @@
     Printer printFilename:(printFilename value isEmptyOrNil ifTrue:[nil] ifFalse:[printFilename value]).
 
     Printer supportsPageSizes ifTrue:[
-	Printer pageFormat:(self pageFormat value).
-	Printer landscape:(self landscape value).
+        Printer pageFormat:(self pageFormat value).
+        Printer landscape:(self landscape value).
     ].
     Printer supportsMargins ifTrue:[
-	| unit |
-	self selectedUnit value == 2 ifTrue:[
-	    unit := #mm
-	] ifFalse:[
-	    unit := #inch
-	].
-	Printer topMargin:(UnitConverter convert:(self topMargin value) from:unit to:#inch).
-	Printer leftMargin:(UnitConverter convert:(self leftMargin value) from:unit to:#inch).
-	Printer rightMargin:(UnitConverter convert:(self rightMargin value) from:unit to:#inch).
-	Printer bottomMargin:(UnitConverter convert:(self bottomMargin value) from:unit to:#inch).
+        | unit |
+        self selectedUnit value == 2 ifTrue:[
+            unit := #mm
+        ] ifFalse:[
+            unit := #inch
+        ].
+        Printer topMargin:(UnitConverter convert:(self topMargin value) from:unit to:#inch).
+        Printer leftMargin:(UnitConverter convert:(self leftMargin value) from:unit to:#inch).
+        Printer rightMargin:(UnitConverter convert:(self rightMargin value) from:unit to:#inch).
+        Printer bottomMargin:(UnitConverter convert:(self bottomMargin value) from:unit to:#inch).
     ].
     Printer supportsPostscript ifTrue:[
-	Printer supportsColor:self supportsColor value.
+        Printer supportsColor:self supportsColor value.
     ].
 ! !
 
@@ -10675,8 +11343,8 @@
 bottomMargin
 
     bottomMargin isNil ifTrue:[
-	bottomMargin := Printer bottomMargin asValue.
-	bottomMargin onChangeSend:#updateModifiedChannel to:self
+        bottomMargin := Printer bottomMargin asValue.
+        bottomMargin onChangeSend:#updateModifiedChannel to:self
     ].
     ^ bottomMargin.
 !
@@ -10684,7 +11352,7 @@
 enableColorBox
 
     enableColorBox isNil ifTrue:[
-	enableColorBox := true asValue.
+        enableColorBox := true asValue.
     ].
     ^ enableColorBox.
 !
@@ -10692,7 +11360,7 @@
 enableFormat
 
     enableFormat isNil ifTrue:[
-	enableFormat := true asValue.
+        enableFormat := true asValue.
     ].
     ^ enableFormat.
 !
@@ -10700,7 +11368,7 @@
 enableMargins
 
     enableMargins isNil ifTrue:[
-	enableMargins := true asValue.
+        enableMargins := true asValue.
     ].
     ^ enableMargins.
 !
@@ -10708,7 +11376,7 @@
 enablelandscape
 
     enablelandscape isNil ifTrue:[
-	enablelandscape := true asValue.
+        enablelandscape := true asValue.
     ].
     ^ enablelandscape.
 !
@@ -10716,8 +11384,8 @@
 landscape
 
     landscape isNil ifTrue:[
-	landscape := (Printer isNil ifTrue:[ false ] ifFalse:[ Printer landscape])  asValue.
-	landscape onChangeSend:#updateModifiedChannel to:self
+        landscape := (Printer isNil ifTrue:[ false ] ifFalse:[ Printer landscape])  asValue.
+        landscape onChangeSend:#updateModifiedChannel to:self
     ].
     ^ landscape.
 
@@ -10727,8 +11395,8 @@
 leftMargin
 
     leftMargin isNil ifTrue:[
-	leftMargin := Printer leftMargin asValue.
-	leftMargin onChangeSend:#updateModifiedChannel to:self
+        leftMargin := Printer leftMargin asValue.
+        leftMargin onChangeSend:#updateModifiedChannel to:self
     ].
     ^ leftMargin.
 !
@@ -10736,15 +11404,15 @@
 pageFormat
 
     pageFormat isNil ifTrue:[
-	self pageFormatList notEmpty ifTrue:[
-	    | index |
-	    (index := self pageFormatList indexOf:#a4) ~~ 0 ifTrue:[
-		pageFormat := index asValue.
-	    ] ifFalse:[
-		pageFormat := 1 asValue.
-	    ]
-	].
-	pageFormat onChangeSend:#updateModifiedChannel to:self
+        self pageFormatList notEmpty ifTrue:[
+            | index |
+            (index := self pageFormatList indexOf:#a4) ~~ 0 ifTrue:[
+                pageFormat := index asValue.
+            ] ifFalse:[
+                pageFormat := 1 asValue.
+            ]
+        ].
+        pageFormat onChangeSend:#updateModifiedChannel to:self
     ].
     ^ pageFormat.
 !
@@ -10752,7 +11420,7 @@
 pageFormatList
 
     pageFormatList isNil ifTrue:[
-	pageFormatList := (Printer isNil ifTrue:[ #() ] ifFalse: [Printer defaultPageFormats]) asList.
+        pageFormatList := (Printer isNil ifTrue:[ #() ] ifFalse: [Printer defaultPageFormats]) asList.
     ].
     ^ pageFormatList.
 
@@ -10762,16 +11430,16 @@
 printCommand
 
     printCommand isNil ifTrue:[
-	printCommand := Printer printCommand asValue.
-	printCommand onChangeSend:#updateModifiedChannel to:self
+        printCommand := Printer printCommand asValue.
+        printCommand onChangeSend:#updateModifiedChannel to:self
     ].
     ^ printCommand.
 !
 
 printCommandEnabled
     ^ BlockValue
-	with:[:m | m isEmptyOrNil]
-	argument:(self printFilename).
+        with:[:m | m isEmptyOrNil]
+        argument:(self printFilename).
 
     "Modified: / 08-03-2007 / 23:02:40 / cg"
 !
@@ -10779,15 +11447,15 @@
 printCommandList
 
     printCommandList isNil ifTrue:[
-	printCommandList := self commandList asList.
+        printCommandList := self commandList asList.
     ].
     ^ printCommandList.
 !
 
 printFilename
     printFilename isNil ifTrue:[
-	printFilename := (Printer isNil ifTrue:[''] ifFalse:[Printer printFilename ? '']) asValue.
-	printFilename onChangeSend:#updateModifiedChannel to:self
+        printFilename := (Printer isNil ifTrue:[''] ifFalse:[Printer printFilename ? '']) asValue.
+        printFilename onChangeSend:#updateModifiedChannel to:self
     ].
     ^ printFilename.
 
@@ -10796,19 +11464,19 @@
 
 printerIsDrivenByCommand
     printerIsDrivenByCommand isNil ifTrue:[
-	printerIsDrivenByCommand := BlockValue
-	    with:[:m |
-		|printer|
-
-		printer := self possiblePrinters at:m value ifAbsent:nil.
-		printer notNil ifTrue:[
-		    printer isDrivenByCommand
-		] ifFalse:[
-		    self breakPoint:#expecco.
-		    false
-		]
-	    ]
-	    argument:self printerTypeSelection.
+        printerIsDrivenByCommand := BlockValue
+            with:[:m |
+                |printer|
+
+                printer := self possiblePrinters at:m value ifAbsent:nil.
+                printer notNil ifTrue:[
+                    printer isDrivenByCommand
+                ] ifFalse:[
+                    self breakPoint:#expecco.
+                    false
+                ]
+            ]
+            argument:self printerTypeSelection.
     ].
     ^ printerIsDrivenByCommand.
 
@@ -10818,9 +11486,9 @@
 
 printerSupportsPrintingToFile
     printerSupportsPrintingToFile isNil ifTrue:[
-	printerSupportsPrintingToFile := BlockValue
-					with:[:m | (self possiblePrinters at:m) supportsPrintingToFile ]
-					argument:self printerTypeSelection.
+        printerSupportsPrintingToFile := BlockValue
+                                        with:[:m | (self possiblePrinters at:m) supportsPrintingToFile ]
+                                        argument:self printerTypeSelection.
     ].
     ^ printerSupportsPrintingToFile.
 
@@ -10830,8 +11498,8 @@
 
 printerType
     printerType isNil ifTrue:[
-	printerType := (self possiblePrinters collect:[:cls | cls printerTypeName]) asList.
-	printerType onChangeSend:#updateModifiedChannel to:self
+        printerType := (self possiblePrinters collect:[:cls | cls printerTypeName]) asList.
+        printerType onChangeSend:#updateModifiedChannel to:self
     ].
     ^ printerType.
 
@@ -10842,16 +11510,16 @@
     |printerIndex|
 
     printerTypeSelection isNil ifTrue:[
-	printerIndex := self possiblePrinters identityIndexOf:Printer.
-	printerIndex == 0 ifTrue:[
-	   self possiblePrinters isEmptyOrNil ifTrue:[self error:'no printer'].
-	   printerIndex := 1.
-	].
-	printerTypeSelection := printerIndex asValue.
-
-	printerTypeSelection addDependent:self.
-	printerTypeSelection changed.
-	printerTypeSelection onChangeSend:#updateModifiedChannel to:self
+        printerIndex := self possiblePrinters identityIndexOf:Printer.
+        printerIndex == 0 ifTrue:[
+           self possiblePrinters isEmptyOrNil ifTrue:[self error:'no printer'].
+           printerIndex := 1.
+        ].
+        printerTypeSelection := printerIndex asValue.
+
+        printerTypeSelection addDependent:self.
+        printerTypeSelection changed.
+        printerTypeSelection onChangeSend:#updateModifiedChannel to:self
     ].
     ^ printerTypeSelection.
 
@@ -10861,8 +11529,8 @@
 rightMargin
 
     rightMargin isNil ifTrue:[
-	rightMargin := Printer rightMargin asValue.
-	rightMargin onChangeSend:#updateModifiedChannel to:self
+        rightMargin := Printer rightMargin asValue.
+        rightMargin onChangeSend:#updateModifiedChannel to:self
     ].
     ^ rightMargin.
 !
@@ -10870,10 +11538,10 @@
 selectedUnit
 
     selectedUnit isNil ifTrue:[
-	selectedUnit := 1 asValue.
-	selectedUnit addDependent:self.
-	selectedUnit changed.
-	selectedUnit onChangeSend:#updateModifiedChannel to:self
+        selectedUnit := 1 asValue.
+        selectedUnit addDependent:self.
+        selectedUnit changed.
+        selectedUnit onChangeSend:#updateModifiedChannel to:self
     ].
     ^ selectedUnit.
 !
@@ -10881,8 +11549,8 @@
 supportsColor
 
     supportsColor isNil ifTrue:[
-	supportsColor := (Printer notNil and:[Printer supportsColor]) asValue.
-	supportsColor onChangeSend:#updateModifiedChannel to:self
+        supportsColor := (Printer notNil and:[Printer supportsColor]) asValue.
+        supportsColor onChangeSend:#updateModifiedChannel to:self
     ].
     ^ supportsColor.
 
@@ -10891,9 +11559,9 @@
 
 supportsColorSetting
     supportsColorSetting isNil ifTrue:[
-	supportsColorSetting := BlockValue
-					with:[:m | (self possiblePrinters at:m) supportsColor ]
-					argument:self printerTypeSelection.
+        supportsColorSetting := BlockValue
+                                        with:[:m | (self possiblePrinters at:m) supportsColor ]
+                                        argument:self printerTypeSelection.
     ].
     ^ supportsColorSetting.
 
@@ -10903,9 +11571,9 @@
 
 supportsMarginSetting
     supportsMarginSetting isNil ifTrue:[
-	supportsMarginSetting := BlockValue
-					with:[:m | (self possiblePrinters at:m) supportsMargins ]
-					argument:self printerTypeSelection.
+        supportsMarginSetting := BlockValue
+                                        with:[:m | (self possiblePrinters at:m) supportsMargins ]
+                                        argument:self printerTypeSelection.
     ].
     ^ supportsMarginSetting.
 
@@ -10915,9 +11583,9 @@
 
 supportsPageFormatSetting
     supportsPageFormatSetting isNil ifTrue:[
-	supportsPageFormatSetting := BlockValue
-					with:[:m | (self possiblePrinters at:m) supportsPageSizes ]
-					argument:self printerTypeSelection.
+        supportsPageFormatSetting := BlockValue
+                                        with:[:m | (self possiblePrinters at:m) supportsPageSizes ]
+                                        argument:self printerTypeSelection.
     ].
     ^ supportsPageFormatSetting.
 
@@ -10928,8 +11596,8 @@
 topMargin
 
     topMargin isNil ifTrue:[
-	topMargin := (Printer isNil ifTrue:[ 0 ] ifFalse:[ Printer topMargin ]) asValue.
-	topMargin onChangeSend:#updateModifiedChannel to:self
+        topMargin := (Printer isNil ifTrue:[ 0 ] ifFalse:[ Printer topMargin ]) asValue.
+        topMargin onChangeSend:#updateModifiedChannel to:self
     ].
     ^ topMargin.
 
@@ -10939,7 +11607,7 @@
 unitList
 
     unitList isNil ifTrue:[
-	unitList := #('inch' 'mm') asList.
+        unitList := #('inch' 'mm') asList.
     ].
     ^ unitList.
 ! !
@@ -10950,12 +11618,12 @@
     | p hasPageSize hasMargins|
 
     self printerType selectionIndex ~~ 0 ifTrue:[
-	p := self possiblePrinters at:(self printerType selectionIndex).
-	hasPageSize := p supportsPageSizes.
-	hasMargins := p supportsMargins.
+        p := self possiblePrinters at:(self printerType selectionIndex).
+        hasPageSize := p supportsPageSizes.
+        hasMargins := p supportsMargins.
     ] ifFalse:[
-	hasPageSize := false.
-	hasMargins := false.
+        hasPageSize := false.
+        hasMargins := false.
     ].
 !
 
@@ -10963,26 +11631,26 @@
     | p hasPageSize hasMargins unit printerSupportsPostscript|
 
     self printerTypeSelection value ~~ 0 ifTrue:[
-	p := self possiblePrinters at:(self printerTypeSelection value).
-	hasPageSize := p supportsPageSizes.
-	hasMargins := p supportsMargins.
+        p := self possiblePrinters at:(self printerTypeSelection value).
+        hasPageSize := p supportsPageSizes.
+        hasMargins := p supportsMargins.
     ] ifFalse:[
-	hasPageSize := false.
-	hasMargins := false.
+        hasPageSize := false.
+        hasMargins := false.
     ].
     self enablelandscape value:hasPageSize.
     self enableFormat value:hasPageSize.
     hasPageSize ifTrue:[
-	self pageFormat value:(p pageFormat).
-	self landscape value:(p landscape).
+        self pageFormat value:(p pageFormat).
+        self landscape value:(p landscape).
     ] ifFalse:[
        self landscape value:false.
     ].
     hasMargins ifTrue:[
        self selectedUnit value == 2 ifTrue:[
-	   unit := #mm
+           unit := #mm
        ] ifFalse:[
-	   unit := #inch
+           unit := #inch
        ].
 
        self topMargin value:(UnitConverter convert:p topMargin from:#inch to:unit).
@@ -10995,22 +11663,22 @@
     self enableMargins value:hasMargins.
 
     p notNil ifTrue:[
-	| newCommandList |
-	newCommandList := p defaultCommands.
-	newCommandList notNil ifTrue:[
-	    self printCommandList
-		contents:(newCommandList asList);
-		changed.
-	].
-	self printCommand value:(p printCommand).
-	self printFilename value:(p printFilename ? '').
+        | newCommandList |
+        newCommandList := p defaultCommands.
+        newCommandList notNil ifTrue:[
+            self printCommandList
+                contents:(newCommandList asList);
+                changed.
+        ].
+        self printCommand value:(p printCommand).
+        self printFilename value:(p printFilename ? '').
     ].
     printerSupportsPostscript := p notNil and:[p supportsPostscript].
     self enableColorBox value:printerSupportsPostscript.
     printerSupportsPostscript ifFalse:[
-	self supportsColor value:false
+        self supportsColor value:false
     ] ifTrue:[
-	self supportsColor value:(Printer supportsColor).
+        self supportsColor value:(Printer supportsColor).
     ]
 
     "Modified: / 07-08-2006 / 15:24:06 / fm"
@@ -11021,8 +11689,8 @@
 
 update:something with:aParameter from:changedObject
     (changedObject == self selectedUnit or:[changedObject == self printerTypeSelection]) ifTrue:[
-	self printerTypeSelectionOrUnitListChanged.
-	^ self.
+        self printerTypeSelectionOrUnitListChanged.
+        ^ self.
     ].
 
     super update:something with:aParameter from:changedObject
@@ -11038,16 +11706,16 @@
 
 commandList
     commandList isNil ifTrue:[
-	commandList := resources string:'PRINT_COMMANDS' default:nil.
-	commandList isNil ifTrue:[
-	    commandList := PrinterStream defaultCommands.
-	    commandList isNil ifTrue:[
-		commandList := #('lpr' 'lp').
-	    ].
-	    (commandList includes:self printCommand value) ifFalse:[
-		commandList := commandList copyWith:self printCommand value.
-	    ].
-	].
+        commandList := resources string:'PRINT_COMMANDS' default:nil.
+        commandList isNil ifTrue:[
+            commandList := PrinterStream defaultCommands.
+            commandList isNil ifTrue:[
+                commandList := #('lpr' 'lp').
+            ].
+            (commandList includes:self printCommand value) ifFalse:[
+                commandList := commandList copyWith:self printCommand value.
+            ].
+        ].
     ].
     ^ commandList
 !
@@ -11058,9 +11726,9 @@
     Printer isNil ifTrue:[^ false].
 
     self selectedUnit value == 2 ifTrue:[
-	unit := #mm
+        unit := #mm
     ] ifFalse:[
-	unit := #inch
+        unit := #inch
     ].
     printer := self possiblePrinters at:(self printerTypeSelection value).
 
@@ -11070,17 +11738,17 @@
     (Printer printFilename ? '') ~= (self printFilename value ? '') ifTrue:[^ true].
 
     Printer supportsPageSizes ifTrue:[
-	Printer pageFormat ~= self pageFormat value ifTrue:[^ true].
-	Printer landscape ~= (self landscape value) ifTrue:[^ true].
+        Printer pageFormat ~= self pageFormat value ifTrue:[^ true].
+        Printer landscape ~= (self landscape value) ifTrue:[^ true].
     ].
     Printer supportsMargins ifTrue:[
-	Printer topMargin ~= ((UnitConverter convert:(self topMargin value asFloat) from:unit to:#inch) asFloat) ifTrue:[^ true].
-	Printer leftMargin ~= ((UnitConverter convert:(self leftMargin value asFloat) from:unit to:#inch) asFloat) ifTrue:[^ true].
-	Printer rightMargin ~= ((UnitConverter convert:(self rightMargin value asFloat) from:unit to:#inch) asFloat) ifTrue:[^ true].
-	Printer bottomMargin ~= ((UnitConverter convert:(self bottomMargin value asFloat) from:unit to:#inch) asFloat) ifTrue:[^ true].
+        Printer topMargin ~= ((UnitConverter convert:(self topMargin value asFloat) from:unit to:#inch) asFloat) ifTrue:[^ true].
+        Printer leftMargin ~= ((UnitConverter convert:(self leftMargin value asFloat) from:unit to:#inch) asFloat) ifTrue:[^ true].
+        Printer rightMargin ~= ((UnitConverter convert:(self rightMargin value asFloat) from:unit to:#inch) asFloat) ifTrue:[^ true].
+        Printer bottomMargin ~= ((UnitConverter convert:(self bottomMargin value asFloat) from:unit to:#inch) asFloat) ifTrue:[^ true].
     ].
     Printer supportsPostscript ifTrue:[
-	Printer supportsColor ~= self supportsColor value ifTrue:[^ true].
+        Printer supportsColor ~= self supportsColor value ifTrue:[^ true].
     ].
     ^ false
 
@@ -11089,7 +11757,7 @@
 
 possiblePrinters
     possiblePrinters isNil ifTrue:[
-	possiblePrinters := PrinterStream withAllSubclasses asArray.
+        possiblePrinters := PrinterStream withAllSubclasses asArray.
     ].
     ^ possiblePrinters
 ! !
@@ -11138,8 +11806,8 @@
     <resource: #image>
 
     ^Icon
-	constantNamed:#'AbstractSettingsApplication::ProcessorSchedulerSettingsAppl class defaultIcon'
-	ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(4 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+        constantNamed:#'AbstractSettingsApplication::ProcessorSchedulerSettingsAppl class defaultIcon'
+        ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(4 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 @@@@@@@@@@@@@@@@@@@@ADQ@@@@@@@@@@DQBL2QD@@@@@@@DH"D3D"I@@@@@@DHQDSLQDRP@@@@DHQDQDQDQD$@@@DHQDQDQDQDQI@@@P!!DQDQDQDQD$@@AB
 DQDQDQLQDRP@ABDQDQDQLQDQD$@DHQDQDSLQDQDRP@P!!DQDQL1DQDQI@ABDQDQDQLQDQD$@@P!!DQDQDSDQD$@@ABDQDQDQD1DRP@@DHQDQDQDQLQI@@@ABDQ
 DQDQDQI@@@@@P!!DQDQDQI@@@@@@DH"DQD"I@@@@@@@ADP"H$Q@@@@@@@@@@DQD@@@@@@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255 128 128 128 0 128 128 192 192 192]; mask:((ImageMask new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@G @@?<@A?>@C??@G?? O??0O??0O??0_??8_??8_??8_??8O??0O??0O??0G?? C??@A?>@@?<@@G @@@@@') ; yourself); yourself]
@@ -11167,56 +11835,56 @@
        name: windowSpec
        window:
       (WindowSpec
-	 label: 'Processor and Scheduler Settings'
-	 name: 'Processor and Scheduler Settings'
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 600 320)
+         label: 'Processor and Scheduler Settings'
+         name: 'Processor and Scheduler Settings'
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 600 320)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (VerticalPanelViewSpec
-	     name: 'VerticalPanel2'
-	     layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-	     horizontalLayout: fit
-	     verticalLayout: topSpace
-	     horizontalSpace: 3
-	     verticalSpace: 5
-	     component:
-	    (SpecCollection
-	       collection: (
-		(CheckBoxSpec
-		   label: 'Preemptive Scheduling'
-		   name: 'CheckBox11'
-		   activeHelpKey: preemptiveScheduling
-		   model: preemptive
-		   translateLabel: true
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'Box2'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (CheckBoxSpec
-			 label: 'Dynamic Priorities'
-			 name: 'CheckBox12'
-			 layout: (LayoutFrame 30 0.0 0 0 0 1.0 30 0)
-			 activeHelpKey: dynamicPriorities
-			 enableChannel: preemptive
-			 model: dynamicPrios
-			 translateLabel: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		)
-
-	     )
-	   )
-	  )
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel2'
+             layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+             horizontalLayout: fit
+             verticalLayout: topSpace
+             horizontalSpace: 3
+             verticalSpace: 5
+             component:
+            (SpecCollection
+               collection: (
+                (CheckBoxSpec
+                   label: 'Preemptive Scheduling'
+                   name: 'CheckBox11'
+                   activeHelpKey: preemptiveScheduling
+                   model: preemptive
+                   translateLabel: true
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'Box2'
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (CheckBoxSpec
+                         label: 'Dynamic Priorities'
+                         name: 'CheckBox12'
+                         layout: (LayoutFrame 30 0.0 0 0 0 1.0 30 0)
+                         activeHelpKey: dynamicPriorities
+                         enableChannel: preemptive
+                         model: dynamicPrios
+                         translateLabel: true
+                       )
+                      )
+
+                   )
+                   extent: (Point 600 30)
+                 )
+                )
+
+             )
+           )
+          )
 
        )
      )
@@ -11232,14 +11900,14 @@
 basicSaveSettings
 
     Processor isTimeSlicing ~~ self preemptive value ifTrue:[
-	self preemptive value ifTrue:[
-	    Processor startTimeSlicing
-	] ifFalse:[
-	    Processor stopTimeSlicing
-	]
+        self preemptive value ifTrue:[
+            Processor startTimeSlicing
+        ] ifFalse:[
+            Processor stopTimeSlicing
+        ]
     ].
     Processor supportDynamicPriorities ~~ self dynamicPrios value ifTrue:[
-	Processor supportDynamicPriorities:self dynamicPrios value
+        Processor supportDynamicPriorities:self dynamicPrios value
     ].
 ! !
 
@@ -11247,16 +11915,16 @@
 
 dynamicPrios
     dynamicPrios isNil ifTrue:[
-	dynamicPrios := true asValue.
-	dynamicPrios onChangeSend:#updateModifiedChannel to:self.
+        dynamicPrios := true asValue.
+        dynamicPrios onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ dynamicPrios.
 !
 
 preemptive
     preemptive isNil ifTrue:[
-	preemptive := true asValue.
-	preemptive onChangeSend:#updateModifiedChannel to:self.
+        preemptive := true asValue.
+        preemptive onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ preemptive.
 ! !
@@ -11275,6 +11943,37 @@
     ^ false
 ! !
 
+!AbstractSettingsApplication::RDoItServerSettingsAppl class methodsFor:'help specs'!
+
+flyByHelpSpec
+    "This resource specification was automatically generated
+     by the UIHelpTool of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIHelpTool may not be able to read the specification."
+
+    "
+     UIHelpTool openOnClass:AbstractSettingsApplication::MiscDisplaySettingsAppl
+    "
+
+    <resource: #help>
+
+    ^ super flyByHelpSpec addPairsFrom:#(
+
+#rdoitDisabled
+'RDoit setup disabled, because the "stx:goodies/rdoit" package is not loaded.\To load, open the package load dialog via the Launcher''s "File"-"Load Package" menu item.\\Press the ''Help'' button for a description of what this does'
+
+#rdoitSettings
+'RDoit setup. Press the ''Help'' button for a description of what this does'
+
+#scriptingDisabled
+'Scripting service setup disabled, because the "stx:goodies/simpleServices" package is not loaded.\To load, open the package load dialog via the Launcher''s "File"-"Load Package" menu item.\\Press the ''Help'' button for a description of what this does'
+
+#scriptingSettings
+'Scripting service setup. Press the ''Help'' button for a description of what this does'
+)
+! !
+
 !AbstractSettingsApplication::RDoItServerSettingsAppl class methodsFor:'image specs'!
 
 defaultIcon
@@ -11293,8 +11992,8 @@
     <resource: #image>
 
     ^Icon
-	constantNamed:#'AbstractSettingsApplication::RDoItServerSettingsAppl class defaultIcon'
-	ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(4 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+        constantNamed:#'AbstractSettingsApplication::RDoItServerSettingsAppl class defaultIcon'
+        ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(4 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@&Y&Y&Y&Y&Y3@@@BY&Y&Y&Y&Y''L@@@I$[]7_]7]6,1P@@&QL3L>:1GZ3E@@BY83L3L>D]+LT@@I
 ''#L3L38Q6,1P@@&[L3L8 @]7''E@@BYE3NH (@@_LT@@I$WNBBDAH L1P@@&Q]8P$IB"@3E@@BY4W $ B$@CLT@@L3L $!!H@$"@1P@@3L2DJB DJHCE@@@@UV
 !!B D @A%T@@@@@BBP$IH @@@@@@@@HPHHB"@@@@@@@@@@@!!H@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 64 80 96 240 240 0 80 112 112 240 240 240 64 64 64 48 64 80 64 96 96 128 128 0 128 128 128 48 80 80 80 96 96 112 112 112 64 80 80 80 96 112]; mask:((ImageMask new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@@@G??0G??0G??8G??8G??8G??8G??8G??8G??8G??8G??8G??8G??8A??8@O?@@O?@@G>@@A0@@@@@') ; yourself); yourself]
@@ -11335,6 +12034,7 @@
              label: 'RDoIt'
              name: 'RDoItFramedBox'
              layout: (LayoutFrame 0 0 0 0 0 1 232 0)
+             activeHelpKey: rdoitSettings
              labelPosition: topLeft
              translateLabel: true
              component: 
@@ -11483,9 +12183,10 @@
              )
            )
           (FramedBoxSpec
-             label: 'JavaScript-Scripting via Telnet'
+             label: 'JavaScript/Smalltalk-Scripting via Telnet'
              name: 'ScriptingFramedBox'
              layout: (LayoutFrame 0 0 224 0 0 1 460 0)
+             activeHelpKey: scriptingSettings
              labelPosition: topLeft
              translateLabel: true
              component: 
@@ -11507,7 +12208,7 @@
                         (SpecCollection
                            collection: (
                             (CheckBoxSpec
-                               label: 'JavaScript-Scripting enabled'
+                               label: 'Telnet Scripting enabled'
                                name: 'CheckBox5'
                                layout: (LayoutFrame 0 0 0 0 -5 1 22 0)
                                enableChannel: hasScriptingServerClass
@@ -11660,21 +12361,21 @@
     scriptingEnabledOnlyViaLocalConnection := true.
 
     (self hasRDoitServer and:[RDoItServer isLoaded]) ifTrue:[
-	rDoitsEnabled := RDoItServer serverRunning.
-	rDoitEnabledOnlyViaLocalConnection := RDoItServer localConnectionsOnly.
-	rDoitLogging := RDoItServer isLogging.
-	rDoitErrorLogging := RDoItServer isErrorLogging.
-	rDoitErrorDebugging := RDoItServer isErrorCatching not.
-	rDoitServerPortOrPath := RDoItServer defaultPortNumberOrPath asString.
+        rDoitsEnabled := RDoItServer serverRunning.
+        rDoitEnabledOnlyViaLocalConnection := RDoItServer localConnectionsOnly.
+        rDoitLogging := RDoItServer isLogging.
+        rDoitErrorLogging := RDoItServer isErrorLogging.
+        rDoitErrorDebugging := RDoItServer isErrorCatching not.
+        rDoitServerPortOrPath := RDoItServer defaultPortNumberOrPath asString.
     ].
 
     (STXScriptingServer notNil
     and:[ STXScriptingServer isLoaded ]) ifTrue:[
-	scriptingEnabled := STXScriptingServer serverRunning.
-	scriptingEnabledOnlyViaLocalConnection := STXScriptingServer localConnectionsOnly.
-	scriptingLogging := STXScriptingServer isLogging.
-	scriptingErrorLogging := STXScriptingServer isErrorLogging.
-	scriptingErrorDebugging := STXScriptingServer isErrorDebugging.
+        scriptingEnabled := STXScriptingServer serverRunning.
+        scriptingEnabledOnlyViaLocalConnection := STXScriptingServer localConnectionsOnly.
+        scriptingLogging := STXScriptingServer isLogging.
+        scriptingErrorLogging := STXScriptingServer isErrorLogging.
+        scriptingErrorDebugging := STXScriptingServer isErrorDebugging.
     ].
 
     self rDoitsEnabled value:rDoitsEnabled.
@@ -11698,46 +12399,46 @@
     portOrPath := self getPortNumberOrPath.
 
     self hasRDoitServerClass ifTrue:[
-	RDoItServer defaultPortNumberOrPath:portOrPath.
-	RDoItServer logging:self rDoitLogging value.
-	RDoItServer errorLogging:self rDoitErrorLogging value.
-	RDoItServer errorCatching:(self rDoitErrorDebugging value not).
-	RDoItServer localConnectionsOnly:(self rDoitEnabledOnlyViaLocalConnection value).
-	shouldRun := self rDoitsEnabled value.
-	shouldRun ~~ RDoItServer serverRunning ifTrue:[
-	    shouldRun ifFalse:[
-		RDoItServer stop
-	    ] ifTrue:[
-		RDoItServer start.
-		"/ must wait a bit; give it a chance to
-		"/ really start (before checking)
-		Delay waitForSeconds:1.
-		RDoItServer serverRunning ifFalse:[
-		    self warn:'RDoit startup failed (see stderr).'
-		]
-	    ]
-	].
+        RDoItServer defaultPortNumberOrPath:portOrPath.
+        RDoItServer logging:self rDoitLogging value.
+        RDoItServer errorLogging:self rDoitErrorLogging value.
+        RDoItServer errorCatching:(self rDoitErrorDebugging value not).
+        RDoItServer localConnectionsOnly:(self rDoitEnabledOnlyViaLocalConnection value).
+        shouldRun := self rDoitsEnabled value.
+        shouldRun ~~ RDoItServer serverRunning ifTrue:[
+            shouldRun ifFalse:[
+                RDoItServer stop
+            ] ifTrue:[
+                RDoItServer start.
+                "/ must wait a bit; give it a chance to
+                "/ really start (before checking)
+                Delay waitForSeconds:1.
+                RDoItServer serverRunning ifFalse:[
+                    self warn:'RDoit startup failed (see stderr).'
+                ]
+            ]
+        ].
     ].
 
     self hasScriptingServerClass ifTrue:[
-	STXScriptingServer logging:self scriptingLogging value.
-	STXScriptingServer errorLogging:self scriptingErrorLogging value.
-	STXScriptingServer errorDebugging:(self scriptingErrorDebugging value).
-	STXScriptingServer localConnectionsOnly:(self scriptingEnabledOnlyViaLocalConnection value).
-	shouldRun := self scriptingEnabled value.
-	shouldRun ~~ STXScriptingServer serverRunning ifTrue:[
-	    shouldRun ifFalse:[
-		STXScriptingServer stop
-	    ] ifTrue:[
-		STXScriptingServer start.
-		"/ must wait a bit; give it a chance to
-		"/ really start (before checking)
-		Delay waitForSeconds:1.
-		STXScriptingServer serverRunning ifFalse:[
-		    self warn:'STXScripting startup failed (see stderr).'
-		]
-	    ]
-	].
+        STXScriptingServer logging:self scriptingLogging value.
+        STXScriptingServer errorLogging:self scriptingErrorLogging value.
+        STXScriptingServer errorDebugging:(self scriptingErrorDebugging value).
+        STXScriptingServer localConnectionsOnly:(self scriptingEnabledOnlyViaLocalConnection value).
+        shouldRun := self scriptingEnabled value.
+        shouldRun ~~ STXScriptingServer serverRunning ifTrue:[
+            shouldRun ifFalse:[
+                STXScriptingServer stop
+            ] ifTrue:[
+                STXScriptingServer start.
+                "/ must wait a bit; give it a chance to
+                "/ really start (before checking)
+                Delay waitForSeconds:1.
+                STXScriptingServer serverRunning ifFalse:[
+                    self warn:'STXScripting startup failed (see stderr).'
+                ]
+            ]
+        ].
     ].
 
     "Modified: / 20-05-2010 / 14:50:44 / cg"
@@ -11748,11 +12449,11 @@
 
     portOrPath := self rDoitServerPortOrPath value.
     portOrPath isNumber ifFalse:[
-	"a numeric string means it is a TCP port number"
-	nrOrNil := Integer readFrom:portOrPath onError:nil.
-	nrOrNil notNil ifTrue:[
-	    portOrPath := nrOrNil.
-	]
+        "a numeric string means it is a TCP port number"
+        nrOrNil := Integer readFrom:portOrPath onError:nil.
+        nrOrNil notNil ifTrue:[
+            portOrPath := nrOrNil.
+        ]
     ].
     ^ portOrPath
 ! !
@@ -11761,8 +12462,8 @@
 
 rDoitEnabledOnlyViaLocalConnection
     rDoitEnabledOnlyViaLocalConnection isNil ifTrue:[
-	rDoitEnabledOnlyViaLocalConnection := true asValue.
-	rDoitEnabledOnlyViaLocalConnection onChangeSend:#updateModifiedChannel to:self
+        rDoitEnabledOnlyViaLocalConnection := true asValue.
+        rDoitEnabledOnlyViaLocalConnection onChangeSend:#updateModifiedChannel to:self
     ].
     ^ rDoitEnabledOnlyViaLocalConnection.
 
@@ -11771,32 +12472,32 @@
 
 rDoitErrorDebugging
     rDoitErrorDebugging isNil ifTrue:[
-	rDoitErrorDebugging := true asValue.
-	rDoitErrorDebugging onChangeSend:#updateModifiedChannel to:self
+        rDoitErrorDebugging := true asValue.
+        rDoitErrorDebugging onChangeSend:#updateModifiedChannel to:self
     ].
     ^ rDoitErrorDebugging.
 !
 
 rDoitErrorLogging
     rDoitErrorLogging isNil ifTrue:[
-	rDoitErrorLogging := true asValue.
-	rDoitErrorLogging onChangeSend:#updateModifiedChannel to:self
+        rDoitErrorLogging := true asValue.
+        rDoitErrorLogging onChangeSend:#updateModifiedChannel to:self
     ].
     ^ rDoitErrorLogging.
 !
 
 rDoitLogging
     rDoitLogging isNil ifTrue:[
-	rDoitLogging := true asValue.
-	rDoitLogging onChangeSend:#updateModifiedChannel to:self
+        rDoitLogging := true asValue.
+        rDoitLogging onChangeSend:#updateModifiedChannel to:self
     ].
     ^ rDoitLogging.
 !
 
 rDoitOnlyViaLocalConnection
     rDoitOnlyViaLocalConnection isNil ifTrue:[
-	rDoitOnlyViaLocalConnection := true asValue.
-	rDoitOnlyViaLocalConnection onChangeSend:#updateModifiedChannel to:self
+        rDoitOnlyViaLocalConnection := true asValue.
+        rDoitOnlyViaLocalConnection onChangeSend:#updateModifiedChannel to:self
     ].
     ^ rDoitOnlyViaLocalConnection.
 
@@ -11805,56 +12506,56 @@
 
 rDoitServerPortOrPath
     rDoitServerPortOrPath isNil ifTrue:[
-	rDoitServerPortOrPath := nil asValue.
-	rDoitServerPortOrPath onChangeSend:#updateModifiedChannel to:self
+        rDoitServerPortOrPath := nil asValue.
+        rDoitServerPortOrPath onChangeSend:#updateModifiedChannel to:self
     ].
     ^ rDoitServerPortOrPath.
 !
 
 rDoitsEnabled
     rDoitsEnabled isNil ifTrue:[
-	rDoitsEnabled := true asValue.
-	rDoitsEnabled onChangeSend:#rDoitsEnabledChanged to:self
+        rDoitsEnabled := true asValue.
+        rDoitsEnabled onChangeSend:#rDoitsEnabledChanged to:self
     ].
     ^ rDoitsEnabled.
 !
 
 scriptingEnabled
     scriptingEnabled isNil ifTrue:[
-	scriptingEnabled := false asValue.
-	scriptingEnabled onChangeSend:#updateModifiedChannel to:self
+        scriptingEnabled := false asValue.
+        scriptingEnabled onChangeSend:#updateModifiedChannel to:self
     ].
     ^ scriptingEnabled.
 !
 
 scriptingEnabledOnlyViaLocalConnection
     scriptingEnabledOnlyViaLocalConnection isNil ifTrue:[
-	scriptingEnabledOnlyViaLocalConnection := true asValue.
-	scriptingEnabledOnlyViaLocalConnection onChangeSend:#updateModifiedChannel to:self
+        scriptingEnabledOnlyViaLocalConnection := true asValue.
+        scriptingEnabledOnlyViaLocalConnection onChangeSend:#updateModifiedChannel to:self
     ].
     ^ scriptingEnabledOnlyViaLocalConnection.
 !
 
 scriptingErrorDebugging
     scriptingErrorDebugging isNil ifTrue:[
-	scriptingErrorDebugging := true asValue.
-	scriptingErrorDebugging onChangeSend:#updateModifiedChannel to:self
+        scriptingErrorDebugging := true asValue.
+        scriptingErrorDebugging onChangeSend:#updateModifiedChannel to:self
     ].
     ^ scriptingErrorDebugging.
 !
 
 scriptingErrorLogging
     scriptingErrorLogging isNil ifTrue:[
-	scriptingErrorLogging := true asValue.
-	scriptingErrorLogging onChangeSend:#updateModifiedChannel to:self
+        scriptingErrorLogging := true asValue.
+        scriptingErrorLogging onChangeSend:#updateModifiedChannel to:self
     ].
     ^ scriptingErrorLogging.
 !
 
 scriptingLogging
     scriptingLogging isNil ifTrue:[
-	scriptingLogging := true asValue.
-	scriptingLogging onChangeSend:#updateModifiedChannel to:self
+        scriptingLogging := true asValue.
+        scriptingLogging onChangeSend:#updateModifiedChannel to:self
     ].
     ^ scriptingLogging.
 !
@@ -11870,9 +12571,9 @@
     "*** (and replace this comment by something more useful ;-)"
 
     scriptingServerPortOrPath isNil ifTrue:[
-	STXScriptingServer notNil ifTrue:[
-	    scriptingServerPortOrPath := STXScriptingServer defaultPortNumber asValue.
-	].
+        STXScriptingServer notNil ifTrue:[
+            scriptingServerPortOrPath := STXScriptingServer defaultPortNumber asValue.
+        ].
 "/ if your app needs to be notified of changes, uncomment one of the lines below:
 "/       scriptingServerPortOrPath addDependent:self.
 "/       scriptingServerPortOrPath onChangeSend:#scriptingServerPortOrPathChanged to:self.
@@ -11885,15 +12586,32 @@
 rDoitsEnabledChanged
     self updateModifiedChannel.
     self rDoitsEnabled value ifTrue:[
-	RDoItServer autoload.
-	rDoitServerPortOrPath value isEmptyOrNil ifTrue:[
-	    rDoitServerPortOrPath value:(RDoItServer defaultPortNumberOrPath asString)
-	]
+        RDoItServer autoload.
+        rDoitServerPortOrPath value isEmptyOrNil ifTrue:[
+            rDoitServerPortOrPath value:(RDoItServer defaultPortNumberOrPath asString)
+        ]
     ]
 ! !
 
 !AbstractSettingsApplication::RDoItServerSettingsAppl methodsFor:'help'!
 
+flyByHelpTextForKey:aKey
+    |usedKey|
+    
+    usedKey := aKey.
+    usedKey == #rdoitSettings ifTrue:[
+        self hasRDoitServerClass ifFalse:[
+            usedKey := #rdoitDisabled
+        ].    
+    ].
+    usedKey == #scriptingSettings ifTrue:[
+        self hasScriptingServerClass ifFalse:[
+            usedKey := #scriptingDisabled
+        ].    
+    ].
+    ^ super flyByHelpTextForKey:usedKey.
+!
+
 helpFilename
     ^ 'Launcher/communicationsSettings.html'
 ! !
@@ -11918,23 +12636,23 @@
 
 hasUnsavedChanges
     (self hasRDoitServer and:[RDoItServer isLoaded]) ifTrue:[
-	self rDoitsEnabled value ~= RDoItServer serverRunning ifTrue:[^ true].
-	RDoItServer serverRunning ifTrue:[
-	    self rDoitLogging value ~= RDoItServer isLogging ifTrue:[^ true].
-	    self rDoitErrorLogging value ~= RDoItServer isErrorLogging ifTrue:[^ true].
-	    self rDoitErrorDebugging value ~= RDoItServer isErrorCatching not ifTrue:[^ true].
-	    self getPortNumberOrPath ~= RDoItServer defaultPortNumberOrPath ifTrue:[^ true].
-	    self rDoitEnabledOnlyViaLocalConnection value ~= RDoItServer localConnectionsOnly ifTrue:[^ true].
-	]
+        self rDoitsEnabled value ~= RDoItServer serverRunning ifTrue:[^ true].
+        RDoItServer serverRunning ifTrue:[
+            self rDoitLogging value ~= RDoItServer isLogging ifTrue:[^ true].
+            self rDoitErrorLogging value ~= RDoItServer isErrorLogging ifTrue:[^ true].
+            self rDoitErrorDebugging value ~= RDoItServer isErrorCatching not ifTrue:[^ true].
+            self getPortNumberOrPath ~= RDoItServer defaultPortNumberOrPath ifTrue:[^ true].
+            self rDoitEnabledOnlyViaLocalConnection value ~= RDoItServer localConnectionsOnly ifTrue:[^ true].
+        ]
     ].
     (self hasScriptingServer and:[STXScriptingServer isLoaded]) ifTrue:[
-	self scriptingEnabled value ~= STXScriptingServer serverRunning ifTrue:[^ true].
-	STXScriptingServer serverRunning ifTrue:[
-	    self scriptingLogging value ~= STXScriptingServer isLogging ifTrue:[^ true].
-	    self scriptingErrorLogging value ~= STXScriptingServer isErrorLogging ifTrue:[^ true].
-	    self scriptingErrorDebugging value ~= STXScriptingServer isErrorDebugging ifTrue:[^ true].
-	    self scriptingEnabledOnlyViaLocalConnection value ~= STXScriptingServer localConnectionsOnly ifTrue:[^ true].
-	]
+        self scriptingEnabled value ~= STXScriptingServer serverRunning ifTrue:[^ true].
+        STXScriptingServer serverRunning ifTrue:[
+            self scriptingLogging value ~= STXScriptingServer isLogging ifTrue:[^ true].
+            self scriptingErrorLogging value ~= STXScriptingServer isErrorLogging ifTrue:[^ true].
+            self scriptingErrorDebugging value ~= STXScriptingServer isErrorDebugging ifTrue:[^ true].
+            self scriptingEnabledOnlyViaLocalConnection value ~= STXScriptingServer localConnectionsOnly ifTrue:[^ true].
+        ]
     ].
     ^ false
 
@@ -11982,8 +12700,8 @@
     <resource: #image>
 
     ^Icon
-	constantNamed:#'AbstractSettingsApplication::SQLServerSettingsAppl class dbIcon1'
-	ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+        constantNamed:#'AbstractSettingsApplication::SQLServerSettingsAppl class dbIcon1'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 H"H"H @@@@@@@@@@@@@@@@@@@@@"H"H"@@@@@@@@@@@@@@@@@@@@@@@@@@@"H"H"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@BH"@@@@@@@@@@@@J"(*J"(*@@@@
 @@@@@BH"@@@@@@@@J"(*@@@@@@@@J"(*@@@@H"H"@@@@@B(*@@@@@@@@@@@@@@@@J"("H"H"@@@@J @@@@@@@@@@@@@@@@@@@@@*H"H"@BH@H"(*@@@@@@@@
 @@@@@@@@J"("H"H"@BH(H" $J"(*J @@@@@*J"(*H"H"H"H"@BH(H" $ABTJIB(*J"("H"H"H"H"H"H"@BH(H" $ABT%IBP(JBH"H"H"H"H"H"H"@@@(J" $
@@ -12009,8 +12727,8 @@
     <resource: #image>
 
     ^Icon
-	constantNamed:'Object class dbIcon2'
-	ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+        constantNamed:'Object class dbIcon2'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 @@@@@@@@@@@@@@@@@@@@!!!!"O_@T>@@@@@@@@@@@@@@@@@@@@@E8=X(!!#T!!0-X@D@@@@@@@@@@@@@@@@@NVTLL@.HK%MTZQEH@@@@@@@@@@@@@@@@V2<LCC@K
 "GTIT15UV @@@@@@@@@@@@@@R"$<F&P0B8]ONGECQ @@@@@@@@@@@@@@I!!,_]"2ARPH%J&!!8V@@@@@@@@@@@@@@@_1-EI61''PFFC!!F!!&V@@@@@@@@@@@@@@@
@@ -12251,23 +12969,23 @@
 
     sqlServerClass := self sqlServerClass.
     (sqlServerClass notNil and:[sqlServerClass isLoaded]) ifTrue:[
-	self sqlServerEnabled value:sqlServerClass serverRunning.
-	self sqlSmalltalkServerEnabled value:sqlServerClass isSmalltalkServerEnabled.
-	self sqlLogging value:sqlServerClass isLogging.
-	self sqlStatementLogging value:sqlServerClass isSQLLogging.
-	self sqlErrorLogging value:sqlServerClass isErrorLogging.
-	self sqlDataLogging value:sqlServerClass isDataLogging.
-	self sqlErrorDebugging value:sqlServerClass isErrorCatching not.
-	self sqlServerPort value:sqlServerClass defaultPort
+        self sqlServerEnabled value:sqlServerClass serverRunning.
+        self sqlSmalltalkServerEnabled value:sqlServerClass isSmalltalkServerEnabled.
+        self sqlLogging value:sqlServerClass isLogging.
+        self sqlStatementLogging value:sqlServerClass isSQLLogging.
+        self sqlErrorLogging value:sqlServerClass isErrorLogging.
+        self sqlDataLogging value:sqlServerClass isDataLogging.
+        self sqlErrorDebugging value:sqlServerClass isErrorCatching not.
+        self sqlServerPort value:sqlServerClass defaultPort
     ] ifFalse:[
-	self sqlServerEnabled value:false.
-	self sqlSmalltalkServerEnabled value:false.
-	self sqlLogging value:false.
-	self sqlStatementLogging value:false.
-	self sqlErrorLogging value:false.
-	self sqlDataLogging value:false.
-	self sqlErrorDebugging value:false.
-	self sqlServerPort value:nil
+        self sqlServerEnabled value:false.
+        self sqlSmalltalkServerEnabled value:false.
+        self sqlLogging value:false.
+        self sqlStatementLogging value:false.
+        self sqlErrorLogging value:false.
+        self sqlDataLogging value:false.
+        self sqlErrorDebugging value:false.
+        self sqlServerPort value:nil
     ].
 
     "Modified: / 25-01-2007 / 17:40:53 / cg"
@@ -12280,7 +12998,7 @@
 
     port := self sqlServerPort value.
     port isNumber ifFalse:[
-	port := port asInteger.
+        port := port asInteger.
     ].
 
     sqlServerClass defaultPort:port.
@@ -12293,17 +13011,17 @@
 
     shouldRun := self sqlServerEnabled value.
     shouldRun ~~ sqlServerClass serverRunning ifTrue:[
-	shouldRun ifFalse:[
-	    sqlServerClass stop
-	] ifTrue:[
-	    sqlServerClass start.
-	    "/ must wait a bit; give it a chance to
-	    "/ really start (before checking)
-	    Delay waitForSeconds:1.
-	    sqlServerClass serverRunning ifFalse:[
-		self warn:'SQLServer startup failed (see stderr).'
-	    ]
-	]
+        shouldRun ifFalse:[
+            sqlServerClass stop
+        ] ifTrue:[
+            sqlServerClass start.
+            "/ must wait a bit; give it a chance to
+            "/ really start (before checking)
+            Delay waitForSeconds:1.
+            sqlServerClass serverRunning ifFalse:[
+                self warn:'SQLServer startup failed (see stderr).'
+            ]
+        ]
     ].
 
     "Modified: / 25-01-2007 / 17:41:20 / cg"
@@ -12313,64 +13031,64 @@
 
 sqlDataLogging
     sqlDataLogging isNil ifTrue:[
-	sqlDataLogging := true asValue.
-	sqlDataLogging onChangeSend:#updateModifiedChannel to:self
+        sqlDataLogging := true asValue.
+        sqlDataLogging onChangeSend:#updateModifiedChannel to:self
     ].
     ^ sqlDataLogging.
 !
 
 sqlErrorDebugging
     sqlErrorDebugging isNil ifTrue:[
-	sqlErrorDebugging := true asValue.
-	sqlErrorDebugging onChangeSend:#updateModifiedChannel to:self
+        sqlErrorDebugging := true asValue.
+        sqlErrorDebugging onChangeSend:#updateModifiedChannel to:self
     ].
     ^ sqlErrorDebugging.
 !
 
 sqlErrorLogging
     sqlErrorLogging isNil ifTrue:[
-	sqlErrorLogging := true asValue.
-	sqlErrorLogging onChangeSend:#updateModifiedChannel to:self
+        sqlErrorLogging := true asValue.
+        sqlErrorLogging onChangeSend:#updateModifiedChannel to:self
     ].
     ^ sqlErrorLogging.
 !
 
 sqlLogging
     sqlLogging isNil ifTrue:[
-	sqlLogging := true asValue.
-	sqlLogging onChangeSend:#updateModifiedChannel to:self
+        sqlLogging := true asValue.
+        sqlLogging onChangeSend:#updateModifiedChannel to:self
     ].
     ^ sqlLogging.
 !
 
 sqlServerEnabled
     sqlServerEnabled isNil ifTrue:[
-	sqlServerEnabled := true asValue.
-	sqlServerEnabled onChangeSend:#sqlServerEnabledChanged to:self
+        sqlServerEnabled := true asValue.
+        sqlServerEnabled onChangeSend:#sqlServerEnabledChanged to:self
     ].
     ^ sqlServerEnabled.
 !
 
 sqlServerPort
     sqlServerPort isNil ifTrue:[
-	sqlServerPort := ValueHolder new.
-	sqlServerPort onChangeSend:#updateModifiedChannel to:self
+        sqlServerPort := ValueHolder new.
+        sqlServerPort onChangeSend:#updateModifiedChannel to:self
     ].
     ^ sqlServerPort.
 !
 
 sqlSmalltalkServerEnabled
     sqlSmalltalkServerEnabled isNil ifTrue:[
-	sqlSmalltalkServerEnabled := true asValue.
-	sqlSmalltalkServerEnabled onChangeSend:#sqlSmalltalkServerEnabledChanged to:self
+        sqlSmalltalkServerEnabled := true asValue.
+        sqlSmalltalkServerEnabled onChangeSend:#sqlSmalltalkServerEnabledChanged to:self
     ].
     ^ sqlSmalltalkServerEnabled.
 !
 
 sqlStatementLogging
     sqlStatementLogging isNil ifTrue:[
-	sqlStatementLogging := true asValue.
-	sqlStatementLogging onChangeSend:#updateModifiedChannel to:self
+        sqlStatementLogging := true asValue.
+        sqlStatementLogging onChangeSend:#updateModifiedChannel to:self
     ].
     ^ sqlStatementLogging.
 ! !
@@ -12380,9 +13098,9 @@
 sqlServerEnabledChanged
     self updateModifiedChannel.
     self sqlServerEnabled value ifTrue:[
-	sqlServerPort value isEmptyOrNil ifTrue:[
-	    sqlServerPort value:(self sqlServerClass defaultPort)
-	]
+        sqlServerPort value isEmptyOrNil ifTrue:[
+            sqlServerPort value:(self sqlServerClass defaultPort)
+        ]
     ]
 
     "Modified: / 25-01-2007 / 17:46:07 / cg"
@@ -12391,9 +13109,9 @@
 sqlSmalltalkServerEnabledChanged
     self updateModifiedChannel.
     self sqlSmalltalkServerEnabled value ifTrue:[
-	sqlServerPort value isEmptyOrNil ifTrue:[
-	    sqlServerPort value:(self sqlServerClass defaultPort)
-	]
+        sqlServerPort value isEmptyOrNil ifTrue:[
+            sqlServerPort value:(self sqlServerClass defaultPort)
+        ]
     ]
 
     "Modified: / 25-01-2007 / 17:40:03 / cg"
@@ -12421,13 +13139,13 @@
 
     self sqlServerEnabled value ~= sqlServerClass serverRunning ifTrue:[^ true].
     sqlServerClass serverRunning ifTrue:[
-	self sqlSmalltalkServerEnabled value ~= sqlServerClass isSmalltalkServerEnabled ifTrue:[^ true].
-	self sqlLogging value ~= sqlServerClass isLogging ifTrue:[^ true].
-	self sqlStatementLogging value ~= sqlServerClass isSQLLogging ifTrue:[^ true].
-	self sqlErrorLogging value ~= sqlServerClass isErrorLogging ifTrue:[^ true].
-	self sqlDataLogging value ~= sqlServerClass isDataLogging ifTrue:[^ true].
-	self sqlErrorDebugging value ~= sqlServerClass isErrorCatching not ifTrue:[^ true].
-	self sqlServerPort value ~= sqlServerClass defaultPort ifTrue:[^ true].
+        self sqlSmalltalkServerEnabled value ~= sqlServerClass isSmalltalkServerEnabled ifTrue:[^ true].
+        self sqlLogging value ~= sqlServerClass isLogging ifTrue:[^ true].
+        self sqlStatementLogging value ~= sqlServerClass isSQLLogging ifTrue:[^ true].
+        self sqlErrorLogging value ~= sqlServerClass isErrorLogging ifTrue:[^ true].
+        self sqlDataLogging value ~= sqlServerClass isDataLogging ifTrue:[^ true].
+        self sqlErrorDebugging value ~= sqlServerClass isErrorCatching not ifTrue:[^ true].
+        self sqlServerPort value ~= sqlServerClass defaultPort ifTrue:[^ true].
     ].
     ^ false
 
@@ -12509,8 +13227,8 @@
     <resource: #image>
 
     ^Icon
-	constantNamed:#'AbstractSettingsApplication::STCCompilerSettingsAppl class defaultIcon1'
-	ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#[2]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+        constantNamed:#'AbstractSettingsApplication::STCCompilerSettingsAppl class defaultIcon1'
+        ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#[2]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 @@@@@@@@C??????@CUUUUUW@CZ(J@B''@CZ""(*''CCZ"*(*''@CV(J(*WKCV*"(*W@CU""()WJCU(J()W@CUZ**%W@CUZ**%WACUV(JUW@CUV""UWDCUU")UWI
 CUU")UWICUUR%UWJCUUR!!UWACUUTEUW@CUUUUUW@C??????@@@@@@@@B') ; colorMapFromArray:#[0 0 0 255 255 255 255 189 23 127 127 127]; mask:((ImageMask new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@O??8O??8O??8O??8O??8O??8O??8O??8O??8O??8O??8O??8O??8O??8O??8O??8O??8O??8O??8O??8@@@@') ; yourself); yourself]
 !
@@ -12531,8 +13249,8 @@
     <resource: #image>
 
     ^Icon
-	constantNamed:#'AbstractSettingsApplication::STCCompilerSettingsAppl class defaultIcon2'
-	ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+        constantNamed:#'AbstractSettingsApplication::STCCompilerSettingsAppl class defaultIcon2'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 A@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PD@0LDA@PDA@PDA@PDA@PDA@PD
 A@PDA@LCA PCA@P@@@@@@@@@@@@@@@@@@@@D@0PFA PCA@PC@0@@@@@@@@@@@@@C@0@D@0PFAPTD@0LDA L@@@@@@@@@@@LFA@LCA@TEAPTEA@PE@PL@@@@@
 @@@@@@LAAPPDAPTEAPTEAPTF@0@@@@@@@@@@@@@CA TEAPTEA DFAPTD@0@@@@@@@@@@@@@CA@TEA DF@0LAA TEA@LC@@@@@@@@@0LDAPTF@PLC@ HC@PTE
@@ -12558,8 +13276,8 @@
     <resource: #image>
 
     ^Icon
-	constantNamed:#'AbstractSettingsApplication::STCCompilerSettingsAppl class defaultIcon3'
-	ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+        constantNamed:#'AbstractSettingsApplication::STCCompilerSettingsAppl class defaultIcon3'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 A@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PC@0PDA@PD
 A@PDA@PDA@PDA@PDA@PDA@LDA LDA@PDA@PDA@PDA@PDA@PD@0LDA@LDA LDA@LCA@PDA@PDA@PDA@PCA PC@0PEAPPC@0PF@0PDA@PDA@PDA@PC@PTDA@TE
 APTDA@TA@0PDA@PDA@PDA@PD@0XEAPTEAPTEAPXCA@PDA@PDA@PDA@PD@0PEAPXAA XEAPPCA@PDA@PDA@PDA@LCA@TEA DC@0DFAPTD@0LDA@PDA@PD@0PD
@@ -12585,8 +13303,8 @@
     <resource: #image>
 
     ^Icon
-	constantNamed:'AbstractSettingsApplication::STCCompilerSettingsAppl class defaultIcon4'
-	ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+        constantNamed:'AbstractSettingsApplication::STCCompilerSettingsAppl class defaultIcon4'
+        ifAbsentPut:[(Depth8Image new) width: 24; height: 24; photometric:(#palette); bitsPerSample:(#[8]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 A@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PDA@PC@0PDA@PD
 A@PDA@PDA@PDA@PDA@PDA@LDA LDA@PDA@PDA@PDA@PDA@PD@0LDA@LDA LDA@LCA@PDA@PDA@PDA@PCA PC@0PEAPPC@0PF@0PDA@PDA@PDA@PC@PTDA@TE
 APTDA@TA@0PDA@PDA@PDA@PD@0XEAPTEAPTEAPXCA@PDA@PDA@PDA@PD@0PEAPXAA XEAPPCA@PDA@PDA@PDA@LCA@TEA DC@0DFAPTD@0LDA@PDA@PD@0PD
@@ -12634,7 +13352,7 @@
              verticalLayout: top
              horizontalSpace: 3
              verticalSpace: 0
-             component: 
+             component:
             (SpecCollection
                collection: (
                 (ViewSpec
@@ -12643,7 +13361,7 @@
                  )
                 (ViewSpec
                    name: 'InfoTextBox'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -12660,7 +13378,7 @@
                  )
                 (ViewSpec
                    name: 'STCCompilationBox11'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -12688,7 +13406,7 @@
                  )
                 (ViewSpec
                    name: 'STCCommandBox1'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -12716,7 +13434,7 @@
                  )
                 (ViewSpec
                    name: 'STCOptionsBox2'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -12744,7 +13462,7 @@
                  )
                 (ViewSpec
                    name: 'KeepCIntermediateBox'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -12770,7 +13488,7 @@
                  )
                 (ViewSpec
                    name: 'CCCommandBox3'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -12798,7 +13516,7 @@
                  )
                 (ViewSpec
                    name: 'CCOptionsBox1'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -12890,7 +13608,7 @@
                  )
                 (ViewSpec
                    name: 'CCIncludeDirectoriesBox2'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -12920,7 +13638,7 @@
                  )
                 (ViewSpec
                    name: 'STCDefinesBox6'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -12948,7 +13666,7 @@
                  )
                 (ViewSpec
                    name: 'LinkCommandBox7'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -12976,7 +13694,7 @@
                  )
                 (ViewSpec
                    name: 'LinkArgumentsBox8'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -13004,7 +13722,7 @@
                  )
                 (ViewSpec
                    name: 'LinkSharedArgumentsBox1'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -13032,7 +13750,7 @@
                  )
                 (ViewSpec
                    name: 'CLibrariesBox9'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -13060,7 +13778,7 @@
                  )
                 (ViewSpec
                    name: 'STCLibraryPathBox10'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -13088,7 +13806,7 @@
                  )
                 (ViewSpec
                    name: 'MakeCommandBox'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -13119,7 +13837,7 @@
                  )
                 (ViewSpec
                    name: 'SetupForBox'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -13146,7 +13864,7 @@
                  )
                 (ViewSpec
                    name: 'Box1'
-                   component: 
+                   component:
                   (SpecCollection
                      collection: (
                       (LabelSpec
@@ -13186,7 +13904,7 @@
     |t|
 
     self canLoadBinaries
-	value:(ObjectFileLoader notNil and:[ObjectFileLoader canLoadObjectFiles]).
+        value:(ObjectFileLoader notNil and:[ObjectFileLoader canLoadObjectFiles]).
 
     self verbose value:(STCCompilerInterface verbose ? false).
 
@@ -13204,15 +13922,15 @@
     self linkSharedArgs value:ParserFlags linkSharedArgs.
 
     (t := ParserFlags searchedLibraries) notNil ifTrue:[
-	self stcLibraries value:(String fromStringCollection:t separatedBy:' ')
+        self stcLibraries value:(String fromStringCollection:t separatedBy:' ')
     ].
     (t := ParserFlags libPath) notNil ifTrue:[
-	self stcLibraryPath value:t
+        self stcLibraryPath value:t
     ].
 
     self stcCompilationSelection value:(self class stcCompilationOptions
-	     indexOf:(ParserFlags stcCompilation)
-	     ifAbsent:1).
+             indexOf:(ParserFlags stcCompilation)
+             ifAbsent:1).
 
     "Modified: / 09-08-2006 / 18:49:38 / fm"
     "Modified: / 16-09-2011 / 18:45:15 / cg"
@@ -13232,16 +13950,16 @@
     ParserFlags makeCommand:self makeCommand value.
 
     self stc value ~= ParserFlags stcPath ifTrue:[
-	ParserFlags stcPath:self stc value
+        ParserFlags stcPath:self stc value
     ].
     ParserFlags linkCommand:self linkCommand value.
     ParserFlags linkArgs:self linkArgs value.
     ParserFlags linkSharedArgs:self linkSharedArgs value.
     self stcLibraries value notNil ifTrue:[
-	ParserFlags searchedLibraries:(self stcLibraries value asCollectionOfWords).
+        ParserFlags searchedLibraries:(self stcLibraries value asCollectionOfWords).
     ].
     stcLibraryPath notNil ifTrue:[
-	ParserFlags libPath:(self stcLibraryPath value).
+        ParserFlags libPath:(self stcLibraryPath value).
     ].
 
     "Modified: / 09-08-2006 / 19:33:10 / fm"
@@ -13292,11 +14010,11 @@
 
 setupForMINGW
     ExternalBytes sizeofPointer == 4 ifTrue:[
-	self cc value:'C:\mingw32\bin\gcc'.
-	self linkArgs value:'-L..\..\lib\mingw -LC:\mingw32\lib'.
+        self cc value:'C:\mingw32\bin\gcc'.
+        self linkArgs value:'-L..\..\lib\mingw -LC:\mingw32\lib'.
     ] ifFalse:[
-	self cc value:'C:\mingw64\bin\gcc'.
-	self linkArgs value:'-L..\..\lib\mingw -LC:\mingw64\lib'.
+        self cc value:'C:\mingw64\bin\gcc'.
+        self linkArgs value:'-L..\..\lib\mingw -LC:\mingw64\lib'.
     ].
     self ccOptions value:''.
     self stcIncludes value:'-I..\..\include'.
@@ -13317,17 +14035,17 @@
     programFilesX86 isEmptyOrNil ifTrue:[ programFilesX86 := 'C:\Program Files (x86)' ].
 
     {
-	(programFilesX86,'\Microsoft Visual Studio 10.0\VC\bin'     ) .
-	(programFilesX86,'\Microsoft Visual Studio 11.0\VC\bin'     ) .
-	(programFilesX86,'\Microsoft Visual Studio 12.0\VC\bin'     ) .
-	(programFiles,'\Microsoft Visual Studio 10.0\VC\bin'        ) .
-	(programFiles,'\Microsoft Visual Studio 11.0\VC\bin'        ) .
-	(programFiles,'\Microsoft Visual Studio 12.0\VC\bin'        ) .
+        (programFilesX86,'\Microsoft Visual Studio 10.0\VC\bin'     ) .
+        (programFilesX86,'\Microsoft Visual Studio 11.0\VC\bin'     ) .
+        (programFilesX86,'\Microsoft Visual Studio 12.0\VC\bin'     ) .
+        (programFiles,'\Microsoft Visual Studio 10.0\VC\bin'        ) .
+        (programFiles,'\Microsoft Visual Studio 11.0\VC\bin'        ) .
+        (programFiles,'\Microsoft Visual Studio 12.0\VC\bin'        ) .
     } do:[:each |
-	each asFilename exists ifTrue:[
-	    self cc value:(each,'\cl.exe').
-	    self linkCommand value:(each,'\ilink32.exe').
-	].
+        each asFilename exists ifTrue:[
+            self cc value:(each,'\cl.exe').
+            self linkCommand value:(each,'\ilink32.exe').
+        ].
     ].
     self ccOptions value:'/O1'.
     self stcIncludes value:'-I..\..\include'.
@@ -13348,20 +14066,20 @@
     spec := self supportedCCompilerListSpec at:idx ifAbsent:[^ self].
     compiler := spec second.
     compiler == #gcc ifTrue:[
-	self setupForGCC.
-	^ self.
+        self setupForGCC.
+        ^ self.
     ].
     compiler == #bcc ifTrue:[
-	self setupForBCC.
-	^ self.
+        self setupForBCC.
+        ^ self.
     ].
     compiler == #msvc ifTrue:[
-	self setupForMSVC.
-	^ self.
+        self setupForMSVC.
+        ^ self.
     ].
     compiler == #mingw ifTrue:[
-	self setupForMINGW.
-	^ self.
+        self setupForMINGW.
+        ^ self.
     ].
 ! !
 
@@ -13370,7 +14088,7 @@
 canLoadBinaries
 
     canLoadBinaries isNil ifTrue:[
-	canLoadBinaries := (ObjectFileLoader notNil and:[ObjectFileLoader canLoadObjectFiles]) asValue.
+        canLoadBinaries := (ObjectFileLoader notNil and:[ObjectFileLoader canLoadObjectFiles]) asValue.
     ].
     ^ canLoadBinaries.
 !
@@ -13378,8 +14096,8 @@
 cc
 
     cc isNil ifTrue:[
-	cc := ValueHolder new.
-	cc onChangeSend:#updateModifiedChannel to:self.
+        cc := ValueHolder new.
+        cc onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ cc.
 !
@@ -13387,8 +14105,8 @@
 ccOptions
 
     ccOptions isNil ifTrue:[
-	ccOptions := ValueHolder new.
-	ccOptions onChangeSend:#updateModifiedChannel to:self.
+        ccOptions := ValueHolder new.
+        ccOptions onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ ccOptions.
 !
@@ -13407,8 +14125,8 @@
 linkArgs
 
     linkArgs isNil ifTrue:[
-	linkArgs := ValueHolder new.
-	linkArgs onChangeSend:#updateModifiedChannel to:self.
+        linkArgs := ValueHolder new.
+        linkArgs onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ linkArgs.
 !
@@ -13416,8 +14134,8 @@
 linkCommand
 
     linkCommand isNil ifTrue:[
-	linkCommand := ValueHolder new.
-	linkCommand onChangeSend:#updateModifiedChannel to:self.
+        linkCommand := ValueHolder new.
+        linkCommand onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ linkCommand.
 !
@@ -13425,8 +14143,8 @@
 linkSharedArgs
 
     linkSharedArgs isNil ifTrue:[
-	linkSharedArgs := ValueHolder new.
-	linkSharedArgs onChangeSend:#updateModifiedChannel to:self.
+        linkSharedArgs := ValueHolder new.
+        linkSharedArgs onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ linkSharedArgs.
 !
@@ -13434,8 +14152,8 @@
 makeCommand
 
     makeCommand isNil ifTrue:[
-	makeCommand := ValueHolder new.
-	makeCommand onChangeSend:#updateModifiedChannel to:self.
+        makeCommand := ValueHolder new.
+        makeCommand onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ makeCommand.
 
@@ -13445,8 +14163,8 @@
 stc
 
     stc isNil ifTrue:[
-	stc := ValueHolder new.
-	stc onChangeSend:#updateModifiedChannel to:self.
+        stc := ValueHolder new.
+        stc onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ stc.
 !
@@ -13454,7 +14172,7 @@
 stcCompilationList
 
     stcCompilationList isNil ifTrue:[
-	stcCompilationList := (resources array:(self class stcCompilationStrings)) asList.
+        stcCompilationList := (resources array:(self class stcCompilationStrings)) asList.
     ].
     ^ stcCompilationList.
 !
@@ -13462,8 +14180,8 @@
 stcCompilationSelection
 
     stcCompilationSelection isNil ifTrue:[
-	stcCompilationSelection := (self class stcCompilationOptions indexOf:(ParserFlags stcCompilation) ifAbsent:1) asValue.
-	stcCompilationSelection onChangeSend:#updateModifiedChannel to:self.
+        stcCompilationSelection := (self class stcCompilationOptions indexOf:(ParserFlags stcCompilation) ifAbsent:1) asValue.
+        stcCompilationSelection onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ stcCompilationSelection.
 !
@@ -13471,8 +14189,8 @@
 stcDefines
 
     stcDefines isNil ifTrue:[
-	stcDefines := ValueHolder new.
-	stcDefines onChangeSend:#updateModifiedChannel to:self.
+        stcDefines := ValueHolder new.
+        stcDefines onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ stcDefines.
 !
@@ -13480,8 +14198,8 @@
 stcIncludes
 
     stcIncludes isNil ifTrue:[
-	stcIncludes := ValueHolder new.
-	stcIncludes onChangeSend:#updateModifiedChannel to:self.
+        stcIncludes := ValueHolder new.
+        stcIncludes onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ stcIncludes.
 !
@@ -13494,8 +14212,8 @@
 
 stcKeepCIntermediate
     stcKeepCIntermediate isNil ifTrue:[
-	stcKeepCIntermediate := false asValue.
-	stcKeepCIntermediate onChangeSend:#updateModifiedChannel to:self.
+        stcKeepCIntermediate := false asValue.
+        stcKeepCIntermediate onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ stcKeepCIntermediate.
 
@@ -13505,8 +14223,8 @@
 stcLibraries
 
     stcLibraries isNil ifTrue:[
-	stcLibraries := ValueHolder new.
-	stcLibraries onChangeSend:#updateModifiedChannel to:self.
+        stcLibraries := ValueHolder new.
+        stcLibraries onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ stcLibraries.
 !
@@ -13514,8 +14232,8 @@
 stcLibraryPath
 
     stcLibraryPath isNil ifTrue:[
-	stcLibraryPath := ValueHolder new.
-	stcLibraryPath onChangeSend:#updateModifiedChannel to:self.
+        stcLibraryPath := ValueHolder new.
+        stcLibraryPath onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ stcLibraryPath.
 !
@@ -13523,8 +14241,8 @@
 stcOptions
 
     stcOptions isNil ifTrue:[
-	stcOptions := ValueHolder new.
-	stcOptions onChangeSend:#updateModifiedChannel to:self.
+        stcOptions := ValueHolder new.
+        stcOptions onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ stcOptions.
 !
@@ -13535,21 +14253,21 @@
 
 supportedCCompilerListSpec
     OperatingSystem isMSWINDOWSlike ifTrue:[
-	^ #(
-	    ('Borland CC v5.5 (bcc)'        #bcc)
-	    ('Microsoft Visual C (cl)'      #msvc)
-	    ('Mingw (gcc)'                  #mingw)
-	 ).
+        ^ #(
+            ('Borland CC v5.5 (bcc)'        #bcc)
+            ('Microsoft Visual C (cl)'      #msvc)
+            ('Mingw (gcc)'                  #mingw)
+         ).
     ].
 
     ^ #(
-	('GNU gcc'                      #gcc)
+        ('GNU gcc'                      #gcc)
      ).
 !
 
 supportedCCompilerSelection
     supportedCCompilerSelection isNil ifTrue:[
-	supportedCCompilerSelection := ValueHolder new.
+        supportedCCompilerSelection := ValueHolder new.
     ].
     ^ supportedCCompilerSelection.
 !
@@ -13557,8 +14275,8 @@
 verbose
 
     verbose isNil ifTrue:[
-	verbose := false asValue.
-	verbose onChangeSend:#updateModifiedChannel to:self.
+        verbose := false asValue.
+        verbose onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ verbose.
 ! !
@@ -13603,7 +14321,7 @@
 
     searchedLibs := ParserFlags searchedLibraries.
     searchedLibs notNil ifTrue:[
-	(String fromStringCollection:searchedLibs separatedBy:' ') ~= self stcLibraries value ifTrue:[^ true].
+        (String fromStringCollection:searchedLibs separatedBy:' ') ~= self stcLibraries value ifTrue:[^ true].
     ].
     ^ false.
 
@@ -13626,32 +14344,32 @@
     self at:index put:methodArg.        "/ a two arg message
     self from:1 to:index put:methodArg. "/ a three arg message
     methodArg ifTrue:[
-	Transcript showCR:''hello''.      "/ condition
+        Transcript showCR:''hello''.      "/ condition
     ].
     methodArg ifTrue:[
-	Transcript showCR:''hello''.      "/ condition
+        Transcript showCR:''hello''.      "/ condition
     ] ifFalse:[
-	Transcript showCR:''world''.
+        Transcript showCR:''world''.
     ].
     [methodArg] whileTrue:[
-	Transcript showCR:''hello''.      "/ looping
+        Transcript showCR:''hello''.      "/ looping
     ].
     [self aVeryLongConditionBlock and:[self toMakeBlockLonger]] whileTrue:[
-	Transcript showCR:''hello''.      "/ long blocks
+        Transcript showCR:''hello''.      "/ long blocks
     ].
     methodArg do:[:element |
-	Transcript showCR:''hello''.      "/ looping
+        Transcript showCR:''hello''.      "/ looping
     ].
     1 to:methodArg size do:[:index |
-	Transcript showCR:''hello''.      "/ looping
+        Transcript showCR:''hello''.      "/ looping
     ].
     methodArg keysAndValuesDo:[:index |
-	Transcript showCR:''hello''.      "/ looping
+        Transcript showCR:''hello''.      "/ looping
     ].
     Object errorSignal handle:[:ex |
-	ex return
+        ex return
     ] do:[                                "/ exception handling
-	self someAction                   "/ blocks
+        self someAction                   "/ blocks
     ].
     ^ self.
 '.
@@ -13704,261 +14422,261 @@
        name: windowSpec
        window:
       (WindowSpec
-	 label: 'Code Format Settings'
-	 name: 'Code Format Settings'
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 613 685)
+         label: 'Code Format Settings'
+         name: 'Code Format Settings'
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 613 685)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (VerticalPanelViewSpec
-	     name: 'VerticalPanel3'
-	     layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -30 1.0)
-	     horizontalLayout: fit
-	     verticalLayout: topSpaceFit
-	     horizontalSpace: 3
-	     verticalSpace: 3
-	     component:
-	    (SpecCollection
-	       collection: (
-		(VerticalPanelViewSpec
-		   name: 'VerticalPanel1'
-		   horizontalLayout: fit
-		   verticalLayout: bottom
-		   horizontalSpace: 3
-		   verticalSpace: 3
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (ViewSpec
-			 name: 'Box1'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Space around Temporaries'
-			       name: 'CheckBox3'
-			       layout: (LayoutFrame 0 0 0 0 250 0 30 0)
-			       model: spaceAroundTemporaries
-			       translateLabel: true
-			     )
-			    (CheckBoxSpec
-			       label: 'Blank line after local Var Declaration'
-			       name: 'CheckBox4'
-			       layout: (LayoutFrame 250 0 0 0 0 1 30 0)
-			       model: emptyLineAfterTemporaries
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 613 30)
-		       )
-		      (ViewSpec
-			 name: 'Box11'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Space after ''^'''
-			       name: 'CheckBox5'
-			       layout: (LayoutFrame 0 0 0 0 250 0 30 0)
-			       model: spaceAfterReturnToken
-			       translateLabel: true
-			     )
-			    (CheckBoxSpec
-			       label: 'Space after '':'' in Keywords'
-			       name: 'CheckBox6'
-			       layout: (LayoutFrame 250 0 0 0 -5 1 30 0)
-			       model: spaceAfterKeywordSelector
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 613 30)
-		       )
-		      (ViewSpec
-			 name: 'Box15'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Space after ''['''
-			       name: 'CheckBox9'
-			       layout: (LayoutFrame 0 0 0 0 250 0 30 0)
-			       model: spaceAfterBlockStart
-			       translateLabel: true
-			     )
-			    (CheckBoxSpec
-			       label: 'Space before '']'''
-			       name: 'CheckBox10'
-			       layout: (LayoutFrame 250 0 0 0 -5 1 30 0)
-			       model: spaceBeforeBlockEnd
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 613 30)
-		       )
-		      (ViewSpec
-			 name: 'Box12'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'C-Style Blocks'
-			       name: 'CheckBox8'
-			       layout: (LayoutFrame 0 0 0 0 250 0 30 0)
-			       model: cStyleBlocks
-			       translateLabel: true
-			     )
-			    (CheckBoxSpec
-			       label: 'Block Args on new Line'
-			       name: 'CheckBox7'
-			       layout: (LayoutFrame 250 0 0 0 -5 1 30 0)
-			       model: blockArgumentsOnNewLine
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 613 30)
-		       )
-		      (ViewSpec
-			 name: 'Box13'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (LabelSpec
-			       label: 'Indent:'
-			       name: 'Label1'
-			       layout: (LayoutFrame 0 0 0 0 327 0 30 0)
-			       translateLabel: true
-			       adjust: right
-			     )
-			    (InputFieldSpec
-			       name: 'EntryField1'
-			       layout: (LayoutFrame 334 0 0 0 381 0 30 0)
-			       model: tabIndent
-			       type: number
-			       acceptOnReturn: true
-			       acceptOnTab: true
-			       acceptOnLostFocus: true
-			       acceptOnPointerLeave: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 613 30)
-		       )
-		      (ViewSpec
-			 name: 'Box16'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (LabelSpec
-			       label: 'Max Length for Single Line Blocks:'
-			       name: 'Label5'
-			       layout: (LayoutFrame 0 0 0 0 327 0 30 0)
-			       translateLabel: true
-			       adjust: right
-			     )
-			    (InputFieldSpec
-			       name: 'EntryField4'
-			       layout: (LayoutFrame 334 0 0 0 381 0 30 0)
-			       model: maxLengthForSingleLineBlocks
-			       type: number
-			       acceptOnReturn: true
-			       acceptOnTab: true
-			       acceptOnLostFocus: true
-			       acceptOnPointerLeave: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 613 30)
-		       )
-		      (HorizontalPanelViewSpec
-			 name: 'HorizontalPanel1'
-			 horizontalLayout: fitSpace
-			 verticalLayout: bottom
-			 horizontalSpace: 3
-			 verticalSpace: 3
-			 component:
-			(SpecCollection
-			   collection: (
-			    (ActionButtonSpec
-			       label: 'Reset to ST/X Default'
-			       name: 'Button1'
-			       translateLabel: true
-			       tabable: true
-			       model: resetToStxDefault
-			       extent: (Point 302 22)
-			     )
-			    (ActionButtonSpec
-			       label: 'Reset to RefactoryBrowser Default'
-			       name: 'Button2'
-			       translateLabel: true
-			       tabable: true
-			       model: resetToRBDefault
-			       extent: (Point 302 22)
-			     )
-			    )
-
-			 )
-			 extent: (Point 613 30)
-		       )
-		      )
-
-		   )
-		   extent: (Point 613 180)
-		 )
-		(ViewSpec
-		   name: 'SpacingBox1'
-		   extent: (Point 613 10)
-		 )
-		(ViewSpec
-		   name: 'Box14'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Sample Output:'
-			 name: 'Label3'
-			 layout: (LayoutFrame 0 0 0 0 0 1 30 0)
-			 translateLabel: true
-			 adjust: left
-		       )
-		      (TextEditorSpec
-			 name: 'TextEditor3'
-			 layout: (LayoutFrame 0 0 30 0 0 1 0 1)
-			 model: editorText
-			 hasHorizontalScrollBar: true
-			 hasVerticalScrollBar: true
-			 isReadOnly: true
-			 hasKeyboardFocusInitially: false
-			 postBuildCallback: postBuildTextEditor:
-		       )
-		      )
-
-		   )
-		   extent: (Point 613 453)
-		 )
-		)
-
-	     )
-	   )
-	  (CheckBoxSpec
-	     label: 'Auto Format'
-	     name: 'CheckBox2'
-	     layout: (LayoutFrame 3 0 -30 1 0 1 0 1)
-	     model: autoFormat
-	     translateLabel: true
-	   )
-	  )
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel3'
+             layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -30 1.0)
+             horizontalLayout: fit
+             verticalLayout: topSpaceFit
+             horizontalSpace: 3
+             verticalSpace: 3
+             component:
+            (SpecCollection
+               collection: (
+                (VerticalPanelViewSpec
+                   name: 'VerticalPanel1'
+                   horizontalLayout: fit
+                   verticalLayout: bottom
+                   horizontalSpace: 3
+                   verticalSpace: 3
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (ViewSpec
+                         name: 'Box1'
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Space around Temporaries'
+                               name: 'CheckBox3'
+                               layout: (LayoutFrame 0 0 0 0 250 0 30 0)
+                               model: spaceAroundTemporaries
+                               translateLabel: true
+                             )
+                            (CheckBoxSpec
+                               label: 'Blank line after local Var Declaration'
+                               name: 'CheckBox4'
+                               layout: (LayoutFrame 250 0 0 0 0 1 30 0)
+                               model: emptyLineAfterTemporaries
+                               translateLabel: true
+                             )
+                            )
+
+                         )
+                         extent: (Point 613 30)
+                       )
+                      (ViewSpec
+                         name: 'Box11'
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Space after ''^'''
+                               name: 'CheckBox5'
+                               layout: (LayoutFrame 0 0 0 0 250 0 30 0)
+                               model: spaceAfterReturnToken
+                               translateLabel: true
+                             )
+                            (CheckBoxSpec
+                               label: 'Space after '':'' in Keywords'
+                               name: 'CheckBox6'
+                               layout: (LayoutFrame 250 0 0 0 -5 1 30 0)
+                               model: spaceAfterKeywordSelector
+                               translateLabel: true
+                             )
+                            )
+
+                         )
+                         extent: (Point 613 30)
+                       )
+                      (ViewSpec
+                         name: 'Box15'
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Space after ''['''
+                               name: 'CheckBox9'
+                               layout: (LayoutFrame 0 0 0 0 250 0 30 0)
+                               model: spaceAfterBlockStart
+                               translateLabel: true
+                             )
+                            (CheckBoxSpec
+                               label: 'Space before '']'''
+                               name: 'CheckBox10'
+                               layout: (LayoutFrame 250 0 0 0 -5 1 30 0)
+                               model: spaceBeforeBlockEnd
+                               translateLabel: true
+                             )
+                            )
+
+                         )
+                         extent: (Point 613 30)
+                       )
+                      (ViewSpec
+                         name: 'Box12'
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'C-Style Blocks'
+                               name: 'CheckBox8'
+                               layout: (LayoutFrame 0 0 0 0 250 0 30 0)
+                               model: cStyleBlocks
+                               translateLabel: true
+                             )
+                            (CheckBoxSpec
+                               label: 'Block Args on new Line'
+                               name: 'CheckBox7'
+                               layout: (LayoutFrame 250 0 0 0 -5 1 30 0)
+                               model: blockArgumentsOnNewLine
+                               translateLabel: true
+                             )
+                            )
+
+                         )
+                         extent: (Point 613 30)
+                       )
+                      (ViewSpec
+                         name: 'Box13'
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (LabelSpec
+                               label: 'Indent:'
+                               name: 'Label1'
+                               layout: (LayoutFrame 0 0 0 0 327 0 30 0)
+                               translateLabel: true
+                               adjust: right
+                             )
+                            (InputFieldSpec
+                               name: 'EntryField1'
+                               layout: (LayoutFrame 334 0 0 0 381 0 30 0)
+                               model: tabIndent
+                               type: number
+                               acceptOnReturn: true
+                               acceptOnTab: true
+                               acceptOnLostFocus: true
+                               acceptOnPointerLeave: true
+                             )
+                            )
+
+                         )
+                         extent: (Point 613 30)
+                       )
+                      (ViewSpec
+                         name: 'Box16'
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (LabelSpec
+                               label: 'Max Length for Single Line Blocks:'
+                               name: 'Label5'
+                               layout: (LayoutFrame 0 0 0 0 327 0 30 0)
+                               translateLabel: true
+                               adjust: right
+                             )
+                            (InputFieldSpec
+                               name: 'EntryField4'
+                               layout: (LayoutFrame 334 0 0 0 381 0 30 0)
+                               model: maxLengthForSingleLineBlocks
+                               type: number
+                               acceptOnReturn: true
+                               acceptOnTab: true
+                               acceptOnLostFocus: true
+                               acceptOnPointerLeave: true
+                             )
+                            )
+
+                         )
+                         extent: (Point 613 30)
+                       )
+                      (HorizontalPanelViewSpec
+                         name: 'HorizontalPanel1'
+                         horizontalLayout: fitSpace
+                         verticalLayout: bottom
+                         horizontalSpace: 3
+                         verticalSpace: 3
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (ActionButtonSpec
+                               label: 'Reset to ST/X Default'
+                               name: 'Button1'
+                               translateLabel: true
+                               tabable: true
+                               model: resetToStxDefault
+                               extent: (Point 302 22)
+                             )
+                            (ActionButtonSpec
+                               label: 'Reset to RefactoryBrowser Default'
+                               name: 'Button2'
+                               translateLabel: true
+                               tabable: true
+                               model: resetToRBDefault
+                               extent: (Point 302 22)
+                             )
+                            )
+
+                         )
+                         extent: (Point 613 30)
+                       )
+                      )
+
+                   )
+                   extent: (Point 613 180)
+                 )
+                (ViewSpec
+                   name: 'SpacingBox1'
+                   extent: (Point 613 10)
+                 )
+                (ViewSpec
+                   name: 'Box14'
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Sample Output:'
+                         name: 'Label3'
+                         layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+                         translateLabel: true
+                         adjust: left
+                       )
+                      (TextEditorSpec
+                         name: 'TextEditor3'
+                         layout: (LayoutFrame 0 0 30 0 0 1 0 1)
+                         model: editorText
+                         hasHorizontalScrollBar: true
+                         hasVerticalScrollBar: true
+                         isReadOnly: true
+                         hasKeyboardFocusInitially: false
+                         postBuildCallback: postBuildTextEditor:
+                       )
+                      )
+
+                   )
+                   extent: (Point 613 453)
+                 )
+                )
+
+             )
+           )
+          (CheckBoxSpec
+             label: 'Auto Format'
+             name: 'CheckBox2'
+             layout: (LayoutFrame 3 0 -30 1 0 1 0 1)
+             model: autoFormat
+             translateLabel: true
+           )
+          )
 
        )
      )
@@ -13970,20 +14688,20 @@
     reformatLocked := true.
 
     self
-	readAspects:
-	    #(
-		tabIndent
-		spaceAroundTemporaries
-		emptyLineAfterTemporaries
-		spaceAfterReturnToken
-		spaceAfterKeywordSelector
-		spaceAfterBlockStart
-		spaceBeforeBlockEnd
-		cStyleBlocks
-		blockArgumentsOnNewLine
-		maxLengthForSingleLineBlocks
-	    )
-	from:RBFormatter.
+        readAspects:
+            #(
+                tabIndent
+                spaceAroundTemporaries
+                emptyLineAfterTemporaries
+                spaceAfterReturnToken
+                spaceAfterKeywordSelector
+                spaceAfterBlockStart
+                spaceBeforeBlockEnd
+                cStyleBlocks
+                blockArgumentsOnNewLine
+                maxLengthForSingleLineBlocks
+            )
+        from:RBFormatter.
 
     self autoFormat value:currentUserPrefs autoFormatting.
     self updateModifiedChannel.
@@ -14005,16 +14723,16 @@
     currentUserPrefs at:#'formatter.blockArgumentsOnNewLine' put:self blockArgumentsOnNewLine value.
     currentUserPrefs at:#'formatter.maxLengthForSingleLineBlocks' put:self maxLengthForSingleLineBlocks value.
     RBFormatter
-	tabIndent:self tabIndent value;
-	spaceAroundTemporaries:self spaceAroundTemporaries value;
-	emptyLineAfterTemporaries:self emptyLineAfterTemporaries value;
-	spaceAfterReturnToken:self spaceAfterReturnToken value;
-	spaceAfterKeywordSelector:self spaceAfterKeywordSelector value;
-	spaceAfterBlockStart:self spaceAfterBlockStart value;
-	spaceBeforeBlockEnd:self spaceBeforeBlockEnd value;
-	cStyleBlocks:self cStyleBlocks value;
-	blockArgumentsOnNewLine:self blockArgumentsOnNewLine value;
-	maxLengthForSingleLineBlocks:self maxLengthForSingleLineBlocks value asInteger.
+        tabIndent:self tabIndent value;
+        spaceAroundTemporaries:self spaceAroundTemporaries value;
+        emptyLineAfterTemporaries:self emptyLineAfterTemporaries value;
+        spaceAfterReturnToken:self spaceAfterReturnToken value;
+        spaceAfterKeywordSelector:self spaceAfterKeywordSelector value;
+        spaceAfterBlockStart:self spaceAfterBlockStart value;
+        spaceBeforeBlockEnd:self spaceBeforeBlockEnd value;
+        cStyleBlocks:self cStyleBlocks value;
+        blockArgumentsOnNewLine:self blockArgumentsOnNewLine value;
+        maxLengthForSingleLineBlocks:self maxLengthForSingleLineBlocks value asInteger.
 !
 
 reformat
@@ -14025,31 +14743,31 @@
      s_spaceAfterBlockStart s_spaceBeforeBlockEnd|
 
     reformatLocked ifFalse:[
-	"/
-	"/ temporary change the RBFormatters settings ...
-	"/
-	s_tabIndent := RBFormatter tabIndent.
-	s_spaceAroundTemporaries := RBFormatter spaceAroundTemporaries.
-	s_emptyLineAfterTemporaries := RBFormatter emptyLineAfterTemporaries.
-	s_spaceAfterReturnToken := RBFormatter spaceAfterReturnToken.
-	s_spaceAfterKeywordSelector := RBFormatter spaceAfterKeywordSelector.
-	s_spaceAfterBlockStart := RBFormatter spaceAfterBlockStart.
-	s_spaceBeforeBlockEnd := RBFormatter spaceBeforeBlockEnd.
-	s_cStyleBlocks := RBFormatter cStyleBlocks.
-	s_blockArgumentsOnNewLine := RBFormatter blockArgumentsOnNewLine.
-	s_maxLengthForSingleLineBlocks := RBFormatter maxLengthForSingleLineBlocks.
-
-	RBFormatter
-	    tabIndent:self tabIndent value;
-	    spaceAroundTemporaries:self spaceAroundTemporaries value;
-	    emptyLineAfterTemporaries:self emptyLineAfterTemporaries value;
-	    spaceAfterReturnToken:self spaceAfterReturnToken value;
-	    spaceAfterKeywordSelector:self spaceAfterKeywordSelector value;
-	    spaceAfterBlockStart:self spaceAfterBlockStart value;
-	    spaceBeforeBlockEnd:self spaceBeforeBlockEnd value;
-	    cStyleBlocks:self cStyleBlocks value;
-	    blockArgumentsOnNewLine:self blockArgumentsOnNewLine value;
-	    maxLengthForSingleLineBlocks:self maxLengthForSingleLineBlocks value.
+        "/
+        "/ temporary change the RBFormatters settings ...
+        "/
+        s_tabIndent := RBFormatter tabIndent.
+        s_spaceAroundTemporaries := RBFormatter spaceAroundTemporaries.
+        s_emptyLineAfterTemporaries := RBFormatter emptyLineAfterTemporaries.
+        s_spaceAfterReturnToken := RBFormatter spaceAfterReturnToken.
+        s_spaceAfterKeywordSelector := RBFormatter spaceAfterKeywordSelector.
+        s_spaceAfterBlockStart := RBFormatter spaceAfterBlockStart.
+        s_spaceBeforeBlockEnd := RBFormatter spaceBeforeBlockEnd.
+        s_cStyleBlocks := RBFormatter cStyleBlocks.
+        s_blockArgumentsOnNewLine := RBFormatter blockArgumentsOnNewLine.
+        s_maxLengthForSingleLineBlocks := RBFormatter maxLengthForSingleLineBlocks.
+
+        RBFormatter
+            tabIndent:self tabIndent value;
+            spaceAroundTemporaries:self spaceAroundTemporaries value;
+            emptyLineAfterTemporaries:self emptyLineAfterTemporaries value;
+            spaceAfterReturnToken:self spaceAfterReturnToken value;
+            spaceAfterKeywordSelector:self spaceAfterKeywordSelector value;
+            spaceAfterBlockStart:self spaceAfterBlockStart value;
+            spaceBeforeBlockEnd:self spaceBeforeBlockEnd value;
+            cStyleBlocks:self cStyleBlocks value;
+            blockArgumentsOnNewLine:self blockArgumentsOnNewLine value;
+            maxLengthForSingleLineBlocks:self maxLengthForSingleLineBlocks value.
 
 "/        tree := RBParser
 "/                    parseMethod:self class exampleText
@@ -14060,19 +14778,19 @@
 "/            ]
 "/        ].
 "/        self editorText value:tree printString.
-	self editorText value:(RBFormatter format:(self class exampleText)).
-
-	RBFormatter
-	    tabIndent:s_tabIndent;
-	    spaceAroundTemporaries:s_spaceAroundTemporaries;
-	    emptyLineAfterTemporaries:s_emptyLineAfterTemporaries;
-	    spaceAfterReturnToken:s_spaceAfterReturnToken;
-	    spaceAfterKeywordSelector:s_spaceAfterKeywordSelector;
-	    spaceAfterBlockStart:s_spaceAfterBlockStart;
-	    spaceBeforeBlockEnd:s_spaceBeforeBlockEnd;
-	    cStyleBlocks:s_cStyleBlocks;
-	    blockArgumentsOnNewLine:s_blockArgumentsOnNewLine;
-	    maxLengthForSingleLineBlocks:s_maxLengthForSingleLineBlocks.
+        self editorText value:(RBFormatter format:(self class exampleText)).
+
+        RBFormatter
+            tabIndent:s_tabIndent;
+            spaceAroundTemporaries:s_spaceAroundTemporaries;
+            emptyLineAfterTemporaries:s_emptyLineAfterTemporaries;
+            spaceAfterReturnToken:s_spaceAfterReturnToken;
+            spaceAfterKeywordSelector:s_spaceAfterKeywordSelector;
+            spaceAfterBlockStart:s_spaceAfterBlockStart;
+            spaceBeforeBlockEnd:s_spaceBeforeBlockEnd;
+            cStyleBlocks:s_cStyleBlocks;
+            blockArgumentsOnNewLine:s_blockArgumentsOnNewLine;
+            maxLengthForSingleLineBlocks:s_maxLengthForSingleLineBlocks.
       ].
 !
 
@@ -14115,8 +14833,8 @@
 autoFormat
 
     autoFormat isNil ifTrue:[
-	autoFormat := currentUserPrefs autoFormatting asValue.
-	autoFormat onChangeSend:#updateModifiedChannel to:self
+        autoFormat := currentUserPrefs autoFormatting asValue.
+        autoFormat onChangeSend:#updateModifiedChannel to:self
     ].
     ^ autoFormat.
 !
@@ -14124,8 +14842,8 @@
 blockArgumentsOnNewLine
 
     blockArgumentsOnNewLine isNil ifTrue:[
-	blockArgumentsOnNewLine := true asValue.
-	blockArgumentsOnNewLine addDependent:self.
+        blockArgumentsOnNewLine := true asValue.
+        blockArgumentsOnNewLine addDependent:self.
     ].
     ^ blockArgumentsOnNewLine.
 !
@@ -14133,8 +14851,8 @@
 cStyleBlocks
 
     cStyleBlocks isNil ifTrue:[
-	cStyleBlocks := true asValue.
-	cStyleBlocks addDependent:self.
+        cStyleBlocks := true asValue.
+        cStyleBlocks addDependent:self.
     ].
     ^ cStyleBlocks.
 !
@@ -14142,7 +14860,7 @@
 editorText
 
     editorText isNil ifTrue:[
-	editorText := ValueHolder new.
+        editorText := ValueHolder new.
     ].
     ^ editorText.
 !
@@ -14150,8 +14868,8 @@
 emptyLineAfterTemporaries
 
     emptyLineAfterTemporaries isNil ifTrue:[
-	emptyLineAfterTemporaries := true asValue.
-	emptyLineAfterTemporaries addDependent:self.
+        emptyLineAfterTemporaries := true asValue.
+        emptyLineAfterTemporaries addDependent:self.
     ].
     ^ emptyLineAfterTemporaries.
 !
@@ -14159,8 +14877,8 @@
 maxLengthForSingleLineBlocks
 
     maxLengthForSingleLineBlocks isNil ifTrue:[
-	maxLengthForSingleLineBlocks := ValueHolder new.
-	maxLengthForSingleLineBlocks addDependent:self.
+        maxLengthForSingleLineBlocks := ValueHolder new.
+        maxLengthForSingleLineBlocks addDependent:self.
     ].
     ^ maxLengthForSingleLineBlocks.
 !
@@ -14168,8 +14886,8 @@
 spaceAfterBlockStart
 
     spaceAfterBlockStart isNil ifTrue:[
-	spaceAfterBlockStart := true asValue.
-	spaceAfterBlockStart addDependent:self.
+        spaceAfterBlockStart := true asValue.
+        spaceAfterBlockStart addDependent:self.
     ].
     ^ spaceAfterBlockStart.
 !
@@ -14177,8 +14895,8 @@
 spaceAfterKeywordSelector
 
     spaceAfterKeywordSelector isNil ifTrue:[
-	spaceAfterKeywordSelector := true asValue.
-	spaceAfterKeywordSelector addDependent:self.
+        spaceAfterKeywordSelector := true asValue.
+        spaceAfterKeywordSelector addDependent:self.
     ].
     ^ spaceAfterKeywordSelector.
 !
@@ -14186,8 +14904,8 @@
 spaceAfterReturnToken
 
     spaceAfterReturnToken isNil ifTrue:[
-	spaceAfterReturnToken := true asValue.
-	spaceAfterReturnToken addDependent:self.
+        spaceAfterReturnToken := true asValue.
+        spaceAfterReturnToken addDependent:self.
     ].
     ^ spaceAfterReturnToken.
 !
@@ -14195,8 +14913,8 @@
 spaceAroundTemporaries
 
     spaceAroundTemporaries isNil ifTrue:[
-	spaceAroundTemporaries := true asValue.
-	spaceAroundTemporaries addDependent:self.
+        spaceAroundTemporaries := true asValue.
+        spaceAroundTemporaries addDependent:self.
     ].
     ^ spaceAroundTemporaries.
 !
@@ -14204,8 +14922,8 @@
 spaceBeforeBlockEnd
 
     spaceBeforeBlockEnd isNil ifTrue:[
-	spaceBeforeBlockEnd := true asValue.
-	spaceBeforeBlockEnd addDependent:self.
+        spaceBeforeBlockEnd := true asValue.
+        spaceBeforeBlockEnd addDependent:self.
     ].
     ^ spaceBeforeBlockEnd.
 !
@@ -14213,8 +14931,8 @@
 tabIndent
 
     tabIndent isNil ifTrue:[
-	tabIndent := ValueHolder new.
-	tabIndent addDependent:self.
+        tabIndent := ValueHolder new.
+        tabIndent addDependent:self.
     ].
     ^ tabIndent.
 ! !
@@ -14233,14 +14951,14 @@
     or:[ changedObject == self spaceAroundTemporaries
     or:[ changedObject == self tabIndent]]]]]]]]])
     ifTrue:[
-	self updateModifiedChannel.
-	self reformat.
-	^ self
+        self updateModifiedChannel.
+        self reformat.
+        ^ self
     ].
     super
-	update:something
-	with:aParameter
-	from:changedObject
+        update:something
+        with:aParameter
+        from:changedObject
 ! !
 
 !AbstractSettingsApplication::SourceCodeFormatSettingsAppl methodsFor:'help'!
@@ -14254,10 +14972,10 @@
 initialize
     super initialize.
     RBFormatter isNil ifTrue:[
-	^ self warn:'Sorry, no RBFormatter class'
+        ^ self warn:'Sorry, no RBFormatter class'
     ].
     RBFormatter isLoaded ifFalse:[
-	WindowGroup activeGroup withWaitCursorDo:[RBFormatter autoload]
+        WindowGroup activeGroup withWaitCursorDo:[RBFormatter autoload]
     ].
     reformatLocked := false.
 !
@@ -14274,20 +14992,20 @@
     self autoFormat value ~= currentUserPrefs autoFormatting ? false ifTrue:[^ true].
 
     (self
-	hasChangedAspectIn:
-	    #(
-		tabIndent
-		spaceAroundTemporaries
-		emptyLineAfterTemporaries
-		spaceAfterReturnToken
-		spaceAfterKeywordSelector
-		spaceAfterBlockStart
-		spaceBeforeBlockEnd
-		cStyleBlocks
-		blockArgumentsOnNewLine
-		maxLengthForSingleLineBlocks
-	    )
-	asComparedTo:RBFormatter) ifTrue:[^ true].
+        hasChangedAspectIn:
+            #(
+                tabIndent
+                spaceAroundTemporaries
+                emptyLineAfterTemporaries
+                spaceAfterReturnToken
+                spaceAfterKeywordSelector
+                spaceAfterBlockStart
+                spaceBeforeBlockEnd
+                cStyleBlocks
+                blockArgumentsOnNewLine
+                maxLengthForSingleLineBlocks
+            )
+        asComparedTo:RBFormatter) ifTrue:[^ true].
 
     ^ false
 ! !
@@ -14395,8 +15113,8 @@
     <resource: #image>
 
     ^Icon
-	constantNamed:#'AbstractSettingsApplication::SourceCodeManagementSettingsAppl class defaultIcon'
-	ifAbsentPut:[(Depth8Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(8 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+        constantNamed:#'AbstractSettingsApplication::SourceCodeManagementSettingsAppl class defaultIcon'
+        ifAbsentPut:[(Depth8Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(8 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 @@@@@@@@@@@A@PHB@0P@@@@@@@@@@@@@@@@@@@HEA \HA $JB0HD@@@@@@@@@@@@@@HLA04NC0HD@@L@@ P@@@@@@@@@@@@ED@ NDP@@@@@@@@@D@@@@@@@@
 @@@BA \FAPP@@@@@@@@@@@P@@@@@@@@@AQ@RC0@@@@@@@@@@@@@@@@@@@@@@@@TGA!!DD@@@@@@@@@@@@@@@@@@@D@PDIA08OA@@@@@@@@@@@@@@@@@@@AP S
 A0XIBPXGC0P@@@@@@@@@@@@@@@@ECAPLBPXOAP@@@@@@EQX@@@@@@@@@@@TIE@XOAP@@@@@@EQ\XE @@@@@@@@@@AP$OAP@@@@@@FQ\ZE!! V@@@@@@@@@@@E
@@ -14427,396 +15145,396 @@
        name: windowSpec
        window:
       (WindowSpec
-	 label: 'Source Code Manager Settings'
-	 name: 'Source Code Manager Settings'
-	 flags: 1
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 660 639)
+         label: 'Source Code Manager Settings'
+         name: 'Source Code Manager Settings'
+         flags: 1
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 660 639)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (VerticalPanelViewSpec
-	     name: 'VerticalPanel2'
-	     layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-	     horizontalLayout: fit
-	     verticalLayout: topSpace
-	     horizontalSpace: 3
-	     verticalSpace: 20
-	     component:
-	    (SpecCollection
-	       collection: (
-		(VerticalPanelViewSpec
-		   name: 'VerticalPanel3'
-		   horizontalLayout: fit
-		   verticalLayout: top
-		   horizontalSpace: 3
-		   verticalSpace: 4
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (ViewSpec
-			 name: 'Box3'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Sourcecode Management'
-			       name: 'SourcecodeManagementCheckBox'
-			       layout: (LayoutFrame 5 0 0 0.0 332 0 30 0)
-			       activeHelpKey: useManager
-			       model: useManager
-			       translateLabel: true
-			     )
-			    (ComboListSpec
-			       name: 'ComboList1'
-			       layout: (LayoutFrame -151 1 0 0 -5 1 30 0)
-			       activeHelpKey: defaultManagerType
-			       visibilityChannel: moreThanOneManagerTypesAvailable
-			       enableChannel: useManager
-			       model: selectedManagerTypeIndexHolder
-			       comboList: availableManagerTypeNames
-			       useIndex: true
-			     )
-			    (LabelSpec
-			       label: 'Default Repository Type:'
-			       name: 'Label14'
-			       layout: (AlignmentOrigin -154 1 16 0 1 0.5)
-			       activeHelpKey: defaultManagerType
-			       translateLabel: true
-			       resizeForLabel: true
-			       adjust: right
-			     )
-			    )
-
-			 )
-			 extent: (Point 660 30)
-		       )
-		      (FramedBoxSpec
-			 label: 'Per Package Settings'
-			 name: 'PerPackageConfiguration'
-			 activeHelpKey: perPackageConfiguration
-			 labelPosition: topLeft
-			 translateLabel: true
-			 component:
-			(SpecCollection
-			   collection: (
-			    (VerticalPanelViewSpec
-			       name: 'RepositoryConfigurations'
-			       layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-			       activeHelpKey: perPackageConfiguration
-			       horizontalLayout: fit
-			       verticalLayout: bottomFit
-			       horizontalSpace: 3
-			       verticalSpace: 3
-			       component:
-			      (SpecCollection
-				 collection: (
-				  (ViewSpec
-				     name: 'RepositoryConfigurationListBox'
-				     activeHelpKey: perPackageConfiguration
-				     component:
-				    (SpecCollection
-				       collection: (
-					(DataSetSpec
-					   name: 'RepositoryConfigurationList'
-					   layout: (LayoutFrame 0 0 0 0 -122 1 0 1)
-					   enableChannel: useManager
-					   model: selectedManagerPerMatchingModuleHolder
-					   hasHorizontalScrollBar: true
-					   hasVerticalScrollBar: true
-					   dataList: managerPerMatchingModule
-					   columnHolder: managerPerMatchingModuleColumns
-					   beDependentOfRows: true
-					 )
-					(VerticalPanelViewSpec
-					   name: 'Buttons1'
-					   layout: (LayoutFrame -121 1 0 0 0 1 -22 1)
-					   horizontalLayout: fit
-					   verticalLayout: top
-					   horizontalSpace: 5
-					   verticalSpace: 3
-					   component:
-					  (SpecCollection
-					     collection: (
-					      (ActionButtonSpec
-						 label: 'Add...'
-						 name: 'ButtonAdd'
-						 activeHelpKey: addPerPackageManager
-						 translateLabel: true
-						 model: actionAdd
-						 extent: (Point 121 30)
-					       )
-					      (ActionButtonSpec
-						 label: 'Edit...'
-						 name: 'ButtonEdit'
-						 activeHelpKey: editPerPackageManager
-						 translateLabel: true
-						 model: actionEdit
-						 enableChannel: canRemoveManagerPerPackageEntry
-						 extent: (Point 121 30)
-					       )
-					      (ActionButtonSpec
-						 label: 'Move Up'
-						 name: 'ButtonModeUp'
-						 activeHelpKey: moveManagerUp
-						 translateLabel: true
-						 model: actionMoveUp
-						 enableChannel: canMoveUp
-						 extent: (Point 121 30)
-					       )
-					      (ActionButtonSpec
-						 label: 'Move Down'
-						 name: 'ButtonModeDown'
-						 activeHelpKey: moveManagerDown
-						 translateLabel: true
-						 model: actionMoveDown
-						 enableChannel: canMoveDown
-						 extent: (Point 121 30)
-					       )
-					      (LabelSpec
-						 name: 'SpacingLabel'
-						 translateLabel: true
-						 extent: (Point 121 22)
-					       )
-					      (ActionButtonSpec
-						 label: 'Remove'
-						 name: 'ButtonRemove'
-						 activeHelpKey: removePerPackageManager
-						 translateLabel: true
-						 model: actionRemove
-						 enableChannel: canRemoveManagerPerPackageEntry
-						 extent: (Point 121 30)
-					       )
-					      )
-
-					   )
-					 )
-					(ActionButtonSpec
-					   label: 'Test'
-					   name: 'Button2'
-					   layout: (LayoutFrame -90 1 -30 1 0 1 0 1)
-					   activeHelpKey: checkPerPackageManager
-					   translateLabel: true
-					   model: actionTest
-					 )
-					)
-
-				     )
-				     extent: (Point 626 266)
-				   )
-				  )
-
-			       )
-			     )
-			    )
-
-			 )
-			 extent: (Point 660 300)
-		       )
-		      (FramedBoxSpec
-			 label: 'Source Cache'
-			 name: 'SourceCacheBox'
-			 activeHelpKey: sourceCache
-			 labelPosition: topLeft
-			 translateLabel: true
-			 component:
-			(SpecCollection
-			   collection: (
-			    (ViewSpec
-			       name: 'SourceCacheDirBox'
-			       layout: (LayoutFrame 0 0 0 0 0 1 30 0)
-			       component:
-			      (SpecCollection
-				 collection: (
-				  (FilenameInputFieldSpec
-				     name: 'FilenameEntryField1'
-				     layout: (LayoutFrame 64 0.25 0 0 0 1 30 0)
-				     enableChannel: useManager
-				     model: sourceCacheDir
-				     immediateAccept: false
-				     acceptOnReturn: true
-				     acceptOnTab: true
-				     acceptOnLostFocus: true
-				     acceptOnPointerLeave: true
-				   )
-				  (LabelSpec
-				     label: 'Source Cache Dir:'
-				     name: 'SourceCacheDirLabel'
-				     layout: (LayoutFrame 0 0.0 0 0 60 0.25 30 0)
-				     translateLabel: true
-				     adjust: right
-				   )
-				  )
-
-			       )
-			     )
-			    (HorizontalPanelViewSpec
-			       name: 'CacheActionsHorizontalPanel1'
-			       layout: (LayoutFrame 0 0 37 0 0 1 67 0)
-			       horizontalLayout: right
-			       verticalLayout: center
-			       horizontalSpace: 3
-			       verticalSpace: 3
-			       component:
-			      (SpecCollection
-				 collection: (
-				  (ActionButtonSpec
-				     label: 'Fill Cache now'
-				     name: 'FillCacheInBackgroundButton'
-				     activeHelpKey: fillSourceCache
-				     translateLabel: true
-				     tabable: true
-				     model: fillSourceCache
-				     enableChannel: useManager
-				     extent: (Point 171 30)
-				   )
-				  )
-
-			       )
-			     )
-			    (HorizontalPanelViewSpec
-			       name: 'CacheActionsHorizontalPanel2'
-			       layout: (LayoutFrame 0 0 70 0 0 1 100 0)
-			       horizontalLayout: right
-			       verticalLayout: center
-			       horizontalSpace: 3
-			       verticalSpace: 3
-			       component:
-			      (SpecCollection
-				 collection: (
-				  (ActionButtonSpec
-				     label: 'Browse Cache'
-				     name: 'Button3'
-				     activeHelpKey: browseSourceCache
-				     translateLabel: true
-				     tabable: true
-				     model: browseSourceCache
-				     enableChannel: useManager
-				     extent: (Point 171 30)
-				   )
-				  (ViewSpec
-				     name: 'Box5'
-				     extent: (Point 20 10)
-				   )
-				  (ActionButtonSpec
-				     label: 'Flush Cache now'
-				     name: 'Button4'
-				     activeHelpKey: flushSourceCache
-				     translateLabel: true
-				     tabable: true
-				     model: flushSourceCache
-				     enableChannel: useManager
-				     extent: (Point 171 30)
-				   )
-				  (ActionButtonSpec
-				     label: 'Condense Cache now'
-				     name: 'Button5'
-				     activeHelpKey: condenseSourceCache
-				     translateLabel: true
-				     tabable: true
-				     model: condenseSourceCache
-				     enableChannel: useManager
-				     extent: (Point 171 30)
-				   )
-				  )
-
-			       )
-			     )
-			    )
-
-			 )
-			 extent: (Point 660 136)
-		       )
-		      (ViewSpec
-			 name: 'UseLocalSourceBox'
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'If Present, Use Local Source (Suppress Checkout)'
-			       name: 'CheckBox4'
-			       layout: (LayoutFrame 30 0 0 0 -5 1 30 0)
-			       activeHelpKey: useLocalSources
-			       enableChannel: useManager
-			       model: localSourceFirst
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 660 30)
-		       )
-		      (ViewSpec
-			 name: 'KeepMethodSourceBox'
-			 activeHelpKey: keepMethodSourceInImage
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Keep Method Source (In Image)'
-			       name: 'CheckBox7'
-			       layout: (LayoutFrame 30 0 0 0 -5 1 30 0)
-			       activeHelpKey: keepMethodSourceInImage
-			       enableChannel: useManager
-			       model: keepMethodSource
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 660 30)
-		       )
-		      (ViewSpec
-			 name: 'CheckForHaltSendsBox'
-			 activeHelpKey: checkClassesWhenCheckingIn
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Check for halt/error-Sends when Checking in'
-			       name: 'CheckBox5'
-			       layout: (LayoutFrame 30 0 0 0 -5 1 30 0)
-			       activeHelpKey: checkClassesWhenCheckingIn
-			       enableChannel: useManager
-			       model: checkClassesWhenCheckingIn
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 660 30)
-		       )
-		      (ViewSpec
-			 name: 'VerboseBox'
-			 activeHelpKey: verboseSourceCodeAccess
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Verbose (Trace Operations on Transcript)'
-			       name: 'CheckBox6'
-			       layout: (LayoutFrame 30 0 0 0 -5 1 30 0)
-			       activeHelpKey: verboseSourceCodeAccess
-			       enableChannel: useManager
-			       model: verboseSourceCodeAccess
-			       translateLabel: true
-			     )
-			    )
-
-			 )
-			 extent: (Point 660 30)
-		       )
-		      )
-
-		   )
-		   extent: (Point 660 768)
-		 )
-		)
-
-	     )
-	   )
-	  )
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel2'
+             layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+             horizontalLayout: fit
+             verticalLayout: topSpace
+             horizontalSpace: 3
+             verticalSpace: 20
+             component:
+            (SpecCollection
+               collection: (
+                (VerticalPanelViewSpec
+                   name: 'VerticalPanel3'
+                   horizontalLayout: fit
+                   verticalLayout: top
+                   horizontalSpace: 3
+                   verticalSpace: 4
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (ViewSpec
+                         name: 'Box3'
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Sourcecode Management'
+                               name: 'SourcecodeManagementCheckBox'
+                               layout: (LayoutFrame 5 0 0 0.0 332 0 30 0)
+                               activeHelpKey: useManager
+                               model: useManager
+                               translateLabel: true
+                             )
+                            (ComboListSpec
+                               name: 'ComboList1'
+                               layout: (LayoutFrame -151 1 0 0 -5 1 30 0)
+                               activeHelpKey: defaultManagerType
+                               visibilityChannel: moreThanOneManagerTypesAvailable
+                               enableChannel: useManager
+                               model: selectedManagerTypeIndexHolder
+                               comboList: availableManagerTypeNames
+                               useIndex: true
+                             )
+                            (LabelSpec
+                               label: 'Default Repository Type:'
+                               name: 'Label14'
+                               layout: (AlignmentOrigin -154 1 16 0 1 0.5)
+                               activeHelpKey: defaultManagerType
+                               translateLabel: true
+                               resizeForLabel: true
+                               adjust: right
+                             )
+                            )
+
+                         )
+                         extent: (Point 660 30)
+                       )
+                      (FramedBoxSpec
+                         label: 'Per Package Settings'
+                         name: 'PerPackageConfiguration'
+                         activeHelpKey: perPackageConfiguration
+                         labelPosition: topLeft
+                         translateLabel: true
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (VerticalPanelViewSpec
+                               name: 'RepositoryConfigurations'
+                               layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+                               activeHelpKey: perPackageConfiguration
+                               horizontalLayout: fit
+                               verticalLayout: bottomFit
+                               horizontalSpace: 3
+                               verticalSpace: 3
+                               component:
+                              (SpecCollection
+                                 collection: (
+                                  (ViewSpec
+                                     name: 'RepositoryConfigurationListBox'
+                                     activeHelpKey: perPackageConfiguration
+                                     component:
+                                    (SpecCollection
+                                       collection: (
+                                        (DataSetSpec
+                                           name: 'RepositoryConfigurationList'
+                                           layout: (LayoutFrame 0 0 0 0 -122 1 0 1)
+                                           enableChannel: useManager
+                                           model: selectedManagerPerMatchingModuleHolder
+                                           hasHorizontalScrollBar: true
+                                           hasVerticalScrollBar: true
+                                           dataList: managerPerMatchingModule
+                                           columnHolder: managerPerMatchingModuleColumns
+                                           beDependentOfRows: true
+                                         )
+                                        (VerticalPanelViewSpec
+                                           name: 'Buttons1'
+                                           layout: (LayoutFrame -121 1 0 0 0 1 -22 1)
+                                           horizontalLayout: fit
+                                           verticalLayout: top
+                                           horizontalSpace: 5
+                                           verticalSpace: 3
+                                           component:
+                                          (SpecCollection
+                                             collection: (
+                                              (ActionButtonSpec
+                                                 label: 'Add...'
+                                                 name: 'ButtonAdd'
+                                                 activeHelpKey: addPerPackageManager
+                                                 translateLabel: true
+                                                 model: actionAdd
+                                                 extent: (Point 121 30)
+                                               )
+                                              (ActionButtonSpec
+                                                 label: 'Edit...'
+                                                 name: 'ButtonEdit'
+                                                 activeHelpKey: editPerPackageManager
+                                                 translateLabel: true
+                                                 model: actionEdit
+                                                 enableChannel: canRemoveManagerPerPackageEntry
+                                                 extent: (Point 121 30)
+                                               )
+                                              (ActionButtonSpec
+                                                 label: 'Move Up'
+                                                 name: 'ButtonModeUp'
+                                                 activeHelpKey: moveManagerUp
+                                                 translateLabel: true
+                                                 model: actionMoveUp
+                                                 enableChannel: canMoveUp
+                                                 extent: (Point 121 30)
+                                               )
+                                              (ActionButtonSpec
+                                                 label: 'Move Down'
+                                                 name: 'ButtonModeDown'
+                                                 activeHelpKey: moveManagerDown
+                                                 translateLabel: true
+                                                 model: actionMoveDown
+                                                 enableChannel: canMoveDown
+                                                 extent: (Point 121 30)
+                                               )
+                                              (LabelSpec
+                                                 name: 'SpacingLabel'
+                                                 translateLabel: true
+                                                 extent: (Point 121 22)
+                                               )
+                                              (ActionButtonSpec
+                                                 label: 'Remove'
+                                                 name: 'ButtonRemove'
+                                                 activeHelpKey: removePerPackageManager
+                                                 translateLabel: true
+                                                 model: actionRemove
+                                                 enableChannel: canRemoveManagerPerPackageEntry
+                                                 extent: (Point 121 30)
+                                               )
+                                              )
+
+                                           )
+                                         )
+                                        (ActionButtonSpec
+                                           label: 'Test'
+                                           name: 'Button2'
+                                           layout: (LayoutFrame -90 1 -30 1 0 1 0 1)
+                                           activeHelpKey: checkPerPackageManager
+                                           translateLabel: true
+                                           model: actionTest
+                                         )
+                                        )
+
+                                     )
+                                     extent: (Point 626 266)
+                                   )
+                                  )
+
+                               )
+                             )
+                            )
+
+                         )
+                         extent: (Point 660 300)
+                       )
+                      (FramedBoxSpec
+                         label: 'Source Cache'
+                         name: 'SourceCacheBox'
+                         activeHelpKey: sourceCache
+                         labelPosition: topLeft
+                         translateLabel: true
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (ViewSpec
+                               name: 'SourceCacheDirBox'
+                               layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+                               component:
+                              (SpecCollection
+                                 collection: (
+                                  (FilenameInputFieldSpec
+                                     name: 'FilenameEntryField1'
+                                     layout: (LayoutFrame 64 0.25 0 0 0 1 30 0)
+                                     enableChannel: useManager
+                                     model: sourceCacheDir
+                                     immediateAccept: false
+                                     acceptOnReturn: true
+                                     acceptOnTab: true
+                                     acceptOnLostFocus: true
+                                     acceptOnPointerLeave: true
+                                   )
+                                  (LabelSpec
+                                     label: 'Source Cache Dir:'
+                                     name: 'SourceCacheDirLabel'
+                                     layout: (LayoutFrame 0 0.0 0 0 60 0.25 30 0)
+                                     translateLabel: true
+                                     adjust: right
+                                   )
+                                  )
+
+                               )
+                             )
+                            (HorizontalPanelViewSpec
+                               name: 'CacheActionsHorizontalPanel1'
+                               layout: (LayoutFrame 0 0 37 0 0 1 67 0)
+                               horizontalLayout: right
+                               verticalLayout: center
+                               horizontalSpace: 3
+                               verticalSpace: 3
+                               component:
+                              (SpecCollection
+                                 collection: (
+                                  (ActionButtonSpec
+                                     label: 'Fill Cache now'
+                                     name: 'FillCacheInBackgroundButton'
+                                     activeHelpKey: fillSourceCache
+                                     translateLabel: true
+                                     tabable: true
+                                     model: fillSourceCache
+                                     enableChannel: useManager
+                                     extent: (Point 171 30)
+                                   )
+                                  )
+
+                               )
+                             )
+                            (HorizontalPanelViewSpec
+                               name: 'CacheActionsHorizontalPanel2'
+                               layout: (LayoutFrame 0 0 70 0 0 1 100 0)
+                               horizontalLayout: right
+                               verticalLayout: center
+                               horizontalSpace: 3
+                               verticalSpace: 3
+                               component:
+                              (SpecCollection
+                                 collection: (
+                                  (ActionButtonSpec
+                                     label: 'Browse Cache'
+                                     name: 'Button3'
+                                     activeHelpKey: browseSourceCache
+                                     translateLabel: true
+                                     tabable: true
+                                     model: browseSourceCache
+                                     enableChannel: useManager
+                                     extent: (Point 171 30)
+                                   )
+                                  (ViewSpec
+                                     name: 'Box5'
+                                     extent: (Point 20 10)
+                                   )
+                                  (ActionButtonSpec
+                                     label: 'Flush Cache now'
+                                     name: 'Button4'
+                                     activeHelpKey: flushSourceCache
+                                     translateLabel: true
+                                     tabable: true
+                                     model: flushSourceCache
+                                     enableChannel: useManager
+                                     extent: (Point 171 30)
+                                   )
+                                  (ActionButtonSpec
+                                     label: 'Condense Cache now'
+                                     name: 'Button5'
+                                     activeHelpKey: condenseSourceCache
+                                     translateLabel: true
+                                     tabable: true
+                                     model: condenseSourceCache
+                                     enableChannel: useManager
+                                     extent: (Point 171 30)
+                                   )
+                                  )
+
+                               )
+                             )
+                            )
+
+                         )
+                         extent: (Point 660 136)
+                       )
+                      (ViewSpec
+                         name: 'UseLocalSourceBox'
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'If Present, Use Local Source (Suppress Checkout)'
+                               name: 'CheckBox4'
+                               layout: (LayoutFrame 30 0 0 0 -5 1 30 0)
+                               activeHelpKey: useLocalSources
+                               enableChannel: useManager
+                               model: localSourceFirst
+                               translateLabel: true
+                             )
+                            )
+
+                         )
+                         extent: (Point 660 30)
+                       )
+                      (ViewSpec
+                         name: 'KeepMethodSourceBox'
+                         activeHelpKey: keepMethodSourceInImage
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Keep Method Source (In Image)'
+                               name: 'CheckBox7'
+                               layout: (LayoutFrame 30 0 0 0 -5 1 30 0)
+                               activeHelpKey: keepMethodSourceInImage
+                               enableChannel: useManager
+                               model: keepMethodSource
+                               translateLabel: true
+                             )
+                            )
+
+                         )
+                         extent: (Point 660 30)
+                       )
+                      (ViewSpec
+                         name: 'CheckForHaltSendsBox'
+                         activeHelpKey: checkClassesWhenCheckingIn
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Check for halt/error-Sends when Checking in'
+                               name: 'CheckBox5'
+                               layout: (LayoutFrame 30 0 0 0 -5 1 30 0)
+                               activeHelpKey: checkClassesWhenCheckingIn
+                               enableChannel: useManager
+                               model: checkClassesWhenCheckingIn
+                               translateLabel: true
+                             )
+                            )
+
+                         )
+                         extent: (Point 660 30)
+                       )
+                      (ViewSpec
+                         name: 'VerboseBox'
+                         activeHelpKey: verboseSourceCodeAccess
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Verbose (Trace Operations on Transcript)'
+                               name: 'CheckBox6'
+                               layout: (LayoutFrame 30 0 0 0 -5 1 30 0)
+                               activeHelpKey: verboseSourceCodeAccess
+                               enableChannel: useManager
+                               model: verboseSourceCodeAccess
+                               translateLabel: true
+                             )
+                            )
+
+                         )
+                         extent: (Point 660 30)
+                       )
+                      )
+
+                   )
+                   extent: (Point 660 768)
+                 )
+                )
+
+             )
+           )
+          )
 
        )
      )
@@ -14839,22 +15557,22 @@
 
     ^#(
       (DataSetColumnSpec
-	 label: 'Module (PackageID Match)'
-	 labelButtonType: Button
-	 width: 0.5
-	 model: displayStringForPackage
-	 menuFromApplication: false
-	 writeSelector: package:
-	 canSelect: false
+         label: 'Module (PackageID Match)'
+         labelButtonType: Button
+         width: 0.5
+         model: displayStringForPackage
+         menuFromApplication: false
+         writeSelector: package:
+         canSelect: false
        )
       (DataSetColumnSpec
-	 label: 'Repository Type'
-	 labelButtonType: Button
-	 width: 0.5
-	 model: displayStringForManagerTypeName
-	 menuFromApplication: false
-	 writeSelector: manager:
-	 canSelect: false
+         label: 'Repository Type'
+         labelButtonType: Button
+         width: 0.5
+         model: displayStringForManagerTypeName
+         menuFromApplication: false
+         writeSelector: manager:
+         canSelect: false
        )
       )
 
@@ -14877,17 +15595,17 @@
     package := dlg package.
     mgr := dlg manager.
     oldEntry := managerPerMatchingModule
-		detect:[:entry | entry package = package and:[ entry manager = mgr ] ]
-		ifNone:nil.
+                detect:[:entry | entry package = package and:[ entry manager = mgr ] ]
+                ifNone:nil.
     oldEntry notNil
-	ifTrue:
-	    [ oldEntry manager:mgr.
-	    managerPerMatchingModule changed.
-	    idx := managerPerMatchingModule indexOf:oldEntry. ]
-	ifFalse:
-	    [ managerPerMatchingModule
-		add:(AbstractSourceCodeManager::PackageAndManager package:package manager:mgr).
-	    idx := managerPerMatchingModule size. ].
+        ifTrue:
+            [ oldEntry manager:mgr.
+            managerPerMatchingModule changed.
+            idx := managerPerMatchingModule indexOf:oldEntry. ]
+        ifFalse:
+            [ managerPerMatchingModule
+                add:(AbstractSourceCodeManager::PackageAndManager package:package manager:mgr).
+            idx := managerPerMatchingModule size. ].
     selectedManagerPerMatchingModuleHolder value:idx.
 
     "Created: / 18-04-2011 / 19:30:46 / cg"
@@ -14904,10 +15622,10 @@
     dlg package: entry package.
     dlg manager: entry manager.
     dlg open ifTrue:[
-	entry package: dlg package.
-	entry manager: dlg manager.
-	entry changed.
-	self updateModifiedChannel.
+        entry package: dlg package.
+        entry manager: dlg manager.
+        entry changed.
+        self updateModifiedChannel.
     ]
 
     "Modified: / 29-03-2012 / 11:53:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -14943,10 +15661,10 @@
     idx := self selectedManagerPerMatchingModuleHolder value.
     managerPerMatchingModule removeIndex:idx.
     managerPerMatchingModule size >= idx
-	ifTrue:[ selectedManagerPerMatchingModuleHolder value:idx. ]
-	ifFalse:
-	    [ managerPerMatchingModule size >= (idx - 1)
-		ifTrue:[ selectedManagerPerMatchingModuleHolder value:idx - 1. ]. ].
+        ifTrue:[ selectedManagerPerMatchingModuleHolder value:idx. ]
+        ifFalse:
+            [ managerPerMatchingModule size >= (idx - 1)
+                ifTrue:[ selectedManagerPerMatchingModuleHolder value:idx - 1. ]. ].
 
     "Created: / 18-04-2011 / 20:56:46 / cg"
 !
@@ -14961,7 +15679,7 @@
 
 addModule:module withData:data
     (self listOfModules includes:module) ifFalse:[
-	self listOfModules add:module; sort.
+        self listOfModules add:module; sort.
     ].
     rootsPerModule at:module put:data.
 
@@ -14977,30 +15695,30 @@
     self keepMethodSource value:(currentUserPrefs keepMethodSourceCode).
 
     self hasManager ifTrue:[
-	self useManager value:(manager := Smalltalk at:#SourceCodeManager) notNil.
-	self localSourceFirst value:Class tryLocalSourceFirst.
-	self sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName).
-
-	manager notNil ifTrue:[
-	    manager forgetDisabledModules.
-	].
+        self useManager value:(manager := Smalltalk at:#SourceCodeManager) notNil.
+        self localSourceFirst value:Class tryLocalSourceFirst.
+        self sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName).
+
+        manager notNil ifTrue:[
+            manager forgetDisabledModules.
+        ].
     ] ifFalse:[
-	self useManager value:false.
-	self localSourceFirst value:false.
+        self useManager value:false.
+        self localSourceFirst value:false.
     ].
 
     self managerPerMatchingModule removeAll.
     AbstractSourceCodeManager managerPerMatchingModuleDefinitions do:[:each |
-	self managerPerMatchingModule add: each copy
+        self managerPerMatchingModule add: each copy
     ].
 
     self availableManagers do:[:eachManager |
-	|infoPerModule|
-
-	infoPerModule := eachManager repositoryInfoPerModule.
-	infoPerModule keysAndValuesDo:[:module :info |
-	    rootsPerModule at:module put:(Array with:eachManager with:info).
-	].
+        |infoPerModule|
+
+        infoPerModule := eachManager repositoryInfoPerModule.
+        infoPerModule keysAndValuesDo:[:module :info |
+            rootsPerModule at:module put:(Array with:eachManager with:info).
+        ].
     ].
 
     self updateSelectedManager.
@@ -15008,8 +15726,8 @@
     self checkClassesWhenCheckingIn value:(currentUserPrefs at:#checkClassesWhenCheckingIn ifAbsent:true).
 
     rootsPerModule notNil ifTrue:[
-	self listOfModules removeAll.
-	listOfModules addAll:rootsPerModule keys asList.
+        self listOfModules removeAll.
+        listOfModules addAll:rootsPerModule keys asList.
     ].
 "/    self selectedPerModuleRootChanged.
 
@@ -15026,61 +15744,61 @@
     currentUserPrefs keepMethodSourceCode:(self keepMethodSource value).
 
     (self hasManager and:[self useManager value]) ifTrue:[
-	manager ~~ self selectedManager ifTrue:[
-	    manager := nil.
-	].
-
-	manager isNil ifTrue:[
-	    manager := self selectedManager.
-	    manager isNil ifTrue:[
-		manager := self availableManagers first.
-	    ].
-	].
-	Smalltalk at:#SourceCodeManager put:manager.
-
-	manager notNil ifTrue:[
-	    | nm fn|
-
-	    nm := self sourceCacheDir value.
-	    nm notEmptyOrNil ifTrue:[
-		(fn := nm asFilename) exists ifFalse:[
-		    (self confirm:('CVS cache directory ''' , nm , ''' does not exist\create ?' withCRs)) ifTrue:[
-			fn recursiveMakeDirectory;
-			   makeReadableForAll;
-			   makeWritableForAll;
-			   makeExecutableForAll.
-		    ]
-		].
-		(fn isWritableDirectory and:[fn isReadable]) ifTrue:[
-		    AbstractSourceCodeManager cacheDirectoryName:nm.
-		] ifFalse:[
-		    self warn:'Invalid sourceCache directory.'
-		]
-	    ].
-	].
-
-	AbstractSourceCodeManager
-	    managerPerMatchingModuleDefinitions:
-		managerPerMatchingModule asOrderedCollection.
-
-	self availableManagers do:[:eachManager |
-	    |infoPerModule|
-
-	    modules := rootsPerModule select:[:entry | entry first == eachManager].
-	    infoPerModule := Dictionary new.
-	    modules keysAndValuesDo:[:module :entry |
-		entry first == eachManager ifTrue:[
-		    infoPerModule at:module put:(entry second).
-		].
-	    ].
-	    eachManager repositoryInfoPerModule:infoPerModule.
-	].
-
-	self sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName).
-
-	DebugView newDebugger. "/ ???
+        manager ~~ self selectedManager ifTrue:[
+            manager := nil.
+        ].
+
+        manager isNil ifTrue:[
+            manager := self selectedManager.
+            manager isNil ifTrue:[
+                manager := self availableManagers first.
+            ].
+        ].
+        Smalltalk at:#SourceCodeManager put:manager.
+
+        manager notNil ifTrue:[
+            | nm fn|
+
+            nm := self sourceCacheDir value.
+            nm notEmptyOrNil ifTrue:[
+                (fn := nm asFilename) exists ifFalse:[
+                    (self confirm:('CVS cache directory ''' , nm , ''' does not exist\create ?' withCRs)) ifTrue:[
+                        fn recursiveMakeDirectory;
+                           makeReadableForAll;
+                           makeWritableForAll;
+                           makeExecutableForAll.
+                    ]
+                ].
+                (fn isWritableDirectory and:[fn isReadable]) ifTrue:[
+                    AbstractSourceCodeManager cacheDirectoryName:nm.
+                ] ifFalse:[
+                    self warn:'Invalid sourceCache directory.'
+                ]
+            ].
+        ].
+
+        AbstractSourceCodeManager
+            managerPerMatchingModuleDefinitions:
+                managerPerMatchingModule asOrderedCollection.
+
+        self availableManagers do:[:eachManager |
+            |infoPerModule|
+
+            modules := rootsPerModule select:[:entry | entry first == eachManager].
+            infoPerModule := Dictionary new.
+            modules keysAndValuesDo:[:module :entry |
+                entry first == eachManager ifTrue:[
+                    infoPerModule at:module put:(entry second).
+                ].
+            ].
+            eachManager repositoryInfoPerModule:infoPerModule.
+        ].
+
+        self sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName).
+
+        DebugView newDebugger. "/ ???
     ] ifFalse:[
-	Smalltalk at:#SourceCodeManager put:nil
+        Smalltalk at:#SourceCodeManager put:nil
     ].
 
     self acceptChannel value.
@@ -15093,7 +15811,7 @@
     <resource: #uiCallback>
 
     UserPreferences fileBrowserClass openOn:
-	self sourceCacheDir value
+        self sourceCacheDir value
 
     "Modified: / 12-10-2011 / 11:11:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -15109,20 +15827,20 @@
     |p|
 
     FillCacheProcess notNil ifTrue:[
-	FillCacheProcess terminate
+        FillCacheProcess terminate
     ].
     FillCacheProcess := p :=
-	[
-	    [
-		Smalltalk allClasses do:[:eachClass |
-		    eachClass source
-		]
-	    ] ensure:[
-		(FillCacheProcess == p) ifTrue:[
-		    FillCacheProcess := nil
-		]
-	    ].
-	] forkAt:(Processor systemBackgroundPriority)
+        [
+            [
+                Smalltalk allClasses do:[:eachClass |
+                    eachClass source
+                ]
+            ] ensure:[
+                (FillCacheProcess == p) ifTrue:[
+                    FillCacheProcess := nil
+                ]
+            ].
+        ] forkAt:(Processor systemBackgroundPriority)
 !
 
 flushSourceCache
@@ -15149,8 +15867,8 @@
    AbstractLauncherApplication::LauncherDialogs cvsConfigurationDialog.
    manager := (Smalltalk at:#SourceCodeManager).
    manager notNil ifTrue:[
-	repositoryHolder value: manager repositoryName.
-	sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName).
+        repositoryHolder value: manager repositoryName.
+        sourceCacheDir value:(AbstractSourceCodeManager cacheDirectoryName).
    ].
 
     "Modified: / 16-08-2006 / 11:07:51 / cg"
@@ -15161,7 +15879,7 @@
 acceptChannel
 
     acceptChannel isNil ifTrue:[
-	acceptChannel := TriggerValue new.
+        acceptChannel := TriggerValue new.
     ].
     ^ acceptChannel.
 !
@@ -15174,8 +15892,8 @@
 
 availableManagers
     availableManagers isNil ifTrue:[
-	availableManagers := AbstractSourceCodeManager availableManagers copy.
-	availableManagers := availableManagers sort:[:a :b | a managerTypeName asLowercase < b managerTypeName asLowercase].
+        availableManagers := AbstractSourceCodeManager availableManagers copy.
+        availableManagers := availableManagers sort:[:a :b | a managerTypeName asLowercase < b managerTypeName asLowercase].
     ].
     ^ availableManagers.
 
@@ -15189,12 +15907,12 @@
 
 canMoveDown
     ^ BlockValue
-	with:
-	    [:sel |
-	    sel notNil
-		and:[sel ~~ 0
-		    and:[sel ~~ managerPerMatchingModule size]]]
-	argument:(self selectedManagerPerMatchingModuleHolder)
+        with:
+            [:sel |
+            sel notNil
+                and:[sel ~~ 0
+                    and:[sel ~~ managerPerMatchingModule size]]]
+        argument:(self selectedManagerPerMatchingModuleHolder)
 
     "Created: / 18-04-2011 / 20:52:48 / cg"
     "Created: / 09-07-2011 / 14:18:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -15202,11 +15920,11 @@
 
 canMoveUp
     ^ BlockValue
-	with:
-	    [:sel |
-	    sel notNil
-		and:[sel > 1]]
-	argument:(self selectedManagerPerMatchingModuleHolder)
+        with:
+            [:sel |
+            sel notNil
+                and:[sel > 1]]
+        argument:(self selectedManagerPerMatchingModuleHolder)
 
     "Created: / 18-04-2011 / 20:52:48 / cg"
     "Created: / 09-07-2011 / 14:18:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -15214,9 +15932,9 @@
 
 canRemoveManagerPerPackageEntry
     ^ BlockValue
-	with:[:sel :use | sel notNil and:[sel ~~ 0 and:[use]] ]
-	argument:(self selectedManagerPerMatchingModuleHolder)
-	argument:(self useManager)
+        with:[:sel :use | sel notNil and:[sel ~~ 0 and:[use]] ]
+        argument:(self selectedManagerPerMatchingModuleHolder)
+        argument:(self useManager)
 
     "Created: / 18-04-2011 / 20:52:48 / cg"
 !
@@ -15224,8 +15942,8 @@
 checkClassesWhenCheckingIn
 
     checkClassesWhenCheckingIn isNil ifTrue:[
-	checkClassesWhenCheckingIn := (currentUserPrefs at:#checkClassesWhenCheckingIn ifAbsent:true) asValue.
-	checkClassesWhenCheckingIn onChangeSend:#updateModifiedChannel to:self
+        checkClassesWhenCheckingIn := (currentUserPrefs at:#checkClassesWhenCheckingIn ifAbsent:true) asValue.
+        checkClassesWhenCheckingIn onChangeSend:#updateModifiedChannel to:self
     ].
     ^ checkClassesWhenCheckingIn.
 !
@@ -15233,8 +15951,8 @@
 keepMethodSource
 
     keepMethodSource isNil ifTrue:[
-	keepMethodSource := ValueHolder new.
-	keepMethodSource onChangeSend:#updateModifiedChannel to:self
+        keepMethodSource := ValueHolder new.
+        keepMethodSource onChangeSend:#updateModifiedChannel to:self
     ].
     ^ keepMethodSource.
 !
@@ -15242,11 +15960,11 @@
 listOfModules
 
     listOfModules isNil ifTrue:[
-	rootsPerModule notNil ifTrue:[
-	    listOfModules := rootsPerModule keys asList.
-	].
-	listOfModules sort.
-	listOfModules onChangeSend:#updateModifiedChannel to:self
+        rootsPerModule notNil ifTrue:[
+            listOfModules := rootsPerModule keys asList.
+        ].
+        listOfModules sort.
+        listOfModules onChangeSend:#updateModifiedChannel to:self
     ].
     ^ listOfModules.
 !
@@ -15254,16 +15972,16 @@
 localSourceFirst
 
     localSourceFirst isNil ifTrue:[
-	localSourceFirst := ValueHolder new.
-	localSourceFirst onChangeSend:#updateModifiedChannel to:self
+        localSourceFirst := ValueHolder new.
+        localSourceFirst onChangeSend:#updateModifiedChannel to:self
     ].
     ^ localSourceFirst.
 !
 
 managerIsCVSSourceCodeManager
     managerIsCVSSourceCodeManager isNil ifTrue:[
-	managerIsCVSSourceCodeManager := (SourceCodeManager notNil and:
-					 [SourceCodeManager isCVS]) asValue.
+        managerIsCVSSourceCodeManager := (SourceCodeManager notNil and:
+                                         [SourceCodeManager isCVS]) asValue.
     ].
     ^ managerIsCVSSourceCodeManager.
 
@@ -15272,8 +15990,8 @@
 
 managerIsSmallTeamSourceCodeManager
     managerIsSmallTeamSourceCodeManager isNil ifTrue:[
-	managerIsSmallTeamSourceCodeManager := (SourceCodeManager notNil and:
-					 [SourceCodeManager isSmallTeam]) asValue.
+        managerIsSmallTeamSourceCodeManager := (SourceCodeManager notNil and:
+                                         [SourceCodeManager isSmallTeam]) asValue.
     ].
     ^ managerIsSmallTeamSourceCodeManager.
 
@@ -15282,8 +16000,8 @@
 
 managerIsStoreSourceCodeManager
     managerIsStoreSourceCodeManager isNil ifTrue:[
-	managerIsStoreSourceCodeManager := (SourceCodeManager notNil and:
-					 [SourceCodeManager isStore]) asValue.
+        managerIsStoreSourceCodeManager := (SourceCodeManager notNil and:
+                                         [SourceCodeManager isStore]) asValue.
     ].
     ^ managerIsStoreSourceCodeManager.
 
@@ -15292,8 +16010,8 @@
 
 managerPerMatchingModule
     managerPerMatchingModule isNil ifTrue:[
-	managerPerMatchingModule := List new.
-	managerPerMatchingModule onChangeSend:#updateModifiedChannel to:self
+        managerPerMatchingModule := List new.
+        managerPerMatchingModule onChangeSend:#updateModifiedChannel to:self
     ].
     ^ managerPerMatchingModule.
 
@@ -15302,7 +16020,7 @@
 
 managerTypeIndexToAddHolder
     managerTypeIndexToAddHolder isNil ifTrue:[
-	managerTypeIndexToAddHolder := ValueHolder new.
+        managerTypeIndexToAddHolder := ValueHolder new.
     ].
     ^ managerTypeIndexToAddHolder.
 
@@ -15311,7 +16029,7 @@
 
 managerTypeToAddHolder
     managerTypeToAddHolder isNil ifTrue:[
-	managerTypeToAddHolder := ValueHolder new.
+        managerTypeToAddHolder := ValueHolder new.
     ].
     ^ managerTypeToAddHolder.
 
@@ -15326,7 +16044,7 @@
 
 packageToAddHolder
     packageToAddHolder isNil ifTrue:[
-	packageToAddHolder := ValueHolder new.
+        packageToAddHolder := ValueHolder new.
     ].
     ^ packageToAddHolder.
 
@@ -15336,23 +16054,23 @@
 perModuleFieldsEnableHolder
 
     perModuleFieldsEnableHolder isNil ifTrue:[
-	perModuleFieldsEnableHolder := true asValue.
-	perModuleFieldsEnableHolder addDependent:self.
+        perModuleFieldsEnableHolder := true asValue.
+        perModuleFieldsEnableHolder addDependent:self.
     ].
     ^ perModuleFieldsEnableHolder.
 !
 
 perModuleRoot
     perModuleRoot isNil ifTrue:[
-	perModuleRoot := ValueHolder new.
-	perModuleRoot addDependent:self.
+        perModuleRoot := ValueHolder new.
+        perModuleRoot addDependent:self.
     ].
     ^ perModuleRoot.
 !
 
 perModuleRootModule
     perModuleRootModule isNil ifTrue:[
-	perModuleRootModule := ValueHolder new.
+        perModuleRootModule := ValueHolder new.
     ].
     ^ perModuleRootModule.
 !
@@ -15360,7 +16078,7 @@
 removeEnabled
 
     removeEnabled isNil ifTrue:[
-	removeEnabled := false asValue.
+        removeEnabled := false asValue.
     ].
     ^ removeEnabled.
 !
@@ -15370,7 +16088,7 @@
 
     availableManagers := self availableManagers.
     availableManagers size == 1 ifTrue:[
-	^ availableManagers anElement
+        ^ availableManagers anElement
     ].
 
     idx := self selectedManagerTypeIndexHolder value.
@@ -15382,8 +16100,8 @@
 
 selectedManagerPerMatchingModuleHolder
     selectedManagerPerMatchingModuleHolder isNil ifTrue:[
-	selectedManagerPerMatchingModuleHolder := nil asValue.
-	selectedManagerPerMatchingModuleHolder addDependent:self.
+        selectedManagerPerMatchingModuleHolder := nil asValue.
+        selectedManagerPerMatchingModuleHolder addDependent:self.
     ].
     ^ selectedManagerPerMatchingModuleHolder.
 
@@ -15394,16 +16112,16 @@
     |selectedManager|
 
     selectedManagerTypeIndexHolder isNil ifTrue:[
-	selectedManagerTypeIndexHolder := nil asValue.
-	selectedManagerTypeIndexHolder onChangeEvaluate:[
-	    selectedManager := self selectedManager.
-	    self managerIsCVSSourceCodeManager value:( selectedManager notNil and:[ selectedManager isCVS] ).
-	    self managerIsStoreSourceCodeManager value:( selectedManager notNil and:[ selectedManager isStore] ).
-	    self managerIsSmallTeamSourceCodeManager value:( selectedManager notNil and:[ selectedManager isSmallTeam] ).
-	    self updateModifiedChannel
-	].
-
-	self updateSelectedManager.
+        selectedManagerTypeIndexHolder := nil asValue.
+        selectedManagerTypeIndexHolder onChangeEvaluate:[
+            selectedManager := self selectedManager.
+            self managerIsCVSSourceCodeManager value:( selectedManager notNil and:[ selectedManager isCVS] ).
+            self managerIsStoreSourceCodeManager value:( selectedManager notNil and:[ selectedManager isStore] ).
+            self managerIsSmallTeamSourceCodeManager value:( selectedManager notNil and:[ selectedManager isSmallTeam] ).
+            self updateModifiedChannel
+        ].
+
+        self updateSelectedManager.
     ].
     ^ selectedManagerTypeIndexHolder.
 
@@ -15413,32 +16131,32 @@
 
 selectedPerModuleRoot
     selectedPerModuleRoot isNil ifTrue:[
-	selectedPerModuleRoot := ValueHolder new.
-	selectedPerModuleRoot addDependent:self.
+        selectedPerModuleRoot := ValueHolder new.
+        selectedPerModuleRoot addDependent:self.
     ].
     ^ selectedPerModuleRoot.
 !
 
 sourceCacheDir
     sourceCacheDir isNil ifTrue:[
-	sourceCacheDir := ValueHolder new.
-	sourceCacheDir onChangeSend:#updateModifiedChannel to:self
+        sourceCacheDir := ValueHolder new.
+        sourceCacheDir onChangeSend:#updateModifiedChannel to:self
     ].
     ^ sourceCacheDir.
 !
 
 useManager
     useManager isNil ifTrue:[
-	useManager := ValueHolder new.
-	useManager onChangeSend:#updateModifiedChannel to:self
+        useManager := ValueHolder new.
+        useManager onChangeSend:#updateModifiedChannel to:self
     ].
     ^ useManager.
 !
 
 verboseSourceCodeAccess
     verboseSourceCodeAccess isNil ifTrue:[
-	verboseSourceCodeAccess := false asValue.
-	verboseSourceCodeAccess onChangeSend:#updateModifiedChannel to:self
+        verboseSourceCodeAccess := false asValue.
+        verboseSourceCodeAccess onChangeSend:#updateModifiedChannel to:self
     ].
     ^ verboseSourceCodeAccess.
 ! !
@@ -15451,21 +16169,21 @@
     self acceptChannel value:true.
     module := self selectedPerModuleRoot value.
     module isNil ifTrue:[
-	self removeEnabled value:false.
-	self perModuleRootModule value:' '.
-	self perModuleRoot value:''.
-	^ self
+        self removeEnabled value:false.
+        self perModuleRootModule value:' '.
+        self perModuleRoot value:''.
+        ^ self
     ].
 
     entry := rootsPerModule at:module ifAbsent:#().
     (entry first = CVSSourceCodeManager) ifTrue:[
-	self removeEnabled value:true.
-	self perModuleRootModule value:module.
-	self perModuleRoot value:(entry at:2).
+        self removeEnabled value:true.
+        self perModuleRootModule value:module.
+        self perModuleRoot value:(entry at:2).
     ] ifFalse:[
-	self removeEnabled value:false.
-	self perModuleRootModule value:module , ' ',('<<use ',entry first managerTypeName,'>>') allBold.
-	self perModuleRoot value:''.
+        self removeEnabled value:false.
+        self perModuleRootModule value:module , ' ',('<<use ',entry first managerTypeName,'>>') allBold.
+        self perModuleRoot value:''.
     ].
 !
 
@@ -15480,41 +16198,41 @@
     nm isEmptyOrNil ifTrue:[^ self].
 
     (fn := nm asFilename) exists ifFalse:[
-	(self confirm:(resources
-			    stringWithCRs:'SourceCache directory "%1" does not exist.\Create ?'
-			    with:nm)
-	) ifFalse:[
-	    self sourceCacheDir value:previousDir.
-	    ^ self.
-	].
-	fn
-	    recursiveMakeDirectory;
-	    makeReadableForAll;
-	    makeWritableForAll;
-	    makeExecutableForAll.
-	^ self.
+        (self confirm:(resources
+                            stringWithCRs:'SourceCache directory "%1" does not exist.\Create ?'
+                            with:nm)
+        ) ifFalse:[
+            self sourceCacheDir value:previousDir.
+            ^ self.
+        ].
+        fn
+            recursiveMakeDirectory;
+            makeReadableForAll;
+            makeWritableForAll;
+            makeExecutableForAll.
+        ^ self.
     ].
 
     (fn isDirectory) ifFalse:[
-	self warn:(resources
-			    stringWithCRs:'Not a directory: "%1"'
-			    with:nm).
-	self sourceCacheDir value:previousDir.
-	^ self.
+        self warn:(resources
+                            stringWithCRs:'Not a directory: "%1"'
+                            with:nm).
+        self sourceCacheDir value:previousDir.
+        ^ self.
     ].
 
     (fn isWritableDirectory and:[fn isReadable]) ifFalse:[
-	(self confirm:(resources
-			    stringWithCRs:'SourceCache directory "%1" is not both readable and writable.\Change ?'
-			    with:nm)
-	) ifFalse:[
-	    self sourceCacheDir value:previousDir.
-	    ^ self.
-	].
-	fn
-	    makeReadableForAll;
-	    makeWritableForAll;
-	    makeExecutableForAll.
+        (self confirm:(resources
+                            stringWithCRs:'SourceCache directory "%1" is not both readable and writable.\Change ?'
+                            with:nm)
+        ) ifFalse:[
+            self sourceCacheDir value:previousDir.
+            ^ self.
+        ].
+        fn
+            makeReadableForAll;
+            makeWritableForAll;
+            makeExecutableForAll.
     ].
 "/    (fn isReadableForAll and:[fn isWritableForAll]) ifFalse:[
 "/        (self confirm:(resources
@@ -15533,19 +16251,19 @@
     |idx entry|
 
     changedObject == sourceCacheDir ifTrue:[
-	self sourceDirChanged.
-	self updateModifiedChannel.
-	^ self
+        self sourceDirChanged.
+        self updateModifiedChannel.
+        ^ self
     ].
 
     changedObject == selectedManagerPerMatchingModuleHolder ifTrue:[
-	idx := changedObject value.
-	(idx notNil and:[idx ~~ 0]) ifTrue:[
-	    entry := self managerPerMatchingModule at:idx.
-	    self packageToAddHolder value:(entry package).
-	    self managerTypeToAddHolder value:(entry managerTypeName).
-	].
-	^ self.
+        idx := changedObject value.
+        (idx notNil and:[idx ~~ 0]) ifTrue:[
+            entry := self managerPerMatchingModule at:idx.
+            self packageToAddHolder value:(entry package).
+            self managerTypeToAddHolder value:(entry managerTypeName).
+        ].
+        ^ self.
     ].
 
     super update:something with:aParameter from:changedObject
@@ -15561,9 +16279,9 @@
 
     selectedManagerTypeIndex := availableManagers indexOf:SourceCodeManager.
     selectedManagerTypeIndex == 0 ifTrue:[
-	availableManagers size == 1 ifTrue:[
-	    selectedManagerTypeIndex := 1.
-	].
+        availableManagers size == 1 ifTrue:[
+            selectedManagerTypeIndex := 1.
+        ].
     ].
     self selectedManagerTypeIndexHolder value:selectedManagerTypeIndex.
 ! !
@@ -15599,13 +16317,13 @@
     rootsPerModule := Dictionary new.
 
     self availableManagers do:[:eachManager |
-	eachManager repositoryInfoPerModule
-	    keysAndValuesDo:[:module :info |
-		module withoutSeparators ~= module ifTrue:[
-		    self halt:'should not happen any longer'
-		].
-		rootsPerModule at:module put:(Array with:eachManager with:info)
-	    ].
+        eachManager repositoryInfoPerModule
+            keysAndValuesDo:[:module :info |
+                module withoutSeparators ~= module ifTrue:[
+                    self halt:'should not happen any longer'
+                ].
+                rootsPerModule at:module put:(Array with:eachManager with:info)
+            ].
     ].
 
     super initialize.
@@ -15620,10 +16338,10 @@
 
     cvsDir := 'CVS' asFilename.
     cvsDir isDirectory ifTrue:[
-	cvsRootFile := cvsDir construct:'Root'.
-	cvsRootFile isReadable ifTrue:[
-	    cvsRoot := cvsRootFile contents firstIfEmpty:nil.
-	].
+        cvsRootFile := cvsDir construct:'Root'.
+        cvsRootFile isReadable ifTrue:[
+            cvsRoot := cvsRootFile contents firstIfEmpty:nil.
+        ].
     ].
     ^ cvsRoot
 !
@@ -15643,30 +16361,30 @@
     ((self selectedManager cacheDirectoryName ? '') ~= (self sourceCacheDir value ? '')) ifTrue:[^ true].
 
     ((currentUserPrefs at:#checkClassesWhenCheckingIn ifAbsent:true) ~= self checkClassesWhenCheckingIn value)
-	ifTrue:[^ true].
+        ifTrue:[^ true].
 
     ((currentUserPrefs keepMethodSourceCode) ~= self keepMethodSource value)
-	ifTrue:[^ true].
+        ifTrue:[^ true].
 
     ((AbstractSourceCodeManager managerPerMatchingModuleDefinitions)
-	~= (self managerPerMatchingModule asOrderedCollection)) ifTrue:[^ true].
+        ~= (self managerPerMatchingModule asOrderedCollection)) ifTrue:[^ true].
 
     (AbstractSourceCodeManager verboseSourceCodeAccess
-	~= self verboseSourceCodeAccess value) ifTrue:[^ true].
+        ~= self verboseSourceCodeAccess value) ifTrue:[^ true].
 
     self availableManagers do:[:mgr |
-	|modules|
-
-	modules := rootsPerModule select:[:entry | entry first == mgr].
-
-	mgr repositoryInfoPerModule keysAndValuesDo:[:module :info |
-	    ((modules includesKey:module) and:[info = (modules at:module) second])
-	    ifFalse:[^ true].
-	].
-	modules keysAndValuesDo:[:module :info|
-	    ((mgr repositoryInfoPerModule includesKey:module) and:[(mgr repositoryInfoPerModule at:module) = info second])
-	    ifFalse:[^ true].
-	].
+        |modules|
+
+        modules := rootsPerModule select:[:entry | entry first == mgr].
+
+        mgr repositoryInfoPerModule keysAndValuesDo:[:module :info |
+            ((modules includesKey:module) and:[info = (modules at:module) second])
+            ifFalse:[^ true].
+        ].
+        modules keysAndValuesDo:[:module :info|
+            ((mgr repositoryInfoPerModule includesKey:module) and:[(mgr repositoryInfoPerModule at:module) = info second])
+            ifFalse:[^ true].
+        ].
     ].
 
     ^ false
@@ -15856,8 +16574,8 @@
 
 availableManagers
     availableManagers isNil ifTrue:[
-	availableManagers := AbstractSourceCodeManager availableManagers copy.
-	availableManagers := availableManagers sort:[:a :b | a managerTypeName asLowercase < b managerTypeName asLowercase].
+        availableManagers := AbstractSourceCodeManager availableManagers copy.
+        availableManagers := availableManagers sort:[:a :b | a managerTypeName asLowercase < b managerTypeName asLowercase].
     ].
     ^ availableManagers.
 
@@ -15875,14 +16593,14 @@
     |holder|
 
     (holder := builder bindingAt:#doAcceptEnabled) isNil ifTrue:[
-	holder := BlockValue
-	    with:
-		[:package :manager|
-		package value notEmptyOrNil  and:[manager value notNil]]
-	    argument: self packageHolder
-	    argument: self managerHolder.
-
-	builder aspectAt:#doAcceptEnabled put:holder.
+        holder := BlockValue
+            with:
+                [:package :manager|
+                package value notEmptyOrNil  and:[manager value notNil]]
+            argument: self packageHolder
+            argument: self managerHolder.
+
+        builder aspectAt:#doAcceptEnabled put:holder.
     ].
     ^ holder.
 
@@ -15893,7 +16611,7 @@
     <resource: #uiAspect>
 
     managerNameHolder isNil ifTrue:[
-	managerNameHolder := ValueHolder new.
+        managerNameHolder := ValueHolder new.
     ].
     ^ managerNameHolder.
 
@@ -15904,7 +16622,7 @@
     <resource: #uiAspect>
 
     managerNameHolder isNil ifTrue:[
-	managerNameHolder := ValueHolder new.
+        managerNameHolder := ValueHolder new.
     ].
     ^ managerNameHolder.
 
@@ -15916,7 +16634,7 @@
     <resource: #uiAspect>
 
     packageHolder isNil ifTrue:[
-	packageHolder := ValueHolder new.
+        packageHolder := ValueHolder new.
     ].
     ^ packageHolder.
 
@@ -15929,8 +16647,8 @@
     |modules|
 
     modules := Smalltalk allProjectIDs
-		collect:[:packageId | packageId asPackageId module ]
-		as:Set.
+                collect:[:packageId | packageId asPackageId module ]
+                as:Set.
 
     modules remove:(PackageId noProjectID) ifAbsent:[].
     modules := modules collect:[:packageId | packageId , ':*' ].
@@ -16193,7 +16911,7 @@
 infoLabelHolder
 
     infoLabelHolder isNil ifTrue:[
-	infoLabelHolder := '' asValue.
+        infoLabelHolder := '' asValue.
     ].
     ^ infoLabelHolder.
 !
@@ -16201,7 +16919,7 @@
 noticeLabelHolder
 
     noticeLabelHolder isNil ifTrue:[
-	noticeLabelHolder := '' asValue.
+        noticeLabelHolder := '' asValue.
     ].
     ^ noticeLabelHolder.
 !
@@ -16209,8 +16927,8 @@
 previewVisibleHolder
 
     previewVisibleHolder isNil ifTrue:[
-	previewVisibleHolder := ValueHolder new.
-	previewVisibleHolder onChangeSend:#changeInfoLabel to:self.
+        previewVisibleHolder := ValueHolder new.
+        previewVisibleHolder onChangeSend:#changeInfoLabel to:self.
     ].
     ^ previewVisibleHolder.
 !
@@ -16218,8 +16936,8 @@
 selectedStyle
 
     selectedStyle isNil ifTrue:[
-	selectedStyle := ValueHolder new.
-	selectedStyle addDependent:self.
+        selectedStyle := ValueHolder new.
+        selectedStyle addDependent:self.
     ].
     ^ selectedStyle.
 !
@@ -16227,8 +16945,8 @@
 showStandardStylesOnly
 
     showStandardStylesOnly isNil ifTrue:[
-	showStandardStylesOnly := true asValue.
-	showStandardStylesOnly addDependent:self.
+        showStandardStylesOnly := true asValue.
+        showStandardStylesOnly addDependent:self.
     ].
     ^ showStandardStylesOnly.
 !
@@ -16236,8 +16954,8 @@
 styleList
 
     styleList isNil ifTrue:[
-	styleList := List new.
-	styleList addDependent:self.
+        styleList := List new.
+        styleList addDependent:self.
     ].
     ^ styleList.
 ! !
@@ -16250,50 +16968,50 @@
     comment := ''.
     nm := self selectedStyle value.
     nm notNil ifTrue:[
-	sheet := ViewStyle fromFile:(nm , '.style').
-	comment := (sheet at:#comment ifAbsent:'') withoutSeparators.
-	previewFile := sheet at:#previewFileName ifAbsent:nil.
+        sheet := ViewStyle fromFile:(nm , '.style').
+        comment := (sheet at:#comment ifAbsent:'') withoutSeparators.
+        previewFile := sheet at:#previewFileName ifAbsent:nil.
     ].
     comment := comment withCRs asStringCollection.
     comment size == 1 ifTrue:[
-	comment := comment first
+        comment := comment first
     ].
     self infoLabelHolder value:comment.
 
     self previewVisibleHolder value ifTrue:[
-	self builder notNil ifTrue:[
-	    labelView := self componentAt:#PreviewLabel.
-	    labelView label:'Sorry - no preview available'.
-
-	    imgView := (self componentAt:#Preview).
-	    imgView image:nil.
-
-	    previewFile notEmptyOrNil ifTrue:[
-		previewImage := Image fromFile:'../../doc/online/pictures' asFilename / previewFile.
-		previewImage notNil ifTrue:[
-		    labelView label:'Preview'.
-		    imgView adjust:#fitBig; image:previewImage.
-		]
-	    ].
-	    labelView forceResizeHorizontally.
-	]
+        self builder notNil ifTrue:[
+            labelView := self componentAt:#PreviewLabel.
+            labelView label:'Sorry - no preview available'.
+
+            imgView := (self componentAt:#Preview).
+            imgView image:nil.
+
+            previewFile notEmptyOrNil ifTrue:[
+                previewImage := Image fromFile:'../../doc/online/pictures' asFilename / previewFile.
+                previewImage notNil ifTrue:[
+                    labelView label:'Preview'.
+                    imgView adjust:#fitBig; image:previewImage.
+                ]
+            ].
+            labelView forceResizeHorizontally.
+        ]
     ]
 !
 
 update:something with:aParameter from:changedObject
     changedObject == self showStandardStylesOnly ifTrue:[
-	self updateList.
-	^ self
+        self updateList.
+        ^ self
     ].
     changedObject == self selectedStyle ifTrue:[
-	self changeInfoLabel.
-	self updateModifiedChannel.
-	^ self
+        self changeInfoLabel.
+        self updateModifiedChannel.
+        ^ self
     ].
     super
-	update:something
-	with:aParameter
-	from:changedObject
+        update:something
+        with:aParameter
+        from:changedObject
 !
 
 updateList
@@ -16308,7 +17026,7 @@
 "/    ].
     listOfStyles remove:'generic' ifAbsent:nil; remove:'mswindows3' ifAbsent:nil.
     self showStandardStylesOnly value ifTrue:[
-	listOfStyles := listOfStyles select:[:aStyleName | self class standardStyles includes:aStyleName asLowercase].
+        listOfStyles := listOfStyles select:[:aStyleName | self class standardStyles includes:aStyleName asLowercase].
     ].
 
     listOfStyles sort.
@@ -16390,22 +17108,22 @@
 emphasisList
 
     ^ #(
-	#normal
-	#underline
-	#'red underline'
-	#underwave
-	#'red underwave'
-	#bold
-	#boldUnderline
-	#'bold+red underline'
-	#boldUnderwave
-	#'bold+red underwave'
-	#italic
-	#italicUnderline
-	#'italic+red underline'
-	#italicUnderwave
-	#'italic+red underwave'
-	#reverse
+        #normal
+        #underline
+        #'red underline'
+        #underwave
+        #'red underwave'
+        #bold
+        #boldUnderline
+        #'bold+red underline'
+        #boldUnderwave
+        #'bold+red underwave'
+        #italic
+        #italicUnderline
+        #'italic+red underline'
+        #italicUnderwave
+        #'italic+red underwave'
+        #reverse
     )
 !
 
@@ -16438,22 +17156,22 @@
 fontList
 
     ^ #(
-	normal
-	underline
-	#'red underline'
-	underwave
-	#'red underwave'
-	bold
-	boldUnderline
-	#'bold+red underline'
-	boldUnderwave
-	#'bold+red underwave'
-	italic
-	italicUnderline
-	#'italic+red underline'
-	italicUnderwave
-	#'italic+red underwave'
-	reverse
+        normal
+        underline
+        #'red underline'
+        underwave
+        #'red underwave'
+        bold
+        boldUnderline
+        #'bold+red underline'
+        boldUnderwave
+        #'bold+red underwave'
+        italic
+        italicUnderline
+        #'italic+red underline'
+        italicUnderwave
+        #'italic+red underwave'
+        reverse
     )
 ! !
 
@@ -16519,28 +17237,28 @@
      Icon flushCachedIcons"
 
     ^ Icon
-	constantNamed:#'AbstractSettingsApplication::SyntaxColorSettingsAppl class defaultIcon'
-	ifAbsentPut:[
-	    (Depth4Image new)
-		width:22;
-		height:22;
-		photometric:(#palette);
-		bitsPerSample:(#( 4 ));
-		samplesPerPixel:(1);
-		bits:(ByteArray
-			    fromPackedString:'
+        constantNamed:#'AbstractSettingsApplication::SyntaxColorSettingsAppl class defaultIcon'
+        ifAbsentPut:[
+            (Depth4Image new)
+                width:22;
+                height:22;
+                photometric:(#palette);
+                bitsPerSample:(#( 4 ));
+                samplesPerPixel:(1);
+                bits:(ByteArray
+                            fromPackedString:'
 DQDQDQDQDQDQDQDTQDQDQDQDQDQDPQQ@QDADQBP$QDP!!E@QDQ@QDIBQDP$DTADQDADQDQDQBPQPDQDPDQDQDQBQAE@QDQ@QDQDQDIDDTADQDADQDQDIDPQPD
 QDPDQDQDP$QAEDADPDQDQDP$QDDTQDQDQDQDQDQDPQQDADQDQDQDQDQAEDADQDQDQDQDQDDTPDQ@QDADQDQDPQP@A@PDA@Q@QDQAEDADA@PDADQDQDDTPDPD
 A@PDQDQDPQQ@QDADPDQ@QDQAEDQDQDQDQDQDQDDTMCP4MCP4QDQDPQQCP4MCP4MDQDQADQDQDQDQDQDQDQDb');
-		colorMapFromArray:#[ 0 0 0 88 88 88 0 0 255 255 0 0 255 255 255 ];
-		mask:((ImageMask new)
-			    width:22;
-			    height:22;
-			    bits:(ByteArray
-					fromPackedString:'???<???<???<???<???<???<???<???<???<???<???<???<???<???<???<???<???<???<???<???<???<???<');
-			    yourself);
-		yourself
-	]
+                colorMapFromArray:#[ 0 0 0 88 88 88 0 0 255 255 0 0 255 255 255 ];
+                mask:((ImageMask new)
+                            width:22;
+                            height:22;
+                            bits:(ByteArray
+                                        fromPackedString:'???<???<???<???<???<???<???<???<???<???<???<???<???<???<???<???<???<???<???<???<???<???<');
+                            yourself);
+                yourself
+        ]
 ! !
 
 !AbstractSettingsApplication::SyntaxColorSettingsAppl class methodsFor:'interface specs'!
@@ -16565,191 +17283,191 @@
        name: windowSpec
        window:
       (WindowSpec
-	 label: 'Syntax Color Settings'
-	 name: 'Syntax Color Settings'
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 695 609)
+         label: 'Syntax Color Settings'
+         name: 'Syntax Color Settings'
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 695 609)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (VerticalPanelViewSpec
-	     name: 'VerticalPanel2'
-	     layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-	     horizontalLayout: fit
-	     verticalLayout: topSpaceFit
-	     horizontalSpace: 3
-	     verticalSpace: 3
-	     component:
-	    (SpecCollection
-	       collection: (
-		(CheckBoxSpec
-		   label: 'Syntax Coloring'
-		   name: 'CheckBox1'
-		   activeHelpKey: syntaxColoringEnabled
-		   model: syntaxColoring
-		   translateLabel: true
-		   extent: (Point 695 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Immediate Selector Check'
-		   name: 'ImmediateSelectorCheckBox'
-		   activeHelpKey: immediateSelectorCheck
-		   enableChannel: syntaxColoring
-		   model: fullSelectorCheck
-		   translateLabel: true
-		   extent: (Point 695 30)
-		 )
-		(ViewSpec
-		   name: 'SpacingBox2'
-		   extent: (Point 695 10)
-		 )
-		(LabelSpec
-		   label: 'Style:'
-		   name: 'Label5'
-		   activeHelpKey: individualStyleSetting
-		   translateLabel: true
-		   adjust: left
-		   extent: (Point 695 30)
-		 )
-		(ViewSpec
-		   name: 'ElementSelectionBox'
-		   activeHelpKey: individualStyleSetting
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Element:'
-			 name: 'Label4'
-			 layout: (LayoutFrame 4 0 0 0 140 0 30 0)
-			 activeHelpKey: elementSelection
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (ComboListSpec
-			 name: 'ComboList3'
-			 layout: (LayoutFrame 140 0 0 0 0 1 30 0)
-			 enableChannel: syntaxColoring
-			 model: syntaxElementSelection
-			 comboList: syntaxElementList
-			 useIndex: false
-			 hidePullDownMenuButton: false
-		       )
-		      )
-
-		   )
-		   extent: (Point 695 30)
-		 )
-		(ViewSpec
-		   name: 'ColorBox'
-		   activeHelpKey: individualStyleSetting
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Color:'
-			 name: 'Label2'
-			 layout: (LayoutFrame 4 0 0 0 140 0 30 0)
-			 activeHelpKey: colorSelection
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (ColorMenuSpec
-			 name: 'ColorMenu2'
-			 layout: (LayoutFrame 140 0 0 0 0 1 30 0)
-			 enableChannel: syntaxColoring
-			 model: syntaxColor
-			 labelsAreColored: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 695 30)
-		 )
-		(ViewSpec
-		   name: 'EmphasisBox'
-		   activeHelpKey: individualStyleSetting
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Emphasis:'
-			 name: 'Label1'
-			 layout: (LayoutFrame 4 0 0 0 140 0 30 0)
-			 activeHelpKey: emphasisSelection
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (ComboListSpec
-			 name: 'ComboList5'
-			 layout: (LayoutFrame 140 0 0 0 0 1 30 0)
-			 enableChannel: syntaxColoring
-			 model: syntaxEmphasisSelection
-			 comboList: syntaxEmphasisList
-			 useIndex: false
-			 hidePullDownMenuButton: false
-		       )
-		      )
-
-		   )
-		   extent: (Point 695 30)
-		 )
-		(ViewSpec
-		   name: 'ResetBox'
-		   activeHelpKey: commonStyleSetting
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (ActionButtonSpec
-			 label: 'Reset To:'
-			 name: 'Button2'
-			 layout: (LayoutFrame 0 0 -36 1 150 0 -6 1)
-			 activeHelpKey: resetToCommonStyle
-			 translateLabel: true
-			 model: resetToColorScheme
-			 enableChannel: syntaxColoring
-		       )
-		      (ComboListSpec
-			 name: 'ComboList4'
-			 layout: (LayoutFrame 150 0 -36 1 0 1 -6 1)
-			 activeHelpKey: commonStyleSelection
-			 enableChannel: syntaxColoring
-			 model: resetListSelection
-			 comboList: resetList
-			 useIndex: false
-			 hidePullDownMenuButton: false
-		       )
-		      )
-
-		   )
-		   extent: (Point 695 45)
-		 )
-		(ViewSpec
-		   name: 'SpacingBox1'
-		   extent: (Point 695 10)
-		 )
-		(LabelSpec
-		   label: 'Sample Output:'
-		   name: 'SampleLabel3'
-		   translateLabel: true
-		   adjust: left
-		   extent: (Point 695 30)
-		 )
-		(TextEditorSpec
-		   name: 'TextEditor2'
-		   enableChannel: syntaxColoring
-		   model: coloredText
-		   hasHorizontalScrollBar: true
-		   hasVerticalScrollBar: true
-		   isReadOnly: true
-		   hasKeyboardFocusInitially: false
-		   extent: (Point 695 298)
-		 )
-		)
-
-	     )
-	   )
-	  )
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel2'
+             layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+             horizontalLayout: fit
+             verticalLayout: topSpaceFit
+             horizontalSpace: 3
+             verticalSpace: 3
+             component:
+            (SpecCollection
+               collection: (
+                (CheckBoxSpec
+                   label: 'Syntax Coloring'
+                   name: 'CheckBox1'
+                   activeHelpKey: syntaxColoringEnabled
+                   model: syntaxColoring
+                   translateLabel: true
+                   extent: (Point 695 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Immediate Selector Check'
+                   name: 'ImmediateSelectorCheckBox'
+                   activeHelpKey: immediateSelectorCheck
+                   enableChannel: syntaxColoring
+                   model: fullSelectorCheck
+                   translateLabel: true
+                   extent: (Point 695 30)
+                 )
+                (ViewSpec
+                   name: 'SpacingBox2'
+                   extent: (Point 695 10)
+                 )
+                (LabelSpec
+                   label: 'Style:'
+                   name: 'Label5'
+                   activeHelpKey: individualStyleSetting
+                   translateLabel: true
+                   adjust: left
+                   extent: (Point 695 30)
+                 )
+                (ViewSpec
+                   name: 'ElementSelectionBox'
+                   activeHelpKey: individualStyleSetting
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Element:'
+                         name: 'Label4'
+                         layout: (LayoutFrame 4 0 0 0 140 0 30 0)
+                         activeHelpKey: elementSelection
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (ComboListSpec
+                         name: 'ComboList3'
+                         layout: (LayoutFrame 140 0 0 0 0 1 30 0)
+                         enableChannel: syntaxColoring
+                         model: syntaxElementSelection
+                         comboList: syntaxElementList
+                         useIndex: false
+                         hidePullDownMenuButton: false
+                       )
+                      )
+
+                   )
+                   extent: (Point 695 30)
+                 )
+                (ViewSpec
+                   name: 'ColorBox'
+                   activeHelpKey: individualStyleSetting
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Color:'
+                         name: 'Label2'
+                         layout: (LayoutFrame 4 0 0 0 140 0 30 0)
+                         activeHelpKey: colorSelection
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (ColorMenuSpec
+                         name: 'ColorMenu2'
+                         layout: (LayoutFrame 140 0 0 0 0 1 30 0)
+                         enableChannel: syntaxColoring
+                         model: syntaxColor
+                         labelsAreColored: true
+                       )
+                      )
+
+                   )
+                   extent: (Point 695 30)
+                 )
+                (ViewSpec
+                   name: 'EmphasisBox'
+                   activeHelpKey: individualStyleSetting
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Emphasis:'
+                         name: 'Label1'
+                         layout: (LayoutFrame 4 0 0 0 140 0 30 0)
+                         activeHelpKey: emphasisSelection
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (ComboListSpec
+                         name: 'ComboList5'
+                         layout: (LayoutFrame 140 0 0 0 0 1 30 0)
+                         enableChannel: syntaxColoring
+                         model: syntaxEmphasisSelection
+                         comboList: syntaxEmphasisList
+                         useIndex: false
+                         hidePullDownMenuButton: false
+                       )
+                      )
+
+                   )
+                   extent: (Point 695 30)
+                 )
+                (ViewSpec
+                   name: 'ResetBox'
+                   activeHelpKey: commonStyleSetting
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (ActionButtonSpec
+                         label: 'Reset To:'
+                         name: 'Button2'
+                         layout: (LayoutFrame 0 0 -36 1 150 0 -6 1)
+                         activeHelpKey: resetToCommonStyle
+                         translateLabel: true
+                         model: resetToColorScheme
+                         enableChannel: syntaxColoring
+                       )
+                      (ComboListSpec
+                         name: 'ComboList4'
+                         layout: (LayoutFrame 150 0 -36 1 0 1 -6 1)
+                         activeHelpKey: commonStyleSelection
+                         enableChannel: syntaxColoring
+                         model: resetListSelection
+                         comboList: resetList
+                         useIndex: false
+                         hidePullDownMenuButton: false
+                       )
+                      )
+
+                   )
+                   extent: (Point 695 45)
+                 )
+                (ViewSpec
+                   name: 'SpacingBox1'
+                   extent: (Point 695 10)
+                 )
+                (LabelSpec
+                   label: 'Sample Output:'
+                   name: 'SampleLabel3'
+                   translateLabel: true
+                   adjust: left
+                   extent: (Point 695 30)
+                 )
+                (TextEditorSpec
+                   name: 'TextEditor2'
+                   enableChannel: syntaxColoring
+                   model: coloredText
+                   hasHorizontalScrollBar: true
+                   hasVerticalScrollBar: true
+                   isReadOnly: true
+                   hasKeyboardFocusInitially: false
+                   extent: (Point 695 298)
+                 )
+                )
+
+             )
+           )
+          )
 
        )
      )
@@ -16794,21 +17512,21 @@
     |text dummyClass|
 
     self syntaxColoring value ifTrue:[
-	Class withoutUpdatingChangesDo:[
-	    dummyClass := Object
-			    subclass:#DummyClass
-			    instanceVariableNames:'instVar'
-			    classVariableNames:'ClassVar'
-			    poolDictionaries:''
-			    category:''
-			    inEnvironment:nil
-	].
-	text := SyntaxHighlighter
-		    formatMethod:self class exampleText
-		    in:dummyClass
-		    using:currentUserPrefs.
+        Class withoutUpdatingChangesDo:[
+            dummyClass := Object
+                            subclass:#DummyClass
+                            instanceVariableNames:'instVar'
+                            classVariableNames:'ClassVar'
+                            poolDictionaries:''
+                            category:''
+                            inEnvironment:nil
+        ].
+        text := SyntaxHighlighter
+                    formatMethod:self class exampleText
+                    in:dummyClass
+                    using:currentUserPrefs.
     ] ifFalse:[
-	text := self class exampleText.
+        text := self class exampleText.
     ].
     self coloredText value:text
 
@@ -16831,7 +17549,7 @@
 coloredText
 
     coloredText isNil ifTrue:[
-	coloredText := ValueHolder new.
+        coloredText := ValueHolder new.
     ].
     ^ coloredText.
 !
@@ -16839,8 +17557,8 @@
 fullSelectorCheck
 
     fullSelectorCheck isNil ifTrue:[
-	fullSelectorCheck := currentUserPrefs fullSelectorCheck asValue.
-	fullSelectorCheck onChangeSend:#updateModifiedChannel to:self
+        fullSelectorCheck := currentUserPrefs fullSelectorCheck asValue.
+        fullSelectorCheck onChangeSend:#updateModifiedChannel to:self
     ].
     ^ fullSelectorCheck.
 !
@@ -16848,7 +17566,7 @@
 resetList
 
     resetList isNil ifTrue:[
-	resetList := ValueHolder new.
+        resetList := ValueHolder new.
     ].
     ^ resetList.
 
@@ -16858,7 +17576,7 @@
 resetListSelection
 
     resetListSelection isNil ifTrue:[
-	resetListSelection := ValueHolder new.
+        resetListSelection := ValueHolder new.
     ].
     ^ resetListSelection.
 !
@@ -16866,8 +17584,8 @@
 syntaxColor
 
     syntaxColor isNil ifTrue:[
-	syntaxColor := ValueHolder new.
-	syntaxColor addDependent:self.
+        syntaxColor := ValueHolder new.
+        syntaxColor addDependent:self.
     ].
     ^ syntaxColor.
 !
@@ -16875,16 +17593,16 @@
 syntaxColoring
 
     syntaxColoring isNil ifTrue:[
-	syntaxColoring := true asValue.
-	syntaxColoring addDependent:self.
-	syntaxColoring onChangeSend:#updateModifiedChannel to:self.
+        syntaxColoring := true asValue.
+        syntaxColoring addDependent:self.
+        syntaxColoring onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ syntaxColoring.
 !
 
 syntaxElementList
     syntaxElementList isNil ifTrue:[
-	syntaxElementList := ValueHolder new.
+        syntaxElementList := ValueHolder new.
     ].
     ^ syntaxElementList.
 
@@ -16894,8 +17612,8 @@
 syntaxElementSelection
 
     syntaxElementSelection isNil ifTrue:[
-	syntaxElementSelection := ValueHolder new.
-	syntaxElementSelection addDependent:self.
+        syntaxElementSelection := ValueHolder new.
+        syntaxElementSelection addDependent:self.
     ].
     ^ syntaxElementSelection.
 
@@ -16904,7 +17622,7 @@
 
 syntaxEmphasisList
     syntaxEmphasisList isNil ifTrue:[
-	syntaxEmphasisList := ValueHolder new.
+        syntaxEmphasisList := ValueHolder new.
     ].
     ^ syntaxEmphasisList.
 
@@ -16914,8 +17632,8 @@
 syntaxEmphasisSelection
 
     syntaxEmphasisSelection isNil ifTrue:[
-	syntaxEmphasisSelection := ValueHolder new.
-	syntaxEmphasisSelection addDependent:self.
+        syntaxEmphasisSelection := ValueHolder new.
+        syntaxEmphasisSelection addDependent:self.
     ].
     ^ syntaxEmphasisSelection.
 ! !
@@ -16955,20 +17673,20 @@
 
 update:something with:aParameter from:changedObject
     changedObject == self syntaxElementSelection ifTrue:[
-	self syntaxElementSelectionChanged.
-	^ self.
+        self syntaxElementSelectionChanged.
+        ^ self.
     ].
     changedObject == self syntaxColor ifTrue:[
-	self syntaxColorChanged.
-	^ self.
+        self syntaxColorChanged.
+        ^ self.
     ].
     changedObject == self syntaxEmphasisSelection ifTrue:[
-	self syntaxEmphasisSelectionChanged.
-	^ self.
+        self syntaxEmphasisSelectionChanged.
+        ^ self.
     ].
     changedObject == self syntaxColoring ifTrue:[
-	self recolor.
-	^ self.
+        self recolor.
+        ^ self.
     ].
 
     super update:something with:aParameter from:changedObject
@@ -16988,7 +17706,7 @@
 
     resetListDictionary := Dictionary new.
     currentUserPrefs listOfPredefinedSyntaxColoringSchemes do:[:entry |
-	resetListDictionary at:(entry at:1) put:(entry at:2)
+        resetListDictionary at:(entry at:1) put:(entry at:2)
     ].
 !
 
@@ -16996,46 +17714,46 @@
 
     emphasisDictionary := Dictionary new.
     self class emphasisList do:[ : entry |
-	entry == #'red underline' ifTrue:[
-	    emphasisDictionary at:entry put:(Array with:#underline with:(#underlineColor->Color red)).
-	    emphasisDictionary at:(Array with:#underline with:(#underlineColor->Color red)) put:entry.
-	] ifFalse:[
-	    entry == #'red underwave' ifTrue:[
-		emphasisDictionary at:entry put:(Array with:#underwave with:(#underlineColor->Color red)).
-		emphasisDictionary at:(Array with:#underwave with:(#underlineColor->Color red)) put:entry.
-	    ] ifFalse:[
-		entry == #'bold+red underline' ifTrue:[
-		    emphasisDictionary at:entry put:(Array with:#bold with:#underline with:(#underlineColor->Color red)).
-		    emphasisDictionary at:(Array with:#bold with:#underline with:(#underlineColor->Color red)) put:entry.
-		] ifFalse:[
-		    entry == #'bold+red underwave' ifTrue:[
-			emphasisDictionary at:entry put:(Array with:#bold with:#underwave with:(#underlineColor->Color red)).
-			emphasisDictionary at:(Array with:#bold with:#underwave with:(#underlineColor->Color red)) put:entry.
-		    ] ifFalse:[
-			entry == #'italic+red underline' ifTrue:[
-			    emphasisDictionary at:entry put:(Array with:#italic with:#underline with:(#underlineColor->Color red)).
-			    emphasisDictionary at:(Array with:#italic with:#underline with:(#underlineColor->Color red)) put:entry.
-			] ifFalse:[
-			    entry == #'italic+red underwave' ifTrue:[
-				emphasisDictionary at:entry put:(Array with:#italic with:#underwave with:(#underlineColor->Color red)).
-				emphasisDictionary at:(Array with:#italic with:#underwave with:(#underlineColor->Color red)) put:entry.
-			    ] ifFalse:[
-				emphasisDictionary at:entry put:entry
-			    ]
-			]
-		    ]
-		]
-	    ]
-	]
+        entry == #'red underline' ifTrue:[
+            emphasisDictionary at:entry put:(Array with:#underline with:(#underlineColor->Color red)).
+            emphasisDictionary at:(Array with:#underline with:(#underlineColor->Color red)) put:entry.
+        ] ifFalse:[
+            entry == #'red underwave' ifTrue:[
+                emphasisDictionary at:entry put:(Array with:#underwave with:(#underlineColor->Color red)).
+                emphasisDictionary at:(Array with:#underwave with:(#underlineColor->Color red)) put:entry.
+            ] ifFalse:[
+                entry == #'bold+red underline' ifTrue:[
+                    emphasisDictionary at:entry put:(Array with:#bold with:#underline with:(#underlineColor->Color red)).
+                    emphasisDictionary at:(Array with:#bold with:#underline with:(#underlineColor->Color red)) put:entry.
+                ] ifFalse:[
+                    entry == #'bold+red underwave' ifTrue:[
+                        emphasisDictionary at:entry put:(Array with:#bold with:#underwave with:(#underlineColor->Color red)).
+                        emphasisDictionary at:(Array with:#bold with:#underwave with:(#underlineColor->Color red)) put:entry.
+                    ] ifFalse:[
+                        entry == #'italic+red underline' ifTrue:[
+                            emphasisDictionary at:entry put:(Array with:#italic with:#underline with:(#underlineColor->Color red)).
+                            emphasisDictionary at:(Array with:#italic with:#underline with:(#underlineColor->Color red)) put:entry.
+                        ] ifFalse:[
+                            entry == #'italic+red underwave' ifTrue:[
+                                emphasisDictionary at:entry put:(Array with:#italic with:#underwave with:(#underlineColor->Color red)).
+                                emphasisDictionary at:(Array with:#italic with:#underwave with:(#underlineColor->Color red)) put:entry.
+                            ] ifFalse:[
+                                emphasisDictionary at:entry put:entry
+                            ]
+                        ]
+                    ]
+                ]
+            ]
+        ]
     ].
 !
 
 release
 
     oldUserPreferences notNil ifTrue:[
-	(UserPreferences reset; current)
-	    addAll:oldUserPreferences;
-	    flyByHelpSettingChanged.    "/ reinstall
+        (UserPreferences reset; current)
+            addAll:oldUserPreferences;
+            flyByHelpSettingChanged.    "/ reinstall
     ].
     super release
 
@@ -17174,276 +17892,276 @@
        name: windowSpec
        window:
       (WindowSpec
-	 label: 'System Browser Settings'
-	 name: 'System Browser Settings'
-	 flags: 1
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 617 659)
+         label: 'System Browser Settings'
+         name: 'System Browser Settings'
+         flags: 1
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 617 659)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (VerticalPanelViewSpec
-	     name: 'SettingsPanel'
-	     layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-	     horizontalLayout: fit
-	     verticalLayout: top
-	     horizontalSpace: 3
-	     verticalSpace: 3
-	     component:
-	    (SpecCollection
-	       collection: (
-		(FramedBoxSpec
-		   label: 'Settings'
-		   name: 'ToolsSettingsPanel'
-		   labelPosition: topLeft
-		   translateLabel: true
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (VerticalPanelViewSpec
-			 name: 'ToolSettingsVPanel'
-			 layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-			 horizontalLayout: fit
-			 verticalLayout: top
-			 horizontalSpace: 3
-			 verticalSpace: 3
-			 component:
-			(SpecCollection
-			   collection: (
-			    (CheckBoxSpec
-			       label: 'Use the Embedded Test Runner'
-			       name: 'UseEmbeddedTestRunner'
-			       activeHelpKey: useEmbeddedTestRunner
-			       model: showEmbeddedTestRunnerInBrowser
-			       translateLabel: true
-			       extent: (Point 583 30)
-			     )
-			    (CheckBoxSpec
-			       label: 'Web Browser Like Layout (Toolbars are Part of the Tab - experimental)'
-			       name: 'CheckBox1'
-			       activeHelpKey: webBrowserLikeLayout
-			       initiallyInvisible: true
-			       model: webBrowserLikeLayout
-			       translateLabel: true
-			       extent: (Point 607 30)
-			     )
-			    (CheckBoxSpec
-			       label: 'Show Bookmarks Bar'
-			       name: 'ShowBookmarksBar'
-			       activeHelpKey: showBookmarksBar
-			       model: showBookmarkBar
-			       translateLabel: true
-			       extent: (Point 583 30)
-			     )
-			    (CheckBoxSpec
-			       label: 'Sort and Indent Classes by Inheritance'
-			       name: 'SortAndIndentClassesByInheritance'
-			       activeHelpKey: sortAndIndentClassesByInheritance
-			       model: sortAndIndentClassesByInheritance
-			       translateLabel: true
-			       extent: (Point 583 30)
-			     )
-			    (CheckBoxSpec
-			       label: 'Show Local Navigation History (Separate History per Browser Tab)'
-			       name: 'CheckBox2'
-			       activeHelpKey: showLocalHistory
-			       model: showLocalHistory
-			       translateLabel: true
-			       extent: (Point 583 30)
-			     )
-			    (CheckBoxSpec
-			       label: 'Show Global Navigation History (Global History for all Browsers)'
-			       name: 'CheckBox3'
-			       activeHelpKey: showGlobalHistory
-			       model: showGlobalHistory
-			       translateLabel: true
-			       extent: (Point 583 30)
-			     )
-			    (CheckBoxSpec
-			       label: 'Show Search Bar in Browser'
-			       name: 'ShowSearchBarInBrowser'
-			       activeHelpKey: searchBarInBrowser
-			       model: useSearchBarInBrowser
-			       translateLabel: true
-			       extent: (Point 583 30)
-			     )
-			    (CheckBoxSpec
-			       label: 'Use in-place Search in Browser Lists (experimental)'
-			       name: 'CheckBox4'
-			       activeHelpKey: inPlaceSearch
-			       model: useInPlaceSearchInBrowserLists
-			       translateLabel: true
-			       extent: (Point 583 30)
-			     )
-			    (CheckBoxSpec
-			       label: 'Show Method Template'
-			       name: 'MethodTemplate'
-			       activeHelpKey: showMethodTemplate
-			       model: showMethodTemplate
-			       translateLabel: true
-			       extent: (Point 583 30)
-			     )
-			    )
-
-			 )
-		       )
-		      )
-
-		   )
-		   extent: (Point 607 308)
-		   useDynamicPreferredHeight: true
-		   usePreferredHeight: true
-		 )
-		(FramedBoxSpec
-		   label: 'Sourcecode Management Menu Layout'
-		   name: 'MenuLayoutPanel'
-		   labelPosition: topLeft
-		   translateLabel: true
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (VerticalPanelViewSpec
-			 name: 'MenyLayoutVPanel'
-			 layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-			 horizontalLayout: fit
-			 verticalLayout: top
-			 horizontalSpace: 3
-			 verticalSpace: 3
-			 component:
-			(SpecCollection
-			   collection: (
-			    (RadioButtonSpec
-			       label: 'Old'
-			       name: 'SCMMenuLayoutOld'
-			       activeHelpKey: oldSCMMenuLayout
-			       translateLabel: true
-			       model: sourceCodeManagementMenuLayout
-			       isTriggerOnDown: true
-			       select: 'old'
-			       extent: (Point 583 30)
-			     )
-			    (RadioButtonSpec
-			       label: 'Inline'
-			       name: 'SCMMenuLayoutInline'
-			       activeHelpKey: inlineSCMLayout
-			       translateLabel: true
-			       model: sourceCodeManagementMenuLayout
-			       isTriggerOnDown: true
-			       select: 'inline'
-			       extent: (Point 583 30)
-			     )
-			    (RadioButtonSpec
-			       label: 'Compact'
-			       name: 'SCMMenuLayoutCompact'
-			       activeHelpKey: compactSCMLayout
-			       translateLabel: true
-			       model: sourceCodeManagementMenuLayout
-			       isTriggerOnDown: true
-			       select: 'compact'
-			       extent: (Point 583 30)
-			     )
-			    )
-
-			 )
-		       )
-		      )
-
-		   )
-		   extent: (Point 617 143)
-		   useDynamicPreferredHeight: true
-		   usePreferredHeight: true
-		 )
-		(FramedBoxSpec
-		   label: 'Static Analysis (Lint)'
-		   name: 'LintPanel'
-		   labelPosition: topLeft
-		   translateLabel: true
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (VerticalPanelViewSpec
-			 name: 'LintPanelContent'
-			 layout: (LayoutFrame 0 0 0 0 0 1 53 0)
-			 horizontalLayout: fit
-			 verticalLayout: top
-			 horizontalSpace: 3
-			 verticalSpace: 3
-			 component:
-			(SpecCollection
-			   collection: (
-			    (ViewSpec
-			       name: 'DefaultRulesetBox'
-			       component:
-			      (SpecCollection
-				 collection: (
-				  (LabelSpec
-				     label: 'Default Rules:'
-				     name: 'DefaultRulesetLabel'
-				     layout: (LayoutFrame 0 0 0 0 120 0 0 1)
-				     translateLabel: true
-				     adjust: left
-				   )
-				  (InputFieldSpec
-				     name: 'DefaultRuleset'
-				     layout: (LayoutFrame 120 0 0 0 -70 1 0 1)
-				     model: smallLintRulesetDefault
-				     isReadOnly: true
-				     acceptOnReturn: true
-				     acceptOnTab: true
-				     converter: smallLintRulesetDefaultAdaptor
-				     acceptOnPointerLeave: true
-				     emptyFieldReplacementText: 'Default'
-				   )
-				  (ActionButtonSpec
-				     label: 'Select'
-				     name: 'DefaultRulesetSelectButton'
-				     layout: (LayoutFrame -70 1 0 0 0 1 0 1)
-				     translateLabel: true
-				     model: doSelectDefaultRuleset
-				   )
-				  )
-
-			       )
-			       extent: (Point 583 25)
-			     )
-			    (ViewSpec
-			       name: 'Box1'
-			       component:
-			      (SpecCollection
-				 collection: (
-				  (LinkButtonSpec
-				     label: 'Configure Rule Sets...'
-				     name: 'Button1'
-				     layout: (LayoutFrame -150 1 -20 1 0 1 0 1)
-				     foregroundColor: (Color 0.0 0.0 100.0)
-				     translateLabel: true
-				     adjust: right
-				     model: doConfigureRulesets
-				   )
-				  )
-
-			       )
-			       extent: (Point 583 25)
-			     )
-			    )
-
-			 )
-			 useDynamicPreferredHeight: true
-			 usePreferredHeight: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 617 100)
-		   useDynamicPreferredHeight: true
-		   usePreferredHeight: true
-		 )
-		)
-
-	     )
-	   )
-	  )
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'SettingsPanel'
+             layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+             horizontalLayout: fit
+             verticalLayout: top
+             horizontalSpace: 3
+             verticalSpace: 3
+             component:
+            (SpecCollection
+               collection: (
+                (FramedBoxSpec
+                   label: 'Settings'
+                   name: 'ToolsSettingsPanel'
+                   labelPosition: topLeft
+                   translateLabel: true
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (VerticalPanelViewSpec
+                         name: 'ToolSettingsVPanel'
+                         layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+                         horizontalLayout: fit
+                         verticalLayout: top
+                         horizontalSpace: 3
+                         verticalSpace: 3
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (CheckBoxSpec
+                               label: 'Use the Embedded Test Runner'
+                               name: 'UseEmbeddedTestRunner'
+                               activeHelpKey: useEmbeddedTestRunner
+                               model: showEmbeddedTestRunnerInBrowser
+                               translateLabel: true
+                               extent: (Point 583 30)
+                             )
+                            (CheckBoxSpec
+                               label: 'Web Browser Like Layout (Toolbars are Part of the Tab - experimental)'
+                               name: 'CheckBox1'
+                               activeHelpKey: webBrowserLikeLayout
+                               initiallyInvisible: true
+                               model: webBrowserLikeLayout
+                               translateLabel: true
+                               extent: (Point 607 30)
+                             )
+                            (CheckBoxSpec
+                               label: 'Show Bookmarks Bar'
+                               name: 'ShowBookmarksBar'
+                               activeHelpKey: showBookmarksBar
+                               model: showBookmarkBar
+                               translateLabel: true
+                               extent: (Point 583 30)
+                             )
+                            (CheckBoxSpec
+                               label: 'Sort and Indent Classes by Inheritance'
+                               name: 'SortAndIndentClassesByInheritance'
+                               activeHelpKey: sortAndIndentClassesByInheritance
+                               model: sortAndIndentClassesByInheritance
+                               translateLabel: true
+                               extent: (Point 583 30)
+                             )
+                            (CheckBoxSpec
+                               label: 'Show Local Navigation History (Separate History per Browser Tab)'
+                               name: 'CheckBox2'
+                               activeHelpKey: showLocalHistory
+                               model: showLocalHistory
+                               translateLabel: true
+                               extent: (Point 583 30)
+                             )
+                            (CheckBoxSpec
+                               label: 'Show Global Navigation History (Global History for all Browsers)'
+                               name: 'CheckBox3'
+                               activeHelpKey: showGlobalHistory
+                               model: showGlobalHistory
+                               translateLabel: true
+                               extent: (Point 583 30)
+                             )
+                            (CheckBoxSpec
+                               label: 'Show Search Bar in Browser'
+                               name: 'ShowSearchBarInBrowser'
+                               activeHelpKey: searchBarInBrowser
+                               model: useSearchBarInBrowser
+                               translateLabel: true
+                               extent: (Point 583 30)
+                             )
+                            (CheckBoxSpec
+                               label: 'Use in-place Search in Browser Lists (experimental)'
+                               name: 'CheckBox4'
+                               activeHelpKey: inPlaceSearch
+                               model: useInPlaceSearchInBrowserLists
+                               translateLabel: true
+                               extent: (Point 583 30)
+                             )
+                            (CheckBoxSpec
+                               label: 'Show Method Template'
+                               name: 'MethodTemplate'
+                               activeHelpKey: showMethodTemplate
+                               model: showMethodTemplate
+                               translateLabel: true
+                               extent: (Point 583 30)
+                             )
+                            )
+
+                         )
+                       )
+                      )
+
+                   )
+                   extent: (Point 607 308)
+                   useDynamicPreferredHeight: true
+                   usePreferredHeight: true
+                 )
+                (FramedBoxSpec
+                   label: 'Sourcecode Management Menu Layout'
+                   name: 'MenuLayoutPanel'
+                   labelPosition: topLeft
+                   translateLabel: true
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (VerticalPanelViewSpec
+                         name: 'MenyLayoutVPanel'
+                         layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+                         horizontalLayout: fit
+                         verticalLayout: top
+                         horizontalSpace: 3
+                         verticalSpace: 3
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (RadioButtonSpec
+                               label: 'Old'
+                               name: 'SCMMenuLayoutOld'
+                               activeHelpKey: oldSCMMenuLayout
+                               translateLabel: true
+                               model: sourceCodeManagementMenuLayout
+                               isTriggerOnDown: true
+                               select: 'old'
+                               extent: (Point 583 30)
+                             )
+                            (RadioButtonSpec
+                               label: 'Inline'
+                               name: 'SCMMenuLayoutInline'
+                               activeHelpKey: inlineSCMLayout
+                               translateLabel: true
+                               model: sourceCodeManagementMenuLayout
+                               isTriggerOnDown: true
+                               select: 'inline'
+                               extent: (Point 583 30)
+                             )
+                            (RadioButtonSpec
+                               label: 'Compact'
+                               name: 'SCMMenuLayoutCompact'
+                               activeHelpKey: compactSCMLayout
+                               translateLabel: true
+                               model: sourceCodeManagementMenuLayout
+                               isTriggerOnDown: true
+                               select: 'compact'
+                               extent: (Point 583 30)
+                             )
+                            )
+
+                         )
+                       )
+                      )
+
+                   )
+                   extent: (Point 617 143)
+                   useDynamicPreferredHeight: true
+                   usePreferredHeight: true
+                 )
+                (FramedBoxSpec
+                   label: 'Static Analysis (Lint)'
+                   name: 'LintPanel'
+                   labelPosition: topLeft
+                   translateLabel: true
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (VerticalPanelViewSpec
+                         name: 'LintPanelContent'
+                         layout: (LayoutFrame 0 0 0 0 0 1 53 0)
+                         horizontalLayout: fit
+                         verticalLayout: top
+                         horizontalSpace: 3
+                         verticalSpace: 3
+                         component:
+                        (SpecCollection
+                           collection: (
+                            (ViewSpec
+                               name: 'DefaultRulesetBox'
+                               component:
+                              (SpecCollection
+                                 collection: (
+                                  (LabelSpec
+                                     label: 'Default Rules:'
+                                     name: 'DefaultRulesetLabel'
+                                     layout: (LayoutFrame 0 0 0 0 120 0 0 1)
+                                     translateLabel: true
+                                     adjust: left
+                                   )
+                                  (InputFieldSpec
+                                     name: 'DefaultRuleset'
+                                     layout: (LayoutFrame 120 0 0 0 -70 1 0 1)
+                                     model: smallLintRulesetDefault
+                                     isReadOnly: true
+                                     acceptOnReturn: true
+                                     acceptOnTab: true
+                                     converter: smallLintRulesetDefaultAdaptor
+                                     acceptOnPointerLeave: true
+                                     emptyFieldReplacementText: 'Default'
+                                   )
+                                  (ActionButtonSpec
+                                     label: 'Select'
+                                     name: 'DefaultRulesetSelectButton'
+                                     layout: (LayoutFrame -70 1 0 0 0 1 0 1)
+                                     translateLabel: true
+                                     model: doSelectDefaultRuleset
+                                   )
+                                  )
+
+                               )
+                               extent: (Point 583 25)
+                             )
+                            (ViewSpec
+                               name: 'Box1'
+                               component:
+                              (SpecCollection
+                                 collection: (
+                                  (LinkButtonSpec
+                                     label: 'Configure Rule Sets...'
+                                     name: 'Button1'
+                                     layout: (LayoutFrame -150 1 -20 1 0 1 0 1)
+                                     foregroundColor: (Color 0.0 0.0 100.0)
+                                     translateLabel: true
+                                     adjust: right
+                                     model: doConfigureRulesets
+                                   )
+                                  )
+
+                               )
+                               extent: (Point 583 25)
+                             )
+                            )
+
+                         )
+                         useDynamicPreferredHeight: true
+                         usePreferredHeight: true
+                       )
+                      )
+
+                   )
+                   extent: (Point 617 100)
+                   useDynamicPreferredHeight: true
+                   usePreferredHeight: true
+                 )
+                )
+
+             )
+           )
+          )
 
        )
      )
@@ -17472,7 +18190,7 @@
     dialog := Tools::LintRuleSelectionDialog new.
     dialog open.
     dialog accepted ifTrue:[
-	smallLintRulesetDefault value: dialog selectionAsRule.
+        smallLintRulesetDefault value: dialog selectionAsRule.
     ]
 
     "Modified: / 14-10-2014 / 22:12:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -17482,20 +18200,20 @@
 
 aspects
     ^ #(
-	"/ showAcceptCancelBarInBrowser
-	useSearchBarInBrowser
-	showMethodTemplate
-	"/ useCodeView2InTools
-	showEmbeddedTestRunnerInBrowser
-	showBookmarkBar
-	webBrowserLikeLayout
-	sortAndIndentClassesByInheritance
-	showGlobalHistory
-	showLocalHistory
-	useInPlaceSearchInBrowserLists
-	sourceCodeManagementMenuLayout
-	confirmRefactorings
-	smallLintRulesetDefault
+        "/ showAcceptCancelBarInBrowser
+        useSearchBarInBrowser
+        showMethodTemplate
+        "/ useCodeView2InTools
+        showEmbeddedTestRunnerInBrowser
+        showBookmarkBar
+        webBrowserLikeLayout
+        sortAndIndentClassesByInheritance
+        showGlobalHistory
+        showLocalHistory
+        useInPlaceSearchInBrowserLists
+        sourceCodeManagementMenuLayout
+        confirmRefactorings
+        smallLintRulesetDefault
     )
 
     "Created: / 25-11-2011 / 15:09:28 / cg"
@@ -17505,8 +18223,8 @@
 confirmRefactorings
 
     confirmRefactorings isNil ifTrue:[
-	confirmRefactorings := false asValue.
-	confirmRefactorings onChangeSend:#updateModifiedChannel to:self
+        confirmRefactorings := false asValue.
+        confirmRefactorings onChangeSend:#updateModifiedChannel to:self
     ].
     ^ confirmRefactorings.
 
@@ -17515,8 +18233,8 @@
 
 showAcceptCancelBarInBrowser
     showAcceptCancelBarInBrowser isNil ifTrue:[
-	showAcceptCancelBarInBrowser := false asValue.
-	showAcceptCancelBarInBrowser onChangeSend:#updateModifiedChannel to:self
+        showAcceptCancelBarInBrowser := false asValue.
+        showAcceptCancelBarInBrowser onChangeSend:#updateModifiedChannel to:self
     ].
     ^ showAcceptCancelBarInBrowser.
 !
@@ -17525,8 +18243,8 @@
     "return/create the 'showMethodTemplate' value holder (automatically generated)"
 
     showBookmarkBar isNil ifTrue:[
-	showBookmarkBar := ValueHolder new.
-	showBookmarkBar onChangeSend:#updateModifiedChannel to:self
+        showBookmarkBar := ValueHolder new.
+        showBookmarkBar onChangeSend:#updateModifiedChannel to:self
 
     ].
     ^ showBookmarkBar
@@ -17538,8 +18256,8 @@
     "return/create the 'showEmbeddedTestRunnerInBrowser' value holder (automatically generated)"
 
     showEmbeddedTestRunnerInBrowser isNil ifTrue:[
-	showEmbeddedTestRunnerInBrowser := ValueHolder new.
-	showEmbeddedTestRunnerInBrowser onChangeSend:#updateModifiedChannel to:self
+        showEmbeddedTestRunnerInBrowser := ValueHolder new.
+        showEmbeddedTestRunnerInBrowser onChangeSend:#updateModifiedChannel to:self
     ].
     ^ showEmbeddedTestRunnerInBrowser
 
@@ -17549,8 +18267,8 @@
 showGlobalHistory
 
     showGlobalHistory isNil ifTrue:[
-	showGlobalHistory := false asValue.
-	showGlobalHistory onChangeSend:#updateModifiedChannel to:self
+        showGlobalHistory := false asValue.
+        showGlobalHistory onChangeSend:#updateModifiedChannel to:self
     ].
     ^ showGlobalHistory.
 
@@ -17560,8 +18278,8 @@
 showLocalHistory
 
     showLocalHistory isNil ifTrue:[
-	showLocalHistory := false asValue.
-	showLocalHistory onChangeSend:#updateModifiedChannel to:self
+        showLocalHistory := false asValue.
+        showLocalHistory onChangeSend:#updateModifiedChannel to:self
     ].
     ^ showLocalHistory.
 
@@ -17572,8 +18290,8 @@
     "return/create the 'showMethodTemplate' value holder (automatically generated)"
 
     showMethodTemplate isNil ifTrue:[
-	showMethodTemplate := ValueHolder new.
-	showMethodTemplate onChangeSend:#updateModifiedChannel to:self
+        showMethodTemplate := ValueHolder new.
+        showMethodTemplate onChangeSend:#updateModifiedChannel to:self
 
     ].
     ^ showMethodTemplate
@@ -17592,10 +18310,10 @@
     "*** (and replace this comment by something more useful ;-)"
 
     smallLintRulesetDefault isNil ifTrue:[
-	smallLintRulesetDefault := ValueHolder new.
+        smallLintRulesetDefault := ValueHolder new.
 "/ if your app needs to be notified of changes, uncomment one of the lines below:
 "/       smallLintRulesetNameDefault addDependent:self.
-	smallLintRulesetDefault onChangeSend:#updateModifiedChannel to:self.
+        smallLintRulesetDefault onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ smallLintRulesetDefault.
 
@@ -17605,8 +18323,8 @@
 
 smallLintRulesetDefaultAdaptor
     ^ PluggableAdaptor new
-	getter:[ :model | model value isNil ifTrue:[nil] ifFalse:[model value name]]
-	setter:[ :model :value | ]
+        getter:[ :model | model value isNil ifTrue:[nil] ifFalse:[model value name]]
+        setter:[ :model :value | ]
 
     "Created: / 14-10-2014 / 22:11:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -17614,8 +18332,8 @@
 sortAndIndentClassesByInheritance
 
     sortAndIndentClassesByInheritance isNil ifTrue:[
-	sortAndIndentClassesByInheritance := false asValue.
-	sortAndIndentClassesByInheritance onChangeSend:#updateModifiedChannel to:self
+        sortAndIndentClassesByInheritance := false asValue.
+        sortAndIndentClassesByInheritance onChangeSend:#updateModifiedChannel to:self
     ].
     ^ sortAndIndentClassesByInheritance.
 
@@ -17624,8 +18342,8 @@
 
 sourceCodeManagementMenuLayout
     sourceCodeManagementMenuLayout isNil ifTrue:[
-	sourceCodeManagementMenuLayout := #inline "#old" asValue.
-	sourceCodeManagementMenuLayout onChangeSend:#updateModifiedChannel to:self
+        sourceCodeManagementMenuLayout := #inline "#old" asValue.
+        sourceCodeManagementMenuLayout onChangeSend:#updateModifiedChannel to:self
     ].
     ^ sourceCodeManagementMenuLayout.
 
@@ -17636,8 +18354,8 @@
     "return/create the 'useCodeView2InTools' value holder (automatically generated)"
 
     useCodeView2InTools isNil ifTrue:[
-	useCodeView2InTools := ValueHolder new.
-	useCodeView2InTools onChangeSend:#updateModifiedChannel to:self
+        useCodeView2InTools := ValueHolder new.
+        useCodeView2InTools onChangeSend:#updateModifiedChannel to:self
 
     ].
     ^ useCodeView2InTools
@@ -17647,8 +18365,8 @@
 
 useInPlaceSearchInBrowserLists
     useInPlaceSearchInBrowserLists isNil ifTrue:[
-	useInPlaceSearchInBrowserLists := false asValue.
-	useInPlaceSearchInBrowserLists onChangeSend:#updateModifiedChannel to:self
+        useInPlaceSearchInBrowserLists := false asValue.
+        useInPlaceSearchInBrowserLists onChangeSend:#updateModifiedChannel to:self
     ].
     ^ useInPlaceSearchInBrowserLists.
 
@@ -17660,8 +18378,8 @@
      (like in firefox). False if a dialog is to be opened."
 
     useSearchBarInBrowser isNil ifTrue:[
-	useSearchBarInBrowser := true asValue.
-	useSearchBarInBrowser onChangeSend:#updateModifiedChannel to:self
+        useSearchBarInBrowser := true asValue.
+        useSearchBarInBrowser onChangeSend:#updateModifiedChannel to:self
     ].
     ^ useSearchBarInBrowser.
 !
@@ -17671,8 +18389,8 @@
      (like in firefox). False if a dialog is to be opened."
 
     webBrowserLikeLayout isNil ifTrue:[
-	webBrowserLikeLayout := false asValue.
-	webBrowserLikeLayout onChangeSend:#updateModifiedChannel to:self
+        webBrowserLikeLayout := false asValue.
+        webBrowserLikeLayout onChangeSend:#updateModifiedChannel to:self
     ].
     ^ webBrowserLikeLayout.
 
@@ -17764,8 +18482,8 @@
     <resource: #image>
 
     ^Icon
-	constantNamed:#'AbstractSettingsApplication::SystemMessageSettingsAppl class defaultIcon'
-	ifAbsentPut:[(Depth8Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(8 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
+        constantNamed:#'AbstractSettingsApplication::SystemMessageSettingsAppl class defaultIcon'
+        ifAbsentPut:[(Depth8Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(8 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'
 @@@@@@@@@@@@@PDA@P@@@@@@@@@@@@@@@@@@@@@@@PHB@0D@@@@@@@@@@@@@@@@@@@@@@PHDAPLC@P@@@@@@@@@@@@@@@@@@@@DBA PGA0 @@@@@@@@@@@@@
 @@@@@@@A@ XDA0\H@@@@@@@@@@@@@@@@@@@@@PHIA@(J@@@@@@@@@@@@@@@@@@@@@@DAB00MCP@@@@@@@@@@@@@@@@@@@@@@@@DN@@@@@@@@@@@@@@@@@@@@
 @@@@@@@AC @@@@@@@@@@@@@@@@@@@@@@@@@@@P8@@@@@@@@@@@@@@@@@@@@@@@<OC0PNDA@@DQD@@@@@@@@@@@@@@@<RD1LTEQXVE1 XDP@@@@@@@@@@@@@O
@@ -18021,56 +18739,56 @@
 
 aspects
     ^ #(
-		beepEnabled
-		beepInEditor
-		beepForInfoDialog
-		beepForWarningDialog
-		beepForErrorDialog
-		flyByHelpActive
-		toolTipAutoHideDelay
-		sendMessagesAlsoToTranscript
-		onlyShowTooltipsForActiveWindow
-	    )
+                beepEnabled
+                beepInEditor
+                beepForInfoDialog
+                beepForWarningDialog
+                beepForErrorDialog
+                flyByHelpActive
+                toolTipAutoHideDelay
+                sendMessagesAlsoToTranscript
+                onlyShowTooltipsForActiveWindow
+            )
 
     "Created: / 10-11-2010 / 12:07:42 / cg"
 !
 
 beepEnabled
     beepEnabled isNil ifTrue:[
-	beepEnabled := true asValue.
-	beepEnabled onChangeSend:#updateModifiedChannel to:self
+        beepEnabled := true asValue.
+        beepEnabled onChangeSend:#updateModifiedChannel to:self
     ].
     ^ beepEnabled.
 !
 
 beepForErrorDialog
     beepForErrorDialog isNil ifTrue:[
-	beepForErrorDialog := currentUserPrefs beepForErrorDialog asValue.
-	beepForErrorDialog onChangeSend:#updateModifiedChannel to:self
+        beepForErrorDialog := currentUserPrefs beepForErrorDialog asValue.
+        beepForErrorDialog onChangeSend:#updateModifiedChannel to:self
     ].
     ^ beepForErrorDialog.
 !
 
 beepForInfoDialog
     beepForInfoDialog isNil ifTrue:[
-	beepForInfoDialog := currentUserPrefs beepForInfoDialog asValue.
-	beepForInfoDialog onChangeSend:#updateModifiedChannel to:self
+        beepForInfoDialog := currentUserPrefs beepForInfoDialog asValue.
+        beepForInfoDialog onChangeSend:#updateModifiedChannel to:self
     ].
     ^ beepForInfoDialog.
 !
 
 beepForWarningDialog
     beepForWarningDialog isNil ifTrue:[
-	beepForWarningDialog := currentUserPrefs beepForWarningDialog asValue.
-	beepForWarningDialog onChangeSend:#updateModifiedChannel to:self
+        beepForWarningDialog := currentUserPrefs beepForWarningDialog asValue.
+        beepForWarningDialog onChangeSend:#updateModifiedChannel to:self
     ].
     ^ beepForWarningDialog.
 !
 
 beepInEditor
     beepInEditor isNil ifTrue:[
-	beepInEditor := true asValue.
-	beepInEditor onChangeSend:#updateModifiedChannel to:self
+        beepInEditor := true asValue.
+        beepInEditor onChangeSend:#updateModifiedChannel to:self
     ].
     ^ beepInEditor.
 !
@@ -18078,8 +18796,8 @@
 changeFileName
 
     changeFileName isNil ifTrue:[
-	changeFileName := ObjectMemory nameForChanges asValue.
-	changeFileName onChangeSend:#updateModifiedChannel to:self
+        changeFileName := ObjectMemory nameForChanges asValue.
+        changeFileName onChangeSend:#updateModifiedChannel to:self
     ].
     ^ changeFileName.
 !
@@ -18087,8 +18805,8 @@
 classInfos
 
     classInfos isNil ifTrue:[
-	classInfos := Object infoPrinting asValue.
-	classInfos onChangeSend:#updateModifiedChannel to:self
+        classInfos := Object infoPrinting asValue.
+        classInfos onChangeSend:#updateModifiedChannel to:self
     ].
     ^ classInfos.
 !
@@ -18096,16 +18814,16 @@
 displayErrors
 
     displayErrors isNil ifTrue:[
-	displayErrors := DeviceWorkstation errorPrinting asValue.
-	displayErrors onChangeSend:#updateModifiedChannel to:self
+        displayErrors := DeviceWorkstation errorPrinting asValue.
+        displayErrors onChangeSend:#updateModifiedChannel to:self
     ].
     ^ displayErrors.
 !
 
 flyByHelpActive
     flyByHelp isNil ifTrue:[
-	flyByHelp := currentUserPrefs flyByHelpActive asValue.
-	flyByHelp onChangeSend:#updateModifiedChannel to:self
+        flyByHelp := currentUserPrefs flyByHelpActive asValue.
+        flyByHelp onChangeSend:#updateModifiedChannel to:self
     ].
     ^ flyByHelp.
 !
@@ -18113,32 +18831,32 @@
 logDoits
 
     logDoits isNil ifTrue:[
-	logDoits := Smalltalk logDoits asValue.
-	logDoits onChangeSend:#updateModifiedChannel to:self
+        logDoits := Smalltalk logDoits asValue.
+        logDoits onChangeSend:#updateModifiedChannel to:self
     ].
     ^ logDoits.
 !
 
 onlyShowTooltipsForActiveWindow
     onlyShowTooltipsForActiveWindow isNil ifTrue:[
-	onlyShowTooltipsForActiveWindow := true asValue.
-	onlyShowTooltipsForActiveWindow onChangeSend:#updateModifiedChannel to:self
+        onlyShowTooltipsForActiveWindow := true asValue.
+        onlyShowTooltipsForActiveWindow onChangeSend:#updateModifiedChannel to:self
     ].
     ^ onlyShowTooltipsForActiveWindow.
 !
 
 sendMessagesAlsoToTranscript
     sendMessagesAlsoToTranscript isNil ifTrue:[
-	sendMessagesAlsoToTranscript := true asValue.
-	sendMessagesAlsoToTranscript onChangeSend:#updateModifiedChannel to:self
+        sendMessagesAlsoToTranscript := true asValue.
+        sendMessagesAlsoToTranscript onChangeSend:#updateModifiedChannel to:self
     ].
     ^ sendMessagesAlsoToTranscript.
 !
 
 toolTipAutoHideDelay
     toolTipAutoHideDelay isNil ifTrue:[
-	toolTipAutoHideDelay := 10 seconds asValue.
-	toolTipAutoHideDelay onChangeSend:#updateModifiedChannel to:self
+        toolTipAutoHideDelay := 10 seconds asValue.
+        toolTipAutoHideDelay onChangeSend:#updateModifiedChannel to:self
     ].
     ^ toolTipAutoHideDelay.
 
@@ -18148,8 +18866,8 @@
 updChanges
 
     updChanges isNil ifTrue:[
-	updChanges := Class updatingChanges asValue.
-	updChanges onChangeSend:#updateModifiedChannel to:self
+        updChanges := Class updatingChanges asValue.
+        updChanges onChangeSend:#updateModifiedChannel to:self
     ].
     ^ updChanges.
 !
@@ -18157,8 +18875,8 @@
 vmErrors
 
     vmErrors isNil ifTrue:[
-	vmErrors := ObjectMemory debugPrinting asValue.
-	vmErrors onChangeSend:#updateModifiedChannel to:self
+        vmErrors := ObjectMemory debugPrinting asValue.
+        vmErrors onChangeSend:#updateModifiedChannel to:self
     ].
     ^ vmErrors.
 !
@@ -18166,8 +18884,8 @@
 vmInfo
 
     vmInfo isNil ifTrue:[
-	vmInfo := ObjectMemory infoPrinting asValue.
-	vmInfo onChangeSend:#updateModifiedChannel to:self
+        vmInfo := ObjectMemory infoPrinting asValue.
+        vmInfo onChangeSend:#updateModifiedChannel to:self
     ].
     ^ vmInfo.
 ! !
@@ -18312,8 +19030,8 @@
 
 terminalOutputIsUTF8
     terminalOutputIsUTF8 isNil ifTrue:[
-	terminalOutputIsUTF8 := false asValue.
-	terminalOutputIsUTF8 onChangeSend:#updateModifiedChannel to:self.
+        terminalOutputIsUTF8 := false asValue.
+        terminalOutputIsUTF8 onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ terminalOutputIsUTF8.
 ! !
@@ -18368,28 +19086,28 @@
 
     ^
      #(FullSpec
-	name: developmentToolsSpec
-	window:
+        name: developmentToolsSpec
+        window:
        (WindowSpec
-	  label: 'Development'
-	  name: 'Development'
-	  bounds: (Rectangle 0 0 674 614)
-	)
-	component:
+          label: 'Development'
+          name: 'Development'
+          bounds: (Rectangle 0 0 674 614)
+        )
+        component:
        (SpecCollection
-	  collection: (
-	   (VerticalPanelViewSpec
-	      name: 'DevToolsPanel'
-	      layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-	      horizontalLayout: fit
-	      verticalLayout: top
-	      horizontalSpace: 3
-	      verticalSpace: 3
-	      postBuildCallback: developmentToolSettingsInto:
-	    )
-	   )
-
-	)
+          collection: (
+           (VerticalPanelViewSpec
+              name: 'DevToolsPanel'
+              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+              horizontalLayout: fit
+              verticalLayout: top
+              horizontalSpace: 3
+              verticalSpace: 3
+              postBuildCallback: developmentToolSettingsInto:
+            )
+           )
+
+        )
       )
 
     "Modified: / 03-04-2012 / 10:51:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -18411,28 +19129,28 @@
 
     ^
      #(FullSpec
-	name: miscToolsSpec
-	window:
+        name: miscToolsSpec
+        window:
        (WindowSpec
-	  label: 'Other'
-	  name: 'Other'
-	  bounds: (Rectangle 0 0 674 614)
-	)
-	component:
+          label: 'Other'
+          name: 'Other'
+          bounds: (Rectangle 0 0 674 614)
+        )
+        component:
        (SpecCollection
-	  collection: (
-	   (VerticalPanelViewSpec
-	      name: 'DevToolsPanel'
-	      layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-	      horizontalLayout: fit
-	      verticalLayout: top
-	      horizontalSpace: 3
-	      verticalSpace: 3
-	      postBuildCallback: miscToolSettingsInto:
-	    )
-	   )
-
-	)
+          collection: (
+           (VerticalPanelViewSpec
+              name: 'DevToolsPanel'
+              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+              horizontalLayout: fit
+              verticalLayout: top
+              horizontalSpace: 3
+              verticalSpace: 3
+              postBuildCallback: miscToolSettingsInto:
+            )
+           )
+
+        )
       )
 
     "Created: / 03-04-2012 / 10:51:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -18455,24 +19173,24 @@
 
     ^
      #(FullSpec
-	name: windowSpec
-	window:
+        name: windowSpec
+        window:
        (WindowSpec
-	  label: 'Toolbox Settings'
-	  name: 'Toolbox Settings'
-	  bounds: (Rectangle 0 0 551 561)
-	)
-	component:
+          label: 'Toolbox Settings'
+          name: 'Toolbox Settings'
+          bounds: (Rectangle 0 0 551 561)
+        )
+        component:
        (SpecCollection
-	  collection: (
-	   (NoteBookViewSpec
-	      name: 'NoteBook'
-	      layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-	      menu: notebookTabList
-	    )
-	   )
-
-	)
+          collection: (
+           (NoteBookViewSpec
+              name: 'NoteBook'
+              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+              menu: notebookTabList
+            )
+           )
+
+        )
       )
 ! !
 
@@ -18493,15 +19211,15 @@
 
     ^     #(
        (TabItem
-	  label: 'Development'
-	  minorKey: developmentToolsSpec
-	  createNewBuilder: false
-	)
+          label: 'Development'
+          minorKey: developmentToolsSpec
+          createNewBuilder: false
+        )
        (TabItem
-	  label: 'Miscellaneous'
-	  minorKey: miscToolsSpec
-	  createNewBuilder: false
-	)
+          label: 'Miscellaneous'
+          minorKey: miscToolsSpec
+          createNewBuilder: false
+        )
 
        )
 
@@ -18515,11 +19233,11 @@
 aspects
 
     ^#(
-	"Development"
-	changesBrowserClassName
-
-	"Misc"
-	fileBrowserClassName
+        "Development"
+        changesBrowserClassName
+
+        "Misc"
+        fileBrowserClassName
     )
 
     "Created: / 14-02-2012 / 18:36:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -18536,7 +19254,7 @@
     "*** (and replace this comment by something more useful ;-)"
 
     changesBrowserClassName isNil ifTrue:[
-	changesBrowserClassName := ValueHolder new.
+        changesBrowserClassName := ValueHolder new.
 "/ if your app needs to be notified of changes, uncomment one of the lines below:
 "/       changesBrowserClassName addDependent:self.
       changesBrowserClassName onChangeSend:#updateModifiedChannel to:self.
@@ -18550,8 +19268,8 @@
     <resource: #uiAspect>
 
     fileBrowserClassName isNil ifTrue:[
-	fileBrowserClassName := ValueHolder new.
-	fileBrowserClassName onChangeSend:#updateModifiedChannel to:self.
+        fileBrowserClassName := ValueHolder new.
+        fileBrowserClassName onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ fileBrowserClassName.
 
@@ -18565,7 +19283,7 @@
     |list|
 
     (list := builder bindingAt:#notebookTabList) isNil ifTrue:[
-	builder aspectAt:#notebookTabList put:(list := self class notebookTabList).
+        builder aspectAt:#notebookTabList put:(list := self class notebookTabList).
     ].
     ^ list
 ! !
@@ -18575,14 +19293,14 @@
 developmentToolSettingsInto:panel
 
     (self addClassToolSettingTo: panel)
-	label: 'Changes Browser';
-	classes:#(  #ChangesBrowser
-		    #NewChangesBrowser
-		    #Tools::ChangeSetBrowser2 );
-	labels: #(  'ChangesBrowser - default'
-		    'NewChangesBrowser - experimental, not maintained'
-		    'Tools::ChangeSetBrowser2 - experimental' );
-	model: self changesBrowserClassName
+        label: 'Changes Browser';
+        classes:#(  #ChangesBrowser
+                    #NewChangesBrowser
+                    #Tools::ChangeSetBrowser2 );
+        labels: #(  'ChangesBrowser - default'
+                    'NewChangesBrowser - experimental, not maintained'
+                    'Tools::ChangeSetBrowser2 - experimental' );
+        model: self changesBrowserClassName
 
     "Created: / 14-02-2012 / 16:20:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
@@ -18590,14 +19308,14 @@
 miscToolSettingsInto:panel
 
     (self addClassToolSettingTo: panel)
-	label: 'File Browser';
-	classes:#(  #FileBrowser
-		    #FileBrowserV2
-		    #FileBrowserV3 );
-	labels: #(  'FileBrowser'
-		    'FileBrowserV2 - default'
-		    'FileBrowserV3 - experimental' );
-	model: self fileBrowserClassName
+        label: 'File Browser';
+        classes:#(  #FileBrowser
+                    #FileBrowserV2
+                    #FileBrowserV3 );
+        labels: #(  'FileBrowser'
+                    'FileBrowserV2 - default'
+                    'FileBrowserV3 - experimental' );
+        model: self fileBrowserClassName
 
     "Created: / 03-04-2012 / 10:54:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
@@ -18649,48 +19367,48 @@
 
     ^
      #(FullSpec
-	name: windowSpec
-	window:
+        name: windowSpec
+        window:
        (WindowSpec
-	  label: 'ToolSetting'
-	  name: 'ToolSetting'
-	  min: (Point 10 10)
-	  bounds: (Rectangle 0 0 431 60)
-	)
-	component:
+          label: 'ToolSetting'
+          name: 'ToolSetting'
+          min: (Point 10 10)
+          bounds: (Rectangle 0 0 431 60)
+        )
+        component:
        (SpecCollection
-	  collection: (
-	   (LabelSpec
-	      label: 'Tool...'
-	      name: 'Label'
-	      layout: (LayoutFrame 0 0 0 0 150 0 30 0)
-	      translateLabel: true
-	      labelChannel: optionLabelHolder
-	      adjust: left
-	    )
-	   (PopUpListSpec
-	      label: 'Please select...'
-	      name: 'OptionList'
-	      layout: (LayoutFrame 150 0 3 0 0 1 27 0)
-	      model: optionSelectionHolder
-	      menu: optionLabelList
-	      useIndex: true
-	    )
-	   (InputFieldSpec
-	      name: 'EntryField1'
-	      layout: (LayoutFrame 150 0 33 0 0 1 56 0)
-	      visibilityChannel: optionCustomValueVisibleHolder
-	      backgroundChannel: optionCustomValueBackgroundHolder
-	      model: optionCustomValueHolder
-	      type: string
-	      immediateAccept: true
-	      acceptOnReturn: true
-	      acceptOnTab: true
-	      acceptOnPointerLeave: true
-	    )
-	   )
-
-	)
+          collection: (
+           (LabelSpec
+              label: 'Tool...'
+              name: 'Label'
+              layout: (LayoutFrame 0 0 0 0 150 0 30 0)
+              translateLabel: true
+              labelChannel: optionLabelHolder
+              adjust: left
+            )
+           (PopUpListSpec
+              label: 'Please select...'
+              name: 'OptionList'
+              layout: (LayoutFrame 150 0 3 0 0 1 27 0)
+              model: optionSelectionHolder
+              menu: optionLabelList
+              useIndex: true
+            )
+           (InputFieldSpec
+              name: 'EntryField1'
+              layout: (LayoutFrame 150 0 33 0 0 1 56 0)
+              visibilityChannel: optionCustomValueVisibleHolder
+              backgroundChannel: optionCustomValueBackgroundHolder
+              model: optionCustomValueHolder
+              type: string
+              immediateAccept: true
+              acceptOnReturn: true
+              acceptOnTab: true
+              acceptOnPointerLeave: true
+            )
+           )
+
+        )
       )
 ! !
 
@@ -18740,7 +19458,7 @@
     "*** (and replace this comment by something more useful ;-)"
 
     optionCustomValueBackgroundHolder isNil ifTrue:[
-	optionCustomValueBackgroundHolder := ValueHolder new.
+        optionCustomValueBackgroundHolder := ValueHolder new.
 "/ if your app needs to be notified of changes, uncomment one of the lines below:
 "/       optionCustomValueBackgroundHolder addDependent:self.
 "/       optionCustomValueBackgroundHolder onChangeSend:#optionCustomValueBackgroundHolderChanged to:self.
@@ -18765,7 +19483,7 @@
     "*** (and replace this comment by something more useful ;-)"
 
     optionCustomValueHolder isNil ifTrue:[
-	optionCustomValueHolder := ValueHolder new.
+        optionCustomValueHolder := ValueHolder new.
 "/ if your app needs to be notified of changes, uncomment one of the lines below:
        optionCustomValueHolder addDependent:self.
 "/       optionCustomValueHolder onChangeSend:#optionCustomValueHolderChanged to:self.
@@ -18786,7 +19504,7 @@
     "*** (and replace this comment by something more useful ;-)"
 
     optionCustomValueVisibleHolder isNil ifTrue:[
-	optionCustomValueVisibleHolder := false asValue.
+        optionCustomValueVisibleHolder := false asValue.
 "/ if your app needs to be notified of changes, uncomment one of the lines below:
        optionCustomValueVisibleHolder addDependent:self.
 "/       optionCustomValueVisibleHolder onChangeSend:#optionCustomValueVisibleHolderChanged to:self.
@@ -18807,7 +19525,7 @@
     "*** (and replace this comment by something more useful ;-)"
 
     optionLabelHolder isNil ifTrue:[
-	optionLabelHolder := ValueHolder new.
+        optionLabelHolder := ValueHolder new.
 "/ if your app needs to be notified of changes, uncomment one of the lines below:
 "/       optionLabelHolder addDependent:self.
 "/       optionLabelHolder onChangeSend:#optionLabelHolderChanged to:self.
@@ -18826,7 +19544,7 @@
     "*** (and replace this comment by something more useful ;-)"
 
     optionLabelList isNil ifTrue:[
-	optionLabelList := ValueHolder new.
+        optionLabelList := ValueHolder new.
 "/ if your app needs to be notified of changes, uncomment one of the lines below:
 "/       optionLabelList addDependent:self.
 "/       optionLabelList onChangeSend:#optionLabelListChanged to:self.
@@ -18851,7 +19569,7 @@
     "*** (and replace this comment by something more useful ;-)"
 
     optionSelectionHolder isNil ifTrue:[
-	optionSelectionHolder := ValueHolder new.
+        optionSelectionHolder := ValueHolder new.
 "/ if your app needs to be notified of changes, uncomment one of the lines below:
        optionSelectionHolder addDependent:self.
 "/       optionSelectionHolder onChangeSend:#optionSelectionHolderChanged to:self.
@@ -18867,16 +19585,16 @@
     |oldValue newValue|
 
     optionSelectionHolder notNil ifTrue:[
-	oldValue := optionSelectionHolder value.
-	optionSelectionHolder removeDependent:self.
+        oldValue := optionSelectionHolder value.
+        optionSelectionHolder removeDependent:self.
     ].
     optionSelectionHolder := something.
     optionSelectionHolder notNil ifTrue:[
-	optionSelectionHolder addDependent:self.
+        optionSelectionHolder addDependent:self.
     ].
     newValue := optionSelectionHolder value.
     oldValue ~~ newValue ifTrue:[
-	self update:#value with:newValue from:optionSelectionHolder.
+        self update:#value with:newValue from:optionSelectionHolder.
     ].
 !
 
@@ -18884,8 +19602,8 @@
     "return/create the 'optionValueHolder' value holder (automatically generated)"
 
     optionValueHolder isNil ifTrue:[
-	optionValueHolder := ValueHolder new.
-	optionValueHolder addDependent:self.
+        optionValueHolder := ValueHolder new.
+        optionValueHolder addDependent:self.
     ].
     ^ optionValueHolder
 !
@@ -18896,16 +19614,16 @@
     |oldValue newValue|
 
     optionValueHolder notNil ifTrue:[
-	oldValue := optionValueHolder value.
-	optionValueHolder removeDependent:self.
+        oldValue := optionValueHolder value.
+        optionValueHolder removeDependent:self.
     ].
     optionValueHolder := something.
     optionValueHolder notNil ifTrue:[
-	optionValueHolder addDependent:self.
+        optionValueHolder addDependent:self.
     ].
     newValue := optionValueHolder value.
     oldValue ~~ newValue ifTrue:[
-	self update:#value with:newValue from:optionValueHolder.
+        self update:#value with:newValue from:optionValueHolder.
     ].
 ! !
 
@@ -18917,30 +19635,30 @@
     "stub code automatically generated - please change as required"
 
     changedObject == optionSelectionHolder ifTrue:[
-	| idx |
-
-	idx := self optionSelectionHolder value.
-	self optionCustomValueVisibleHolder value: (idx == optionLabelList value size).
-	idx <= optionValueList size ifTrue:[
-	    self optionValueHolder value: (optionValueList at: idx)
-	].
-	 ^ self.
+        | idx |
+
+        idx := self optionSelectionHolder value.
+        self optionCustomValueVisibleHolder value: (idx == optionLabelList value size).
+        idx <= optionValueList size ifTrue:[
+            self optionValueHolder value: (optionValueList at: idx)
+        ].
+         ^ self.
     ].
     changedObject == optionCustomValueVisibleHolder ifTrue:[
-	self window notNil ifTrue:[
-	    optionCustomValueVisibleHolder value ifTrue:[
-		self window height: 60
-	    ] ifFalse:[
-		self window height: 30
-	    ]
-	]
+        self window notNil ifTrue:[
+            optionCustomValueVisibleHolder value ifTrue:[
+                self window height: 60
+            ] ifFalse:[
+                self window height: 30
+            ]
+        ]
     ].
 
     changedObject == optionValueHolder ifTrue:[
-	| idx |
-
-	self optionSelectionHolder value: ((optionValueList ? #()) indexOf: optionValueHolder value ifAbsent:[optionLabelList value size]).
-	self optionCustomValueHolder value: optionValueHolder value.
+        | idx |
+
+        self optionSelectionHolder value: ((optionValueList ? #()) indexOf: optionValueHolder value ifAbsent:[optionLabelList value size]).
+        self optionCustomValueHolder value: optionValueHolder value.
 
     ].
 
@@ -19012,28 +19730,28 @@
      Icon flushCachedIcons"
 
     ^ Icon
-	constantNamed:#'AbstractSettingsApplication::ToolsSettingsAppl class defaultIcon'
-	ifAbsentPut:[
-	    (Depth4Image new)
-		width:22;
-		height:22;
-		photometric:(#palette);
-		bitsPerSample:(#( 4 ));
-		samplesPerPixel:(1);
-		bits:(ByteArray
-			    fromPackedString:'
+        constantNamed:#'AbstractSettingsApplication::ToolsSettingsAppl class defaultIcon'
+        ifAbsentPut:[
+            (Depth4Image new)
+                width:22;
+                height:22;
+                photometric:(#palette);
+                bitsPerSample:(#( 4 ));
+                samplesPerPixel:(1);
+                bits:(ByteArray
+                            fromPackedString:'
 ******************************@@@@@@@@@@@@@J(@@@@@@@@@@@@@* @@@F(QD@@@@@B*@@@@B((QD@@@@J(@@@@@@JLQ@@@@* @B$@@@)CD@@@B*@@
 IC$J*SPP@@@J(@BH@4MCQADP@@* AR"HACQAFQD@B*@@H""H"HEG$Q@J(@@@H"H("HP9$@* @@@@@"H""HI@B*@@@@@@@@H""H@J(@@@@@@@@@H" @* @@@@
 @@@@@@H0B*@@@@@@@@@@@@@J(@@@@@@@@@@@@@* @@@@@@@@@@@@B*****************************(b');
-		colorMapFromArray:#[ 0 0 0 160 160 160 240 240 240 224 224 224 48 48 48 128 128 128 208 208 208 112 112 112 192 192 192 96 96 96 176 176 176 ];
-		mask:((ImageMask new)
-			    width:22;
-			    height:22;
-			    bits:(ByteArray
-					fromPackedString:'@@@@@@@@@@@@@?@@@?0@@_8@GO<@G3<@G?>@G??@G?? G?? C?? @?? @G? @@_ @@G @@A @@@@@@@@@@@@@@@@');
-			    yourself);
-		yourself
-	]
+                colorMapFromArray:#[ 0 0 0 160 160 160 240 240 240 224 224 224 48 48 48 128 128 128 208 208 208 112 112 112 192 192 192 96 96 96 176 176 176 ];
+                mask:((ImageMask new)
+                            width:22;
+                            height:22;
+                            bits:(ByteArray
+                                        fromPackedString:'@@@@@@@@@@@@@?@@@?0@@_8@GO<@G3<@G?>@G??@G?? G?? C?? @?? @G? @@_ @@G @@A @@@@@@@@@@@@@@@@');
+                            yourself);
+                yourself
+        ]
 ! !
 
 !AbstractSettingsApplication::ToolsSettingsAppl class methodsFor:'interface specs'!
@@ -19058,242 +19776,242 @@
        name: windowSpec
        window:
       (WindowSpec
-	 label: 'Tool Settings'
-	 name: 'Tool Settings'
-	 flags: 1
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 594 584)
+         label: 'Tool Settings'
+         name: 'Tool Settings'
+         flags: 1
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 594 584)
        )
        component:
       (SpecCollection
-	 collection: (
-	  (VerticalPanelViewSpec
-	     name: 'VerticalPanel1'
-	     layout: (LayoutFrame 0 0.0 0 0 0 1.0 562 0)
-	     horizontalLayout: fit
-	     verticalLayout: top
-	     horizontalSpace: 3
-	     verticalSpace: 3
-	     component:
-	    (SpecCollection
-	       collection: (
-		(CheckBoxSpec
-		   label: 'Use the New System Browser'
-		   name: 'NewSystemBrowser'
-		   activeHelpKey: useNewSystemBrowser
-		   visibilityChannel: false
-		   model: useNewSystemBrowser
-		   translateLabel: true
-		   extent: (Point 594 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Use the New File Browser'
-		   name: 'NewFileBrowser'
-		   activeHelpKey: useNewFileBrowser
-		   visibilityChannel: false
-		   model: useNewFileBrowser
-		   translateLabel: true
-		   extent: (Point 594 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Use the New VersionDiff Browser'
-		   name: 'VersionDiffBrowser'
-		   model: useNewVersionDiffBrowser
-		   translateLabel: true
-		   extent: (Point 594 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Use the New FileTree File Dialog'
-		   name: 'UseNewFileDialogCheckBox'
-		   model: useNewFileDialog
-		   translateLabel: true
-		   extent: (Point 594 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Use the New Settings Dialog'
-		   name: 'UseNewSettinsApplicationCheckBox'
-		   visibilityChannel: false
-		   model: useNewSettingsApplication
-		   translateLabel: true
-		   extent: (Point 594 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Use the New Process Monitor'
-		   name: 'UseNewProcessMonitor'
-		   model: useProcessMonitorV2
-		   translateLabel: true
-		   extent: (Point 594 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Use the New TestRunner2'
-		   name: 'CheckBox3'
-		   model: useTestRunner2
-		   translateLabel: true
-		   extent: (Point 594 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Use the New Changes Browser for Changefiles (not yet recommended)'
-		   name: 'ChangesBrowser'
-		   model: useNewChangesBrowser
-		   translateLabel: true
-		   extent: (Point 594 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Use the New ChangeSet Browser for Internal ChangeSets'
-		   name: 'CheckBox5'
-		   model: useNewChangeSetBrowser
-		   translateLabel: true
-		   extent: (Point 594 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Use Hierarchical Inspector (not yet recommended)'
-		   name: 'HierarchicalInspector'
-		   activeHelpKey: useHierarchicalInspector
-		   model: useNewInspector
-		   translateLabel: true
-		   extent: (Point 594 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Use the Smalltalk Document Viewer'
-		   name: 'UseSmalltalkDocumentViewer'
-		   activeHelpKey: useSmalltalkDocumentView
-		   model: useSmalltalkDocumentViewer
-		   translateLabel: true
-		   extent: (Point 594 30)
-		 )
-		(HorizontalPanelViewSpec
-		   name: 'HorizontalPanel2'
-		   horizontalLayout: leftFit
-		   verticalLayout: center
-		   horizontalSpace: 3
-		   verticalSpace: 3
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'External Diff Tool:'
-			 name: 'Label3'
-			 activeHelpKey: transcriptBufferSize
-			 translateLabel: true
-			 resizeForLabel: true
-			 adjust: left
-			 useDefaultExtent: true
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField1'
-			 activeHelpKey: transcriptBufferSize
-			 model: externalDiffCommandTemplate
-			 type: string
-			 immediateAccept: true
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-			 extent: (Point 480 30)
-		       )
-		      )
-
-		   )
-		   extent: (Point 594 35)
-		 )
-		(DividerSpec
-		   name: 'Separator3'
-		   extent: (Point 594 4)
-		 )
-		(CheckBoxSpec
-		   label: 'Show "Tip Of The Day" at Startup'
-		   name: 'CheckBox1'
-		   activeHelpKey: showDidYouKnowTips
-		   model: showTipOfTheDayAtStartup
-		   translateLabel: true
-		   extent: (Point 594 30)
-		 )
-		(CheckBoxSpec
-		   label: 'Show Clock in Launcher'
-		   name: 'Clock'
-		   activeHelpKey: showClockInLauncher
-		   model: showClockInLauncher
-		   translateLabel: true
-		   extent: (Point 594 30)
-		 )
-		(DividerSpec
-		   name: 'Separator2'
-		   extent: (Point 594 4)
-		 )
-		(HorizontalPanelViewSpec
-		   name: 'HorizontalPanel1'
-		   horizontalLayout: left
-		   verticalLayout: center
-		   horizontalSpace: 3
-		   verticalSpace: 3
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (ViewSpec
-			 name: 'Box4'
-			 extent: (Point 20 10)
-		       )
-		      (LabelSpec
-			 label: 'Transcript''s Buffer Size:'
-			 name: 'Label1'
-			 activeHelpKey: transcriptBufferSize
-			 translateLabel: true
-			 resizeForLabel: true
-			 adjust: right
-			 useDefaultExtent: true
-		       )
-		      (InputFieldSpec
-			 name: 'Transcripts Buffer Size'
-			 activeHelpKey: transcriptBufferSize
-			 model: transcriptBufferSize
-			 type: number
-			 immediateAccept: true
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 numChars: 8
-			 acceptOnPointerLeave: true
-			 extent: (Point 78 30)
-		       )
-		      (LabelSpec
-			 label: '(Lines)'
-			 name: 'Label2'
-			 activeHelpKey: transcriptBufferSize
-			 translateLabel: true
-			 resizeForLabel: true
-			 adjust: right
-			 useDefaultExtent: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 594 35)
-		 )
-		(CheckBoxSpec
-		   label: 'Autoraise Transcript'
-		   name: 'CheckBox2'
-		   activeHelpKey: autoRaiseTranscript
-		   model: autoRaiseTranscript
-		   translateLabel: true
-		   extent: (Point 594 30)
-		 )
-		(DividerSpec
-		   name: 'Separator1'
-		   extent: (Point 594 4)
-		 )
-		(CheckBoxSpec
-		   label: 'Eclipse Style Menus (where implemented)'
-		   name: 'CheckBox4'
-		   activeHelpKey: eclipseStyleMenus
-		   model: eclipseStyleMenus
-		   translateLabel: true
-		   extent: (Point 594 30)
-		 )
-		)
-
-	     )
-	   )
-	  )
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel1'
+             layout: (LayoutFrame 0 0.0 0 0 0 1.0 562 0)
+             horizontalLayout: fit
+             verticalLayout: top
+             horizontalSpace: 3
+             verticalSpace: 3
+             component:
+            (SpecCollection
+               collection: (
+                (CheckBoxSpec
+                   label: 'Use the New System Browser'
+                   name: 'NewSystemBrowser'
+                   activeHelpKey: useNewSystemBrowser
+                   visibilityChannel: false
+                   model: useNewSystemBrowser
+                   translateLabel: true
+                   extent: (Point 594 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Use the New File Browser'
+                   name: 'NewFileBrowser'
+                   activeHelpKey: useNewFileBrowser
+                   visibilityChannel: false
+                   model: useNewFileBrowser
+                   translateLabel: true
+                   extent: (Point 594 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Use the New VersionDiff Browser'
+                   name: 'VersionDiffBrowser'
+                   model: useNewVersionDiffBrowser
+                   translateLabel: true
+                   extent: (Point 594 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Use the New FileTree File Dialog'
+                   name: 'UseNewFileDialogCheckBox'
+                   model: useNewFileDialog
+                   translateLabel: true
+                   extent: (Point 594 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Use the New Settings Dialog'
+                   name: 'UseNewSettinsApplicationCheckBox'
+                   visibilityChannel: false
+                   model: useNewSettingsApplication
+                   translateLabel: true
+                   extent: (Point 594 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Use the New Process Monitor'
+                   name: 'UseNewProcessMonitor'
+                   model: useProcessMonitorV2
+                   translateLabel: true
+                   extent: (Point 594 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Use the New TestRunner2'
+                   name: 'CheckBox3'
+                   model: useTestRunner2
+                   translateLabel: true
+                   extent: (Point 594 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Use the New Changes Browser for Changefiles (not yet recommended)'
+                   name: 'ChangesBrowser'
+                   model: useNewChangesBrowser
+                   translateLabel: true
+                   extent: (Point 594 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Use the New ChangeSet Browser for Internal ChangeSets'
+                   name: 'CheckBox5'
+                   model: useNewChangeSetBrowser
+                   translateLabel: true
+                   extent: (Point 594 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Use Hierarchical Inspector (not yet recommended)'
+                   name: 'HierarchicalInspector'
+                   activeHelpKey: useHierarchicalInspector
+                   model: useNewInspector
+                   translateLabel: true
+                   extent: (Point 594 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Use the Smalltalk Document Viewer'
+                   name: 'UseSmalltalkDocumentViewer'
+                   activeHelpKey: useSmalltalkDocumentView
+                   model: useSmalltalkDocumentViewer
+                   translateLabel: true
+                   extent: (Point 594 30)
+                 )
+                (HorizontalPanelViewSpec
+                   name: 'HorizontalPanel2'
+                   horizontalLayout: leftFit
+                   verticalLayout: center
+                   horizontalSpace: 3
+                   verticalSpace: 3
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'External Diff Tool:'
+                         name: 'Label3'
+                         activeHelpKey: transcriptBufferSize
+                         translateLabel: true
+                         resizeForLabel: true
+                         adjust: left
+                         useDefaultExtent: true
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField1'
+                         activeHelpKey: transcriptBufferSize
+                         model: externalDiffCommandTemplate
+                         type: string
+                         immediateAccept: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                         extent: (Point 480 30)
+                       )
+                      )
+
+                   )
+                   extent: (Point 594 35)
+                 )
+                (DividerSpec
+                   name: 'Separator3'
+                   extent: (Point 594 4)
+                 )
+                (CheckBoxSpec
+                   label: 'Show "Tip Of The Day" at Startup'
+                   name: 'CheckBox1'
+                   activeHelpKey: showDidYouKnowTips
+                   model: showTipOfTheDayAtStartup
+                   translateLabel: true
+                   extent: (Point 594 30)
+                 )
+                (CheckBoxSpec
+                   label: 'Show Clock in Launcher'
+                   name: 'Clock'
+                   activeHelpKey: showClockInLauncher
+                   model: showClockInLauncher
+                   translateLabel: true
+                   extent: (Point 594 30)
+                 )
+                (DividerSpec
+                   name: 'Separator2'
+                   extent: (Point 594 4)
+                 )
+                (HorizontalPanelViewSpec
+                   name: 'HorizontalPanel1'
+                   horizontalLayout: left
+                   verticalLayout: center
+                   horizontalSpace: 3
+                   verticalSpace: 3
+                   component:
+                  (SpecCollection
+                     collection: (
+                      (ViewSpec
+                         name: 'Box4'
+                         extent: (Point 20 10)
+                       )
+                      (LabelSpec
+                         label: 'Transcript''s Buffer Size:'
+                         name: 'Label1'
+                         activeHelpKey: transcriptBufferSize
+                         translateLabel: true
+                         resizeForLabel: true
+                         adjust: right
+                         useDefaultExtent: true
+                       )
+                      (InputFieldSpec
+                         name: 'Transcripts Buffer Size'
+                         activeHelpKey: transcriptBufferSize
+                         model: transcriptBufferSize
+                         type: number
+                         immediateAccept: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         numChars: 8
+                         acceptOnPointerLeave: true
+                         extent: (Point 78 30)
+                       )
+                      (LabelSpec
+                         label: '(Lines)'
+                         name: 'Label2'
+                         activeHelpKey: transcriptBufferSize
+                         translateLabel: true
+                         resizeForLabel: true
+                         adjust: right
+                         useDefaultExtent: true
+                       )
+                      )
+
+                   )
+                   extent: (Point 594 35)
+                 )
+                (CheckBoxSpec
+                   label: 'Autoraise Transcript'
+                   name: 'CheckBox2'
+                   activeHelpKey: autoRaiseTranscript
+                   model: autoRaiseTranscript
+                   translateLabel: true
+                   extent: (Point 594 30)
+                 )
+                (DividerSpec
+                   name: 'Separator1'
+                   extent: (Point 594 4)
+                 )
+                (CheckBoxSpec
+                   label: 'Eclipse Style Menus (where implemented)'
+                   name: 'CheckBox4'
+                   activeHelpKey: eclipseStyleMenus
+                   model: eclipseStyleMenus
+                   translateLabel: true
+                   extent: (Point 594 30)
+                 )
+                )
+
+             )
+           )
+          )
 
        )
      )
@@ -19385,23 +20103,23 @@
 
 aspects
     ^ #(
-	#eclipseStyleMenus
-	#useTestRunner2
-	"/ #useCodeView2InTools
-	#useNewInspector
-	#useNewChangesBrowser
-	#useNewChangeSetBrowser
-	"/ #useNewSystemBrowser     -- no longer an option
-	#useNewVersionDiffBrowser
-	"/ #useNewFileBrowser       -- no longer an option
-	#useNewFileDialog
-	"/ #useNewSettingsApplication   -- no longer an option
-	#useProcessMonitorV2
-	#useSmalltalkDocumentViewer
-	#showClockInLauncher
-	#showTipOfTheDayAtStartup
-	#externalDiffCommandTemplate
-	#autoRaiseTranscript
+        #eclipseStyleMenus
+        #useTestRunner2
+        "/ #useCodeView2InTools
+        #useNewInspector
+        #useNewChangesBrowser
+        #useNewChangeSetBrowser
+        "/ #useNewSystemBrowser     -- no longer an option
+        #useNewVersionDiffBrowser
+        "/ #useNewFileBrowser       -- no longer an option
+        #useNewFileDialog
+        "/ #useNewSettingsApplication   -- no longer an option
+        #useProcessMonitorV2
+        #useSmalltalkDocumentViewer
+        #showClockInLauncher
+        #showTipOfTheDayAtStartup
+        #externalDiffCommandTemplate
+        #autoRaiseTranscript
     )
 
     "Created: / 27-07-2012 / 20:48:18 / cg"
@@ -19409,8 +20127,8 @@
 
 autoRaiseTranscript
     autoRaiseTranscript isNil ifTrue:[
-	autoRaiseTranscript := false asValue.
-	autoRaiseTranscript onChangeSend:#updateModifiedChannel to:self
+        autoRaiseTranscript := false asValue.
+        autoRaiseTranscript onChangeSend:#updateModifiedChannel to:self
     ].
     ^ autoRaiseTranscript.
 
@@ -19419,8 +20137,8 @@
 
 eclipseStyleMenus
     eclipseStyleMenus isNil ifTrue:[
-	eclipseStyleMenus := false asValue.
-	eclipseStyleMenus onChangeSend:#updateModifiedChannel to:self
+        eclipseStyleMenus := false asValue.
+        eclipseStyleMenus onChangeSend:#updateModifiedChannel to:self
     ].
     ^ eclipseStyleMenus.
 
@@ -19430,16 +20148,16 @@
 
 externalDiffCommandTemplate
     externalDiffCommandTemplate isNil ifTrue:[
-	externalDiffCommandTemplate := UserPreferences current externalDiffCommandTemplate asValue.
-	externalDiffCommandTemplate onChangeSend:#updateModifiedChannel to:self
+        externalDiffCommandTemplate := UserPreferences current externalDiffCommandTemplate asValue.
+        externalDiffCommandTemplate onChangeSend:#updateModifiedChannel to:self
     ].
     ^ externalDiffCommandTemplate.
 !
 
 showClockInLauncher
     showClockInLauncher isNil ifTrue:[
-	showClockInLauncher := false asValue.
-	showClockInLauncher onChangeSend:#updateModifiedChannel to:self
+        showClockInLauncher := false asValue.
+        showClockInLauncher onChangeSend:#updateModifiedChannel to:self
     ].
     ^ showClockInLauncher.
 
@@ -19448,8 +20166,8 @@
 
 showTipOfTheDayAtStartup
     showTipOfTheDayAtStartup isNil ifTrue:[
-	showTipOfTheDayAtStartup := false asValue.
-	showTipOfTheDayAtStartup onChangeSend:#updateModifiedChannel to:self
+        showTipOfTheDayAtStartup := false asValue.
+        showTipOfTheDayAtStartup onChangeSend:#updateModifiedChannel to:self
     ].
     ^ showTipOfTheDayAtStartup.
 
@@ -19458,16 +20176,16 @@
 
 transcriptBufferSize
     transcriptBufferSize isNil ifTrue:[
-	transcriptBufferSize := 600 asValue. "/ Transcript current lineLimit asValue.
-	transcriptBufferSize onChangeSend:#updateModifiedChannel to:self
+        transcriptBufferSize := 600 asValue. "/ Transcript current lineLimit asValue.
+        transcriptBufferSize onChangeSend:#updateModifiedChannel to:self
     ].
     ^ transcriptBufferSize.
 !
 
 useCodeView2InTools
     useCodeView2InTools isNil ifTrue:[
-	useCodeView2InTools := ValueHolder new.
-	useCodeView2InTools onChangeSend:#updateModifiedChannel to:self
+        useCodeView2InTools := ValueHolder new.
+        useCodeView2InTools onChangeSend:#updateModifiedChannel to:self
 
     ].
     ^ useCodeView2InTools
@@ -19477,8 +20195,8 @@
 
 useNewChangeSetBrowser
     useNewChangeSetBrowser isNil ifTrue:[
-	useNewChangeSetBrowser := false asValue.
-	useNewChangeSetBrowser onChangeSend:#updateModifiedChannel to:self
+        useNewChangeSetBrowser := false asValue.
+        useNewChangeSetBrowser onChangeSend:#updateModifiedChannel to:self
     ].
     ^ useNewChangeSetBrowser.
 
@@ -19488,8 +20206,8 @@
 
 useNewChangesBrowser
     useNewChangesBrowser isNil ifTrue:[
-	useNewChangesBrowser := false asValue.
-	useNewChangesBrowser onChangeSend:#updateModifiedChannel to:self
+        useNewChangesBrowser := false asValue.
+        useNewChangesBrowser onChangeSend:#updateModifiedChannel to:self
     ].
     ^ useNewChangesBrowser.
 
@@ -19498,8 +20216,8 @@
 
 useNewFileBrowser
     useNewFileBrowser isNil ifTrue:[
-	useNewFileBrowser := true asValue.
-	useNewFileBrowser onChangeSend:#updateModifiedChannel to:self
+        useNewFileBrowser := true asValue.
+        useNewFileBrowser onChangeSend:#updateModifiedChannel to:self
     ].
     ^ useNewFileBrowser.
 
@@ -19508,16 +20226,16 @@
 
 useNewFileDialog
     useNewFileDialog isNil ifTrue:[
-	useNewFileDialog := true asValue.
-	useNewFileDialog onChangeSend:#updateModifiedChannel to:self
+        useNewFileDialog := true asValue.
+        useNewFileDialog onChangeSend:#updateModifiedChannel to:self
     ].
     ^ useNewFileDialog.
 !
 
 useNewInspector
     useNewInspector isNil ifTrue:[
-	useNewInspector := false asValue.
-	useNewInspector onChangeSend:#updateModifiedChannel to:self
+        useNewInspector := false asValue.
+        useNewInspector onChangeSend:#updateModifiedChannel to:self
     ].
     ^ useNewInspector.
 
@@ -19526,16 +20244,16 @@
 
 useNewSettingsApplication
     useNewSettingsApplication isNil ifTrue:[
-	useNewSettingsApplication := true asValue.
-	useNewSettingsApplication onChangeSend:#updateModifiedChannel to:self
+        useNewSettingsApplication := true asValue.
+        useNewSettingsApplication onChangeSend:#updateModifiedChannel to:self
     ].
     ^ useNewSettingsApplication.
 !
 
 useNewSystemBrowser
     useNewSystemBrowser isNil ifTrue:[
-	useNewSystemBrowser := true asValue.
-	useNewSystemBrowser onChangeSend:#updateModifiedChannel to:self
+        useNewSystemBrowser := true asValue.
+        useNewSystemBrowser onChangeSend:#updateModifiedChannel to:self
     ].
     ^ useNewSystemBrowser.
 
@@ -19544,8 +20262,8 @@
 
 useNewVersionDiffBrowser
     useNewVersionDiffBrowser isNil ifTrue:[
-	useNewVersionDiffBrowser := true asValue.
-	useNewVersionDiffBrowser onChangeSend:#updateModifiedChannel to:self
+        useNewVersionDiffBrowser := true asValue.
+        useNewVersionDiffBrowser onChangeSend:#updateModifiedChannel to:self
     ].
     ^ useNewVersionDiffBrowser.
 
@@ -19554,8 +20272,8 @@
 
 useProcessMonitorV2
     useProcessMonitorV2 isNil ifTrue:[
-	useProcessMonitorV2 := true asValue.
-	useProcessMonitorV2 onChangeSend:#updateModifiedChannel to:self
+        useProcessMonitorV2 := true asValue.
+        useProcessMonitorV2 onChangeSend:#updateModifiedChannel to:self
     ].
     ^ useProcessMonitorV2.
 
@@ -19564,8 +20282,8 @@
 
 useSmalltalkDocumentViewer
     useSmalltalkDocumentViewer isNil ifTrue:[
-	useSmalltalkDocumentViewer := nil asValue.
-	useSmalltalkDocumentViewer onChangeSend:#updateModifiedChannel to:self
+        useSmalltalkDocumentViewer := nil asValue.
+        useSmalltalkDocumentViewer onChangeSend:#updateModifiedChannel to:self
     ].
     ^ useSmalltalkDocumentViewer.
 
@@ -19574,8 +20292,8 @@
 
 useTestRunner2
     useTestRunner2 isNil ifTrue:[
-	useTestRunner2 := true asValue.
-	useTestRunner2 onChangeSend:#updateModifiedChannel to:self
+        useTestRunner2 := true asValue.
+        useTestRunner2 onChangeSend:#updateModifiedChannel to:self
     ].
     ^ useTestRunner2.
 
--- a/AbstractSourceCodeManagementSettingsAppl.st	Fri Mar 11 07:02:34 2016 +0100
+++ b/AbstractSourceCodeManagementSettingsAppl.st	Wed Mar 23 07:52:39 2016 +0000
@@ -14,7 +14,7 @@
 "{ NameSpace: Smalltalk }"
 
 AbstractSettingsApplication subclass:#AbstractSourceCodeManagementSettingsAppl
-	instanceVariableNames:'shownInBrowserMenusHolder sourceCacheDir acceptChannel
+	instanceVariableNames:'shownInBrowserMenusHolder sourceCacheDir 
 		verboseSourceCodeAccess removeEnabled listOfModules'
 	classVariableNames:''
 	poolDictionaries:''
--- a/SettingsDialog.st	Fri Mar 11 07:02:34 2016 +0100
+++ b/SettingsDialog.st	Wed Mar 23 07:52:39 2016 +0000
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2002 by eXept Software AG
               All Rights Reserved
@@ -269,7 +267,7 @@
                 #('Tools/Compiler/ByteCode'             #'AbstractSettingsApplication::ByteCodeCompilerSettingsAppl'    )
                 #('Tools/Compiler/STC'                  #'AbstractSettingsApplication::STCCompilerSettingsAppl'         )
                 #('Tools/Compiler/Build'                #'AbstractSettingsApplication::BuildSettingsAppl'               )
-                #('Workspace'            #'AbstractSettingsApplication::WorkspaceSettingsAppl'               )
+                #('Workspace'                           #'AbstractSettingsApplication::WorkspaceSettingsAppl'               )
                 #('Source Code Management'              #'AbstractSettingsApplication::SourceCodeManagementSettingsAppl')
             );
         add:
@@ -285,9 +283,11 @@
                 #('Communication'                       nil                                           #communicationIcon)
 
                 #('Communication/Logging'               #'AbstractSettingsApplication::CommunicationLoggingSettingsAppl')
-                #('Communication/RDoIt'                 #'AbstractSettingsApplication::RDoItServerSettingsAppl'         )
-                #('Communication/OSI Protocol'          #'AbstractSettingsApplication::OsiSettingsAppl'                 )
+                #('Communication/RDoIt & Telnet'        #'AbstractSettingsApplication::RDoItServerSettingsAppl'         )
                 #('Communication/Misc'                  #'AbstractSettingsApplication::MiscCommunicationSettingsAppl'   )
+                #('Communication/Misc/Bridges'          #'AbstractSettingsApplication::MiscBridgeCommunicationSettingsAppl'   )
+                #('Communication/Misc/Smalltalk'        #'AbstractSettingsApplication::MiscSmalltalkCommunicationSettingsAppl'   )
+                #('Communication/Misc/OSI Protocol'     #'AbstractSettingsApplication::OsiSettingsAppl'                 )
                 #('Communication/SQLServer'             #'AbstractSettingsApplication::SQLServerSettingsAppl'           )
                 #('Communication/HTTPServer'            #'AbstractSettingsApplication::HTTPStartServerSettingsApplication'   )
             );
--- a/Tools__NewSystemBrowser.st	Fri Mar 11 07:02:34 2016 +0100
+++ b/Tools__NewSystemBrowser.st	Wed Mar 23 07:52:39 2016 +0000
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2000 by eXept Software AG
               All Rights Reserved
@@ -39998,7 +40000,6 @@
     "Modified: / 28-02-2012 / 16:27:44 / cg"
 ! !
 
-
 !NewSystemBrowser methodsFor:'menu actions-namespace'!
 
 nameSpaceMenuCheckOut
@@ -51202,7 +51203,7 @@
             label:[:chg | 
                 |lbl|
                 "/ lbl := chg printString
-                lbl := (chg className ? '???') , '  ' , (chg selector  ? '???') allBold.
+                lbl := (chg className ? '???') , ' ยป ' , (chg selector  ? '???') allBold.
                 (chg isMethodChange and:[chg changeMethod isNil]) ifTrue:[
                     lbl := lbl asText allStrikedOut,' ','(removed)' allItalic.
                 ].    
@@ -55784,8 +55785,10 @@
                 setSearchPatternAction notNil ifTrue:[
                     setSearchPatternAction value:newBrowser value:string value:((selector notNil and:[selector endsWith:'isMethod:']) ifTrue:[isMethod] ifFalse:[ignoreCase]) value:match.
                 ].
-                t > 5 seconds ifTrue:[
-                    newBrowser methodListApp autoUpdateOnChange: false.
+                newBrowser windowGroup notNil ifTrue:[
+                    t > 5 seconds ifTrue:[
+                        newBrowser methodListApp autoUpdateOnChange: false.
+                    ].
                 ].
                 ^ newBrowser.
             ].
@@ -58444,7 +58447,6 @@
     "Created: / 04-12-2011 / 22:22:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-
 !NewSystemBrowser methodsFor:'private-semantic checks'!
 
 checkAcceptedMethod:aMethod inClass:aClass