h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-22 15:34:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix status icon2 alt font (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-12-14 23:02:30 +00:00
committed by github-actions[bot]
parent 89517a058b
commit 6a60ff2f05
12 changed files with 44 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
HMI/US/landscape/diff-eu-version.txt
View File

@@ -416,29 +416,3 @@
│ Scope : local │ Scope : local
│ Dragging : 0 │ Dragging : 0
│ Disable release event after 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)
│ {

10
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -22,6 +22,10 @@ popupNotify
19 Component(s) 19 Component(s)
257 Line(s) of event code 257 Line(s) of event code
166 Unique 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 popupLight
28 Component(s) 28 Component(s)
408 Line(s) of event code 408 Line(s) of event code
@@ -70,13 +74,9 @@ cardGrid
42 Component(s) 42 Component(s)
514 Line(s) of event code 514 Line(s) of event code
293 Unique 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 Total
18 Page(s) 18 Page(s)
626 Component(s) 626 Component(s)
7881 Line(s) of event code 7881 Line(s) of event code
1987 Unique line(s) of event code 1988 Unique line(s) of event code

2
HMI/US/landscape/n2t-out-visual/screensaver.txt
View File

@@ -1147,7 +1147,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",22 spstr strCommand.txt,tTmp.txt,"~",22
if(tTmp.txt!="") if(tTmp.txt!="")
{ {
tIcon1.font=3 tIcon2.font=3
} }
} }
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")

2
HMI/US/landscape/n2t-out/screensaver.txt
View File

@@ -575,7 +575,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",22 spstr strCommand.txt,tTmp.txt,"~",22
if(tTmp.txt!="") if(tTmp.txt!="")
{ {
tIcon1.font=3 tIcon2.font=3
} }
} }
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")

26
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1197,29 +1197,3 @@
│ Disable release event after dragging: 0 │ Disable release event after dragging: 0
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard : none │ 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)
│ {

28
HMI/US/portrait/diff-filtered.txt
View File

@@ -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 +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+I/n2t-out/cardChart.txt +I/n2t-out/cardChart.txt
@@ -553,29 +553,3 @@
+ Disable release event after dragging: 0 + Disable release event after dragging: 0
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard : none + 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)
+ {

10
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -62,6 +62,10 @@ cardMedia
57 Component(s) 57 Component(s)
660 Line(s) of event code 660 Line(s) of event code
325 Unique 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 cardQR
32 Component(s) 32 Component(s)
425 Line(s) of event code 425 Line(s) of event code
@@ -70,13 +74,9 @@ cardEntities
77 Component(s) 77 Component(s)
1395 Line(s) of event code 1395 Line(s) of event code
619 Unique 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 Total
18 Page(s) 18 Page(s)
638 Component(s) 638 Component(s)
8028 Line(s) of event code 8028 Line(s) of event code
2024 Unique line(s) of event code 2025 Unique line(s) of event code

2
HMI/US/portrait/n2t-out-visual/screensaver.txt
View File

@@ -1147,7 +1147,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",22 spstr strCommand.txt,tTmp.txt,"~",22
if(tTmp.txt!="") if(tTmp.txt!="")
{ {
tIcon1.font=3 tIcon2.font=3
} }
} }
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")

2
HMI/US/portrait/n2t-out/screensaver.txt
View File

@@ -575,7 +575,7 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",22 spstr strCommand.txt,tTmp.txt,"~",22
if(tTmp.txt!="") if(tTmp.txt!="")
{ {
tIcon1.font=3 tIcon2.font=3
} }
} }
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")

8
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -52,8 +52,8 @@ cardPower
299 Unique line(s) of event code 299 Unique line(s) of event code
screensaver screensaver
47 Component(s) 47 Component(s)
409 Line(s) of event code 418 Line(s) of event code
301 Unique line(s) of event code 302 Unique line(s) of event code
cardQR cardQR
32 Component(s) 32 Component(s)
425 Line(s) of event code 425 Line(s) of event code
@@ -78,5 +78,5 @@ cardEntities
Total Total
18 Page(s) 18 Page(s)
635 Component(s) 635 Component(s)
7875 Line(s) of event code 7884 Line(s) of event code
2008 Unique line(s) of event code 2009 Unique line(s) of event code

21
HMI/n2t-out-visual/screensaver.txt
View File

@@ -626,10 +626,10 @@ Text tIcon1
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 3 x coordinate : 1
y coordinate : 0 y coordinate : 0
Width : 85 Width : 85
Height : 40 Height : 48
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -640,7 +640,7 @@ Text tIcon1
Back. Color : 0 Back. Color : 0
Font Color : 17299 Font Color : 17299
Horizontal Alignment : left Horizontal Alignment : left
Vertical Alignment : center Vertical Alignment : top
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 10 Max. Text Size : 10
@@ -659,7 +659,7 @@ Text tIcon2
x coordinate : 365 x coordinate : 365
y coordinate : 0 y coordinate : 0
Width : 85 Width : 85
Height : 40 Height : 48
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -670,7 +670,7 @@ Text tIcon2
Back. Color : 0 Back. Color : 0
Font Color : 17299 Font Color : 17299
Horizontal Alignment : right Horizontal Alignment : right
Vertical Alignment : center Vertical Alignment : top
Input Type : character Input Type : character
Text : Text :
Max. Text Size : 10 Max. Text Size : 10
@@ -1189,7 +1189,16 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0 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=="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{ {

11
HMI/n2t-out/screensaver.txt
View File

@@ -596,7 +596,16 @@ Timer tmSerial
spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tIcon2.txt,"~",19
spstr strCommand.txt,tTmp.txt,"~",20 spstr strCommand.txt,tTmp.txt,"~",20
covx tTmp.txt,tIcon2.pco,0,0 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=="") if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
{ {