mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-24 00:14:26 +01:00
extend bText to two line (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
4c5beeea91
commit
d70eb22738
@@ -1,6 +1,6 @@
|
|||||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||||
--- HMI/n2t-out/Program.s.txt 2022-09-15 18:53:18.301002047 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-09-17 13:59:14.951896133 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-15 18:53:19.233011610 +0000
|
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-09-17 13:59:15.879909718 +0000
|
||||||
@@ -14,6 +14,3 @@
|
@@ -14,6 +14,3 @@
|
||||||
//color vars
|
//color vars
|
||||||
int defaultFontColor=65535
|
int defaultFontColor=65535
|
||||||
@@ -8,10 +8,49 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
|||||||
- // fix touch offset
|
- // fix touch offset
|
||||||
- lcd_dev fffb 0002 0000 0020
|
- lcd_dev fffb 0002 0000 0020
|
||||||
- page pageStartup
|
- page pageStartup
|
||||||
|
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||||
|
--- HMI/n2t-out/cardEntities.txt 2022-09-17 13:59:14.951896133 +0000
|
||||||
|
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-09-17 13:59:15.883909777 +0000
|
||||||
|
@@ -786,7 +786,7 @@
|
||||||
|
Send Component ID : disabled
|
||||||
|
State : unpressed
|
||||||
|
Text :
|
||||||
|
- Max. Text Size : 45
|
||||||
|
+ Max. Text Size : 40
|
||||||
|
|
||||||
|
Events
|
||||||
|
Touch Press Event
|
||||||
|
@@ -811,7 +811,7 @@
|
||||||
|
Send Component ID : disabled
|
||||||
|
State : unpressed
|
||||||
|
Text :
|
||||||
|
- Max. Text Size : 45
|
||||||
|
+ Max. Text Size : 40
|
||||||
|
|
||||||
|
Events
|
||||||
|
Touch Press Event
|
||||||
|
@@ -836,7 +836,7 @@
|
||||||
|
Send Component ID : disabled
|
||||||
|
State : unpressed
|
||||||
|
Text :
|
||||||
|
- Max. Text Size : 45
|
||||||
|
+ Max. Text Size : 40
|
||||||
|
|
||||||
|
Events
|
||||||
|
Touch Press Event
|
||||||
|
@@ -861,7 +861,7 @@
|
||||||
|
Send Component ID : disabled
|
||||||
|
State : unpressed
|
||||||
|
Text :
|
||||||
|
- Max. Text Size : 45
|
||||||
|
+ Max. Text Size : 40
|
||||||
|
|
||||||
|
Events
|
||||||
|
Touch Press Event
|
||||||
Only in HMI/n2t-out: cardPower.txt
|
Only in HMI/n2t-out: cardPower.txt
|
||||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||||
--- HMI/n2t-out/pageStartup.txt 2022-09-15 18:53:18.301002047 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-09-17 13:59:14.951896133 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-15 18:53:19.233011610 +0000
|
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-09-17 13:59:15.879909718 +0000
|
||||||
@@ -177,7 +177,7 @@
|
@@ -177,7 +177,7 @@
|
||||||
recmod=1
|
recmod=1
|
||||||
bauds=115200
|
bauds=115200
|
||||||
@@ -22,8 +61,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
|
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
|
||||||
--- HMI/n2t-out/pageTest.txt 2022-09-15 18:53:18.301002047 +0000
|
--- HMI/n2t-out/pageTest.txt 2022-09-17 13:59:14.951896133 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-15 18:53:19.233011610 +0000
|
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-09-17 13:59:15.883909777 +0000
|
||||||
@@ -13,36 +13,6 @@
|
@@ -13,36 +13,6 @@
|
||||||
Events
|
Events
|
||||||
Preinitialize Event
|
Preinitialize Event
|
||||||
|
|||||||
@@ -1507,9 +1507,9 @@ Button bText1
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 276
|
x coordinate : 276
|
||||||
y coordinate : 84
|
y coordinate : 75
|
||||||
Width : 166
|
Width : 166
|
||||||
Height : 30
|
Height : 50
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
Effect Time : 300
|
Effect Time : 300
|
||||||
@@ -1525,8 +1525,8 @@ Button bText1
|
|||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
State : unpressed
|
State : unpressed
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 40
|
||||||
Word wrap : disabled
|
Word wrap : enabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
Vertical Spacing : 0
|
Vertical Spacing : 0
|
||||||
|
|
||||||
@@ -1554,9 +1554,9 @@ Button bText2
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 276
|
x coordinate : 276
|
||||||
y coordinate : 140
|
y coordinate : 131
|
||||||
Width : 166
|
Width : 166
|
||||||
Height : 30
|
Height : 50
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
Effect Time : 300
|
Effect Time : 300
|
||||||
@@ -1572,8 +1572,8 @@ Button bText2
|
|||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
State : unpressed
|
State : unpressed
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 40
|
||||||
Word wrap : disabled
|
Word wrap : enabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
Vertical Spacing : 0
|
Vertical Spacing : 0
|
||||||
|
|
||||||
@@ -1601,9 +1601,9 @@ Button bText3
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 277
|
x coordinate : 277
|
||||||
y coordinate : 197
|
y coordinate : 188
|
||||||
Width : 166
|
Width : 166
|
||||||
Height : 30
|
Height : 50
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
Effect Time : 300
|
Effect Time : 300
|
||||||
@@ -1619,8 +1619,8 @@ Button bText3
|
|||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
State : unpressed
|
State : unpressed
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 40
|
||||||
Word wrap : disabled
|
Word wrap : enabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
Vertical Spacing : 0
|
Vertical Spacing : 0
|
||||||
|
|
||||||
@@ -1648,9 +1648,9 @@ Button bText4
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 277
|
x coordinate : 277
|
||||||
y coordinate : 254
|
y coordinate : 245
|
||||||
Width : 166
|
Width : 166
|
||||||
Height : 30
|
Height : 50
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
Effect Time : 300
|
Effect Time : 300
|
||||||
@@ -1666,8 +1666,8 @@ Button bText4
|
|||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
State : unpressed
|
State : unpressed
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 40
|
||||||
Word wrap : disabled
|
Word wrap : enabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
Vertical Spacing : 0
|
Vertical Spacing : 0
|
||||||
|
|
||||||
|
|||||||
@@ -786,7 +786,7 @@ Button bText1
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
State : unpressed
|
State : unpressed
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 40
|
||||||
|
|
||||||
Events
|
Events
|
||||||
Touch Press Event
|
Touch Press Event
|
||||||
@@ -811,7 +811,7 @@ Button bText2
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
State : unpressed
|
State : unpressed
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 40
|
||||||
|
|
||||||
Events
|
Events
|
||||||
Touch Press Event
|
Touch Press Event
|
||||||
@@ -836,7 +836,7 @@ Button bText3
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
State : unpressed
|
State : unpressed
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 40
|
||||||
|
|
||||||
Events
|
Events
|
||||||
Touch Press Event
|
Touch Press Event
|
||||||
@@ -861,7 +861,7 @@ Button bText4
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
State : unpressed
|
State : unpressed
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 40
|
||||||
|
|
||||||
Events
|
Events
|
||||||
Touch Press Event
|
Touch Press Event
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
||||||
--- HMI/n2t-out/Program.s.txt 2022-09-15 18:53:18.301002047 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-09-17 13:59:14.951896133 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-15 18:53:18.749006644 +0000
|
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 13:59:15.403902750 +0000
|
||||||
@@ -14,6 +14,6 @@
|
@@ -14,6 +14,6 @@
|
||||||
//color vars
|
//color vars
|
||||||
int defaultFontColor=65535
|
int defaultFontColor=65535
|
||||||
@@ -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
|
+ //lcd_dev fffb 0002 0000 0020
|
||||||
page pageStartup
|
page pageStartup
|
||||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||||
--- HMI/n2t-out/cardEntities.txt 2022-09-15 18:53:18.305002088 +0000
|
--- HMI/n2t-out/cardEntities.txt 2022-09-17 13:59:14.951896133 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-15 18:53:18.753006685 +0000
|
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 13:59:15.403902750 +0000
|
||||||
@@ -65,6 +65,16 @@
|
@@ -65,6 +65,16 @@
|
||||||
vis nNum4,0
|
vis nNum4,0
|
||||||
vis bPrev,0
|
vis bPrev,0
|
||||||
@@ -127,6 +127,42 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
Button bDown1
|
Button bDown1
|
||||||
Attributes
|
Attributes
|
||||||
Scope : local
|
Scope : local
|
||||||
|
@@ -786,7 +865,7 @@
|
||||||
|
Send Component ID : disabled
|
||||||
|
State : unpressed
|
||||||
|
Text :
|
||||||
|
- Max. Text Size : 45
|
||||||
|
+ Max. Text Size : 20
|
||||||
|
|
||||||
|
Events
|
||||||
|
Touch Press Event
|
||||||
|
@@ -811,7 +890,7 @@
|
||||||
|
Send Component ID : disabled
|
||||||
|
State : unpressed
|
||||||
|
Text :
|
||||||
|
- Max. Text Size : 45
|
||||||
|
+ Max. Text Size : 20
|
||||||
|
|
||||||
|
Events
|
||||||
|
Touch Press Event
|
||||||
|
@@ -836,7 +915,7 @@
|
||||||
|
Send Component ID : disabled
|
||||||
|
State : unpressed
|
||||||
|
Text :
|
||||||
|
- Max. Text Size : 45
|
||||||
|
+ Max. Text Size : 20
|
||||||
|
|
||||||
|
Events
|
||||||
|
Touch Press Event
|
||||||
|
@@ -861,7 +940,7 @@
|
||||||
|
Send Component ID : disabled
|
||||||
|
State : unpressed
|
||||||
|
Text :
|
||||||
|
- Max. Text Size : 45
|
||||||
|
+ Max. Text Size : 20
|
||||||
|
|
||||||
|
Events
|
||||||
|
Touch Press Event
|
||||||
@@ -878,6 +957,106 @@
|
@@ -878,6 +957,106 @@
|
||||||
prints tSend.txt,0
|
prints tSend.txt,0
|
||||||
prints crcval,2
|
prints crcval,2
|
||||||
@@ -459,8 +495,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
{
|
{
|
||||||
Only in HMI/n2t-out: cardPower.txt
|
Only in HMI/n2t-out: cardPower.txt
|
||||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||||
--- HMI/n2t-out/pageStartup.txt 2022-09-15 18:53:18.301002047 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-09-17 13:59:14.951896133 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-15 18:53:18.749006644 +0000
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 13:59:15.403902750 +0000
|
||||||
@@ -142,7 +142,7 @@
|
@@ -142,7 +142,7 @@
|
||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
@@ -480,8 +516,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
|||||||
btlen tSend.txt,sys0
|
btlen tSend.txt,sys0
|
||||||
crcrest 1,0xffff // reset CRC
|
crcrest 1,0xffff // reset CRC
|
||||||
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
|
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
|
||||||
--- HMI/n2t-out/pageTest.txt 2022-09-15 18:53:18.301002047 +0000
|
--- HMI/n2t-out/pageTest.txt 2022-09-17 13:59:14.951896133 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-15 18:53:18.749006644 +0000
|
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 13:59:15.403902750 +0000
|
||||||
@@ -13,36 +13,6 @@
|
@@ -13,36 +13,6 @@
|
||||||
Events
|
Events
|
||||||
Preinitialize Event
|
Preinitialize Event
|
||||||
@@ -617,8 +653,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
|
|||||||
- }
|
- }
|
||||||
-
|
-
|
||||||
diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
|
diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
|
||||||
--- HMI/n2t-out/popupFan.txt 2022-09-15 18:53:18.301002047 +0000
|
--- HMI/n2t-out/popupFan.txt 2022-09-17 13:59:14.951896133 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-15 18:53:18.749006644 +0000
|
+++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 13:59:15.403902750 +0000
|
||||||
@@ -81,23 +81,23 @@
|
@@ -81,23 +81,23 @@
|
||||||
Scope: local
|
Scope: local
|
||||||
Value: 0
|
Value: 0
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-09-15 18:53:18.765006808 +0000
|
+++ HMI/US/portrait/diff-eu-version.txt 2022-09-17 13:59:15.415902926 +0000
|
||||||
+--- HMI/n2t-out/Program.s.txt 2022-09-15 18:53:18.301002047 +0000
|
+--- HMI/n2t-out/Program.s.txt 2022-09-17 13:59:14.951896133 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-15 18:53:18.749006644 +0000
|
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-09-17 13:59:15.403902750 +0000
|
||||||
+@@ -14,6 +14,6 @@
|
+@@ -14,6 +14,6 @@
|
||||||
+ //color vars
|
+ //color vars
|
||||||
+ int defaultFontColor=65535
|
+ int defaultFontColor=65535
|
||||||
+ int defaultBcoColor=6371
|
+ int defaultBcoColor=6371
|
||||||
+--- HMI/n2t-out/cardEntities.txt 2022-09-15 18:53:18.305002088 +0000
|
+--- HMI/n2t-out/cardEntities.txt 2022-09-17 13:59:14.951896133 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-15 18:53:18.753006685 +0000
|
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-09-17 13:59:15.403902750 +0000
|
||||||
+@@ -65,6 +65,16 @@
|
+@@ -65,6 +65,16 @@
|
||||||
+ vis bPrev,0
|
+ vis bPrev,0
|
||||||
+ vis bNext,0
|
+ vis bNext,0
|
||||||
@@ -19,6 +19,42 @@
|
|||||||
+@@ -182,6 +204,15 @@
|
+@@ -182,6 +204,15 @@
|
||||||
+@@ -302,6 +333,26 @@
|
+@@ -302,6 +333,26 @@
|
||||||
+@@ -421,6 +472,34 @@
|
+@@ -421,6 +472,34 @@
|
||||||
|
+@@ -786,7 +865,7 @@
|
||||||
|
+ Send Component ID : disabled
|
||||||
|
+ State : unpressed
|
||||||
|
+ Text :
|
||||||
|
+- Max. Text Size : 45
|
||||||
|
++ Max. Text Size : 20
|
||||||
|
+
|
||||||
|
+ Events
|
||||||
|
+ Touch Press Event
|
||||||
|
+@@ -811,7 +890,7 @@
|
||||||
|
+ Send Component ID : disabled
|
||||||
|
+ State : unpressed
|
||||||
|
+ Text :
|
||||||
|
+- Max. Text Size : 45
|
||||||
|
++ Max. Text Size : 20
|
||||||
|
+
|
||||||
|
+ Events
|
||||||
|
+ Touch Press Event
|
||||||
|
+@@ -836,7 +915,7 @@
|
||||||
|
+ Send Component ID : disabled
|
||||||
|
+ State : unpressed
|
||||||
|
+ Text :
|
||||||
|
+- Max. Text Size : 45
|
||||||
|
++ Max. Text Size : 20
|
||||||
|
+
|
||||||
|
+ Events
|
||||||
|
+ Touch Press Event
|
||||||
|
+@@ -861,7 +940,7 @@
|
||||||
|
+ Send Component ID : disabled
|
||||||
|
+ State : unpressed
|
||||||
|
+ Text :
|
||||||
|
+- Max. Text Size : 45
|
||||||
|
++ Max. Text Size : 20
|
||||||
|
+
|
||||||
|
+ Events
|
||||||
|
+ Touch Press Event
|
||||||
+@@ -878,6 +957,106 @@
|
+@@ -878,6 +957,106 @@
|
||||||
+@@ -986,6 +1165,33 @@
|
+@@ -986,6 +1165,33 @@
|
||||||
+@@ -1107,6 +1313,32 @@
|
+@@ -1107,6 +1313,32 @@
|
||||||
@@ -36,11 +72,11 @@
|
|||||||
++ covx tTmp.txt,sys0,0,0
|
++ covx tTmp.txt,sys0,0,0
|
||||||
++ btOnOff5.val=sys0
|
++ btOnOff5.val=sys0
|
||||||
+Only in HMI/n2t-out: cardPower.txt
|
+Only in HMI/n2t-out: cardPower.txt
|
||||||
+--- HMI/n2t-out/pageStartup.txt 2022-09-15 18:53:18.301002047 +0000
|
+--- HMI/n2t-out/pageStartup.txt 2022-09-17 13:59:14.951896133 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-15 18:53:18.749006644 +0000
|
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-09-17 13:59:15.403902750 +0000
|
||||||
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
|
+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
|
||||||
+--- HMI/n2t-out/pageTest.txt 2022-09-15 18:53:18.301002047 +0000
|
+--- HMI/n2t-out/pageTest.txt 2022-09-17 13:59:14.951896133 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-15 18:53:18.749006644 +0000
|
++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-09-17 13:59:15.403902750 +0000
|
||||||
+@@ -13,36 +13,6 @@
|
+@@ -13,36 +13,6 @@
|
||||||
+ Events
|
+ Events
|
||||||
+ Preinitialize Event
|
+ Preinitialize Event
|
||||||
@@ -176,8 +212,8 @@
|
|||||||
+- }
|
+- }
|
||||||
+-
|
+-
|
||||||
+diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
|
+diff -bur HMI/n2t-out/popupFan.txt HMI/US/portrait/n2t-out/popupFan.txt
|
||||||
+--- HMI/n2t-out/popupFan.txt 2022-09-15 18:53:18.301002047 +0000
|
+--- HMI/n2t-out/popupFan.txt 2022-09-17 13:59:14.951896133 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-15 18:53:18.749006644 +0000
|
++++ HMI/US/portrait/n2t-out/popupFan.txt 2022-09-17 13:59:15.403902750 +0000
|
||||||
+@@ -81,23 +81,23 @@
|
+@@ -81,23 +81,23 @@
|
||||||
+ Scope: local
|
+ Scope: local
|
||||||
+ Value: 0
|
+ Value: 0
|
||||||
|
|||||||
@@ -1507,9 +1507,9 @@ Button bText1
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 261
|
x coordinate : 261
|
||||||
y coordinate : 84
|
y coordinate : 74
|
||||||
Width : 166
|
Width : 166
|
||||||
Height : 30
|
Height : 50
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
Effect Time : 300
|
Effect Time : 300
|
||||||
@@ -1525,8 +1525,8 @@ Button bText1
|
|||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
State : unpressed
|
State : unpressed
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 45
|
||||||
Word wrap : disabled
|
Word wrap : enabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
Vertical Spacing : 0
|
Vertical Spacing : 0
|
||||||
|
|
||||||
@@ -1554,9 +1554,9 @@ Button bText2
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 261
|
x coordinate : 261
|
||||||
y coordinate : 140
|
y coordinate : 132
|
||||||
Width : 166
|
Width : 166
|
||||||
Height : 30
|
Height : 50
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
Effect Time : 300
|
Effect Time : 300
|
||||||
@@ -1572,8 +1572,8 @@ Button bText2
|
|||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
State : unpressed
|
State : unpressed
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 45
|
||||||
Word wrap : disabled
|
Word wrap : enabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
Vertical Spacing : 0
|
Vertical Spacing : 0
|
||||||
|
|
||||||
@@ -1601,9 +1601,9 @@ Button bText3
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 262
|
x coordinate : 262
|
||||||
y coordinate : 197
|
y coordinate : 188
|
||||||
Width : 166
|
Width : 166
|
||||||
Height : 30
|
Height : 50
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
Effect Time : 300
|
Effect Time : 300
|
||||||
@@ -1619,8 +1619,8 @@ Button bText3
|
|||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
State : unpressed
|
State : unpressed
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 45
|
||||||
Word wrap : disabled
|
Word wrap : enabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
Vertical Spacing : 0
|
Vertical Spacing : 0
|
||||||
|
|
||||||
@@ -1648,9 +1648,9 @@ Button bText4
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Opacity : 127
|
Opacity : 127
|
||||||
x coordinate : 262
|
x coordinate : 262
|
||||||
y coordinate : 254
|
y coordinate : 244
|
||||||
Width : 166
|
Width : 166
|
||||||
Height : 30
|
Height : 50
|
||||||
Effect : load
|
Effect : load
|
||||||
Effect Priority : 0
|
Effect Priority : 0
|
||||||
Effect Time : 300
|
Effect Time : 300
|
||||||
@@ -1666,8 +1666,8 @@ Button bText4
|
|||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
State : unpressed
|
State : unpressed
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 45
|
||||||
Word wrap : disabled
|
Word wrap : enabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
Vertical Spacing : 0
|
Vertical Spacing : 0
|
||||||
|
|
||||||
|
|||||||
@@ -786,7 +786,7 @@ Button bText1
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
State : unpressed
|
State : unpressed
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 45
|
||||||
|
|
||||||
Events
|
Events
|
||||||
Touch Press Event
|
Touch Press Event
|
||||||
@@ -811,7 +811,7 @@ Button bText2
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
State : unpressed
|
State : unpressed
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 45
|
||||||
|
|
||||||
Events
|
Events
|
||||||
Touch Press Event
|
Touch Press Event
|
||||||
@@ -836,7 +836,7 @@ Button bText3
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
State : unpressed
|
State : unpressed
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 45
|
||||||
|
|
||||||
Events
|
Events
|
||||||
Touch Press Event
|
Touch Press Event
|
||||||
@@ -861,7 +861,7 @@ Button bText4
|
|||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
State : unpressed
|
State : unpressed
|
||||||
Text :
|
Text :
|
||||||
Max. Text Size : 20
|
Max. Text Size : 45
|
||||||
|
|
||||||
Events
|
Events
|
||||||
Touch Press Event
|
Touch Press Event
|
||||||
|
|||||||
Reference in New Issue
Block a user