[squeak-dev] The Trunk: Tools-ar.235.mcz

commits at source.squeak.org commits at source.squeak.org
Tue Apr 27 02:54:15 UTC 2010


Andreas Raab uploaded a new version of Tools to project The Trunk:
http://source.squeak.org/trunk/Tools-ar.235.mcz

==================== Summary ====================

Name: Tools-ar.235
Author: ar
Time: 26 April 2010, 7:53:43.974 pm
UUID: e5f7d56c-c8bd-df4a-a205-359e17ec8e19
Ancestors: Tools-cmm.234, Tools-cao.230

Merging Tools-cao.230:

Fixes for the following:

Shift+menu not respected in browser class panes.

		Browser>>buildClassListWith: and
		Browser>>buildClassListSingletonWith:

	use the older (non-shift key sending)
	
		Browser>>classListMenu:
		
	rather than:
			
		Browser>>classListMenu:shifted:

	
Shift+menu produces DNU in contents pane of file list.

	MenuMorph>>addAllFrom: expects morphs, but
	the argument passed is an array of string-selector
	pairs.  Use MenuMorph>>addList: instead.


=============== Diff against Tools-cmm.234 ===============

Item was changed:
  ----- Method: Browser>>buildClassListWith: (in category 'toolbuilder') -----
  buildClassListWith: builder
  	| listSpec |
  	listSpec := builder pluggableListSpec new.
  	listSpec 
  		model: self;
  		list: #classList; 
  		getIndex: #classListIndex; 
  		setIndex: #classListIndex:; 
+ 		menu: #classListMenu:shifted:; 
- 		menu: #classListMenu:; 
  		keyPress: #classListKey:from:.
  	Preferences browseWithDragNDrop 
  		ifTrue:[listSpec dragItem: #dragFromClassList:].
  
  	^listSpec
  !

Item was changed:
  ----- Method: FileList>>fileContentsMenu:shifted: (in category 'file list menu') -----
  fileContentsMenu: aMenu shifted: shifted
  	"Construct aMenu to have items appropriate for the file browser's code pane, given the shift state provided"
  
+ 	| services maybeLine extraLines |
- 	| shiftMenu services maybeLine extraLines |
  	shifted ifTrue:
+ 		[^ aMenu addList: StringHolder shiftedYellowButtonMenuItems].
- 		[shiftMenu := SelectionMenu fromArray: StringHolder shiftedYellowButtonMenuItems.
- 		^ aMenu addAllFrom: shiftMenu].
  	fileName ifNotNil:
  		[services := OrderedCollection new.
  		(#(briefHex briefFile needToGetBriefHex needToGetBrief) includes: brevityState) ifTrue:
  			[services add: self serviceGet].
  		(#(fullHex briefHex needToGetFullHex needToGetBriefHex) includes: brevityState) ifFalse:
  			[services add: self serviceGetHex].
  		(#(needToGetShiftJIS needToGetEUCJP needToGetCNGB needToGetEUCKR needToGetUTF8) includes: brevityState) ifFalse:
  			[services add: self serviceGetEncodedText].
  		maybeLine := services size.
  		(FileStream sourceFileSuffixes includes: self suffixOfSelectedFile) ifTrue:
  			[services addAll:
  				(self servicesFromSelectorSpecs:
  					#(fileIntoNewChangeSet: fileIn: browseChangesFile: browseFile:))].
  
  		extraLines := OrderedCollection new.
  		maybeLine > 0 ifTrue: [extraLines add: maybeLine].
  		services size > maybeLine ifTrue: [extraLines add: services size].
  		aMenu 
  			addServices: services
  			for: self fullName
  			extraLines: extraLines].
  
  	aMenu addList: {
  			{'find...(f)' translated.		#find}.
  			{'find again (g)' translated.		#findAgain}.
  			{'set search string (h)' translated.	#setSearchString}.
  			#-.
  			{'do again (j)' translated.		#again}.
  			{'undo (z)' translated.			#undo}.
  			#-.
  			{'copy (c)' translated.			#copySelection}.
  			{'cut (x)' translated.			#cut}.
  			{'paste (v)' translated.		#paste}.
  			{'paste...' translated.			#pasteRecent}.
  			#-.
  			{'do it (d)' translated.		#doIt}.
  			{'print it (p)' translated.		#printIt}.
  			{'inspect it (i)' translated.		#inspectIt}.
  			{'fileIn selection (G)' translated.	#fileItIn}.
  			#-.
  			{'accept (s)' translated.		#accept}.
  			{'cancel (l)' translated.		#cancel}.
  			#-.
  			{'more...' translated.			#shiftedYellowButtonActivity}}.
  
  
  	^ aMenu
  !

Item was changed:
  ----- Method: Browser>>buildClassListSingletonWith: (in category 'toolbuilder') -----
  buildClassListSingletonWith: builder
  	| listSpec |
  	listSpec := builder pluggableListSpec new.
  	listSpec 
  		model: self;
  		list: #classListSingleton; 
  		getIndex: #indexIsOne; 
  		setIndex: #indexIsOne:; 
+ 		menu: #classListMenu:shifted; 
- 		menu: #classListMenu:; 
  		keyPress: #classListKey:from:.
  	^listSpec
  !




More information about the Squeak-dev mailing list