AssistantApplication.st
changeset 4142 0d4544915494
parent 4135 5c35f5450b9f
child 4190 ec0144dbf85c
--- a/AssistantApplication.st	Thu Aug 23 00:18:27 2012 +0200
+++ b/AssistantApplication.st	Thu Sep 06 20:52:23 2012 +0200
@@ -5,7 +5,8 @@
 		backButtonVisible forwardButtonVisible finishButtonVisible
 		finishButtonEnabled currentPageInfoHTMLHolder
 		currentPageIndexHolder backButtonLabelHolder
-		nextButtonLabelHolder pageLabelsInList pageInfoHolder infoHolder'
+		nextButtonLabelHolder pageLabelsInList pageInfoHolder infoHolder
+		cancelButtonVisible'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Views-DialogBoxes'
@@ -151,7 +152,7 @@
              (SpecCollection
                 collection: (
                  (VariableHorizontalPanelSpec
-                    name: 'VariableHorizontalPanel1'
+                    name: 'MainHorizontalPanel'
                     layout: (LayoutFrame 0 0 0 0 0 1 -40 1)
                     component: 
                    (SpecCollection
@@ -224,6 +225,7 @@
                              (ActionButtonSpec
                                 label: 'Cancel'
                                 name: 'Button8'
+                                visibilityChannel: cancelButtonVisible
                                 translateLabel: true
                                 resizeForLabel: true
                                 model: doCancel
@@ -494,6 +496,17 @@
     ^ backButtonVisible.
 !
 
+cancelButtonVisible
+    <resource: #uiAspect>
+
+    cancelButtonVisible isNil ifTrue:[
+        cancelButtonVisible := true asValue.
+    ].
+    ^ cancelButtonVisible.
+
+    "Created: / 06-09-2012 / 16:41:11 / cg"
+!
+
 currentPageIndexHolder
     <resource: #uiAspect>
 
@@ -664,6 +677,11 @@
                        ) max.
 
     self window extent:(maxCanvasExtent + (200 @ 40)).
+    self builder window isModal ifFalse:[
+        self cancelButtonVisible value:false
+    ].
+
+    "Modified: / 06-09-2012 / 16:42:42 / cg"
 ! !
 
 !AssistantApplication methodsFor:'look'!
@@ -822,9 +840,9 @@
 !AssistantApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/AssistantApplication.st,v 1.23 2012-07-20 18:02:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/AssistantApplication.st,v 1.24 2012-09-06 18:52:23 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/AssistantApplication.st,v 1.23 2012-07-20 18:02:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/AssistantApplication.st,v 1.24 2012-09-06 18:52:23 cg Exp $'
 ! !