Слияние ветки 'develop' с 'main'

#161 Синхронизация ветки develop в main после глобального рефакторинга перевода на архитектуру приложений Посмотреть запрос на слияние !299

Слияние ветки 'develop' с 'main'
#161 Синхронизация ветки develop в main после глобального рефакторинга перевода на архитектуру приложений Посмотреть запрос на слияние !299
ca22e936 · Левадный Владимир Юрьевич · bf3ca45f · cd1ae3ba · bf3ca45f · ca22e936
--- a/addons/SIsilicon.vfx.godrays/plugin.cfg
+++ b/addons/SIsilicon.vfx.godrays/plugin.cfg
-[plugin]
-
-name="God Rays Plugin"
-description="This plugin adds god rays to your Project. Just add such a node to a light, and the light will exude the effect."
-author="SIsilicon"
-version="1.0"
-script="Plugin.gd"
--- a/blokoj/administri/bazo/apliko_tipo.gd
+++ b/blokoj/administri/bazo/apliko_tipo.gd
-extends "res://blokoj/administri/skriptoj/wablono.gd"
+extends "res://apps/admin/scripts/wablono.gd"


 var main_node = null #вызывающая нода

--- a/blokoj/administri/bazo/apliko_tipo.tscn
+++ b/blokoj/administri/bazo/apliko_tipo.tscn
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=4 format=3 uid="uid://e5yt3w0t37s"]

-[ext_resource path="res://blokoj/administri/scenoj/wablono.tscn" type="PackedScene" id=1]
-[ext_resource path="res://blokoj/administri/bazo/apliko_tipo.gd" type="Script" id=2]
-[ext_resource path="res://blokoj/administri/wablono/Lokalizo.tscn" type="PackedScene" id=3]
+[ext_resource type="PackedScene" uid="uid://dgt4ij56ig7v0" path="res://apps/admin/scenes/wablono.tscn" id="1"]
+[ext_resource type="Script" path="res://apps/admin/base/apliko_tipo.gd" id="2"]
+[ext_resource type="PackedScene" uid="uid://cmotx2adp54w7" path="res://apps/admin/templates/Lokalizo.tscn" id="3"]

-[node name="apliko_tipo" instance=ExtResource( 1 )]
-script = ExtResource( 2 )
+[node name="apliko_tipo" instance=ExtResource("1")]
+script = ExtResource("2")

 [node name="menuo_name" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="0"]
 text = "Реальность"

 [node name="GridContainer" parent="VBox/body_texture/ScrollContainer/VBoxContainer" index="0"]
-theme_override_constants/v_separation = 15
-theme_override_constants/h_separation = 3
 columns = 2

 [node name="Label" type="Label" parent="VBox/body_texture/ScrollContainer/VBoxContainer/GridContainer" index="0"]
-offset_right = 86.0
-offset_bottom = 17.0
+layout_mode = 2
 text = "xcvbxcb"

-[node name="Lokalizo" parent="VBox/body_texture/ScrollContainer/VBoxContainer/GridContainer" index="1" instance=ExtResource( 3 )]
-anchor_right = 0.0
-anchor_bottom = 0.0
-offset_left = 89.0
-offset_right = 389.0
-offset_bottom = 17.0
+[node name="Lokalizo" parent="VBox/body_texture/ScrollContainer/VBoxContainer/GridContainer" index="1" instance=ExtResource("3")]
+layout_mode = 2

 [node name="Label2" type="Label" parent="VBox/body_texture/ScrollContainer/VBoxContainer/GridContainer" index="2"]
-offset_top = 32.0
-offset_right = 86.0
-offset_bottom = 49.0
+layout_mode = 2
 text = "Проверка "

 [node name="TextEdit" type="TextEdit" parent="VBox/body_texture/ScrollContainer/VBoxContainer/GridContainer" index="3"]
-offset_left = 89.0
-offset_top = 32.0
-offset_right = 389.0
-offset_bottom = 49.0
+layout_mode = 2
 size_flags_horizontal = 3
 text = "cvkljc hn lkf kldfh;ljdf ;hkl jhfhkljdf ;kljh
 "

--- a/blokoj/administri/bazo/realeco.gd
+++ b/blokoj/administri/bazo/realeco.gd
-extends "res://blokoj/administri/skriptoj/wablono.gd"
+extends "res://apps/admin/scripts/wablono.gd"


 var main_node = null #вызывающая нода

