Merge pull request #182 from OpenSmock/Nyan11-patch-1

Update .smalltalk.ston

.smalltalk.ston

@@ -10,7 +10,7 @@ SmalltalkCISpec {
     }
   ],
   #testing : {
-    #packages : [ 'Pyramid.*' ],
+    #categories : [ 'Pyramid*' ],
     #packages : [ 'Bloc-Serialization.*' ]
   }
 }

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 |

src/BaselineOfPyramid/package.st

@@ -1 +1 @@
-Package { #name : #BaselineOfPyramid }
+Package { #name : 'BaselineOfPyramid' }

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
+]

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 |

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
 ]

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' }

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 ]

src/Pyramid-Bloc/PyramidProjectModel.extension.st

@@ -0,0 +1,8 @@
+Extension { #name : 'PyramidProjectModel' }
+
+{ #category : '*Pyramid-Bloc' }
+PyramidProjectModel >> allElements [
+
+	^ PyramidElementsManipulationHelper flattenChildrenOfCollection:
+		  self firstLevelElements
+]

src/Pyramid-Bloc/PyramidSaveModelVerifier.class.st

@@ -26,7 +26,7 @@ PyramidSaveModelVerifier class >> classPackageIsEqual [
 
 	^ self new
 		  verifyBlock: [ :model |
-			  self class environment
+			  Smalltalk globals
 				  at: model savingClassName asSymbol
 				  ifPresent: [ :class | "
 					Model = class package >> OK
@@ -35,12 +35,11 @@ PyramidSaveModelVerifier class >> classPackageIsEqual [
 					  class package name = model savingPackageName
 						  ifTrue: [ true ]
 						  ifFalse: [
-							  class package tags
-								  detect: [ :tag | tag includesClass: class ]
-								  ifFound: [ :tag |
-									  class package name , '-' , tag name
-									  = model savingPackageName ]
-								  ifNone: [ false ] ] ]
+							  (model savingPackageName endsWith: class packageTag name)
+								  ifFalse: [ false ]
+								  ifTrue: [
+									  model savingPackageName = (class package name , '-'
+									  , class packageTag name) ] ] ]
 				  ifAbsent: [ true ] ];
 		  showBlock: [ :view | view showClassPackageIsNotEqualError ];
 		  yourself

src/Pyramid-Bloc/PyramidSavePlugin.class.st

@@ -52,7 +52,8 @@ PyramidSavePlugin >> connectOn: aPyramidEditor [
 
 	self projectModel: aPyramidEditor projectModel.
 	self saveModel projectModel: aPyramidEditor projectModel.
-	aPyramidEditor projectModel addObserver: self inputsController
+	self inputsController projectModel: aPyramidEditor projectModel.
+
 ]
 
 { #category : 'initialization' }

src/Pyramid-Bloc/PyramidSaveProjectConfigurationController.class.st

@@ -1,8 +1,6 @@
 Class {
 	#name : 'PyramidSaveProjectConfigurationController',
 	#superclass : 'Object',
-	#traits : 'TPyramidProjectModelObserver',
-	#classTraits : 'TPyramidProjectModelObserver classTrait',
 	#instVars : [
 		'view',
 		'saveModel',
@@ -55,17 +53,16 @@ PyramidSaveProjectConfigurationController >> isSaved [
 ]
 
 { #category : 'as yet unclassified' }
-PyramidSaveProjectConfigurationController >> pyramidElementsChanged [
+PyramidSaveProjectConfigurationController >> projectModel: aProjectModel [
 
-	self saveModel isSaved: false.
-	self updateWindowTitle
-]
-
-{ #category : 'as yet unclassified' }
-PyramidSaveProjectConfigurationController >> pyramidFirstLevelElementsChanged [
-
-	self saveModel isSaved: false.
-	self updateWindowTitle
+	aProjectModel announcer
+		when: PyramidElementsChangedEvent
+		do: [ :evt | self updateSaveState: evt ]
+		for: self.
+	aProjectModel announcer
+		when: PyramidFirstLevelElementsChangedEvent
+		do: [ :evt | self updateSaveState: evt ]
+		for: self.
 ]
 
 { #category : 'as yet unclassified' }
@@ -116,6 +113,13 @@ PyramidSaveProjectConfigurationController >> textUpdatedFromPackage: aString [
 	self updateView
 ]
 
+{ #category : 'as yet unclassified' }
+PyramidSaveProjectConfigurationController >> updateSaveState: anEvent [
+
+	self saveModel isSaved: false.
+	self updateWindowTitle
+]
+
 { #category : 'as yet unclassified' }
 PyramidSaveProjectConfigurationController >> updateView [
 

src/Pyramid-Bloc/PyramidSelectionWidgetExtension.class.st

@@ -1,8 +1,8 @@
 Class {
 	#name : 'PyramidSelectionWidgetExtension',
 	#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 : [
 		'projectModel',
 		'widgetElement',
@@ -193,14 +193,18 @@ PyramidSelectionWidgetExtension >> projectModel [
 PyramidSelectionWidgetExtension >> projectModel: aProjectModel [
 
 	projectModel := aProjectModel.
-	projectModel addObserver: self.
-	self makeNewSelection.
+	projectModel announcer
+		when: PyramidSelectionChangedEvent
+		do: [ :evt | self pyramidSelectionChanged: evt ]
+		for: self.
+	self makeNewSelection
 ]
 
 { #category : 'events' }
-PyramidSelectionWidgetExtension >> pyramidSelectionChanged [
+PyramidSelectionWidgetExtension >> pyramidSelectionChanged: anEvent [
 
-	self updateSelection
+	self removeSelection.
+	self makeNewSelection
 ]
 
 { #category : 'selection element' }
@@ -225,13 +229,6 @@ PyramidSelectionWidgetExtension >> removeSelection [
 	self widgetElement removeChildren.
 ]
 
-{ #category : 'selection' }
-PyramidSelectionWidgetExtension >> updateSelection [
-
-	self removeSelection.
-	self makeNewSelection
-]
-
 { #category : 'as yet unclassified' }
 PyramidSelectionWidgetExtension >> usePositionOffsetCommand: aPosition [