diff --git a/project.godot b/project.godot index adcd28a6..242f7d6a 100644 --- a/project.godot +++ b/project.godot @@ -84,6 +84,7 @@ gdscript/warnings/integer_division=0 window/size/viewport_width=1600 window/size/viewport_height=1200 +window/size/borderless=true window/subwindows/embed_subwindows=false window/stretch/mode="canvas_items" diff --git a/scenes/button-flat/button-flat.tscn b/scenes/button-flat/button-flat.tscn index d1a610ae..ee9c86cb 100644 --- a/scenes/button-flat/button-flat.tscn +++ b/scenes/button-flat/button-flat.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=13 format=3 uid="uid://da7w3vkhadfwe"] -[ext_resource type="Script" path="res://scenes/button-flat/nine-patch-button.gd" id="1_ui6sg"] +[ext_resource type="Script" uid="uid://damy6n4u215pu" path="res://scenes/button-flat/nine-patch-button.gd" id="1_ui6sg"] [ext_resource type="Texture2D" uid="uid://ct0ajcwno03h7" path="res://data/кнопка-квадрат-0.png" id="2_0cn5u"] -[ext_resource type="Shader" path="res://shaders/strips.gdshader" id="2_5ngiq"] +[ext_resource type="Shader" uid="uid://cdmmsf161l6yw" path="res://shaders/strips.gdshader" id="2_5ngiq"] [sub_resource type="StyleBoxEmpty" id="1"] diff --git a/scenes/frame-ecm-params/frame-ecm-params.tscn b/scenes/frame-ecm-params/frame-ecm-params.tscn index 0c037550..27af52d6 100644 --- a/scenes/frame-ecm-params/frame-ecm-params.tscn +++ b/scenes/frame-ecm-params/frame-ecm-params.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=3 uid="uid://b1o10yvgjpb0j"] [ext_resource type="Texture2D" uid="uid://cs6i1xwx0pmdk" path="res://data/рамка-панели.png" id="1_q1ow7"] -[ext_resource type="Script" path="res://table/table.gd" id="2_82yax"] -[ext_resource type="Script" path="res://scenes/frame-ecm-params/scroll-ecm-params.gd" id="2_sm6tk"] +[ext_resource type="Script" uid="uid://c5pq0hbrij34d" path="res://table/table.gd" id="2_82yax"] +[ext_resource type="Script" uid="uid://uaw2wbqu2l1w" path="res://scenes/frame-ecm-params/scroll-ecm-params.gd" id="2_sm6tk"] [node name="frm_ecm_params" type="NinePatchRect"] size_flags_horizontal = 3 @@ -30,7 +30,7 @@ layout_mode = 0 offset_left = 4.0 offset_top = 25.0 offset_right = 476.0 -offset_bottom = 256.0 +offset_bottom = 285.0 script = ExtResource("2_sm6tk") [node name="table" type="GridContainer" parent="scroll"] diff --git a/scenes/tabs-switch/tab-switch.tscn b/scenes/tabs-switch/tab-switch.tscn index 4b6e48bc..cd8d9c22 100644 --- a/scenes/tabs-switch/tab-switch.tscn +++ b/scenes/tabs-switch/tab-switch.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=11 format=3 uid="uid://3slb0i3pvowc"] -[ext_resource type="Script" path="res://scenes/tabs-switch/tab-switch.gd" id="1_fg0vd"] +[ext_resource type="Script" uid="uid://bvo6tcreqyuex" path="res://scenes/tabs-switch/tab-switch.gd" id="1_fg0vd"] [ext_resource type="PackedScene" uid="uid://b276iygic5itk" path="res://scenes/работа/работа.tscn" id="2_u7p16"] [ext_resource type="PackedScene" uid="uid://lwmw4egynmd1" path="res://scenes/контроль/контроль.tscn" id="3_txp0s"] [ext_resource type="PackedScene" uid="uid://trt0q8th3bn2" path="res://scenes/журнал/журнал.tscn" id="4_cu5k8"] diff --git a/scenes/контроль/кассета-у-5-нв.tscn b/scenes/контроль/кассета-у-5-нв.tscn index 99f06312..d1ed6ce7 100644 --- a/scenes/контроль/кассета-у-5-нв.tscn +++ b/scenes/контроль/кассета-у-5-нв.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://bk1655p4e8y4u"] [ext_resource type="Texture2D" uid="uid://c4mdrmk7h638f" path="res://data/nine-patch-round.png" id="1_bnifj"] -[ext_resource type="Script" path="res://scenes/контроль/кассета.gd" id="2_6hp1m"] +[ext_resource type="Script" uid="uid://crpedygm3gohi" path="res://scenes/контроль/кассета.gd" id="2_6hp1m"] [ext_resource type="PackedScene" uid="uid://p2suppildvq0" path="res://scenes/контроль/элемент-в.tscn" id="3_picsk"] [node name="kasseta_u5" type="NinePatchRect"] diff --git a/scenes/эмс/кнопка-эмс.tscn b/scenes/эмс/кнопка-эмс.tscn index 9d900659..3b55dc2d 100644 --- a/scenes/эмс/кнопка-эмс.tscn +++ b/scenes/эмс/кнопка-эмс.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=3 uid="uid://gh3wqymu7cub"] -[ext_resource type="Script" path="res://scenes/эмс/кнопка-эмс.gd" id="1_pmsh3"] +[ext_resource type="Script" uid="uid://dhqqyf2pd1scs" path="res://scenes/эмс/кнопка-эмс.gd" id="1_pmsh3"] [ext_resource type="Texture2D" uid="uid://nfpish471rjj" path="res://data/кнопка-эмс-1.png" id="2_0o537"] [sub_resource type="StyleBoxEmpty" id="1"] diff --git a/scenes/эмс/состояния-эмс.tscn b/scenes/эмс/состояния-эмс.tscn index 427f5811..a27e47b2 100644 --- a/scenes/эмс/состояния-эмс.tscn +++ b/scenes/эмс/состояния-эмс.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=7 format=3 uid="uid://by22sta8tt8dn"] -[ext_resource type="Script" path="res://scenes/эмс/состояния-эмс.gd" id="1_5cq67"] +[ext_resource type="Script" uid="uid://dbf4w46tjjvjk" path="res://scenes/эмс/состояния-эмс.gd" id="1_5cq67"] [ext_resource type="Texture2D" uid="uid://belwchvdktrw0" path="res://data/эмс-бланк.png" id="2_don4l"] [ext_resource type="Texture2D" uid="uid://bwddxs24es81u" path="res://data/эмс-бланк-пост.png" id="3_lu634"] [ext_resource type="Texture2D" uid="uid://pfoscstbm025" path="res://data/эмс-бланк-перем.png" id="4_b33qw"] diff --git a/scenes/эмс/эмс.tscn b/scenes/эмс/эмс.tscn index 0613f1a4..32717b0e 100644 --- a/scenes/эмс/эмс.tscn +++ b/scenes/эмс/эмс.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=20 format=3 uid="uid://dab6loryocc73"] -[ext_resource type="Script" path="res://scenes/эмс/эмс.gd" id="1_mk57x"] +[ext_resource type="Script" uid="uid://do1s7qg4bmxqy" 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://csnts8f155sf7" path="res://data/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-a.png" id="5_2nrut"] [ext_resource type="Texture2D" uid="uid://u3tnejvpm8it" path="res://data/disconnect-a.png" id="6_g3q7m"] -[ext_resource type="Script" path="res://table/table.gd" id="8_qcl30"] +[ext_resource type="Script" uid="uid://c5pq0hbrij34d" path="res://table/table.gd" id="8_qcl30"] [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_mu34x"] texture = ExtResource("3_onafb") diff --git a/table/table.gd b/table/table.gd index 3c0a4e48..45f744be 100644 --- a/table/table.gd +++ b/table/table.gd @@ -310,7 +310,7 @@ func clear_rows_selected(): ## [param i_row] - Индекс ряда. func set_row_selected(i_row: int, selected: bool = true) -> void: - call_deferred('_set_row_selected', i_row, selected) + _set_row_selected(i_row, selected) ## [param i_row] - Индекс ряда.