jaap/education-apps
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects 1 Releases Wiki Activity

updated podbooker UI

Browse Source
This commit is contained in:
Jaap Marsman 2023-05-10 12:09:13 +08:00
parent cb0ec1761f
commit b4b522c407
4 changed files with 82 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

3
podbooker/BookingScreen.gd
View File

@ -18,6 +18,7 @@ extends CanvasLayer
@onready var name4 = $"%Name4" @onready var name4 = $"%Name4"
@onready var form4 = $"%Form4" @onready var form4 = $"%Form4"
@onready var reason = $"%ReasonField" @onready var reason = $"%ReasonField"
@onready var book_pw = $"%BookPw"
func _clear_form(): func _clear_form():
@ -30,6 +31,7 @@ func _clear_form():
form3.text = "" form3.text = ""
form4.text = "" form4.text = ""
reason.text = "" reason.text = ""
book_pw.text = ""
func restore_names_to_four(): func restore_names_to_four():
@ -70,6 +72,7 @@ func _on_ClearButton_pressed():
var namer = "/root/MainStartScreen/ButtonGrid/" + important_vars.pod + "L" + str(important_vars.time) var namer = "/root/MainStartScreen/ButtonGrid/" + important_vars.pod + "L" + str(important_vars.time)
var sp = get_node(str(namer)) var sp = get_node(str(namer))
sp.text = "" sp.text = ""
if $"%BookPw".text == "WhoIsJaap":
_clear_form() _clear_form()
_book_it() _book_it()
_on_CancelButton_pressed() _on_CancelButton_pressed()

7
podbooker/ButtonScript.gd
View File

@ -107,7 +107,12 @@ func book_button_pressed(pod_name, lesson):
# settings_button.visible = false # settings_button.visible = false
if name1.text != "": if name1.text != "":
clear_button.visible = true clear_button.visible = true
$"%ClearBookPw".visible = true
$"%BookPw".visible = true
if name1.text == "":
clear_button.visible = false
$"%ClearBookPw".visible = false
$"%BookPw".visible = false
func _on_A1L1_pressed(): func _on_A1L1_pressed():
book_button_pressed("A1", 1) book_button_pressed("A1", 1)

84
podbooker/MainStartScreen.tscn
View File

@ -1169,41 +1169,77 @@ text = "[u]Lesson 1[/u]
fit_content = true fit_content = true
scroll_active = false scroll_active = false
[node name="Lesson 2" type="Label" parent="LessonGrid"] [node name="Lesson 2" type="RichTextLabel" parent="LessonGrid"]
custom_minimum_size = Vector2(90, 2.08165e-12)
layout_mode = 2 layout_mode = 2
size_flags_vertical = 6 size_flags_vertical = 6
text = "Lesson 2" theme_override_colors/default_color = Color(0, 0, 0, 1)
bbcode_enabled = true
text = "[u]Lesson 2[/u]
[color=gray]9.00-9.50[/color]"
fit_content = true
scroll_active = false
[node name="Lesson 3" type="Label" parent="LessonGrid"] [node name="Lesson 3" type="RichTextLabel" parent="LessonGrid"]
layout_mode = 2 layout_mode = 2
size_flags_vertical = 6 size_flags_vertical = 6
text = "Lesson 3" theme_override_colors/default_color = Color(0, 0, 0, 1)
bbcode_enabled = true
text = "[u]Lesson 3[/u]
[color=gray]10.10-11.00[/color]"
fit_content = true
scroll_active = false
[node name="Lesson 4" type="Label" parent="LessonGrid"] [node name="Lesson 4" type="RichTextLabel" parent="LessonGrid"]
layout_mode = 2 layout_mode = 2
size_flags_vertical = 6 size_flags_vertical = 6
text = "Lesson 4" theme_override_colors/default_color = Color(0, 0, 0, 1)
bbcode_enabled = true
text = "[u]Lesson 4[/u]
[color=gray]11.00-11.50[/color]"
fit_content = true
scroll_active = false
[node name="Lesson 5" type="Label" parent="LessonGrid"] [node name="Lesson 5" type="RichTextLabel" parent="LessonGrid"]
layout_mode = 2 layout_mode = 2
size_flags_vertical = 6 size_flags_vertical = 6
text = "Lesson 5" theme_override_colors/default_color = Color(0, 0, 0, 1)
bbcode_enabled = true
text = "[u]Lesson 5[/u]
[color=gray]11.50-12.40[/color]"
fit_content = true
scroll_active = false
[node name="Lesson8" type="Label" parent="LessonGrid"] [node name="Lesson8" type="RichTextLabel" parent="LessonGrid"]
unique_name_in_owner = true unique_name_in_owner = true
layout_mode = 2 layout_mode = 2
size_flags_vertical = 6 size_flags_vertical = 6
text = "Lunch" theme_override_colors/default_color = Color(0, 0, 0, 1)
bbcode_enabled = true
text = "[u]Lunch[/u]
[color=gray]12.40-13.30[/color]"
fit_content = true
scroll_active = false
[node name="Lesson 6" type="Label" parent="LessonGrid"] [node name="Lesson 6" type="RichTextLabel" parent="LessonGrid"]
layout_mode = 2 layout_mode = 2
size_flags_vertical = 6 size_flags_vertical = 6
text = "Lesson 6" theme_override_colors/default_color = Color(0, 0, 0, 1)
bbcode_enabled = true
text = "[u]Lesson 6[/u]
[color=gray]13.30-14.20[/color]"
fit_content = true
scroll_active = false
[node name="Lesson 7" type="Label" parent="LessonGrid"] [node name="Lesson 7" type="RichTextLabel" parent="LessonGrid"]
layout_mode = 2 layout_mode = 2
size_flags_vertical = 6 size_flags_vertical = 6
text = "Lesson 7" theme_override_colors/default_color = Color(0, 0, 0, 1)
bbcode_enabled = true
text = "[u]Lesson 7[/u]
[color=gray]14.20-15.10[/color]"
fit_content = true
scroll_active = false
[node name="SettingsButton" type="TextureButton" parent="."] [node name="SettingsButton" type="TextureButton" parent="."]
unique_name_in_owner = true unique_name_in_owner = true
@ -1453,6 +1489,26 @@ layout_mode = 2
size_flags_horizontal = 3 size_flags_horizontal = 3
text = "Clear Booking" text = "Clear Booking"
[node name="PwArea" type="HBoxContainer" parent="BookingScreen"]
offset_left = 389.0
offset_top = 539.0
offset_right = 765.0
offset_bottom = 579.0
[node name="ClearBookPw" type="Label" parent="BookingScreen/PwArea"]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 3
theme_override_colors/font_color = Color(0, 0, 0, 1)
text = "Clear Booking Password:"
[node name="BookPw" type="LineEdit" parent="BookingScreen/PwArea"]
unique_name_in_owner = true
layout_mode = 2
size_flags_horizontal = 3
secret = true
expand_to_text_length = true
[node name="bookings" type="Node" parent="."] [node name="bookings" type="Node" parent="."]
unique_name_in_owner = true unique_name_in_owner = true
script = ExtResource("8") script = ExtResource("8")