use FileRequest interaction

pharo-project · Jun 21, 2024 · d34ce71 · d34ce71
1 parent 3bd7046
commit d34ce71
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 42 deletions.
diff --git a/src/BaselineOfPharoLauncher/BaselineOfPharoLauncher.class.st b/src/BaselineOfPharoLauncher/BaselineOfPharoLauncher.class.st
@@ -17,6 +17,7 @@ BaselineOfPharoLauncher >> baseline: spec [
 		self xmlParser: spec.
 		self clap: spec.
 		self objCBridge: spec.
+		self interactions: spec.
 
 		spec
 			package: 'PharoLauncher-100Compatibility'; 
@@ -26,6 +27,7 @@ BaselineOfPharoLauncher >> baseline: spec [
 					'OSSubprocess' 
 					'OSWinSubprocess' 
 					'Ston'
+					'Interactions'
 					'ObjCBridge' 
 					'PharoLauncher-100Compatibility'). ];
 			package: 'PharoLauncher-Spec2' with: [ 
@@ -69,6 +71,14 @@ BaselineOfPharoLauncher >> clap: spec [
 		with: [ spec repository: 'github://pharo-contributions/clap-st:master/src' ]
 ]
 
+{ #category : 'external projects' }
+BaselineOfPharoLauncher >> interactions: spec [
+
+	spec 
+		baseline: #Interactions
+		with: [ spec repository: 'github://pharo-contributions/interactions' ]
+]
+
 { #category : 'external projects' }
 BaselineOfPharoLauncher >> objCBridge: spec [
 

diff --git a/src/PharoLauncher-Core/PhLImportImageCommand.class.st b/src/PharoLauncher-Core/PhLImportImageCommand.class.st
@@ -81,8 +81,8 @@ PhLImportImageCommand >> importImage [
 	| imageFile |
 	imageFile := self imagesPresenter newFileRequest
 		title: 'Import a Pharo image (will move image, changes file and pharo-local folder)';
-		extensionsToShow: #('image');
-		path: FileLocator home;
+		filter: '.image';
+		currentFolder: FileLocator home;
 		chooseFile.
 	imageFile ifNil: [ 
 		self imagesPresenter newInformation 

diff --git a/src/PharoLauncher-Core/PhLLaunchImageFromDiskCommand.class.st b/src/PharoLauncher-Core/PhLLaunchImageFromDiskCommand.class.st
@@ -30,11 +30,11 @@ PhLLaunchImageFromDiskCommand >> execute [
 	| imageFile |
 	imageFile := self imagesPresenter newFileRequest 
 		title: 'Open a Pharo image';
-		extensionsToShow: #('image');
-		path: FileLocator home;
+		filter: '.image';
+		currentFolder: FileLocator home;
 		chooseFile.
 	imageFile ifNil: [ ^ self ].
-	imageFile isFile ifFalse: [ ^self ].
+	imageFile isFile ifFalse: [ ^ self ].
 	^ self launchImage: (PhLImage location: imageFile).
 ]
 

diff --git a/src/PharoLauncher-Core/PhLUIFileRequest.class.st b/src/PharoLauncher-Core/PhLUIFileRequest.class.st
diff --git a/src/PharoLauncher-Spec2/TPhLInteractionTrait.trait.st b/src/PharoLauncher-Spec2/TPhLInteractionTrait.trait.st
@@ -16,7 +16,7 @@ TPhLInteractionTrait >> newConfirmation [
 
 { #category : 'user interaction' }
 TPhLInteractionTrait >> newFileRequest [
-	^ PhLUIFileRequest new
+	^ ITFileRequest new
 ]
 
 { #category : 'user interaction' }