From 9f07705b62da8063b476bcb84c106b0b68daad77 Mon Sep 17 00:00:00 2001 From: yannk Date: Sat, 16 Apr 2022 10:35:18 +0200 Subject: [PATCH] Adding basic window for developper tools --- locales/en.po | 9 ++++++ locales/fr.po | 11 +++++++- locales/messages.mo | Bin 5499 -> 5574 bytes locales/messages.pot | 7 +++++ scenes/developper/developper.tscn | 35 +++++++++++++++++++++++ scenes/hud/hud.gd | 3 ++ scenes/hud/hud.tscn | 45 ++++++++++++++++++++---------- scenes/languages/languages.gd | 37 +----------------------- 8 files changed, 96 insertions(+), 51 deletions(-) create mode 100644 scenes/developper/developper.tscn diff --git a/locales/en.po b/locales/en.po index 7aaf9b6..dd3fb48 100644 --- a/locales/en.po +++ b/locales/en.po @@ -65,6 +65,9 @@ msgstr "Themes" msgid "HUD/LANGUAGES" msgstr "Languages" +msgid "HUD/DEV" +msgstr "Developper" + msgid "HUD/ABOUT" msgstr "About" @@ -301,3 +304,9 @@ msgstr "Reverse vertical" msgid "NO_MOUSE_BUTTON" msgstr "Nothing" + +msgid "win_developper" +msgstr "Developper" + +msgid "lab_dev_tools" +msgstr "Developper tools" diff --git a/locales/fr.po b/locales/fr.po index 57a6a18..f3de6eb 100644 --- a/locales/fr.po +++ b/locales/fr.po @@ -65,6 +65,9 @@ msgstr "Thèmes" msgid "HUD/LANGUAGES" msgstr "Langue" +msgid "HUD/DEV" +msgstr "Développeur" + msgid "HUD/ABOUT" msgstr "A propos" @@ -75,7 +78,7 @@ msgid "POPUP_CONFIRM_QUIT/TITLE" msgstr "Merci de confirmer" msgid "POPUP_CONFIRM_QUIT/MESSAGE" -msgstr "Voulez-vous fermer le jeux ?" +msgstr "Voulez-vous fermer le jeu ?" msgid "OK" msgstr "Valider" @@ -301,3 +304,9 @@ msgstr "Inversé verticale" msgid "NO_MOUSE_BUTTON" msgstr "Rien n'est sélectionné" + +msgid "win_developper" +msgstr "Développeur" + +msgid "lab_dev_tools" +msgstr "Outils de développement" diff --git a/locales/messages.mo b/locales/messages.mo index 57be303ae684724896fc9ea9f4ced7bdc0d7e92f..924a7a24a214e2df5184535c137dcc04aa92c536 100644 GIT binary patch delta 2170 zcmXxlT})SH9Ki8MUIIz6kOE5(1qubjq!%obQXnz2P*KYl(xTyFi@73QbN|+x%ZnhY zi*jtOg|+A+`QKz0*38`8S~V|f(=yk~MQd@_*5+1yzkhx`<99yK^FQZ2FTdxU!{udX z8Z#Hm3f@eVy~IMIDLz?n&=s5gte8lun>4J{9M`jo;5Bf9V$vu4oz;VLoZ9$67Qq z-ROWj@G2aR-w%gxVHxA6$++Moy25YJmH&oj;vY1{mE>I;(3Q91wb+YZHyG`g@p{_h z=*mxE9bUj?=&H)r1OE{I zjb@;{bmso%a81}-O8%X|06*vTe~C-*66Usmi(GLnnwd^C zGdsg!^uAFv!;|yKe{LoG-~`Shf9WCzvX!QhMWoBI7WKRsw>_JmI$FIajyJeZ+k$A{1rzlcug2-@)on&NSEfMe+OSu|6h#`&+q@6r1% zq1R2LTlW{bwZ$~-e*wDSOf?m6XhE(?_aJ|1GY2R1IQp~?qHo7D=!!CN{uQ*t5p=*e z;`~vpqCJ7W63t$9WYCeE*MH!FR$5G?gEQ$I%WxK{InE{0g1OIW!aJ(ffYH8vGT_ zNFndCZ^uIPx;AtI?U=E{4OHCwP2pqcgocqm(zD?xdgBB-p(*tK&yklRS03hQnwJyx zL>qA{v5PS6J`;Bn+lV{d{~M@SnuxuGDYI-P9IVv_Wd~84tEF^PxEb#yI-~6>s|i=V zk!T=pC(MfFHsVg=W*d|)_usv*Bf1GctCl4*bbXrx*wST3k%Pc9*%pWF832P zRw!n03$coLfaoJE4|-tyTv^R=XVf1;K4|GKVkNPTuso7G&OFsCqTY^v;WiO|+t(15 zM#5*q2h$JHeMARgaqC(LAL=Uq5mEBXK7^j&PA-$!^8 zeu4E7h4_KW98Ua=vvK;=h$d{oM(ob^4!oK6zVskE;djuvp2c=NhpqSrI>E-8h-Pd< z$JvAo9HTgm@#6(5^o?<34si%w>Dzh!RG$9;`NdfduH-!4hTmZeUPA|LCS4A+0_$)9 zJwKA}MJI5;{~15tqT>yU+F*H-h(afDj2mUbq63xJG==D{# zlg>d0?nrxT$-g(=&WRgvce)py*nTX>arB0-;Q~B~rv7turN5vVso^3s(wweFuNy=& zy9ZsstLQ{tpF#eq#|aK(CyL0V;}i6ux`Q9D-Qa&#rD@_a9PqkeRtf&70EZ=pScz6CF#{Z610 zIE7~5<2*l+o zc48-CrYzeC#wx@;rDnwA=(}y{m?XC11H}4lKZUmvu6h&Ue%?)(70XJZi|DjL=_3{s z3yBScUr&qQ3`?c^-#=L|rD!en`Pmj0UMib8j$~an5~kc@<{lyLB_1ZOmx1dQyq_4# z_IBiZ755R#89yE*EW?wOp5{BUz6SlGZ6R8Tb%e$5xzC0Vq#vG#h+e|t*4;_?F#El? zJW2Sr_!YGDOcF=xsvDXgqp^&5G*7zc7T@0`#EN2H^`7$LM9q5@#b;};R228uFDoye IZkSj0KUy)G;{X5v diff --git a/locales/messages.pot b/locales/messages.pot index 34baf9b..a6bb178 100644 --- a/locales/messages.pot +++ b/locales/messages.pot @@ -56,6 +56,9 @@ msgstr "" msgid "HUD/LANGUAGES" msgstr "" +msgid "HUD/DEV" +msgstr "" + msgid "HUD/ABOUT" msgstr "" @@ -293,5 +296,9 @@ msgstr "" msgid "NO_MOUSE_BUTTON" msgstr "" +msgid "win_developper" +msgstr "" +msgid "lab_dev_tools" +msgstr "" diff --git a/scenes/developper/developper.tscn b/scenes/developper/developper.tscn new file mode 100644 index 0000000..e7faf67 --- /dev/null +++ b/scenes/developper/developper.tscn @@ -0,0 +1,35 @@ +[gd_scene load_steps=2 format=3 uid="uid://cua4782cbjhla"] + +[ext_resource type="Script" path="res://scenes/languages/languages.gd" id="1_irmml"] + +[node name="Control" type="Control"] +script = ExtResource( "1_irmml" ) + +[node name="Window" type="Window" parent="."] +title = "win_developper" +visible = false + +[node name="VBoxContainer" type="VBoxContainer" parent="Window"] +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 +metadata/_edit_use_custom_anchors = false + +[node name="Label" type="Label" parent="Window/VBoxContainer"] +offset_right = 40.0 +offset_bottom = 23.0 +text = "lab_dev_tools" + +[node name="Quit" type="Button" parent="Window/VBoxContainer"] +offset_top = 35.0 +offset_right = 43.0 +offset_bottom = 66.0 +size_flags_horizontal = 4 +size_flags_vertical = 8 +text = "Quit" + +[connection signal="close_requested" from="Window" to="." method="_on_quit_pressed"] +[connection signal="pressed" from="Window/VBoxContainer/Quit" to="." method="_on_quit_pressed"] diff --git a/scenes/hud/hud.gd b/scenes/hud/hud.gd index 2b7a436..38e2be2 100644 --- a/scenes/hud/hud.gd +++ b/scenes/hud/hud.gd @@ -66,6 +66,9 @@ func _on_themes_pressed(): $MenuTheme/Window.popup_centered() $MenuTheme/Window.visible = true +func _on_dev_pressed(): + $MenuDev/Window.popup_centered() + $MenuDev/Window.visible = true func _on_about_pressed(): var aboutmessage:String diff --git a/scenes/hud/hud.tscn b/scenes/hud/hud.tscn index 9855958..1372df2 100644 --- a/scenes/hud/hud.tscn +++ b/scenes/hud/hud.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=3 uid="uid://cdyi1a858p7em"] +[gd_scene load_steps=8 format=3 uid="uid://cdyi1a858p7em"] [ext_resource type="Theme" uid="uid://bi1js53ni6ehd" path="res://UI/themes/zbasu/zbasu.theme" id="1_iq3fo"] [ext_resource type="Script" path="res://scenes/hud/hud.gd" id="1_s6f6d"] @@ -6,6 +6,7 @@ [ext_resource type="PackedScene" uid="uid://cl8xk8w3jmta0" path="res://scenes/controls/controls.tscn" id="3_08xl7"] [ext_resource type="PackedScene" uid="uid://cb0gfweooxdsl" path="res://scenes/themes/themes.tscn" id="4_1poje"] [ext_resource type="PackedScene" uid="uid://ebfrhgrluixd" path="res://scenes/music/music_manager.tscn" id="6_0ivsi"] +[ext_resource type="PackedScene" uid="uid://cua4782cbjhla" path="res://scenes/developper/developper.tscn" id="7_45giw"] [node name="Control" type="Control"] anchor_right = 1.0 @@ -27,42 +28,50 @@ size_flags_vertical = 1 text = "Echap = Menu" [node name="Menu" type="HBoxContainer" parent="."] -visible = false anchor_right = 1.0 offset_right = 40.0 offset_bottom = 40.0 alignment = 1 [node name="Keys" type="Button" parent="Menu"] -offset_left = 510.0 -offset_right = 554.0 +offset_left = 205.0 +offset_right = 282.0 offset_bottom = 40.0 text = "HUD/KEYS" [node name="Themes" type="Button" parent="Menu"] -offset_right = 8.0 -offset_bottom = 31.0 +offset_left = 285.0 +offset_right = 386.0 +offset_bottom = 40.0 text = "HUD/THEMES" [node name="Languages" type="Button" parent="Menu"] -offset_left = 492.0 -offset_right = 574.0 +offset_left = 389.0 +offset_right = 520.0 offset_bottom = 40.0 text = "HUD/LANGUAGES" [node name="Music" type="Button" parent="Menu"] -offset_right = 87.0 -offset_bottom = 19.0 +offset_left = 523.0 +offset_right = 610.0 +offset_bottom = 40.0 text = "HUD/MUSIC" +[node name="Dev" type="Button" parent="Menu"] +offset_left = 613.0 +offset_right = 684.0 +offset_bottom = 40.0 +text = "HUD/DEV" + [node name="About" type="Button" parent="Menu"] -offset_right = 40.0 -offset_bottom = 19.0 +offset_left = 687.0 +offset_right = 779.0 +offset_bottom = 40.0 text = "HUD/ABOUT" [node name="Quit" type="Button" parent="Menu"] -offset_left = 578.0 -offset_right = 619.0 +offset_left = 782.0 +offset_right = 858.0 offset_bottom = 40.0 text = "HUD/QUIT" @@ -87,11 +96,19 @@ visible = false visible = false [node name="MusicManager" parent="." instance=ExtResource( "6_0ivsi" )] +visible = false + +[node name="MenuDev" parent="." instance=ExtResource( "7_45giw" )] +offset_left = 174.0 +offset_top = 4.0 +offset_right = 174.0 +offset_bottom = 4.0 [connection signal="pressed" from="Menu/Keys" to="." method="_on_keys_pressed"] [connection signal="pressed" from="Menu/Themes" to="." method="_on_themes_pressed"] [connection signal="pressed" from="Menu/Languages" to="." method="_on_languages_pressed"] [connection signal="pressed" from="Menu/Music" to="." method="_on_music_pressed"] +[connection signal="pressed" from="Menu/Dev" to="." method="_on_dev_pressed"] [connection signal="pressed" from="Menu/About" to="." method="_on_about_pressed"] [connection signal="pressed" from="Menu/Quit" to="." method="_on_quit_pressed"] [connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"] diff --git a/scenes/languages/languages.gd b/scenes/languages/languages.gd index a63210a..5a6881a 100644 --- a/scenes/languages/languages.gd +++ b/scenes/languages/languages.gd @@ -2,42 +2,7 @@ extends Control # Called when the node enters the scene tree for the first time. func _ready(): - $Window/VBoxContainer/Select.clear() - var id = 0 - var selected = -1 - var near_selected = -1 - var current_locale = TranslationServer.get_locale() - var root_language = current_locale.split('_')[0] - for key in TranslationServer.get_loaded_locales(): - if key == TranslationServer.get_locale(): - selected = id - else: - var tmp = key.split("_") - # print("tmp:" + tmp[0]) - if tmp[0] == root_language: - if tmp.size() == 1: - near_selected = id - elif near_selected == -1: - near_selected = id - $Window/VBoxContainer/Select.add_item(TranslationServer.get_locale_name(key) + " [" + key + "]", id) - id += 1 - if selected == -1 and near_selected != -1: - selected = near_selected - if selected == -1: - # Your language not exist, create it just for the form - var key = TranslationServer.get_locale() - $Window/VBoxContainer/Select.add_item(TranslationServer.get_locale_name(key) + " (" + key + " !)", id) - selected = id - $Window/VBoxContainer/Select.select(selected) - - -func _on_select_item_selected(_index): - var pos = 0 - for key in TranslationServer.get_loaded_locales(): - if pos == $Window/VBoxContainer/Select.get_selected(): - TranslationServer.set_locale(key) - return - pos += 1 + pass func _on_quit_pressed():