--- a/AbstractLauncherApplication.st Tue Mar 02 17:27:45 2004 +0100
+++ b/AbstractLauncherApplication.st Tue Mar 02 17:28:20 2004 +0100
@@ -4566,8 +4566,11 @@
useNewFileDialog := currentUserPrefs useNewFileDialog asValue.
useNewSettingsApplication := currentUserPrefs useNewSettingsApplication asValue.
useProcessMonitorV2 := currentUserPrefs useProcessMonitorV2 asValue.
- transcriptBufferSize := Transcript current lineLimit printString asValue.
-
+ Transcript current isExternalStream ifTrue:[
+ transcriptBufferSize := TextCollector defaultLineLimit
+ ] ifFalse:[
+ transcriptBufferSize := Transcript current lineLimit printString asValue.
+ ].
acceptChannel := false asValue.
"/
@@ -4650,12 +4653,14 @@
showClock := showClockInLauncher value.
currentUserPrefs showClockInLauncher ~= showClock ifTrue:[
currentUserPrefs showClockInLauncher:showClock.
- launcher := Transcript application.
- (launcher isKindOf:ToolApplicationModel) ifTrue:[
- showClock ifTrue:[
- launcher startClock
- ] ifFalse:[
- launcher stopClock
+ Transcript current isExternalStream ifFalse:[
+ launcher := Transcript application.
+ (launcher isKindOf:ToolApplicationModel) ifTrue:[
+ showClock ifTrue:[
+ launcher startClock
+ ] ifFalse:[
+ launcher stopClock
+ ]
]
]
].
@@ -6428,5 +6433,5 @@
!AbstractLauncherApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.306 2004-03-02 12:46:41 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.307 2004-03-02 16:28:20 cg Exp $'
! !
--- a/SettingsDialog.st Tue Mar 02 17:27:45 2004 +0100
+++ b/SettingsDialog.st Tue Mar 02 17:28:20 2004 +0100
@@ -1176,7 +1176,7 @@
"a temporary kludge - we need a central systemSettings object for this,
which can be saved/restored with a single store/read."
- |fileName|
+ |fileName transcript launcher|
fileName := Dialog
requestFileName:(resources string:'Load Settings from File')
@@ -1193,7 +1193,16 @@
self withWaitCursorDo:[
Smalltalk fileIn:fileName.
- Transcript current topView model reOpen.
+
+ "/ Transcript current topView model reOpen.
+
+ transcript := Transcript current.
+ (transcript notNil and:[transcript isExternalStream not]) ifTrue:[
+ launcher := transcript application.
+ launcher notNil ifTrue:[
+ launcher reopenLauncher.
+ ]
+ ].
self sendLoadRequestToAll.
].
!
@@ -1296,7 +1305,7 @@
!SettingsDialog class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/SettingsDialog.st,v 1.49 2004-03-02 12:46:58 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/SettingsDialog.st,v 1.50 2004-03-02 16:28:12 cg Exp $'
! !
SettingsDialog initialize!