Skip to content

Commit 23a0d42

Browse files
sadko4usadko4u
committed
Merge remote-tracking branch 'origin/github-issue-164' into devel
* Added audio file preview template. * Updated styles. * Updated localization files.
2 parents b735566 + 08407cd commit 23a0d42

File tree

14 files changed

+165
-3
lines changed

14 files changed

+165
-3
lines changed

‎CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
*******************************************************************************
44

55
=== 1.0.5 ===
6+
* Added audio file preview template.
7+
* Updated styles.
8+
* Updated localization files.
69

710
=== 1.0.4 ===
811
* Updated visual styles.

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
"export_settings_to_clipboard": "Export settings to clipboard",
3030
"export_settings_to_file": "Export settings to file...",
3131

32+
"file_preview": {
33+
"pause": "Pause",
34+
"play": "Play",
35+
"stop": "Stop"
36+
},
37+
3238
"font_scaling": {
3339
"select": "Font scaling",
3440
"value:pc": "{@value} %",

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

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,32 @@
218218
},
219219
"file_list": "File list",
220220
"file_name": "File name",
221-
"file_preview": "File preview",
221+
"file_preview": {
222+
"": "File preview",
223+
"audio_channels": "Audio channels:",
224+
"auto_play": "Autoplay",
225+
"duration": "Duration:",
226+
"n_a": "n/a",
227+
"sample_format":
228+
{
229+
"": "Sample format:",
230+
"f32": "32-bit float",
231+
"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",
240+
"unknown": "unknown"
241+
},
242+
"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}"
246+
},
222247
"filter": "Filter",
223248
"filters": "Filters",
224249

@@ -675,6 +700,7 @@
675700
"fmt_value": "{@value}",
676701
"selected": "Selected",
677702
"worst": "Worst",
703+
"x_hz": "{@value} Hz",
678704
"x_k": "{@value}k",
679705
"x_khz": "{@value} kHz",
680706
"x_pc": "{@value%.2f} %"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,7 @@
551551
"fmt_value": "{@value}",
552552
"selected": "Seleccionado",
553553
"worst": "Peor",
554+
"x_hz": "{@value} Hz",
554555
"x_k": "{@value}k",
555556
"x_khz": "{@value} kHz",
556557
"x_pc": "{@value%.2f} %"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,7 @@
620620
"fmt_value": "{@value}",
621621
"selected": "Sélectionné",
622622
"worst": "Pire",
623+
"x_hz": "{@value} Hz",
623624
"x_k": "{@value}k",
624625
"x_khz": "{@value} kHz",
625626
"x_pc": "{@value%.2f} %"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,7 @@
655655
"fmt_value": "{@value}",
656656
"selected": "Selezionato",
657657
"worst": "Peggiore",
658+
"x_hz": "{@value} Hz",
658659
"x_k": "{@value}k",
659660
"x_khz": "{@value} kHz",
660661
"x_pc": "{@value%.2f} %"

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@
2929
"export_settings_to_clipboard": "Экпорт настроек в буфер обмена",
3030
"export_settings_to_file": "Экспорт настроек в файл...",
3131

32+
"file_preview": {
33+
"pause": "Пауза",
34+
"play": "Играть",
35+
"stop": "Стоп"
36+
},
37+
3238
"font_scaling": {
3339
"select": "Масштаб шрифтов",
3440
"value:pc": "{@value} %",

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

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,32 @@
218218
},
219219
"file_list": "Список файлов",
220220
"file_name": "Имя файла",
221-
"file_preview": "Предпросмотр",
221+
"file_preview": {
222+
"": "Предпросмотр",
223+
"audio_channels": "Аудиодорожек:",
224+
"auto_play": "Автовоспроизведение",
225+
"duration": "Длительность:",
226+
"n_a": "н/д",
227+
"sample_format":
228+
{
229+
"": "Формат семпла:",
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 бит",
240+
"unknown": "неизвестный"
241+
},
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}"
246+
},
222247
"filter": "Фильтр",
223248
"filters": "Фильтры",
224249

@@ -668,6 +693,7 @@
668693
"fmt_value": "{@value}",
669694
"selected": "Выбранное",
670695
"worst": "Худшее",
696+
"x_hz": "{@value} Гц",
671697
"x_k": "{@value}к",
672698
"x_khz": "{@value} кГц",
673699
"x_pc": "{@value%.2f} %"

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

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,32 @@
218218
},
219219
"file_list": "File list",
220220
"file_name": "File name",
221-
"file_preview": "File preview",
221+
"file_preview": {
222+
"": "File preview",
223+
"audio_channels": "Audio channels:",
224+
"auto_play": "Autoplay",
225+
"duration": "Duration:",
226+
"n_a": "n/a",
227+
"sample_format":
228+
{
229+
"": "Sample format:",
230+
"f32": "32-bit float",
231+
"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",
240+
"unknown": "unknown"
241+
},
242+
"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}"
246+
},
222247
"filter": "Filter",
223248
"filters": "Filters",
224249

