From 369e9af9cb56c5d3b91be024344f28fd7ae080ff Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 7 May 2022 15:04:38 +0000 Subject: [PATCH] implemented localization for popup pages (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 ++++---- .../n2t-out-visual/nspanel_US_L_Stats.txt | 16 ++++++++-------- HMI/US/landscape/n2t-out-visual/pageStartup.txt | 2 +- HMI/US/landscape/n2t-out-visual/popupLight.txt | 2 +- HMI/US/landscape/n2t-out/pageStartup.txt | 2 +- HMI/US/landscape/n2t-out/popupLight.txt | 2 +- HMI/US/portrait/diff-eu-version.txt | 12 ++++++------ HMI/US/portrait/diff-filtered.txt | 14 +++++++------- .../n2t-out-visual/nspanel_US_P_Stats.txt | 16 ++++++++-------- HMI/US/portrait/n2t-out-visual/pageStartup.txt | 2 +- HMI/US/portrait/n2t-out-visual/popupLight.txt | 2 +- HMI/US/portrait/n2t-out/pageStartup.txt | 2 +- HMI/US/portrait/n2t-out/popupLight.txt | 2 +- HMI/n2t-out-visual/pageStartup.txt | 2 +- HMI/n2t-out-visual/popupLight.txt | 2 +- HMI/n2t-out/pageStartup.txt | 2 +- HMI/n2t-out/popupLight.txt | 2 +- 17 files changed, 45 insertions(+), 45 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 1ee22b4a..4bdb14bc 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-07 09:49:49.312383427 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 09:49:50.284371694 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-07 15:04:37.072926627 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 15:04:38.097005282 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-07 09:49:49.312383427 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 09:49:50.284371694 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:04:37.072926627 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 15:04:38.097005282 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index ef4189a0..45608993 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -10,22 +10,22 @@ pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code -pageStartup - 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code -popupShutter - 20 Component(s) - 193 Line(s) of event code - 109 Unique line(s) of event code popupLight 27 Component(s) 341 Line(s) of event code 185 Unique line(s) of event code +popupShutter + 20 Component(s) + 193 Line(s) of event code + 109 Unique line(s) of event code popupNotify 17 Component(s) 196 Line(s) of event code 123 Unique line(s) of event code +pageStartup + 19 Component(s) + 150 Line(s) of event code + 113 Unique line(s) of event code cardThermo 41 Component(s) 444 Line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index 52643470..3051eb43 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 33 + Text : 34 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index 055e1d91..1d226516 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -886,7 +886,7 @@ Timer tmSerial // set t4 Temperature (Localization) spstr strCommand.txt,t4.txt,"~",7 // set t1 Brightness (Localization) - spstr strCommand.txt,t0.txt,"~",8 + spstr strCommand.txt,t1.txt,"~",8 } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index e801ff3c..83223a12 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 33 + Text : 34 Max. Text Size : 10 Picture p0 diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index ad73166a..e37957d1 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/n2t-out/popupLight.txt @@ -540,7 +540,7 @@ Timer tmSerial // set t4 Temperature (Localization) spstr strCommand.txt,t4.txt,"~",7 // set t1 Brightness (Localization) - spstr strCommand.txt,t0.txt,"~",8 + spstr strCommand.txt,t1.txt,"~",8 } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 0add9fb0..dbe15f96 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-07 09:49:49.312383427 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 09:49:49.792377633 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-07 15:04:37.072926627 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:04:37.528961499 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-07 09:49:49.316383378 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 09:49:49.792377633 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:04:37.076926933 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:04:37.528961499 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -427,8 +427,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-07 09:49:49.312383427 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 09:49:49.792377633 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:04:37.072926627 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:04:37.528961499 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 5904100d..47c7d453 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,7 +1,7 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 09:49:49.808377439 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-07 09:49:49.312383427 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 09:49:49.792377633 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-07 09:49:49.316383378 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 09:49:49.792377633 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-07 09:49:49.312383427 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 09:49:49.792377633 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 15:04:37.624968840 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-07 15:04:37.072926627 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:04:37.528961499 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:04:37.076926933 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:04:37.528961499 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:04:37.072926627 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:04:37.528961499 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index 1097da47..a1ab3ca5 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -14,10 +14,6 @@ popupNotify 17 Component(s) 196 Line(s) of event code 123 Unique line(s) of event code -pageStartup - 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code popupShutter 20 Component(s) 193 Line(s) of event code @@ -26,10 +22,18 @@ cardGrid 39 Component(s) 420 Line(s) of event code 246 Unique line(s) of event code +pageStartup + 19 Component(s) + 150 Line(s) of event code + 113 Unique line(s) of event code screensaver 35 Component(s) 292 Line(s) of event code 235 Unique line(s) of event code +popupLight + 27 Component(s) + 341 Line(s) of event code + 185 Unique line(s) of event code cardMedia 30 Component(s) 331 Line(s) of event code @@ -38,10 +42,6 @@ cardAlarm 35 Component(s) 345 Line(s) of event code 216 Unique line(s) of event code -popupLight - 27 Component(s) - 341 Line(s) of event code - 185 Unique line(s) of event code cardThermo 41 Component(s) 444 Line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index 564bb585..63b4a396 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 33 + Text : 34 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 834c48e6..a2ec97a1 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -886,7 +886,7 @@ Timer tmSerial // set t4 Temperature (Localization) spstr strCommand.txt,t4.txt,"~",7 // set t1 Brightness (Localization) - spstr strCommand.txt,t0.txt,"~",8 + spstr strCommand.txt,t1.txt,"~",8 } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 84314c37..5311b94a 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 33 + Text : 34 Max. Text Size : 10 Picture p0 diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index ad73166a..e37957d1 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -540,7 +540,7 @@ Timer tmSerial // set t4 Temperature (Localization) spstr strCommand.txt,t4.txt,"~",7 // set t1 Brightness (Localization) - spstr strCommand.txt,t0.txt,"~",8 + spstr strCommand.txt,t1.txt,"~",8 } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 8f5033ea..699293c3 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 33 + Text : 34 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index e5302d12..0e2904b8 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -886,7 +886,7 @@ Timer tmSerial // set t4 Temperature (Localization) spstr strCommand.txt,t4.txt,"~",7 // set t1 Brightness (Localization) - spstr strCommand.txt,t0.txt,"~",8 + spstr strCommand.txt,t1.txt,"~",8 } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 08cfb05d..c033adf6 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 33 + Text : 34 Max. Text Size : 10 Picture p0 diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index ad73166a..e37957d1 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -540,7 +540,7 @@ Timer tmSerial // set t4 Temperature (Localization) spstr strCommand.txt,t4.txt,"~",7 // set t1 Brightness (Localization) - spstr strCommand.txt,t0.txt,"~",8 + spstr strCommand.txt,t1.txt,"~",8 } if(tInstruction.txt=="time") {