From e51bb3c64b4a56a0f7d196a18e3147daa486ccd6 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <pierre.laborde@fr.thalesgroup.com>
Date: Fri, 17 Nov 2023 12:44:27 +0100
Subject: [PATCH 01/12] Place flags for #117. Working on edition plugin.

---
 .../PyramidPluginEditOnRunningTest.class.st   | 12 ++++++++++
 src/Pyramid/BlElement.extension.st            |  2 ++
 src/Pyramid/BlSpace.extension.st              |  2 ++
 .../PyramidPluginEditOnRunning.class.st       | 24 +++++++++++++++++--
 4 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/Pyramid-Tests/PyramidPluginEditOnRunningTest.class.st b/src/Pyramid-Tests/PyramidPluginEditOnRunningTest.class.st
index 0b57bcb8..fc1d3958 100644
--- a/src/Pyramid-Tests/PyramidPluginEditOnRunningTest.class.st
+++ b/src/Pyramid-Tests/PyramidPluginEditOnRunningTest.class.st
@@ -24,6 +24,18 @@ PyramidPluginEditOnRunningTest >> tearDown [
 	super tearDown.
 ]
 
+{ #category : #tests }
+PyramidPluginEditOnRunningTest >> testCanEditBlSpace [
+
+	| space |
+	PyramidPluginEditOnRunning editOnRunning: true.
+	
+	"Create a BlSpace and check if it is configured correctly"
+	space := BlSpace new.
+	
+	self assert: space.
+]
+
 { #category : #tests }
 PyramidPluginEditOnRunningTest >> testEditOnRunning [
 
diff --git a/src/Pyramid/BlElement.extension.st b/src/Pyramid/BlElement.extension.st
index 7b83e087..6abe50fc 100644
--- a/src/Pyramid/BlElement.extension.st
+++ b/src/Pyramid/BlElement.extension.st
@@ -5,6 +5,8 @@ BlElement >> editWithPyramid [
 
 	| editor  oldParent |
 	editor := PyramidPluginManager uniqueInstance makeEditor.
+	
+	self flag:'labordep: the code below is too complicated, we need to have a more simple API to edit a BlElement, for example editElement:'.
 	oldParent := self parent.
 	self hasParent ifTrue: [ oldParent removeChild: self ].
 
diff --git a/src/Pyramid/BlSpace.extension.st b/src/Pyramid/BlSpace.extension.st
index 7987a743..bae04baf 100644
--- a/src/Pyramid/BlSpace.extension.st
+++ b/src/Pyramid/BlSpace.extension.st
@@ -12,6 +12,8 @@ BlSpace >> editWithPyramid [
 	editor := PyramidPluginManager uniqueInstance makeEditor.
 	editor window open.
 
+	self flag:'labordep: the code below is too complicated, we need to have a more simple API to edit a BlSpace, for example editSpace:'.
+
 	"Remove all blElement of the application root to be replaced by the image"
 	elements := self root children asArray copy.
 	self root removeChildren.
diff --git a/src/Pyramid/PyramidPluginEditOnRunning.class.st b/src/Pyramid/PyramidPluginEditOnRunning.class.st
index 1876e000..a29f2d24 100644
--- a/src/Pyramid/PyramidPluginEditOnRunning.class.st
+++ b/src/Pyramid/PyramidPluginEditOnRunning.class.st
@@ -34,17 +34,37 @@ PyramidPluginEditOnRunning class >> install [
 { #category : #'universe management' }
 PyramidPluginEditOnRunning class >> installBlUniverseListeners [
 	
-	BlParallelUniverse all do:[ :universe |
+	Beacon instance
+		when: BlParallelUniverseHostSpaceCreatedSignal
+		send: #receiveBlParallelUniverseHostSpaceCreatedSignal:
+		to: self.
+	
+	"BlParallelUniverse all do:[ :universe |
 		universe 
 			when: BlParallelUniverseHostSpaceCreatedSignal 
 			do:[ :e | self receiveBlParallelUniverseHostSpaceCreatedSignal: e ].
-	].
+	]."
 ]
 
 { #category : #'universe management' }
 PyramidPluginEditOnRunning class >> receiveBlParallelUniverseHostSpaceCreatedSignal: anEvent [
 
 	self editOnRunning ifFalse: [ ^ self ].
+	
+	"add a sequence to install shortcut"
+]
+
+{ #category : #initialization }
+PyramidPluginEditOnRunning class >> uninstall [
+	"Undo some stuff here when the plugin used class oriented behavior"
+	
+	self uninstallBlUniverseListeners.
+]
+
+{ #category : #'universe management' }
+PyramidPluginEditOnRunning class >> uninstallBlUniverseListeners [
+
+	Beacon instance unsubscribe: self
 ]
 
 { #category : #adding }

From 84ce56d31eca7190306de27bc72f2198b1cdeab4 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <pierre.laborde@fr.thalesgroup.com>
Date: Fri, 17 Nov 2023 14:21:57 +0100
Subject: [PATCH 02/12] Working on edition plugin with shortcuts. Refactor
 editor building and opening. Tests.

---
 .../PyramidContextMenuPlugin.class.st         |  4 +-
 src/Pyramid-Bloc/PyramidSavePlugin.class.st   |  2 +-
 src/Pyramid-IDE/PyramidWorld.class.st         |  2 +-
 src/Pyramid-Tests/PyramidEditorTest.class.st  |  2 +-
 .../PyramidPluginEditOnRunningTest.class.st   | 64 +++++++++++++-
 src/Pyramid/BlElement.extension.st            |  3 +-
 src/Pyramid/BlSpace.extension.st              |  2 +-
 src/Pyramid/PyramidEditor.class.st            | 13 +++
 src/Pyramid/PyramidEditorBuilder.class.st     | 10 ---
 .../PyramidPluginEditOnRunning.class.st       | 85 +++++++++++++++----
 src/Pyramid/PyramidPluginManager.class.st     |  8 ++
 11 files changed, 160 insertions(+), 35 deletions(-)

diff --git a/src/Pyramid-Bloc/PyramidContextMenuPlugin.class.st b/src/Pyramid-Bloc/PyramidContextMenuPlugin.class.st
index e259496a..4d8955d3 100644
--- a/src/Pyramid-Bloc/PyramidContextMenuPlugin.class.st
+++ b/src/Pyramid-Bloc/PyramidContextMenuPlugin.class.st
@@ -12,8 +12,10 @@ Class {
 { #category : #'class initialization' }
 PyramidContextMenuPlugin class >> initialize [
 
-	self flag:'labordep: Why remove before add ?'.
+	"Remove the plugin in case of already install (reset)"
 	PyramidPluginManager uniqueInstance removePlugin: self.
+	
+	"Add the plugin"
 	PyramidPluginManager uniqueInstance addPlugin: self
 ]
 
diff --git a/src/Pyramid-Bloc/PyramidSavePlugin.class.st b/src/Pyramid-Bloc/PyramidSavePlugin.class.st
index 7c7ee66f..7c1307a1 100644
--- a/src/Pyramid-Bloc/PyramidSavePlugin.class.st
+++ b/src/Pyramid-Bloc/PyramidSavePlugin.class.st
@@ -19,7 +19,7 @@ Class {
 PyramidSavePlugin class >> openOn: aCollectionOfBlElement saveModel: aSaveModel [
 
 	| editor savePlugin |
-	editor := PyramidEditorBuilder makeEditor.
+	editor := PyramidEditor buildEditor.
 	savePlugin := editor plugins select: [ :each | each class = self ].
 	savePlugin size = 1 ifFalse: [
 		Error signal:
diff --git a/src/Pyramid-IDE/PyramidWorld.class.st b/src/Pyramid-IDE/PyramidWorld.class.st
index ca8cc1b3..194da388 100644
--- a/src/Pyramid-IDE/PyramidWorld.class.st
+++ b/src/Pyramid-IDE/PyramidWorld.class.st
@@ -161,7 +161,7 @@ PyramidWorld class >> startBrowseSources [
 { #category : #actions }
 PyramidWorld class >> startNewDesign [
 
-	PyramidPluginManager uniqueInstance makeEditor window open	
+	PyramidEditor open
 ]
 
 { #category : #actions }
diff --git a/src/Pyramid-Tests/PyramidEditorTest.class.st b/src/Pyramid-Tests/PyramidEditorTest.class.st
index 30d6ced1..4403ae5a 100644
--- a/src/Pyramid-Tests/PyramidEditorTest.class.st
+++ b/src/Pyramid-Tests/PyramidEditorTest.class.st
@@ -34,7 +34,7 @@ PyramidEditorTest >> openFromBlSpace [
 PyramidEditorTest >> openNewEditor [
 
 	| editor spec |
-	editor := PyramidPluginManager uniqueInstance makeEditor.
+	editor := PyramidEditor buildEditor.
 	spec := editor window open.
 	(Duration milliSeconds: 10) wait.
 	self currentWorld doOneCycle.
diff --git a/src/Pyramid-Tests/PyramidPluginEditOnRunningTest.class.st b/src/Pyramid-Tests/PyramidPluginEditOnRunningTest.class.st
index fc1d3958..c79e5636 100644
--- a/src/Pyramid-Tests/PyramidPluginEditOnRunningTest.class.st
+++ b/src/Pyramid-Tests/PyramidPluginEditOnRunningTest.class.st
@@ -10,11 +10,24 @@ Class {
 	#category : #'Pyramid-Tests-cases-plugin-edit-on-running'
 }
 
+{ #category : #utils }
+PyramidPluginEditOnRunningTest >> closeSpace: aSpace [
+
+	aSpace when: BlSpaceShownEvent doOnce: [ :event |
+		BlSpace pulseUntilEmptyTaskQueue: aSpace timeout: 200 milliSeconds.
+		aSpace close ].
+]
+
 { #category : #tests }
 PyramidPluginEditOnRunningTest >> setUp [ 
 
 	super setUp.
+	
+	"Preserve user settings"
 	setting := PyramidPluginEditOnRunning editOnRunning.
+	
+	PyramidPluginEditOnRunning uninstall.
+	PyramidPluginEditOnRunning install.
 ]
 
 { #category : #tests }
@@ -25,15 +38,20 @@ PyramidPluginEditOnRunningTest >> tearDown [
 ]
 
 { #category : #tests }
-PyramidPluginEditOnRunningTest >> testCanEditBlSpace [
-
+PyramidPluginEditOnRunningTest >> testBlSpaceShortcutAddAndRemove [
 	| space |
+
 	PyramidPluginEditOnRunning editOnRunning: true.
 	
-	"Create a BlSpace and check if it is configured correctly"
 	space := BlSpace new.
+	self deny: (PyramidPluginEditOnRunning spaceIds includes: space id).
+	self deny: (space root shortcuts includes: (PyramidPluginEditOnRunning shortcut)).
+	
+	space show.	
+	self assert: (PyramidPluginEditOnRunning spaceIds includes: space id).
+	self assert: (space root shortcuts includes: (PyramidPluginEditOnRunning shortcut)).
 	
-	self assert: space.
+	self closeSpace: space.
 ]
 
 { #category : #tests }
@@ -45,3 +63,41 @@ PyramidPluginEditOnRunningTest >> testEditOnRunning [
 	PyramidPluginEditOnRunning editOnRunning: false.
 	self deny: PyramidPluginEditOnRunning editOnRunning.
 ]
+
+{ #category : #tests }
+PyramidPluginEditOnRunningTest >> testKeyCombination [
+
+	self assert: (PyramidPluginEditOnRunning keyCombination isKindOf: BlKeyCombination) 
+
+]
+
+{ #category : #tests }
+PyramidPluginEditOnRunningTest >> testNotEditEditor [
+	| space |
+
+	PyramidPluginEditOnRunning editOnRunning: true.
+	
+	space := PyramidEditor new.
+	self deny: (PyramidPluginEditOnRunning spaceIds includes: space id).
+	self deny: (space root shortcuts includes: (PyramidPluginEditOnRunning shortcut)).
+	
+	space show.	
+	self assert: (PyramidPluginEditOnRunning spaceIds includes: space id).
+	self assert: (space root shortcuts includes: (PyramidPluginEditOnRunning shortcut)).
+	
+	self closeSpace: space.
+]
+
+{ #category : #tests }
+PyramidPluginEditOnRunningTest >> testShortcut [
+
+	self assert: (PyramidPluginEditOnRunning shortcut isKindOf: BlShortcutWithAction).
+
+]
+
+{ #category : #tests }
+PyramidPluginEditOnRunningTest >> testSpaceIds [
+
+	self assert: PyramidPluginEditOnRunning spaceIds isEmpty.
+
+]
diff --git a/src/Pyramid/BlElement.extension.st b/src/Pyramid/BlElement.extension.st
index 6abe50fc..9db70f8c 100644
--- a/src/Pyramid/BlElement.extension.st
+++ b/src/Pyramid/BlElement.extension.st
@@ -4,7 +4,7 @@ Extension { #name : #BlElement }
 BlElement >> editWithPyramid [
 
 	| editor  oldParent |
-	editor := PyramidPluginManager uniqueInstance makeEditor.
+	editor := PyramidEditor buildEditor.
 	
 	self flag:'labordep: the code below is too complicated, we need to have a more simple API to edit a BlElement, for example editElement:'.
 	oldParent := self parent.
@@ -21,6 +21,7 @@ BlElement >> editWithPyramid [
 BlElement >> openInNewSpaceWithPyramidShortcut [
 
 	| space isEdit |
+	self deprecated:'use the edition capacity in pyramid properties'.
 	space := self openInNewSpace.
 	isEdit := false.
 	space when: BlKeyDownEvent do: [ :evt |
diff --git a/src/Pyramid/BlSpace.extension.st b/src/Pyramid/BlSpace.extension.st
index bae04baf..ee0cd949 100644
--- a/src/Pyramid/BlSpace.extension.st
+++ b/src/Pyramid/BlSpace.extension.st
@@ -9,7 +9,7 @@ BlSpace >> editWithPyramid [
 	spacePlaceholder addChildren: PyramidLogo logoOpenInPyramid materializeAsBlElement.
 	
 	"Open editor"
-	editor := PyramidPluginManager uniqueInstance makeEditor.
+	editor := PyramidEditor buildEditor.
 	editor window open.
 
 	self flag:'labordep: the code below is too complicated, we need to have a more simple API to edit a BlSpace, for example editSpace:'.
diff --git a/src/Pyramid/PyramidEditor.class.st b/src/Pyramid/PyramidEditor.class.st
index 56a2c0f4..0c7cc60b 100644
--- a/src/Pyramid/PyramidEditor.class.st
+++ b/src/Pyramid/PyramidEditor.class.st
@@ -10,6 +10,19 @@ Class {
 	#category : #'Pyramid-core'
 }
 
+{ #category : #private }
+PyramidEditor class >> buildEditor [
+
+	^ PyramidPluginManager uniqueInstance buildEditor
+]
+
+{ #category : #'instance creation' }
+PyramidEditor class >> open [
+	<script>
+
+	self buildEditor window open	
+]
+
 { #category : #initialization }
 PyramidEditor >> initialize [
 
diff --git a/src/Pyramid/PyramidEditorBuilder.class.st b/src/Pyramid/PyramidEditorBuilder.class.st
index 201e7ad3..f7eeb591 100644
--- a/src/Pyramid/PyramidEditorBuilder.class.st
+++ b/src/Pyramid/PyramidEditorBuilder.class.st
@@ -9,16 +9,6 @@ Class {
 	#category : #'Pyramid-core'
 }
 
-{ #category : #'as yet unclassified' }
-PyramidEditorBuilder class >> makeEditor [
-
-	^ self new
-		  plugins:
-			  (PyramidPluginManager uniqueInstance pluginClasses collect: [ :class |
-					   class new ]);
-		  build
-]
-
 { #category : #building }
 PyramidEditorBuilder >> build [
 
diff --git a/src/Pyramid/PyramidPluginEditOnRunning.class.st b/src/Pyramid/PyramidPluginEditOnRunning.class.st
index a29f2d24..b52a85a3 100644
--- a/src/Pyramid/PyramidPluginEditOnRunning.class.st
+++ b/src/Pyramid/PyramidPluginEditOnRunning.class.st
@@ -7,11 +7,37 @@ Class {
 		'editOnRunning'
 	],
 	#classInstVars : [
-		'editOnRunning'
+		'editOnRunning',
+		'spaceIds',
+		'shortcut',
+		'keyCombination'
 	],
 	#category : #'Pyramid-plugin-edit-on-running'
 }
 
+{ #category : #private }
+PyramidPluginEditOnRunning class >> addShortcutInSpace: aSpace [
+
+	aSpace ifNil: [ ^ self ].
+	(self spaceIds includes: aSpace id) ifTrue:[ ^ self ].
+	
+	self spaceIds add: aSpace id.
+	aSpace root addShortcut: shortcut 
+]
+
+{ #category : #private }
+PyramidPluginEditOnRunning class >> doShortcutAction: anEvent [
+
+	| space editor whenClosedDo |
+	self editOnRunning ifFalse:[ ^ self ].
+	space := anEvent source space.
+	space ifNil:[ ^ self ].
+	
+	editor := space editWithPyramid.
+	whenClosedDo := editor window whenClosedDo.
+	editor window whenClosedDo: [ whenClosedDo value ].
+]
+
 { #category : #accessing }
 PyramidPluginEditOnRunning class >> editOnRunning [
 
@@ -29,29 +55,53 @@ PyramidPluginEditOnRunning class >> install [
 	"Do some stuff here when the plugin used class oriented behavior"
 	
 	self installBlUniverseListeners.
+	
 ]
 
 { #category : #'universe management' }
 PyramidPluginEditOnRunning class >> installBlUniverseListeners [
-	
+
 	Beacon instance
-		when: BlParallelUniverseHostSpaceCreatedSignal
-		send: #receiveBlParallelUniverseHostSpaceCreatedSignal:
-		to: self.
-	
-	"BlParallelUniverse all do:[ :universe |
-		universe 
-			when: BlParallelUniverseHostSpaceCreatedSignal 
-			do:[ :e | self receiveBlParallelUniverseHostSpaceCreatedSignal: e ].
-	]."
+		when: BlParallelUniverseHostStartRequestSignal
+		send: #receiveBlParallelUniverseHostSpaceRequestSignal:
+		to: self
+]
+
+{ #category : #accessing }
+PyramidPluginEditOnRunning class >> keyCombination [
+
+	^ keyCombination ifNil: [
+		  keyCombination := (BlKeyCombination builder key: KeyboardKey F12) build ]
 ]
 
 { #category : #'universe management' }
-PyramidPluginEditOnRunning class >> receiveBlParallelUniverseHostSpaceCreatedSignal: anEvent [
+PyramidPluginEditOnRunning class >> receiveBlParallelUniverseHostSpaceRequestSignal: anEvent [
 
-	self editOnRunning ifFalse: [ ^ self ].
-	
-	"add a sequence to install shortcut"
+	BlSpace spaceWithId: anEvent spaceId do: [ :e | self addShortcutInSpace: e ]
+]
+
+{ #category : #private }
+PyramidPluginEditOnRunning class >> removeShortcutInSpace: aSpace [
+
+	aSpace ifNil: [ ^ self ].
+
+	aSpace root removeShortcut: shortcut.
+	self spaceIds remove: aSpace id.
+]
+
+{ #category : #accessing }
+PyramidPluginEditOnRunning class >> shortcut [
+
+	^ shortcut ifNil: [
+		  shortcut := BlShortcutWithAction new
+			              combination: self keyCombination;
+			              action: [ :event | self doShortcutAction: event ] ]
+]
+
+{ #category : #accessing }
+PyramidPluginEditOnRunning class >> spaceIds [
+
+	^ spaceIds ifNil: [ spaceIds := Set new ]
 ]
 
 { #category : #initialization }
@@ -59,6 +109,11 @@ PyramidPluginEditOnRunning class >> uninstall [
 	"Undo some stuff here when the plugin used class oriented behavior"
 	
 	self uninstallBlUniverseListeners.
+	
+	self spaceIds do:[ :id | BlSpace spaceWithId: id do: [ :e | self removeShortcutInSpace: e ] ].
+	self spaceIds removeAll.
+	
+	shortcut := nil.
 ]
 
 { #category : #'universe management' }
diff --git a/src/Pyramid/PyramidPluginManager.class.st b/src/Pyramid/PyramidPluginManager.class.st
index dbfcd26f..a75cf391 100644
--- a/src/Pyramid/PyramidPluginManager.class.st
+++ b/src/Pyramid/PyramidPluginManager.class.st
@@ -47,6 +47,14 @@ PyramidPluginManager >> addPlugin: aPluginClass [
 	aPluginClass install.
 ]
 
+{ #category : #private }
+PyramidPluginManager >> buildEditor [
+
+	^ PyramidEditorBuilder new
+		  plugins: (self pluginClasses collect: [ :class | class new ]);
+		  build
+]
+
 { #category : #initialization }
 PyramidPluginManager >> initialize [
 

From 22d9d6c76b73caa900f51a81cd39fb4e9defda03 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <pierre.laborde@fr.thalesgroup.com>
Date: Fri, 17 Nov 2023 14:51:57 +0100
Subject: [PATCH 03/12] Fix cycling edition, refactoring open/close editor,
 plugin access from plugin class

---
 src/Pyramid-Bloc/PyramidSavePlugin.class.st   |  2 +-
 src/Pyramid-Bloc/PyramidSpaceBuilder.class.st |  1 +
 src/Pyramid-Tests/PyramidEditorTest.class.st  |  8 +++--
 .../PyramidPluginEditOnRunningTest.class.st   | 32 +++++++++----------
 src/Pyramid/PyramidEditor.class.st            | 28 ++++++++++++++--
 .../PyramidPluginEditOnRunning.class.st       |  3 ++
 src/Pyramid/PyramidWindow.class.st            |  6 ++++
 7 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/src/Pyramid-Bloc/PyramidSavePlugin.class.st b/src/Pyramid-Bloc/PyramidSavePlugin.class.st
index 7c1307a1..0516fdea 100644
--- a/src/Pyramid-Bloc/PyramidSavePlugin.class.st
+++ b/src/Pyramid-Bloc/PyramidSavePlugin.class.st
@@ -27,7 +27,7 @@ PyramidSavePlugin class >> openOn: aCollectionOfBlElement saveModel: aSaveModel
 	savePlugin := savePlugin asArray first.
 	editor projectModel roots addAll: aCollectionOfBlElement.
 	savePlugin openOn: aSaveModel.
-	editor window open
+	editor open
 ]
 
 { #category : #adding }
diff --git a/src/Pyramid-Bloc/PyramidSpaceBuilder.class.st b/src/Pyramid-Bloc/PyramidSpaceBuilder.class.st
index 271dbe6f..47d173dc 100644
--- a/src/Pyramid-Bloc/PyramidSpaceBuilder.class.st
+++ b/src/Pyramid-Bloc/PyramidSpaceBuilder.class.st
@@ -89,6 +89,7 @@ PyramidSpaceBuilder >> addOverlayNamed: aString [
 PyramidSpaceBuilder >> build [
 
 	self space: BlSpace new.
+	self space userData at: #isPyramidEditor put: true.
 
 	self overlays ifEmpty: [ ^ self space ].
 
diff --git a/src/Pyramid-Tests/PyramidEditorTest.class.st b/src/Pyramid-Tests/PyramidEditorTest.class.st
index 4403ae5a..e21904e9 100644
--- a/src/Pyramid-Tests/PyramidEditorTest.class.st
+++ b/src/Pyramid-Tests/PyramidEditorTest.class.st
@@ -22,7 +22,7 @@ PyramidEditorTest >> openFromBlSpace [
 	self assert: (editor projectModel roots includes: element).
 	self deny: (space root children includes: element).
 
-	editor window close.
+	editor close.
 	(Duration milliSeconds: 10) wait.
 
 	self assert: editor window isClosed.
@@ -35,13 +35,15 @@ PyramidEditorTest >> openNewEditor [
 
 	| editor spec |
 	editor := PyramidEditor buildEditor.
-	spec := editor window open.
+	editor open.
+	
+	spec := editor window spec.
 	(Duration milliSeconds: 10) wait.
 	self currentWorld doOneCycle.
 	self assert: editor window isOpen.
 	self assert: spec window isInWorld.
 
-	editor window close.
+	editor close.
 	(Duration milliSeconds: 10) wait.
 	self currentWorld doOneCycle.
 	self assert: editor window isClosed.
diff --git a/src/Pyramid-Tests/PyramidPluginEditOnRunningTest.class.st b/src/Pyramid-Tests/PyramidPluginEditOnRunningTest.class.st
index c79e5636..bff39076 100644
--- a/src/Pyramid-Tests/PyramidPluginEditOnRunningTest.class.st
+++ b/src/Pyramid-Tests/PyramidPluginEditOnRunningTest.class.st
@@ -54,6 +54,21 @@ PyramidPluginEditOnRunningTest >> testBlSpaceShortcutAddAndRemove [
 	self closeSpace: space.
 ]
 
+{ #category : #tests }
+PyramidPluginEditOnRunningTest >> testCannotEditTheEditor [
+	| space editor |
+
+	PyramidPluginEditOnRunning editOnRunning: true.
+
+	editor := PyramidEditor buildEditor.
+	"get the space of the editor"
+	space := (editor getPlugin: PyramidSpacePlugin) builder space.
+	
+	"check than the shortcut is not installed" 
+	self deny: (PyramidPluginEditOnRunning spaceIds includes: space id).
+	self deny: (space root shortcuts includes: (PyramidPluginEditOnRunning shortcut)).
+]
+
 { #category : #tests }
 PyramidPluginEditOnRunningTest >> testEditOnRunning [
 
@@ -71,23 +86,6 @@ PyramidPluginEditOnRunningTest >> testKeyCombination [
 
 ]
 
-{ #category : #tests }
-PyramidPluginEditOnRunningTest >> testNotEditEditor [
-	| space |
-
-	PyramidPluginEditOnRunning editOnRunning: true.
-	
-	space := PyramidEditor new.
-	self deny: (PyramidPluginEditOnRunning spaceIds includes: space id).
-	self deny: (space root shortcuts includes: (PyramidPluginEditOnRunning shortcut)).
-	
-	space show.	
-	self assert: (PyramidPluginEditOnRunning spaceIds includes: space id).
-	self assert: (space root shortcuts includes: (PyramidPluginEditOnRunning shortcut)).
-	
-	self closeSpace: space.
-]
-
 { #category : #tests }
 PyramidPluginEditOnRunningTest >> testShortcut [
 
diff --git a/src/Pyramid/PyramidEditor.class.st b/src/Pyramid/PyramidEditor.class.st
index 0c7cc60b..5c749c6b 100644
--- a/src/Pyramid/PyramidEditor.class.st
+++ b/src/Pyramid/PyramidEditor.class.st
@@ -20,7 +20,21 @@ PyramidEditor class >> buildEditor [
 PyramidEditor class >> open [
 	<script>
 
-	self buildEditor window open	
+	self buildEditor open
+]
+
+{ #category : #'open/close' }
+PyramidEditor >> close [
+
+	self window ifNil: [ ^ self ].
+	self window isClosed ifTrue:[ ^ self ].
+	self window close
+]
+
+{ #category : #plugins }
+PyramidEditor >> getPlugin: aPluginClass [
+
+	^ self plugins detect:[ :p | p class = aPluginClass ] ifNone:[ ]
 ]
 
 { #category : #initialization }
@@ -33,13 +47,21 @@ PyramidEditor >> initialize [
 	plugins := {  }
 ]
 
-{ #category : #accessing }
+{ #category : #'open/close' }
+PyramidEditor >> open [
+
+	self window ifNil: [ ^ self ].
+	self window isOpen ifTrue:[ ^ self ].
+	self window open
+]
+
+{ #category : #plugins }
 PyramidEditor >> plugins [
 
 	^ plugins
 ]
 
-{ #category : #accessing }
+{ #category : #plugins }
 PyramidEditor >> plugins: aCollection [
 
 	plugins := aCollection
diff --git a/src/Pyramid/PyramidPluginEditOnRunning.class.st b/src/Pyramid/PyramidPluginEditOnRunning.class.st
index b52a85a3..836f54f7 100644
--- a/src/Pyramid/PyramidPluginEditOnRunning.class.st
+++ b/src/Pyramid/PyramidPluginEditOnRunning.class.st
@@ -21,6 +21,9 @@ PyramidPluginEditOnRunning class >> addShortcutInSpace: aSpace [
 	aSpace ifNil: [ ^ self ].
 	(self spaceIds includes: aSpace id) ifTrue:[ ^ self ].
 	
+	"Not edit the editor space to prevent cycling"
+	aSpace userData at: #isPyramidEditor ifPresent:[ ^ self ].
+	
 	self spaceIds add: aSpace id.
 	aSpace root addShortcut: shortcut 
 ]
diff --git a/src/Pyramid/PyramidWindow.class.st b/src/Pyramid/PyramidWindow.class.st
index 6ebc5781..de13f9a8 100644
--- a/src/Pyramid/PyramidWindow.class.st
+++ b/src/Pyramid/PyramidWindow.class.st
@@ -118,6 +118,12 @@ PyramidWindow >> services [
 	^ services
 ]
 
+{ #category : #accessing }
+PyramidWindow >> spec [
+
+	^ spec
+]
+
 { #category : #'api - showing' }
 PyramidWindow >> title [
 

From c0e764d18973d8f7eb8650ee7fbb91caa49dacd2 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Fri, 17 Nov 2023 15:03:07 +0100
Subject: [PATCH 04/12] remove deprecated message

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8baa9869..79a5bd75 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ element editWithPyramid.
 space editWithPyramid.
 ```
 
-You can edit in Pyramid an opened BlSpace with `F12` keyboard shortcut, for that open a BlElement with `openInNewSpaceWithPyramidShortcut`.
+You can edit in Pyramid all opened BlSpace with `F12` keyboard shortcut, this feature can be disable in the settings.
 
 ## Plugins
 

From 674a68ce656fafae84046944adafd05542f952a2 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <pierre.laborde@fr.thalesgroup.com>
Date: Fri, 17 Nov 2023 15:15:57 +0100
Subject: [PATCH 05/12] Fix cycling edition, remove deprecated method, fix
 shortcut instanciation

---
 src/Pyramid-Bloc/PyramidSpaceBuilder.class.st |  2 +-
 .../PyramidVisualPystonForCly.class.st        | 13 ++++++-----
 src/Pyramid/BlElement.extension.st            | 21 -----------------
 src/Pyramid/BlSpace.extension.st              |  5 +++-
 .../PyramidPluginEditOnRunning.class.st       | 23 +++++++++++++------
 5 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/src/Pyramid-Bloc/PyramidSpaceBuilder.class.st b/src/Pyramid-Bloc/PyramidSpaceBuilder.class.st
index 47d173dc..edfb5595 100644
--- a/src/Pyramid-Bloc/PyramidSpaceBuilder.class.st
+++ b/src/Pyramid-Bloc/PyramidSpaceBuilder.class.st
@@ -89,7 +89,7 @@ PyramidSpaceBuilder >> addOverlayNamed: aString [
 PyramidSpaceBuilder >> build [
 
 	self space: BlSpace new.
-	self space userData at: #isPyramidEditor put: true.
+	self space userData at: #pyramid_isEditor put: true.
 
 	self overlays ifEmpty: [ ^ self space ].
 
diff --git a/src/Pyramid-Bloc/PyramidVisualPystonForCly.class.st b/src/Pyramid-Bloc/PyramidVisualPystonForCly.class.st
index 633247a9..f5b4eb74 100644
--- a/src/Pyramid-Bloc/PyramidVisualPystonForCly.class.st
+++ b/src/Pyramid-Bloc/PyramidVisualPystonForCly.class.st
@@ -99,8 +99,10 @@ PyramidVisualPystonForCly >> build [
 { #category : #'as yet unclassified' }
 PyramidVisualPystonForCly >> buttonEditor [
 
-	^ self buttonLabel: 'Edit' help: 'Open the design in Pyramid' action: [ self openEditor ].
-	
+	^ self
+		  buttonLabel: 'Edit'
+		  help: 'Edit this design in Pyramid'
+		  action: [ self openEditor ]
 ]
 
 { #category : #'as yet unclassified' }
@@ -123,10 +125,9 @@ PyramidVisualPystonForCly >> buttonLabel: aLabel help: aString action: aBlock [
 PyramidVisualPystonForCly >> buttonOpen [
 
 	^ self
-		  buttonLabel: 'Open in new Space'
-		  help: 'Open this design in a new BlSpace'
+		  buttonLabel: 'Open'
+		  help: 'Open this design in a window'
 		  action: [ self openInNewSpace ]
-
 ]
 
 { #category : #initialization }
@@ -200,7 +201,7 @@ PyramidVisualPystonForCly >> openInNewSpace [
 	elements isCollection ifFalse: [ elements := { elements } ].
 
 	elements ifEmpty: [ ^ self ].
-	space := elements first openInNewSpaceWithPyramidShortcut.
+	space := elements first openInNewSpace.
 	space root addChildren: elements allButFirst
 ]
 
diff --git a/src/Pyramid/BlElement.extension.st b/src/Pyramid/BlElement.extension.st
index 9db70f8c..43d311ed 100644
--- a/src/Pyramid/BlElement.extension.st
+++ b/src/Pyramid/BlElement.extension.st
@@ -16,24 +16,3 @@ BlElement >> editWithPyramid [
 	editor window open.
 	^ editor
 ]
-
-{ #category : #'*Pyramid' }
-BlElement >> openInNewSpaceWithPyramidShortcut [
-
-	| space isEdit |
-	self deprecated:'use the edition capacity in pyramid properties'.
-	space := self openInNewSpace.
-	isEdit := false.
-	space when: BlKeyDownEvent do: [ :evt |
-		| editor whenClosedDo |
-		isEdit ifFalse: [
-			evt key = KeyboardKey F12 ifTrue: [
-				isEdit := true.
-				editor := space editWithPyramid.
-				whenClosedDo := editor window whenClosedDo.
-				editor window whenClosedDo: [
-					whenClosedDo value.
-					isEdit := false ] ] ] ].
-
-	^ space
-]
diff --git a/src/Pyramid/BlSpace.extension.st b/src/Pyramid/BlSpace.extension.st
index ee0cd949..232dea53 100644
--- a/src/Pyramid/BlSpace.extension.st
+++ b/src/Pyramid/BlSpace.extension.st
@@ -14,6 +14,8 @@ BlSpace >> editWithPyramid [
 
 	self flag:'labordep: the code below is too complicated, we need to have a more simple API to edit a BlSpace, for example editSpace:'.
 
+	self userData at: #pyramid_isOnEdition put: true.
+
 	"Remove all blElement of the application root to be replaced by the image"
 	elements := self root children asArray copy.
 	self root removeChildren.
@@ -28,7 +30,8 @@ BlSpace >> editWithPyramid [
 			each hasParent ifTrue: [ each parent removeChild: each ] ].
 		editor projectModel roots removeAll.
 		self root removeChildren.
-		self root addChildren: pyramidRoots ].
+		self root addChildren: pyramidRoots.
+		self userData removeKey: #pyramid_isOnEdition. ].
 	
 	^ editor
 ]
diff --git a/src/Pyramid/PyramidPluginEditOnRunning.class.st b/src/Pyramid/PyramidPluginEditOnRunning.class.st
index 836f54f7..526dd881 100644
--- a/src/Pyramid/PyramidPluginEditOnRunning.class.st
+++ b/src/Pyramid/PyramidPluginEditOnRunning.class.st
@@ -18,14 +18,23 @@ Class {
 { #category : #private }
 PyramidPluginEditOnRunning class >> addShortcutInSpace: aSpace [
 
-	aSpace ifNil: [ ^ self ].
+	(self canEditSpace: aSpace) ifFalse:[ ^ self ].
 	(self spaceIds includes: aSpace id) ifTrue:[ ^ self ].
 	
-	"Not edit the editor space to prevent cycling"
-	aSpace userData at: #isPyramidEditor ifPresent:[ ^ self ].
-	
 	self spaceIds add: aSpace id.
-	aSpace root addShortcut: shortcut 
+	aSpace root addShortcut: self shortcut 
+]
+
+{ #category : #testing }
+PyramidPluginEditOnRunning class >> canEditSpace: aSpace [
+
+	aSpace ifNil:[ ^ false ].
+
+	"Not edit the editor space or already edited to prevent cycling"
+	aSpace userData at: #pyramid_isEditor ifPresent:[ ^ false ].
+	aSpace userData at: #pyramid_isOnEdition ifPresent:[ ^ false ].
+	
+	^ true
 ]
 
 { #category : #private }
@@ -34,7 +43,7 @@ PyramidPluginEditOnRunning class >> doShortcutAction: anEvent [
 	| space editor whenClosedDo |
 	self editOnRunning ifFalse:[ ^ self ].
 	space := anEvent source space.
-	space ifNil:[ ^ self ].
+	(self canEditSpace: space) ifFalse:[ ^ self ].
 	
 	editor := space editWithPyramid.
 	whenClosedDo := editor window whenClosedDo.
@@ -88,7 +97,7 @@ PyramidPluginEditOnRunning class >> removeShortcutInSpace: aSpace [
 
 	aSpace ifNil: [ ^ self ].
 
-	aSpace root removeShortcut: shortcut.
+	aSpace root removeShortcut: self shortcut.
 	self spaceIds remove: aSpace id.
 ]
 

From 2fcc701a5cd12a9c3391738e37bf88de818bd1a4 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <pierre.laborde@fr.thalesgroup.com>
Date: Fri, 17 Nov 2023 15:23:08 +0100
Subject: [PATCH 06/12] Shortcut name, best space event management

---
 src/Pyramid/PyramidPluginEditOnRunning.class.st | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Pyramid/PyramidPluginEditOnRunning.class.st b/src/Pyramid/PyramidPluginEditOnRunning.class.st
index 526dd881..164e3e42 100644
--- a/src/Pyramid/PyramidPluginEditOnRunning.class.st
+++ b/src/Pyramid/PyramidPluginEditOnRunning.class.st
@@ -74,8 +74,8 @@ PyramidPluginEditOnRunning class >> install [
 PyramidPluginEditOnRunning class >> installBlUniverseListeners [
 
 	Beacon instance
-		when: BlParallelUniverseHostStartRequestSignal
-		send: #receiveBlParallelUniverseHostSpaceRequestSignal:
+		when: BlParallelUniverseOpenSpaceRequestSignal
+		send: #receiveBlParallelUniverseHostSpaceSignal:
 		to: self
 ]
 
@@ -87,7 +87,7 @@ PyramidPluginEditOnRunning class >> keyCombination [
 ]
 
 { #category : #'universe management' }
-PyramidPluginEditOnRunning class >> receiveBlParallelUniverseHostSpaceRequestSignal: anEvent [
+PyramidPluginEditOnRunning class >> receiveBlParallelUniverseHostSpaceSignal: anEvent [
 
 	BlSpace spaceWithId: anEvent spaceId do: [ :e | self addShortcutInSpace: e ]
 ]
@@ -106,6 +106,7 @@ PyramidPluginEditOnRunning class >> shortcut [
 
 	^ shortcut ifNil: [
 		  shortcut := BlShortcutWithAction new
+			              name: 'Pyramid edition shortcut';
 			              combination: self keyCombination;
 			              action: [ :event | self doShortcutAction: event ] ]
 ]

From c1b85b4792d52fd01d22a724e958540c8ecd542d Mon Sep 17 00:00:00 2001
From: Pierre Laborde <pierre.laborde@fr.thalesgroup.com>
Date: Fri, 17 Nov 2023 15:47:58 +0100
Subject: [PATCH 07/12] Reset plugin in the menu and fix plugin
 reinitialisation, fix shortcut plugin with executing action in a fork

---
 src/Pyramid/PyramidPluginEditOnRunning.class.st | 10 ++++++++--
 src/Pyramid/PyramidPluginManager.class.st       |  3 ++-
 src/Pyramid/TPyramidPlugin.trait.st             |  8 ++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/Pyramid/PyramidPluginEditOnRunning.class.st b/src/Pyramid/PyramidPluginEditOnRunning.class.st
index 164e3e42..f6d41485 100644
--- a/src/Pyramid/PyramidPluginEditOnRunning.class.st
+++ b/src/Pyramid/PyramidPluginEditOnRunning.class.st
@@ -37,6 +37,12 @@ PyramidPluginEditOnRunning class >> canEditSpace: aSpace [
 	^ true
 ]
 
+{ #category : #initialization }
+PyramidPluginEditOnRunning class >> cleanUp: anObject [
+
+	"do nothing"
+]
+
 { #category : #private }
 PyramidPluginEditOnRunning class >> doShortcutAction: anEvent [
 
@@ -108,7 +114,7 @@ PyramidPluginEditOnRunning class >> shortcut [
 		  shortcut := BlShortcutWithAction new
 			              name: 'Pyramid edition shortcut';
 			              combination: self keyCombination;
-			              action: [ :event | self doShortcutAction: event ] ]
+			              action: [ :event | [ self doShortcutAction: event] forkAt: Processor userBackgroundPriority named: 'Pyramid enter edition shortcut' ] ]
 ]
 
 { #category : #accessing }
@@ -125,8 +131,8 @@ PyramidPluginEditOnRunning class >> uninstall [
 	
 	self spaceIds do:[ :id | BlSpace spaceWithId: id do: [ :e | self removeShortcutInSpace: e ] ].
 	self spaceIds removeAll.
-	
 	shortcut := nil.
+	keyCombination := nil.
 ]
 
 { #category : #'universe management' }
diff --git a/src/Pyramid/PyramidPluginManager.class.st b/src/Pyramid/PyramidPluginManager.class.st
index a75cf391..e471c79e 100644
--- a/src/Pyramid/PyramidPluginManager.class.st
+++ b/src/Pyramid/PyramidPluginManager.class.st
@@ -28,7 +28,8 @@ PyramidPluginManager class >> reset [
 
 	<script>
 	self initialize.
-	TPyramidPlugin users do: [ :each | each initialize ]
+	TPyramidPlugin users do: [ :each | each uninstall ].
+	TPyramidPlugin users do: [ :each | each initialize ].
 ]
 
 { #category : #'instance creation' }
diff --git a/src/Pyramid/TPyramidPlugin.trait.st b/src/Pyramid/TPyramidPlugin.trait.st
index e0179712..cd2710de 100644
--- a/src/Pyramid/TPyramidPlugin.trait.st
+++ b/src/Pyramid/TPyramidPlugin.trait.st
@@ -16,6 +16,14 @@ TPyramidPlugin classSide >> install [
 	"Do some stuff here when the plugin used class oriented behavior"
 ]
 
+{ #category : #initialization }
+TPyramidPlugin classSide >> reset [
+
+	<script>
+	self uninstall.
+	self install
+]
+
 { #category : #initialization }
 TPyramidPlugin classSide >> uninstall [
 	"Undo some stuff here when the plugin used class oriented behavior"

From d2fc7c6d6d0db4b0588e58383d6318a19679f63f Mon Sep 17 00:00:00 2001
From: Pierre Laborde <pierre.laborde@fr.thalesgroup.com>
Date: Fri, 17 Nov 2023 15:53:36 +0100
Subject: [PATCH 08/12] update edition settings label

---
 src/Pyramid/PyramidEditOnRunningSystemSettings.class.st | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Pyramid/PyramidEditOnRunningSystemSettings.class.st b/src/Pyramid/PyramidEditOnRunningSystemSettings.class.st
index cf6444db..7b09da1b 100644
--- a/src/Pyramid/PyramidEditOnRunningSystemSettings.class.st
+++ b/src/Pyramid/PyramidEditOnRunningSystemSettings.class.st
@@ -31,7 +31,7 @@ PyramidEditOnRunningSystemSettings class >> editOnRunningSettingOn: aBuilder [
 
 	(aBuilder setting: #editOnRunning)
 		parent: #pyramid;
-		label: '(Not working) Can edit opened BlSpaces';
+		label: 'Can edit opened BlSpaces';
 		target: self;
 		dialog: [self canEditDialog: aBuilder];
 		description: 'Setup availability to edit opened BlSpace in a Pyramid window. 

From 49c5edd72c4e86590d1cf57a0eb27cbdb70c98a3 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Sun, 19 Nov 2023 13:12:35 +0100
Subject: [PATCH 09/12] Move plugin to Pyramid-Bloc package, change settings
 message.

---
 .../PyramidEditOnRunningSystemSettings.class.st           | 8 ++++----
 .../PyramidPluginEditOnRunning.class.st                   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{Pyramid => Pyramid-Bloc}/PyramidEditOnRunningSystemSettings.class.st (81%)
 rename src/{Pyramid => Pyramid-Bloc}/PyramidPluginEditOnRunning.class.st (98%)

diff --git a/src/Pyramid/PyramidEditOnRunningSystemSettings.class.st b/src/Pyramid-Bloc/PyramidEditOnRunningSystemSettings.class.st
similarity index 81%
rename from src/Pyramid/PyramidEditOnRunningSystemSettings.class.st
rename to src/Pyramid-Bloc/PyramidEditOnRunningSystemSettings.class.st
index 7b09da1b..eab68240 100644
--- a/src/Pyramid/PyramidEditOnRunningSystemSettings.class.st
+++ b/src/Pyramid-Bloc/PyramidEditOnRunningSystemSettings.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #PyramidEditOnRunningSystemSettings,
 	#superclass : #Object,
-	#category : #'Pyramid-plugin-edit-on-running'
+	#category : #'Pyramid-Bloc-plugin-edit-on-running'
 }
 
 { #category : #dialog }
@@ -9,7 +9,7 @@ PyramidEditOnRunningSystemSettings class >> canEditDialog: aBuilder [
 
 	^ self theme newRowIn: self for: {
 		"Default shortcut is F12 because it is usually use to enter dev mode in webbrowsers"
-		self theme buttonLabelForText: 'with shortcut: F12' translated.
+		self theme buttonLabelForText: 'with key shortcut: F12' translated.
 	}
 ]
 
@@ -31,10 +31,10 @@ PyramidEditOnRunningSystemSettings class >> editOnRunningSettingOn: aBuilder [
 
 	(aBuilder setting: #editOnRunning)
 		parent: #pyramid;
-		label: 'Can edit opened BlSpaces';
+		label: 'Can edit Bloc opened windows';
 		target: self;
 		dialog: [self canEditDialog: aBuilder];
-		description: 'Setup availability to edit opened BlSpace in a Pyramid window. 
+		description: 'Setup availability to edit opened BlSpace window in Pyramid editor. 
 Press the required shortcut key(s) on a focused BlSpace window to edit it in Pyramid.'
 ]
 
diff --git a/src/Pyramid/PyramidPluginEditOnRunning.class.st b/src/Pyramid-Bloc/PyramidPluginEditOnRunning.class.st
similarity index 98%
rename from src/Pyramid/PyramidPluginEditOnRunning.class.st
rename to src/Pyramid-Bloc/PyramidPluginEditOnRunning.class.st
index f6d41485..e3cee912 100644
--- a/src/Pyramid/PyramidPluginEditOnRunning.class.st
+++ b/src/Pyramid-Bloc/PyramidPluginEditOnRunning.class.st
@@ -12,7 +12,7 @@ Class {
 		'shortcut',
 		'keyCombination'
 	],
-	#category : #'Pyramid-plugin-edit-on-running'
+	#category : #'Pyramid-Bloc-plugin-edit-on-running'
 }
 
 { #category : #private }

From 929db4f579c724faa3d6cd4100df750aae1b1b37 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Sun, 19 Nov 2023 13:22:09 +0100
Subject: [PATCH 10/12] Manage fork for shortcut edition action

---
 src/Pyramid-Bloc/PyramidPluginEditOnRunning.class.st | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Pyramid-Bloc/PyramidPluginEditOnRunning.class.st b/src/Pyramid-Bloc/PyramidPluginEditOnRunning.class.st
index e3cee912..03fbc5ea 100644
--- a/src/Pyramid-Bloc/PyramidPluginEditOnRunning.class.st
+++ b/src/Pyramid-Bloc/PyramidPluginEditOnRunning.class.st
@@ -10,6 +10,7 @@ Class {
 		'editOnRunning',
 		'spaceIds',
 		'shortcut',
+		'shortcutFork',
 		'keyCombination'
 	],
 	#category : #'Pyramid-Bloc-plugin-edit-on-running'
@@ -47,6 +48,12 @@ PyramidPluginEditOnRunning class >> cleanUp: anObject [
 PyramidPluginEditOnRunning class >> doShortcutAction: anEvent [
 
 	| space editor whenClosedDo |
+	
+	self flag:'labordep: this is a temporary processing because this fork is due to a Bloc openend issue'.
+	(shortcutFork notNil and:[ shortcutFork isTerminated ]) ifFalse:[ ^ self ].
+	
+	shortcutFork := [ 
+	
 	self editOnRunning ifFalse:[ ^ self ].
 	space := anEvent source space.
 	(self canEditSpace: space) ifFalse:[ ^ self ].
@@ -54,6 +61,8 @@ PyramidPluginEditOnRunning class >> doShortcutAction: anEvent [
 	editor := space editWithPyramid.
 	whenClosedDo := editor window whenClosedDo.
 	editor window whenClosedDo: [ whenClosedDo value ].
+	
+	] forkAt: Processor userBackgroundPriority named: 'Pyramid edit-on-running plugin shortcut'
 ]
 
 { #category : #accessing }
@@ -114,7 +123,7 @@ PyramidPluginEditOnRunning class >> shortcut [
 		  shortcut := BlShortcutWithAction new
 			              name: 'Pyramid edition shortcut';
 			              combination: self keyCombination;
-			              action: [ :event | [ self doShortcutAction: event] forkAt: Processor userBackgroundPriority named: 'Pyramid enter edition shortcut' ] ]
+			              action: [ :event | self doShortcutAction: event ] ]
 ]
 
 { #category : #accessing }
@@ -131,6 +140,7 @@ PyramidPluginEditOnRunning class >> uninstall [
 	
 	self spaceIds do:[ :id | BlSpace spaceWithId: id do: [ :e | self removeShortcutInSpace: e ] ].
 	self spaceIds removeAll.
+	shortcutFork ifNotNil: [ shortcutFork terminate. shortcutFork := nil ]. 
 	shortcut := nil.
 	keyCombination := nil.
 ]

From 13f864119a6125018454b4fe470473184ff9caeb Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Sun, 19 Nov 2023 13:33:00 +0100
Subject: [PATCH 11/12] Fix shortcut action

---
 .../PyramidPluginEditOnRunning.class.st       | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Pyramid-Bloc/PyramidPluginEditOnRunning.class.st b/src/Pyramid-Bloc/PyramidPluginEditOnRunning.class.st
index 03fbc5ea..a2d5baa1 100644
--- a/src/Pyramid-Bloc/PyramidPluginEditOnRunning.class.st
+++ b/src/Pyramid-Bloc/PyramidPluginEditOnRunning.class.st
@@ -49,18 +49,19 @@ PyramidPluginEditOnRunning class >> doShortcutAction: anEvent [
 
 	| space editor whenClosedDo |
 	
-	self flag:'labordep: this is a temporary processing because this fork is due to a Bloc openend issue'.
-	(shortcutFork notNil and:[ shortcutFork isTerminated ]) ifFalse:[ ^ self ].
+	self flag:'labordep: this is a temporary processing because this fork is due to a Bloc opened issue'.
+	(shortcutFork notNil and:[ shortcutFork isTerminated not ]) ifTrue:[ ^ self ].
 	
 	shortcutFork := [ 
 	
-	self editOnRunning ifFalse:[ ^ self ].
-	space := anEvent source space.
-	(self canEditSpace: space) ifFalse:[ ^ self ].
-	
-	editor := space editWithPyramid.
-	whenClosedDo := editor window whenClosedDo.
-	editor window whenClosedDo: [ whenClosedDo value ].
+		self editOnRunning ifTrue:[
+			space := anEvent source space.
+			(self canEditSpace: space) ifTrue:[
+				editor := space editWithPyramid.
+				whenClosedDo := editor window whenClosedDo.
+				editor window whenClosedDo: [ whenClosedDo value ].
+			].
+		].
 	
 	] forkAt: Processor userBackgroundPriority named: 'Pyramid edit-on-running plugin shortcut'
 ]

From b794c294fbf45b5252d4b6ea795840fd3233f867 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Sun, 19 Nov 2023 13:51:07 +0100
Subject: [PATCH 12/12] PluginManager: cleanUp + tests if all plugins are
 installed IDE: Display on loaded plugin infos view the nb of available
 plugins with the nb of installed plugin

---
 src/Pyramid-IDE/PyramidWorld.class.st         |  4 ++-
 .../PyramidPluginManagerTest.class.st         | 29 +++++++++++++++++
 src/Pyramid/PyramidPluginManager.class.st     | 31 ++++++++++++++++---
 3 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 src/Pyramid-Tests/PyramidPluginManagerTest.class.st

diff --git a/src/Pyramid-IDE/PyramidWorld.class.st b/src/Pyramid-IDE/PyramidWorld.class.st
index 194da388..6f0b40c1 100644
--- a/src/Pyramid-IDE/PyramidWorld.class.st
+++ b/src/Pyramid-IDE/PyramidWorld.class.st
@@ -17,7 +17,9 @@ PyramidWorld class >> displayLoadedPlugins [
 		"Statistics"
 		stream 
 			nextPutAll: (e pluginClasses size) asString; 
-			nextPutAll: ' loaded plugin(s).'; 
+			nextPutAll: ' loaded / '; 
+			nextPutAll: (PyramidPluginManager imagePluginClasses size) asString;
+			nextPutAll: ' available plugin(s)';
 			cr; cr.
 		
 		"Details"
diff --git a/src/Pyramid-Tests/PyramidPluginManagerTest.class.st b/src/Pyramid-Tests/PyramidPluginManagerTest.class.st
new file mode 100644
index 00000000..4cde2cd5
--- /dev/null
+++ b/src/Pyramid-Tests/PyramidPluginManagerTest.class.st
@@ -0,0 +1,29 @@
+"
+A PyramidPluginManagerTest is a test class for testing the behavior of PyramidPluginManager
+"
+Class {
+	#name : #PyramidPluginManagerTest,
+	#superclass : #TestCase,
+	#category : #'Pyramid-Tests-core'
+}
+
+{ #category : #tests }
+PyramidPluginManagerTest >> testIsPluginInstalled [
+
+	"Test incorrect values"
+	| pluginClasses |
+	self deny: (PyramidPluginManager uniqueInstance isPluginInstalled: nil).
+	
+	"Test if all plugins are installed"
+	pluginClasses := PyramidPluginManager imagePluginClasses.
+	self assert: pluginClasses notEmpty.
+	pluginClasses do:[ :c |
+		self assert: (PyramidPluginManager uniqueInstance isPluginInstalled: c).
+	].
+]
+
+{ #category : #tests }
+PyramidPluginManagerTest >> testUniqueInstance [
+
+	self assert: PyramidPluginManager uniqueInstance class equals: PyramidPluginManager.
+]
diff --git a/src/Pyramid/PyramidPluginManager.class.st b/src/Pyramid/PyramidPluginManager.class.st
index e471c79e..49b88d2b 100644
--- a/src/Pyramid/PyramidPluginManager.class.st
+++ b/src/Pyramid/PyramidPluginManager.class.st
@@ -10,6 +10,27 @@ Class {
 	#category : #'Pyramid-core'
 }
 
+{ #category : #'instance creation' }
+PyramidPluginManager class >> cleanUp [
+	<script>
+	
+	self reset.
+]
+
+{ #category : #'instance creation' }
+PyramidPluginManager class >> cleanUp: anObject [
+	"clean up pyramid plugins"
+
+	self cleanUp
+]
+
+{ #category : #initialization }
+PyramidPluginManager class >> imagePluginClasses [
+	<script: 'self imagePluginClasses inspect'>
+
+	^ TPyramidPlugin users
+]
+
 { #category : #initialization }
 PyramidPluginManager class >> initialize [
 
@@ -24,12 +45,13 @@ PyramidPluginManager class >> new [
 
 { #category : #initialization }
 PyramidPluginManager class >> reset [
-	"Use this script to initiliaze each class implementing the trait TPyramidPlugin."
+	"Initialize each class implementing the trait TPyramidPlugin."
 
-	<script>
+	| imagePlugins |
 	self initialize.
-	TPyramidPlugin users do: [ :each | each uninstall ].
-	TPyramidPlugin users do: [ :each | each initialize ].
+	imagePlugins := self imagePluginClasses.
+	imagePlugins do: [ :each | each uninstall ].
+	imagePlugins do: [ :each | each initialize ]
 ]
 
 { #category : #'instance creation' }
@@ -59,6 +81,7 @@ PyramidPluginManager >> buildEditor [
 { #category : #initialization }
 PyramidPluginManager >> initialize [
 
+	super initialize.
 	pluginClasses := Set new
 ]