diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 9295e248..838ccc32 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-03-29 21:37:35.051043757 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 21:37:35.411045869 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-29 22:12:23.291612091 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 22:12:23.795618184 +0000 @@ -10,6 +10,6 @@ int sleepValue=0 // dim value @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-29 21:37:35.055043780 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 21:37:35.411045869 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-29 22:12:23.291612091 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 22:12:23.799618232 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -780,38 +780,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { -diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-03-29 21:37:35.051043757 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-29 21:37:35.411045869 +0000 -@@ -10,6 +10,16 @@ - Swide left page ID : disabled - Swide right page ID : disabled - -+Text t0 -+ Attributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : tIcons contains all icons that can be used though serial (icon will be pulled from this textbox, first icon 0 and so on) -+ Max. Text Size : 400 -+ - Text tIcons - Attributes - Scope : global -@@ -17,7 +27,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text :  -+ Text :  - Max. Text Size : 150 - - Text tTmp1 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-29 21:37:35.051043757 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 21:37:35.411045869 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-29 22:12:23.291612091 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 22:12:23.795618184 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled 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 bf4b1b44..9f720cfd 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 @@ -2,10 +2,6 @@ Program.s 0 Component(s) 9 Line(s) of event code 9 Unique line(s) of event code -pageIcons - 6 Component(s) - 0 Line(s) of event code - 0 Unique line(s) of event code pageSerialTest 13 Component(s) 48 Line(s) of event code @@ -50,6 +46,10 @@ cardMedia 30 Component(s) 278 Line(s) of event code 139 Unique line(s) of event code +pageIcons + 5 Component(s) + 0 Line(s) of event code + 0 Unique line(s) of event code cardEntities 86 Component(s) 1320 Line(s) of event code @@ -57,6 +57,6 @@ cardEntities Total 13 Page(s) - 377 Component(s) + 376 Component(s) 3752 Line(s) of event code 1020 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageIcons.txt b/HMI/US/portrait/n2t-out-visual/pageIcons.txt index f726e619..19bac96f 100644 --- a/HMI/US/portrait/n2t-out-visual/pageIcons.txt +++ b/HMI/US/portrait/n2t-out-visual/pageIcons.txt @@ -18,48 +18,18 @@ Page pageIcons Fill : solid color Back. Color : 65535 -Text t0 - Attributes - ID : 2 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 15 - y coordinate : 148 - Width : 295 - Height : 107 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : tIcons contains all icons that can be used though serial (icon will be pulled from this textbox, first icon 0 and so on) - Max. Text Size : 400 - Word wrap : enabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tIcons Attributes - ID : 3 + ID : 2 Scope : global Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 x coordinate : 15 - y coordinate : 256 + y coordinate : 161 Width : 295 - Height : 190 + Height : 285 Effect : load Effect Priority : 0 Effect Time : 300 @@ -72,7 +42,7 @@ Text tIcons Horizontal Alignment : left Vertical Alignment : top Input Type : character - Text :  + Text :  Max. Text Size : 150 Word wrap : enabled Horizontal Spacing : 0 @@ -80,7 +50,7 @@ Text tIcons Text tTmp1 Attributes - ID : 4 + ID : 3 Scope : global Dragging : 0 Disable release event after dragging: 0 @@ -110,7 +80,7 @@ Text tTmp1 Text tTmp2 Attributes - ID : 5 + ID : 4 Scope : global Dragging : 0 Disable release event after dragging: 0 diff --git a/HMI/US/portrait/n2t-out/pageIcons.txt b/HMI/US/portrait/n2t-out/pageIcons.txt index 6cc6eb96..47f5bf8d 100644 --- a/HMI/US/portrait/n2t-out/pageIcons.txt +++ b/HMI/US/portrait/n2t-out/pageIcons.txt @@ -10,16 +10,6 @@ Page pageIcons Swide left page ID : disabled Swide right page ID : disabled -Text t0 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : tIcons contains all icons that can be used though serial (icon will be pulled from this textbox, first icon 0 and so on) - Max. Text Size : 400 - Text tIcons Attributes Scope : global @@ -27,7 +17,7 @@ Text tIcons Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text :  Max. Text Size : 150 Text tTmp1