--- a/UserPreferences.st Thu Feb 05 08:17:25 2015 +0100
+++ b/UserPreferences.st Thu Feb 05 08:29:08 2015 +0100
@@ -716,8 +716,8 @@
s nextPutLine:'"/'.
s nextPutLine:'Display notNil ifTrue:['.
s nextPutLine:' Display displayName = ' , (screen displayName storeString) , ' ifTrue:['.
- {
- SimpleView . Label . CheckBox . CheckLabel . Button . Toggle .
+ {
+ SimpleView . Label . CheckBox . CheckLabel . Button . Toggle .
SelectionInListView . MenuView . MenuPanel . NoteBookView . PullDownMenu .
TextView . EditTextView . CodeView
} do:[:cls |
@@ -750,19 +750,19 @@
!UserPreferences methodsFor:'accessing'!
-at:key
+at:key
^ super at:key asSymbol
"Created: / 15-01-2012 / 14:27:29 / cg"
!
-at:key ifAbsent:exceptionValue
- ^ super
- at:key asSymbol
+at:key ifAbsent:exceptionValue
+ ^ super
+ at:key asSymbol
ifAbsent:[
"/ Look to DefaultPreferences first...
- self ~~ DefaultPreferences ifTrue:[
- DefaultPreferences at:key ifAbsent:exceptionValue
+ (DefaultPreferences notNil and:[self ~~ DefaultPreferences]) ifTrue:[
+ DefaultPreferences at:key ifAbsent:exceptionValue
] ifFalse:[
exceptionValue value
]
@@ -825,7 +825,7 @@
changeFileName
"were to keep changes"
- ^self
+ ^self
at: #'changeFileName'
ifAbsent: nil
!
@@ -833,7 +833,7 @@
changeFileName:aFilename
"were to keep changes"
- self
+ self
at: #'changeFileName'
put: aFilename.
! !
@@ -843,8 +843,8 @@
dateInputFormat
"return a format used when tools read a date from the user"
- ^ self
- at:#dateInputFormat
+ ^ self
+ at:#dateInputFormat
ifAbsentPut:[
(self language == #en and:[ self languageTerritory ~= #en])
ifTrue:[ '%m %d %y' ]
@@ -855,8 +855,8 @@
dateInputFormat:aFormatString
"return a format used when tools read a date from the user"
- ^ self
- at:#dateInputFormat
+ ^ self
+ at:#dateInputFormat
ifAbsentPut:[
(self language == #en and:[ self languageTerritory ~= #en])
ifTrue:[ '%m %d %y' ]
@@ -1166,8 +1166,8 @@
externalDiffCommandTemplate
"the external command to use for diff"
- ^ self
- at:#externalDiffCommandTemplate
+ ^ self
+ at:#externalDiffCommandTemplate
ifAbsent:[
OperatingSystem isMSDOSlike ifTrue:[
'diff %1 %2'
@@ -1906,7 +1906,7 @@
menuPanelTakesFocusOnClick:aBooleanOrNil
"if true, the menu panel takes the focus and allows further control via
- cursor and tab keys.
+ cursor and tab keys.
Used to be on, but now we changed the default as it turned out to be counter productive"
^ self at:#menuPanelTakesFocusOnClick put:aBooleanOrNil
@@ -2149,8 +2149,8 @@
!
showDottedLinesInTree
- ^ self
- at:#showDottedLinesInTree
+ ^ self
+ at:#showDottedLinesInTree
ifAbsent:[ OperatingSystem isMSWINDOWSlike not
or:[ OperatingSystem isVistaLike not ] ]
@@ -2224,8 +2224,8 @@
"set the time, tooltips are shown. 0 means: dont hide"
self at:#toolTipAutoHideDelay put:aTimeDuration.
- FlyByHelp showTime: (aTimeDuration isInteger
- ifTrue:[aTimeDuration]
+ FlyByHelp showTime: (aTimeDuration isInteger
+ ifTrue:[aTimeDuration]
ifFalse:[aTimeDuration asSeconds]).
"
@@ -2535,7 +2535,7 @@
!UserPreferences methodsFor:'accessing-prefs-browser-colors'!
colorForInstrumentedFullyCoveredCode
- "the color for code in the browser which is instrumented
+ "the color for code in the browser which is instrumented
and where all branches have been executed (also code, which has been executed)"
|clr|
@@ -2549,7 +2549,7 @@
"
UserPreferences current
- at:#emphasisForInstrumentedFullyCoveredCode
+ at:#emphasisForInstrumentedFullyCoveredCode
put:(Color green slightlyDarkened).
"
@@ -2557,7 +2557,7 @@
!
colorForInstrumentedFullyCoveredCode:aColor
- "the color for code in the browser which is instrumented
+ "the color for code in the browser which is instrumented
and where all branches have been executed (also code, which has been executed)"
self at:#colorForInstrumentedFullyCoveredCode put:aColor.
@@ -2577,14 +2577,14 @@
clr := self at:#colorForInstrumentedNeverCalledCode ifAbsent:nil.
clr isNil ifTrue:[
- clr := Color red "slightlyDarkened" "darkened".
+ clr := Color red "slightlyDarkened" "darkened".
"/ self at:#colorForInstrumentedNeverCalledCode put:clr.
].
^ clr
"
UserPreferences current
- at:#colorForInstrumentedNeverCalledCode
+ at:#colorForInstrumentedNeverCalledCode
put:(Color red slightlyDarkened).
"
@@ -2619,7 +2619,7 @@
"
UserPreferences current
- at:#colorForInstrumentedPartiallyCoveredCode
+ at:#colorForInstrumentedPartiallyCoveredCode
put:(Color orange slightlyLightened).
"
@@ -2747,7 +2747,7 @@
"
UserPreferences current
- at:#emphasisForInstrumentedFullyCoveredCode
+ at:#emphasisForInstrumentedFullyCoveredCode
put:(Array with:#bold with:(#color->Color green slightlyDarkened)).
"
@@ -2771,7 +2771,7 @@
"
UserPreferences current
- at:#emphasisForInstrumentedNeverCalledCode
+ at:#emphasisForInstrumentedNeverCalledCode
put:(Array with:#bold with:(#color->Color red slightlyDarkened)).
"
@@ -2796,7 +2796,7 @@
"
UserPreferences current
- at:#emphasisForInstrumentedPartiallyCoveredCode
+ at:#emphasisForInstrumentedPartiallyCoveredCode
put:(Array with:#bold with:(#color->Color orange slightlyLightened)).
"
@@ -2835,8 +2835,8 @@
^ emp
"
- self allInstancesDo:[:pref |pref at:#emphasisForNamespacedCode put:nil].
- UserPreferences current emphasisForNamespacedCode.
+ self allInstancesDo:[:pref |pref at:#emphasisForNamespacedCode put:nil].
+ UserPreferences current emphasisForNamespacedCode.
UserPreferences current at:#emphasisForNamespacedCode put:nil.
"
@@ -3129,8 +3129,8 @@
"the emphasis used for anything else;
If syntaxColoring is turned on."
- ^ self
- at:#defaultSyntaxEmphasis
+ ^ self
+ at:#defaultSyntaxEmphasis
ifAbsentPut:[UserPreferences default at:#defaultSyntaxEmphasis ifAbsent:#normal]
"Modified: / 21-04-2011 / 12:34:46 / cg"
@@ -3645,7 +3645,7 @@
"
self current at:#xmlAttributeColor put:Color black
- self current xmlAttributeColor
+ self current xmlAttributeColor
"
"Created: / 24-07-2011 / 21:30:59 / cg"
@@ -3673,7 +3673,7 @@
"
self current at:#xmlCDataColor put:Color black
- self current xmlCDataColor
+ self current xmlCDataColor
"
"Created: / 24-07-2011 / 21:31:30 / cg"
@@ -3701,7 +3701,7 @@
"
self current at:#xmlTagColor put:Color black
- self current xmlTagColor
+ self current xmlTagColor
"
"Created: / 17-02-2011 / 14:18:28 / cg"
@@ -3733,7 +3733,7 @@
^ self at:#haltInObsoleteMethod ifAbsent:true
"
- UserPreferences current haltInObsoleteMethod
+ UserPreferences current haltInObsoleteMethod
UserPreferences current haltInObsoleteMethod:true
UserPreferences current haltInObsoleteMethod:false
@@ -3811,7 +3811,7 @@
^ self at:#generateComments ifAbsent:true.
"
- UserPreferences current generateComments
+ UserPreferences current generateComments
UserPreferences current generateComments:false
UserPreferences current generateComments:true
"
@@ -3907,8 +3907,8 @@
^self at:#codeView2AutoPrettyPrint ifAbsent: false
"
- UserPreferences current codeView2AutoPrettyPrint
- UserPreferences current codeView2AutoPrettyPrint:true
+ UserPreferences current codeView2AutoPrettyPrint
+ UserPreferences current codeView2AutoPrettyPrint:true
UserPreferences current codeView2AutoPrettyPrint:false"
"Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3920,8 +3920,8 @@
^self at:#codeView2AutoPrettyPrint put: aBoolean
"
- UserPreferences current codeView2AutoPrettyPrint
- UserPreferences current codeView2AutoPrettyPrint:true
+ UserPreferences current codeView2AutoPrettyPrint
+ UserPreferences current codeView2AutoPrettyPrint:true
UserPreferences current codeView2AutoPrettyPrint:false"
"Modified: / 15-02-2010 / 09:26:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3935,8 +3935,8 @@
^self at:#codeView2QuickSendersAndImplementorsOnControl ifAbsent: false
"
- UserPreferences current codeView2QuickSendersAndImplementorsOnControl
- UserPreferences current codeView2QuickSendersAndImplementorsOnControl:true
+ UserPreferences current codeView2QuickSendersAndImplementorsOnControl
+ UserPreferences current codeView2QuickSendersAndImplementorsOnControl:true
UserPreferences current codeView2QuickSendersAndImplementorsOnControl:false"
!
@@ -3947,8 +3947,8 @@
^self at:#codeView2QuickSendersAndImplementorsOnControl put: aBoolean
"
- UserPreferences current codeView2QuickSendersAndImplementorsOnControl
- UserPreferences current codeView2QuickSendersAndImplementorsOnControl:true
+ UserPreferences current codeView2QuickSendersAndImplementorsOnControl
+ UserPreferences current codeView2QuickSendersAndImplementorsOnControl:true
UserPreferences current codeView2QuickSendersAndImplementorsOnControl:false"
!
@@ -3957,11 +3957,11 @@
!
variableBackgroundColorForNavigationService
- ^ self
- at: #variableBackgroundColorForNavigationService
- ifAbsent: [
- (Color rgbValue:16rFFFFA7)
- "/ (Color rgbValue:16rEFD7A7)
+ ^ self
+ at: #variableBackgroundColorForNavigationService
+ ifAbsent: [
+ (Color rgbValue:16rFFFFA7)
+ "/ (Color rgbValue:16rEFD7A7)
]
"Modified: / 01-10-2013 / 11:35:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -3970,7 +3970,7 @@
!UserPreferences methodsFor:'accessing-prefs-editor'!
appendAbbreviationsToCompletionSuggestions
- "show abbreviations in completion"
+ "show abbreviations in completion"
^ self at:#appendAbbreviationsToCompletionSuggestions ifAbsent:false
@@ -3982,7 +3982,7 @@
!
appendAbbreviationsToCompletionSuggestions:aBoolean
- "show abbreviations in completion"
+ "show abbreviations in completion"
^ self at:#appendAbbreviationsToCompletionSuggestions put:aBoolean
@@ -3994,7 +3994,7 @@
!
codeCompletionOnControlKey
- "show completion with CTRL-key - experimental"
+ "show completion with CTRL-key - experimental"
^ self at:#codeCompletionOnControlKey ifAbsent:false
@@ -4006,7 +4006,7 @@
!
codeCompletionOnControlKey:aBoolean
- "show completion with CTRL key - experimental"
+ "show completion with CTRL key - experimental"
^ self at:#codeCompletionOnControlKey put:aBoolean
@@ -4018,7 +4018,7 @@
!
codeCompletionOnTabKey
- "show completion with TAB-key - experimental"
+ "show completion with TAB-key - experimental"
^ self at:#codeCompletionOnTabKey ifAbsent:true
@@ -4029,8 +4029,8 @@
"
!
-codeCompletionOnTabKey:aBoolean
- "show completion with TAB-key - experimental"
+codeCompletionOnTabKey:aBoolean
+ "show completion with TAB-key - experimental"
self at:#codeCompletionOnTabKey put:aBoolean
@@ -4041,7 +4041,7 @@
"
!
-codeCompletionViewKeyboardNavigationNeedsModifier
+codeCompletionViewKeyboardNavigationNeedsModifier
"if you find it annoying, that cursor up/down is intercepted by a floating
completion view, set this to true. Then cursor up/down are only passed to the completion
view if a shift- or control modifier is pressed.
@@ -4056,7 +4056,7 @@
"
!
-codeCompletionViewKeyboardNavigationNeedsModifier:aBoolean
+codeCompletionViewKeyboardNavigationNeedsModifier:aBoolean
"if you find it annoying, that cursor up/down is intercepted by a floating
completion view, set this to true. Then cursor up/down are only passed to the completion
view if a shift- or control modifier is pressed.
@@ -4144,7 +4144,7 @@
!
immediateCodeCompletion
- "show completion, as you type - experimental"
+ "show completion, as you type - experimental"
^ self at:#immediateCodeCompletion ifAbsent:false
@@ -4156,7 +4156,7 @@
!
immediateCodeCompletion:aBoolean
- "show completion, as you type - experimental"
+ "show completion, as you type - experimental"
^ self at:#immediateCodeCompletion put:aBoolean
@@ -4266,15 +4266,15 @@
For historical reasons, #traditional is the default..."
- aSymbol isNil ifTrue:[
+ aSymbol isNil ifTrue:[
self removeKey:#selectionExtensionMode.
^ self.
].
-
- (#(traditional standard) includes: aSymbol) ifFalse:[
+
+ (#(traditional standard) includes: aSymbol) ifFalse:[
self error:'Invalid value. Possible values are #traditional and #standard'.
].
- self at: #selectionExtensionMode put: aSymbol
+ self at: #selectionExtensionMode put: aSymbol
@@ -4429,7 +4429,7 @@
Smalltalk languageTerritory:aLanguageSymbol
"
- UserPreferences current languageTerritory
+ UserPreferences current languageTerritory
UserPreferences current languageTerritory:#en
"
@@ -4539,7 +4539,7 @@
autoRaiseOnFocusInDelay
"if non-nil, an application window will raise automatically,
- when it gets the focus (via the window manager) after that
+ when it gets the focus (via the window manager) after that
number of milliseconds. If nil, autoRaise is disabled.
Especially useful with focusFollowsMouse under X11"
@@ -4552,7 +4552,7 @@
autoRaiseOnFocusInDelay:anIntegerOrNil
"if non-nil, an application window will raise automatically,
- when it gets the focus (via the window manager) after that
+ when it gets the focus (via the window manager) after that
number of milliseconds. If nil, autoRaise is disabled.
Especially useful with focusFollowsMouse under X11"
@@ -4736,9 +4736,9 @@
"if true, the shell's output is utf8 encoded and should be decoded by
the terminal emulator."
- ^ self
- at:#terminalOutputIsUTF8
- ifAbsent:[ OperatingSystem isOSXlike
+ ^ self
+ at:#terminalOutputIsUTF8
+ ifAbsent:[ OperatingSystem isOSXlike
"/ or ???
]
@@ -4751,12 +4751,12 @@
"if true, the shell's output is utf8 encoded and should be decoded by
the terminal emulator."
- ^ self
- at:#terminalOutputIsUTF8
+ ^ self
+ at:#terminalOutputIsUTF8
put:aBoolean
"
- UserPreferences current terminalOutputIsUTF8
+ UserPreferences current terminalOutputIsUTF8
"
!
@@ -5212,11 +5212,11 @@
!UserPreferences class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/UserPreferences.st,v 1.395 2015-02-05 07:17:25 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/UserPreferences.st,v 1.396 2015-02-05 07:29:08 vrany Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/UserPreferences.st,v 1.395 2015-02-05 07:17:25 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/UserPreferences.st,v 1.396 2015-02-05 07:29:08 vrany Exp $'
!
version_SVN