Skip to content

Commit

Permalink
Revert "Merge branch 'deleteMorphButton' into feature/ps/timeline-imp…
Browse files Browse the repository at this point in the history 
…rovements"

This reverts commit 1f5cacf, reversing
changes made to 72a6d04.
  • Loading branch information
@Ol-Ba
Ol-Ba committed Jul 17, 2022
1 parent 1f5cacf commit 6e6d831
Show file tree
Hide file tree
Showing 53 changed files with 54 additions and 300 deletions.
3 changes: 1 addition & 2 deletions ...ges/AnimationsEditor-Core.package/AnimationsEditor.class/instance/addSelectedMorphFor..st
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
buildComponents
addSelectedMorphFor: anEvent
self selectedTreeNode: (self addTargetMorph: (self getDeepestMorph: self currentHand selectedObject at: anEvent position)).
self addTargetMorph: (self getDeepestMorph: self currentHand selectedObject at: anEvent position).
self currentHand removeMouseListener: self.

self updateInformationText: 'Added new Morph'.
3 changes: 1 addition & 2 deletions ...ages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/buildButtonBarWith..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,5 @@ buildButtonBarWith: aBuilder
self buildPlayButtonWith: aBuilder.
self buildResetButtonWith: aBuilder.
self buildLoadJsonButtonWith: aBuilder.
self buildAddKeyframeButtonWith: aBuilder.
self buildDeleteMorphButtonWith: aBuilder. };
self buildAddKeyframeButtonWith: aBuilder. };
yourself.
15 changes: 0 additions & 15 deletions ...mationsEditor-Core.package/AnimationsEditor.class/instance/buildDeleteMorphButtonWith..st
View file

This file was deleted.

4 changes: 0 additions & 4 deletions ...AnimationsEditor-Core.package/AnimationsEditor.class/instance/clearPropertyEditorPanel.st
View file

This file was deleted.

24 changes: 0 additions & 24 deletions packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/deleteMorph..st
View file

This file was deleted.

21 changes: 0 additions & 21 deletions packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/deleteMorph.st
View file

This file was deleted.

9 changes: 0 additions & 9 deletions ...ages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/isPropertyToDelete..st
View file

This file was deleted.

2 changes: 1 addition & 1 deletion packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/numberButtons.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
buildComponents
numberButtons
^ 7.
^ 6.
6 changes: 0 additions & 6 deletions ...es/AnimationsEditor-Core.package/AnimationsEditor.class/instance/removeMorphProperties.st
View file

This file was deleted.

1 change: 0 additions & 1 deletion packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/selectedTreeNode..st
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
accessing
selectedTreeNode: aNode
selectedTreeNode := aNode.

