Skip to content

Commit 3ac6b66

Browse files
bor-Tbor-T
committed
File Dialog UI.
1 parent 23a0d42 commit 3ac6b66

File tree

7 files changed

+461
-415
lines changed

7 files changed

+461
-415
lines changed

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -219,30 +219,30 @@
219219
"file_list": "File list",
220220
"file_name": "File name",
221221
"file_preview": {
222-
"": "File preview",
223-
"audio_channels": "Audio channels:",
222+
"": "File properties",
223+
"audio_channiels": "Audio channels:",
224224
"auto_play": "Autoplay",
225225
"duration": "Duration:",
226-
"n_a": "n/a",
227-
"sample_format":
226+
"n_a": "--",
227+
"sample_format":
228228
{
229229
"": "Sample format:",
230230
"f32": "32-bit float",
231231
"f64": "64-bit float",
232-
"s16": "16-bit signed integer",
233-
"s24": "24-bit signed integer",
234-
"s32": "32-bit signed integer",
235-
"s8": "8-bit signed integer",
236-
"u16": "16-bit unsigned integer",
237-
"u24": "24-bit unsigned integer",
238-
"u32": "32-bit unsigned integer",
239-
"u8": "8-bit unsigned integer",
232+
"s16": "16-bit sint",
233+
"s24": "24-bit sint",
234+
"s32": "32-bit sint",
235+
"s8": "8-bit sint",
236+
"u16": "16-bit uint",
237+
"u24": "24-bit uint",
238+
"u32": "32-bit uint",
239+
"u8": "8-bit uint",
240240
"unknown": "unknown"
241241
},
242242
"sample_rate": "Sample rate:",
243-
"time_hms": "{@hour^0%2d}:{@min^0%2d}:{@sec^0%2d}.{@msec^0%3d}",
244-
"time_ms": "{@min^0%2d}:{@sec^0%2d}.{@msec^0%3d}",
245-
"time_s": "{@sec^0%2d}.{@msec^0%3d}"
243+
"time_hms": "{@hour}:{@min^0%2d}:{@sec^0%2d}.{@msec^0%3d} h",
244+
"time_ms": "{@min}:{@sec^0%2d}.{@msec^0%3d} m",
245+
"time_s": "{@sec}.{@msec^0%3d} s"
246246
},
247247
"filter": "Filter",
248248
"filters": "Filters",

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -219,30 +219,30 @@
219219
"file_list": "Список файлов",
220220
"file_name": "Имя файла",
221221
"file_preview": {
222-
"": "Предпросмотр",
222+
"": "Свойства файла",
223223
"audio_channels": "Аудиодорожек:",
224-
"auto_play": "Автовоспроизведение",
224+
"auto_play": "Автозапуск",
225225
"duration": "Длительность:",
226-
"n_a": "н/д",
227-
"sample_format":
226+
"n_a": "--",
227+
"sample_format":
228228
{
229229
"": "Формат семпла:",
230-
"f32": "вещественный, 32 бит",
231-
"f64": "вещественный, 64 бит",
232-
"s16": "целый знаковый, 16 бит",
233-
"s24": "целый знаковый, 24 бит",
234-
"s32": "целый знаковый, 32 бит",
235-
"s8": "целый беззнаковый, 8 бит",
236-
"u16": "целый беззнаковый, 16 бит",
237-
"u24": "целый беззнаковый, 24 бит",
238-
"u32": "целый беззнаковый, 32 бит",
239-
"u8": "целый беззнаковый, 8 бит",
230+
"f32": "32-bit float",
231+
"f64": "64-bit float",
232+
"s16": "16-bit sint",
233+
"s24": "24-bit sint",
234+
"s32": "32-bit sint",
235+
"s8": "8-bit sint",
236+
"u16": "16-bit uint",
237+
"u24": "24-bit uint",
238+
"u32": "32-bit uint",
239+
"u8": "8-bit uint",
240240
"unknown": "неизвестный"
241241
},
242-
"sample_rate": "Частота дискретизации:",
243-
"time_hms": "{@hour^0%2d}:{@min^0%2d}:{@sec^0%2d}.{@msec^0%3d}",
244-
"time_ms": "{@min^0%2d}:{@sec^0%2d}.{@msec^0%3d}",
245-
"time_s": "{@sec^0%2d}.{@msec^0%3d}"
242+
"sample_rate": "Дискретизация:",
243+
"time_hms": "{@hour}:{@min^0%2d}:{@sec^0%2d}.{@msec^0%3d} ч",
244+
"time_ms": "{@min}:{@sec^0%2d}.{@msec^0%3d} м",
245+
"time_s": "{@sec}.{@msec^0%3d} с"
246246
},
247247
"filter": "Фильтр",
248248
"filters": "Фильтры",
@@ -454,7 +454,7 @@
454454
"plug": {
455455
"calibrator": "Калибратор",
456456
"compressor": "Компрессор",
457-
"dyna_processor": "Динамический процессор",
457+
"dyna_processor": "Динамический процессор",
458458
"expander": "Экспандер",
459459
"gate": "Гейт",
460460
"latency_detector": "Детектор задержки",
@@ -626,7 +626,7 @@
626626
"specials": {
627627
"idx": "{@id}",
628628
"idx:": "{@id}:",
629-
"num": "№"
629+
"num": "№"
630630
},
631631
"spectrogram": "Спектрограмма",
632632
"spread": "Разброс",
@@ -713,4 +713,4 @@
713713

714714
"zone": "Зона",
715715
"zoom": "Масш"
716-
}
716+
}

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -219,30 +219,30 @@
219219
"file_list": "File list",
220220
"file_name": "File name",
221221
"file_preview": {
222-
"": "File preview",
222+
"": "File properties",
223223
"audio_channels": "Audio channels:",
224224
"auto_play": "Autoplay",
225225
"duration": "Duration:",
226-
"n_a": "n/a",
227-
"sample_format":
226+
"n_a": "--",
227+
"sample_format":
228228
{
229229
"": "Sample format:",
230230
"f32": "32-bit float",
231231
"f64": "64-bit float",
232-
"s16": "16-bit signed integer",
233-
"s24": "24-bit signed integer",
234-
"s32": "32-bit signed integer",
235-
"s8": "8-bit signed integer",
236-
"u16": "16-bit unsigned integer",
237-
"u24": "24-bit unsigned integer",
238-
"u32": "32-bit unsigned integer",
239-
"u8": "8-bit unsigned integer",
232+
"s16": "16-bit sint",
233+
"s24": "24-bit sint",
234+
"s32": "32-bit sint",
235+
"s8": "8-bit sint",
236+
"u16": "16-bit uint",
237+
"u24": "24-bit uint",
238+
"u32": "32-bit uint",
239+
"u8": "8-bit uint",
240240
"unknown": "unknown"
241241
},
242242
"sample_rate": "Sample rate:",
243-
"time_hms": "{@hour^0%2d}:{@min^0%2d}:{@sec^0%2d}.{@msec^0%3d}",
244-
"time_ms": "{@min^0%2d}:{@sec^0%2d}.{@msec^0%3d}",
245-
"time_s": "{@sec^0%2d}.{@msec^0%3d}"
243+
"time_hms": "{@hour}:{@min^0%2d}:{@sec^0%2d}.{@msec^0%3d} h",
244+
"time_ms": "{@min}:{@sec^0%2d}.{@msec^0%3d} m",
245+
"time_s": "{@sec}.{@msec^0%3d} s"
246246
},
247247
"filter": "Filter",
248248
"filters": "Filters",

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

