hg/stx-libtool2: comparison ShowMeHowItWorks.st

equal deleted inserted replaced

-:eafc4c1bb53e
+:bbb4c1dbce25
 Object subclass:#ShowMeHowItWorks
 	instanceVariableNames:'application opStream streamStack lastComponentName lastComponent
 		lastResult voice translate language verifying
 		closeApplicationWhenFinished defaultComponentWaitTime ui
-		theShowFile'
+		theShowFile defaultElementTimeout'
 	classVariableNames:'IntroShownCount DebugMode StartLabel'
 	poolDictionaries:''
 	category:'Interface-Help'
 !
 (waitFor: '<component>' timeout:seconds)
 wait for a component to appear
 open            'nameOfAppModelClass'
 open an application (class)
+raise           'application'
+raise           'masterApplication'
 intro
 component naming:
 '<component>' can be:
 name of a component, as defined in the UI-spec's nameKey,
 |diagramEditor pinPO|
 (diagramEditor := lastComponent) isScrollWrapper ifTrue:[
 diagramEditor := lastComponent scrolledView
 ].
-pinPO := diagramEditor
+pinPO := self pinPOForPin:pinName ofStep:stepName.
-detectPOForWhich:[:po |
-po isPin
-and:[ po name = pinName
-and:[ po owningStepPO name = stepName ]]
-].
 diagramEditor selection:{ pinPO }.
 diagramEditor doubleClickOn:pinPO.
 self fastMoveTo:(lastComponentName,'/','EditField').
 self click.
 self type:freezeString.
 !
 selectPin:pinName ofStep:stepName
 <action>
-|diagramEditor pinPo|
+|diagramEditor pinPO|
 (diagramEditor := lastComponent) isScrollWrapper ifTrue:[
 diagramEditor := lastComponent scrolledView
 ].
-pinPo := diagramEditor
+pinPO := self pinPOForPin:pinName ofStep:stepName.
-detectPOForWhich:[:po |
+self movePointerToComponent:diagramEditor offset:pinPO frame center.
-po isPin
+diagramEditor selection:{ pinPO }.
-and:[ po name = pinName
-and:[ po owningStepPO name = stepName ]]
-].
-self movePointerToComponent:diagramEditor offset:pinPo frame center.
-diagramEditor selection:{ pinPo }.
 !
 show:message
 "showing (and speak) some message."
 self show:(self randomThankYou).
 "Created: / 23-07-2019 / 10:50:43 / Claus Gittinger"
 !
+timeout:seconds
+<action>
+defaultElementTimeout := seconds.
+"Created: / 23-07-2019 / 10:27:02 / Claus Gittinger"
+!
 wait:seconds
 <action>
 verifying ifTrue:[^ self].
 DebugMode == true ifTrue:[^ self].
 !
 waitFor:componentName timeout:seconds
 <action>
-|endTime|
+|endTime component|
 verifying ifTrue:[^ self].
+lastComponentName := componentName.
 endTime := Timestamp now + seconds.
 [
-(self findComponent:componentName inAllApplications:true ifMultiple:nil) notNil ifTrue:[
+(component := self findComponent:componentName inAllApplications:true ifMultiple:nil) notNil ifTrue:[
+lastComponent := component.
 ^ self
 ].
-Delay waitForSeconds:0.05.
+Delay waitForSeconds:0.1.
 Timestamp now > endTime ifTrue:[
 self error:('component %1 not present after %2' bindWith:componentName with:seconds)
 ]
 ] loop
 ! !
 !ShowMeHowItWorks methodsFor:'commands - checking'!
 isEmpty:componentName
+"true if the addressed textview/field is empty.
+Leaves component in lastComponent"
 <action>
 |component|
 component := self componentNamed:componentName.
 component isScrollWrapper ifTrue:[ component := component scrolledView ].
 component isTextView ifTrue:[
 ^ component contents isEmptyOrNil
-] ifFalse:[
+].
-self halt.
+self error:'isEmpty: unhandled (non-text) component type: ',component displayString.
-].
-self error:'isEmpty: unhandled component type: ',component displayString.
 "Created: / 19-07-2019 / 15:33:47 / Claus Gittinger"
 !
 unless:query do:actions
 ! !
 !ShowMeHowItWorks methodsFor:'commands - mouse & keyboard'!
 clear
-"clear entry fields"
+"clear entry fields of last component"
 <action>
 verifying ifTrue:[^ self].
 lastComponent contents:nil
 !
 click
-"press-release"
+"press-release in last component"
 <action>
 ^ self click:1 inComponent:lastComponent
 "Created: / 19-07-2019 / 16:11:03 / Claus Gittinger"
 !
 click:buttonNr
-"press-release"
+"press-release in last component"
 <action>
 self assert:(buttonNr isInteger).
 ^ self click:buttonNr inComponent:lastComponent
 "Created: / 19-07-2019 / 13:21:20 / Claus Gittinger"
 "Modified: / 19-07-2019 / 16:10:19 / Claus Gittinger"
 !
 clickIn:componentName
-"press-release"
+"press-release.
+Leaves component in lastComponent"
 <action>
 ^ self click:1 inComponent:(self componentNamed:componentName)
 newPos := currentPos + (dX @ dY).
 self fastMovePointerToScreenPosition:newPos
 !
 fastMoveTo:componentName
