hg/stx-libtool2: comparison Tools__ProjectBuilderAssistantApplication.st

equal deleted inserted replaced

-:f2e117783c83
+:48cb061347ef
 AssistantApplication subclass:#ProjectBuilderAssistantApplication
 	instanceVariableNames:'packageToBuildHolder projectType projectTypeHolder
 		selectedProjectIndexHolder selectedProjectDefinition
 		listOfMatchingProjects selectedProjectsComment
 		hasProjectSelectedHolder newProjectsName hideSTXProjects
+		hideOtherApplicationClasses hideOtherStartupClasses
 		startMakeButtonEnabled stopMakeButtonVisible makeOutputHolder
 		newApplicationsName listOfApplicationsInProject
 		selectedApplicationIndexHolder selectedApplication
 		hasApplicationSelectedHolder listOfStartupClassesInProject
 		selectedStartupClassIndexHolder selectedStartupClass
 window:
 (WindowSpec
 label: 'Application Selection'
 name: 'Application Selection'
 min: (Point 0 0)
-bounds: (Rectangle 0 0 521 408)
+bounds: (Rectangle 0 0 519 406)
 )
 component:
 (SpecCollection
 collection: (
 (FramedBoxSpec
 component:
 (SpecCollection
 collection: (
 (VariableHorizontalPanelSpec
 name: 'VariableHorizontalPanel2'
-layout: (LayoutFrame 0 0 4 0 0 1 0 1)
+layout: (LayoutFrame 0 0 4 0 0 1 -26 1)
 component:
 (SpecCollection
 collection: (
 (SequenceViewSpec
 name: 'List2'
 model: selectedApplicationIndexHolder
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
 useIndex: true
 sequenceList: listOfApplicationsInProject
+ignoreReselect: false
 )
 (TextEditorSpec
 name: 'TextEditor2'
 model: selectedApplicationsComment
 hasHorizontalScrollBar: true
 )
 )
 )
 handles: (Any 0.34560327198364 1.0)
+)
+(CheckBoxSpec
+label: 'Hide other Application Classes'
+name: 'CheckBox1'
+layout: (LayoutFrame -1 0 -18 1 0 1 4 1)
+model: hideOtherApplicationClasses
+translateLabel: true
 )
 )
 )
 )
 component:
 (SpecCollection
 collection: (
 (VariableHorizontalPanelSpec
 name: 'VariableHorizontalPanel2'
-layout: (LayoutFrame 0 0 4 0 0 1 0 1)
+layout: (LayoutFrame 0 0 4 0 0 1 -26 1)
 component:
 (SpecCollection
 collection: (
 (SequenceViewSpec
 name: 'List2'
 )
 )
 handles: (Any 0.34560327198364 1.0)
 )
+(CheckBoxSpec
+label: 'Hide other Startup Classes'
+name: 'CheckBox1'
+layout: (LayoutFrame -1 0 -20 1 0 1 2 1)
+model: hideOtherStartupClasses
+translateLabel: true
+)
 )
 )
 )
 (HorizontalPanelViewSpec
 projectBuilder buildWithColorizedOutputTo:makeOutputWindow.
 ].
 !
 selectedApplicationChanged
-self selectedApplicationIndexHolder value isNil ifTrue:[
+|idx|
+((idx := self selectedApplicationIndexHolder value) isNil
+or:[idx == 0]) ifTrue:[
 selectedApplication := nil.
 ] ifFalse:[
-selectedApplication := self listOfApplicationsInProject value at:(self selectedApplicationIndexHolder value).
+selectedApplication := self listOfApplicationsInProject value at:idx.
 ].
 self hasApplicationSelectedHolder value:(selectedApplication notNil).
 "/    selectedApplication notNil ifTrue:[
 "/        "/ generate startupClass code
 hasStartupClassSelectedHolder isNil ifTrue:[
 hasStartupClassSelectedHolder := nil asValue.
 ].
 ^ hasStartupClassSelectedHolder.
+!
+hideOtherApplicationClasses
+<resource: #uiAspect>
+hideOtherApplicationClasses isNil ifTrue:[
+hideOtherApplicationClasses := true asValue.
+hideOtherApplicationClasses onChangeSend:#updateListOfApplicationsInProject to:self.
+].
+^ hideOtherApplicationClasses.
+!
+hideOtherStartupClasses
+<resource: #uiAspect>
+hideOtherStartupClasses isNil ifTrue:[
+hideOtherStartupClasses := true asValue.
+hideOtherStartupClasses onChangeSend:#updateListOfStartupClassesInProject to:self.
+].
+^ hideOtherStartupClasses.
 !
 hideSTXProjects
 <resource: #uiAspect>
 canEnterDeploy
 ^ self hasProjectBuilder
 !
 canEnterStartupClassSelection
-^ self hasProjectSelected and:[ self hasApplicationSelected ]
+^ self hasProjectSelected "and:[ self hasApplicationSelected ]"
 ! !
 !ProjectBuilderAssistantApplication methodsFor:'specs'!
 assistantSpec
 isEnabledQuerySelector: #projectTypeIsNotLibrary
 canEnterQuerySelector: #canEnterApplicationSelection
 enterCallbackSelector: updateListOfApplicationsInProject
 infoText: 'Choose an existing application or create a new one.
 These are subclasses of <I>ApplicationModel</I> and define
-the GUI and control flow inside the application.'
+the GUI and control flow inside the application.
+Can also be left blank if the startup class does it all (stx build).'
 )
 (AssistantPageSpec
 pageTitle: 'Startup Class Selection'
 windowSpecSelector: page4_startupClassSelectionSpec
 ].
 self selectedProjectsComment value:comment.
 !
 updateListOfApplicationsInProject
-|oldList applicationClasses package startUpClassName startUpClass
+|oldList applicationClasses package appClass appClassIndex|
-appClass appClassIndex|
 appClassIndex := nil.
 selectedProjectDefinition isNil ifTrue:[
 applicationClasses := #()
 ] ifFalse:[
 package := selectedProjectDefinition package.
 applicationClasses := Smalltalk allClasses
 select:[:cls |
-(cls package = package
+((cls isSubclassOf:ApplicationModel)
-and:[ cls isSubclassOf:ApplicationModel ])
+and:[ self hideOtherApplicationClasses value not
+or:[ cls package = package ]])
 ].
 applicationClasses := applicationClasses asOrderedCollection.
 applicationClasses sort:[:a :b | a name < b name].
 "/        startUpClassName := [ selectedProjectDefinition startupClassName ] ifError:[ nil ].
 ] ifFalse:[
 package := selectedProjectDefinition package.
 startupClasses := Smalltalk allClasses
 select:[:cls |
-(cls package = package
+((cls includesBehavior:StandaloneStartup)
-and:[ cls isSubclassOf:StandaloneStartup ])
+and:[ self hideOtherStartupClasses value not
+or:[ cls package = package ]])
 ].
 startupClasses := startupClasses asOrderedCollection.
 startupClasses sort:[:a :b | a name < b name].
 startUpClassName := [ selectedProjectDefinition startupClassName ] ifError:[ nil ].

changeset 2671	48cb061347ef
parent 2670	f2e117783c83
child 2674	3f61bdc7e0dc