GUI Inprovements

assets/themes/main_theme.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=23 format=3 uid="uid://dxnkvosdhpvwi"]
+[gd_resource type="Theme" load_steps=35 format=3 uid="uid://dxnkvosdhpvwi"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_0f6i3"]
 bg_color = Color(0.15686275, 0.26666668, 0.41568628, 1)
@@ -116,6 +116,52 @@ corner_radius_top_right = 5
 bg_color = Color(0.17252281, 0.819067, 0.3901327, 1)
 corner_radius_top_right = 5
 
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_jqgtl"]
+bg_color = Color(0.027450977, 0.5142647, 0.84705883, 1)
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_bjvl4"]
+bg_color = Color(0.19999999, 0.6981582, 0.9137255, 1)
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_600w1"]
+bg_color = Color(0.027450977, 0.5142647, 0.84705883, 1)
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_gaobj"]
+content_margin_left = 5.0
+content_margin_top = 5.0
+content_margin_right = 5.0
+content_margin_bottom = 5.0
+bg_color = Color(0.15686275, 0.26666668, 0.41568628, 1)
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_nv6t3"]
+bg_color = Color(0.027450977, 0.37015864, 0.84705883, 1)
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_eff20"]
+bg_color = Color(0.19999999, 0.6981582, 0.9137255, 1)
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_axncs"]
 bg_color = Color(0.106433235, 0.18161754, 0.32349485, 1)
 border_width_bottom = 5
@@ -168,6 +214,13 @@ border_width_right = 4
 border_width_bottom = 4
 border_color = Color(0.15686275, 0.26666668, 0.41568628, 1)
 
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_67t17"]
+bg_color = Color(0.027450977, 0.5142647, 0.84705883, 1)
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_wlpk7"]
 content_margin_left = 5.0
 content_margin_top = 5.0
@@ -198,6 +251,45 @@ border_color = Color(0.08210841, 0.3142104, 0.6561392, 1)
 corner_radius_top_left = 2
 corner_radius_top_right = 2
 
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_cqecq"]
+bg_color = Color(0.027450977, 0.5142647, 0.84705883, 1)
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_s00gw"]
+bg_color = Color(0.19999999, 0.6981582, 0.9137255, 1)
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_w0lbt"]
+bg_color = Color(0.027450977, 0.37015864, 0.84705883, 1)
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_hd7qi"]
+bg_color = Color(0.19999999, 0.6981582, 0.9137255, 1)
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_cn8il"]
+content_margin_left = 5.0
+content_margin_top = 5.0
+content_margin_right = 5.0
+content_margin_bottom = 5.0
+bg_color = Color(0.15686275, 0.26666668, 0.41568628, 1)
+corner_radius_top_left = 5
+corner_radius_top_right = 5
+corner_radius_bottom_right = 5
+corner_radius_bottom_left = 5
+
 [resource]
 AcceptDialog/styles/panel = SubResource("StyleBoxFlat_0f6i3")
 Button/styles/disabled = SubResource("StyleBoxFlat_6ioqn")
@@ -213,6 +305,13 @@ FoldableContainer/styles/title_panel = SubResource("StyleBoxFlat_etupa")
 HPBar/base_type = &"ProgressBar"
 HPBar/styles/background = SubResource("StyleBoxFlat_7cwyu")
 HPBar/styles/fill = SubResource("StyleBoxFlat_1wn1r")
+HScrollBar/styles/grabber = SubResource("StyleBoxFlat_jqgtl")
+HScrollBar/styles/grabber_highlight = SubResource("StyleBoxFlat_bjvl4")
+HScrollBar/styles/grabber_pressed = SubResource("StyleBoxFlat_600w1")
+HScrollBar/styles/scroll = SubResource("StyleBoxFlat_gaobj")
+HSlider/styles/grabber_area = SubResource("StyleBoxFlat_nv6t3")
+HSlider/styles/grabber_area_highlight = SubResource("StyleBoxFlat_eff20")
+HSlider/styles/slider = SubResource("StyleBoxFlat_gaobj")
 LineEdit/styles/normal = SubResource("StyleBoxFlat_axncs")
 LineEdit/styles/read_only = SubResource("StyleBoxFlat_jungl")
 MarginContainer/constants/margin_bottom = 4
@@ -224,6 +323,8 @@ PanelContainer/styles/panel = SubResource("StyleBoxFlat_4fp8c")
 PopupMenu/styles/hover = SubResource("StyleBoxFlat_jrpol")
 PopupMenu/styles/panel = SubResource("StyleBoxFlat_81epl")
 PopupPanel/styles/panel = SubResource("StyleBoxFlat_vxwtt")
+ProgressBar/styles/background = SubResource("StyleBoxFlat_gaobj")
+ProgressBar/styles/fill = SubResource("StyleBoxFlat_67t17")
 TabContainer/styles/panel = SubResource("StyleBoxFlat_4fp8c")
 TabContainer/styles/tab_disabled = SubResource("StyleBoxFlat_wlpk7")
 TabContainer/styles/tab_hovered = SubResource("StyleBoxFlat_doivh")
@@ -232,5 +333,12 @@ TabContainer/styles/tab_unselected = SubResource("StyleBoxFlat_078gm")
 TabContainer/styles/tabbar_background = SubResource("StyleBoxFlat_0f6i3")
 TextEdit/styles/normal = SubResource("StyleBoxFlat_axncs")
 TextEdit/styles/read_only = SubResource("StyleBoxFlat_jungl")
+VScrollBar/styles/grabber = SubResource("StyleBoxFlat_cqecq")
+VScrollBar/styles/grabber_highlight = SubResource("StyleBoxFlat_s00gw")
+VScrollBar/styles/grabber_pressed = SubResource("StyleBoxFlat_cqecq")
+VScrollBar/styles/scroll = SubResource("StyleBoxFlat_gaobj")
+VSlider/styles/grabber_area = SubResource("StyleBoxFlat_w0lbt")
+VSlider/styles/grabber_area_highlight = SubResource("StyleBoxFlat_hd7qi")
+VSlider/styles/slider = SubResource("StyleBoxFlat_cn8il")
 Window/styles/embedded_border = SubResource("StyleBoxFlat_0f6i3")
 Window/styles/embedded_unfocused_border = SubResource("StyleBoxFlat_0f6i3")

assets/translations/gui.csv

@@ -41,3 +41,6 @@ version_update_desc,"На сервере обнаружена новая (или
 Install it?",
 video,Видео,Video,
 win_rounds,Раундов до победы,Rounds to win,
+toggle_walk,Переключение ходьбы,Toggle walking,
+toggle_crouch,Переключение приседания,Toggle crouching,
+toggle_scope,Переключение прицеливания,Toggle scoping,

gui/client_settings/client_settings.tscn

@@ -21,7 +21,7 @@ layout_mode = 2
 custom_minimum_size = Vector2(512, 256)
 layout_mode = 2
 tab_alignment = 1
-current_tab = 3
+current_tab = 2
 
 [node name="gameplay" type="VBoxContainer" parent="CenterContainer/VBoxContainer/PanelContainer"]
 visible = false
@@ -38,7 +38,6 @@ layout_mode = 2
 text = "fullscreen"
 
 [node name="controls" type="VBoxContainer" parent="CenterContainer/VBoxContainer/PanelContainer"]
-visible = false
 layout_mode = 2
 metadata/_tab_index = 2
 
@@ -54,6 +53,7 @@ unique_name_in_owner = true
 custom_minimum_size = Vector2(256, 0)
 layout_mode = 2
 size_flags_horizontal = 3
+size_flags_vertical = 1
 min_value = 0.001
 max_value = 0.02
 step = 0.001
@@ -68,7 +68,23 @@ value = 0.02
 allow_greater = true
 allow_lesser = true
 
+[node name="ToggleCrouch" type="CheckButton" parent="CenterContainer/VBoxContainer/PanelContainer/controls"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "toggle_crouch"
+
+[node name="ToggleScope" type="CheckButton" parent="CenterContainer/VBoxContainer/PanelContainer/controls"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "toggle_scope"
+
+[node name="ToggleWalk" type="CheckButton" parent="CenterContainer/VBoxContainer/PanelContainer/controls"]
+unique_name_in_owner = true
+layout_mode = 2
+text = "toggle_walk"
+
 [node name="audio" type="VBoxContainer" parent="CenterContainer/VBoxContainer/PanelContainer"]
+visible = false
 layout_mode = 2
 metadata/_tab_index = 3
 
@@ -83,6 +99,7 @@ text = "audio_gameplay"
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_horizontal = 3
+size_flags_vertical = 1
 max_value = 1.0
 step = 0.01
 value = 1.0
@@ -102,6 +119,9 @@ text = "Покинуть сессию"
 [connection signal="toggled" from="CenterContainer/VBoxContainer/PanelContainer/video/FullscreenButton" to="CenterContainer" method="_on_fullscreen_button_toggled"]
 [connection signal="value_changed" from="CenterContainer/VBoxContainer/PanelContainer/controls/Sensitivity/SensitivitySlider" to="CenterContainer" method="_on_sensitivity_slider_value_changed"]
 [connection signal="value_changed" from="CenterContainer/VBoxContainer/PanelContainer/controls/Sensitivity/SensitivityBox" to="CenterContainer" method="_on_sensitivity_box_value_changed"]
+[connection signal="toggled" from="CenterContainer/VBoxContainer/PanelContainer/controls/ToggleCrouch" to="CenterContainer" method="_on_toggle_crouch_toggled"]
+[connection signal="toggled" from="CenterContainer/VBoxContainer/PanelContainer/controls/ToggleScope" to="CenterContainer" method="_on_toggle_scope_toggled"]
+[connection signal="toggled" from="CenterContainer/VBoxContainer/PanelContainer/controls/ToggleWalk" to="CenterContainer" method="_on_toggle_walk_toggled"]
 [connection signal="value_changed" from="CenterContainer/VBoxContainer/PanelContainer/audio/GameplayMainAudio/GameplayMainSlider" to="CenterContainer" method="_on_gameplay_main_slider_value_changed"]
 [connection signal="pressed" from="CenterContainer/VBoxContainer/StopSession" to="CenterContainer" method="_on_stop_session_pressed"]
 [connection signal="pressed" from="CenterContainer/VBoxContainer/LeaveButton" to="CenterContainer" method="_on_leave_button_pressed"]

gui/client_settings/client_settings_menu.gd

@@ -9,6 +9,9 @@ func _ready() -> void:
 	Lobby.lobby_closed.connect(%StopSession.hide)
 	%SensitivitySlider.set_value_no_signal(ClientSettings.SENSITIVITY)
 	%SensitivityBox.set_value_no_signal(ClientSettings.SENSITIVITY)
+	%ToggleCrouch.set_pressed_no_signal(ClientSettings.TOGGLE_CROUCH)
+	%ToggleScope.set_pressed_no_signal(ClientSettings.TOGGLE_SCOPE)
+	%ToggleWalk.set_pressed_no_signal(ClientSettings.TOGGLE_WALK)
 
 func _input(event: InputEvent) -> void:
 	if event.is_action_pressed("menu_settings"):
@@ -39,3 +42,15 @@ func _on_leave_button_pressed() -> void:
 func _on_stop_session_pressed() -> void:
 	if multiplayer.is_server():
 		Session.end_session()
+
+
+func _on_toggle_crouch_toggled(toggled_on: bool) -> void:
+	ClientSettings.TOGGLE_CROUCH = toggled_on
+
+
+func _on_toggle_scope_toggled(toggled_on: bool) -> void:
+	ClientSettings.TOGGLE_SCOPE = toggled_on
+
+
+func _on_toggle_walk_toggled(toggled_on: bool) -> void:
+	ClientSettings.TOGGLE_WALK = toggled_on