--- a/Tools__ProjectBuilderAssistantApplication.st Tue Oct 20 23:53:26 2009 +0200
+++ b/Tools__ProjectBuilderAssistantApplication.st Wed Oct 21 00:23:16 2009 +0200
@@ -27,8 +27,8 @@
the UIPainter may not be able to read the specification."
"
- UIPainter new openOnClass:ProjectBuilderAssistantApplication andSelector:#page1_projectTypeSelectionSpec
- ProjectBuilderAssistantApplication new openInterface:#page1_projectTypeSelectionSpec
+ UIPainter new openOnClass:Tools::ProjectBuilderAssistantApplication andSelector:#page1_projectTypeSelectionSpec
+ Tools::ProjectBuilderAssistantApplication new openInterface:#page1_projectTypeSelectionSpec
"
<resource: #canvas>
@@ -110,7 +110,7 @@
(FramedBoxSpec
label: 'Existing Projects'
name: 'FramedBox2'
- layout: (LayoutFrame 0 0.0 105 0 4 1.0 397 0)
+ layout: (LayoutFrame 0 0.0 105 0 4 1.0 0 1)
labelPosition: topLeft
translateLabel: true
component:
@@ -168,8 +168,8 @@
the UIPainter may not be able to read the specification."
"
- UIPainter new openOnClass:ProjectBuilderAssistantApplication andSelector:#page2_projectSelectionSpec
- ProjectBuilderAssistantApplication new openInterface:#page2_projectSelectionSpec
+ UIPainter new openOnClass:Tools::ProjectBuilderAssistantApplication andSelector:#page2_projectSelectionSpec
+ Tools::ProjectBuilderAssistantApplication new openInterface:#page2_projectSelectionSpec
"
<resource: #canvas>
@@ -219,7 +219,7 @@
(FramedBoxSpec
label: 'Existing Projects'
name: 'FramedBox4'
- layout: (LayoutFrame 0 0.0 70 0 4 1.0 362 0)
+ layout: (LayoutFrame 0 0.0 70 0 4 1.0 -30 1)
labelPosition: topLeft
translateLabel: true
component:
@@ -264,12 +264,26 @@
)
)
- (ActionButtonSpec
- label: 'Browse Selected Project'
- name: 'Button3'
- layout: (LayoutFrame 9 0 363 0 189 0 385 0)
- translateLabel: true
- model: doBrowseProject
+ (HorizontalPanelViewSpec
+ name: 'HorizontalPanel1'
+ layout: (LayoutFrame 0 0 -30 1 0 1 0 1)
+ horizontalLayout: leftSpace
+ verticalLayout: center
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (ActionButtonSpec
+ label: 'Browse Selected Project'
+ name: 'Button3'
+ translateLabel: true
+ model: doBrowseProject
+ extent: (Point 180 22)
+ )
+ )
+
+ )
)
)
@@ -285,8 +299,8 @@
the UIPainter may not be able to read the specification."
"
- UIPainter new openOnClass:ProjectBuilderAssistantApplication andSelector:#page3_applicationSelectionSpec
- ProjectBuilderAssistantApplication new openInterface:#page3_applicationSelectionSpec
+ UIPainter new openOnClass:Tools::ProjectBuilderAssistantApplication andSelector:#page3_applicationSelectionSpec
+ Tools::ProjectBuilderAssistantApplication new openInterface:#page3_applicationSelectionSpec
"
<resource: #canvas>
@@ -336,7 +350,7 @@
(FramedBoxSpec
label: 'Existing Applications'
name: 'FramedBox4'
- layout: (LayoutFrame 0 0.0 105 0 4 1.0 362 0)
+ layout: (LayoutFrame 0 0.0 105 0 4 1.0 -30 1)
labelPosition: topLeft
translateLabel: true
component:
@@ -374,12 +388,26 @@
)
)
- (ActionButtonSpec
- label: 'Browse Selected Application'
- name: 'Button3'
- layout: (LayoutFrame 9 0 363 0 189 0 385 0)
- translateLabel: true
- model: doBrowseApplication
+ (HorizontalPanelViewSpec
+ name: 'HorizontalPanel1'
+ layout: (LayoutFrame 0 0 -30 1 0 1 0 1)
+ horizontalLayout: leftSpace
+ verticalLayout: center
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (ActionButtonSpec
+ label: 'Browse Selected Application'
+ name: 'Button3'
+ translateLabel: true
+ model: doBrowseApplication
+ extent: (Point 180 22)
+ )
+ )
+
+ )
)
)
@@ -395,8 +423,8 @@
the UIPainter may not be able to read the specification."
"
- UIPainter new openOnClass:ProjectBuilderAssistantApplication andSelector:#page4_specifyIncludedClasses
- ProjectBuilderAssistantApplication new openInterface:#page4_specifyIncludedClasses
+ UIPainter new openOnClass:Tools::ProjectBuilderAssistantApplication andSelector:#page4_specifyIncludedClasses
+ Tools::ProjectBuilderAssistantApplication new openInterface:#page4_specifyIncludedClasses
"
<resource: #canvas>
@@ -417,7 +445,7 @@
(FramedBoxSpec
label: 'Project Contents'
name: 'FramedBox3'
- layout: (LayoutFrame 0 0.0 5 0 4 1.0 362 0)
+ layout: (LayoutFrame 0 0.0 5 0 4 1.0 -30 1)
labelPosition: topLeft
translateLabel: true
component:
@@ -436,19 +464,33 @@
)
)
- (ActionButtonSpec
- label: 'Browse Project Definition'
- name: 'Button3'
- layout: (LayoutFrame 9 0 363 0 189 0 385 0)
- translateLabel: true
- model: doBrowseProject
- )
- (ActionButtonSpec
- label: 'Update Contents (Scan)'
- name: 'Button4'
- layout: (LayoutFrame 293 0 363 0 473 0 385 0)
- translateLabel: true
- model: doGenerateProjectContentsDefinition
+ (HorizontalPanelViewSpec
+ name: 'HorizontalPanel1'
+ layout: (LayoutFrame 0 0 -30 1 0 1 0 1)
+ horizontalLayout: center
+ verticalLayout: center
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (ActionButtonSpec
+ label: 'Browse Project Definition'
+ name: 'Button3'
+ translateLabel: true
+ model: doBrowseProject
+ extent: (Point 180 22)
+ )
+ (ActionButtonSpec
+ label: 'Update Contents (Scan)'
+ name: 'Button4'
+ translateLabel: true
+ model: doGenerateProjectContentsDefinition
+ extent: (Point 180 22)
+ )
+ )
+
+ )
)
)
@@ -539,7 +581,7 @@
(FramedBoxSpec
label: 'Make Output'
name: 'FramedBox3'
- layout: (LayoutFrame 0 0.0 5 0 4 1.0 -46 1)
+ layout: (LayoutFrame 0 0.0 5 0 4 1.0 -30 1)
labelPosition: topLeft
translateLabel: true
component:
@@ -559,21 +601,35 @@
)
)
- (ActionButtonSpec
- label: 'Start Make'
- name: 'Button3'
- layout: (LayoutFrame 9 0 -42 1 116 0 -20 1)
- translateLabel: true
- model: doStartMake
- enableChannel: startMakeButtonEnabled
- )
- (ActionButtonSpec
- label: 'Stop Make'
- name: 'Button4'
- layout: (LayoutFrame 131 0 -42 1 238 0 -20 1)
- visibilityChannel: stopMakeButtonVisible
- translateLabel: true
- model: doStopMake
+ (HorizontalPanelViewSpec
+ name: 'HorizontalPanel1'
+ layout: (LayoutFrame 0 0 -30 1 0 1 0 1)
+ horizontalLayout: leftSpace
+ verticalLayout: center
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (ActionButtonSpec
+ label: 'Start Make'
+ name: 'Button3'
+ translateLabel: true
+ model: doStartMake
+ enableChannel: startMakeButtonEnabled
+ extent: (Point 107 22)
+ )
+ (ActionButtonSpec
+ label: 'Stop Make'
+ name: 'Button4'
+ visibilityChannel: stopMakeButtonVisible
+ translateLabel: true
+ model: doStopMake
+ extent: (Point 107 22)
+ )
+ )
+
+ )
)
)
@@ -751,6 +807,7 @@
self stopMakeButtonVisible value:false.
self startMakeButtonEnabled value:true.
makeProcess := nil.
+ self updateButtonEnableState.
].
] newProcess.
@@ -880,6 +937,10 @@
^ self buildDirectoryHolder value notEmptyOrNil
!
+hasProjectBuilder
+ ^ projectBuilder notNil
+!
+
hasProjectSelected
^ self selectedProjectIndexHolder value notNil
!
@@ -1142,6 +1203,7 @@
(AssistantPageSpec
pageTitle: 'Deploy'
windowSpecSelector: page7_deploySpec
+ canEnterQuerySelector: #hasProjectBuilder
)
) decodeAsLiteralArray.
! !