From d35faf34bac1785ae5c94d257f42a83363ebb67a Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Tue, 8 Jun 2021 22:43:33 +0200 Subject: [PATCH] activate option to select output audio, adding option to activate debug message on console and update locale --- NEWS_fr | 3 +++ locale/en.po | 2 +- locale/fr.po | 2 +- ressources/scripts/config/config.gd | 2 ++ scenes/interfaces/options/option_language.gd | 6 ++++-- scenes/interfaces/options/option_settings.gd | 4 ++-- scenes/interfaces/options/option_settings.tscn | 1 - 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/NEWS_fr b/NEWS_fr index 527f5ea..8a27fbc 100644 --- a/NEWS_fr +++ b/NEWS_fr @@ -26,3 +26,6 @@ f) Garder la fenêtre dessus II) Paramétrage son +6) Correction du menu de selection de la langue + +7) Activer la sortie audio en fonction de la selection dans le menu option diff --git a/locale/en.po b/locale/en.po index 0d51f7c..6d531f9 100644 --- a/locale/en.po +++ b/locale/en.po @@ -147,7 +147,7 @@ msgid "JUKEBOX_MUTE" msgstr "Mute" msgid "OPTION_SETTINGS_SOUND_SELECT_DEVICE" -msgstr "Del" +msgstr "Select output audio" msgid "OPTION_TITLE" msgstr "Settings" diff --git a/locale/fr.po b/locale/fr.po index 24c2b09..b00703c 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -147,7 +147,7 @@ msgid "JUKEBOX_MUTE" msgstr "Silence" msgid "OPTION_SETTINGS_SOUND_SELECT_DEVICE" -msgstr "Supprimer" +msgstr "Sélectionner la sortie audio" msgid "OPTION_TITLE" msgstr "Configuration" diff --git a/ressources/scripts/config/config.gd b/ressources/scripts/config/config.gd index a66bfbd..9ac46ac 100644 --- a/ressources/scripts/config/config.gd +++ b/ressources/scripts/config/config.gd @@ -215,6 +215,7 @@ func save_config(): #Config.msg_debug("" + child ) config_file.set_value( "playermusic", str(posmusic), child ) posmusic += 1 + config_file.set_value("debug", "console", debug) config_file.save( SettingsFile ) #print("[res://ressources/scripts/config/config.gd] save_config") @@ -248,3 +249,4 @@ func load_config(): var file = config_file.get_value( "playermusic", key, "" ) # Config.msg_debug( "playermusic:" + key + " " + str(file) ) queuemusic.append(file) + debug = config_file.get_value("debug", "console", false) diff --git a/scenes/interfaces/options/option_language.gd b/scenes/interfaces/options/option_language.gd index 80214f0..64afd31 100644 --- a/scenes/interfaces/options/option_language.gd +++ b/scenes/interfaces/options/option_language.gd @@ -33,11 +33,13 @@ func _ready(): $window_dialog/margin_container/v_box_container/option_button.select(selected) -func _on_option_button_item_selected(index): +func _on_option_button_item_selected(_index): + var pos = 0 for key in TranslationServer.get_loaded_locales(): - if index == $window_dialog/margin_container/v_box_container/option_button.get_selected(): + if pos == $window_dialog/margin_container/v_box_container/option_button.get_selected(): TranslationServer.set_locale(key) return + pos += 1 func _on_button_pressed(): diff --git a/scenes/interfaces/options/option_settings.gd b/scenes/interfaces/options/option_settings.gd index 4aac741..dd538b9 100644 --- a/scenes/interfaces/options/option_settings.gd +++ b/scenes/interfaces/options/option_settings.gd @@ -194,14 +194,14 @@ func _on_button_pressed(): func _on_musicplayer_pressed(): - Config.msg_debug("") + Config.msg_debug("musicplayer_pressed") Config.set_playermusic(not Config.get_playermusic()) Config.save_config() emit_signal( "musicplayer_pressed") func _on_audiodevice_item_selected(index): - Config.msg_debug("TODO") + AudioServer.set_device(audiodevice_list.get_item_text(index)) func _on_control_musicplayer_pressed(): diff --git a/scenes/interfaces/options/option_settings.tscn b/scenes/interfaces/options/option_settings.tscn index ab23adb..97b9e20 100644 --- a/scenes/interfaces/options/option_settings.tscn +++ b/scenes/interfaces/options/option_settings.tscn @@ -11,7 +11,6 @@ __meta__ = { } [node name="window_dialog" type="WindowDialog" parent="."] -visible = true margin_left = 55.2183 margin_top = 62.4725 margin_right = 1231.22