diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 6f61ef56..58eedbb8 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -48,8 +48,8 @@ │ b2.pco=defaultFontColor │ - vis tIcon,0 │ - vis tTextAlt,0 -│ - tIcon.bco=defaultFontColor -│ - tTextAlt.bco=defaultFontColor +│ - tIcon.pco=defaultFontColor +│ - tTextAlt.pco=defaultFontColor │ │ Variable (string) strCommand │ Attributes @@ -92,7 +92,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ -│ @@ -325,26 +299,14 @@ +│ @@ -325,33 +299,14 @@ │ tText.pco=sys0 │ //preserve old sleepTimeout │ vaOldSleepT.val=sleepTimeout @@ -100,10 +100,12 @@ │ 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!="") │ - { @@ -111,7 +113,12 @@ │ - 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 732cd21d..c91bd151 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -709,8 +709,8 @@ │ b2.pco=defaultFontColor │ - vis tIcon,0 │ - vis tTextAlt,0 -│ - tIcon.bco=defaultFontColor -│ - tTextAlt.bco=defaultFontColor +│ - tIcon.pco=defaultFontColor +│ - tTextAlt.pco=defaultFontColor │ │ Variable (string) strCommand │ Attributes @@ -753,7 +753,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ -│ @@ -325,26 +299,14 @@ +│ @@ -325,33 +299,14 @@ │ tText.pco=sys0 │ //preserve old sleepTimeout │ vaOldSleepT.val=sleepTimeout @@ -761,10 +761,12 @@ │ 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!="") │ - { @@ -772,7 +774,12 @@ │ - 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-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 66b49b47..866b257b 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 12:20:50.585699560 +0000 ++++ /dev/fd/62 2022-10-15 12:55:10.725304315 +0000 +geIcons.txt +5 +15,15 @@ + Scope : global @@ -35,8 +35,8 @@ + b2.pco=defaultFontColor + vis tIcon,0 + vis tTextAlt,0 -+ tIcon.bco=defaultFontColor -+ tTextAlt.bco=defaultFontColor ++ tIcon.pco=defaultFontColor ++ tTextAlt.pco=defaultFontColor + +e (string) strCommand +ributes @@ -79,7 +79,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + -+26 +299,14 @@ ++33 +299,14 @@ + tText.pco=sys0 + //preserve old sleepTimeout + vaOldSleepT.val=sleepTimeout @@ -87,10 +87,12 @@ + 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!="") + { @@ -98,7 +100,12 @@ + 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/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 833d1638..e92975ff 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -20,8 +20,8 @@ popupLight 214 Unique line(s) of event code popupNotify 19 Component(s) - 249 Line(s) of event code - 161 Unique line(s) of event code + 253 Line(s) of event code + 164 Unique line(s) of event code pageStartup 19 Component(s) 172 Line(s) of event code @@ -66,5 +66,5 @@ cardEntities Total 15 Page(s) 490 Component(s) - 5815 Line(s) of event code - 1575 Unique line(s) of event code + 5819 Line(s) of event code + 1576 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index fdc8740b..86f1cd78 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -42,8 +42,8 @@ Page popupNotify b2.pco=defaultFontColor vis tIcon,0 vis tTextAlt,0 - tIcon.bco=defaultFontColor - tTextAlt.bco=defaultFontColor + tIcon.pco=defaultFontColor + tTextAlt.pco=defaultFontColor Variable (string) strCommand Attributes @@ -559,10 +559,12 @@ 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!="") { @@ -570,7 +572,12 @@ Timer tmSerial 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/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index 3126a823..3c9399fd 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -34,8 +34,8 @@ Page popupNotify b2.pco=defaultFontColor vis tIcon,0 vis tTextAlt,0 - tIcon.bco=defaultFontColor - tTextAlt.bco=defaultFontColor + tIcon.pco=defaultFontColor + tTextAlt.pco=defaultFontColor Variable (string) strCommand Attributes @@ -329,10 +329,12 @@ 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!="") { @@ -340,7 +342,12 @@ Timer tmSerial 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") {