# HG changeset patch # User Claus Gittinger # Date 1327316031 -3600 # Node ID 9fc90b8f931cc8c64b836e814de1f8fc4013ebce # Parent bb13cb4b60c207040f9dcf832259c400c36bdb3e care for fileDialog not present diff -r bb13cb4b60c2 -r 9fc90b8f931c DialogBox.st --- a/DialogBox.st Fri Jan 20 15:54:44 2012 +0100 +++ b/DialogBox.st Mon Jan 23 11:53:51 2012 +0100 @@ -2079,16 +2079,18 @@ "Modified: 23.10.1997 / 19:24:41 / cg" ! -requestDirectoryName:title default:aFileName ok:okText abort:abortText ifFail:failBlock - "Same as requestFileName, but only show directories. - " - - ^ self requestDirectoryName:title - default: aFileName - ok: okText - abort: abortText - ifFail: failBlock - acceptReturnAsOK: false +requestDirectoryName:title default:aFileName ok:okText abort:abortText ifFail:failBlock + "Same as requestFileName, but only show directories." + + ^ self + requestDirectoryName:title + default:aFileName + ok:okText + abort:abortText + ifFail:failBlock + acceptReturnAsOK:false + + "Modified (format): / 23-01-2012 / 11:46:08 / cg" ! requestDirectoryName:title default:aFileName ok:okText abort:abortText ifFail:failBlock acceptReturnAsOK:aBoolean @@ -2098,7 +2100,9 @@ |t dir dirF fN fileBox enteredName resources| UserPreferences current useNewFileDialog ifTrue:[ - ^ "FileDialogV2" FileDialog requestDirectoryName:title default:aFileName ok:okText abort:abortText ifFail:failBlock acceptReturnAsOK:aBoolean + FileDialog notNil ifTrue:[ + ^ "FileDialogV2" FileDialog requestDirectoryName:title default:aFileName ok:okText abort:abortText ifFail:failBlock acceptReturnAsOK:aBoolean + ] ]. resources := self classResources. @@ -2151,23 +2155,33 @@ " "Created: / 19-04-1996 / 14:31:04 / cg" - "Modified: / 23-08-2006 / 12:33:55 / cg" + "Modified: / 23-01-2012 / 11:43:07 / cg" ! requestDirectoryName:titleString default:aFileName ok:okText abort:abortText version:versionSymbol pattern:pattern fromDirectory:aDirectoryPath ifFail:failBlock whenBoxCreatedEvaluate:boxCreatedCallback asLoadDialog:aBoolean "same as requestFileName, but only show directories" - ^ FileDialog + FileDialog notNil ifTrue:[ + ^ FileDialog + requestDirectoryName:titleString + default:aFileName + ok:okText + abort:abortText + version:versionSymbol + pattern:pattern + fromDirectory:aDirectoryPath + ifFail:failBlock + whenBoxCreatedEvaluate:boxCreatedCallback + asLoadDialog:aBoolean. + ]. + ^ self requestDirectoryName:titleString default:aFileName - ok:okText - abort:abortText - version:versionSymbol - pattern:pattern - fromDirectory:aDirectoryPath + ok:okText abort:abortText ifFail:failBlock - whenBoxCreatedEvaluate:boxCreatedCallback - asLoadDialog:aBoolean. + acceptReturnAsOK:true + + "Modified: / 23-01-2012 / 11:47:37 / cg" ! requestFileName @@ -2387,24 +2401,28 @@ Screen current nativeFileDialogs ifTrue:[ OperatingSystem isMSWINDOWSlike ifTrue:[ - ^ Win32FileDialog - fileDialogFor:nil - save:forSave - title:titleString - inDirectory:aDirectoryPathOrNil - initialAnswer:defaultName - filter:pattern - extension:nil + Win32FileDialog notNil ifTrue:[ + ^ Win32FileDialog + fileDialogFor:nil + save:forSave + title:titleString + inDirectory:aDirectoryPathOrNil + initialAnswer:defaultName + filter:pattern + extension:nil + ]. ]. ]. UserPreferences current useNewFileDialog ifTrue:[ - ^ FileDialog - requestFileName:titleString - default:defaultName - ok:okText abort:abortText - pattern:pattern - fromDirectory:aDirectoryPathOrNil - whenBoxCreatedEvaluate:boxCreatedCallback + FileDialog notNil ifTrue:[ + ^ FileDialog + requestFileName:titleString + default:defaultName + ok:okText abort:abortText + pattern:pattern + fromDirectory:aDirectoryPathOrNil + whenBoxCreatedEvaluate:boxCreatedCallback + ] ]. defaultNm := defaultName. @@ -2510,17 +2528,27 @@ #any (other) - no validation " - ^ FileDialog + FileDialog notNil ifTrue:[ + ^ FileDialog + requestFileName:titleString + default:defaultName + ok:okText + abort:abortText + version:versionSymbol + ifFail:failBlock + pattern:pattern + fromDirectory:aDirectoryPath + whenBoxCreatedEvaluate:boxCreatedCallback + asLoadDialog:aBoolean. + ]. + ^ self requestFileName:titleString default:defaultName - ok:okText - abort:abortText - version:versionSymbol - ifFail:failBlock - pattern:pattern - fromDirectory:aDirectoryPath - whenBoxCreatedEvaluate:boxCreatedCallback - asLoadDialog:aBoolean. + ok:okText abort:abortText + pattern:pattern fromDirectory:aDirectoryPath forSave:aBoolean not + whenBoxCreatedEvaluate:boxCreatedCallback + + "Modified: / 23-01-2012 / 11:50:45 / cg" ! requestFileName:titleString default:defaultName pattern:pattern @@ -2754,19 +2782,22 @@ Screen current nativeFileDialogs ifTrue:[ OperatingSystem isMSWINDOWSlike ifTrue:[ - ^ Win32FileDialog - fileDialogFor:nil - save:forSave - title:titleString - inDirectory:aDirectoryPath - initialAnswer:defaultName - filter:pattern - extension:nil + Win32FileDialog notNil ifTrue:[ + ^ Win32FileDialog + fileDialogFor:nil + save:forSave + title:titleString + inDirectory:aDirectoryPath + initialAnswer:defaultName + filter:pattern + extension:nil + ] ]. ]. UserPreferences current useNewFileDialog ifTrue:[ - ^ FileDialog + FileDialog notNil ifTrue:[ + ^ FileDialog requestFileName:titleString default:defaultName version:versionSymbol @@ -2774,7 +2805,9 @@ pattern:pattern fromDirectory:aDirectoryPath whenBoxCreatedEvaluate:boxCreatedCallback. - ]. + ]. + ]. + defaultName notNil ifTrue:[defaultNm := defaultName asFilename name]. defaultDir := aDirectoryPath. defaultDir isNil ifTrue:[ @@ -3262,7 +3295,8 @@ Return all selected Filenames as filenames in a collection, or nil if cancel was pressed " - ^ FileDialog + FileDialog notNil ifTrue:[ + ^ FileDialog requestFileNames:titleString default:defaultName ok:okText @@ -3272,6 +3306,15 @@ fromDirectory:aDirectoryPath whenBoxCreatedEvaluate:boxCreatedCallback asLoadDialog:asLoadDialog. + ]. + ^ self + requestFileName:titleString + default:defaultName + ok:okText abort:abortText + pattern:pattern fromDirectory:aDirectoryPath forSave:asLoadDialog not + whenBoxCreatedEvaluate:boxCreatedCallback + + "Modified: / 23-01-2012 / 11:52:17 / cg" ! requestNewFileName:titleString default:defaultName @@ -3309,29 +3352,31 @@ Screen current nativeFileDialogs ifTrue:[ OperatingSystem isMSWINDOWSlike ifTrue:[ appendActionOrNil isNil ifTrue:[ - ^ Win32FileDialog - fileDialogFor:nil - save:true - title:title - inDirectory:directoryOrNil - initialAnswer:default - filter:nil - extension:nil + Win32FileDialog notNil ifTrue:[ + ^ Win32FileDialog + fileDialogFor:nil + save:true + title:title + inDirectory:directoryOrNil + initialAnswer:default + filter:nil + extension:nil + ] ]. ]. ]. - UserPreferences current useNewFileDialog ifTrue:[ + (UserPreferences current useNewFileDialog and:[FileDialog notNil]) ifTrue:[ fileName := FileDialog - requestFileName:title - default:default - ok:(resources string:'Save') - abort:nil - version:nil - ifFail:nil - pattern:nil - fromDirectory:directoryOrNil - whenBoxCreatedEvaluate:[:box | (dialog := box) appendButtonVisibleHolder value:appendActionOrNil notNil]. + requestFileName:title + default:default + ok:(resources string:'Save') + abort:nil + version:nil + ifFail:nil + pattern:nil + fromDirectory:directoryOrNil + whenBoxCreatedEvaluate:[:box | (dialog := box) appendButtonVisibleHolder value:appendActionOrNil notNil]. doAppend := dialog appendWasPressed ] ifFalse:[ @@ -3369,8 +3414,8 @@ appendAction:nil " - "Modified: / 27-10-2006 / 09:47:01 / cg" "Modified: / 24-08-2010 / 17:29:12 / sr" + "Modified: / 23-01-2012 / 11:53:07 / cg" ! ! !DialogBox class methodsFor:'fill in the blank dialogs'! @@ -9695,11 +9740,11 @@ !DialogBox class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.322 2012-01-20 14:54:44 cg Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.323 2012-01-23 10:53:51 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.322 2012-01-20 14:54:44 cg Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.323 2012-01-23 10:53:51 cg Exp $' ! ! DialogBox initialize!