Merge remote-tracking branch 'origin/master'
# Conflicts: # scenes/canvas.tscn # scenes/count_all_pad.tscn # scenes/sector.tscn # scenes/журнал.tscn # scenes/работа.tscn # scenes/состояния-эмс.tscn
This commit is contained in:
MaD_CaT
@@ -1,32 +1,32 @@
|
||||
[gd_scene load_steps=7 format=3 uid="uid://3slb0i3pvowc"]
|
||||
|
||||
[ext_resource type="Script" path="res://scenes/tab-switch.gd" id="1_qroqt"]
|
||||
[ext_resource type="PackedScene" uid="uid://b276iygic5itk" path="res://scenes/работа.tscn" id="2_pdbvn"]
|
||||
[ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль.tscn" id="3_2apbp"]
|
||||
[ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал.tscn" id="4_yq6c0"]
|
||||
[ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/ЭМС.tscn" id="5_tlyql"]
|
||||
[ext_resource type="PackedScene" uid="uid://bnptm4rlp60dq" path="res://scenes/настройки.tscn" id="6_rxq15"]
|
||||
[ext_resource type="Script" path="res://scenes/tab-switch.gd" id="1_jjaev"]
|
||||
[ext_resource type="PackedScene" uid="uid://b276iygic5itk" path="res://scenes/работа.tscn" id="2_ottu4"]
|
||||
[ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль.tscn" id="3_50u6g"]
|
||||
[ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал.tscn" id="4_jbm5n"]
|
||||
[ext_resource type="PackedScene" uid="uid://dab6loryocc73" path="res://scenes/эмс.tscn" id="5_014x4"]
|
||||
[ext_resource type="PackedScene" uid="uid://bnptm4rlp60dq" path="res://scenes/настройки.tscn" id="6_06u87"]
|
||||
|
||||
[node name="tab_switch" type="TabContainer"]
|
||||
offset_right = 1600.0
|
||||
offset_bottom = 1200.0
|
||||
script = ExtResource("1_qroqt")
|
||||
script = ExtResource("1_jjaev")
|
||||
|
||||
[node name="Работа" parent="." instance=ExtResource("2_pdbvn")]
|
||||
[node name="Работа" parent="." instance=ExtResource("2_ottu4")]
|
||||
layout_mode = 2
|
||||
|
||||
[node name="Контроль" parent="." instance=ExtResource("3_2apbp")]
|
||||
[node name="Контроль" parent="." instance=ExtResource("3_50u6g")]
|
||||
visible = false
|
||||
layout_mode = 2
|
||||
|
||||
[node name="Журнал" parent="." instance=ExtResource("4_yq6c0")]
|
||||
[node name="Журнал" parent="." instance=ExtResource("4_jbm5n")]
|
||||
visible = false
|
||||
layout_mode = 2
|
||||
|
||||
[node name="ЭМС" parent="." instance=ExtResource("5_tlyql")]
|
||||
[node name="ЭМС" parent="." instance=ExtResource("5_014x4")]
|
||||
visible = false
|
||||
layout_mode = 2
|
||||
|
||||
[node name="Настройки" parent="." instance=ExtResource("6_rxq15")]
|
||||
[node name="Настройки" parent="." instance=ExtResource("6_06u87")]
|
||||
visible = false
|
||||
layout_mode = 2
|
||||
|
||||
144
scenes/эмс.tscn
144
scenes/эмс.tscn
@@ -1,144 +0,0 @@
|
||||
[gd_scene load_steps=9 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.tscn" id="2_eju8r"]
|
||||
[ext_resource type="Texture2D" uid="uid://dd60btbqnpiqw" path="res://data/document-new-0.png" id="3_w7rqa"]
|
||||
[ext_resource type="Texture2D" uid="uid://coqg6wsftvtxr" path="res://data/document-save-0.png" id="4_gyaoq"]
|
||||
[ext_resource type="Texture2D" uid="uid://cywuevvpkxl7v" path="res://data/edit-copy-0.png" id="5_dxpqo"]
|
||||
[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="Script" path="res://table/table.gd" id="8_qcl30"]
|
||||
|
||||
[node name="ЭМС" type="Panel"]
|
||||
offset_right = 1598.0
|
||||
offset_bottom = 1201.0
|
||||
script = ExtResource("1_mk57x")
|
||||
|
||||
[node name="lbl_online" type="Label" parent="."]
|
||||
layout_mode = 0
|
||||
offset_left = 30.0
|
||||
offset_top = 4.0
|
||||
offset_right = 166.0
|
||||
offset_bottom = 30.0
|
||||
theme_override_colors/font_color = Color(0, 0.647059, 0.184314, 1)
|
||||
text = "Ячейка на связи"
|
||||
|
||||
[node name="btn_flash_read" parent="." instance=ExtResource("2_eju8r")]
|
||||
layout_mode = 0
|
||||
offset_left = 1446.0
|
||||
offset_top = 55.0
|
||||
offset_right = 1583.0
|
||||
offset_bottom = 85.0
|
||||
text = "Прочитать"
|
||||
|
||||
[node name="btn_flash_write" parent="." instance=ExtResource("2_eju8r")]
|
||||
layout_mode = 0
|
||||
offset_left = 1446.0
|
||||
offset_top = 99.0
|
||||
offset_right = 1583.0
|
||||
offset_bottom = 129.0
|
||||
text = "Записать"
|
||||
|
||||
[node name="btn_new" type="Button" parent="."]
|
||||
layout_mode = 0
|
||||
offset_left = 1453.0
|
||||
offset_top = 960.0
|
||||
offset_right = 1509.0
|
||||
offset_bottom = 1016.0
|
||||
focus_mode = 0
|
||||
shortcut_feedback = false
|
||||
shortcut_in_tooltip = false
|
||||
icon = ExtResource("3_w7rqa")
|
||||
|
||||
[node name="btn_save" type="Button" parent="."]
|
||||
layout_mode = 0
|
||||
offset_left = 1453.0
|
||||
offset_top = 1017.0
|
||||
offset_right = 1509.0
|
||||
offset_bottom = 1073.0
|
||||
focus_mode = 0
|
||||
icon = ExtResource("4_gyaoq")
|
||||
|
||||
[node name="btn_copy" type="Button" parent="."]
|
||||
layout_mode = 0
|
||||
offset_left = 1454.0
|
||||
offset_top = 1074.0
|
||||
offset_right = 1510.0
|
||||
offset_bottom = 1130.0
|
||||
focus_mode = 0
|
||||
icon = ExtResource("5_dxpqo")
|
||||
|
||||
[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
|
||||
focus_mode = 0
|
||||
theme_override_colors/icon_normal_color = Color(1, 1, 1, 1)
|
||||
icon = ExtResource("6_axj2m")
|
||||
|
||||
[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
|
||||
focus_mode = 0
|
||||
theme_override_colors/icon_normal_color = Color(1, 1, 1, 1)
|
||||
icon = ExtResource("7_yscbq")
|
||||
|
||||
[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
|
||||
|
||||
[node name="tbl_in" type="GridContainer" parent="scrollin"]
|
||||
layout_mode = 2
|
||||
script = ExtResource("8_qcl30")
|
||||
|
||||
[node name="scrl_files" type="ScrollContainer" parent="."]
|
||||
layout_mode = 0
|
||||
offset_left = 1047.0
|
||||
offset_top = 962.0
|
||||
offset_right = 1442.0
|
||||
offset_bottom = 1166.0
|
||||
|
||||
[node name="tbl_files" type="GridContainer" parent="scrl_files"]
|
||||
layout_mode = 2
|
||||
script = ExtResource("8_qcl30")
|
||||
|
||||
[node name="scrollout" type="ScrollContainer" parent="."]
|
||||
layout_mode = 0
|
||||
offset_left = 657.0
|
||||
offset_top = 50.0
|
||||
offset_right = 1351.0
|
||||
offset_bottom = 679.0
|
||||
|
||||
[node name="tbl_out" type="GridContainer" parent="scrollout"]
|
||||
layout_mode = 2
|
||||
script = ExtResource("8_qcl30")
|
||||
|
||||
[node name="scrl_in_set" type="ScrollContainer" parent="."]
|
||||
layout_mode = 0
|
||||
offset_left = 120.0
|
||||
offset_top = 776.0
|
||||
offset_right = 703.0
|
||||
offset_bottom = 942.0
|
||||
|
||||
[node name="tbl_in_set" type="GridContainer" parent="scrl_in_set"]
|
||||
layout_mode = 2
|
||||
script = ExtResource("8_qcl30")
|
||||
|
||||
[node name="scrl_out_set" type="ScrollContainer" parent="."]
|
||||
layout_mode = 0
|
||||
offset_left = 719.0
|
||||
offset_top = 773.0
|
||||
offset_right = 1415.0
|
||||
offset_bottom = 924.0
|
||||
|
||||
[node name="tbl_out_set" type="GridContainer" parent="scrl_out_set"]
|
||||
layout_mode = 2
|
||||
script = ExtResource("8_qcl30")
|
||||
Reference in New Issue
Block a user