From 1d6d608d9c0687098297b5d77dc4d70efba2d7b3 Mon Sep 17 00:00:00 2001 From: Rekku Date: Tue, 10 Sep 2024 15:54:29 +0100 Subject: [PATCH] Sounds --- tools/configurator/main.tscn | 47 +++++++++---------- tools/configurator/scripts/SettingsTab.gd | 8 ++-- tools/configurator/scripts/TabContainer.gd | 3 +- tools/configurator/scripts/class_functions.gd | 1 + 4 files changed, 29 insertions(+), 30 deletions(-) diff --git a/tools/configurator/main.tscn b/tools/configurator/main.tscn index a9bdcda9..9f708d27 100644 --- a/tools/configurator/main.tscn +++ b/tools/configurator/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=110 format=3 uid="uid://61f6m4r1mpan"] +[gd_scene load_steps=111 format=3 uid="uid://61f6m4r1mpan"] [ext_resource type="Texture2D" uid="uid://bv6vh33cnfaw4" path="res://icon.svg" id="1_axfei"] [ext_resource type="Theme" uid="uid://hhc60cllcg47" path="res://assets/themes/default_theme.tres" id="1_if8nh"] @@ -90,6 +90,7 @@ [ext_resource type="Texture2D" uid="uid://d4suyd0iag1k" path="res://assets/icons/pixelitos/128/system-suspend.png" id="56_witym"] [ext_resource type="Texture2D" uid="uid://l3bredurb11m" path="res://assets/graphics/rekku2/rekku_base.png" id="57_1n3u5"] [ext_resource type="Texture2D" uid="uid://dxtd2lvewb4qa" path="res://assets/icons/pixelitos/128/system-switch-user.png" id="57_7b0kp"] +[ext_resource type="Texture2D" uid="uid://diu1akug7xul8" path="res://assets/icons/pixelitos/128/cs-user.png" id="58_mntxv"] [ext_resource type="Texture2D" uid="uid://bby02mc8j6rxt" path="res://assets/icons/pixelitos/128/youtube-music.png" id="58_oismn"] [ext_resource type="Texture2D" uid="uid://cvlncuql8igrm" path="res://assets/graphics/rekku2/rekku_eye_1.png" id="59_7lcu5"] [ext_resource type="Texture2D" uid="uid://bdrdu4nddkqjn" path="res://assets/graphics/rekku2/rekku_eye_2.png" id="60_mbhg6"] @@ -215,7 +216,7 @@ size_flags_horizontal = 3 unique_name_in_owner = true layout_mode = 2 tab_alignment = 1 -current_tab = 3 +current_tab = 2 script = ExtResource("3_id6l4") [node name="GLOBALS" type="MarginContainer" parent="Background/SplitContainer/MarginContainer/TabContainer"] @@ -767,7 +768,6 @@ text = "INSTALL FIRMWARE" icon = ExtResource("38_vsjf2") [node name="TOOLS" type="MarginContainer" parent="Background/SplitContainer/MarginContainer/TabContainer"] -visible = false layout_mode = 2 script = ExtResource("50_wqa5h") metadata/_tab_index = 2 @@ -792,9 +792,10 @@ icon = ExtResource("50_5d2ui") [node name="logs_button" type="OptionButton" parent="Background/SplitContainer/MarginContainer/TabContainer/TOOLS/ScrollContainer/VBoxContainer/troubleshoot_container"] unique_name_in_owner = true layout_mode = 2 +alignment = 1 selected = 0 item_count = 4 -popup/item_0/text = " LOGS" +popup/item_0/text = "LOGS" popup/item_0/icon = ExtResource("50_h3jx2") popup/item_0/disabled = true popup/item_0/separator = true @@ -919,6 +920,7 @@ disabled = true text = "TK_3DSDECRYPT" [node name="SETTINGS" type="MarginContainer" parent="Background/SplitContainer/MarginContainer/TabContainer"] +visible = false layout_mode = 2 script = ExtResource("54_bxhvn") metadata/_tab_index = 3 @@ -948,6 +950,7 @@ layout_mode = 2 button_pressed = true text = "TK_UPDATENOTIF" icon = ExtResource("55_x32s4") +alignment = 1 [node name="easter_eggs" type="CheckButton" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container"] layout_mode = 2 @@ -955,44 +958,40 @@ disabled = true button_pressed = true text = "TK_EASTEREGGS" icon = ExtResource("56_witym") +alignment = 1 -[node name="multi_user_container" type="HBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container"] +[node name="multi_user_option" type="OptionButton" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container"] layout_mode = 2 - -[node name="multi_user_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container/multi_user_container"] -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_vertical = 1 -text = "TK_MULTIUSR" - -[node name="multi_user_option" type="OptionButton" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container/multi_user_container"] -layout_mode = 2 -size_flags_horizontal = 10 +alignment = 1 selected = 0 -item_count = 3 -popup/item_0/text = "TK_OFF" +item_count = 4 +popup/item_0/text = "TK_MULTIUSR" popup/item_0/icon = ExtResource("57_7b0kp") -popup/item_1/text = "TK_STEAMUSR" +popup/item_0/separator = true +popup/item_1/text = "TK_CUSTOMUSR" +popup/item_1/icon = ExtResource("58_mntxv") popup/item_1/id = 1 -popup/item_2/text = "TK_CUSTOMUSR" +popup/item_2/text = "TK_OFF" +popup/item_2/icon = ExtResource("58_mntxv") popup/item_2/id = 2 +popup/item_3/text = "TK_STEAMUSR" +popup/item_3/icon = ExtResource("58_mntxv") +popup/item_3/id = 3 [node name="menu_music" type="CheckButton" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container"] layout_mode = 2 button_pressed = true text = "TK_MUSIC" icon = ExtResource("58_oismn") - -[node name="fancy_audio_player_here_(please_no)" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container"] -layout_mode = 2 -size_flags_vertical = 1 -text = "|| ------( )--------" +alignment = 1 [node name="sound_button" type="CheckButton" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container"] +unique_name_in_owner = true layout_mode = 2 button_pressed = true text = "SOUND" icon = ExtResource("9_qwq2k") +alignment = 1 [node name="theme_optionbutton" type="OptionButton" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer"] unique_name_in_owner = true diff --git a/tools/configurator/scripts/SettingsTab.gd b/tools/configurator/scripts/SettingsTab.gd index 07bb655a..916a13a4 100644 --- a/tools/configurator/scripts/SettingsTab.gd +++ b/tools/configurator/scripts/SettingsTab.gd @@ -1,14 +1,14 @@ extends Control - func _ready(): _get_nodes() _connect_signals() - func _connect_signals() -> void: - pass + %sound_button.pressed.connect(sound_off) - func _get_nodes() -> void: pass + +func sound_off() -> void: + class_functions.sound_effects = false diff --git a/tools/configurator/scripts/TabContainer.gd b/tools/configurator/scripts/TabContainer.gd index 99dc396c..d983fcd7 100644 --- a/tools/configurator/scripts/TabContainer.gd +++ b/tools/configurator/scripts/TabContainer.gd @@ -3,7 +3,6 @@ extends TabContainer var icon_width: int = 32 @onready var tcount: int = get_tab_count()-1 - func _ready(): focusFirstFocusableChild() #grab focus on first element to enable controller focusing %TabContainer.add_theme_icon_override("decrement",ResourceLoader.load("res://assets/icons/kenney_input-prompts-pixel-16/Tiles/tile_0797.png")) @@ -31,7 +30,7 @@ func connect_focus_signals(node): connect_focus_signals(child) func _on_Button_focus_entered(button: Button): - if button: + if button and class_functions.sound_effects: %AudioStreamPlayer2D.play() func _input(event): diff --git a/tools/configurator/scripts/class_functions.gd b/tools/configurator/scripts/class_functions.gd index 0e86ddfd..f9892c0c 100644 --- a/tools/configurator/scripts/class_functions.gd +++ b/tools/configurator/scripts/class_functions.gd @@ -11,6 +11,7 @@ var rd_log: String var rd_log_folder: String var rd_version: String var gc_version: String +var sound_effects: bool = true func read_cfg() -> String: var title: String