diff --git a/data/connect_1.png b/data/connect_1.png new file mode 100644 index 0000000..7e78ff2 Binary files /dev/null and b/data/connect_1.png differ diff --git a/data/connect_1.png.import b/data/connect_1.png.import new file mode 100644 index 0000000..4f311f2 --- /dev/null +++ b/data/connect_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bdlbqs88bki8x" +path="res://.godot/imported/connect_1.png-1d171b59fd32a8c472030e3672b21ba2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://data/connect_1.png" +dest_files=["res://.godot/imported/connect_1.png-1d171b59fd32a8c472030e3672b21ba2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/data/disconnect_1.png b/data/disconnect_1.png new file mode 100644 index 0000000..b10adfa Binary files /dev/null and b/data/disconnect_1.png differ diff --git a/data/disconnect_1.png.import b/data/disconnect_1.png.import new file mode 100644 index 0000000..42803c8 --- /dev/null +++ b/data/disconnect_1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://u3tnejvpm8it" +path="res://.godot/imported/disconnect_1.png-f509e4d9fb0e1e814fdc8edbae6ccf3d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://data/disconnect_1.png" +dest_files=["res://.godot/imported/disconnect_1.png-f509e4d9fb0e1e814fdc8edbae6ccf3d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/data/load1.png b/data/load1.png new file mode 100644 index 0000000..d88f4e2 Binary files /dev/null and b/data/load1.png differ diff --git a/data/load1.png.import b/data/load1.png.import new file mode 100644 index 0000000..c0a0d62 --- /dev/null +++ b/data/load1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://o8mam0a060d8" +path="res://.godot/imported/load1.png-2f9ad89470787ff4a3521b469b7e9fe3.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://data/load1.png" +dest_files=["res://.godot/imported/load1.png-2f9ad89470787ff4a3521b469b7e9fe3.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/data/save1.png b/data/save1.png new file mode 100644 index 0000000..e83a5d7 Binary files /dev/null and b/data/save1.png differ diff --git a/data/save1.png.import b/data/save1.png.import new file mode 100644 index 0000000..ddd22dc --- /dev/null +++ b/data/save1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://lkw8k7ouj42i" +path="res://.godot/imported/save1.png-fe0ea2e877c55fd87cac57974b80e102.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://data/save1.png" +dest_files=["res://.godot/imported/save1.png-fe0ea2e877c55fd87cac57974b80e102.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/scenes/save1.png b/scenes/save1.png new file mode 100644 index 0000000..e83a5d7 Binary files /dev/null and b/scenes/save1.png differ diff --git a/scenes/save1.png.import b/scenes/save1.png.import new file mode 100644 index 0000000..a17ecd9 --- /dev/null +++ b/scenes/save1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://slace75bc6kj" +path="res://.godot/imported/save1.png-6b1d97f8e5244252585ce158fd5780d4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/save1.png" +dest_files=["res://.godot/imported/save1.png-6b1d97f8e5244252585ce158fd5780d4.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/scenes/настройки/save1.png b/scenes/настройки/save1.png new file mode 100644 index 0000000..e83a5d7 Binary files /dev/null and b/scenes/настройки/save1.png differ diff --git a/scenes/настройки/save1.png.import b/scenes/настройки/save1.png.import new file mode 100644 index 0000000..32b523c --- /dev/null +++ b/scenes/настройки/save1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://csnts8f155sf7" +path="res://.godot/imported/save1.png-71614b438670d8c00484426836e4048f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/настройки/save1.png" +dest_files=["res://.godot/imported/save1.png-71614b438670d8c00484426836e4048f.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/scenes/настройки/настройки.gd b/scenes/настройки/настройки.gd index f763c43..98b37ae 100644 --- a/scenes/настройки/настройки.gd +++ b/scenes/настройки/настройки.gd @@ -138,10 +138,6 @@ func setting_tab(): if j < unit_data[2].size() - 1: joined_data += "," profiles.text = str(unit_data[1]) + " : " + joined_data - $end_table.set_header(HEADER_ROW) - $end_table.set_header_text(HEADER_ROW_TEXT) - $end_table.set_columns_min_size([600, 950]) - $end_table.set_columns_alignments(ALIGNMENT) button_settings() diff --git a/scenes/настройки/настройки.tscn b/scenes/настройки/настройки.tscn index 1c8ab22..b55c290 100644 --- a/scenes/настройки/настройки.tscn +++ b/scenes/настройки/настройки.tscn @@ -2,13 +2,20 @@ [ext_resource type="Script" path="res://scenes/настройки/настройки.gd" id="1_2l3rd"] [ext_resource type="Script" path="res://table/table.gd" id="2_6sx73"] -[ext_resource type="Texture2D" uid="uid://biyjygfnhhf7i" path="res://data/save.png" id="3_xqtce"] +[ext_resource type="Texture2D" uid="uid://csnts8f155sf7" path="res://scenes/настройки/save1.png" id="3_dbpks"] -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_bgm7i"] +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_pyq6h"] +texture = ExtResource("3_dbpks") +modulate_color = Color(0.8, 0.533333, 0.27451, 1) -[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_eifcy"] +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_l5g3r"] +texture = ExtResource("3_dbpks") +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_exytp"] +[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_tbxk6"] +texture = ExtResource("3_dbpks") [node name="Настройки" type="Panel"] script = ExtResource("1_2l3rd") @@ -32,25 +39,20 @@ offset_bottom = 988.0 layout_mode = 2 script = ExtResource("2_6sx73") -[node name="end_table" type="GridContainer" parent="."] -layout_mode = 0 -offset_left = 16.0 -offset_top = 1000.0 -offset_right = 16.0 -offset_bottom = 1000.0 -script = ExtResource("2_6sx73") - [node name="btn_save_settings" type="Button" parent="."] layout_mode = 0 offset_left = 1523.0 -offset_top = 1062.0 -offset_right = 2043.0 -offset_bottom = 1582.0 +offset_top = 1057.0 +offset_right = 2035.0 +offset_bottom = 1569.0 scale = Vector2(0.1, 0.1) +tooltip_text = "Сохранить настройки" focus_mode = 0 -theme_override_styles/focus = SubResource("StyleBoxEmpty_bgm7i") -theme_override_styles/pressed = SubResource("StyleBoxEmpty_eifcy") -theme_override_styles/normal = SubResource("StyleBoxEmpty_exytp") -icon = ExtResource("3_xqtce") +theme_override_styles/focus = SubResource("StyleBoxTexture_pyq6h") +theme_override_styles/disabled = SubResource("StyleBoxTexture_pyq6h") +theme_override_styles/hover_pressed = SubResource("StyleBoxTexture_pyq6h") +theme_override_styles/hover = SubResource("StyleBoxTexture_pyq6h") +theme_override_styles/pressed = SubResource("StyleBoxTexture_l5g3r") +theme_override_styles/normal = SubResource("StyleBoxTexture_tbxk6") [connection signal="pressed" from="btn_save_settings" to="." method="_on_btn_save_settings_pressed"] diff --git a/scenes/эмс/эмс.tscn b/scenes/эмс/эмс.tscn index 1eb1b15..58f078d 100644 --- a/scenes/эмс/эмс.tscn +++ b/scenes/эмс/эмс.tscn @@ -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