--- a/blokoj/administri/bazo/realeco.tscn
+++ b/blokoj/administri/bazo/realeco.tscn
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=4 format=3 uid="uid://nswq72af1v22"]

-[ext_resource path="res://blokoj/administri/wablono/Lokalizo.tscn" type="PackedScene" id=1]
-[ext_resource path="res://blokoj/administri/scenoj/wablono.tscn" type="PackedScene" id=2]
-[ext_resource path="res://blokoj/administri/bazo/realeco.gd" type="Script" id=3]
+[ext_resource type="PackedScene" uid="uid://cmotx2adp54w7" path="res://apps/admin/templates/Lokalizo.tscn" id="1"]
+[ext_resource type="PackedScene" uid="uid://dgt4ij56ig7v0" path="res://apps/admin/scenes/wablono.tscn" id="2"]
+[ext_resource type="Script" path="res://apps/admin/base/realeco.gd" id="3"]

-[node name="realeco" instance=ExtResource( 2 )]
-script = ExtResource( 3 )
+[node name="realeco" instance=ExtResource("2")]
+script = ExtResource("3")

 [node name="menuo_name" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="0"]
 text = "Реальность"

 [node name="GridContainer" parent="VBox/body_texture/ScrollContainer/VBoxContainer" index="0"]
-theme_override_constants/v_separation = 15
-theme_override_constants/h_separation = 3
 columns = 2

 [node name="Label" type="Label" parent="VBox/body_texture/ScrollContainer/VBoxContainer/GridContainer" index="0"]
-offset_right = 86.0
-offset_bottom = 17.0
+layout_mode = 2
 text = "xcvbxcb"

-[node name="Lokalizo" parent="VBox/body_texture/ScrollContainer/VBoxContainer/GridContainer" index="1" instance=ExtResource( 1 )]
-anchor_right = 0.0
-anchor_bottom = 0.0
-offset_left = 89.0
-offset_right = 389.0
-offset_bottom = 17.0
+[node name="Lokalizo" parent="VBox/body_texture/ScrollContainer/VBoxContainer/GridContainer" index="1" instance=ExtResource("1")]
+layout_mode = 2

 [node name="Label2" type="Label" parent="VBox/body_texture/ScrollContainer/VBoxContainer/GridContainer" index="2"]
-offset_top = 32.0
-offset_right = 86.0
-offset_bottom = 49.0
+layout_mode = 2
 text = "Проверка "

 [node name="TextEdit" type="TextEdit" parent="VBox/body_texture/ScrollContainer/VBoxContainer/GridContainer" index="3"]
-offset_left = 89.0
-offset_top = 32.0
-offset_right = 389.0
-offset_bottom = 49.0
+layout_mode = 2
 size_flags_horizontal = 3
 text = "cvkljc hn lkf kldfh;ljdf ;hkl jhfhkljdf ;kljh
 "

--- a/blokoj/administri/scenoj/main_administri.tscn
+++ b/blokoj/administri/scenoj/main_administri.tscn
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=6 format=3]
+
+[ext_resource type="PackedScene" uid="uid://to3qrst1pcw6" path="res://apps/screens/tipo_d1.tscn" id="1"]
+[ext_resource type="Script" path="res://apps/admin/scripts/main_administri.gd" id="2"]
+[ext_resource type="Texture2D" uid="uid://b47v0rxsqaswl" path="res://apps/menu/resources/icons/tab2a.png" id="3"]
+[ext_resource type="Texture2D" uid="uid://b5s0tehydk0ub" path="res://apps/menu/resources/icons/tab3a.png" id="4"]
+[ext_resource type="Texture2D" uid="uid://bkjt27d5abq4h" path="res://apps/menu/resources/icons/tab1a.png" id="5"]

-[ext_resource path="res://kerno/fenestroj/tipo_d1.tscn" type="PackedScene" id=1]
-[ext_resource path="res://blokoj/administri/skriptoj/main_administri.gd" type="Script" id=2]
-[ext_resource path="res://kerno/menuo/resursoj/icons/tab2a.png" type="Texture2D" id=3]
-[ext_resource path="res://kerno/menuo/resursoj/icons/tab3a.png" type="Texture2D" id=4]
-[ext_resource path="res://kerno/menuo/resursoj/icons/tab1a.png" type="Texture2D" id=5]

 [node name="main_administri" instance=ExtResource( 1 )]
 script = ExtResource( 2 )

