add a setting to prevent close window.

show line counts when uploading.
EiichiroIto · May 4, 2020 · d45f2da · d45f2da
1 parent 9a1aa73
commit d45f2da
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 18 deletions.
diff --git a/src/FromScratch/SpScratchApp.class.st b/src/FromScratch/SpScratchApp.class.st
@@ -34,6 +34,16 @@ SpScratchApp class >> clipboard: anObject [
 	Clipboard := anObject
 ]
 
+{ #category : #accessing }
+SpScratchApp class >> dontClose [
+	^ self settings at: #dontClose ifAbsentPut: [ false ]
+]
+
+{ #category : #accessing }
+SpScratchApp class >> dontClose: aBoolean [
+	self settings at: #dontClose put: aBoolean
+]
+
 { #category : #accessing }
 SpScratchApp class >> extension [
 	self subclassResponsibility
@@ -69,9 +79,11 @@ SpScratchApp class >> loadSettings [
 { #category : #accessing }
 SpScratchApp class >> optionsFor: aSymbol [
 	aSymbol = #stickyWindow
-		ifTrue: [ ^ #(true false) ].
+		ifTrue: [ ^ {true . false} ].
 	aSymbol = #useErrorCatcher
-		ifTrue: [ ^ #(true false) ].
+		ifTrue: [ ^ {true . false} ].
+	aSymbol = #dontClose
+		ifTrue: [ ^ {true . false} ].
 	^ #()
 ]
 

diff --git a/src/FromScratch/SpScratchFrame.class.st b/src/FromScratch/SpScratchFrame.class.st
@@ -184,6 +184,23 @@ SpScratchFrame >> scriptMenuFor: aScript [
 	^ menu
 ]
 
+{ #category : #private }
+SpScratchFrame >> selectSetting: aSymbol [
+	| list choice appClass |
+	appClass := self application class.
+	list := appClass optionsFor: aSymbol.
+	list isEmpty
+		ifTrue: [ ^ self ].
+	choice := UIManager default
+		chooseFrom: list
+		title: 'Select options for ' , aSymbol.
+	choice = 0
+		ifTrue: [ ^ self ].
+	appClass perform: (aSymbol , ':') asSymbol with: (list at: choice).
+	aSymbol = #dontClose
+		ifTrue: [ self updateDontCloseSetting ]
+]
+
 { #category : #private }
 SpScratchFrame >> stageShotExtent: size [
 	^ self formFrom: self display extent: size
@@ -228,6 +245,15 @@ SpScratchFrame >> updateDisplay [
 	self display changed
 ]
 
+{ #category : #private }
+SpScratchFrame >> updateDontCloseSetting [
+	| win |
+	win := 	self window window.
+	self application class dontClose
+		ifTrue: [ win makeUnclosable ]
+		ifFalse: [ win makeClosable ]
+]
+
 { #category : #stepping }
 SpScratchFrame >> whenStepsDo: aBlock [
 	self display

diff --git a/src/MicroWiz/MicroPythonProxy.class.st b/src/MicroWiz/MicroPythonProxy.class.st
@@ -237,6 +237,13 @@ MicroPythonProxy >> setRawPrompted [
 	self status: #rawPrompted
 ]
 
+{ #category : #accessing }
+MicroPythonProxy >> statusString [
+	self isRawPrompted
+		ifFalse: [ ^ super statusString ].
+	^ '(', sendingQueue size asString, ')'
+]
+
 { #category : #private }
 MicroPythonProxy >> stringOfFileNamed: aString [
 	| out |

diff --git a/src/MicroWiz/MicroWizProxy.class.st b/src/MicroWiz/MicroWizProxy.class.st
@@ -331,6 +331,11 @@ MicroWizProxy >> status: aSymbol [
 	status := aSymbol
 ]
 
+{ #category : #accessing }
+MicroWizProxy >> statusString [
+	^ self status
+]
+
 { #category : #accessing }
 MicroWizProxy >> step [
 	| ret |

diff --git a/src/MicroWiz/SpMicroWizFrame.class.st b/src/MicroWiz/SpMicroWizFrame.class.st
@@ -229,7 +229,8 @@ SpMicroWizFrame >> fileMenu [
 		addItem: [ :item | 
 			item
 				name: 'Close';
-				action: [ application close ] ];
+				action: [ application close ];
+				enabled: [ application class dontClose not ] ];
 		addItem: [ :item | 
 			item
 				name: 'Quit';
@@ -349,20 +350,6 @@ SpMicroWizFrame >> replLog [
 	^ stageFrame log
 ]
 
-{ #category : #private }
-SpMicroWizFrame >> selectSetting: aSymbol [
-	| list choice |
-	list := SpMicroWiz optionsFor: aSymbol.
-	list isEmpty
-		ifTrue: [ ^ self ].
-	choice := UIManager default
-		chooseFrom: list
-		title: 'Select options for ' , aSymbol.
-	choice = 0
-		ifTrue: [ ^ self ].
-	SpMicroWiz perform: (aSymbol , ':') asSymbol with: (list at: choice)
-]
-
 { #category : #private }
 SpMicroWizFrame >> settingsMenu [
 	| m |

diff --git a/src/MicroWiz/SpMicroWizStage.class.st b/src/MicroWiz/SpMicroWizStage.class.st
@@ -342,7 +342,7 @@ SpMicroWizStage >> step [
 		ifFalse: [ buttonConnect state: false.
 			^ labelStatus label: 'unconnected' ].
 	proxy step.
-	labelStatus label: proxy status.
+	labelStatus label: proxy statusString.
 	self addOutput: proxy responseString
 ]