Skip to content

Commit d4892a3

Browse files
bor-Tbor-T
committed
UPD labels and colors
1 parent 703be6c commit d4892a3

File tree

6 files changed

+67
-1
lines changed

6 files changed

+67
-1
lines changed

‎res/main/i18n/default/labels.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
"M_ute": "M",
110110
"OFF": "OFF",
111111
"ON": "ON",
112+
"ON_num_id": "ON {@id}",
112113
"P_hase": "P",
113114
"R_ight": "R",
114115
"R_ight:": "R:",

‎res/main/i18n/ru/labels.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
"M_ute": "Г",
111111
"OFF": "ВЫКЛ",
112112
"ON": "ВКЛ",
113+
"ON_num_id": "ВКЛ {@id}",
113114
"P_hase": "Ф",
114115
"R_ight": "П",
115116
"R_ight:": "П:",

‎res/main/i18n/us/labels.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@
108108
"M_id:": "M:",
109109
"M_ute": "M",
110110
"OFF": "OFF",
111-
"ON": "ON",
111+
"ON": "ON",
112+
"ON_num_id": "ON {@id}",
112113
"P_hase": "P",
113114
"R_ight": "R",
114115
"R_ight:": "R:",

‎res/main/schema/legacy-dark.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<dark_violet value="#8a1ab7"/>
5555
<dark_magenta value="#943059"/>
5656
<dark_gray value="#606173"/>
57+
<darker_gray value="#373843"/>
5758

5859
<!-- ChannelGroup -->
5960

@@ -552,6 +553,18 @@
552553
<led.color value="gray"/>
553554
</style>
554555

556+
<style class="Button_inactive" parents="Button">
557+
<down.color value="darker_gray"/>
558+
<down.hover.color value="darker_gray"/>
559+
560+
<text.down.color value="gray"/>
561+
<text.down.hover.color value="gray"/>
562+
563+
<border.down.color value="gray"/>
564+
<border.down.hover.color value="dark_gray"/>
565+
<led.color value="dark_gray"/>
566+
</style>
567+
555568
<style class="Button_red" parents="Button">
556569
<down.color value="dark_red"/>
557570
<down.hover.color value="dark_red"/>
@@ -850,6 +863,10 @@
850863
<font.size value="8"/>
851864
</style>
852865

866+
<style class="Button_inactive_8" parents="Button_inactive">
867+
<font.size value="8"/>
868+
</style>
869+
853870
<style class="Button_red_8" parents="Button_red">
854871
<font.size value="8"/>
855872
</style>
@@ -910,6 +927,10 @@
910927
<font.size value="6"/>
911928
</style>
912929

930+
<style class="Button_inactive_6" parents="Button_inactive">
931+
<font.size value="6"/>
932+
</style>
933+
913934
<style class="Button_red_6" parents="Button_red">
914935
<font.size value="6"/>
915936
</style>

‎res/main/schema/legacy.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<dark_violet value="#8800d2"/>
5555
<dark_magenta value="#d200d2"/>
5656
<dark_gray value="#444444"/>
57+
<darker_gray value="#333333"/>
5758

5859
<!-- ChannelGroup -->
5960

@@ -556,6 +557,18 @@
556557
<led.color value="gray"/>
557558
</style>
558559

560+
<style class="Button_inactive" parents="Button">
561+
<down.color value="darker_gray"/>
562+
<down.hover.color value="darker_gray"/>
563+
564+
<text.down.color value="gray"/>
565+
<text.down.hover.color value="gray"/>
566+
567+
<border.down.color value="gray"/>
568+
<border.down.hover.color value="dark_gray"/>
569+
<led.color value="dark_gray"/>
570+
</style>
571+
559572
<style class="Button_red" parents="Button">
560573

561574
<down.color value="bright_red"/>
@@ -861,6 +874,10 @@
861874
<font.size value="8"/>
862875
</style>
863876

877+
<style class="Button_inactive_8" parents="Button_inactive">
878+
<font.size value="8"/>
879+
</style>
880+
864881
<style class="Button_red_8" parents="Button_red">
865882
<font.size value="8"/>
866883
</style>
@@ -921,6 +938,10 @@
921938
<font.size value="6"/>
922939
</style>
923940

941+
<style class="Button_inactive_6" parents="Button_inactive">
942+
<font.size value="6"/>
943+
</style>
944+
924945
<style class="Button_red_6" parents="Button_red">
925946
<font.size value="6"/>
926947
</style>

‎res/main/schema/modern.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<dark_violet value="#8a1ab7"/>
5555
<dark_magenta value="#943059"/>
5656
<dark_gray value="#606173"/>
57+
<darker_gray value="#373843"/>
5758

5859
<!-- ChannelGroup -->
5960

@@ -537,6 +538,18 @@
537538
<led.color value="gray"/>
538539
</style>
539540

541+
<style class="Button_inactive" parents="Button">
542+
<down.color value="darker_gray"/>
543+
<down.hover.color value="darker_gray"/>
544+
545+
<text.down.color value="gray"/>
546+
<text.down.hover.color value="gray"/>
547+
548+
<border.down.color value="gray"/>
549+
<border.down.hover.color value="dark_gray"/>
550+
<led.color value="dark_gray"/>
551+
</style>
552+
540553
<style class="Button_red" parents="Button">
541554
<down.color value="dark_red"/>
542555
<down.hover.color value="dark_red"/>
@@ -835,6 +848,10 @@
835848
<font.size value="8"/>
836849
</style>
837850

851+
<style class="Button_inactive_8" parents="Button_inactive">
852+
<font.size value="8"/>
853+
</style>
854+
838855
<style class="Button_red_8" parents="Button_red">
839856
<font.size value="8"/>
840857
</style>
@@ -895,6 +912,10 @@
895912
<font.size value="6"/>
896913
</style>
897914

915+
<style class="Button_inactive_6" parents="Button_inactive">
916+
<font.size value="6"/>
917+
</style>
918+
898919
<style class="Button_red_6" parents="Button_red">
899920
<font.size value="6"/>
900921
</style>

0 commit comments

Comments
 (0)