h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-17 10:27:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2023-02-04 08:43:22 +00:00
committed by github-actions[bot]
parent 18d9d9bf90
commit eba3b0d913
9 changed files with 173 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1037,39 +1037,63 @@
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -494,15 +470,15 @@
│ if(tTmp.txt!="")
│ @@ -590,42 +566,39 @@
│ //tMainTextAlt2
│ spstr strCommand.txt,tMainTextAlt2.txt,"~",36
│ //tMainIconAlt2
│ spstr strCommand.txt,tMainIconAlt2.txt,"~",33
│ //tMainIconAlt2 Color
│ spstr strCommand.txt,tTmp.txt,"~",34
│ covx tTmp.txt,tMainIconAlt2.pco,0,0
│ - if(tMainTextAlt2.txt!="")
│ + if(tMainTextAlt2.txt!=""&&p0.w!=320)
│ {
│ covx tTmp.txt,defaultFontColor,0,0
│ }
│ }
│ if(tInstruction.txt=="time")
│ {
│ - click m0,1
│ + //click m0,1
│ //get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0
│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1
│ if(tAMPM.txt=="")
│ //value for tMRIcon, activate alternative layout
│ vis tMainIcon,0
│ vis tMainText,0
│ vis tMainTextAlt,1
│ vis tMainIconAlt,1
│ vis tMainTextAlt2,1
│ vis tMainIconAlt2,1
│ - if(p0.w!=320)
│ - {
│ - vis tForecast1,0
│ - vis tF1Icon,0
│ - vis tForecast1Val,0
│ - //move forecast values to the right
│ - tForecast4.txt=tForecast3.txt
│ - tForecast3.txt=tForecast2.txt
│ - tForecast2.txt=tForecast1.txt
│ - tForecast4Val.txt=tForecast3Val.txt
│ - tForecast3Val.txt=tForecast2Val.txt
│ - tForecast2Val.txt=tForecast1Val.txt
│ - tF4Icon.txt=tF3Icon.txt
│ - tF3Icon.txt=tF2Icon.txt
│ - tF2Icon.txt=tF1Icon.txt
│ - tF4Icon.pco=tF3Icon.pco
│ - tF3Icon.pco=tF2Icon.pco
│ - tF2Icon.pco=tF1Icon.pco
│ - }
│ + vis tForecast1,0
│ + vis tF1Icon,0
│ + vis tForecast1Val,0
│ + //move forecast values to the right
│ + tForecast4.txt=tForecast3.txt
│ + tForecast3.txt=tForecast2.txt
│ + tForecast2.txt=tForecast1.txt
│ + tForecast4Val.txt=tForecast3Val.txt
│ + tForecast3Val.txt=tForecast2Val.txt
│ + tForecast2Val.txt=tForecast1Val.txt
│ + tF4Icon.txt=tF3Icon.txt
│ + tF3Icon.txt=tF2Icon.txt
│ + tF2Icon.txt=tF1Icon.txt
│ + tF4Icon.pco=tF3Icon.pco
│ + tF3Icon.pco=tF2Icon.pco
│ + tF2Icon.pco=tF1Icon.pco
│ }else
│ {
│ vis tAMPM,0
│ @@ -745,18 +721,14 @@
│ {
│ page pageStartup
│ }
│ if(tId.txt=="screensaver")
│ {
│ page screensaver
│ }
│ - if(tId.txt=="screensaver2")
│ - {
│ - page screensaver2
│ - }
│ if(tId.txt=="cardEntities")
│ {
│ page cardEntities
│ }
│ if(tId.txt=="cardGrid")
│ {
│ page cardGrid
│ vis tMainIcon,1
│ vis tMainIconAlt,0
│ vis tMainText,1
│ vis tMainTextAlt,0
│ vis tMainTextAlt2,0