Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

inter/sgp/menu/lang.tsv

@@ -6,7 +6,7 @@ TextID	Note	English	Thai
 000002		Please Select Drink Type	กรุณาเลือกประเภทเครื่องดื่ม
 
 	Page catalog body
-		Font=Kanit,Type=Medium,Size=32,Color=0x0025FF,Align=Center,LineHeight=30	Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30
+		Font=Kanit,Type=Medium,Size=32,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=30	Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30
 		Font=Kanit,Type=Medium,Size=32,Color=0xFFFFFF,Align=Center,LineHeight=30	Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30
 000003		Best Sellers	เมนูแนะนำ
 000004		Vending\nMachine	ตู้สินค้า
@@ -24,8 +24,8 @@ TextID	Note	English	Thai
 000013		UNAVAILABLE	หมด
 
 
-		Font=Montserrat,Type=Regular,Size=20,Color=0x746253,Align=Center-All	Font=Montserrat,Type=Regular,Size=24,Color=0x746253,Align=Center-All
-		Font=Montserrat,Type=Bold,Size=20,Color=0x746253,Align=Center-All	Font=Montserrat,Type=Bold,Size=24,Color=0x746253,Align=Center-All
+		Font=Montserrat,Type=Regular,Size=20,Color=0x0025FF,Align=Center-All	Font=Montserrat,Type=Regular,Size=24,Color=0x746253,Align=Center-All
+		Font=Montserrat,Type=Bold,Size=20,Color=0x0025FF,Align=Center-All	Font=Montserrat,Type=Bold,Size=24,Color=0x746253,Align=Center-All
 000014		our specialty	เมนูแนะนำ
 000015		Coffee	กาแฟ
 000016		Tea	ชา

inter/sgp/xml/page_collect_point_1.lxml

@@ -40,6 +40,13 @@
 		;Play "ROOT/taobin_project/sound_eng/Reward_final.mp3"
 
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+
+		If UsePepsiTheme = 1 Then
+			Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
+			Var DirImage = DirImage + "/image/collect_point1_en"
+
+			Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_eng.png"
+		EndIf
 	Else
 		Var DirImage = "ROOT/taobin_project/image/collect_point1"
 		;Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3"
@@ -425,6 +432,11 @@
 		Var ShowCountdown = "Invisible"
 
 		Var IMG_CNT = "ROOT/taobin_project/inter/sgp/image/page_doing/img2_percent_eng.png"
+
+		If UsePepsiTheme = 1 Then
+			Var IMG_CNT = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_doing/img2_percent_eng.png"
+
+		EndIf
 	EndIf
 
 	If XPercent = 0 Then
@@ -433,6 +445,51 @@
 		Var XPercent = 0
 	EndIf
 
+	Var AlphaBg = "ROOT/taobin_project/image/collectiing/alpha.png"
+	Var NumImgDir = "ROOT/taobin_project/image/collectiing/"
+
+	If UsePepsiTheme = 1 Then
+		Var AlphaBg = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/alpha.png"
+		Var NumImgDir = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/"
+	EndIf
+
+	Var bn_NumPad1 = NumImgDir + "bn_1.png"
+	Var bp_NumPad1 = NumImgDir + "bp_1.png"
+
+	Var bn_NumPad2 = NumImgDir + "bn_2.png"
+	Var bp_NumPad2 = NumImgDir + "bp_2.png"
+
+	Var bn_NumPad3 = NumImgDir + "bn_3.png"
+	Var bp_NumPad3 = NumImgDir + "bp_3.png"
+
+	Var bn_NumPad4 = NumImgDir + "bn_4.png"
+	Var bp_NumPad4 = NumImgDir + "bp_4.png"
+
+	Var bn_NumPad5 = NumImgDir + "bn_5.png"
+	Var bp_NumPad5 = NumImgDir + "bp_5.png"
+
+	Var bn_NumPad6 = NumImgDir + "bn_6.png"
+	Var bp_NumPad6 = NumImgDir + "bp_6.png"
+
+	Var bn_NumPad7 = NumImgDir + "bn_7.png"
+	Var bp_NumPad7 = NumImgDir + "bp_7.png"
+
+	Var bn_NumPad8 = NumImgDir + "bn_8.png"
+	Var bp_NumPad8 = NumImgDir + "bp_8.png"
+
+	Var bn_NumPad9 = NumImgDir + "bn_9.png"
+	Var bp_NumPad9 = NumImgDir + "bp_9.png"
+
+	Var bn_NumPad0 = NumImgDir + "bn_0.png"
+	Var bp_NumPad0 = NumImgDir + "bp_0.png"
+
+	Var bn_NumPadBack = NumImgDir + "bn_back-1.png"
+	Var bp_NumPadBack = NumImgDir + "bp_back-1.png"
+
+	Var TextEditImg = DirImage + "/text_edit.png"
+
+	DEBUGVAR TextEditImg
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -509,7 +566,7 @@
 <Image>
 <X> 0 </X>
 <Y> 380 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
+<Filename> AlphaBg </Filename>
 </Image>
 
 
@@ -524,8 +581,8 @@
 <Button>
 <X> 333 </X>
 <Y> 1086 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_1.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_1.png" </FilenamePress>
+<Filename> bn_NumPad1 </Filename>
+<FilenamePress> bp_NumPad1 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -554,8 +611,8 @@
 <Button>
 <X> 477 </X>
 <Y> 1086 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_2.png" </FilenamePress>
