--- a/FileBrowserV2SettingsAppl.st	Tue Jan 27 13:36:16 2015 +0100
+++ b/FileBrowserV2SettingsAppl.st	Tue Jan 27 13:36:32 2015 +0100
@@ -17,10 +17,11 @@
 	instanceVariableNames:'sortDirectoriesBeforeFiles showDirectoryTree sortCaseless
 		showHiddenFiles openMultipleApplicationsForType
 		toolBarVisibleHolder viewDirectoryDescription
-		openAlwaysInTextEditor viewFilesInDirectoryTree viewDescription
-		viewPreview viewTime viewSize viewSizeInBytes viewType
-		viewDetails viewPermissions viewGroup viewDirsInContentsBrowser
-		viewOwner filenameEntryFieldVisibleHolder viewSizeInKiloBytes
+		openAlwaysInTextEditor alwaysUseSmalltalkTools
+		viewFilesInDirectoryTree viewDescription viewPreview viewTime
+		viewSize viewSizeInBytes viewType viewDetails viewPermissions
+		viewGroup viewDirsInContentsBrowser viewOwner
+		filenameEntryFieldVisibleHolder viewSizeInKiloBytes
 		useCodeView2InTools showDirectoriesOnTop'
 	classVariableNames:''
 	poolDictionaries:''
@@ -63,6 +64,8 @@
 #textEditorForAllTypes
 'Show all files as text, i.e. do not open specialized viewers as per mime type'
 
+#alwaysUseSmalltalkTools
+'Always use Smalltalk tools to show/edit documents.\I.e. do not try to start a tool from the operating system on double click'
 )
 ! !
 
@@ -332,6 +335,14 @@
                                extent: (Point 435 30)
                              )
                             (CheckBoxSpec
+                               label: 'Always use Smalltalk Tools'
+                               name: 'CheckBox27'
+                               activeHelpKey: alwaysUseSmalltalkTools
+                               model: alwaysUseSmalltalkTools
+                               translateLabel: true
+                               extent: (Point 435 30)
+                             )
+                            (CheckBoxSpec
                                label: 'Open Multiple Applications'
                                name: 'CheckBox9'
                                activeHelpKey: openMultipleApplications
@@ -354,7 +365,7 @@
                       )
                     
                    )
-                   extent: (Point 627 139)
+                   extent: (Point 627 160)
                  )
                 )
               
@@ -429,6 +440,14 @@
 
 !FileBrowserV2SettingsAppl methodsFor:'aspects'!
 
+alwaysUseSmalltalkTools
+    alwaysUseSmalltalkTools isNil ifTrue:[
+        alwaysUseSmalltalkTools := true asValue.
+        alwaysUseSmalltalkTools onChangeSend:#updateModifiedChannel to:self
+    ].
+    ^ alwaysUseSmalltalkTools
+!
+
 filenameEntryFieldVisibleHolder
     filenameEntryFieldVisibleHolder isNil ifTrue:[
         filenameEntryFieldVisibleHolder := true asValue.
@@ -656,10 +675,10 @@
 !FileBrowserV2SettingsAppl class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2SettingsAppl.st,v 1.36 2015-01-27 12:17:07 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2SettingsAppl.st,v 1.37 2015-01-27 12:36:32 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2SettingsAppl.st,v 1.36 2015-01-27 12:17:07 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2SettingsAppl.st,v 1.37 2015-01-27 12:36:32 cg Exp $'
 ! !