20503

pharo-project · Feb 6, 2013 · cea99d0 · cea99d0
1 parent 0871159
commit cea99d0
Show file tree

Hide file tree

Showing 200 changed files with 1,930 additions and 895 deletions.
diff --git a/CI-Core.package/SliceSubmitter.class/class/buildNautilusMenu..st b/CI-Core.package/SliceSubmitter.class/class/buildNautilusMenu..st
@@ -1,6 +1,6 @@
 nautilus menu
 buildNautilusMenu: aBuilder
-	<nautilusPackageMenu>
+	<nautilusGlobalPackageMenu>
 	| package target mc |
 	target := aBuilder model.
 	(package := target selectedPackage) ifNil: [ ^self ].

diff --git a/CI-Core.package/SliceSubmitter.class/methodProperties.json b/CI-Core.package/SliceSubmitter.class/methodProperties.json
@@ -1,7 +1,7 @@
 {
 	"class" : {
 		"authenticate:with:" : "BenjaminVanRyseghem 7/4/2012 15:19",
-		"buildNautilusMenu:" : "EstebanLorenzano 11/7/2012 16:56" },
+		"buildNautilusMenu:" : "EstebanLorenzano 1/30/2013 15:52" },
 	"instance" : {
 		"commit:in:message:" : "BenjaminVanRyseghem 7/6/2012 16:44",
 		"initialize" : "BenjaminVanRyseghem 7/6/2012 16:46",

diff --git a/...OrderedIdentityDictionary.class/README.md → ...OrderedIdentityDictionary.class/README.md b/...OrderedIdentityDictionary.class/README.md → ...OrderedIdentityDictionary.class/README.md
diff --git a/...IdentityDictionary.class/instance/add..st → ...IdentityDictionary.class/instance/add..st b/...IdentityDictionary.class/instance/add..st → ...IdentityDictionary.class/instance/add..st
diff --git a/...tionary.class/instance/associationsDo..st → ...tionary.class/instance/associationsDo..st b/...tionary.class/instance/associationsDo..st → ...tionary.class/instance/associationsDo..st
diff --git a/...ntityDictionary.class/instance/at.put..st → ...ntityDictionary.class/instance/at.put..st b/...ntityDictionary.class/instance/at.put..st → ...ntityDictionary.class/instance/at.put..st
diff --git a/...yDictionary.class/instance/initialize..st → ...yDictionary.class/instance/initialize..st b/...yDictionary.class/instance/initialize..st → ...yDictionary.class/instance/initialize..st
diff --git a/...tyDictionary.class/instance/initialize.st → ...tyDictionary.class/instance/initialize.st b/...tyDictionary.class/instance/initialize.st → ...tyDictionary.class/instance/initialize.st
diff --git a/...ary.class/instance/removeKey.ifAbsent..st → ...ary.class/instance/removeKey.ifAbsent..st b/...ary.class/instance/removeKey.ifAbsent..st → ...ary.class/instance/removeKey.ifAbsent..st
diff --git a/...ityDictionary.class/methodProperties.json → ...ityDictionary.class/methodProperties.json b/...ityDictionary.class/methodProperties.json → ...ityDictionary.class/methodProperties.json
diff --git a/...dIdentityDictionary.class/properties.json → ...dIdentityDictionary.class/properties.json b/...dIdentityDictionary.class/properties.json → ...dIdentityDictionary.class/properties.json
@@ -1,5 +1,5 @@
 {
-	"category" : "Spec-Core",
+	"category" : "Collections-Sequenceable",
 	"classinstvars" : [
 		 ],
 	"classvars" : [

diff --git a/Manifest-CriticBrowser.package/CriticBrowser.class/class/packagesGroup..st b/Manifest-CriticBrowser.package/CriticBrowser.class/class/packagesGroup..st
@@ -1,6 +1,6 @@
 instance creation
 packagesGroup: aBuilder
-	<nautilusGroupMenu>
+	<nautilusGlobalGroupMenu>
 	| packages target env rules group|
 	target := aBuilder model.
 

diff --git a/Manifest-CriticBrowser.package/CriticBrowser.class/class/packagesMenu..st b/Manifest-CriticBrowser.package/CriticBrowser.class/class/packagesMenu..st
@@ -1,6 +1,6 @@
 instance creation
 packagesMenu: aBuilder
-	<nautilusPackageMenu>
+	<nautilusGlobalPackageMenu>
 	| packages target env rules |
 	target := aBuilder model.
 	(packages := target selectedPackages) ifNil: [ ^ {target} ].

diff --git a/Manifest-CriticBrowser.package/CriticBrowser.class/methodProperties.json b/Manifest-CriticBrowser.package/CriticBrowser.class/methodProperties.json
@@ -7,8 +7,8 @@
 		"openOnCurrentWorkingConfiguration" : "StephaneDucasse 12/22/2012 19:52",
 		"openOnRule:onEnvironment:" : "SimonAllier 5/22/2012 15:55",
 		"openOnWorkspace:" : "BenjaminVanRyseghem 11/24/2012 18:12",
-		"packagesGroup:" : "SimonAllier 7/31/2012 11:06",
-		"packagesMenu:" : "StephaneDucasse 12/22/2012 19:52",
+		"packagesGroup:" : "EstebanLorenzano 1/30/2013 15:55",
+		"packagesMenu:" : "EstebanLorenzano 1/30/2013 15:52",
 		"theme" : "" },
 	"instance" : {
 		"addModelItemsToWindowMenu:" : "Sd 11/30/2012 17:33",

diff --git a/MenuRegistration.package/MenuRegistration.class/instance/keyText..st b/MenuRegistration.package/MenuRegistration.class/instance/keyText..st
@@ -0,0 +1,3 @@
+spec accessing
+keyText: aString
+	self spec keyText: aString
diff --git a/MenuRegistration.package/MenuRegistration.class/methodProperties.json b/MenuRegistration.package/MenuRegistration.class/methodProperties.json
@@ -20,6 +20,7 @@
 		"itemList:" : "AlainPlantec 2/15/2010 11:17",
 		"itemNamed:" : "BenjaminVanRyseghem 1/24/2012 20:29",
 		"itemReceiver" : "AlainPlantec 2/13/2010 12:58",
+		"keyText:" : "EstebanLorenzano 1/30/2013 16:55",
 		"label" : "AlainPlantec 2/12/2010 16:06",
 		"label:" : "AlainPlantec 2/12/2010 16:06",
 		"model" : "AlainPlantec 2/13/2010 12:54",

diff --git a/...on.package/PragmaMenuAndShortcutRegistration.class/instance/attachShortcutCategory.to..st b/...on.package/PragmaMenuAndShortcutRegistration.class/instance/attachShortcutCategory.to..st
@@ -1,4 +1,4 @@
-as yet unclassified
+initialization
 attachShortcutCategory: aSymbol to: aClass 
 
 	KMRepository default attachCategoryName: aSymbol to: aClass.
diff --git a/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/instance/initialize.st b/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/instance/initialize.st
@@ -1,4 +1,4 @@
-initialization
+keymapping
 initialize
 	"Initialization code for PragmaMenuAndShortcutRegistration"
 

diff --git a/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/instance/keyText..st b/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/instance/keyText..st
@@ -0,0 +1,3 @@
+menu protocol
+keyText: aString
+	self currentItem keyText: aString
diff --git a/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/methodProperties.json b/MenuRegistration.package/PragmaMenuAndShortcutRegistration.class/methodProperties.json
@@ -26,6 +26,7 @@
 		"item:" : "BenjaminVanRyseghem 4/7/2012 23:00",
 		"itemClass" : "BenjaminVanRyseghem 4/7/2012 20:50",
 		"items" : "BenjaminVanRyseghem 4/7/2012 21:25",
+		"keyText:" : "EstebanLorenzano 1/30/2013 16:47",
 		"label:" : "BenjaminVanRyseghem 4/7/2012 20:49",
 		"model" : "BenjaminVanRyseghem 4/7/2012 23:16",
 		"model:" : "BenjaminVanRyseghem 4/7/2012 23:16",

diff --git a/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/instance/keyText..st b/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/instance/keyText..st
@@ -0,0 +1,3 @@
+menu protocol
+keyText: aString
+	keyText := aString
diff --git a/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/instance/keyText.st b/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/instance/keyText.st
@@ -0,0 +1,3 @@
+accessing
+keyText
+	^keyText
diff --git a/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/methodProperties.json b/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/methodProperties.json
@@ -24,6 +24,8 @@
 		"isWithSeparatorAfter" : "BenjaminVanRyseghem 4/7/2012 21:29",
 		"item" : "BenjaminVanRyseghem 4/7/2012 21:27",
 		"item:" : "BenjaminVanRyseghem 4/7/2012 20:47",
+		"keyText" : "EstebanLorenzano 1/30/2013 16:48",
+		"keyText:" : "EstebanLorenzano 1/30/2013 16:47",
 		"label" : "BenjaminVanRyseghem 4/7/2012 21:28",
 		"label:" : "BenjaminVanRyseghem 4/7/2012 20:47",
 		"order" : "BenjaminVanRyseghem 4/7/2012 21:34",

diff --git a/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/properties.json b/MenuRegistration.package/PragmaMenuAndShortcutRegistrationItem.class/properties.json
@@ -26,7 +26,8 @@
 		"platform",
 		"default",
 		"category",
-		"shortcutName" ],
+		"shortcutName",
+		"keyText" ],
 	"name" : "PragmaMenuAndShortcutRegistrationItem",
 	"pools" : [
 		 ],

diff --git a/MenuRegistration.package/PragmaMenuBuilder.class/instance/interpretRegistration..st b/MenuRegistration.package/PragmaMenuBuilder.class/instance/interpretRegistration..st
@@ -22,6 +22,7 @@ interpretRegistration: aRegistration
 							node 
 								action: item action ]].
 			node
