From f3a2774d63685f5c16a390d6d995085f0e592923 Mon Sep 17 00:00:00 2001 From: thanawat saiyota Date: Tue, 19 Nov 2024 15:08:18 +0700 Subject: [PATCH] THAI Inter: add GetEnabledBlock func --- .../xml/multi/page_catalog_group_coffee.lxml | 15 ++++-------- .../xml/multi/page_catalog_group_forkid.lxml | 4 ++++ .../xml/multi/page_catalog_group_health.lxml | 23 +++++++++++++++++- .../xml/multi/page_catalog_group_milk.lxml | 4 ++++ .../xml/multi/page_catalog_group_other.lxml | 22 +++++++++++++++++ .../multi/page_catalog_group_other_other.lxml | 2 ++ .../multi/page_catalog_group_pepsi_7up.lxml | 24 +++++++++++++++++++ .../tha/xml/multi/page_catalog_group_tea.lxml | 6 +++++ 8 files changed, 89 insertions(+), 11 deletions(-) diff --git a/inter/tha/xml/multi/page_catalog_group_coffee.lxml b/inter/tha/xml/multi/page_catalog_group_coffee.lxml index 1e06d5fa..a87e1f82 100644 --- a/inter/tha/xml/multi/page_catalog_group_coffee.lxml +++ b/inter/tha/xml/multi/page_catalog_group_coffee.lxml @@ -10,14 +10,6 @@ ; On open ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml" Var Menu2Selected = "PressForever" - - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 412 - Var LanguageButtonListEnable = "Invisible" - - If ENABLE_LANGUAGE_COUNT = "" Then - LanguageControl "UpdateList" 1 - EndIf SAVELOG PreviseXMLFileName2 @@ -122,6 +114,8 @@ Var SaveStringInst = "ShowMYANMAR" EndIf EndIf + + EndIf @@ -133,7 +127,8 @@ InstanceGetString SaveStringInst DEBUGVAR SaveStringInst DEBUGVAR show_eng - + GetEnabledDrawBlockCount EnabledBlocksDrawInst5 + GetEnabledUpdateBlockCount EnabledBlockUpdateInst5 Var ButtonLanguageCurrentXPosition = 1005 Var ButtonLanguageCurrentYPosition = 458 - 38 @@ -141,8 +136,8 @@ Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 450 - 38 - DEBUGVAR EnabledBlockUpdateInst5 DEBUGVAR EnabledBlocksDrawInst5 + DEBUGVAR EnabledBlockUpdateInst5 If SaveStringInst = "RefreshNow" Then GetXMLFileNameCurrentRunning CurrentOpenFile diff --git a/inter/tha/xml/multi/page_catalog_group_forkid.lxml b/inter/tha/xml/multi/page_catalog_group_forkid.lxml index 264eb92b..90c6d2b4 100644 --- a/inter/tha/xml/multi/page_catalog_group_forkid.lxml +++ b/inter/tha/xml/multi/page_catalog_group_forkid.lxml @@ -125,6 +125,8 @@ Var SaveStringInst = "ShowMYANMAR" EndIf EndIf + + EndIf @@ -138,6 +140,8 @@ DEBUGVAR SaveStringInst DEBUGVAR show_eng + GetEnabledDrawBlockCount EnabledBlocksDrawInst8 + GetEnabledUpdateBlockCount EnabledBlockUpdateInst8 Var ButtonLanguageCurrentXPosition = 1005 Var ButtonLanguageCurrentYPosition = 458 - 38 diff --git a/inter/tha/xml/multi/page_catalog_group_health.lxml b/inter/tha/xml/multi/page_catalog_group_health.lxml index 1b8d7a34..9b54db92 100644 --- a/inter/tha/xml/multi/page_catalog_group_health.lxml +++ b/inter/tha/xml/multi/page_catalog_group_health.lxml @@ -98,6 +98,26 @@ Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_health.lxml" RefreshAll EndIf + + InstanceGetString SaveStringInst + If SaveStringInst = "RefreshNow" Then + + Else + If LanguageShow = "ENG" Then + Var SaveStringInst = "ShowEng" + Var show_eng = "false" + EndIf + If LanguageShow = "THAI" Then + Var SaveStringInst = "ShowThai" + Var show_eng = "true" + EndIf + If LanguageShow "MYANMAR" Then + Var show_eng = "false" + Var SaveStringInst = "ShowMYANMAR" + EndIf + EndIf + + EndIf @@ -110,7 +130,8 @@ InstanceGetString SaveStringInst DEBUGVAR SaveStringInst DEBUGVAR show_eng - + GetEnabledDrawBlockCount EnabledBlocksDrawInst9 + GetEnabledUpdateBlockCount EnabledBlockUpdateInst9 Var ButtonLanguageCurrentXPosition = 1005 Var ButtonLanguageCurrentYPosition = 458 - 38 diff --git a/inter/tha/xml/multi/page_catalog_group_milk.lxml b/inter/tha/xml/multi/page_catalog_group_milk.lxml index e90b74de..70f719f5 100644 --- a/inter/tha/xml/multi/page_catalog_group_milk.lxml +++ b/inter/tha/xml/multi/page_catalog_group_milk.lxml @@ -117,6 +117,8 @@ Var SaveStringInst = "ShowMYANMAR" EndIf EndIf + + EndIf @@ -129,6 +131,8 @@ DEBUGVAR SaveStringInst DEBUGVAR show_eng + GetEnabledDrawBlockCount EnabledBlocksDrawInst7 + GetEnabledUpdateBlockCount EnabledBlockUpdateInst7 Var ButtonLanguageCurrentXPosition = 1005 Var ButtonLanguageCurrentYPosition = 458 - 38 diff --git a/inter/tha/xml/multi/page_catalog_group_other.lxml b/inter/tha/xml/multi/page_catalog_group_other.lxml index 59ebb92c..7755d565 100644 --- a/inter/tha/xml/multi/page_catalog_group_other.lxml +++ b/inter/tha/xml/multi/page_catalog_group_other.lxml @@ -100,6 +100,26 @@ Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_other.lxml" RefreshAll EndIf + + InstanceGetString SaveStringInst + If SaveStringInst = "RefreshNow" Then + + Else + If LanguageShow = "ENG" Then + Var SaveStringInst = "ShowEng" + Var show_eng = "false" + EndIf + If LanguageShow = "THAI" Then + Var SaveStringInst = "ShowThai" + Var show_eng = "true" + EndIf + If LanguageShow "MYANMAR" Then + Var show_eng = "false" + Var SaveStringInst = "ShowMYANMAR" + EndIf + EndIf + + EndIf @@ -113,6 +133,8 @@ DEBUGVAR SaveStringInst DEBUGVAR show_eng + GetEnabledDrawBlockCount EnabledBlocksDrawInst10 + GetEnabledUpdateBlockCount EnabledBlockUpdateInst10 Var ButtonLanguageCurrentXPosition = 1005 Var ButtonLanguageCurrentYPosition = 458 - 38 diff --git a/inter/tha/xml/multi/page_catalog_group_other_other.lxml b/inter/tha/xml/multi/page_catalog_group_other_other.lxml index 5d982acc..679b16ec 100644 --- a/inter/tha/xml/multi/page_catalog_group_other_other.lxml +++ b/inter/tha/xml/multi/page_catalog_group_other_other.lxml @@ -85,6 +85,8 @@ DEBUGVAR SaveStringInst DEBUGVAR show_eng + GetEnabledDrawBlockCount EnabledBlocksDrawInst10 + GetEnabledUpdateBlockCount EnabledBlockUpdateInst10 Var ButtonLanguageCurrentXPosition = 1005 Var ButtonLanguageCurrentYPosition = 458 - 38 diff --git a/inter/tha/xml/multi/page_catalog_group_pepsi_7up.lxml b/inter/tha/xml/multi/page_catalog_group_pepsi_7up.lxml index 69da4a55..d0f0d22d 100644 --- a/inter/tha/xml/multi/page_catalog_group_pepsi_7up.lxml +++ b/inter/tha/xml/multi/page_catalog_group_pepsi_7up.lxml @@ -96,6 +96,28 @@ Open "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_pepsi_7up.lxml" RefreshAll EndIf + InstanceGetString SaveStringInst + If SaveStringInst = "RefreshNow" Then + + Else + If LanguageShow = "ENG" Then + Var SaveStringInst = "ShowEng" + Var show_eng = "false" + EndIf + If LanguageShow = "THAI" Then + Var SaveStringInst = "ShowThai" + Var show_eng = "true" + EndIf + If LanguageShow "MYANMAR" Then + Var show_eng = "false" + Var SaveStringInst = "ShowMYANMAR" + EndIf + EndIf + + GetEnabledDrawBlockCount EnabledBlocksDrawInst11 + GetEnabledUpdateBlockCount EnabledBlockUpdateInst11 + + EndIf @@ -110,6 +132,8 @@ DEBUGVAR SaveStringInst DEBUGVAR show_eng + GetEnabledDrawBlockCount EnabledBlocksDrawInst11 + GetEnabledUpdateBlockCount EnabledBlockUpdateInst11 Var ButtonLanguageCurrentXPosition = 1005 Var ButtonLanguageCurrentYPosition = 458 - 38 diff --git a/inter/tha/xml/multi/page_catalog_group_tea.lxml b/inter/tha/xml/multi/page_catalog_group_tea.lxml index 1771a2a9..ec699d0d 100644 --- a/inter/tha/xml/multi/page_catalog_group_tea.lxml +++ b/inter/tha/xml/multi/page_catalog_group_tea.lxml @@ -105,6 +105,10 @@ Var SaveStringInst = "ShowMYANMAR" EndIf EndIf + + + + EndIf @@ -118,6 +122,8 @@ DEBUGVAR SaveStringInst DEBUGVAR show_eng + GetEnabledDrawBlockCount EnabledBlocksDrawInst6 + GetEnabledUpdateBlockCount EnabledBlockUpdateInst6 Var ButtonLanguageCurrentXPosition = 1005 Var ButtonLanguageCurrentYPosition = 458 - 38