diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index dc0e706a..33513534 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -98,7 +98,7 @@ │ } │ - if(tId.txt=="screensaver2") │ - { -│ - page screensaver +│ - page screensaver2 │ - } │ if(tId.txt=="cardEntities") │ { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index b22f6f35..3824b254 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1493,23 +1493,6 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -750,15 +726,15 @@ -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ if(tId.txt=="screensaver2") -│ { -│ - page screensaver -│ + page screensaver2 -│ } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { │ --- HMI/n2t-out/screensaver2.txt ├── +++ HMI/US/portrait/n2t-out/screensaver2.txt │ @@ -29,17 +29,14 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index de8d1e65..b300904b 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-02-18 13:46:17.475034495 +0000 ++++ /dev/fd/62 2023-02-18 15:07:51.297065909 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardEntities.txt @@ -879,23 +879,6 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none -+15 +726,15 @@ -+ } -+ if(tId.txt=="screensaver") -+ { -+ page screensaver -+ } -+ if(tId.txt=="screensaver2") -+ { -+ page screensaver -+ page screensaver2 -+ } -+ if(tId.txt=="cardEntities") -+ { -+ page cardEntities -+ } -+ if(tId.txt=="cardGrid") -+ { +I/n2t-out/screensaver2.txt ++ HMI/US/portrait/n2t-out/screensaver2.txt +7 +29,14 @@ diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 01aab425..3d361380 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -50,10 +50,6 @@ cardThermo 57 Component(s) 536 Line(s) of event code 317 Unique line(s) of event code -screensaver - 47 Component(s) - 434 Line(s) of event code - 310 Unique line(s) of event code popupInSel 34 Component(s) 617 Line(s) of event code @@ -82,6 +78,10 @@ popupTimer 42 Component(s) 512 Line(s) of event code 255 Unique line(s) of event code +screensaver + 47 Component(s) + 434 Line(s) of event code + 311 Unique line(s) of event code cardEntities 67 Component(s) 1166 Line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index f0134b73..a04109b9 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1347,7 +1347,7 @@ Timer tmSerial } if(tId.txt=="screensaver2") { - page screensaver + page screensaver2 } if(tId.txt=="cardEntities") { diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index a3c813cf..fcafb4a4 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -754,7 +754,7 @@ Timer tmSerial } if(tId.txt=="screensaver2") { - page screensaver + page screensaver2 } if(tId.txt=="cardEntities") {