Merge f6a413c

pharo-project · Jul 4, 2024 · 81fd0e8 · 81fd0e8
2 parents 4d36bf9 + f6a413c
commit 81fd0e8
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 56 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,10 +27,13 @@ BaselineOfPharoLauncher >> baseline: spec [
 					'OSSubprocess' 
 					'OSWinSubprocess' 
 					'Ston'
+					'Interactions'
 					'ObjCBridge' 
 					'PharoLauncher-100Compatibility'). ];
 			package: 'PharoLauncher-Spec2' with: [ 
 				spec requires: #('PharoLauncher-Core') ];
+			package: 'PharoLauncher-Spec2-Gtk' with: [ 
+				spec requires: #('PharoLauncher-Spec2') ];
 			package: 'PharoLauncher-GToolkit' with: [ 
 				spec requires: #('PharoLauncher-Core') ];
 			package: 'PharoLauncher-Squeak' with: [ 
@@ -53,7 +57,8 @@ BaselineOfPharoLauncher >> baseline: spec [
 				'PharoLauncher-Tests-Core' 
 				'PharoLauncher-Tests-Download' 
 				'PharoLauncher-Core' 
-				'PharoLauncher-Spec2' 
+				'PharoLauncher-Spec2'
+				'PharoLauncher-Spec2-Gtk' 
 				'PharoLauncher-Tests-SpecUI' 
 				'PharoLauncher-Tests-Functional'
 				'PharoLauncher-CLI-Tests' 
@@ -69,6 +74,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
@@ -83,18 +83,18 @@ 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 
+		self imagesPresenter newInformation
 			title: 'Import';
 			message: 'No path selected. Import failed.';
 			inform.
 		^ self ].
 	imageFile asFileReference isDirectory ifTrue: [ 
-		self imagesPresenter newInformation
-			title: 'Import'; 
+		self imagesPresenter newInformation 
+			title: 'Import';
 			message: 'The file selected is a directory and not a Pharo image. Import failed.';
 			inform.
 		^ self ].

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
@@ -22,10 +22,10 @@ TPhLInteractionTrait >> newConfirmation [
 { #category : 'user interaction' }
 TPhLInteractionTrait >> newFileRequest [
 
-	^ PhLUIFileRequest new
-		application: self application;
+	^ ITFileRequest new
+		"application: self application;
 		parentWindow: self window;
-		yourself	
+		yourself"
 ]
 
 { #category : 'user interaction' }

diff --git a/src/PharoLauncher-Tests-Commands/PhLTestRequest.class.st b/src/PharoLauncher-Tests-Commands/PhLTestRequest.class.st
@@ -33,7 +33,12 @@ PhLTestRequest >> chooseFrom: aCollection [
 ]
 
 { #category : 'noop' }
-PhLTestRequest >> extensionsToShow: aCollection [ 
+PhLTestRequest >> currentFolder: aFileLocator [ 
+	"noop"
+]
+
+{ #category : 'noop' }
+PhLTestRequest >> filter: aFilterString [ 
 	"noop"
 ]
 
@@ -52,11 +57,6 @@ PhLTestRequest >> parentWindow: aWindowPresenter [
 	"no need to keep the parent"
 ]
 
-{ #category : 'noop' }
-PhLTestRequest >> path: aFileLocator [ 
-	"noop"
-]
-
 { #category : 'accessing' }
 PhLTestRequest >> request [
 	^ (validationBlock value: self answer)

diff --git a/src/PharoLauncher-Tests-Functional/PhLLaunchImageTest.class.st b/src/PharoLauncher-Tests-Functional/PhLLaunchImageTest.class.st
@@ -99,7 +99,7 @@ PhLLaunchImageTest >> testCanLaunchImageWithNonAsciiCharacters [
 	| image |
 	image := self copyCurrentImageToTestDir.
 
-	image launch.
+	process := image launch.
 	2 seconds wait. "let time to the process to be launched, else test cleanup will interfer with process launch"
 
 	"ensure image determination succeeded"
@@ -143,7 +143,7 @@ PhLLaunchImageTest >> testLaunchImageSetShouldRunInitilizationScriptToFalse [
 
 	image := self copyCurrentImageToTestDir.
 
-	image launch.
+	process := image launch.
 	2 seconds wait. "let time to the process to be launched, else test cleanup will interfer with process launch"
 
 	image := PhLImage location: imageDir / FileLocator image basename. "read image metadata from disk"