diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/colorPalette.st b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/colorPalette.st index 24897150..3572fb30 100644 --- a/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/colorPalette.st +++ b/packages/SketchMorph2-Core.package/MorphicMonet.class/instance/colorPalette.st @@ -1,3 +1,3 @@ accessing colorPalette - ^ colorPalette ifNil: [colorPalette := M2ColorPalette newWithSqueakPaint: self] + ^ colorPalette ifNil: [colorPalette := M2ColorPalette newWithMorphicMonet: self] diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json b/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json index 8f94f6a0..705ba4df 100644 --- a/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json +++ b/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json @@ -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", diff --git a/packages/SketchMorph2-UI.package/.squot-contents b/packages/SketchMorph2-UI.package/.squot-contents index b97110af..239ddebb 100644 --- a/packages/SketchMorph2-UI.package/.squot-contents +++ b/packages/SketchMorph2-UI.package/.squot-contents @@ -2,4 +2,4 @@ SquotTrackedObjectMetadata { #objectClassName : #PackageInfo, #objectsReplacedByNames : true, #serializer : #SquotCypressCodeSerializer -} +} \ No newline at end of file diff --git a/packages/SketchMorph2-UI.package/M2ColorMorph.class/instance/initialize.st b/packages/SketchMorph2-UI.package/M2ColorMorph.class/instance/initialize.st index ae6c6fa0..91566667 100644 --- a/packages/SketchMorph2-UI.package/M2ColorMorph.class/instance/initialize.st +++ b/packages/SketchMorph2-UI.package/M2ColorMorph.class/instance/initialize.st @@ -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; diff --git a/packages/SketchMorph2-UI.package/M2ColorMorph.class/methodProperties.json b/packages/SketchMorph2-UI.package/M2ColorMorph.class/methodProperties.json index f6d508df..9b944b78 100644 --- a/packages/SketchMorph2-UI.package/M2ColorMorph.class/methodProperties.json +++ b/packages/SketchMorph2-UI.package/M2ColorMorph.class/methodProperties.json @@ -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" } } diff --git a/packages/SketchMorph2-UI.package/M2ColorPalette.class/class/newWithMorphicMonet..st b/packages/SketchMorph2-UI.package/M2ColorPalette.class/class/newWithMorphicMonet..st new file mode 100644 index 00000000..32dcc220 --- /dev/null +++ b/packages/SketchMorph2-UI.package/M2ColorPalette.class/class/newWithMorphicMonet..st @@ -0,0 +1,5 @@ +instance creation +newWithMorphicMonet: aMorphicMonet + ^ self basicNew + morphicMonet: aMorphicMonet; + initialize diff --git a/packages/SketchMorph2-UI.package/M2ColorPalette.class/class/newWithSqueakPaint..st b/packages/SketchMorph2-UI.package/M2ColorPalette.class/class/newWithSqueakPaint..st deleted file mode 100644 index b12c3ac3..00000000 --- a/packages/SketchMorph2-UI.package/M2ColorPalette.class/class/newWithSqueakPaint..st +++ /dev/null @@ -1,5 +0,0 @@ -instance creation -newWithSqueakPaint: aSqueakPaint - ^ self basicNew - squeakPaint: aSqueakPaint; - initialize diff --git a/packages/SketchMorph2-UI.package/M2ColorPalette.class/instance/morphicMonet..st b/packages/SketchMorph2-UI.package/M2ColorPalette.class/instance/morphicMonet..st new file mode 100644 index 00000000..2d8821ee --- /dev/null +++ b/packages/SketchMorph2-UI.package/M2ColorPalette.class/instance/morphicMonet..st @@ -0,0 +1,3 @@ +accessing +morphicMonet: aMorphicMonet + morphicMonet := aMorphicMonet diff --git a/packages/SketchMorph2-UI.package/M2ColorPalette.class/instance/morphicMonet.st b/packages/SketchMorph2-UI.package/M2ColorPalette.class/instance/morphicMonet.st new file mode 100644 index 00000000..29ae2547 --- /dev/null +++ b/packages/SketchMorph2-UI.package/M2ColorPalette.class/instance/morphicMonet.st @@ -0,0 +1,3 @@ +accessing +morphicMonet + ^ morphicMonet diff --git a/packages/SketchMorph2-UI.package/M2ColorPalette.class/instance/squeakPaint..st b/packages/SketchMorph2-UI.package/M2ColorPalette.class/instance/squeakPaint..st deleted file mode 100644 index d04dbe86..00000000 --- a/packages/SketchMorph2-UI.package/M2ColorPalette.class/instance/squeakPaint..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -squeakPaint: aSqueakPaint - squeakPaint := aSqueakPaint diff --git a/packages/SketchMorph2-UI.package/M2ColorPalette.class/instance/squeakPaint.st b/packages/SketchMorph2-UI.package/M2ColorPalette.class/instance/squeakPaint.st deleted file mode 100644 index 69aa62d2..00000000 --- a/packages/SketchMorph2-UI.package/M2ColorPalette.class/instance/squeakPaint.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -squeakPaint - ^ squeakPaint diff --git a/packages/SketchMorph2-UI.package/M2ColorPalette.class/methodProperties.json b/packages/SketchMorph2-UI.package/M2ColorPalette.class/methodProperties.json index 40e273c7..6c7455f0 100644 --- a/packages/SketchMorph2-UI.package/M2ColorPalette.class/methodProperties.json +++ b/packages/SketchMorph2-UI.package/M2ColorPalette.class/methodProperties.json @@ -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", @@ -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" } } diff --git a/packages/SketchMorph2-UI.package/M2ColorPalette.class/properties.json b/packages/SketchMorph2-UI.package/M2ColorPalette.class/properties.json index 5d667465..8f1d7514 100644 --- a/packages/SketchMorph2-UI.package/M2ColorPalette.class/properties.json +++ b/packages/SketchMorph2-UI.package/M2ColorPalette.class/properties.json @@ -8,8 +8,8 @@ "instvars" : [ "buttons", "customizableButtons", - "squeakPaint", - "uncustomizableButtons" ], + "uncustomizableButtons", + "morphicMonet" ], "name" : "M2ColorPalette", "pools" : [ ], diff --git a/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/colorPicker.st b/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/colorPicker.st index ac0ec835..274f60e1 100644 --- a/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/colorPicker.st +++ b/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/colorPicker.st @@ -1,3 +1,3 @@ accessing colorPicker - ^ self squeakPaint colorPicker + ^ self morphicMonet colorPicker diff --git a/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/initialModel.st b/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/initialModel.st index 19b78610..9f11546d 100644 --- a/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/initialModel.st +++ b/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/initialModel.st @@ -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] diff --git a/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/morphicMonet.st b/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/morphicMonet.st new file mode 100644 index 00000000..60de9994 --- /dev/null +++ b/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/morphicMonet.st @@ -0,0 +1,3 @@ +accessing +morphicMonet + ^ self palette morphicMonet diff --git a/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/squeakPaint.st b/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/squeakPaint.st deleted file mode 100644 index 4608516e..00000000 --- a/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/instance/squeakPaint.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -squeakPaint - ^ self palette squeakPaint diff --git a/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/methodProperties.json b/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/methodProperties.json index dcc462ef..92954c55 100644 --- a/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/methodProperties.json +++ b/packages/SketchMorph2-UI.package/M2CustomizableColorMorph.class/methodProperties.json @@ -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" } }