hg/stx-libtool: comparison PerforceSourceCodeManagementSettingsAppl.st

equal deleted inserted replaced

-:3d943384d373
+:ba6b2f17e30d
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 other person.  No title to or ownership of the software is
 hereby transferred.
 "
-"{ Package: 'stx:libtool' }"
 AbstractSourceCodeManagementSettingsAppl subclass:#PerforceSourceCodeManagementSettingsAppl
-	instanceVariableNames:'selectedPerModuleRoot perforceExecutableHolder
+instanceVariableNames:'selectedPerModuleRoot perforceExecutableHolder
-		listOfPerforceModules defaultSettingsHolder tableColumns
+listOfPerforceModules defaultSettingsHolder tableColumns
-		defaultSettingsPrototypeList'
+defaultSettingsPrototypeList'
-	classVariableNames:'RecentlyUsedCVSRoots RecentlyUsedStoreHosts
+classVariableNames:'RecentlyUsedCVSRoots RecentlyUsedStoreHosts
-		RecentlyUsedSmallTeamHosts LastStoreHost LastStoreUser
+RecentlyUsedSmallTeamHosts LastStoreHost LastStoreUser
-		LastStorePassword'
+LastStorePassword'
-	poolDictionaries:''
+poolDictionaries:''
-	category:'System-SourceCodeManagement'
+category:'System-SourceCodeManagement'
 !
 ApplicationModel subclass:#ManagerPerModuleApp
-	instanceVariableNames:'moduleHolder acceptChannel settingsHolder
+instanceVariableNames:'moduleHolder acceptChannel settingsHolder
-		sourceCodeManagementSettingsApp acceptEnableChannel canceled
+sourceCodeManagementSettingsApp acceptEnableChannel canceled
-		defaultSettingsPrototypeList'
+defaultSettingsPrototypeList'
-	classVariableNames:''
+classVariableNames:''
-	poolDictionaries:''
+poolDictionaries:''
-	privateIn:PerforceSourceCodeManagementSettingsAppl
+privateIn:PerforceSourceCodeManagementSettingsAppl
 !
 Object subclass:#ModuleManager
-	instanceVariableNames:'manager module settings app'
+instanceVariableNames:'manager module settings app check checkIcon'
-	classVariableNames:''
+classVariableNames:''
-	poolDictionaries:''
+poolDictionaries:''
-	privateIn:PerforceSourceCodeManagementSettingsAppl
+privateIn:PerforceSourceCodeManagementSettingsAppl
 !
 !PerforceSourceCodeManagementSettingsAppl class methodsFor:'documentation'!
 copyright
 window:
 (WindowSpec
 label: 'Source Code Manager Settings'
 name: 'Source Code Manager Settings'
 min: (Point 10 10)
-bounds: (Rectangle 0 0 740 642)
+bounds: (Rectangle 0 0 767 642)
 )
 component:
 (SpecCollection
 collection: (
 (VerticalPanelViewSpec
 (SpecCollection
 collection: (
 (CheckBoxSpec
 label: 'Show in Browser Menus'
 name: 'CheckBox1'
-layout: (LayoutFrame 0 0 5 0 0 1 27 0)
+layout: (LayoutFrame 0 0 5 0 -150 1 27 0)
+activeHelpKey: shownInBrowserMenus
 model: shownInBrowserMenusHolder
-activeHelpKey: shownInBrowserMenus
 translateLabel: true
+)
+(ActionButtonSpec
+label: 'Check'
+name: 'Button6'
+layout: (LayoutFrame -150 1 5 0 -5 1 27 0)
+translateLabel: true
+labelChannel: checkLabel
+model: checkPerforceSettings
 )
 (ViewSpec
 name: 'Box3'
 layout: (LayoutFrame 0 0 36 0 0 1 0 1)
 component:
 )
 )
 )
 )
-extent: (Point 740 138)
+extent: (Point 767 138)
 )
 (ViewSpec
 name: 'ManagerSetupBoxx'
 component:
 (SpecCollection
 label: 'Add/Apply'
 name: 'Button2'
 translateLabel: true
 tabable: true
 model: addPerModuleRoot
-extent: (Point 345 22)
+extent: (Point 361 22)
 )
 (ActionButtonSpec
 label: 'Remove'
 name: 'Button3'
 translateLabel: true
 tabable: true
 model: removePerModuleRoot
 enableChannel: removeEnabled
-extent: (Point 346 22)
+extent: (Point 361 22)
 )
 )
 )
 )
 )
 )
 )
 )
