--- a/NewLauncher.st Sat Dec 08 02:26:04 2001 +0100
+++ b/NewLauncher.st Sat Dec 08 13:08:19 2001 +0100
@@ -194,7 +194,7 @@
'MenuEditor'
#toolsChangesBrowser
-'Changes Browser.'
+'Changes Browser'
#toolsMiscProjectsNewProject
'New Project'
@@ -4115,5 +4115,5 @@
!NewLauncher class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.243 2001-12-08 01:26:04 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/NewLauncher.st,v 1.244 2001-12-08 12:07:46 cg Exp $'
! !
--- a/NewSystemBrowser.st Sat Dec 08 02:26:04 2001 +0100
+++ b/NewSystemBrowser.st Sat Dec 08 13:08:19 2001 +0100
@@ -27,7 +27,8 @@
SynchronousUpdate DefaultIsNewBuffer DoubleClickIsOpenBrowser
ShowMethodTemplateWhenProtocolIsSelected
DefaultShowMethodTemplate DefaultEmphasizeUnloadedClasses
- DefaultImmediateSyntaxColoring DefaultSyntaxColoring'
+ DefaultImmediateSyntaxColoring DefaultSyntaxColoring
+ DefaultToolBarVisible DefaultCodeInfoVisible'
poolDictionaries:''
category:'Interface-Browsers'
!
@@ -396,6 +397,39 @@
^ SynchronousUpdate ? false
! !
+!NewSystemBrowser class methodsFor:'help specs'!
+
+flyByHelpSpec
+ <resource: #help>
+
+ ^super flyByHelpSpec addPairsFrom:#(
+
+#searchClass
+'Search Class'
+)
+!
+
+helpSpec
+ "This resource specification was automatically generated
+ by the UIHelpTool of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the UIHelpTool may not be able to read the specification."
+
+ "
+ UIHelpTool openOnClass:NewSystemBrowser
+ "
+
+ <resource: #help>
+
+ ^super helpSpec addPairsFrom:#(
+
+#searchClass
+''
+
+)
+! !
+
!NewSystemBrowser class methodsFor:'image specs'!
defaultIcon
@@ -2191,6 +2225,7 @@
#name: 'ToolBar'
#layout: #(#LayoutFrame 0 0 0 0 0 1 30 0)
#visibilityChannel: #toolBarVisibleHolder
+ #menu: #toolBarMenu
#textDefault: true
)
#(#NoteBookViewSpec
@@ -5864,7 +5899,12 @@
)
#(#MenuItem
#label: '-'
- #isVisible: false
+ )
+ #(#MenuItem
+ #label: 'Toolbar'
+ #translateLabel: true
+ #hideMenuOnActivated: false
+ #indication: #toolBarVisibleHolder
)
#(#MenuItem
#label: 'Info'
@@ -7835,6 +7875,39 @@
)
!
+toolBarMenu
+ "This resource specification was automatically generated
+ by the MenuEditor of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the MenuEditor may not be able to read the specification."
+
+ "
+ MenuEditor new openOnClass:NewSystemBrowser andSelector:#toolBarMenu
+ (Menu new fromLiteralArrayEncoding:(NewSystemBrowser toolBarMenu)) startUp
+ "
+
+ <resource: #menu>
+
+ ^
+ #(#Menu
+ #(
+ #(#MenuItem
+ #label: 'Search Class'
+ #translateLabel: true
+ #isButton: true
+ #hideMenuOnActivated: false
+ #value: #searchMenuFindClass
+ #activeHelpKey: #searchClass
+ #showBusyCursorWhilePerforming: true
+ #labelImage: #(#ResourceRetriever #ToolbarIconLibrary #search16x16Icon)
+ )
+ )
+ nil
+ nil
+ )
+!
+
variablesMenu
"This resource specification was automatically generated
by the MenuEditor of ST/X."
@@ -9493,7 +9566,7 @@
|holder|
(holder := builder bindingAt:#codeInfoVisible) isNil ifTrue:[
- holder := false asValue.
+ holder := (DefaultCodeInfoVisible ? false) asValue.
builder aspectAt:#codeInfoVisible put: holder.
holder addDependent:self.
].
@@ -9646,7 +9719,7 @@
|holder|
(holder := builder bindingAt:#toolBarVisibleHolder) isNil ifTrue:[
- holder := false asValue.
+ holder := (DefaultToolBarVisible ? false) asValue.
builder aspectAt:#toolBarVisibleHolder put: holder.
holder addDependent:self.
].
@@ -11293,7 +11366,7 @@
"/ ].
changedObject == self codeInfoVisible ifTrue:[
- self infoVisibilityChanged.
+ self codeInfoVisibilityChanged.
^ self
].
changedObject == self toolBarVisibleHolder ifTrue:[
@@ -21162,29 +21235,34 @@
class := allClasses
detect:[:cls | cls name asLowercase startsWith:lcName]
ifNone:nil.
- class isNil ifTrue:[
- class := allClasses
- detect:[:cls | cls nameWithoutNameSpacePrefix asLowercase = lcName]
- ifNone:nil.
- class isNil ifTrue:[
- class := allClasses
- detect:[:cls | cls nameWithoutNameSpacePrefix asLowercase startsWith:lcName]
- ifNone:nil.
- class isNil ifTrue:[
- class := allClasses
- detect:[:cls | cls nameWithoutPrefix asLowercase = lcName]
- ifNone:nil.
- class isNil ifTrue:[
- class := allClasses
- detect:[:cls | cls nameWithoutPrefix asLowercase startsWith:lcName]
- ifNone:nil.
- class isNil ifTrue:[
- ^ self warn:('No such class: ' , className).
- ].
- ].
- ].
- ].
- ].
+ ].
+ class isNil ifTrue:[
+ class := allClasses
+ detect:[:cls | cls nameWithoutNameSpacePrefix asLowercase = lcName]
+ ifNone:nil.
+ ].
+ class isNil ifTrue:[
+ class := allClasses
+ detect:[:cls | cls nameWithoutNameSpacePrefix asLowercase startsWith:lcName]
+ ifNone:nil.
+ ].
+ class isNil ifTrue:[
+ class := allClasses
+ detect:[:cls | cls nameWithoutPrefix asLowercase = lcName]
+ ifNone:nil.
+ ].
+ class isNil ifTrue:[
+ class := allClasses
+ detect:[:cls | cls nameWithoutPrefix asLowercase startsWith:lcName]
+ ifNone:nil.
+ ].
+ class isNil ifTrue:[
+ class := allClasses
+ detect:[:cls | ('*' , lcName , '*') match:cls nameWithoutPrefix asLowercase]
+ ifNone:nil.
+ ].
+ class isNil ifTrue:[
+ ^ self warn:('No such class: ' , className).
].
].
className := class name
@@ -30440,6 +30518,10 @@
"/ no need to fixup here - I am always installed as subcanvas
"/ (via noteBookView)
Smalltalk addDependent:self.
+
+ self codeInfoVisible value ifTrue:[ self codeInfoVisibilityChanged ].
+ self toolBarVisibleHolder value ifTrue:[ self toolBarVisibilityChanged ].
+
super postBuildWith:aBuilder.
"Modified: / 24.2.2000 / 16:11:27 / cg"
@@ -30826,6 +30908,26 @@
"Modified: / 15.11.2001 / 18:19:35 / cg"
!
+codeInfoVisibilityChanged
+ |visible cFrame bottomOffset|
+
+ visible := self codeInfoVisible value.
+
+ cFrame := builder findComponentAt:#CodeView.
+ cFrame notNil ifTrue:[
+ visible ifFalse:[
+ bottomOffset := 0.
+ ] ifTrue:[
+ bottomOffset := -25.
+ ].
+ cFrame layout bottomOffset:bottomOffset.
+ cFrame container notNil ifTrue:[
+ cFrame containerChangedSize.
+ ].
+ ].
+ DefaultCodeInfoVisible := visible
+!
+
codeModified
"invoked when the user edits the text shown in the codeView"
@@ -30841,21 +30943,6 @@
self updateBufferLabel.
!
-infoVisibilityChanged
- |cFrame bottomOffset|
-
- cFrame := builder findComponentAt:#CodeView.
- self codeInfoVisible value ifFalse:[
- bottomOffset := 0.
- ] ifTrue:[
- bottomOffset := -25.
- ].
- cFrame layout bottomOffset:bottomOffset.
- cFrame container notNil ifTrue:[
- cFrame containerChangedSize.
- ].
-!
-
methodDoubleClicked
|currentMethod|
@@ -31080,11 +31167,14 @@
!
toolBarVisibilityChanged
- |toolBar noteBook topOffset|
-
- toolBar := self builder componentAt:#ToolBar.
- noteBook := self builder componentAt:#NoteBook.
- self toolBarVisibleHolder value ifTrue:[
+ |visible builder toolBar noteBook topOffset|
+
+ visible := self toolBarVisibleHolder value.
+
+ builder := self builder.
+ toolBar := builder componentAt:#ToolBar.
+ noteBook := builder componentAt:#NoteBook.
+ visible ifTrue:[
topOffset := toolBar height.
] ifFalse:[
topOffset := 0.
@@ -31093,6 +31183,7 @@
noteBook container notNil ifTrue:[
noteBook containerChangedSize.
].
+ DefaultToolBarVisible := visible.
!
variableDoubleClicked
@@ -31219,7 +31310,7 @@
label:'Class redefinition'
form:(WarningBox iconBitmap)
- buttonLabels:#('cancel' 'continue')
+ buttonLabels:#('Cancel' 'Continue')
values:#(#cancel #keep)
default:#keep
onCancel:#cancel.
@@ -51177,6 +51268,6 @@
!NewSystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.279 2001-12-07 11:10:34 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Attic/NewSystemBrowser.st,v 1.280 2001-12-08 12:08:19 cg Exp $'
! !
NewSystemBrowser initialize!
--- a/Tools__NewSystemBrowser.st Sat Dec 08 02:26:04 2001 +0100
+++ b/Tools__NewSystemBrowser.st Sat Dec 08 13:08:19 2001 +0100
@@ -27,7 +27,8 @@
SynchronousUpdate DefaultIsNewBuffer DoubleClickIsOpenBrowser
ShowMethodTemplateWhenProtocolIsSelected
DefaultShowMethodTemplate DefaultEmphasizeUnloadedClasses
- DefaultImmediateSyntaxColoring DefaultSyntaxColoring'
+ DefaultImmediateSyntaxColoring DefaultSyntaxColoring
+ DefaultToolBarVisible DefaultCodeInfoVisible'
poolDictionaries:''
category:'Interface-Browsers'
!
@@ -396,6 +397,39 @@
^ SynchronousUpdate ? false
! !
+!NewSystemBrowser class methodsFor:'help specs'!
+
+flyByHelpSpec
+ <resource: #help>
+
+ ^super flyByHelpSpec addPairsFrom:#(
+
+#searchClass
+'Search Class'
+)
+!
+
+helpSpec
+ "This resource specification was automatically generated
+ by the UIHelpTool of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the UIHelpTool may not be able to read the specification."
+
+ "
+ UIHelpTool openOnClass:NewSystemBrowser
+ "
+
+ <resource: #help>
+
+ ^super helpSpec addPairsFrom:#(
+
+#searchClass
+''
+
+)
+! !
+
!NewSystemBrowser class methodsFor:'image specs'!
defaultIcon
@@ -2191,6 +2225,7 @@
#name: 'ToolBar'
#layout: #(#LayoutFrame 0 0 0 0 0 1 30 0)
#visibilityChannel: #toolBarVisibleHolder
+ #menu: #toolBarMenu
#textDefault: true
)
#(#NoteBookViewSpec
@@ -5864,7 +5899,12 @@
)
#(#MenuItem
#label: '-'
- #isVisible: false
+ )
+ #(#MenuItem
+ #label: 'Toolbar'
+ #translateLabel: true
+ #hideMenuOnActivated: false
+ #indication: #toolBarVisibleHolder
)
#(#MenuItem
#label: 'Info'
@@ -7835,6 +7875,39 @@
)
!
+toolBarMenu
+ "This resource specification was automatically generated
+ by the MenuEditor of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the MenuEditor may not be able to read the specification."
+
+ "
+ MenuEditor new openOnClass:NewSystemBrowser andSelector:#toolBarMenu
+ (Menu new fromLiteralArrayEncoding:(NewSystemBrowser toolBarMenu)) startUp
+ "
+
+ <resource: #menu>
+
+ ^
+ #(#Menu
+ #(
+ #(#MenuItem
+ #label: 'Search Class'
+ #translateLabel: true
+ #isButton: true
+ #hideMenuOnActivated: false
+ #value: #searchMenuFindClass
+ #activeHelpKey: #searchClass
+ #showBusyCursorWhilePerforming: true
+ #labelImage: #(#ResourceRetriever #ToolbarIconLibrary #search16x16Icon)
+ )
+ )
+ nil
+ nil
+ )
+!
+
variablesMenu
"This resource specification was automatically generated
by the MenuEditor of ST/X."
@@ -9493,7 +9566,7 @@
|holder|
(holder := builder bindingAt:#codeInfoVisible) isNil ifTrue:[
- holder := false asValue.
+ holder := (DefaultCodeInfoVisible ? false) asValue.
builder aspectAt:#codeInfoVisible put: holder.
holder addDependent:self.
].
@@ -9646,7 +9719,7 @@
|holder|
(holder := builder bindingAt:#toolBarVisibleHolder) isNil ifTrue:[
- holder := false asValue.
+ holder := (DefaultToolBarVisible ? false) asValue.
builder aspectAt:#toolBarVisibleHolder put: holder.
holder addDependent:self.
].
@@ -11293,7 +11366,7 @@
"/ ].
changedObject == self codeInfoVisible ifTrue:[
- self infoVisibilityChanged.
+ self codeInfoVisibilityChanged.
^ self
].
changedObject == self toolBarVisibleHolder ifTrue:[
@@ -21162,29 +21235,34 @@
class := allClasses
detect:[:cls | cls name asLowercase startsWith:lcName]
ifNone:nil.
- class isNil ifTrue:[
- class := allClasses
- detect:[:cls | cls nameWithoutNameSpacePrefix asLowercase = lcName]
- ifNone:nil.
- class isNil ifTrue:[
- class := allClasses
- detect:[:cls | cls nameWithoutNameSpacePrefix asLowercase startsWith:lcName]
- ifNone:nil.
- class isNil ifTrue:[
- class := allClasses
- detect:[:cls | cls nameWithoutPrefix asLowercase = lcName]
- ifNone:nil.
- class isNil ifTrue:[
- class := allClasses
- detect:[:cls | cls nameWithoutPrefix asLowercase startsWith:lcName]
- ifNone:nil.
- class isNil ifTrue:[
- ^ self warn:('No such class: ' , className).
- ].
- ].
- ].
- ].
- ].
+ ].
+ class isNil ifTrue:[
+ class := allClasses
+ detect:[:cls | cls nameWithoutNameSpacePrefix asLowercase = lcName]
+ ifNone:nil.
+ ].
+ class isNil ifTrue:[
+ class := allClasses
+ detect:[:cls | cls nameWithoutNameSpacePrefix asLowercase startsWith:lcName]
+ ifNone:nil.
+ ].
+ class isNil ifTrue:[
+ class := allClasses
+ detect:[:cls | cls nameWithoutPrefix asLowercase = lcName]
+ ifNone:nil.
+ ].
+ class isNil ifTrue:[
+ class := allClasses
+ detect:[:cls | cls nameWithoutPrefix asLowercase startsWith:lcName]
+ ifNone:nil.
+ ].
+ class isNil ifTrue:[
+ class := allClasses
+ detect:[:cls | ('*' , lcName , '*') match:cls nameWithoutPrefix asLowercase]
+ ifNone:nil.
+ ].
+ class isNil ifTrue:[
+ ^ self warn:('No such class: ' , className).
].
].
className := class name
@@ -30440,6 +30518,10 @@
"/ no need to fixup here - I am always installed as subcanvas
"/ (via noteBookView)
Smalltalk addDependent:self.
+
+ self codeInfoVisible value ifTrue:[ self codeInfoVisibilityChanged ].
+ self toolBarVisibleHolder value ifTrue:[ self toolBarVisibilityChanged ].
+
super postBuildWith:aBuilder.
"Modified: / 24.2.2000 / 16:11:27 / cg"
@@ -30826,6 +30908,26 @@
"Modified: / 15.11.2001 / 18:19:35 / cg"
!
+codeInfoVisibilityChanged
+ |visible cFrame bottomOffset|
+
+ visible := self codeInfoVisible value.
+
+ cFrame := builder findComponentAt:#CodeView.
+ cFrame notNil ifTrue:[
+ visible ifFalse:[
+ bottomOffset := 0.
+ ] ifTrue:[
+ bottomOffset := -25.
+ ].
+ cFrame layout bottomOffset:bottomOffset.
+ cFrame container notNil ifTrue:[
+ cFrame containerChangedSize.
+ ].
+ ].
+ DefaultCodeInfoVisible := visible
+!
+
codeModified
"invoked when the user edits the text shown in the codeView"
@@ -30841,21 +30943,6 @@
self updateBufferLabel.
!
-infoVisibilityChanged
- |cFrame bottomOffset|
-
- cFrame := builder findComponentAt:#CodeView.
- self codeInfoVisible value ifFalse:[
- bottomOffset := 0.
- ] ifTrue:[
- bottomOffset := -25.
- ].
- cFrame layout bottomOffset:bottomOffset.
- cFrame container notNil ifTrue:[
- cFrame containerChangedSize.
- ].
-!
-
methodDoubleClicked
|currentMethod|
@@ -31080,11 +31167,14 @@
!
toolBarVisibilityChanged
- |toolBar noteBook topOffset|
-
- toolBar := self builder componentAt:#ToolBar.
- noteBook := self builder componentAt:#NoteBook.
- self toolBarVisibleHolder value ifTrue:[
+ |visible builder toolBar noteBook topOffset|
+
+ visible := self toolBarVisibleHolder value.
+
+ builder := self builder.
+ toolBar := builder componentAt:#ToolBar.
+ noteBook := builder componentAt:#NoteBook.
+ visible ifTrue:[
topOffset := toolBar height.
] ifFalse:[
topOffset := 0.
@@ -31093,6 +31183,7 @@
noteBook container notNil ifTrue:[
noteBook containerChangedSize.
].
+ DefaultToolBarVisible := visible.
!
variableDoubleClicked
@@ -31219,7 +31310,7 @@
label:'Class redefinition'
form:(WarningBox iconBitmap)
- buttonLabels:#('cancel' 'continue')
+ buttonLabels:#('Cancel' 'Continue')
values:#(#cancel #keep)
default:#keep
onCancel:#cancel.
@@ -51177,6 +51268,6 @@
!NewSystemBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.279 2001-12-07 11:10:34 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.280 2001-12-08 12:08:19 cg Exp $'
! !
NewSystemBrowser initialize!