Skip to content

Commit

Permalink
Merge origin/develop into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
jkubuni committed Jul 11, 2024
2 parents 4c4d51e + f8f1052 commit 3180b3d
Show file tree
Hide file tree
Showing 35 changed files with 23 additions and 82 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"class" : {
"newFor:withBounds:" : "jkon 7/4/2024 22:57",
"newFor:withBounds:from:" : "jkon 7/5/2024 09:30" },
"instance" : {
"addButtonMenu" : "jkon 7/5/2024 09:30",
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
{
"class" : {
"newFor:withBounds:andSize:" : "TU 6/14/2024 09:29",
"newWithBounds:andPhoto:andSize:" : "jkon 5/22/2024 10:27" },
"instance" : {
"addPhoto" : "jkon 5/22/2024 10:21",
"chat" : "TU 6/14/2024 09:29",
"chat:" : "TU 6/14/2024 09:29",
"initialize" : "jkon 5/15/2024 15:11",
"photo" : "jkon 5/22/2024 10:30",
"photo:" : "jkon 5/22/2024 10:31",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
drawing
addSelectionMorph

selectionMorph := RectangleMorph new.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
drawing
addTextMorph

|textMorph|
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
accessing
content: aString

content := aString
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
accessing
content

^ content
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
initialization
initialize

super initialize.
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
accessing
isSelected: aBoolean

isSelected := aBoolean
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
accessing
isSelected

^ isSelected
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
accessing
name: aString

name := aString
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
accessing
name

^ name
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
accessing
selectionMorph: aMorph

selectionMorph := aMorph
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
accessing
selectionMorph

^ selectionMorph
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
event handling
updateChoice

self isSelected
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
{
"class" : {
"newFor:" : "jkon 6/19/2024 18:26",
"newFor:isExclusive:" : "6/24/2024 10:41:19" },
"newFor:" : "jkon 6/19/2024 18:26" },
"instance" : {
"addSelectionMorph" : "jkon 6/19/2024 18:32",
"addTextMorph" : "jkon 6/17/2024 15:32",
"content" : "jkon 6/17/2024 15:32",
"content:" : "jkon 6/17/2024 15:32",
"initialize" : "jkon 6/18/2024 10:03",
"isExclusive" : "6/24/2024 10:41:19",
"isExclusive:" : "6/24/2024 10:41:19",
"isSelected" : "jkon 6/17/2024 14:52",
"isSelected:" : "jkon 6/17/2024 14:52",
"name" : "jkon 6/27/2024 19:30",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
drawing
addSelectionMorph

selectionMorph := CircleMorph new.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
accessing
poll: aPoll

poll := aPoll
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
accessing
poll

^ poll
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
event handling
updateChoice

self isSelected
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
accessing
addPollOption: anOption

| option |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
accessing
addPollOptions

options := OrderedCollection new.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
event handling
updatePoll

options do: [ :option | option updateSelection ]

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
initialization
initializeWith: aPollMessage and: anOption
| text |

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
event handling
mouseDown: anEvent

pollMessage messageModel optionClicked: pollOption.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
event handling
updateSelection

pollOption isChosen ifTrue: [selectionMorph color: Color black.]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"class" : {
"new" : "TU 6/5/2024 12:08",
"new:" : "6/14/2024 00:26:16",
"new:with:" : "F.M. 6/5/2024 14:49" },
"instance" : {
"initializeWith:and:" : "TU 6/20/2024 21:56",
Expand Down

0 comments on commit 3180b3d

Please sign in to comment.