Revert "Merge branch 'dev' into feature/clickableKeyframes"

This reverts commit db0f5e4, reversing
changes made to 6a9144f.

packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/addKeyframe.st

@@ -1,9 +1,4 @@
 eventHandling
 addKeyframe
-
-	self selectedTreeNode isActivated 
-		ifTrue: [
-			self updateInformationText: 'Added keyframe.'.
-			self selectedTreeNode addKeyframe.] 
-		ifFalse: [
-			self updateInformationText: 'Activate property first'.].
+	self updateInformationText: 'Added keyframe.'.
+	self selectedTreeNode addKeyframe.

packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/createPropertyWith..st

@@ -2,5 +2,5 @@ buildComponents
 createPropertyWith: aMorph 
 	^ AnimationsEditorProperty new animationsEditor: self;
 		 targetMorph: aMorph;
-		 title: '' , (self propertyList size + 1), ' - ' , aMorph className;
+		 title: '' , self propertyList size , ' - ' , aMorph className;
 		 yourself.

packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/seedProperties.st

@@ -2,4 +2,4 @@ initialization
 seedProperties
 	self propertyStartEnd: AnimationsEditorPropertyStartEnd new.
 	self propertyStartEnd animationsEditor: self.
-	"self propertyList add: self propertyStartEnd."
+	self propertyList add: self propertyStartEnd.

packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/selectedTreeNode..st

@@ -2,15 +2,8 @@ accessing
 selectedTreeNode: aNode 
 	selectedTreeNode := aNode.
 	aNode canRenderUI
-		ifTrue: [
-				(aNode isActivated) 
-					ifTrue: [
-						self
-							insertMorph: (aNode buildUIWith: self toolBuilder)
-							Into: self propertyEditorPanel]
-					ifFalse: [ 
-						self
-							insertMorph: (aNode buildActivatePanelWith:  self toolBuilder) Into: self propertyEditorPanel].].
-
+		ifTrue: [self
+				insertMorph: (aNode buildUIWith: self toolBuilder)
+				Into: self propertyEditorPanel].
 	aNode isStartEnd
 		ifFalse: [self switchTimelineToMorphWith: aNode].

packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json

