diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index ce63b0a2..fa174ab9 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 15:47:37.639317903 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 15:47:38.051322725 +0000 +--- HMI/n2t-out/Program.s.txt 2022-03-29 18:16:56.880176149 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 18:16:57.284191791 +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 15:47:37.643317950 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 15:47:38.055322772 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-03-29 18:16:56.880176149 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 18:16:57.284191791 +0000 @@ -31,7 +31,6 @@ vis tEntity1,0 vis bText1,0 @@ -803,9 +803,38 @@ 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 18:16:56.880176149 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-29 18:16:57.284191791 +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 15:47:37.639317903 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 15:47:38.051322725 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-29 18:16:56.880176149 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 18:16:57.284191791 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index e8b5a8ef..34dc4997 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -3,7 +3,7 @@ Program.s 10 Line(s) of event code 10 Unique line(s) of event code pageIcons - 6 Component(s) + 5 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code pageTest @@ -57,6 +57,6 @@ cardEntities Total 13 Page(s) - 353 Component(s) + 352 Component(s) 3363 Line(s) of event code 910 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageIcons.txt b/HMI/n2t-out-visual/pageIcons.txt index 630544af..7c46cd56 100644 --- a/HMI/n2t-out-visual/pageIcons.txt +++ b/HMI/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 : 0 - y coordinate : 5 - 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 : 1 - y coordinate : 117 - Width : 300 - Height : 190 + y coordinate : 8 + Width : 298 + Height : 299 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/n2t-out/pageIcons.txt b/HMI/n2t-out/pageIcons.txt index 6cc6eb96..47f5bf8d 100644 --- a/HMI/n2t-out/pageIcons.txt +++ b/HMI/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