Merge branch 'smoothie_tbp' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into smoothie_tbp
This commit is contained in:
commit
fb9ded93c0
8 changed files with 80 additions and 68 deletions
|
|
@ -104,6 +104,8 @@
|
||||||
RefreshAll
|
RefreshAll
|
||||||
</EventLanguageOnChange>
|
</EventLanguageOnChange>
|
||||||
|
|
||||||
|
;include="ROOT/taobin_project/inc/video.inc"
|
||||||
|
|
||||||
|
|
||||||
; back
|
; back
|
||||||
<Button>
|
<Button>
|
||||||
|
|
|
||||||
|
|
@ -86,6 +86,7 @@
|
||||||
RefreshAll
|
RefreshAll
|
||||||
</EventLanguageOnChange>
|
</EventLanguageOnChange>
|
||||||
|
|
||||||
|
;include="ROOT/taobin_project/inc/video.inc"
|
||||||
|
|
||||||
; back
|
; back
|
||||||
<Button>
|
<Button>
|
||||||
|
|
|
||||||
|
|
@ -308,6 +308,8 @@
|
||||||
RefreshAll
|
RefreshAll
|
||||||
</EventLanguageOnChange>
|
</EventLanguageOnChange>
|
||||||
|
|
||||||
|
;include="ROOT/taobin_project/inc/video.inc"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;
|
;
|
||||||
|
|
|
||||||
|
|
@ -220,6 +220,8 @@
|
||||||
RefreshAll
|
RefreshAll
|
||||||
</EventLanguageOnChange>
|
</EventLanguageOnChange>
|
||||||
|
|
||||||
|
;include="ROOT/taobin_project/inc/video.inc"
|
||||||
|
|
||||||
<Image>
|
<Image>
|
||||||
<X> 0 </X>
|
<X> 0 </X>
|
||||||
<Y> 380 </Y>
|
<Y> 380 </Y>
|
||||||
|
|
@ -300,7 +302,7 @@
|
||||||
Var TimeOutSmoothiesProcess = 120
|
Var TimeOutSmoothiesProcess = 120
|
||||||
|
|
||||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
;include="ROOT/taobin_project/inc/return_condition.ev"
|
||||||
|
|
||||||
</EventClick>
|
</EventClick>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
|
||||||
|
|
@ -190,6 +190,8 @@
|
||||||
RefreshAll
|
RefreshAll
|
||||||
</EventLanguageOnChange>
|
</EventLanguageOnChange>
|
||||||
|
|
||||||
|
;include="ROOT/taobin_project/inc/video.inc"
|
||||||
|
|
||||||
<Image>
|
<Image>
|
||||||
<X> 0 </X>
|
<X> 0 </X>
|
||||||
<Y> 380 </Y>
|
<Y> 380 </Y>
|
||||||
|
|
@ -269,7 +271,7 @@
|
||||||
Var TimeOutSmoothiesProcess = 120
|
Var TimeOutSmoothiesProcess = 120
|
||||||
|
|
||||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
;include="ROOT/taobin_project/inc/return_condition.ev"
|
||||||
|
|
||||||
</EventClick>
|
</EventClick>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
|
||||||
|
|
@ -262,6 +262,7 @@
|
||||||
RefreshAll
|
RefreshAll
|
||||||
</EventLanguageOnChange>
|
</EventLanguageOnChange>
|
||||||
|
|
||||||
|
;include="ROOT/taobin_project/inc/video.inc"
|
||||||
|
|
||||||
<Image>
|
<Image>
|
||||||
<X> 0 </X>
|
<X> 0 </X>
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,8 @@
|
||||||
<EventActionOk>
|
<EventActionOk>
|
||||||
</EventActionOk>
|
</EventActionOk>
|
||||||
|
|
||||||
|
;include="ROOT/taobin_project/inc/video.inc"
|
||||||
|
|
||||||
<Video>
|
<Video>
|
||||||
<X> 0 </X>
|
<X> 0 </X>
|
||||||
<Y> 0 </Y>
|
<Y> 0 </Y>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue