--- a/AbstractSettingsApplication.st Tue May 12 06:57:16 2015 +0200
+++ b/AbstractSettingsApplication.st Sat May 16 06:49:10 2015 +0200
@@ -168,7 +168,8 @@
enablePasswordCheck smallTeamServerEnabled selectedSmallTeamHost
listOfSmallTeamHosts smallTeamHostEntry addHostEnabled
removeHostEnabled acceptChannel smtpServerName
- dotNetBridgeVerbose dotNetBridgeRunsInIDE'
+ dotNetBridgeVerbose dotNetBridgeRunsInIDE smalltalkBridgeEnabled
+ smalltalkBridgeVerbose'
classVariableNames:''
poolDictionaries:''
privateIn:AbstractSettingsApplication
@@ -7463,6 +7464,43 @@
"Modified: / 12-08-2010 / 15:33:12 / cg"
! !
+!AbstractSettingsApplication::MiscCommunicationSettingsAppl class methodsFor:'help specs'!
+
+flyByHelpSpec
+ "This resource specification was automatically generated
+ by the UIHelpTool of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the UIHelpTool may not be able to read the specification."
+
+ "
+ UIHelpTool openOnClass:AbstractSettingsApplication::MiscDisplaySettingsAppl
+ "
+
+ <resource: #help>
+
+ ^ super flyByHelpSpec addPairsFrom:#(
+
+#smtpServer
+'The host name of your SMTP (mail transfer) server.\This is only needed for the debugger''s "Send Error Report via Mail" menu function,\so you can leave this empty if you don''t need or want this function'
+
+#windowMigration
+'The window migration service allows is available for X-display systems only.\It allows a window to be fetched from your screen and moved to another X-display'
+
+#remoteBrowsing
+'The remote browsing service allows for another ST/X system''s browser to request a classes source from your running system'
+
+#smallTeam
+'The smallTeam framework distributes notifications to team members when code is changed in browser.\This allows for team members to track and follow your changes in real time'
+
+#dotNetBridge
+'The dotNet bridge extension allows transparent access and message sending to .NET classes and instances.'
+
+#smalltalkBridgeServer
+'The smalltalk bridge server extension allows distributed processing\via transparent access and message sending from other ST/X systems.'
+)
+! !
+
!AbstractSettingsApplication::MiscCommunicationSettingsAppl class methodsFor:'image specs'!
defaultIcon
@@ -7505,367 +7543,448 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
- label: 'Communication Settings'
- name: 'Communication Settings'
- flags: 1
- min: (Point 10 10)
- bounds: (Rectangle 0 0 732 558)
- )
- component:
+ label: 'Communication Settings'
+ name: 'Communication Settings'
+ flags: 1
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 732 558)
+ )
+ component:
(SpecCollection
- collection: (
- (VerticalPanelViewSpec
- name: 'VerticalPanel1'
- layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
- horizontalLayout: fit
- verticalLayout: top
- horizontalSpace: 3
- verticalSpace: 3
- component:
- (SpecCollection
- collection: (
- (FramedBoxSpec
- label: 'SMTP Server'
- name: 'SMTPServerBox1'
- labelPosition: topLeft
- translateLabel: true
- component:
- (SpecCollection
- collection: (
- (ViewSpec
- name: 'Box5'
- layout: (LayoutFrame 0 0 5 0 0 1 28 0)
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'SMTP Server:'
- name: 'SMTPLabel'
- layout: (LayoutFrame 0 0 0 0 150 0 22 0)
- translateLabel: true
- adjust: right
- )
- (InputFieldSpec
- name: 'SMTPServer'
- layout: (LayoutFrame 150 0 0 0 400 0 22 0)
- model: smtpServerName
- acceptOnReturn: true
- acceptOnTab: true
- acceptOnLostFocus: true
- acceptOnPointerLeave: false
- )
- )
-
- )
- )
- )
-
- )
- extent: (Point 732 65)
- )
- (FramedBoxSpec
- label: 'Window migration'
- name: 'WindowMicrationSetupBox'
- labelPosition: topLeft
- translateLabel: true
- component:
- (SpecCollection
- collection: (
- (VerticalPanelViewSpec
- name: 'VerticalPanel2'
- layout: (LayoutFrame 0 0 0 0 0 1 0 1)
- horizontalLayout: left
- verticalLayout: center
- horizontalSpace: 3
- verticalSpace: 3
- component:
- (SpecCollection
- collection: (
- (ViewSpec
- name: 'Box2'
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'Window migration enabled'
- name: 'CheckBox2'
- layout: (LayoutFrame 5 0 0 0 600 0 22 0)
- enableChannel: hasWindowMigrationServer
- model: windowMigrationEnabled
- translateLabel: true
- )
- )
-
- )
- extent: (Point 696 23)
- )
- (ViewSpec
- name: 'Box3'
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'Password check'
- name: 'CheckBox3'
- layout: (LayoutFrame 5 0 -2 0 600 0 20 0)
- enableChannel: enablePasswordCheck
- model: windowMigrationAuthenticate
- translateLabel: true
- )
- )
-
- )
- extent: (Point 696 22)
- )
- (ViewSpec
- name: 'Box4'
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'Password:'
- name: 'Label3'
- layout: (LayoutFrame 0 0 0 0 150 0 22 0)
- translateLabel: true
- adjust: right
- )
- (InputFieldSpec
- name: 'EntryField1'
- layout: (LayoutFrame 150 0 0 0 400 0 22 0)
- enableChannel: windowMigrationAuthenticate
- model: windowMigrationPassword
- type: password
- acceptOnReturn: true
- acceptOnTab: true
- acceptOnLostFocus: true
- acceptOnPointerLeave: true
- )
- )
-
- )
- extent: (Point 696 22)
- )
- )
-
- )
- )
- )
-
- )
- extent: (Point 732 115)
- )
- (FramedBoxSpec
- label: 'Remote Browsing'
- name: 'RemoteBrowsingSetupBox'
- labelPosition: topLeft
- translateLabel: true
- component:
- (SpecCollection
- collection: (
- (ViewSpec
- name: 'Box1'
- layout: (LayoutFrame 0 0 5 0 0 1 28 0)
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'Remote browsing enabled'
- name: 'CheckBox1'
- layout: (LayoutFrame 5 0 0 0 600 0 22 0)
- enableChannel: hasRemoteBrowsingSupport
- model: remoteBrowsingEnabled
- translateLabel: true
- )
- )
-
- )
- )
- )
-
- )
- extent: (Point 732 64)
- )
- (FramedBoxSpec
- label: 'SmallTeam Change Distribution'
- name: 'SmallTeamSetupBox'
- visibilityChannel: managerIsCVSSourceCodeManager
- labelPosition: topLeft
- translateLabel: true
- component:
- (SpecCollection
- collection: (
- (ViewSpec
- name: 'enableBox'
- layout: (LayoutFrame 0 0 8 0 0 1 31 0)
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'SmallTeam Server enabled'
- name: 'CheckBox4'
- layout: (LayoutFrame 5 0 0 0 600 0 22 0)
- enableChannel: smallTeamServerAvailable
- model: smallTeamServerEnabled
- translateLabel: true
- )
- )
-
- )
- )
- (LabelSpec
- label: 'SmallTeam Hosts:'
- name: 'smallTeamHostsLabel'
- layout: (LayoutFrame 0 0.0 37 0 60 0.25 59 0)
- translateLabel: true
- adjust: right
- )
- (SequenceViewSpec
- name: 'smallTeamHostsList'
- layout: (LayoutFrame 64 0.25 37 0 0 1 131 0)
- enableChannel: smallTeamServerEnabled
- tabable: true
- model: selectedSmallTeamHost
- hasHorizontalScrollBar: true
- hasVerticalScrollBar: true
- miniScrollerHorizontal: true
- useIndex: false
- sequenceList: listOfSmallTeamHosts
- )
- (LabelSpec
- label: 'Host:'
- name: 'hostLabel'
- layout: (LayoutFrame 0 0.0 142 0 60 0.25 159 0)
- translateLabel: true
- adjust: right
- )
- (InputFieldSpec
- name: 'smallTeamHostEntryField'
- layout: (LayoutFrame 64 0.25 138 0 0 1 160 0)
- enableChannel: smallTeamServerEnabled
- tabable: true
- model: smallTeamHostEntry
- acceptChannel: acceptChannel
- acceptOnPointerLeave: true
- )
- (HorizontalPanelViewSpec
- name: 'HorizontalPanel2'
- layout: (LayoutFrame 64 0.25 165 0 -1 1 190 0)
- horizontalLayout: fitSpace
- verticalLayout: center
- horizontalSpace: 3
- verticalSpace: 3
- component:
- (SpecCollection
- collection: (
- (ActionButtonSpec
- label: 'Add'
- name: 'addButton'
- translateLabel: true
- tabable: true
- model: addSmallTeamHost
- enableChannel: addHostEnabled
- extent: (Point 225 22)
- )
- (ActionButtonSpec
- label: 'Remove'
- name: 'removeButton'
- translateLabel: true
- tabable: true
- model: removeSmallTeamHost
- enableChannel: removeHostEnabled
- extent: (Point 225 22)
- )
- )
-
- )
- )
- )
-
- )
- extent: (Point 732 222)
- )
- (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 5 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 3 0 600 0 25 0)
- enableChannel: hasDotNetBridge
- model: dotNetBridgeRunsInIDE
- translateLabel: true
- )
- )
-
- )
- extent: (Point 696 22)
- )
- )
-
- )
- )
- (ActionButtonSpec
- label: 'Close all Connections'
- name: 'Button1'
- layout: (LayoutFrame -228 1 27 0 -3 1 49 0)
- translateLabel: true
- tabable: true
- model: closeAllDotNetConnections
- )
- )
-
- )
- extent: (Point 732 83)
- )
- )
-
- )
- )
- )
-
+ collection: (
+ (VerticalPanelViewSpec
+ name: 'VerticalPanel1'
+ layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+ horizontalLayout: fit
+ verticalLayout: top
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (FramedBoxSpec
+ label: 'SMTP Server'
+ name: 'SMTPServerBox1'
+ activeHelpKey: smtpServer
+ labelPosition: topLeft
+ translateLabel: true
+ component:
+ (SpecCollection
+ collection: (
+ (ViewSpec
+ name: 'Box5'
+ layout: (LayoutFrame 0 0 5 0 0 1 28 0)
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'SMTP Server:'
+ name: 'SMTPLabel'
+ layout: (LayoutFrame 0 0 0 0 150 0 22 0)
+ translateLabel: true
+ adjust: right
+ )
+ (InputFieldSpec
+ name: 'SMTPServer'
+ layout: (LayoutFrame 150 0 0 0 400 0 22 0)
+ model: smtpServerName
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptOnPointerLeave: false
+ )
+ )
+
+ )
+ )
+ )
+
+ )
+ extent: (Point 732 65)
+ )
+ (FramedBoxSpec
+ label: 'Window migration'
+ name: 'WindowMicrationSetupBox'
+ activeHelpKey: windowMigration
+ labelPosition: topLeft
+ translateLabel: true
+ component:
+ (SpecCollection
+ collection: (
+ (VerticalPanelViewSpec
+ name: 'VerticalPanel2'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ horizontalLayout: left
+ verticalLayout: center
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (ViewSpec
+ name: 'Box2'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Window migration enabled'
+ name: 'CheckBox2'
+ layout: (LayoutFrame 5 0 0 0 600 0 22 0)
+ enableChannel: hasWindowMigrationServer
+ model: windowMigrationEnabled
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 696 23)
+ )
+ (ViewSpec
+ name: 'Box3'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Password check'
+ name: 'CheckBox3'
+ layout: (LayoutFrame 5 0 -2 0 600 0 20 0)
+ enableChannel: enablePasswordCheck
+ model: windowMigrationAuthenticate
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 696 22)
+ )
+ (ViewSpec
+ name: 'Box4'
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Password:'
+ name: 'Label3'
+ layout: (LayoutFrame 0 0 0 0 150 0 22 0)
+ translateLabel: true
+ adjust: right
+ enableDisableColorChannel: enablePasswordCheck
+ )
+ (InputFieldSpec
+ name: 'EntryField1'
+ layout: (LayoutFrame 150 0 0 0 400 0 22 0)
+ enableChannel: windowMigrationAuthenticate
+ model: windowMigrationPassword
+ type: password
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptOnPointerLeave: true
+ )
+ )
+
+ )
+ extent: (Point 696 22)
+ )
+ )
+
+ )
+ )
+ )
+
+ )
+ extent: (Point 732 115)
+ )
+ (FramedBoxSpec
+ label: 'Remote Browsing'
+ name: 'RemoteBrowsingSetupBox'
+ activeHelpKey: remoteBrowsing
+ labelPosition: topLeft
+ translateLabel: true
+ component:
+ (SpecCollection
+ collection: (
+ (ViewSpec
+ name: 'Box1'
+ layout: (LayoutFrame 0 0 5 0 0 1 28 0)
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Remote browsing enabled'
+ name: 'CheckBox1'
+ layout: (LayoutFrame 5 0 0 0 600 0 22 0)
+ enableChannel: hasRemoteBrowsingSupport
+ model: remoteBrowsingEnabled
+ translateLabel: true
+ )
+ )
+
+ )
+ )
+ )
+
+ )
+ extent: (Point 732 64)
+ )
+ (FramedBoxSpec
+ label: 'SmallTeam Change Distribution'
+ name: 'SmallTeamSetupBox'
+ activeHelpKey: smallTeam
+ visibilityChannel: managerIsCVSSourceCodeManager
+ labelPosition: topLeft
+ translateLabel: true
+ component:
+ (SpecCollection
+ collection: (
+ (ViewSpec
+ name: 'enableBox'
+ layout: (LayoutFrame 0 0 8 0 0 1 31 0)
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'SmallTeam Server enabled'
+ name: 'CheckBox4'
+ layout: (LayoutFrame 5 0 0 0 600 0 22 0)
+ enableChannel: smallTeamServerAvailable
+ model: smallTeamServerEnabled
+ translateLabel: true
+ )
+ )
+
+ )
+ )
+ (LabelSpec
+ label: 'SmallTeam Hosts:'
+ name: 'smallTeamHostsLabel'
+ layout: (LayoutFrame 0 0.0 37 0 60 0.25 59 0)
+ translateLabel: true
+ adjust: right
+ enableDisableColorChannel: smallTeamServerAvailable
+ )
+ (SequenceViewSpec
+ name: 'smallTeamHostsList'
+ layout: (LayoutFrame 64 0.25 37 0 0 1 131 0)
+ enableChannel: smallTeamServerEnabled
+ tabable: true
+ model: selectedSmallTeamHost
+ hasHorizontalScrollBar: true
+ hasVerticalScrollBar: true
+ miniScrollerHorizontal: true
+ useIndex: false
+ sequenceList: listOfSmallTeamHosts
+ )
+ (LabelSpec
+ label: 'Host:'
+ name: 'hostLabel'
+ layout: (LayoutFrame 0 0.0 142 0 60 0.25 159 0)
+ translateLabel: true
+ adjust: right
+ enableDisableColorChannel: smallTeamServerAvailable
+ )
+ (InputFieldSpec
+ name: 'smallTeamHostEntryField'
+ layout: (LayoutFrame 64 0.25 138 0 0 1 160 0)
+ enableChannel: smallTeamServerEnabled
+ tabable: true
+ model: smallTeamHostEntry
+ acceptChannel: acceptChannel
+ acceptOnPointerLeave: true
+ )
+ (HorizontalPanelViewSpec
+ name: 'HorizontalPanel2'
+ layout: (LayoutFrame 64 0.25 165 0 -1 1 190 0)
+ horizontalLayout: fitSpace
+ verticalLayout: center
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (ActionButtonSpec
+ label: 'Add'
+ name: 'addButton'
+ translateLabel: true
+ tabable: true
+ model: addSmallTeamHost
+ enableChannel: addHostEnabled
+ extent: (Point 224 22)
+ )
+ (ActionButtonSpec
+ label: 'Remove'
+ name: 'removeButton'
+ translateLabel: true
+ tabable: true
+ model: removeSmallTeamHost
+ enableChannel: removeHostEnabled
+ extent: (Point 224 22)
+ )
+ )
+
+ )
+ )
+ )
+
+ )
+ extent: (Point 732 222)
+ )
+ (FramedBoxSpec
+ label: '.NET Bridge'
+ name: 'FramedBox1'
+ activeHelpKey: dotNetBridge
+ 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 5 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 3 0 600 0 25 0)
+ enableChannel: hasDotNetBridge
+ model: dotNetBridgeRunsInIDE
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 696 22)
+ )
+ )
+
+ )
+ )
+ (ActionButtonSpec
+ label: 'Close all Connections'
+ name: 'Button1'
+ layout: (LayoutFrame -228 1 27 0 -3 1 49 0)
+ translateLabel: true
+ tabable: true
+ model: closeAllDotNetConnections
+ enableChannel: hasDotNetBridge
+ )
+ )
+
+ )
+ extent: (Point 732 83)
+ )
+ (FramedBoxSpec
+ label: 'Smalltalk Bridge Server'
+ name: 'FramedBox2'
+ activeHelpKey: smalltalkBridgeServer
+ labelPosition: topLeft
+ translateLabel: true
+ component:
+ (SpecCollection
+ collection: (
+ (VerticalPanelViewSpec
+ name: 'VerticalPanel4'
+ layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+ horizontalLayout: left
+ verticalLayout: center
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (ViewSpec
+ name: 'Box8'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Bridge Server Enabled'
+ name: 'CheckBox7'
+ layout: (LayoutFrame 5 0 3 0 600 0 25 0)
+ model: smalltalkBridgeEnabled
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 696 22)
+ )
+ (ViewSpec
+ name: 'Box9'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Verbose'
+ name: 'CheckBox8'
+ layout: (LayoutFrame 5 0 5 0 600 0 22 0)
+ enableChannel: hasSmalltalkBridge
+ model: smalltalkBridgeVerbose
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 696 23)
+ )
+ )
+
+ )
+ )
+ (ActionButtonSpec
+ label: 'Close all Connections'
+ name: 'Button2'
+ layout: (LayoutFrame -228 1 27 0 -3 1 49 0)
+ translateLabel: true
+ tabable: true
+ model: closeAllSmalltalkBridgeConnections
+ enableChannel: hasSmalltalkBridge
+ )
+ )
+
+ )
+ extent: (Point 732 83)
+ )
+ )
+
+ )
+ )
+ )
+
)
)
! !
@@ -7914,70 +8033,74 @@
basicSaveSettings
self
- writeAspects:
- #(
- smtpServerName
- dotNetBridgeRunsInIDE
- dotNetBridgeVerbose
- )
- to:currentUserPrefs.
+ writeAspects:
+ #(
+ smtpServerName
+ dotNetBridgeRunsInIDE
+ dotNetBridgeVerbose
+ )
+ to:currentUserPrefs.
+
+ BRIDGE::SmalltalkBridge notNil ifTrue:[
+ BRIDGE::SmalltalkBridge verbose:(self smalltalkBridgeVerbose value).
+ ].
(SmallTeam notNil) ifTrue:[
- SmallTeam connectedHosts copy do:[:host |
- (self listOfSmallTeamHosts includes:host) ifFalse:[
- SmallTeam removeHost:host.
- ].
- ].
-
- self listOfSmallTeamHosts do:[:eachHost |
- SmallTeam addHost:eachHost.
- ].
- self smallTeamServerEnabled value ifTrue:[
- SmallTeam startServer
- ] ifFalse:[
- SmallTeam stopServer
- ].
+ SmallTeam connectedHosts copy do:[:host |
+ (self listOfSmallTeamHosts includes:host) ifFalse:[
+ SmallTeam removeHost:host.
+ ].
+ ].
+
+ self listOfSmallTeamHosts do:[:eachHost |
+ SmallTeam addHost:eachHost.
+ ].
+ self smallTeamServerEnabled value ifTrue:[
+ SmallTeam startServer
+ ] ifFalse:[
+ SmallTeam stopServer
+ ].
].
self hasRemoteBrowsingSupport ifTrue:[
- self remoteBrowsingEnabled value ifFalse:[
- SmalltalkShareServer serverRunning ifTrue:[
- SmalltalkShareServer killAll
- ].
- ] ifTrue:[
- SmalltalkShareServer serverRunning ifFalse:[
- SmalltalkShareServer start.
- "/ must wait a bit; give it a chance to
- "/ really start (before checking)
- Delay waitForSeconds:0.5.
- SmalltalkShareServer serverRunning ifFalse:[
- self warn:'SmalltalkShareServer startup failed (see stderr).'
- ]
- ].
- ].
+ self remoteBrowsingEnabled value ifFalse:[
+ SmalltalkShareServer serverRunning ifTrue:[
+ SmalltalkShareServer killAll
+ ].
+ ] ifTrue:[
+ SmalltalkShareServer serverRunning ifFalse:[
+ SmalltalkShareServer start.
+ "/ must wait a bit; give it a chance to
+ "/ really start (before checking)
+ Delay waitForSeconds:0.5.
+ SmalltalkShareServer serverRunning ifFalse:[
+ self warn:'SmalltalkShareServer startup failed (see stderr).'
+ ]
+ ].
+ ].
].
self hasWindowMigrationServer ifTrue:[
- self windowMigrationAuthenticate value ifTrue:[
- WindowMigrationServer password:self windowMigrationPassword value.
- ] ifFalse:[
- WindowMigrationServer password:nil
- ].
- self windowMigrationEnabled value ifFalse:[
- WindowMigrationServer serverRunning ifTrue:[
- WindowMigrationServer stop
- ].
- ] ifTrue:[
- WindowMigrationServer serverRunning ifFalse:[
- WindowMigrationServer start.
- "/ must wait a bit; give it a chance to
- "/ really start (before checking)
- Delay waitForSeconds:0.5.
- WindowMigrationServer serverRunning ifFalse:[
- self warn:'WindowMigrationServer startup failed (see stderr).'
- ]
- ].
- ].
+ self windowMigrationAuthenticate value ifTrue:[
+ WindowMigrationServer password:self windowMigrationPassword value.
+ ] ifFalse:[
+ WindowMigrationServer password:nil
+ ].
+ self windowMigrationEnabled value ifFalse:[
+ WindowMigrationServer serverRunning ifTrue:[
+ WindowMigrationServer stop
+ ].
+ ] ifTrue:[
+ WindowMigrationServer serverRunning ifFalse:[
+ WindowMigrationServer start.
+ "/ must wait a bit; give it a chance to
+ "/ really start (before checking)
+ Delay waitForSeconds:0.5.
+ WindowMigrationServer serverRunning ifFalse:[
+ self warn:'WindowMigrationServer startup failed (see stderr).'
+ ]
+ ].
+ ].
].
"Modified: / 20-09-2007 / 16:05:01 / cg"
@@ -8029,6 +8152,10 @@
^ DOTNET::DotNet notNil and:[ DOTNET::DotNet isLoaded ].
!
+hasSmalltalkBridge
+ ^ BRIDGE::SmalltalkBridge notNil and:[ BRIDGE::SmalltalkBridge isLoaded ].
+!
+
listOfSmallTeamHosts
listOfSmallTeamHosts isNil ifTrue:[
@@ -8099,6 +8226,24 @@
"Created: / 12-11-2006 / 18:56:11 / cg"
!
+smalltalkBridgeEnabled
+
+ smalltalkBridgeEnabled isNil ifTrue:[
+ smalltalkBridgeEnabled := false asValue.
+ smalltalkBridgeEnabled onChangeSend:#updateModifiedChannel to:self.
+ ].
+ ^ smalltalkBridgeEnabled.
+!
+
+smalltalkBridgeVerbose
+
+ smalltalkBridgeVerbose isNil ifTrue:[
+ smalltalkBridgeVerbose := false asValue.
+ smalltalkBridgeVerbose onChangeSend:#updateModifiedChannel to:self.
+ ].
+ ^ smalltalkBridgeVerbose.
+!
+
smtpServerName
smtpServerName isNil ifTrue:[
@@ -8185,31 +8330,42 @@
hasUnsavedChanges
(self
- hasChangedAspectIn:
- #(
- smtpServerName
- dotNetBridgeRunsInIDE
- dotNetBridgeVerbose
- )
- asComparedTo:currentUserPrefs) ifTrue:[^ true].
+ hasChangedAspectIn:
+ #(
+ smtpServerName
+ dotNetBridgeRunsInIDE
+ dotNetBridgeVerbose
+ )
+ asComparedTo:currentUserPrefs) ifTrue:[^ true].
+
+ BRIDGE::SmalltalkBridge notNil ifTrue:[
+ BRIDGE::SmalltalkBridge verbose ~= (self smalltalkBridgeVerbose value) ifTrue:[^ true].
+ BRIDGE::SmalltalkBridge singletonInstanceOrNil notNil ifTrue:[
+ (self smalltalkBridgeEnabled value) ifFalse:[^ true].
+ ] ifFalse:[
+ (self smalltalkBridgeEnabled value) ifTrue:[^ true].
+ ].
+ ] ifFalse:[
+ (self smalltalkBridgeEnabled value) ifTrue:[^ true].
+ ].
SmallTeam notNil ifTrue:[
- self smallTeamServerEnabled value ~= (SmallTeam isLoaded and:[SmallTeam serverRunning]) ifTrue:[^ true].
- self listOfSmallTeamHosts asSet ~= (SmallTeam connectedHosts asSet) ifTrue:[^ true].
+ self smallTeamServerEnabled value ~= (SmallTeam isLoaded and:[SmallTeam serverRunning]) ifTrue:[^ true].
+ self listOfSmallTeamHosts asSet ~= (SmallTeam connectedHosts asSet) ifTrue:[^ true].
].
(self hasRemoteBrowsingSupport and:[SmalltalkShareServer isLoaded]) ifTrue:[
- self remoteBrowsingEnabled value ~~ SmalltalkShareServer serverRunning ifTrue:[^ true].
+ self remoteBrowsingEnabled value ~~ SmalltalkShareServer serverRunning ifTrue:[^ true].
].
self hasWindowMigrationServer ifTrue:[
- WindowMigrationServer isLoaded ifFalse:[
- self windowMigrationEnabled value ifTrue:[
- WindowMigrationServer autoload.
- ].
- ].
- (self windowMigrationEnabled value ~~ WindowMigrationServer serverRunning) ifTrue:[^ true].
- (self windowMigrationPassword value ~= WindowMigrationServer password) ifTrue:[^ true].
- (self windowMigrationAuthenticate value ~= self windowMigrationPassword value notNil) ifTrue:[^ true].
+ WindowMigrationServer isLoaded ifFalse:[
+ self windowMigrationEnabled value ifTrue:[
+ WindowMigrationServer autoload.
+ ].
+ ].
+ (self windowMigrationEnabled value ~~ WindowMigrationServer serverRunning) ifTrue:[^ true].
+ (self windowMigrationPassword value ~= WindowMigrationServer password) ifTrue:[^ true].
+ (self windowMigrationAuthenticate value ~= self windowMigrationPassword value notNil) ifTrue:[^ true].
].
^ false
@@ -8239,7 +8395,13 @@
closeAllDotNetConnections
DOTNET::DotNet notNil ifTrue:[
- DOTNET::DotNet exitAllLiveInstances
+ DOTNET::DotNet exitAllInstances
+ ].
+!
+
+closeAllSmalltalkBridgeConnections
+ BRIDGE::SmalltalkBridge notNil ifTrue:[
+ BRIDGE::SmalltalkBridge exitAllInstances
].
!
@@ -11419,6 +11581,29 @@
"Modified: / 20-05-2010 / 14:48:52 / cg"
! !
+!AbstractSettingsApplication::SQLServerSettingsAppl class methodsFor:'help specs'!
+
+flyByHelpSpec
+ "This resource specification was automatically generated
+ by the UIHelpTool of ST/X."
+
+ "Do not manually edit this!! If it is corrupted,
+ the UIHelpTool may not be able to read the specification."
+
+ "
+ UIHelpTool openOnClass:AbstractSettingsApplication::MiscDisplaySettingsAppl
+ "
+
+ <resource: #help>
+
+ ^ super flyByHelpSpec addPairsFrom:#(
+
+#sqlServer
+'The sql server is a pure Smalltalk application which implements the mySQL wire protocol,\and allows for a smalltalk application to simulate database tables.\One particular application presents classes and methods as tables.\\The SQL server is a non-free ST/X addon.'
+
+)
+! !
+
!AbstractSettingsApplication::SQLServerSettingsAppl class methodsFor:'image specs'!
dbIcon1
@@ -11499,201 +11684,204 @@
<resource: #canvas>
- ^
- #(FullSpec
- name: windowSpec
- window:
- (WindowSpec
- label: 'SQL Server Settings'
- name: 'SQL Server Settings'
- min: (Point 10 10)
- bounds: (Rectangle 0 0 600 550)
- )
- component:
- (SpecCollection
- collection: (
- (VerticalPanelViewSpec
- name: 'VerticalPanel2'
- layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
- horizontalLayout: fit
- verticalLayout: top
- horizontalSpace: 3
- verticalSpace: 3
- component:
- (SpecCollection
- collection: (
- (ViewSpec
- name: 'EnableBox'
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'SQL Server Enabled'
- name: 'EnableCheckBox'
- layout: (LayoutFrame 5 0 0 0 -5 1 22 0)
- enableChannel: hasSQLServerClass
- model: sqlServerEnabled
- translateLabel: true
- )
- )
-
- )
- extent: (Point 600 25)
- )
- (ViewSpec
- name: 'PortBox'
- component:
- (SpecCollection
- collection: (
- (LabelSpec
- label: 'MySQL Port:'
- name: 'Label2'
- layout: (LayoutFrame 5 0 0 0 150 0 22 0)
- translateLabel: true
- adjust: right
- )
- (InputFieldSpec
- name: 'EntryField1'
- layout: (LayoutFrame 150 0 0 0 -5 1 22 0)
- enableChannel: sqlServerEnabled
- model: sqlServerPort
- acceptOnReturn: true
- acceptOnTab: true
- acceptOnLostFocus: true
- acceptOnPointerLeave: true
- )
- (LabelSpec
- label: 'MySQL Port-Number (ODBC)'
- name: 'Label3'
- layout: (LayoutFrame 150 0 28 0 596 0 50 0)
- translateLabel: true
- adjust: left
- )
- )
-
- )
- extent: (Point 600 72)
- )
- (ViewSpec
- name: 'LogErrorsBox'
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'Log Errors'
- name: 'ErrorLoggingCheckBox'
- layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
- enableChannel: sqlServerEnabled
- model: sqlErrorLogging
- translateLabel: true
- )
- )
-
- )
- extent: (Point 600 25)
- )
- (ViewSpec
- name: 'LogDataBox'
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'Log Data'
- name: 'LogDataCheckBox'
- layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
- enableChannel: sqlServerEnabled
- model: sqlDataLogging
- translateLabel: true
- )
- )
-
- )
- extent: (Point 600 23)
- )
- (ViewSpec
- name: 'LogRequestsBox'
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'Log Requests'
- name: 'LogRequestsCheckBox'
- layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
- enableChannel: sqlServerEnabled
- model: sqlLogging
- translateLabel: true
- )
- )
-
- )
- extent: (Point 600 24)
- )
- (ViewSpec
- name: 'LogSQLBox'
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'Log SQL'
- name: 'CheckBox1'
- layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
- enableChannel: sqlServerEnabled
- model: sqlStatementLogging
- translateLabel: true
- )
- )
-
- )
- extent: (Point 600 24)
- )
- (ViewSpec
- name: 'DebugErrorsBox'
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'Debug Errors'
- name: 'DebugErrorsCheckBox'
- layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
- enableChannel: sqlServerEnabled
- model: sqlErrorDebugging
- translateLabel: true
- )
- )
-
- )
- extent: (Point 600 23)
- )
- (ViewSpec
- name: 'Box1'
- extent: (Point 600 10)
- )
- (ViewSpec
- name: 'EnableSmalltalkBox'
- component:
- (SpecCollection
- collection: (
- (CheckBoxSpec
- label: 'Virtual Smalltalk Tables Enabled'
- name: 'EnableSmalltalkCheckBox'
- layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
- enableChannel: sqlServerEnabled
- model: sqlSmalltalkServerEnabled
- translateLabel: true
- )
- )
-
- )
- extent: (Point 600 24)
- )
- )
-
- )
- )
- )
-
- )
- )
+ ^
+ #(FullSpec
+ name: windowSpec
+ window:
+ (WindowSpec
+ label: 'SQL Server Settings'
+ name: 'SQL Server Settings'
+ min: (Point 10 10)
+ bounds: (Rectangle 0 0 600 550)
+ )
+ component:
+ (SpecCollection
+ collection: (
+ (VerticalPanelViewSpec
+ activeHelpKey: #sqlServer
+ name: 'VerticalPanel2'
+ layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+ horizontalLayout: fit
+ verticalLayout: top
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (ViewSpec
+ name: 'EnableBox'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'SQL Server Enabled'
+ name: 'EnableCheckBox'
+ layout: (LayoutFrame 5 0 0 0 -5 1 22 0)
+ enableChannel: hasSQLServerClass
+ model: sqlServerEnabled
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 600 25)
+ )
+ (ViewSpec
+ name: 'PortBox'
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'MySQL Port:'
+ name: 'Label2'
+ layout: (LayoutFrame 5 0 0 0 150 0 22 0)
+ translateLabel: true
+ adjust: right
+ enableDisableColorChannel: sqlServerEnabled
+ )
+ (InputFieldSpec
+ name: 'EntryField1'
+ layout: (LayoutFrame 150 0 0 0 -5 1 22 0)
+ enableChannel: sqlServerEnabled
+ model: sqlServerPort
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptOnPointerLeave: true
+ )
+ (LabelSpec
+ label: 'MySQL Port-Number (ODBC)'
+ name: 'Label3'
+ layout: (LayoutFrame 150 0 28 0 596 0 50 0)
+ translateLabel: true
+ adjust: left
+ enableDisableColorChannel: sqlServerEnabled
+ )
+ )
+
+ )
+ extent: (Point 600 72)
+ )
+ (ViewSpec
+ name: 'LogErrorsBox'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Log Errors'
+ name: 'ErrorLoggingCheckBox'
+ layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
+ enableChannel: sqlServerEnabled
+ model: sqlErrorLogging
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 600 25)
+ )
+ (ViewSpec
+ name: 'LogDataBox'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Log Data'
+ name: 'LogDataCheckBox'
+ layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
+ enableChannel: sqlServerEnabled
+ model: sqlDataLogging
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 600 23)
+ )
+ (ViewSpec
+ name: 'LogRequestsBox'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Log Requests'
+ name: 'LogRequestsCheckBox'
+ layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
+ enableChannel: sqlServerEnabled
+ model: sqlLogging
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 600 24)
+ )
+ (ViewSpec
+ name: 'LogSQLBox'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Log SQL'
+ name: 'CheckBox1'
+ layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
+ enableChannel: sqlServerEnabled
+ model: sqlStatementLogging
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 600 24)
+ )
+ (ViewSpec
+ name: 'DebugErrorsBox'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Debug Errors'
+ name: 'DebugErrorsCheckBox'
+ layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
+ enableChannel: sqlServerEnabled
+ model: sqlErrorDebugging
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 600 23)
+ )
+ (ViewSpec
+ name: 'Box1'
+ extent: (Point 600 10)
+ )
+ (ViewSpec
+ name: 'EnableSmalltalkBox'
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Virtual Smalltalk Tables Enabled'
+ name: 'EnableSmalltalkCheckBox'
+ layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
+ enableChannel: sqlServerEnabled
+ model: sqlSmalltalkServerEnabled
+ translateLabel: true
+ )
+ )
+
+ )
+ extent: (Point 600 24)
+ )
+ )
+
+ )
+ )
+ )
+
+ )
+ )
! !
!AbstractSettingsApplication::SQLServerSettingsAppl methodsFor:'actions'!
@@ -19000,10 +19188,10 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.596 2015-05-09 08:32:02 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.597 2015-05-15 11:16:29 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.596 2015-05-09 08:32:02 cg Exp $'
-! !
-
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.597 2015-05-15 11:16:29 cg Exp $'
+! !
+