--- a/blokoj/administri/scenoj/tempo_informpeto.tscn
+++ b/blokoj/administri/scenoj/tempo_informpeto.tscn
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=3 format=3]
+
+[ext_resource type="PackedScene" uid="uid://bbm0knxrdpuus" path="res://apps/screens/tipo_a1.tscn" id="1"]
+[ext_resource type="Script" path="res://apps/admin/scripts/tempo_informpeto.gd" id="2"]

-[ext_resource path="res://kerno/fenestroj/tipo_a1.tscn" type="PackedScene" id=1]
-[ext_resource path="res://blokoj/administri/skriptoj/tempo_informpeto.gd" type="Script" id=2]

 [node name="tempo_informpeto" instance=ExtResource( 1 )]
 script = ExtResource( 2 )

--- a/blokoj/administri/scenoj/wablono.tscn
+++ b/blokoj/administri/scenoj/wablono.tscn
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=3 format=3 uid="uid://dgt4ij56ig7v0"]

-[ext_resource path="res://kerno/fenestroj/tipo_a1.tscn" type="PackedScene" id=1]
-[ext_resource path="res://blokoj/administri/skriptoj/wablono.gd" type="Script" id=2]
+[ext_resource type="PackedScene" uid="uid://bbm0knxrdpuus" path="res://apps/screens/tipo_a1.tscn" id="1"]
+[ext_resource type="Script" path="res://apps/admin/scripts/wablono.gd" id="2"]

-[node name="wablono" instance=ExtResource( 1 )]
+[node name="wablono" instance=ExtResource("1")]
+layout_mode = 3
+anchors_preset = 0
 offset_left = 218.877
 offset_top = 197.168
 offset_right = 218.877
 offset_bottom = 197.168
-script = ExtResource( 2 )
+script = ExtResource("2")

 [node name="VBox" parent="." index="0"]
+layout_mode = 0
 offset_right = 389.0
 offset_bottom = 232.0

 [node name="HBox_top" parent="VBox" index="0"]
-offset_right = 389.0
+layout_mode = 2
+
+[node name="top_texture1" parent="VBox/HBox_top" index="0"]
+layout_mode = 2
+
+[node name="frame1" parent="VBox/HBox_top/top_texture1" index="0"]
+layout_mode = 0
+anchor_right = 0.0
+anchor_bottom = 0.0
+offset_left = 0.0
+offset_top = 0.0
+offset_right = 0.0
+offset_bottom = 0.0
+expand_mode = 1

 [node name="top_texture2" parent="VBox/HBox_top" index="1"]
-offset_right = 389.0
+layout_mode = 2
+
+[node name="HBox_buttons" parent="VBox/HBox_top/top_texture2" index="0"]
+layout_mode = 0
+anchor_top = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+offset_top = 0.0
+offset_right = 0.0
+offset_bottom = 23.0

 [node name="menuo_name" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="0"]
-offset_right = 321.0
+layout_mode = 2
 text = "Шаблон"

 [node name="Button_fix" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="1"]
 visible = false
+layout_mode = 2

 [node name="Button_" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="2"]
 visible = false
+layout_mode = 2

 [node name="Button_min" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="3"]
-offset_left = 325.0
-offset_right = 345.0
+layout_mode = 2

 [node name="Button_full" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="4"]
 visible = false
+layout_mode = 2

 [node name="Button_x" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="5"]
-offset_left = 349.0
-offset_right = 368.0
+layout_mode = 2
+
+[node name="frame2" parent="VBox/HBox_top/top_texture2" index="1"]
+layout_mode = 0
+anchor_right = 0.0
+offset_left = 0.0
+offset_top = 0.0
+offset_right = 12.0
+offset_bottom = 1.0
+expand_mode = 1

 [node name="body_texture" parent="VBox" index="1"]
-offset_right = 389.0
-offset_bottom = 210.0
+layout_mode = 2
+
+[node name="resize_control" parent="VBox/body_texture" index="0"]
+anchors_preset = 0
+
+[node name="frame3" parent="VBox/body_texture" index="1"]
+layout_mode = 0
+anchor_top = 0.0
+anchor_bottom = 0.0
+offset_left = 0.0
+offset_top = 0.0
+offset_right = 1.0
+offset_bottom = 32.844
+expand_mode = 1
+
+[node name="frame4" parent="VBox/body_texture" index="2"]
+layout_mode = 0
+anchor_left = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+offset_top = 0.0
+offset_bottom = 33.7
+expand_mode = 1

 [node name="ScrollContainer" type="ScrollContainer" parent="VBox/body_texture" index="3"]
