do not use systemIcon or taskbarIcon but systemIconName and takbarIconName

estebanlm · estebanlm · commit 1e0ba07e672b · 2022-09-18T16:34:03.000+02:00
diff --git a/src/Spec2-Core/SpImageTableColumn.class.st b/src/Spec2-Core/SpImageTableColumn.class.st
@@ -21,13 +21,15 @@ SpImageTableColumn class >> example [
 
 	SpTablePresenter new
 		addColumn:
-			((SpImageTableColumn title: 'Icon' evaluated: #systemIcon)
+			((SpImageTableColumn 
+				title: 'Icon' 
+				evaluated: [ :aClass | self iconNamed: aClass systemIconName ])
 				width: 50;
 				yourself);
 		addColumn: (SpStringTableColumn title: 'Name' evaluated: #name);
 		items: self class environment allClasses;
 		beResizable;
-		open.
+		open
 ]
 
 { #category : #visiting }
diff --git a/src/Spec2-Core/SpWindowPresenter.class.st b/src/Spec2-Core/SpWindowPresenter.class.st
@@ -545,11 +545,12 @@ SpWindowPresenter >> statusBar: aStatusBarPresenter [
 
 { #category : #TOREMOVE }
 SpWindowPresenter >> taskbarIcon [
+
 	^ self windowIcon
 		ifNil: [
-			self presenter
-				ifNil: [ super taskbarIcon ]
-				ifNotNil: #taskbarIcon ]
+			self iconNamed:  (self presenter
+				ifNotNil: [ :aPresenter | aPresenter taskbarIconName ]
+				ifNil: [ (self taskbarIconName) ]) ]
 ]
 
 { #category : #private }
diff --git a/src/Spec2-Dialogs/SpSelectDialog.class.st b/src/Spec2-Dialogs/SpSelectDialog.class.st
@@ -46,7 +46,7 @@ SpSelectDialog class >> example [
 		label: 'Select a class';
 		items: Smalltalk allClassesAndTraits;
 		display: [ :each | each name ];
-		displayIcon: [ :each | each systemIcon ];
+		displayIcon: [ :each | self iconNamed: each systemIconName ];
 		onAccept: [ :dialog | self inform: dialog presenter selectedItem asString ];
 		openDialog
 ]
@@ -60,7 +60,7 @@ SpSelectDialog class >> exampleModal [
 		label: 'Select a class';
 		items: Smalltalk allClassesAndTraits;
 		display: [ :each | each name ];
-		displayIcon: [ :each | each systemIcon ];
+		displayIcon: [ :each | self iconNamed: each systemIconName ];
 		openModal.
 		
 	selection ifNotNil: [ 
diff --git a/src/Spec2-Examples/SpActionBarPresenter.extension.st b/src/Spec2-Examples/SpActionBarPresenter.extension.st
@@ -14,7 +14,7 @@ SpActionBarPresenter class >> example [
 	"some settings to the list (to not have the presenter empty)"
 	list 
 		items: Smalltalk allClassesAndTraits;
-		displayIcon: [ :aClass | aClass systemIcon ];
+		displayIcon: [ :aClass | self iconNamed: aClass systemIconName ];
 		display: [ :aClass | aClass name ].
 		
 	"now, we add some buttons to our action bar"
diff --git a/src/Spec2-Examples/SpButtonBarPresenter.extension.st b/src/Spec2-Examples/SpButtonBarPresenter.extension.st
@@ -15,7 +15,7 @@ SpButtonBarPresenter class >> example [
 	"some settings to the list (to not have the presenter empty)"
 	list 
 		items: Smalltalk allClassesAndTraits;
-		displayIcon: [ :aClass | aClass systemIcon ];
+		displayIcon: [ :aClass | self iconNamed: aClass systemIconName ];
 		display: [ :aClass | aClass name ].
 		
 	"now, we add some buttons to our button bar"
diff --git a/src/Spec2-Examples/SpDemoFilteringListsPresenter.class.st b/src/Spec2-Examples/SpDemoFilteringListsPresenter.class.st
@@ -39,7 +39,7 @@ SpDemoFilteringListsPresenter >> initializePresenters [
 	listWithPackages listPresenter
 		display: [ :class | class name ];
 		sortingBlock: [ :a : b | a name < b name ];
-		displayIcon: [ :aClass | aClass systemIcon ].
+		displayIcon: [ :aClass | self iconNamed: aClass systemIconName ].
 	
 	listWithMethodsAlreadyFiltered := self newFilteringList.
 	listWithMethodsAlreadyFiltered
@@ -49,7 +49,7 @@ SpDemoFilteringListsPresenter >> initializePresenters [
 	listWithMethodsAlreadyFiltered listPresenter
 		display: [ :class | class name ];
 		sortingBlock: [ :a :b | a name < b name ];
-		displayIcon: [ :aClass | aClass systemIcon ].
+		displayIcon: [ :aClass | self iconNamed: aClass systemIconName ].
 	
 	selectableList :=  self instantiate: SpFilteringSelectableListPresenter.
 	selectableList items: self class environment allClasses.
diff --git a/src/Spec2-Examples/SpDemoListsPresenter.class.st b/src/Spec2-Examples/SpDemoListsPresenter.class.st
@@ -81,7 +81,7 @@ SpDemoListsPresenter >> iconFor: class [
 			class hasErrorTest ifTrue: [ ^ self iconNamed: #testRed ].
 			^ self iconNamed: #testNotRun ].
 	class organization classComment ifEmpty: [ ^ self iconNamed: #uncommentedClass ].
-	^ class systemIcon
+	^ self iconNamed: class systemIconName
 ]
 
 { #category : #initialization }
diff --git a/src/Spec2-Examples/SpDemoTablePresenter.class.st b/src/Spec2-Examples/SpDemoTablePresenter.class.st
@@ -49,11 +49,15 @@ SpDemoTablePresenter >> initializePresenters [
 				width: 20;
 				yourself);
 		addColumn:
-			((SpImageTableColumn title: 'Icon' evaluated: #systemIcon)
+			((SpImageTableColumn 
+				title: 'Icon' 
+				evaluated: [ :aClass | self iconNamed: aClass systemIconName ])
 				width: 50;
 				yourself);
 		addColumn: (SpStringTableColumn title: 'Name' evaluated: #name);
-		addColumn: (SpStringTableColumn title: 'Number of subclasses' evaluated: [ :class | class subclasses size asString ]);
+		addColumn: (SpStringTableColumn 
+			title: 'Number of subclasses' 
+			evaluated: [ :class | class subclasses size asString ]);
 		items: self class environment allClasses;
 		beResizable
 ]
diff --git a/src/Spec2-Examples/SpDemoTreeTablePresenter.class.st b/src/Spec2-Examples/SpDemoTreeTablePresenter.class.st
@@ -29,7 +29,8 @@ SpDemoTreeTablePresenter >> initializePresenters [
 	table1
 		addColumn: (SpCompositeTableColumn new
 			title: 'Classes';
-			addColumn: ((SpImageTableColumn evaluated: #systemIcon)
+			addColumn: ((SpImageTableColumn 
+				evaluated: [ :aClass | self iconNamed: aClass systemIconName ])
 				width: 20;
 				yourself);
 			addColumn: (SpStringTableColumn evaluated: #name);
diff --git a/src/Spec2-Examples/SpFilteringListPresenter.extension.st b/src/Spec2-Examples/SpFilteringListPresenter.extension.st
@@ -36,7 +36,7 @@ SpFilteringListPresenter class >> exampleWithInitializedFilter [
 	example := self new.
 	example matchSubstring.
 	example items: RBBrowserEnvironment default classes asArray.
-	example displayIcon: [ :aClass | aClass systemIcon ].
+	example displayIcon:[ :aClass | self iconNamed: aClass systemIconName ].
 	example applyFilter: 'ZZ'.
 	example open title:
 		self name asString , ' example with filter'.
diff --git a/src/Spec2-Examples/SpTablePresenter.extension.st b/src/Spec2-Examples/SpTablePresenter.extension.st
@@ -5,7 +5,9 @@ SpTablePresenter class >> example [
 	<sampleInstance>
 	
 	^ self new
-		addColumn: (SpImageTableColumn title: 'Icon' evaluated: #systemIcon);
+		addColumn: (SpImageTableColumn 
+			title: 'Icon' 
+			evaluated: [ :aClass | self iconNamed: aClass systemIconName ]);
 		addColumn: (SpStringTableColumn title: 'Name' evaluated: #name);
 		items: Smalltalk allClasses;
 		open
@@ -38,7 +40,9 @@ SpTablePresenter class >> exampleDragAndDrop [
 SpTablePresenter class >> exampleFixedWidth [
 	
 	^ self new
-		addColumn: ((SpImageTableColumn title: 'Icon' evaluated: #systemIcon) width: 30);
+		addColumn: ((SpImageTableColumn title: 'Icon' 
+			evaluated: [ :aClass | self iconNamed: aClass systemIconName ]) 
+			width: 30);
 		addColumn: (SpStringTableColumn title: 'Name' evaluated: #name);
 		items: Smalltalk allClasses;
 		open
@@ -50,7 +54,9 @@ SpTablePresenter class >> exampleFixedWidthResizable [
 	
 	^ self new
 		beResizable;
-		addColumn: ((SpImageTableColumn title: 'Icon' evaluated: #systemIcon) width: 30);
+		addColumn: ((SpImageTableColumn title: 'Icon' 
+			evaluated: [ :aClass | self iconNamed: aClass systemIconName ]) 
+			width: 30);
 		addColumn: (SpStringTableColumn title: 'Name' evaluated: #name);
 		addColumn: (SpStringTableColumn title: 'Methods' evaluated: [ :each | each methods size ]);
 		items: Smalltalk allClasses;
@@ -62,7 +68,9 @@ SpTablePresenter class >> exampleResizableColumns [
 	
 	^ self new
 		beResizable;
-		addColumn: (SpImageTableColumn title: 'Icon' evaluated: #systemIcon);
+		addColumn: (SpImageTableColumn 
+			title: 'Icon' 
+			evaluated: [ :aClass | self iconNamed: aClass systemIconName ]);
 		addColumn: (SpStringTableColumn title: 'Name' evaluated: #name);
 		items: Smalltalk allClasses;
 		open
@@ -108,7 +116,10 @@ SpTablePresenter class >> exampleWithCompositeColumn [
 		addColumn: (SpStringTableColumn title: 'Package' evaluated: [ :aClass | aClass package packageName ]);
 		addColumn: (SpCompositeTableColumn new
 			title: 'Class';
-			addColumn: (SpImageTableColumn evaluated: #systemIcon) beNotExpandable;
+			addColumn: (SpImageTableColumn new 
+				evaluated: [ :aClass | self iconNamed: aClass systemIconName ];
+				beNotExpandable;
+				yourself);
 			addColumn: (SpStringTableColumn evaluated: #name);
 			yourself);
 		items: Smalltalk allClasses;
@@ -119,7 +130,9 @@ SpTablePresenter class >> exampleWithCompositeColumn [
 SpTablePresenter class >> exampleWithDecoratedString [
 	
 	^ self new
-		addColumn: (SpImageTableColumn title: 'Icon' evaluated: [ :aClass | aClass systemIcon ]);
+		addColumn: (SpImageTableColumn 
+			title: 'Icon' 
+			evaluated: [ :aClass | self iconNamed: aClass systemIconName ]);
 		addColumn: (SpStringTableColumn new 
 			title: 'Name'; 
 			evaluated: [ :aClass | aClass name ];
diff --git a/src/Spec2-Examples/SpTransmissionExample.class.st b/src/Spec2-Examples/SpTransmissionExample.class.st
@@ -144,7 +144,7 @@ SpTransmissionExample >> initializeClassesPresenter [
 	classes := self newList.
 	classes
 		display: [ :class | class name];
-		displayIcon: [ :class | class systemIcon ];
+		displayIcon: [ :aClass | self iconNamed: aClass systemIconName ];
 		sortingBlock: [ :a :b | a name < b name ]
 ]
 
diff --git a/src/Spec2-Examples/SpTreePresenter.extension.st b/src/Spec2-Examples/SpTreePresenter.extension.st
@@ -7,7 +7,7 @@ SpTreePresenter class >> example [
 	^ self new
 		roots: { Object };
 		children: [ :aClass | aClass subclasses ];
-		displayIcon: [ :aClass | aClass systemIcon ];
+		displayIcon: [ :aClass | self iconNamed: aClass systemIconName ];
 		display: [ :aClass | aClass name ];
 		open
 ]
@@ -18,7 +18,7 @@ SpTreePresenter class >> exampleExpandPath [
 	^ self new
 		roots: { Object };
 		children: [ :aClass | aClass subclasses ];
-		displayIcon: [ :aClass | aClass systemIcon ];
+		displayIcon: [ :aClass | self iconNamed: aClass systemIconName ];
 		display: [ :aClass | aClass name ];
 		expandPath: #(1 1 3); "Object/Exception/Notification"
 		open
@@ -30,7 +30,7 @@ SpTreePresenter class >> exampleExpandRoots [
 	^ self new
 		roots: { Object };
 		children: [ :aClass | aClass subclasses ];
-		displayIcon: [ :aClass | aClass systemIcon ];
+		displayIcon: [ :aClass | self iconNamed: aClass systemIconName ];
 		display: [ :aClass | aClass name ];
 		expandRoots;
 		open
@@ -42,7 +42,7 @@ SpTreePresenter class >> exampleSelectPathByItems [
 	^ self new
 		roots: { Object };
 		children: [ :aClass | aClass subclasses ];
-		displayIcon: [ :aClass | aClass systemIcon ];
+		displayIcon: [ :aClass | self iconNamed: aClass systemIconName ];
 		display: [ :aClass | aClass name ];
 		open;
 		selectPathByItems: self withAllSuperclasses reversed allButFirst scrollToSelection: true
@@ -56,7 +56,7 @@ SpTreePresenter class >> exampleWithContextMenu [
 	^ (tree := self new)
 		roots: { Object };
 		children: [ :aClass | aClass subclasses ];
-		displayIcon: [ :aClass | aClass systemIcon ];
+		displayIcon: [ :aClass | self iconNamed: aClass systemIconName ];
 		display: [ :aClass | aClass name ];
 		contextMenu: [
 			SpMenuPresenter new 
@@ -69,7 +69,7 @@ SpTreePresenter class >> exampleWithContextMenu [
 SpTreePresenter class >> exampleWithDecoratedString [
 	
 	^ self new
-		displayIcon: [ :aClass | aClass systemIcon ];
+		displayIcon: [ :aClass | self iconNamed: aClass systemIconName ];
 		displayColor: [ :aClass | 
 			(aClass name endsWith: 'Test')
 				ifTrue: [ Color green ]
diff --git a/src/Spec2-Examples/SpTreeTablePresenter.extension.st b/src/Spec2-Examples/SpTreeTablePresenter.extension.st
@@ -6,7 +6,9 @@ SpTreeTablePresenter class >> example [
 	^ self new
 		addColumn: (SpCompositeTableColumn new
 			title: 'Classes';
-			addColumn: ((SpImageTableColumn evaluated: #systemIcon) width: 20);
+			addColumn: (SpImageTableColumn new 
+				evaluated: [ :aClass | self iconNamed: aClass systemIconName]; 
+				width: 20);
 			addColumn: (SpStringTableColumn evaluated: #name);
 			yourself);
 		roots: { Object };
@@ -20,7 +22,9 @@ SpTreeTablePresenter class >> exampleExpandPath [
 	^ self new
 		addColumn: (SpCompositeTableColumn new
 			title: 'Classes';
-			addColumn: ((SpImageTableColumn evaluated: #systemIcon) width: 20);
+			addColumn: (SpImageTableColumn new
+				evaluated: [ :aClass | self iconNamed: aClass systemIconName ]; 
+				width: 20);
 			addColumn: (SpStringTableColumn evaluated: #name);
 			yourself);
 		roots: { Object };
@@ -35,7 +39,9 @@ SpTreeTablePresenter class >> exampleExpandRoots [
 	^ self new
 		addColumn: (SpCompositeTableColumn new
 			title: 'Classes';
-			addColumn: ((SpImageTableColumn evaluated: #systemIcon) width: 20);
+			addColumn: (SpImageTableColumn new
+				evaluated: [ :aClass | self iconNamed: aClass systemIconName ]; 
+				width: 20);
 			addColumn: (SpStringTableColumn evaluated: #name);
 			yourself);
 		roots: { Object };
@@ -51,7 +57,7 @@ SpTreeTablePresenter class >> exampleResizableColumns [
 		beResizable;
 		addColumn: (SpCompositeTableColumn new
 			title: 'Classes';
-			addColumn: ((SpImageTableColumn evaluated: [:c| c systemIcon]) );
+			addColumn: ((SpImageTableColumn evaluated: [ :aClass | self iconNamed: aClass systemIconName ]) );
 			addColumn: (SpStringTableColumn evaluated: #name);
 			yourself);
 		addColumn: (SpStringTableColumn new
@@ -69,7 +75,7 @@ SpTreeTablePresenter class >> exampleResizableColumnsFixedWidth [
 		beResizable;
 		addColumn: (SpCompositeTableColumn new
 			title: 'Classes';
-			addColumn: ((SpImageTableColumn evaluated: [:c| c systemIcon]) );
+			addColumn: ((SpImageTableColumn evaluated: [ :aClass | self iconNamed: aClass systemIconName ]) );
 			addColumn: (SpStringTableColumn evaluated: #name);
 			width: 150;
 			beExpandable;
@@ -86,7 +92,9 @@ SpTreeTablePresenter class >> exampleResizableColumnsFixedWidth [
 SpTreeTablePresenter class >> exampleWithDecoratedString [
 	
 	^ self new
-		addColumn: (SpImageTableColumn title: 'Icon' evaluated: [ :aClass | aClass systemIcon ]);
+		addColumn: (SpImageTableColumn 
+			title: 'Icon' 
+			evaluated: [ :aClass | self iconNamed: aClass systemIconName ]);
 		addColumn: (SpStringTableColumn new 
 			title: 'Name'; 
 			evaluated: [ :aClass | aClass name ];
@@ -109,7 +117,7 @@ SpTreeTablePresenter class >> exampleWithTwoColumns [
 	^ self  new
 		addColumn: (SpCompositeTableColumn new
 			title: 'Classes';
-			addColumn: ((SpImageTableColumn evaluated: [:c| c systemIcon]) );
+			addColumn: ((SpImageTableColumn evaluated: [ :aClass | self iconNamed: aClass systemIconName ]) );
 			addColumn: (SpStringTableColumn evaluated: #name);
 			yourself);
 		addColumn: (SpStringTableColumn new
diff --git a/src/Spec2-Morphic-Backend-Tests/SpBoxLayoutWithTableForTestPresenter.class.st b/src/Spec2-Morphic-Backend-Tests/SpBoxLayoutWithTableForTestPresenter.class.st
@@ -37,7 +37,9 @@ SpBoxLayoutWithTableForTestPresenter >> initializePresenters [
 		items: Smalltalk allClassesAndTraits;
 		addColumn: (SpCompositeTableColumn new
 			title: 'Test'; 
-			addColumn: ((SpImageTableColumn evaluated: [ :each | each systemIcon ]) width: 20);
+			addColumn: ((SpImageTableColumn 
+				evaluated: [ :aClass | self iconNamed: aClass systemIconName ]) 
+				width: 20);
 			addColumn: (SpStringTableColumn evaluated: [ :each | each name ])).
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ SpDemoListsPresenter >> iconFor: class [`
`81`	`81`	`class hasErrorTest ifTrue: [ ^ self iconNamed: #testRed ].`
`82`	`82`	`^ self iconNamed: #testNotRun ].`
`83`	`83`	`class organization classComment ifEmpty: [ ^ self iconNamed: #uncommentedClass ].`
`84`		`- ^ class systemIcon`
	`84`	`+ ^ self iconNamed: class systemIconName`
`85`	`85`	`]`
`86`	`86`
`87`	`87`	`{ #category : #initialization }`