diff --git a/tools/configurator/main.tscn b/tools/configurator/main.tscn index ed309be2..6904769d 100644 --- a/tools/configurator/main.tscn +++ b/tools/configurator/main.tscn @@ -453,56 +453,6 @@ grow_vertical = 2 theme_override_styles/fill = SubResource("StyleBoxFlat_1161k") show_percentage = false -[node name="reset_retrodeck_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/GLOBALS/ScrollContainer/VBoxContainer/globals_gridcontainer"] -unique_name_in_owner = true -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_vertical = 3 -theme_override_constants/icon_max_width = 64 -text = "RESET -RETRODECK" -icon = ExtResource("11_g1uhn") -icon_alignment = 1 -vertical_icon_alignment = 0 -expand_icon = true - -[node name="reset_retrodeck_progress" type="ProgressBar" parent="Background/SplitContainer/MarginContainer/TabContainer/GLOBALS/ScrollContainer/VBoxContainer/globals_gridcontainer/reset_retrodeck_button"] -unique_name_in_owner = true -visible = false -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -theme_override_styles/fill = SubResource("StyleBoxFlat_1161k") -show_percentage = false - -[node name="reset_all_emulators_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/GLOBALS/ScrollContainer/VBoxContainer/globals_gridcontainer"] -unique_name_in_owner = true -layout_mode = 2 -size_flags_horizontal = 3 -size_flags_vertical = 3 -theme_override_constants/icon_max_width = 64 -text = "RESET ALL -EMULATORS" -icon = ExtResource("45_qxd26") -icon_alignment = 1 -vertical_icon_alignment = 0 -expand_icon = true - -[node name="reset_all_emulators_progress" type="ProgressBar" parent="Background/SplitContainer/MarginContainer/TabContainer/GLOBALS/ScrollContainer/VBoxContainer/globals_gridcontainer/reset_all_emulators_button"] -unique_name_in_owner = true -visible = false -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -theme_override_styles/fill = SubResource("StyleBoxFlat_1161k") -show_percentage = false - [node name="SYSTEM" type="MarginContainer" parent="Background/SplitContainer/MarginContainer/TabContainer"] visible = false layout_mode = 2 @@ -970,7 +920,6 @@ layout_mode = 2 size_flags_horizontal = 3 [node name="system_container" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer"] -visible = false layout_mode = 2 [node name="system_label" type="Label" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container"] @@ -984,22 +933,23 @@ layout_mode = 2 unique_name_in_owner = true custom_minimum_size = Vector2(0, 100) layout_mode = 2 +theme_override_constants/icon_max_width = 64 text = "AUTO UPDATES" icon = ExtResource("55_x32s4") alignment = 1 -expand_icon = true [node name="sound_button" type="CheckButton" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container"] unique_name_in_owner = true custom_minimum_size = Vector2(0, 100) layout_mode = 2 +theme_override_constants/icon_max_width = 64 text = "SOUND EFFECTS" icon = ExtResource("9_qwq2k") alignment = 1 -expand_icon = true [node name="volume_effects_slider" type="HSlider" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container"] unique_name_in_owner = true +visible = false custom_minimum_size = Vector2(0, 75) layout_mode = 2 min_value = 1.0 @@ -1012,8 +962,8 @@ tick_count = 25 unique_name_in_owner = true custom_minimum_size = Vector2(0, 100) layout_mode = 2 +theme_override_constants/icon_max_width = 64 alignment = 1 -expand_icon = true selected = 0 item_count = 4 popup/item_0/text = "CHOOSE FONT" @@ -1030,23 +980,6 @@ popup/item_3/text = "OpenDyslexic3" popup/item_3/icon = ExtResource("56_ubqc2") popup/item_3/id = 2 -[node name="menu_music" type="CheckButton" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container"] -layout_mode = 2 -disabled = true -text = "TK_MUSIC" -icon = ExtResource("58_oismn") -alignment = 1 -expand_icon = true - -[node name="easter_eggs" type="CheckButton" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container"] -layout_mode = 2 -disabled = true -button_pressed = true -text = "TK_EASTEREGGS" -icon = ExtResource("56_witym") -alignment = 1 -expand_icon = true - [node name="locale_option" type="OptionButton" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container"] unique_name_in_owner = true custom_minimum_size = Vector2(0, 100) @@ -1070,6 +1003,48 @@ popup/item_5/id = 5 popup/item_6/icon = ExtResource("11_ri2fv") popup/item_6/id = 6 +[node name="reset_retrodeck_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +theme_override_constants/icon_max_width = 64 +text = "RESET RETRODECK" +icon = ExtResource("11_g1uhn") + +[node name="reset_retrodeck_progress" type="ProgressBar" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container/reset_retrodeck_button"] +unique_name_in_owner = true +visible = false +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_styles/fill = SubResource("StyleBoxFlat_1161k") +show_percentage = false + +[node name="reset_all_emulators_button" type="Button" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +theme_override_constants/icon_max_width = 64 +text = "RESET ALL EMULATORS" +icon = ExtResource("45_qxd26") + +[node name="reset_all_emulators_progress" type="ProgressBar" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/system_container/reset_all_emulators_button"] +unique_name_in_owner = true +visible = false +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_styles/fill = SubResource("StyleBoxFlat_1161k") +show_percentage = false + [node name="cheevos_container" type="VBoxContainer" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer"] layout_mode = 2 @@ -1236,6 +1211,23 @@ size_flags_horizontal = 3 disabled = true text = "TK_FTPBTN" +[node name="menu_music" type="CheckButton" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/data_mng_container"] +layout_mode = 2 +theme_override_constants/icon_max_width = 64 +disabled = true +text = "TK_MUSIC" +icon = ExtResource("58_oismn") +alignment = 1 + +[node name="easter_eggs" type="CheckButton" parent="Background/SplitContainer/MarginContainer/TabContainer/SETTINGS/ScrollContainer/VBoxContainer/data_mng_container"] +layout_mode = 2 +theme_override_constants/icon_max_width = 64 +disabled = true +button_pressed = true +text = "TK_EASTEREGGS" +icon = ExtResource("56_witym") +alignment = 1 + [node name="ABOUT" type="MarginContainer" parent="Background/SplitContainer/MarginContainer/TabContainer"] visible = false layout_mode = 2 diff --git a/tools/configurator/scripts/Rekku.gd b/tools/configurator/scripts/Rekku.gd index 63e6bac2..5a78f8fe 100644 --- a/tools/configurator/scripts/Rekku.gd +++ b/tools/configurator/scripts/Rekku.gd @@ -1,5 +1,6 @@ extends Control - +var split_max: int = 1280 +var split_min: int = 925 func _input(event): if event.is_action_released("rekku_hide"): @@ -7,7 +8,9 @@ func _input(event): if class_functions.rekku_state == false: self.visible = true class_functions.rekku_state = true - %SplitContainer.split_offset=925 + for n in range (split_max, split_min,-2): + await class_functions.wait(0.000000001) + %SplitContainer.split_offset=n %pop_rtl.visible = false %TabContainer.set_tab_title(0, "GLOBALS") %TabContainer.set_tab_title(1, "SYSTEM") @@ -20,7 +23,9 @@ func _input(event): %TabContainer.set_tab_title(2, " TOOLS ") %TabContainer.set_tab_title(3, " SETTINGS ") %TabContainer.set_tab_title(4, " ABOUT ") - class_functions.rekku_state = false %pop_rtl.visible = false + for n in range (split_min, split_max,2): + await class_functions.wait(0.000000001) + %SplitContainer.split_offset=n + class_functions.rekku_state = false self.visible = false - %SplitContainer.split_offset=1280 diff --git a/tools/configurator/scripts/TabGlobals.gd b/tools/configurator/scripts/TabGlobals.gd index 29f8dc47..657052b3 100644 --- a/tools/configurator/scripts/TabGlobals.gd +++ b/tools/configurator/scripts/TabGlobals.gd @@ -1,5 +1,4 @@ -extends MarginContainer - +extends Control func _ready(): _connect_signals() @@ -34,7 +33,3 @@ func _connect_signals(): %quick_rewind_button.button_down.connect(class_functions._do_action.bind(%quick_rewind_progress, %quick_rewind_button, class_functions.quick_rewind_state)) %quick_rewind_button.button_up.connect(class_functions._on_button_released.bind(%quick_rewind_progress)) %quick_rewind_button.pressed.connect(class_functions.run_function.bind(%quick_rewind_button, "rewind")) - %reset_retrodeck_button.button_down.connect(class_functions._do_action.bind(%reset_retrodeck_progress, %reset_retrodeck_button, "mixed")) - %reset_retrodeck_button.button_up.connect(class_functions._on_button_released.bind(%reset_retrodeck_progress)) - %reset_all_emulators_button.button_down.connect(class_functions._do_action.bind(%reset_all_emulators_progress, %reset_all_emulators_button, "mixed")) - %reset_all_emulators_button.button_up.connect(class_functions._on_button_released.bind(%reset_all_emulators_progress)) diff --git a/tools/configurator/scripts/TabSettings.gd b/tools/configurator/scripts/TabSettings.gd index f96797de..85c20f68 100644 --- a/tools/configurator/scripts/TabSettings.gd +++ b/tools/configurator/scripts/TabSettings.gd @@ -21,6 +21,10 @@ func _connect_signals() -> void: %cheevos_hardcore_button.button_down.connect(class_functions._do_action.bind(%cheevos_hardcore_progress, %cheevos_hardcore_button, class_functions.cheevos_hardcore_state)) %cheevos_hardcore_button.button_up.connect(class_functions._on_button_released.bind(%cheevos_hardcore_progress)) %cheevos_hardcore_button.pressed.connect(class_functions.run_function.bind(%cheevos_hardcore_button, "cheevos_hardcore")) + %reset_retrodeck_button.button_down.connect(class_functions._do_action.bind(%reset_retrodeck_progress, %reset_retrodeck_button, "mixed")) + %reset_retrodeck_button.button_up.connect(class_functions._on_button_released.bind(%reset_retrodeck_progress)) + %reset_all_emulators_button.button_down.connect(class_functions._do_action.bind(%reset_all_emulators_progress, %reset_all_emulators_button, "mixed")) + %reset_all_emulators_button.button_up.connect(class_functions._on_button_released.bind(%reset_all_emulators_progress)) func _on_request_completed(_result, response_code, _headers, body): var response_text = JSON.parse_string(body.get_string_from_utf8())