Skip to content

Commit 17d5614

Browse files
sadko4usadko4u
committed
Merge remote-tracking branch 'origin/github-issue-204' into devel
* Merged changes related to the Multisampler.
2 parents 3aefeb3 + f821a21 commit 17d5614

File tree

6 files changed

+80
-11
lines changed

6 files changed

+80
-11
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,8 @@
374374

375375
"mute": "Mute",
376376
"muting": "Muting",
377+
378+
"name": "Name",
377379

378380
"noise_floor": "Noise Floor",
379381
"noise_floor_left": "Noise Floor Left",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,8 @@
372372

373373
"mute": "Глушение",
374374
"muting": "Глушение",
375+
376+
"name": "Название",
375377

376378
"noise_floor": "Шумовой порог",
377379
"noise_floor_left": "Шумовой порог левый",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,8 @@
374374

375375
"mute": "Mute",
376376
"muting": "Muting",
377+
378+
"name": "Name",
377379

378380
"noise_floor": "Noise Floor",
379381
"noise_floor_left": "Noise Floor Left",

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

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,9 +1007,9 @@
10071007
<border.gap.size value="1"/>
10081008
<border.radius value="5"/>
10091009
<color value="bg_light"/>
1010-
<text.color value="text_sec"/>
1011-
<cursor.color value="text_sec"/>
1012-
<border.color value="border_color"/>
1010+
<text.color value="text_prim"/>
1011+
<cursor.color value="text_prim"/>
1012+
<border.color value="bg"/>
10131013
<border.gap.color value="bg_light"/>
10141014
</style>
10151015

@@ -1565,7 +1565,27 @@
15651565

15661566
<style class="FileDialog::OptionSeparator" parents="Separator"></style>
15671567

1568-
<style class="FileDialog::Path" parents="Edit"></style>
1568+
<style class="FileDialog::Path" parents="Edit">
1569+
<border.size value="1"/>
1570+
<border.gap.size value="1"/>
1571+
<border.radius value="5"/>
1572+
<color value="bg_light"/>
1573+
<text.color value="text_sec"/>
1574+
<cursor.color value="text_sec"/>
1575+
<border.color value="border_color"/>
1576+
<border.gap.color value="bg_light"/>
1577+
</style>
1578+
1579+
<style class="FileDialog::Search" parents="Edit">
1580+
<border.size value="1"/>
1581+
<border.gap.size value="1"/>
1582+
<border.radius value="5"/>
1583+
<color value="bg_light"/>
1584+
<text.color value="text_sec"/>
1585+
<cursor.color value="text_sec"/>
1586+
<border.color value="border_color"/>
1587+
<border.gap.color value="bg_light"/>
1588+
</style>
15691589

15701590
<style class="FileDialog::Warning" parents="root">
15711591
<text.color value="warn"/>

‎res/main/schema/legacy.xml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1573,7 +1573,29 @@
15731573

15741574
<style class="FileDialog::OptionSeparator" parents="Separator"></style>
15751575

1576-
<style class="FileDialog::Path" parents="Edit"></style>
1576+
<style class="FileDialog::Path" parents="Edit">
1577+
<border.size value="1"/>
1578+
<border.gap.size value="1"/>
1579+
<border.radius value="5"/>
1580+
1581+
<color value="bg_name"/>
1582+
<text.color value="bg"/>
1583+
<cursor.color value="bg"/>
1584+
<border.color value="bg"/>
1585+
<border.gap.color value="bg_name"/>
1586+
</style>
1587+
1588+
<style class="FileDialog::Search" parents="Edit">
1589+
<border.size value="1"/>
1590+
<border.gap.size value="1"/>
1591+
<border.radius value="5"/>
1592+
1593+
<color value="bg_name"/>
1594+
<text.color value="bg"/>
1595+
<cursor.color value="bg"/>
1596+
<border.color value="bg"/>
1597+
<border.gap.color value="bg_name"/>
1598+
</style>
15771599

15781600
<style class="FileDialog::Warning" parents="root">
15791601
<text.color value="warn"/>

‎res/main/schema/modern.xml

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -989,14 +989,15 @@
989989
</style>
990990

991991
<style class="Edit" parents="root">
992-
<border.size value="1"/>
993-
<border.gap.size value="2"/>
992+
<border.size value="0"/>
993+
<border.gap.size value="3"/>
994994
<border.radius value="0"/>
995-
<color value="bg_light"/>
995+
<color value="bg"/>
996996
<text.color value="text_sec"/>
997+
<border.color value="bg_light"/>
997998
<cursor.color value="text_sec"/>
998-
<border.color value="border_color"/>
999-
<border.gap.color value="bg_light"/>
999+
<border.gap.color value="bg"/>
1000+
<bg.inherit value="true"/>
10001001
</style>
10011002

10021003
<style class="Fader" parents="root">
@@ -1560,7 +1561,27 @@
15601561

15611562
<style class="FileDialog::OptionSeparator" parents="Separator"></style>
15621563

1563-
<style class="FileDialog::Path" parents="Edit"></style>
1564+
<style class="FileDialog::Path" parents="Edit">
1565+
<border.size value="1"/>
1566+
<border.gap.size value="2"/>
1567+
<border.radius value="0"/>
1568+
<color value="bg_light"/>
1569+
<text.color value="text_sec"/>
1570+
<cursor.color value="text_sec"/>
1571+
<border.color value="border_color"/>
1572+
<border.gap.color value="bg_light"/>
1573+
</style>
1574+
1575+
<style class="FileDialog::Search" parents="Edit">
1576+
<border.size value="1"/>
1577+
<border.gap.size value="2"/>
1578+
<border.radius value="0"/>
1579+
<color value="bg_light"/>
1580+
<text.color value="text_sec"/>
1581+
<cursor.color value="text_sec"/>
1582+
<border.color value="border_color"/>
1583+
<border.gap.color value="bg_light"/>
1584+
</style>
15641585

15651586
<style class="FileDialog::Warning" parents="root">
15661587
<text.color value="warn"/>

0 commit comments

Comments
 (0)