From 9896a362c3ff3a93e4f78256e6e5962c2d1a0f33 Mon Sep 17 00:00:00 2001 From: Leroy Hopson Date: Sat, 6 Aug 2022 20:32:31 +1200 Subject: [PATCH] Automatic editor updates Automatic updates applied to scenes after opening in Godot editor v3.4.4-stable. --- .../editor_plugins/terminal/editor_terminal.tscn | 5 +---- .../editor_plugins/terminal/terminal_panel.tscn | 11 ++++++----- addons/gut/GutScene.tscn | 13 +++++-------- examples/socat_terminal/socat_terminal.tscn | 1 + examples/terminal/terminal.tscn | 2 +- examples/web_console/web_console.tscn | 1 - 6 files changed, 14 insertions(+), 19 deletions(-) diff --git a/addons/godot_xterm/editor_plugins/terminal/editor_terminal.tscn b/addons/godot_xterm/editor_plugins/terminal/editor_terminal.tscn index b63d438..f21ab4c 100644 --- a/addons/godot_xterm/editor_plugins/terminal/editor_terminal.tscn +++ b/addons/godot_xterm/editor_plugins/terminal/editor_terminal.tscn @@ -4,7 +4,6 @@ [ext_resource path="res://addons/godot_xterm/pty.gd" type="Script" id=2] [ext_resource path="res://addons/godot_xterm/themes/default.tres" type="Theme" id=3] - [node name="Terminal" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 @@ -13,9 +12,6 @@ size_flags_horizontal = 4 size_flags_vertical = 4 theme = ExtResource( 3 ) script = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="PTY" type="Node" parent="."] script = ExtResource( 2 ) @@ -26,5 +22,6 @@ env = { } [node name="Bell" type="AudioStreamPlayer" parent="."] + [connection signal="bell" from="." to="Bell" method="play"] [connection signal="exited" from="PTY" to="." method="_on_PTY_exited"] diff --git a/addons/godot_xterm/editor_plugins/terminal/terminal_panel.tscn b/addons/godot_xterm/editor_plugins/terminal/terminal_panel.tscn index c64d72f..c0ff835 100644 --- a/addons/godot_xterm/editor_plugins/terminal/terminal_panel.tscn +++ b/addons/godot_xterm/editor_plugins/terminal/terminal_panel.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://addons/godot_xterm/editor_plugins/terminal/terminal_panel.gd" type="Script" id=1] -[sub_resource type="Image" id=1] +[sub_resource type="Image" id=6] data = { "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), "format": "LumAlpha8", @@ -14,7 +14,7 @@ data = { [sub_resource type="ImageTexture" id=2] flags = 4 flags = 4 -image = SubResource( 1 ) +image = SubResource( 6 ) size = Vector2( 16, 16 ) [sub_resource type="StyleBoxTexture" id=3] @@ -25,7 +25,7 @@ margin_right = 2.0 margin_top = 2.0 margin_bottom = 2.0 -[sub_resource type="Image" id=4] +[sub_resource type="Image" id=7] data = { "data": PoolByteArray( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 224, 224, 0, 224, 224, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 224, 224, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 224, 224, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 224, 224, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 224, 224, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 224, 224, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 0, 0, 0, 0, 0, 224, 224, 224, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 0, 0, 0, 0, 0, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 0, 224, 224, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 224, 224, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 224, 224, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 224, 224, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 224, 224, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 224, 224, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 224, 224, 224, 0, 224, 224, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ), "format": "RGBA8", @@ -37,7 +37,7 @@ data = { [sub_resource type="ImageTexture" id=5] flags = 0 flags = 0 -image = SubResource( 4 ) +image = SubResource( 7 ) size = Vector2( 16, 16 ) [node name="Panel" type="Panel"] @@ -97,9 +97,9 @@ margin_right = 1024.0 margin_bottom = 603.0 rect_clip_content = true size_flags_vertical = 3 -custom_styles/panel = SubResource( 3 ) custom_constants/top_margin = 0 custom_constants/side_margin = 0 +custom_styles/panel = SubResource( 3 ) tabs_visible = false [node name="TerminalPopupMenu" type="PopupMenu" parent="VBoxContainer"] @@ -144,6 +144,7 @@ __meta__ = { } [node name="SizeLabelTimer" type="Timer" parent="SizeLabel"] + [connection signal="resized" from="." to="." method="_on_Panel_resized"] [connection signal="reposition_active_tab_request" from="VBoxContainer/TabbarContainer/Tabs" to="." method="_on_Tabs_reposition_active_tab_request"] [connection signal="tab_changed" from="VBoxContainer/TabbarContainer/Tabs" to="." method="_on_Tabs_tab_changed"] diff --git a/addons/gut/GutScene.tscn b/addons/gut/GutScene.tscn index ce7e855..76159db 100644 --- a/addons/gut/GutScene.tscn +++ b/addons/gut/GutScene.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://addons/gut/GutScene.gd" type="Script" id=1] [ext_resource path="res://addons/gut/UserFileViewer.tscn" type="PackedScene" id=6] @@ -31,9 +31,6 @@ margin_bottom = 300.0 rect_min_size = Vector2( 740, 300 ) custom_styles/panel = SubResource( 1 ) script = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="UserFileViewer" parent="." instance=ExtResource( 6 )] margin_top = 388.0 @@ -120,7 +117,7 @@ size_flags_vertical = 3 [node name="Title" type="Label" parent="VBox/TitleBar/HBox"] margin_left = 114.0 -margin_right = 594.0 +margin_right = 598.0 margin_bottom = 30.0 size_flags_horizontal = 3 size_flags_vertical = 7 @@ -133,8 +130,8 @@ __meta__ = { } [node name="Time" type="Label" parent="VBox/TitleBar/HBox"] -margin_left = 598.0 -margin_top = 7.0 +margin_left = 602.0 +margin_top = 8.0 margin_right = 654.0 margin_bottom = 22.0 custom_colors/font_color = Color( 0, 0, 0, 1 ) @@ -507,7 +504,7 @@ rect_min_size = Vector2( 50, 0 ) [node name="CurrentScriptLabel" type="Label" parent="VBox/BottomPanel/VBox/HBox2"] margin_left = 167.0 -margin_top = 7.0 +margin_top = 8.0 margin_right = 740.0 margin_bottom = 22.0 size_flags_horizontal = 3 diff --git a/examples/socat_terminal/socat_terminal.tscn b/examples/socat_terminal/socat_terminal.tscn index 92918fb..2db3443 100644 --- a/examples/socat_terminal/socat_terminal.tscn +++ b/examples/socat_terminal/socat_terminal.tscn @@ -10,4 +10,5 @@ script = ExtResource( 1 ) __meta__ = { "_edit_use_anchors_": false } + [connection signal="data_sent" from="." to="." method="_on_Terminal_data_sent"] diff --git a/examples/terminal/terminal.tscn b/examples/terminal/terminal.tscn index b80b827..0a67e70 100644 --- a/examples/terminal/terminal.tscn +++ b/examples/terminal/terminal.tscn @@ -4,7 +4,6 @@ [ext_resource path="res://addons/godot_xterm/pty.gd" type="Script" id=2] [ext_resource path="res://examples/terminal/terminal.gd" type="Script" id=3] - [node name="Terminal" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 @@ -25,4 +24,5 @@ env = { [node name="Bell" type="AudioStreamPlayer" parent="."] stream = ExtResource( 1 ) + [connection signal="bell" from="." to="Bell" method="play"] diff --git a/examples/web_console/web_console.tscn b/examples/web_console/web_console.tscn index ed04a4f..ef8bf7f 100644 --- a/examples/web_console/web_console.tscn +++ b/examples/web_console/web_console.tscn @@ -3,7 +3,6 @@ [ext_resource path="res://addons/godot_xterm/terminal.gd" type="Script" id=2] [ext_resource path="res://examples/web_console/web_console.gd" type="Script" id=3] - [node name="WebConsole" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0