+				keyText: item keyText;
 				help: item help;
 				icon: item icon;
 				order: item order;

diff --git a/MenuRegistration.package/PragmaMenuBuilder.class/methodProperties.json b/MenuRegistration.package/PragmaMenuBuilder.class/methodProperties.json
@@ -12,7 +12,7 @@
 		"collectRegistrations" : "BenjaminVanRyseghem 4/7/2012 22:19",
 		"currentRoot:while:" : "AlainPlantec 2/16/2010 16:36",
 		"initialize" : "AlainPlantec 11/16/2010 19:55",
-		"interpretRegistration:" : "BenjaminVanRyseghem 4/7/2012 23:44",
+		"interpretRegistration:" : "EstebanLorenzano 1/30/2013 16:54",
 		"itemReceiver" : "AlainPlantec 2/13/2010 12:57",
 		"menu" : "StephaneDucasse 6/5/2011 22:47",
 		"menuAt:" : "StephaneDucasse 6/5/2011 22:47",

diff --git a/Morphic.package/KeyboardEvent.class/instance/isUserInterrupt.st b/Morphic.package/KeyboardEvent.class/instance/isUserInterrupt.st
@@ -0,0 +1,5 @@
+testing
+isUserInterrupt
+
+	^ UserInterruptHandler cmdDotEnabled and: [ self keyCharacter = $. and: [ self commandKeyPressed ] ].
+
diff --git a/Morphic.package/KeyboardEvent.class/methodProperties.json b/Morphic.package/KeyboardEvent.class/methodProperties.json
@@ -9,6 +9,7 @@
 		"isKeyboard" : "ar 9/13/2000 15:49",
 		"isKeystroke" : "ar 9/13/2000 15:49",
 		"isMouseMove" : "ar 10/9/2000 00:43",
