equal
deleted
inserted
replaced
342 enteredFileNameString := instance result. |
342 enteredFileNameString := instance result. |
343 (enteredFileNameString isNil or:[enteredFileNameString isEmpty]) ifTrue:[ |
343 (enteredFileNameString isNil or:[enteredFileNameString isEmpty]) ifTrue:[ |
344 ^ failBlock value |
344 ^ failBlock value |
345 ]. |
345 ]. |
346 enteredFileName := enteredFileNameString asFilename. |
346 enteredFileName := enteredFileNameString asFilename. |
|
347 |
|
348 (enteredFileName isDirectory and:[defaultName notEmptyOrNil]) ifTrue:[ |
|
349 enteredFileName := enteredFileName construct:defaultName. |
|
350 ]. |
347 enteredFileNameString := enteredFileName asString. |
351 enteredFileNameString := enteredFileName asString. |
348 |
|
349 (enteredFileName notNil |
352 (enteredFileName notNil |
350 and:[enteredFileNameString notEmpty]) ifTrue:[ |
353 and:[enteredFileNameString notEmpty]) ifTrue:[ |
351 FileSelectionBox lastFileSelectionDirectory:(enteredFileName directoryName). |
354 FileSelectionBox lastFileSelectionDirectory:(enteredFileName directoryName). |
352 versionSymbol isNil ifTrue:[ ^ enteredFileNameString]. |
355 versionSymbol isNil ifTrue:[ ^ enteredFileNameString]. |
353 versionSymbol == #mustBeNew ifTrue:[ |
356 versionSymbol == #mustBeNew ifTrue:[ |
379 default:'' |
382 default:'' |
380 ok:nil |
383 ok:nil |
381 abort:nil |
384 abort:nil |
382 version:nil |
385 version:nil |
383 ifFail:['none'] |
386 ifFail:['none'] |
384 pattern:'*.conf' |
387 pattern:'*' |
385 fromDirectory:Filename currentDirectory pathName |
388 fromDirectory:Filename currentDirectory pathName |
386 whenBoxCreatedEvaluate:nil |
389 whenBoxCreatedEvaluate:nil |
387 asLoadDialog:true |
390 asLoadDialog:true |
388 " |
391 " |
389 ! |
392 ! |
1469 ! ! |
1472 ! ! |
1470 |
1473 |
1471 !FileDialog class methodsFor:'documentation'! |
1474 !FileDialog class methodsFor:'documentation'! |
1472 |
1475 |
1473 version |
1476 version |
1474 ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.57 2004-05-17 16:54:01 cg Exp $' |
1477 ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.58 2004-05-18 11:43:03 penk Exp $' |
1475 ! ! |
1478 ! ! |