godot/global_ints.gd

@@ -1,7 +1,7 @@
 extends Node
 
-var date = {}
+var date
-var ddmmyyyy : String
+var ddmmyyyy
 
 var update_text : String
 
@@ -30,26 +30,26 @@ var locked_observation_intervals : int
 var locked_observations_intervals_remaining : int
 var locked_observations_completed : int
 
-var one_acronym : String = "OnT"
+var one_acronym = "OnT"
-var two_acronym : String = "Loo"
+var two_acronym = "Loo"
-var three_acronym : String = "Dis"
+var three_acronym = "Dis"
-var four_acronym : String = "Wal"
+var four_acronym = "Wal"
-var five_acronym : String = "Oth"
+var five_acronym = "Oth"
-var six_acronym : String = "Emp"
+var six_acronym = "Emp"
 
-var one_behaviour : String = "On Task"
+var one_behaviour = "On Task"
-var two_behaviour : String = "Looking"
+var two_behaviour = "Looking"
-var three_behaviour : String = "Distracting"
+var three_behaviour = "Distracting"
-var four_behaviour : String = "Walking"
+var four_behaviour = "Walking"
-var five_behaviour : String = "Other"
+var five_behaviour = "Other"
-var six_behaviour : String = "Empty"
+var six_behaviour = "Empty"
 
-var one_explanation : String = "The pupil is on task"
+var one_explanation = "The pupil is on task"
-var two_explanation : String = "The pupil is looking around in a distracted manner or is staring into the distance"
+var two_explanation = "The pupil is looking around in a distracted manner or is staring into the distance"
-var three_explanation : String = "The pupil is distracting other pupils or talking to them"
+var three_explanation = "The pupil is distracting other pupils or talking to them"
-var four_explanation : String = "The pupil is walking through the class"
+var four_explanation = "The pupil is walking through the class"
-var five_explanation : String = "The pupil is otherwise distracted and not on task"
+var five_explanation = "The pupil is otherwise distracted and not on task"
-var six_explanation : String = "No answer was selected for this round"
+var six_explanation = "No answer was selected for this round"
 
 var total_behaviours : int
 var one_behaviour_score : int

godot/main_screen.gd

@@ -1,8 +1,12 @@
 extends CanvasLayer
 
+const RATIO = 720.0 / 1280.0
 
+var date_time
 var check_time_var : int
-var csv_url = "https://raw.githubusercontent.com/hobbesjaap/time-sampling-form/main/updater/version_info.csv"
+var ddmmyyyy : String
+var date
+var csv_url = "https://raw.githubusercontent.com/hobbesjaap/time-sampling-form/main/version_info.csv"
 var update_text_url = "https://raw.githubusercontent.com/hobbesjaap/time-sampling-form/main/updater/update_text.md"
 var update_text : String
 var text_buffer : String
@@ -12,15 +16,27 @@ var text_buffer : String
 @onready var minute_label = $"StartScreen/InstructionPanel/MinuteBox/MinuteLabel"
 
 
-func check_for_updates() -> void:
+#func set_window_aspect_ratio():
+#	OS.window_size = Vector2(OS.window_size.x, OS.window_size.x * RATIO)
+#	var screen_size = DisplayServer.screen_get_size()
+#	var window = get_editor_interface().get_window()
+#	window.mode = Window.MODE_WINDOWED
+#	window.position = Vector2i(-8, 0)
+#	window.size = Vector2i(screen_size.x - 66, screen_size.y - 1)
+
+
+func check_for_updates():
 	var os_list : Array = ["Linux", "Windows", "macOS", "OSX"]
-	if os_list.has(OS.get_name()):
+	var os_check : String
+	os_check = OS.get_name()
+	print(os_check)
+	if os_list.has(os_check):
 		print("We're on desktop. So let's check for updates!")
 		$"%HTTPRequest".request(csv_url)
 		$"%HTTPRequest2".request(update_text_url)
 
 
-func _on_HTTPRequest_request_completed(_result, _response_code, _headers, body) -> void:
+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()
@@ -34,14 +50,14 @@ func _on_HTTPRequest_request_completed(_result, _response_code, _headers, body)
 		print("No update available!")
 
 
-func _on_HTTPRequest2_request_completed(_result, _response_code, _headers, body) -> void:
+func _on_HTTPRequest2_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()
 	global_ints.update_text = json
 
 
-func refresh_descriptors() -> void:
+func refresh_descriptors():
 	$"%1Acronym".text = global_ints.one_acronym
 	$"%1AcronymE".text = $"%1Acronym".text
 	$"%2Acronym".text = global_ints.two_acronym
@@ -74,8 +90,7 @@ func refresh_descriptors() -> void:
 	$"%5ExplanationE".text = $"%5Explanation".text
 
 
