From 4f760da1aad687d09a3a8cb66b4fe3422862bb97 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Fri, 23 Dec 2022 15:58:47 +0000 Subject: [PATCH] Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/portrait/diff-filtered.txt | 2 +- .../n2t-out-visual/nspanel_US_P_Stats.txt | 8 +++--- .../portrait/n2t-out-visual/screensaver.txt | 26 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 4d33a8c6..46bb1a2d 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-12-21 20:15:25.252534958 +0000 ++++ /dev/fd/62 2022-12-23 15:58:39.712878570 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardEntities.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 0d6e1e1d..24df2a8c 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 @@ -30,6 +30,10 @@ pageStartup 19 Component(s) 181 Line(s) of event code 129 Unique line(s) of event code +screensaver + 45 Component(s) + 410 Line(s) of event code + 298 Unique line(s) of event code popupShutter 25 Component(s) 398 Line(s) of event code @@ -50,10 +54,6 @@ 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 diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index 58ab401d..b2e0e58b 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -126,9 +126,9 @@ Text t10 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 49 - y coordinate : 240 - Width : 225 + x coordinate : 53 + y coordinate : 245 + Width : 215 Height : 2 Effect : load Effect Priority : 0 @@ -576,10 +576,10 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 8 + x coordinate : 0 y coordinate : 227 - Width : 33 - Height : 30 + Width : 45 + Height : 45 Effect : load Effect Priority : 0 Effect Time : 300 @@ -589,7 +589,7 @@ Text tIcon1 Font ID : 1 Back. Color : 0 Font Color : 17299 - Horizontal Alignment : center + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : @@ -606,10 +606,10 @@ Text tIcon2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 282 + x coordinate : 275 y coordinate : 227 - Width : 33 - Height : 30 + Width : 45 + Height : 45 Effect : load Effect Priority : 0 Effect Time : 300 @@ -619,7 +619,7 @@ Text tIcon2 Font ID : 1 Back. Color : 0 Font Color : 17299 - Horizontal Alignment : center + Horizontal Alignment : right Vertical Alignment : center Input Type : character Text : @@ -817,7 +817,7 @@ Text tNotifyHead Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 257 + y coordinate : 272 Width : 320 Height : 58 Effect : load @@ -847,7 +847,7 @@ Text tNotifyText Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 315 + y coordinate : 330 Width : 320 Height : 58 Effect : load