From c2df414557cab20febcd5da003df7568f11a93b8 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Wed, 14 Dec 2022 22:34:47 +0000 Subject: [PATCH] alternative font for status icons (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 12 +++++++++++- .../n2t-out-visual/nspanel_US_L_Stats.txt | 8 ++++---- HMI/US/landscape/n2t-out-visual/screensaver.txt | 16 +++++++++++++--- HMI/US/landscape/n2t-out/screensaver.txt | 10 ++++++++++ HMI/US/portrait/diff-eu-version.txt | 12 +++++++++++- HMI/US/portrait/diff-filtered.txt | 14 ++++++++++++-- .../n2t-out-visual/nspanel_US_P_Stats.txt | 12 ++++++------ HMI/US/portrait/n2t-out-visual/screensaver.txt | 10 ++++++++++ HMI/US/portrait/n2t-out/screensaver.txt | 10 ++++++++++ 9 files changed, 87 insertions(+), 17 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 2acd2504..5e24bbc9 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -416,7 +416,7 @@ │ Scope : local │ Dragging : 0 │ Disable release event after dragging: 0 -│ @@ -592,15 +563,14 @@ +│ @@ -592,15 +563,24 @@ │ spstr strCommand.txt,tIcon1.txt,"~",17 │ spstr strCommand.txt,tTmp.txt,"~",18 │ covx tTmp.txt,tIcon1.pco,0,0 @@ -425,6 +425,16 @@ │ 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=="") │ { 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 8201088a..15317c5c 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 @@ -72,11 +72,11 @@ cardGrid 293 Unique line(s) of event code screensaver 45 Component(s) - 400 Line(s) of event code - 296 Unique line(s) of event code + 410 Line(s) of event code + 297 Unique line(s) of event code Total 18 Page(s) 626 Component(s) - 7871 Line(s) of event code - 1986 Unique line(s) of event code + 7881 Line(s) of event code + 1987 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 f935e5bb..1537fc84 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -576,10 +576,10 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 16 + x coordinate : 0 y coordinate : 0 Width : 85 - Height : 38 + Height : 48 Effect : load Effect Priority : 0 Effect Time : 300 @@ -609,7 +609,7 @@ Text tIcon2 x coordinate : 393 y coordinate : 0 Width : 85 - Height : 38 + Height : 48 Effect : load Effect Priority : 0 Effect Time : 300 @@ -1139,6 +1139,16 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 + 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=="") { diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index 5010cdf7..84d24e64 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -567,6 +567,16 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 + 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=="") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 35e08eea..5e407aae 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1197,7 +1197,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -592,15 +563,14 @@ +│ @@ -592,15 +563,24 @@ │ spstr strCommand.txt,tIcon1.txt,"~",17 │ spstr strCommand.txt,tTmp.txt,"~",18 │ covx tTmp.txt,tIcon1.pco,0,0 @@ -1206,6 +1206,16 @@ │ 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=="") │ { diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 87cff6ed..0acd9224 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-12-13 20:21:49.356087313 +0000 ++++ /dev/fd/62 2022-12-14 22:34:40.980601919 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardChart.txt @@ -553,7 +553,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none -+15 +563,14 @@ ++15 +563,24 @@ + spstr strCommand.txt,tIcon1.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",18 + covx tTmp.txt,tIcon1.pco,0,0 @@ -562,6 +562,16 @@ + 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=="") + { 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 251ffecf..71eb75a5 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,10 +62,6 @@ cardMedia 57 Component(s) 660 Line(s) of event code 325 Unique line(s) of event code -screensaver - 45 Component(s) - 400 Line(s) of event code - 296 Unique line(s) of event code cardQR 32 Component(s) 425 Line(s) of event code @@ -74,9 +70,13 @@ 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) - 8018 Line(s) of event code - 2023 Unique line(s) of event code + 8028 Line(s) of event code + 2024 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 3b96a509..99aacb6a 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -1139,6 +1139,16 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 + 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=="") { diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index dc84818e..1c965b2c 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -567,6 +567,16 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 + 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=="") {