Merge pull request #20 from demarey/spec2

Make Cupboard a Spec presenter.
zeroflag · Feb 2, 2023 · b5596e1 · b5596e1
2 parents 11e3e5e + 34d82f3
commit b5596e1
Show file tree

Hide file tree

Showing 2 changed files with 182 additions and 40 deletions.
diff --git a/source/Teapot-Tools/Cupboard.class.st b/source/Teapot-Tools/Cupboard.class.st
@@ -1,9 +1,18 @@
 "
-A cupboad for teapots
+A cupboard for teapots.
+I'm the main User Interface to manage teapots instances.
+
+You can open me with:
+	
+	self soleInstance open
 "
 Class {
 	#name : #Cupboard,
-	#superclass : #Object,
+	#superclass : #SpPresenter,
+	#instVars : [
+		'teapots',
+		'toolbar'
+	],
 	#classInstVars : [
 		'soleInstance',
 		'icons'
@@ -25,7 +34,7 @@ Cupboard class >> menuCommandOn: aBuilder [
 		help: 'Teatime'; 
 		parent: #'Tools' translated;
 		icon: self iconProvider teapotIcon;
-		action: [ self soleInstance inspect ].
+		action: [ self soleInstance open ].
 	 aBuilder withSeparatorAfter 
 ]
 
@@ -50,58 +59,160 @@ Cupboard class >> soleInstance [
 	^ soleInstance ifNil: [ soleInstance := self basicNew initialize ]
 ]
 
