equal
deleted
inserted
replaced
270 LastCodeSearchArea := where. |
270 LastCodeSearchArea := where. |
271 ] ifFalse:[ |
271 ] ifFalse:[ |
272 (selectionList notNil and:[selectionList hasSelection]) ifTrue:[ |
272 (selectionList notNil and:[selectionList hasSelection]) ifTrue:[ |
273 sel := selectionList selectionValue. |
273 sel := selectionList selectionValue. |
274 ] ifFalse:[ |
274 ] ifFalse:[ |
275 sel := selectorHolder value withoutSeparators. |
275 sel := selectorHolder value. |
|
276 searchWhat ~~ #string ifTrue:[ |
|
277 sel := sel withoutSeparators. |
|
278 ]. |
276 ]. |
279 ]. |
277 sel isEmptyOrNil ifTrue:[ |
280 sel isEmptyOrNil ifTrue:[ |
278 browser warn:((searchWhat == #selector) |
281 browser warn:((searchWhat == #selector) |
279 ifTrue:[ 'No selector entered for search'. ] |
282 ifTrue:[ 'No selector entered for search'. ] |
280 ifFalse:[ 'Nothing entered for search'. ]). |
283 ifFalse:[ 'Nothing entered for search'. ]). |
1025 "/ use last searchString |
1028 "/ use last searchString |
1026 lastSearchPatterns size > 0 ifTrue:[ |
1029 lastSearchPatterns size > 0 ifTrue:[ |
1027 sel := lastSearchPatterns first. |
1030 sel := lastSearchPatterns first. |
1028 ]. |
1031 ]. |
1029 ]. |
1032 ]. |
1030 selectorHolder := (sel ? '') withoutSeparators asValue. |
1033 searchWhat == #string ifTrue:[ |
|
1034 selectorHolder := (sel ? '') asValue. |
|
1035 ] ifFalse:[ |
|
1036 selectorHolder := (sel ? '') withoutSeparators asValue. |
|
1037 ]. |
1031 |
1038 |
1032 inputField := self addComboBoxOn:selectorHolder tabable:true. |
1039 inputField := self addComboBoxOn:selectorHolder tabable:true. |
1033 inputField list:lastSearchPatterns. |
1040 inputField list:lastSearchPatterns. |
1034 inputField selectAllInitially. |
1041 inputField selectAllInitially. |
1035 inputField immediateAccept:true. |
1042 inputField immediateAccept:true. |
1412 ! ! |
1419 ! ! |
1413 |
1420 |
1414 !SearchDialog class methodsFor:'documentation'! |
1421 !SearchDialog class methodsFor:'documentation'! |
1415 |
1422 |
1416 version |
1423 version |
1417 ^ '$Header: /cvs/stx/stx/libtool/Tools__SearchDialog.st,v 1.85 2015-01-31 01:59:31 cg Exp $' |
1424 ^ '$Header: /cvs/stx/stx/libtool/Tools__SearchDialog.st,v 1.86 2015-02-04 18:09:28 cg Exp $' |
1418 ! |
1425 ! |
1419 |
1426 |
1420 version_CVS |
1427 version_CVS |
1421 ^ '$Header: /cvs/stx/stx/libtool/Tools__SearchDialog.st,v 1.85 2015-01-31 01:59:31 cg Exp $' |
1428 ^ '$Header: /cvs/stx/stx/libtool/Tools__SearchDialog.st,v 1.86 2015-02-04 18:09:28 cg Exp $' |
1422 ! ! |
1429 ! ! |
1423 |
1430 |
1424 |
1431 |
1425 SearchDialog initialize! |
1432 SearchDialog initialize! |