Squeak-dev November 2015

squeak-dev@lists.squeakfoundation.org

40 participants
251 discussions

Squeak 5.0 Strange Commit Behavior
by marcel.taeumel 04 Nov '15

04 Nov '15

Hi there! I just wanted to commit the regression fixes for the debugger (warnings etc.) as it is currently fixed in trunk only. Turn out, that I get strange warnings about "[...] to serialize an empty MCZ") ... blah. Now, everything looks changed! (See screenshot) <http://forum.world.st/file/n4858951/squeak-50-bug.png> What's going on? How to proceed? Best, Marcel -- View this message in context: http://forum.world.st/Squeak-5-0-Strange-Commit-Behavior-tp4858951.html Sent from the Squeak - Dev mailing list archive at Nabble.com.

5 15

The Trunk: 51Deprecated-mt.9.mcz
by commits＠source.squeak.org 04 Nov '15

04 Nov '15

Marcel Taeumel uploaded a new version of 51Deprecated to project The Trunk: http://source.squeak.org/trunk/51Deprecated-mt.9.mcz ==================== Summary ==================== Name: 51Deprecated-mt.9 Author: mt Time: 4 November 2015, 6:51:55.753 pm UUID: c75b7e53-d432-41ed-937e-945ac48af8d9 Ancestors: 51Deprecated-topa.8 Refactors and cleans-up drag-and-drop mechanism used by pluggable lists and trees. =============== Diff against 51Deprecated-topa.8 =============== Item was changed: SystemOrganization addCategory: #'51Deprecated-Files-Kernel'! + SystemOrganization addCategory: #'51Deprecated-Morphic-Support'! Item was added: + ----- Method: Object>>dragAnimationFor:transferMorph: (in category '*51Deprecated') ----- + dragAnimationFor: item transferMorph: transferMorph + "Default do nothing"! Item was added: + Morph subclass: #TransferMorphAnimation + instanceVariableNames: 'transferMorph' + classVariableNames: '' + poolDictionaries: '' + category: '51Deprecated-Morphic-Support'! Item was added: + ----- Method: TransferMorphAnimation class>>on: (in category 'instance creation') ----- + on: aTransferMorph + ^self new on: aTransferMorph! Item was added: + ----- Method: TransferMorphAnimation>>on: (in category 'initialization') ----- + on: aTransferMorph + + self flag: #bob. "there was a reference to World, but the class seems to be unused" + + self color: Color transparent. + transferMorph := aTransferMorph. + transferMorph addDependent: self. + ActiveWorld addMorph: self "or perhaps aTransferMorph world"! Item was added: + ----- Method: TransferMorphAnimation>>transferMorph (in category 'accessing') ----- + transferMorph + ^transferMorph! Item was added: + ----- Method: TransferMorphAnimation>>update: (in category 'updating') ----- + update: aSymbol + aSymbol == #deleted + ifTrue: [self delete]. + aSymbol == #position + ifTrue: [self updateAnimation]. + self changed! Item was added: + ----- Method: TransferMorphAnimation>>updateAnimation (in category 'update') ----- + updateAnimation! Item was added: + TransferMorphAnimation subclass: #TransferMorphLineAnimation + instanceVariableNames: 'polygon' + classVariableNames: '' + poolDictionaries: '' + category: '51Deprecated-Morphic-Support'! Item was added: + ----- Method: TransferMorphLineAnimation>>initPolygon (in category 'initialization') ----- + initPolygon + polygon := (LineMorph from: self transferMorph source bounds center + to: self transferMorph bounds center + color: Color black width: 2) + dashedBorder: {10. 10. Color white}. + self addMorph: polygon + ! Item was added: + ----- Method: TransferMorphLineAnimation>>on: (in category 'initialization') ----- + on: aTransferMorph + super on: aTransferMorph. + self initPolygon! Item was added: + ----- Method: TransferMorphLineAnimation>>updateAnimation (in category 'update') ----- + updateAnimation + polygon verticesAt: 2 put: self transferMorph center!

1 0

The Trunk: ToolBuilder-Morphic-mt.151.mcz
by commits＠source.squeak.org 04 Nov '15

04 Nov '15

