Merge pull request #257 from OpenSmock/Issue_0170

Issue 0170

Author: LabordePierre

src/Pyramid-Bloc/PyramidBasicConstraintsInputPresenter.class.st

@@ -117,7 +117,7 @@ PyramidBasicConstraintsInputPresenter >> setMatchParent [
 ]
 
 { #category : #initialization }
-PyramidBasicConstraintsInputPresenter >> setUnknowValue [
+PyramidBasicConstraintsInputPresenter >> setUnknownValue [
 
 	self buttonExact
 		enabled: false;

src/Pyramid-Bloc/PyramidBlElementHelper.class.st

@@ -9,6 +9,24 @@ Class {
 	#category : #'Pyramid-Bloc-plugin-bloc-geometry'
 }
 
+{ #category : #accessing }
+PyramidBlocGeometryPlugin class >> cornerRadii [
+
+	| property |
+	property := PyramidProperty new
+		            name: 'Corner radius';
+		            command: PyramidRoundedRectangleCornerRadiiCommand new;
+		            inputPresenterClass:
+			            PyramidCornerRadiiInputPresenter;
+		            yourself.
+	property inputPresenterModel help:
+		'Change the corner radius of the geometry. For example:
+	- "10" to set a radius of 10 px on each corner.
+	- "10 20" to set a radius of 10 px on the top-left and bottom-right corner and 20 px on the top-right and bottom-left corner.
+	- "10 20 30 40" to set a radius of 10 px on top-left, 20 px on top-right, 30 px on bottom-right and 40 px on bottom-left.'.
+	^ property
+]
+
 { #category : #accessing }
 PyramidBlocGeometryPlugin class >> geometry [
 
@@ -66,7 +84,7 @@ PyramidBlocGeometryPlugin >> initialize [
 	propertiesManager := PyramidPropertiesManagerForSelection new.
 
 	propertiesManager addProperty: self class geometry.
-
+	propertiesManager addProperty: self class cornerRadii.
 ]
 
 { #category : #adding }

src/Pyramid-Bloc/PyramidBlocGeometryPlugin.class.st

@@ -100,7 +100,7 @@ PyramidBlocLayoutPlugin class >> constraintsPropH [
 	property := PyramidProperty new
 		            name: 'Constraints - horizontal';
 		            command:
-			            PyramidProportionnalHorizontalConstraintsCommand new;
+			            PyramidProportionalHorizontalConstraintsCommand new;
 		            inputPresenterClass: PyramidPointInputPresenter;
 		            yourself.
 	property inputPresenterModel
@@ -117,7 +117,7 @@ PyramidBlocLayoutPlugin class >> constraintsPropV [
 	property := PyramidProperty new
 		            name: 'Constraints - vertical';
 		            command:
-			            PyramidProportionnalVerticalConstraintsCommand new;
+			            PyramidProportionalVerticalConstraintsCommand new;
 		            inputPresenterClass: PyramidPointInputPresenter;
 		            yourself.
 	property inputPresenterModel
@@ -167,8 +167,7 @@ PyramidBlocLayoutPlugin class >> layout [
 	property := PyramidProperty new
 		            name: 'Layout Type';
 		            command: PyramidLayoutBlocCommand new;
-		            inputPresenterClass:
-			            PyramidMagicButtonsInputPresenter;
+		            inputPresenterClass: PyramidMagicButtonsInputPresenter;
 		            yourself.
 	property inputPresenterModel
 		addButtonModel: (PyramidMagicButtonModel new
@@ -205,8 +204,8 @@ PyramidBlocLayoutPlugin class >> layout [
 				 yourself);
 		addButtonModel: (PyramidMagicButtonModel new
 				 icon: (Smalltalk ui icons iconNamed: #haloScale);
-				 helpSelected: 'The layout is proportionnal.';
-				 helpNotSelected: 'Set the layout to proportionnal.';
+				 helpSelected: 'The layout is proportional.';
+				 helpNotSelected: 'Set the layout to proportional.';
 				 label: 'Prop';
 				 inputValue: [ BlProportionalLayout new ];
 				 inputValidation: [ :value | value class = BlProportionalLayout ];

src/Pyramid-Bloc/PyramidBlocLayoutPlugin.class.st

@@ -28,24 +28,6 @@ PyramidBlocPlugin class >> clipChildren [
 	^ property
 ]
 
-{ #category : #accessing }
-PyramidBlocPlugin class >> cornerRadii [
-
-	| property |
-	property := PyramidProperty new
-		            name: 'Corner radius';
-		            command: PyramidRoundedRectangleCornerRadiiCommand new;
-		            inputPresenterClass:
-			            PyramidCornerRadiiInputPresenter;
-		            yourself.
-	property inputPresenterModel help:
-		'Change the corner radius of the geometry. For example:
-	- "10" to set a radius of 10 px on each corner.
-	- "10 20" to set a radius of 10 px on the top-left and bottom-right corner and 20 px on the top-right and bottom-left corner.
-	- "10 20 30 40" to set a radius of 10 px on top-left, 20 px on top-right, 30 px on bottom-right and 40 px on bottom-left.'.
-	^ property
-]
-
 { #category : #accessing }
 PyramidBlocPlugin class >> elementId [
 
@@ -59,25 +41,12 @@ PyramidBlocPlugin class >> elementId [
 	^ property
 ]
 
-{ #category : #accessing }
-PyramidBlocPlugin class >> geometry [
-
-	| property |
-	property := PyramidProperty new
-		            name: 'Geometry';
-		            command: PyramidGeometryCommand new;
-		            inputPresenterClass:
-			            PyramidGeometryInputPresenter;
-		            yourself.
-	^ property
-]
-
 { #category : #accessing }
 PyramidBlocPlugin class >> visibility [
 
 	| property |
 	property := PyramidProperty new
-		            name: 'Visibility2';
+		            name: 'Visibility';
 		            command: PyramidVisibilityCommand new;
 		            inputPresenterClass: PyramidMagicButtonsInputPresenter;
 		            yourself.
@@ -124,7 +93,7 @@ PyramidBlocPlugin class >> zIndex [
 		            inputPresenterClass: PyramidNumberInputPresenter;
 		            yourself.
 	property inputPresenterModel help:
-		'Change the elevation (#zIndex:). Bloc will used the elevation to determine wich of two sibling must be draw on top. The higher zIndex will be drawn on top of the lesser one.'.
+		'Change the elevation (#zIndex:). Bloc will use the elevation to determine wich of two siblings must be draw on top. The higher zIndex will be drawn on top of the lesser one.'.
 	^ property
 ]
 
@@ -229,9 +198,7 @@ PyramidBlocPlugin >> initialize [
 	propertiesManager addProperty: self class elementId.
 	propertiesManager addProperty: self class visibility.
 	propertiesManager addProperty: self class zIndex.
-	propertiesManager addProperty: self class clipChildren.
-	propertiesManager addProperty: self class geometry.
-	propertiesManager addProperty: self class cornerRadii
+	propertiesManager addProperty: self class clipChildren
 ]
 
 { #category : #'as yet unclassified' }