+		"isUserInterrupt" : "SeanDeNigris 1/29/2013 11:22",
 		"keyCharacter" : "michael.rueger 3/11/2009 11:21",
 		"keyString" : "nk 10/13/2004 10:43",
 		"keyValue" : "ar 9/13/2000 15:51",

diff --git a/Morphic.package/MenuMorph.class/instance/addAllFrom..st b/Morphic.package/MenuMorph.class/instance/addAllFrom..st
@@ -1,13 +1,8 @@
 construction
-addAllFrom: aMenuMorph 
-	aMenuMorph submorphs
-		do: [:each | 
-			(each isKindOf: MenuItemMorph)
-				ifTrue: [self
-						add: each contents
-						target: each target
-						selector: each selector
-						argumentList: each arguments.
-						each icon ifNotNil: [:ic | self lastItem icon: ic]].
-			(each isKindOf: MenuLineMorph)
-				ifTrue: [self addLine]] 
+addAllFrom: aMenuMorph
+	"This is a fast add..."
+	submorphs := submorphs, (aMenuMorph submorphs collect: [ :each |
+		each copy 
+			privateOwner: self;
+			yourself ]).
+	menuItems := submorphs copy asOrderedCollection
diff --git a/Morphic.package/MenuMorph.class/instance/addAllFromPragma.target..st b/Morphic.package/MenuMorph.class/instance/addAllFromPragma.target..st
@@ -0,0 +1,6 @@
+construction
+addAllFromPragma: aString target: anObject
+	self addAllFrom: (PragmaMenuBuilder 
+		pragmaKeyword: aString
+		model: anObject)
+		menu 
diff --git a/Morphic.package/MenuMorph.class/methodProperties.json b/Morphic.package/MenuMorph.class/methodProperties.json
@@ -27,7 +27,8 @@
 		"add:target:selector:" : "BenjaminVanRyseghem 3/28/2011 15:01",
 		"add:target:selector:argument:" : "BenjaminVanRyseghem 3/28/2011 15:45",
 		"add:target:selector:argumentList:" : "BenjaminVanRyseghem 3/28/2011 15:01",
