--- a/AbstractSettingsApplication.st Wed Sep 15 01:26:38 2004 +0200
+++ b/AbstractSettingsApplication.st Wed Sep 15 13:31:14 2004 +0200
@@ -8123,7 +8123,7 @@
label: 'Code Format Settings'
name: 'Code Format Settings'
min: (Point 10 10)
- bounds: (Rectangle 14 46 618 722)
+ bounds: (Rectangle 0 0 604 676)
)
component:
(SpecCollection
@@ -8139,234 +8139,238 @@
(SpecCollection
collection: (
(VerticalPanelViewSpec
- name: 'VerticalPanel2'
- horizontalLayout: fitSpace
- verticalLayout: topSpace
- horizontalSpace: 5
- verticalSpace: 4
+ name: 'VerticalPanel1'
+ horizontalLayout: fit
+ verticalLayout: bottom
+ horizontalSpace: 3
+ verticalSpace: 3
component:
(SpecCollection
collection: (
- (CheckBoxSpec
- label: 'Auto Format'
- name: 'CheckBox2'
- model: autoFormat
- translateLabel: true
- extent: (Point 594 22)
+ (ViewSpec
+ name: 'Box1'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Space around Temporaries'
+ name: 'CheckBox3'
+ layout: (LayoutFrame 0 0 0 0 250 0 22 0)
+ model: spaceAroundTemporaries
+ translateLabel: true
+ )
+ (CheckBoxSpec
+ label: 'Blank line after local Var Declaration'
+ name: 'CheckBox4'
+ layout: (LayoutFrame 250 0 0 0 0 1 22 0)
+ model: emptyLineAfterTemporaries
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 604 22)
+ )
+ (ViewSpec
+ name: 'Box11'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Space after ''^'''
+ name: 'CheckBox5'
+ layout: (LayoutFrame 0 0 0 0 250 0 22 0)
+ model: spaceAfterReturnToken
+ translateLabel: true
+ )
+ (CheckBoxSpec
+ label: 'Space after '':'' in Keywords'
+ name: 'CheckBox6'
+ layout: (LayoutFrame 250 0 0 0 -5 1 22 0)
+ model: spaceAfterKeywordSelector
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 604 22)
)
(ViewSpec
- name: 'Box14'
+ name: 'Box15'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Space after ''['''
+ name: 'CheckBox9'
+ layout: (LayoutFrame 0 0 0 0 250 0 22 0)
+ model: spaceAfterBlockStart
+ translateLabel: true
+ )
+ (CheckBoxSpec
+ label: 'Space before '']'''
+ name: 'CheckBox10'
+ layout: (LayoutFrame 250 0 0 0 -5 1 22 0)
+ model: spaceBeforeBlockEnd
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 604 22)
+ )
+ (ViewSpec
+ name: 'Box12'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Block Args on new Line'
+ name: 'CheckBox7'
+ layout: (LayoutFrame 250 0 0 0 -5 1 22 0)
+ model: blockArgumentsOnNewLine
+ translateLabel: true
+ )
+ (CheckBoxSpec
+ label: 'C-Style Blocks'
+ name: 'CheckBox8'
+ layout: (LayoutFrame 0 0 0 0 250 0 22 0)
+ model: cStyleBlocks
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 604 22)
+ )
+ (ViewSpec
+ name: 'Box13'
component:
(SpecCollection
collection: (
(LabelSpec
- label: 'Sample Output:'
- name: 'Label3'
- layout: (LayoutFrame 0 0 0 0 0 1 22 0)
- style: (FontDescription helvetica medium roman 12)
+ label: 'Indent:'
+ name: 'Label1'
+ layout: (LayoutFrame 0 0 0 0 250 0 22 0)
translateLabel: true
- adjust: left
+ adjust: right
)
- (TextEditorSpec
- name: 'TextEditor3'
- layout: (LayoutFrame 0 0 22 0 0 1 300 0)
- model: editorText
- hasHorizontalScrollBar: true
- hasVerticalScrollBar: true
- isReadOnly: true
- postBuildCallback: postBuildTextEditor:
+ (InputFieldSpec
+ name: 'EntryField1'
+ layout: (LayoutFrame 253 0 0 0 300 0 22 0)
+ model: tabIndent
+ type: number
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptOnPointerLeave: true
)
)
)
- extent: (Point 594 300)
- )
- (VerticalPanelViewSpec
- name: 'VerticalPanel1'
- horizontalLayout: fit
+ extent: (Point 604 30)
+ )
+ (ViewSpec
+ name: 'Box16'
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Max Length for Single Line Blocks:'
+ name: 'Label5'
+ layout: (LayoutFrame 0 0 0 0 250 0 22 0)
+ translateLabel: true
+ adjust: right
+ )
+ (InputFieldSpec
+ name: 'EntryField4'
+ layout: (LayoutFrame 253 0 0 0 300 0 22 0)
+ model: maxLengthForSingleLineBlocks
+ type: number
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptOnPointerLeave: true
+ )
+ )
+
+ )
+ extent: (Point 604 29)
+ )
+ (HorizontalPanelViewSpec
+ name: 'HorizontalPanel1'
+ horizontalLayout: fitSpace
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 22 0)
- model: spaceAroundTemporaries
- translateLabel: true
- )
- (CheckBoxSpec
- label: 'Blank line after local Var Declaration'
- name: 'CheckBox4'
- layout: (LayoutFrame 250 0 0 0 0 1 22 0)
- model: emptyLineAfterTemporaries
- translateLabel: true
- )
- )
-
- )
- extent: (Point 594 22)
- )
- (ViewSpec
- name: 'Box11'
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'Space after ''^'''
- name: 'CheckBox5'
- layout: (LayoutFrame 0 0 0 0 250 0 22 0)
- model: spaceAfterReturnToken
- translateLabel: true
- )
- (CheckBoxSpec
- label: 'Space after '':'' in Keywords'
- name: 'CheckBox6'
- layout: (LayoutFrame 250 0 0 0 -5 1 22 0)
- model: spaceAfterKeywordSelector
- translateLabel: true
- )
- )
-
- )
- extent: (Point 594 22)
- )
- (ViewSpec
- name: 'Box15'
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'Space after ''['''
- name: 'CheckBox9'
- layout: (LayoutFrame 0 0 0 0 250 0 22 0)
- model: spaceAfterBlockStart
- translateLabel: true
- )
- (CheckBoxSpec
- label: 'Space before '']'''
- name: 'CheckBox10'
- layout: (LayoutFrame 250 0 0 0 -5 1 22 0)
- model: spaceBeforeBlockEnd
- translateLabel: true
- )
- )
-
- )
- extent: (Point 594 22)
+ (ActionButtonSpec
+ label: 'Reset to ST/X Default'
+ name: 'Button1'
+ translateLabel: true
+ model: resetToStxDefault
+ extent: (Point 297 22)
)
- (ViewSpec
- name: 'Box12'
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'Block Args on new Line'
- name: 'CheckBox7'
- layout: (LayoutFrame 250 0 0 0 -5 1 22 0)
- model: blockArgumentsOnNewLine
- translateLabel: true
- )
- (CheckBoxSpec
- label: 'C-Style Blocks'
- name: 'CheckBox8'
- layout: (LayoutFrame 0 0 0 0 250 0 22 0)
- model: cStyleBlocks
- translateLabel: true
- )
- )
-
- )
- extent: (Point 594 22)
- )
- (ViewSpec
- name: 'Box13'
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'Ident:'
- name: 'Label1'
- layout: (LayoutFrame 0 0 0 0 100 0 22 0)
- translateLabel: true
- adjust: right
- )
- (InputFieldSpec
- name: 'EntryField1'
- layout: (LayoutFrame 100 0 0 0 200 0 22 0)
- model: tabIndent
- type: number
- acceptOnReturn: true
- acceptOnTab: true
- acceptOnLostFocus: true
- acceptOnPointerLeave: true
- )
- (LabelSpec
- label: 'Max Length for single line Blocks:'
- name: 'Label2'
- layout: (LayoutFrame 200 0 0 0 400 0 22 0)
- translateLabel: true
- adjust: right
- )
- (InputFieldSpec
- name: 'EntryField2'
- layout: (LayoutFrame 400 0 0 0 500 0 22 0)
- model: maxLengthForSingleLineBlocks
- type: number
- acceptOnReturn: true
- acceptOnTab: true
- acceptOnLostFocus: true
- acceptOnPointerLeave: true
- )
- )
-
- )
- extent: (Point 594 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
- model: resetToStxDefault
- extent: (Point 292 22)
- )
- (ActionButtonSpec
- label: 'Reset to RB Default'
- name: 'Button2'
- translateLabel: true
- model: resetToRBDefault
- extent: (Point 293 22)
- )
- )
-
- )
- extent: (Point 594 30)
+ (ActionButtonSpec
+ label: 'Reset to RefactoryBrowser Default'
+ name: 'Button2'
+ translateLabel: true
+ model: resetToRBDefault
+ extent: (Point 298 22)
)
)
)
- extent: (Point 594 150)
+ extent: (Point 604 30)
)
)
)
- extent: (Point 604 676)
+ extent: (Point 604 180)
+ )
+ (ViewSpec
+ name: 'Box17'
+ extent: (Point 604 20)
+ )
+ (ViewSpec
+ name: 'Box14'
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Sample Output:'
+ name: 'Label3'
+ layout: (LayoutFrame 0 0 0 0 0 1 22 0)
+ style: (FontDescription helvetica medium roman 12)
+ translateLabel: true
+ adjust: left
+ )
+ (TextEditorSpec
+ name: 'TextEditor3'
+ layout: (LayoutFrame 0 0 22 0 0 1 300 0)
+ model: editorText
+ hasHorizontalScrollBar: true
+ hasVerticalScrollBar: true
+ isReadOnly: true
+ postBuildCallback: postBuildTextEditor:
+ )
+ )
+
+ )
+ extent: (Point 604 300)
+ )
+ (ViewSpec
+ name: 'Box18'
+ extent: (Point 604 19)
+ )
+ (CheckBoxSpec
+ label: 'Auto Format'
+ name: 'CheckBox2'
+ model: autoFormat
+ translateLabel: true
+ extent: (Point 604 22)
)
)
@@ -9145,7 +9149,7 @@
manager notNil ifTrue:[
| nm fn|
nm := self sourceCacheDir value.
- nm size > 0 ifTrue:[
+ nm notEmptyOrNil ifTrue:[
(fn := nm asFilename) exists ifFalse:[
(self confirm:('CVS cache directory ''' , nm , ''' does not exist\create ?' withCRs)) ifTrue:[
fn makeDirectory;
@@ -9157,11 +9161,13 @@
(fn isDirectory
and:[fn isReadable
and:[fn isWritable]]) ifTrue:[
- AbstractSourceCodeManager cacheDirectoryName:(self sourceCacheDir value).
+ AbstractSourceCodeManager cacheDirectoryName:nm.
] ifFalse:[
self warn:'Invalid sourceCache directory.'
]
- ]
+"/ ] ifFalse:[
+"/ AbstractSourceCodeManager cacheDirectoryName:nil.
+ ].
].
repositoryHolder notNil ifTrue:[
@@ -10063,7 +10069,7 @@
label: 'Syntax Color Settings'
name: 'Syntax Color Settings'
min: (Point 10 10)
- bounds: (Rectangle 14 46 709 655)
+ bounds: (Rectangle 0 0 695 609)
)
component:
(SpecCollection
@@ -10078,136 +10084,147 @@
component:
(SpecCollection
collection: (
- (VerticalPanelViewSpec
- name: 'VerticalPanel1'
- horizontalLayout: fitSpace
- verticalLayout: topSpace
- horizontalSpace: 5
- verticalSpace: 8
+ (ViewSpec
+ name: 'Box11'
component:
(SpecCollection
collection: (
- (CheckBoxSpec
- label: 'Syntax Coloring'
- name: 'CheckBox1'
- model: syntaxColoring
- translateLabel: true
- extent: (Point 685 22)
- )
- (CheckBoxSpec
- label: 'Immediate Selector Check'
- name: 'ImmediateSelectorCheckBox'
- enableChannel: syntaxColoring
- model: fullSelectorCheck
- translateLabel: true
- extent: (Point 685 22)
- )
- (TextEditorSpec
- name: 'TextEditor2'
+ (LabelSpec
+ label: 'Syntax Element:'
+ name: 'Label4'
+ layout: (LayoutFrame 0 0 0 0 165 0 22 0)
+ translateLabel: true
+ adjust: left
+ )
+ (ComboListSpec
+ name: 'ComboList3'
+ layout: (LayoutFrame 0 0 -22 1 0 1 0 1)
enableChannel: syntaxColoring
- model: coloredText
- hasHorizontalScrollBar: true
- hasVerticalScrollBar: true
- isReadOnly: true
- extent: (Point 685 280)
- )
- (ViewSpec
- name: 'Box11'
- component:
- (SpecCollection
- collection: (
- (ComboListSpec
- name: 'ComboList3'
- layout: (LayoutFrame 0 0 -22 1 0 1 0 1)
- enableChannel: syntaxColoring
- model: syntaxElementSelection
- comboList: syntaxElementList
- useIndex: false
- )
- )
-
- )
- extent: (Point 685 35)
- )
- (ViewSpec
- name: 'Box12'
- component:
- (SpecCollection
- collection: (
- (ComboListSpec
- name: 'ComboList5'
- layout: (LayoutFrame 0 0 -22 1 0 1 0 1)
- enableChannel: syntaxColoring
- model: syntaxEmphasisSelection
- comboList: syntaxEmphasisList
- useIndex: false
- )
- (LabelSpec
- label: 'Emphasis:'
- name: 'Label1'
- layout: (LayoutFrame 0 0 0 0 205 0 22 0)
- translateLabel: true
- adjust: left
- )
- )
-
- )
- extent: (Point 685 44)
- )
- (ViewSpec
- name: 'Box1'
- component:
- (SpecCollection
- collection: (
- (ColorMenuSpec
- name: 'ColorMenu2'
- layout: (LayoutFrame 0 0 -22 1 0 1 0 1)
- enableChannel: syntaxColoring
- model: syntaxColor
- labelsAreColored: true
- )
- (LabelSpec
- label: 'Text Color:'
- name: 'Label2'
- layout: (LayoutFrame 0 0 0 0 205 0 22 0)
- translateLabel: true
- adjust: left
- )
- )
-
- )
- extent: (Point 685 44)
- )
- (ViewSpec
- name: 'Box10'
- component:
- (SpecCollection
- collection: (
- (ActionButtonSpec
- label: 'Reset To:'
- name: 'Button2'
- layout: (LayoutFrame 0 0 -22 1 150 0 0 1)
- translateLabel: true
- model: resetToColorScheme
- enableChannel: syntaxColoring
- )
- (ComboListSpec
- name: 'ComboList4'
- layout: (LayoutFrame 150 0 -22 1 0 1 0 1)
- enableChannel: syntaxColoring
- model: resetListSelection
- comboList: resetList
- useIndex: false
- )
- )
-
- )
- extent: (Point 685 35)
+ model: syntaxElementSelection
+ comboList: syntaxElementList
+ useIndex: false
+ hidePullDownMenuButton: false
+ )
+ )
+
+ )
+ extent: (Point 695 44)
+ )
+ (ViewSpec
+ name: 'Box12'
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Emphasis:'
+ name: 'Label1'
+ layout: (LayoutFrame 40 0 0 0 205 0 22 0)
+ translateLabel: true
+ adjust: left
+ )
+ (ComboListSpec
+ name: 'ComboList5'
+ layout: (LayoutFrame 40 0 -22 1 0 1 0 1)
+ enableChannel: syntaxColoring
+ model: syntaxEmphasisSelection
+ comboList: syntaxEmphasisList
+ useIndex: false
+ hidePullDownMenuButton: false
)
)
)
- extent: (Point 695 609)
+ extent: (Point 695 44)
+ )
+ (ViewSpec
+ name: 'Box1'
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Text Color:'
+ name: 'Label2'
+ layout: (LayoutFrame 40 0 0 0 205 0 22 0)
+ translateLabel: true
+ adjust: left
+ )
+ (ColorMenuSpec
+ name: 'ColorMenu2'
+ layout: (LayoutFrame 40 0 -22 1 0 1 0 1)
+ enableChannel: syntaxColoring
+ model: syntaxColor
+ labelsAreColored: true
+ )
+ )
+
+ )
+ extent: (Point 695 44)
+ )
+ (ViewSpec
+ name: 'Box10'
+ component:
+ (SpecCollection
+ collection: (
+ (ActionButtonSpec
+ label: 'Reset To:'
+ name: 'Button2'
+ layout: (LayoutFrame 0 0 -22 1 150 0 0 1)
+ translateLabel: true
+ model: resetToColorScheme
+ enableChannel: syntaxColoring
+ )
+ (ComboListSpec
+ name: 'ComboList4'
+ layout: (LayoutFrame 150 0 -22 1 0 1 0 1)
+ enableChannel: syntaxColoring
+ model: resetListSelection
+ comboList: resetList
+ useIndex: false
+ hidePullDownMenuButton: false
+ )
+ )
+
+ )
+ extent: (Point 695 35)
+ )
+ (ViewSpec
+ name: 'SpacingBox1'
+ extent: (Point 695 20)
+ )
+ (LabelSpec
+ label: 'Sample Output:'
+ name: 'Label3'
+ translateLabel: true
+ adjust: left
+ extent: (Point 695 22)
+ )
+ (TextEditorSpec
+ name: 'TextEditor2'
+ enableChannel: syntaxColoring
+ model: coloredText
+ hasHorizontalScrollBar: true
+ hasVerticalScrollBar: true
+ isReadOnly: true
+ extent: (Point 695 280)
+ )
+ (ViewSpec
+ name: 'SpacingBox2'
+ extent: (Point 695 20)
+ )
+ (CheckBoxSpec
+ label: 'Syntax Coloring'
+ name: 'CheckBox1'
+ model: syntaxColoring
+ translateLabel: true
+ extent: (Point 695 22)
+ )
+ (CheckBoxSpec
+ label: 'Immediate Selector Check'
+ name: 'ImmediateSelectorCheckBox'
+ enableChannel: syntaxColoring
+ model: fullSelectorCheck
+ translateLabel: true
+ extent: (Point 695 22)
)
)
@@ -10267,11 +10284,13 @@
!
recolor
-
|text|
self syntaxColoring value ifTrue:[
- text := SyntaxHighlighter formatMethod:self class exampleText in:nil.
+ text := SyntaxHighlighter
+ formatMethod:self class exampleText
+ in:nil
+ using:currentUserPrefs.
] ifFalse:[
text := self class exampleText.
].
@@ -10407,8 +10426,7 @@
!
syntaxColorChanged
- currentUserPrefs at:(self syntaxColorSelector value)
- put:(self syntaxColor value).
+ currentUserPrefs at:(self syntaxColorSelector) put:(self syntaxColor value).
self recolor.
self updateModifiedChannel
!
@@ -10417,8 +10435,8 @@
| syntaxEmphasisValue |
- self syntaxColor value:(currentUserPrefs perform:(self syntaxColorSelector value)).
- syntaxEmphasisValue := (currentUserPrefs perform:(self syntaxEmphasisSelector value)).
+ self syntaxColor value:(currentUserPrefs perform:(self syntaxColorSelector)).
+ syntaxEmphasisValue := (currentUserPrefs perform:(self syntaxEmphasisSelector)).
self syntaxEmphasisSelection value:(self getEmphasis:syntaxEmphasisValue).
self recolor.
!
@@ -10427,7 +10445,7 @@
|em|
em := self getEmphasis:self syntaxEmphasisSelection value.
- currentUserPrefs at:(self syntaxEmphasisSelector value) value put:em.
+ currentUserPrefs at:(self syntaxEmphasisSelector) put:em.
self recolor.
self updateModifiedChannel
!
@@ -10514,13 +10532,12 @@
!AbstractSettingsApplication::SyntaxColorSettingsAppl methodsFor:'queries'!
hasUnsavedChanges
-
|colorList colorPerformer emphasisPerformer|
colorList := UserPreferences syntaxColorNames.
colorList do:[:syntaxElement |
- colorPerformer := (self syntaxColorSelectorForElement:syntaxElement) value.
- emphasisPerformer := (self syntaxEmphasisSelectorForElement:syntaxElement) value.
+ colorPerformer := (self syntaxColorSelectorForElement:syntaxElement).
+ emphasisPerformer := (self syntaxEmphasisSelectorForElement:syntaxElement).
((oldUserPreferences perform:colorPerformer) ~= (currentUserPrefs perform:colorPerformer)) ifTrue:[
^ true
].
@@ -10535,23 +10552,21 @@
!
syntaxColorSelector
-
- ^ self syntaxColorSelectorForElement:self syntaxElementSelection value
+ ^ (self syntaxColorSelectorForElement:self syntaxElementSelection value)
!
syntaxColorSelectorForElement:aSyntaxElement
-
- ^ [(aSyntaxElement replChar:$ withString: '') asLowercaseFirst asSymbol]
+ ^ (aSyntaxElement replChar:$ withString: '') asLowercaseFirst asSymbol
!
syntaxEmphasisSelector
- ^ self syntaxEmphasisSelectorForElement:self syntaxElementSelection value
+ ^ self syntaxEmphasisSelectorForElement:(self syntaxElementSelection value)
!
syntaxEmphasisSelectorForElement:anEmElement
-
- ^ [((((self syntaxColorSelectorForElement:anEmElement) value) readStream upToAll: 'Color'), 'Emphasis') asLowercaseFirst asSymbol]
+ ^ (((self syntaxColorSelectorForElement:anEmElement) readStream upToAll: 'Color'), 'Emphasis')
+ asLowercaseFirst asSymbol
! !
!AbstractSettingsApplication::SystemMessageSettingsAppl class methodsFor:'image specs'!
@@ -11229,5 +11244,5 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.168 2004-09-14 17:22:08 ca Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.169 2004-09-15 11:31:14 cg Exp $'
+! !