Merge 5187f7e

OpenSmock · Jun 24, 2024 · 6bc246a · 6bc246a
2 parents cd6ec10 + 5187f7e
commit 6bc246a
Show file tree

Hide file tree

Showing 52 changed files with 2,573 additions and 1,610 deletions.
diff --git a/.github/workflows/Pharo11CI.yml b/.github/workflows/Pharo11CI.yml
@@ -9,8 +9,6 @@ on:
       - 'main'
   pull_request:
     types: [assigned, opened, synchronize, reopened]
-  schedule:
-    - cron:  '0 12 * * 0'
 
 jobs:
   build:

diff --git a/.github/workflows/Pharo13CI.yml b/.github/workflows/Pharo13CI.yml
@@ -0,0 +1,31 @@
+name: 'Pharo 13 CI'
+
+env: 
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+on:
+  push:
+    branches:
+      - 'master'
+  pull_request:
+    types: [assigned, opened, synchronize, reopened]
+  schedule:
+    - cron:  '0 12 * * 0'
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        smalltalk: [ Pharo64-13 ]
+    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.smalltalk }} on ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: hpi-swa/setup-smalltalkCI@v1
+        with:
+          smalltalk-image: ${{ matrix.smalltalk }}
+      - name: Load in New Image and Run Tests
+        run: smalltalkci -s ${{ matrix.smalltalk }} ${{ matrix.ston }}
+        shell: bash
+        timeout-minutes: 15
diff --git a/.smalltalk.ston b/.smalltalk.ston
@@ -10,7 +10,7 @@ SmalltalkCISpec {
     }
   ],
   #testing : {
