Merge remote-tracking branch 'lepshiy/master'

This commit is contained in:
MaD_CaT
2025-03-25 08:41:09 +03:00
16 changed files with 549 additions and 145 deletions

View File

@@ -1,34 +1,64 @@
[gd_scene load_steps=19 format=3 uid="uid://dab6loryocc73"]
[gd_scene load_steps=20 format=3 uid="uid://dab6loryocc73"]
[ext_resource type="Script" path="res://scenes/эмс/эмс.gd" id="1_mk57x"]
[ext_resource type="PackedScene" uid="uid://da7w3vkhadfwe" path="res://scenes/button-flat/button-flat.tscn" id="2_eju8r"]
[ext_resource type="Texture2D" uid="uid://biyjygfnhhf7i" path="res://data/save.png" id="3_sc4po"]
[ext_resource type="Texture2D" uid="uid://t51eyh4hmc6p" path="res://data/load.png" id="4_mit0h"]
[ext_resource type="Texture2D" uid="uid://7h55yvh84cve" path="res://data/connect.png" id="6_axj2m"]
[ext_resource type="Texture2D" uid="uid://cjsr544qccftu" path="res://data/disconnect.png" id="7_yscbq"]
[ext_resource type="Texture2D" uid="uid://csnts8f155sf7" path="res://scenes/настройки/save1.png" id="3_onafb"]
[ext_resource type="Texture2D" uid="uid://o8mam0a060d8" path="res://data/load1.png" id="4_afjfs"]
[ext_resource type="Texture2D" uid="uid://bdlbqs88bki8x" path="res://data/connect_1.png" id="5_2nrut"]
[ext_resource type="Texture2D" uid="uid://u3tnejvpm8it" path="res://data/disconnect_1.png" id="6_g3q7m"]
[ext_resource type="Script" path="res://table/table.gd" id="8_qcl30"]
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_sy7ny"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_mu34x"]
texture = ExtResource("3_onafb")
modulate_color = Color(0.8, 0.533333, 0.27451, 1)
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_udlbp"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_x3l45"]
texture = ExtResource("3_onafb")
expand_margin_left = 20.0
expand_margin_top = 20.0
modulate_color = Color(0.8, 0.533333, 0.27451, 1)
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_4amgo"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_sn6cm"]
texture = ExtResource("3_onafb")
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_fi0eb"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_570ue"]
texture = ExtResource("4_afjfs")
modulate_color = Color(0.8, 0.533333, 0.27451, 1)
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_5kkhp"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_piewc"]
texture = ExtResource("4_afjfs")
expand_margin_left = 20.0
expand_margin_top = 20.0
modulate_color = Color(0.8, 0.533333, 0.27451, 1)
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ot108"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_3ytmi"]
texture = ExtResource("4_afjfs")
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_63bsy"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_o7qii"]
texture = ExtResource("5_2nrut")
modulate_color = Color(0.8, 0.533333, 0.27451, 1)
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_yuj6c"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_mgr7r"]
texture = ExtResource("5_2nrut")
expand_margin_left = 3.0
expand_margin_top = 3.0
modulate_color = Color(0.8, 0.533333, 0.27451, 1)
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_2q0t0"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_hxhyh"]
texture = ExtResource("5_2nrut")
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_n2m1l"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_tnihm"]
texture = ExtResource("6_g3q7m")
modulate_color = Color(0.8, 0.533333, 0.27451, 1)
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_x5pts"]
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_k1qbi"]
texture = ExtResource("6_g3q7m")
expand_margin_left = 3.0
expand_margin_top = 3.0
modulate_color = Color(0.8, 0.533333, 0.27451, 1)
[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_pe5pe"]
texture = ExtResource("6_g3q7m")
[node name="ЭМС" type="Panel"]
offset_right = 1598.0
@@ -64,61 +94,71 @@ text = "Записать"
[node name="btn_save" type="Button" parent="."]
layout_mode = 0
offset_left = 1453.0
offset_top = 960.0
offset_right = 1973.0
offset_bottom = 1480.0
offset_top = 967.0
offset_right = 1837.0
offset_bottom = 1351.0
scale = Vector2(0.1, 0.1)
tooltip_text = "Сохранить настройки"
focus_mode = 0
theme_override_styles/focus = SubResource("StyleBoxEmpty_sy7ny")
theme_override_styles/pressed = SubResource("StyleBoxEmpty_udlbp")
theme_override_styles/normal = SubResource("StyleBoxEmpty_4amgo")
icon = ExtResource("3_sc4po")
theme_override_styles/focus = SubResource("StyleBoxTexture_mu34x")
theme_override_styles/disabled = SubResource("StyleBoxTexture_mu34x")
theme_override_styles/hover_pressed = SubResource("StyleBoxTexture_mu34x")
theme_override_styles/hover = SubResource("StyleBoxTexture_mu34x")
theme_override_styles/pressed = SubResource("StyleBoxTexture_x3l45")
theme_override_styles/normal = SubResource("StyleBoxTexture_sn6cm")
[node name="btn_load" type="Button" parent="."]
layout_mode = 0
offset_left = 1453.0
offset_top = 1015.0
offset_right = 1973.0
offset_bottom = 1535.0
offset_left = 1458.0
offset_top = 1019.0
offset_right = 1735.5
offset_bottom = 1403.0
scale = Vector2(0.1, 0.1)
tooltip_text = "Сохранить настройки"
focus_mode = 0
theme_override_styles/focus = SubResource("StyleBoxEmpty_fi0eb")
theme_override_styles/pressed = SubResource("StyleBoxEmpty_5kkhp")
theme_override_styles/normal = SubResource("StyleBoxEmpty_4amgo")
icon = ExtResource("4_mit0h")
theme_override_styles/focus = SubResource("StyleBoxTexture_570ue")
theme_override_styles/disabled = SubResource("StyleBoxTexture_570ue")
theme_override_styles/hover_pressed = SubResource("StyleBoxTexture_570ue")
theme_override_styles/hover = SubResource("StyleBoxTexture_570ue")
theme_override_styles/pressed = SubResource("StyleBoxTexture_piewc")
theme_override_styles/normal = SubResource("StyleBoxTexture_3ytmi")
[node name="btn_connect" type="Button" parent="."]
layout_mode = 0
offset_left = 627.0
offset_top = 55.0
offset_right = 683.0
offset_bottom = 111.0
offset_right = 679.0
offset_bottom = 87.0
focus_mode = 0
theme_override_colors/icon_normal_color = Color(1, 1, 1, 1)
theme_override_styles/focus = SubResource("StyleBoxEmpty_ot108")
theme_override_styles/pressed = SubResource("StyleBoxEmpty_63bsy")
theme_override_styles/normal = SubResource("StyleBoxEmpty_yuj6c")
icon = ExtResource("6_axj2m")
theme_override_styles/focus = SubResource("StyleBoxTexture_o7qii")
theme_override_styles/disabled = SubResource("StyleBoxTexture_o7qii")
theme_override_styles/hover_pressed = SubResource("StyleBoxTexture_o7qii")
theme_override_styles/hover = SubResource("StyleBoxTexture_o7qii")
theme_override_styles/pressed = SubResource("StyleBoxTexture_mgr7r")
theme_override_styles/normal = SubResource("StyleBoxTexture_hxhyh")
[node name="btn_disconnect" type="Button" parent="."]
layout_mode = 0
offset_left = 714.0
offset_top = 741.0
offset_right = 770.0
offset_bottom = 815.0
offset_right = 766.0
offset_bottom = 775.0
focus_mode = 0
theme_override_colors/icon_normal_color = Color(1, 1, 1, 1)
theme_override_styles/focus = SubResource("StyleBoxEmpty_2q0t0")
theme_override_styles/pressed = SubResource("StyleBoxEmpty_n2m1l")
theme_override_styles/normal = SubResource("StyleBoxEmpty_x5pts")
icon = ExtResource("7_yscbq")
theme_override_styles/focus = SubResource("StyleBoxTexture_tnihm")
theme_override_styles/disabled = SubResource("StyleBoxTexture_tnihm")
theme_override_styles/hover_pressed = SubResource("StyleBoxTexture_tnihm")
theme_override_styles/hover = SubResource("StyleBoxTexture_tnihm")
theme_override_styles/pressed = SubResource("StyleBoxTexture_k1qbi")
theme_override_styles/normal = SubResource("StyleBoxTexture_pe5pe")
[node name="scrollin" type="ScrollContainer" parent="."]
layout_mode = 0
offset_left = 56.0
offset_top = 52.0
offset_right = 641.0
offset_bottom = 679.0
offset_bottom = 720.0
[node name="tbl_in" type="GridContainer" parent="scrollin"]
layout_mode = 2
@@ -140,7 +180,7 @@ layout_mode = 0
offset_left = 657.0
offset_top = 50.0
offset_right = 1351.0
offset_bottom = 679.0
offset_bottom = 720.0
[node name="tbl_out" type="GridContainer" parent="scrollout"]
layout_mode = 2