From d92ebe4164bd655fafa6886a113e1f893cfa85ee Mon Sep 17 00:00:00 2001 From: betalars Date: Fri, 15 Aug 2025 00:22:13 +0200 Subject: [PATCH] temporary fix for #210 and implementing #205: restructuring menu and adding stage management override to a11y settings --- src/demo-main.tscn | 34 +++++++++--------- src/internationalisation.csv | 1 + src/internationalisation.de.translation | Bin 37393 -> 37425 bytes src/internationalisation.en.translation | Bin 32182 -> 32210 bytes src/internationalisation.es.translation | Bin 14701 -> 14717 bytes src/internationalisation.ja.translation | Bin 14689 -> 14705 bytes src/internationalisation.notes.translation | Bin 15216 -> 15232 bytes .../main menu/acessability_settings.gd | 23 +++++++++--- 8 files changed, 36 insertions(+), 22 deletions(-) diff --git a/src/demo-main.tscn b/src/demo-main.tscn index 0fdc2015..459fa1e2 100644 --- a/src/demo-main.tscn +++ b/src/demo-main.tscn @@ -203,40 +203,40 @@ fill = 1 fill_from = Vector2(0.538462, 0.491453) fill_to = Vector2(1.3, -0.3) -[sub_resource type="InputEventKey" id="InputEventKey_jirkf"] +[sub_resource type="InputEventKey" id="InputEventKey_kt5p7"] device = -1 physical_keycode = 87 unicode = 119 -[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_kt5p7"] +[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_mivr6"] device = -1 axis = 1 axis_value = -1.0 -[sub_resource type="InputEventKey" id="InputEventKey_mivr6"] +[sub_resource type="InputEventKey" id="InputEventKey_52c3j"] device = -1 physical_keycode = 65 unicode = 97 -[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_52c3j"] +[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_b7q2n"] device = -1 axis_value = -1.0 -[sub_resource type="InputEventKey" id="InputEventKey_b7q2n"] +[sub_resource type="InputEventKey" id="InputEventKey_qhf78"] device = -1 physical_keycode = 68 unicode = 100 -[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_qhf78"] +[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_gatj6"] device = -1 axis_value = 1.0 -[sub_resource type="InputEventKey" id="InputEventKey_gatj6"] +[sub_resource type="InputEventKey" id="InputEventKey_ol51q"] device = -1 physical_keycode = 83 unicode = 115 -[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_ol51q"] +[sub_resource type="InputEventJoypadMotion" id="InputEventJoypadMotion_2rqk2"] device = -1 axis = 1 axis_value = 1.0 @@ -466,6 +466,10 @@ text = "show Content Notes" layout_mode = 2 text = "reduce motion and flickering" +[node name="A11Y" type="Button" parent="Menu/VBoxContainer"] +layout_mode = 2 +text = "More Options" + [node name="Label3" type="Label" parent="Menu/VBoxContainer"] layout_mode = 2 theme_type_variation = &"HeaderMedium" @@ -500,10 +504,6 @@ popup/item_1/id = 2 layout_mode = 2 text = "Privacy Info" -[node name="A11Y" type="Button" parent="Menu/VBoxContainer"] -layout_mode = 2 -text = "Accessibility" - [node name="Control" type="Control" parent="Menu"] layout_mode = 1 anchors_preset = 2 @@ -525,7 +525,7 @@ stretch_mode = 5 script = ExtResource("5_6w5b4") action = "player_forwards" icon = 4 -events = Array[InputEvent]([SubResource("InputEventKey_jirkf"), SubResource("InputEventJoypadMotion_kt5p7")]) +events = Array[InputEvent]([SubResource("InputEventKey_kt5p7"), SubResource("InputEventJoypadMotion_mivr6")]) metadata/_custom_type_script = "uid://bbs1u7ojno7xo" [node name="ActionPrompt2" type="TextureRect" parent="Menu/Control"] @@ -540,7 +540,7 @@ stretch_mode = 5 script = ExtResource("5_6w5b4") action = "player_left" icon = 4 -events = Array[InputEvent]([SubResource("InputEventKey_mivr6"), SubResource("InputEventJoypadMotion_52c3j")]) +events = Array[InputEvent]([SubResource("InputEventKey_52c3j"), SubResource("InputEventJoypadMotion_b7q2n")]) metadata/_custom_type_script = "uid://bbs1u7ojno7xo" [node name="ActionPrompt4" type="TextureRect" parent="Menu/Control"] @@ -555,7 +555,7 @@ stretch_mode = 5 script = ExtResource("5_6w5b4") action = "player_right" icon = 4 -events = Array[InputEvent]([SubResource("InputEventKey_b7q2n"), SubResource("InputEventJoypadMotion_qhf78")]) +events = Array[InputEvent]([SubResource("InputEventKey_qhf78"), SubResource("InputEventJoypadMotion_gatj6")]) metadata/_custom_type_script = "uid://bbs1u7ojno7xo" [node name="ActionPrompt3" type="TextureRect" parent="Menu/Control"] @@ -570,7 +570,7 @@ stretch_mode = 5 script = ExtResource("5_6w5b4") action = "player_backwards" icon = 4 -events = Array[InputEvent]([SubResource("InputEventKey_gatj6"), SubResource("InputEventJoypadMotion_ol51q")]) +events = Array[InputEvent]([SubResource("InputEventKey_ol51q"), SubResource("InputEventJoypadMotion_2rqk2")]) metadata/_custom_type_script = "uid://bbs1u7ojno7xo" [node name="Label" type="Label" parent="Menu/Control"] @@ -727,9 +727,9 @@ libraries = { [connection signal="pressed" from="Menu/VBoxContainer2/PressStart" to="." method="_on_start_button_pressed"] [connection signal="toggled" from="Menu/VBoxContainer/CNBox" to="." method="_on_cn_box_toggled"] [connection signal="toggled" from="Menu/VBoxContainer/MotionBox" to="." method="_on_motion_box_toggled"] +[connection signal="pressed" from="Menu/VBoxContainer/A11Y" to="." method="show_accessibility_settings"] [connection signal="item_selected" from="Menu/VBoxContainer/SpeechButton" to="." method="_on_speech_button_item_selected"] [connection signal="item_selected" from="Menu/VBoxContainer/TextButton" to="." method="_on_text_button_item_selected"] [connection signal="pressed" from="Menu/VBoxContainer/Button" to="Menu/PrivacyPanel" method="show"] -[connection signal="pressed" from="Menu/VBoxContainer/A11Y" to="." method="show_accessibility_settings"] [connection signal="leave_stage" from="Menu/PrivacyPanel/PrivacyAndDataProtection" to="Menu/PrivacyPanel" method="hide"] [connection signal="pressed" from="PauseContainer/PauseMenu/VBoxContainer/A11Y2" to="." method="show_accessibility_settings"] diff --git a/src/internationalisation.csv b/src/internationalisation.csv index 0a5a9be1..51a281ad 100644 --- a/src/internationalisation.csv +++ b/src/internationalisation.csv @@ -571,3 +571,4 @@ To see its beauty. It helped a lot.,To see its beauty. It helped a lot.,Weil es "I was unsure at first, but signed up for it nonetheless.","I was unsure at first, but signed up for it nonetheless.","Ich war mir erst nicht sicher, aber hab mich dann doch eingetraten.",,, "This is where I understood that Lukas never asked me, that I froze because he jumped me, and that I am not alone.","This is where I understood that Lukas never asked me, that I froze because he jumped me, and that I am not alone.","Da habe ich verstanden, dass Lukas mich nie gefragt hatte, dass ich eingefroren bin, weil er mich überumpelt hat, dass er hätte mitbekommen müssen, wie ich weggetreten bin und, dass ich damit wirklich nicht alleine bin.",,, "It still took me some time to fully accept, that I was not to blame.","It still took me some time to fully accept, that I was not to blame.","Es hat trotzdem noch eine Weile gebraucht, bis die Schuldgefühle weg waren.",,, +More Options,More Options,Mehr Optionen,,, diff --git a/src/internationalisation.de.translation b/src/internationalisation.de.translation index 12e0d6f85c0857d08f97f0022809502d0fb24ec2..ca9d65093cd404e1a6162eb1261dd9db497a4183 100644 GIT binary patch delta 690 zcmZ9IPbdUo7{=e7VrOX=n;f*XiHn1iB1u~$#jaYC=AccYHaW;)lXm1F z_k;eES{o2)1gdYLMxY(^z0?6}jOyJtig|*WMNL)J{@qz*=smE^c~#3d=(nId;6UrV z=W@*Q|2hYA0bFVM4SYFZ<43^UgD0(gfqw^Iz^MECGv13#W+AO>*1Xzl$K1)RTkHBY z@5Zn=#9)M)fX;$Bu)s`Rn5NG_YeXapvZa;aceKlZ^?{|^!=`YX$P7F_O-?fp@iR*# m2p=kCdtOc7MQOh8+=^7+YsGt--P&Xu}lEXj!+F(Ke delta 658 zcmZ9IF-XHe7=^DvX;Ld{L6Cyd$x$3cK^%%YNGE9}L+Kz6)v1Vxh=>7k5QmD`sZ+qx z$)OT(=u{A#9K}K06bB~CExj zRp2Vv27BNT$j&i*%3OyV%uQN$LMzKGr|qgCb&ZQ#&;$4GrA}spN5p6F2I5VvKbSvh z$5Sc|!4u5W^enwVoA)hZUSa3cmDs`G&IU{Kz!vA4)$cPO!6)F%x--u;*fsy% zg_zr*WA$C+o)_RpAUuF4>+%Kp9ejZwt2ZC&OT~X9MN2>bL=LqyBRC%JQn9! zOD9Z82$r+ACwM((jYMyh=PhG0O>3sE&<{yAZ`F+keW6i-2-J$ z0@5>}?0HZcq-F^c8^i~JRU8cb3>$zFyMXuz5TD|h{DEDn{sxeF4~Sm?F+}D6|L>se zFHo9|lYv11h(YpVP+A5^D?!;NP}&MgJ3wied2T?y4^%7)N+&?*da#-_s31&34wPSn zBwhn$Hv#DmAnrqwgXxy+&0Rd!O0ODInk`I9FS3vv& zh?%$$Ap^6B11iRcBqxHz2C0(+@>QT>T1avhNbLU(K!tWt0T(Fk2c#o_I1Y$Ypkg2c zv!Lt>AkE6az@Pxcb(`aPe=Ddm0hx?IoPM}pFkPI1K?cay1mYbtzhq_7q^VQ=1=Wo+{;2%(mfgOlJ`h$XloB{4WV2}U+ delta 660 zcmZ9IJxIe)6oqf3(lq!FVksh>1Q&4-1#u`UBAp~^2Pr5Dt&=#2h=>owK^%0jQ>RXy z914LBP6ffqNyI_i6bGjcP6mwUne*V`gOBgr^KKHzW9T$Pr}6En1y>}($r;27S8j081TApyUbmAO^@R8W-a)(>MW4)V zx+5jh1@!#@orXu4C+I19mNxI3!@R_eE&Y_iiYEHUrHor0HxqhO;u%nmw;n)2OMe|bn`7>HU1;iylTm{4pKnzmT2BdqS>`6d+ z29!MyN`uraL1KgWAh3#qfuCUmP+}Jl9|7W19FzaEOV!^1GVcNL3m}H5{Qv(Ql>G%t zvvD#o2mmoiUJOdh0BI#C+XPBmL1_ml4KvRT$oGMYMM3EV2we|WlLi%pX~=={i;%=? zpzJ0f-2udXNOCZJGoWJg(Bzf?`Ky3<3zGOgAo~bsJuo1Ej0-?~3rX?;ko^jXe*iHP z7b0X}7I8qu_>km8kk}w~azMTcR7?v=&H{=3-vOx54l3XRrTu_(1Q5poaSBunWMCGQ zT>+$785kH8fVggR9`A1jIVK>J5s1?d_X{3}vO)YQ6<2+KGj1-|d&R-@hjDYE`2xm? K34D_UEn@(FSzEIJ delta 644 zcmexc^tNaNCwILI2Lr=@An=0H0Z^>kp z1Boj>-SorRuK$nYV!W2@pe6{{R09%KiYQ znK&63cz_rrF9f9}fV3QxZ2+asptKE?hMDICec}U_F zP<9=VZUN#hBsrMADNwOlXmSgH{AEDA0ZDupkbQu&9vBcn#u*^Kh9r3h$bJUIUx4@@ zk~qvF7A{C=a6xI1xBwCx#Fql{6`*2jNOC4f?Eelxg;r1j2Po|Yq(gu>3WyV+Vju(4 zpzIPL&B_2Y9Ehtn=kfkl;9~?bK{)+zzu<9(&Fy-xIGBDjZf-PRz&J61Z?d9g3;>HU1;iylTm{4pKnzmT2BdqS>`6d+ z29!MyN`uraL1KgWAh3#qfuCUmP+}Jl9|7W19FzaEOV!^1GVcNL3m}H5{Qv(Ql>G%t zvvD#o2mmoiUJOdh0BI#C+XPBmL1_ml4KvRT$oGMYMM3EV2we|WlLi%pX~=={i;%=? zpzJ0f-2udXNOCZJGoWJg(Bzf?`Ky3<3zGOgAo~bsJuo1Ej0-?~3rX?;ko^jXe*iHP z7b0X}7I8qu_>km8kk}w~azMTcR7?v=&H{=3-vOx54l3XRrTu_(1Q5poaSBunWMCGQ zT>+$785kH8fVggR9`A1jIVK>J5s1?d_X{3}vO)YQ6<2-VGHx!{d&R-@j&XCL`4h&8 O34A>4P$faZLCyeh*IU>C delta 653 zcmexZ^ss0HCwILI2Lr=@An=0H0Z^>kp z1Boj>-SorRuK$nYV!W2@pe6{{R09%KiYQ znK&63cz_rrF9f9}fV3QxZ2+asptKE?hMDICec}U_F zP<9=VZUN#hBsrMADNwOlXmSgH{AEDA0ZDupkbQu&9vBcn#u*^Kh9r3h$bJUIUx4@@ zk~qvF7A{C=a6xI1xBwCx#Fql{6`*2jNOC4f?Eelxg;r1j2Po|Yq(gu>3WyV+Vju(4 zpzIPL&B_2Y9Ehtn=kfkl;9~?bK{)+zzu<9(&Fy-xIGEltZf-Px!ZVAOOT5c`+z01EiIpY!fJL1*ILJG|W6VAm0Zn76qjfAap%gO&U}XrXdH)FG3Qp zfwG%`bO#XkA<4n?&47x{Lz7zq9 delta 640 zcmZoD|4_Dphr8Z|gMr~c5O_i904NO-gMl!pSPYO(1L6W8E(78kAO@*v0@58&b{~+Q z0%gyF(jYYpkk}wT2rT1Z5M)>bl-LHu2Y~n(5KlJbkf^@`WZVMcCqN8Q`~UwdDEkAH zX5wUE-~nQgybzR@0Mc?$wgHqjgVHuo8fKmoknaH%3xm=z5V{_$CJ8DC(~tq>=OKw# zK-qObx&?^4kmO+cra;AJp~)=(@|OYe1|;!aK=uL7dSFlh8E1g_8j|E4Ap02*e*xlu zNa8SyShyge!3Cv3;sQu)5MK(&SAdGCA<3B_vHv>&6 void: - leave_stage.emit() + is_active = false State.save_settings() - State.leave_stage(self) func _input(event: InputEvent) -> void: - if event.is_action_pressed("ui_cancel") and has_stage: - State.leave_stage(self) + if event.is_action_pressed("ui_cancel") and is_active: + is_active = false + get_viewport().set_input_as_handled()