godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70304 from MarcusElg/audioimportnaming 

Fix inconsistent audio import menu naming
This commit is contained in:
Rémi Verschelde 2022-12-20 10:33:00 +01:00
parent 5d97889d1a 7f88943483
commit 05f479736b
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/import/audio_stream_import_settings.cpp
View File

@ -552,7 +552,7 @@ AudioStreamImportSettings::AudioStreamImportSettings() {
bpm_edit->connect("value_changed", callable_mp(this, &AudioStreamImportSettings::_settings_changed).unbind(1)); bpm_edit->connect("value_changed", callable_mp(this, &AudioStreamImportSettings::_settings_changed).unbind(1));
interactive_hb->add_child(bpm_edit); interactive_hb->add_child(bpm_edit);
interactive_hb->add_spacer(); interactive_hb->add_spacer();
bar_beats_label = memnew(Label(TTR("Beats/Bar:"))); bar_beats_label = memnew(Label(TTR("Bar Beats:")));
interactive_hb->add_child(bar_beats_label); interactive_hb->add_child(bar_beats_label);
bar_beats_edit = memnew(SpinBox); bar_beats_edit = memnew(SpinBox);
bar_beats_edit->set_tooltip_text(TTR("Configure the Beats Per Bar. This used for music-aware transitions between AudioStreams.")); bar_beats_edit->set_tooltip_text(TTR("Configure the Beats Per Bar. This used for music-aware transitions between AudioStreams."));
@ -562,7 +562,7 @@ AudioStreamImportSettings::AudioStreamImportSettings() {
interactive_hb->add_child(bar_beats_edit); interactive_hb->add_child(bar_beats_edit);
interactive_hb->add_spacer(); interactive_hb->add_spacer();
beats_enabled = memnew(CheckBox); beats_enabled = memnew(CheckBox);
beats_enabled->set_text(TTR("Length (in beats):")); beats_enabled->set_text(TTR("Beat Count:"));
beats_enabled->connect("toggled", callable_mp(this, &AudioStreamImportSettings::_settings_changed).unbind(1)); beats_enabled->connect("toggled", callable_mp(this, &AudioStreamImportSettings::_settings_changed).unbind(1));
interactive_hb->add_child(beats_enabled); interactive_hb->add_child(beats_enabled);
beats_edit = memnew(SpinBox); beats_edit = memnew(SpinBox);