vincent.p.mercier/Kalulu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean warnings

Browse Source
This commit is contained in:
Adrien Ufferte
2025-06-14 17:54:32 +02:00
parent aba76ad461
commit 53f97425ee
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/language_tool/lesson_container.gd
+8 -7
View File
@@ -1,16 +1,17 @@
# TODO CLEAN WARNINGS
extends MarginContainer
class_name LessonContainer
var gp_label_scene: = preload("res://sources/language_tool/lesson_gp_label.tscn")
var gp_label_scene: PackedScene = preload("res://sources/language_tool/lesson_gp_label.tscn")
signal lesson_dropped(before: bool, number: int, dropped_number: int)
var number: = 0:
var number: int = 0:
set = set_number
@onready var gp_container: = $%GPContainer
@onready var number_label: = $%NumberLabel
@onready var gp_container: HBoxContainer = $%GPContainer
@onready var number_label: Label = $%NumberLabel
func set_number(p_number: int) -> void:
@@ -20,7 +21,7 @@ func set_number(p_number: int) -> void:
func add_gp(new_gp: Dictionary) -> void:
var gp_label: = gp_label_scene.instantiate()
var gp_label: LessonGPLabel = gp_label_scene.instantiate()
gp_label.grapheme = new_gp.grapheme
gp_label.phoneme = new_gp.phoneme
gp_label.gp_id = new_gp.gp_id
@@ -29,13 +30,13 @@ func add_gp(new_gp: Dictionary) -> void:
func _on_gp_dropped(before: bool, data: Dictionary, gp_label: Control) -> void:
var new_gp_label: = gp_label_scene.instantiate()
var new_gp_label: LessonGPLabel = gp_label_scene.instantiate()
new_gp_label.grapheme = data.grapheme
new_gp_label.phoneme = data.phoneme
new_gp_label.gp_id = data.gp_id
new_gp_label.gp_dropped.connect(_on_gp_dropped.bind(new_gp_label))
gp_container.add_child(new_gp_label)
var children: = gp_container.get_children()
var children: Array[Node] = gp_container.get_children()
for index: int in children.size():
var child = children[index]
if child == gp_label:
sources/language_tool/lessons_list.gd
+10 -10
View File
@@ -7,7 +7,7 @@ extends Control
var lesson_container_scene: PackedScene = preload("res://sources/language_tool/lesson_container.tscn")
var gp_label_scene: PackedScene = preload("res://sources/language_tool/lesson_gp_label.tscn")
var lessons: Dictionary = {}
var lessons: Dictionary[int, LessonContainer] = {}
func _ready() -> void:
@@ -44,7 +44,7 @@ func _on_plus_button_pressed() -> void:
lessons_container.add_child(lesson_container)
lesson_container.lesson_dropped.connect(_on_lesson_dropped)
var max_nb: int = -1
for element in lessons.values():
for element: LessonContainer in lessons.values():
max_nb = max(max_nb, element.number)
lesson_container.number = max_nb + 1
lessons[max_nb + 1] = lesson_container
@@ -70,15 +70,15 @@ func _on_gp_dropped(_before: bool, data: Dictionary) -> void:
func _on_lesson_dropped(before: bool, number: int, dropped_number: int) -> void:
var dropped_lesson = lessons[dropped_number]
var where_lesson = lessons[number]
var dropped_lesson: LessonContainer = lessons[dropped_number]
var where_lesson: LessonContainer = lessons[number]
var index: int = where_lesson.get_index()
if not before:
index += 1
lessons_container.move_child(dropped_lesson, index)
var children: = lessons_container.get_children()
for ind in children.size():
var child: = children[ind]
var children: Array[Node] = lessons_container.get_children()
for ind: int in children.size():
var child: LessonContainer = children[ind]
child.number = ind + 1
lessons[child.number] = child
@@ -87,9 +87,9 @@ func _on_save_button_pressed() -> void:
Database.db.query("DELETE FROM GPsInLessons")
var children: Array[Node] = lessons_container.get_children()
for index: int in children.size():
var child: = children[index]
var child: LessonContainer = children[index]
Database.db.query_with_bindings("SELECT * FROM Lessons WHERE LessonNb = ?", [index + 1])
var lesson_id: = -1
var lesson_id: int = -1
if Database.db.query_result.is_empty():
Database.db.insert_row("Lessons",
{
@@ -99,7 +99,7 @@ func _on_save_button_pressed() -> void:
else:
lesson_id = Database.db.query_result[0].ID
for gp_id in child.get_gp_ids():
for gp_id: int in child.get_gp_ids():
Database.db.insert_row("GPsInLessons",
{
GPID = gp_id,