--- a/AbstractSettingsApplication.st Thu May 11 20:27:47 2006 +0200
+++ b/AbstractSettingsApplication.st Thu May 11 20:40:54 2006 +0200
@@ -1366,34 +1366,34 @@
!AbstractSettingsApplication::ByteCodeCompilerSettingsAppl methodsFor:'queries'!
hasUnsavedChanges
- #(
- warnings
- warnCommonMistakes
- warnUnusedVars
- warnAboutWrongVariableNames
- warnAboutBadComments
- warnInconsistentReturnValues
- warnAboutLowercaseLocalVariableNames
- warnSTXSpecials
- warnOldStyleAssignment
- warnUnderscoreInIdentifier
- warnDollarInIdentifier
- warnPossibleIncompatibilities
-
- allowVisualAgeESSymbolLiterals
- allowSqueakExtensions
- allowDolphinExtensions
- allowQualifiedNames
- allowOldStyleAssignment
- allowReservedWordsAsSelectors
- allowUnderscoreInIdentifier
- allowDollarInIdentifier
- allowFixedPointLiterals
- arraysAreImmutable
- )
- do:[:aspect |
- (self perform:aspect) value ~= (ParserFlags perform:aspect) ifTrue:[^ true].
- ].
+ (self
+ hasChangedAspectIn:
+ #(
+ warnings
+ warnCommonMistakes
+ warnUnusedVars
+ warnAboutWrongVariableNames
+ warnAboutBadComments
+ warnInconsistentReturnValues
+ warnAboutLowercaseLocalVariableNames
+ warnSTXSpecials
+ warnOldStyleAssignment
+ warnUnderscoreInIdentifier
+ warnDollarInIdentifier
+ warnPossibleIncompatibilities
+
+ allowVisualAgeESSymbolLiterals
+ allowSqueakExtensions
+ allowDolphinExtensions
+ allowQualifiedNames
+ allowOldStyleAssignment
+ allowReservedWordsAsSelectors
+ allowUnderscoreInIdentifier
+ allowDollarInIdentifier
+ allowFixedPointLiterals
+ arraysAreImmutable
+ )
+ asComparedTo:ParserFlags) ifTrue:[^ true].
((self supportsJustInTimeCompilation value ifTrue:[ObjectMemory fullSingleStepSupport ? false] ifFalse:[Compiler lineNumberInfo == #full]) ~= self fullDebugSupport value) ifTrue:[^ true].
((Compiler foldConstants) ~= (self class constantFoldingOptions at:self constantFoldingSelection value)) ifTrue:[^ true].
@@ -5330,12 +5330,13 @@
!AbstractSettingsApplication::MemorySettingsAppl methodsFor:'queries'!
hasUnsavedChanges
- #(
- newSpaceSize
- maxOldSpace
- ) do:[:aspect |
- (ObjectMemory perform:aspect) ~= (self perform:aspect) value ifTrue:[^ true].
- ].
+ (self
+ hasChangedAspectIn:
+ #(
+ newSpaceSize
+ maxOldSpace
+ )
+ asComparedTo:ObjectMemory) ifTrue:[^ true].
ObjectMemory freeSpaceGCAmount ~= self igcFreeAmount value ifTrue:[^ true].
ObjectMemory freeSpaceGCLimit ~= self igcFreeLimit value ifTrue:[^ true].
@@ -5825,14 +5826,14 @@
(CheckBoxSpec
label: 'Opaque Variable Panel Resizing'
name: 'opaqueVariablePanelResize'
- model: opaqueVariablePanelResize
+ model: opaqueVariablePanelResizing
translateLabel: true
extent: (Point 435 22)
)
(CheckBoxSpec
label: 'Opaque Table Column Resizing'
name: 'opaqueTableColumnResize'
- model: opaqueTableColumnResize
+ model: opaqueTableColumnResizing
translateLabel: true
extent: (Point 435 22)
)
@@ -5909,6 +5910,8 @@
readAspects:
#(
beepEnabled
+ opaqueVariablePanelResizing
+ opaqueTableColumnResizing
)
from:currentUserPrefs.
@@ -5919,8 +5922,6 @@
self takeFocus value:StandardSystemView takeFocusWhenMapped.
self focusFollowsMouse value:(currentUserPrefs focusFollowsMouse ? true).
self activateOnClick value:(Display activateOnClick:nil).
- self opaqueVariablePanelResize value:currentUserPrefs opaqueVariablePanelResizing.
- self opaqueTableColumnResize value:currentUserPrefs opaqueTableColumnResizing.
self showAccelerators value:MenuView showAcceleratorKeys.
!
@@ -5961,14 +5962,13 @@
]
].
- currentUserPrefs opaqueVariablePanelResizing:self opaqueVariablePanelResize value.
- currentUserPrefs opaqueTableColumnResizing:self opaqueTableColumnResize value.
-
self
writeAspects:
#(
beepEnabled
focusFollowsMouse
+ opaqueVariablePanelResizing
+ opaqueTableColumnResizing
)
to:currentUserPrefs.
@@ -6080,7 +6080,7 @@
"Created: / 16.12.2002 / 17:50:49 / penk"
!
-opaqueTableColumnResize
+opaqueTableColumnResizing
opaqueTableColumnResize isNil ifTrue:[
opaqueTableColumnResize := true asValue.
opaqueTableColumnResize onChangeSend:#updateModifiedChannel to:self
@@ -6088,7 +6088,7 @@
^ opaqueTableColumnResize.
!
-opaqueVariablePanelResize
+opaqueVariablePanelResizing
opaqueVariablePanelResize isNil ifTrue:[
opaqueVariablePanelResize := true asValue.
opaqueVariablePanelResize onChangeSend:#updateModifiedChannel to:self
@@ -6131,18 +6131,30 @@
!AbstractSettingsApplication::MiscDisplaySettingsAppl methodsFor:'queries'!
hasUnsavedChanges
+ (self
+ hasChangedAspectIn:
+ #(
+ nativeWidgets
+ nativeDialogs
+ )
+ asComparedTo:Screen current) ifTrue:[^ true].
+
+ (self
+ hasChangedAspectIn:
+ #(
+ beepEnabled
+ opaqueVariablePanelResizing
+ opaqueTableColumnResizing
+ )
+ asComparedTo:currentUserPrefs) ifTrue:[^ true].
+
self newWindowLabelFormat value ~= StandardSystemView windowLabelFormat ifTrue:[^ true].
- self nativeWidgets value ~= Screen current nativeWidgets ifTrue:[^ true].
- self nativeDialogs value ~= Screen current nativeDialogs ifTrue:[^ true].
self shadows value ~= PopUpView shadows ifTrue:[^ true].
- self beepEnabled value ~= currentUserPrefs beepEnabled ifTrue:[^ true].
self hostNameInLabelHolder value ~= StandardSystemView includeHostNameInLabel ifTrue:[^ true].
self returnFocus value ~= StandardSystemView returnFocusWhenClosingModalBoxes ifTrue:[^ true].
self takeFocus value ~= StandardSystemView takeFocusWhenMapped ifTrue:[^ true].
self focusFollowsMouse value ~= (currentUserPrefs focusFollowsMouse ? true) ifTrue:[^ true].
self activateOnClick value ~= (Display activateOnClick:nil) ifTrue:[^ true].
- self opaqueVariablePanelResize value ~= currentUserPrefs opaqueVariablePanelResizing ifTrue:[^ true].
- self opaqueTableColumnResize value ~= currentUserPrefs opaqueTableColumnResizing ifTrue:[^ true].
self showAccelerators value ~= MenuView showAcceleratorKeys ifTrue:[^ true].
^ false
! !
@@ -9487,16 +9499,23 @@
hasUnsavedChanges
self autoFormat value ~= currentUserPrefs autoFormatting ? false ifTrue:[^ true].
- self tabIndent value ~= RBFormatter tabIndent ifTrue:[^ true].
- self spaceAroundTemporaries value ~= RBFormatter spaceAroundTemporaries ifTrue:[^ true].
- self emptyLineAfterTemporaries value ~= RBFormatter emptyLineAfterTemporaries ifTrue:[^ true].
- self spaceAfterReturnToken value ~= RBFormatter spaceAfterReturnToken ifTrue:[^ true].
- self spaceAfterKeywordSelector value ~= RBFormatter spaceAfterKeywordSelector ifTrue:[^ true].
- self spaceAfterBlockStart value ~= RBFormatter spaceAfterBlockStart ifTrue:[^ true].
- self spaceBeforeBlockEnd value ~= RBFormatter spaceBeforeBlockEnd ifTrue:[^ true].
- self cStyleBlocks value ~= RBFormatter cStyleBlocks ifTrue:[^ true].
- self blockArgumentsOnNewLine value ~= RBFormatter blockArgumentsOnNewLine ifTrue:[^ true].
- self maxLengthForSingleLineBlocks value ~= RBFormatter maxLengthForSingleLineBlocks ifTrue:[^ true].
+
+ (self
+ hasChangedAspectIn:
+ #(
+ tabIndent
+ spaceAroundTemporaries
+ emptyLineAfterTemporaries
+ spaceAfterReturnToken
+ spaceAfterKeywordSelector
+ spaceAfterBlockStart
+ spaceBeforeBlockEnd
+ cStyleBlocks
+ blockArgumentsOnNewLine
+ maxLengthForSingleLineBlocks
+ )
+ asComparedTo:RBFormatter) ifTrue:[^ true].
+
^ false
! !
@@ -11036,8 +11055,15 @@
oldUserPreferences notNil ifTrue:[
(UserPreferences reset; current) addAll:oldUserPreferences
].
- self syntaxColoring value:currentUserPrefs syntaxColoring.
- self fullSelectorCheck value:currentUserPrefs fullSelectorCheck.
+
+ self
+ readAspects:
+ #(
+ syntaxColoring
+ fullSelectorCheck
+ )
+ from:currentUserPrefs.
+
oldUserPreferences := currentUserPrefs copy.
colorList := UserPreferences syntaxColorNames.
resetListLoc := currentUserPrefs listOfPredefinedSyntaxColoringSchemes
@@ -11335,8 +11361,15 @@
].
syntaxElement
].
- currentUserPrefs syntaxColoring ~= self syntaxColoring value ifTrue:[^ true].
- currentUserPrefs fullSelectorCheck ~= self fullSelectorCheck value ifTrue:[^ true].
+
+ (self
+ hasChangedAspectIn:
+ #(
+ syntaxColoring
+ fullSelectorCheck
+ )
+ asComparedTo:currentUserPrefs) ifTrue:[^ true].
+
^ false
!
@@ -11722,6 +11755,16 @@
!AbstractSettingsApplication::SystemMessageSettingsAppl methodsFor:'queries'!
hasUnsavedChanges
+ (self
+ hasChangedAspectIn:
+ #(
+ beepForInfoDialog
+ beepForWarningDialog
+ beepForErrorDialog
+ flyByHelpActive
+ )
+ asComparedTo:currentUserPrefs) ifTrue:[^ true].
+
self vmInfo value ~= ObjectMemory infoPrinting ifTrue:[^ true].
self vmErrors value ~= ObjectMemory debugPrinting ifTrue:[^ true].
self classInfos value ~= Object infoPrinting ifTrue:[^ true].
@@ -11729,10 +11772,6 @@
self updChanges value ~= Class updatingChanges ifTrue:[^ true].
self changeFileName value ~= ObjectMemory nameForChanges ifTrue:[^ true].
self displayErrors value ~= DeviceWorkstation errorPrinting ifTrue:[^ true].
- self beepForInfoDialog value ~= currentUserPrefs beepForInfoDialog ifTrue:[^ true].
- self beepForWarningDialog value ~= currentUserPrefs beepForWarningDialog ifTrue:[^ true].
- self beepForErrorDialog value ~= currentUserPrefs beepForErrorDialog ifTrue:[^ true].
- self flyByHelpActive value ~= currentUserPrefs flyByHelpActive ifTrue:[^ true].
^ false
! !
@@ -12116,21 +12155,21 @@
!AbstractSettingsApplication::ToolsSettingsAppl methodsFor:'queries'!
hasUnsavedChanges
- #(
- useNewInspector
- useNewChangesBrowser
- useNewSystemBrowser
- useNewVersionDiffBrowser
- useNewFileBrowser
- useNewFileDialog
- useNewSettingsApplication
- useProcessMonitorV2
- useSmalltalkDocumentViewer
- showClockInLauncher
- )
- do:[:aspect |
- (self perform:aspect) value ~= (currentUserPrefs perform:aspect) ifTrue:[^ true].
- ].
+ (self
+ hasChangedAspectIn:
+ #(
+ useNewInspector
+ useNewChangesBrowser
+ useNewSystemBrowser
+ useNewVersionDiffBrowser
+ useNewFileBrowser
+ useNewFileDialog
+ useNewSettingsApplication
+ useProcessMonitorV2
+ useSmalltalkDocumentViewer
+ showClockInLauncher
+ )
+ asComparedTo:currentUserPrefs) ifTrue:[^ true].
Transcript current isExternalStream ifFalse:[
(self transcriptBufferSize value ~= Transcript current lineLimit) ifTrue:[^ true].
@@ -12141,5 +12180,5 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.228 2006-05-11 18:27:47 cg Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.229 2006-05-11 18:40:54 cg Exp $'
+! !