-extent: (Point 740 250)
+extent: (Point 767 250)
 )
 (FramedBoxSpec
 label: 'Source Cache'
 name: 'FramedBox2'
 visibilityChannel: false
 label: 'Flush Cache now'
 name: 'Button4'
 translateLabel: true
 tabable: true
 model: flushSourceCache
-extent: (Point 238 22)
+extent: (Point 250 22)
 )
 (ActionButtonSpec
 label: 'Condense Cache now'
 name: 'Button5'
 translateLabel: true
 tabable: true
 model: condenseSourceCache
-extent: (Point 239 22)
+extent: (Point 250 22)
 )
 )
 )
 )
 )
 )
-extent: (Point 740 95)
+extent: (Point 767 95)
 )
 (ViewSpec
 name: 'VerboseBox'
 component:
 (SpecCollection
 translateLabel: true
 )
 )
 )
-extent: (Point 740 25)
+extent: (Point 767 25)
 )
 )
 )
 )
 )
 )
 )
+! !
-"Modified: / 11-01-2012 / 15:39:42 / cg"
+!PerforceSourceCodeManagementSettingsAppl class methodsFor:'menu specs'!
+menuPerModule
+"This resource specification was automatically generated
+by the MenuEditor of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the MenuEditor may not be able to read the specification."
+"
+MenuEditor new openOnClass:PerforceSourceCodeManagementSettingsAppl andSelector:#menuPerModule
+(Menu new fromLiteralArrayEncoding:(PerforceSourceCodeManagementSettingsAppl menuPerModule)) startUp
+"
+<resource: #menu>
+^
+#(Menu
+(
+(MenuItem
+label: 'Check'
+itemValue: checkPerforceSettings
+translateLabel: true
+)
+)
+nil
+nil
+)
 ! !
 !PerforceSourceCodeManagementSettingsAppl class methodsFor:'queries'!
 managerClass
 "Do not manually edit this!! If it is corrupted,
 the DataSetBuilder may not be able to read the specification."
 "
-DataSetBuilder new openOnClass:P4SourceCodeManagementSettingsAppl andSelector:#tableColumns
+DataSetBuilder new openOnClass:PerforceSourceCodeManagementSettingsAppl andSelector:#tableColumns
 "
 <resource: #tableColumns>
 ^#(
 (DataSetColumnSpec
 label: 'Module'
 labelButtonType: Button
 usePreferredWidth: true
+width: 100
+minWidth: 100
 model: module
+menuFromApplication: false
 )
 (DataSetColumnSpec
 label: 'Settings'
 labelButtonType: Button
 editorType: InputField
 model: settings
+menuFromApplication: false
+isResizeable: false
+)
+(DataSetColumnSpec
+label: 'Check'
+labelButtonType: Button
+model: check
+menuFromApplication: false
+doubleClickedSelector: doubleClick
 isResizeable: false
 )
 )
 ! !
 !PerforceSourceCodeManagementSettingsAppl methodsFor:'actions'!
 addModule:aModuleManager
 app moduleHolder value isEmptyOrNil ifTrue:[
 self information:'Adding without module name not allowed'.
 ^ self.
 ].
 moduleManager module:app moduleHolder value.
-moduleManager settings:app settingsHolder value.
 moduleManager settings:app settingsHolder value.
 self listOfModules add:moduleManager.
 self updateModifiedChannel.
 ].
 "Modified: / 08-11-2006 / 19:27:39 / cg"
 "Modified: / 10-01-2012 / 00:21:00 / cg"
 !
 basicSaveSettings
-|client settings repositoryInfoPerModule|
+|client repositoryInfoPerModule|
 self hasManager ifTrue:[
 | nm fn|
 nm := self sourceCacheDir value.
 ].
 PerforceSourceCodeManager repositoryInfoPerModule:repositoryInfoPerModule.
 PerforceSourceCodeManager perforceExecutable:((self perforceExecutableHolder value ? '') withoutSeparators).
 client := self defaultSettingsHolder value.