+layout_mode = 0
 anchor_right = 1.0
 anchor_bottom = 1.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
-__meta__ = {
-"_edit_lock_": true,
-"_edit_use_anchors_": true
-}

 [node name="VBoxContainer" type="VBoxContainer" parent="VBox/body_texture/ScrollContainer" index="0"]
-offset_right = 389.0
-offset_bottom = 188.0
+layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
-__meta__ = {
-"_edit_lock_": true
-}

 [node name="GridContainer" type="GridContainer" parent="VBox/body_texture/ScrollContainer/VBoxContainer" index="0"]
-offset_right = 389.0
-offset_bottom = 161.0
+layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 columns = 3
-__meta__ = {
-"_edit_lock_": true
-}

 [node name="HBoxContainer" type="HBoxContainer" parent="VBox/body_texture/ScrollContainer/VBoxContainer" index="1"]
-offset_top = 165.0
-offset_right = 389.0
-offset_bottom = 188.0
-__meta__ = {
-"_edit_lock_": true
-}
+layout_mode = 2

 [node name="save" type="Button" parent="VBox/body_texture/ScrollContainer/VBoxContainer/HBoxContainer" index="0"]
-offset_right = 99.0
-offset_bottom = 23.0
+layout_mode = 2
 text = "Сохранить"
-__meta__ = {
-"_edit_lock_": true
-}

 [node name="delete" type="Button" parent="VBox/body_texture/ScrollContainer/VBoxContainer/HBoxContainer" index="1"]
-offset_left = 103.0
-offset_right = 183.0
-offset_bottom = 23.0
+layout_mode = 2
 text = "Удалить"
-__meta__ = {
-"_edit_lock_": true
-}

 [node name="HBox_bottom" parent="VBox" index="2"]
-offset_top = 210.0
-offset_right = 389.0
-offset_bottom = 232.0
+layout_mode = 2

 [node name="bottom_texture1" parent="VBox/HBox_bottom" index="0"]
-offset_right = 367.0
+layout_mode = 2
+expand_mode = 1
+
+[node name="frame5" parent="VBox/HBox_bottom/bottom_texture1" index="0"]
+layout_mode = 0
+anchor_top = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+offset_left = 0.0
+offset_right = 12.6
+expand_mode = 1

 [node name="bottom_texture2" parent="VBox/HBox_bottom" index="1"]
-offset_left = 367.0
-offset_right = 389.0
+layout_mode = 2
+
+[node name="frame6" parent="VBox/HBox_bottom/bottom_texture2" index="0"]
+layout_mode = 0
+anchor_right = 0.0
+anchor_bottom = 0.0
+offset_left = 0.0
+offset_top = 0.0
+offset_right = 0.0
+offset_bottom = 0.0
+expand_mode = 1
--- a/blokoj/administri/skriptoj/main_administri.gd
+++ b/blokoj/administri/skriptoj/main_administri.gd
-extends "res://kerno/fenestroj/tipo_d1.gd"
+extends "res://apps/screens/tipo_d1.gd"


-const realeco_screan = preload("res://blokoj/administri/bazo/realeco.tscn")
+const realeco_screan = preload("res://apps/admin/base/realeco.tscn")
 const QueryAdmini = preload("queries.gd")
-# const item_konservejo = preload("res://blokoj/objektoj/scenoj/ITEM_konservejo.tscn")
-const apliko_tipo_screan = preload("res://blokoj/administri/bazo/apliko_tipo.tscn")
+# const item_konservejo = preload("res://apps/objects/scenes/ITEM_konservejo.tscn")
+const apliko_tipo_screan = preload("res://apps/admin/base/apliko_tipo.tscn")

 @onready var table = get_node("VBox/body_texture/HSplit/VBoxContainer2/Table")


--- a/blokoj/administri/skriptoj/queries.gd
+++ b/blokoj/administri/skriptoj/queries.gd
--- a/blokoj/administri/skriptoj/tempo_informpeto.gd
+++ b/blokoj/administri/skriptoj/tempo_informpeto.gd
-extends "res://kerno/fenestroj/tipo_a1.gd"
+extends "res://apps/screens/tipo_a1.gd"
 # окно вывода лога среднего времени запросов

 @onready var table = get_node("VBox/body_texture/table")

