From c9fc7d9f16251c4f7e6d47b7bef65052193bd642 Mon Sep 17 00:00:00 2001 From: Jannes Konarski Date: Wed, 19 Jun 2024 22:01:15 +0200 Subject: [PATCH] made mighty fine ui --- .../instance/addChoices..st | 7 ++++++ .../instance/addConfirmButton..st | 10 ++++++++ .../instance/addInputFieldFor..st | 14 +++++++++++ .../instance/addNextButton..st | 10 ++++++++ .../instance/addTextFieldFor.with..st | 12 +++++++++ .../instance/addTextInputFor..st | 19 ++++++++++++++ .../instance/addTypeOption.st | 25 +++++-------------- .../TCUChatPollEditor.class/instance/chat..st | 2 +- .../TCUChatPollEditor.class/instance/chat.st | 2 +- .../TCUChatPollEditor.class/instance/clear.st | 4 +++ .../instance/confirmPressed.st | 4 +++ .../instance/createNameSetter.st | 14 +++++++++++ .../instance/createTypeOption.st | 17 +++++++++++++ .../instance/currentSelection..st | 4 +++ .../instance/currentSelection.st | 4 +++ .../instance/initialize.st | 4 +-- .../instance/newSelection..st | 7 ++++++ .../instance/nextPressed.st | 5 ++++ .../instance/typeOption..st | 2 +- .../instance/typeOption.st | 2 +- .../methodProperties.json | 19 +++++++++++--- .../TCUChatPollEditor.class/properties.json | 3 ++- .../instance/addPollButton.st | 2 +- .../TCUChatWindow.class/instance/clear.st | 2 ++ .../instance/createPollEditor.st | 6 +++++ .../instance/newChatSelected..st | 3 +-- .../TCUChatWindow.class/methodProperties.json | 9 +++---- .../TCUChoice.class/class/newFor..st | 8 ++++++ .../instance/addSelectionMorph.st | 6 ++--- .../TCUChoice.class/instance/initialize.st | 2 +- .../TCUChoice.class/instance/updateChoice.st | 2 +- .../TCUChoice.class/methodProperties.json | 10 +++----- .../TCUChoice.class/properties.json | 3 ++- .../TCUChoiceExclusive.class/README.md | 0 .../class/newFor.inPoll..st | 9 +++++++ .../instance/addSelectionMorph.st | 8 ++++++ .../instance/poll..st | 4 +++ .../TCUChoiceExclusive.class/instance/poll.st | 4 +++ .../instance/updateChoice.st | 10 ++++++++ .../methodProperties.json | 8 ++++++ .../TCUChoiceExclusive.class/properties.json | 14 +++++++++++ 41 files changed, 250 insertions(+), 50 deletions(-) create mode 100644 packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addChoices..st create mode 100644 packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addConfirmButton..st create mode 100644 packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addInputFieldFor..st create mode 100644 packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addNextButton..st create mode 100644 packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addTextFieldFor.with..st create mode 100644 packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addTextInputFor..st create mode 100644 packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/clear.st create mode 100644 packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/confirmPressed.st create mode 100644 packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/createNameSetter.st create mode 100644 packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/createTypeOption.st create mode 100644 packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/currentSelection..st create mode 100644 packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/currentSelection.st create mode 100644 packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/newSelection..st create mode 100644 packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/nextPressed.st create mode 100644 packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createPollEditor.st create mode 100644 packages/TelegramClient-UI.package/TCUChoice.class/class/newFor..st create mode 100644 packages/TelegramClient-UI.package/TCUChoiceExclusive.class/README.md create mode 100644 packages/TelegramClient-UI.package/TCUChoiceExclusive.class/class/newFor.inPoll..st create mode 100644 packages/TelegramClient-UI.package/TCUChoiceExclusive.class/instance/addSelectionMorph.st create mode 100644 packages/TelegramClient-UI.package/TCUChoiceExclusive.class/instance/poll..st create mode 100644 packages/TelegramClient-UI.package/TCUChoiceExclusive.class/instance/poll.st create mode 100644 packages/TelegramClient-UI.package/TCUChoiceExclusive.class/instance/updateChoice.st create mode 100644 packages/TelegramClient-UI.package/TCUChoiceExclusive.class/methodProperties.json create mode 100644 packages/TelegramClient-UI.package/TCUChoiceExclusive.class/properties.json diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addChoices..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addChoices..st new file mode 100644 index 000000000..e845cf51c --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addChoices..st @@ -0,0 +1,7 @@ +drawing +addChoices: aRectangle + + aRectangle addMorph: (TCUChoice newFor: 'Anonymous Poll?'); + addMorph: (TCUChoiceExclusive newFor: 'Standard Poll' inPoll: self); + addMorph: (TCUChoiceExclusive newFor: 'Multiple Options' inPoll: self); + addMorph: (TCUChoiceExclusive newFor: 'Quiz' inPoll: self). \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addConfirmButton..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addConfirmButton..st new file mode 100644 index 000000000..939003857 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addConfirmButton..st @@ -0,0 +1,10 @@ +drawing +addConfirmButton: aRectangle + + |confirmButton| + + confirmButton := TCUButton new. + confirmButton text: 'Confirm'; + on: #mouseUp send: #confirmPressed to: self. + + aRectangle addMorph: confirmButton. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addInputFieldFor..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addInputFieldFor..st new file mode 100644 index 000000000..8457eb1ae --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addInputFieldFor..st @@ -0,0 +1,14 @@ +drawing +addInputFieldFor: aRectangle + + |inputField| + inputField := (TextMorph new + borderWidth: 2; + borderColor: TCUDefaultValues colorLightBlue; + color: Color white; + contentsWrapped: '' asText; + extent: 200 @ 20; + "crAction: [self buttonSendPressed]; + " yourself). + aRectangle addMorph: inputField. + \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addNextButton..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addNextButton..st new file mode 100644 index 000000000..fbde94090 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addNextButton..st @@ -0,0 +1,10 @@ +drawing +addNextButton: aRectangle + + |nextButton| + + nextButton := TCUButton new. + nextButton text: 'Next'; + on: #mouseUp send: #nextPressed to: self. + + aRectangle addMorph: nextButton. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addTextFieldFor.with..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addTextFieldFor.with..st new file mode 100644 index 000000000..d036ecf87 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addTextFieldFor.with..st @@ -0,0 +1,12 @@ +drawing +addTextFieldFor: aRectangle with: aString + + |text| + text := (TextMorph new + contents: aString; + extent: 20 @ 20; + readOnly: true; + color: Color white; + lock; + yourself). + aRectangle addMorph: text. diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addTextInputFor..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addTextInputFor..st new file mode 100644 index 000000000..9cff0e307 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addTextInputFor..st @@ -0,0 +1,19 @@ +drawing +addTextInputFor: aString + + | morph| + morph := (RectangleMorph new + borderWidth: 0; + color: TCUDefaultValues colorNileBlue; + layoutPolicy: TableLayout new; + listDirection: #leftToRight; + wrapDirection: #leftToRight; + wrapCentering: #topLeft; + layoutInset: 2; + hResizing: #shrinkWrap; + vResizing: #shrinkWrap; + yourself). + + self addInputFieldFor: morph. + self addTextFieldFor: morph with: aString. + ^ morph. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addTypeOption.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addTypeOption.st index 81436987e..2c5a166c2 100644 --- a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addTypeOption.st +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/addTypeOption.st @@ -1,23 +1,10 @@ -as yet unclassified +drawing addTypeOption - self typeOption: (RectangleMorph new - color: TCUDefaultValues colorLightBlue; - useRoundedCorners; - layoutPolicy: TableLayout new; - listDirection: #leftToRight; - wrapDirection: #topToBottom; - wrapCentering: #topLeft; - layoutInset: 2; - hResizing: #shrinkWrap; - vResizing: #shrinkWrap; - cellInset: 8; - addMorph: (TCUChoice newFor: 'Anonymous Poll?' isExclusive: false); - addMorph: (TCUChoice newFor: 'Standard Poll' isExclusive: true); - addMorph: (TCUChoice newFor: 'Multiple Options' isExclusive: true); - addMorph: (TCUChoice newFor: 'Quiz' isExclusive: true); - yourself). - - self addMorphFront: self typeOption. + self createTypeOption; + addTextFieldFor: self typeOption with: 'Customize your poll!'; + addChoices: self typeOption; + addNextButton: self typeOption; + addMorphFront: self typeOption. self typeOption center: self center. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/chat..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/chat..st index 0fcab42a8..de02cfb96 100644 --- a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/chat..st +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/chat..st @@ -1,4 +1,4 @@ -as yet unclassified +accessing chat: aChat chat := aChat \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/chat.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/chat.st index cfd52aac7..207f37ad7 100644 --- a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/chat.st +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/chat.st @@ -1,4 +1,4 @@ -as yet unclassified +accessing chat ^ chat \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/clear.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/clear.st new file mode 100644 index 000000000..ac2b3d163 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/clear.st @@ -0,0 +1,4 @@ +drawing +clear + + self abandon. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/confirmPressed.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/confirmPressed.st new file mode 100644 index 000000000..c0c1bb2b9 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/confirmPressed.st @@ -0,0 +1,4 @@ +event handling +confirmPressed + + self abandon. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/createNameSetter.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/createNameSetter.st new file mode 100644 index 000000000..041701b5b --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/createNameSetter.st @@ -0,0 +1,14 @@ +drawing +createNameSetter + + self createTypeOption; + addTextFieldFor: self typeOption with: 'Describe your poll!'. + self typeOption addMorph: (self addTextInputFor: 'Title'); + addMorph: (self addTextInputFor: 'Option 1'); + addMorph: (self addTextInputFor: 'Option 2'); + addMorph: (self addTextInputFor: 'Option 3'). + + self addConfirmButton: self typeOption; + addMorphFront: self typeOption. + + self typeOption center: self center. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/createTypeOption.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/createTypeOption.st new file mode 100644 index 000000000..085dd80a9 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/createTypeOption.st @@ -0,0 +1,17 @@ +drawing +createTypeOption + + self typeOption: + (RectangleMorph new + color: TCUDefaultValues colorNileBlue; + extent: 200@200; + useRoundedCorners; + layoutPolicy: TableLayout new; + listDirection: #leftToRight; + wrapDirection: #bottomToTop; + wrapCentering: #topLeft; + layoutInset: 2; + hResizing: #shrinkWrap; + vResizing: #shrinkWrap; + cellInset: 8; + yourself). \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/currentSelection..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/currentSelection..st new file mode 100644 index 000000000..4bdb1ec90 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/currentSelection..st @@ -0,0 +1,4 @@ +accessing +currentSelection: aChoice + + currentSelection := aChoice \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/currentSelection.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/currentSelection.st new file mode 100644 index 000000000..205c9db19 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/currentSelection.st @@ -0,0 +1,4 @@ +accessing +currentSelection + + ^ currentSelection \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/initialize.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/initialize.st index 3128f1e1c..f23be2d0b 100644 --- a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/initialize.st +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/initialize.st @@ -1,4 +1,4 @@ -as yet unclassified +initialization initialize super initialize. @@ -6,5 +6,5 @@ initialize self color: (TCUDefaultValues colorLightGray alpha: 0.8); borderWidth: 0; - on: #mouseUp send: #hide to: self. + on: #mouseUp send: #clear to: self. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/newSelection..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/newSelection..st new file mode 100644 index 000000000..97717b0f3 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/newSelection..st @@ -0,0 +1,7 @@ +event handling +newSelection: aChoice + + (self currentSelection) ifNotNil: [ + self currentSelection updateChoice]. + + self currentSelection: aChoice. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/nextPressed.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/nextPressed.st new file mode 100644 index 000000000..0e0067c60 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/nextPressed.st @@ -0,0 +1,5 @@ +event handling +nextPressed + + self typeOption abandon. + self createNameSetter. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/typeOption..st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/typeOption..st index 8cf40cd45..9eda4913a 100644 --- a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/typeOption..st +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/typeOption..st @@ -1,4 +1,4 @@ -as yet unclassified +accessing typeOption: aRectangleMorph typeOption := aRectangleMorph \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/typeOption.st b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/typeOption.st index 66a8728d2..d985c7908 100644 --- a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/typeOption.st +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/instance/typeOption.st @@ -1,4 +1,4 @@ -as yet unclassified +accessing typeOption ^ typeOption \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/methodProperties.json index ebfca8317..b2bc30347 100644 --- a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/methodProperties.json @@ -2,10 +2,23 @@ "class" : { "newFor:withBounds:" : "jkon 6/17/2024 11:14" }, "instance" : { - "addChoices" : "jkon 6/17/2024 15:50", - "addTypeOption" : "jkon 6/17/2024 16:06", + "addChoices:" : "jkon 6/19/2024 21:34", + "addConfirmButton:" : "jkon 6/18/2024 10:05", + "addInputFieldFor:" : "jkon 6/19/2024 21:44", + "addNextButton:" : "jkon 6/19/2024 18:50", + "addTextFieldFor:with:" : "jkon 6/18/2024 13:31", + "addTextInputFor:" : "jkon 6/19/2024 21:41", + "addTypeOption" : "jkon 6/19/2024 21:29", "chat" : "jkon 6/17/2024 10:29", "chat:" : "jkon 6/17/2024 10:29", - "initialize" : "jkon 6/17/2024 15:58", + "clear" : "jkon 6/18/2024 13:40", + "confirmPressed" : "jkon 6/19/2024 18:52", + "createNameSetter" : "jkon 6/19/2024 21:33", + "createTypeOption" : "jkon 6/19/2024 21:48", + "currentSelection" : "jkon 6/19/2024 18:39", + "currentSelection:" : "jkon 6/19/2024 18:40", + "initialize" : "jkon 6/18/2024 13:39", + "newSelection:" : "jkon 6/19/2024 18:39", + "nextPressed" : "jkon 6/19/2024 18:51", "typeOption" : "jkon 6/17/2024 11:03", "typeOption:" : "jkon 6/17/2024 11:03" } } diff --git a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/properties.json b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/properties.json index e5478bf7d..2d12af58a 100644 --- a/packages/TelegramClient-UI.package/TCUChatPollEditor.class/properties.json +++ b/packages/TelegramClient-UI.package/TCUChatPollEditor.class/properties.json @@ -10,7 +10,8 @@ "typeOption", "selectionMorph", "textMorph", - "isSelected" ], + "isSelected", + "currentSelection" ], "name" : "TCUChatPollEditor", "pools" : [ ], diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addPollButton.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addPollButton.st index 76a95903c..7f7d155e1 100644 --- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addPollButton.st +++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/addPollButton.st @@ -4,7 +4,7 @@ addPollButton self pollButton: (TCUButton new extent: 50 @ 30; text: '|||'; - on: #mouseUp send: #showPollEditor to: self; + on: #mouseUp send: #createPollEditor to: self; name: 'openPollEditor'; yourself). self inputBar addMorph: self pollButton. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/clear.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/clear.st index c2ce4b1ce..9e7c63b42 100644 --- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/clear.st +++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/clear.st @@ -6,5 +6,7 @@ clear self welcomeMessage show. self chatMessageList hide. self infoPage hide. + self pollEditor ifNotNil: [self pollEditor abandon. + self pollEditor: nil]. self stickerWindow ifNotNil: [self stickerWindow close. self stickerWindow: nil]. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createPollEditor.st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createPollEditor.st new file mode 100644 index 000000000..f669f7942 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/createPollEditor.st @@ -0,0 +1,6 @@ +drawing +createPollEditor + + self + pollEditor: (TCUChatPollEditor newFor: self selectedChat withBounds: self bounds); + addMorphFront: self pollEditor. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/newChatSelected..st b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/newChatSelected..st index 1ef39bc88..d80e558e0 100644 --- a/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/newChatSelected..st +++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/instance/newChatSelected..st @@ -13,8 +13,7 @@ newChatSelected: aChat self selectedChat: aChat; addTitleBar; - addHiddenInfoPage; - addHiddenPollEditor. + addHiddenInfoPage. self chatMessageList show. self chatMessageList displayChat: aChat. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json index e7c75e595..16e334531 100644 --- a/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUChatWindow.class/methodProperties.json @@ -7,10 +7,9 @@ "addChatMessageList" : "JB 7/6/2021 14:03", "addChatTitle" : "RK 8/4/2021 12:06", "addHiddenInfoPage" : "per 6/15/2021 09:02", - "addHiddenPollEditor" : "jkon 6/17/2024 10:25", "addInputBar" : "jkon 6/17/2024 09:54", "addMemberCount" : "RK 8/4/2021 12:06", - "addPollButton" : "jkon 6/17/2024 10:19", + "addPollButton" : "jkon 6/18/2024 13:38", "addReplyMessage" : "JS 5/22/2022 19:39", "addSendButton" : "ek 6/19/2022 19:07", "addStickerButton" : "JK 5/21/2024 10:07", @@ -21,16 +20,17 @@ "buttonStickerPressed" : "JK 6/5/2024 11:12", "chatMessageList" : "JB 7/6/2021 14:02", "chatMessageList:" : "JB 7/6/2021 14:02", - "clear" : "JK 5/29/2024 20:29", + "clear" : "jkon 6/18/2024 10:48", "core" : "js 8/2/2020 22:11", "createInputBar" : "jkon 6/17/2024 09:59", + "createPollEditor" : "jkon 6/18/2024 13:38", "createTitleBar" : "ek 6/19/2022 19:08", "infoPage" : "RS 5/20/2021 21:14", "infoPage:" : "RS 5/20/2021 21:14", "initialize" : "RS 5/20/2021 19:29", "inputBar" : "rs 6/13/2020 10:38", "inputBar:" : "RK 8/4/2021 10:48", - "newChatSelected:" : "jkon 6/17/2024 10:27", + "newChatSelected:" : "jkon 6/18/2024 13:39", "pollButton" : "jkon 6/17/2024 09:51", "pollButton:" : "jkon 6/17/2024 09:52", "pollEditor" : "jkon 6/17/2024 10:03", @@ -40,7 +40,6 @@ "sendButton" : "ek 6/19/2022 18:53", "sendButton:" : "ek 6/19/2022 18:53", "showInfoPage" : "per 5/30/2021 11:51", - "showPollEditor" : "jkon 6/17/2024 10:19", "stickerButton" : "JK 5/21/2024 10:04", "stickerButton:" : "JK 5/21/2024 10:04", "stickerWindow" : "JK 5/29/2024 14:46", diff --git a/packages/TelegramClient-UI.package/TCUChoice.class/class/newFor..st b/packages/TelegramClient-UI.package/TCUChoice.class/class/newFor..st new file mode 100644 index 000000000..d6b547f51 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChoice.class/class/newFor..st @@ -0,0 +1,8 @@ +as yet unclassified +newFor: aString + + ^ (super new) + content: aString; + addSelectionMorph; + addTextMorph; + yourself \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChoice.class/instance/addSelectionMorph.st b/packages/TelegramClient-UI.package/TCUChoice.class/instance/addSelectionMorph.st index 1f291de06..ba9022e69 100644 --- a/packages/TelegramClient-UI.package/TCUChoice.class/instance/addSelectionMorph.st +++ b/packages/TelegramClient-UI.package/TCUChoice.class/instance/addSelectionMorph.st @@ -1,10 +1,8 @@ as yet unclassified addSelectionMorph - self isExclusive - ifTrue: [selectionMorph := CircleMorph new] - ifFalse: [selectionMorph := RectangleMorph new]. + selectionMorph := RectangleMorph new. selectionMorph - color: TCUDefaultValues colorLightBlue; + color: TCUDefaultValues colorNileBlue; extent: 22@22. self addMorph: selectionMorph. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChoice.class/instance/initialize.st b/packages/TelegramClient-UI.package/TCUChoice.class/instance/initialize.st index 0dad3cfcb..4582d1971 100644 --- a/packages/TelegramClient-UI.package/TCUChoice.class/instance/initialize.st +++ b/packages/TelegramClient-UI.package/TCUChoice.class/instance/initialize.st @@ -3,7 +3,7 @@ initialize super initialize. - self color: TCUDefaultValues colorLightBlue; + self color: TCUDefaultValues colorNileBlue; borderWidth: 0; hResizing: #shrinkWrap; vResizing: #shrinkWrap; diff --git a/packages/TelegramClient-UI.package/TCUChoice.class/instance/updateChoice.st b/packages/TelegramClient-UI.package/TCUChoice.class/instance/updateChoice.st index ec88c761c..70ca559e6 100644 --- a/packages/TelegramClient-UI.package/TCUChoice.class/instance/updateChoice.st +++ b/packages/TelegramClient-UI.package/TCUChoice.class/instance/updateChoice.st @@ -2,7 +2,7 @@ as yet unclassified updateChoice self isSelected - ifTrue: [selectionMorph color: TCUDefaultValues colorLightBlue. + ifTrue: [selectionMorph color: TCUDefaultValues colorNileBlue. self isSelected: false.] ifFalse: [selectionMorph color: Color black. self isSelected: true.] \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChoice.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChoice.class/methodProperties.json index 892c5341d..581019a37 100644 --- a/packages/TelegramClient-UI.package/TCUChoice.class/methodProperties.json +++ b/packages/TelegramClient-UI.package/TCUChoice.class/methodProperties.json @@ -1,16 +1,14 @@ { "class" : { - "newFor:isExclusive:" : "jkon 6/17/2024 15:40" }, + "newFor:" : "jkon 6/19/2024 18:26" }, "instance" : { - "addSelectionMorph" : "jkon 6/17/2024 15:21", + "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/17/2024 15:40", - "isExclusive" : "jkon 6/17/2024 15:16", - "isExclusive:" : "jkon 6/17/2024 15:17", + "initialize" : "jkon 6/18/2024 10:03", "isSelected" : "jkon 6/17/2024 14:52", "isSelected:" : "jkon 6/17/2024 14:52", "selectionMorph" : "jkon 6/17/2024 15:20", "selectionMorph:" : "jkon 6/17/2024 15:20", - "updateChoice" : "jkon 6/17/2024 14:56" } } + "updateChoice" : "jkon 6/18/2024 10:03" } } diff --git a/packages/TelegramClient-UI.package/TCUChoice.class/properties.json b/packages/TelegramClient-UI.package/TCUChoice.class/properties.json index 81d867315..7423d4116 100644 --- a/packages/TelegramClient-UI.package/TCUChoice.class/properties.json +++ b/packages/TelegramClient-UI.package/TCUChoice.class/properties.json @@ -9,7 +9,8 @@ "selectionMorph", "isSelected", "content", - "isExclusive" ], + "isExclusive", + "poll" ], "name" : "TCUChoice", "pools" : [ ], diff --git a/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/README.md b/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/class/newFor.inPoll..st b/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/class/newFor.inPoll..st new file mode 100644 index 000000000..50724e7e7 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/class/newFor.inPoll..st @@ -0,0 +1,9 @@ +as yet unclassified +newFor: aString inPoll: aPoll + + ^ (super new) + content: aString; + poll: aPoll; + addSelectionMorph; + addTextMorph; + yourself \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/instance/addSelectionMorph.st b/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/instance/addSelectionMorph.st new file mode 100644 index 000000000..fc35165b8 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/instance/addSelectionMorph.st @@ -0,0 +1,8 @@ +as yet unclassified +addSelectionMorph + + selectionMorph := CircleMorph new. + selectionMorph + color: TCUDefaultValues colorNileBlue; + extent: 22@22. + self addMorph: selectionMorph. \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/instance/poll..st b/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/instance/poll..st new file mode 100644 index 000000000..d040961e6 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/instance/poll..st @@ -0,0 +1,4 @@ +as yet unclassified +poll: aPoll + + poll := aPoll \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/instance/poll.st b/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/instance/poll.st new file mode 100644 index 000000000..6b6ea58d6 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/instance/poll.st @@ -0,0 +1,4 @@ +as yet unclassified +poll + + ^ poll \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/instance/updateChoice.st b/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/instance/updateChoice.st new file mode 100644 index 000000000..4ab664596 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/instance/updateChoice.st @@ -0,0 +1,10 @@ +as yet unclassified +updateChoice + + self isSelected + ifTrue: [selectionMorph color: TCUDefaultValues colorNileBlue. + self isSelected: false.] + ifFalse: [selectionMorph color: Color black. + self isSelected: true. + poll newSelection: self. + ] \ No newline at end of file diff --git a/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/methodProperties.json b/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/methodProperties.json new file mode 100644 index 000000000..578c33261 --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/methodProperties.json @@ -0,0 +1,8 @@ +{ + "class" : { + "newFor:inPoll:" : "jkon 6/19/2024 18:27" }, + "instance" : { + "addSelectionMorph" : "jkon 6/19/2024 18:28", + "poll" : "jkon 6/19/2024 18:20", + "poll:" : "jkon 6/19/2024 18:21", + "updateChoice" : "jkon 6/19/2024 18:35" } } diff --git a/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/properties.json b/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/properties.json new file mode 100644 index 000000000..9d05e95ee --- /dev/null +++ b/packages/TelegramClient-UI.package/TCUChoiceExclusive.class/properties.json @@ -0,0 +1,14 @@ +{ + "category" : "TelegramClient-UI", + "classinstvars" : [ + ], + "classvars" : [ + ], + "commentStamp" : "", + "instvars" : [ + ], + "name" : "TCUChoiceExclusive", + "pools" : [ + ], + "super" : "TCUChoice", + "type" : "normal" }