-func set_language() -> void:
+func set_manual_url():
-	print(TranslationServer.get_locale())
 	if TranslationServer.get_locale() != "nl":
 		print("We're not Dutch")
 		global_ints.manual_url = "https://docs.internationalsengroup.org/tsf.html"
@@ -84,11 +99,7 @@ func set_language() -> void:
 		global_ints.manual_url = "https://www.lerenleukermaken.nl/"
 
 
-func update_date() -> void:
+func _ready():
-	global_ints.date = Time.get_datetime_dict_from_system()
-	global_ints.ddmmyyyy = str(global_ints.date.day, "-", global_ints.date.month, "-", global_ints.date.year)
-
-func _ready() -> void:
 	DisplayServer.window_set_min_size(Vector2i(1280, 720))
 	minute_label.text = str(global_ints.observation_minutes)
 	global_ints.observed_person_name = ""
@@ -101,45 +112,50 @@ func _ready() -> void:
 	$"Results".visible = false
 	$"EditScreen".visible = false
 	$"%UpdatePanel".visible = false
-	update_date()
+	set_manual_url()
-	set_language()
+	print(TranslationServer.get_locale())
+	
+	global_ints.date = Time.get_datetime_dict_from_system()
+	global_ints.ddmmyyyy = str(global_ints.date.day, "-", global_ints.date.month, "-", global_ints.date.year)
+	
 	check_for_updates()
 
 
-func _process(_delta) -> void:
+func _process(_delta):
 	check_time_var += 1
 	
 	if check_time_var == 10:
 		check_time_var = 0
-		if global_ints.date.minute < 10:
+		date_time = Time.get_datetime_dict_from_system()
-			date_time_display.text = str(global_ints.date.hour, ":0", global_ints.date.minute)
+		if date_time.minute < 10:
-		if global_ints.date.minute >= 10:
+			date_time_display.text = str(date_time.hour, ":0", date_time.minute)
-			date_time_display.text = str(global_ints.date.hour, ":", global_ints.date.minute)
+		if date_time.minute >= 10:
+			date_time_display.text = str(date_time.hour, ":", date_time.minute)
 
 
-func _on_MinuteMinus_pressed() -> void:
+func _on_MinuteMinus_pressed():
 	if global_ints.observation_minutes >= 2:
 		global_ints.observation_minutes -= 1
 		minute_label.text = str(global_ints.observation_minutes)
 
 
-func _on_MinutePlus_pressed() -> void:
+func _on_MinutePlus_pressed():
 	if global_ints.observation_minutes < 60:
 		global_ints.observation_minutes += 1
 		minute_label.text = str(global_ints.observation_minutes)
 
 
-func _on_Manual_pressed() -> void:
+func _on_Manual_pressed():
 	var _error = OS.shell_open(global_ints.manual_url)
 
 
-func _on_PupilName_pressed() -> void:
+func _on_PupilName_pressed():
 	$"%NameLine".text = global_ints.observed_person_name
 	$"%InstructionPanel".visible = false
 	$"%NameChangePanel".visible = true
 
 
-func _on_Start_pressed() -> void:
+func _on_Start_pressed():
 	$"StartScreen".visible = false
 	refresh_descriptors()
 	$"ObservationWindow".visible = true
@@ -175,24 +191,24 @@ func _on_Start_pressed() -> void:
 	$"%TwentySecondTimer".start(global_ints.timer_duration)
 
 
-func _on_ChangeItems_pressed() -> void:
+func _on_ChangeItems_pressed():
 	$"EditScreen".visible = true
 
 
-func _on_InsOkButton_pressed() -> void:
+func _on_InsOkButton_pressed():
 	$"%InstructionScreen".visible = false
 
 
-func _on_MinuteMinus_button_down() -> void:
+func _on_MinuteMinus_button_down():
 #	if global_ints.observation_minutes >= 2:
 #		global_ints.observation_minutes -= 1
 #		minute_label.text = str(global_ints.observation_minutes)
 	pass
 
 
-func _on_GoToUpdate_pressed() -> void:
+func _on_GoToUpdate_pressed():
 	var _error = OS.shell_open("https://github.com/hobbesjaap/time-sampling-form/releases")
 
 
-func _on_IgnoreUpdate_pressed() -> void:
+func _on_IgnoreUpdate_pressed():
 	$"%UpdatePanel".visible = false

godot/project.godot

@@ -55,7 +55,6 @@ common/enable_pause_aware_picking=true
 [rendering]
 
 renderer/rendering_method="mobile"
-textures/vram_compression/import_etc2_astc=true
 quality/intended_usage/framebuffer_allocation=0
 quality/intended_usage/framebuffer_allocation.mobile=0
 2d/snapping/use_gpu_pixel_snap=true