--- a/blokoj/administri/skriptoj/wablono.gd
+++ b/blokoj/administri/skriptoj/wablono.gd
-extends "res://kerno/fenestroj/tipo_a1.gd"
+extends "res://apps/screens/tipo_a1.gd"

-const LOKALIZO = preload("res://blokoj/administri/wablono/Lokalizo.tscn") #предзагружаю сцену lokalizo
+const LOKALIZO = preload("res://apps/admin/templates/Lokalizo.tscn") #предзагружаю сцену lokalizo
 #onready var grid = get_node("VBox/body_texture/ScrollContainer/VBoxContainer/GridContainer")

 var objekto # строка данных для редактирования 

--- a/blokoj/administri/wablono/Lokalizo.gd
+++ b/blokoj/administri/wablono/Lokalizo.gd
--- a/blokoj/administri/wablono/Lokalizo.tscn
+++ b/blokoj/administri/wablono/Lokalizo.tscn
--- a/blokoj/komunumoj/komunumoj.gd
+++ b/blokoj/komunumoj/komunumoj.gd
--- a/blokoj/komunumoj/komunumoj.tscn
+++ b/blokoj/komunumoj/komunumoj.tscn
-[gd_scene load_steps=2 format=2]
+[gd_scene load_steps=2 format=3]
+
+[ext_resource type="Script" path="res://apps/communities/komunumoj.gd" id="1"]

-[ext_resource path="res://blokoj/komunumoj/komunumoj.gd" type="Script" id=1]

 [node name="Node3D" type="Node3D"]
 script = ExtResource( 1 )
--- a/blokoj/eliro/eliro.gd
+++ b/blokoj/eliro/eliro.gd
-extends "res://kerno/fenestroj/tipo_c1.gd"
+extends "res://apps/screens/tipo_c1.gd"

 func _ready():
 	pass # Replace with function body.

--- a/blokoj/eliro/eliro.tscn
+++ b/blokoj/eliro/eliro.tscn
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=3 format=3]
+
+[ext_resource type="PackedScene" uid="uid://gtueidwtxfjc" path="res://apps/screens/tipo_c1.tscn" id="1"]
+[ext_resource type="Script" path="res://apps/exit/eliro.gd" id="2"]

-[ext_resource path="res://kerno/fenestroj/tipo_c1.tscn" type="PackedScene" id=1]
-[ext_resource path="res://blokoj/eliro/eliro.gd" type="Script" id=2]

 [node name="eliro" instance=ExtResource( 1 )]
 script = ExtResource( 2 )

--- a/blokoj/items/items_menuo.tscn
+++ b/blokoj/items/items_menuo.tscn
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=6 format=3 uid="uid://b4irr556bppis"]

-[ext_resource path="res://kerno/fenestroj/tipo_d1.tscn" type="PackedScene" id=1]
-[ext_resource path="res://blokoj/items/scriptoj/items_menuo.gd" type="Script" id=2]
-[ext_resource path="res://kerno/menuo/resursoj/icons/tab2a.png" type="Texture2D" id=3]
-[ext_resource path="res://kerno/menuo/resursoj/icons/tab3a.png" type="Texture2D" id=4]
-[ext_resource path="res://kerno/menuo/resursoj/icons/tab1a.png" type="Texture2D" id=5]
+[ext_resource type="PackedScene" uid="uid://to3qrst1pcw6" path="res://apps/screens/tipo_d1.tscn" id="1"]
+[ext_resource type="Script" path="res://apps/items/scripts/items_menuo.gd" id="2"]
+[ext_resource type="Texture2D" uid="uid://b47v0rxsqaswl" path="res://apps/menu/resources/icons/tab2a.png" id="3"]
+[ext_resource type="Texture2D" uid="uid://b5s0tehydk0ub" path="res://apps/menu/resources/icons/tab3a.png" id="4"]
+[ext_resource type="Texture2D" uid="uid://bkjt27d5abq4h" path="res://apps/menu/resources/icons/tab1a.png" id="5"]

-[node name="items_menuo" instance=ExtResource( 1 )]
-script = ExtResource( 2 )
+[node name="items_menuo" instance=ExtResource("1")]
+layout_mode = 3
+anchors_preset = 0
+script = ExtResource("2")

 [node name="VBox" parent="." index="0"]
 visible = false
+layout_mode = 0
 offset_right = 461.0
 offset_bottom = 400.0

 [node name="HBox_top" parent="VBox" index="0"]
