HKG : 3 langs with xml, Add Image

inter/hkg/xml/multi/page_catalog.lxml

@@ -498,7 +498,7 @@
 <EventClick> 
 	If  Seeker = "next" Then 
 		RootLayoutVisible 3 "hide"
-        Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+        Open "ROOT/taobin_project/inter/hkg/xml/page_brewing3Conti.xml"  
     Else
         Open "ROOT/taobin_project/xml/page_back_to_main.xml"
     EndIf

inter/hkg/xml/page_brewing3Conti.xml

@@ -16,14 +16,16 @@
 
 	;Var PayCredit = 0
 
+	Var DirImageDoing = "ROOT/taobin_project/inter/hkg/image/page_doing"
+
+	Var IMG_CNT = DirImageDoing + "/bg_show_time_remaining.png"
+
 	If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
 		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
-		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
 	Else
 		Var DirImage = "ROOT/taobin_project/image/page_payment"
 		Var DirImage2 = "ROOT/taobin_project/image/topping2"
-		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
 	EndIf
 
 	Var next_pic_bn = DirImage + "/bn_add_order.png"
@@ -164,7 +166,7 @@
 		Var ShowPercent = "Enable"
 		Var ShowCountdown = "Invisible"
 
-		Var IMG_CNT = "ROOT/taobin_project/inter/hkg/image/page_doing/img2_percent_eng.png"
+		Var DirImageDoing = "ROOT/taobin_project/inter/hkg/image/page_doing"
 	EndIf
 
 	If XPercent = 0 Then
@@ -1052,7 +1054,9 @@
 <X> 0 </X>
 <Y> 1655 </Y>
 <State>EnableSelectMenuBetweenBrew</State>
-<Filename> text_next_order </Filename>
+<Language>
+	<ID> 000408 </ID>
+</Language>
 <Image>
 
 <Image>
@@ -1097,12 +1101,27 @@
 <Value> XPercent </Value>
 </Text>
 
+<Text>
+<X> 816 </X>
+<Y> 429 </Y>
+<Language>
+	<ID> 000405 </ID>
+</Language>
+</Text>
+<Text>
+<X> 941 </X>
+<Y> 518 </Y>
+<Language>
+	<ID> 000406 </ID>
+</Language>
+</Text>
+
 <Button>
 <X> 792 </X>
 <Y> 1787 </Y>
 <State>EnableSelectMenuBetweenBrew</State>
-<Filename> next_pic_bn </Filename>
+<Filename> Var( DirImageDoing + "/bn_next_order.png" ) </Filename>
-<FilenamePress> next_pic_bp </FilenamePress>
+<FilenamePress> Var( DirImageDoing + "/bp_next_order.png" )"/bp_next_order.png" </FilenamePress>
 <EventClick> 
 	If MachineState_Result = 0 Then
 	
@@ -1116,6 +1135,13 @@
 		Open "ROOT/taobin_project/xml/page_catalog.xml" 
 	EndIf
 </EventClick> 
+<Language>
+	<X> 0 </X>
+	<Y> 20 </Y>
+	<Width> 297 </Width>
+	<Height> 96 </Height>
+	<ID> 000407 </ID>
+</Language>
 </Button>
 
 <Button>

inter/hkg/xml/page_drinkfail_hkg.lxml

@@ -10,6 +10,14 @@
 
 	Var DirImage = CountryRootPath + "/image/collectiing/"
 
+    If LanguageShow = "MSC" Then
+        Var DirImage = CountryRootPath + "/image/collectiing_drinkfail_msc/"
+    EndIf
+
+    If LanguageShow = "MTC" Then
+        Var DirImage = CountryRootPath + "/image/collectiing_drinkfail_mtc/"
+    EndIf
+
 	
 	Var Timeout = 0
 	StopLongPlay

inter/hkg/xml/page_topping_select6.lxml

@@ -2224,9 +2224,9 @@
 <X> 680 </X>
 <Y> 79 </Y>
 <State> SugarState5 </State>
-<Filename> SugarNormalPicLv5 </Filename>
+<Filename> "ROOT/taobin_project/image/topping_inter/bn_sugar_6lvl.png" </Filename>
-<FilenamePress>  SugarPressPicLv5 </FilenamePress>
+<FilenamePress>  "ROOT/taobin_project/image/topping_inter/bp_sugar_6lvl.png" </FilenamePress>
-<FilenameDisable>  "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg5.png" </FilenameDisable>
+<FilenameDisable>  "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -2292,9 +2292,9 @@
 <X> 820 </X>
 <Y> 79 </Y>
 <State> SugarState6 </State>
