Merge remote-tracking branch 'MaD_CaT/master'

# Conflicts:
#	scenes/настройки/настройки.tscn

project.godot

@@ -38,6 +38,7 @@ config/mod_bus_interpreter="python"
 config/mod_bus_serial_baud="9600"
 config/mod_bus_serial_port="/dev/pts/3"
 interfer/resend_timeout=1000.0
+config/external_cu=false
 
 [autoload]
 
@@ -94,6 +95,7 @@ enabled=PackedStringArray()
 
 map_server_addr=false
 center_offset=Vector2(0, 0)
+external_cu=false
 
 [gui]
 

scenes/настройки/настройки.gd

@@ -8,3 +8,9 @@ func _ready() -> void:
     for node in $GridContainer.get_children().filter(func(b): return b is Button):
         node.disabled = true
 
+
+func _on_external_cu_btn_pressed() -> void:
+    var state = $GridContainer2/external_cu_btn.button_pressed
+    ProjectSettings.set_setting('application/config/external_cu', state)
+    if state:
+        signaller.emit_signal('interfer_off_all')

scenes/настройки/настройки.tscn

@@ -267,26 +267,21 @@ text = "Адрес сервера карт"
 horizontal_alignment = 1
 vertical_alignment = 1
 
-[node name="Label19" type="Label" parent="."]
+[node name="GridContainer2" type="GridContainer" parent="."]
 layout_mode = 0
-offset_left = 487.0
-offset_top = 150.0
-offset_right = 775.0
-offset_bottom = 257.0
-size_flags_horizontal = 3
-size_flags_vertical = 3
-text = "Кнопка «Подавление».
-Отключить отображение этой кнопки,
-что бы тип помех применялся сразу."
+offset_left = 900.0
+offset_top = 87.0
+offset_right = 1192.0
+offset_bottom = 193.0
+columns = 2
 
-[node name="CheckButton18" type="CheckButton" parent="."]
-layout_mode = 0
-offset_left = 802.0
-offset_top = 148.0
-offset_right = 846.0
-offset_bottom = 172.0
-size_flags_horizontal = 6
-size_flags_vertical = 6
-button_pressed = true
+[node name="external_cu_lbl" type="Label" parent="GridContainer2"]
+layout_mode = 2
+text = "Внешнее целеуказание"
+vertical_alignment = 1
+
+[node name="external_cu_btn" type="CheckButton" parent="GridContainer2"]
+layout_mode = 2
 
 [connection signal="text_changed" from="edt_mapaddr" to="edt_mapaddr" method="_on_text_changed"]
+[connection signal="pressed" from="GridContainer2/external_cu_btn" to="." method="_on_external_cu_btn_pressed"]