Packages November 2020

packages@lists.squeakfoundation.org

1 participants
61 discussions

The Trunk: Morphic-mt.1711.mcz
by commits＠source.squeak.org 04 Nov '20

04 Nov '20

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1711.mcz ==================== Summary ==================== Name: Morphic-mt.1711 Author: mt Time: 4 November 2020, 4:26:48.73762 pm UUID: bfe511e4-840d-9742-a340-11c2a470d5f7 Ancestors: Morphic-mt.1710, Morphic-kfr.1469 In progress indication for project loading, remove target-owner-visibility magic as suggested by Karl (kfr). When this indicator is used as part of InternalThreadNavigationMorph or ProjectViewMorph, hiding them (and keeping them hidden for quick workBlocks) makes no sense. Those are more than just layout containers. (Note that this is unrelated to system-progress indication.) =============== Diff against Morphic-mt.1710 =============== Item was changed: ----- Method: ComplexProgressIndicator>>withProgressDo: (in category 'as yet unclassified') ----- withProgressDo: aBlock + | safetyFactor totals trialRect delta | - | safetyFactor totals trialRect delta targetOwner | Smalltalk isMorphic ifFalse: [^aBlock value]. formerProject := Project current. formerWorld := formerProject world. formerProcess := Processor activeProcess. targetMorph ifNil: [targetMorph := ProgressTargetRequestNotification signal]. targetMorph ifNil: [ trialRect := Rectangle center: Sensor cursorPoint extent: 80@80. delta := trialRect amountToTranslateWithin: formerWorld bounds. trialRect := trialRect translateBy: delta. translucentMorph := TranslucentProgessMorph new opaqueBackgroundColor: Color white; bounds: trialRect; openInWorld: formerWorld. ] ifNotNil: [ - targetOwner := targetMorph owner. translucentMorph := TranslucentProgessMorph new setProperty: #morphicLayerNumber toValue: targetMorph morphicLayerNumber - 0.1; bounds: targetMorph boundsInWorld; openInWorld: targetMorph world. ]. stageCompleted := 0. safetyFactor := 1.1. "better to guess high than low" translucentMorph setProperty: #progressStageNumber toValue: 1. translucentMorph hide. - targetOwner ifNotNil: [targetOwner hide]. totals := self loadingHistoryDataForKey: 'total'. newRatio := 1.0. estimate := totals size < 2 ifTrue: [ 15000 "be a pessimist" ] ifFalse: [ (totals sum - totals max) / (totals size - 1 max: 1) * safetyFactor. ]. start := Time millisecondClockValue. self forkProgressWatcher. [ aBlock on: ProgressInitiationException do: [ :ex | ex sendNotificationsTo: [ :min :max :curr | "ignore this as it is inaccurate" ]. ]. ] on: ProgressNotification do: [ :note | | stageCompletedString | translucentMorph show. - targetOwner ifNotNil: [targetOwner show]. note extraParam ifNotNil:[self addProgressDecoration: note extraParam]. stageCompletedString := (note messageText findTokens: ' ') first. stageCompleted := (stageCompletedString copyUpTo: $:) asNumber. cumulativeStageTime := Time millisecondClockValue - start max: 1. prevData := self loadingHistoryDataForKey: stageCompletedString. prevData isEmpty ifFalse: [ newRatio := (cumulativeStageTime / (prevData average max: 1)) asFloat. ]. self loadingHistoryAt: stageCompletedString add: cumulativeStageTime. translucentMorph setProperty: #progressStageNumber toValue: stageCompleted + 1. note resume. ]. stageCompleted := 999. "we may or may not get here" !

1 0

The Trunk: Morphic-spfa.1641.mcz
by commits＠source.squeak.org 04 Nov '20

04 Nov '20

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-spfa.1641.mcz ==================== Summary ==================== Name: Morphic-spfa.1641 Author: spfa Time: 2 April 2020, 11:31:57.845097 pm UUID: be701ee2-5637-c34d-8765-d2527e1d5785 Ancestors: Morphic-mt.1640 Add inst. var. lastParenLocation to TextEditor #stateArray (used to transfer state to a newly installed editor). This ensures that #clearParens works as expected in all circumstances. =============== Diff against Morphic-mt.1640 =============== Item was changed: ----- Method: TextEditor>>stateArray (in category 'initialize-release') ----- stateArray ^ {ChangeText. FindText. history ifNil: [TextEditorCommandHistory new]. "Convert old instances" self markIndex to: self pointIndex - 1. self startOfTyping. + emphasisHere. + lastParenLocation}! - emphasisHere}! Item was changed: ----- Method: TextEditor>>stateArrayPut: (in category 'initialize-release') ----- stateArrayPut: stateArray | sel | ChangeText := stateArray at: 1. FindText := stateArray at: 2. history := stateArray at: 3. sel := stateArray at: 4. self selectFrom: sel first to: sel last. beginTypeInIndex := stateArray at: 5. + emphasisHere := stateArray at: 6. + lastParenLocation := stateArray at: 7! - emphasisHere := stateArray at: 6!

1 0

The Trunk: Morphic-cmm.1489.mcz
by commits＠source.squeak.org 04 Nov '20

04 Nov '20

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-cmm.1489.mcz ==================== Summary ==================== Name: Morphic-cmm.1489 Author: cmm Time: 14 May 2019, 5:52:52.33191 pm UUID: 7ac016ff-055b-4834-b3b3-35a7864215d0 Ancestors: Morphic-pre.1488 Fix TextEditor>>#hasMultipleLinesSelected to consider actual lines, instead of wrapped lines. =============== Diff against Morphic-pre.1488 =============== Item was changed: ----- Method: TextEditor>>hasMultipleLinesSelected (in category 'typing support') ----- hasMultipleLinesSelected + ^ self selection includes: Character cr! - - ^ self hasSelection and: [self startBlock top < self stopBlock top]!

1 0

The Trunk: Morphic-nice.1616.mcz
by commits＠source.squeak.org 04 Nov '20

04 Nov '20

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-nice.1616.mcz ==================== Summary ==================== Name: Morphic-nice.1616 Author: nice Time: 8 January 2020, 10:48:52.680239 am UUID: 88019e05-7d25-6744-97d0-4ebb873b6303 Ancestors: Morphic-mt.1615 Provide smoother scrolling in response to mouse wheel events Instead of delivering the events when wheelDelta reaches 120, make this threshold a Preference (minimumWheelDelta) Reminder: 120 represents a single notch for traditional mouse wheel with notches, but trackpads can deliver much smaller deltas Rather than accumulating the wheelDeltas into MouseWheelState, do it when we #generateMouseWheelEvent: Indeed, small deltas will come in packets of successive events, and it's more efficient to regroup then, exactly like we do with mouse trails... Also MouseWheelState did ignore time outs (long delays between deltas) and other state changes (buttons/modifiers), which was not ideal. Directly get those states from the raw eventBuffer, like any other mouse event. This requires integration of tose 2 PR: https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/461 for Windows https://github.com/OpenSmalltalk/opensmalltalk-vm/pull/462 for OSX and linux Honour larger wheelDeltas too in ScrollPane>>#mouseWheel: event handling Honour horizontal mouse wheels too in ScrollPane Note that the scroll pane still won't deliver sub-scrollDeltaWidth/scrollDeltaHeight with those changes, the number of scroll deltas is still rounded to 1. With patched VM, and following settings, I get a reasonnable scrolling experience on OSX: HandMorph minimumWheelDelta: 20. Smalltalk sendMouseWheelEvents: true. NOTE: it is tricky to add/remove inst. var. to such HandMorph because obsolete CompiledMethod pointing to old inst. var. offset are still active on the stack and can mess things up (unless you do not load the package from UI but rather from command line...). Since accessing 'lastMouseEvent' in such obsolete CompiledMethod is causing grief, preserve its offset by swapping inst. var. order with 'targetOffset' which is less likely used. =============== Diff against Morphic-mt.1615 =============== Item was changed: Morph subclass: #HandMorph + instanceVariableNames: 'mouseFocus keyboardFocus eventListeners mouseListeners keyboardListeners eventCaptureFilters mouseCaptureFilters keyboardCaptureFilters mouseClickState mouseOverHandler targetOffset lastMouseEvent damageRecorder cacheCanvas cachedCanvasHasHoles temporaryCursor temporaryCursorOffset hardwareCursor hasChanged savedPatch userInitials lastEventBuffer genieGestureProcessor keyboardInterpreter' + classVariableNames: 'CompositionWindowManager DoubleClickTime DragThreshold EventStats MinimalWheelDelta NewEventRules NormalCursor PasteBuffer SendMouseWheelToKeyboardFocus ShowEvents SynthesizeMouseWheelEvents' - instanceVariableNames: 'mouseFocus keyboardFocus eventListeners mouseListeners keyboardListeners eventCaptureFilters mouseCaptureFilters keyboardCaptureFilters mouseClickState mouseOverHandler mouseWheelState lastMouseEvent targetOffset damageRecorder cacheCanvas cachedCanvasHasHoles temporaryCursor temporaryCursorOffset hardwareCursor hasChanged savedPatch userInitials lastEventBuffer genieGestureProcessor keyboardInterpreter' - classVariableNames: 'CompositionWindowManager DoubleClickTime DragThreshold EventStats NewEventRules NormalCursor PasteBuffer SendMouseWheelToKeyboardFocus ShowEvents SynthesizeMouseWheelEvents' poolDictionaries: 'EventSensorConstants' category: 'Morphic-Kernel'! !HandMorph commentStamp: '<historical>' prior: 0! The cursor may be thought of as the HandMorph. The hand's submorphs hold anything being carried by dragging. There is some minimal support for multiple hands in the same world.! Item was added: + ----- Method: HandMorph class>>minimumWheelDelta (in category 'preferences') ----- + minimumWheelDelta + <preference: 'Minimal Mouse Wheel Detection Threshold' + categoryList: #(Morphic mouse) + description: 'Answer the minimal scrolling units taken into account + Defaults to 120 (See #scrollUnitsPerMouseWheelNotch), corresponding to a single mouse wheel notch. + Use a lower value (20 - See #minimalScrollUnitsPerEvent) if wanting smoother scrolling with trackpads.' + type: #Number> + ^MinimalWheelDelta ifNil: [MouseWheelEvent scrollUnitsPerMouseWheelNotch].! Item was added: + ----- Method: HandMorph class>>minimumWheelDelta: (in category 'preferences') ----- + minimumWheelDelta: anInteger + MinimalWheelDelta := anInteger ifNotNil: [anInteger + clampLow: MouseWheelEvent minimalScrollUnitsPerEvent + high: MouseWheelEvent scrollUnitsPerMouseWheelNotch]! Item was changed: ----- Method: HandMorph>>generateMouseWheelEvent: (in category 'private events') ----- generateMouseWheelEvent: evtBuf "Generate the appropriate mouse wheel event for the given raw event buffer" + | buttons modifiers deltaX deltaY stamp nextEvent | - | buttons modifiers deltaX deltaY stamp | stamp := evtBuf second. stamp = 0 ifTrue: [stamp := Time eventMillisecondClock]. deltaX := evtBuf third. deltaY := evtBuf fourth. + buttons := evtBuf fifth. + modifiers := evtBuf sixth. + [(deltaX abs + deltaY abs < self class minimumWheelDelta) + and: [(nextEvent := Sensor peekEvent) notNil + and: [nextEvent first = evtBuf first + and: [nextEvent fifth = evtBuf fifth + and: [nextEvent sixth = evtBuf sixth] + and: [nextEvent third isZero = evtBuf third isZero "both horizontal or vertical"]]]]] + whileTrue: + ["nextEvent is similar. Remove it from the queue, and check the next." + nextEvent := Sensor nextEvent. + deltaX := deltaX + nextEvent third. + deltaY := deltaY + nextEvent fourth]. - modifiers := evtBuf fifth. - buttons := (modifiers bitShift: 3) bitOr: (lastMouseEvent buttons bitAnd: 7). ^ MouseWheelEvent new setType: #mouseWheel position: self position delta: deltaX@deltaY - direction: 2r0000 buttons: buttons hand: self stamp: stamp! Item was changed: ----- Method: HandMorph>>generateMouseWheelEvent:direction: (in category 'private events') ----- generateMouseWheelEvent: keystrokeEvent direction: direction "Generate the appropriate mouse wheel event from the keystrokeEvent. Before calling this, ensure that the control key is pressed. This method can be discarded once the VM produces real mouse wheel events." ^ MouseWheelEvent new setType: #mouseWheel position: keystrokeEvent position + delta: 0 @ ((direction anyMask: 2r1000 "wheel up") ifTrue: [MouseWheelEvent scrollUnitsPerMouseWheelNotch] ifFalse: [MouseWheelEvent scrollUnitsPerMouseWheelNotch negated]) - delta: 0 @ ((direction anyMask: 2r1000 "wheel up") ifTrue: [120] ifFalse: [-120]) direction: direction buttons: (keystrokeEvent buttons bitAnd: 2r01111) "drop control key pressed for this conversion" hand: keystrokeEvent hand stamp: keystrokeEvent timeStamp! Item was changed: ----- Method: HandMorph>>handleEvent: (in category 'events-processing') ----- handleEvent: unfilteredEvent | filteredEvent | owner ifNil: [^ unfilteredEvent "not necessary but good style -- see Morph >> #handleEvent:"]. self logEvent: unfilteredEvent. "Mouse-over events occur really, really, really often. They are kind of the heart beat of the Morphic UI process." unfilteredEvent isMouseOver ifTrue: [^ self sendMouseEvent: unfilteredEvent]. self showEvent: unfilteredEvent. self sendListenEvents: unfilteredEvent. filteredEvent := self sendFilterEventCapture: unfilteredEvent for: nil. "filteredEvent := unfilteredEvent" " <-- use this to disable global capture filters" filteredEvent wasIgnored ifTrue: [ self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent]. filteredEvent isWindowEvent ifTrue: [ self sendEvent: filteredEvent focus: nil. self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent]. filteredEvent isKeyboard ifTrue:[ self sendKeyboardEvent: filteredEvent. self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent]. filteredEvent isDropEvent ifTrue:[ self sendEvent: filteredEvent focus: nil. self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent]. filteredEvent isMouse ifFalse: [ self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent]. " ********** MOUSE EVENT *********** " lastMouseEvent := filteredEvent. "Check for pending drag or double click operations." mouseClickState ifNotNil:[ (mouseClickState handleEvent: filteredEvent from: self) ifFalse:[ "Possibly dispatched #click: or something and will not re-establish otherwise" self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent]]. filteredEvent isMouseWheel ifTrue: [ + self class sendMouseWheelToKeyboardFocus + ifFalse: [self sendMouseEvent: filteredEvent] + ifTrue: [self sendEvent: filteredEvent focus: self keyboardFocus clear: [self keyboardFocus: nil]]. - mouseWheelState ifNil: [mouseWheelState := MouseWheelState new]. - mouseWheelState handleEvent: filteredEvent from: self. self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent]. filteredEvent isMove ifTrue:[ self position: filteredEvent position. self sendMouseEvent: filteredEvent. self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent]. "Issue a synthetic move event if we're not at the position of the event" filteredEvent position = self position ifFalse: [self moveToEvent: filteredEvent]. "Drop submorphs on button events" self hasSubmorphs ifTrue:[self dropMorphs: filteredEvent] ifFalse:[self sendMouseEvent: filteredEvent]. self mouseOverHandler processMouseOver: lastMouseEvent. ^ filteredEvent "not necessary but good style -- see Morph >> #handleEvent:" ! Item was added: + ----- Method: MouseWheelEvent class>>convertScrollUnits:intoScrollDelta: (in category 'utility') ----- + convertScrollUnits: scrollUnits intoScrollDelta: scrollDeltaPerMouseWheelNotch + "Convert the scrolling units provided by the VM into scrolling delta (increment) used by Morph. + The morph knows how many scroll delta it wants per single wheel notch. + I know how many scrolling units is generated by a single wheel notch." + + ^scrollUnits abs * scrollDeltaPerMouseWheelNotch // self scrollUnitsPerMouseWheelNotch max: 1! Item was added: + ----- Method: MouseWheelEvent class>>minimalScrollUnitsPerEvent (in category 'constants') ----- + minimalScrollUnitsPerEvent + "Answer how many scroll units a single mouse wheel event can generate. + This reflects a value hardcoded in the VM. + The VM aggregate wheel events until this threshold is reached." + + ^20! Item was added: + ----- Method: MouseWheelEvent class>>scrollUnitsPerMouseWheelNotch (in category 'constants') ----- + scrollUnitsPerMouseWheelNotch + "Answer how many scroll units a single mouse wheel notch does generate. + This reflects a value hardcoded in the VM. + The value is chosen high enough so as to enable: + - smoother scrolling on notch-less devices. + - while preserving Integer arithmetic + Interpretation (scaling) of scrolling units is left to the client morphs. + Typically, 120 units (1 notch) represents 3 lines of text." + + ^120! Item was added: + ----- Method: MouseWheelEvent>>horizontalScrollDelta: (in category 'accessing') ----- + horizontalScrollDelta: scrollDeltaPerMouseWheelNotch + "Convert scrolling units into unsigned scrolling increment. + The morph knows how many scroll delta it wants per single wheel notch. + Note that returned increment value is always positive, regardless of direction." + ^self class convertScrollUnits: delta x intoScrollDelta: scrollDeltaPerMouseWheelNotch! Item was added: + ----- Method: MouseWheelEvent>>setDirection (in category 'initialization') ----- + setDirection + delta x > 0 ifTrue: [self setWheelRight]. + delta x < 0 ifTrue: [self setWheelLeft]. + + delta y > 0 ifTrue: [self setWheelUp]. + delta y < 0 ifTrue: [self setWheelDown].! Item was added: + ----- Method: MouseWheelEvent>>setType:position:delta:buttons:hand:stamp: (in category 'private') ----- + setType: evtType position: evtPos delta: evtDelta buttons: evtButtons hand: evtHand stamp: stamp + type := evtType. + position := evtPos. + buttons := evtButtons. + source := evtHand. + wasHandled := false. + direction := 2r0000. + delta := evtDelta. + timeStamp := stamp. + self setDirection! Item was added: + ----- Method: MouseWheelEvent>>verticalScrollDelta: (in category 'accessing') ----- + verticalScrollDelta: scrollDeltaPerMouseWheelNotch + "Convert scrolling units into unsigned scrolling increment. + The morph knows how many scroll delta it wants per single wheel notch. + Note that returned increment value is always positive, regardless of direction." + ^self class convertScrollUnits: delta y intoScrollDelta: scrollDeltaPerMouseWheelNotch! Item was removed: - Object subclass: #MouseWheelState - instanceVariableNames: 'currentDelta' - classVariableNames: '' - poolDictionaries: '' - category: 'Morphic-Events'! Item was removed: - ----- Method: MouseWheelState>>handleEvent:from: (in category 'event processing') ----- - handleEvent: aMouseWheelEvent from: aHand - "Every 120 units, raise the wheel flags for convenient mouse wheel programming. We choose not to send multiple mouse-wheel events for multiples of 120 because applications can always react to the actual delta values if they want to do more scrolling or zooming." - - | sign | - currentDelta := currentDelta + aMouseWheelEvent wheelDelta. - - sign := currentDelta sign. - currentDelta := currentDelta abs. - - (currentDelta x // 120) > 0 ifTrue: [ - sign x = 1 - ifTrue: [aMouseWheelEvent setWheelRight] - ifFalse: [aMouseWheelEvent setWheelLeft]]. - - (currentDelta y // 120) > 0 ifTrue: [ - sign y = 1 - ifTrue: [aMouseWheelEvent setWheelUp] - ifFalse: [aMouseWheelEvent setWheelDown]]. - - currentDelta := currentDelta \\ 120. - currentDelta := currentDelta * sign. - - "Finally, send the event." - HandMorph sendMouseWheelToKeyboardFocus - ifFalse: [aHand sendMouseEvent: aMouseWheelEvent] - ifTrue: [aHand sendEvent: aMouseWheelEvent focus: aHand keyboardFocus clear: [aHand keyboardFocus: nil]]. - ! Item was removed: - ----- Method: MouseWheelState>>initialize (in category 'initialize-release') ----- - initialize - - super initialize. - currentDelta := 0@0.! Item was changed: MorphicModel subclass: #ScrollPane instanceVariableNames: 'scrollBar scroller retractableScrollBar scrollBarOnLeft getMenuSelector getMenuTitleSelector hasFocus hScrollBar hScrollBarPolicy vScrollBarPolicy scrollBarThickness' + classVariableNames: 'HorizontalScrollDeltaPerMouseWheelNotch UseRetractableScrollBars VerticalScrollDeltaPerMouseWheelNotch' - classVariableNames: 'UseRetractableScrollBars' poolDictionaries: '' category: 'Morphic-Windows'! !ScrollPane commentStamp: 'mk 8/9/2005 10:34' prior: 0! The scroller (a transform) of a scrollPane is driven by the scrollBar. The scroll values vary from 0.0, meaning zero offset to 1.0 meaning sufficient offset such that the bottom of the scrollable material appears 3/4 of the way down the pane. The total distance to achieve this range is called the totalScrollRange. Basic clue about utilization of the ScrollPane class is given in: ScrollPane example1. ScrollPane example2.! Item was added: + ----- Method: ScrollPane class>>horizontalScrollDeltaPerMouseWheelNotch (in category 'preferences') ----- + horizontalScrollDeltaPerMouseWheelNotch + + <preference: 'horizontal scroll increment per single mouse wheel' + category: #scrolling + description: 'How many horizontal scroll increments should be caused in response to a single mouse wheel notch. + Typically, the scroll panes increment are about 1 character width for list and text panes (see #scrollDeltaWidth). + The default setting is 3 so as to match the most widely used convention.' + type: #Number> + ^ HorizontalScrollDeltaPerMouseWheelNotch ifNil: [3]! Item was added: + ----- Method: ScrollPane class>>horizontalScrollDeltaPerMouseWheelNotch: (in category 'preferences') ----- + horizontalScrollDeltaPerMouseWheelNotch: anIntegerOrNil + + HorizontalScrollDeltaPerMouseWheelNotch := anIntegerOrNil! Item was added: + ----- Method: ScrollPane class>>verticalScrollDeltaPerMouseWheelNotch (in category 'preferences') ----- + verticalScrollDeltaPerMouseWheelNotch + + <preference: 'vertical scroll increment per single mouse wheel' + category: #scrolling + description: 'How many vertical scroll increments should be caused in response to a single mouse wheel notch. + Typically, the scroll panes increment are one line height for list and text panes (see #scrollDeltaHeight). + The default setting is 3 so as to match the most widely used convention.' + type: #Number> + ^ VerticalScrollDeltaPerMouseWheelNotch ifNil: [3]! Item was added: + ----- Method: ScrollPane class>>verticalScrollDeltaPerMouseWheelNotch: (in category 'preferences') ----- + verticalScrollDeltaPerMouseWheelNotch: anIntegerOrNil + + VerticalScrollDeltaPerMouseWheelNotch := anIntegerOrNil! Item was changed: ----- Method: ScrollPane>>mouseWheel: (in category 'event handling') ----- mouseWheel: evt + evt isWheelUp ifTrue: [scrollBar scrollUp: (evt verticalScrollDelta: self class verticalScrollDeltaPerMouseWheelNotch)]. + evt isWheelDown ifTrue: [scrollBar scrollDown: (evt verticalScrollDelta: self class verticalScrollDeltaPerMouseWheelNotch)]. + evt isWheelLeft ifTrue: [hScrollBar scrollUp: (evt horizontalScrollDelta: self class verticalScrollDeltaPerMouseWheelNotch)]. + evt isWheelRight ifTrue: [hScrollBar scrollDown: (evt horizontalScrollDelta: self class verticalScrollDeltaPerMouseWheelNotch)].! - evt isWheelUp ifTrue: [scrollBar scrollUp: 3]. - evt isWheelDown ifTrue: [scrollBar scrollDown: 3].!

1 0

The Trunk: Morphic-cmm.1618.mcz
by commits＠source.squeak.org 04 Nov '20

04 Nov '20

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-cmm.1618.mcz ==================== Summary ==================== Name: Morphic-cmm.1618 Author: cmm Time: 16 January 2020, 10:50:39.500247 pm UUID: 9cbbc4fc-7a83-4f6c-94ca-6ac110f34c1f Ancestors: Morphic-cmm.1617 When "Mouse over for keyboard focus" is used, release the prior keyboard focus upon restarting the image, so that the Global Command Keys will be honored until the first focus shift. =============== Diff against Morphic-cmm.1617 =============== Item was changed: ----- Method: MorphicProject>>wakeUpTopWindow (in category 'enter') ----- wakeUpTopWindow "Image has been restarted, and the startUp list has been processed. Perform any additional actions needed to restart the user interface." + SystemWindow wakeUpTopWindowUponStartup. + Preferences mouseOverForKeyboardFocus ifTrue: + [ "Allow global command keys to work upon re-entry without having to cause a focus change first." + ActiveHand releaseKeyboardFocus ]! - SystemWindow wakeUpTopWindowUponStartup!

1 0

The Trunk: Morphic-ct.1619.mcz
by commits＠source.squeak.org 04 Nov '20

04 Nov '20

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-ct.1619.mcz ==================== Summary ==================== Name: Morphic-ct.1619 Author: ct Time: 22 January 2020, 10:18:49.982972 am UUID: 7857d3bc-414b-cf4a-87bd-9d0aae05616f Ancestors: Morphic-cmm.1618 Proposal: Unify all doIt related operations in PluggableTextMorph by delegating them to the editor. This also fixes the fact that certain hooks such as #printIt:result:, #inspectIt:result:, or #exploreIt:result: were ignored when triggering the operation via the textmorph menu instead of shortcut. This is not an expected behavior, is it? =============== Diff against Morphic-cmm.1618 =============== Item was changed: ----- Method: PluggableTextMorph>>doIt (in category 'menu commands') ----- doIt + ^ self handleEdit: [textMorph editor doIt]! - ^self handleEdit: [textMorph editor evaluateSelection]! Item was changed: ----- Method: PluggableTextMorph>>exploreIt (in category 'menu commands') ----- exploreIt + ^ self handleEdit: [textMorph editor exploreIt]! - - - self handleEdit: - [textMorph editor evaluateSelectionAndDo: [:result | result explore]].! Item was changed: ----- Method: PluggableTextMorph>>inspectIt (in category 'menu commands') ----- inspectIt + ^ self handleEdit: [textMorph editor inspectIt]! - - self handleEdit: - [textMorph editor evaluateSelectionAndDo: [:result | result inspect]]! Item was changed: ----- Method: PluggableTextMorph>>printIt (in category 'menu commands') ----- printIt + ^ self handleEdit: [textMorph editor printIt]! - | oldEditor | - textMorph editor selectFrom: selectionInterval first to: selectionInterval last; - model: model. "For, eg, evaluateSelection" - textMorph handleEdit: [(oldEditor := textMorph editor) evaluateSelectionAndDo: - [:result | - self flag: #fixIntervalCache. "mt: We should find a better design for discarding unused text editors in text morphs and restoring them on demand." - selectionInterval := oldEditor markIndex to: oldEditor pointIndex -1. - textMorph installEditorToReplace: oldEditor. - textMorph handleEdit: [oldEditor afterSelectionInsertAndSelect: result printString]. - selectionInterval := oldEditor markIndex to: oldEditor pointIndex -1. - - textMorph editor selectFrom: selectionInterval first to: selectionInterval last. - self scrollSelectionIntoView]]!

1 0

The Trunk: Morphic-ct.1622.mcz
by commits＠source.squeak.org 04 Nov '20

04 Nov '20

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-ct.1622.mcz ==================== Summary ==================== Name: Morphic-ct.1622 Author: ct Time: 30 January 2020, 7:05:04.363325 pm UUID: 8641b370-6222-f948-aeda-fbb50f764f72 Ancestors: Morphic-cmm.1618 Proposal: Swap key and item of an Integer's explorer contents. Integer representations are not really keys, but rather values. In an explorer's code pane, this allows you to interact with the selected string representation (for example '101010') which is much more interesting than the base name (for example 'binary'). =============== Diff against Morphic-cmm.1618 =============== Item was changed: ----- Method: Integer>>explorerContents (in category '*Morphic-Explorer') ----- explorerContents ^#( ('hexadecimal' 16) ('octal' 8) ('binary' 2)) collect: [ :each | ObjectExplorerWrapper + with: (self printStringBase: each second) + name: each first translated - with: each first translated - name: (self printStringBase: each second) model: self ]!

1 0

The Trunk: Morphic-nice.1625.mcz
by commits＠source.squeak.org 04 Nov '20

04 Nov '20

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-nice.1625.mcz ==================== Summary ==================== Name: Morphic-nice.1625 Author: nice Time: 17 February 2020, 5:06:10.606532 pm UUID: 094e2566-ddfe-2340-8fab-2338d255e164 Ancestors: Morphic-mt.1624 Free our mind from un-initialized LayoutFrame. There should not be any such thing. Require Graphics-nice.425 =============== Diff against Morphic-mt.1624 =============== Item was changed: ----- Method: BorderedMorph>>addMorph:fullFrame: (in category 'resize handling') ----- addMorph: aMorph fullFrame: aLayoutFrame "Add aMorph according to aLayoutFrame." self cellGap > 0 ifTrue: [ | left right bottom top spacing | spacing := self cellGap. + left := aLayoutFrame leftOffset. + right := aLayoutFrame rightOffset. - left := aLayoutFrame leftOffset ifNil: [0]. - right := aLayoutFrame rightOffset ifNil: [0]. + bottom := aLayoutFrame bottomOffset. + top := aLayoutFrame topOffset. - bottom := aLayoutFrame bottomOffset ifNil: [0]. - top := aLayoutFrame topOffset ifNil: [0]. "Add a spacing to the frame if it is not top or leftmost." aLayoutFrame leftFraction = 0 ifFalse: [left := left + spacing] ifTrue: [ "Expect another, resizable widget besides me if I have a fixed width." aLayoutFrame hasFixedWidth ifTrue: [right := right - spacing]]. aLayoutFrame topFraction = 0 ifFalse: [top := top + spacing] ifTrue: [ "Expect another, resizable widget besides me if I have a fixed height." aLayoutFrame hasFixedHeight ifTrue: [bottom := bottom - spacing]]. aLayoutFrame topOffset: top; bottomOffset: bottom; leftOffset: left; rightOffset: right]. super addMorph: aMorph fullFrame: aLayoutFrame. self wantsPaneSplitters ifTrue: [self addPaneSplitters].! Item was changed: ----- Method: BorderedMorph>>addPaneHSplitterAtBottomOfRow: (in category 'resize handling') ----- addPaneHSplitterAtBottomOfRow: someMorphs | targetY minX maxX splitter | targetY := someMorphs first layoutFrame bottomFraction. minX := (someMorphs detectMin: [:each | each layoutFrame leftFraction]) layoutFrame leftFraction. maxX := (someMorphs detectMax: [:each | each layoutFrame rightFraction]) layoutFrame rightFraction. splitter := ProportionalSplitterMorph new beSplitsTopAndBottom; yourself. splitter layoutFrame: (LayoutFrame fractions: (minX @ targetY corner: maxX @ targetY) + offsets: (someMorphs first layoutFrame leftOffset @ 0 + corner: someMorphs first layoutFrame rightOffset @ AbstractResizerMorph gripThickness)). - offsets: ((someMorphs first layoutFrame leftOffset ifNil: [0]) @ 0 - corner: (someMorphs first layoutFrame rightOffset ifNil: [0]) @ AbstractResizerMorph gripThickness)). self addMorphBack: (splitter position: self position).! Item was changed: ----- Method: BorderedMorph>>addPaneVSplitterAtRightOfColumn: (in category 'resize handling') ----- addPaneVSplitterAtRightOfColumn: someMorphs | targetX minY maxY splitter | targetX := someMorphs first layoutFrame rightFraction. minY := (someMorphs detectMin: [:each | each layoutFrame topFraction]) layoutFrame topFraction. maxY := (someMorphs detectMax: [:each | each layoutFrame bottomFraction]) layoutFrame bottomFraction. splitter := ProportionalSplitterMorph new beSplitsLeftAndRight; yourself. splitter layoutFrame: (LayoutFrame fractions: (targetX @ minY corner: targetX @ maxY) + offsets: (0 @ (someMorphs first layoutFrame topOffset) + corner: (AbstractResizerMorph gripThickness@ (someMorphs first layoutFrame bottomOffset)))). - offsets: (0 @ (someMorphs first layoutFrame topOffset ifNil: [0]) - corner: (AbstractResizerMorph gripThickness@ (someMorphs first layoutFrame bottomOffset ifNil: [0])))). self addMorphBack: (splitter position: self position).! Item was changed: ----- Method: BorderedMorph>>linkSubmorphsToSplitters (in category 'resize handling') ----- linkSubmorphsToSplitters self splitters do: [:splitter | splitter splitsTopAndBottom ifTrue: [ self submorphsDo: [:morph | ((morph ~= splitter and: [morph layoutFrame bottomFraction = splitter layoutFrame topFraction]) and: [morph layoutFrame hasFixedHeight not + or: [(morph layoutFrame topOffset) < 0]]) - or: [(morph layoutFrame topOffset ifNil: [0]) < 0]]) ifTrue: [splitter addLeftOrTop: morph]. ((morph ~= splitter and: [morph layoutFrame topFraction = splitter layoutFrame bottomFraction]) and: [morph layoutFrame hasFixedHeight not + or: [(morph layoutFrame bottomOffset) > 0]]) - or: [(morph layoutFrame bottomOffset ifNil: [0]) > 0]]) ifTrue: [splitter addRightOrBottom: morph]]]. splitter splitsLeftAndRight ifTrue: [ self submorphsDo: [:morph | ((morph ~= splitter and: [morph layoutFrame rightFraction = splitter layoutFrame leftFraction]) and: [morph layoutFrame hasFixedWidth not + or: [(morph layoutFrame leftOffset) < 0]]) - or: [(morph layoutFrame leftOffset ifNil: [0]) < 0]]) ifTrue: [splitter addLeftOrTop: morph]. ((morph ~= splitter and: [morph layoutFrame leftFraction = splitter layoutFrame rightFraction]) and: [morph layoutFrame hasFixedWidth not + or: [(morph layoutFrame rightOffset) > 0]]) - or: [(morph layoutFrame rightOffset ifNil: [0]) > 0]]) ifTrue: [splitter addRightOrBottom: morph]]]]! Item was changed: ----- Method: ProportionalSplitterMorph>>balanceOffsets (in category 'events') ----- balanceOffsets | fdx fdy | (self hasProperty: #fullDelta) ifFalse: [^ self]. fdx := (self valueOfProperty: #fullDelta) x. fdy := (self valueOfProperty: #fullDelta) y. self layoutFrame hasFixedHeight ifTrue: [ | otop obot ctop cbot topf | otop := (owner submorphs detect: [:m | m layoutFrame topFraction isZero] ifNone: [^ self]) in: [:tm | + tm top - (tm layoutFrame topOffset)]. - tm top - (tm layoutFrame topOffset ifNil: [0])]. obot := (owner submorphs detect: [:m | m layoutFrame bottomFraction = 1] ifNone: [^ self]) in: [:tm | + tm bottom - (tm layoutFrame bottomOffset)]. - tm bottom - (tm layoutFrame bottomOffset ifNil: [0])]. ctop := (self layoutFrame topFraction * (obot - otop)) rounded + + otop + (self layoutFrame topOffset). - + otop + (self layoutFrame topOffset ifNil: [0]). cbot := (self layoutFrame bottomFraction * (obot - otop)) rounded + + otop + (self layoutFrame bottomOffset). - + otop + (self layoutFrame bottomOffset ifNil: [0]). topf := self layoutFrame topFraction. self layoutFrame topFraction: ((ctop + cbot) * 0.5 - otop) / (obot - otop) asFloat. self layoutFrame bottomFraction: self layoutFrame topFraction. self layoutFrame topOffset: self layoutFrame topOffset - fdy. self layoutFrame bottomOffset: self layoutFrame bottomOffset - fdy. (leftOrTop copy union: rightOrBottom) do: [:m | (m layoutFrame topFraction closeTo: topf) ifTrue: [ m layoutFrame topFraction: self layoutFrame topFraction. m layoutFrame topOffset: m layoutFrame topOffset - fdy]. (m layoutFrame bottomFraction closeTo: topf) ifTrue: [ m layoutFrame bottomFraction: self layoutFrame topFraction. m layoutFrame bottomOffset: m layoutFrame bottomOffset - fdy]]] . self layoutFrame hasFixedWidth ifTrue: [ | oleft oright cleft cright leftf | oleft := (owner submorphs detect: [:m | m layoutFrame leftFraction isZero] ifNone: [^ self]) in: [:tm | + tm left - (tm layoutFrame leftOffset)]. - tm left - (tm layoutFrame leftOffset ifNil: [0])]. oright := (owner submorphs detect: [:m | m layoutFrame rightFraction = 1] ifNone: [^ self]) in: [:tm | + tm right - (tm layoutFrame rightOffset)]. - tm right - (tm layoutFrame rightOffset ifNil: [0])]. cleft := (self layoutFrame leftFraction * (oright - oleft)) rounded + + oleft + (self layoutFrame leftOffset). - + oleft + (self layoutFrame leftOffset ifNil: [0]). cright := (self layoutFrame rightFraction * (oright - oleft)) rounded + + oleft + (self layoutFrame rightOffset). - + oleft + (self layoutFrame rightOffset ifNil: [0]). leftf := self layoutFrame leftFraction. self layoutFrame leftFraction: ((cleft + cright) * 0.5 - oleft) / (oright - oleft) asFloat. self layoutFrame rightFraction: self layoutFrame leftFraction. self layoutFrame leftOffset: self layoutFrame leftOffset - fdx. self layoutFrame rightOffset: self layoutFrame rightOffset - fdx. (leftOrTop copy union: rightOrBottom) do: [:m | (m layoutFrame leftFraction closeTo: leftf) ifTrue: [ m layoutFrame leftFraction: self layoutFrame leftFraction. m layoutFrame leftOffset: m layoutFrame leftOffset - fdx]. (m layoutFrame rightFraction closeTo: leftf) ifTrue: [ m layoutFrame rightFraction: self layoutFrame leftFraction. m layoutFrame rightOffset: m layoutFrame rightOffset - fdx.]]] . self removeProperty: #fullDelta. owner layoutChanged ! Item was changed: ----- Method: ProportionalSplitterMorph>>repositionBy: (in category 'events') ----- repositionBy: delta | selfTop selfBottom selfLeft selfRight | self setProperty: #fullDelta toValue: ((self valueOfProperty: #fullDelta) ifNil: [0@0]) + delta. leftOrTop do: [ : each | | firstRight firstBottom firstLeft firstTop | + firstRight := each layoutFrame rightOffset. + firstBottom := each layoutFrame bottomOffset. - firstRight := each layoutFrame rightOffset ifNil: [ 0 ]. - firstBottom := each layoutFrame bottomOffset ifNil: [ 0 ]. each layoutFrame rightOffset: firstRight + delta x. each layoutFrame bottomOffset: firstBottom + delta y. each layoutFrame hasFixedHeight ifTrue: [ + firstTop := each layoutFrame topOffset. - firstTop := each layoutFrame topOffset ifNil: [ 0 ]. each layoutFrame topOffset: firstTop + delta y ]. each layoutFrame hasFixedWidth ifTrue: [ + firstLeft := each layoutFrame leftOffset. - firstLeft := each layoutFrame leftOffset ifNil: [ 0 ]. each layoutFrame leftOffset: firstLeft + delta x. ] ]. rightOrBottom do: [ : each | | secondLeft secondTop secondRight secondBottom | + secondLeft := each layoutFrame leftOffset. + secondTop := each layoutFrame topOffset. - secondLeft := each layoutFrame leftOffset ifNil: [ 0 ]. - secondTop := each layoutFrame topOffset ifNil: [ 0 ]. each layoutFrame leftOffset: secondLeft + delta x. each layoutFrame topOffset: secondTop + delta y. each layoutFrame hasFixedHeight ifTrue: [ + secondBottom := each layoutFrame bottomOffset. - secondBottom := each layoutFrame bottomOffset ifNil: [ 0 ]. each layoutFrame bottomOffset: secondBottom + delta y. ]. each layoutFrame hasFixedWidth ifTrue: [ + secondRight := each layoutFrame rightOffset. - secondRight := each layoutFrame rightOffset ifNil: [ 0 ]. each layoutFrame rightOffset: secondRight + delta x. ] ]. + selfTop := self layoutFrame topOffset. + selfBottom := self layoutFrame bottomOffset. + selfLeft := self layoutFrame leftOffset. + selfRight := self layoutFrame rightOffset. - selfTop := self layoutFrame topOffset ifNil: [ 0 ]. - selfBottom := self layoutFrame bottomOffset ifNil: [ 0 ]. - selfLeft := self layoutFrame leftOffset ifNil: [ 0 ]. - selfRight := self layoutFrame rightOffset ifNil: [ 0 ]. self layoutFrame topOffset: selfTop + delta y ; bottomOffset: selfBottom + delta y ; leftOffset: selfLeft + delta x ; rightOffset: selfRight + delta x. self owner layoutChanged. self movements removeFirst; add: (splitsTopAndBottom ifTrue: [ delta y sign ] ifFalse: [ delta x sign ])! Item was changed: ----- Method: SystemWindow>>convertAlignment (in category 'layout') ----- convertAlignment "Primarily Jesse Welton's code to convert old system windows to ones with modern layout scheme" self layoutPolicy: ProportionalLayout new. (paneMorphs isNil or: [paneRects isNil or: [paneMorphs size ~= paneRects size]]) ifFalse: [self addLabelArea. self putLabelItemsInLabelArea. self setFramesForLabelArea. paneMorphs with: paneRects do: [:m :r | | frame | frame := LayoutFrame new. frame leftFraction: r left; rightFraction: r right; topFraction: r top; bottomFraction: r bottom. m layoutFrame: frame. m hResizing: #spaceFill; vResizing: #spaceFill]]. labelArea isNil ifTrue: [self addLabelArea. self putLabelItemsInLabelArea. self setFramesForLabelArea. paneMorphs ifNotNil: [paneMorphs do: [:m | | frame | frame := m layoutFrame ifNil: [LayoutFrame new]. + frame topOffset: (frame topOffset) - self labelHeight. - frame topOffset: (frame topOffset ifNil: [0]) - self labelHeight. frame bottomFraction ~= 1.0 ifTrue: + [frame bottomOffset: (frame bottomOffset) - self labelHeight]]]]. - [frame bottomOffset: (frame bottomOffset ifNil: [0]) - self labelHeight]]]]. label ifNotNil: [| frame | frame := LayoutFrame new. frame leftFraction: 0.5; topFraction: 0; leftOffset: label width negated // 2. label layoutFrame: frame]. collapseBox ifNotNil: [| frame | frame := LayoutFrame new. frame rightFraction: 1; topFraction: 0; rightOffset: -1; topOffset: 1. collapseBox layoutFrame: frame]. stripes ifNotNil: [| frame | frame := LayoutFrame new. frame leftFraction: 0; topFraction: 0; rightFraction: 1; leftOffset: 1; topOffset: 1; rightOffset: -1. stripes first layoutFrame: frame. stripes first height: self labelHeight - 2. stripes first hResizing: #spaceFill. frame := LayoutFrame new. frame leftFraction: 0; topFraction: 0; rightFraction: 1; leftOffset: 3; topOffset: 3; rightOffset: -3. stripes last layoutFrame: frame. stripes last height: self labelHeight - 6. stripes last hResizing: #spaceFill]. menuBox ifNotNil: [| frame | frame := LayoutFrame new. frame leftFraction: 0; leftOffset: 19; topFraction: 0; topOffset: 1. menuBox layoutFrame: frame]. closeBox ifNotNil: [| frame | frame := LayoutFrame new. frame leftFraction: 0; leftOffset: 4; topFraction: 0; topOffset: 1. closeBox layoutFrame: frame]! Item was changed: ----- Method: SystemWindow>>setPaneRectsFromBounds (in category 'geometry') ----- setPaneRectsFromBounds "Reset proportional specs from actual bounds, eg, after reframing panes" | layoutBounds | layoutBounds := self layoutBounds. paneMorphs do:[:m| | box left bottom top frame right | frame := m layoutFrame. box := m bounds. frame ifNotNil:[ + left := box left - layoutBounds left - frame leftOffset. + right := box right - layoutBounds left - frame rightOffset. + top := box top - layoutBounds top - frame topOffset. + bottom := box bottom - layoutBounds top - frame bottomOffset. - left := box left - layoutBounds left - (frame leftOffset ifNil:[0]). - right := box right - layoutBounds left - (frame rightOffset ifNil:[0]). - top := box top - layoutBounds top - (frame topOffset ifNil:[0]). - bottom := box bottom - layoutBounds top - (frame bottomOffset ifNil:[0]). frame leftFraction: (left / layoutBounds width asFloat). frame rightFraction: (right / layoutBounds width asFloat). frame topFraction: (top / layoutBounds height asFloat). frame bottomFraction: (bottom / layoutBounds height asFloat). ]. ].!

1 0

The Trunk: Monticello-mt.732.mcz
by commits＠source.squeak.org 04 Nov '20

04 Nov '20

Marcel Taeumel uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-mt.732.mcz ==================== Summary ==================== Name: Monticello-mt.732 Author: mt Time: 4 November 2020, 4:05:55.79762 pm UUID: 6424345e-36b4-db44-90eb-de9c30a823d4 Ancestors: Monticello-mt.731 Catches a possible isNil error during ancestry stubbing. Thanks to Karl (kfr) for finding it! (Monticello-kfr.617 will be moved to treated) =============== Diff against Monticello-mt.731 =============== Item was changed: ----- Method: MCAncestry>>stubAncestryFor:using: (in category 'initialize-release') ----- stubAncestryFor: aMCWorkingCopy using: aMCRepository "childInfo was retrieved from aMCRepository. Replace my ancestry with a Proxy that can retrieve the full tree from these two elements." ancestors := ancestors collect: [ : each | each isMCInfoProxy ifTrue: [ each ] ifFalse: [ MCInfoProxy info: each copyWithTrimmedAncestry workingCopy: aMCWorkingCopy repository: aMCRepository ] ]. + stepChildren ifNotNil: + [ stepChildren := stepChildren collect: + [ : each | each isMCInfoProxy + ifTrue: [ each ] + ifFalse: + [ MCInfoProxy + info: each copyWithTrimmedAncestry + workingCopy: aMCWorkingCopy + repository: aMCRepository ] ] ]! - stepChildren := stepChildren collect: - [ : each | each isMCInfoProxy - ifTrue: [ each ] - ifFalse: - [ MCInfoProxy - info: each copyWithTrimmedAncestry - workingCopy: aMCWorkingCopy - repository: aMCRepository ] ]!

1 0

The Trunk: Monticello-bf.532.mcz
by commits＠source.squeak.org 04 Nov '20

04 Nov '20

Marcel Taeumel uploaded a new version of Monticello to project The Trunk: http://source.squeak.org/trunk/Monticello-bf.532.mcz ==================== Summary ==================== Name: Monticello-bf.532 Author: bf Time: 24 January 2013, 4:05:51.496 pm UUID: 71bddd0f-d5ac-488b-a8e1-729f2a06474e Ancestors: Monticello-bf.531 Save dialog now shows a list of changes to be submitted. Clicking a list item shows a diff in the lower pane. Advanced users can also make this save ignore individual changes using the item's context menu. =============== Diff against Monticello-bf.531 =============== Item was added: + ----- Method: MCPatch>>ignoring: (in category 'accessing') ----- + ignoring: ignoredOperations + ^ MCPatch operations: (operations difference: ignoredOperations)! Item was changed: + MCPatchBrowser subclass: #MCSaveVersionDialog + instanceVariableNames: 'name message ignore' - MCTool subclass: #MCSaveVersionDialog - instanceVariableNames: 'name message' classVariableNames: '' poolDictionaries: '' category: 'Monticello-UI'! Item was changed: ----- Method: MCSaveVersionDialog>>accept (in category 'as yet unclassified') ----- accept self answer: (Array with: (self findTextMorph: #versionName) text asString + with: (self findTextMorph: #logMessage) text asString + with: ignore) + ! - with: (self findTextMorph: #logMessage) text asString) - ! Item was added: + ----- Method: MCSaveVersionDialog>>ignore (in category 'as yet unclassified') ----- + ignore + ^ ignore ifNil: [ignore := Set new]! Item was added: + ----- Method: MCSaveVersionDialog>>ignoreSelection (in category 'as yet unclassified') ----- + ignoreSelection + selection + ifNil: [ignore size = items size + ifFalse: [ignore addAll: items] + ifTrue: [ignore removeAll]] + ifNotNil: [ + ignore remove: selection ifAbsent: [ + ignore add: selection]]. + self changed: #list + ! Item was added: + ----- Method: MCSaveVersionDialog>>installSelection (in category 'as yet unclassified') ----- + installSelection + super installSelection. + selection ifNotNil: [ + ignore remove: selection ifAbsent: []. + self changed: #list]. + + ! Item was added: + ----- Method: MCSaveVersionDialog>>list (in category 'as yet unclassified') ----- + list + ^ self items collect: [:ea | + (self ignore includes: ea) + ifFalse: [ea summary] + ifTrue: [Text string: '( ', ea summary, ' )' attribute: TextEmphasis struckOut ]]! Item was added: + ----- Method: MCSaveVersionDialog>>methodListKey:from: (in category 'as yet unclassified') ----- + methodListKey: aKeystroke from: aListMorph + aKeystroke caseOf: { + [$I] -> [self ignoreSelection]. + } otherwise: [super methodListKey: aKeystroke from: aListMorph ]! Item was added: + ----- Method: MCSaveVersionDialog>>methodListMenu: (in category 'as yet unclassified') ----- + methodListMenu: aMenu + aMenu addList:#( + ('ignore (I)' ignoreSelection 'Do not include this change when saving') + -). + super methodListMenu: aMenu. + ^aMenu! Item was added: + ----- Method: MCSaveVersionDialog>>revertSelection (in category 'as yet unclassified') ----- + revertSelection + super revertSelection. + selection ifNotNil: [ + ignore add: selection. + self changed: #list]. + ! Item was changed: ----- Method: MCSaveVersionDialog>>widgetSpecs (in category 'as yet unclassified') ----- widgetSpecs ^ #( ((textMorph: versionName) (0 0 1 0) (0 0 0 30)) + ((textMorph: logMessage) (0 0 1 0.3) (0 30 0 -30)) + ((buttonRow) (0 0.3 1 0.3) (0 -40 0 0)) + ((listMorph:selection:menu:keystroke: list selection methodListMenu: methodListKey:from:) (0 0.3 1 0.6) (0 0 0 0)) + ((textMorph: text) (0 0.6 1 1) (0 0 0 0)) - ((textMorph: logMessage) (0 0 1 1) (0 30 0 -30)) - ((buttonRow) (0 1 1 1) (0 -40 0 0)) )! Item was changed: Notification subclass: #MCVersionNameAndMessageRequest + instanceVariableNames: 'suggestion initialMessage patch' - instanceVariableNames: 'suggestion initialMessage' classVariableNames: '' poolDictionaries: '' category: 'Monticello-Versioning'! Item was changed: ----- Method: MCVersionNameAndMessageRequest>>defaultAction (in category 'as yet unclassified') ----- defaultAction ^ MCSaveVersionDialog new versionName: suggestion; logMessage: initialMessage; + patch: patch; showModally! Item was added: + ----- Method: MCVersionNameAndMessageRequest>>patch (in category 'as yet unclassified') ----- + patch + ^ patch! Item was added: + ----- Method: MCVersionNameAndMessageRequest>>patch: (in category 'as yet unclassified') ----- + patch: aPatch + patch := aPatch + ! Item was changed: ----- Method: MCWorkingCopy>>newVersion (in category 'operations') ----- newVersion + | packageSnapshot parentSnapshot patch | + parentSnapshot := self parentSnapshot. + packageSnapshot := package snapshot. + patch := packageSnapshot patchRelativeToBase: parentSnapshot. ^ (self requestVersionNameAndMessageWithSuggestion: self uniqueVersionName + initialMessage: self patchMessageDefault + patch: patch) ifNotNil: + [:tuple | + self newVersionWithName: tuple first withBlanksTrimmed + message: (self patchMessageStripped: tuple second) + snapshot: (tuple third + ifEmpty: [packageSnapshot] + ifNotEmpty: [ + MCPatcher apply: (patch ignoring: tuple third) + to: parentSnapshot])] - initialMessage: self patchMessageSuggestion) ifNotNil: - [:pair | - self newVersionWithName: pair first withBlanksTrimmed - message: (self patchMessageStripped: pair last)]. ! Item was changed: ----- Method: MCWorkingCopy>>newVersionWithName:message: (in category 'operations') ----- newVersionWithName: nameString message: messageString + ^self newVersionWithName: nameString message: messageString snapshot: package snapshot! - | info deps | - info := ancestry infoWithName: nameString message: messageString. - ancestry := MCWorkingAncestry new addAncestor: info. - self modified: true; modified: false. - - deps := self requiredPackages collect: - [:ea | - MCVersionDependency - package: ea - info: ea workingCopy currentVersionInfo]. - - ^ MCVersion - package: package - info: info - snapshot: package snapshot - dependencies: deps! Item was added: + ----- Method: MCWorkingCopy>>newVersionWithName:message:snapshot: (in category 'operations') ----- + newVersionWithName: nameString message: messageString snapshot: aSnapshot + | info deps clean | + info := ancestry infoWithName: nameString message: messageString. + ancestry := MCWorkingAncestry new addAncestor: info. + clean := (package snapshot patchRelativeToBase: aSnapshot) isEmpty. + self modified: clean; modified: clean not. "hack to ensure label is updated" + + deps := self requiredPackages collect: + [:ea | + MCVersionDependency + package: ea + info: ea workingCopy currentVersionInfo]. + + ^ MCVersion + package: package + info: info + snapshot: aSnapshot + dependencies: deps! Item was added: + ----- Method: MCWorkingCopy>>parentSnapshot (in category 'private') ----- + parentSnapshot + ^ self findSnapshotWithVersionInfo: (self ancestors + ifEmpty: [nil] + ifNotEmpty: [self ancestors first])! Item was changed: ----- Method: MCWorkingCopy>>patchMessageChanges (in category 'operations') ----- patchMessageChanges + | changes | + changes := package snapshot patchRelativeToBase: self parentSnapshot. - | changes parentInfo parentSnapshot | - parentInfo := self ancestors - ifEmpty: [nil] - ifNotEmpty: [self ancestors first]. - parentSnapshot := self findSnapshotWithVersionInfo: parentInfo. - changes := package snapshot patchRelativeToBase: parentSnapshot. ^ (MCPatchMessage new patch: changes) message! Item was removed: - ----- Method: MCWorkingCopy>>requestVersionNameAndMessageWithSuggestion:initialMessage: (in category 'private') ----- - requestVersionNameAndMessageWithSuggestion: nameString initialMessage: msgString - ^ (MCVersionNameAndMessageRequest new - suggestedName: nameString; - initialMessage: msgString - ) signal! Item was added: + ----- Method: MCWorkingCopy>>requestVersionNameAndMessageWithSuggestion:initialMessage:patch: (in category 'private') ----- + requestVersionNameAndMessageWithSuggestion: nameString initialMessage: msgString patch: aPatch + ^ (MCVersionNameAndMessageRequest new + suggestedName: nameString; + initialMessage: msgString; + patch: aPatch + ) signal!

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages November 2020