From 23b37778b1698c9445b68927d2d8f34ef2651935 Mon Sep 17 00:00:00 2001 From: CrispyPin Date: Wed, 19 Jan 2022 19:47:23 +0100 Subject: [PATCH] add keyboard proof of concept --- .../battery.gd | 0 .../image_viewer.gd | 0 src/overlay_resources/keyboard/keyboard.theme | Bin 0 -> 938 bytes .../keyboard/keyboard_overlay.gd | 32 +++++++ .../main_menu.gd | 0 .../time.gd | 0 .../ui_demo.gd | 0 .../unknown_type.gd | 0 src/overlays/BatteryLevel.tscn | 2 +- src/overlays/Clock.tscn | 2 +- src/overlays/ImageViewer.tscn | 2 +- src/overlays/KeyboardOverlay.tscn | 87 ++++++++++++++++++ src/overlays/UI_demo.tscn | 2 +- src/special_overlays/MainOverlay.tscn | 2 +- src/special_overlays/UnknownType.tscn | 2 +- 15 files changed, 125 insertions(+), 6 deletions(-) rename src/{overlay_scripts => overlay_resources}/battery.gd (100%) rename src/{overlay_scripts => overlay_resources}/image_viewer.gd (100%) create mode 100644 src/overlay_resources/keyboard/keyboard.theme create mode 100644 src/overlay_resources/keyboard/keyboard_overlay.gd rename src/{overlay_scripts => overlay_resources}/main_menu.gd (100%) rename src/{overlay_scripts => overlay_resources}/time.gd (100%) rename src/{overlay_scripts => overlay_resources}/ui_demo.gd (100%) rename src/{overlay_scripts => overlay_resources}/unknown_type.gd (100%) create mode 100644 src/overlays/KeyboardOverlay.tscn diff --git a/src/overlay_scripts/battery.gd b/src/overlay_resources/battery.gd similarity index 100% rename from src/overlay_scripts/battery.gd rename to src/overlay_resources/battery.gd diff --git a/src/overlay_scripts/image_viewer.gd b/src/overlay_resources/image_viewer.gd similarity index 100% rename from src/overlay_scripts/image_viewer.gd rename to src/overlay_resources/image_viewer.gd diff --git a/src/overlay_resources/keyboard/keyboard.theme b/src/overlay_resources/keyboard/keyboard.theme new file mode 100644 index 0000000000000000000000000000000000000000..f133549ae00db3b5f25b481f8b28fa3bab165a5a GIT binary patch literal 938 zcmV;b16BM|Q$s@n000005C8xq3IG6-0{{RhwJ-f(Bnd?v048L0KM>C(9S000$~RgZ|=K16P^<=qI8WFsA9>{(H`Me-d;AT`qccyw``90oxU_6YlV4C+V$ zSO8uCX8@~lsUWxD7kBftag4iJ@j1n2Q`w^Zui$bUzUsgyrWf|Ewln*WamkQfM%(yc zXZ#<*7sQ+Y2YfG$8Q-{WHtq)1F>LE(#&hL=kN*_D*Me&PTU7iP@CO_>X6CrkkmkZs z&yGiatx~a_AZd2go>An~&bbmRxm+6tjhtFI>3mc(k){;6JA?WE@zyZYYN_ju`a#V+ zw9%XlEtT8^J}re+V^6w^vq&MQ6NFl6E7dx3_20k)B`6}EIuqw2hWY$2@T$8*L55kG zQ9p698R@0LwN<7gUvTfzIFk9FU~-^bS85Bn*A22B1X&M6B6pfpT5_oeKOE%7ryV&4 zgBx`NgAkC&?tOSTczl-Bt9@W8^(2L(g3WLo>Lmj)G#{G(7A`FlSftMXiWLbFAUse> zLE)U3l#q;g6axv7A3zAmM+b)o8)2e?h7vcPs;WF8eou!JC_KKFUKxH1e}H3Lr05PM zm8a2$q}fIaS#I7U;x3Z(vNo@sN|R&R%+5k8DyXf@TC_DWV`+t)27u70fx!_PnGumB z1xY$kf+3~IN*)rx)F99@N*h9?NF3iMKI~;?-iCy z%39@Me^t0XDGE?CblP|028;}X5QaY#ea`%9!rrcs$h3}R_NOInSl1yzf1Qb0`b zb6mVT#o_f{2(}xSVQ2K`4I{_et>j|NxhSxs=X)Qt#|7Nrx^Ln<7l-Hh?lc{G6cJe|)7XN4z;hWLM!Rvio-UXog6oqKvr8S+A&mrS^=rrf~5PL1OfOFV<`i40*PTIZeE0sti8DS#_dl%%ZDCuxk{diU~5Xv z$`JO#pC%S&yIo80bUxv+8SSJ1L?l3X9Lu1CHIk|%*bD1m{HYzb|&eyp%p- zCK@`RM8|*|!54iR{*ooOPsAI|QaWD~L=>nala-SHMrf`c(rmSxY4wDlo)rAg2fHe> Md`eO+Vp3B>LtQwpLjV8( literal 0 HcmV?d00001 diff --git a/src/overlay_resources/keyboard/keyboard_overlay.gd b/src/overlay_resources/keyboard/keyboard_overlay.gd new file mode 100644 index 0000000..01add75 --- /dev/null +++ b/src/overlay_resources/keyboard/keyboard_overlay.gd @@ -0,0 +1,32 @@ +extends Control + +const OVERLAY_PROPERTIES = { + "has_touch": true, +} + +func _ready(): + pass + + +func _on_KeyO_pressed(): + GDVK.press("O") + + +func _on_KeyE_pressed(): + GDVK.press("E") + pass # Replace with function body. + + +func _on_KeyH_pressed(): + GDVK.press("H") + pass # Replace with function body. + + +func _on_KeyL_pressed(): + GDVK.press("L") + pass # Replace with function body. + + +func _on_KeyCaps_pressed(): + GDVK.press("CAPSLOCK") + pass # Replace with function body. diff --git a/src/overlay_scripts/main_menu.gd b/src/overlay_resources/main_menu.gd similarity index 100% rename from src/overlay_scripts/main_menu.gd rename to src/overlay_resources/main_menu.gd diff --git a/src/overlay_scripts/time.gd b/src/overlay_resources/time.gd similarity index 100% rename from src/overlay_scripts/time.gd rename to src/overlay_resources/time.gd diff --git a/src/overlay_scripts/ui_demo.gd b/src/overlay_resources/ui_demo.gd similarity index 100% rename from src/overlay_scripts/ui_demo.gd rename to src/overlay_resources/ui_demo.gd diff --git a/src/overlay_scripts/unknown_type.gd b/src/overlay_resources/unknown_type.gd similarity index 100% rename from src/overlay_scripts/unknown_type.gd rename to src/overlay_resources/unknown_type.gd diff --git a/src/overlays/BatteryLevel.tscn b/src/overlays/BatteryLevel.tscn index 2d36796..b6b0283 100644 --- a/src/overlays/BatteryLevel.tscn +++ b/src/overlays/BatteryLevel.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://overlay_scripts/battery.gd" type="Script" id=1] +[ext_resource path="res://overlay_resources/battery.gd" type="Script" id=1] [ext_resource path="res://fonts/OpenSans-Regular.ttf" type="DynamicFontData" id=2] [sub_resource type="StyleBoxEmpty" id=4] diff --git a/src/overlays/Clock.tscn b/src/overlays/Clock.tscn index d594de1..d485184 100644 --- a/src/overlays/Clock.tscn +++ b/src/overlays/Clock.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://overlay_scripts/time.gd" type="Script" id=1] +[ext_resource path="res://overlay_resources/time.gd" type="Script" id=1] [ext_resource path="res://fonts/OpenSans-Regular.ttf" type="DynamicFontData" id=2] [sub_resource type="StyleBoxFlat" id=1] diff --git a/src/overlays/ImageViewer.tscn b/src/overlays/ImageViewer.tscn index cc2b73d..aa6ed7b 100644 --- a/src/overlays/ImageViewer.tscn +++ b/src/overlays/ImageViewer.tscn @@ -2,7 +2,7 @@ [ext_resource path="res://styles/menu.theme" type="Theme" id=1] [ext_resource path="res://styles/file_menu.theme" type="Theme" id=2] -[ext_resource path="res://overlay_scripts/image_viewer.gd" type="Script" id=3] +[ext_resource path="res://overlay_resources/image_viewer.gd" type="Script" id=3] [node name="ImageViewer" type="Control"] anchor_right = 1.0 diff --git a/src/overlays/KeyboardOverlay.tscn b/src/overlays/KeyboardOverlay.tscn new file mode 100644 index 0000000..1edc7c1 --- /dev/null +++ b/src/overlays/KeyboardOverlay.tscn @@ -0,0 +1,87 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://overlay_resources/keyboard/keyboard.theme" type="Theme" id=1] +[ext_resource path="res://overlay_resources/keyboard/keyboard_overlay.gd" type="Script" id=2] + +[node name="Overlay" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 +theme = ExtResource( 1 ) +script = ExtResource( 2 ) +__meta__ = { +"_edit_lock_": true, +"_edit_use_anchors_": false +} + +[node name="PanelContainer" type="PanelContainer" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -123.0 +margin_top = -103.5 +margin_right = 123.0 +margin_bottom = 103.5 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="CenterContainer" type="CenterContainer" parent="PanelContainer"] +margin_left = 8.0 +margin_top = 8.0 +margin_right = 400.0 +margin_bottom = 268.0 + +[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"] +margin_left = 8.0 +margin_top = 8.0 +margin_right = 400.0 +margin_bottom = 268.0 + +[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/VBoxContainer"] +margin_right = 392.0 +margin_bottom = 128.0 + +[node name="KeyH" type="Button" parent="PanelContainer/VBoxContainer/HBoxContainer"] +margin_right = 128.0 +margin_bottom = 128.0 +rect_min_size = Vector2( 128, 128 ) +text = "H" + +[node name="KeyE" type="Button" parent="PanelContainer/VBoxContainer/HBoxContainer"] +margin_left = 132.0 +margin_right = 260.0 +margin_bottom = 128.0 +rect_min_size = Vector2( 128, 128 ) +text = "E" + +[node name="KeyO" type="Button" parent="PanelContainer/VBoxContainer/HBoxContainer"] +margin_left = 264.0 +margin_right = 392.0 +margin_bottom = 128.0 +rect_min_size = Vector2( 128, 128 ) +text = "O" + +[node name="HBoxContainer2" type="HBoxContainer" parent="PanelContainer/VBoxContainer"] +margin_top = 132.0 +margin_right = 392.0 +margin_bottom = 260.0 + +[node name="KeyCaps" type="Button" parent="PanelContainer/VBoxContainer/HBoxContainer2"] +margin_right = 224.0 +margin_bottom = 128.0 +rect_min_size = Vector2( 224, 128 ) +text = "CAPS" + +[node name="KeyL" type="Button" parent="PanelContainer/VBoxContainer/HBoxContainer2"] +margin_left = 228.0 +margin_right = 356.0 +margin_bottom = 128.0 +rect_min_size = Vector2( 128, 128 ) +text = "L" + +[connection signal="pressed" from="PanelContainer/VBoxContainer/HBoxContainer/KeyH" to="." method="_on_KeyH_pressed"] +[connection signal="pressed" from="PanelContainer/VBoxContainer/HBoxContainer/KeyE" to="." method="_on_KeyE_pressed"] +[connection signal="pressed" from="PanelContainer/VBoxContainer/HBoxContainer/KeyO" to="." method="_on_KeyO_pressed"] +[connection signal="pressed" from="PanelContainer/VBoxContainer/HBoxContainer2/KeyCaps" to="." method="_on_KeyCaps_pressed"] +[connection signal="pressed" from="PanelContainer/VBoxContainer/HBoxContainer2/KeyL" to="." method="_on_KeyL_pressed"] diff --git a/src/overlays/UI_demo.tscn b/src/overlays/UI_demo.tscn index 3335a93..9f88f58 100644 --- a/src/overlays/UI_demo.tscn +++ b/src/overlays/UI_demo.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=10 format=2] -[ext_resource path="res://overlay_scripts/ui_demo.gd" type="Script" id=1] +[ext_resource path="res://overlay_resources/ui_demo.gd" type="Script" id=1] [ext_resource path="res://fonts/OpenSans-Regular.ttf" type="DynamicFontData" id=2] [ext_resource path="res://fonts/OpenSans-Bold.ttf" type="DynamicFontData" id=3] [ext_resource path="res://styles/menu.theme" type="Theme" id=4] diff --git a/src/special_overlays/MainOverlay.tscn b/src/special_overlays/MainOverlay.tscn index b8a4f62..c061397 100644 --- a/src/special_overlays/MainOverlay.tscn +++ b/src/special_overlays/MainOverlay.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://overlay_scripts/main_menu.gd" type="Script" id=1] +[ext_resource path="res://overlay_resources/main_menu.gd" type="Script" id=1] [ext_resource path="res://icons/move.svg" type="Texture" id=2] [ext_resource path="res://icons/list.svg" type="Texture" id=3] [ext_resource path="res://icons/close.svg" type="Texture" id=4] diff --git a/src/special_overlays/UnknownType.tscn b/src/special_overlays/UnknownType.tscn index 861a6c2..c357bfd 100644 --- a/src/special_overlays/UnknownType.tscn +++ b/src/special_overlays/UnknownType.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://styles/menu.theme" type="Theme" id=1] -[ext_resource path="res://overlay_scripts/unknown_type.gd" type="Script" id=2] +[ext_resource path="res://overlay_resources/unknown_type.gd" type="Script" id=2] [node name="UnknownType" type="Control"] anchor_right = 1.0