diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..886e28e Binary files /dev/null and b/.DS_Store differ diff --git a/podbooker/BookPanel.gd b/podbooker/BookPanel.gd new file mode 100644 index 0000000..f4d47f8 --- /dev/null +++ b/podbooker/BookPanel.gd @@ -0,0 +1,16 @@ +extends Panel + + +var style = StyleBoxFlat.new() + +func _ready(): + # The Panel doc tells you which style names there are + add_style_override("panel", style) + set_process(true) + +func _process(delta): + # Some basic code animation + var color = Color(0.5*sin(OS.get_ticks_msec()/100.0)+0.5, 0, 0) + style.set_bg_color(color) + # Don't forget to update so the control will redraw + update() diff --git a/podbooker/BookingScreen.gd b/podbooker/BookingScreen.gd index 116740d..b9fca7d 100644 --- a/podbooker/BookingScreen.gd +++ b/podbooker/BookingScreen.gd @@ -1,4 +1,4 @@ -extends Panel +extends CanvasLayer @onready var booking_screen = $"%BookingScreen" diff --git a/podbooker/ButtonScript.gd b/podbooker/ButtonScript.gd index c43ab32..bf86d48 100644 --- a/podbooker/ButtonScript.gd +++ b/podbooker/ButtonScript.gd @@ -26,7 +26,26 @@ extends GridContainer func _ready(): - pass # Replace with function body. + pass + + +func topbar_color(): + if important_vars.pod == "A1": + $"%BookTopBar".color = Color.html("#baa7c2") + if important_vars.pod == "A2": + $"%BookTopBar".color = Color.html("#e5c67a") + if important_vars.pod == "B1": + $"%BookTopBar".color = Color.html("#3b719c") + if important_vars.pod == "B2": + $"%BookTopBar".color = Color.html("#3b719c") + if important_vars.pod == "C": + $"%BookTopBar".color = Color.html("#baa7c2") + if important_vars.pod == "D": + $"%BookTopBar".color = Color.html("#aec48c") + if important_vars.pod == "E": + $"%BookTopBar".color = Color.html("#6dc1f0") + if important_vars.pod == "F": + $"%BookTopBar".color = Color.html("#e5c67a") func set_booking_screen_values(): @@ -35,7 +54,7 @@ func set_booking_screen_values(): if important_vars.time == 8: lesson_name.text = "Lunch Time" day_name.text = "Today is " + times.dayofweek_word - + topbar_color() booking_vars.read_values() if name1.text != "": book_button.text = "Save Changed Booking" @@ -84,8 +103,8 @@ func book_button_pressed(pod_name, lesson): drop_names_to_two() booking_screen.visible = true - lesson_grid.visible = false - settings_button.visible = false +# lesson_grid.visible = false +# settings_button.visible = false if name1.text != "": clear_button.visible = true diff --git a/podbooker/MainStartScreen.tscn b/podbooker/MainStartScreen.tscn index ad7cc53..0a52eeb 100644 --- a/podbooker/MainStartScreen.tscn +++ b/podbooker/MainStartScreen.tscn @@ -1,16 +1,48 @@ -[gd_scene load_steps=11 format=3 uid="uid://cntv32f7abpkp"] +[gd_scene load_steps=17 format=3 uid="uid://cntv32f7abpkp"] [ext_resource type="Script" path="res://ButtonScript.gd" id="1"] [ext_resource type="Theme" uid="uid://c3niwfgfe0ji" path="res://kellett.tres" id="2"] [ext_resource type="Texture2D" uid="uid://ccue7ssal6n3g" path="res://assets/noun-grand-central-terminal-2828893.png" id="3"] [ext_resource type="Script" path="res://MainStartScreen.gd" id="5"] +[ext_resource type="StyleBox" uid="uid://co7uo0oepmwup" path="res://pod_a1_style.tres" id="5_n1n2k"] [ext_resource type="Script" path="res://BookingScreen.gd" id="6"] +[ext_resource type="StyleBox" uid="uid://qivmmxhwd2lc" path="res://pod_a2_style.tres" id="6_80vf2"] [ext_resource type="Texture2D" uid="uid://bxm4opuvj1fkv" path="res://noun-cogs-1959786.png" id="7"] [ext_resource type="Script" path="res://assets/bookings.gd" id="8"] [ext_resource type="Script" path="res://ResetMenu.gd" id="9"] [ext_resource type="Script" path="res://assets/ImportantVars.gd" id="10"] [ext_resource type="Script" path="res://time_script.gd" id="11"] +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_cla8i"] +bg_color = Color(0.231373, 0.443137, 0.611765, 1) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_t28bl"] +bg_color = Color(0.682353, 0.768627, 0.54902, 1) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2igss"] +bg_color = Color(0.427451, 0.756863, 0.941176, 1) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_0tj26"] +content_margin_left = 26.0 +bg_color = Color(1, 1, 1, 1) +corner_radius_top_left = 20 +corner_radius_top_right = 20 +corner_radius_bottom_right = 20 +corner_radius_bottom_left = 20 +shadow_offset = Vector2(10, 10) + [node name="MainStartScreen" type="CanvasLayer"] script = ExtResource("5") @@ -41,48 +73,56 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("5_n1n2k") [node name="A2L1" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("6_80vf2") [node name="B1L1" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_cla8i") [node name="B2L1" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_cla8i") [node name="CL1" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("5_n1n2k") [node name="DL1" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_t28bl") [node name="EL1" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_2igss") [node name="FL1" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("6_80vf2") [node name="GL1" type="Button" parent="ButtonGrid"] visible = false @@ -96,48 +136,56 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("5_n1n2k") [node name="A2L2" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("6_80vf2") [node name="B1L2" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_cla8i") [node name="B2L2" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_cla8i") [node name="CL2" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("5_n1n2k") [node name="DL2" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_t28bl") [node name="EL2" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_2igss") [node name="FL2" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("6_80vf2") [node name="GL2" type="Button" parent="ButtonGrid"] visible = false @@ -151,48 +199,56 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("5_n1n2k") [node name="A2L3" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("6_80vf2") [node name="B1L3" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_cla8i") [node name="B2L3" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_cla8i") [node name="CL3" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("5_n1n2k") [node name="DL3" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_t28bl") [node name="EL3" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_2igss") [node name="FL3" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("6_80vf2") [node name="GL3" type="Button" parent="ButtonGrid"] visible = false @@ -206,48 +262,56 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("5_n1n2k") [node name="A2L4" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("6_80vf2") [node name="B1L4" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_cla8i") [node name="B2L4" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_cla8i") [node name="CL4" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("5_n1n2k") [node name="DL4" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_t28bl") [node name="EL4" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_2igss") [node name="FL4" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("6_80vf2") [node name="GL4" type="Button" parent="ButtonGrid"] visible = false @@ -261,48 +325,56 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("5_n1n2k") [node name="A2L5" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("6_80vf2") [node name="B1L5" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_cla8i") [node name="B2L5" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_cla8i") [node name="CL5" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("5_n1n2k") [node name="DL5" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_t28bl") [node name="EL5" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_2igss") [node name="FL5" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("6_80vf2") [node name="GL5" type="Button" parent="ButtonGrid"] unique_name_in_owner = true @@ -318,6 +390,7 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("5_n1n2k") [node name="A2L8" type="Button" parent="ButtonGrid"] unique_name_in_owner = true @@ -325,6 +398,7 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("6_80vf2") [node name="B1L8" type="Button" parent="ButtonGrid"] unique_name_in_owner = true @@ -332,6 +406,7 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_cla8i") [node name="B2L8" type="Button" parent="ButtonGrid"] unique_name_in_owner = true @@ -339,6 +414,7 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_cla8i") [node name="CL8" type="Button" parent="ButtonGrid"] unique_name_in_owner = true @@ -346,6 +422,7 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("5_n1n2k") [node name="DL8" type="Button" parent="ButtonGrid"] unique_name_in_owner = true @@ -353,6 +430,7 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_t28bl") [node name="EL8" type="Button" parent="ButtonGrid"] unique_name_in_owner = true @@ -360,6 +438,7 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_2igss") [node name="FL8" type="Button" parent="ButtonGrid"] unique_name_in_owner = true @@ -367,6 +446,7 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("6_80vf2") [node name="GL8" type="Button" parent="ButtonGrid"] unique_name_in_owner = true @@ -381,48 +461,56 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("5_n1n2k") [node name="A2L6" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("6_80vf2") [node name="B1L6" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_cla8i") [node name="B2L6" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_cla8i") [node name="CL6" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("5_n1n2k") [node name="DL6" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_t28bl") [node name="EL6" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_2igss") [node name="FL6" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("6_80vf2") [node name="GL6" type="Button" parent="ButtonGrid"] visible = false @@ -436,48 +524,56 @@ layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("5_n1n2k") [node name="A2L7" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("6_80vf2") [node name="B1L7" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_cla8i") [node name="B2L7" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_cla8i") [node name="CL7" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("5_n1n2k") [node name="DL7" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_t28bl") [node name="EL7" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = SubResource("StyleBoxFlat_2igss") [node name="FL7" type="Button" parent="ButtonGrid"] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme = ExtResource("2") +theme_override_styles/normal = ExtResource("6_80vf2") [node name="GL7" type="Button" parent="ButtonGrid"] visible = false @@ -1102,6 +1198,19 @@ layout_mode = 2 size_flags_vertical = 6 text = "Lesson 7" +[node name="SettingsButton" type="TextureButton" parent="."] +unique_name_in_owner = true +anchors_preset = 1 +anchor_left = 1.0 +anchor_right = 1.0 +offset_left = -27.0 +offset_top = 3.0 +offset_right = 1173.0 +offset_bottom = 1203.0 +grow_horizontal = 0 +scale = Vector2(0.02, 0.02) +texture_normal = ExtResource("7") + [node name="CentralLogo" type="Sprite2D" parent="."] position = Vector2(46, 42) scale = Vector2(0.06, 0.06) @@ -1143,43 +1252,92 @@ layout_mode = 2 theme = ExtResource("2") text = ">>" -[node name="BookingScreen" type="Panel" parent="."] +[node name="BookingScreen" type="CanvasLayer" parent="."] unique_name_in_owner = true visible = false +script = ExtResource("6") + +[node name="TransWhiteBack" type="ColorRect" parent="BookingScreen"] anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -offset_left = 93.0 -theme = ExtResource("2") -script = ExtResource("6") +grow_horizontal = 2 +grow_vertical = 2 +color = Color(0.298039, 0.298039, 0.298039, 0.858824) -[node name="CancelButton" type="Button" parent="BookingScreen"] -layout_mode = 0 -offset_left = 867.0 -offset_top = 572.0 -offset_right = 921.0 -offset_bottom = 592.0 -text = "Cancel" - -[node name="BookButton" type="Button" parent="BookingScreen"] +[node name="BookPanel" type="Panel" parent="BookingScreen"] unique_name_in_owner = true -layout_mode = 0 -offset_left = 433.0 -offset_top = 538.0 -offset_right = 487.0 -offset_bottom = 561.0 -text = "Book" +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -346.5 +offset_top = -288.0 +offset_right = 346.5 +offset_bottom = 288.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 4 +theme = ExtResource("2") +theme_override_styles/panel = SubResource("StyleBoxFlat_0tj26") + +[node name="BookTopBar" type="ColorRect" parent="BookingScreen"] +unique_name_in_owner = true +offset_left = 229.25 +offset_top = 35.0 +offset_right = 923.75 +offset_bottom = 75.0 +color = Color(1, 0.215686, 1, 1) + +[node name="TopTitles" type="HBoxContainer" parent="BookingScreen"] +offset_left = 240.0 +offset_top = 35.0 +offset_right = 913.0 +offset_bottom = 74.0 + +[node name="PodName" type="Label" parent="BookingScreen/TopTitles"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 3 +text = "PodName" + +[node name="LessonName" type="Label" parent="BookingScreen/TopTitles"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 3 +text = "LessonName" + +[node name="DayName" type="Label" parent="BookingScreen/TopTitles"] +unique_name_in_owner = true +layout_mode = 2 +text = "DayName +" [node name="NamesBox" type="GridContainer" parent="BookingScreen"] -layout_mode = 0 +anchors_preset = 8 anchor_left = 0.5 +anchor_top = 0.5 anchor_right = 0.5 +anchor_bottom = 0.5 offset_left = -187.5 -offset_top = 146.0 +offset_top = -180.0 offset_right = 187.5 -offset_bottom = 290.0 +offset_bottom = -14.0 +grow_horizontal = 2 +grow_vertical = 2 columns = 2 +[node name="Names" type="Label" parent="BookingScreen/NamesBox"] +layout_mode = 2 +theme_override_colors/font_color = Color(0, 0, 0, 1) +text = "Name(s):" + +[node name="Forms" type="Label" parent="BookingScreen/NamesBox"] +layout_mode = 2 +theme_override_colors/font_color = Color(0, 0, 0, 1) +text = "Form(s):" + [node name="Name1" type="LineEdit" parent="BookingScreen/NamesBox"] unique_name_in_owner = true layout_mode = 2 @@ -1220,101 +1378,69 @@ unique_name_in_owner = true layout_mode = 2 expand_to_text_length = true -[node name="HBoxContainer" type="HBoxContainer" parent="BookingScreen"] -layout_mode = 0 -offset_left = 142.0 -offset_top = 42.0 -offset_right = 791.0 -offset_bottom = 82.0 +[node name="ReasonBox" type="VBoxContainer" parent="BookingScreen"] +anchors_preset = 8 +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +offset_left = -186.0 +offset_top = -8.0 +offset_right = 189.0 +offset_bottom = 165.0 +grow_horizontal = 2 +grow_vertical = 2 -[node name="PodName" type="Label" parent="BookingScreen/HBoxContainer"] +[node name="Reason" type="Label" parent="BookingScreen/ReasonBox"] unique_name_in_owner = true layout_mode = 2 -size_flags_horizontal = 3 -text = "PodName" - -[node name="LessonName" type="Label" parent="BookingScreen/HBoxContainer"] -unique_name_in_owner = true -layout_mode = 2 -size_flags_horizontal = 3 -text = "LessonName" - -[node name="Reason" type="Label" parent="BookingScreen"] -unique_name_in_owner = true -layout_mode = 0 -offset_left = 304.0 -offset_top = 317.0 -offset_right = 619.0 -offset_bottom = 340.0 +theme_override_colors/font_color = Color(0, 0, 0, 1) text = "For what reason are you booking this Pod?" -[node name="DayName" type="Label" parent="BookingScreen"] +[node name="ReasonField" type="TextEdit" parent="BookingScreen/ReasonBox"] unique_name_in_owner = true -visible = false -layout_mode = 0 -offset_left = 606.0 -offset_top = 81.0 -offset_right = 678.0 -offset_bottom = 130.0 -text = "DayName -" - -[node name="ReasonField" type="TextEdit" parent="BookingScreen"] -unique_name_in_owner = true -layout_mode = 0 -offset_left = 276.0 -offset_top = 345.0 -offset_right = 654.0 -offset_bottom = 514.0 - -[node name="Names" type="Label" parent="BookingScreen"] -layout_mode = 0 -offset_left = 279.0 -offset_top = 119.0 -offset_right = 344.0 -offset_bottom = 142.0 -text = "Name(s):" - -[node name="Forms" type="Label" parent="BookingScreen"] -layout_mode = 0 -offset_left = 593.0 -offset_top = 117.0 -offset_right = 653.0 -offset_bottom = 140.0 -text = "Form(s):" +layout_mode = 2 +size_flags_vertical = 3 [node name="ErrLabel" type="Label" parent="BookingScreen"] unique_name_in_owner = true visible = false -layout_mode = 0 -offset_left = 285.0 -offset_top = 565.0 -offset_right = 638.0 -offset_bottom = 588.0 +anchors_preset = 7 +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +offset_left = -183.0 +offset_top = -95.0 +offset_right = 187.0 +offset_bottom = -69.0 +grow_horizontal = 2 +grow_vertical = 0 +theme_override_colors/font_color = Color(0.839216, 0, 0, 1) text = "You must enter at LEAST one name + a REASON." -[node name="ClearButton" type="Button" parent="BookingScreen"] -unique_name_in_owner = true -visible = false -layout_mode = 0 -offset_left = 759.0 -offset_top = 572.0 -offset_right = 862.0 -offset_bottom = 595.0 -text = "Clear Booking" +[node name="Buttons" type="HBoxContainer" parent="BookingScreen"] +offset_left = 389.0 +offset_top = 492.0 +offset_right = 765.0 +offset_bottom = 532.0 -[node name="SettingsButton" type="TextureButton" parent="."] +[node name="CancelButton" type="Button" parent="BookingScreen/Buttons"] +layout_mode = 2 +size_flags_horizontal = 3 +text = "Cancel" + +[node name="BookButton" type="Button" parent="BookingScreen/Buttons"] unique_name_in_owner = true -anchors_preset = 1 -anchor_left = 1.0 -anchor_right = 1.0 -offset_left = -27.0 -offset_top = 3.0 -offset_right = 1173.0 -offset_bottom = 1203.0 -grow_horizontal = 0 -scale = Vector2(0.02, 0.02) -texture_normal = ExtResource("7") +layout_mode = 2 +size_flags_horizontal = 3 +text = "Book" + +[node name="ClearButton" type="Button" parent="BookingScreen/Buttons"] +unique_name_in_owner = true +layout_mode = 2 +size_flags_horizontal = 3 +text = "Clear Booking" [node name="bookings" type="Node" parent="."] unique_name_in_owner = true @@ -1528,9 +1654,9 @@ script = ExtResource("11") [connection signal="pressed" from="RecurringGrid/EL7" to="RecurringGrid" method="_on_EL7_pressed"] [connection signal="pressed" from="RecurringGrid/FL7" to="RecurringGrid" method="_on_FL7_pressed"] [connection signal="pressed" from="RecurringGrid/GL7" to="RecurringGrid" method="_on_GL7_pressed"] -[connection signal="pressed" from="BookingScreen/CancelButton" to="BookingScreen" method="_on_CancelButton_pressed"] -[connection signal="pressed" from="BookingScreen/BookButton" to="BookingScreen" method="_on_BookButton_pressed"] -[connection signal="pressed" from="BookingScreen/ClearButton" to="BookingScreen" method="_on_ClearButton_pressed"] [connection signal="pressed" from="SettingsButton" to="." method="_on_SettingsButton_pressed"] +[connection signal="pressed" from="BookingScreen/Buttons/CancelButton" to="BookingScreen" method="_on_CancelButton_pressed"] +[connection signal="pressed" from="BookingScreen/Buttons/BookButton" to="BookingScreen" method="_on_BookButton_pressed"] +[connection signal="pressed" from="BookingScreen/Buttons/ClearButton" to="BookingScreen" method="_on_ClearButton_pressed"] [connection signal="pressed" from="ResetMenu/ResetButton" to="ResetMenu" method="_on_ResetButton_pressed"] [connection signal="pressed" from="ResetMenu/CancelReset" to="ResetMenu" method="_on_CancelReset_pressed"] diff --git a/podbooker/PodBooker.zip b/podbooker/PodBooker.zip new file mode 100644 index 0000000..bffb121 Binary files /dev/null and b/podbooker/PodBooker.zip differ diff --git a/podbooker/kellett.tres b/podbooker/kellett.tres index a294c0f..b6b0150 100644 --- a/podbooker/kellett.tres +++ b/podbooker/kellett.tres @@ -34,6 +34,10 @@ cache/0/20/0/kerning_overrides/20/0 = Vector2(0, 0) [sub_resource type="StyleBoxFlat" id="3"] bg_color = Color(0.427451, 0.431373, 0.443137, 1) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 [sub_resource type="StyleBoxFlat" id="2"] bg_color = Color(0, 0.0431373, 0.294118, 1) diff --git a/podbooker/pod1_gradient.tres b/podbooker/pod1_gradient.tres new file mode 100644 index 0000000..0af0d34 --- /dev/null +++ b/podbooker/pod1_gradient.tres @@ -0,0 +1,12 @@ +[gd_resource type="StyleBoxTexture" load_steps=3 format=3 uid="uid://djbfd8e7imm2p"] + +[sub_resource type="Gradient" id="Gradient_3rkwm"] +colors = PackedColorArray(0.709804, 0.592157, 0.67451, 1, 0.792157, 0.756863, 0.796078, 1) + +[sub_resource type="GradientTexture2D" id="GradientTexture2D_w4na2"] +gradient = SubResource("Gradient_3rkwm") +fill_from = Vector2(2.08165e-12, 2.08165e-12) +fill_to = Vector2(2.08165e-12, 1) + +[resource] +texture = SubResource("GradientTexture2D_w4na2") diff --git a/podbooker/pod_a1_style.tres b/podbooker/pod_a1_style.tres new file mode 100644 index 0000000..b3d7c57 --- /dev/null +++ b/podbooker/pod_a1_style.tres @@ -0,0 +1,8 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://co7uo0oepmwup"] + +[resource] +bg_color = Color(0.729412, 0.654902, 0.760784, 1) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 diff --git a/podbooker/pod_a2_style.tres b/podbooker/pod_a2_style.tres new file mode 100644 index 0000000..66d6d3b --- /dev/null +++ b/podbooker/pod_a2_style.tres @@ -0,0 +1,8 @@ +[gd_resource type="StyleBoxFlat" format=3 uid="uid://qivmmxhwd2lc"] + +[resource] +bg_color = Color(0.898039, 0.776471, 0.478431, 1) +corner_radius_top_left = 10 +corner_radius_top_right = 10 +corner_radius_bottom_right = 10 +corner_radius_bottom_left = 10 diff --git a/podbooker/pod_colours.md b/podbooker/pod_colours.md new file mode 100644 index 0000000..7dc4b9c --- /dev/null +++ b/podbooker/pod_colours.md @@ -0,0 +1,14 @@ +- A1 and C: +- #baa7c2 + +- A2 and F: +- #e5c67a + +- B1 and B2: +- #3b719c + +- D: +- #aec48c + +- E: +- #6dc1f0 \ No newline at end of file diff --git a/podbooker/project.godot b/podbooker/project.godot index e43d00c..694d802 100644 --- a/podbooker/project.godot +++ b/podbooker/project.godot @@ -21,6 +21,7 @@ config/macos_native_icon="res://assets/logo.icns" [display] +window/size/mode=3 window/stretch/mode="canvas_items" window/size/fullscreen=true @@ -40,6 +41,7 @@ common/enable_pause_aware_picking=true [rendering] renderer/rendering_method="gl_compatibility" +textures/vram_compression/import_s3tc_bptc=true environment/defaults/default_environment="res://default_env.tres" quality/driver/driver_name="GLES2" 2d/snapping/use_gpu_pixel_snap=true