--- a/AbstractSettingsApplication.st Tue Mar 16 11:57:52 2004 +0100
+++ b/AbstractSettingsApplication.st Tue Mar 16 12:37:10 2004 +0100
@@ -13,235 +13,235 @@
"{ Package: 'stx:libtool' }"
ApplicationModel subclass:#AbstractSettingsApplication
- instanceVariableNames:'settingsString currentUserPrefs modifiedChannel settingsDialog
- requestor'
- classVariableNames:''
- poolDictionaries:''
- category:'Interface-Smalltalk'
+ instanceVariableNames:'settingsString currentUserPrefs modifiedChannel settingsDialog
+ requestor'
+ classVariableNames:''
+ poolDictionaries:''
+ category:'Interface-Smalltalk'
!
AbstractSettingsApplication subclass:#ByteCodeCompilerSettingsAppl
- instanceVariableNames:'allowQualifiedNames warnDollar warnOldStyle fullDebugSupport
- warnCommonMistakes warnUnderscore keepSource constantFolding
- warnCompatibility constantFoldingOptions warnings warnSTX
- allowDollar allowReservedWordsAsSelectors immutableArrays
- allowOldStyleAssignment allowUnderscore allowDolphinExtensions
- warnUnusedVars allowSqueakExtensions justInTimeCompilation
- canLoadBinaries constantFoldingSelection enableUnderscore
- enableDollar'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'allowQualifiedNames warnDollar warnOldStyle fullDebugSupport
+ warnCommonMistakes warnUnderscore keepSource constantFolding
+ warnCompatibility constantFoldingOptions warnings warnSTX
+ allowDollar allowReservedWordsAsSelectors immutableArrays
+ allowOldStyleAssignment allowUnderscore allowDolphinExtensions
+ warnUnusedVars allowSqueakExtensions justInTimeCompilation
+ canLoadBinaries constantFoldingSelection enableUnderscore
+ enableDollar'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:AbstractSettingsApplication
!
AbstractSettingsApplication subclass:#DebuggerSettingsAppl
- instanceVariableNames:'showErrorNotifier showVerboseStack allowSendMailFromDebugger'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'showErrorNotifier showVerboseStack allowSendMailFromDebugger'
+ 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'
- 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'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:AbstractSettingsApplication
!
AbstractSettingsApplication subclass:#EditSettingsAppl
- instanceVariableNames:'st80EditingMode tabsIs4 st80DoubleClickSelectMode
- searchDialogIsModal startTextDragWithControl'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'st80EditingMode tabsIs4 st80DoubleClickSelectMode
+ searchDialogIsModal startTextDragWithControl'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:AbstractSettingsApplication
!
AbstractSettingsApplication subclass:#FontSettingsAppl
- instanceVariableNames:'filter allOfThem labelDef buttonDef listDef menuDef textDef
- allFontLabelHolder buttonsFontLabelHolder textFontLabelHolder
- labelsFontLabelHolder listsFontLabelHolder menusFontLabelHolder
- allLabel buttonsLabel textLabel labelLabel listsLabel menuLabel'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'filter allOfThem labelDef buttonDef listDef menuDef textDef
+ allFontLabelHolder buttonsFontLabelHolder textFontLabelHolder
+ labelsFontLabelHolder listsFontLabelHolder menusFontLabelHolder
+ allLabel buttonsLabel textLabel labelLabel listsLabel menuLabel'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:AbstractSettingsApplication
!
AbstractSettingsApplication subclass:#GeneralCompilerSettingsAppl
- instanceVariableNames:'st80EditingMode tabsIs4 st80DoubleClickSelectMode
- searchDialogIsModal startTextDragWithControl catchClassRedefs
- fullHistoryUpdate historyLines keepSourceSelection keepSource
- hasHistoryManager canLoadBinaries loadBinaries catchMethodRedefs'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'st80EditingMode tabsIs4 st80DoubleClickSelectMode
+ searchDialogIsModal startTextDragWithControl catchClassRedefs
+ fullHistoryUpdate historyLines keepSourceSelection keepSource
+ hasHistoryManager canLoadBinaries loadBinaries catchMethodRedefs'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:AbstractSettingsApplication
!
AbstractSettingsApplication subclass:#HTTPStartServerSettingsApplication
- instanceVariableNames:'portNumberChannel informationLabel hasNoCreatedServerChannel
- hasCreatedServerChannel'
- classVariableNames:'CreatedServers'
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'portNumberChannel informationLabel hasNoCreatedServerChannel
+ hasCreatedServerChannel'
+ classVariableNames:'CreatedServers'
+ poolDictionaries:''
+ privateIn:AbstractSettingsApplication
!
AbstractSettingsApplication subclass:#KbdMappingSettingsAppl
- instanceVariableNames:'selectedRawKey macroTextHolder selectedFunctionKey
- labelTextHolder functionKeyList rawKeyList mappings'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'selectedRawKey macroTextHolder selectedFunctionKey
+ labelTextHolder functionKeyList rawKeyList mappings'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:AbstractSettingsApplication
!
AbstractSettingsApplication subclass:#LanguageSettingsAppl
- instanceVariableNames:'languageHolder languageIndexHolder languageList
- languageListHolder listOfLanguages translatedLanguages
- noticeLabelHolder currentFlagAndLanguageChannel
- currentLanguageLabel perLanguageResources'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'languageHolder languageIndexHolder languageList
+ languageListHolder listOfLanguages translatedLanguages
+ noticeLabelHolder currentFlagAndLanguageChannel
+ currentLanguageLabel perLanguageResources'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:AbstractSettingsApplication
!
AbstractSettingsApplication subclass:#MemorySettingsAppl
- instanceVariableNames:'newSpaceSize maxOldSpace fastMoreLimit warningLabelHolder
- codeTrigger codeLimit oldIncr compressLimit igcFreeLimit igcLimit
- igcFreeAmount stackLimit supportsJustInTimeCompilation'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'newSpaceSize maxOldSpace fastMoreLimit warningLabelHolder
+ codeTrigger codeLimit oldIncr compressLimit igcFreeLimit igcLimit
+ igcFreeAmount stackLimit supportsJustInTimeCompilation'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:AbstractSettingsApplication
!
AbstractSettingsApplication subclass:#MiscCommunicationSettingsAppl
- instanceVariableNames:'remoteBrowsingEnabled windowMigrationEnabled
- windowMigrationPassword windowMigrationAuthenticate
- enablePasswordCheck'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'remoteBrowsingEnabled windowMigrationEnabled
+ windowMigrationPassword windowMigrationAuthenticate
+ enablePasswordCheck'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:AbstractSettingsApplication
!
AbstractSettingsApplication subclass:#MiscDisplaySettingsAppl
- instanceVariableNames:'returnFocus focusFollowsMouse beepEnabled takeFocus
- activateOnClick shadows opaqueVariablePanelResize
- formatHostNameinWindowLabels opaqueTableColumnResize
- hostNameInLabelHolder showAccelerators newWindowLabelFormat
- formatHostNameWindowLabel'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'returnFocus focusFollowsMouse beepEnabled takeFocus
+ activateOnClick shadows opaqueVariablePanelResize
+ formatHostNameinWindowLabels opaqueTableColumnResize
+ hostNameInLabelHolder showAccelerators newWindowLabelFormat
+ formatHostNameWindowLabel'
+ 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'
- 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'
+ 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'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'rDoitLogging rDoitsEnabled rDoitErrorLogging hasRDoitServer
+ rDoitErrorDebugging rDoitServerPortOrPath'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:AbstractSettingsApplication
!
AbstractSettingsApplication subclass:#STCCompilerSettingsAppl
- instanceVariableNames:'cc ccOptions stcIncludes linkCommand stc linkArgs canLoadBinaries
- stcDefines stcLibraries stcOptions stcLibraryPath
- stcCompilationSelection stcCompilationList'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'cc ccOptions stcIncludes linkCommand stc linkArgs canLoadBinaries
+ stcDefines stcLibraries stcOptions stcLibraryPath
+ stcCompilationSelection stcCompilationList'
+ 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 condenseSourceCache
- syntaxColorConfiguration setupSourceCodeManager
- checkClassesWhenCheckingIn formattingConfiguration
- flushSourceCache localSourceFirst cvsIsSetup repositoryHolder
- manager repository listOfModules cvsRootPrototypeList
- addPerModuleRoot removeEnabled perModuleRootModule acceptChannel
- removePerModuleRoot perModuleRoot cvsRootHolder
- selectedPerModuleRoot cvsBinDirectoryHolder rootsPerModule
- cvsLoginInModuleEnabled cvsLoginEnabled'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'sourceCacheDir useManager condenseSourceCache
+ syntaxColorConfiguration setupSourceCodeManager
+ checkClassesWhenCheckingIn formattingConfiguration
+ flushSourceCache localSourceFirst cvsIsSetup repositoryHolder
+ manager repository listOfModules cvsRootPrototypeList
+ addPerModuleRoot removeEnabled perModuleRootModule acceptChannel
+ removePerModuleRoot perModuleRoot cvsRootHolder
+ selectedPerModuleRoot cvsBinDirectoryHolder rootsPerModule
+ cvsLoginInModuleEnabled cvsLoginEnabled'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:AbstractSettingsApplication
!
AbstractSettingsApplication subclass:#StyleSettingsAppl
- instanceVariableNames:'showStandardStylesOnly styleList selectedStyle
- styleDirectoryContents infoLabelHolder noticeLabelHolder'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'showStandardStylesOnly styleList selectedStyle
+ styleDirectoryContents infoLabelHolder noticeLabelHolder'
+ 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:#SystemMessageSettingsAppl
- instanceVariableNames:'classInfos vmInfo vmErrors displayErrors logDoits updChanges
- changeFileName'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'classInfos vmInfo vmErrors displayErrors logDoits updChanges
+ changeFileName'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:AbstractSettingsApplication
!
AbstractSettingsApplication subclass:#ToolsSettingsAppl
- instanceVariableNames:'useNewVersionDiffBrowser transcriptBufferSize useNewInspector
- showClockInLauncher useNewChangesBrowser useNewFileBrowser
- useNewSystemBrowser useNewFileDialog useNewSettingsApplication
- useProcessMonitorV2'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractSettingsApplication
+ instanceVariableNames:'useNewVersionDiffBrowser transcriptBufferSize useNewInspector
+ showClockInLauncher useNewChangesBrowser useNewFileBrowser
+ useNewSystemBrowser useNewFileDialog useNewSettingsApplication
+ useProcessMonitorV2'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:AbstractSettingsApplication
!
!AbstractSettingsApplication class methodsFor:'documentation'!
@@ -4341,12 +4341,13 @@
l := languages at:idx.
eL := enLanguages at:idx.
nL := nativeLanguages at:idx.
- s := l.
- eL ~= l ifTrue:[
+
+ s := nL.
+ eL ~= nL ifTrue:[
s := s , ' / ' , eL
].
- (nL ~= l and:[nL ~= eL]) ifTrue:[
- s := s , ' / ' , nL
+ (l ~= nL and:[l ~= eL]) ifTrue:[
+ s := s , ' / ' , l
].
s
].
@@ -11293,5 +11294,5 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.150 2004-03-15 16:45:53 cg Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.151 2004-03-16 11:37:10 cg Exp $'
+! !