From 31fae924bfc5c979ccbc37fa860e0d65f0b5bf2b Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Tue, 23 Jun 2020 17:15:18 +0300 Subject: [PATCH] Removed import button from splash screen and fixed #265 --- src/UI/Dialogs/SplashDialog.gd | 11 +++-------- src/UI/Dialogs/SplashDialog.tscn | 10 +--------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/UI/Dialogs/SplashDialog.gd b/src/UI/Dialogs/SplashDialog.gd index c5a1d44d5..ac37b9e87 100644 --- a/src/UI/Dialogs/SplashDialog.gd +++ b/src/UI/Dialogs/SplashDialog.gd @@ -58,19 +58,14 @@ func _on_DiscordButton_pressed() -> void: func _on_NewBtn_pressed() -> void: visible = false - Global.control.file_menu_id_pressed(0) + Global.top_menu_container.file_menu_id_pressed(0) func _on_OpenBtn__pressed() -> void: visible = false - Global.control.file_menu_id_pressed(1) + Global.top_menu_container.file_menu_id_pressed(1) func _on_OpenLastBtn_pressed() -> void: visible = false - Global.control.file_menu_id_pressed(2) - - -func _on_ImportBtn_pressed() -> void: - visible = false - Global.control.file_menu_id_pressed(5) + Global.top_menu_container.file_menu_id_pressed(2) diff --git a/src/UI/Dialogs/SplashDialog.tscn b/src/UI/Dialogs/SplashDialog.tscn index 90ef983ee..a873c6a43 100644 --- a/src/UI/Dialogs/SplashDialog.tscn +++ b/src/UI/Dialogs/SplashDialog.tscn @@ -87,7 +87,7 @@ rect_min_size = Vector2( 4, 0 ) [node name="Buttons" type="VBoxContainer" parent="Contents/ButtonsPatronsLogos"] margin_left = 8.0 margin_right = 298.0 -margin_bottom = 110.0 +margin_bottom = 80.0 rect_min_size = Vector2( 290, 0 ) size_flags_vertical = 0 custom_constants/separation = 10 @@ -112,13 +112,6 @@ margin_bottom = 80.0 mouse_default_cursor_shape = 2 text = "Open Last Project" -[node name="ImportBtn" type="Button" parent="Contents/ButtonsPatronsLogos/Buttons"] -margin_top = 90.0 -margin_right = 290.0 -margin_bottom = 110.0 -mouse_default_cursor_shape = 2 -text = "Import" - [node name="Info" type="HBoxContainer" parent="Contents/ButtonsPatronsLogos"] margin_left = 302.0 margin_right = 639.0 @@ -285,7 +278,6 @@ rect_min_size = Vector2( 4, 0 ) [connection signal="pressed" from="Contents/ButtonsPatronsLogos/Buttons/NewBtn" to="." method="_on_NewBtn_pressed"] [connection signal="pressed" from="Contents/ButtonsPatronsLogos/Buttons/OpenBtn " to="." method="_on_OpenBtn__pressed"] [connection signal="pressed" from="Contents/ButtonsPatronsLogos/Buttons/OpenLastBtn" to="." method="_on_OpenLastBtn_pressed"] -[connection signal="pressed" from="Contents/ButtonsPatronsLogos/Buttons/ImportBtn" to="." method="_on_ImportBtn_pressed"] [connection signal="pressed" from="Contents/ButtonsPatronsLogos/Info/Sponsors/PatronContainer/VBoxContainer/BecomePlatinum" to="." method="_on_TakeThisSpot_pressed"] [connection signal="pressed" from="Contents/ButtonsPatronsLogos/Info/Sponsors/PatronContainer/VBoxContainer/BecomeGold" to="." method="_on_TakeThisSpot_pressed"] [connection signal="pressed" from="Contents/ButtonsPatronsLogos/Info/Sponsors/PatronContainer/VBoxContainer/BecomePatron" to="." method="_on_TakeThisSpot_pressed"]