-offset_right = 461.0
+layout_mode = 2
+
+[node name="top_texture1" parent="VBox/HBox_top" index="0"]
+layout_mode = 2
+
+[node name="frame1" parent="VBox/HBox_top/top_texture1" index="0"]
+layout_mode = 0
+expand_mode = 1

 [node name="top_texture2" parent="VBox/HBox_top" index="1"]
-offset_right = 461.0
+layout_mode = 2

 [node name="HBox_buttons" parent="VBox/HBox_top/top_texture2" index="0"]
-anchor_left = -3.22258e-12
+layout_mode = 0
 anchor_right = 1.0
 offset_right = 1.0

 [node name="menuo_name" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="0"]
-offset_right = 393.0
+layout_mode = 2
 text = "Имущество"

 [node name="Button_fix" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="1"]
 visible = false
+layout_mode = 2

 [node name="Button_" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="2"]
 visible = false
+layout_mode = 2

 [node name="Button_min" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="3"]
-offset_left = 397.0
-offset_right = 417.0
+layout_mode = 2

 [node name="Button_full" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="4"]
 visible = false
+layout_mode = 2

 [node name="Button_x" parent="VBox/HBox_top/top_texture2/HBox_buttons" index="5"]
-offset_left = 421.0
-offset_right = 440.0
+layout_mode = 2
+
+[node name="frame2" parent="VBox/HBox_top/top_texture2" index="1"]
+layout_mode = 0
+expand_mode = 1

 [node name="body_texture" parent="VBox" index="1"]
-offset_right = 461.0
-offset_bottom = 378.0
+layout_mode = 2
+
+[node name="resize_control" parent="VBox/body_texture" index="0"]
+anchors_preset = 0

 [node name="HSplit" parent="VBox/body_texture" index="1"]
-anchor_left = -1.4782e-07
+layout_mode = 0
 anchor_top = 0.0100214
 anchor_bottom = 1.01002
 offset_left = 11.0001
@@ -62,128 +79,113 @@ theme_override_constants/autohide = 0
 split_offset = 1

 [node name="VBoxContainer" type="VBoxContainer" parent="VBox/body_texture/HSplit" index="0"]
-offset_right = 364.0
-offset_bottom = 344.0
+layout_mode = 2
 size_flags_horizontal = 3

 [node name="HBoxContainer" type="HBoxContainer" parent="VBox/body_texture/HSplit/VBoxContainer" index="0"]
-offset_right = 364.0
-offset_bottom = 23.0
+layout_mode = 2
 alignment = 2

 [node name="Label" type="Label" parent="VBox/body_texture/HSplit/VBoxContainer/HBoxContainer" index="0"]
-offset_left = 154.0
-offset_top = 3.0
-offset_right = 219.0
-offset_bottom = 20.0
+layout_mode = 2
 size_flags_horizontal = 9
 text = "Фильтр:"

 [node name="Button" type="Button" parent="VBox/body_texture/HSplit/VBoxContainer/HBoxContainer" index="1"]
-offset_left = 223.0
-offset_right = 253.0
-offset_bottom = 23.0
-custom_minimum_size = Vector2( 30, 0 )
-icon = ExtResource( 5 )
+custom_minimum_size = Vector2(30, 0)
+layout_mode = 2
+icon = ExtResource("5")
 flat = true
-align = 2
 expand_icon = true
-__meta__ = {
-"_edit_use_anchors_": false
-}

 [node name="Button2" type="Button" parent="VBox/body_texture/HSplit/VBoxContainer/HBoxContainer" index="2"]
-offset_left = 257.0
-offset_right = 287.0
-offset_bottom = 23.0
-custom_minimum_size = Vector2( 30, 0 )
-icon = ExtResource( 3 )
+custom_minimum_size = Vector2(30, 0)
+layout_mode = 2
+icon = ExtResource("3")
 flat = true
-align = 2
 expand_icon = true
-__meta__ = {
-"_edit_use_anchors_": false
-}

 [node name="Button3" type="Button" parent="VBox/body_texture/HSplit/VBoxContainer/HBoxContainer" index="3"]
-offset_left = 291.0
-offset_right = 321.0
-offset_bottom = 23.0
-custom_minimum_size = Vector2( 30, 0 )
-icon = ExtResource( 4 )
+custom_minimum_size = Vector2(30, 0)
+layout_mode = 2
+icon = ExtResource("4")
 flat = true