aNode canRenderUI
ifTrue: [self
insertMorph: (aNode buildUIWith: self toolBuilder)
Expand Down
3 changes: 3 additions & 0 deletions packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/treeSpec..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
treeSpec: anObject
treeSpec := anObject.
3 changes: 3 additions & 0 deletions packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/treeSpec.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
treeSpec
^ treeSpec
20 changes: 8 additions & 12 deletions packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,23 @@
"addPropertiesToImageMorphOn:" : "FH 8/1/2021 18:47",
"addPropertiesToMorphOn:" : "FH 8/1/2021 18:47",
"addPropertiesToTextMorphOn:" : "FH 8/1/2021 18:47",
"addSelectedMorphFor:" : "ob 7/13/2022 12:39",
"addSelectedMorphFor:" : "LW 7/31/2021 12:50",
"addSubPropertiesOn:" : "FH 8/1/2021 18:48",
"addTargetMorph:" : "FH 8/1/2021 18:48",
"buildAddKeyframeButtonWith:" : "FH 8/1/2021 18:32",
"buildAddMorphButtonWith:" : "FH 8/1/2021 18:35",
"buildButtonBarWith:" : "lka 7/1/2022 16:07",
"buildDeleteMorphButtonWith:" : "lka 7/1/2022 16:15",
"buildButtonBarWith:" : "FH 8/1/2021 18:35",
"buildInformationBarWith:" : "DM 8/4/2020 16:12",
"buildLoadJsonButtonWith:" : "FH 8/1/2021 18:37",
"buildLoadingMainWindow:" : "SG 5/21/2022 13:24",
"buildMainWindowWith:" : "SG 5/21/2022 14:11",
"buildPlayButtonWith:" : "FH 8/1/2021 18:39",
"buildPositionUIPanelWith:" : "FH 8/1/2021 18:39",
"buildPropertiesTreeWith:" : "ob 7/12/2022 18:57",
"buildPropertiesTreeWith:" : "FH 8/1/2021 18:42",
"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",
"clearPropertyEditorPanel" : "NR 7/16/2022 17:01",
"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",
Expand All @@ -37,8 +35,6 @@
"createTextPropertyOn:" : "LW 7/26/2021 16:44",
"defaultEmptyPanels" : "DM 8/7/2020 17:37",
"defaultPropertyPanelPosition" : "mjs 7/31/2021 16:18",
"deleteMorph" : "NR 7/16/2022 17:09",
"deleteMorph:" : "NR 7/16/2022 16:55",
"editorTitle" : "LH 8/4/2020 10:31",
"editorTitle:" : "DM 8/3/2020 15:40",
"emptyPanels" : "DM 8/7/2020 17:37",
Expand All @@ -52,16 +48,15 @@
"informationBarText:" : "FH 8/1/2021 18:50",
"initialize" : "FH 8/1/2021 18:49",
"initializeJsonHandler" : "FH 8/1/2021 18:49",
"initializePropertyEditorPanel" : "ob 7/12/2022 18:00",
"initializePropertyEditorPanel" : "FH 8/1/2021 18:49",
"insertMorph:Into:" : "FH 8/1/2021 18:46",
"isPropertyToDelete:" : "NR 7/16/2022 17:17",
"jsonHandler" : "CL 7/5/2021 17:17",
"jsonHandler:" : "FH 8/1/2021 18:24",
"loadJsonWithExceptionHandling:" : "FH 8/1/2021 18:48",
"mainWindow" : "JIZ 6/3/2020 17:04",
"mainWindow:" : "JIZ 6/3/2020 17:04",
"messagePlayAnimations" : "CL 5/27/2021 13:48",
"numberButtons" : "lka 7/1/2022 16:04",
"numberButtons" : "CL 5/30/2021 14:05",
"playAnimations" : "SG 5/23/2022 18:41",
"propertyEditorPanel" : "DM 6/22/2020 01:27",
"propertyEditorPanel:" : "DM 6/12/2020 20:41",
Expand All @@ -73,7 +68,6 @@
"propertyStartEnd:" : "DM 8/6/2020 10:53",
"propertyTreeMorph" : "DM 6/22/2020 01:28",
"propertyTreeMorph:" : "DM 6/18/2020 08:59",
"removeMorphProperties" : "NR 7/16/2022 17:18",
"resetTargetMorph" : "FH 8/1/2021 18:48",
"saveAnimations" : "FH 8/1/2021 18:48",
"savedAnimationText" : "mjs 7/31/2021 15:08",
Expand All @@ -88,6 +82,8 @@
"timelines:" : "DM 8/6/2020 10:53",
"toolBuilder" : "JIZ 6/3/2020 17:00",
"toolBuilder:" : "JIZ 6/3/2020 16:59",
"treeSpec" : "FH 8/1/2021 18:27",
"treeSpec:" : "FH 8/1/2021 18:27",
"updateInformationText:" : "FH 8/1/2021 18:50",
"windowReference" : "DM 8/4/2020 13:19",
"windowReference:" : "DM 8/4/2020 13:19" } }
1 change: 1 addition & 0 deletions packages/AnimationsEditor-Core.package/AnimationsEditor.class/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"propertyList",
"selectedTreeNode",
"toolBuilder",
"treeSpec",
"propertyEditorPanelChildren",
"mainWindow",
"informationBarText",
Expand Down
9 changes: 0 additions & 9 deletions ...nsEditorKeyframe.class/class/on.withPosition.withFrame.withValue.withAnimationsEditor..st
View file

