start applying p13 changes

pharo-project · Dec 3, 2024 · 972f264 · 972f264
1 parent fb36d86
commit 972f264
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/...mpatibility/SystemDictionary.extension.st → ...patibility/SystemEnvironment.extension.st b/...mpatibility/SystemDictionary.extension.st → ...patibility/SystemEnvironment.extension.st
@@ -1,7 +1,7 @@
-Extension { #name : 'SystemDictionary' }
+Extension { #name : 'SystemEnvironment' }
 
 { #category : '*PharoLauncher-100Compatibility' }
-SystemDictionary >> at: aKey put: anObject [
+SystemEnvironment >> at: aKey put: anObject [
 	"Override from Dictionary to check Undeclared and fix up
 	references to undeclared variables."
 	| index assoc registeredMethods |

diff --git a/src/PharoLauncher-Spec2/PhLImagesPresenter.class.st b/src/PharoLauncher-Spec2/PhLImagesPresenter.class.st
@@ -160,10 +160,12 @@ PhLImagesPresenter >> buildImageTable [
 			evaluated: [ :image | self readableDateFor: image lastModification ])
 			sortFunction: #lastModification descending;
 			yourself);
-		actions: self rootCommandsGroup / self contextMenuCommandGroupName;
-		addShortcutWith: [ :action | action 
-			shortcutKey: Character cr asKeyCombination;
-			action: [ self actionLaunch ] ];
+		actions: (SpActionGroup new 
+			add: self rootCommandsGroup / self contextMenuCommandGroupName;
+			addShortcutWith: [ :action | action
+				shortcutKey: Character cr asKeyCombination;
+				action: [ self actionLaunch ] ];
+			yourself);
 		beResizable;
 		beMultipleSelection;
 		yourself
@@ -310,7 +312,7 @@ PhLImagesPresenter >> initializeWindow: aWindowPresenter [
 		initialExtent: self initialExtent;
 		centered;
 		whenClosedDo: [ self imageRepository unsubscribe: self ].
-	self rootCommandsGroup installShortcutsIn: aWindowPresenter.
+	"self rootCommandsGroup installShortcutsIn: aWindowPresenter."
 	aWindowPresenter 
 		addShortcutWith: [ :action | action 
 			shortcutKey: $f actionModifier;

diff --git a/src/PharoLauncher-Spec2/PharoLauncherApplication.class.st b/src/PharoLauncher-Spec2/PharoLauncherApplication.class.st
@@ -5,7 +5,7 @@ PharoLauncherApplication open
 "
 Class {
 	#name : 'PharoLauncherApplication',
-	#superclass : 'SpApplication',
+	#superclass : 'SgaApplication',
 	#instVars : [
 		'imageRepository',
 		'templateRepository',
@@ -74,7 +74,7 @@ PharoLauncherApplication class >> hardResetPersistanceState: isClickedFromSettin
 	World doOneCycle.
 	500 milliSeconds wait. "To help user perception that *something* was reset"
 
-	packages := RPackageOrganizer default packages select:[ :package | 
+	packages := PackageOrganizer default packages select:[ :package | 
 		(package name includesSubstring: 'PharoLauncher') ].
 	packages do: 
 		[ :package |