-align = 2
 expand_icon = true
-__meta__ = {
-"_edit_use_anchors_": false
-}

 [node name="Button4" type="Button" parent="VBox/body_texture/HSplit/VBoxContainer/HBoxContainer" index="4"]
-offset_left = 325.0
-offset_right = 364.0
-offset_bottom = 23.0
+layout_mode = 2
 size_flags_horizontal = 9
 text = "Всё"
 flat = true
-align = 2
 expand_icon = true
-__meta__ = {
-"_edit_use_anchors_": false
-}

 [node name="ItemList" type="ItemList" parent="VBox/body_texture/HSplit/VBoxContainer" index="1"]
 visible = false
-offset_top = 27.0
-offset_right = 210.0
-offset_bottom = 183.0
+layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
-items = [ "Элемент 0", ExtResource( 3 ), false, "Элемент 1", ExtResource( 4 ), false, "Элемент 2", ExtResource( 5 ), false, "Элемент 3", ExtResource( 3 ), false, "Элемент 4", null, false ]
 allow_reselect = true
-fixed_icon_size = Vector2( 15, 15 )
+item_count = 5
+fixed_icon_size = Vector2i(15, 15)
+item_0/text = "Элемент 0"
+item_0/icon = ExtResource("3")
+item_1/text = "Элемент 1"
+item_1/icon = ExtResource("4")
+item_2/text = "Элемент 2"
+item_2/icon = ExtResource("5")
+item_3/text = "Элемент 3"
+item_3/icon = ExtResource("3")
+item_4/text = "Элемент 4"

 [node name="Tree" type="Tree" parent="VBox/body_texture/HSplit/VBoxContainer" index="2"]
-offset_top = 27.0
-offset_right = 364.0
-offset_bottom = 343.0
+layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 allow_reselect = true
 allow_rmb_select = true

 [node name="VBoxContainer2" type="VBoxContainer" parent="VBox/body_texture/HSplit" index="1"]
-offset_left = 376.0
-offset_right = 440.0
-offset_bottom = 344.0
+layout_mode = 2

 [node name="HBoxContainer" type="HBoxContainer" parent="VBox/body_texture/HSplit/VBoxContainer2" index="0"]
-offset_right = 64.0
-offset_bottom = 23.0
+layout_mode = 2

 [node name="button" type="Button" parent="VBox/body_texture/HSplit/VBoxContainer2/HBoxContainer" index="0"]
-offset_right = 64.0
-offset_bottom = 23.0
+layout_mode = 2
 text = "button"

 [node name="ItemList2" type="ItemList" parent="VBox/body_texture/HSplit/VBoxContainer2" index="1"]
-offset_top = 27.0
-offset_right = 64.0
-offset_bottom = 343.0
+layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
-items = [ "Элемент 0", null, false ]
+item_count = 1
+item_0/text = "Элемент 0"
+
+[node name="frame3" parent="VBox/body_texture" index="2"]
+layout_mode = 0
+expand_mode = 1
+
+[node name="frame4" parent="VBox/body_texture" index="3"]
+layout_mode = 0
+expand_mode = 1

 [node name="HBox_bottom" parent="VBox" index="2"]
-offset_top = 378.0
-offset_right = 461.0
-offset_bottom = 400.0
+layout_mode = 2

 [node name="bottom_texture1" parent="VBox/HBox_bottom" index="0"]
-offset_right = 439.0
+layout_mode = 2
+expand_mode = 1
+
+[node name="frame5" parent="VBox/HBox_bottom/bottom_texture1" index="0"]
+layout_mode = 0
+expand_mode = 1

 [node name="bottom_texture2" parent="VBox/HBox_bottom" index="1"]
-offset_left = 439.0
-offset_right = 461.0
+layout_mode = 2
+
+[node name="frame6" parent="VBox/HBox_bottom/bottom_texture2" index="0"]
+layout_mode = 0
+expand_mode = 1

 [connection signal="focus_entered" from="." to="." method="_on_tipo_a1_focus_entered"]
 [connection signal="gui_input" from="." to="." method="_on_tipo_a1_gui_input"]

--- a/blokoj/items/scriptoj/items_menuo.gd
+++ b/blokoj/items/scriptoj/items_menuo.gd
-extends "res://kerno/fenestroj/tipo_d1.gd"
+extends "res://apps/screens/tipo_d1.gd"


 func _ready():