Skip to content

Commit

Permalink
Rename M2ColorPalette>>squeakPaint to morphicMonet
Browse files Browse the repository at this point in the history
  • Loading branch information
@MariusDoe
MariusDoe committed Aug 5, 2022
1 parent 25d4fae commit da814ad
Show file tree
Hide file tree
Showing 18 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion packages/SketchMorph2-Core.package/MorphicMonet.class/instance/colorPalette.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
accessing
colorPalette
^ colorPalette ifNil: [colorPalette := M2ColorPalette newWithSqueakPaint: self]
^ colorPalette ifNil: [colorPalette := M2ColorPalette newWithMorphicMonet: self]
2 changes: 1 addition & 1 deletion packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"chooseColor" : "md 7/31/2022 18:53",
"clearCanvas" : "md 8/2/2022 15:22",
"clickMenuItemWith:" : "CS 8/5/2021 22:13",
"colorPalette" : "NC 6/18/2020 11:39",
"colorPalette" : "md 8/5/2022 20:21",
"colorPanel" : "mFr 5/19/2021 10:59",
"colorPanel:" : "mFr 5/19/2021 10:59",
"colorPicker" : "mFr 5/19/2021 10:59",
Expand Down
2 changes: 1 addition & 1 deletion packages/SketchMorph2-UI.package/.squot-contents
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ SquotTrackedObjectMetadata {
#objectClassName : #PackageInfo,
#objectsReplacedByNames : true,
#serializer : #SquotCypressCodeSerializer
}
}
2 changes: 1 addition & 1 deletion packages/SketchMorph2-UI.package/M2ColorMorph.class/instance/initialize.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ initialize
super initialize.
self
onColor: self initialColor offColor: self initialColor;
model: self palette squeakPaint;
model: self palette morphicMonet;
action: #setColor:;
arguments: {self offColor};
triggerOnMouseDown: true;
Expand Down
2 changes: 1 addition & 1 deletion packages/SketchMorph2-UI.package/M2ColorMorph.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"defaultColorMorphBorderWidth" : "mFr 5/18/2021 17:41",
"initialColor" : "mFr 5/18/2021 17:41",
"initialColor:" : "mFr 5/18/2021 17:41",
"initialize" : "mFr 5/19/2021 12:55",
"initialize" : "md 8/5/2022 20:19",
"isM2ColorMorph" : "mFr 5/17/2021 11:45",
"palette" : "mFr 5/18/2021 17:41",
"palette:" : "mFr 5/18/2021 17:40" } }
5 changes: 5 additions & 0 deletions packages/SketchMorph2-UI.package/M2ColorPalette.class/class/newWithMorphicMonet..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
instance creation
newWithMorphicMonet: aMorphicMonet
^ self basicNew
morphicMonet: aMorphicMonet;
initialize
5 changes: 0 additions & 5 deletions packages/SketchMorph2-UI.package/M2ColorPalette.class/class/newWithSqueakPaint..st
View file

This file was deleted.

3 changes: 3 additions & 0 deletions packages/SketchMorph2-UI.package/M2ColorPalette.class/instance/morphicMonet..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
morphicMonet: aMorphicMonet
morphicMonet := aMorphicMonet
3 changes: 3 additions & 0 deletions packages/SketchMorph2-UI.package/M2ColorPalette.class/instance/morphicMonet.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
morphicMonet
^ morphicMonet
3 changes: 0 additions & 3 deletions packages/SketchMorph2-UI.package/M2ColorPalette.class/instance/squeakPaint..st
View file

This file was deleted.

3 changes: 0 additions & 3 deletions packages/SketchMorph2-UI.package/M2ColorPalette.class/instance/squeakPaint.st
View file

This file was deleted.

6 changes: 3 additions & 3 deletions packages/SketchMorph2-UI.package/M2ColorPalette.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"class" : {
"newWithSqueakPaint:" : "CS 8/5/2021 17:52" },
"newWithMorphicMonet:" : "md 8/5/2022 20:21" },
"instance" : {
"buttons" : "mFr 5/18/2021 17:40",
"buttons:" : "mFr 5/18/2021 17:43",
Expand All @@ -10,9 +10,9 @@
"customizableButtons:" : "mFr 5/18/2021 17:43",
"defaultButtonsPerRow" : "mFr 7/14/2021 17:23",
"initialize" : "mFr 7/14/2021 17:37",
"morphicMonet" : "md 8/5/2022 20:19",
"morphicMonet:" : "md 8/5/2022 20:19",
"numberOfRows" : "CS 8/5/2021 18:02",
"rowPanelCollection" : "CS 8/5/2021 18:08",
"squeakPaint" : "mFr 5/18/2021 17:42",
"squeakPaint:" : "CS 8/5/2021 17:54",
"uncustomizableButtons" : "CS 8/5/2021 17:54",
"uncustomizableButtons:" : "mFr 5/18/2021 17:42" } }
4 changes: 2 additions & 2 deletions packages/SketchMorph2-UI.package/M2ColorPalette.class/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"instvars" : [
"buttons",
"customizableButtons",
"squeakPaint",
"uncustomizableButtons" ],
"uncustomizableButtons",
"morphicMonet" ],
"name" : "M2ColorPalette",
"pools" : [
],
Expand Down
2 changes: 1 addition & 1 deletion packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/colorPicker.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
accessing
colorPicker
^ self squeakPaint colorPicker
^ self morphicMonet colorPicker
2 changes: 1 addition & 1 deletion packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/initialModel.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ initialModel
| userColor |
userColor := self selectedColor.
self onColor: userColor offColor: userColor].
self palette squeakPaint setColor: self offColor]
self palette morphicMonet setColor: self offColor]
3 changes: 3 additions & 0 deletions packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/morphicMonet.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
morphicMonet
^ self palette morphicMonet
3 changes: 0 additions & 3 deletions packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/squeakPaint.st
View file

This file was deleted.

8 changes: 4 additions & 4 deletions packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"class" : {
"on:" : "CS 8/5/2021 17:43" },
"instance" : {
"colorPicker" : "SW 8/5/2022 15:32",
"colorPicker" : "md 8/5/2022 20:19",
"helpText" : "K.P. 5/29/2021 14:34",
"initialModel" : "CS 8/6/2021 18:34",
"initialModel" : "md 8/5/2022 20:19",
"initialize" : "CS 8/6/2021 18:35",
"morphicMonet" : "md 8/5/2022 20:19",
"mouseDown:" : "CS 8/5/2021 17:50",
"selectedColor" : "SW 8/5/2022 15:32",
"squeakPaint" : "SW 8/5/2022 15:32" } }
"selectedColor" : "SW 8/5/2022 15:32" } }

0 comments on commit da814ad

Please sign in to comment.