diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 58eedbb8..8be1b00a 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -30,99 +30,3 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -├── popupNotify.txt -│ @@ -21,25 +21,19 @@ -│ vis tId,0 -│ popupNotify.bco=defaultBcoColor -│ tHeading.bco=defaultBcoColor -│ b0.bco=defaultBcoColor -│ tText.bco=defaultBcoColor -│ b1.bco=defaultBcoColor -│ b2.bco=defaultBcoColor -│ - tIcon.bco=defaultBcoColor -│ - tTextAlt.bco=defaultBcoColor -│ tHeading.pco=defaultFontColor -│ b0.pco=defaultFontColor -│ tText.pco=defaultFontColor -│ b1.pco=defaultFontColor -│ b2.pco=defaultFontColor -│ - vis tIcon,0 -│ - vis tTextAlt,0 -│ - tIcon.pco=defaultFontColor -│ - tTextAlt.pco=defaultFontColor -│ -│ Variable (string) strCommand -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 1000 -│ -│ @@ -106,34 +100,14 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : -│ Max. Text Size : 500 -│ -│ -Text tTextAlt -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 500 -│ - -│ -Text tIcon -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 250 -│ - -│ Picture p0 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ -│ @@ -325,33 +299,14 @@ -│ tText.pco=sys0 -│ //preserve old sleepTimeout -│ vaOldSleepT.val=sleepTimeout -│ // sleep timeout -│ spstr strCommand.txt,tTmp.txt,"~",10 -│ covx tTmp.txt,sys0,0,0 -│ sleepTimeout=sys0 -│ - //font size -│ - spstr strCommand.txt,tTmp.txt,"~",11 -│ - covx tTmp.txt,sys0,0,0 -│ - tTextAlt.font=sys0 -│ - tText.font=sys0 -│ - //icon -│ - spstr strCommand.txt,tIcon.txt,"~",12 -│ - if(tIcon.txt!="") -│ - { -│ - vis tIcon,1 -│ - vis tTextAlt,1 -│ - vis tText,0 -│ - tTextAlt.txt=tText.txt -│ - tTextAlt.pco=tText.pco -│ - } -│ - // alt icon color -│ - spstr strCommand.txt,tTmp.txt,"~",13 -│ - covx tTmp.txt,sys0,0,0 -│ - tIcon.pco=sys0 -│ } -│ if(tInstruction.txt=="time") -│ { -│ // get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ } -│ if(tInstruction.txt=="date") diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 61e31eb9..c6d370b1 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -7,9 +7,9 @@ pageIcons 0 Line(s) of event code 0 Unique line(s) of event code popupNotify - 17 Component(s) - 231 Line(s) of event code - 146 Unique line(s) of event code + 19 Component(s) + 253 Line(s) of event code + 164 Unique line(s) of event code cardMedia 34 Component(s) 394 Line(s) of event code @@ -65,6 +65,6 @@ cardEntities Total 15 Page(s) - 482 Component(s) - 5744 Line(s) of event code - 1546 Unique line(s) of event code + 484 Component(s) + 5766 Line(s) of event code + 1561 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupNotify.txt b/HMI/US/landscape/n2t-out-visual/popupNotify.txt index bc7af2f4..3f63ad0f 100644 --- a/HMI/US/landscape/n2t-out-visual/popupNotify.txt +++ b/HMI/US/landscape/n2t-out-visual/popupNotify.txt @@ -33,11 +33,17 @@ Page popupNotify tText.bco=defaultBcoColor b1.bco=defaultBcoColor b2.bco=defaultBcoColor + tIcon.bco=defaultBcoColor + tTextAlt.bco=defaultBcoColor tHeading.pco=defaultFontColor b0.pco=defaultFontColor tText.pco=defaultFontColor b1.pco=defaultFontColor b2.pco=defaultFontColor + vis tIcon,0 + vis tTextAlt,0 + tIcon.pco=defaultFontColor + tTextAlt.pco=defaultFontColor Variable (string) strCommand Attributes @@ -174,7 +180,7 @@ Text tHeading Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 1 Back. Color : 6371 Font Color : 65535 Horizontal Alignment : left @@ -216,6 +222,66 @@ Text tText Horizontal Spacing : 0 Vertical Spacing : 0 +Text tTextAlt + Attributes + ID : 17 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 150 + y coordinate : 74 + Width : 285 + Height : 171 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : top + Input Type : character + Text : + Max. Text Size : 500 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon + Attributes + ID : 18 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 38 + y coordinate : 74 + Width : 109 + Height : 171 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 4 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 250 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -298,7 +364,7 @@ Button b2 Effect Time : 300 Fill : solid color Style : flat - Font ID : 2 + Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 8 Back. Color (Pressed) : 1024 @@ -347,7 +413,7 @@ Button b1 Effect Time : 300 Fill : solid color Style : flat - Font ID : 2 + Font ID : 1 Back. Color : 6371 Back. Picture ID (Pressed) : 8 Back. Color (Pressed) : 1024 @@ -493,6 +559,25 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",10 covx tTmp.txt,sys0,0,0 sleepTimeout=sys0 + //font size + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + tTextAlt.font=sys0 + tText.font=sys0 + //icon + spstr strCommand.txt,tIcon.txt,"~",12 + if(tIcon.txt!="") + { + vis tIcon,1 + vis tTextAlt,1 + vis tText,0 + tTextAlt.txt=tText.txt + tTextAlt.pco=tText.pco + } + // alt icon color + spstr strCommand.txt,tTmp.txt,"~",13 + covx tTmp.txt,sys0,0,0 + tIcon.pco=sys0 } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/popupNotify.txt b/HMI/US/landscape/n2t-out/popupNotify.txt index 673dd9bb..3c9399fd 100644 --- a/HMI/US/landscape/n2t-out/popupNotify.txt +++ b/HMI/US/landscape/n2t-out/popupNotify.txt @@ -25,11 +25,17 @@ Page popupNotify tText.bco=defaultBcoColor b1.bco=defaultBcoColor b2.bco=defaultBcoColor + tIcon.bco=defaultBcoColor + tTextAlt.bco=defaultBcoColor tHeading.pco=defaultFontColor b0.pco=defaultFontColor tText.pco=defaultFontColor b1.pco=defaultFontColor b2.pco=defaultFontColor + vis tIcon,0 + vis tTextAlt,0 + tIcon.pco=defaultFontColor + tTextAlt.pco=defaultFontColor Variable (string) strCommand Attributes @@ -104,6 +110,26 @@ Text tText Text : Max. Text Size : 500 +Text tTextAlt + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 500 + +Text tIcon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 250 + Picture p0 Attributes Scope : local @@ -303,6 +329,25 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",10 covx tTmp.txt,sys0,0,0 sleepTimeout=sys0 + //font size + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + tTextAlt.font=sys0 + tText.font=sys0 + //icon + spstr strCommand.txt,tIcon.txt,"~",12 + if(tIcon.txt!="") + { + vis tIcon,1 + vis tTextAlt,1 + vis tText,0 + tTextAlt.txt=tText.txt + tTextAlt.pco=tText.pco + } + // alt icon color + spstr strCommand.txt,tTmp.txt,"~",13 + covx tTmp.txt,sys0,0,0 + tIcon.pco=sys0 } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index c91bd151..441585e3 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -717,76 +717,6 @@ │ Scope : local │ Text : │ Max. Text Size: 1000 -│ -│ @@ -106,34 +100,14 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : -│ Max. Text Size : 500 -│ -│ -Text tTextAlt -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 500 -│ - -│ -Text tIcon -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 250 -│ - -│ Picture p0 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ -│ @@ -325,33 +299,14 @@ -│ tText.pco=sys0 -│ //preserve old sleepTimeout -│ vaOldSleepT.val=sleepTimeout -│ // sleep timeout -│ spstr strCommand.txt,tTmp.txt,"~",10 -│ covx tTmp.txt,sys0,0,0 -│ sleepTimeout=sys0 -│ - //font size -│ - spstr strCommand.txt,tTmp.txt,"~",11 -│ - covx tTmp.txt,sys0,0,0 -│ - tTextAlt.font=sys0 -│ - tText.font=sys0 -│ - //icon -│ - spstr strCommand.txt,tIcon.txt,"~",12 -│ - if(tIcon.txt!="") -│ - { -│ - vis tIcon,1 -│ - vis tTextAlt,1 -│ - vis tText,0 -│ - tTextAlt.txt=tText.txt -│ - tTextAlt.pco=tText.pco -│ - } -│ - // alt icon color -│ - spstr strCommand.txt,tTmp.txt,"~",13 -│ - covx tTmp.txt,sys0,0,0 -│ - tIcon.pco=sys0 -│ } -│ if(tInstruction.txt=="time") -│ { -│ // get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ } -│ if(tInstruction.txt=="date") ├── screensaver.txt │ @@ -71,15 +71,15 @@ │ Text tTime diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 96b04aa6..992922b7 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-10-15 13:53:17.697936240 +0000 ++++ /dev/fd/62 2022-10-16 07:36:55.021416954 +0000 +geIcons.txt +5 +15,15 @@ + Scope : global @@ -43,76 +43,6 @@ + Scope : local + Text : + Max. Text Size: 1000 -+ -+34 +100,14 @@ -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 500 -+ -+extAlt -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 500 -+ -+con -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 250 -+ -+ p0 -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ -+33 +299,14 @@ -+ tText.pco=sys0 -+ //preserve old sleepTimeout -+ vaOldSleepT.val=sleepTimeout -+ // sleep timeout -+ spstr strCommand.txt,tTmp.txt,"~",10 -+ covx tTmp.txt,sys0,0,0 -+ sleepTimeout=sys0 -+ //font size -+ spstr strCommand.txt,tTmp.txt,"~",11 -+ covx tTmp.txt,sys0,0,0 -+ tTextAlt.font=sys0 -+ tText.font=sys0 -+ //icon -+ spstr strCommand.txt,tIcon.txt,"~",12 -+ if(tIcon.txt!="") -+ { -+ vis tIcon,1 -+ vis tTextAlt,1 -+ vis tText,0 -+ tTextAlt.txt=tText.txt -+ tTextAlt.pco=tText.pco -+ } -+ // alt icon color -+ spstr strCommand.txt,tTmp.txt,"~",13 -+ covx tTmp.txt,sys0,0,0 -+ tIcon.pco=sys0 -+ } -+ if(tInstruction.txt=="time") -+ { -+ // get set time to global variable -+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ } -+ if(tInstruction.txt=="date") +reensaver.txt +5 +71,15 @@ +ime 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 06f08baf..6c9729d0 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 @@ -14,10 +14,6 @@ popupFan 27 Component(s) 347 Line(s) of event code 202 Unique line(s) of event code -popupNotify - 17 Component(s) - 231 Line(s) of event code - 146 Unique line(s) of event code pageStartup 19 Component(s) 172 Line(s) of event code @@ -46,6 +42,10 @@ cardMedia 34 Component(s) 394 Line(s) of event code 213 Unique line(s) of event code +popupNotify + 19 Component(s) + 247 Line(s) of event code + 158 Unique line(s) of event code screensaver 38 Component(s) 338 Line(s) of event code @@ -65,6 +65,6 @@ cardEntities Total 15 Page(s) - 494 Component(s) - 5967 Line(s) of event code - 1620 Unique line(s) of event code + 496 Component(s) + 5983 Line(s) of event code + 1629 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupNotify.txt b/HMI/US/portrait/n2t-out-visual/popupNotify.txt index d9111a46..7ef04848 100644 --- a/HMI/US/portrait/n2t-out-visual/popupNotify.txt +++ b/HMI/US/portrait/n2t-out-visual/popupNotify.txt @@ -194,8 +194,8 @@ Text tText Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 5 - y coordinate : 74 + x coordinate : 4 + y coordinate : 76 Width : 307 Height : 260 Effect : load @@ -216,6 +216,66 @@ Text tText Horizontal Spacing : 0 Vertical Spacing : 0 +Text tTextAlt + Attributes + ID : 17 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 4 + y coordinate : 164 + Width : 306 + Height : 171 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : top + Input Type : character + Text : + Max. Text Size : 500 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon + Attributes + ID : 18 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 3 + y coordinate : 74 + Width : 308 + Height : 90 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 4 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 250 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -493,6 +553,25 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",10 covx tTmp.txt,sys0,0,0 sleepTimeout=sys0 + //font size + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + tTextAlt.font=sys0 + tText.font=sys0 + //icon + spstr strCommand.txt,tIcon.txt,"~",12 + if(tIcon.txt!="") + { + vis tIcon,1 + vis tTextAlt,1 + vis tText,0 + tTextAlt.txt=tText.txt + tTextAlt.pco=tText.pco + } + // alt icon color + spstr strCommand.txt,tTmp.txt,"~",13 + covx tTmp.txt,sys0,0,0 + tIcon.pco=sys0 } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/popupNotify.txt b/HMI/US/portrait/n2t-out/popupNotify.txt index 673dd9bb..c72fec72 100644 --- a/HMI/US/portrait/n2t-out/popupNotify.txt +++ b/HMI/US/portrait/n2t-out/popupNotify.txt @@ -104,6 +104,26 @@ Text tText Text : Max. Text Size : 500 +Text tTextAlt + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 500 + +Text tIcon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 250 + Picture p0 Attributes Scope : local @@ -303,6 +323,25 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",10 covx tTmp.txt,sys0,0,0 sleepTimeout=sys0 + //font size + spstr strCommand.txt,tTmp.txt,"~",11 + covx tTmp.txt,sys0,0,0 + tTextAlt.font=sys0 + tText.font=sys0 + //icon + spstr strCommand.txt,tIcon.txt,"~",12 + if(tIcon.txt!="") + { + vis tIcon,1 + vis tTextAlt,1 + vis tText,0 + tTextAlt.txt=tText.txt + tTextAlt.pco=tText.pco + } + // alt icon color + spstr strCommand.txt,tTmp.txt,"~",13 + covx tTmp.txt,sys0,0,0 + tIcon.pco=sys0 } if(tInstruction.txt=="time") {