+<Filename> bn_NumPad2 </Filename>
+<FilenamePress> bp_NumPad2 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -579,8 +636,8 @@
 <Button>
 <X> 620 </X>
 <Y> 1086 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_3.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_3.png" </FilenamePress>
+<Filename> bn_NumPad3 </Filename>
+<FilenamePress> bp_NumPad3 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -604,8 +661,8 @@
 <Button>
 <X> 333 </X>
 <Y> 1230 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_4.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_4.png" </FilenamePress>
+<Filename> bn_NumPad4 </Filename>
+<FilenamePress> bp_NumPad4 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -629,8 +686,8 @@
 <Button>
 <X> 477 </X>
 <Y> 1230 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_5.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_5.png" </FilenamePress>
+<Filename> bn_NumPad5 </Filename>
+<FilenamePress> bp_NumPad5 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -654,8 +711,8 @@
 <Button>
 <X> 620 </X>
 <Y> 1230 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_6.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_6.png" </FilenamePress>
+<Filename> bn_NumPad6 </Filename>
+<FilenamePress> bp_NumPad6 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -679,8 +736,8 @@
 <Button>
 <X> 333 </X>
 <Y> 1373 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_7.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_7.png" </FilenamePress>
+<Filename> bn_NumPad7 </Filename>
+<FilenamePress> bp_NumPad7 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -704,8 +761,8 @@
 <Button>
 <X> 477 </X>
 <Y> 1373 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_8.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_8.png" </FilenamePress>
+<Filename> bn_NumPad8 </Filename>
+<FilenamePress> bp_NumPad8 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -729,8 +786,8 @@
 <Button>
 <X> 620 </X>
 <Y> 1373 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_9.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_9.png" </FilenamePress>
+<Filename> bn_NumPad9 </Filename>
+<FilenamePress> bp_NumPad9 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -755,8 +812,8 @@
 <Button>
 <X> 477 </X>
 <Y> 1517 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_0.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_0.png" </FilenamePress>
+<Filename> bn_NumPad0 </Filename>
+<FilenamePress> bp_NumPad0 </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -780,8 +837,8 @@
 <Button>
 <X> 620 </X>
 <Y> 1517 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_back-1.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_back-1.png" </FilenamePress>
+<Filename> bn_NumPadBack </Filename>
+<FilenamePress> bp_NumPadBack </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -813,7 +870,7 @@
 <Align> Center </Align>
 <Size> 62 </Size>
 <Font> RobotoBlack </Font>
-<Color> 0x513C2F </Color>
+<Color> HeadlineColor </Color>
 <Value> TelephoneNumber </Value>
 <Format> Telnum-mask-3 </Format>
 </Text>
@@ -1023,14 +1080,14 @@
 <Image>
 <X> 217 </X>
 <Y> 866 </Y>
-<Filename> "ROOT/taobin_project/image/collect_point1/img3.png" </Filename>
+<Filename> Var( DirImage + "/img3.png") </Filename>
 </Image>
 
 <Image>
 <X> 157 </X>
 <Y> 868 </Y>
 <State> ShowTextNumber </State>
-<Filename> Var( DirImage + "/text_edit.png") </Filename>
+<Filename> TextEditImg </Filename>
 </Image>
 
 
@@ -1104,7 +1161,7 @@
 <Width> 153 </Width>
 <Size> 88 </Size>
 <Font> RobotoBold </Font>
-<Color> 0x513C2F </Color>
+<Color> HeadlineColor </Color>
 <Value> XPercent </Value>
 </Text>
 

inter/whatthecup/sgp/xml/page_catalog.lxml

@@ -374,6 +374,13 @@
 	EndIf
 
 </EventClick>
+<Language>
+	<ID> 000003 </ID>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 <Button>
@@ -401,6 +408,13 @@
 	EndIf
 
 </EventClick>
+<Language>
+	<ID> 000005 </ID>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 ; menu row 2
@@ -426,6 +440,13 @@
 		Open OpenFileXML
 	EndIf
 </EventClick>
+<Language>
+	<ID> 000006 </ID>
+	<X> 28 </X>
+	<Y> 193 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 <Button>
@@ -450,6 +471,13 @@
 		Open OpenFileXML
 	EndIf
 </EventClick>
+<Language>
+	<ID> 000007 </ID>
+	<X> 28 </X>
+	<Y> 193 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 
@@ -476,6 +504,13 @@
 		Open OpenFileXML
 	EndIf
 </EventClick>
+<Language>
+	<ID> 000011 </ID>
+	<X> 28 </X>
+	<Y> 211 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 <Button>
@@ -502,6 +537,13 @@
 	EndIf
 
 </EventClick>
+<Language>
+	<ID> 000012 </ID>
+	<X> 28 </X>
+	<Y> 211 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 
@@ -527,6 +569,13 @@
 		Open OpenFileXML
 	EndIf
 </EventClick>
+<Language>
+	<ID> 000009 </ID>
+	<X> 28 </X>
+	<Y> 211 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 ;###############################################################
@@ -557,6 +606,13 @@
 	EndIf
 
 </EventClick>
+<Language>
+	<ID> 000008 </ID>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
+	<Height> 72 </Height>
+</Language>
 </Button>
 
 
@@ -585,6 +641,13 @@
 	EndIf
 
 </EventClick>
+<Language>
+	<ID> 000010 </ID>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
+	<Height> 82 </Height>
+</Language>
 </Button>