Lines changed: 73 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@
288288
<as_ch8 value="#5d310c"/>
289289
<fade_in value="#2abecc"/>
290290
<fade_out value="#2abecc"/>
291-
<stretch value="#a49851" />
292-
<loop value="#23b270" />
291+
<stretch value="#a49851"/>
292+
<loop value="#23b270"/>
293293

294294
<!-- Cycle colors -->
295295
<cycle value="#d8412a"/>
@@ -300,14 +300,14 @@
300300
<graph_mesh_cycle value="#d8412a"/>
301301

302302
<!-- Stretch and loop colors -->
303-
<stretch_color avalue="#cca49851" />
304-
<stretch_border_color avalue="#44a49851" />
305-
<stretch_color_off avalue="#eea49851" />
306-
<stretch_border_color_off avalue="#bba49851" />
307-
<loop_color avalue="#dd23b270" />
308-
<loop_border_color avalue="#8823b270" />
309-
<loop_color_off avalue="#ee23b270" />
310-
<loop_border_color_off avalue="#bb23b270" />
303+
<stretch_color avalue="#cca49851"/>
304+
<stretch_border_color avalue="#44a49851"/>
305+
<stretch_color_off avalue="#eea49851"/>
306+
<stretch_border_color_off avalue="#bba49851"/>
307+
<loop_color avalue="#dd23b270"/>
308+
<loop_border_color avalue="#8823b270"/>
309+
<loop_color_off avalue="#ee23b270"/>
310+
<loop_border_color_off avalue="#bb23b270"/>
311311
</colors>
312312