-<Filename> SugarNormalPicLv6 </Filename>
+<Filename> "ROOT/taobin_project/image/topping_inter/bn_sugar_6lvl.png" </Filename>
-<FilenamePress>  SugarPressPicLv6 </FilenamePress>
+<FilenamePress>  "ROOT/taobin_project/image/topping_inter/bp_sugar_6lvl.png" </FilenamePress>
-<FilenameDisable>  "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg6.png" </FilenameDisable>
+<FilenameDisable>  "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>

xml/page_payment_cash-HKG.xml

@@ -7,6 +7,9 @@
 <Sound> PlaySoundLag </Sound>
 <EventOpen>
 
+	;HKG doesn't use New_Payment
+	Var New_Payment = 0
+
 	Var cash_disable = "0"
 	READ_FILE "/mnt/sdcard/coffeevending/cash_disable" cash_disable
 	DEBUGVAR cash_disable
@@ -1685,9 +1688,9 @@
 <X> 327 </X>
 <Y> TopRowY </Y>
 <State> CreditCardButtonState </State>
-<Filename> Var( CountryRootPath + "/image/page_payment/bn_credit_card.png") </Filename>
+<Filename> Var( DirImage + "/bn_credit_card.png") </Filename>
-<FilenamePress> Var( CountryRootPath + "/image/page_payment/bp_credit_card.png") </FilenamePress>
+<FilenamePress> Var( DirImage + "/bp_credit_card.png") </FilenamePress>
-<FilenameDisable> Var( CountryRootPath + "/image/page_payment/bd_credit_card.png") </FilenameDisable>
+<FilenameDisable> Var( DirImage + "/bd_credit_card.png") </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -1739,9 +1742,9 @@ EndIf
 <X> 551 </X>
 <Y> TopRowY </Y>
 <State> QRCodeButtonState </State>
-<Filename> Var( CountryRootPath + "/image/page_payment/bn_qr_code.png") </Filename>
+<Filename> Var( DirImage + "/bn_qr_code.png") </Filename>
-<FilenamePress> Var( CountryRootPath + "/image/page_payment/bp_qr_code.png") </FilenamePress>
+<FilenamePress> Var( DirImage + "/bp_qr_code.png") </FilenamePress>
-<FilenameDisable> Var( CountryRootPath + "/image/page_payment/bd_qr_code.png") </FilenameDisable>
+<FilenameDisable> Var( DirImage + "/bd_qr_code.png") </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>

xml/page_remove_cup.xml

@@ -40,11 +40,20 @@
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
 
+		If LanguageShow = "MSC" Then 
+			SetLanguage "MSC"
+		EndIf
+
+		If LanguageShow = "MTC" Then 
+			SetLanguage "MTC"
+		EndIf
+
 		If LanguageShow = "MYANMAR" Then 
 			SetLanguage "MYANMAR"
 		Else
 			SetLanguage "ENG"
 		EndIf
+
 	Else
 		SetLanguage "THAI"
 	EndIf
@@ -79,12 +88,12 @@
 		Var DirImage = "ROOT/taobin_project/image/user_take_cup_mmr/"
     EndIf
 	If LanguageShow = "MSC" Then 
-		Var DirImage = "ROOT/taobin_project/image/user_take_cup_en/"
+		Var DirImage = "ROOT/taobin_project/inter/hkg/image/user_take_cup_msc/"
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
 	EndIf
 	If LanguageShow = "MTC" Then 
-		Var DirImage = "ROOT/taobin_project/image/user_take_cup_en/"
+		Var DirImage = "ROOT/taobin_project/inter/hkg/image/user_take_cup_mtc/"
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
 	EndIf

xml/page_show_error.lxml

@@ -223,12 +223,6 @@
 	DEBUGVAR MachineStage
 	DEBUGVAR stop_now
 	Var DirImage = "ROOT/taobin_project/image/vending_error_en"
-	If LanguageShow = "MSC" Then
-		Var DirImage = CountryRootPath + "image/vending_error_en"
-	EndIf
-	If LanguageShow = "MTC" Then
-		Var DirImage = CountryRootPath + "image/vending_error_en"
-	EndIf
 	If MachineStage = "show-menu" Then
 		If LanguageShow = "ENG" Then
 			Var DirImage = CountryRootPath + "image/vending_error_en"
