Merge 6d0a771 into 7948f18

hpi-swa-teaching · Jun 8, 2022 · cbdc805 · cbdc805
2 parents 7948f18 + 6d0a771
commit cbdc805
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 12 deletions.
diff --git a/.../MorphicAPIExplorer-Core.package/MEXCodeHolder.class/class/defaultContentsSymbolQuints.st b/.../MorphicAPIExplorer-Core.package/MEXCodeHolder.class/class/defaultContentsSymbolQuints.st
@@ -0,0 +1,27 @@
+initialize-release
+defaultContentsSymbolQuints
+	"Default list of quintuplets representing information on the alternative views available in the code pane
+		first element:	the contentsSymbol used
+		second element:	the selector to call when this item is chosen.
+		third element:	the selector to call to obtain the wording of the menu item.
+		fourth element:	the wording to represent this view
+		fifth element:	balloon help
+	A hypen indicates a need for a seperator line in a menu of such choices"
+
+	^ {
+		{#source
+			. #togglePlainSource 
+			. #showingPlainSourceString 
+			. 'source'
+			. 'the textual source code as written' translated} .
+
+
+		#- .
+		{#prettyPrint
+			. #togglePrettyPrint
+			. #prettyPrintString
+			. 'prettyPrint'
+			. 'the method source presented in a standard text format' translated} .
+
+
+	}
diff --git a/...ages/MorphicAPIExplorer-Core.package/MEXCodeHolder.class/instance/contentsSymbolQuints.st b/...ages/MorphicAPIExplorer-Core.package/MEXCodeHolder.class/instance/contentsSymbolQuints.st
@@ -0,0 +1,20 @@
+accessing
+contentsSymbolQuints
+
+	^ {
+		{#source
+			. #togglePlainSource 
+			. #showingPlainSourceString 
+			. 'source'
+			. 'the textual source code as written' translated} .
+
+
+		#- .
+		{#prettyPrint
+			. #togglePrettyPrint
+			. #prettyPrintString
+			. 'prettyPrint'
+			. 'the method source presented in a standard text format' translated} .
+
+
+	}
diff --git a/packages/MorphicAPIExplorer-Core.package/MEXCodeHolder.class/methodProperties.json b/packages/MorphicAPIExplorer-Core.package/MEXCodeHolder.class/methodProperties.json
@@ -1,7 +1,9 @@
 {
 	"class" : {
+		"defaultContentsSymbolQuints" : "JF 6/6/2022 17:06",
 		"newWithView:" : "PM 6/11/2021 14:57" },
 	"instance" : {
+		"contentsSymbolQuints" : "JF 6/6/2022 21:35",
 		"copyToClipboard" : "jb 7/24/2019 11:56",
 		"evaluateExpression:" : "jb 7/24/2019 14:23",
 		"explorationView" : "jb 6/20/2019 02:38",

diff --git a/...er-Core.package/MEXListItemWrapper.class/instance/backgroundOfMethodsWithoutSubmethods.st b/...er-Core.package/MEXListItemWrapper.class/instance/backgroundOfMethodsWithoutSubmethods.st
@@ -1,7 +1,7 @@
 accessing
 backgroundOfMethodsWithoutSubmethods    
 
-		^ self item isActiveInhibitor 
+		^ (self item isActiveInhibitor or: self isInhibited)
 					ifTrue: [Color red]
 					ifFalse: [
 						self item isInhibited

diff --git a/packages/MorphicAPIExplorer-Core.package/MEXListItemWrapper.class/methodProperties.json b/packages/MorphicAPIExplorer-Core.package/MEXListItemWrapper.class/methodProperties.json
@@ -4,7 +4,7 @@
 	"instance" : {
 		"asString" : "FFN 5/20/2019 14:40",
 		"backgroundColor" : "JF 6/1/2022 14:21",
-		"backgroundOfMethodsWithoutSubmethods" : "JF 6/1/2022 14:21",
+		"backgroundOfMethodsWithoutSubmethods" : "JF 6/7/2022 19:58",
 		"balloonText" : "SC 7/10/2021 17:12",
 		"contents" : "SC 8/5/2021 19:44",
 		"getDependencies" : "SC 7/16/2021 19:01",

diff --git a/packages/MorphicAPIExplorer-Core.package/MEXToolOverView.class/class/categories.st b/packages/MorphicAPIExplorer-Core.package/MEXToolOverView.class/class/categories.st
@@ -9,4 +9,4 @@ categories
 		self categoryLayouting .
 		self categoryEventHandling .
 		self categoryFileHandling. 
-		self categoryCollision}
+		self categoryLuBoxTest}
diff --git a/packages/MorphicAPIExplorer-Core.package/MEXToolOverView.class/class/categoryLuBoxTest.st b/packages/MorphicAPIExplorer-Core.package/MEXToolOverView.class/class/categoryLuBoxTest.st
@@ -14,34 +14,34 @@ categoryLuBoxTest
 				havingSubMethods: {
 					MEXMethod 
 						newWithName: 'layoutPolicy:'
-						havingParameters: {'TableLayout new'} asOrderedCollection
+						havingParameters: {'morph layoutPolicy: TableLayout new'} asOrderedCollection
 						withDependencies: {'addMorph:'}
 						withInhibitors: {'hResizing:'}}.
 			MEXMethod
 				newWithName: 'Table Layouting'
 				havingSubMethods: {
 					MEXMethod 
 						newWithName: 'listDirection:'
-						havingParameters: {'#leftToRight'} asOrderedCollection
+						havingParameters: {'morph listDirection: #leftToRight'} asOrderedCollection
 						withDependencies: {'layoutPolicy:'} .
 					MEXMethod 
 						newWithName: 'vResizing:'
-						havingParameters: {'#shrinkWrap'} asOrderedCollection
+						havingParameters: {'morph vResizing: #shrinkWrap'} asOrderedCollection
 						withDependencies: {'layoutPolicy:'} .
 					MEXMethod 
 						newWithName: 'hResizing:'
-						havingParameters: {'#shrinkWrap'} asOrderedCollection
+						havingParameters: {'morph hResizing: #shrinkWrap'} asOrderedCollection
 						withDependencies: {'layoutPolicy:'} .
 					MEXMethod 
 						newWithName: 'minCellSize:'
-						havingParameters: {'100'} asOrderedCollection
+						havingParameters: {'morph minCellSize: 100'} asOrderedCollection
 						withDependencies: {'layoutPolicy:'}} .
 			MEXMethod
 				newWithName: 'Adding Submorphs to see results'
 				havingSubMethods: {
 					MEXMethod
 						newWithName: 'addMorph:'
-						havingParameters: {'(EllipseMorph new color: (Color orange))'} asOrderedCollection .
+						havingParameters: {'morph addMorph: (EllipseMorph new color: (Color orange))'} asOrderedCollection .
 					MEXMethod
 						newWithName: 'addMorph:'
-						havingParameters: {'(EllipseMorph new color: (Color blue))'} asOrderedCollection}}
+						havingParameters: {'morph addMorph: (EllipseMorph new color: (Color blue))'} asOrderedCollection}}
diff --git a/packages/MorphicAPIExplorer-Core.package/MEXToolOverView.class/methodProperties.json b/packages/MorphicAPIExplorer-Core.package/MEXToolOverView.class/methodProperties.json
@@ -1,14 +1,14 @@
 {
 	"class" : {
-		"categories" : "JS 5/20/2022 12:37",
+		"categories" : "JF 6/7/2022 19:45",
 		"categoryAnimating" : "JF 5/17/2022 11:56",
 		"categoryBuildingAndTearingDown" : "JF 5/17/2022 11:58",
 		"categoryCollision" : "JS 5/20/2022 12:38",
 		"categoryDrawingAndStyling" : "JF 5/17/2022 12:05",
 		"categoryEventHandling" : "JF 5/18/2022 10:32",
 		"categoryFileHandling" : "JF 5/18/2022 10:34",
 		"categoryLayouting" : "JF 5/18/2022 10:22",
-		"categoryLuBoxTest" : "JF 6/1/2022 14:54",
+		"categoryLuBoxTest" : "JF 6/7/2022 19:50",
 		"categoryNestingAndSubmorphing" : "JF 5/17/2022 18:39",
 		"categoryTransforming" : "JF 5/18/2022 10:20",
 		"defaultButtonImageExtent" : "jb 7/24/2019 14:26",

diff --git a/...IExplorer-Tests.package/MEXCodeHolderTests.class/instance/testSourceMenuOnlyTwoOptions.st b/...IExplorer-Tests.package/MEXCodeHolderTests.class/instance/testSourceMenuOnlyTwoOptions.st
@@ -0,0 +1,5 @@
+tests
+testSourceMenuOnlyTwoOptions
+
+
+	self assert: (codeHolder contentsSymbolQuints size) equals: 3.
diff --git a/packages/MorphicAPIExplorer-Tests.package/MEXCodeHolderTests.class/methodProperties.json b/packages/MorphicAPIExplorer-Tests.package/MEXCodeHolderTests.class/methodProperties.json
@@ -10,4 +10,5 @@
 		"testCodeContainsValidCodeLines" : "JF 5/17/2022 20:50",
 		"testCopyToClipboardCopiesContentsToClipboard" : "lk 6/21/2019 20:46",
 		"testSaveUpdatesHolder" : "CU 7/16/2019 15:32",
+		"testSourceMenuOnlyTwoOptions" : "JF 6/6/2022 21:33",
 		"update:" : "CU 7/16/2019 15:32" } }