Squeak-dev October 2020

squeak-dev@lists.squeakfoundation.org

51 participants
394 discussions

The Trunk: WebClient-Core-mt.126.mcz
by commits＠source.squeak.org 01 Oct '20

01 Oct '20

Marcel Taeumel uploaded a new version of WebClient-Core to project The Trunk: http://source.squeak.org/trunk/WebClient-Core-mt.126.mcz ==================== Summary ==================== Name: WebClient-Core-mt.126 Author: mt Time: 1 October 2020, 3:50:05.23448 pm UUID: ac088027-30e2-9c4e-8f43-c1b651186f3d Ancestors: WebClient-Core-mt.124, WebClient-Core-ct.124 Merges WebClient-Core-ct.124 =============== Diff against WebClient-Core-mt.124 =============== Item was changed: ----- Method: WebUtils class>>encodeMultipartForm:boundary: (in category 'decoding') ----- encodeMultipartForm: fieldMap boundary: boundary "Encodes the fieldMap as multipart/form-data. The fieldMap may contain MIMEDocument instances to indicate the presence of a file to upload to the server. If the MIMEDocument is present, its content type and file name will be used for the upload. The fieldMap can be EITHER an array of associations OR a Dictionary of key value pairs (the former is useful for providing multiple fields and/or specifying the order of fields)." ^String streamContents:[:stream| (fieldMap as: Dictionary) keysAndValuesDo:[:fieldName :fieldValue | | fieldContent | "Write multipart boundary and common headers" stream nextPutAll: '--', boundary; crlf. stream nextPutAll: 'Content-Disposition: form-data; name="', fieldName, '"'. "Figure out if this is a file upload" (fieldValue isKindOf: MIMEDocument) ifTrue:[ + stream nextPutAll: '; filename="', fieldValue url pathForFile, '"'; crlf. - stream nextPutAll: ' filename="', fieldValue url pathForFile, '"'; crlf. stream nextPutAll: 'Content-Type: ', fieldValue contentType. fieldContent := (fieldValue content ifNil:[ (FileStream readOnlyFileNamed: fieldValue url pathForFile) contentsOfEntireFile. ]) asString. ] ifFalse: [fieldContent := fieldValue]. stream crlf; crlf. stream nextPutAll: fieldContent asString. stream crlf. ]. stream nextPutAll: '--', boundary, '--', String crlf. ]. !

1 0

The Inbox: WebClient-Core-mt.125.mcz
by commits＠source.squeak.org 01 Oct '20

01 Oct '20