@@ -1,10 +1,10 @@
 {
 	"class" : {
-		"open" : "ob 6/20/2022 20:28" },
+		"open" : "FH 8/1/2021 18:50" },
 	"instance" : {
-		"addKeyframe" : "NR 6/26/2022 15:41",
+		"addKeyframe" : "mjs 7/31/2021 17:11",
 		"addPropertiesToImageMorphOn:" : "FH 8/1/2021 18:47",
-		"addPropertiesToMorphOn:" : "NR 6/26/2022 14:09",
+		"addPropertiesToMorphOn:" : "FH 8/1/2021 18:47",
 		"addPropertiesToTextMorphOn:" : "FH 8/1/2021 18:47",
 		"addSelectedMorphFor:" : "LW 7/31/2021 12:50",
 		"addSubPropertiesOn:" : "FH 8/1/2021 18:48",
@@ -22,14 +22,14 @@
 		"buildResetButtonWith:" : "FH 8/1/2021 18:43",
 		"buildSaveButtonWith:" : "FH 8/1/2021 18:44",
 		"buildTimeline:" : "FH 8/1/2021 18:44",
-		"buildWith:" : "ob 6/20/2022 20:40",
+		"buildWith:" : "FH 8/1/2021 18:44",
 		"collectAllEmptyPanels" : "FH 8/1/2021 18:44",
 		"collectInformationBar" : "FH 8/1/2021 18:44",
 		"collectPropertyTreeMorph" : "FH 8/1/2021 18:44",
 		"createColorPropertyOn:" : "FH 8/1/2021 18:45",
 		"createImageSourcePropertyOn:" : "LW 7/26/2021 16:42",
 		"createPositionPropertyOn:" : "LW 7/26/2021 16:43",
-		"createPropertyWith:" : "Noel Bastubbe 6/22/2022 12:14",
+		"createPropertyWith:" : "FH 8/1/2021 18:46",
 		"createRotationPropertyOn:" : "LW 7/26/2021 16:43",
 		"createSizePropertyOn:" : "LW 7/26/2021 16:43",
 		"createTextPropertyOn:" : "LW 7/26/2021 16:44",
@@ -46,7 +46,7 @@
 		"informationBar:" : "DM 7/8/2020 15:03",
 		"informationBarText" : "FH 8/1/2021 18:49",
 		"informationBarText:" : "FH 8/1/2021 18:50",
-		"initialize" : "NR 6/26/2022 15:00",
+		"initialize" : "FH 8/1/2021 18:49",
 		"initializeJsonHandler" : "FH 8/1/2021 18:49",
 		"initializePropertyEditorPanel" : "FH 8/1/2021 18:49",
 		"insertMorph:Into:" : "FH 8/1/2021 18:46",
@@ -71,10 +71,10 @@
 		"resetTargetMorph" : "FH 8/1/2021 18:48",
 		"saveAnimations" : "FH 8/1/2021 18:48",
 		"savedAnimationText" : "mjs 7/31/2021 15:08",
-		"seedProperties" : "Noel Bastubbe 6/22/2022 11:27",
+		"seedProperties" : "Noel Bastubbe 6/14/2022 15:28",
 		"selectMorphByHand" : "FH 8/1/2021 18:49",
 		"selectedTreeNode" : "JIZ 5/27/2020 15:31",
-		"selectedTreeNode:" : "ob 6/26/2022 19:02",
+		"selectedTreeNode:" : "FH 8/1/2021 18:27",
 		"switchTimelineToMorphWith:" : "FH 8/1/2021 18:49",
 		"timeline" : "FH 8/1/2021 18:27",
 		"timeline:" : "FH 8/1/2021 18:27",

packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/addMovingLine.st

@@ -0,0 +1,12 @@
+as yet unclassified
+addMovingLine
+	| line |	
+	"self movingLine: (self addLineFrom: 105@25 to: 105@125)."
+
+	line := LineMorph
+				from: 105@25
+				to: 105@125
+				color: Color black
+				width: self lineWidth.
+	self movingLine: line.
+	self addMorph: line.

packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/animationDuration.st

@@ -1,3 +1,4 @@
 accessing
 animationDuration
+
 	^ self timeline endTime - self timeline startTime.

packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/initialize.st

@@ -1,4 +1,4 @@
-initialization
+as yet unclassified
 initialize
 	super initialize.
 	self

packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/lineWidth.st

@@ -1,3 +1,3 @@
-constants
+as yet unclassified
 lineWidth
-	^ 3.
+	^3.

packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/movingLine..st

@@ -1,3 +1,3 @@
 accessing
 movingLine: anObject
-	movingLine := anObject.
+	movingLine := anObject

packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/movingLine.st

@@ -1,3 +1,3 @@
 accessing
 movingLine
-	^ movingLine.
+	^ movingLine

packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/positionY..st

@@ -1,3 +1,3 @@
 accessing
 positionY: anObject
-	positionY := anObject.
+	positionY := anObject

packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/positionY.st

@@ -1,3 +1,3 @@
 accessing
 positionY
-	^ positionY.
+	^ positionY

packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/setMovingSpeedPerHundredMilliseconds.st

@@ -1,3 +1,4 @@
 accessing
 setMovingSpeedPerHundredMilliseconds
+
 	self speed: (self timeline width - (self startMargin) - (self endMargin)) / self animationDuration * 100.

packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/speed..st

@@ -1,3 +1,3 @@
 accessing
 speed: anObject
-	speed := anObject.
+	speed := anObject

packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/speed.st

@@ -1,3 +1,3 @@
 accessing
 speed
-	^ speed.
+	^ speed

packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/step.st

@@ -1,4 +1,4 @@
-stepping and presenter
+as yet unclassified
 step
 	| endPositionX| 
 

packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/instance/stepTime.st

@@ -1,3 +1,3 @@
-stepping and presenter
+as yet unclassified
 stepTime
-	^ 100.
+	^100.

packages/AnimationsEditor-Core.package/AnimationsEditorMovingLine.class/methodProperties.json

@@ -16,4 +16,4 @@
 		"speed" : "ob 6/9/2022 20:26",
 		"speed:" : "ob 6/9/2022 20:26",
 		"step" : "ob 6/9/2022 20:45",
-		"stepTime" : "Noel Bastubbe 6/22/2022 12:27" } }
+		"stepTime" : "ob 6/9/2022 20:15" } }

packages/AnimationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/instance/initialize.st

@@ -1,5 +1,4 @@
 initialization
 initialize
 	super initialize.
-	self isActivated: false.
 	self addStartFrame.

packages/AnimationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/methodProperties.json