313313
<!-- Root style -->
@@ -357,12 +357,12 @@
357357
<fade_in.border.color value="#882abecc"/>
358358
<fade_out.border.color value="#882abecc"/>
359359

360-
<stretch.color value="stretch_color" />
361-
<stretch.border.color value="stretch_border_color" />
362-
<loop.color value="loop_color" />
363-
<loop.border.color value="loop_border_color" />
364-
<play.border value="1" />
365-
<play.color value="bright_cyan" />
360+
<stretch.color value="stretch_color"/>
361+
<stretch.border.color value="stretch_border_color"/>
362+
<loop.color value="loop_color"/>
363+
<loop.border.color value="loop_border_color"/>
364+
<play.border value="1"/>
365+
<play.color value="bright_cyan"/>
366366
</style>
367367

368368
<style class="AudioSample" parents="root">
@@ -384,16 +384,16 @@
384384
<fade_in.border value="0"/>
385385
<fade_out.border value="0"/>
386386
<wave.border value="2"/>
387-
<stretch.border value="0" />
388-
<loop.border value="0" />
387+
<stretch.border value="0"/>
388+
<loop.border value="0"/>
389389

390-
<play.border value="1" />
391-
<play.color value="bright_cyan" />
390+
<play.border value="1"/>
391+
<play.color value="bright_cyan"/>
392392

393-
<stretch.color value="stretch_color" />
394-
<stretch.border.color value="stretch_border_color" />
395-
<loop.color value="loop_color" />
396-
<loop.border.color value="loop_border_color" />
393+
<stretch.color value="stretch_color"/>
394+
<stretch.border.color value="stretch_border_color"/>
395+
<loop.color value="loop_color"/>
396+
<loop.border.color value="loop_border_color"/>
397397

398398
<label.0.layout.halign value="-1"/>
399399
<label.0.layout.valign value="1"/>
@@ -1087,6 +1087,15 @@
10871087
<button.width value="4"/>
10881088
</style>
10891089

1090+
<style class="Fader_play" parents="Fader">
1091+
<button.border.size value="0"/>
1092+
<button.border.radius value="5"/>
1093+
<button.radius value="5"/>
1094+
<button.width value="8"/>
1095+
<button.color value="bg_name"/>
1096+
<button.aspect value="0.125" />
1097+
</style>
1098+
10901099
<style class="Graph" parents="root">
10911100
<glass.visibility value="false"/>
10921101
<border.color value="bg_name"/>
@@ -1574,39 +1583,39 @@
15741583
<style class="Switch" parents="root"></style>
15751584

15761585
<style class="Tab" parents="root">
1577-
<color value="bg_light" />
1578-
<selected.color value="bg_name" />
1579-
<hover.color value="bg_name" />
1586+
<color value="bg_light"/>
1587+
<selected.color value="bg_name"/>
1588+
<hover.color value="bg_name"/>
15801589