This file was deleted.

3 changes: 0 additions & 3 deletions ...nimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/animationsEditor..st
View file

This file was deleted.

3 changes: 0 additions & 3 deletions ...AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/animationsEditor.st
View file

This file was deleted.

3 changes: 0 additions & 3 deletions ...nimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/handlesMouseDown..st
View file

This file was deleted.

7 changes: 0 additions & 7 deletions packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/mouseDown..st
View file

This file was deleted.

14 changes: 0 additions & 14 deletions ...s/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/selectProperty.st
View file

This file was deleted.

8 changes: 0 additions & 8 deletions ...AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/setValueAndFrame.st
View file

This file was deleted.

4 changes: 1 addition & 3 deletions packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"class" : {
"on:withPosition:withFrame:withValue:" : "FH 8/1/2021 19:05",
"on:withPosition:withFrame:withValue:withAnimationsEditor:" : "SG 6/17/2022 15:45" },
"on:withPosition:withFrame:withValue:" : "FH 8/1/2021 19:05" },
"instance" : {
"defaultColor" : "ps 7/11/2022 00:40",
"frame" : "mjs 7/31/2021 15:46",
Expand All @@ -11,7 +10,6 @@
"initialize" : "ps 7/11/2022 00:40",
"mouseOverColor" : "ps 7/11/2022 00:40",
"setCenteredPosition:" : "FH 8/1/2021 19:04",
"setValueAndFrame" : "SG 6/25/2022 16:10",
"track" : "mjs 7/31/2021 15:46",
"track:" : "mjs 7/31/2021 15:46",
"value:" : "mjs 7/31/2021 15:46" } }
3 changes: 1 addition & 2 deletions packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
"instvars" : [
"track",
"frame",
"value",
"animationsEditor" ],
"value" ],
"name" : "AnimationsEditorKeyframe",
"pools" : [
],
Expand Down
10 changes: 1 addition & 9 deletions ...imationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/instance/initialize.st
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
initialization
initialize


super initialize.
self isActivated: false.
self addStartFrame.
"self process: [
[ 1 seconds asDelay wait.
self targetMorph isInWorld ifFalse: [self animationsEditor deleteMorph: self process.].
] repeat.
] fork."
self addStartFrame.
3 changes: 0 additions & 3 deletions ...AnimationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/instance/process..st
View file

This file was deleted.

3 changes: 0 additions & 3 deletions .../AnimationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/instance/process.st
View file

This file was deleted.

7 changes: 1 addition & 6 deletions ...nimationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,18 @@
"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 7/12/2022 18:51",
"defaultFrame" : "MH 7/8/2021 11:33",
"defaultValue" : "MH 7/8/2021 11:33",
"executeCompositeAnimation:" : "FH 8/1/2021 19:11",
"frame" : "MH 7/8/2021 11:08",
"frame:" : "MH 7/8/2021 11:10",
"initialize" : "NR 7/16/2022 16:50",
"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",
"messageKeyframeOutOfBounds" : "MH 7/8/2021 11:36",
"messageNotEnoughKeyframes" : "CL 7/29/2021 12:05",
"playAnimationWithStartEnd:" : "FH 8/1/2021 19:12",
"process" : "ob 7/12/2022 22:34",
"process:" : "ob 7/12/2022 22:34",
"resetTargetMorph" : "LW 7/9/2021 15:34",
"setAnimationProperty:" : "MH 7/8/2021 11:03",
"setStartValue" : "MH 7/8/2021 11:31",
Expand Down
4 changes: 1 addition & 3 deletions ...ages/AnimationsEditor-Core.package/AnimationsEditorPropertyAnimated.class/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
"targetDuration",
"targetFrame",
"targetValues",
"currentValue",
"isActivated",
"process" ],
"currentValue" ],
"name" : "AnimationsEditorPropertyAnimated",
"pools" : [
],
Expand Down
Loading

0 comments on commit 6e6d831

Please sign in to comment.