-    #packages : [ 'Pyramid.*' ],
+    #categories : [ 'Pyramid*' ],
     #packages : [ 'Bloc-Serialization.*' ]
   }
 }
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 [![License](https://img.shields.io/github/license/openSmock/Pyramid.svg)](./LICENSE)
 [![Pharo 11 CI](https://github.com/OpenSmock/Pyramid/actions/workflows/Pharo11CI.yml/badge.svg)](https://github.com/OpenSmock/Pyramid/actions/workflows/Pharo11CI.yml)
 [![Pharo 12 CI](https://github.com/OpenSmock/Pyramid/actions/workflows/Pharo12CI.yml/badge.svg)](https://github.com/OpenSmock/Pyramid/actions/workflows/Pharo12CI.yml)
+[![Pharo 13 CI](https://github.com/OpenSmock/Pyramid/actions/workflows/Pharo13CI.yml/badge.svg)](https://github.com/OpenSmock/Pyramid/actions/workflows/Pharo13CI.yml)
 
 # Pyramid
 

diff --git a/src/BaselineOfPyramid/BaselineOfPyramid.class.st b/src/BaselineOfPyramid/BaselineOfPyramid.class.st
@@ -1,18 +1,19 @@
 Class {
-	#name : #BaselineOfPyramid,
-	#superclass : #BaselineOf,
-	#category : #BaselineOfPyramid
+	#name : 'BaselineOfPyramid',
+	#superclass : 'BaselineOf',
+	#category : 'BaselineOfPyramid',
+	#package : 'BaselineOfPyramid'
 }
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfPyramid >> baseline: spec [
 
 	<baseline>
 	"Common baseline for all Pharo versions"
 	spec for: #common do: [ self baselineForCommon: spec ]
 ]
 
-{ #category : #baselines }
+{ #category : 'baselines' }
 BaselineOfPyramid >> baselineForCommon: spec [
 
 	<baseline>
@@ -34,7 +35,7 @@ BaselineOfPyramid >> baselineForCommon: spec [
 	spec group: 'ToploUI' with: self toploPackagesNames "only Bloc and Toplo"
 ]
 
-{ #category : #dependencies }
+{ #category : 'dependencies' }
 BaselineOfPyramid >> blocDependencies: spec [
 
 	spec
@@ -46,7 +47,7 @@ BaselineOfPyramid >> blocDependencies: spec [
 		spec repository: 'github://OpenSmock/Bloc-Serialization:main/src' ]
 ]
 
-{ #category : #packages }
+{ #category : 'packages' }
 BaselineOfPyramid >> blocPackages: spec [
 
 	spec
@@ -60,24 +61,24 @@ BaselineOfPyramid >> blocPackages: spec [
 		with: [ spec requires: #( 'Pyramid-Bloc' ) ]
 ]
 
-{ #category : #packages }
+{ #category : 'packages' }
 BaselineOfPyramid >> blocPackagesNames [
 
 	^ #( 'Pyramid' 'Pyramid-Bloc' 'Pyramid-Tests' 'Pyramid-IDE' 'Pyramid-Examples' )
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 BaselineOfPyramid >> postload: loader package: packageSpec [
 
 	PyramidPluginManager reset
 ]
 
-{ #category : #actions }
+{ #category : 'actions' }
 BaselineOfPyramid >> preload: loader package: packageSpec [
 
 ]
 
-{ #category : #packages }
+{ #category : 'packages' }
 BaselineOfPyramid >> pyramidPackages: spec [
 
 	spec package: 'Pyramid'.
@@ -87,18 +88,19 @@ BaselineOfPyramid >> pyramidPackages: spec [
 
 ]
 
-{ #category : #dependencies }
+{ #category : 'dependencies' }
 BaselineOfPyramid >> toploDependencies: spec [
 
 	spec
 		baseline: 'Toplo'
 		with: [ spec repository: 'github://pharo-graphics/Toplo:master/src' ].
 	spec
 		baseline: 'ToploSerialization'
-		with: [ spec repository: 'github://OpenSmock/Toplo-Serialization:main/src' ]
+		with: [
+		spec repository: 'github://OpenSmock/Toplo-Serialization:main/src' ]
 ]
 
-{ #category : #packages }
+{ #category : 'packages' }
 BaselineOfPyramid >> toploPackages: spec [
 
 	spec
@@ -112,7 +114,7 @@ BaselineOfPyramid >> toploPackages: spec [
 		with: [ spec requires: #( 'Pyramid-Toplo' ) ]
 ]
 
-{ #category : #packages }
+{ #category : 'packages' }
 BaselineOfPyramid >> toploPackagesNames [
 
 	| packages |

diff --git a/src/BaselineOfPyramid/package.st b/src/BaselineOfPyramid/package.st
@@ -1 +1 @@
-Package { #name : #BaselineOfPyramid }
+Package { #name : 'BaselineOfPyramid' }
diff --git a/src/Pyramid-Bloc/BlElement.extension.st b/src/Pyramid-Bloc/BlElement.extension.st
@@ -5,3 +5,22 @@ BlElement >> asIcon [
 
 	^ self layout asIcon
 ]
+
+{ #category : '*Pyramid-Bloc' }
+BlElement >> editWithPyramid [
+
+	| editor oldParent |
+	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.
+	self hasParent ifTrue: [ oldParent removeChild: self ].
+
+	editor projectModel firstLevelElements add: self.
+	editor window whenClosedDo: [
+		oldParent ifNotNil: [ oldParent addChild: self ] ].
+
+	editor window open.
+	^ editor
+]
diff --git a/src/Pyramid/BlSpace.extension.st → src/Pyramid-Bloc/BlSpace.extension.st b/src/Pyramid/BlSpace.extension.st → src/Pyramid-Bloc/BlSpace.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : 'BlSpace' }
 
-{ #category : '*Pyramid' }
+{ #category : '*Pyramid-Bloc' }
 BlSpace >> editWithPyramid [
 
 	| editor elements spacePlaceholder openFromSpacePlugin |

diff --git a/src/Pyramid-Bloc/PyramidBackgroundOpacityCommand.class.st b/src/Pyramid-Bloc/PyramidBackgroundOpacityCommand.class.st
@@ -15,6 +15,8 @@ PyramidBackgroundOpacityCommand >> getValueFor: aBlElement [
 { #category : 'as yet unclassified' }
 PyramidBackgroundOpacityCommand >> setValueFor: aBlElement with: anArgument [
 
-	aBlElement background: aBlElement background paint asBlBackground.
-	aBlElement background opacity: anArgument
+	| background |
+	background := aBlElement background paint asBlBackground.
+	background opacity: anArgument.
+	aBlElement background: background
 ]
diff --git a/src/Pyramid-Bloc/PyramidBlocPlugin.class.st b/src/Pyramid-Bloc/PyramidBlocPlugin.class.st
@@ -113,13 +113,16 @@ PyramidBlocPlugin >> addPanelsOn: aPyramidSimpleWindow [
 { #category : 'connecting' }
 PyramidBlocPlugin >> connectOn: aPyramidEditor [
 
+	"Configure the sort function."
+	aPyramidEditor projectModel firstLevelElements sortFunction: PyramidElevationSortFunction new.
+
 	self editor: aPyramidEditor.
 	aPyramidEditor propertiesManager addProperty: self class elementId.
 	aPyramidEditor propertiesManager addProperty: self class visibility.
 	aPyramidEditor propertiesManager addProperty: self class zIndex.
 	aPyramidEditor propertiesManager addProperty: self class clipChildren.
 	aPyramidEditor propertiesManager addProperty: self class geometry.
-	aPyramidEditor propertiesManager addProperty: self class cornerRadii.
+	aPyramidEditor propertiesManager addProperty: self class cornerRadii
 ]
 
 { #category : 'accessing' }

diff --git a/src/Pyramid-Bloc/PyramidCopyPastePlugin.class.st b/src/Pyramid-Bloc/PyramidCopyPastePlugin.class.st
@@ -3,6 +3,9 @@ Class {
 	#superclass : 'Object',
 	#traits : 'TPyramidPlugin',
 	#classTraits : 'TPyramidPlugin classTrait',
+	#instVars : [
+		'projectModel'
+	],
 	#category : 'Pyramid-Bloc-plugin-copy-paste',
 	#package : 'Pyramid-Bloc',
 	#tag : 'plugin-copy-paste'
@@ -16,6 +19,12 @@ PyramidCopyPastePlugin >> addPanelsOn: aPyramidSimpleWindow [
 		addItem: [ :builder | self copyAsStonMenu: builder ]
 ]
 
+{ #category : 'connecting' }
+PyramidCopyPastePlugin >> connectOn: aPyramidEditor [
+
+	self projectModel: aPyramidEditor projectModel
+]
+
 { #category : 'copying' }
 PyramidCopyPastePlugin >> copyAsStonInClipboard: aCollection [
 
@@ -25,6 +34,24 @@ PyramidCopyPastePlugin >> copyAsStonInClipboard: aCollection [
 { #category : 'copying' }
 PyramidCopyPastePlugin >> copyAsStonMenu: aBuilder [
 
+	aBuilder
+		addGroupEmptySelection: [ :group :empty |
+			group
+				addItem: [ :item |
+					item
+						icon: (Smalltalk ui icons iconNamed: #smallCopy);
+						name: 'Copy (select only one element)';
+						enabled: false;
+						yourself ];
+				addItem: [ :item |
+					item
+						icon: (Smalltalk ui icons iconNamed: #smallPaste);
+						name: 'Paste';
+						action: [ self pasteAsStonInClipboardOnRoots ];
+						yourself ];
+				yourself ]
+		order: 20.
+
 	aBuilder
 		addGroupSingleSelection: [ :group :single |
 			group
@@ -34,6 +61,12 @@ PyramidCopyPastePlugin >> copyAsStonMenu: aBuilder [
 						name: 'Copy';
 						action: [ self copyAsStonInClipboard: { single } ];
 						yourself ];
+				addItem: [ :item |
+					item
+						icon: (Smalltalk ui icons iconNamed: #smallPaste);
+						name: 'Paste';
+						action: [ self pasteAsStonInClipboard: single ];
+						yourself ];
 				yourself ]
 		order: 20.
 
@@ -46,6 +79,50 @@ PyramidCopyPastePlugin >> copyAsStonMenu: aBuilder [
 						name: 'Copy (select only one element)';
 						enabled: false;
 						yourself ];
+				addItem: [ :item |
+					item
+						icon: (Smalltalk ui icons iconNamed: #smallPaste);
+						name: 'Paste (select only one element)';
+						enabled: false;
+						yourself ];
 				yourself ]
 		order: 20
 ]
+
+{ #category : 'copying' }
+PyramidCopyPastePlugin >> pasteAsStonInClipboard: aBlElement [
+
+	| copiedElement |
+	[ copiedElement := BlSerializer materialize: Clipboard clipboardText ]
+		on: BlocMaterializationError
+		do: [
+			UIManager default inform: 'Cannot paste the clipboard.'.
+			^ self ].
+	aBlElement addChildren: copiedElement.
+	self projectModel informElementsChanged
+]
+
+{ #category : 'copying' }
+PyramidCopyPastePlugin >> pasteAsStonInClipboardOnRoots [
+
+	| copiedElement |
+	[ copiedElement := BlSerializer materialize: Clipboard clipboardText ]
+		on: BlocMaterializationError
+		do: [
+			UIManager default inform: 'Cannot paste the clipboard.'.
+			^ self ].
+	self projectModel firstLevelElements addAll: copiedElement.
+	self projectModel informFirstLevelElementsChanged
+]
+
+{ #category : 'accessing' }
+PyramidCopyPastePlugin >> projectModel [
+
+	^ projectModel
+]
+
+{ #category : 'accessing' }
+PyramidCopyPastePlugin >> projectModel: anObject [
+
+	projectModel := anObject
+]
diff --git a/src/Pyramid-Bloc/PyramidMainExtension.class.st b/src/Pyramid-Bloc/PyramidMainExtension.class.st
@@ -1,11 +1,10 @@
 Class {
 	#name : 'PyramidMainExtension',
 	#superclass : 'Object',
-	#traits : 'TPyramidSpaceExtension + TPyramidEditorExtension + TPyramidProjectModelObserver + TPyramidEditorTransformationObserver',
-	#classTraits : 'TPyramidSpaceExtension classTrait + TPyramidEditorExtension classTrait + TPyramidProjectModelObserver classTrait + TPyramidEditorTransformationObserver classTrait',
+	#traits : 'TPyramidSpaceExtension + TPyramidEditorExtension + TPyramidEditorTransformationObserver',
+	#classTraits : 'TPyramidSpaceExtension classTrait + TPyramidEditorExtension classTrait + TPyramidEditorTransformationObserver classTrait',
 	#instVars : [
 		'containerElement',
-		'projectModel',
 		'borderElement',
 		'sizeElement',
 		'extentButton',
@@ -143,24 +142,20 @@ PyramidMainExtension >> offsetTranslation [
 	^ 50 @ 50
 ]
 
-{ #category : 'accessing' }
-PyramidMainExtension >> projectModel [
-
-	^ projectModel
-]
-
 { #category : 'accessing' }
 PyramidMainExtension >> projectModel: aProjectModel [
 
-	projectModel:= aProjectModel.
-	aProjectModel addObserver: self.
+	aProjectModel announcer
+		when: PyramidFirstLevelElementsChangedEvent
+		do: [ :evt | self pyramidFirstLevelElementsChanged: evt ]
+		for: self
 ]
 
 { #category : 'as yet unclassified' }
-PyramidMainExtension >> pyramidFirstLevelElementsChanged [
+PyramidMainExtension >> pyramidFirstLevelElementsChanged: anEvent [
 
 	self containerElement removeChildren.
-	(self projectModel firstLevelElements asArray sorted:
+	(anEvent firstLevelElements asArray sorted:
 		 PyramidElevationSortFunction new) do: [ :each |
 		each parent ifNotNil: [ :p | p removeChild: each ].
 		self containerElement addChild: each ]

diff --git a/src/Pyramid-Bloc/PyramidProjectModel.extension.st b/src/Pyramid-Bloc/PyramidProjectModel.extension.st
@@ -0,0 +1,8 @@
+Extension { #name : 'PyramidProjectModel' }
+
+{ #category : '*Pyramid-Bloc' }
+PyramidProjectModel >> allElements [
+
+	^ PyramidElementsManipulationHelper flattenChildrenOfCollection:
+		  self firstLevelElements
+]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Package { #name : #BaselineOfPyramid }
		Package { #name : 'BaselineOfPyramid' }