@@ -2,34 +2,25 @@
 	"class" : {
 		 },
 	"instance" : {
-		"activateProperty" : "NR 6/26/2022 14:41",
 		"addKeyframe" : "CL 8/2/2021 08:43",
 		"addStartFrame" : "FH 8/1/2021 19:13",
 		"animationProperty" : "CL 7/29/2021 11:55",
-		"buildActivateFrameWith:" : "ob 6/26/2022 17:58",
-		"buildActivatePanelWith:" : "ob 6/26/2022 17:58",
-		"buildDeactivateFrameWith:" : "ob 6/26/2022 17:57",
 		"buildInputFrameWith:" : "FH 8/1/2021 19:13",
-		"buildStartPanelWith:" : "ob 6/26/2022 19:04",
 		"buildTextFrameWith:" : "FH 8/1/2021 19:13",
 		"canCreateAnimation" : "MH 7/8/2021 11:37",
-		"canRenderUI" : "ob 6/20/2022 18:54",
+		"canRenderUI" : "MH 7/8/2021 11:39",
 		"createAnimationSequenceWithStartEnd:" : "FH 8/1/2021 19:08",
 		"createAnimationWith:withPreviousKey:" : "CL 7/29/2021 12:02",
 		"createAtomicAnimationFor:withKey:withPreviousKey:" : "FH 8/1/2021 19:09",
 		"createCompositeAnimationWith:withKey:withPreviousKey:" : "FH 8/1/2021 19:10",
 		"currentValue" : "MH 7/8/2021 11:08",
 		"currentValue:" : "MH 7/8/2021 11:08",
-		"deactivateProperty" : "ob 6/26/2022 17:01",
 		"defaultFrame" : "MH 7/8/2021 11:33",
 		"defaultValue" : "MH 7/8/2021 11:33",
-		"deleteAllKeyframes" : "ob 6/26/2022 18:58",
 		"executeCompositeAnimation:" : "FH 8/1/2021 19:11",
 		"frame" : "MH 7/8/2021 11:08",
 		"frame:" : "MH 7/8/2021 11:10",
-		"initialize" : "NR 6/26/2022 14:32",
-		"isActivated" : "ob 6/26/2022 18:59",
-		"isActivated:" : "ob 6/26/2022 18:59",
+		"initialize" : "MH 7/8/2021 10:28",
 		"isFirstFrame" : "MH 7/8/2021 11:31",
 		"isKey:outOfBound:" : "MH 7/8/2021 11:36",
 		"isKeyframeExceptStartFrameExistent" : "FH 8/1/2021 19:11",

packages/AnimationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/properties.json

@@ -9,8 +9,7 @@
 		"targetDuration",
 		"targetFrame",
 		"targetValues",
-		"currentValue",
-		"isActivated" ],
+		"currentValue" ],
 	"name" : "AnimationsEditorPropertyAnimated",
 	"pools" : [
 		 ],

packages/AnimationsEditor-Core.package/AnimationsEditorPropertyColor.class/instance/buildPanelWith..st

@@ -2,21 +2,12 @@ buildComponents
 buildPanelWith: aBuilder 
 	| aPluggablePanelSpec |
 
-	aPluggablePanelSpec := aBuilder pluggablePanelSpec new 
-			model: self;
-			frame: (LayoutFrame new 
-						topFraction: 0.1;
-					 	bottomFraction: 0.9;
-						leftFraction: 0.1;
-					 	rightFraction: 0.8;
-					 	yourself);
-			children: {self buildDeactivateFrameWith: aBuilder. 
-						self buildColorPickerWith: aBuilder. 
-						self buildInputColorWith: aBuilder. 
-						self buildTextColorWith: aBuilder. 
-						self buildInputFrameWith: aBuilder. 
-						self buildTextFrameWith: aBuilder
-						};
-			yourself.
-
+	aPluggablePanelSpec := aBuilder pluggablePanelSpec new model: self;
+				 frame: (LayoutFrame new topFraction: 0.1;
+					 bottomFraction: 0.9;
+					 leftFraction: 0.1;
+					 rightFraction: 0.8;
+					 yourself);
+				 children: {self buildColorPickerWith: aBuilder. self buildInputColorWith: aBuilder. self buildTextColorWith: aBuilder. self buildInputFrameWith: aBuilder. self buildTextFrameWith: aBuilder};
+				 yourself.
 	^ aBuilder build: aPluggablePanelSpec.

packages/AnimationsEditor-Core.package/AnimationsEditorPropertyColor.class/methodProperties.json

@@ -6,7 +6,7 @@
 		"animationString" : "FH 8/1/2021 19:19",
 		"buildColorPickerWith:" : "FH 8/1/2021 19:19",
 		"buildInputColorWith:" : "FH 8/1/2021 19:19",
-		"buildPanelWith:" : "ob 6/26/2022 17:57",
+		"buildPanelWith:" : "FH 8/1/2021 19:19",
 		"buildTextColorWith:" : "FH 8/1/2021 19:20",
 		"buildUIWith:" : "mjs 7/31/2021 18:00",
 		"colorPicker" : "MH 7/8/2021 10:03",