Merge pull request #1772 from pharo-spec/dev-3.0

last minute changes

Author: estebanlm

src/Spec2-Adapters-Morphic/SpNotebookPageMorph.class.st

@@ -80,7 +80,7 @@ SpNotebookPageMorph >> reset [
 SpNotebookPageMorph >> themeChanged [
 
 	super themeChanged.
-	labelMorph themeChanged.
+	labelMorph ifNotNil: [ :aMorph | aMorph themeChanged ].
 	actualPageMorph ifNotNil: [ 
 		actualPageMorph themeChanged ]
 ]

src/Spec2-Commander2/CmUICommand.extension.st

@@ -0,0 +1,17 @@
+Extension { #name : 'CmUICommand' }
+
+{ #category : '*Spec2-Commander2' }
+CmUICommand >> id [
+
+	^ String streamContents: [ :stream |
+		| parts name |
+		
+		name := self name 
+			ifNil: [ 
+				self shortcutKey
+					ifNotNil: [ 'shortcut ', (KMShortcutPrinter toString: self shortcutKey) ]
+					ifNil: [ 'unknown' ] ].
+		parts := name substrings.
+		stream << parts first asLowercase.
+		parts allButFirstDo: [ :each | stream << each capitalized ] ]
+]

src/Spec2-Commander2/SpCommand.class.st

@@ -121,22 +121,6 @@ SpCommand >> iconProvider [
 	^ iconProvider
 ]
 
-{ #category : 'private' }
-SpCommand >> id [
-
-	^ String streamContents: [ :stream |
-		| parts name |
-		
-		name := self name 
-			ifNil: [ 
-				self shortcutKey
-					ifNotNil: [ 'shortcut ', (KMShortcutPrinter toString: self shortcutKey) ]
-					ifNil: [ 'unknown' ] ].
-		parts := name substrings.
-		stream << parts first asLowercase.
-		parts allButFirstDo: [ :each | stream << each capitalized ] ]
-]
-
 { #category : 'initialization' }
 SpCommand >> initialize [
 

src/Spec2-CommonWidgets/SpFilteringListPresenter.class.st

@@ -65,6 +65,18 @@ SpFilteringListPresenter >> applyFilter: aString [
 	self filterInputPresenter text: aString
 ]
 
+{ #category : 'api' }
+SpFilteringListPresenter >> beMultipleSelection [
+
+	listPresenter beMultipleSelection
+]
+
+{ #category : 'api' }
+SpFilteringListPresenter >> beSingleSelection [
+
+	listPresenter beSingleSelection
+]
+
 { #category : 'initialization' }
 SpFilteringListPresenter >> connectPresenters [
 
@@ -150,13 +162,16 @@ SpFilteringListPresenter >> headerTitle: aString [
 
 { #category : 'initialization' }
 SpFilteringListPresenter >> initializePresenters [
+	self addStyle: 'filteringList'.
 
 	filterInputPresenter := self newTextInput
-		                        placeholder: 'Filter...';
-		                        yourself.
+		addStyle: 'flat';
+		placeholder: 'Filter...';
+		yourself.
 	listPresenter := self newListToFilter.
-	unfilteredItems := #(  ).
-	self matchSubstring
+	unfilteredItems := #().
+	itemFilterBlock ifNil: [
+		self matchSubstring ]
 ]
 
 { #category : 'transmission' }
@@ -207,13 +222,13 @@ SpFilteringListPresenter >> matchBeginOfString [
 SpFilteringListPresenter >> matchSubstring [
 
 	itemFilterBlock := [ :each :pattern | 
-	              each asLowercase includesSubstring: pattern asLowercase ]
+		each asLowercase includesSubstring: pattern asLowercase ]
 ]
 
 { #category : 'initialization' }
 SpFilteringListPresenter >> newListToFilter [
 
-	^ self newList
+	^ self newEasyListView
 ]
 
 { #category : 'transmission' }
@@ -241,6 +256,15 @@ SpFilteringListPresenter >> resetFilter [
 	self applyFilter: ''
 ]
 
+{ #category : 'api' }
+SpFilteringListPresenter >> rowPresenterClass: aPresenterClass [
+	"Selecting a presenter class will override #display: and #displayIcon: selectors. 
+	 NOTICE that the #display: will still be used to filter, so you need to define it 
+	 anyway" 
+
+	listPresenter rowPresenterClass: aPresenterClass
+]
+
 { #category : 'api - selection' }
 SpFilteringListPresenter >> selectIndex: aNumber scrollToSelection: aBoolean [ 
 
@@ -289,6 +313,20 @@ SpFilteringListPresenter >> unfilteredItems: someItems [
 	unfilteredItems := someItems
 ]
 
+{ #category : 'api - selection' }
+SpFilteringListPresenter >> unselectAll [
+
+	listPresenter unselectAll
+]
+
+{ #category : 'api' }
+SpFilteringListPresenter >> updateItemsKeepingSelection: aCollection [
+	
+	listPresenter updateItemsKeepingSelection: aCollection.
+	unfilteredItems := aCollection.
+	self reapplyOrResetFilter
+]
+
 { #category : 'api - events' }
 SpFilteringListPresenter >> whenSelectionChangedDo: aBlock [
 

src/Spec2-Core/SpLocationIconProvider.class.st

@@ -70,6 +70,7 @@ SpLocationIconProvider >> inspectionIcons: aBuilder [
 	<inspectorPresentationOrder: 0 title: 'Icons'> 
 
 	^ aBuilder newList
+		addStyle: 'stList';
 		items: (icons associations sorted: [ :a :b | a key < b key ]);
 		displayIcon: [ :each | each value ];
 		display: [ :each | each key ];

src/Spec2-Core/SpPresenter.class.st

@@ -690,6 +690,7 @@ SpPresenter >> inspectionSubPresenters: aBuilder [
 	<inspectorPresentationOrder: 910 title: 'Subpresenters'>
 
 	^ aBuilder newTree
+		addStyle: 'stTree';
 		roots: self presenters;
 		children: [ :each | each presenters ];
 		expandRoots;

src/Spec2-Examples/SpBoxLayout.extension.st

@@ -8,7 +8,11 @@ SpBoxLayout class >> exampleAddLast [
 	presenter layout: (self newTopToBottom
 		add: 'Enter text' expand: false;
 		add: presenter newTextInput expand: false;
-		addLast: (presenter newButton label: 'Ok') expand: false;
+		add: (SpBoxLayout newTopToBottom
+				vAlignEnd;
+				add: presenter newButton label: 'Ok';
+				yourself) 
+			expand: false;
 		yourself).
 
 	presenter open
@@ -43,8 +47,9 @@ SpBoxLayout class >> exampleBorderWidth [
 		add: 'Enter text' expand: false;
 		add: presenter newTextInput expand: false;
 		addLast: (self newLeftToRight
-				addLast: (presenter newButton label: 'Ok') expand: false;
-				addLast: (presenter newButton label: 'Cancel') expand: false;
+				hAlignEnd;
+				add: (presenter newButton label: 'Ok') expand: false;
+				add: (presenter newButton label: 'Cancel') expand: false;
 				yourself)
 			expand: false;
 		yourself).

src/Spec2-Examples/SpDemoActionBarPresenter.class.st

@@ -18,7 +18,7 @@ SpDemoActionBarPresenter >> defaultLayout [
 
 	^ SpBoxLayout newTopToBottom
 		  add: text;
-		  addLast: actionBar expand: false;
+		  add: actionBar expand: false;
 		  yourself
 ]
 

src/Spec2-ListView/SpAbstractEasyListViewPresenter.class.st

@@ -101,6 +101,12 @@ SpAbstractEasyListViewPresenter >> removeScrollBarStyle: aStyle [
 	^ contentView removeScrollBarStyle: aStyle
 ]
 
+{ #category : 'initialization' }
+SpAbstractEasyListViewPresenter >> resetListSelection [
+	
+	self selectIndex: 0
+]
+
 { #category : 'api' }
 SpAbstractEasyListViewPresenter >> scrollBarStyles [
 
@@ -131,6 +137,12 @@ SpAbstractEasyListViewPresenter >> selectIndex: anInteger [
 	contentView selectIndex: anInteger
 ]
 
+{ #category : 'api - selection' }
+SpAbstractEasyListViewPresenter >> selectIndexes: anArray [
+	
+	contentView selectIndexes: anArray
+]
+
 { #category : 'api - selection' }
 SpAbstractEasyListViewPresenter >> selectItem: anObject [
 
@@ -145,6 +157,12 @@ SpAbstractEasyListViewPresenter >> selectItem: anObject scrollToSelection: aBool
 		scrollToSelection: aBoolean
 ]
 
+{ #category : 'api - selection' }
+SpAbstractEasyListViewPresenter >> selectItems: anArray [
+
+	contentView selectItems: anArray
+]
+
 { #category : 'api - selection' }
 SpAbstractEasyListViewPresenter >> selectedIndex [
 

src/Spec2-ListView/SpEasyListRowPresenter.class.st

@@ -57,7 +57,7 @@ SpEasyListRowPresenter >> updatePresenter [
 	self model ifNil: [ ^ self ].
 
 	self listView hasIcons
-		ifTrue: [ iconPresenter image: (self listView displayIcon value: self model) ].
+		ifTrue: [ iconPresenter image: (self listView displayIcon cull: self model) ].
 	textPresenter label: (self listView display value: self model)
 ]