-{ #category : #private }
-Cupboard >> iconForTeapot: aTeapot [
-	^aTeapot server isRunning 
-			ifTrue: [ self iconProvider teapotServerStartIcon ] 
-			ifFalse: [ self iconProvider teapotServerStopIcon ]
-]
+{ #category : #initialization }
+Cupboard >> buildBrowseToolBarItem [
 
-{ #category : #accessing }
-Cupboard >> iconProvider [
-	^ self class iconProvider
+	^ SpToolbarButtonPresenter new
+		label: 'Browse';
+		icon: self iconProvider teapotServerIcon;
+		action: [ self selectedTeapot browse ];
+		help: 'Browse the selected Teapot';
+		yourself
 ]
 
-{ #category : #accessing }
-Cupboard >> inspectTeapot: aBuilder [
-	<inspectorPresentationOrder: 0 title: 'Teapots'>      
-	| list |
-	list := aBuilder newList.
-	list
-		items: self teapots;
-		displayIcon: [:each | self iconForTeapot: each ];
-		display: [ :each | self nameForTeapot: each  ];
-		contextMenu: (SpMenuPresenter new
+{ #category : #initialization }
+Cupboard >> buildContextMenu [
+
+	^ SpMenuPresenter new
 			addItem: [ :item | 
 				item 
 					name: 'Start';
 					icon: self iconProvider teapotServerStartIcon;
-					action: [ list selectedItem start. list refresh ] ];
+					action: [ teapots selectedItem start. self refreshTeapots ] ];
 			addItem: [ :item | 
 				item 
 					name: 'Stop';
 					icon: self iconProvider teapotServerStopIcon;
-					action: [ list selectedItem stop. list refresh ] ];
+					action: [ teapots selectedItem stop. self refreshTeapots ] ];
 			addItem: [ :item | 
 				item 
 					name: 'Browse';
 					icon: self iconProvider teapotServerIcon;
-					action: [ list selectedItem browse. list refresh ] ];
-"			TODO: this doesn't work properly:
-				1. After adding a new Teapot the list is not refreshed
-				2. It shouldn't be a context menu. If there is no existing Teapot in the list, the context menu cannot be shown.	
-			addItem: [ :item | 
-				item 
-					name: 'New Teapot';
-					icon: self iconProvider teapotServerIcon;
-					action: [ self onNewServer. list refresh ] ];
-			addItem: [ :item | 
-				item 
-					name: 'New Teapot (serving static)';
-					icon: self iconProvider teapotServerStaticIcon;
-					action: [ self onNewStaticServer. list refresh ] ];	"							
-			yourself).
-	^ list
+					action: [ teapots selectedItem browse. self refreshTeapots ] ];
+		yourself
+]
+
+{ #category : #initialization }
+Cupboard >> buildInspectToolBarItem [
+
+	^ SpToolbarButtonPresenter new
+		label: 'Inspect';
+		icon: self iconProvider teapotInspectIcon;
+		action: [ self selectedTeapot inspect ];
+		help: 'Inspect the selected Teapot';
+		yourself
+]
+
+{ #category : #initialization }
+Cupboard >> buildNewStaticToolBarItem [
+
+	^ SpToolbarButtonPresenter new
+		label: 'New Teapot (serving static)';
+		icon: self iconProvider teapotServerStaticIcon;
+		action: [ self onNewStaticServer. self refreshTeapots ];
+		help: 'Create a new Teapot serving static files';
+		yourself
+]
+
+{ #category : #initialization }
+Cupboard >> buildNewToolBarItem [
+
+	^ SpToolbarButtonPresenter new
+		label: 'New Teapot';
+		icon: self iconProvider teapotServerIcon;
+		action: [ self onNewServer. self refreshTeapots ];
+		help: 'Create a new Teapot';
+		yourself
+
+]
+
+{ #category : #initialization }
+Cupboard >> buildRefreshToolBarItem [
+
+	^ SpToolbarButtonPresenter new
+		label: 'Refresh';
+		icon: self iconProvider teapotRefreshIcon;
+		action: [ self refreshTeapots ];
+		help: 'Refresh the Teapot list';
+		yourself
+]
+
+{ #category : #initialization }
+Cupboard >> buildStartToolBarItem [
+
+	^ SpToolbarButtonPresenter new
+		label: 'Start';
+		icon: self iconProvider teapotServerStartIcon;
+		action: [ self selectedTeapot start. self refreshTeapots ];
+		help: 'Start the selected Teapot';
+		yourself
+]
+
+{ #category : #initialization }
+Cupboard >> buildStopToolBarItem [
+
+	^ SpToolbarButtonPresenter new
+		label: 'Stop';
+		icon: self iconProvider teapotServerStopIcon;
+		action: [ self selectedTeapot stop. self refreshTeapots ];
+		help: 'Stop the selected Teapot';
+		yourself
+]
+
+{ #category : #initialization }
+Cupboard >> buildToolbar [
+
+	^ self newToolbar 
+		addItem: self buildRefreshToolBarItem;
+		addItem: self buildNewToolBarItem;
+		addItem: self buildNewStaticToolBarItem;
+		addItem: self buildStartToolBarItem;
+		addItem: self buildStopToolBarItem;
+		addItem: self buildBrowseToolBarItem;
+		addItem: self buildInspectToolBarItem;
+		yourself
+]
+
+{ #category : #layout }
+Cupboard >> defaultLayout [ 
+
+	^ SpBoxLayout newTopToBottom 
+		add: teapots;
+		yourself
+]
+
+{ #category : #private }
+Cupboard >> iconForTeapot: aTeapot [
+	^aTeapot server isRunning 
+			ifTrue: [ self iconProvider teapotServerStartIcon ] 
+			ifFalse: [ self iconProvider teapotServerStopIcon ]
+]
+
+{ #category : #accessing }
+Cupboard >> iconProvider [
+	^ self class iconProvider
+]
+
+{ #category : #initialization }
+Cupboard >> initializePresenters [
+
+	teapots := self newList.
+	teapots
+		items: self teapots;
+		displayIcon: [:each | self iconForTeapot: each ];
+		display: [ :each | self nameForTeapot: each  ];
+		whenActivatedDo: [ self selectedTeapot inspect ];
+		bindKeyCombination: Character cr asShortcut toAction: [ self selectedTeapot inspect ];
+		contextMenu: self buildContextMenu
+]
+
+{ #category : #initialization }
+Cupboard >> initializeWindow: aWindowPresenter [
+
+	super initializeWindow: aWindowPresenter.
+	aWindowPresenter 
+		title: 'Teapots';
+		toolbar: (toolbar := self buildToolbar).
 ]
 
 { #category : #private }
@@ -144,11 +255,30 @@ Cupboard >> onNewStaticServer [
 
 ]
 
+{ #category : #actions }
+Cupboard >> open [
+
+	self refreshTeapots.
+	super open.
+]
+
 { #category : #printing }
 Cupboard >> printOn: aStream [
 	aStream nextPutAll: 'Cupboard'
 ]
 
+{ #category : #actions }
+Cupboard >> refreshTeapots [
+
+	teapots items: self teapots
+]
+
+{ #category : #accessing }
+Cupboard >> selectedTeapot [
+
+	^ teapots selectedItem
+]
+
 { #category : #accessing }
 Cupboard >> teapots [
 	^ Teapot allInstances

diff --git a/source/Teapot-Tools/TeaIconProvider.class.st b/source/Teapot-Tools/TeaIconProvider.class.st
@@ -44,6 +44,18 @@ QD2vUC8Qkkf0uiT9wFon5OSVqUL65oui6hGxBy3TMMsAU+Y9Ki5M3KZ1lZZqi5oBr2z5j75R
 N5raAAAAAElFTkSuQmCC'
 ]
 
+{ #category : #icons }
+TeaIconProvider class >> teapotInspectIcon [
+
+	^ self iconNamed: #'glamorousInspect'
+]
+
+{ #category : #icons }
+TeaIconProvider class >> teapotRefreshIcon [
+
+	^ self iconNamed: #'glamorousRefresh'
+]
+
 { #category : #icons }
 TeaIconProvider class >> teapotServerIcon [