@@ -669,6 +694,7 @@
669694
"fmt_value": "{@value}",
670695
"selected": "Selected",
671696
"worst": "Worst",
697+
"x_hz": "{@value} Hz",
672698
"x_k": "{@value}k",
673699
"x_khz": "{@value} kHz",
674700
"x_pc": "{@value%.2f} %"

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,6 +1643,18 @@
16431643
</style>
16441644

16451645
<style class="FileDialog::FileList" parents="ListBox"></style>
1646+
1647+
<style class="FileDialog::FilePreview::Heading" parents="Label">
1648+
<allocation.hfill value="true" />
1649+
<text.layout.halign value="-1" />
1650+
<font.bold value="true" />
1651+
</style>
1652+
1653+
<style class="FileDialog::FilePreview::Value" parents="Label">
1654+
<allocation.hfill value="true" />
1655+
<padding.left value="16" />
1656+
<text.layout.halign value="-1" />
1657+
</style>
16461658

16471659
<style class="FileDialog::FilterComboBox" parents="ComboBox">
16481660
<border.color value="border_color"/>

‎res/main/schema/legacy.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,6 +1649,18 @@
16491649
</style>
16501650

16511651
<style class="FileDialog::FileList" parents="ListBox"></style>
1652+
1653+
<style class="FileDialog::FilePreview::Heading" parents="Label">
1654+
<allocation.hfill value="true" />
1655+
<text.layout.halign value="-1" />
1656+
<font.bold value="true" />
1657+
</style>
1658+
1659+
<style class="FileDialog::FilePreview::Value" parents="Label">
1660+
<allocation.hfill value="true" />
1661+
<padding.left value="16" />
1662+
<text.layout.halign value="-1" />
1663+
</style>
16521664

16531665
<style class="FileDialog::FilterComboBox" parents="ComboBox">
16541666
<color value="bg_name"/>

‎res/main/schema/modern.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,6 +1635,18 @@
16351635
</style>
16361636

16371637
<style class="FileDialog::FileList" parents="ListBox"></style>
1638+
1639+
<style class="FileDialog::FilePreview::Heading" parents="Label">
1640+
<allocation.hfill value="true" />
1641+
<text.layout.halign value="-1" />
1642+
<font.bold value="true" />
1643+
</style>
1644+
1645+
<style class="FileDialog::FilePreview::Value" parents="Label">
1646+
<allocation.hfill value="true" />
1647+
<padding.left value="16" />
1648+
<text.layout.halign value="-1" />
1649+
</style>
16381650

16391651
<style class="FileDialog::FilterComboBox" parents="ComboBox">
16401652
<color value="bg_light"/>

‎res/main/ui/about.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
<?xml version="1.0"?>
2+
13
<window ui:inject="AboutDialog" title="titles.about">
24
<grid rows="2" cols="2" spacing="8" expand="true" fill="true">
35
<align halign="0" valign="-1">

‎res/main/ui/audio_file_preview.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0"?>
2+
3+
<preview halign="-1" valign="-1">
4+
<vbox>
5+
<label ui:inject="FileDialog::FilePreview::Heading" text="labels.file_preview.audio_channels" hfill="true" />
6+
<label ui:inject="FileDialog::FilePreview::Value" ui:id="audio_channels" />
7+
<label ui:inject="FileDialog::FilePreview::Heading" text="labels.file_preview.sample_rate" />
8+
<label ui:inject="FileDialog::FilePreview::Value" ui:id="sample_rate" />
9+
<label ui:inject="FileDialog::FilePreview::Heading" text="labels.file_preview.sample_format" />
10+
<label ui:inject="FileDialog::FilePreview::Value" ui:id="sample_format" />
11+
<label ui:inject="FileDialog::FilePreview::Heading" text="labels.file_preview.duration" />
12+
<label ui:inject="FileDialog::FilePreview::Value" ui:id="duration" />
13+
14+
<grid rows="3" cols="2">
15+
<cell cols="2">
16+
<fader ui:id="play_position" />
17+
</cell>
18+
<button ui:id="play_pause" text="actions.file_preview.play" />
19+
<button ui:id="stop" text="actions.file_preview.stop" />
20+
<cell cols="2">
21+
<hbox>
22+
<check ui:id="auto_play" id="_ui_preview_auto_play" />
23+
<label text="labels.file_preview.auto_play" />
24+
</hbox>
25+
</cell>
26+
</grid>
27+
</vbox>
28+
</preview>

0 commit comments

Comments
 (0)