diff --git a/project.godot b/project.godot index dda70221..c8cd0cfa 100644 --- a/project.godot +++ b/project.godot @@ -13,6 +13,7 @@ config_version=5 config/name="uarep-ctl" run/main_scene="res://scenes/tab_switch.tscn" config/features=PackedStringArray("4.1") +run/low_processor_mode=true run/delta_smoothing=false boot_splash/show_image=false boot_splash/fullsize=false @@ -21,18 +22,28 @@ config/icon="res://data/icon.png" [autoload] +Log="*res://addons/godot-logger/scripts/logger.gd" Tools="*res://scripts/tools.gd" REPSettings="*res://scripts/repsettings.gd" REPNetwork="*res://scripts/repnetwork.gd" yau07="*res://scripts/yau07.gd" -Log="*res://addons/godot-logger/scripts/logger.gd" +capsrpb="*res://scripts/capsrpb.gd" Table="*res://table/table.gd" -Bip="*res://scenes/bip.tscn" Threats="*res://scripts/threats.gd" [debug] file_logging/enable_file_logging=true +gdscript/warnings/exclude_addons=false +gdscript/warnings/unassigned_variable=2 +gdscript/warnings/unassigned_variable_op_assign=2 +gdscript/warnings/shadowed_variable=2 +gdscript/warnings/shadowed_variable_base_class=2 +gdscript/warnings/shadowed_global_identifier=2 +gdscript/warnings/unsafe_cast=1 +gdscript/warnings/assert_always_true=2 +gdscript/warnings/assert_always_false=2 +gdscript/warnings/integer_division=0 [display] diff --git a/scenes/bip.tscn b/scenes/bip.tscn index e1620506..18854c9c 100644 --- a/scenes/bip.tscn +++ b/scenes/bip.tscn @@ -4,7 +4,7 @@ [sub_resource type="ShaderMaterial" id="ShaderMaterial_2dulj"] shader = ExtResource("1_k6vue") -shader_parameter/color = Color(0.666667, 0.690196, 0.807843, 1) +shader_parameter/color = Color(1, 0.101961, 0.494118, 1) [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_tgf76"] diff --git a/scenes/header.tscn b/scenes/header.tscn deleted file mode 100644 index 0762438c..00000000 --- a/scenes/header.tscn +++ /dev/null @@ -1,8 +0,0 @@ -[gd_scene format=2] - -[node name="Label" type="Label"] -margin_right = 122.0 -margin_bottom = 34.0 -custom_colors/font_color = Color( 1, 0.596078, 0.4, 1 ) -valign = 1 -clip_text = true diff --git a/scenes/журнал.tscn b/scenes/журнал.tscn index cfd4ac81..5d29c556 100644 --- a/scenes/журнал.tscn +++ b/scenes/журнал.tscn @@ -15,10 +15,11 @@ script = ExtResource("1_3f1mv") [node name="content" type="RichTextLabel" parent="."] layout_mode = 0 offset_left = 16.0 -offset_top = 57.0 +offset_top = 16.0 offset_right = 1584.0 -offset_bottom = 999.0 +offset_bottom = 1059.0 focus_mode = 2 +theme_override_colors/selection_color = Color(0.72549, 0.270588, 0.133333, 1) threaded = true selection_enabled = true deselect_on_focus_loss_enabled = false @@ -26,18 +27,18 @@ script = ExtResource("1_t5g4h") [node name="btn_save" type="Button" parent="."] layout_mode = 0 -offset_left = 1344.0 -offset_top = 1044.0 -offset_right = 1440.0 -offset_bottom = 1080.0 +offset_left = 1464.0 +offset_top = 1080.0 +offset_right = 1560.0 +offset_bottom = 1116.0 text = "Сохранить" [node name="btn_clear" type="Button" parent="."] layout_mode = 0 -offset_left = 1200.0 -offset_top = 1044.0 -offset_right = 1296.0 -offset_bottom = 1080.0 +offset_left = 1344.0 +offset_top = 1080.0 +offset_right = 1440.0 +offset_bottom = 1116.0 text = "Очистить" [node name="dlg_file" type="FileDialog" parent="."] diff --git a/scenes/работа.gd b/scenes/работа.gd index 844ab949..8c492017 100644 --- a/scenes/работа.gd +++ b/scenes/работа.gd @@ -9,7 +9,6 @@ extends Panel @export var drag_scale_width: float @export var drag_scale_band: float @export var window_0_id: int -@export var window_1_id: int signal add_imit_threat (signal_name: String) signal del_imit_threat (signal_name: String) diff --git a/scenes/работа.tscn b/scenes/работа.tscn index 6b9e0ddd..2b19fc4c 100644 --- a/scenes/работа.tscn +++ b/scenes/работа.tscn @@ -19,7 +19,6 @@ strob_min_band = 0.1 strob_max_band = 15.538 drag_scale_width = 0.5 drag_scale_band = 0.05 -window_1_id = 1 metadata/_edit_vertical_guides_ = [] metadata/_edit_lock_ = true diff --git a/table/header.tscn b/table/header.tscn index b65e7dcc..24b90a1e 100644 --- a/table/header.tscn +++ b/table/header.tscn @@ -3,8 +3,10 @@ [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2thpi"] bg_color = Color(0.8, 0.533333, 0.27451, 1) -[node name="heder" type="Label"] +[node name="header" type="Label"] offset_right = 128.0 offset_bottom = 23.0 theme_override_colors/font_color = Color(0, 0, 0, 1) theme_override_styles/normal = SubResource("StyleBoxFlat_2thpi") +horizontal_alignment = 1 +vertical_alignment = 1 diff --git a/table/node.tscn b/table/node.tscn index 96c26f52..120347d2 100644 --- a/table/node.tscn +++ b/table/node.tscn @@ -1,10 +1,10 @@ -[gd_scene load_steps=2 format=3 uid="uid://c1i4rwaajq7d5"] +[gd_scene format=3 uid="uid://c1i4rwaajq7d5"] -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7jiwk"] - -[node name="Label" type="Label"] +[node name="Label" type="LineEdit"] offset_right = 121.0 offset_bottom = 23.0 theme_override_colors/font_color = Color(1, 0.596078, 0.4, 1) -theme_override_styles/normal = SubResource("StyleBoxFlat_7jiwk") -clip_text = true +editable = false +context_menu_enabled = false +caret_blink = true +caret_blink_interval = 0.1