@@ -249,10 +243,10 @@
 			Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
 		EndIf
 		If LanguageShow = "MSC" Then
-			Var DirImage = CountryRootPath + "image/vending_error_en"
+			Var DirImage = CountryRootPath + "image/vending_error_msc"
 		EndIf
 		If LanguageShow = "MTC" Then
-			Var DirImage = CountryRootPath + "image/vending_error_en"
+			Var DirImage = CountryRootPath + "image/vending_error_mtc"
 		EndIf
 	EndIf
 	If MachineStage = "mcu-upgrade" Then
@@ -277,6 +271,12 @@
 		If LanguageShow = "MYANMAR" Then
 			Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
 		EndIf
+		If LanguageShow = "MSC" Then
+			Var DirImage = CountryRootPath + "image/vending_error_msc"
+		EndIf
+		If LanguageShow = "MTC" Then
+			Var DirImage = CountryRootPath + "image/vending_error_mtc"
+		EndIf
 	EndIf
 
 	If NeedUpgrade = "true" Then
@@ -301,6 +301,12 @@
 		If LanguageShow = "MYANMAR" Then
 			Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
 		EndIf
+		If LanguageShow = "MSC" Then
+			Var DirImage = CountryRootPath + "image/vending_error_msc"
+		EndIf
+		If LanguageShow = "MTC" Then
+			Var DirImage = CountryRootPath + "image/vending_error_mtc"
+		EndIf
 	EndIf
 
 	DEBUGVAR MachineStage
@@ -329,6 +335,12 @@
 			If LanguageShow = "MYANMAR" Then
 				Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
 			EndIf
+			If LanguageShow = "MSC" Then
+				Var DirImage = CountryRootPath + "image/vending_error_msc"
+			EndIf
+			If LanguageShow = "MTC" Then
+				Var DirImage = CountryRootPath + "image/vending_error_mtc"
+			EndIf
 		Else
 			Var show_error_normal = "Enable"
 			Var show_error_sp1 = "Invisible"
@@ -354,6 +366,12 @@
 			If LanguageShow = "MYANMAR" Then
 				Var DirImage = CountryRootPath + "image/close_en"
 			EndIf
+			If LanguageShow = "MSC" Then
+				Var DirImage = CountryRootPath + "image/close_hkg"
+			EndIf
+			If LanguageShow = "MTC" Then
+				Var DirImage = CountryRootPath + "image/close_hkg"
+			EndIf
 		EndIf
 	EndIf
 
@@ -379,6 +397,12 @@
 			If LanguageShow = "MYANMAR" Then
 				Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
 			EndIf
+			If LanguageShow = "MSC" Then
+				Var DirImage = CountryRootPath + "image/vending_error_msc"
+			EndIf
+			If LanguageShow = "MTC" Then
+				Var DirImage = CountryRootPath + "image/vending_error_mtc"
+			EndIf
 		Else
 			Var show_error_normal = "Enable"
 			Var show_error_sp1 = "Invisible"
@@ -400,6 +424,12 @@
 			If LanguageShow = "MYANMAR" Then
 				Var DirImage = CountryRootPath + "image/close_en"
 			EndIf
+			If LanguageShow = "MSC" Then
+				Var DirImage = CountryRootPath + "image/close_hkg"
+			EndIf
+			If LanguageShow = "MTC" Then
+				Var DirImage = CountryRootPath + "image/close_hkg"
+			EndIf
 		EndIf
 	EndIf
 
@@ -422,6 +452,12 @@
 		If LanguageShow = "MYANMAR" Then
 			Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
 		EndIf
+		If LanguageShow = "MSC" Then
+			Var DirImage = CountryRootPath + "image/vending_error_msc"
+		EndIf
+		If LanguageShow = "MTC" Then
+			Var DirImage = CountryRootPath + "image/vending_error_mtc"
+		EndIf
 	EndIf
 
 	If NETCORE_EVENT_CNT_X >= 30 Then
@@ -444,6 +480,12 @@
 		If LanguageShow = "MYANMAR" Then
 			Var DirImage = "ROOT/taobin_project/image/vending_error_mmr"
 		EndIf
+		If LanguageShow = "MSC" Then
+			Var DirImage = CountryRootPath + "image/vending_error_msc"
+		EndIf
+		If LanguageShow = "MTC" Then
+			Var DirImage = CountryRootPath + "image/vending_error_mtc"
+		EndIf
 	EndIf
 
 	Var MaintenanceCard = 20