-		"addAllFrom:" : "AlainPlantec 10/20/2010 00:38",
+		"addAllFrom:" : "EstebanLorenzano 1/31/2013 19:25",
+		"addAllFromPragma:target:" : "EstebanLorenzano 1/31/2013 19:25",
 		"addBlankIconsIfNecessary:" : "dgd 9/13/2004 19:59",
 		"addCustomMenuItems:hand:" : "dgd 8/30/2003 21:52",
 		"addItem" : "alain.plantec 2/6/2009 15:30",

diff --git a/Morphic.package/PluggableMenuItemSpec.class/instance/asMenuItemMorphFrom.isLast..st b/Morphic.package/PluggableMenuItemSpec.class/instance/asMenuItemMorphFrom.isLast..st
@@ -9,6 +9,7 @@ asMenuItemMorphFrom: parentMenu isLast: aBoolean
 		ifTrue: [ lbl := self hasCheckBox -> lbl].
 	it contents: lbl.
 	it icon: self icon.
+	it keyText: self keyText.
 	it isEnabled: self enabled.
 	(act := self action) ifNotNil: [
 				it 

diff --git a/Morphic.package/PluggableMenuItemSpec.class/instance/keyText..st b/Morphic.package/PluggableMenuItemSpec.class/instance/keyText..st
@@ -0,0 +1,3 @@
+accessing
+keyText: aString
+	keyText := aString.
diff --git a/Morphic.package/PluggableMenuItemSpec.class/instance/keyText.st b/Morphic.package/PluggableMenuItemSpec.class/instance/keyText.st
@@ -0,0 +1,3 @@
+accessing
+keyText
+	^keyText
diff --git a/Morphic.package/PluggableMenuItemSpec.class/methodProperties.json b/Morphic.package/PluggableMenuItemSpec.class/methodProperties.json
@@ -5,7 +5,7 @@
 		"action" : "ar 2/28/2006 17:23",
 		"action:" : "ar 2/28/2006 17:23",
 		"analyzeLabel" : "AlainPlantec 2/15/2010 11:28",
-		"asMenuItemMorphFrom:isLast:" : "StephaneDucasse 4/23/2012 12:19",
+		"asMenuItemMorphFrom:isLast:" : "EstebanLorenzano 1/30/2013 16:45",
 		"checked" : "AlainPlantec 2/8/2010 11:16",
 		"checked:" : "ar 2/28/2006 17:21",
 		"enabled" : "BenjaminVanRyseghem 4/13/2011 17:24",
@@ -15,6 +15,8 @@
 		"hasCheckBox" : "AlainPlantec 2/10/2010 08:19",
 		"icon" : "AlainPlantec 2/12/2010 22:22",
 		"icon:" : "AlainPlantec 2/12/2010 22:22",
+		"keyText" : "EstebanLorenzano 1/30/2013 16:45",
+		"keyText:" : "EstebanLorenzano 1/30/2013 16:44",
 		"label" : "ar 2/28/2006 17:20",
 		"label:" : "ar 2/28/2006 17:21",
 		"morphClass" : "StephaneDucasse 6/10/2011 22:14",

diff --git a/Morphic.package/PluggableMenuItemSpec.class/properties.json b/Morphic.package/PluggableMenuItemSpec.class/properties.json
@@ -13,7 +13,8 @@
 		"separator",
 		"subMenu",
 		"icon",
-		"enabledBlock" ],
+		"enabledBlock",
+		"keyText" ],
 	"name" : "PluggableMenuItemSpec",
 	"pools" : [
 		 ],

