From 6a60ff2f0566ae10e67a0a9acec0117745b4e18b Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Wed, 14 Dec 2022 23:02:30 +0000 Subject: [PATCH] fix status icon2 alt font (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 26 ----------------- .../n2t-out-visual/nspanel_US_L_Stats.txt | 10 +++---- .../landscape/n2t-out-visual/screensaver.txt | 2 +- HMI/US/landscape/n2t-out/screensaver.txt | 2 +- HMI/US/portrait/diff-eu-version.txt | 26 ----------------- HMI/US/portrait/diff-filtered.txt | 28 +------------------ .../n2t-out-visual/nspanel_US_P_Stats.txt | 10 +++---- .../portrait/n2t-out-visual/screensaver.txt | 2 +- HMI/US/portrait/n2t-out/screensaver.txt | 2 +- HMI/n2t-out-visual/nspanel_Stats.txt | 8 +++--- HMI/n2t-out-visual/screensaver.txt | 21 ++++++++++---- HMI/n2t-out/screensaver.txt | 11 +++++++- 12 files changed, 44 insertions(+), 104 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 5e24bbc9..c05232ca 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -416,29 +416,3 @@ │ Scope : local │ Dragging : 0 │ Disable release event after dragging: 0 -│ @@ -592,15 +563,24 @@ -│ spstr strCommand.txt,tIcon1.txt,"~",17 -│ spstr strCommand.txt,tTmp.txt,"~",18 -│ covx tTmp.txt,tIcon1.pco,0,0 -│ //statusIcon2 -│ spstr strCommand.txt,tIcon2.txt,"~",19 -│ spstr strCommand.txt,tTmp.txt,"~",20 -│ covx tTmp.txt,tIcon2.pco,0,0 -│ - click m0,1 -│ + spstr strCommand.txt,tTmp.txt,"~",21 -│ + if(tTmp.txt!="") -│ + { -│ + tIcon1.font=3 -│ + } -│ + spstr strCommand.txt,tTmp.txt,"~",22 -│ + if(tTmp.txt!="") -│ + { -│ + tIcon1.font=3 -│ + } -│ } -│ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") -│ { -│ spstr strCommand.txt,tTmp.txt,"~",1 -│ covx tTmp.txt,tTime.bco,0,0 -│ if(tTime.bco!=screensaver.bco) -│ { 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 15317c5c..8abef057 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 @@ -22,6 +22,10 @@ popupNotify 19 Component(s) 257 Line(s) of event code 166 Unique line(s) of event code +screensaver + 45 Component(s) + 410 Line(s) of event code + 298 Unique line(s) of event code popupLight 28 Component(s) 408 Line(s) of event code @@ -70,13 +74,9 @@ cardGrid 42 Component(s) 514 Line(s) of event code 293 Unique line(s) of event code -screensaver - 45 Component(s) - 410 Line(s) of event code - 297 Unique line(s) of event code Total 18 Page(s) 626 Component(s) 7881 Line(s) of event code - 1987 Unique line(s) of event code + 1988 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index 1537fc84..5d62206d 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -1147,7 +1147,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",22 if(tTmp.txt!="") { - tIcon1.font=3 + tIcon2.font=3 } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index 84d24e64..97498d07 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -575,7 +575,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",22 if(tTmp.txt!="") { - tIcon1.font=3 + tIcon2.font=3 } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 5e407aae..a4d3ad3b 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1197,29 +1197,3 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -592,15 +563,24 @@ -│ spstr strCommand.txt,tIcon1.txt,"~",17 -│ spstr strCommand.txt,tTmp.txt,"~",18 -│ covx tTmp.txt,tIcon1.pco,0,0 -│ //statusIcon2 -│ spstr strCommand.txt,tIcon2.txt,"~",19 -│ spstr strCommand.txt,tTmp.txt,"~",20 -│ covx tTmp.txt,tIcon2.pco,0,0 -│ - click m0,1 -│ + spstr strCommand.txt,tTmp.txt,"~",21 -│ + if(tTmp.txt!="") -│ + { -│ + tIcon1.font=3 -│ + } -│ + spstr strCommand.txt,tTmp.txt,"~",22 -│ + if(tTmp.txt!="") -│ + { -│ + tIcon1.font=3 -│ + } -│ } -│ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") -│ { -│ spstr strCommand.txt,tTmp.txt,"~",1 -│ covx tTmp.txt,tTime.bco,0,0 -│ if(tTime.bco!=screensaver.bco) -│ { diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 0acd9224..27ed50bb 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-12-14 22:34:40.980601919 +0000 ++++ /dev/fd/62 2022-12-14 23:02:23.381717287 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardChart.txt @@ -553,29 +553,3 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none -+15 +563,24 @@ -+ spstr strCommand.txt,tIcon1.txt,"~",17 -+ spstr strCommand.txt,tTmp.txt,"~",18 -+ covx tTmp.txt,tIcon1.pco,0,0 -+ //statusIcon2 -+ spstr strCommand.txt,tIcon2.txt,"~",19 -+ spstr strCommand.txt,tTmp.txt,"~",20 -+ covx tTmp.txt,tIcon2.pco,0,0 -+ click m0,1 -+ spstr strCommand.txt,tTmp.txt,"~",21 -+ if(tTmp.txt!="") -+ { -+ tIcon1.font=3 -+ } -+ spstr strCommand.txt,tTmp.txt,"~",22 -+ if(tTmp.txt!="") -+ { -+ tIcon1.font=3 -+ } -+ } -+ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") -+ { -+ spstr strCommand.txt,tTmp.txt,"~",1 -+ covx tTmp.txt,tTime.bco,0,0 -+ if(tTime.bco!=screensaver.bco) -+ { 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 71eb75a5..d7ca4b15 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 @@ -62,6 +62,10 @@ cardMedia 57 Component(s) 660 Line(s) of event code 325 Unique line(s) of event code +screensaver + 45 Component(s) + 410 Line(s) of event code + 298 Unique line(s) of event code cardQR 32 Component(s) 425 Line(s) of event code @@ -70,13 +74,9 @@ cardEntities 77 Component(s) 1395 Line(s) of event code 619 Unique line(s) of event code -screensaver - 45 Component(s) - 410 Line(s) of event code - 297 Unique line(s) of event code Total 18 Page(s) 638 Component(s) 8028 Line(s) of event code - 2024 Unique line(s) of event code + 2025 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index 99aacb6a..58ab401d 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -1147,7 +1147,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",22 if(tTmp.txt!="") { - tIcon1.font=3 + tIcon2.font=3 } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index 1c965b2c..f83c8107 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -575,7 +575,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",22 if(tTmp.txt!="") { - tIcon1.font=3 + tIcon2.font=3 } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 492ff369..5c582642 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -52,8 +52,8 @@ cardPower 299 Unique line(s) of event code screensaver 47 Component(s) - 409 Line(s) of event code - 301 Unique line(s) of event code + 418 Line(s) of event code + 302 Unique line(s) of event code cardQR 32 Component(s) 425 Line(s) of event code @@ -78,5 +78,5 @@ cardEntities Total 18 Page(s) 635 Component(s) - 7875 Line(s) of event code - 2008 Unique line(s) of event code + 7884 Line(s) of event code + 2009 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 48646c2d..95be178d 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -626,10 +626,10 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 3 + x coordinate : 1 y coordinate : 0 Width : 85 - Height : 40 + Height : 48 Effect : load Effect Priority : 0 Effect Time : 300 @@ -640,7 +640,7 @@ Text tIcon1 Back. Color : 0 Font Color : 17299 Horizontal Alignment : left - Vertical Alignment : center + Vertical Alignment : top Input Type : character Text : Max. Text Size : 10 @@ -659,7 +659,7 @@ Text tIcon2 x coordinate : 365 y coordinate : 0 Width : 85 - Height : 40 + Height : 48 Effect : load Effect Priority : 0 Effect Time : 300 @@ -670,7 +670,7 @@ Text tIcon2 Back. Color : 0 Font Color : 17299 Horizontal Alignment : right - Vertical Alignment : center + Vertical Alignment : top Input Type : character Text : Max. Text Size : 10 @@ -1189,7 +1189,16 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 - click m0,1 + spstr strCommand.txt,tTmp.txt,"~",21 + if(tTmp.txt!="") + { + tIcon1.font=3 + } + spstr strCommand.txt,tTmp.txt,"~",22 + if(tTmp.txt!="") + { + tIcon2.font=3 + } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 60665bdb..330151d4 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -596,7 +596,16 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 - click m0,1 + spstr strCommand.txt,tTmp.txt,"~",21 + if(tTmp.txt!="") + { + tIcon1.font=3 + } + spstr strCommand.txt,tTmp.txt,"~",22 + if(tTmp.txt!="") + { + tIcon2.font=3 + } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") {