--- a/DataSetBuilder.st Wed Sep 04 21:38:09 2002 +0200
+++ b/DataSetBuilder.st Wed Sep 04 21:52:58 2002 +0200
@@ -2621,7 +2621,7 @@
!
labelInPreviewPressed:anIndex
- (builder componentAt:#labelAndColumns) selection:anIndex
+ (self componentAt:#labelAndColumns) selection:anIndex
!
updateColumnView
@@ -2777,7 +2777,7 @@
postBuildWith:builder
- columnView := self builder componentAt:#columnView.
+ columnView := self componentAt:#columnView.
"/ columnView labelView enabled:false.
super postBuildWith:builder.
@@ -2790,7 +2790,7 @@
self updateHistory
].
- (builder componentAt: #labelAndColumns)
+ (self componentAt: #labelAndColumns)
selectConditionBlock: [:i|self askForItemModification];
action: [:i|self cancel];
selection: 1.
--- a/FileSelectionBrowser.st Wed Sep 04 21:38:09 2002 +0200
+++ b/FileSelectionBrowser.st Wed Sep 04 21:52:58 2002 +0200
@@ -422,14 +422,12 @@
directoryInputField
- ^builder componentAt: #directoryInputField
-
+ ^self componentAt: #directoryInputField
!
directoryTreeView
- ^builder componentAt: #directoryTreeView
-
+ ^self componentAt: #directoryTreeView
! !
!FileSelectionBrowser methodsFor:'aspects'!
@@ -533,7 +531,7 @@
!
menuUpdate
- (self builder componentAt:#directoryTreeView) monitorCycle.
+ (self componentAt:#directoryTreeView) monitorCycle.
!
readDirectory
--- a/ImageEditor.st Wed Sep 04 21:38:09 2002 +0200
+++ b/ImageEditor.st Wed Sep 04 21:52:58 2002 +0200
@@ -1883,7 +1883,7 @@
colorDataSetView
"returns the view of the colormap"
- ^(builder componentAt: #colorDataSetView)
+ ^(self componentAt: #colorDataSetView)
"Created: / 26.7.1998 / 12:02:14 / cg"
!
@@ -1891,14 +1891,14 @@
coordLabel
"returns the view the coord label"
- ^builder componentAt: #coordLabel
+ ^self componentAt: #coordLabel
!
imageEditView
"returns the view of the image"
imageEditView isNil ifTrue:[
- imageEditView := (builder componentAt: #imageEditView) scrolledView.
+ imageEditView := (self componentAt: #imageEditView) scrolledView.
imageEditView addDependent:self.
].
^ imageEditView
@@ -1909,7 +1909,7 @@
imagePreView
"returns the preview of the image"
- ^ (builder componentAt: #imagePreView) subViews first
+ ^ (self componentAt: #imagePreView) subViews first
! !
!ImageEditor methodsFor:'aspects'!
@@ -2514,7 +2514,7 @@
super open.
- imageEditView := (builder componentAt: #imageEditView) subViews first.
+ imageEditView := (self componentAt: #imageEditView) subViews first.
!
postOpenWith:aBuilder
@@ -2527,7 +2527,7 @@
imageEditView clickInfoCallBack:[:button :point |
|mouseButtonColorToolBar|
- mouseButtonColorToolBar := builder componentAt:#MouseButtonColorToolBar.
+ mouseButtonColorToolBar := self componentAt:#MouseButtonColorToolBar.
(mouseButtonColorToolBar itemAt:button) toggleIndication.
mouseButtonColorToolBar do: [:i| i updateIndicators].
].
--- a/UIHelpTool.st Wed Sep 04 21:38:09 2002 +0200
+++ b/UIHelpTool.st Wed Sep 04 21:52:58 2002 +0200
@@ -677,7 +677,7 @@
ifTrue: [list removeAll: (ApplicationModel withAllSuperclasses collect: [:cls| cls name])].
self selectionOfHelpSpecClass value: specClass name.
- listOfHelpSpecClassesView := builder componentAt: #listOfHelpSpecClassesView.
+ listOfHelpSpecClassesView := self componentAt: #listOfHelpSpecClassesView.
listOfHelpSpecClassesView notNil ifTrue:[
listOfHelpSpecClassesView selection:
(list value indexOf: specClass name).
@@ -693,33 +693,30 @@
helpSpecClassSelected
"extracts the help dictionary from the selected class and make it current"
- |clsName|
+ |clsName listOfHelpKeysView newSelection|
clsName := self selectionOfHelpSpecClass value.
- (dictionary := dictionaries at: clsName ifAbsent: nil) isNil
- ifTrue:
- [
- dictionary := dictionaries at: clsName put: (self extractHelpSpecForClass: (Smalltalk at: clsName))
- ].
+ dictionary := self dictionaryForClassNamed:clsName.
self updateList.
- listSelection notNil
- ifTrue:
- [
+ listSelection notNil ifTrue: [
+ listOfHelpKeysView := self componentAt: #listOfHelpKeysView.
+
(dictionary keys includes: listSelection asSymbol)
- ifTrue: [(builder componentAt: #listOfHelpKeysView) selection:
- (self listChannel value indexOf: (builder componentAt: #helpKeyInputField) contents)]
- ifFalse: [(builder componentAt: #listOfHelpKeysView) selection: nil].
+ ifTrue: [
+ newSelection :=
+ (self listChannel value indexOf: (self componentAt: #helpKeyInputField) contents)
+ ] ifFalse: [
+ newSelection := nil
+ ].
+
+ listOfHelpKeysView selection:newSelection.
].
- listSelection notNil
- ifTrue:
- [
+ listSelection notNil ifTrue: [
self editTextView contents: (dictionary at: listSelection asSymbol ifAbsent: '')
]
-
-
! !
!UIHelpTool methodsFor:'help'!
@@ -769,12 +766,22 @@
!
+dictionaryForClassNamed:clsName
+ |dictionary|
+
+ dictionary := dictionaries at:clsName ifAbsent:nil.
+ dictionary isNil ifTrue: [
+ dictionary := dictionaries at:clsName put:(self extractHelpSpecForClass: (Smalltalk at:clsName))
+ ].
+ ^ dictionary
+!
+
editTextView
"returns the editTextView or nil"
|view|
- (view := builder componentAt:#helpTextView) notNil ifTrue:[
+ (view := self componentAt:#helpTextView) notNil ifTrue:[
view := view scrolledView.
view acceptAction isNil ifTrue:[
@@ -820,18 +827,14 @@
dictTemp := dictionary.
listOfHelpSpecClasses := self listOfHelpSpecClasses.
listOfHelpSpecClasses value do:[:clsName|
- (dictionary := dictionaries at: clsName ifAbsent: nil) isNil ifTrue:[
- dictionary := dictionaries at: clsName put: (self extractHelpSpecForClass: (Smalltalk at: clsName))
- ].
+ dictionary := self dictionaryForClassNamed:clsName.
(dictionary includesKey: aHelpKey asSymbol) ifTrue:[
self updateList.
- ^(builder componentAt: #listOfHelpSpecClassesView) selection:
+ ^(self componentAt: #listOfHelpSpecClassesView) selection:
(listOfHelpSpecClasses value indexOf: clsName).
]
].
dictionary := dictTemp
-
-
!
getHelpSpecClassFromClass:aClass
@@ -1030,7 +1033,7 @@
].
selection isNil ifTrue:[
- (builder componentAt:#listOfHelpKeysView) selection:nil
+ (self componentAt:#listOfHelpKeysView) selection:nil
] ifFalse:[
(dictionary includesKey:selection asSymbol) ifFalse:[
self findHelpSpecForKey:selection
@@ -1056,7 +1059,6 @@
view contents:txt.
view modified:false.
]
-
! !
!UIHelpTool methodsFor:'startup / release'!
@@ -1111,19 +1113,21 @@
openOnClass:aClass
"opens the UIHelpTool on aClass"
- super openInterface: #windowSpecForStandAlone.
- self masterApplication isNil ifTrue: [(builder componentAt: #RemoveButton) beInvisible].
- builder window label: 'Help Tool'.
- self buildFromClass: aClass
+ self openOnClass:aClass andSelector:nil
+
+ "
+ self openOnClass:NewLauncher
+ "
!
openOnClass:aClass andSelector: aSelector
"opens the UIHelpTool on aClass and aSelector"
super openInterface: #windowSpecForStandAlone.
- self masterApplication isNil ifTrue: [(builder componentAt: #RemoveButton) beInvisible].
+
+ self masterApplication isNil ifTrue: [(self componentAt: #RemoveButton) beInvisible].
builder window label: 'Help Tool'.
- self buildFromClass: aClass andSelector: aSelector
+ self buildFromClass:aClass andSelector:aSelector
! !
!UIHelpTool methodsFor:'user actions'!
@@ -1145,7 +1149,7 @@
listChgd ifTrue:[
self updateList.
- (builder componentAt: #listOfHelpKeysView) selection: (list indexOf: key).
+ (self componentAt: #listOfHelpKeysView) selection: (list indexOf: key).
].
modified := true.
@@ -1157,7 +1161,7 @@
"adds a help key"
|helpKey|
- (helpKey := (builder componentAt: #helpKeyInputField asSymbol) contents) size > 0
+ (helpKey := (self componentAt: #helpKeyInputField asSymbol) contents) size > 0
ifTrue:
[
self listModel value: helpKey.