-"move the mouse to componentName without circling"
+"move the mouse to componentName without circling.
+Leaves component in lastComponent"
 <action>
 |component|
 "Modified: / 20-07-2019 / 08:14:16 / Claus Gittinger"
 "Modified (comment): / 23-07-2019 / 09:33:31 / Claus Gittinger"
 !
 key:aKeySymbol
-"press/release a key"
+"press/release a key in last component"
 <action>
 |t|
 "Created: / 19-07-2019 / 15:50:40 / Claus Gittinger"
 !
 moveTo:componentName
 "move the mouse to componentName,
-then circle around it a few times"
+then circle around it a few times.
+Leaves component in lastComponent"
 <action>
 |component|
 !
 press:buttonNr
 <action>
-"press at the current position"
+"press at the current position in last component"
 self assert:(buttonNr isInteger).
 ^ self press:buttonNr inComponent:lastComponent.
 "/    "press at the current position"
 !
 release:buttonNr
 <action>
-"release at the current position"
+"release at the current position in last component"
 <action>
 self assert:(buttonNr isInteger).
 ^ self press:buttonNr inComponent:lastComponent.
 "retrieve a component by name or report an error if not found.
 Can return either a view or a menu item"
 |component|
+verifying ifFalse:[
+self waitFor:componentName timeout:(defaultElementTimeout ? 1).
+^ lastComponent.
+].
 lastComponentName := componentName.
 component := self findComponent:componentName.
 component isNil ifTrue:[
 self error:'no component found for: ',componentName mayProceed:verifying.
 ] ifFalse:[
 idxString := idxString withoutQuotes.
 idxString includesMatchCharacters ifTrue:[
 item :=
 anApplicationOrViewOrMenuItem itemForWhich:[:item |
-(item nameKey matches: idxString)
+(idxString match:(item nameKey ? '') )
-or:[ (item textLabel matches: idxString)
+or:[ (idxString match:(item textLabel ? ''))
-or:[ (item value isSymbol and:[item value matches: idxString])]]
+or:[ (item value isSymbol and:[idxString match:(item value)])]]
 ]
 ] ifFalse:[
 item :=
 anApplicationOrViewOrMenuItem itemForWhich:[:item |
 item nameKey = idxString
 or:[ item textLabel = idxString
 ] on:MessageNotUnderstood do:[:ex | ].
 ]
 ].
 foundIt ifFalse:[
 each isMenu ifTrue:[
+|comp|
 (item := each detectItemForNameKey:componentNameSymbol) notNil ifTrue:[
-foundByName add:item. foundIt := true
+comp := ItemInView new view:each item:item boundsInView:(item layout).
+foundByName add:comp. foundIt := true
 ].
 foundIt ifFalse:[
 (item := each detectItemForKey:componentNameSymbol) notNil ifTrue:[
-foundByName add:item. foundIt := true
+comp := ItemInView new view:each item:item boundsInView:(item layout).
+foundByName add:comp. foundIt := true
 ].
 foundIt ifFalse:[
 (item := each detectItemForLabel:componentNameSymbol) notNil ifTrue:[
-foundByLabel add:item. foundIt := true
+comp := ItemInView new view:each item:item boundsInView:(item layout).
+foundByLabel add:comp. foundIt := true
 ].
 ].
 ].
 ].
 ].
 |visibleItems|
 (itemsFound conform:[:each | each askFor:#isMenuItem]) ifTrue:[
 (itemsFound collect:[:item | item itemValue]) asSet size == 1 ifTrue:[
 "/ choose one which is visible, if possible
-visibleItems := itemsFound select:[:item | item menuPanel shown].
+visibleItems := itemsFound select:[:item | item view shown].
 visibleItems notEmpty ifTrue:[
 ^ visibleItems first
 ].
 ^ itemsFound first.
 ].
 "
 "Created: / 19-07-2019 / 12:02:30 / Claus Gittinger"
 "Modified: / 19-07-2019 / 16:44:30 / Claus Gittinger"
 "Modified (comment): / 23-07-2019 / 09:32:44 / Claus Gittinger"
+!
+pinPOForPin:pinName ofStep:stepName
+|diagramEditor pinPO|
+(diagramEditor := lastComponent) isScrollWrapper ifTrue:[
+diagramEditor := lastComponent scrolledView
+].
+pinPO := diagramEditor
+detectPOForWhich:[:po |
+po isPin
+and:[ po name = pinName
+and:[ po owningStepPO name = stepName ]]
+].
+^ pinPO
 !
 screenBoundsOfComponent:aWidgetOrMenuItemOrTab
 |itemLayout|
 |bounds position|
 bounds := self screenBoundsOfComponent:aWidgetOrMenuItemOrTab.
 bounds isNil ifTrue:[
-self error:'no bounds found for: ',aWidgetOrMenuItemOrTab printString.
+self error:('no bounds found for: %1 (%2)' bindWith:lastComponentName with:aWidgetOrMenuItemOrTab printString).
 ].
 position := bounds center rounded.
 self movePointerToScreenPosition:position speed:pixelsPerSecond.
 "Created: / 20-07-2019 / 08:12:49 / Claus Gittinger"
 item
 ^ item
 !
+itemValue
+^ item itemValue
+!
 layout
 ^ item layout
 !
 view

changeset 3799	bbb4c1dbce25
parent 3798	eafc4c1bb53e
child 3800	fb1763b613bf