--- a/GitSourceCodeManagementSettingsAppl.st Sat Mar 03 10:26:58 2012 +0100
+++ b/GitSourceCodeManagementSettingsAppl.st Sat Mar 03 11:28:57 2012 +0100
@@ -12,13 +12,13 @@
"{ Package: 'stx:libtool' }"
AbstractSourceCodeManagementSettingsAppl subclass:#GitSourceCodeManagementSettingsAppl
- instanceVariableNames:'repositoryHolder manager repository repositoryPrototypeList
- addPerModuleRepository removePerModuleRepository
- perModuleRepository defaultRepositoryHolder
- selectedPerModuleRepository repositoriesPerModule
- perModuleRepositoryModule gitBinDirectoryHolder
- gitExecutableHolder gitCommandTimeoutHolder pushURL
- pushURLPrototypeList selectedPushURL listOfPushURLs'
+ instanceVariableNames:'repositoryHolder workDirectoryHolder manager repository
+ repositoryPrototypeList addPerModuleRepository
+ removePerModuleRepository perModuleRepository
+ defaultRepositoryHolder selectedPerModuleRepository
+ repositoriesPerModule perModuleRepositoryModule
+ gitBinDirectoryHolder gitExecutableHolder gitCommandTimeoutHolder
+ pushURL pushURLPrototypeList selectedPushURL listOfPushURLs'
classVariableNames:'RecentlyUsedRepositoryURLS'
poolDictionaries:''
category:'System-SourceCodeManagement'
@@ -96,12 +96,6 @@
#cvsCommandTimeout
'The command timeout.\For slow connections (ssl-tunnel), it may make sense to increase this value.'
-#cvsLogin
-'Perform a "cvs login" operation for the default CVSROOT'
-
-#cvsRootDefault
-'The default CVSROOT.\This will be used for all modules which are not listed below.'
-
#cvsRootPerModule
'Specifies per-module CVSROOTs.\This allows for individual projects to be stored in different cvs repositories.'
@@ -156,9 +150,6 @@
#gitRootPerModuleRoot
'The git repository for which this specific module is defined'
-#loginPerModuleRoot
-'Execute a "cvs login" operation for this CVSROOT'
-
#moveManagerDown
'Move the selected entry down in the list.\(The first matching definition is used to determine which repository type is used.)'
@@ -188,7 +179,7 @@
)
- "Modified: / 02-03-2012 / 16:52:43 / cg"
+ "Modified: / 03-03-2012 / 10:36:12 / cg"
! !
!GitSourceCodeManagementSettingsAppl class methodsFor:'image specs'!
@@ -278,7 +269,7 @@
label: 'Git Settings'
name: 'Git Settings'
min: (Point 10 10)
- bounds: (Rectangle 0 0 811 693)
+ bounds: (Rectangle 0 0 811 719)
)
component:
(SpecCollection
@@ -316,7 +307,7 @@
translateLabel: true
)
(ViewSpec
- name: 'Box1'
+ name: 'CommandBox'
layout: (LayoutFrame 0 0 35 0 0 1 60 0)
component:
(SpecCollection
@@ -344,7 +335,7 @@
)
)
(ViewSpec
- name: 'Box12'
+ name: 'TimeoutBox'
layout: (LayoutFrame 0 0 61 0 0 1 86 0)
component:
(SpecCollection
@@ -373,8 +364,37 @@
)
)
(ViewSpec
- name: 'Box7'
- layout: (LayoutFrame 0 0.0 92 0 0 1 117 0)
+ name: 'WorkingDirBox'
+ layout: (LayoutFrame 0 0 87 0 0 1 112 0)
+ component:
+ (SpecCollection
+ collection: (
+ (LabelSpec
+ label: 'Working Directory:'
+ name: 'Label9'
+ layout: (LayoutFrame 0 0.0 0 0 60 0.25 22 0)
+ activeHelpKey: workDirectory
+ level: 0
+ translateLabel: true
+ adjust: right
+ )
+ (InputFieldSpec
+ name: 'EntryField2'
+ layout: (LayoutFrame 64 0.25 0 0 0 1 22 0)
+ activeHelpKey: workDirectory
+ tabable: true
+ model: workDirectoryHolder
+ type: string
+ acceptChannel: acceptChannel
+ acceptOnPointerLeave: true
+ )
+ )
+
+ )
+ )
+ (ViewSpec
+ name: 'DefaultRepositoryBox7'
+ layout: (LayoutFrame 0 0.0 118 0 0 1 143 0)
component:
(SpecCollection
collection: (
@@ -409,7 +429,7 @@
(ActionButtonSpec
label: 'Init'
name: 'Button2'
- layout: (LayoutFrame -201 1 122 0 -101 1 144 0)
+ layout: (LayoutFrame -201 1 148 0 -101 1 170 0)
activeHelpKey: gitInit
translateLabel: true
tabable: true
@@ -419,7 +439,7 @@
(ActionButtonSpec
label: 'Check Access'
name: 'Button1'
- layout: (LayoutFrame -100 1 122 0 0 1 144 0)
+ layout: (LayoutFrame -100 1 148 0 0 1 170 0)
activeHelpKey: gitCheckAccess
translateLabel: true
tabable: true
@@ -429,14 +449,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 184 0 60 0.25 206 0)
activeHelpKey: gitRootPerModule
translateLabel: true
adjust: right
)
(SequenceViewSpec
name: 'List1'
- layout: (LayoutFrame 64 0.25 150 0 0 1 269 0)
+ layout: (LayoutFrame 64 0.25 184 0 0 1 303 0)
activeHelpKey: gitRootPerModule
tabable: true
model: selectedPerModuleRepository
@@ -449,14 +469,14 @@
(LabelSpec
label: 'Module:'
name: 'moduleLabel'
- layout: (LayoutFrame 0 0.0 279 0 60 0.25 296 0)
+ layout: (LayoutFrame 0 0.0 313 0 60 0.25 330 0)
activeHelpKey: gitRootPerModuleModule
translateLabel: true
adjust: right
)
(InputFieldSpec
name: 'perModuleRepositoryModuleEntryField'
- layout: (LayoutFrame 64 0.25 275 0 0 1 297 0)
+ layout: (LayoutFrame 64 0.25 309 0 0 1 331 0)
activeHelpKey: gitRootPerModuleModule
tabable: true
model: perModuleRepositoryModule
@@ -466,14 +486,14 @@
(LabelSpec
label: 'Git Repository:'
name: 'gitRepository'
- layout: (LayoutFrame 0 0.0 304 0 60 0.25 321 0)
+ layout: (LayoutFrame 0 0.0 338 0 60 0.25 355 0)
activeHelpKey: gitRootPerModuleRoot
translateLabel: true
adjust: right
)
(ComboBoxSpec
name: 'perModuleRepositoryComboBox'
- layout: (LayoutFrame 64 0.25 300 0 0 1.0 322 0)
+ layout: (LayoutFrame 64 0.25 334 0 0 1.0 356 0)
activeHelpKey: gitRootPerModuleRoot
tabable: true
model: perModuleRepository
@@ -487,8 +507,8 @@
comboList: gitRepositoryPrototypeList
)
(HorizontalPanelViewSpec
- name: 'HorizontalPanel2'
- layout: (LayoutFrame 64 0.25 327 0 -1 1 352 0)
+ name: 'PerModuleButtonHorizontalPanel'
+ layout: (LayoutFrame 64 0.25 361 0 -1 1 386 0)
horizontalLayout: right
verticalLayout: center
horizontalSpace: 3
@@ -550,7 +570,7 @@
)
)
- extent: (Point 811 389)
+ extent: (Point 811 418)
)
(FramedBoxSpec
label: 'Push URLs'
@@ -651,7 +671,7 @@
)
)
- extent: (Point 811 187)
+ extent: (Point 811 181)
)
(FramedBoxSpec
label: 'Source Cache'
@@ -732,8 +752,6 @@
)
)
-
- "Modified: / 02-03-2012 / 16:53:53 / cg"
! !
!GitSourceCodeManagementSettingsAppl class methodsFor:'queries'!
@@ -768,6 +786,7 @@
repository := GitSourceCodeManager repositoryName.
self repositoryHolder value:(repository ? '') asValue.
+ self workDirectoryHolder value:GitSourceCodeManager workDirectory.
infoPerModule := GitSourceCodeManager repositoryInfoPerModule.
infoPerModule keysAndValuesDo:[:module :info |
@@ -786,7 +805,7 @@
].
"/ self selectedPerModuleRootChanged.
- "Modified: / 02-03-2012 / 15:23:00 / cg"
+ "Modified: / 03-03-2012 / 11:08:11 / cg"
!
basicSaveSettings
@@ -821,6 +840,7 @@
].
].
GitSourceCodeManager repositoryInfoPerModule:infoPerModule.
+ GitSourceCodeManager workDirectory:self workDirectoryHolder value.
self basicSaveGitSettings.
@@ -830,7 +850,7 @@
self acceptChannel value.
- "Modified: / 02-03-2012 / 15:19:14 / cg"
+ "Modified: / 03-03-2012 / 11:25:12 / cg"
!
removePerModuleRoot
@@ -1050,6 +1070,16 @@
^ selectedPushURL.
"Created: / 02-03-2012 / 16:20:21 / cg"
+!
+
+workDirectoryHolder
+ workDirectoryHolder isNil ifTrue:[
+ workDirectoryHolder := ValueHolder new.
+ workDirectoryHolder addDependent:self.
+ ].
+ ^ workDirectoryHolder.
+
+ "Created: / 03-03-2012 / 10:34:19 / cg"
! !
!GitSourceCodeManagementSettingsAppl methodsFor:'change & update'!
@@ -1240,9 +1270,9 @@
!GitSourceCodeManagementSettingsAppl class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/GitSourceCodeManagementSettingsAppl.st,v 1.3 2012-03-02 16:10:48 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/GitSourceCodeManagementSettingsAppl.st,v 1.4 2012-03-03 10:28:57 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/GitSourceCodeManagementSettingsAppl.st,v 1.3 2012-03-02 16:10:48 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/GitSourceCodeManagementSettingsAppl.st,v 1.4 2012-03-03 10:28:57 cg Exp $'
! !