mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-22 07:24:24 +01:00
implemented localization for popup pages (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
b3fb86e427
commit
369e9af9cb
@@ -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-05-07 09:49:49.312383427 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-05-07 15:04:37.072926627 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 09:49:50.284371694 +0000
|
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 15:04:38.097005282 +0000
|
||||||
@@ -11,6 +11,4 @@
|
@@ -11,6 +11,4 @@
|
||||||
// dim value
|
// dim value
|
||||||
int dimValue=40
|
int dimValue=40
|
||||||
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/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/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-05-07 09:49:49.312383427 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:04:37.072926627 +0000
|
||||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 09:49:50.284371694 +0000
|
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 15:04:38.097005282 +0000
|
||||||
@@ -177,7 +177,7 @@
|
@@ -177,7 +177,7 @@
|
||||||
recmod=1
|
recmod=1
|
||||||
bauds=115200
|
bauds=115200
|
||||||
|
|||||||
@@ -10,22 +10,22 @@ pageTest
|
|||||||
13 Component(s)
|
13 Component(s)
|
||||||
13 Line(s) of event code
|
13 Line(s) of event code
|
||||||
13 Unique line(s) of event code
|
13 Unique line(s) of event code
|
||||||
pageStartup
|
|
||||||
19 Component(s)
|
|
||||||
150 Line(s) of event code
|
|
||||||
113 Unique line(s) of event code
|
|
||||||
popupShutter
|
|
||||||
20 Component(s)
|
|
||||||
193 Line(s) of event code
|
|
||||||
109 Unique line(s) of event code
|
|
||||||
popupLight
|
popupLight
|
||||||
27 Component(s)
|
27 Component(s)
|
||||||
341 Line(s) of event code
|
341 Line(s) of event code
|
||||||
185 Unique line(s) of event code
|
185 Unique line(s) of event code
|
||||||
|
popupShutter
|
||||||
|
20 Component(s)
|
||||||
|
193 Line(s) of event code
|
||||||
|
109 Unique line(s) of event code
|
||||||
popupNotify
|
popupNotify
|
||||||
17 Component(s)
|
17 Component(s)
|
||||||
196 Line(s) of event code
|
196 Line(s) of event code
|
||||||
123 Unique line(s) of event code
|
123 Unique line(s) of event code
|
||||||
|
pageStartup
|
||||||
|
19 Component(s)
|
||||||
|
150 Line(s) of event code
|
||||||
|
113 Unique line(s) of event code
|
||||||
cardThermo
|
cardThermo
|
||||||
41 Component(s)
|
41 Component(s)
|
||||||
444 Line(s) of event code
|
444 Line(s) of event code
|
||||||
|
|||||||
@@ -402,7 +402,7 @@ Text tVersion
|
|||||||
Horizontal Alignment : center
|
Horizontal Alignment : center
|
||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
Input Type : character
|
Input Type : character
|
||||||
Text : 33
|
Text : 34
|
||||||
Max. Text Size : 10
|
Max. Text Size : 10
|
||||||
Word wrap : disabled
|
Word wrap : disabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
|
|||||||
@@ -886,7 +886,7 @@ Timer tmSerial
|
|||||||
// set t4 Temperature (Localization)
|
// set t4 Temperature (Localization)
|
||||||
spstr strCommand.txt,t4.txt,"~",7
|
spstr strCommand.txt,t4.txt,"~",7
|
||||||
// set t1 Brightness (Localization)
|
// set t1 Brightness (Localization)
|
||||||
spstr strCommand.txt,t0.txt,"~",8
|
spstr strCommand.txt,t1.txt,"~",8
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ Text tVersion
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Associated Keyboard : none
|
Associated Keyboard : none
|
||||||
Text : 33
|
Text : 34
|
||||||
Max. Text Size : 10
|
Max. Text Size : 10
|
||||||
|
|
||||||
Picture p0
|
Picture p0
|
||||||
|
|||||||
@@ -540,7 +540,7 @@ Timer tmSerial
|
|||||||
// set t4 Temperature (Localization)
|
// set t4 Temperature (Localization)
|
||||||
spstr strCommand.txt,t4.txt,"~",7
|
spstr strCommand.txt,t4.txt,"~",7
|
||||||
// set t1 Brightness (Localization)
|
// set t1 Brightness (Localization)
|
||||||
spstr strCommand.txt,t0.txt,"~",8
|
spstr strCommand.txt,t1.txt,"~",8
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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-05-07 09:49:49.312383427 +0000
|
--- HMI/n2t-out/Program.s.txt 2022-05-07 15:04:37.072926627 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 09:49:49.792377633 +0000
|
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:04:37.528961499 +0000
|
||||||
@@ -11,6 +11,6 @@
|
@@ -11,6 +11,6 @@
|
||||||
// dim value
|
// dim value
|
||||||
int dimValue=40
|
int dimValue=40
|
||||||
@@ -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-05-07 09:49:49.316383378 +0000
|
--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:04:37.076926933 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 09:49:49.792377633 +0000
|
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:04:37.528961499 +0000
|
||||||
@@ -62,6 +62,16 @@
|
@@ -62,6 +62,16 @@
|
||||||
vis bText4,0
|
vis bText4,0
|
||||||
vis hSlider4,0
|
vis hSlider4,0
|
||||||
@@ -427,8 +427,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
|||||||
if(tInstruction.txt=="pageType")
|
if(tInstruction.txt=="pageType")
|
||||||
{
|
{
|
||||||
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-05-07 09:49:49.312383427 +0000
|
--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:04:37.072926627 +0000
|
||||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 09:49:49.792377633 +0000
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:04:37.528961499 +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
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 09:49:49.808377439 +0000
|
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 15:04:37.624968840 +0000
|
||||||
+--- HMI/n2t-out/Program.s.txt 2022-05-07 09:49:49.312383427 +0000
|
+--- HMI/n2t-out/Program.s.txt 2022-05-07 15:04:37.072926627 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 09:49:49.792377633 +0000
|
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:04:37.528961499 +0000
|
||||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-07 09:49:49.316383378 +0000
|
+--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:04:37.076926933 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 09:49:49.792377633 +0000
|
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:04:37.528961499 +0000
|
||||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-07 09:49:49.312383427 +0000
|
+--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:04:37.072926627 +0000
|
||||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 09:49:49.792377633 +0000
|
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:04:37.528961499 +0000
|
||||||
|
|||||||
@@ -14,10 +14,6 @@ popupNotify
|
|||||||
17 Component(s)
|
17 Component(s)
|
||||||
196 Line(s) of event code
|
196 Line(s) of event code
|
||||||
123 Unique line(s) of event code
|
123 Unique line(s) of event code
|
||||||
pageStartup
|
|
||||||
19 Component(s)
|
|
||||||
150 Line(s) of event code
|
|
||||||
113 Unique line(s) of event code
|
|
||||||
popupShutter
|
popupShutter
|
||||||
20 Component(s)
|
20 Component(s)
|
||||||
193 Line(s) of event code
|
193 Line(s) of event code
|
||||||
@@ -26,10 +22,18 @@ cardGrid
|
|||||||
39 Component(s)
|
39 Component(s)
|
||||||
420 Line(s) of event code
|
420 Line(s) of event code
|
||||||
246 Unique line(s) of event code
|
246 Unique line(s) of event code
|
||||||
|
pageStartup
|
||||||
|
19 Component(s)
|
||||||
|
150 Line(s) of event code
|
||||||
|
113 Unique line(s) of event code
|
||||||
screensaver
|
screensaver
|
||||||
35 Component(s)
|
35 Component(s)
|
||||||
292 Line(s) of event code
|
292 Line(s) of event code
|
||||||
235 Unique line(s) of event code
|
235 Unique line(s) of event code
|
||||||
|
popupLight
|
||||||
|
27 Component(s)
|
||||||
|
341 Line(s) of event code
|
||||||
|
185 Unique line(s) of event code
|
||||||
cardMedia
|
cardMedia
|
||||||
30 Component(s)
|
30 Component(s)
|
||||||
331 Line(s) of event code
|
331 Line(s) of event code
|
||||||
@@ -38,10 +42,6 @@ cardAlarm
|
|||||||
35 Component(s)
|
35 Component(s)
|
||||||
345 Line(s) of event code
|
345 Line(s) of event code
|
||||||
216 Unique line(s) of event code
|
216 Unique line(s) of event code
|
||||||
popupLight
|
|
||||||
27 Component(s)
|
|
||||||
341 Line(s) of event code
|
|
||||||
185 Unique line(s) of event code
|
|
||||||
cardThermo
|
cardThermo
|
||||||
41 Component(s)
|
41 Component(s)
|
||||||
444 Line(s) of event code
|
444 Line(s) of event code
|
||||||
|
|||||||
@@ -402,7 +402,7 @@ Text tVersion
|
|||||||
Horizontal Alignment : center
|
Horizontal Alignment : center
|
||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
Input Type : character
|
Input Type : character
|
||||||
Text : 33
|
Text : 34
|
||||||
Max. Text Size : 10
|
Max. Text Size : 10
|
||||||
Word wrap : disabled
|
Word wrap : disabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
|
|||||||
@@ -886,7 +886,7 @@ Timer tmSerial
|
|||||||
// set t4 Temperature (Localization)
|
// set t4 Temperature (Localization)
|
||||||
spstr strCommand.txt,t4.txt,"~",7
|
spstr strCommand.txt,t4.txt,"~",7
|
||||||
// set t1 Brightness (Localization)
|
// set t1 Brightness (Localization)
|
||||||
spstr strCommand.txt,t0.txt,"~",8
|
spstr strCommand.txt,t1.txt,"~",8
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ Text tVersion
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Associated Keyboard : none
|
Associated Keyboard : none
|
||||||
Text : 33
|
Text : 34
|
||||||
Max. Text Size : 10
|
Max. Text Size : 10
|
||||||
|
|
||||||
Picture p0
|
Picture p0
|
||||||
|
|||||||
@@ -540,7 +540,7 @@ Timer tmSerial
|
|||||||
// set t4 Temperature (Localization)
|
// set t4 Temperature (Localization)
|
||||||
spstr strCommand.txt,t4.txt,"~",7
|
spstr strCommand.txt,t4.txt,"~",7
|
||||||
// set t1 Brightness (Localization)
|
// set t1 Brightness (Localization)
|
||||||
spstr strCommand.txt,t0.txt,"~",8
|
spstr strCommand.txt,t1.txt,"~",8
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -402,7 +402,7 @@ Text tVersion
|
|||||||
Horizontal Alignment : center
|
Horizontal Alignment : center
|
||||||
Vertical Alignment : center
|
Vertical Alignment : center
|
||||||
Input Type : character
|
Input Type : character
|
||||||
Text : 33
|
Text : 34
|
||||||
Max. Text Size : 10
|
Max. Text Size : 10
|
||||||
Word wrap : disabled
|
Word wrap : disabled
|
||||||
Horizontal Spacing : 0
|
Horizontal Spacing : 0
|
||||||
|
|||||||
@@ -886,7 +886,7 @@ Timer tmSerial
|
|||||||
// set t4 Temperature (Localization)
|
// set t4 Temperature (Localization)
|
||||||
spstr strCommand.txt,t4.txt,"~",7
|
spstr strCommand.txt,t4.txt,"~",7
|
||||||
// set t1 Brightness (Localization)
|
// set t1 Brightness (Localization)
|
||||||
spstr strCommand.txt,t0.txt,"~",8
|
spstr strCommand.txt,t1.txt,"~",8
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ Text tVersion
|
|||||||
Disable release event after dragging: 0
|
Disable release event after dragging: 0
|
||||||
Send Component ID : disabled
|
Send Component ID : disabled
|
||||||
Associated Keyboard : none
|
Associated Keyboard : none
|
||||||
Text : 33
|
Text : 34
|
||||||
Max. Text Size : 10
|
Max. Text Size : 10
|
||||||
|
|
||||||
Picture p0
|
Picture p0
|
||||||
|
|||||||
@@ -540,7 +540,7 @@ Timer tmSerial
|
|||||||
// set t4 Temperature (Localization)
|
// set t4 Temperature (Localization)
|
||||||
spstr strCommand.txt,t4.txt,"~",7
|
spstr strCommand.txt,t4.txt,"~",7
|
||||||
// set t1 Brightness (Localization)
|
// set t1 Brightness (Localization)
|
||||||
spstr strCommand.txt,t0.txt,"~",8
|
spstr strCommand.txt,t1.txt,"~",8
|
||||||
}
|
}
|
||||||
if(tInstruction.txt=="time")
|
if(tInstruction.txt=="time")
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user