From 0504d52cd75dbf228619a325e019a8f75ab2a1c4 Mon Sep 17 00:00:00 2001 From: kenta-work Date: Fri, 15 Sep 2023 15:03:10 +0700 Subject: [PATCH] bring language button flag back --- inter/mys/xml/event/promotion_2.xml | 4 ++-- inter/mys/xml/event/promotion_3.xml | 4 ++-- inter/mys/xml/event/promotion_pepsi_099.lxml | 4 ++-- inter/mys/xml/menu_catalog_new.lxml | 4 ++-- inter/mys/xml/page_catalog_group_appfast.lxml | 4 ++-- .../mys/xml/page_catalog_group_cocktail.lxml | 4 ++-- inter/mys/xml/page_catalog_group_coffee.lxml | 4 ++-- inter/mys/xml/page_catalog_group_forkid.lxml | 4 ++-- inter/mys/xml/page_catalog_group_health.lxml | 4 ++-- inter/mys/xml/page_catalog_group_milk.lxml | 4 ++-- inter/mys/xml/page_catalog_group_other.lxml | 4 ++-- .../mys/xml/page_catalog_group_recommend.lxml | 4 ++-- inter/mys/xml/page_catalog_group_tea.lxml | 4 ++-- inter/mys/xml/page_catalog_group_whey.lxml | 4 ++-- xml/page_catalog.lxml | 9 ++------- xml/topview2.xml | 19 ++++++++++--------- 16 files changed, 40 insertions(+), 44 deletions(-) diff --git a/inter/mys/xml/event/promotion_2.xml b/inter/mys/xml/event/promotion_2.xml index 5bbb60fe..c9f250f7 100644 --- a/inter/mys/xml/event/promotion_2.xml +++ b/inter/mys/xml/event/promotion_2.xml @@ -263,8 +263,8 @@ Refresh Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 950 - Var ButtonLanguageCurrentYPosition = 420 + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 diff --git a/inter/mys/xml/event/promotion_3.xml b/inter/mys/xml/event/promotion_3.xml index 4092ccd2..5435ca8e 100644 --- a/inter/mys/xml/event/promotion_3.xml +++ b/inter/mys/xml/event/promotion_3.xml @@ -263,8 +263,8 @@ Refresh Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 950 - Var ButtonLanguageCurrentYPosition = 420 + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 diff --git a/inter/mys/xml/event/promotion_pepsi_099.lxml b/inter/mys/xml/event/promotion_pepsi_099.lxml index a15d812f..9bd68f22 100644 --- a/inter/mys/xml/event/promotion_pepsi_099.lxml +++ b/inter/mys/xml/event/promotion_pepsi_099.lxml @@ -263,8 +263,8 @@ Refresh Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 950 - Var ButtonLanguageCurrentYPosition = 420 + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 diff --git a/inter/mys/xml/menu_catalog_new.lxml b/inter/mys/xml/menu_catalog_new.lxml index bdeacb0c..b30b1936 100644 --- a/inter/mys/xml/menu_catalog_new.lxml +++ b/inter/mys/xml/menu_catalog_new.lxml @@ -106,8 +106,8 @@ Refresh Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 950 - Var ButtonLanguageCurrentYPosition = 420 + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 diff --git a/inter/mys/xml/page_catalog_group_appfast.lxml b/inter/mys/xml/page_catalog_group_appfast.lxml index 06186c1e..05613965 100644 --- a/inter/mys/xml/page_catalog_group_appfast.lxml +++ b/inter/mys/xml/page_catalog_group_appfast.lxml @@ -265,8 +265,8 @@ Refresh Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 950 - Var ButtonLanguageCurrentYPosition = 420 + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 diff --git a/inter/mys/xml/page_catalog_group_cocktail.lxml b/inter/mys/xml/page_catalog_group_cocktail.lxml index c1b8cfa1..11822ba4 100644 --- a/inter/mys/xml/page_catalog_group_cocktail.lxml +++ b/inter/mys/xml/page_catalog_group_cocktail.lxml @@ -246,8 +246,8 @@ Refresh Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 950 - Var ButtonLanguageCurrentYPosition = 420 + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 diff --git a/inter/mys/xml/page_catalog_group_coffee.lxml b/inter/mys/xml/page_catalog_group_coffee.lxml index fda84b10..129672a3 100644 --- a/inter/mys/xml/page_catalog_group_coffee.lxml +++ b/inter/mys/xml/page_catalog_group_coffee.lxml @@ -257,8 +257,8 @@ Refresh Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 950 - Var ButtonLanguageCurrentYPosition = 420 + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 diff --git a/inter/mys/xml/page_catalog_group_forkid.lxml b/inter/mys/xml/page_catalog_group_forkid.lxml index e5b1f3cd..0a025746 100644 --- a/inter/mys/xml/page_catalog_group_forkid.lxml +++ b/inter/mys/xml/page_catalog_group_forkid.lxml @@ -266,8 +266,8 @@ Refresh Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 950 - Var ButtonLanguageCurrentYPosition = 420 + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 diff --git a/inter/mys/xml/page_catalog_group_health.lxml b/inter/mys/xml/page_catalog_group_health.lxml index 36d83bcd..2d5d830d 100644 --- a/inter/mys/xml/page_catalog_group_health.lxml +++ b/inter/mys/xml/page_catalog_group_health.lxml @@ -257,8 +257,8 @@ Refresh Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 950 - Var ButtonLanguageCurrentYPosition = 420 + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 diff --git a/inter/mys/xml/page_catalog_group_milk.lxml b/inter/mys/xml/page_catalog_group_milk.lxml index ec412720..cc358386 100644 --- a/inter/mys/xml/page_catalog_group_milk.lxml +++ b/inter/mys/xml/page_catalog_group_milk.lxml @@ -255,8 +255,8 @@ Refresh Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 950 - Var ButtonLanguageCurrentYPosition = 420 + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 diff --git a/inter/mys/xml/page_catalog_group_other.lxml b/inter/mys/xml/page_catalog_group_other.lxml index 77ab8733..5651947e 100644 --- a/inter/mys/xml/page_catalog_group_other.lxml +++ b/inter/mys/xml/page_catalog_group_other.lxml @@ -256,8 +256,8 @@ Refresh Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 950 - Var ButtonLanguageCurrentYPosition = 420 + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 diff --git a/inter/mys/xml/page_catalog_group_recommend.lxml b/inter/mys/xml/page_catalog_group_recommend.lxml index 75e62380..c7d26979 100644 --- a/inter/mys/xml/page_catalog_group_recommend.lxml +++ b/inter/mys/xml/page_catalog_group_recommend.lxml @@ -263,8 +263,8 @@ Refresh Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 950 - Var ButtonLanguageCurrentYPosition = 420 + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 diff --git a/inter/mys/xml/page_catalog_group_tea.lxml b/inter/mys/xml/page_catalog_group_tea.lxml index 557dba3b..60c2adf0 100644 --- a/inter/mys/xml/page_catalog_group_tea.lxml +++ b/inter/mys/xml/page_catalog_group_tea.lxml @@ -257,8 +257,8 @@ Refresh Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 950 - Var ButtonLanguageCurrentYPosition = 420 + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 diff --git a/inter/mys/xml/page_catalog_group_whey.lxml b/inter/mys/xml/page_catalog_group_whey.lxml index 7c922c95..e6317524 100644 --- a/inter/mys/xml/page_catalog_group_whey.lxml +++ b/inter/mys/xml/page_catalog_group_whey.lxml @@ -262,8 +262,8 @@ Refresh Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 950 - Var ButtonLanguageCurrentYPosition = 420 + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 diff --git a/xml/page_catalog.lxml b/xml/page_catalog.lxml index 8902d3f2..cc33a608 100644 --- a/xml/page_catalog.lxml +++ b/xml/page_catalog.lxml @@ -345,13 +345,8 @@ Var countDownRetrun = 300 Var LanguageButtonEnable = "Enable" - If CountryName = "Malaysia" Then - Var ButtonLanguageCurrentXPosition = 950 - Var ButtonLanguageCurrentYPosition = 458 - Else - Var ButtonLanguageCurrentXPosition = 990 - Var ButtonLanguageCurrentYPosition = 438 - EndIf + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 438 Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" diff --git a/xml/topview2.xml b/xml/topview2.xml index ac5af9bf..1c51df2f 100644 --- a/xml/topview2.xml +++ b/xml/topview2.xml @@ -17,15 +17,16 @@ Var langFileNameIcon = lang_icon_file_name[LanguageShowByIndex] - If CountryName = "Malaysia" Then - Var dirImageLang = CountryRootPath + "image/lang/" - Var langfn = dirImageLang + langFileNameIcon - DEBUGVAR langfn - DEBUGVAR ButtonLanguageCurrentXPosition - DEBUGVAR ButtonLanguageCurrentYPosition - Else - Var langfn = "ROOT/taobin_project/image/lang/" + langFileNameIcon - EndIf + Var langfn = "ROOT/taobin_project/image/lang/" + langFileNameIcon + + ;If CountryName = "Malaysia" Then + ; Var dirImageLang = CountryRootPath + "image/lang/" + ; Var langfn = dirImageLang + langFileNameIcon + ; DEBUGVAR langfn + ; DEBUGVAR ButtonLanguageCurrentXPosition + ; DEBUGVAR ButtonLanguageCurrentYPosition + ;EndIf + Var ButtonLanguageListXPositionIcon = ButtonLanguageListXPosition + 27 Var ButtonLanguageListYPositionIcon = ButtonLanguageListYPosition + 14