Merge remote-tracking branch 'origin/master' into master-afsp

# Conflicts:
#	scenes/tabs-switch/tab-switch.tscn
#	scenes/контроль/контроль.tscn

scenes/tabs-switch/tab-switch.gd

@@ -23,3 +23,17 @@ func _enter_tree() -> void:
 func on_setting_changed():
     var ext_cu = ProjectSettings.get_setting('application/config/Внешнее управление', false)
     get_parent().get_node('remote_control').visible = ext_cu
+    apply_colors()
+
+
+func apply_colors():
+    var is_light: bool = ProjectSettings.get_setting("application/config/Цвет темы программы", false)
+    var style = StyleBoxFlat.new()
+    if is_light:
+        style.bg_color = Color.DARK_GRAY
+        add_theme_stylebox_override("tabbar_background", style)
+        add_theme_stylebox_override("panel", style)
+    else:
+        style.bg_color = Color(0.12, 0.12, 0.12)
+        add_theme_stylebox_override("tabbar_background", style)
+        add_theme_stylebox_override("panel", style)

scenes/tabs-switch/tab-switch.tscn

@@ -16,9 +16,7 @@
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_cw2ss"]
 
-[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_nmdfd"]
-
-[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_vap7n"]
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_vap7n"]
 
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_o1r22"]
 
@@ -33,17 +31,14 @@ bg_color = Color(0, 100, 0, 1)
 [node name="panel" type="Panel"]
 offset_right = 1600.0
 offset_bottom = 1200.0
-theme_override_styles/panel = SubResource("StyleBoxEmpty_tidwt")
 
 [node name="tab_switch" type="TabContainer" parent="."]
 layout_mode = 0
 offset_right = 1600.0
 offset_bottom = 1200.0
 tooltip_text = "Переключает режимы работы программы"
-theme_override_styles/tab_focus = SubResource("StyleBoxEmpty_41d34")
-theme_override_styles/tab_disabled = SubResource("StyleBoxEmpty_cw2ss")
-theme_override_styles/tabbar_background = SubResource("StyleBoxEmpty_nmdfd")
-theme_override_styles/panel = SubResource("StyleBoxEmpty_vap7n")
+theme_override_styles/tabbar_background = SubResource("StyleBoxFlat_vap7n")
+theme_override_styles/panel = SubResource("StyleBoxFlat_vap7n")
 current_tab = 0
 script = ExtResource("1_fg0vd")