A new version of WebClient-Core was added to project The Inbox: http://source.squeak.org/inbox/WebClient-Core-mt.125.mcz ==================== Summary ==================== Name: WebClient-Core-mt.125 Author: mt Time: 1 October 2020, 3:39:01.65348 pm UUID: 8a9c023e-5992-534e-ba7d-2a824197d979 Ancestors: WebClient-Core-mt.124 Re-commit proposal from WebClient-Core-monty.114 (-> treated) to use more recent codebase. Original commit message follows. (30 October 2017, 2:59 am) Added support for disabling the automatic character decoding of text responses by adding #getContentWithProgress:decodesText:, making #getContentWithProgress: delegate to it, adding #contentWithProgress:decodesText: as a caching front-end and then making #contentWithProgress: delegate to it and #content delegate to #contentWithProgress:. This is needed because some text formats allow encodings to be inferred from the document itself, like from a leading BOM or an XML-style 'encoding="..."?>' declaration, and to give an alternative for situations where the charset is incorrectly inferred and WebClient mangles the response. This is different from HTTP encoding (like with GZIP) which is part of HTTP and is meant to be applied before transit and removed after entirely transparant to the user and so does not permanently alter the original payload, unlike automatic decoding from UTF-8 or another character encoding. =============== Diff against WebClient-Core-mt.124 =============== Item was changed: ----- Method: WebMessage>>getContentWithProgress: (in category 'private') ----- getContentWithProgress: progressBlockOrNil - "Reads available content and returns it." + ^ self getContentWithProgress: progressBlockOrNil decodesText: true! - | length result | - length := self contentLength. - result := (stream isBinary ifTrue:[ ByteArray ] ifFalse: [ ByteString ]) - new: (length ifNil: [ 1000 ]) - streamContents: [ :outputStream | - self - streamFrom: stream - to: outputStream - size: length - progress: progressBlockOrNil ]. - self decoderForContentEncoding ifNotNil: [:decoder | - result := (decoder on: result) upToEnd]. - self textConverterForContentType ifNotNil: [:converter | - [result := result convertFromWithConverter: converter] - on: InvalidUTF8 "some servers lie" - do: [^ result]]. - ^ result - ! Item was added: + ----- Method: WebMessage>>getContentWithProgress:decodesText: (in category 'private') ----- + getContentWithProgress: progressBlockOrNil decodesText: aBoolean + "Reads available content and returns it, periodically evaluating progressBlockOrNil + with the total size and the total bytes read so far, optionally decoding text content + based on the Content-Type charset." + + | length result | + length := self contentLength. + result := (stream isBinary ifTrue:[ ByteArray ] ifFalse: [ ByteString ]) + new: (length ifNil: [ 1000 ]) + streamContents: [ :outputStream | + self + streamFrom: stream + to: outputStream + size: length + progress: progressBlockOrNil ]. + self decoderForContentEncoding ifNotNil: [:decoder | + result := (decoder on: result) upToEnd]. + aBoolean ifTrue: [ + self textConverterForContentType ifNotNil: [:converter | + [result := result convertFromWithConverter: converter] + on: InvalidUTF8 "some servers lie" + do: [^ result]]]. + ^ result! Item was removed: - ----- Method: WebResponse>>getContentWithProgress: (in category 'private') ----- - getContentWithProgress: progressBlockOrNil - "Any response to a HEAD request and any response with a 1xx (Informational), 204 (No Content), or 304 (Not Modified) status code is always terminated by the first empty line after the header fields, regardless of the header fields present in the message, and thus cannot contain a message body. See https://tools.ietf.org/html/rfc7230#section-3.3.3 " - - [ - (request method = 'HEAD' - or: [(code between: 100 and: 199) - or: [code = 204 - or: [code = 304]]]) ifTrue: [^ '']. - - ^ super getContentWithProgress: progressBlockOrNil - - ] ensure: [self closeIfTransient]! Item was added: + ----- Method: WebResponse>>getContentWithProgress:decodesText: (in category 'private') ----- + getContentWithProgress: progressBlockOrNil decodesText: aBoolean + "Any response to a HEAD request and any response with a 1xx (Informational), 204 (No Content), or 304 (Not Modified) status code is always terminated by the first empty line after the header fields, regardless of the header fields present in the message, and thus cannot contain a message body. See https://tools.ietf.org/html/rfc7230#section-3.3.3 " + + [ + (request method = 'HEAD' + or: [(code between: 100 and: 199) + or: [code = 204 + or: [code = 304]]]) ifTrue: [^ '']. + + ^ super getContentWithProgress: progressBlockOrNil decodesText: aBoolean + + ] ensure: [self closeIfTransient]!

1 0

The Trunk: WebClient-Core-mt.124.mcz
by commits＠source.squeak.org 01 Oct '20

01 Oct '20

Marcel Taeumel uploaded a new version of WebClient-Core to project The Trunk: http://source.squeak.org/trunk/WebClient-Core-mt.124.mcz ==================== Summary ==================== Name: WebClient-Core-mt.124 Author: mt Time: 1 October 2020, 3:33:31.12048 pm UUID: ded69be5-bdb0-ea47-9289-4c4d01285b08 Ancestors: WebClient-Core-ul.123 Merges WebClient-Core-monty.113 (-> treated), which fixes the missing #closeIfTransient for #getContentWithProgress:. However, do it differently than proposed, that is, use the template method that is re-used in subclasses. =============== Diff against WebClient-Core-ul.123 =============== Item was removed: - ----- Method: WebResponse>>content (in category 'accessing') ----- - content - "Reimplemented to close the socket if the request is transient" - - content ifNil:[ - content := self getContent. - self closeIfTransient. - ]. - ^content! Item was removed: - ----- Method: WebResponse>>getContent (in category 'private') ----- - getContent - " Any response to a HEAD request and any response with a 1xx - (Informational), 204 (No Content), or 304 (Not Modified) status - code is always terminated by the first empty line after the - header fields, regardless of the header fields present in the - message, and thus cannot contain a message body. - - https://tools.ietf.org/html/rfc7230#section-3.3.3 " - - (request method = 'HEAD' or: [(code between: 100 and: 199) or: [code = 204 or: [code = 304]]]) ifTrue:[^'']. - ^super getContent! Item was added: + ----- Method: WebResponse>>getContentWithProgress: (in category 'private') ----- + getContentWithProgress: progressBlockOrNil + "Any response to a HEAD request and any response with a 1xx (Informational), 204 (No Content), or 304 (Not Modified) status code is always terminated by the first empty line after the header fields, regardless of the header fields present in the message, and thus cannot contain a message body. See https://tools.ietf.org/html/rfc7230#section-3.3.3 " + + [ + (request method = 'HEAD' + or: [(code between: 100 and: 199) + or: [code = 204 + or: [code = 304]]]) ifTrue: [^ '']. + + ^ super getContentWithProgress: progressBlockOrNil + + ] ensure: [self closeIfTransient]!

1 0