1581-
<border.color value="#888888" />
1582-
<border.selected.color value="#000000" />
1583-
<border.hover.color value="#eeeeee" />
1590+
<border.color value="#888888"/>
1591+
<border.selected.color value="#000000"/>
1592+
<border.hover.color value="#eeeeee"/>
15841593

1585-
<text.color value="text_tab" />
1586-
<text.selected.color value="text_group" />
1587-
<text.hover.color value="text_prim" />
1594+
<text.color value="text_tab"/>
1595+
<text.selected.color value="text_group"/>
1596+
<text.hover.color value="text_prim"/>
15881597

15891598
<text.padding.bottom value="0"/>
15901599
<text.padding.top value="0"/>
15911600

1592-
<border.size value="0" />
1593-
<border.radius value="4" />
1601+
<border.size value="0"/>
1602+
<border.radius value="4"/>
15941603
</style>
15951604

15961605
<style class="TabControl" parents="root">
1597-
<border.color value="bg_name" />
1598-
<heading.color value="bg_name" />
1599-
<heading.spacing.color value="bg_name" />
1600-
<heading.gap.color value="bg_schema" />
1601-
<border.size value="2" />
1602-
<border.radius value="10" />
1603-
<tab.spacing value="4" />
1604-
<head.spacing value="-1" />
1605-
<tab.joint value="true" />
1606-
<heading.spacing value="0" />
1607-
<heading.gap value="0" />
1608-
<heading.fill value="false" />
1609-
<heading.spacing.fill value="false" />
1606+
<border.color value="bg_name"/>
1607+
<heading.color value="bg_name"/>
1608+
<heading.spacing.color value="bg_name"/>
1609+
<heading.gap.color value="bg_schema"/>
1610+
<border.size value="2"/>
1611+
<border.radius value="10"/>
1612+
<tab.spacing value="4"/>
1613+
<head.spacing value="-1"/>
1614+
<tab.joint value="true"/>
1615+
<heading.spacing value="0"/>
1616+
<heading.gap value="0"/>
1617+
<heading.fill value="false"/>
1618+
<heading.spacing.fill value="false"/>
16101619
<pointer value="hand"/>
16111620
</style>
16121621

@@ -1634,26 +1643,32 @@
16341643
<style class="FileDialog::BookmarkBox" parents="Box"></style>
16351644

16361645
<style class="FileDialog::BookmarkLabel" parents="Label">
1637-
<allocation.hfill value="true" />
1638-
<text.layout.halign value="-1.0f" />
1646+
<allocation.hfill value="true"/>
1647+
<text.layout.halign value="-1.0f"/>
16391648
</style>
16401649

16411650
<style class="FileDialog::ExtCheck" parents="CheckBox">
16421651
<color value="text_prim"/>
16431652
</style>
16441653

16451654
<style class="FileDialog::FileList" parents="ListBox"></style>
1646-
1655+
1656+
<style class="FileDialog::PreviewAlign" parents="Align">
1657+
<allocation.hreduce value="true"/>
1658+
</style>
1659+
16471660
<style class="FileDialog::FilePreview::Heading" parents="Label">
1648-
<allocation.hfill value="true" />
1649-
<text.layout.halign value="-1" />
1650-
<font.bold value="true" />
1661+
<allocation.hfill value="false"/>
1662+
<text.layout.halign value="-1"/>
1663+
<font.bold value="true"/>
1664+
<text.color value="text_prim"/>
16511665
</style>
1652-
1666+
16531667
<style class="FileDialog::FilePreview::Value" parents="Label">
1654-
<allocation.hfill value="true" />
1655-
<padding.left value="16" />
1656-
<text.layout.halign value="-1" />
1668+
<allocation.hfill value="true"/>
1669+
<padding.left value="6"/>
1670+
<text.layout.halign value="1"/>
1671+
<text.color value="text_prim"/>
16571672
</style>
16581673

16591674
<style class="FileDialog::FilterComboBox" parents="ComboBox">

0 commit comments

Comments
 (0)