Marcel Taeumel uploaded a new version of ToolBuilder-Morphic to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Morphic-mt.151.mcz ==================== Summary ==================== Name: ToolBuilder-Morphic-mt.151 Author: mt Time: 4 November 2015, 6:51:17.408 pm UUID: 047b0821-03ce-4921-bc87-6e2e8b216fe6 Ancestors: ToolBuilder-Morphic-mt.150 Refactors and cleans-up drag-and-drop mechanism used by pluggable lists and trees. =============== Diff against ToolBuilder-Morphic-mt.150 =============== Item was changed: ----- Method: MorphicToolBuilder>>buildPluggableList: (in category 'widgets required') ----- buildPluggableList: aSpec | widget listClass getIndex setIndex | aSpec getSelected ifNil:[ listClass := self listClass. getIndex := aSpec getIndex. setIndex := aSpec setIndex. ] ifNotNil:[ listClass := self listByItemClass. getIndex := aSpec getSelected. setIndex := aSpec setSelected. ]. widget := listClass on: aSpec model list: aSpec list selected: getIndex changeSelected: setIndex menu: aSpec menu keystroke: aSpec keyPress. self register: widget id: aSpec name. "Override default scroll bar policies if needed. Widget will use preference values otherwise." aSpec hScrollBarPolicy ifNotNil: [:policy | policy caseOf: { [#always] -> [widget alwaysShowHScrollBar]. [#never] -> [widget hideHScrollBarIndefinitely]. [#whenNeeded] -> [widget showHScrollBarOnlyWhenNeeded]. } ]. aSpec vScrollBarPolicy ifNotNil: [:policy | policy caseOf: { [#always] -> [widget alwaysShowVScrollBar]. [#never] -> [widget hideVScrollBarIndefinitely]. [#whenNeeded] -> [widget showVScrollBarOnlyWhenNeeded]. } ]. widget getListElementSelector: aSpec listItem. widget getListSizeSelector: aSpec listSize. widget getIconSelector: aSpec icon. widget getHelpSelector: aSpec help. widget doubleClickSelector: aSpec doubleClick. widget dragItemSelector: aSpec dragItem. widget dropItemSelector: aSpec dropItem. widget wantsDropSelector: aSpec dropAccept. + widget dragStartedSelector: aSpec dragStarted. widget autoDeselect: aSpec autoDeselect. widget keystrokePreviewSelector: aSpec keystrokePreview. widget borderWidth: 1; borderColor: Color lightGray; color: (aSpec color ifNil: [Color white] ifNotNil: [aSpec color]). self setFrame: aSpec frame in: widget. self setLayoutHintsFor: widget spec: aSpec. parent ifNotNil:[self add: widget to: parent]. panes ifNotNil:[ aSpec list ifNotNil:[panes add: aSpec list]. ]. ^widget! Item was changed: ----- Method: MorphicToolBuilder>>buildPluggableTree: (in category 'widgets required') ----- buildPluggableTree: aSpec | widget | widget := self treeClass new. self register: widget id: aSpec name. widget model: aSpec model. widget getSelectedPathSelector: aSpec getSelectedPath. widget setSelectedSelector: aSpec setSelected. widget getSelectedSelector: aSpec getSelected. widget setSelectedParentSelector: aSpec setSelectedParent. widget getChildrenSelector: aSpec getChildren. widget hasChildrenSelector: aSpec hasChildren. widget getLabelSelector: aSpec label. widget getIconSelector: aSpec icon. widget getHelpSelector: aSpec help. widget getMenuSelector: aSpec menu. widget keystrokeActionSelector: aSpec keyPress. widget nodeClass: aSpec nodeClass. widget getRootsSelector: aSpec roots. widget autoDeselect: aSpec autoDeselect. + widget dropItemSelector: aSpec dropItem. widget wantsDropSelector: aSpec dropAccept. widget dragItemSelector: aSpec dragItem. + widget dragStartedSelector: aSpec dragStarted. + widget columns: aSpec columns. "Override default scroll bar policies if needed. Widget will use preference values otherwise." aSpec hScrollBarPolicy ifNotNil: [:policy | policy caseOf: { [#always] -> [widget alwaysShowHScrollBar]. [#never] -> [widget hideHScrollBarIndefinitely]. [#whenNeeded] -> [widget showHScrollBarOnlyWhenNeeded]. } ]. aSpec vScrollBarPolicy ifNotNil: [:policy | policy caseOf: { [#always] -> [widget alwaysShowVScrollBar]. [#never] -> [widget hideVScrollBarIndefinitely]. [#whenNeeded] -> [widget showVScrollBarOnlyWhenNeeded]. } ]. self setFrame: aSpec frame in: widget. self setLayoutHintsFor: widget spec: aSpec. parent ifNotNil:[self add: widget to: parent]. " panes ifNotNil:[ aSpec roots ifNotNil:[panes add: aSpec roots]. ]. " ^widget! Item was changed: PluggableListMorph subclass: #PluggableListMorphPlus + instanceVariableNames: 'dragItemSelector dropItemSelector wantsDropSelector getHelpSelector dragTypeSelector dragStartedSelector' - instanceVariableNames: 'dragItemSelector dropItemSelector wantsDropSelector getHelpSelector dragTypeSelector' classVariableNames: '' poolDictionaries: '' category: 'ToolBuilder-Morphic'! !PluggableListMorphPlus commentStamp: 'ar 7/15/2005 11:10' prior: 0! Extensions for PluggableListMorph needed by ToolBuilder! Item was changed: ----- Method: PluggableListMorphPlus>>acceptDroppingMorph:event: (in category 'drag and drop') ----- + acceptDroppingMorph: aTransferMorph event: evt + + dropItemSelector ifNil: [^ self]. + potentialDropRow ifNil: [^ self]. + + model + perform: dropItemSelector + withEnoughArguments: { + aTransferMorph passenger. + potentialDropRow. + aTransferMorph shouldCopy. + aTransferMorph}. + - acceptDroppingMorph: aMorph event: evt - | item | - dropItemSelector isNil | potentialDropRow isNil ifTrue: [^self]. - item := aMorph passenger. - model perform: dropItemSelector with: item with: potentialDropRow. self resetPotentialDropRow. evt hand releaseMouseFocus: self. Cursor normal show. ! Item was added: + ----- Method: PluggableListMorphPlus>>dragStartedSelector (in category 'accessing') ----- + dragStartedSelector + ^ dragStartedSelector! Item was added: + ----- Method: PluggableListMorphPlus>>dragStartedSelector: (in category 'accessing') ----- + dragStartedSelector: symbol + dragStartedSelector := symbol.! Item was changed: ----- Method: PluggableListMorphPlus>>startDrag: (in category 'drag and drop') ----- startDrag: evt + + | item itemMorph modelIndex | - dragItemSelector ifNil:[^self]. evt hand hasSubmorphs ifTrue: [^ self]. + self model okToChange ifFalse: [^ self]. + + item := self selection ifNil: [^ self]. + itemMorph := StringMorph contents: item asStringOrText. + modelIndex := self modelIndexFor: self selectionIndex. + + [ "Initiate drag." + (self model perform: dragItemSelector with: modelIndex) ifNotNil: [:passenger | | ddm | + ddm := (self valueOfProperty: #dragTransferClass ifAbsent: [TransferMorph]) withPassenger: passenger from: self. + ddm dragTransferType: (self dragTypeSelector ifNotNil: [:s | self model perform: s with: modelIndex]). + ddm updateFromUserInputEvent: evt. + self dragStartedSelector ifNotNil: [:s | self model perform: s with: itemMorph with: ddm]. + evt hand grabMorph: ddm]. + ] ensure: [ + Cursor normal show. + evt hand releaseMouseFocus: self]! - [ | dragIndex draggedItem ddm | - (self dragEnabled and: [model okToChange]) ifFalse: [^ self]. - dragIndex := self rowAtLocation: evt position. - dragIndex = 0 ifTrue:[^self]. - draggedItem := model perform: dragItemSelector with: (self modelIndexFor: dragIndex). - draggedItem ifNil:[^self]. - ddm := TransferMorph withPassenger: draggedItem from: self. - ddm dragTransferType: (self dragTypeSelector - ifNil: [#dragTransferPlus] - ifNotNil: [:s | self model perform: s with: (self modelIndexFor: dragIndex)]). - evt hand grabMorph: ddm] - ensure: [Cursor normal show. - evt hand releaseMouseFocus: self]! Item was changed: ----- Method: PluggableListMorphPlus>>wantsDroppedMorph:event: (in category 'drag and drop') ----- + wantsDroppedMorph: aTransferMorph event: anEvent + + dropItemSelector ifNil: [^ false]. + wantsDropSelector ifNil: [^ true]. + + (aTransferMorph isKindOf: TransferMorph) ifFalse: [^ false]. + + ^ model perform: wantsDropSelector withEnoughArguments: { + aTransferMorph passenger. + aTransferMorph dragTransferType. + aTransferMorph source. + aTransferMorph}! - wantsDroppedMorph: aMorph event: anEvent - aMorph dragTransferType == #dragTransferPlus ifFalse:[^false]. - dropItemSelector ifNil:[^false]. - wantsDropSelector ifNil:[^true]. - ^(model perform: wantsDropSelector with: aMorph passenger) == true! Item was changed: SimpleHierarchicalListMorph subclass: #PluggableTreeMorph + instanceVariableNames: 'rootWrappers selectedWrapper getRootsSelector getChildrenSelector hasChildrenSelector getLabelSelector getIconSelector getSelectedPathSelector setSelectedParentSelector getHelpSelector dropItemSelector wantsDropSelector dragItemSelector dragTypeSelector nodeClass lastKeystrokeTime lastKeystrokes dragStartedSelector' - instanceVariableNames: 'rootWrappers selectedWrapper getRootsSelector getChildrenSelector hasChildrenSelector getLabelSelector getIconSelector getSelectedPathSelector setSelectedParentSelector getHelpSelector dropItemSelector wantsDropSelector dragItemSelector dragTypeSelector nodeClass lastKeystrokeTime lastKeystrokes' classVariableNames: 'FilterByLabelsOnly MaximumSearchDepth' poolDictionaries: '' category: 'ToolBuilder-Morphic'! !PluggableTreeMorph commentStamp: 'ar 2/12/2005 04:38' prior: 0! A pluggable tree morph.! Item was changed: + ----- Method: PluggableTreeMorph>>acceptDroppingMorph:event: (in category 'drag and drop') ----- - ----- Method: PluggableTreeMorph>>acceptDroppingMorph:event: (in category 'morphic') ----- acceptDroppingMorph: aTransferMorph event: evt + + dropItemSelector ifNil: [^ self]. + potentialDropMorph ifNil: [^ self]. + - dropItemSelector ifNil: [ ^ self ]. model perform: dropItemSelector + withEnoughArguments: { + aTransferMorph passenger. + potentialDropMorph withoutListWrapper. + aTransferMorph shouldCopy. + aTransferMorph}. + + self resetPotentialDropMorph. - withEnoughArguments: {aTransferMorph passenger. - (self itemFromPoint: evt position) withoutListWrapper. - aTransferMorph shouldCopy}. evt hand releaseMouseFocus: self. - potentialDropMorph ifNotNil: [ potentialDropMorph highlightForDrop: false ]. Cursor normal show! Item was added: + ----- Method: PluggableTreeMorph>>dragStartedSelector (in category 'accessing') ----- + dragStartedSelector + ^ dragStartedSelector! Item was added: + ----- Method: PluggableTreeMorph>>dragStartedSelector: (in category 'accessing') ----- + dragStartedSelector: aSymbol + dragStartedSelector := aSymbol.! Item was changed: ----- Method: PluggableTreeMorph>>setSelectedMorph: (in category 'selection') ----- setSelectedMorph: aMorph + + "Avoid unnecessary model callbacks." + self selectedMorph == aMorph ifTrue: [^ self]. + selectedWrapper := aMorph complexContents. "Let the model now about the selected object, not wrapper." setSelectionSelector ifNotNil: [:symbol | model perform: symbol with: (selectedWrapper ifNotNil: [:w | w item])]. "The model may not have access to the parent object in terms of this tree structure." setSelectedParentSelector ifNotNil: [:symbol | model perform: symbol with: (selectedWrapper ifNotNil: [:w | w parent ifNotNil: [:pw | pw item]])].! Item was changed: + ----- Method: PluggableTreeMorph>>startDrag: (in category 'drag and drop') ----- - ----- Method: PluggableTreeMorph>>startDrag: (in category 'morphic') ----- startDrag: evt + + | itemMorph | + self dragItemSelector ifNil: [^ self]. + evt hand hasSubmorphs ifTrue: [^ self]. + self model okToChange ifFalse: [^ self]. + + itemMorph := scroller submorphs + detect: [:any | any highlightedForMouseDown] + ifNone: [^ self]. + + "Prepare visuals." - | ddm itemMorph passenger | - self dragEnabled - ifTrue: [itemMorph := scroller submorphs - detect: [:any | any highlightedForMouseDown] - ifNone: []]. - (itemMorph isNil - or: [evt hand hasSubmorphs]) - ifTrue: [^ self]. itemMorph highlightForMouseDown: false. + self setSelectedMorph: itemMorph. + + [ "Initiate drag." + (self model perform: self dragItemSelector with: itemMorph withoutListWrapper) ifNotNil: [:passenger | | ddm | + ddm := (self valueOfProperty: #dragTransferClass ifAbsent: [TransferMorph]) withPassenger: passenger from: self. + ddm dragTransferType: (self dragTypeSelector ifNotNil: [:s | self model perform: s with: itemMorph withoutListWrapper]). + ddm updateFromUserInputEvent: evt. + self dragStartedSelector ifNotNil: [:s | self model perform: s with: itemMorph with: ddm]. - itemMorph ~= self selectedMorph - ifTrue: [self setSelectedMorph: itemMorph]. - passenger := self model perform: dragItemSelector with: itemMorph withoutListWrapper. - passenger - ifNotNil: [ddm := TransferMorph withPassenger: passenger from: self. - ddm dragTransferType: (self dragTypeSelector - ifNil: [#dragTransferPlus] - ifNotNil: [:s | self model perform: s with: itemMorph withoutListWrapper]). - Preferences dragNDropWithAnimation - ifTrue: [self model dragAnimationFor: itemMorph transferMorph: ddm]. evt hand grabMorph: ddm]. + ] ensure: [ + Cursor normal show. + evt hand releaseMouseFocus: self].! - evt hand releaseMouseFocus: self! Item was changed: + ----- Method: PluggableTreeMorph>>wantsDroppedMorph:event: (in category 'drag and drop') ----- + wantsDroppedMorph: aTransferMorph event: anEvent + + dropItemSelector ifNil: [^ false]. + wantsDropSelector ifNil: [^ true]. + + (aTransferMorph isKindOf: TransferMorph) ifFalse: [^ false]. + + ^ model perform: wantsDropSelector withEnoughArguments: { + aTransferMorph passenger. + aTransferMorph dragTransferType. + aTransferMorph source. + aTransferMorph}! - ----- Method: PluggableTreeMorph>>wantsDroppedMorph:event: (in category 'morphic') ----- - wantsDroppedMorph: aMorph event: anEvent - aMorph dragTransferType == #dragTransferPlus ifFalse:[^false]. - dropItemSelector ifNil:[^false]. - wantsDropSelector ifNil:[^true]. - ^ (model perform: wantsDropSelector with: aMorph passenger) == true.!

1 0

The Trunk: ToolBuilder-Kernel-mt.94.mcz
by commits＠source.squeak.org 04 Nov '15

04 Nov '15

Marcel Taeumel uploaded a new version of ToolBuilder-Kernel to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Kernel-mt.94.mcz ==================== Summary ==================== Name: ToolBuilder-Kernel-mt.94 Author: mt Time: 4 November 2015, 6:50:15.546 pm UUID: 58fe2a54-1973-41df-84a2-12393598991a Ancestors: ToolBuilder-Kernel-mt.93 Refactors and cleans-up drag-and-drop mechanism used by pluggable lists and trees. =============== Diff against ToolBuilder-Kernel-mt.93 =============== Item was changed: PluggableWidgetSpec subclass: #PluggableListSpec + instanceVariableNames: 'list getIndex setIndex getSelected setSelected menu keyPress autoDeselect dragItem dropItem dropAccept doubleClick listSize listItem keystrokePreview icon vScrollBarPolicy hScrollBarPolicy dragStarted' - instanceVariableNames: 'list getIndex setIndex getSelected setSelected menu keyPress autoDeselect dragItem dropItem dropAccept doubleClick listSize listItem keystrokePreview icon vScrollBarPolicy hScrollBarPolicy' classVariableNames: '' poolDictionaries: '' category: 'ToolBuilder-Kernel'! !PluggableListSpec commentStamp: 'ar 7/15/2005 11:54' prior: 0! A single selection list element. Instance variables: list <Symbol> The selector to retrieve the list elements. getIndex <Symbol> The selector to retrieve the list selection index. setIndex <Symbol> The selector to set the list selection index. getSelected <Symbol> The selector to retrieve the list selection. setSelected <Symbol> The selector to set the list selection. menu <Symbol> The selector to offer (to retrieve?) the context menu. keyPress <Symbol> The selector to invoke for handling keyboard shortcuts. autoDeselect <Boolean> Whether the list should allow automatic deselection or not. dragItem <Symbol> Selector to initiate a drag action on an item dropItem <Symbol> Selector to initiate a drop action of an item dropAccept <Symbol> Selector to determine whether a drop would be accepted! Item was added: + ----- Method: PluggableListSpec>>dragStarted (in category 'accessing - drag and drop') ----- + dragStarted + ^ dragStarted! Item was added: + ----- Method: PluggableListSpec>>dragStarted: (in category 'accessing - drag and drop') ----- + dragStarted: symbol + dragStarted := symbol.! Item was changed: PluggableWidgetSpec subclass: #PluggableTreeSpec + instanceVariableNames: 'roots getSelectedPath setSelected getSelected setSelectedParent getChildren hasChildren label icon unusedVar menu keyPress dropItem dropAccept autoDeselect dragItem nodeClass columns vScrollBarPolicy hScrollBarPolicy dragStarted' - instanceVariableNames: 'roots getSelectedPath setSelected getSelected setSelectedParent getChildren hasChildren label icon unusedVar menu keyPress dropItem dropAccept autoDeselect dragItem nodeClass columns vScrollBarPolicy hScrollBarPolicy' classVariableNames: '' poolDictionaries: '' category: 'ToolBuilder-Kernel'! !PluggableTreeSpec commentStamp: 'mvdg 3/21/2008 20:59' prior: 0! A pluggable tree widget. PluggableTrees are slightly different from lists in such that they ALWAYS store the actual objects and use the label selector to query for the label of the item. PluggableTrees also behave somewhat differently in such that they do not have a "getSelected" message but only a getSelectedPath message. The difference is that getSelectedPath is used to indicate by the model that the tree should select the appropriate path. This allows disambiguation of items. Because of this, implementations of PluggableTrees must always set their internal selection directly, e.g., rather than sending the model a setSelected message and wait for an update of the #getSelected the implementation must set the selection before sending the #setSelected message. If a client doesn't want this, it can always just signal a change of getSelectedPath to revert to whatever is needed. Instance variables: roots <Symbol> The message to retrieve the roots of the tree. getSelectedPath <Symbol> The message to retrieve the selected path in the tree. setSelected <Symbol> The message to set the selected item in the tree. getChildren <Symbol> The message to retrieve the children of an item hasChildren <Symbol> The message to query for children of an item label <Symbol> The message to query for the label of an item. icon <Symbol> The message to query for the icon of an item. help <Symbol> The message to query for the help of an item. menu <Symbol> The message to query for the tree's menu keyPress <Symbol> The message to process a keystroke. wantsDrop <Symbol> The message to query whether a drop might be accepted. dropItem <Symbol> The message to drop an item. enableDrag <Boolean> Enable dragging from this tree. autoDeselect <Boolean> Whether the tree should allow automatic deselection or not. unusedVar (unused) This variable is a placeholder to fix problems with loading packages in 3.10.! Item was added: + ----- Method: PluggableTreeSpec>>dragStarted (in category 'accessing - drag and drop') ----- + dragStarted + ^ dragStarted! Item was added: + ----- Method: PluggableTreeSpec>>dragStarted: (in category 'accessing - drag and drop') ----- + dragStarted: symbol + dragStarted := symbol.!

1 0

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

04 Nov '15

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1026.mcz ==================== Summary ==================== Name: Morphic-mt.1026 Author: mt Time: 4 November 2015, 6:49:25.917 pm UUID: a15f3e14-7c49-4d00-988f-ab69d4a499f8 Ancestors: Morphic-mt.1025 Refactors and cleans-up drag-and-drop mechanism used by pluggable lists and trees. =============== Diff against Morphic-mt.1025 =============== Item was changed: ----- Method: PluggableListMorph>>startDrag: (in category 'drag and drop') ----- startDrag: evt + + | item itemMorph | + evt hand hasSubmorphs ifTrue: [^ self]. + self model okToChange ifFalse: [^ self]. + + item := self selection ifNil: [^ self]. + itemMorph := StringMorph contents: item asStringOrText. + [ "Initiate drag." + (self model dragPassengerFor: itemMorph inMorph: self) ifNotNil: [:passenger | | ddm | + ddm := (self valueOfProperty: #dragTransferClass ifAbsent: [TransferMorph]) withPassenger: passenger from: self. + ddm dragTransferType: (self model dragTransferTypeForMorph: self). + ddm updateFromUserInputEvent: evt. + self model dragStartedFor: itemMorph transferMorph: ddm. + evt hand grabMorph: ddm] + ] ensure: [ + Cursor normal show. + evt hand releaseMouseFocus: self].! - evt hand hasSubmorphs - ifTrue: [^ self]. - [ | draggedItem draggedItemMorph passenger ddm | - (self dragEnabled and: [model okToChange]) - ifFalse: [^ self]. - (draggedItem := self selection) - ifNil: [^ self]. - draggedItemMorph := StringMorph contents: draggedItem asStringOrText. - passenger := self model dragPassengerFor: draggedItemMorph inMorph: self. - passenger - ifNil: [^ self]. - ddm := TransferMorph withPassenger: passenger from: self. - ddm - dragTransferType: (self model dragTransferTypeForMorph: self). - Preferences dragNDropWithAnimation - ifTrue: [self model dragAnimationFor: draggedItemMorph transferMorph: ddm]. - evt hand grabMorph: ddm] - ensure: [Cursor normal show. - evt hand releaseMouseFocus: self]! Item was changed: + ----- Method: PluggableListMorph>>wantsDroppedMorph:event: (in category 'drag and drop') ----- - ----- Method: PluggableListMorph>>wantsDroppedMorph:event: (in category 'dropping/grabbing') ----- wantsDroppedMorph: aMorph event: anEvent ^ self model wantsDroppedMorph: aMorph event: anEvent inMorph: self! Item was changed: + ----- Method: SimpleHierarchicalListMorph>>acceptDroppingMorph:event: (in category 'drag and drop') ----- - ----- Method: SimpleHierarchicalListMorph>>acceptDroppingMorph:event: (in category 'dropping/grabbing') ----- acceptDroppingMorph: aMorph event: evt self model acceptDroppingMorph: aMorph event: evt inMorph: self. self resetPotentialDropMorph. evt hand releaseMouseFocus: self. Cursor normal show. ! Item was changed: + ----- Method: SimpleHierarchicalListMorph>>potentialDropMorph (in category 'drag and drop') ----- - ----- Method: SimpleHierarchicalListMorph>>potentialDropMorph (in category 'dropping/grabbing') ----- potentialDropMorph ^potentialDropMorph! Item was changed: + ----- Method: SimpleHierarchicalListMorph>>potentialDropMorph: (in category 'drag and drop') ----- - ----- Method: SimpleHierarchicalListMorph>>potentialDropMorph: (in category 'dropping/grabbing') ----- potentialDropMorph: aMorph potentialDropMorph := aMorph. aMorph highlightForDrop! Item was changed: + ----- Method: SimpleHierarchicalListMorph>>resetPotentialDropMorph (in category 'drag and drop') ----- - ----- Method: SimpleHierarchicalListMorph>>resetPotentialDropMorph (in category 'dropping/grabbing') ----- resetPotentialDropMorph potentialDropMorph ifNotNil: [ potentialDropMorph resetHighlightForDrop. potentialDropMorph := nil] ! Item was changed: ----- Method: SimpleHierarchicalListMorph>>setSelectedMorph: (in category 'selection') ----- setSelectedMorph: aMorph + "Avoid unnecessary model callbacks." + self selectedMorph == aMorph ifTrue: [^ self]. + model perform: (setSelectionSelector ifNil: [^self]) with: aMorph complexContents "leave last wrapper in place" ! Item was changed: + ----- Method: SimpleHierarchicalListMorph>>startDrag: (in category 'drag and drop') ----- - ----- Method: SimpleHierarchicalListMorph>>startDrag: (in category 'event handling') ----- startDrag: evt + + | itemMorph | + evt hand hasSubmorphs ifTrue: [^ self]. + self model okToChange ifFalse: [^ self]. + + itemMorph := scroller submorphs + detect: [:any | any highlightedForMouseDown] + ifNone: [^ self]. + + "Prepare visuals." - | ddm itemMorph passenger | - self dragEnabled - ifTrue: [itemMorph := scroller submorphs - detect: [:any | any highlightedForMouseDown] - ifNone: []]. - (itemMorph isNil - or: [evt hand hasSubmorphs]) - ifTrue: [^ self]. itemMorph highlightForMouseDown: false. + self setSelectedMorph: itemMorph. + + [ "Initiate drag." + (self model dragPassengerFor: itemMorph inMorph: self) ifNotNil: [:passenger | | ddm | + ddm := (self valueOfProperty: #dragTransferClass ifAbsent: [TransferMorph]) withPassenger: passenger from: self. + ddm dragTransferType: (self model dragTransferTypeForMorph: self). + ddm updateFromUserInputEvent: evt. + self model dragStartedFor: itemMorph transferMorph: ddm. - itemMorph ~= self selectedMorph - ifTrue: [self setSelectedMorph: itemMorph]. - passenger := self model dragPassengerFor: itemMorph inMorph: self. - passenger - ifNotNil: [ddm := TransferMorph withPassenger: passenger from: self. - ddm - dragTransferType: (self model dragTransferTypeForMorph: self). - Preferences dragNDropWithAnimation - ifTrue: [self model dragAnimationFor: itemMorph transferMorph: ddm]. evt hand grabMorph: ddm]. + ] ensure: [ + Cursor normal show. + evt hand releaseMouseFocus: self].! - evt hand releaseMouseFocus: self! Item was changed: + ----- Method: SimpleHierarchicalListMorph>>wantsDroppedMorph:event: (in category 'drag and drop') ----- - ----- Method: SimpleHierarchicalListMorph>>wantsDroppedMorph:event: (in category 'dropping/grabbing') ----- wantsDroppedMorph: aMorph event: anEvent ^ self model wantsDroppedMorph: aMorph event: anEvent inMorph: self! Item was changed: ----- Method: TransferMorph class>>withPassenger: (in category 'instance creation') ----- withPassenger: anObject + + ^ self + withPassenger: anObject + from: nil! - ^ self withPassenger: anObject from: nil! Item was changed: ----- Method: TransferMorph class>>withPassenger:from: (in category 'instance creation') ----- withPassenger: anObject from: source + + ^ self new + passenger: anObject; + source: source; + yourself! - | ddm | - ddm := self new. - ddm passenger: anObject. - ddm source: source. - Sensor shiftPressed ifTrue: [ddm shouldCopy: true]. - ^ ddm! Item was changed: ----- Method: TransferMorph>>aboutToBeGrabbedBy: (in category 'dropping/grabbing') ----- aboutToBeGrabbedBy: aHand "The receiver is being grabbed by a hand. Perform necessary adjustments (if any) and return the actual morph that should be added to the hand." "Since this morph has been initialized automatically with bounds origin 0@0, we have to move it to aHand position." super aboutToBeGrabbedBy: aHand. + + self align: self fullBounds bottomLeft with: aHand position. - self draggedMorph. - self align: self bottomLeft with: aHand position. aHand newKeyboardFocus: self.! Item was removed: - ----- Method: TransferMorph>>delete (in category 'submorphs-add/remove') ----- - delete - "See also >>justDroppedInto:event:." - self changed: #deleted. - self breakDependents. - super delete! Item was added: + ----- Method: TransferMorph>>doCopy (in category 'event handling') ----- + doCopy + + copy := true. + self updateCopyIcon.! Item was added: + ----- Method: TransferMorph>>doMove (in category 'event handling') ----- + doMove + + copy := false. + self updateCopyIcon.! Item was changed: + ----- Method: TransferMorph>>dragTransferType (in category 'accessing') ----- - ----- Method: TransferMorph>>dragTransferType (in category 'drag and drop') ----- dragTransferType ^transferType! Item was removed: - ----- Method: TransferMorph>>draggedMorph (in category 'accessing') ----- - draggedMorph - draggedMorph ifNil: [self initDraggedMorph]. - ^draggedMorph! Item was removed: - ----- Method: TransferMorph>>draggedMorph: (in category 'accessing') ----- - draggedMorph: aMorph - draggedMorph := aMorph! Item was removed: - ----- Method: TransferMorph>>initDraggedMorph (in category 'private') ----- - initDraggedMorph - draggedMorph ifNotNil: [^self]. - draggedMorph := self passenger asDraggableMorph. - self addMorphBack: draggedMorph. - self updateCopyIcon. - self changed; fullBounds! Item was changed: ----- Method: TransferMorph>>initialize (in category 'initialization') ----- initialize + - "initialize the state of the receiver" super initialize. + + self + changeTableLayout; + listDirection: #leftToRight; - self layoutPolicy: TableLayout new. - self listDirection: #leftToRight; hResizing: #shrinkWrap; vResizing: #shrinkWrap; layoutInset: 3; + cellInset: 3; wrapCentering: #center; + cellPositioning: #leftCenter; + setProperty: #indicateKeyboardFocus toValue: #never. + + self doMove. + + self on: #keyStroke send: #keyStroke: to: self. + self on: #keyUp send: #updateFromUserInputEvent: to: self. + self on: #keyDown send: #updateFromUserInputEvent: to: self.! - cellPositioning: #leftCenter. - copy := false. - self on: #keyStroke send: #keyStroke: to: self! Item was changed: ----- Method: TransferMorph>>keyStroke: (in category 'event handling') ----- keyStroke: evt "Abort the drag on an escape" + + evt keyCharacter = Character escape ifTrue: [self delete].! - evt keyCharacter ~= Character escape ifTrue: [ ^self ]. - self delete.! Item was removed: - ----- Method: TransferMorph>>move (in category 'accessing') ----- - move - copy := false! Item was changed: ----- Method: TransferMorph>>passenger: (in category 'accessing') ----- passenger: anObject + + passenger := anObject. + + self + removeAllMorphs; + addMorph: passenger asDraggableMorph; + updateCopyIcon.! - passenger := anObject! Item was removed: - ----- Method: TransferMorph>>privateFullMoveBy: (in category 'private') ----- - privateFullMoveBy: delta - super privateFullMoveBy: delta. - self changed: #position! Item was removed: - ----- Method: TransferMorph>>shouldCopy: (in category 'accessing') ----- - shouldCopy: aBoolean - copy := aBoolean.! Item was added: + ----- Method: TransferMorph>>shouldMove (in category 'accessing') ----- + shouldMove + ^ self shouldCopy not! Item was removed: - ----- Method: TransferMorph>>step (in category 'stepping and presenter') ----- - step - self shouldCopy: self primaryHand lastEvent shiftPressed. - self updateCopyIcon! Item was removed: - ----- Method: TransferMorph>>stepTime (in category 'stepping and presenter') ----- - stepTime - ^100! Item was changed: ----- Method: TransferMorph>>updateCopyIcon (in category 'private') ----- updateCopyIcon + + (self submorphNamed: #tmCopyIcon) + ifNil: [self shouldCopy ifTrue: [ + self addMorphFront: (ImageMorph new image: CopyPlusIcon; name: #tmCopyIcon; yourself)]] + ifNotNil: [:copyIcon | self shouldCopy ifFalse: [ + copyIcon delete]]! - | copyIcon | - copyIcon := self submorphWithProperty: #tmCopyIcon. - (self shouldCopy and: [ copyIcon isNil ]) ifTrue: [ - ^self addMorphFront: ((ImageMorph new image: CopyPlusIcon) setProperty: #tmCopyIcon toValue: true) - ]. - (self shouldCopy not and: [ copyIcon notNil ]) ifTrue: [ - copyIcon delete - ]! Item was added: + ----- Method: TransferMorph>>updateFromUserInputEvent: (in category 'event handling') ----- + updateFromUserInputEvent: evt + + evt shiftPressed + ifTrue: [self doCopy] + ifFalse: [self doMove].! Item was removed: - Morph subclass: #TransferMorphAnimation - instanceVariableNames: 'transferMorph' - classVariableNames: '' - poolDictionaries: '' - category: 'Morphic-Support'! Item was removed: - ----- Method: TransferMorphAnimation class>>on: (in category 'instance creation') ----- - on: aTransferMorph - ^self new on: aTransferMorph! Item was removed: - ----- Method: TransferMorphAnimation>>on: (in category 'initialization') ----- - on: aTransferMorph - - self flag: #bob. "there was a reference to World, but the class seems to be unused" - - self color: Color transparent. - transferMorph := aTransferMorph. - transferMorph addDependent: self. - ActiveWorld addMorph: self "or perhaps aTransferMorph world"! Item was removed: - ----- Method: TransferMorphAnimation>>transferMorph (in category 'accessing') ----- - transferMorph - ^transferMorph! Item was removed: - ----- Method: TransferMorphAnimation>>update: (in category 'updating') ----- - update: aSymbol - aSymbol == #deleted - ifTrue: [self delete]. - aSymbol == #position - ifTrue: [self updateAnimation]. - self changed! Item was removed: - ----- Method: TransferMorphAnimation>>updateAnimation (in category 'update') ----- - updateAnimation! Item was removed: - TransferMorphAnimation subclass: #TransferMorphLineAnimation - instanceVariableNames: 'polygon' - classVariableNames: '' - poolDictionaries: '' - category: 'Morphic-Support'! Item was removed: - ----- Method: TransferMorphLineAnimation>>initPolygon (in category 'initialization') ----- - initPolygon - polygon := (LineMorph from: self transferMorph source bounds center - to: self transferMorph bounds center - color: Color black width: 2) - dashedBorder: {10. 10. Color white}. - self addMorph: polygon - ! Item was removed: - ----- Method: TransferMorphLineAnimation>>on: (in category 'initialization') ----- - on: aTransferMorph - super on: aTransferMorph. - self initPolygon! Item was removed: - ----- Method: TransferMorphLineAnimation>>updateAnimation (in category 'update') ----- - updateAnimation - polygon verticesAt: 2 put: self transferMorph center!

1 0

The Trunk: Kernel-mt.965.mcz
by commits＠source.squeak.org 04 Nov '15

04 Nov '15

Marcel Taeumel uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-mt.965.mcz ==================== Summary ==================== Name: Kernel-mt.965 Author: mt Time: 4 November 2015, 6:47:19.492 pm UUID: bc2a01d5-b9c9-4111-bfd0-a2a19ae61e88 Ancestors: Kernel-ul.964 Refactors and cleans-up drag-and-drop mechanism used by pluggable lists and trees. =============== Diff against Kernel-ul.964 =============== Item was removed: - ----- Method: Object>>dragAnimationFor:transferMorph: (in category 'drag and drop') ----- - dragAnimationFor: item transferMorph: transferMorph - "Default do nothing"! Item was added: + ----- Method: Object>>dragStartedFor:transferMorph: (in category 'drag and drop') ----- + dragStartedFor: anItemMorph transferMorph: aTransferMorph + "Give the model a chance to respond to a started drag operation. Could be used to give a notification or play an animation. Do nothing by default."! Item was removed: - ----- Method: Object>>dragTransferType (in category 'drag and drop') ----- - dragTransferType - ^nil!

1 0

The Trunk: ToolBuilder-Kernel-mt.93.mcz
by commits＠source.squeak.org 04 Nov '15

04 Nov '15

Marcel Taeumel uploaded a new version of ToolBuilder-Kernel to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Kernel-mt.93.mcz ==================== Summary ==================== Name: ToolBuilder-Kernel-mt.93 Author: mt Time: 4 November 2015, 10:42:39.831 am UUID: 7641f554-712a-4031-ad7f-986f3aa658b0 Ancestors: ToolBuilder-Kernel-mt.92 Removes unused and obsolete #wantsDrop accessors and instVar. We have #dropAccept for that. =============== Diff against ToolBuilder-Kernel-mt.92 =============== Item was changed: PluggableWidgetSpec subclass: #PluggableTreeSpec + instanceVariableNames: 'roots getSelectedPath setSelected getSelected setSelectedParent getChildren hasChildren label icon unusedVar menu keyPress dropItem dropAccept autoDeselect dragItem nodeClass columns vScrollBarPolicy hScrollBarPolicy' - instanceVariableNames: 'roots getSelectedPath setSelected getSelected setSelectedParent getChildren hasChildren label icon unusedVar menu keyPress wantsDrop dropItem dropAccept autoDeselect dragItem nodeClass columns vScrollBarPolicy hScrollBarPolicy' classVariableNames: '' poolDictionaries: '' category: 'ToolBuilder-Kernel'! !PluggableTreeSpec commentStamp: 'mvdg 3/21/2008 20:59' prior: 0! A pluggable tree widget. PluggableTrees are slightly different from lists in such that they ALWAYS store the actual objects and use the label selector to query for the label of the item. PluggableTrees also behave somewhat differently in such that they do not have a "getSelected" message but only a getSelectedPath message. The difference is that getSelectedPath is used to indicate by the model that the tree should select the appropriate path. This allows disambiguation of items. Because of this, implementations of PluggableTrees must always set their internal selection directly, e.g., rather than sending the model a setSelected message and wait for an update of the #getSelected the implementation must set the selection before sending the #setSelected message. If a client doesn't want this, it can always just signal a change of getSelectedPath to revert to whatever is needed. Instance variables: roots <Symbol> The message to retrieve the roots of the tree. getSelectedPath <Symbol> The message to retrieve the selected path in the tree. setSelected <Symbol> The message to set the selected item in the tree. getChildren <Symbol> The message to retrieve the children of an item hasChildren <Symbol> The message to query for children of an item label <Symbol> The message to query for the label of an item. icon <Symbol> The message to query for the icon of an item. help <Symbol> The message to query for the help of an item. menu <Symbol> The message to query for the tree's menu keyPress <Symbol> The message to process a keystroke. wantsDrop <Symbol> The message to query whether a drop might be accepted. dropItem <Symbol> The message to drop an item. enableDrag <Boolean> Enable dragging from this tree. autoDeselect <Boolean> Whether the tree should allow automatic deselection or not. unusedVar (unused) This variable is a placeholder to fix problems with loading packages in 3.10.! Item was removed: - ----- Method: PluggableTreeSpec>>wantsDrop (in category 'accessing - drag and drop') ----- - wantsDrop - "Answer the selector for invoking the tree's wantsDrop handler" - ^wantsDrop! Item was removed: - ----- Method: PluggableTreeSpec>>wantsDrop: (in category 'accessing - drag and drop') ----- - wantsDrop: aSymbol - "Indicate the selector for invoking the tree's wantsDrop handler" - wantsDrop := aSymbol!

1 0

The Trunk: SMLoader-mt.86.mcz
by commits＠source.squeak.org 04 Nov '15

04 Nov '15

Marcel Taeumel uploaded a new version of SMLoader to project The Trunk: http://source.squeak.org/trunk/SMLoader-mt.86.mcz ==================== Summary ==================== Name: SMLoader-mt.86 Author: mt Time: 4 November 2015, 10:41:19.319 am UUID: 235be22c-ca32-4ff4-b87c-73a6a8a58862 Ancestors: SMLoader-cmm.85 Code clean-up. =============== Diff against SMLoader-cmm.85 =============== Item was changed: ----- Method: SMLoaderCategoricalPlus>>buildInstalledPackagesListWith: (in category 'DEPRECATED') ----- buildInstalledPackagesListWith: aBuilder ^ aBuilder pluggableTreeSpec new model: self; roots: #installedPackageList; getSelectedPath: #selectedItemPath; getSelected: #selectedItem; setSelected: #selectedItem:; menu: #packagesMenu:; label: #itemLabel:; getChildren: #itemChildren:; hasChildren: #itemHasChildren:; autoDeselect: true; - wantsDrop: true; yourself! Item was changed: ----- Method: SMLoaderCategoricalPlus>>buildNotInstalledPackagesListWith: (in category 'DEPRECATED') ----- buildNotInstalledPackagesListWith: aBuilder ^ aBuilder pluggableTreeSpec new model: self; roots: #notInstalledPackageList; getSelectedPath: #selectedItemPath; getSelected: #selectedItem; setSelected: #selectedItem:; menu: #packagesMenu:; label: #itemLabel:; getChildren: #itemChildren:; hasChildren: #itemHasChildren:; autoDeselect: true; - wantsDrop: true; yourself! Item was changed: ----- Method: SMLoaderPlus>>buildCategoriesListWith: (in category 'interface') ----- buildCategoriesListWith: aBuilder "Create the hierarchical list holding the category tree." ^ aBuilder pluggableTreeSpec new model: self; roots: #categoryList; getSelectedPath: #selectedCategoryPath; getChildren: #categoryChildren:; hasChildren: #categoryHasChildren:; setSelected: #selectedCategory:; getSelected: #selectedCategory; menu: #categoriesMenu:; label: #categoryLabel:; autoDeselect: true; - wantsDrop: true; name: #categoriesList; yourself! Item was changed: ----- Method: SMLoaderPlus>>buildPackagesListWith: (in category 'interface') ----- buildPackagesListWith: aBuilder "Create the hierarchical list holding the packages and releases." ^ aBuilder pluggableTreeSpec new model: self; roots: #packageList; getSelectedPath: #selectedItemPath; getSelected: #selectedItem; setSelected: #selectedItem:; menu: #packagesMenu:; label: #itemLabel:; getChildren: #itemChildren:; hasChildren: #itemHasChildren:; autoDeselect: true; - wantsDrop: true; name: #packagesList; yourself!

1 0

The Trunk: ToolBuilder-Morphic-mt.150.mcz
by commits＠source.squeak.org 04 Nov '15

04 Nov '15

Marcel Taeumel uploaded a new version of ToolBuilder-Morphic to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Morphic-mt.150.mcz ==================== Summary ==================== Name: ToolBuilder-Morphic-mt.150 Author: mt Time: 4 November 2015, 10:33:51.502 am UUID: 4df461c0-47b8-4cda-a915-4277646038fb Ancestors: ToolBuilder-Morphic-mt.149 Adds support for overriding scrollbar policies in trees. =============== Diff against ToolBuilder-Morphic-mt.149 =============== Item was changed: ----- Method: MorphicToolBuilder>>buildPluggableTree: (in category 'widgets required') ----- buildPluggableTree: aSpec | widget | widget := self treeClass new. self register: widget id: aSpec name. widget model: aSpec model. widget getSelectedPathSelector: aSpec getSelectedPath. widget setSelectedSelector: aSpec setSelected. widget getSelectedSelector: aSpec getSelected. widget setSelectedParentSelector: aSpec setSelectedParent. widget getChildrenSelector: aSpec getChildren. widget hasChildrenSelector: aSpec hasChildren. widget getLabelSelector: aSpec label. widget getIconSelector: aSpec icon. widget getHelpSelector: aSpec help. widget getMenuSelector: aSpec menu. widget keystrokeActionSelector: aSpec keyPress. widget nodeClass: aSpec nodeClass. widget getRootsSelector: aSpec roots. widget autoDeselect: aSpec autoDeselect. widget dropItemSelector: aSpec dropItem. widget wantsDropSelector: aSpec dropAccept. widget dragItemSelector: aSpec dragItem. widget columns: aSpec columns. + "Override default scroll bar policies if needed. Widget will use preference values otherwise." + aSpec hScrollBarPolicy ifNotNil: [:policy | + policy caseOf: { + [#always] -> [widget alwaysShowHScrollBar]. + [#never] -> [widget hideHScrollBarIndefinitely]. + [#whenNeeded] -> [widget showHScrollBarOnlyWhenNeeded]. } ]. + aSpec vScrollBarPolicy ifNotNil: [:policy | + policy caseOf: { + [#always] -> [widget alwaysShowVScrollBar]. + [#never] -> [widget hideVScrollBarIndefinitely]. + [#whenNeeded] -> [widget showVScrollBarOnlyWhenNeeded]. } ]. + self setFrame: aSpec frame in: widget. self setLayoutHintsFor: widget spec: aSpec. parent ifNotNil:[self add: widget to: parent]. " panes ifNotNil:[ aSpec roots ifNotNil:[panes add: aSpec roots]. ]. " ^widget!

1 0

The Trunk: ToolBuilder-Kernel-mt.92.mcz
by commits＠source.squeak.org 04 Nov '15

04 Nov '15

Marcel Taeumel uploaded a new version of ToolBuilder-Kernel to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Kernel-mt.92.mcz ==================== Summary ==================== Name: ToolBuilder-Kernel-mt.92 Author: mt Time: 4 November 2015, 10:32:50.512 am UUID: b16fa7cb-f1cd-40b0-bf3f-29948e2e66e6 Ancestors: ToolBuilder-Kernel-topa.91 Updates message categories in list spec and tree spec. Adds possibility to override scroll bar policies in trees like it works in lists or scroll panes. =============== Diff against ToolBuilder-Kernel-topa.91 =============== Item was changed: + ----- Method: PluggableListSpec>>autoDeselect (in category 'accessing - selection') ----- - ----- Method: PluggableListSpec>>autoDeselect (in category 'accessing') ----- autoDeselect "Answer whether this tree can be automatically deselected" ^autoDeselect ifNil:[true]! Item was changed: + ----- Method: PluggableListSpec>>autoDeselect: (in category 'accessing - selection') ----- - ----- Method: PluggableListSpec>>autoDeselect: (in category 'accessing') ----- autoDeselect: aBool "Indicate whether this tree can be automatically deselected" autoDeselect := aBool! Item was changed: + ----- Method: PluggableListSpec>>dragItem (in category 'accessing - drag and drop') ----- - ----- Method: PluggableListSpec>>dragItem (in category 'accessing') ----- dragItem "Answer the selector for dragging an item" ^dragItem! Item was changed: + ----- Method: PluggableListSpec>>dragItem: (in category 'accessing - drag and drop') ----- - ----- Method: PluggableListSpec>>dragItem: (in category 'accessing') ----- dragItem: aSymbol "Set the selector for dragging an item" dragItem := aSymbol! Item was changed: + ----- Method: PluggableListSpec>>dropAccept (in category 'accessing - drag and drop') ----- - ----- Method: PluggableListSpec>>dropAccept (in category 'accessing') ----- dropAccept "Answer the selector to determine whether a drop would be accepted" ^dropAccept! Item was changed: + ----- Method: PluggableListSpec>>dropAccept: (in category 'accessing - drag and drop') ----- - ----- Method: PluggableListSpec>>dropAccept: (in category 'accessing') ----- dropAccept: aSymbol "Answer the selector to determine whether a drop would be accepted" dropAccept := aSymbol.! Item was changed: + ----- Method: PluggableListSpec>>dropItem (in category 'accessing - drag and drop') ----- - ----- Method: PluggableListSpec>>dropItem (in category 'accessing') ----- dropItem "Answer the selector for dropping an item" ^dropItem! Item was changed: + ----- Method: PluggableListSpec>>dropItem: (in category 'accessing - drag and drop') ----- - ----- Method: PluggableListSpec>>dropItem: (in category 'accessing') ----- dropItem: aSymbol "Set the selector for dropping an item" dropItem := aSymbol! Item was changed: + ----- Method: PluggableListSpec>>getIndex (in category 'accessing - selection') ----- - ----- Method: PluggableListSpec>>getIndex (in category 'accessing') ----- getIndex "Answer the selector for retrieving the list's selection index" ^getIndex! Item was changed: + ----- Method: PluggableListSpec>>getIndex: (in category 'accessing - selection') ----- - ----- Method: PluggableListSpec>>getIndex: (in category 'accessing') ----- getIndex: aSymbol "Indicate the selector for retrieving the list's selection index" getIndex := aSymbol! Item was changed: + ----- Method: PluggableListSpec>>getSelected (in category 'accessing - selection') ----- - ----- Method: PluggableListSpec>>getSelected (in category 'accessing') ----- getSelected "Answer the selector for retrieving the list selection" ^getSelected! Item was changed: + ----- Method: PluggableListSpec>>getSelected: (in category 'accessing - selection') ----- - ----- Method: PluggableListSpec>>getSelected: (in category 'accessing') ----- getSelected: aSymbol "Indicate the selector for retrieving the list selection" getSelected := aSymbol! Item was changed: + ----- Method: PluggableListSpec>>list (in category 'accessing - list') ----- - ----- Method: PluggableListSpec>>list (in category 'accessing') ----- list "Answer the selector for retrieving the list contents" ^list! Item was changed: + ----- Method: PluggableListSpec>>list: (in category 'accessing - list') ----- - ----- Method: PluggableListSpec>>list: (in category 'accessing') ----- list: aSymbol "Indicate the selector for retrieving the list contents" list := aSymbol.! Item was changed: + ----- Method: PluggableListSpec>>listItem (in category 'accessing - list') ----- - ----- Method: PluggableListSpec>>listItem (in category 'accessing') ----- listItem "Answer the selector for retrieving the list element" ^listItem! Item was changed: + ----- Method: PluggableListSpec>>listItem: (in category 'accessing - list') ----- - ----- Method: PluggableListSpec>>listItem: (in category 'accessing') ----- listItem: aSymbol "Indicate the selector for retrieving the list element" listItem := aSymbol.! Item was changed: + ----- Method: PluggableListSpec>>listSize (in category 'accessing - list') ----- - ----- Method: PluggableListSpec>>listSize (in category 'accessing') ----- listSize "Answer the selector for retrieving the list size" ^listSize! Item was changed: + ----- Method: PluggableListSpec>>listSize: (in category 'accessing - list') ----- - ----- Method: PluggableListSpec>>listSize: (in category 'accessing') ----- listSize: aSymbol "Indicate the selector for retrieving the list size" listSize := aSymbol.! Item was changed: + ----- Method: PluggableListSpec>>setIndex (in category 'accessing - selection') ----- - ----- Method: PluggableListSpec>>setIndex (in category 'accessing') ----- setIndex "Answer the selector for setting the list's selection index" ^setIndex! Item was changed: + ----- Method: PluggableListSpec>>setIndex: (in category 'accessing - selection') ----- - ----- Method: PluggableListSpec>>setIndex: (in category 'accessing') ----- setIndex: aSymbol "Answer the selector for setting the list's selection index" setIndex := aSymbol! Item was changed: + ----- Method: PluggableListSpec>>setSelected (in category 'accessing - selection') ----- - ----- Method: PluggableListSpec>>setSelected (in category 'accessing') ----- setSelected "Answer the selector for setting the list selection" ^setSelected! Item was changed: + ----- Method: PluggableListSpec>>setSelected: (in category 'accessing - selection') ----- - ----- Method: PluggableListSpec>>setSelected: (in category 'accessing') ----- setSelected: aSymbol "Indicate the selector for setting the list selection" setSelected := aSymbol! Item was changed: PluggableWidgetSpec subclass: #PluggableTreeSpec + instanceVariableNames: 'roots getSelectedPath setSelected getSelected setSelectedParent getChildren hasChildren label icon unusedVar menu keyPress wantsDrop dropItem dropAccept autoDeselect dragItem nodeClass columns vScrollBarPolicy hScrollBarPolicy' - instanceVariableNames: 'roots getSelectedPath setSelected getSelected setSelectedParent getChildren hasChildren label icon unusedVar menu keyPress wantsDrop dropItem dropAccept autoDeselect dragItem nodeClass columns' classVariableNames: '' poolDictionaries: '' category: 'ToolBuilder-Kernel'! !PluggableTreeSpec commentStamp: 'mvdg 3/21/2008 20:59' prior: 0! A pluggable tree widget. PluggableTrees are slightly different from lists in such that they ALWAYS store the actual objects and use the label selector to query for the label of the item. PluggableTrees also behave somewhat differently in such that they do not have a "getSelected" message but only a getSelectedPath message. The difference is that getSelectedPath is used to indicate by the model that the tree should select the appropriate path. This allows disambiguation of items. Because of this, implementations of PluggableTrees must always set their internal selection directly, e.g., rather than sending the model a setSelected message and wait for an update of the #getSelected the implementation must set the selection before sending the #setSelected message. If a client doesn't want this, it can always just signal a change of getSelectedPath to revert to whatever is needed. Instance variables: roots <Symbol> The message to retrieve the roots of the tree. getSelectedPath <Symbol> The message to retrieve the selected path in the tree. setSelected <Symbol> The message to set the selected item in the tree. getChildren <Symbol> The message to retrieve the children of an item hasChildren <Symbol> The message to query for children of an item label <Symbol> The message to query for the label of an item. icon <Symbol> The message to query for the icon of an item. help <Symbol> The message to query for the help of an item. menu <Symbol> The message to query for the tree's menu keyPress <Symbol> The message to process a keystroke. wantsDrop <Symbol> The message to query whether a drop might be accepted. dropItem <Symbol> The message to drop an item. enableDrag <Boolean> Enable dragging from this tree. autoDeselect <Boolean> Whether the tree should allow automatic deselection or not. unusedVar (unused) This variable is a placeholder to fix problems with loading packages in 3.10.! Item was changed: + ----- Method: PluggableTreeSpec>>autoDeselect (in category 'accessing - selection') ----- - ----- Method: PluggableTreeSpec>>autoDeselect (in category 'accessing') ----- autoDeselect "Answer whether this tree can be automatically deselected" ^autoDeselect ifNil:[true]! Item was changed: + ----- Method: PluggableTreeSpec>>autoDeselect: (in category 'accessing - selection') ----- - ----- Method: PluggableTreeSpec>>autoDeselect: (in category 'accessing') ----- autoDeselect: aBool "Indicate whether this tree can be automatically deselected" autoDeselect := aBool.! Item was changed: + ----- Method: PluggableTreeSpec>>dragItem (in category 'accessing - drag and drop') ----- - ----- Method: PluggableTreeSpec>>dragItem (in category 'accessing') ----- dragItem ^ dragItem.! Item was changed: + ----- Method: PluggableTreeSpec>>dragItem: (in category 'accessing - drag and drop') ----- - ----- Method: PluggableTreeSpec>>dragItem: (in category 'accessing') ----- dragItem: aSymbol "Set the selector for dragging an item" dragItem := aSymbol! Item was changed: + ----- Method: PluggableTreeSpec>>dropAccept (in category 'accessing - drag and drop') ----- - ----- Method: PluggableTreeSpec>>dropAccept (in category 'accessing') ----- dropAccept "Answer the selector for querying the receiver about accepting drops" ^dropAccept! Item was changed: + ----- Method: PluggableTreeSpec>>dropAccept: (in category 'accessing - drag and drop') ----- - ----- Method: PluggableTreeSpec>>dropAccept: (in category 'accessing') ----- dropAccept: aSymbol "Set the selector for querying the receiver about accepting drops" dropAccept := aSymbol! Item was changed: + ----- Method: PluggableTreeSpec>>dropItem (in category 'accessing - drag and drop') ----- - ----- Method: PluggableTreeSpec>>dropItem (in category 'accessing') ----- dropItem "Answer the selector for invoking the tree's dragDrop handler" ^dropItem! Item was changed: + ----- Method: PluggableTreeSpec>>dropItem: (in category 'accessing - drag and drop') ----- - ----- Method: PluggableTreeSpec>>dropItem: (in category 'accessing') ----- dropItem: aSymbol "Indicate the selector for invoking the tree's dragDrop handler" dropItem := aSymbol! Item was changed: + ----- Method: PluggableTreeSpec>>getChildren (in category 'accessing - hierarchy') ----- - ----- Method: PluggableTreeSpec>>getChildren (in category 'accessing') ----- getChildren "Answer the message to get the children of this tree" ^getChildren! Item was changed: + ----- Method: PluggableTreeSpec>>getChildren: (in category 'accessing - hierarchy') ----- - ----- Method: PluggableTreeSpec>>getChildren: (in category 'accessing') ----- getChildren: aSymbol "Indicate the message to retrieve the children of this tree" getChildren := aSymbol! Item was changed: + ----- Method: PluggableTreeSpec>>getSelected (in category 'accessing - selection') ----- - ----- Method: PluggableTreeSpec>>getSelected (in category 'accessing') ----- getSelected ^ getSelected! Item was changed: + ----- Method: PluggableTreeSpec>>getSelected: (in category 'accessing - selection') ----- - ----- Method: PluggableTreeSpec>>getSelected: (in category 'accessing') ----- getSelected: aSymbol "Indicate a single node in the tree. Only works if that node is visible, too. Use #getSelectedPath otherwise." getSelected := aSymbol.! Item was changed: + ----- Method: PluggableTreeSpec>>getSelectedPath (in category 'accessing - selection') ----- - ----- Method: PluggableTreeSpec>>getSelectedPath (in category 'accessing') ----- getSelectedPath "Answer the message to retrieve the selection of this tree" ^getSelectedPath! Item was changed: + ----- Method: PluggableTreeSpec>>getSelectedPath: (in category 'accessing - selection') ----- - ----- Method: PluggableTreeSpec>>getSelectedPath: (in category 'accessing') ----- getSelectedPath: aSymbol "Indicate the message to retrieve the selection of this tree" getSelectedPath := aSymbol! Item was added: + ----- Method: PluggableTreeSpec>>hScrollBarPolicy (in category 'accessing') ----- + hScrollBarPolicy + + ^ hScrollBarPolicy! Item was added: + ----- Method: PluggableTreeSpec>>hScrollBarPolicy: (in category 'accessing') ----- + hScrollBarPolicy: aSymbol + "#always, #never, #whenNeeded" + + hScrollBarPolicy := aSymbol.! Item was changed: + ----- Method: PluggableTreeSpec>>hasChildren (in category 'accessing - hierarchy') ----- - ----- Method: PluggableTreeSpec>>hasChildren (in category 'accessing') ----- hasChildren "Answer the message to get the existence of children in this tree" ^hasChildren! Item was changed: + ----- Method: PluggableTreeSpec>>hasChildren: (in category 'accessing - hierarchy') ----- - ----- Method: PluggableTreeSpec>>hasChildren: (in category 'accessing') ----- hasChildren: aSymbol "Indicate the message to retrieve the existence children in this tree" hasChildren := aSymbol! Item was changed: + ----- Method: PluggableTreeSpec>>roots (in category 'accessing - hierarchy') ----- - ----- Method: PluggableTreeSpec>>roots (in category 'accessing') ----- roots "Answer the message to retrieve the roots of this tree" ^roots! Item was changed: + ----- Method: PluggableTreeSpec>>roots: (in category 'accessing - hierarchy') ----- - ----- Method: PluggableTreeSpec>>roots: (in category 'accessing') ----- roots: aSymbol "Indicate the message to retrieve the roots of this tree" roots := aSymbol! Item was changed: + ----- Method: PluggableTreeSpec>>setSelected (in category 'accessing - selection') ----- - ----- Method: PluggableTreeSpec>>setSelected (in category 'accessing') ----- setSelected "Answer the message to set the selection of this tree" ^setSelected! Item was changed: + ----- Method: PluggableTreeSpec>>setSelected: (in category 'accessing - selection') ----- - ----- Method: PluggableTreeSpec>>setSelected: (in category 'accessing') ----- setSelected: aSymbol "Indicate the message to set the selection of this tree" setSelected := aSymbol! Item was changed: + ----- Method: PluggableTreeSpec>>setSelectedParent (in category 'accessing - selection') ----- - ----- Method: PluggableTreeSpec>>setSelectedParent (in category 'accessing') ----- setSelectedParent ^ setSelectedParent! Item was changed: + ----- Method: PluggableTreeSpec>>setSelectedParent: (in category 'accessing - selection') ----- - ----- Method: PluggableTreeSpec>>setSelectedParent: (in category 'accessing') ----- setSelectedParent: aSymbol setSelectedParent := aSymbol! Item was added: + ----- Method: PluggableTreeSpec>>vScrollBarPolicy (in category 'accessing') ----- + vScrollBarPolicy + + ^ vScrollBarPolicy! Item was added: + ----- Method: PluggableTreeSpec>>vScrollBarPolicy: (in category 'accessing') ----- + vScrollBarPolicy: aSymbol + "#always, #never, #whenNeeded" + + vScrollBarPolicy := aSymbol.! Item was changed: + ----- Method: PluggableTreeSpec>>wantsDrop (in category 'accessing - drag and drop') ----- - ----- Method: PluggableTreeSpec>>wantsDrop (in category 'accessing') ----- wantsDrop "Answer the selector for invoking the tree's wantsDrop handler" ^wantsDrop! Item was changed: + ----- Method: PluggableTreeSpec>>wantsDrop: (in category 'accessing - drag and drop') ----- - ----- Method: PluggableTreeSpec>>wantsDrop: (in category 'accessing') ----- wantsDrop: aSymbol "Indicate the selector for invoking the tree's wantsDrop handler" wantsDrop := aSymbol!

1 0

Jump to page: