--- a/AbstractSettingsApplication.st Thu Nov 09 14:30:39 2006 +0100
+++ b/AbstractSettingsApplication.st Thu Nov 09 14:49:50 2006 +0100
@@ -224,17 +224,17 @@
cvsBinDirectoryHolder cvsExecutableHolder rootsPerModule
cvsLoginInModuleEnabled cvsLoginEnabled
selectedManagerTypeIndexHolder managerIsCVSSourceCodeManager
- managerIsStoreSourceCodeManager
- managerIsSharedImageSourceCodeManager storeLoginEnabled
+ managerIsStoreSourceCodeManager storeLoginEnabled
storeHostPrototypeList storeHostnameHolder storeUsernameHolder
storePasswordHolder perStoreModuleHostnameHolder
perStoreModuleUsernameHolder perStoreModulePasswordHolder
perStoreModuleRoot perStoreModuleRootModule
selectedPerStoreModuleRoot storeConnectEnabled
storeConnectInModuleEnabled perModuleFieldsEnableHolder
- perStoreModuleFieldsEnableHolder perShareModuleRoot
- perShareModuleRootModule perShareModuleHostnameHolder
- selectedPerShareModuleRoot'
+ managerIsSmallTeamSourceCodeManager
+ selectedPerSmallTeamModuleRoot
+ perSmallTeamModuleFieldsEnableHolder perSmallTeamModuleRoot
+ perSmallTeamModuleRootModule perSmallTeamModuleHostnameHolder'
classVariableNames:'RecentlyUsedCVSRoots RecentlyUsedStoreHosts LastStoreHost
LastStoreUser LastStorePassword'
poolDictionaries:''
@@ -10312,10 +10312,10 @@
)
)
(FramedBoxSpec
- label: 'Smalltalk ImageShare Setup'
- name: 'SmalltalkShareSetupBox'
+ label: 'SmallTeam Setup'
+ name: 'SmalltalkSmallTeamSetupBox'
layout: (LayoutFrame 0 0 0 0 0 1 0 1)
- visibilityChannel: managerIsSharedImageSourceCodeManager
+ visibilityChannel: managerIsSmallTeamSourceCodeManager
labelPosition: topLeft
translateLabel: true
component:
@@ -10329,18 +10329,18 @@
collection: (
(LabelSpec
label: 'Host:'
- name: 'ShareHostLabel'
+ name: 'SmallTeamHostLabel'
layout: (LayoutFrame 0 0.0 0 0 40 0.25 22 0)
level: 0
translateLabel: true
adjust: right
)
(ComboBoxSpec
- name: 'ShareHostComboBox'
+ name: 'SmallTeamHostComboBox'
layout: (LayoutFrame 44 0.25 0 0 0 1 22 0)
enableChannel: useManager
tabable: true
- model: shareHostnameHolder
+ model: smallTeamHostnameHolder
immediateAccept: true
acceptOnLeave: true
acceptOnReturn: true
@@ -10348,7 +10348,7 @@
acceptOnLostFocus: true
acceptChannel: acceptChannel
acceptOnPointerLeave: true
- comboList: shareHostPrototypeList
+ comboList: smallTeamHostPrototypeList
)
)
@@ -10369,7 +10369,7 @@
name: 'TryConnectButton4'
translateLabel: true
tabable: true
- model: shareConnect
+ model: smallTeamConnect
enableChannel: storeConnectEnabled
extent: (Point 124 22)
)
@@ -10379,7 +10379,7 @@
)
(LabelSpec
label: 'Host per Module:'
- name: 'perShareModuleLabel'
+ name: 'perSmallTeamModuleLabel'
layout: (LayoutFrame 0 0.0 82 0 40 0.25 104 0)
translateLabel: true
adjust: right
@@ -10389,7 +10389,7 @@
layout: (LayoutFrame 44 0.25 82 0 0 1 180 0)
enableChannel: useManager
tabable: true
- model: selectedPerShareModuleRoot
+ model: selectedPerSmallTeamModuleRoot
hasHorizontalScrollBar: true
hasVerticalScrollBar: true
miniScrollerHorizontal: true
@@ -10408,7 +10408,7 @@
layout: (LayoutFrame 44 0.25 182 0 0 1 204 0)
enableChannel: useManager
tabable: true
- model: perShareModuleRoot
+ model: perSmallTeamModuleRoot
acceptChannel: acceptChannel
acceptOnPointerLeave: true
)
@@ -10424,7 +10424,7 @@
layout: (LayoutFrame 44 0.25 207 0 0 1 229 0)
enableChannel: useManager
tabable: true
- model: perShareModuleHostnameHolder
+ model: perSmallTeamModuleHostnameHolder
immediateAccept: true
acceptOnLeave: true
acceptOnReturn: true
@@ -10432,7 +10432,7 @@
acceptOnLostFocus: true
acceptChannel: acceptChannel
acceptOnPointerLeave: true
- comboList: shareHostPrototypeList
+ comboList: smallTeamHostPrototypeList
)
(HorizontalPanelViewSpec
name: 'HorizontalPanel8'
@@ -10449,7 +10449,7 @@
name: 'AddButton5'
translateLabel: true
tabable: true
- model: addPerShareModuleHost
+ model: addPerSmallTeamModuleHost
enableChannel: useManager
extent: (Point 97 22)
)
@@ -10458,7 +10458,7 @@
name: 'RemoveButton6'
translateLabel: true
tabable: true
- model: removePerShareModuleHost
+ model: removePerSmallTeamModuleHost
enableChannel: removeEnabled
extent: (Point 98 22)
)
@@ -10481,7 +10481,7 @@
name: 'ConnectButton7'
translateLabel: true
tabable: true
- model: connectPerShareModuleHost
+ model: connectPerSmallTeamModuleHost
enableChannel: storeConnectInModuleEnabled
extent: (Point 103 22)
)
@@ -10490,7 +10490,7 @@
name: 'BrowseButton8'
translateLabel: true
tabable: true
- model: browsePerShareModuleHost
+ model: browsePerSmallTeamModuleHost
enableChannel: storeConnectInModuleEnabled
extent: (Point 104 22)
)
@@ -10838,6 +10838,8 @@
)
)
+
+ "Modified: / 09-11-2006 / 14:38:39 / cg"
! !
!AbstractSettingsApplication::SourceCodeManagementSettingsAppl methodsFor:'accessing'!
@@ -11094,17 +11096,17 @@
!AbstractSettingsApplication::SourceCodeManagementSettingsAppl methodsFor:'actions - share'!
-addPerShareModuleHost
+addPerSmallTeamModuleHost
|module host|
acceptChannel value:true.
- module := self perShareModuleRoot value.
- host := self perShareModuleHostnameHolder value.
-
- self addModule:module withData:(Array with:SmalltalkShareSourceCodeManager with:host).
-
- "Created: / 08-11-2006 / 19:01:51 / cg"
+ module := self perSmallTeamModuleRoot value.
+ host := self perSmallTeamModuleHostnameHolder value.
+
+ self addModule:module withData:(Array with:SmallTeamSourceCodeManager with:host).
+
+ "Created: / 09-11-2006 / 14:35:50 / cg"
! !
!AbstractSettingsApplication::SourceCodeManagementSettingsAppl methodsFor:'actions - store'!
@@ -11344,26 +11346,14 @@
"Created: / 16-08-2006 / 10:56:38 / cg"
!
-managerIsShareSourceCodeManager
- managerIsSharedImageSourceCodeManager isNil ifTrue:[
- managerIsSharedImageSourceCodeManager := (SourceCodeManager notNil and:
+managerIsSmallTeamSourceCodeManager
+ managerIsSmallTeamSourceCodeManager isNil ifTrue:[
+ managerIsSmallTeamSourceCodeManager := (SourceCodeManager notNil and:
[SourceCodeManager isSmallTeam]) asValue.
].
- ^ managerIsSharedImageSourceCodeManager.
-
- "Created: / 08-11-2006 / 18:52:28 / cg"
- "Modified: / 09-11-2006 / 14:29:58 / cg"
-!
-
-managerIsSharedImageSourceCodeManager
- managerIsSharedImageSourceCodeManager isNil ifTrue:[
- managerIsSharedImageSourceCodeManager := (SourceCodeManager notNil and:
- [SourceCodeManager isSmallTeam]) asValue.
- ].
- ^ managerIsSharedImageSourceCodeManager.
-
- "Created: / 08-11-2006 / 18:54:40 / cg"
- "Modified: / 09-11-2006 / 14:30:01 / cg"
+ ^ managerIsSmallTeamSourceCodeManager.
+
+ "Created: / 09-11-2006 / 14:33:53 / cg"
!
managerIsStoreSourceCodeManager
@@ -11406,41 +11396,41 @@
^ perModuleRootModule.
!
-perShareModuleHostnameHolder
- perShareModuleHostnameHolder isNil ifTrue:[
- perShareModuleHostnameHolder := ValueHolder new.
- ].
- ^ perShareModuleHostnameHolder.
-
- "Created: / 08-11-2006 / 19:06:57 / cg"
-!
-
-perShareModuleRoot
- perShareModuleRoot isNil ifTrue:[
- perShareModuleRoot := ValueHolder new.
- perShareModuleRoot addDependent:self.
- ].
- ^ perShareModuleRoot.
-
- "Created: / 08-11-2006 / 19:02:43 / cg"
-!
-
-perShareModuleRootModule
- perShareModuleRootModule isNil ifTrue:[
- perShareModuleRootModule := ValueHolder new.
- ].
- ^ perShareModuleRootModule.
-
- "Created: / 08-11-2006 / 19:03:09 / cg"
+perSmallTeamModuleHostnameHolder
+ perSmallTeamModuleHostnameHolder isNil ifTrue:[
+ perSmallTeamModuleHostnameHolder := ValueHolder new.
+ ].
+ ^ perSmallTeamModuleHostnameHolder.
+
+ "Created: / 09-11-2006 / 14:40:29 / cg"
+!
+
+perSmallTeamModuleRoot
+ perSmallTeamModuleRoot isNil ifTrue:[
+ perSmallTeamModuleRoot := ValueHolder new.
+ perSmallTeamModuleRoot addDependent:self.
+ ].
+ ^ perSmallTeamModuleRoot.
+
+ "Created: / 09-11-2006 / 14:40:35 / cg"
+!
+
+perSmallTeamModuleRootModule
+ perSmallTeamModuleRootModule isNil ifTrue:[
+ perSmallTeamModuleRootModule := ValueHolder new.
+ ].
+ ^ perSmallTeamModuleRootModule.
+
+ "Created: / 09-11-2006 / 14:40:41 / cg"
!
perStoreModuleFieldsEnableHolder
- perStoreModuleFieldsEnableHolder isNil ifTrue:[
- perStoreModuleFieldsEnableHolder := true asValue.
- perStoreModuleFieldsEnableHolder addDependent:self.
- ].
- ^ perStoreModuleFieldsEnableHolder.
+ perSmallTeamModuleFieldsEnableHolder isNil ifTrue:[
+ perSmallTeamModuleFieldsEnableHolder := true asValue.
+ perSmallTeamModuleFieldsEnableHolder addDependent:self.
+ ].
+ ^ perSmallTeamModuleFieldsEnableHolder.
!
perStoreModuleHostnameHolder
@@ -11516,7 +11506,7 @@
selectedManager := self selectedManager.
self managerIsCVSSourceCodeManager value:( selectedManager notNil and:[ selectedManager isCVS] ).
self managerIsStoreSourceCodeManager value:( selectedManager notNil and:[ selectedManager isStore] ).
- self managerIsSharedImageSourceCodeManager value:( selectedManager notNil and:[ selectedManager isSmallTeam] ).
+ self managerIsSmallTeamSourceCodeManager value:( selectedManager notNil and:[ selectedManager isSmallTeam] ).
self updateModifiedChannel
].
@@ -11525,7 +11515,7 @@
^ selectedManagerTypeIndexHolder.
"Created: / 16-08-2006 / 11:17:20 / cg"
- "Modified: / 09-11-2006 / 14:30:06 / cg"
+ "Modified: / 09-11-2006 / 14:34:54 / cg"
!
selectedPerModuleRoot
@@ -11536,14 +11526,14 @@
^ selectedPerModuleRoot.
!
-selectedPerShareModuleRoot
- selectedPerShareModuleRoot isNil ifTrue:[
- selectedPerShareModuleRoot := ValueHolder new.
- selectedPerShareModuleRoot addDependent:self.
- ].
- ^ selectedPerShareModuleRoot.
-
- "Created: / 08-11-2006 / 19:13:57 / cg"
+selectedPerSmallTeamModuleRoot
+ selectedPerSmallTeamModuleRoot isNil ifTrue:[
+ selectedPerSmallTeamModuleRoot := ValueHolder new.
+ selectedPerSmallTeamModuleRoot addDependent:self.
+ ].
+ ^ selectedPerSmallTeamModuleRoot.
+
+ "Created: / 09-11-2006 / 14:39:15 / cg"
!
selectedPerStoreModuleRoot
@@ -11672,33 +11662,31 @@
].
!
-selectedPerShareModuleRootChanged
+selectedPerSmallTeamModuleRootChanged
|module entry|
self acceptChannel value:true.
- module := self selectedPerShareModuleRoot value.
+ module := self selectedPerSmallTeamModuleRoot value.
module isNil ifTrue:[
self removeEnabled value:false.
- self perStoreModuleRoot value:''.
- self perStoreModuleHostnameHolder value:''.
- self perStoreModuleUsernameHolder value:''.
- self perStoreModulePasswordHolder value:''.
+ self perSmallTeamModuleRoot value:''.
+ self perSmallTeamModuleHostnameHolder value:''.
^ self
].
entry := rootsPerModule at:module.
- (entry first = SmalltalkShareSourceCodeManager) ifTrue:[
+ (entry first = SmallTeamSourceCodeManager) ifTrue:[
self removeEnabled value:true.
- self perShareModuleRoot value:module.
- self perShareModuleHostnameHolder value:(entry at:2).
+ self perSmallTeamModuleRoot value:module.
+ self perSmallTeamModuleHostnameHolder value:(entry at:2).
] ifFalse:[
self removeEnabled value:false.
- self perShareModuleRoot value:module , ' ',('<<use ',entry first managerTypeName,'>>') allBold.
- self perShareModuleHostnameHolder value:''.
- ].
-
- "Created: / 08-11-2006 / 19:13:41 / cg"
+ self perSmallTeamModuleRoot value:module , ' ',('<<use ',entry first managerTypeName,'>>') allBold.
+ self perSmallTeamModuleHostnameHolder value:''.
+ ].
+
+ "Created: / 09-11-2006 / 14:39:04 / cg"
!
selectedPerStoreModuleRootChanged
@@ -11818,15 +11806,15 @@
^ self
].
- "/ share
- changedObject == selectedPerShareModuleRoot ifTrue:[
- self selectedPerShareModuleRootChanged.
+ "/ SmallTeam
+ changedObject == selectedPerSmallTeamModuleRoot ifTrue:[
+ self selectedPerSmallTeamModuleRootChanged.
^ self
].
super update:something with:aParameter from:changedObject
- "Modified: / 08-11-2006 / 19:14:30 / cg"
+ "Modified: / 09-11-2006 / 14:41:10 / cg"
!
updateConnectEnableHolders
@@ -11917,10 +11905,7 @@
((currentUserPrefs at:#checkClassesWhenCheckingIn ifAbsent:true) ~= self checkClassesWhenCheckingIn value)
ifTrue:[^ true].
- (Array
- with:CVSSourceCodeManager
- with:StoreSourceCodeManager)
- do:[:mgr |
+ self availableManagers do:[:mgr |
|modules|
modules := rootsPerModule select:[:entry | entry first == mgr].
@@ -11954,7 +11939,7 @@
^ false
- "Modified: / 29-09-2006 / 14:40:42 / cg"
+ "Modified: / 09-11-2006 / 14:49:14 / cg"
! !
!AbstractSettingsApplication::StyleSettingsAppl class methodsFor:'defaults'!
@@ -13714,5 +13699,5 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.264 2006-11-09 13:30:39 cg Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.265 2006-11-09 13:49:50 cg Exp $'
+! !