diff --git a/src/BaselineOfPharoLauncher/BaselineOfPharoLauncher.class.st b/src/BaselineOfPharoLauncher/BaselineOfPharoLauncher.class.st index 7ba17a05..c4331766 100644 --- a/src/BaselineOfPharoLauncher/BaselineOfPharoLauncher.class.st +++ b/src/BaselineOfPharoLauncher/BaselineOfPharoLauncher.class.st @@ -16,6 +16,7 @@ BaselineOfPharoLauncher >> baseline: spec [ self xmlParser: spec. self clap: spec. self objCBridge: spec. + self interactions: spec. spec package: 'PharoLauncher-100Compatibility'; @@ -25,6 +26,7 @@ BaselineOfPharoLauncher >> baseline: spec [ 'OSSubprocess' 'OSWinSubprocess' 'Ston' + 'Interactions' 'ObjCBridge' 'PharoLauncher-100Compatibility'). ]; package: 'PharoLauncher-Spec2' with: [ @@ -69,6 +71,14 @@ BaselineOfPharoLauncher >> clap: spec [ ] { #category : #'external projects' } +BaselineOfPharoLauncher >> interactions: spec [ + + spec + baseline: #Interactions + with: [ spec repository: 'github://pharo-contributions/interactions' ] +] + +{ #category : 'external projects' } BaselineOfPharoLauncher >> objCBridge: spec [ spec diff --git a/src/PharoLauncher-Core/PhLImportImageCommand.class.st b/src/PharoLauncher-Core/PhLImportImageCommand.class.st index b835028b..1a18f6fc 100644 --- a/src/PharoLauncher-Core/PhLImportImageCommand.class.st +++ b/src/PharoLauncher-Core/PhLImportImageCommand.class.st @@ -79,8 +79,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 index a13e58a0..4fb2e169 100644 --- a/src/PharoLauncher-Core/PhLLaunchImageFromDiskCommand.class.st +++ b/src/PharoLauncher-Core/PhLLaunchImageFromDiskCommand.class.st @@ -28,11 +28,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 deleted file mode 100644 index de136910..00000000 --- a/src/PharoLauncher-Core/PhLUIFileRequest.class.st +++ /dev/null @@ -1,34 +0,0 @@ -Class { - #name : #PhLUIFileRequest, - #superclass : #PhLUserInteraction, - #instVars : [ - 'title', - 'extensionsToShow', - 'path' - ], - #category : #'PharoLauncher-Core-Commands' -} - -{ #category : #action } -PhLUIFileRequest >> chooseFile [ - ^ UIManager default - chooseExistingFileReference: title - extensions: extensionsToShow - path: path - preview: false. -] - -{ #category : #accessing } -PhLUIFileRequest >> extensionsToShow: anObject [ - extensionsToShow := anObject -] - -{ #category : #accessing } -PhLUIFileRequest >> path: anObject [ - path := anObject -] - -{ #category : #accessing } -PhLUIFileRequest >> title: anObject [ - title := anObject -] diff --git a/src/PharoLauncher-Spec2/TPhLInteractionTrait.trait.st b/src/PharoLauncher-Spec2/TPhLInteractionTrait.trait.st index b439a22f..f5745ebc 100644 --- a/src/PharoLauncher-Spec2/TPhLInteractionTrait.trait.st +++ b/src/PharoLauncher-Spec2/TPhLInteractionTrait.trait.st @@ -15,7 +15,7 @@ TPhLInteractionTrait >> newConfirmation [ { #category : #'user interaction' } TPhLInteractionTrait >> newFileRequest [ - ^ PhLUIFileRequest new + ^ ITFileRequest new ] { #category : #'user interaction' }