From e019d8bb3e934ce7d2f71410a85818041ef5b84b Mon Sep 17 00:00:00 2001 From: yannk Date: Sat, 16 Apr 2022 11:02:53 +0200 Subject: [PATCH] Adding tabs and proper localization and scripts to dev tools --- locales/en.po | 3 --- locales/fr.po | 3 --- locales/messages.mo | Bin 5574 -> 5640 bytes locales/messages.pot | 3 --- scenes/developper/developper.gd | 14 +++++++++++ scenes/developper/developper.tscn | 18 +++++++++++---- scenes/languages/languages.gd | 37 +++++++++++++++++++++++++++++- 7 files changed, 63 insertions(+), 15 deletions(-) create mode 100644 scenes/developper/developper.gd diff --git a/locales/en.po b/locales/en.po index dd3fb48..8b6b17d 100644 --- a/locales/en.po +++ b/locales/en.po @@ -307,6 +307,3 @@ 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 f3de6eb..462a0dc 100644 --- a/locales/fr.po +++ b/locales/fr.po @@ -307,6 +307,3 @@ 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 924a7a24a214e2df5184535c137dcc04aa92c536..6862cf4abad5ab06f2a7124bb7fcf096863c4256 100644 GIT binary patch delta 2217 zcmZwHT}+l`7{Kv60YO1fG%W3dOhkh|EF&WlGmH{b3W>@Jia3z6P#1N=-ZpD#Zp{N~ zZcQ^=2es0cEgE%@ZP3@2P2DP^HcnhITjL~~o2~!<<-&E)z4v;4_x*g_AJ=m~?{L+Q z>dddDxvwTlCvgd}EGMO%xOOTBN>4#bg}4Q0U>_FYE}VsXums-?2g7gT`pNJ#&f&g) za5m1KmQra-nN&$-9w%yXF1F&uxEU|Pm!iENFQh#feveN06gt>l6_!Bb8G>WcxEUy0@=ckYks;LlNQ5jy2Rak*d=)hah z0k`8!+!yB$g-5WI@ze3R;S{>UGw8}^kY_Wo2u<2bN(UdS8FE58`~Wu&JAvJt(6`Y61~Cu63s0aEJc(0q4DI+2Tz~~!%)SD2#Z72tHlvw& zA>4;P_X(Qe<0a%jyAn<~fpO%QrjiD-mdcPtr7O`*wiFpNEyw%|QffrrR$9*s_r8tj zbDPjT(96O8cAy#B6COZ5wDevkDj%Q&e1xw2Q*>fS(2j@ERG&Zx_yxUx49(bhT+buV z-dBu1Hy6FH0{NwC4$L{#qy1-^skri1^nq@quk;-9OD}V9LVM9&{}%d{97I?2aa{i# z?Qj?!@Y}e43@@cUf_@!m(fi7oH519C3M!_e2E9-l)}sSA#Pv1k%GRMNZ$mTDiSCIW zbVA!O`&FR#^`o0|f3!bC=8(R^d4B&tQ*rbBg_T%FI_!7_+F?`Jie{ia>_#*3OxTA` z@Wp7q67AQ}e%?Sc{7yK4MU0<@sJQZD;Sb>mn#$4eH?)I4(af9+bNE)B$TTz)v(V?} zU^&i5Gg5~xv<1Cy8)jT-FBLo7j=uYy;p^zc-bcntABJC|&yAoH`W=1#44R>H$j6a= zt&r{^9Jqn7AOD0bYkmLAsoX`7{d7CwcWJqfFm3-=nmOrrZh3Hm>_3{-mC<%0mdl6- zvNb+qbT2H9_O-tMYiO({ZYI_c3kf&KLxi7-rHSynUtxn{mMVyP8x$6tE&eTA9-bg= zM0fv<(KhXtYNCp`pYhL^PHMLi_Y#j1O9;#Lgzs|!v6Qg15$^7G!qneK_($^?@d)wX zaubaj;uhj=qLJ{mE+R6m99oDv;!a`%aR)J3{JXUHzRQXA#5%(FegomgbJtInN-F;4 z-b&OGR}+(^gUTwx&A5!99BwT5I=}eYO;5Ey-qqXn%`Df;tm#VKbiS3^KP_LT7P4qU1g%8mAH8W^ zI2(DPGLUE%*+p(3>V=A#AVq~21zIMS7a{B}5CZG_J^!B%`<>5o{^y+M<@cQDY**vC zhWzD<;=PHonV3j47Nztaw%oyivZySjyRZXCVGc*)%Xl}wj-&D2urK^9t`CN1v6B0K z!LfK9D^kj*|ES!@4;3R)8izA*JhovKcE zWX>0({d6N8r=2*G{?mRcJd?h_Qapl;DIG^=d?v2{9KT;g{?eZuoY62&!XnZ%6>HJV zbf6us#WC0uzwZq9VFmrC!*Rn&bcR2nGrxvr;wGBnD)O%N=**k(Ud*BQb;tRKIDzwi zbmqsg4lm(@=&a0i1LmEKTUU+_HI4{hVlYa-$#Sgjz?Vt}!@KE?QI>14^9nYW*e}_}>3T8{dP0qL$%}g7b znRQ_g`rIBg!-q$c|7<4w-~i4ef9Wy@vXzFBNu+<#muv*-DZPy>A*+(ASZJ@;q4&>1 z*S?j5?W{mEvnhNH*Ti9UMaMA3`&ABCh`!{)#?# z1-)+=UAlkJr7h#c_Q#_W&R0|MfhOdh^bGQsR&j7ZThOY%j7>B032F*kx`Yy~y2h@VD zc{_UFdh}&{HO@akx=Np*@4)9c$^Czd$^-oH2ikBcd9lIDuo}%keb|I%Vs6-u4sdy# zua5Ihw4E+A!*7J|p#AK|V)y?6D|j#*KvVfucm!?W7@C=L;ScCQE})sXh(7l_*5F@g zMoQSr?v9D*eJ$t!S}|{fOR2c_E5ldN0renlr0wAz^uYmiK!fP>r;$yOm6tf0<{89P zqJ?;jSWlRC--)M*)x?vo|1>I=Mq)Ez$}BGscGm0(Wi3&g)lzyWT!jmXwm5f|)r7NN zPSg`m5N5^lIPnzmh$obG*Wb0TBRU8_tClGRvMel)dbT^L`+>Ptn0QuJaNHDiSw_@Y zp_swviP^-nL?>Z+&IA2tWiH2cQGXHnprtv)EMgI1*_a&*Z}r1bZ$-awD+#~t^9V}= z;k)6B>4#_uv4F6+bWMaWbS8)(|s^9AWVtu(+?M S6ORsUE&IN7XyKTnCI16=L7b}q diff --git a/locales/messages.pot b/locales/messages.pot index a6bb178..103d3b2 100644 --- a/locales/messages.pot +++ b/locales/messages.pot @@ -299,6 +299,3 @@ msgstr "" msgid "win_developper" msgstr "" -msgid "lab_dev_tools" -msgstr "" - diff --git a/scenes/developper/developper.gd b/scenes/developper/developper.gd new file mode 100644 index 0000000..3b6c092 --- /dev/null +++ b/scenes/developper/developper.gd @@ -0,0 +1,14 @@ +extends Control + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta): + pass + +func _on_quit_pressed(): + $Window.visible = false diff --git a/scenes/developper/developper.tscn b/scenes/developper/developper.tscn index e7faf67..6d6d37c 100644 --- a/scenes/developper/developper.tscn +++ b/scenes/developper/developper.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=2 format=3 uid="uid://cua4782cbjhla"] -[ext_resource type="Script" path="res://scenes/languages/languages.gd" id="1_irmml"] +[ext_resource type="Script" path="res://scenes/developper/developper.gd" id="1_qf0rd"] [node name="Control" type="Control"] -script = ExtResource( "1_irmml" ) +script = ExtResource( "1_qf0rd" ) [node name="Window" type="Window" parent="."] title = "win_developper" @@ -18,10 +18,18 @@ size_flags_horizontal = 3 size_flags_vertical = 3 metadata/_edit_use_custom_anchors = false -[node name="Label" type="Label" parent="Window/VBoxContainer"] +[node name="VBoxContainer2" type="VBoxContainer" parent="Window/VBoxContainer"] offset_right = 40.0 -offset_bottom = 23.0 -text = "lab_dev_tools" +offset_bottom = 40.0 + +[node name="TabBar" type="TabBar" parent="Window/VBoxContainer/VBoxContainer2"] +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_top = 31.0 +offset_bottom = 22.0 +tab_count = 2 +tab_0/title = "tab_sky" +tab_1/title = "tab_weather" [node name="Quit" type="Button" parent="Window/VBoxContainer"] offset_top = 35.0 diff --git a/scenes/languages/languages.gd b/scenes/languages/languages.gd index 5a6881a..a63210a 100644 --- a/scenes/languages/languages.gd +++ b/scenes/languages/languages.gd @@ -2,7 +2,42 @@ extends Control # Called when the node enters the scene tree for the first time. func _ready(): - pass + $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 func _on_quit_pressed():