-client notNil ifTrue:[
+PerforceSourceCodeManager setDefaultPerforceSettingsFromString:client.
-settings := PerforceSourceCodeManager getPerforceSettingsFromString:client.
-PerforceSourceCodeManager perforceClient:(settings at:#client ifAbsent:nil).
-PerforceSourceCodeManager perforceUser:(settings at:#user ifAbsent:nil).
-PerforceSourceCodeManager perforcePort:(settings at:#port ifAbsent:nil).
-PerforceSourceCodeManager perforcePassword:(settings at:#password ifAbsent:nil).
-].
 PerforceSourceCodeManager verboseSourceCodeAccess:self verboseSourceCodeAccess value.
 PerforceSourceCodeManager shownInBrowserMenus:self shownInBrowserMenusHolder value.
 ].
 self acceptChannel value.
 "Modified: / 10-01-2012 / 00:21:59 / cg"
+!
+checkPerforceSettings
+|result icon|
+PerforceSourceCodeManager perforceError handle:[:ex|
+self warn:ex description.
+^false
+] do:[
+result := PerforceSourceCodeManager checkPerforceSettings:(self defaultSettingsHolder value) forPackage:nil.
+result ifTrue:[
+icon := GenericToolbarIconLibrary ledGreen14x14.
+] ifFalse:[
+icon := GenericToolbarIconLibrary ledRed14x14.
+].
+self checkLabel value:(LabelAndIcon label:'Check' icon:icon).
+].
+^false
+!
+condenseSourceCache
+self withWaitCursorDo:[ AbstractSourceCodeManager condenseSourceCache ].
+Method flushSourceStreamCache.
+"Modified: / 28-11-2006 / 12:21:33 / cg"
+!
+flushSourceCache
+self withWaitCursorDo:[ AbstractSourceCodeManager flushSourceCache ].
+"Modified: / 30-09-2011 / 13:33:51 / cg"
 !
 removePerModuleRoot
 |module|
 self listOfModules remove:module ifAbsent:nil.
 self updateModifiedChannel.
 ! !
 !PerforceSourceCodeManagementSettingsAppl methodsFor:'aspects'!
+checkLabel
+<resource: #uiAspect>
+"automatically generated by UIPainter ..."
+"*** the code below creates a default model when invoked."
+"*** (which may not be the one you wanted)"
+"*** Please change as required and accept it in the browser."
+"*** (and replace this comment by something more useful ;-)"
+checkLabel isNil ifTrue:[
+checkLabel := 'Check' asValue.
+"/ if your app needs to be notified of changes, uncomment one of the lines below:
+"/       checkLabel addDependent:self.
+"/       checkLabel onChangeSend:#checkLabelChanged to:self.
+].
+^ checkLabel.
+!
 defaultSettingsHolder
 defaultSettingsHolder isNil ifTrue:[
 defaultSettingsHolder := ValueHolder new.
 "Do not manually edit this!! If it is corrupted,
 the UIPainter may not be able to read the specification."
 "
-UIPainter new openOnClass:P4SourceCodeManagementSettingsAppl::ManagerPerModuleApp andSelector:#windowSpec
+UIPainter new openOnClass:PerforceSourceCodeManagementSettingsAppl::ManagerPerModuleApp andSelector:#windowSpec
-P4SourceCodeManagementSettingsAppl::ManagerPerModuleApp new openInterface:#windowSpec
+PerforceSourceCodeManagementSettingsAppl::ManagerPerModuleApp new openInterface:#windowSpec
-P4SourceCodeManagementSettingsAppl::ManagerPerModuleApp open
+PerforceSourceCodeManagementSettingsAppl::ManagerPerModuleApp open
 "
 <resource: #canvas>
 ^
 extent: (Point 180 35)
 )
 (ComboBoxSpec
 name: 'ComboBox1'
 model: settingsHolder
+immediateAccept: false
+acceptOnLostFocus: true
 acceptOnPointerLeave: false
 comboList: defaultSettingsPrototypeList
 extent: (Point 465 20)
 )
 )
 app:something
 app := something.
 !
+check
+|icon|
+check isNil ifTrue:[
+^'unchecked'
+].
+check ifTrue:[
+icon := GenericToolbarIconLibrary ledGreen14x14.
+] ifFalse:[
+icon := GenericToolbarIconLibrary ledRed14x14.
+].
+^icon
+!
+check:something
+check := something.
+!
+checkIcon
+^ checkIcon
+!
+checkIcon:something
+checkIcon := something.
+!
 manager
 ^ manager
 !
 manager:something
 app notNil ifTrue:[
 app listOfModules changed.
 ].
 ! !
+!PerforceSourceCodeManagementSettingsAppl::ModuleManager methodsFor:'actions'!
+doubleClick
+PerforceSourceCodeManager perforceError handle:[:ex|
+self warn:ex description.
+check := false.
+] do:[
+check := PerforceSourceCodeManager checkPerforceSettings:settings forPackage:module.
+].
+self changed.
+! !
 !PerforceSourceCodeManagementSettingsAppl::ModuleManager methodsFor:'comparing'!
 < aModuleManager
 ^ self module < aModuleManager module
 ! !
 !PerforceSourceCodeManagementSettingsAppl class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/PerforceSourceCodeManagementSettingsAppl.st,v 1.21 2012-03-02 13:51:07 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/PerforceSourceCodeManagementSettingsAppl.st,v 1.22 2012-06-01 08:33:29 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libtool/PerforceSourceCodeManagementSettingsAppl.st,v 1.21 2012-03-02 13:51:07 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/PerforceSourceCodeManagementSettingsAppl.st,v 1.22 2012-06-01 08:33:29 cg Exp $'
 !
 version_SVN
 ^ '�Id�'
 ! !

changeset 11530	ba6b2f17e30d
parent 11328	9e3994a3c68d
child 11531	f5f8306664d7