The Inbox: Morphic-ct.1692.mcz
by commits＠source.squeak.org 01 Oct '20

01 Oct '20

Christoph Thiede uploaded a new version of Morphic to project The Inbox: http://source.squeak.org/inbox/Morphic-ct.1692.mcz ==================== Summary ==================== Name: Morphic-ct.1692 Author: ct Time: 1 October 2020, 3:27:15.197807 am UUID: 80889aa8-2990-634d-b8f0-b73c6b7f3a02 Ancestors: Morphic-eem.1686 Second version of NewColorPickerMorph rework. Replaces Morphic-ct.1634 which can be moved to the treated inbox. Changelog: - Add pick button to NewColorPickerMorph that allows to pick a color from the Display. With this enhancement, NCPM is finally superior to the old ColorPickerMorph and could now replace the latter by the default preferences. - The color picker keeps live and non-modal; if the picking button is pressed, you can modally choose a color from anywhere on the screen. Press escape, yellow button, or click into the color picker morph to revert to cancel the color picking. - Make the color picker hi-dpi-sensitive. - Remove the pixel-costly 'Current selection:' label (it still survives in the balloon text of the color presenter). - Enable Shout styling in the color expression pane. Thanks for all your feedback on my first attempt! For the full discussion, see http://forum.world.st/The-Inbox-Morphic-ct-1634-mcz-td5112623.html. =============== Diff against Morphic-eem.1686 =============== Item was changed: Morph subclass: #NewColorPickerMorph + instanceVariableNames: 'target setColorSelector hsvaMorph colorPresenter isPicking' - instanceVariableNames: 'target setColorSelector hsvaMorph colorPresenter' classVariableNames: 'UseIt' poolDictionaries: '' category: 'Morphic-Widgets'! !NewColorPickerMorph commentStamp: 'cmm 12/3/2010 13:36' prior: 0! A NewColorPickerMorph is a new widget for choosing colors in Morphic. Instantiate a NewColorPickerMorph: (NewColorPickerMorph on: objectToHaveItsColorSet getColorSelector: itsColorGetterSymbol setColorSelector: itsColorSetterSymbol) openInWorld ! Item was added: + ----- Method: NewColorPickerMorph>>aboutToStyle:requestor: (in category 'styling') ----- + aboutToStyle: styler requestor: requestor + + ^ true! Item was changed: + ----- Method: NewColorPickerMorph>>closeButtonLabel (in category 'accessing - labels') ----- - ----- Method: NewColorPickerMorph>>closeButtonLabel (in category 'initialize-release') ----- closeButtonLabel ^ 'Close' translated! Item was added: + ----- Method: NewColorPickerMorph>>colorPresenterLabel (in category 'accessing - labels') ----- + colorPresenterLabel + + ^ 'Current selection' translated! Item was changed: ----- Method: NewColorPickerMorph>>initialize (in category 'initialize-release') ----- initialize + super initialize. + isPicking := false. + self initializeHsvaMorph.! - self initializeHsvaMorph! Item was added: + ----- Method: NewColorPickerMorph>>isPicking (in category 'accessing') ----- + isPicking + + ^ isPicking! Item was added: + ----- Method: NewColorPickerMorph>>isPicking: (in category 'picking') ----- + isPicking: aBoolean + + isPicking := aBoolean. + self changed: #isPicking. + aBoolean ifTrue: [self pickColor].! Item was changed: ----- Method: NewColorPickerMorph>>newBottomRow (in category 'initialize-release') ----- newBottomRow + ^ Morph new + color: Color transparent; + changeTableLayout; + listDirection: #leftToRight; + hResizing: #spaceFill; vResizing: #shrinkWrap; + height: Preferences standardButtonFont height * 1.5; + cellGap: 4; + addMorphBack: self newPickButton; + addMorphBack: self newColorPresenterMorph; + addMorphBack: self newCloseButton; + yourself! - color: Color transparent ; - changeTableLayout ; - listDirection: #leftToRight ; - hResizing: #spaceFill; vResizing: #shrinkWrap ; - height: 20 ; - cellGap: 4 ; - addMorph: (StringMorph contents: 'Current selection:' translated) ; - addMorphBack: self newColorPresenterMorph ; - addMorphBack: self newCloseButton! Item was changed: ----- Method: NewColorPickerMorph>>newCloseButton (in category 'initialize-release') ----- newCloseButton + ^ (PluggableButtonMorph on: self getState: nil action: #delete label: #closeButtonLabel) + vResizing: #spaceFill; + hResizing: #spaceFill; + yourself! - vResizing: #spaceFill ; - hResizing: #spaceFill; - yourself! Item was changed: ----- Method: NewColorPickerMorph>>newColorExpressionMorph (in category 'initialize-release') ----- newColorExpressionMorph + | inputField builder | builder := ToolBuilder default. + inputField := builder build: (builder pluggableInputFieldSpec new - inputField := (builder build: (builder pluggableInputFieldSpec new model: self; getText: #colorExpression; + setText: #colorExpression:). - setText: #colorExpression:)). inputField + hResizing: #spaceFill; + vResizing: #rigid; + height: Preferences standardButtonFont height * 1.5; + useDefaultStyler. + self changed: #colorExpression. "Necessary to trigger the styler" - hResizing: #spaceFill ; - vResizing: #rigid ; - height: (Preferences standardDefaultTextFont height * 3/2). ^ inputField! Item was changed: ----- Method: NewColorPickerMorph>>newColorPresenterMorph (in category 'initialize-release') ----- newColorPresenterMorph + ^ (ColorPresenterMorph on: hsvaMorph color: #selectedColor) + vResizing: #spaceFill; + hResizing: #spaceFill; + balloonText: self colorPresenterLabel; + yourself! - vResizing: #rigid ; height: 20 ; - hResizing: #spaceFill ; - yourself! Item was added: + ----- Method: NewColorPickerMorph>>newPickButton (in category 'initialize-release') ----- + newPickButton + + ^ (PluggableButtonMorph + on: self + getState: #isPicking + action: #togglePicking + label: #pickingButtonLabel) + vResizing: #spaceFill; + hResizing: #spaceFill; + yourself! Item was added: + ----- Method: NewColorPickerMorph>>pickColor (in category 'picking') ----- + pickColor + + | selectedColor | + [ + | previousColor | + previousColor := self selectedColor. + selectedColor := self pickColorFromDisplay. + selectedColor ifNil: [^ self selectedColor: previousColor]. + ] ensure: [ + self isPicking: false]. + self selectedColor: selectedColor.! Item was added: + ----- Method: NewColorPickerMorph>>pickColorFromDisplay (in category 'picking') ----- + pickColorFromDisplay + + Cursor target showWhile: [ + | previousColor | + previousColor := self selectedColor. + [Sensor anyButtonPressed] + whileTrue; + whileFalse: [ + | frontMorph | + Sensor peekKeyboard = Character escape ifTrue: [ + ^ nil]. + frontMorph := (self currentWorld morphsAt: Sensor cursorPoint) at: 1 ifAbsent: [nil]. + self selectedColor: ((frontMorph isNil or: [(frontMorph == self or: [frontMorph hasOwner: self]) not]) + ifTrue: [Display colorAt: Sensor cursorPoint] + ifFalse: [previousColor]). + self world runStepMethods; displayWorldSafely]]. + Sensor yellowButtonPressed + ifTrue: [^ nil]. + ^ self selectedColor! Item was added: + ----- Method: NewColorPickerMorph>>pickingButtonLabel (in category 'accessing - labels') ----- + pickingButtonLabel + + ^ 'Picking' translated! Item was changed: ----- Method: NewColorPickerMorph>>setup (in category 'initialize-release') ----- setup + self + color: Color white darker; + cornerStyle: #rounded; + changeTableLayout; + hResizing: #shrinkWrap; + vResizing: #shrinkWrap; + extent: (240 @ 240) * RealEstateAgent scaleFactor; + addMorphBack: hsvaMorph; + addMorphBack: self newColorExpressionMorph; + addMorphBack: self newBottomRow; + layoutInset: 4; + cellGap: 2. + + Preferences menuAppearance3d + ifTrue: [self addDropShadow].! - color: (Color white darker) ; - cornerStyle: #rounded ; - changeTableLayout ; - hResizing: #shrinkWrap ; - vResizing: #shrinkWrap ; - extent: 240@240 ; - addMorphBack: hsvaMorph ; - addMorphBack: self newColorExpressionMorph ; - addMorphBack: self newBottomRow ; - layoutInset: 4 ; - cellGap: 2. - - Preferences menuAppearance3d - ifTrue: [self addDropShadow]. - ! Item was changed: ----- Method: NewColorPickerMorph>>setupForProperties (in category 'initialize-release') ----- setupForProperties + self + color: Color white darker; + changeTableLayout; + hResizing: #shrinkWrap; + vResizing: #shrinkWrap; + extent: 240@240; + addMorphBack: hsvaMorph; + layoutInset: 4; + cellGap: 2.! - color: (Color white darker) ; - changeTableLayout ; - hResizing: #shrinkWrap ; - vResizing: #shrinkWrap ; - extent: 240@240 ; - addMorphBack: hsvaMorph ; - layoutInset: 4 ; - cellGap: 2.! Item was added: + ----- Method: NewColorPickerMorph>>togglePicking (in category 'picking') ----- + togglePicking + self isPicking: self isPicking not!

1 0

Jump to page: