jaap/time-sampling-form
1
0
Fork 0
mirror of https://github.com/hobbesjaap/time-sampling-form.git synced 2024-12-22 15:39:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

continued work on item-changing-menu

Browse Source
This commit is contained in:
Jaap Marsman 2022-10-26 16:05:44 +08:00
parent 71860d815b
commit f3dc807dc4
3 changed files with 82 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
godot/EditScreen.gd Normal file
View File

@ -0,0 +1,37 @@
extends CanvasLayer
onready var gi = $"/root/GlobalInts"
onready var global_ints = gi
onready var main_window = $"../../AppWindow"
func _ready():
pass # Replace with function body.
func _on_CancelButton_pressed():
$"%EditScreen".visible = false
func _on_OKButton_pressed():
global_ints.one_acronym = $"%1AcronymE".text
global_ints.two_acronym = $"%2AcronymE".text
global_ints.three_acronym = $"%3AcronymE".text
global_ints.four_acronym = $"%4AcronymE".text
global_ints.five_acronym = $"%5AcronymE".text
global_ints.one_behaviour = $"%1ItemE".text
global_ints.two_behaviour = $"%2ItemE".text
global_ints.three_behaviour = $"%3ItemE".text
global_ints.four_behaviour = $"%4ItemE".text
global_ints.five_behaviour = $"%5ItemE".text
global_ints.one_explanation = $"%1ExplanationE".text
global_ints.two_explanation = $"%2ExplanationE".text
global_ints.three_explanation = $"%3ExplanationE".text
global_ints.four_explanation = $"%4ExplanationE".text
global_ints.five_explanation = $"%5ExplanationE".text
$"%EditScreen".visible = false
main_window.refresh_descriptors()

5
godot/main_screen.gd
View File

@ -50,6 +50,7 @@ func _ready():
$"%WarningLabel".visible = false $"%WarningLabel".visible = false
$"ObservationWindow".visible = false $"ObservationWindow".visible = false
$"Results".visible = false $"Results".visible = false
$"EditScreen".visible = false
func _process(_delta): func _process(_delta):
check_time_var += 1 check_time_var += 1
@ -100,3 +101,7 @@ func _on_Start_pressed() -> void:
$"%ObservationsRemaining".text = str(global_ints.locked_observations_intervals_remaining) $"%ObservationsRemaining".text = str(global_ints.locked_observations_intervals_remaining)
$"%TwentySecondTimer".start(global_ints.timer_duration) $"%TwentySecondTimer".start(global_ints.timer_duration)
func _on_ChangeItems_pressed():
$"EditScreen".visible = true

