--- a/DialogBox.st	Mon Jan 23 11:53:51 2012 +0100
+++ b/DialogBox.st	Mon Jan 23 17:24:35 2012 +0100
@@ -2161,18 +2161,20 @@
 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 notNil ifTrue:[
-        ^ FileDialog
-            requestDirectoryName:titleString 
-            default:aFileName 
-            ok:okText 
-            abort:abortText 
-            version:versionSymbol 
-            pattern:pattern 
-            fromDirectory:aDirectoryPath 
-            ifFail:failBlock 
-            whenBoxCreatedEvaluate:boxCreatedCallback 
-            asLoadDialog:aBoolean.
+    UserPreferences current useNewFileDialog ifTrue:[
+        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 
@@ -2181,7 +2183,7 @@
         ifFail:failBlock 
         acceptReturnAsOK:true
 
-    "Modified: / 23-01-2012 / 11:47:37 / cg"
+    "Modified: / 23-01-2012 / 17:23:27 / cg"
 !
 
 requestFileName
@@ -2528,18 +2530,20 @@
         #any (other)    - no validation
     "
 
-    FileDialog notNil ifTrue:[
-        ^ FileDialog
-            requestFileName:titleString 
-            default:defaultName 
-            ok:okText 
-            abort:abortText 
-            version:versionSymbol 
-            ifFail:failBlock 
-            pattern:pattern 
-            fromDirectory:aDirectoryPath 
-            whenBoxCreatedEvaluate:boxCreatedCallback 
-            asLoadDialog:aBoolean.
+    UserPreferences current useNewFileDialog ifTrue:[
+        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 
@@ -2548,7 +2552,7 @@
         pattern:pattern fromDirectory:aDirectoryPath forSave:aBoolean not
         whenBoxCreatedEvaluate:boxCreatedCallback
 
-    "Modified: / 23-01-2012 / 11:50:45 / cg"
+    "Modified: / 23-01-2012 / 17:22:57 / cg"
 !
 
 requestFileName:titleString default:defaultName pattern:pattern
@@ -3295,17 +3299,19 @@
      Return all selected Filenames as filenames in a collection, or nil if cancel was pressed
     "
 
-    FileDialog notNil ifTrue:[
-        ^ FileDialog
-            requestFileNames:titleString 
-            default:defaultName 
-            ok:okText 
-            abort:abortText 
-            ifFail:failBlock 
-            pattern:pattern 
-            fromDirectory:aDirectoryPath 
-            whenBoxCreatedEvaluate:boxCreatedCallback 
-            asLoadDialog:asLoadDialog.
+    UserPreferences current useNewFileDialog ifTrue:[
+        FileDialog notNil ifTrue:[
+            ^ FileDialog
+                requestFileNames:titleString 
+                default:defaultName 
+                ok:okText 
+                abort:abortText 
+                ifFail:failBlock 
+                pattern:pattern 
+                fromDirectory:aDirectoryPath 
+                whenBoxCreatedEvaluate:boxCreatedCallback 
+                asLoadDialog:asLoadDialog.
+        ].
     ].
     ^ self
         requestFileName:titleString 
@@ -3314,7 +3320,7 @@
         pattern:pattern fromDirectory:aDirectoryPath forSave:asLoadDialog not
         whenBoxCreatedEvaluate:boxCreatedCallback
 
-    "Modified: / 23-01-2012 / 11:52:17 / cg"
+    "Modified: / 23-01-2012 / 17:24:06 / cg"
 !
 
 requestNewFileName:titleString default:defaultName
@@ -9740,11 +9746,11 @@
 !DialogBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.323 2012-01-23 10:53:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.324 2012-01-23 16:24:35 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.323 2012-01-23 10:53:51 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.324 2012-01-23 16:24:35 cg Exp $'
 ! !
 
 DialogBox initialize!