From d9eae61efab98ce0f158351136152ad4b8a3df02 Mon Sep 17 00:00:00 2001 From: Jaap Marsman Date: Wed, 29 Mar 2023 08:59:51 +0800 Subject: [PATCH] Revert "first attempt at converting to Godot 4" This reverts commit b11d28d574391833e8a1f214377ab8ca0d9d7ded. --- .gitignore | 2 - godot/EditScreen.gd | 6 +- godot/NameChangePanel.gd | 2 +- godot/ObservationWindow.gd | 2 +- godot/ProgressBar.gd | 2 +- godot/Results.gd | 2 +- godot/TimerBar.gd | 2 +- .../HTML5FileExchange/HTML5FileExchange.gd | 2 +- godot/addons/HTML5FileExchange/plugin.gd | 2 +- godot/default_env.tres | 6 +- godot/main_screen.gd | 14 +- godot/main_screen.tscn | 1078 +++++++++++------ godot/project.godot | 14 +- godot/wb_theme.tres | 116 +- 14 files changed, 788 insertions(+), 462 deletions(-) diff --git a/.gitignore b/.gitignore index 4b3196e..02444f2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,8 +8,6 @@ export.cfg export_presets.cfg *.import -.godot/ -godot/.godot/ # Imported translations (automatically generated from CSV files) *.translation diff --git a/godot/EditScreen.gd b/godot/EditScreen.gd index 913bf35..e8d1814 100644 --- a/godot/EditScreen.gd +++ b/godot/EditScreen.gd @@ -1,8 +1,8 @@ extends CanvasLayer -@onready var gi = $"/root/GlobalInts" -@onready var global_ints = gi -@onready var main_window = $"../../AppWindow" +onready var gi = $"/root/GlobalInts" +onready var global_ints = gi +onready var main_window = $"../../AppWindow" func _ready(): pass # Replace with function body. diff --git a/godot/NameChangePanel.gd b/godot/NameChangePanel.gd index 0ee53e4..ab06a13 100644 --- a/godot/NameChangePanel.gd +++ b/godot/NameChangePanel.gd @@ -1,7 +1,7 @@ extends Panel -@onready var global_ints = $"/root/GlobalInts" +onready var global_ints = $"/root/GlobalInts" func _on_OkButton_pressed(): diff --git a/godot/ObservationWindow.gd b/godot/ObservationWindow.gd index 3e959ec..764e1b2 100644 --- a/godot/ObservationWindow.gd +++ b/godot/ObservationWindow.gd @@ -1,7 +1,7 @@ extends CanvasLayer -@onready var global_ints = $"/root/GlobalInts" +onready var global_ints = $"/root/GlobalInts" var time_lefts : int diff --git a/godot/ProgressBar.gd b/godot/ProgressBar.gd index c655c5a..acc1fc4 100644 --- a/godot/ProgressBar.gd +++ b/godot/ProgressBar.gd @@ -1,7 +1,7 @@ extends ProgressBar -@onready var global_ints = $"/root/GlobalInts" +onready var global_ints = $"/root/GlobalInts" func _ready(): diff --git a/godot/Results.gd b/godot/Results.gd index 9465433..10080e7 100644 --- a/godot/Results.gd +++ b/godot/Results.gd @@ -1,7 +1,7 @@ extends CanvasLayer -@onready var global_ints = $"/root/GlobalInts" +onready var global_ints = $"/root/GlobalInts" var js_callback = JavaScript.create_callback(self, "load_handler"); var js_interface; diff --git a/godot/TimerBar.gd b/godot/TimerBar.gd index 0504b8c..a59ec12 100644 --- a/godot/TimerBar.gd +++ b/godot/TimerBar.gd @@ -1,7 +1,7 @@ extends ProgressBar -@onready var global_ints = $"/root/GlobalInts" +onready var global_ints = $"/root/GlobalInts" var time_lefts : int diff --git a/godot/addons/HTML5FileExchange/HTML5FileExchange.gd b/godot/addons/HTML5FileExchange/HTML5FileExchange.gd index 3128b26..637356c 100644 --- a/godot/addons/HTML5FileExchange/HTML5FileExchange.gd +++ b/godot/addons/HTML5FileExchange/HTML5FileExchange.gd @@ -48,7 +48,7 @@ func load_image(): js_interface.upload(js_callback); - await self.read_completed + yield(self, "read_completed") var imageType = js_interface.fileType; var imageData = JavaScript.eval("_HTML5FileExchange.result", true) # interface doesn't work as expected for some reason diff --git a/godot/addons/HTML5FileExchange/plugin.gd b/godot/addons/HTML5FileExchange/plugin.gd index de53c6e..2d9467f 100644 --- a/godot/addons/HTML5FileExchange/plugin.gd +++ b/godot/addons/HTML5FileExchange/plugin.gd @@ -1,4 +1,4 @@ -@tool +tool extends EditorPlugin diff --git a/godot/default_env.tres b/godot/default_env.tres index a7c678e..20207a4 100644 --- a/godot/default_env.tres +++ b/godot/default_env.tres @@ -1,7 +1,7 @@ -[gd_resource type="Environment" load_steps=2 format=3 uid="uid://jbihewyaxy2u"] +[gd_resource type="Environment" load_steps=2 format=2] -[sub_resource type="Sky" id="1"] +[sub_resource type="ProceduralSky" id=1] [resource] background_mode = 2 -sky = SubResource("1") +background_sky = SubResource( 1 ) diff --git a/godot/main_screen.gd b/godot/main_screen.gd index ead2ab8..a55fe67 100644 --- a/godot/main_screen.gd +++ b/godot/main_screen.gd @@ -10,9 +10,9 @@ var update_text_url = "https://raw.githubusercontent.com/hobbesjaap/time-samplin var update_text : String -@onready var date_time_display = $"%CurrentTime" -@onready var global_ints = $"/root/GlobalInts" -@onready var minute_label = $"StartScreen/InstructionPanel/MinuteBox/MinuteLabel" +onready var date_time_display = $"%CurrentTime" +onready var global_ints = $"/root/GlobalInts" +onready var minute_label = $"StartScreen/InstructionPanel/MinuteBox/MinuteLabel" func check_for_updates(): @@ -26,9 +26,7 @@ func check_for_updates(): func _on_HTTPRequest_request_completed(_result, _response_code, _headers, body): - var test_json_conv = JSON.new() - test_json_conv.parse(body.get_string_from_utf8()) - var json = test_json_conv.get_data() + var json = JSON.parse(body.get_string_from_utf8()) global_ints.web_release_version = json.result if global_ints.web_release_version > global_ints.release_version: print("There's an update!") @@ -39,9 +37,7 @@ func _on_HTTPRequest_request_completed(_result, _response_code, _headers, body): func _on_HTTPRequest2_request_completed(_result, _response_code, _headers, _body): # Need to find a way to load .txt file contents from a URL into a label. This to show what the update changes are. -var test_json_conv = JSON.new() -test_json_conv.parse(body.get_string_from_utf8()) -# var json = test_json_conv.get_data() +# var json = JSON.parse(body.get_string_from_utf8()) # update_text = str(json.result) pass diff --git a/godot/main_screen.tscn b/godot/main_screen.tscn index 6ab9bb3..6179faf 100644 --- a/godot/main_screen.tscn +++ b/godot/main_screen.tscn @@ -1,24 +1,68 @@ -[gd_scene load_steps=11 format=3 uid="uid://c7gjcodnkw7cr"] +[gd_scene load_steps=24 format=2] -[ext_resource type="Theme" uid="uid://cft2814mm2aav" path="res://wb_theme.tres" id="1"] -[ext_resource type="Script" path="res://main_screen.gd" id="2"] -[ext_resource type="Texture2D" uid="uid://ddsykp7qe1sh5" path="res://Assets/photos/classroom-824120_1920.jpg" id="3"] -[ext_resource type="Script" path="res://NameChangePanel.gd" id="4"] -[ext_resource type="Script" path="res://ObservationWindow.gd" id="7"] -[ext_resource type="Script" path="res://EditScreen.gd" id="8"] -[ext_resource type="Script" path="res://Results.gd" id="9"] -[ext_resource type="Script" path="res://TimerBar.gd" id="10"] -[ext_resource type="Script" path="res://ProgressBar.gd" id="11"] -[ext_resource type="Texture2D" uid="uid://cv62xyg5bfjoc" path="res://Assets/icons/main_icon.png" id="12"] +[ext_resource path="res://wb_theme.tres" type="Theme" id=1] +[ext_resource path="res://main_screen.gd" type="Script" id=2] +[ext_resource path="res://Assets/photos/classroom-824120_1920.jpg" type="Texture" id=3] +[ext_resource path="res://NameChangePanel.gd" type="Script" id=4] +[ext_resource path="res://Assets/fonts/noto_sans_display.ttf" type="DynamicFontData" id=5] +[ext_resource path="res://Assets/fonts/noto_sans_display_bold.ttf" type="DynamicFontData" id=6] +[ext_resource path="res://ObservationWindow.gd" type="Script" id=7] +[ext_resource path="res://EditScreen.gd" type="Script" id=8] +[ext_resource path="res://Results.gd" type="Script" id=9] +[ext_resource path="res://TimerBar.gd" type="Script" id=10] +[ext_resource path="res://ProgressBar.gd" type="Script" id=11] +[ext_resource path="res://Assets/icons/main_icon.png" type="Texture" id=12] + +[sub_resource type="StyleBoxFlat" id=2] +bg_color = Color( 0.952941, 0.933333, 0.847059, 1 ) + +[sub_resource type="StyleBoxFlat" id=1] +bg_color = Color( 1, 1, 1, 1 ) +shadow_offset = Vector2( 0, 4 ) + +[sub_resource type="DynamicFont" id=4] +font_data = ExtResource( 5 ) + +[sub_resource type="DynamicFont" id=5] +size = 24 +font_data = ExtResource( 6 ) + +[sub_resource type="DynamicFont" id=6] +size = 32 +font_data = ExtResource( 6 ) + +[sub_resource type="StyleBoxFlat" id=7] +bg_color = Color( 1, 1, 1, 1 ) +corner_radius_top_left = 50 +corner_radius_top_right = 50 + +[sub_resource type="StyleBoxFlat" id=10] +bg_color = Color( 0.941176, 0.772549, 0.517647, 1 ) + +[sub_resource type="StyleBoxFlat" id=11] +bg_color = Color( 0.862745, 0.435294, 0.329412, 1 ) + +[sub_resource type="StyleBoxFlat" id=8] +bg_color = Color( 1, 1, 1, 1 ) + +[sub_resource type="DynamicFont" id=9] +font_data = ExtResource( 5 ) + +[sub_resource type="DynamicFont" id=12] +size = 18 +font_data = ExtResource( 5 ) [node name="AppWindow" type="CanvasLayer"] -script = ExtResource("2") +script = ExtResource( 2 ) [node name="Background" type="Panel" parent="."] -anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -theme = ExtResource("1") +theme = ExtResource( 1 ) +custom_styles/panel = SubResource( 2 ) +__meta__ = { +"_edit_lock_": true +} [node name="HTTPRequest" type="HTTPRequest" parent="."] unique_name_in_owner = true @@ -26,775 +70,1069 @@ unique_name_in_owner = true [node name="HTTPRequest2" type="HTTPRequest" parent="."] unique_name_in_owner = true -[node name="ClassroomPhoto" type="Sprite2D" parent="."] +[node name="ClassroomPhoto" type="Sprite" parent="."] visible = false -position = Vector2(639.9, 201.694) -scale = Vector2(0.665729, 0.665729) -texture = ExtResource("3") +position = Vector2( 639.9, 201.694 ) +scale = Vector2( 0.665729, 0.665729 ) +texture = ExtResource( 3 ) +__meta__ = { +"_edit_lock_": true +} [node name="StartScreen" type="CanvasLayer" parent="."] [node name="InstructionPanel" type="Panel" parent="StartScreen"] unique_name_in_owner = true visible = false -anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -640.0 -offset_top = -289.0 -offset_right = 640.0 -offset_bottom = 359.0 +margin_left = -640.0 +margin_top = -289.0 +margin_right = 640.0 +margin_bottom = 359.0 +custom_styles/panel = SubResource( 1 ) +__meta__ = { +"_edit_lock_": true +} [node name="MinuteBox" type="HBoxContainer" parent="StartScreen/InstructionPanel"] -layout_mode = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -53.5 -offset_top = -159.0 -offset_right = 53.5 -offset_bottom = -119.0 +margin_left = -53.5 +margin_top = -159.0 +margin_right = 53.5 +margin_bottom = -119.0 [node name="MinuteMinus" type="Button" parent="StartScreen/InstructionPanel/MinuteBox"] -layout_mode = 2 +margin_right = 43.0 +margin_bottom = 40.0 size_flags_horizontal = 3 -theme = ExtResource("1") +theme = ExtResource( 1 ) text = "-" +__meta__ = { +"_edit_lock_": true +} [node name="MinuteLabel" type="Label" parent="StartScreen/InstructionPanel/MinuteBox"] -layout_mode = 2 -theme = ExtResource("1") +margin_left = 47.0 +margin_top = 3.0 +margin_right = 60.0 +margin_bottom = 37.0 +theme = ExtResource( 1 ) text = "1" +__meta__ = { +"_edit_lock_": true +} [node name="MinutePlus" type="Button" parent="StartScreen/InstructionPanel/MinuteBox"] -layout_mode = 2 +margin_left = 64.0 +margin_right = 107.0 +margin_bottom = 40.0 size_flags_horizontal = 3 -theme = ExtResource("1") +theme = ExtResource( 1 ) text = "+" +__meta__ = { +"_edit_lock_": true +} [node name="CurrentTime" type="Label" parent="StartScreen/InstructionPanel"] unique_name_in_owner = true -layout_mode = 0 -offset_left = 1196.0 -offset_top = 506.0 -offset_right = 1275.0 -offset_bottom = 529.0 +margin_left = 1196.0 +margin_top = 506.0 +margin_right = 1275.0 +margin_bottom = 529.0 +custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 4 ) text = "99:99" +align = 2 [node name="MinuteExplanation" type="Label" parent="StartScreen/InstructionPanel"] -layout_mode = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -322.5 -offset_top = -197.0 -offset_right = 322.5 -offset_bottom = -163.0 -theme = ExtResource("1") +margin_left = -322.5 +margin_top = -197.0 +margin_right = 322.5 +margin_bottom = -163.0 +theme = ExtResource( 1 ) text = "How long will you observe for? (in minutes)" +align = 1 [node name="ObservationItemsTitle" type="Label" parent="StartScreen/InstructionPanel"] -layout_mode = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -102.5 -offset_top = -97.0 -offset_right = 102.5 -offset_bottom = -63.0 -theme = ExtResource("1") +margin_left = -102.5 +margin_top = -97.0 +margin_right = 102.5 +margin_bottom = -63.0 +theme = ExtResource( 1 ) +custom_fonts/font = SubResource( 5 ) text = "Observation Items" [node name="Title" type="Label" parent="StartScreen/InstructionPanel"] -layout_mode = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -172.5 -offset_top = -250.0 -offset_right = 172.5 -offset_bottom = -200.0 +margin_left = -172.5 +margin_top = -250.0 +margin_right = 172.5 +margin_bottom = -200.0 +custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 6 ) text = "Time Sampling Form" +align = 1 [node name="BottomButtons" type="HBoxContainer" parent="StartScreen/InstructionPanel"] -layout_mode = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -500.0 -offset_top = 180.0 -offset_right = 500.0 -offset_bottom = 240.0 +margin_left = -500.0 +margin_top = 180.0 +margin_right = 500.0 +margin_bottom = 240.0 [node name="Manual" type="Button" parent="StartScreen/InstructionPanel/BottomButtons"] -layout_mode = 2 +margin_right = 247.0 +margin_bottom = 60.0 size_flags_horizontal = 3 -theme = ExtResource("1") +theme = ExtResource( 1 ) text = "Manual" [node name="ChangeItems" type="Button" parent="StartScreen/InstructionPanel/BottomButtons"] -layout_mode = 2 +margin_left = 251.0 +margin_right = 498.0 +margin_bottom = 60.0 size_flags_horizontal = 3 -theme = ExtResource("1") +theme = ExtResource( 1 ) text = "Edit Items" [node name="PupilName" type="Button" parent="StartScreen/InstructionPanel/BottomButtons"] -layout_mode = 2 +margin_left = 502.0 +margin_right = 749.0 +margin_bottom = 60.0 size_flags_horizontal = 3 -theme = ExtResource("1") +theme = ExtResource( 1 ) text = "Edit Names" [node name="Start" type="Button" parent="StartScreen/InstructionPanel/BottomButtons"] -layout_mode = 2 +margin_left = 753.0 +margin_right = 1000.0 +margin_bottom = 60.0 size_flags_horizontal = 3 -theme = ExtResource("1") +theme = ExtResource( 1 ) text = "Start" [node name="GridObservations" type="GridContainer" parent="StartScreen/InstructionPanel"] -layout_mode = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -589.0 -offset_top = -57.0 -offset_right = 603.0 -offset_bottom = 167.0 +margin_left = -589.0 +margin_top = -57.0 +margin_right = 603.0 +margin_bottom = 167.0 columns = 3 [node name="AcronymLabel" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_right = 96.0 +margin_bottom = 34.0 +theme = ExtResource( 1 ) text = "Acronym" +__meta__ = { +"_edit_lock_": true +} [node name="DescriptorLabel" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 100.0 +margin_right = 218.0 +margin_bottom = 34.0 +theme = ExtResource( 1 ) text = "Descriptor" +__meta__ = { +"_edit_lock_": true +} [node name="ExplanationLabel" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 222.0 +margin_right = 1088.0 +margin_bottom = 34.0 +theme = ExtResource( 1 ) text = "Explanation" +__meta__ = { +"_edit_lock_": true +} [node name="1Acronym" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_top = 38.0 +margin_right = 96.0 +margin_bottom = 72.0 +theme = ExtResource( 1 ) text = "OnT" +__meta__ = { +"_edit_lock_": true +} [node name="1Item" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 100.0 +margin_top = 38.0 +margin_right = 218.0 +margin_bottom = 72.0 +theme = ExtResource( 1 ) text = "On Task" +__meta__ = { +"_edit_lock_": true +} [node name="1Explanation" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 222.0 +margin_top = 38.0 +margin_right = 1088.0 +margin_bottom = 72.0 +theme = ExtResource( 1 ) text = "The pupil is on task" +__meta__ = { +"_edit_lock_": true +} [node name="2Acronym" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_top = 76.0 +margin_right = 96.0 +margin_bottom = 110.0 +theme = ExtResource( 1 ) text = "Loo" +__meta__ = { +"_edit_lock_": true +} [node name="2Item" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 100.0 +margin_top = 76.0 +margin_right = 218.0 +margin_bottom = 110.0 +theme = ExtResource( 1 ) text = "Looking" +__meta__ = { +"_edit_lock_": true +} [node name="2Explanation" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 222.0 +margin_top = 76.0 +margin_right = 1088.0 +margin_bottom = 110.0 +theme = ExtResource( 1 ) text = " The pupil is looking around in a distracted manner or is staring into the distance" +__meta__ = { +"_edit_lock_": true +} [node name="3Acronym" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_top = 114.0 +margin_right = 96.0 +margin_bottom = 148.0 +theme = ExtResource( 1 ) text = "Dis" +__meta__ = { +"_edit_lock_": true +} [node name="3Item" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 100.0 +margin_top = 114.0 +margin_right = 218.0 +margin_bottom = 148.0 +theme = ExtResource( 1 ) text = "Distracting" +__meta__ = { +"_edit_lock_": true +} [node name="3Explanation" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 222.0 +margin_top = 114.0 +margin_right = 1088.0 +margin_bottom = 148.0 +theme = ExtResource( 1 ) text = "The pupil is distracting other pupils or talking to them" +__meta__ = { +"_edit_lock_": true +} [node name="4Acronym" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_top = 152.0 +margin_right = 96.0 +margin_bottom = 186.0 +theme = ExtResource( 1 ) text = "Wal" +__meta__ = { +"_edit_lock_": true +} [node name="4Item" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 100.0 +margin_top = 152.0 +margin_right = 218.0 +margin_bottom = 186.0 +theme = ExtResource( 1 ) text = "Walking" +__meta__ = { +"_edit_lock_": true +} [node name="4Explanation" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 222.0 +margin_top = 152.0 +margin_right = 1088.0 +margin_bottom = 186.0 +theme = ExtResource( 1 ) text = "The pupil is walking through the class" +__meta__ = { +"_edit_lock_": true +} [node name="5Acronym" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_top = 190.0 +margin_right = 96.0 +margin_bottom = 224.0 +theme = ExtResource( 1 ) text = "Oth" +__meta__ = { +"_edit_lock_": true +} [node name="5Item" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 100.0 +margin_top = 190.0 +margin_right = 218.0 +margin_bottom = 224.0 +theme = ExtResource( 1 ) text = "Other" +__meta__ = { +"_edit_lock_": true +} [node name="5Explanation" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 222.0 +margin_top = 190.0 +margin_right = 1088.0 +margin_bottom = 224.0 +theme = ExtResource( 1 ) text = "The pupil is otherwise distracted and not on task" +__meta__ = { +"_edit_lock_": true +} [node name="NameChangePanel" type="Panel" parent="StartScreen"] unique_name_in_owner = true visible = false -anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -640.0 -offset_top = -289.0 -offset_right = 640.0 -offset_bottom = 359.0 -script = ExtResource("4") +margin_left = -640.0 +margin_top = -289.0 +margin_right = 640.0 +margin_bottom = 359.0 +custom_styles/panel = SubResource( 1 ) +script = ExtResource( 4 ) [node name="NameContainer" type="VBoxContainer" parent="StartScreen/NameChangePanel"] -layout_mode = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -269.0 -offset_top = -210.0 -offset_right = 270.0 -offset_bottom = 237.0 +margin_left = -269.0 +margin_top = -210.0 +margin_right = 270.0 +margin_bottom = 237.0 [node name="ObservedNameLabel" type="Label" parent="StartScreen/NameChangePanel/NameContainer"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_right = 539.0 +margin_bottom = 34.0 +theme = ExtResource( 1 ) text = "Who are you observing? (First name)" [node name="WarningLabel" type="Label" parent="StartScreen/NameChangePanel/NameContainer"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_top = 38.0 +margin_right = 539.0 +margin_bottom = 72.0 +theme = ExtResource( 1 ) text = "You must complete all fields below!" [node name="NameLine" type="LineEdit" parent="StartScreen/NameChangePanel/NameContainer"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_top = 76.0 +margin_right = 539.0 +margin_bottom = 110.0 +theme = ExtResource( 1 ) [node name="ObserverName" type="Label" parent="StartScreen/NameChangePanel/NameContainer"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_top = 114.0 +margin_right = 539.0 +margin_bottom = 148.0 +theme = ExtResource( 1 ) text = "What is your name?" [node name="ObserverLine" type="LineEdit" parent="StartScreen/NameChangePanel/NameContainer"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_top = 152.0 +margin_right = 539.0 +margin_bottom = 186.0 +theme = ExtResource( 1 ) [node name="ObserverName2" type="Label" parent="StartScreen/NameChangePanel/NameContainer"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_top = 190.0 +margin_right = 539.0 +margin_bottom = 224.0 +theme = ExtResource( 1 ) text = "What Activity/Lesson are you observing?" [node name="ObservedActivity" type="LineEdit" parent="StartScreen/NameChangePanel/NameContainer"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_top = 228.0 +margin_right = 539.0 +margin_bottom = 262.0 +theme = ExtResource( 1 ) [node name="OkButton" type="Button" parent="StartScreen/NameChangePanel/NameContainer"] -layout_mode = 2 -theme = ExtResource("1") +margin_top = 266.0 +margin_right = 539.0 +margin_bottom = 300.0 +theme = ExtResource( 1 ) text = "OK" [node name="InstructionScreen" type="Panel" parent="StartScreen"] unique_name_in_owner = true visible = false -anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -640.0 -offset_top = -289.0 -offset_right = 640.0 -offset_bottom = 359.0 -script = ExtResource("4") +margin_left = -640.0 +margin_top = -289.0 +margin_right = 640.0 +margin_bottom = 359.0 +custom_styles/panel = SubResource( 1 ) +script = ExtResource( 4 ) [node name="InstructionContainer" type="VBoxContainer" parent="StartScreen/InstructionScreen"] -layout_mode = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -384.0 -offset_top = -124.5 -offset_right = 386.0 -offset_bottom = 290.5 +margin_left = -384.0 +margin_top = -124.5 +margin_right = 386.0 +margin_bottom = 290.5 -[node name="MainIcon" type="Sprite2D" parent="StartScreen/InstructionScreen/InstructionContainer"] -position = Vector2(384, -160) -scale = Vector2(0.2, 0.2) -texture = ExtResource("12") +[node name="MainIcon" type="Sprite" parent="StartScreen/InstructionScreen/InstructionContainer"] +position = Vector2( 384, -160 ) +scale = Vector2( 0.2, 0.2 ) +texture = ExtResource( 12 ) [node name="Instructions" type="Label" parent="StartScreen/InstructionScreen/InstructionContainer"] -layout_mode = 2 -theme = ExtResource("1") +margin_right = 770.0 +margin_bottom = 367.0 +theme = ExtResource( 1 ) text = "The Time Sampling Form is a guided observation tool. You set the length of your observation in minutes. Every 20 seconds you will click the button that corresponds with the behaviour you see at that time. The buttons to select the observed behaviour will be visible in the final 5 seconds of each 20 second interval. For first time users: It is recommended to do a one minute trial to gain an understanding of the system. I hope you find this tool useful!" +autowrap = true +__meta__ = { +"_edit_lock_": true +} [node name="InsOkButton" type="Button" parent="StartScreen/InstructionScreen/InstructionContainer"] -layout_mode = 2 -theme = ExtResource("1") +margin_top = 371.0 +margin_right = 770.0 +margin_bottom = 405.0 +theme = ExtResource( 1 ) text = "OK" +__meta__ = { +"_edit_lock_": true +} [node name="UpdatePanel" type="Panel" parent="StartScreen"] unique_name_in_owner = true -anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -640.0 -offset_top = -289.0 -offset_right = 640.0 -offset_bottom = 359.0 +margin_left = -640.0 +margin_top = -289.0 +margin_right = 640.0 +margin_bottom = 359.0 +custom_styles/panel = SubResource( 1 ) +__meta__ = { +"_edit_lock_": true +} [node name="Update" type="Label" parent="StartScreen/UpdatePanel"] -layout_mode = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -172.5 -offset_top = -250.0 -offset_right = 172.5 -offset_bottom = -200.0 +margin_left = -172.5 +margin_top = -250.0 +margin_right = 172.5 +margin_bottom = -200.0 +custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = SubResource( 6 ) text = "An Update is available!" +align = 1 [node name="BottomButtons" type="HBoxContainer" parent="StartScreen/UpdatePanel"] -layout_mode = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -500.0 -offset_top = 180.0 -offset_right = 500.0 -offset_bottom = 240.0 +margin_left = -500.0 +margin_top = 180.0 +margin_right = 500.0 +margin_bottom = 240.0 [node name="GoToUpdate" type="Button" parent="StartScreen/UpdatePanel/BottomButtons"] -layout_mode = 2 +margin_right = 498.0 +margin_bottom = 60.0 size_flags_horizontal = 3 -theme = ExtResource("1") +theme = ExtResource( 1 ) text = "Go to Download Page" [node name="IgnoreUpdate" type="Button" parent="StartScreen/UpdatePanel/BottomButtons"] unique_name_in_owner = true -layout_mode = 2 +margin_left = 502.0 +margin_right = 1000.0 +margin_bottom = 60.0 size_flags_horizontal = 3 -theme = ExtResource("1") +theme = ExtResource( 1 ) text = "Ignore Update" [node name="UpdateIntro" type="Label" parent="StartScreen/UpdatePanel"] unique_name_in_owner = true -layout_mode = 0 -offset_left = 33.0 -offset_top = 120.0 -offset_right = 1249.0 -offset_bottom = 161.0 -theme = ExtResource("1") +margin_left = 33.0 +margin_top = 120.0 +margin_right = 1249.0 +margin_bottom = 161.0 +theme = ExtResource( 1 ) text = "You are currently using version XX. The latest version available is XX. Version changes are:" +autowrap = true [node name="UpdateText" type="Label" parent="StartScreen/UpdatePanel"] unique_name_in_owner = true -layout_mode = 0 -offset_left = 33.0 -offset_top = 146.0 -offset_right = 1249.0 -offset_bottom = 432.0 -theme = ExtResource("1") +margin_left = 33.0 +margin_top = 146.0 +margin_right = 1249.0 +margin_bottom = 432.0 +theme = ExtResource( 1 ) text = "text" +autowrap = true [node name="EditScreen" type="CanvasLayer" parent="."] unique_name_in_owner = true visible = false -script = ExtResource("8") +script = ExtResource( 8 ) [node name="Panel" type="Panel" parent="EditScreen"] -anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -theme = ExtResource("1") +theme = ExtResource( 1 ) [node name="GridObservations" type="GridContainer" parent="EditScreen/Panel"] -layout_mode = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -518.5 -offset_top = -57.0 -offset_right = 518.5 -offset_bottom = 129.0 +margin_left = -518.5 +margin_top = -57.0 +margin_right = 518.5 +margin_bottom = 129.0 columns = 3 [node name="AcronymLabel" type="Label" parent="EditScreen/Panel/GridObservations"] -layout_mode = 2 +margin_right = 96.0 +margin_bottom = 34.0 text = "Acronym" [node name="AcronymLabel2" type="Label" parent="EditScreen/Panel/GridObservations"] -layout_mode = 2 +margin_left = 100.0 +margin_right = 244.0 +margin_bottom = 34.0 text = "Descriptor" [node name="AcronymLabel3" type="Label" parent="EditScreen/Panel/GridObservations"] -layout_mode = 2 +margin_left = 248.0 +margin_right = 1037.0 +margin_bottom = 34.0 text = "Explanation" [node name="1AcronymE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_top = 38.0 +margin_right = 96.0 +margin_bottom = 72.0 +theme = ExtResource( 1 ) text = "O" max_length = 3 +__meta__ = { +"_edit_lock_": true +} [node name="1ItemE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 100.0 +margin_top = 38.0 +margin_right = 244.0 +margin_bottom = 72.0 +theme = ExtResource( 1 ) text = "On Task" expand_to_text_length = true +__meta__ = { +"_edit_lock_": true +} [node name="1ExplanationE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 +margin_left = 248.0 +margin_top = 38.0 +margin_right = 1037.0 +margin_bottom = 72.0 size_flags_horizontal = 3 -theme = ExtResource("1") +theme = ExtResource( 1 ) text = "The pupil is on task" +__meta__ = { +"_edit_lock_": true +} [node name="2AcronymE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_top = 76.0 +margin_right = 96.0 +margin_bottom = 110.0 +theme = ExtResource( 1 ) text = "L" max_length = 3 expand_to_text_length = true +__meta__ = { +"_edit_lock_": true +} [node name="2ItemE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 100.0 +margin_top = 76.0 +margin_right = 244.0 +margin_bottom = 110.0 +theme = ExtResource( 1 ) text = "Looking" expand_to_text_length = true +__meta__ = { +"_edit_lock_": true +} [node name="2ExplanationE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 +margin_left = 248.0 +margin_top = 76.0 +margin_right = 1037.0 +margin_bottom = 110.0 size_flags_horizontal = 3 -theme = ExtResource("1") +theme = ExtResource( 1 ) text = " The pupil is looking around in a distracted manner or is staring into the distance" +__meta__ = { +"_edit_lock_": true +} [node name="3AcronymE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_top = 114.0 +margin_right = 96.0 +margin_bottom = 148.0 +theme = ExtResource( 1 ) text = "D" max_length = 3 expand_to_text_length = true +__meta__ = { +"_edit_lock_": true +} [node name="3ItemE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 100.0 +margin_top = 114.0 +margin_right = 244.0 +margin_bottom = 148.0 +theme = ExtResource( 1 ) text = "Distracting" expand_to_text_length = true +__meta__ = { +"_edit_lock_": true +} [node name="3ExplanationE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 +margin_left = 248.0 +margin_top = 114.0 +margin_right = 1037.0 +margin_bottom = 148.0 size_flags_horizontal = 3 -theme = ExtResource("1") +theme = ExtResource( 1 ) text = "The pupil is distracting other pupils or talking to them" +__meta__ = { +"_edit_lock_": true +} [node name="4AcronymE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_top = 152.0 +margin_right = 96.0 +margin_bottom = 186.0 +theme = ExtResource( 1 ) text = "W" max_length = 3 +__meta__ = { +"_edit_lock_": true +} [node name="4ItemE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 100.0 +margin_top = 152.0 +margin_right = 244.0 +margin_bottom = 186.0 +theme = ExtResource( 1 ) text = "Walking" expand_to_text_length = true +__meta__ = { +"_edit_lock_": true +} [node name="4ExplanationE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 +margin_left = 248.0 +margin_top = 152.0 +margin_right = 1037.0 +margin_bottom = 186.0 size_flags_horizontal = 3 -theme = ExtResource("1") +theme = ExtResource( 1 ) text = "The pupil is walking through the class" +__meta__ = { +"_edit_lock_": true +} [node name="5AcronymE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_top = 190.0 +margin_right = 96.0 +margin_bottom = 224.0 +theme = ExtResource( 1 ) text = "O" max_length = 3 +__meta__ = { +"_edit_lock_": true +} [node name="5ItemE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 100.0 +margin_top = 190.0 +margin_right = 244.0 +margin_bottom = 224.0 +theme = ExtResource( 1 ) text = "Other" expand_to_text_length = true +__meta__ = { +"_edit_lock_": true +} [node name="5ExplanationE" type="LineEdit" parent="EditScreen/Panel/GridObservations"] unique_name_in_owner = true -layout_mode = 2 +margin_left = 248.0 +margin_top = 190.0 +margin_right = 1037.0 +margin_bottom = 224.0 size_flags_horizontal = 3 -theme = ExtResource("1") +theme = ExtResource( 1 ) text = "The pupil is otherwise distracted and not on task" +__meta__ = { +"_edit_lock_": true +} [node name="CancelButton" type="Button" parent="EditScreen/Panel"] -layout_mode = 0 -offset_left = 520.0 -offset_top = 645.0 -offset_right = 597.0 -offset_bottom = 679.0 +margin_left = 520.0 +margin_top = 645.0 +margin_right = 597.0 +margin_bottom = 679.0 text = "Cancel" [node name="OKButton" type="Button" parent="EditScreen/Panel"] -layout_mode = 0 -offset_left = 616.0 -offset_top = 645.0 -offset_right = 656.0 -offset_bottom = 679.0 +margin_left = 616.0 +margin_top = 645.0 +margin_right = 656.0 +margin_bottom = 679.0 text = "OK" [node name="ClearAll" type="Button" parent="EditScreen/Panel"] -layout_mode = 0 -offset_left = 952.0 -offset_top = 615.0 -offset_right = 1051.0 -offset_bottom = 649.0 +margin_left = 952.0 +margin_top = 615.0 +margin_right = 1051.0 +margin_bottom = 649.0 text = "Clear All" [node name="ObservationWindow" type="CanvasLayer" parent="."] visible = false -script = ExtResource("7") +script = ExtResource( 7 ) [node name="Panel" type="Panel" parent="ObservationWindow"] -anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -offset_top = 71.0 -offset_bottom = -1.0 -theme = ExtResource("1") +margin_top = 71.0 +margin_bottom = -1.0 +theme = ExtResource( 1 ) +custom_styles/panel = SubResource( 7 ) +__meta__ = { +"_edit_lock_": true +} [node name="BehaviourButtons" type="HBoxContainer" parent="ObservationWindow/Panel"] -layout_mode = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -453.0 -offset_top = 51.0 -offset_right = 453.0 -offset_bottom = 91.0 +margin_left = -453.0 +margin_top = 51.0 +margin_right = 453.0 +margin_bottom = 91.0 [node name="BehaviourOne" type="Button" parent="ObservationWindow/Panel/BehaviourButtons"] unique_name_in_owner = true -layout_mode = 2 +margin_right = 178.0 +margin_bottom = 40.0 size_flags_horizontal = 3 text = "Acronym1" [node name="BehaviourTwo" type="Button" parent="ObservationWindow/Panel/BehaviourButtons"] unique_name_in_owner = true -layout_mode = 2 +margin_left = 182.0 +margin_right = 360.0 +margin_bottom = 40.0 size_flags_horizontal = 3 text = "Acronym1" [node name="BehaviourThree" type="Button" parent="ObservationWindow/Panel/BehaviourButtons"] unique_name_in_owner = true -layout_mode = 2 +margin_left = 364.0 +margin_right = 542.0 +margin_bottom = 40.0 size_flags_horizontal = 3 text = "Acronym1" [node name="BehaviourFour" type="Button" parent="ObservationWindow/Panel/BehaviourButtons"] unique_name_in_owner = true -layout_mode = 2 +margin_left = 546.0 +margin_right = 724.0 +margin_bottom = 40.0 size_flags_horizontal = 3 text = "Acronym1" [node name="BehaviourFive" type="Button" parent="ObservationWindow/Panel/BehaviourButtons"] unique_name_in_owner = true -layout_mode = 2 +margin_left = 728.0 +margin_right = 906.0 +margin_bottom = 40.0 size_flags_horizontal = 3 text = "Acronym1" [node name="BehaviourTitles" type="HBoxContainer" parent="ObservationWindow/Panel"] -layout_mode = 0 -offset_left = 189.0 -offset_top = 368.0 -offset_right = 1095.0 -offset_bottom = 408.0 +margin_left = 189.0 +margin_top = 368.0 +margin_right = 1095.0 +margin_bottom = 408.0 [node name="BTitle1" type="Label" parent="ObservationWindow/Panel/BehaviourTitles"] unique_name_in_owner = true -layout_mode = 2 +margin_top = 3.0 +margin_right = 178.0 +margin_bottom = 37.0 size_flags_horizontal = 3 text = "Title1" +align = 1 [node name="BTitle2" type="Label" parent="ObservationWindow/Panel/BehaviourTitles"] unique_name_in_owner = true -layout_mode = 2 +margin_left = 182.0 +margin_top = 3.0 +margin_right = 360.0 +margin_bottom = 37.0 size_flags_horizontal = 3 text = "Title2" +align = 1 [node name="BTitle3" type="Label" parent="ObservationWindow/Panel/BehaviourTitles"] unique_name_in_owner = true -layout_mode = 2 +margin_left = 364.0 +margin_top = 3.0 +margin_right = 542.0 +margin_bottom = 37.0 size_flags_horizontal = 3 text = "Title3" +align = 1 [node name="BTitle4" type="Label" parent="ObservationWindow/Panel/BehaviourTitles"] unique_name_in_owner = true -layout_mode = 2 +margin_left = 546.0 +margin_top = 3.0 +margin_right = 724.0 +margin_bottom = 37.0 size_flags_horizontal = 3 text = "Title4" +align = 1 [node name="BTitle5" type="Label" parent="ObservationWindow/Panel/BehaviourTitles"] unique_name_in_owner = true -layout_mode = 2 +margin_left = 728.0 +margin_top = 3.0 +margin_right = 906.0 +margin_bottom = 37.0 size_flags_horizontal = 3 text = "Title5" +align = 1 [node name="TimeRemaining" type="Label" parent="ObservationWindow/Panel"] -layout_mode = 0 -offset_left = 532.0 -offset_top = 98.0 -offset_right = 572.0 -offset_bottom = 132.0 -theme = ExtResource("1") +margin_left = 532.0 +margin_top = 98.0 +margin_right = 572.0 +margin_bottom = 132.0 +theme = ExtResource( 1 ) text = "20" [node name="DescriptorTime" type="Label" parent="ObservationWindow/Panel"] -layout_mode = 0 -offset_left = 581.0 -offset_top = 98.0 -offset_right = 784.0 -offset_bottom = 132.0 -theme = ExtResource("1") +margin_left = 581.0 +margin_top = 98.0 +margin_right = 784.0 +margin_bottom = 132.0 +theme = ExtResource( 1 ) text = "Seconds remaining" [node name="Button" type="Button" parent="ObservationWindow/Panel"] -layout_mode = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -74.5 -offset_top = -231.5 -offset_right = 74.5 -offset_bottom = -191.5 +margin_left = -74.5 +margin_top = -231.5 +margin_right = 74.5 +margin_bottom = -191.5 text = "Stop Early" [node name="TimerBar" type="ProgressBar" parent="ObservationWindow/Panel"] -layout_mode = 0 -offset_left = 406.0 -offset_top = 145.0 -offset_right = 891.0 -offset_bottom = 206.0 -theme = ExtResource("1") +margin_left = 406.0 +margin_top = 145.0 +margin_right = 891.0 +margin_bottom = 206.0 +theme = ExtResource( 1 ) max_value = 20.0 step = 1.0 value = 20.0 rounded = true -script = ExtResource("10") +percent_visible = false +script = ExtResource( 10 ) [node name="DescriptorBox" type="HBoxContainer" parent="ObservationWindow/Panel"] -layout_mode = 0 -offset_left = 361.0 -offset_top = 441.0 -offset_right = 966.0 -offset_bottom = 481.0 +margin_left = 361.0 +margin_top = 441.0 +margin_right = 966.0 +margin_bottom = 481.0 alignment = 1 [node name="ObservationsRemaining" type="Label" parent="ObservationWindow/Panel/DescriptorBox"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 31.0 +margin_top = 3.0 +margin_right = 146.0 +margin_bottom = 37.0 +theme = ExtResource( 1 ) text = "Remaining" +__meta__ = { +"_edit_lock_": true +} [node name="ObservationsSlash" type="Label" parent="ObservationWindow/Panel/DescriptorBox"] -layout_mode = 2 -theme = ExtResource("1") +margin_left = 150.0 +margin_top = 3.0 +margin_right = 158.0 +margin_bottom = 37.0 +theme = ExtResource( 1 ) text = "/" +__meta__ = { +"_edit_lock_": true +} [node name="ObservationsTotal" type="Label" parent="ObservationWindow/Panel/DescriptorBox"] unique_name_in_owner = true -layout_mode = 2 -theme = ExtResource("1") +margin_left = 162.0 +margin_top = 3.0 +margin_right = 359.0 +margin_bottom = 37.0 +theme = ExtResource( 1 ) text = "ObservationsTotal" +__meta__ = { +"_edit_lock_": true +} [node name="ObservationsDescriptor" type="Label" parent="ObservationWindow/Panel/DescriptorBox"] -layout_mode = 2 -theme = ExtResource("1") +margin_left = 363.0 +margin_top = 3.0 +margin_right = 573.0 +margin_bottom = 37.0 +theme = ExtResource( 1 ) text = "intervals remaining" +__meta__ = { +"_edit_lock_": true +} [node name="ProgressBar" type="ProgressBar" parent="ObservationWindow/Panel"] -layout_mode = 0 anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -offset_top = -14.0 +margin_top = -14.0 +custom_styles/fg = SubResource( 10 ) +custom_styles/bg = SubResource( 11 ) step = 1.0 -script = ExtResource("11") +percent_visible = false +script = ExtResource( 11 ) [node name="TwentySecondTimer" type="Timer" parent="ObservationWindow"] unique_name_in_owner = true @@ -802,127 +1140,145 @@ wait_time = 20.0 [node name="Results" type="CanvasLayer" parent="."] visible = false -script = ExtResource("9") +script = ExtResource( 9 ) [node name="Panel" type="Panel" parent="Results"] -anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -theme = ExtResource("1") +theme = ExtResource( 1 ) +custom_styles/panel = SubResource( 8 ) +__meta__ = { +"_edit_lock_": true +} [node name="SaveReport" type="Button" parent="Results/Panel"] unique_name_in_owner = true -layout_mode = 0 -offset_left = 992.0 -offset_top = 643.0 -offset_right = 1251.0 -offset_bottom = 683.0 +margin_left = 992.0 +margin_top = 643.0 +margin_right = 1251.0 +margin_bottom = 683.0 text = "Save Report as PNG" [node name="BackMainMenu" type="Button" parent="Results/Panel"] unique_name_in_owner = true -layout_mode = 0 -offset_left = 32.0 -offset_top = 643.0 -offset_right = 176.0 -offset_bottom = 683.0 +margin_left = 32.0 +margin_top = 643.0 +margin_right = 176.0 +margin_bottom = 683.0 text = "Restart" [node name="FullResult" type="Label" parent="Results/Panel"] unique_name_in_owner = true -layout_mode = 0 -offset_left = 11.0 -offset_top = 13.0 -offset_right = 1268.0 -offset_bottom = 396.0 +margin_left = 11.0 +margin_top = 13.0 +margin_right = 1268.0 +margin_bottom = 396.0 +custom_fonts/font = SubResource( 9 ) text = "Can this be multi-line? Or does text-wrap work? Can I get integers in? Must be able to, concatenate." +autowrap = true +__meta__ = { +"_edit_lock_": true +} [node name="ObsBar1" type="ProgressBar" parent="Results/Panel"] unique_name_in_owner = true -layout_mode = 0 -offset_left = 348.0 -offset_top = 422.0 -offset_right = 1140.0 -offset_bottom = 447.0 +margin_left = 348.0 +margin_top = 422.0 +margin_right = 1140.0 +margin_bottom = 447.0 size_flags_horizontal = 3 step = 1.0 +percent_visible = false [node name="ObsBar2" type="ProgressBar" parent="Results/Panel"] unique_name_in_owner = true -layout_mode = 0 -offset_left = 348.0 -offset_top = 452.0 -offset_right = 1140.0 -offset_bottom = 477.0 +margin_left = 348.0 +margin_top = 452.0 +margin_right = 1140.0 +margin_bottom = 477.0 size_flags_horizontal = 3 step = 1.0 +percent_visible = false [node name="ObsBar3" type="ProgressBar" parent="Results/Panel"] unique_name_in_owner = true -layout_mode = 0 -offset_left = 348.0 -offset_top = 482.0 -offset_right = 1140.0 -offset_bottom = 507.0 +margin_left = 348.0 +margin_top = 482.0 +margin_right = 1140.0 +margin_bottom = 507.0 size_flags_horizontal = 3 step = 1.0 +percent_visible = false [node name="ObsBar4" type="ProgressBar" parent="Results/Panel"] unique_name_in_owner = true -layout_mode = 0 -offset_left = 348.0 -offset_top = 512.0 -offset_right = 1140.0 -offset_bottom = 537.0 +margin_left = 348.0 +margin_top = 512.0 +margin_right = 1140.0 +margin_bottom = 537.0 size_flags_horizontal = 3 step = 1.0 +percent_visible = false [node name="ObsBar5" type="ProgressBar" parent="Results/Panel"] unique_name_in_owner = true -layout_mode = 0 -offset_left = 348.0 -offset_top = 542.0 -offset_right = 1140.0 -offset_bottom = 567.0 +margin_left = 348.0 +margin_top = 542.0 +margin_right = 1140.0 +margin_bottom = 567.0 size_flags_horizontal = 3 step = 1.0 +percent_visible = false [node name="GridContainer" type="GridContainer" parent="Results/Panel"] -layout_mode = 0 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -517.0 -offset_top = 60.5 -offset_right = -302.0 -offset_bottom = 206.5 +margin_left = -517.0 +margin_top = 60.5 +margin_right = -302.0 +margin_bottom = 206.5 [node name="ObsTitle1" type="Label" parent="Results/Panel/GridContainer"] unique_name_in_owner = true -layout_mode = 2 +margin_right = 50.0 +margin_bottom = 26.0 +custom_fonts/font = SubResource( 12 ) text = "Item1" [node name="ObsTitle2" type="Label" parent="Results/Panel/GridContainer"] unique_name_in_owner = true -layout_mode = 2 +margin_top = 30.0 +margin_right = 50.0 +margin_bottom = 56.0 +custom_fonts/font = SubResource( 12 ) text = "Item2" [node name="ObsTitle3" type="Label" parent="Results/Panel/GridContainer"] unique_name_in_owner = true -layout_mode = 2 +margin_top = 60.0 +margin_right = 50.0 +margin_bottom = 86.0 +custom_fonts/font = SubResource( 12 ) text = "Item3" [node name="ObsTitle4" type="Label" parent="Results/Panel/GridContainer"] unique_name_in_owner = true -layout_mode = 2 +margin_top = 90.0 +margin_right = 50.0 +margin_bottom = 116.0 +custom_fonts/font = SubResource( 12 ) text = "Item4" [node name="ObsTitle5" type="Label" parent="Results/Panel/GridContainer"] unique_name_in_owner = true -layout_mode = 2 +margin_top = 120.0 +margin_right = 50.0 +margin_bottom = 146.0 +custom_fonts/font = SubResource( 12 ) text = "Item5" [connection signal="request_completed" from="HTTPRequest" to="." method="_on_HTTPRequest_request_completed"] diff --git a/godot/project.godot b/godot/project.godot index 727cadc..f4f283f 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -6,16 +6,15 @@ ; [section] ; section goes between [] ; param=value ; assign values to parameters -config_version=5 +config_version=4 [application] config/name="Time Sampling Form" run/main_scene="res://main_screen.tscn" -config/features=PackedStringArray("4.0") run/low_processor_mode=true -boot_splash/bg_color=Color(0.952941, 0.933333, 0.847059, 1) boot_splash/image="res://Assets/icons/main_icon.png" +boot_splash/bg_color=Color( 0.952941, 0.933333, 0.847059, 1 ) config/icon="res://Assets/icons/main_icon.png" config/macos_native_icon="res://Assets/icons/main_icon.icns" config/windows_native_icon="res://Assets/icons/icon.ico" @@ -27,13 +26,14 @@ HTML5File="*res://addons/HTML5FileExchange/HTML5FileExchange.gd" [display] -window/size/viewport_width=1280 -window/size/viewport_height=720 +window/size/width=1280 +window/size/height=720 window/stretch/mode="2d" +window/stretch/aspect="keep" [editor_plugins] -enabled=PackedStringArray("res://addons/HTML5FileExchange/plugin.cfg") +enabled=PoolStringArray( "res://addons/HTML5FileExchange/plugin.cfg" ) [gui] @@ -45,7 +45,7 @@ common/enable_pause_aware_picking=true [rendering] -environment/defaults/default_environment="res://default_env.tres" quality/intended_usage/framebuffer_allocation=0 quality/intended_usage/framebuffer_allocation.mobile=0 2d/snapping/use_gpu_pixel_snap=true +environment/default_environment="res://default_env.tres" diff --git a/godot/wb_theme.tres b/godot/wb_theme.tres index 4113aa0..88ca0d5 100644 --- a/godot/wb_theme.tres +++ b/godot/wb_theme.tres @@ -1,128 +1,104 @@ -[gd_resource type="Theme" load_steps=16 format=3 uid="uid://cft2814mm2aav"] +[gd_resource type="Theme" load_steps=16 format=2] -[ext_resource type="FontFile" uid="uid://pimhoja8acya" path="res://Assets/fonts/noto_sans_display_bold.ttf" id="1"] -[ext_resource type="FontFile" uid="uid://c21retrvbsple" path="res://Assets/fonts/noto_sans_display.ttf" id="2"] +[ext_resource path="res://Assets/fonts/noto_sans_display_bold.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://Assets/fonts/noto_sans_display.ttf" type="DynamicFontData" id=2] -[sub_resource type="FontFile" id="1"] -fallbacks = Array[Font]([ExtResource("1")]) -face_index = null -embolden = null -transform = null -cache/0/16/0/ascent = 0.0 -cache/0/16/0/descent = 0.0 -cache/0/16/0/underline_position = 0.0 -cache/0/16/0/underline_thickness = 0.0 -cache/0/16/0/scale = 1.0 -cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) +[sub_resource type="DynamicFont" id=1] +size = 24 +font_data = ExtResource( 1 ) -[sub_resource type="StyleBoxFlat" id="4"] -bg_color = Color(0.207843, 0.219608, 0.317647, 1) +[sub_resource type="StyleBoxFlat" id=4] +bg_color = Color( 0.207843, 0.219608, 0.317647, 1 ) corner_radius_top_left = 10 corner_radius_top_right = 10 corner_radius_bottom_right = 10 corner_radius_bottom_left = 10 -[sub_resource type="StyleBoxFlat" id="5"] -bg_color = Color(0.862745, 0.435294, 0.329412, 1) +[sub_resource type="StyleBoxFlat" id=5] +bg_color = Color( 0.862745, 0.435294, 0.329412, 1 ) corner_radius_top_left = 10 corner_radius_top_right = 10 corner_radius_bottom_right = 10 corner_radius_bottom_left = 10 -[sub_resource type="StyleBoxFlat" id="6"] -bg_color = Color(0.941176, 0.772549, 0.517647, 1) +[sub_resource type="StyleBoxFlat" id=6] +bg_color = Color( 0.941176, 0.772549, 0.517647, 1 ) corner_radius_top_left = 10 corner_radius_top_right = 10 corner_radius_bottom_right = 10 corner_radius_bottom_left = 10 -[sub_resource type="StyleBoxFlat" id="2"] -bg_color = Color(0.862745, 0.435294, 0.329412, 1) +[sub_resource type="StyleBoxFlat" id=2] +bg_color = Color( 0.862745, 0.435294, 0.329412, 1 ) corner_radius_top_left = 10 corner_radius_top_right = 10 corner_radius_bottom_right = 10 corner_radius_bottom_left = 10 -[sub_resource type="StyleBoxFlat" id="7"] -bg_color = Color(0.941176, 0.772549, 0.517647, 1) +[sub_resource type="StyleBoxFlat" id=7] +bg_color = Color( 0.941176, 0.772549, 0.517647, 1 ) corner_radius_top_left = 10 corner_radius_top_right = 10 corner_radius_bottom_right = 10 corner_radius_bottom_left = 10 -[sub_resource type="FontFile" id="3"] -fallbacks = Array[Font]([ExtResource("2")]) -face_index = null -embolden = null -transform = null -cache/0/16/0/ascent = 0.0 -cache/0/16/0/descent = 0.0 -cache/0/16/0/underline_position = 0.0 -cache/0/16/0/underline_thickness = 0.0 -cache/0/16/0/scale = 1.0 -cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) +[sub_resource type="DynamicFont" id=3] +size = 24 +font_data = ExtResource( 2 ) -[sub_resource type="FontFile" id="8"] -fallbacks = Array[Font]([ExtResource("2")]) -face_index = null -embolden = null -transform = null -cache/0/16/0/ascent = 0.0 -cache/0/16/0/descent = 0.0 -cache/0/16/0/underline_position = 0.0 -cache/0/16/0/underline_thickness = 0.0 -cache/0/16/0/scale = 1.0 -cache/0/16/0/kerning_overrides/16/0 = Vector2(0, 0) +[sub_resource type="DynamicFont" id=8] +size = 24 +font_data = ExtResource( 2 ) -[sub_resource type="StyleBoxFlat" id="9"] +[sub_resource type="StyleBoxFlat" id=9] content_margin_left = 15.0 content_margin_right = 5.0 -bg_color = Color(0.207843, 0.219608, 0.317647, 1) +bg_color = Color( 0.207843, 0.219608, 0.317647, 1 ) corner_radius_top_left = 10 corner_radius_top_right = 10 corner_radius_bottom_right = 10 corner_radius_bottom_left = 10 -[sub_resource type="StyleBoxFlat" id="11"] -bg_color = Color(0.952941, 0.933333, 0.847059, 1) +[sub_resource type="StyleBoxFlat" id=11] +bg_color = Color( 0.952941, 0.933333, 0.847059, 1 ) border_width_left = 2 border_width_top = 2 border_width_right = 2 border_width_bottom = 2 -border_color = Color(0.207843, 0.219608, 0.317647, 1) +border_color = Color( 0.207843, 0.219608, 0.317647, 1 ) corner_radius_top_left = 10 corner_radius_top_right = 10 corner_radius_bottom_right = 10 corner_radius_bottom_left = 10 -[sub_resource type="StyleBoxEmpty" id="12"] +[sub_resource type="StyleBoxEmpty" id=12] -[sub_resource type="StyleBoxFlat" id="13"] -bg_color = Color(0.862745, 0.435294, 0.329412, 1) +[sub_resource type="StyleBoxFlat" id=13] +bg_color = Color( 0.862745, 0.435294, 0.329412, 1 ) corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 -[sub_resource type="StyleBoxFlat" id="14"] -bg_color = Color(0.941176, 0.772549, 0.517647, 1) +[sub_resource type="StyleBoxFlat" id=14] +bg_color = Color( 0.941176, 0.772549, 0.517647, 1 ) corner_radius_top_left = 5 corner_radius_top_right = 5 corner_radius_bottom_right = 5 corner_radius_bottom_left = 5 [resource] -Button/fonts/font = SubResource("1") -Button/styles/disabled = SubResource("4") -Button/styles/focus = SubResource("5") -Button/styles/hover = SubResource("6") -Button/styles/normal = SubResource("2") -Button/styles/pressed = SubResource("7") -Label/colors/font_color = Color(0, 0, 0, 1) -Label/fonts/font = SubResource("3") -LineEdit/fonts/font = SubResource("8") -LineEdit/styles/normal = SubResource("9") -Panel/styles/panel = SubResource("11") -PanelContainer/styles/panel = SubResource("12") -ProgressBar/styles/bg = SubResource("13") -ProgressBar/styles/fg = SubResource("14") +Button/fonts/font = SubResource( 1 ) +Button/styles/disabled = SubResource( 4 ) +Button/styles/focus = SubResource( 5 ) +Button/styles/hover = SubResource( 6 ) +Button/styles/normal = SubResource( 2 ) +Button/styles/pressed = SubResource( 7 ) +Label/colors/font_color = Color( 0, 0, 0, 1 ) +Label/fonts/font = SubResource( 3 ) +LineEdit/fonts/font = SubResource( 8 ) +LineEdit/styles/normal = SubResource( 9 ) +Panel/styles/panel = SubResource( 11 ) +PanelContainer/styles/panel = SubResource( 12 ) +ProgressBar/styles/bg = SubResource( 13 ) +ProgressBar/styles/fg = SubResource( 14 )