59
godot/main_screen.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=14 format=2] [gd_scene load_steps=15 format=2]
[ext_resource path="res://wb_theme.tres" type="Theme" id=1] [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://main_screen.gd" type="Script" id=2]
@ -7,6 +7,7 @@
[ext_resource path="res://Assets/fonts/noto_sans_display.ttf" type="DynamicFontData" id=5] [ext_resource path="res://Assets/fonts/noto_sans_display.ttf" type="DynamicFontData" id=5]
[ext_resource path="res://Assets/fonts/NotoSansDisplay-Bold.ttf" type="DynamicFontData" id=6] [ext_resource path="res://Assets/fonts/NotoSansDisplay-Bold.ttf" type="DynamicFontData" id=6]
[ext_resource path="res://ObservationWindow.gd" type="Script" id=7] [ext_resource path="res://ObservationWindow.gd" type="Script" id=7]
[ext_resource path="res://EditScreen.gd" type="Script" id=8]
[sub_resource type="StyleBoxFlat" id=2] [sub_resource type="StyleBoxFlat" id=2]
bg_color = Color( 0.952941, 0.933333, 0.847059, 1 ) bg_color = Color( 0.952941, 0.933333, 0.847059, 1 )
@ -443,14 +444,17 @@ margin_bottom = 148.0
theme = ExtResource( 1 ) theme = ExtResource( 1 )
text = "OK" text = "OK"
[node name="ManualScreen" type="CanvasLayer" parent="."] [node name="EditScreen" type="CanvasLayer" parent="."]
unique_name_in_owner = true
visible = false
script = ExtResource( 8 )
[node name="Panel" type="Panel" parent="ManualScreen"] [node name="Panel" type="Panel" parent="EditScreen"]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
theme = ExtResource( 1 ) theme = ExtResource( 1 )
[node name="GridObservations" type="GridContainer" parent="ManualScreen/Panel"] [node name="GridObservations" type="GridContainer" parent="EditScreen/Panel"]
anchor_left = 0.5 anchor_left = 0.5
anchor_top = 0.5 anchor_top = 0.5
anchor_right = 0.5 anchor_right = 0.5
@ -461,7 +465,7 @@ margin_right = 518.5
margin_bottom = 129.0 margin_bottom = 129.0
columns = 3 columns = 3
[node name="1AcronymE" type="LineEdit" parent="ManualScreen/Panel/GridObservations"] [node name="1AcronymE" type="LineEdit" parent="EditScreen/Panel/GridObservations"]
unique_name_in_owner = true unique_name_in_owner = true
margin_right = 92.0 margin_right = 92.0
margin_bottom = 34.0 margin_bottom = 34.0
@ -472,7 +476,7 @@ __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="1ItemE" type="LineEdit" parent="ManualScreen/Panel/GridObservations"] [node name="1ItemE" type="LineEdit" parent="EditScreen/Panel/GridObservations"]
unique_name_in_owner = true unique_name_in_owner = true
margin_left = 96.0 margin_left = 96.0
margin_right = 240.0 margin_right = 240.0
@ -484,7 +488,7 @@ __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="1ExplanationE" type="LineEdit" parent="ManualScreen/Panel/GridObservations"] [node name="1ExplanationE" type="LineEdit" parent="EditScreen/Panel/GridObservations"]
unique_name_in_owner = true unique_name_in_owner = true
margin_left = 244.0 margin_left = 244.0
margin_right = 1037.0 margin_right = 1037.0
@ -496,7 +500,7 @@ __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="2AcronymE" type="LineEdit" parent="ManualScreen/Panel/GridObservations"] [node name="2AcronymE" type="LineEdit" parent="EditScreen/Panel/GridObservations"]
unique_name_in_owner = true unique_name_in_owner = true
margin_top = 38.0 margin_top = 38.0
margin_right = 92.0 margin_right = 92.0
@ -509,7 +513,7 @@ __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="2ItemE" type="LineEdit" parent="ManualScreen/Panel/GridObservations"] [node name="2ItemE" type="LineEdit" parent="EditScreen/Panel/GridObservations"]
unique_name_in_owner = true unique_name_in_owner = true
margin_left = 96.0 margin_left = 96.0
margin_top = 38.0 margin_top = 38.0
@ -522,7 +526,7 @@ __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="2ExplanationE" type="LineEdit" parent="ManualScreen/Panel/GridObservations"] [node name="2ExplanationE" type="LineEdit" parent="EditScreen/Panel/GridObservations"]
unique_name_in_owner = true unique_name_in_owner = true
margin_left = 244.0 margin_left = 244.0
margin_top = 38.0 margin_top = 38.0
@ -535,7 +539,7 @@ __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="3AcronymE" type="LineEdit" parent="ManualScreen/Panel/GridObservations"] [node name="3AcronymE" type="LineEdit" parent="EditScreen/Panel/GridObservations"]
unique_name_in_owner = true unique_name_in_owner = true
margin_top = 76.0 margin_top = 76.0
margin_right = 92.0 margin_right = 92.0
@ -548,7 +552,7 @@ __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="3ItemE" type="LineEdit" parent="ManualScreen/Panel/GridObservations"] [node name="3ItemE" type="LineEdit" parent="EditScreen/Panel/GridObservations"]
unique_name_in_owner = true unique_name_in_owner = true
margin_left = 96.0 margin_left = 96.0
margin_top = 76.0 margin_top = 76.0
@ -561,7 +565,7 @@ __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="3ExplanationE" type="LineEdit" parent="ManualScreen/Panel/GridObservations"] [node name="3ExplanationE" type="LineEdit" parent="EditScreen/Panel/GridObservations"]
unique_name_in_owner = true unique_name_in_owner = true
margin_left = 244.0 margin_left = 244.0
margin_top = 76.0 margin_top = 76.0
@ -574,7 +578,7 @@ __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="4AcronymE" type="LineEdit" parent="ManualScreen/Panel/GridObservations"] [node name="4AcronymE" type="LineEdit" parent="EditScreen/Panel/GridObservations"]
unique_name_in_owner = true unique_name_in_owner = true
margin_top = 114.0 margin_top = 114.0
margin_right = 92.0 margin_right = 92.0
@ -586,7 +590,7 @@ __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="4ItemE" type="LineEdit" parent="ManualScreen/Panel/GridObservations"] [node name="4ItemE" type="LineEdit" parent="EditScreen/Panel/GridObservations"]
unique_name_in_owner = true unique_name_in_owner = true
margin_left = 96.0 margin_left = 96.0
margin_top = 114.0 margin_top = 114.0
@ -599,7 +603,7 @@ __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="4ExplanationE" type="LineEdit" parent="ManualScreen/Panel/GridObservations"] [node name="4ExplanationE" type="LineEdit" parent="EditScreen/Panel/GridObservations"]
unique_name_in_owner = true unique_name_in_owner = true
margin_left = 244.0 margin_left = 244.0
margin_top = 114.0 margin_top = 114.0
@ -612,7 +616,7 @@ __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="5AcronymE" type="LineEdit" parent="ManualScreen/Panel/GridObservations"] [node name="5AcronymE" type="LineEdit" parent="EditScreen/Panel/GridObservations"]
unique_name_in_owner = true unique_name_in_owner = true
margin_top = 152.0 margin_top = 152.0
margin_right = 92.0 margin_right = 92.0
@ -624,7 +628,7 @@ __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="5ItemE" type="LineEdit" parent="ManualScreen/Panel/GridObservations"] [node name="5ItemE" type="LineEdit" parent="EditScreen/Panel/GridObservations"]
unique_name_in_owner = true unique_name_in_owner = true
margin_left = 96.0 margin_left = 96.0
margin_top = 152.0 margin_top = 152.0
@ -637,7 +641,7 @@ __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="5ExplanationE" type="LineEdit" parent="ManualScreen/Panel/GridObservations"] [node name="5ExplanationE" type="LineEdit" parent="EditScreen/Panel/GridObservations"]
unique_name_in_owner = true unique_name_in_owner = true
margin_left = 244.0 margin_left = 244.0
margin_top = 152.0 margin_top = 152.0
@ -650,6 +654,20 @@ __meta__ = {
"_edit_lock_": true "_edit_lock_": true
} }
[node name="CancelButton" type="Button" parent="EditScreen/Panel"]
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"]
margin_left = 616.0
margin_top = 645.0
margin_right = 656.0
margin_bottom = 679.0
text = "OK"
[node name="ObservationWindow" type="CanvasLayer" parent="."] [node name="ObservationWindow" type="CanvasLayer" parent="."]
visible = false visible = false
script = ExtResource( 7 ) script = ExtResource( 7 )
@ -760,7 +778,10 @@ theme = ExtResource( 1 )
[connection signal="pressed" from="StartScreen/InstructionPanel/MinuteBox/MinuteMinus" to="." method="_on_MinuteMinus_pressed"] [connection signal="pressed" from="StartScreen/InstructionPanel/MinuteBox/MinuteMinus" to="." method="_on_MinuteMinus_pressed"]
[connection signal="pressed" from="StartScreen/InstructionPanel/MinuteBox/MinutePlus" to="." method="_on_MinutePlus_pressed"] [connection signal="pressed" from="StartScreen/InstructionPanel/MinuteBox/MinutePlus" to="." method="_on_MinutePlus_pressed"]
[connection signal="pressed" from="StartScreen/InstructionPanel/BottomButtons/Manual" to="." method="_on_Manual_pressed"] [connection signal="pressed" from="StartScreen/InstructionPanel/BottomButtons/Manual" to="." method="_on_Manual_pressed"]
[connection signal="pressed" from="StartScreen/InstructionPanel/BottomButtons/ChangeItems" to="." method="_on_ChangeItems_pressed"]
[connection signal="pressed" from="StartScreen/InstructionPanel/BottomButtons/PupilName" to="." method="_on_PupilName_pressed"] [connection signal="pressed" from="StartScreen/InstructionPanel/BottomButtons/PupilName" to="." method="_on_PupilName_pressed"]
[connection signal="pressed" from="StartScreen/InstructionPanel/BottomButtons/Start" to="." method="_on_Start_pressed"] [connection signal="pressed" from="StartScreen/InstructionPanel/BottomButtons/Start" to="." method="_on_Start_pressed"]
[connection signal="pressed" from="StartScreen/NameChangePanel/NameContainer/OkButton" to="StartScreen/NameChangePanel" method="_on_OkButton_pressed"] [connection signal="pressed" from="StartScreen/NameChangePanel/NameContainer/OkButton" to="StartScreen/NameChangePanel" method="_on_OkButton_pressed"]
[connection signal="pressed" from="EditScreen/Panel/CancelButton" to="EditScreen" method="_on_CancelButton_pressed"]
[connection signal="pressed" from="EditScreen/Panel/OKButton" to="EditScreen" method="_on_OKButton_pressed"]
[connection signal="timeout" from="ObservationWindow/TwentySecondTimer" to="ObservationWindow" method="_on_TwentySecondTimer_timeout"] [connection signal="timeout" from="ObservationWindow/TwentySecondTimer" to="ObservationWindow" method="_on_TwentySecondTimer_timeout"]