diff --git a/Morphic.package/ToggleMenuItemMorph.class/instance/drawKeyTextOn..st b/Morphic.package/ToggleMenuItemMorph.class/instance/drawKeyTextOn..st
@@ -3,8 +3,8 @@ drawKeyTextOn: aCanvas
 	"Draw the key text on the canvas."
 
 	|ktp ktw b|
-	self keyText ifNil: [^self].
+	self keyText ifNil: [^self].	
 	ktp := self hasSubMenu ifTrue: [self right - self subMenuMarker width] ifFalse: [self right].
 	ktp := ktp - (ktw := self fontToUse widthOfString: self keyText).
 	b := (ktp @ (self bounds top + self bounds bottom - self fontToUse height // 2) extent: ktw @ self height).
-	self drawText: self keyText on: aCanvas in: b
+	self drawText: self keyText on: aCanvas in: b color: Color gray muchDarker.
diff --git a/Morphic.package/ToggleMenuItemMorph.class/instance/drawText.on.in..st b/Morphic.package/ToggleMenuItemMorph.class/instance/drawText.on.in..st
@@ -1,21 +1,7 @@
 as yet unclassified
 drawText: aStringOrText on: aCanvas in: aRectangle
-	"Draw the text on the canvas within the given bounds."
-
-	(self enabled not and: [self theme disabledItemStyle = #inset])
-		ifTrue: [|stringColor|
-				stringColor := self stringColorToUse.
-				aCanvas
-					drawString: aStringOrText
-					in: aRectangle 
-					font: self fontToUse
-					color: stringColor muchLighter lighter;
-					drawString: aStringOrText
-					in: (aRectangle translateBy: -1)
-					font: self fontToUse
-					color: stringColor]
-		ifFalse: [aCanvas
-					drawString: aStringOrText
-					in: aRectangle 
-					font: self fontToUse
-					color: self stringColorToUse]
+	^ self 
+		drawText: aStringOrText 
+		on: aCanvas 
+		in: aRectangle 
+		color: self stringColorToUse.
diff --git a/Morphic.package/ToggleMenuItemMorph.class/instance/drawText.on.in.color..st b/Morphic.package/ToggleMenuItemMorph.class/instance/drawText.on.in.color..st
@@ -0,0 +1,20 @@
+as yet unclassified
+drawText: aStringOrText on: aCanvas in: aRectangle color: stringColor 
+	"Draw the text on the canvas within the given bounds."
+
+	(self enabled not and: [self theme disabledItemStyle = #inset])
+		ifTrue: [
+				aCanvas
+					drawString: aStringOrText
+					in: aRectangle 
+					font: self fontToUse
+					color: stringColor muchLighter lighter;
+					drawString: aStringOrText
+					in: (aRectangle translateBy: -1)
+					font: self fontToUse
+					color: stringColor]
+		ifFalse: [aCanvas
+					drawString: aStringOrText
+					in: aRectangle 
+					font: self fontToUse
+					color: stringColor ]
diff --git a/Morphic.package/ToggleMenuItemMorph.class/methodProperties.json b/Morphic.package/ToggleMenuItemMorph.class/methodProperties.json
@@ -6,10 +6,11 @@
 		"adoptPaneColor:" : "gvc 3/29/2007 16:25",
 		"basicDrawOn:" : "GaryChambers 9/21/2011 14:12",
 		"drawIcon:on:in:" : "gvc 10/17/2008 14:05",
-		"drawKeyTextOn:" : "gvc 10/17/2008 13:40",
+		"drawKeyTextOn:" : "EstebanLorenzano 1/30/2013 18:36",
 		"drawOn:" : "gvc 10/12/2006 15:30",
 		"drawSubMenuMarker:on:in:" : "gvc 10/17/2008 14:11",
-		"drawText:on:in:" : "gvc 3/1/2010 16:09",
+		"drawText:on:in:" : "EstebanLorenzano 1/30/2013 17:35",
+		"drawText:on:in:color:" : "EstebanLorenzano 1/30/2013 17:38",
 		"enablementSelector" : "gvc 6/9/2006 09:35",
 		"enablementSelector:" : "gvc 6/9/2006 09:35",
 		"getStateSelector" : "gvc 6/9/2006 09:16",

diff --git a/Nautilus.package/AbstractNautilusUI.class/class/buildAnalyzeSubMenu..st b/Nautilus.package/AbstractNautilusUI.class/class/buildAnalyzeSubMenu..st
@@ -1,7 +1,9 @@
 menu
 buildAnalyzeSubMenu: aBuilder
-	<nautilusClassMenu>
+	<contextMenu>
+	<nautilusGlobalClassMenu>
 	| target |
+
 	target := aBuilder model.
 	target selectedClass ifNil: [^target].
 
@@ -28,12 +30,14 @@ buildAnalyzeSubMenu: aBuilder
 		order: 300;
 		enabledBlock: [ target showInstance ].
 
-	(aBuilder item: #'Generate initialize method (h, i)')
+	(aBuilder item: #'Generate initialize method')
+		keyText: 'h, i';
 		action: [ target generateInitialize ];
 		parent: #Analyze;
 		order: 350.
 
-	(aBuilder item: #'Force the generaton of the initialize method (h, k)')
+	(aBuilder item: #'Force the generaton of the initialize method')
+		keyText: 'h, k';
 		action: [ target forceGenerateInitialize ];
 		parent: #Analyze;
 		order: 375;
@@ -45,7 +49,8 @@ buildAnalyzeSubMenu: aBuilder
 		parent: #Analyze;
 		order: 400.
 
-	(aBuilder item: #'Class refs... (b, N)')
+	(aBuilder item: #'Class refs...')
+		keyText: 'b, N';
 		action: [target browseClassRefs];
 		parent: #Analyze;
 		order: 500.

diff --git a/Nautilus.package/AbstractNautilusUI.class/class/buildBrowseShortcutsOn..st b/Nautilus.package/AbstractNautilusUI.class/class/buildBrowseShortcutsOn..st
@@ -1,6 +1,6 @@
 shortcuts
 buildBrowseShortcutsOn: aBuilder
-<keymap>
+	<keymap>
 
 	(aBuilder shortcut: #browseSenders)
 		category: #NautilusGlobalShortcuts