--- a/AbstractSettingsApplication.st Mon May 26 10:15:40 2008 +0200
+++ b/AbstractSettingsApplication.st Mon May 26 10:35:55 2008 +0200
@@ -134,7 +134,8 @@
windowMigrationPassword windowMigrationAuthenticate
enablePasswordCheck smallTeamServerEnabled selectedSmallTeamHost
listOfSmallTeamHosts smallTeamHostEntry addHostEnabled
- removeHostEnabled acceptChannel smtpServerName'
+ removeHostEnabled acceptChannel smtpServerName
+ dotNetBridgeVerbose dotNetBridgeRunsInIDE'
classVariableNames:''
poolDictionaries:''
privateIn:AbstractSettingsApplication
@@ -5936,7 +5937,7 @@
label: 'Communication Settings'
name: 'Communication Settings'
min: (Point 10 10)
- bounds: (Rectangle 0 0 732 441)
+ bounds: (Rectangle 0 0 732 586)
)
component:
(SpecCollection
@@ -6079,7 +6080,7 @@
)
)
- extent: (Point 732 119)
+ extent: (Point 732 118)
)
(FramedBoxSpec
label: 'Remote Browsing'
@@ -6211,6 +6212,69 @@
)
extent: (Point 732 244)
)
+ (FramedBoxSpec
+ label: '.NET Bridge'
+ name: 'FramedBox1'
+ labelPosition: topLeft
+ translateLabel: true
+ component:
+ (SpecCollection
+ collection: (
+ (VerticalPanelViewSpec
+ name: 'VerticalPanel3'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ horizontalLayout: left
+ verticalLayout: center
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (ViewSpec
+ name: 'Box6'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Verbose'
+ name: 'CheckBox5'
+ layout: (LayoutFrame 5 0 0 0 600 0 22 0)
+ enableChannel: hasDotNetBridge
+ model: dotNetBridgeVerbose
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 696 23)
+ )
+ (ViewSpec
+ name: 'Box7'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Bridge Runs in IDE'
+ name: 'CheckBox6'
+ layout: (LayoutFrame 5 0 0 0 600 0 22 0)
+ enableChannel: hasDotNetBridge
+ model: dotNetBridgeInIDE
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 696 22)
+ )
+ )
+
+ )
+ )
+ )
+
+ )
+ extent: (Point 732 75)
+ )
)
)
@@ -6219,8 +6283,6 @@
)
)
-
- "Modified: / 20-09-2007 / 16:05:10 / cg"
! !
!AbstractSettingsApplication::MiscCommunicationSettingsAppl methodsFor:'actions'!
@@ -6232,6 +6294,8 @@
readAspects:
#(
smtpServerName
+ dotNetBridgeRunsInIDE
+ dotNetBridgeVerbose
)
from:currentUserPrefs.
@@ -6268,10 +6332,12 @@
writeAspects:
#(
smtpServerName
+ dotNetBridgeRunsInIDE
+ dotNetBridgeVerbose
)
to:currentUserPrefs.
- SmallTeam notNil ifTrue:[
+ (SmallTeam notNil) ifTrue:[
SmallTeam connectedHosts copy do:[:host |
(self listOfSmallTeamHosts includes:host) ifFalse:[
SmallTeam removeHost:host.
@@ -6305,17 +6371,18 @@
].
].
].
+
self hasWindowMigrationServer ifTrue:[
self windowMigrationAuthenticate value ifTrue:[
WindowMigrationServer password:self windowMigrationPassword value.
] ifFalse:[
WindowMigrationServer password:nil
].
- self windowMigrationEnabled value ifTrue:[
+ self windowMigrationEnabled value ifFalse:[
WindowMigrationServer serverRunning ifTrue:[
WindowMigrationServer stop
].
- ] ifFalse:[
+ ] ifTrue:[
WindowMigrationServer serverRunning ifFalse:[
WindowMigrationServer start.
"/ must wait a bit; give it a chance to
@@ -6347,6 +6414,24 @@
"Created: / 12-11-2006 / 19:04:09 / cg"
!
+dotNetBridgeRunsInIDE
+
+ dotNetBridgeRunsInIDE isNil ifTrue:[
+ dotNetBridgeRunsInIDE := false asValue.
+ dotNetBridgeRunsInIDE onChangeSend:#updateModifiedChannel to:self.
+ ].
+ ^ dotNetBridgeRunsInIDE.
+!
+
+dotNetBridgeVerbose
+
+ dotNetBridgeVerbose isNil ifTrue:[
+ dotNetBridgeVerbose := false asValue.
+ dotNetBridgeVerbose onChangeSend:#updateModifiedChannel to:self.
+ ].
+ ^ dotNetBridgeVerbose.
+!
+
enablePasswordCheck
enablePasswordCheck isNil ifTrue:[
@@ -6359,6 +6444,10 @@
^ enablePasswordCheck.
!
+hasDotNetBridge
+ ^ DOTNET::DotNet notNil and:[ DOTNET::DotNet isLoaded ].
+!
+
listOfSmallTeamHosts
listOfSmallTeamHosts isNil ifTrue:[
@@ -6512,6 +6601,8 @@
hasChangedAspectIn:
#(
smtpServerName
+ dotNetBridgeRunsInIDE
+ dotNetBridgeVerbose
)
asComparedTo:currentUserPrefs) ifTrue:[^ true].
@@ -14454,5 +14545,5 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.294 2008-05-08 12:26:59 cg Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.295 2008-05-26 08:35:55 cg Exp $'
+! !