THA: Changed Kid menu to Dessert

inter/tha/menu/lang.tsv

@@ -15,7 +15,7 @@
 000008		Protein\nShake	โปรตีนเชค	蛋白奶昔	プロテインシェイク	Protein\nShake	ပရိုတင်း\nShake
 000009		Soda & others	โซดา และ อื่นๆ	汽水	ソーダ、その他	Soda & others	ဆိုဒါနှင့် အခြားအရာများ
 000010		Healthier\nChoice	ทางเลือกสุขภาพ\n[\nคุมจำนวน ไขมัน น้ำตาล โซเดียม\nแคลอรี่ต่ำ###Font=KanitRegular,Size=12,Align=Center]	更健康的选择	-	Healthier\nChoice	ကျန်းမာရေး\nရွေးချယ်မှု
-000011		Kid Menu	เมนูเด็ก	儿童菜单	-	Kid Menu	ကလေးမီနူး
+000011		Dessert	ขนมหวาน	甜品	デザート	Pencuci mulut	အချိုပွဲ
 000012		App Fast	แอพ ฟาสท์	应用快速	-	App Fast	အက်ပ် အမြန်
 000025		Pepsi & 7up	เป๊ปซี่ และ\nเซเว่นอัพ	Pepsi & 7up	-	-	Pepsi & 7up
 000026		Tao Pun	เต่าปั่น	Tao Pun	Tao Pun	Tao Pun	Tao Pun

inter/tha/xml/multi/control_and_lang_swith.ev

@@ -53,11 +53,11 @@ If WheyButtonState = "Enable" Then
     Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
     Var InstanceTabOpenFile5 = InstanceTabOpenFile5 + "/page_catalog_group_whey.lxml"
 Else
-    OpenRedirect "/taobin_project/xml/page_catalog_group_forkid.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
+    OpenRedirect "/taobin_project/xml/page_catalog_group_dessert.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
-    OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_forkid.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
+    OpenRedirect "/taobin_project/inter/tha/xml/page_catalog_group_dessert.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
-    OpenRedirect "/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_forkid.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
+    OpenRedirect "/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_dessert.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/kidandwhey.ev"
     Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVersion
-    Var InstanceTabOpenFile5 = InstanceTabOpenFile5 + "/page_catalog_group_forkid.lxml"
+    Var InstanceTabOpenFile5 = InstanceTabOpenFile5 + "/page_catalog_group_dessert.lxml"
 EndIf
 
 If MenuKidButtonState = "Enable" Then

inter/tha/xml/multi/page_catalog.lxml

@@ -942,11 +942,12 @@
 	<Width> 296 </Width>
 	<Height> 344 </Height>
 	<MarginLeft> 42 </MarginLeft>
+	<MarginBottom> 50 </MarginBottom>
 	<State>MenuKidButtonState</State>
 	<Button>
 	<State>MenuKidButtonState</State>
-	<Filename> Var(DirImage + "/bn_kidmenu.png") </Filename>
+	<Filename> Var(DirImage + "/bn_dessert.png") </Filename>
-	<FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress>
+	<FilenamePress> Var(DirImage + "/bp_dessert.png") </FilenamePress>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventClick>
@@ -965,7 +966,7 @@
 	<Language>
 		<ID> 000011 </ID>
 		<X> 28 </X>
-		<Y> 211 </Y>
+		<Y> 251 </Y>
 		<Width> 241 </Width>
 		<Height> 72 </Height>
 	</Language>

inter/tha/xml/multi/tab_menu.lxml

@@ -201,8 +201,8 @@
         <Layout> "linear" </Layout>
         <State> Menu21Selected </State>
         <Mode> "No" </Mode>
-        <Filename> Var( DirImageAlter + "/bn_forkid2.png") </Filename>
+        <Filename> Var( DirImageAlter + "/bn_dessert.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_forkid2.png") </FilenamePress>
+        <FilenamePress> Var( DirImageAlter + "/bp_dessert.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>

inter/tha/xml/multi/v3/page_catalog_group_dessert.skt

@@ -0,0 +1,91 @@
+<?hurr
+    #include=menu_head.py
+    touch_less_gen = False
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+
+    SetInstanceIgnoreTouch
+
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 5 Then
+		Var SlientRefreshIndex = 6
+	EndIf
+
+</EventOpen>
+
+<EventOnShow>
+
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"
+           ; protein
+    If AppFastEnable = "true" Then
+        Var Menu11Selected = "PressForever"
+        Var Menu7Selected = "Invisible"
+        Var Menu21Selected = "Invisible"
+    Else
+        Var Menu11Selected = "Invisible"
+        Var Menu7Selected = "Invisible"
+        Var Menu21Selected = "PressForever"
+    EndIf
+
+
+    Var Timeout = 0
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
+
+    SetInstanceIgnoreTouch
+
+
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
+
+    Var inst_show_for_kid_counter = 4
+    RefreshAll
+	DEBUGVAR SlientRefreshIndex
+</EventOnShow>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+    ;DEBUGVAR ICE_PROCESS_STATUS
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"
+
+
+
+    GetVisible inst_show_for_kid
+
+
+    If inst_show_for_kid = 1 Then
+        If inst_show_for_kid_counter > 0 Then
+
+            Var inst_show_for_kid_counter = inst_show_for_kid_counter - 1
+
+            If inst_show_for_kid_counter = 0 Then
+                RefreshAll
+                Var inst_show_for_kid_counter = 15
+            EndIf
+        EndIf
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
+    EndIf
+
+
+
+    TimerReset
+</EventTimeout>
+
+
+;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"
+
+
+
+<?hurr
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+</Popup>

ui/lang.tsv

@@ -15,7 +15,7 @@
 000008		Protein\nShake	โปรตีนเชค	蛋白奶昔	プロテインシェイク	Protein\nShake	ပရိုတင်း\nShake
 000009		Soda & others	โซดา และ อื่นๆ	汽水	ソーダ、その他	Soda & others	ဆိုဒါနှင့် အခြားအရာများ
 000010		Healthier\nChoice	ทางเลือกสุขภาพ\n[\nคุมจำนวน ไขมัน น้ำตาล โซเดียม\nแคลอรี่ต่ำ###Font=KanitRegular,Size=12,Align=Center]	更健康的选择	-	Healthier\nChoice	ကျန်းမာရေး\nရွေးချယ်မှု
-000011		Kid Menu	เมนูเด็ก	儿童菜单	-	Kid Menu	ကလေးမီနူး
+000011		Dessert	ขนมหวาน	甜品	デザート	Pencuci mulut	အချိုပွဲ
 000012		App Fast	แอพ ฟาสท์	应用快速	-	App Fast	အက်ပ် အမြန်
 000025		Pepsi & 7up	เป๊ปซี่ และ\nเซเว่นอัพ	Pepsi & 7up	-	-	Pepsi & 7up
 000026		Tao Pun	เต่าปั่น	Tao Pun	Tao Pun	Tao Pun	Tao Pun

xml/menu_catalog.xml

@@ -385,26 +385,26 @@
 <X> 696 </X>
 <Y> 395 </Y>
 <State> Menu21Selected </State>
-<Filename> Var( DirImage + "/bn_forkid.png") </Filename>
+<Filename> Var( DirImage + "/bn_dessert.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_forkid.png") </FilenamePress>
+<FilenamePress> Var( DirImage + "/bp_dessert.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
+    Open "ROOT/taobin_project/xml/page_catalog_group_dessert.xml" 
 </EventClick>
 </Button>
 <Button>
 <X> 611 </X>
 <Y> 395 </Y>
 <State> Menu21Selected2 </State>
-<Filename> Var( DirImage + "/bn_forkid2.png") </Filename>
+<Filename> Var( DirImage + "/bn_dessert.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_forkid2.png") </FilenamePress>
+<FilenamePress> Var( DirImage + "/bp_dessert.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
     Var NextPage = "-"
-    Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
+    Open "ROOT/taobin_project/xml/page_catalog_group_dessert.xml" 
 </EventClick>
 </Button>
 

xml/menu_catalog_new.xml

@@ -281,8 +281,8 @@
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu21Selected </State>
-        <Filename> Var( DirImageAlter + "/bn_forkid2.png") </Filename>
+        <Filename> Var( DirImageAlter + "/bn_dessert.png") </Filename>
-        <FilenamePress> Var( DirImageAlter + "/bp_forkid2.png") </FilenamePress>
+        <FilenamePress> Var( DirImageAlter + "/bp_dessert.png") </FilenamePress>
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick> 
@@ -293,7 +293,7 @@
     
                 OpenInst 2 OpenFileXML
             Else
-                Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" 
+                Open "ROOT/taobin_project/xml/page_catalog_group_dessert.xml" 
             EndIf
         </EventClick>
         </Button>

xml/page_catalog3.xml

@@ -512,15 +512,15 @@
 
 <Button>
 <X> 392 </X>
-<Y> 1532 </Y>
+<Y> 1478 </Y>
 <State>MenuKidButtonState</State>
-<Filename> Var(DirImage + "/bn_kidmenu.png") </Filename>
+<Filename> Var(DirImage + "/bn_dessert.png") </Filename>
-<FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress>
+<FilenamePress> Var(DirImage + "/bp_dessert.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-	Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml"
+	Open "ROOT/taobin_project/xml/page_catalog_group_dessert.xml"
 
 </EventClick>
 </Button>

xml/page_catalog_group_dessert.skt

@@ -0,0 +1,51 @@
+<?hurr 
+    #include=menu_head.py 
+    touch_less_gen = False
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"    
+        ; protein
+    If AppFastEnable = "true" Then
+        Var Menu11Selected = "PressForever" 
+        Var Menu7Selected = "Invisible"
+        Var Menu21Selected = "Invisible"
+    Else
+        Var Menu11Selected = "Invisible" 
+        Var Menu7Selected = "Invisible"
+        Var Menu21Selected = "PressForever"
+    EndIf
+
+    
+    SAVELOG PreviseXMLFileName2
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
+</EventOpen>
+
+
+
+;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
+
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+</Popup>

xml/page_catalog_with_vending.xml

@@ -422,15 +422,15 @@
 
 <Button>
 <X> 392 </X>
-<Y> 1532 </Y>
+<Y> 1478 </Y>
 <State>MenuKidButtonState</State>
-<Filename> Var(DirImage + "/bn_kidmenu.png") </Filename>
+<Filename> Var(DirImage + "/bn_dessert.png") </Filename>
-<FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress>
+<FilenamePress> Var(DirImage + "/bp_dessert.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-		Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml"
+		Open "ROOT/taobin_project/xml/page_catalog_group_dessert.xml"
 
 </EventClick>
 </Button>