--- a/Tools_SearchDialog.st Thu Feb 23 15:53:21 2006 +0100
+++ b/Tools_SearchDialog.st Thu Feb 23 15:53:44 2006 +0100
@@ -541,17 +541,21 @@
!
addTextEntryFieldForCode
- |initial box infoLabel helpButton errMessageField checkCodeAction|
+ |initial box panel infoLabel helpButton errMessageField checkCodeAction|
box := View new.
box extent:(600 @ 200).
- codeField := CodeView in:box.
- codeField origin:0.0@0.0 corner:(0.75@1.0).
+ panel := VariableHorizontalPanel in:box.
+ panel origin:0.0@0.0 corner:(1.0@1.0).
- infoLabel := Label in:box.
- infoLabel origin:0.75@0.0 corner:(1.0@1.0).
+ codeField := CodeView in:panel.
+"/ codeField origin:0.0@0.0 corner:(0.75@1.0).
+
+ infoLabel := Label in:panel.
+"/ infoLabel origin:0.75@0.0 corner:(1.0@1.0).
infoLabel font:(codeField font).
+ infoLabel adjust:#left.
infoLabel label:'MetaPatterns:
' , '`' allBold , ' = meta
@@ -565,13 +569,17 @@
' , '`@e' allBold , ' any expr
'.
- helpButton := Button label:(resources string:'Pattern Help') in:box.
- helpButton layout:((LayoutOrigin fractionalFromPoint:0.75@1.0)
+ panel relativeCorners:#(0.6 1.0).
+
+ helpButton := Button label:(resources string:'Pattern Help') in:infoLabel.
+ helpButton layout:((AlignmentOrigin fractionalFromPoint:0.5@1.0)
leftOffset:2
- topOffset:helpButton preferredExtent y negated).
+ topOffset:helpButton preferredExtent y negated;
+ leftAlignmentFraction:0.5 topAlignmentFraction:0).
helpButton topInset:0.75@1.0.
helpButton action:[self showHelpOnCodePatterns].
+
self addComponent:box tabable:true.
errMessageField := (self addTextLabel:'') adjust:#left.
errMessageField level:-1.
@@ -594,31 +602,35 @@
codeString := codeField contents asString string.
errAction := [:str :pos |
- |line col badLine|
+ |line col badLine|
- line := codeField lineOfCharacterPosition:pos.
- col := (codeField colOfCharacterPosition:pos) max:1.
+ line := codeField lineOfCharacterPosition:pos.
+ col := (codeField colOfCharacterPosition:pos) max:1.
- badLine := (codeField listAt:line) ? ''
+ badLine := (codeField listAt:line) ? ''
. col <= badLine size size ifTrue:[
- codeField
- listAt:line
- put:(badLine asText
- emphasisAt:col
- put:(UserPreferences current unknownIdentifierEmphasis)).
- "/ codeField selectFromCharacterPosition:pos to:pos.
- ].
- errMessageField label:('[',line printString,'] ',str).
- codeField requestFocus.
- nil.
- ].
+ codeField
+ listAt:line
+ put:(badLine asText
+ emphasisAt:col
+ put:(UserPreferences current unknownIdentifierEmphasis)).
+ "/ codeField selectFromCharacterPosition:pos to:pos.
+ ].
+ errMessageField label:('line: ',line printString,' ',str).
+ errMessageField backgroundColor:Color red.
+ codeField requestFocus.
+ nil.
+ ].
isMethodHolder value ifTrue:[
- tree := RBParser parseRewriteMethod:codeString onError: errAction.
+ tree := RBParser parseRewriteMethod:codeString onError: errAction.
] ifFalse:[
- tree := RBParser parseRewriteExpression:codeString onError: errAction.
+ tree := RBParser parseRewriteExpression:codeString onError: errAction.
].
- tree notNil ifTrue:[ errMessageField label:nil ].
+ tree notNil ifTrue:[
+ errMessageField backgroundColor:View defaultViewBackgroundColor.
+ errMessageField label:nil
+ ].
codeField modifiedChannel setValue:false.
!
@@ -783,5 +795,5 @@
!SearchDialog class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.9 2006-01-09 08:58:31 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Tools_SearchDialog.st,v 1.10 2006-02-23 14:53:44 cg Exp $'
! !