diff options
| -rw-r--r-- | client/menu/main.gd | 22 | ||||
| -rw-r--r-- | client/menu/main.tscn | 85 | ||||
| -rw-r--r-- | client/project.godot | 2 |
3 files changed, 72 insertions, 37 deletions
diff --git a/client/menu/main.gd b/client/menu/main.gd index 32dd993e..2a642e14 100644 --- a/client/menu/main.gd +++ b/client/menu/main.gd @@ -1,6 +1,7 @@ # Hurry Curry! - a game about cooking # Copyright 2024 metamuffin # Copyright 2024 nokoe +# Copyright 2024 BigBrotherNii # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -18,11 +19,14 @@ extends Menu var url_regex: RegEx = RegEx.new() -@onready var quit_button = $side/margin/options/quit -@onready var connect_uri = $side/margin/options/connect/uri -@onready var server = $side/margin/options/server -@onready var server_control = $side/margin/options/server/control -@onready var server_connect = $side/margin/options/server/connect +@onready var quit_button = $side/margin/options/first/quit +@onready var connect_uri = $side/margin/options/second/connect/uri +@onready var server = $side/margin/options/second/server +@onready var server_control = $side/margin/options/second/server/control +@onready var server_connect = $side/margin/options/second/server/connect + +@onready var first_menu = $side/margin/options/first +@onready var second_menu = $side/margin/options/second func _ready(): super() @@ -112,3 +116,11 @@ func _process(_delta): func _on_uri_text_changed(new_text): connect_uri.modulate = Color.WHITE if url_regex.search(new_text) else Color.RED + +func _on_play_pressed(): + first_menu.hide() + second_menu.show() + +func _on_back_pressed(): + first_menu.show() + second_menu.hide() diff --git a/client/menu/main.tscn b/client/menu/main.tscn index cdc3a4a8..592ad1a9 100644 --- a/client/menu/main.tscn +++ b/client/menu/main.tscn @@ -29,7 +29,7 @@ material = ExtResource("4_wf51p") layout_mode = 1 anchors_preset = 9 anchor_bottom = 1.0 -offset_right = 340.0 +offset_right = 294.0 grow_vertical = 2 theme_override_styles/panel = SubResource("StyleBoxFlat_ukani") @@ -56,63 +56,86 @@ text = "Hurry Curry!" custom_minimum_size = Vector2(0, 10) layout_mode = 2 -[node name="quick_connect" type="Button" parent="side/margin/options"] +[node name="first" type="VBoxContainer" parent="side/margin/options"] layout_mode = 2 -text = "Quick Connect" + +[node name="play" type="Button" parent="side/margin/options/first"] +layout_mode = 2 +text = "Play" alignment = 0 -[node name="connect" type="HBoxContainer" parent="side/margin/options"] +[node name="change_character" type="Button" parent="side/margin/options/first"] layout_mode = 2 +text = "My Chef" +alignment = 0 -[node name="uri" type="LineEdit" parent="side/margin/options/connect"] +[node name="settings" type="Button" parent="side/margin/options/first"] layout_mode = 2 -size_flags_horizontal = 3 -auto_translate = false -placeholder_text = "wss://example.org" +text = "Settings" +alignment = 0 -[node name="connect" type="Button" parent="side/margin/options/connect"] +[node name="credits" type="Button" parent="side/margin/options/first"] layout_mode = 2 -text = "Connect" +text = "Credits" +alignment = 0 -[node name="change_character" type="Button" parent="side/margin/options"] +[node name="quit" type="Button" parent="side/margin/options/first"] layout_mode = 2 -text = "My Chef" +text = "Quit" alignment = 0 -[node name="settings" type="Button" parent="side/margin/options"] +[node name="second" type="VBoxContainer" parent="side/margin/options"] +visible = false layout_mode = 2 -text = "Settings" + +[node name="quick_connect" type="Button" parent="side/margin/options/second"] +layout_mode = 2 +text = "Quick Connect" alignment = 0 -[node name="server" type="HBoxContainer" parent="side/margin/options"] +[node name="connect" type="HBoxContainer" parent="side/margin/options/second"] +layout_mode = 2 + +[node name="uri" type="LineEdit" parent="side/margin/options/second/connect"] +layout_mode = 2 +size_flags_horizontal = 3 +auto_translate = false +placeholder_text = "wss://example.org" + +[node name="connect" type="Button" parent="side/margin/options/second/connect"] +layout_mode = 2 +text = "Connect" + +[node name="server" type="HBoxContainer" parent="side/margin/options/second"] layout_mode = 2 -[node name="control" type="Button" parent="side/margin/options/server"] +[node name="control" type="Button" parent="side/margin/options/second/server"] layout_mode = 2 size_flags_horizontal = 3 text = "Server" alignment = 0 -[node name="connect" type="Button" parent="side/margin/options/server"] +[node name="connect" type="Button" parent="side/margin/options/second/server"] layout_mode = 2 text = "Connect" -[node name="credits" type="Button" parent="side/margin/options"] +[node name="spacer2" type="Control" parent="side/margin/options/second"] +custom_minimum_size = Vector2(0, 10) layout_mode = 2 -text = "Credits" -alignment = 0 -[node name="quit" type="Button" parent="side/margin/options"] +[node name="back" type="Button" parent="side/margin/options/second"] layout_mode = 2 -text = "Quit" +text = "Back" alignment = 0 -[connection signal="pressed" from="side/margin/options/quick_connect" to="." method="_on_quick_connect_pressed"] -[connection signal="text_changed" from="side/margin/options/connect/uri" to="." method="_on_uri_text_changed"] -[connection signal="pressed" from="side/margin/options/connect/connect" to="." method="_on_connect_pressed"] -[connection signal="pressed" from="side/margin/options/change_character" to="." method="_on_change_character_pressed"] -[connection signal="pressed" from="side/margin/options/settings" to="." method="_on_settings_pressed"] -[connection signal="pressed" from="side/margin/options/server/control" to="." method="_on_server_pressed"] -[connection signal="pressed" from="side/margin/options/server/connect" to="." method="_on_server_connect_pressed"] -[connection signal="pressed" from="side/margin/options/credits" to="." method="_on_credits_pressed"] -[connection signal="pressed" from="side/margin/options/quit" to="." method="_on_quit_pressed"] +[connection signal="pressed" from="side/margin/options/first/play" to="." method="_on_play_pressed"] +[connection signal="pressed" from="side/margin/options/first/change_character" to="." method="_on_change_character_pressed"] +[connection signal="pressed" from="side/margin/options/first/settings" to="." method="_on_settings_pressed"] +[connection signal="pressed" from="side/margin/options/first/credits" to="." method="_on_credits_pressed"] +[connection signal="pressed" from="side/margin/options/first/quit" to="." method="_on_quit_pressed"] +[connection signal="pressed" from="side/margin/options/second/quick_connect" to="." method="_on_quick_connect_pressed"] +[connection signal="text_changed" from="side/margin/options/second/connect/uri" to="." method="_on_uri_text_changed"] +[connection signal="pressed" from="side/margin/options/second/connect/connect" to="." method="_on_connect_pressed"] +[connection signal="pressed" from="side/margin/options/second/server/control" to="." method="_on_server_pressed"] +[connection signal="pressed" from="side/margin/options/second/server/connect" to="." method="_on_server_connect_pressed"] +[connection signal="pressed" from="side/margin/options/second/back" to="." method="_on_back_pressed"] diff --git a/client/project.godot b/client/project.godot index 684ca1cd..25ff30f4 100644 --- a/client/project.godot +++ b/client/project.godot @@ -194,7 +194,7 @@ scroll_up={ [internationalization] locale/translations=PackedStringArray("res://po/de.po", "res://po/fr.po", "res://po/es.po", "res://po/ja.po") -locale/translations_pot_files=PackedStringArray("res://global.gd", "res://menu/overlay.tscn", "res://menu/setup.tscn", "res://menu/character.tscn", "res://menu/error.tscn", "res://menu/ingame.tscn", "res://menu/lobby.tscn", "res://menu/main.tscn", "res://menu/settings.tscn", "res://menu/ingame.gd", "res://menu/lobby.gd", "res://menu/popup_message.gd", "res://multiplayer.gd", "res://menu/hairstyle_preview.gd", "res://menu/credits.tscn", "res://menu/credits.gd", "res://menu/rating/rating.gd") +locale/translations_pot_files=PackedStringArray("res://global.gd", "res://menu/overlay.tscn", "res://menu/setup.tscn", "res://menu/character.tscn", "res://menu/error.tscn", "res://menu/ingame.tscn", "res://menu/lobby.tscn", "res://menu/main.tscn", "res://menu/settings.tscn", "res://menu/ingame.gd", "res://menu/lobby.gd", "res://menu/popup_message.gd", "res://multiplayer.gd", "res://menu/hairstyle_preview.gd", "res://menu/credits.tscn", "res://menu/credits.gd", "res://menu/rating/rating.gd", "res://menu/warning_popup.tscn") [rendering] |