--- a/MercurialSourceCodeManagementSettingsAppl.st Sat Mar 03 11:28:57 2012 +0100
+++ b/MercurialSourceCodeManagementSettingsAppl.st Sat Mar 03 11:31:58 2012 +0100
@@ -12,13 +12,13 @@
"{ Package: 'stx:libtool' }"
AbstractSourceCodeManagementSettingsAppl subclass:#MercurialSourceCodeManagementSettingsAppl
- instanceVariableNames:'repositoryHolder manager repository repositoryPrototypeList
- addPerModuleRepository removePerModuleRepository
- perModuleRepository defaultRepositoryHolder
- selectedPerModuleRepository hgBinDirectoryHolder
- hgExecutableHolder hgCommandTimeoutHolder repositoriesPerModule
- perModuleRepositoryModule selectedPushURL pushURL
- pushURLPrototypeList listOfPushURLs'
+ instanceVariableNames:'workDirectoryHolder repositoryHolder manager repository
+ repositoryPrototypeList addPerModuleRepository
+ removePerModuleRepository perModuleRepository
+ defaultRepositoryHolder selectedPerModuleRepository
+ hgBinDirectoryHolder hgExecutableHolder hgCommandTimeoutHolder
+ repositoriesPerModule perModuleRepositoryModule selectedPushURL
+ pushURL pushURLPrototypeList listOfPushURLs'
classVariableNames:'RecentlyUsedRepositoryURLS'
poolDictionaries:''
category:'System-SourceCodeManagement'
@@ -305,7 +305,7 @@
label: 'Mercurial Settings'
name: 'Mercurial Settings'
min: (Point 10 10)
- bounds: (Rectangle 0 0 811 693)
+ bounds: (Rectangle 0 0 811 723)
)
component:
(SpecCollection
@@ -343,7 +343,7 @@
translateLabel: true
)
(ViewSpec
- name: 'Box1'
+ name: 'CommandBox'
layout: (LayoutFrame 0 0 35 0 0 1 60 0)
component:
(SpecCollection
@@ -371,7 +371,7 @@
)
)
(ViewSpec
- name: 'Box12'
+ name: 'TimeoutBox'
layout: (LayoutFrame 0 0 61 0 0 1 86 0)
component:
(SpecCollection
@@ -400,8 +400,41 @@
)
)
(ViewSpec
- name: 'Box7'
- layout: (LayoutFrame 0 0.0 92 0 0 1 117 0)
+ name: 'WorkDirectoryBox'
+ layout: (LayoutFrame 0 0.0 85 0 0 1 110 0)
+ component:
+ (SpecCollection
+ collection: (
+ (InputFieldSpec
+ name: 'EntryField2'
+ layout: (LayoutFrame 64 0.25 2 0 0 1 24 0)
+ activeHelpKey: hgRootDefault
+ tabable: true
+ model: workDirectoryHolder
+ immediateAccept: true
+ acceptOnLeave: true
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptChannel: acceptChannel
+ acceptOnPointerLeave: true
+ )
+ (LabelSpec
+ label: 'Working Directory:'
+ name: 'Label9'
+ layout: (LayoutFrame 0 0.0 2 0 60 0.25 24 0)
+ activeHelpKey: hgRootDefault
+ level: 0
+ translateLabel: true
+ adjust: right
+ )
+ )
+
+ )
+ )
+ (ViewSpec
+ name: 'RepositoryBox'
+ layout: (LayoutFrame 0 0.0 120 0 0 1 145 0)
component:
(SpecCollection
collection: (
@@ -436,7 +469,7 @@
(ActionButtonSpec
label: 'Init'
name: 'Button2'
- layout: (LayoutFrame -201 1 122 0 -101 1 144 0)
+ layout: (LayoutFrame -201 1 150 0 -101 1 172 0)
activeHelpKey: hgInit
translateLabel: true
tabable: true
@@ -446,7 +479,7 @@
(ActionButtonSpec
label: 'Check Access'
name: 'Button1'
- layout: (LayoutFrame -100 1 122 0 0 1 144 0)
+ layout: (LayoutFrame -100 1 150 0 0 1 172 0)
activeHelpKey: hgCheckAccess
translateLabel: true
tabable: true
@@ -456,14 +489,14 @@
(LabelSpec
label: 'Repository per Module:'
name: 'knownModulesLabel'
- layout: (LayoutFrame 0 0.0 150 0 60 0.25 172 0)
+ layout: (LayoutFrame 0 0.0 178 0 60 0.25 200 0)
activeHelpKey: hgRootPerModule
translateLabel: true
adjust: right
)
(SequenceViewSpec
name: 'List1'
- layout: (LayoutFrame 64 0.25 150 0 0 1 269 0)
+ layout: (LayoutFrame 64 0.25 178 0 0 1 297 0)
activeHelpKey: hgRootPerModule
tabable: true
model: selectedPerModuleRepository
@@ -476,14 +509,14 @@
(LabelSpec
label: 'Module:'
name: 'moduleLabel'
- layout: (LayoutFrame 0 0.0 279 0 60 0.25 296 0)
+ layout: (LayoutFrame 0 0.0 307 0 60 0.25 324 0)
activeHelpKey: hgRootPerModuleModule
translateLabel: true
adjust: right
)
(InputFieldSpec
name: 'perModuleRepositoryModuleEntryField'
- layout: (LayoutFrame 64 0.25 275 0 0 1 297 0)
+ layout: (LayoutFrame 64 0.25 303 0 0 1 325 0)
activeHelpKey: hgRootPerModuleModule
tabable: true
model: perModuleRepositoryModule
@@ -493,14 +526,14 @@
(LabelSpec
label: 'Mercurial Repository:'
name: 'hgRepository'
- layout: (LayoutFrame 0 0.0 304 0 60 0.25 321 0)
+ layout: (LayoutFrame 0 0.0 332 0 60 0.25 349 0)
activeHelpKey: hgRootPerModuleRoot
translateLabel: true
adjust: right
)
(ComboBoxSpec
name: 'perModuleRepositoryComboBox'
- layout: (LayoutFrame 64 0.25 300 0 0 1.0 322 0)
+ layout: (LayoutFrame 64 0.25 328 0 0 1.0 350 0)
activeHelpKey: hgRootPerModuleRoot
tabable: true
model: perModuleRepository
@@ -515,7 +548,7 @@
)
(HorizontalPanelViewSpec
name: 'HorizontalPanel2'
- layout: (LayoutFrame 64 0.25 327 0 -1 1 352 0)
+ layout: (LayoutFrame 64 0.25 355 0 -1 1 380 0)
horizontalLayout: right
verticalLayout: center
horizontalSpace: 3
@@ -577,7 +610,7 @@
)
)
- extent: (Point 811 389)
+ extent: (Point 811 420)
)
(FramedBoxSpec
label: 'Push URLs'
@@ -759,8 +792,6 @@
)
)
-
- "Modified: / 02-03-2012 / 15:54:42 / cg"
! !
!MercurialSourceCodeManagementSettingsAppl class methodsFor:'queries'!
@@ -795,6 +826,7 @@
repository := MercurialSourceCodeManager repositoryName.
self repositoryHolder value:(repository ? '') asValue.
+ self workDirectoryHolder value:MercurialSourceCodeManager workDirectory.
infoPerModule := MercurialSourceCodeManager repositoryInfoPerModule.
infoPerModule keysAndValuesDo:[:module :info |
@@ -813,7 +845,7 @@
].
"/ self selectedPerModuleRootChanged.
- "Modified: / 14-01-2012 / 23:59:03 / cg"
+ "Modified: / 03-03-2012 / 11:11:54 / cg"
!
basicSaveSettings
@@ -848,6 +880,7 @@
].
].
MercurialSourceCodeManager repositoryInfoPerModule:infoPerModule.
+ MercurialSourceCodeManager workDirectory:self workDirectoryHolder value.
self basicSaveMercurialSettings.
@@ -857,7 +890,7 @@
self acceptChannel value.
- "Modified: / 14-01-2012 / 19:58:46 / cg"
+ "Modified: / 03-03-2012 / 11:24:56 / cg"
!
removePerModuleRoot
@@ -1069,6 +1102,16 @@
^ selectedPushURL.
"Created: / 02-03-2012 / 15:52:09 / cg"
+!
+
+workDirectoryHolder
+ workDirectoryHolder isNil ifTrue:[
+ workDirectoryHolder := ValueHolder new.
+ workDirectoryHolder addDependent:self.
+ ].
+ ^ workDirectoryHolder.
+
+ "Created: / 03-03-2012 / 10:34:19 / cg"
! !
!MercurialSourceCodeManagementSettingsAppl methodsFor:'change & update'!
@@ -1259,9 +1302,9 @@
!MercurialSourceCodeManagementSettingsAppl class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/MercurialSourceCodeManagementSettingsAppl.st,v 1.13 2012-03-02 16:11:01 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/MercurialSourceCodeManagementSettingsAppl.st,v 1.14 2012-03-03 10:31:58 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/MercurialSourceCodeManagementSettingsAppl.st,v 1.13 2012-03-02 16:11:01 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/MercurialSourceCodeManagementSettingsAppl.st,v 1.14 2012-03-03 10:31:58 cg Exp $'
! !