[squeak-dev] The Trunk: Tools-mt.1099.mcz
commits at source.squeak.org
commits at source.squeak.org
Fri Dec 31 09:04:03 UTC 2021
Marcel Taeumel uploaded a new version of Tools to project The Trunk:
http://source.squeak.org/trunk/Tools-mt.1099.mcz
==================== Summary ====================
Name: Tools-mt.1099
Author: mt
Time: 31 December 2021, 10:04:01.169338 am
UUID: 79c3bd75-6223-8241-ab31-702abc3c1efe
Ancestors: Tools-mt.1098
Fixes regression in ChangeSorter to be able to edit preambles again, which is now exactly how editing postscripts work: in a separate window. This is also how Monticello offers preamble/postscript editing.
=============== Diff against Tools-mt.1098 ===============
Item was changed:
----- Method: ChangeSetBrowser>>addModelItemsToWindowMenu: (in category 'initialization') -----
addModelItemsToWindowMenu: aMenu
"Add model-related items to the given window menu"
| oldTarget |
oldTarget := aMenu defaultTarget.
aMenu defaultTarget: self.
aMenu addLine.
aMenu add: 'rename change set' action: #rename.
aMenu add: 'make changes go to me' action: #newCurrent.
aMenu addLine.
aMenu add: 'file out' action: #fileOut.
aMenu add: 'browse methods' action: #browseChangeSet.
aMenu addLine.
myChangeSet hasPreamble
ifTrue:
+ [aMenu add: 'edit preamble...' action: #editPreamble.
- [aMenu add: 'edit preamble' action: #addPreamble.
aMenu add: 'remove preamble' action: #removePreamble]
ifFalse:
+ [aMenu add: 'add preamble...' action: #editPreamble].
- [aMenu add: 'add preamble' action: #addPreamble].
myChangeSet hasPostscript
ifTrue:
[aMenu add: 'edit postscript...' action: #editPostscript.
aMenu add: 'remove postscript' action: #removePostscript]
ifFalse:
[aMenu add: 'add postscript...' action: #editPostscript].
aMenu addLine.
aMenu add: 'destroy change set' action: #remove.
aMenu addLine.
Smalltalk isMorphic ifTrue:
[aMenu addLine.
aMenu add: 'what to show...' target: self action: #offerWhatToShowMenu].
aMenu addLine.
aMenu add: 'more...' action: #offerShiftedChangeSetMenu.
aMenu defaultTarget: oldTarget.
^ aMenu!
Item was removed:
- ----- Method: ChangeSorter>>addPreamble (in category 'changeSet menu') -----
- addPreamble
- myChangeSet assurePreambleExists.
- self okToChange ifTrue:
- [currentClassName := nil.
- currentSelector := nil.
- self showChangeSet: myChangeSet]!
Item was changed:
----- Method: ChangeSorter>>changeSetListKey:from: (in category 'changeSet menu') -----
changeSetListKey: aChar from: view
"Respond to a Command key. I am a model with a listView that has a list of changeSets."
aChar == $b ifTrue: [^ self browseChangeSet].
aChar == $B ifTrue: [^ self openChangeSetBrowser].
aChar == $c ifTrue: [^ self copyAllToOther].
aChar == $D ifTrue: [^ self toggleDiffing].
aChar == $f ifTrue: [^ self findCngSet].
aChar == $m ifTrue: [^ self newCurrent].
aChar == $n ifTrue: [^ self newSet].
aChar == $o ifTrue: [^ self fileOut].
+ aChar == $p ifTrue: [^ self editPreamble].
- aChar == $p ifTrue: [^ self addPreamble].
aChar == $r ifTrue: [^ self rename].
aChar == $x ifTrue: [^ self remove].
aChar == $- ifTrue: [^ self subtractOtherSide].
^ self messageListKey: aChar from: view!
Item was changed:
----- Method: ChangeSorter>>editPreamble (in category 'changeSet menu') -----
editPreamble
+ "Allow the user to edit the receiver's change-set's preamble -- in a separate window"
- "Allow the user to edit the receiver's change-set's preamble -- in a separate window."
myChangeSet editPreamble!
Item was changed:
----- Method: ChangeSorter>>removePostscript (in category 'changeSet menu') -----
removePostscript
(myChangeSet hasPostscript and: [myChangeSet postscriptHasDependents]) ifTrue:
[^ self inform:
'Cannot remove the postscript right
now because there is at least one
window open on that postscript.
Close that window and try again.'].
+ myChangeSet removePostscript.!
- myChangeSet removePostscript.
- self showChangeSet: myChangeSet!
Item was changed:
----- Method: ChangeSorter>>removePreamble (in category 'changeSet menu') -----
removePreamble
+ myChangeSet removePreamble.!
- myChangeSet removePreamble.
- self showChangeSet: myChangeSet!
Item was changed:
----- Method: ChangeSorter>>unshiftedChangeSetMenu: (in category 'changeSet menu') -----
unshiftedChangeSetMenu: aMenu
"Set up aMenu to hold commands for the change-set-list pane. This could be for a single or double changeSorter"
<changeSetMenuShifted: false>
Smalltalk isMorphic
ifTrue:
[aMenu title: 'Change Set']
ifFalse:
[aMenu title: 'Change Set:
' , myChangeSet name].
aMenu addStayUpItemSpecial.
aMenu add: 'make changes go to me (m)' action: #newCurrent.
aMenu addLine.
aMenu add: 'new change set... (n)' action: #newSet.
aMenu add: 'find...(f)' action: #findCngSet.
aMenu add: 'select change set...' action: #chooseCngSet.
aMenu addLine.
aMenu add: 'rename change set (r)' action: #rename.
aMenu add: 'file out (o)' action: #fileOut.
aMenu add: 'mail to list' action: #mailOut.
aMenu add: 'browse methods (b)' action: #browseChangeSet.
aMenu add: 'browse change set (B)' action: #openChangeSetBrowser.
aMenu addLine.
parent
ifNotNil:
[aMenu add: 'copy all to other side (c)' action: #copyAllToOther.
aMenu add: 'submerge into other side' action: #submergeIntoOtherSide.
aMenu add: 'subtract other side (-)' action: #subtractOtherSide.
aMenu addLine].
myChangeSet hasPreamble
ifTrue:
+ [aMenu add: 'edit preamble... (p)' action: #editPreamble.
- [aMenu add: 'edit preamble (p)' action: #addPreamble.
aMenu add: 'remove preamble' action: #removePreamble]
+ ifFalse: [aMenu add: 'add preamble... (p)' action: #editPreamble].
- ifFalse: [aMenu add: 'add preamble (p)' action: #addPreamble].
myChangeSet hasPostscript
ifTrue:
[aMenu add: 'edit postscript...' action: #editPostscript.
aMenu add: 'remove postscript' action: #removePostscript]
ifFalse: [aMenu add: 'add postscript...' action: #editPostscript].
aMenu addLine.
aMenu add: 'destroy change set (x)' action: #remove.
aMenu addLine.
aMenu add: 'more...' action: #offerShiftedChangeSetMenu.
^ aMenu!
More information about the Squeak-dev
mailing list
|