From 40162df437ef11741e04de682b4fd8abb32bd930 Mon Sep 17 00:00:00 2001 From: hobbesjaap Date: Sat, 5 Apr 2025 22:02:39 +0800 Subject: [PATCH] Ready for testing v0.2 --- godot/ObservationWindow.gd | 42 +++++ godot/Results.gd | 10 +- godot/global_ints.gd | 2 +- godot/main_screen.gd | 34 ++++- godot/main_screen.tscn | 303 +++++++++++++++++++++++-------------- godot/translation.csv | 7 +- 6 files changed, 277 insertions(+), 121 deletions(-) diff --git a/godot/ObservationWindow.gd b/godot/ObservationWindow.gd index 8824d83..1f4e7c6 100644 --- a/godot/ObservationWindow.gd +++ b/godot/ObservationWindow.gd @@ -5,6 +5,46 @@ var time_lefts : int var toggle_observation : bool = false var observation_button_pressed : bool = false +@onready var styleBox_highlight : StyleBoxFlat = $"%OneInstrPanel".get_theme_stylebox("panel").duplicate() +@onready var styleBox_orig : StyleBoxFlat = $"%TwoNamesPanel".get_theme_stylebox("panel").duplicate() + + +func set_all_boxes_to_normal() -> void: + $"%OneInstrPanel".add_theme_stylebox_override("panel", styleBox_orig) + $"%TwoNamesPanel".add_theme_stylebox_override("panel", styleBox_orig) + $"%ThreeConfigPanel".add_theme_stylebox_override("panel", styleBox_orig) + $"%FourObservePanel".add_theme_stylebox_override("panel", styleBox_orig) + $"%FiveResultsPanel".add_theme_stylebox_override("panel", styleBox_orig) + + +func state_changed_check() -> void: + styleBox_highlight.set("bg_color", Color.html("#F2CC8F")) + + if $"%InstructionScreen".visible == true: + global_ints.app_state = 1 + set_all_boxes_to_normal() + $"%OneInstrPanel".add_theme_stylebox_override("panel", styleBox_highlight) + + if $"%NameChangePanel".visible == true: + global_ints.app_state = 2 + set_all_boxes_to_normal() + $"%TwoNamesPanel".add_theme_stylebox_override("panel", styleBox_highlight) + + if $"%InstructionPanel".visible == true: + global_ints.app_state = 3 + set_all_boxes_to_normal() + $"%ThreeConfigPanel".add_theme_stylebox_override("panel", styleBox_highlight) + + if $"%ObservationWindow".visible == true: + global_ints.app_state = 4 + set_all_boxes_to_normal() + $"%FourObservePanel".add_theme_stylebox_override("panel", styleBox_highlight) + + if $"%Results".visible == true: + global_ints.app_state = 5 + set_all_boxes_to_normal() + $"%FiveResultsPanel".add_theme_stylebox_override("panel", styleBox_highlight) + func _ready() -> void: $"Panel/BehaviourButtons".hide() @@ -127,4 +167,6 @@ func _on_Button_pressed() -> void: $"TwentySecondTimer".stop() global_ints.generate_results = true calculate_percentages() + $"%ObservationWindow".hide() $"../Results".show() + state_changed_check() diff --git a/godot/Results.gd b/godot/Results.gd index d82d7cf..d87f4eb 100644 --- a/godot/Results.gd +++ b/godot/Results.gd @@ -76,14 +76,14 @@ func take_screenshot() -> void: func _on_SaveReport_pressed() -> void: await get_tree().process_frame - $"%SaveReport".hide() - $"%BackMainMenu".hide() + $"%ResultMenu".hide() + $"%TopMenuBar".hide() await get_tree().process_frame take_screenshot() - $"%SaveReport".show() - $"%BackMainMenu".show() + $"%ResultMenu".show() + $"%TopMenuBar".show() func _on_BackMainMenu_pressed() -> void: @@ -97,7 +97,7 @@ func _on_Results_visibility_changed() -> void: var result_text : String - result_text = str("Date: " , global_ints.ddmmyyyy , "\nTime: ", global_ints.observation_start_time , " to " , global_ints.observation_end_time , "\n \nThis Time Sampling Form (TSF) observation was completed by " , global_ints.observer_person_name , ". " , global_ints.observed_person_name , " was observed for " , global_ints.total_observed_time , " minute(s) during " , global_ints.observed_activity , ". \n \nDuring the observation, The ", global_ints.one_behaviour," behaviour was observed ", global_ints.one_behaviour_score, " out of ",global_ints.total_behaviours," times, resulting in ",global_ints.one_behaviour_percent,"%. The ",global_ints.two_behaviour," behaviour was observed ",global_ints.two_behaviour_score," out of ",global_ints.total_behaviours," times, resulting in ",global_ints.two_behaviour_percent,"%. The ",global_ints.three_behaviour," behaviour was observed ",global_ints.three_behaviour_score," out of ",global_ints.total_behaviours," times, resulting in ",global_ints.three_behaviour_percent,"%. The ", global_ints.four_behaviour," behaviour was observed ",global_ints.four_behaviour_score," out of ",global_ints.total_behaviours," times, resulting in ",global_ints.four_behaviour_percent,"%. The ",global_ints.five_behaviour," behaviour was observed ",global_ints.five_behaviour_score," out of ",global_ints.total_behaviours," times, resulting in ",global_ints.five_behaviour_percent,"%. ",global_ints.six_behaviour_score," intervals were not scored.") + result_text = str("Observed: " , global_ints.observed_person_name , "\nDate: " , global_ints.ddmmyyyy , "\nTime: ", global_ints.observation_start_time , " to " , global_ints.observation_end_time , "\n \nThis Time Sampling Form (TSF) observation was completed by " , global_ints.observer_person_name , ". " , global_ints.observed_person_name , " was observed for " , global_ints.total_observed_time , " minute(s) during " , global_ints.observed_activity , ". \n \nDuring the observation, The ", global_ints.one_behaviour," behaviour was observed ", global_ints.one_behaviour_score, " out of ",global_ints.total_behaviours," times, resulting in ",global_ints.one_behaviour_percent,"%. The ",global_ints.two_behaviour," behaviour was observed ",global_ints.two_behaviour_score," out of ",global_ints.total_behaviours," times, resulting in ",global_ints.two_behaviour_percent,"%. The ",global_ints.three_behaviour," behaviour was observed ",global_ints.three_behaviour_score," out of ",global_ints.total_behaviours," times, resulting in ",global_ints.three_behaviour_percent,"%. The ", global_ints.four_behaviour," behaviour was observed ",global_ints.four_behaviour_score," out of ",global_ints.total_behaviours," times, resulting in ",global_ints.four_behaviour_percent,"%. The ",global_ints.five_behaviour," behaviour was observed ",global_ints.five_behaviour_score," out of ",global_ints.total_behaviours," times, resulting in ",global_ints.five_behaviour_percent,"%. ",global_ints.six_behaviour_score," intervals were not scored.") $"%FullResult".text = result_text # This is where we generate the bars diff --git a/godot/global_ints.gd b/godot/global_ints.gd index ee08905..33bfa54 100644 --- a/godot/global_ints.gd +++ b/godot/global_ints.gd @@ -9,7 +9,7 @@ var app_state : int var update_text : String var web_release_version : float -var release_version = 0.15 +var release_version = 0.2 var total_observed_time : int diff --git a/godot/main_screen.gd b/godot/main_screen.gd index 3439d87..635ac0a 100644 --- a/godot/main_screen.gd +++ b/godot/main_screen.gd @@ -15,7 +15,7 @@ var os_list : Array = ["Linux", "Windows", "macOS", "OSX", "UWP", "X11", "FreeBS func check_for_updates() -> void: if os_list.has(OS.get_name()): - print("We're on desktop. So let's check for updates!") +# print("We're on desktop. So let's check for updates!") $"%HTTPRequest".request(csv_url) $"%HTTPRequest2".request(update_text_url) @@ -122,7 +122,7 @@ func _ready() -> void: $"%UpdatePanel".hide() state_changed_check() update_date() - set_language() +# set_language() check_for_updates() @@ -247,6 +247,10 @@ func _on_MinuteMinus_button_down() -> void: pass +func _on_minute_plus_button_down() -> void: + pass # Replace with function body. + + func _on_GoToUpdate_pressed() -> void: var _error = OS.shell_open("https://github.com/hobbesjaap/time-sampling-form/releases") @@ -263,6 +267,32 @@ func _on_ok_button_pressed() -> void: global_ints.observed_person_name = $"%NameLine".text global_ints.observer_person_name = $"%ObserverLine".text global_ints.observed_activity = $"%ObservedActivity".text + + $"%TopOverview".text = str("Time Sampling Observation of " , global_ints.observed_person_name, ", observed by ", global_ints.observer_person_name , ", during " , global_ints.observed_activity , ".") + $"%TopOverview".show() else: $"%ObservedNameLabel".hide() $"%WarningLabel".show() + + +func _on_edit_report_pressed() -> void: + $"%EditResult".text = $"%FullResult".text + $"%ResultMenu".hide() + $"%EditPanel".show() + $"%EditResult".show() + $"%EditMenu".show() + + +func _on_cancel_edit_pressed() -> void: + $"%ResultMenu".show() + $"%EditPanel".hide() + $"%EditResult".hide() + $"%EditMenu".hide() + + +func _on_save_edit_pressed() -> void: + $"%FullResult".text = $"%EditResult".text + $"%ResultMenu".show() + $"%EditPanel".hide() + $"%EditResult".hide() + $"%EditMenu".hide() diff --git a/godot/main_screen.tscn b/godot/main_screen.tscn index 4a2d2d4..89d8624 100644 --- a/godot/main_screen.tscn +++ b/godot/main_screen.tscn @@ -1218,15 +1218,18 @@ grow_vertical = 2 theme_override_styles/panel = SubResource("1") [node name="MinuteBox" type="HBoxContainer" parent="StartScreen/InstructionPanel"] -layout_mode = 0 +layout_mode = 1 +anchors_preset = 8 anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -53.5 +offset_left = -51.5 offset_top = -159.0 -offset_right = 53.5 +offset_right = 55.5 offset_bottom = -119.0 +grow_horizontal = 2 +grow_vertical = 2 [node name="MinuteMinus" type="Button" parent="StartScreen/InstructionPanel/MinuteBox"] layout_mode = 2 @@ -1252,10 +1255,10 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -322.5 -offset_top = -203.0 -offset_right = 322.5 -offset_bottom = -169.0 +offset_left = -578.5 +offset_top = -202.5 +offset_right = 579.5 +offset_bottom = -168.5 grow_horizontal = 2 grow_vertical = 2 theme = ExtResource("1") @@ -1263,18 +1266,22 @@ text = "INSTR_OBS" horizontal_alignment = 1 [node name="ObservationItemsTitle" type="Label" parent="StartScreen/InstructionPanel"] -layout_mode = 0 +layout_mode = 1 +anchors_preset = 8 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 +offset_left = -578.5 +offset_top = -96.5 +offset_right = 579.5 +offset_bottom = -62.5 +grow_horizontal = 2 +grow_vertical = 2 theme = ExtResource("1") theme_override_fonts/font = SubResource("5") text = "OBS_ITEMS" +horizontal_alignment = 1 [node name="Title" type="Label" parent="StartScreen/InstructionPanel"] layout_mode = 1 @@ -1283,9 +1290,9 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -174.5 +offset_left = -578.5 offset_top = -248.5 -offset_right = 170.5 +offset_right = 579.5 offset_bottom = -216.5 grow_horizontal = 2 grow_vertical = 2 @@ -1362,6 +1369,24 @@ layout_mode = 2 theme = ExtResource("1") text = "EXP" +[node name="Empty" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] +unique_name_in_owner = true +layout_mode = 2 +theme = ExtResource("1") +text = " " + +[node name="Empty2" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] +unique_name_in_owner = true +layout_mode = 2 +theme = ExtResource("1") +text = " " + +[node name="Empty3" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] +unique_name_in_owner = true +layout_mode = 2 +theme = ExtResource("1") +text = " " + [node name="1Acronym" type="Label" parent="StartScreen/InstructionPanel/GridObservations"] unique_name_in_owner = true layout_mode = 2 @@ -1467,15 +1492,18 @@ offset_bottom = 359.0 theme_override_styles/panel = SubResource("1") [node name="NameContainer" type="VBoxContainer" parent="StartScreen/NameChangePanel"] -layout_mode = 0 +layout_mode = 1 +anchors_preset = 8 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_right = 383.0 offset_bottom = 237.0 +grow_horizontal = 2 +grow_vertical = 2 [node name="ObservedNameLabel" type="Label" parent="StartScreen/NameChangePanel/NameContainer"] unique_name_in_owner = true @@ -1649,6 +1677,7 @@ text = "UPD_TEXT2" [node name="EditScreen" type="CanvasLayer" parent="."] unique_name_in_owner = true +visible = false script = ExtResource("8") [node name="Panel" type="Panel" parent="EditScreen"] @@ -1983,11 +2012,16 @@ theme = ExtResource("1") text = "INT_REM" [node name="ProgressBar" type="ProgressBar" parent="ObservationWindow/Panel"] -layout_mode = 0 +layout_mode = 1 +anchors_preset = 12 anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -offset_top = -14.0 +offset_left = 119.0 +offset_top = -33.0 +offset_bottom = 2.0 +grow_horizontal = 2 +grow_vertical = 0 step = 1.0 script = ExtResource("11") @@ -2007,96 +2041,59 @@ anchor_bottom = 1.0 theme = ExtResource("1") theme_override_styles/panel = SubResource("8") -[node name="SaveReport" type="Button" parent="Results/Panel"] +[node name="ResultMenu" type="HBoxContainer" 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 -text = "BUT_SAVEPNG" +offset_left = 647.0 +offset_top = 644.0 +offset_right = 1189.0 +offset_bottom = 684.0 -[node name="BackMainMenu" type="Button" parent="Results/Panel"] +[node name="BackMainMenu" type="Button" parent="Results/Panel/ResultMenu"] unique_name_in_owner = true -layout_mode = 0 -offset_left = 32.0 -offset_top = 643.0 -offset_right = 176.0 -offset_bottom = 683.0 +layout_mode = 2 +size_flags_horizontal = 3 text = "BUT_RESTART" +[node name="EditReport" type="Button" parent="Results/Panel/ResultMenu"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 3 +text = "BUT_EDIT_RESULT" + +[node name="SaveReport" type="Button" parent="Results/Panel/ResultMenu"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 3 +text = "BUT_SAVEPNG" + [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_left = 137.0 +offset_top = 75.0 +offset_right = 1253.0 offset_bottom = 396.0 theme_override_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." - -[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 -size_flags_horizontal = 3 -step = 1.0 - -[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 -size_flags_horizontal = 3 -step = 1.0 - -[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 -size_flags_horizontal = 3 -step = 1.0 - -[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 -size_flags_horizontal = 3 -step = 1.0 - -[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 -size_flags_horizontal = 3 -step = 1.0 +autowrap_mode = 3 [node name="GridContainer" type="GridContainer" parent="Results/Panel"] -layout_mode = 0 +layout_mode = 1 +anchors_preset = 8 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 +offset_left = -457.0 +offset_top = 66.0 +offset_right = 547.0 +offset_bottom = 217.0 +grow_horizontal = 2 +grow_vertical = 2 +columns = 2 [node name="ObsTitle1" type="Label" parent="Results/Panel/GridContainer"] unique_name_in_owner = true @@ -2104,33 +2101,100 @@ layout_mode = 2 theme_override_fonts/font = SubResource("12") text = "Item1" +[node name="ObsBar1" type="ProgressBar" parent="Results/Panel/GridContainer"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 3 +step = 1.0 + [node name="ObsTitle2" type="Label" parent="Results/Panel/GridContainer"] unique_name_in_owner = true layout_mode = 2 theme_override_fonts/font = SubResource("12") text = "Item2" +[node name="ObsBar2" type="ProgressBar" parent="Results/Panel/GridContainer"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 3 +step = 1.0 + [node name="ObsTitle3" type="Label" parent="Results/Panel/GridContainer"] unique_name_in_owner = true layout_mode = 2 theme_override_fonts/font = SubResource("12") text = "Item3" +[node name="ObsBar3" type="ProgressBar" parent="Results/Panel/GridContainer"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 3 +step = 1.0 + [node name="ObsTitle4" type="Label" parent="Results/Panel/GridContainer"] unique_name_in_owner = true layout_mode = 2 theme_override_fonts/font = SubResource("12") text = "Item4" +[node name="ObsBar4" type="ProgressBar" parent="Results/Panel/GridContainer"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 3 +step = 1.0 + [node name="ObsTitle5" type="Label" parent="Results/Panel/GridContainer"] unique_name_in_owner = true layout_mode = 2 theme_override_fonts/font = SubResource("12") text = "Item5" -[node name="TopMenuBar" type="CanvasLayer" parent="."] +[node name="ObsBar5" type="ProgressBar" parent="Results/Panel/GridContainer"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 3 +step = 1.0 -[node name="VBoxContainer" type="VBoxContainer" parent="TopMenuBar"] +[node name="EditPanel" type="Panel" parent="Results/Panel"] +unique_name_in_owner = true +visible = false +offset_left = 126.0 +offset_top = 68.0 +offset_right = 1260.0 +offset_bottom = 620.0 + +[node name="EditResult" type="TextEdit" parent="Results/Panel"] +unique_name_in_owner = true +visible = false +offset_left = 136.0 +offset_top = 81.0 +offset_right = 1248.0 +offset_bottom = 608.0 +wrap_mode = 1 + +[node name="EditMenu" type="HBoxContainer" parent="Results/Panel"] +unique_name_in_owner = true +visible = false +layout_mode = 0 +offset_left = 873.0 +offset_top = 626.0 +offset_right = 1264.0 +offset_bottom = 669.0 + +[node name="CancelEdit" type="Button" parent="Results/Panel/EditMenu"] +layout_mode = 2 +size_flags_horizontal = 3 +text = "BUT_CANCEL_EDIT" + +[node name="SaveEdit" type="Button" parent="Results/Panel/EditMenu"] +layout_mode = 2 +size_flags_horizontal = 3 +text = "BUT_SAVE_EDIT" + +[node name="TopMenuBar" type="CanvasLayer" parent="."] +unique_name_in_owner = true + +[node name="Topbar" type="VBoxContainer" parent="TopMenuBar"] custom_minimum_size = Vector2(0, 60) anchors_preset = 10 anchor_right = 1.0 @@ -2138,12 +2202,25 @@ offset_bottom = 60.0 grow_horizontal = 2 size_flags_horizontal = 3 -[node name="Panel" type="Panel" parent="TopMenuBar/VBoxContainer"] +[node name="Panel" type="Panel" parent="TopMenuBar/Topbar"] layout_mode = 2 size_flags_vertical = 3 theme_override_styles/panel = SubResource("StyleBoxFlat_lu4qr") -[node name="HBoxContainer" type="HBoxContainer" parent="TopMenuBar"] +[node name="TopOverview" type="Label" parent="TopMenuBar/Topbar/Panel"] +unique_name_in_owner = true +visible = false +layout_mode = 2 +offset_left = 120.0 +offset_top = 10.0 +offset_right = 1263.0 +offset_bottom = 53.0 +theme_override_colors/font_color = Color(0, 0, 0, 1) +text = "Time Sampling Observation of XXX, observed by XXX during XXX." +horizontal_alignment = 1 +autowrap_mode = 3 + +[node name="Sidebar" type="HBoxContainer" parent="TopMenuBar"] anchors_preset = 9 anchor_bottom = 1.0 offset_top = 60.0 @@ -2151,30 +2228,30 @@ offset_right = 120.0 grow_vertical = 2 size_flags_vertical = 3 -[node name="Panel" type="Panel" parent="TopMenuBar/HBoxContainer"] +[node name="Panel" type="Panel" parent="TopMenuBar/Sidebar"] layout_mode = 2 size_flags_horizontal = 3 theme_override_styles/panel = SubResource("StyleBoxFlat_e43b2") -[node name="VBoxContainer" type="VBoxContainer" parent="TopMenuBar/HBoxContainer/Panel"] +[node name="VBoxContainer" type="VBoxContainer" parent="TopMenuBar/Sidebar/Panel"] layout_mode = 0 offset_right = 120.0 offset_bottom = 660.0 theme_override_constants/separation = 0 -[node name="OneInstrPanel" type="Panel" parent="TopMenuBar/HBoxContainer/Panel/VBoxContainer"] +[node name="OneInstrPanel" type="Panel" parent="TopMenuBar/Sidebar/Panel/VBoxContainer"] unique_name_in_owner = true custom_minimum_size = Vector2(120, 120) layout_mode = 2 size_flags_vertical = 3 theme_override_styles/panel = SubResource("StyleBoxFlat_musqq") -[node name="Noun-manual-241665" type="Sprite2D" parent="TopMenuBar/HBoxContainer/Panel/VBoxContainer/OneInstrPanel"] +[node name="Noun-manual-241665" type="Sprite2D" parent="TopMenuBar/Sidebar/Panel/VBoxContainer/OneInstrPanel"] position = Vector2(59, 58) scale = Vector2(0.04, 0.04) texture = ExtResource("12_p3r6q") -[node name="Instructions" type="Label" parent="TopMenuBar/HBoxContainer/Panel/VBoxContainer/OneInstrPanel"] +[node name="Instructions" type="Label" parent="TopMenuBar/Sidebar/Panel/VBoxContainer/OneInstrPanel"] layout_mode = 1 anchors_preset = 7 anchor_left = 0.5 @@ -2193,19 +2270,19 @@ theme_override_font_sizes/font_size = 14 text = "LAB_INSTR" horizontal_alignment = 1 -[node name="TwoNamesPanel" type="Panel" parent="TopMenuBar/HBoxContainer/Panel/VBoxContainer"] +[node name="TwoNamesPanel" type="Panel" parent="TopMenuBar/Sidebar/Panel/VBoxContainer"] unique_name_in_owner = true custom_minimum_size = Vector2(0, 120) layout_mode = 2 size_flags_vertical = 3 theme_override_styles/panel = SubResource("StyleBoxFlat_musqq") -[node name="Noun-input-field-104354" type="Sprite2D" parent="TopMenuBar/HBoxContainer/Panel/VBoxContainer/TwoNamesPanel"] +[node name="Noun-input-field-104354" type="Sprite2D" parent="TopMenuBar/Sidebar/Panel/VBoxContainer/TwoNamesPanel"] position = Vector2(60, 59) scale = Vector2(0.04, 0.04) texture = ExtResource("12_vtqql") -[node name="Names" type="Label" parent="TopMenuBar/HBoxContainer/Panel/VBoxContainer/TwoNamesPanel"] +[node name="Names" type="Label" parent="TopMenuBar/Sidebar/Panel/VBoxContainer/TwoNamesPanel"] layout_mode = 1 anchors_preset = 7 anchor_left = 0.5 @@ -2224,19 +2301,19 @@ theme_override_font_sizes/font_size = 14 text = "LAB_NAMES" horizontal_alignment = 1 -[node name="ThreeConfigPanel" type="Panel" parent="TopMenuBar/HBoxContainer/Panel/VBoxContainer"] +[node name="ThreeConfigPanel" type="Panel" parent="TopMenuBar/Sidebar/Panel/VBoxContainer"] unique_name_in_owner = true custom_minimum_size = Vector2(0, 120) layout_mode = 2 size_flags_vertical = 3 theme_override_styles/panel = SubResource("StyleBoxFlat_musqq") -[node name="Noun-settings-56313" type="Sprite2D" parent="TopMenuBar/HBoxContainer/Panel/VBoxContainer/ThreeConfigPanel"] +[node name="Noun-settings-56313" type="Sprite2D" parent="TopMenuBar/Sidebar/Panel/VBoxContainer/ThreeConfigPanel"] position = Vector2(59, 60) scale = Vector2(0.04, 0.04) texture = ExtResource("14_3qsiq") -[node name="Configure" type="Label" parent="TopMenuBar/HBoxContainer/Panel/VBoxContainer/ThreeConfigPanel"] +[node name="Configure" type="Label" parent="TopMenuBar/Sidebar/Panel/VBoxContainer/ThreeConfigPanel"] layout_mode = 1 anchors_preset = 7 anchor_left = 0.5 @@ -2255,19 +2332,19 @@ theme_override_font_sizes/font_size = 14 text = "LAB_CONFIG" horizontal_alignment = 1 -[node name="FourObservePanel" type="Panel" parent="TopMenuBar/HBoxContainer/Panel/VBoxContainer"] +[node name="FourObservePanel" type="Panel" parent="TopMenuBar/Sidebar/Panel/VBoxContainer"] unique_name_in_owner = true custom_minimum_size = Vector2(0, 120) layout_mode = 2 size_flags_vertical = 3 theme_override_styles/panel = SubResource("StyleBoxFlat_musqq") -[node name="Noun-glasses-56317" type="Sprite2D" parent="TopMenuBar/HBoxContainer/Panel/VBoxContainer/FourObservePanel"] +[node name="Noun-glasses-56317" type="Sprite2D" parent="TopMenuBar/Sidebar/Panel/VBoxContainer/FourObservePanel"] position = Vector2(59, 56) scale = Vector2(0.04, 0.04) texture = ExtResource("15_7087c") -[node name="Observe" type="Label" parent="TopMenuBar/HBoxContainer/Panel/VBoxContainer/FourObservePanel"] +[node name="Observe" type="Label" parent="TopMenuBar/Sidebar/Panel/VBoxContainer/FourObservePanel"] layout_mode = 1 anchors_preset = 7 anchor_left = 0.5 @@ -2286,19 +2363,19 @@ theme_override_font_sizes/font_size = 14 text = "LAB_OBS" horizontal_alignment = 1 -[node name="FiveResultsPanel" type="Panel" parent="TopMenuBar/HBoxContainer/Panel/VBoxContainer"] +[node name="FiveResultsPanel" type="Panel" parent="TopMenuBar/Sidebar/Panel/VBoxContainer"] unique_name_in_owner = true custom_minimum_size = Vector2(0, 120) layout_mode = 2 size_flags_vertical = 3 theme_override_styles/panel = SubResource("StyleBoxFlat_musqq") -[node name="Noun-file-59659" type="Sprite2D" parent="TopMenuBar/HBoxContainer/Panel/VBoxContainer/FiveResultsPanel"] +[node name="Noun-file-59659" type="Sprite2D" parent="TopMenuBar/Sidebar/Panel/VBoxContainer/FiveResultsPanel"] position = Vector2(60, 56) scale = Vector2(0.04, 0.04) texture = ExtResource("16_do8p6") -[node name="Results" type="Label" parent="TopMenuBar/HBoxContainer/Panel/VBoxContainer/FiveResultsPanel"] +[node name="Results" type="Label" parent="TopMenuBar/Sidebar/Panel/VBoxContainer/FiveResultsPanel"] layout_mode = 1 anchors_preset = 7 anchor_left = 0.5 @@ -2321,6 +2398,7 @@ horizontal_alignment = 1 [connection signal="request_completed" from="HTTPRequest2" to="." method="_on_HTTPRequest2_request_completed"] [connection signal="button_down" from="StartScreen/InstructionPanel/MinuteBox/MinuteMinus" to="." method="_on_MinuteMinus_button_down"] [connection signal="pressed" from="StartScreen/InstructionPanel/MinuteBox/MinuteMinus" to="." method="_on_MinuteMinus_pressed"] +[connection signal="button_down" from="StartScreen/InstructionPanel/MinuteBox/MinutePlus" to="." method="_on_minute_plus_button_down"] [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/ChangeItems" to="." method="_on_ChangeItems_pressed"] @@ -2341,5 +2419,8 @@ horizontal_alignment = 1 [connection signal="pressed" from="ObservationWindow/Panel/Button" to="ObservationWindow" method="_on_Button_pressed"] [connection signal="timeout" from="ObservationWindow/TwentySecondTimer" to="ObservationWindow" method="_on_TwentySecondTimer_timeout"] [connection signal="visibility_changed" from="Results" to="Results" method="_on_Results_visibility_changed"] -[connection signal="pressed" from="Results/Panel/SaveReport" to="Results" method="_on_SaveReport_pressed"] -[connection signal="pressed" from="Results/Panel/BackMainMenu" to="Results" method="_on_BackMainMenu_pressed"] +[connection signal="pressed" from="Results/Panel/ResultMenu/BackMainMenu" to="Results" method="_on_BackMainMenu_pressed"] +[connection signal="pressed" from="Results/Panel/ResultMenu/EditReport" to="." method="_on_edit_report_pressed"] +[connection signal="pressed" from="Results/Panel/ResultMenu/SaveReport" to="Results" method="_on_SaveReport_pressed"] +[connection signal="pressed" from="Results/Panel/EditMenu/CancelEdit" to="." method="_on_cancel_edit_pressed"] +[connection signal="pressed" from="Results/Panel/EditMenu/SaveEdit" to="." method="_on_save_edit_pressed"] diff --git a/godot/translation.csv b/godot/translation.csv index 0e8e29c..db85575 100644 --- a/godot/translation.csv +++ b/godot/translation.csv @@ -1,6 +1,6 @@ keys,en,nl -INSTRUC,"The [b]Time Sampling Form[/b] is a guided observation tool. You set the length of your observation in minutes. Every 20 seconds, you click the button that corresponds with the behaviour you observe at that time. \n\nThe buttons to select the observed behaviour will be visible in the final 5 seconds of each 20 second interval. \n\nFor first time users: It is recommended to do a one-minute trial to gain familiarity with the system. I hope you find this tool useful!","Het [b]Tijdsteekproef Formulier[/b]." -TITLE,"Time Sampling Form","Tijdsteekproef Formulier" +INSTRUC,"The [b]Time Sampling Form[/b] is a guided observation tool. You set the length of your observation in minutes. Every 20 seconds, you click the button that corresponds with the behaviour you observe at that time. \n\nThe buttons to select the observed behaviour will be visible in the final 5 seconds of each 20 second interval. \n\nFor first time users: It is recommended to do a one-minute trial to gain familiarity with the system. I hope you find this tool useful!",Het [b]Tijdsteekproef Formulier[/b]. +TITLE,Time Sampling Form,Tijdsteekproef Formulier WHO,Who are you observing? (First name),Wie COMPLETE,You must complete all fields below!,Compleet YOU,What is your name?,Jij bent @@ -13,7 +13,10 @@ EXP,Explanation,x BUT_MAN,Manual,x BUT_EDIT_ITM,Edit Items,x BUT_EDIT_NM,Edit Names,x +BUT_EDIT_RESULT,Edit Report,x BUT_STRT,Start,x +BUT_CANCEL_EDIT,Cancel,x +BUT_SAVE_EDIT,Save,x UPD_TITLE,An Update is available!,x UPD_TEXT,You are currently using version XX. The latest version available is XX. Version changes are:,x UPD_TEXT2,text,x