diff --git a/Battle Pong/SettingsWindow.tscn b/Battle Pong/SettingsWindow.tscn index 80b65bcd8a19efed25db6949bdc11feafcef30b2..7a84c7c64c9ade223cdc5f25b52cd16d8e53428c 100644 --- a/Battle Pong/SettingsWindow.tscn +++ b/Battle Pong/SettingsWindow.tscn @@ -38,7 +38,7 @@ __meta__ = { [node name="grid_settings" type="GridContainer" parent="VBoxContainer"] margin_right = 347.0 -margin_bottom = 353.0 +margin_bottom = 269.0 columns = 3 __meta__ = { "_edit_use_anchors_": false @@ -175,7 +175,7 @@ margin_bottom = 113.0 [node name="vbox_trainer_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"] margin_top = 117.0 margin_right = 163.0 -margin_bottom = 271.0 +margin_bottom = 215.0 [node name="lbl_title_trainer_settings" type="Label" parent="VBoxContainer/grid_settings/vbox_trainer_settings"] margin_right = 163.0 @@ -240,13 +240,13 @@ margin_bottom = 40.0 margin_left = 167.0 margin_top = 117.0 margin_right = 171.0 -margin_bottom = 271.0 +margin_bottom = 215.0 [node name="vbox_ball_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"] margin_left = 175.0 margin_top = 117.0 margin_right = 347.0 -margin_bottom = 271.0 +margin_bottom = 215.0 [node name="lbl_title_ball_settings" type="Label" parent="VBoxContainer/grid_settings/vbox_ball_settings"] margin_right = 172.0 @@ -256,89 +256,89 @@ text = "Ball:" [node name="grid_ball_settings" type="GridContainer" parent="VBoxContainer/grid_settings/vbox_ball_settings"] margin_top = 18.0 margin_right = 172.0 -margin_bottom = 154.0 +margin_bottom = 98.0 columns = 2 [node name="lbl_ball_height" type="Label" parent="VBoxContainer/grid_settings/vbox_ball_settings/grid_ball_settings"] +visible = false margin_top = 5.0 margin_right = 110.0 margin_bottom = 19.0 text = "Hight" [node name="input_ball_height" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_ball_settings/grid_ball_settings"] -margin_left = 114.0 -margin_right = 172.0 +visible = false +margin_right = 58.0 margin_bottom = 24.0 [node name="lbl_ball_width" type="Label" parent="VBoxContainer/grid_settings/vbox_ball_settings/grid_ball_settings"] -margin_top = 33.0 +visible = false +margin_top = 5.0 margin_right = 110.0 -margin_bottom = 47.0 +margin_bottom = 19.0 text = "Width" [node name="input_ball_width" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_ball_settings/grid_ball_settings"] -margin_left = 114.0 -margin_top = 28.0 -margin_right = 172.0 -margin_bottom = 52.0 +visible = false +margin_right = 58.0 +margin_bottom = 24.0 [node name="lbl_ball_speed_min" type="Label" parent="VBoxContainer/grid_settings/vbox_ball_settings/grid_ball_settings"] -margin_top = 61.0 +margin_top = 5.0 margin_right = 110.0 -margin_bottom = 75.0 +margin_bottom = 19.0 text = "Speed Min" [node name="input_ball_speed_min" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_ball_settings/grid_ball_settings"] margin_left = 114.0 -margin_top = 56.0 margin_right = 172.0 -margin_bottom = 80.0 +margin_bottom = 24.0 [node name="lbl_ball_speed_max" type="Label" parent="VBoxContainer/grid_settings/vbox_ball_settings/grid_ball_settings"] -margin_top = 89.0 +margin_top = 33.0 margin_right = 110.0 -margin_bottom = 103.0 +margin_bottom = 47.0 text = "Speed Max" [node name="input_ball_speed_max" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_ball_settings/grid_ball_settings"] margin_left = 114.0 -margin_top = 84.0 +margin_top = 28.0 margin_right = 172.0 -margin_bottom = 108.0 +margin_bottom = 52.0 [node name="lbl_ball_speed_increment" type="Label" parent="VBoxContainer/grid_settings/vbox_ball_settings/grid_ball_settings"] -margin_top = 117.0 +margin_top = 61.0 margin_right = 110.0 -margin_bottom = 131.0 +margin_bottom = 75.0 text = "Speed Increment" [node name="input_ball_speed_increment" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_ball_settings/grid_ball_settings"] margin_left = 114.0 -margin_top = 112.0 +margin_top = 56.0 margin_right = 172.0 -margin_bottom = 136.0 +margin_bottom = 80.0 [node name="HSeparator7" type="HSeparator" parent="VBoxContainer/grid_settings"] -margin_top = 275.0 +margin_top = 219.0 margin_right = 163.0 -margin_bottom = 279.0 +margin_bottom = 223.0 [node name="VSeparator3" type="HSeparator" parent="VBoxContainer/grid_settings"] margin_left = 167.0 -margin_top = 275.0 +margin_top = 219.0 margin_right = 171.0 -margin_bottom = 279.0 +margin_bottom = 223.0 [node name="HSeparator2" type="HSeparator" parent="VBoxContainer/grid_settings"] margin_left = 175.0 -margin_top = 275.0 +margin_top = 219.0 margin_right = 347.0 -margin_bottom = 279.0 +margin_bottom = 223.0 [node name="vbox_player_one_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"] -margin_top = 283.0 +margin_top = 227.0 margin_right = 163.0 -margin_bottom = 353.0 +margin_bottom = 269.0 [node name="lbl_title_player_one_settings" type="Label" parent="VBoxContainer/grid_settings/vbox_player_one_settings"] margin_right = 163.0 @@ -348,43 +348,44 @@ text = "Player 1:" [node name="grid_player_one_settings" type="GridContainer" parent="VBoxContainer/grid_settings/vbox_player_one_settings"] margin_top = 18.0 margin_right = 163.0 -margin_bottom = 70.0 +margin_bottom = 42.0 columns = 2 [node name="lbl_player_one_length" type="Label" parent="VBoxContainer/grid_settings/vbox_player_one_settings/grid_player_one_settings"] -margin_top = 5.0 -margin_right = 43.0 -margin_bottom = 19.0 +visible = false +margin_right = 58.0 +margin_bottom = 14.0 text = "Length" [node name="input_player_one_length" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_player_one_settings/grid_player_one_settings"] +visible = false margin_left = 47.0 margin_right = 105.0 margin_bottom = 24.0 +editable = false [node name="lbl_player_one_speed" type="Label" parent="VBoxContainer/grid_settings/vbox_player_one_settings/grid_player_one_settings"] -margin_top = 33.0 -margin_right = 43.0 -margin_bottom = 47.0 +margin_top = 5.0 +margin_right = 39.0 +margin_bottom = 19.0 text = "Speed" [node name="input_player_one_speed" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_player_one_settings/grid_player_one_settings"] -margin_left = 47.0 -margin_top = 28.0 -margin_right = 105.0 -margin_bottom = 52.0 +margin_left = 43.0 +margin_right = 101.0 +margin_bottom = 24.0 [node name="VSeparator4" type="VSeparator" parent="VBoxContainer/grid_settings"] margin_left = 167.0 -margin_top = 283.0 +margin_top = 227.0 margin_right = 171.0 -margin_bottom = 353.0 +margin_bottom = 269.0 [node name="vbox_player_two_settings" type="VBoxContainer" parent="VBoxContainer/grid_settings"] margin_left = 175.0 -margin_top = 283.0 +margin_top = 227.0 margin_right = 347.0 -margin_bottom = 353.0 +margin_bottom = 269.0 [node name="lbl_title_player_two_settings" type="Label" parent="VBoxContainer/grid_settings/vbox_player_two_settings"] margin_right = 172.0 @@ -394,53 +395,53 @@ text = "Player 2:" [node name="grid_player_two_settings" type="GridContainer" parent="VBoxContainer/grid_settings/vbox_player_two_settings"] margin_top = 18.0 margin_right = 172.0 -margin_bottom = 70.0 +margin_bottom = 42.0 columns = 2 [node name="lbl_player_two_length" type="Label" parent="VBoxContainer/grid_settings/vbox_player_two_settings/grid_player_two_settings"] -margin_top = 5.0 -margin_right = 43.0 -margin_bottom = 19.0 +visible = false +margin_right = 58.0 +margin_bottom = 14.0 text = "Length" [node name="input_player_two_length" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_player_two_settings/grid_player_two_settings"] +visible = false margin_left = 47.0 margin_right = 105.0 margin_bottom = 24.0 [node name="lbl_player_two_speed" type="Label" parent="VBoxContainer/grid_settings/vbox_player_two_settings/grid_player_two_settings"] -margin_top = 33.0 -margin_right = 43.0 -margin_bottom = 47.0 +margin_top = 5.0 +margin_right = 39.0 +margin_bottom = 19.0 text = "Speed" [node name="input_player_two_speed" type="LineEdit" parent="VBoxContainer/grid_settings/vbox_player_two_settings/grid_player_two_settings"] -margin_left = 47.0 -margin_top = 28.0 -margin_right = 105.0 -margin_bottom = 52.0 +margin_left = 43.0 +margin_right = 101.0 +margin_bottom = 24.0 [node name="VSeparator5" type="HSeparator" parent="VBoxContainer"] -margin_top = 357.0 +margin_top = 273.0 margin_right = 347.0 -margin_bottom = 361.0 +margin_bottom = 277.0 [node name="but_save" type="Button" parent="VBoxContainer"] -margin_top = 365.0 +margin_top = 281.0 margin_right = 347.0 -margin_bottom = 385.0 +margin_bottom = 301.0 text = "Save" [node name="but_cancel" type="Button" parent="VBoxContainer"] -margin_top = 389.0 +margin_top = 305.0 margin_right = 347.0 -margin_bottom = 409.0 +margin_bottom = 325.0 text = "Cancel" [node name="but_reset" type="Button" parent="VBoxContainer"] -margin_top = 413.0 +margin_top = 329.0 margin_right = 347.0 -margin_bottom = 433.0 +margin_bottom = 349.0 text = "Reset" [connection signal="pressed" from="VBoxContainer/grid_settings/vbox_trainer_settings/grid_trainer_settings/input_trainer_position" to="." method="_on_input_trainer_position_pressed"] [connection signal="pressed" from="VBoxContainer/but_save" to="." method="_on_but_save_pressed"]