From e2f8d61431f49d36d786990b4910685a35d1a066 Mon Sep 17 00:00:00 2001
From: AleaJactaEst <jean.sorgemoel.liber@free.fr>
Date: Fri, 15 Apr 2022 17:03:37 +0200
Subject: [PATCH] update translation, windows theme & languages, and button
 exit

---
 locales/en.po                   |   3 +++
 locales/fr.po                   |   3 +++
 locales/messages.mo             | Bin 5215 -> 5499 bytes
 locales/messages.pot            |   2 ++
 player/player.gd                |   4 ----
 scenes/languages/languages.tscn |  11 +++++++++--
 scenes/music/music_manager.gd   |   8 ++++++--
 scenes/music/music_manager.tscn |  20 +++++++++++++++++++-
 scenes/themes/themes.tscn       |  12 +++++++-----
 9 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/locales/en.po b/locales/en.po
index 41fd237..7aaf9b6 100644
--- a/locales/en.po
+++ b/locales/en.po
@@ -290,6 +290,9 @@ msgstr "Music volume"
 msgid "MUSIC_MANAGER/EFFECT_VOLUME"
 msgstr "Effect volume"
 
+msgid "MUSIC_MANAGER/QUIT"
+msgstr "Exit"
+
 msgid "EDIT_CONTROL/MOVE_CAMERA_REVERSE_HORIZONTAL"
 msgstr "Reverse horizontal"
 
diff --git a/locales/fr.po b/locales/fr.po
index 0166088..57a6a18 100644
--- a/locales/fr.po
+++ b/locales/fr.po
@@ -290,6 +290,9 @@ msgstr "Niveau sonore de la musique"
 msgid "MUSIC_MANAGER/EFFECT_VOLUME"
 msgstr "Niveau sonore des effets"
 
+msgid "MUSIC_MANAGER/QUIT"
+msgstr "Sortir"
+
 msgid "EDIT_CONTROL/MOVE_CAMERA_REVERSE_HORIZONTAL"
 msgstr "Inversé horizontale"
 
diff --git a/locales/messages.mo b/locales/messages.mo
index d9426a62e8af6fc28251eb85a8a0635e544d7286..57be303ae684724896fc9ea9f4ced7bdc0d7e92f 100644
GIT binary patch
delta 2222
zcmYM!TWnNC7{Ku<EZtI<LRW>hh_*nn7pg@>r3l5ADwSS9Sb?ftLZW>jM!_^*h*_0~
zRv$F5!30A{2oM_e$u%anAyFQ@1|km{qY)B`MiVvOq9nZd|L+bs+3);j&dxbA^PM^8
zLeu4z-1&6kV4&<EZZM{Yuusc5P?{=2xCWbX7Oub)c4IYe#M!trx+nTl{Qp4oI9^A;
z_wZW$9Md7>!UZaIocI&x;jEb<)M6vnU}tP^!|Q49iH@TaK7!753S03sHsf#T1Zyfo
zXuuY9oIYgWFoG$@56@AdZx}=75cZ=heIuTqi09uyeqoA(EBOd-!f&w=FQWrCkS+&W
zj&pDTJ)e#4Mklb({~15LPQ{g-L|1$Y&A?Y^YJZQKcUL?I=VBY$Z(VE;<9ynq=!*B_
zVk}?_evM{$I;(R5^D*ZD?NprUT67|tkY5<#;7mu+XEu%rJd9@QD4Mx9(ShHMet~A-
z7xemMRmnPZ;I?R275VqZTRAZUcSU!j6MGt`;TU?uS8ySoKvVw-y3(J}j8t-w8EJ^F
zLa)o9nSBynz{}`FUY$+;sfS}6$WACAlMWxCo9Zkk%R=}Pc?#h>(&Ya?qy7IypKXEz
zUBX;6BTJ&~$O{!ZqHECmcA*RI%~5eigXoR7psC%74zLTo;2AVi_V@pM^e}qe3AA4U
zP5C7HNY9}6KaZ~XBHI5F@(a0gdV4_)2WQlZNnD1mWMw?xjozpi9cUo_pTPyRv*=s!
zJlgLVI)Mo^1MkQ4r=q8k@p9qg*x?MivU6yvzd<wbBf1CvLMQYO`m9Zd{pO*YZ&7S_
zB3;4;^w|%id*xZY84scN{SasR{+}&Ycs-C;ID8-d70tw@sQGh(73lfu*set<wh&G2
z(r5=d(0Vi@ndlIj!K^ZVc#Mh{K8`+uz0nuZfyU4byoO$Q0PFD(nu$qth3C+If1m^Z
zjoz<}ciLy2jMkzPYQ-FVLOT`hK`$IaCp3cIU=(=?ie(!|)4P;dOspbqCmte9w|k+J
z$Pg=uM#9oc>>$jPWedSrxo~H(8Nzn--L|xq2%GR;VqI)Mf;SSbx{vUA-a(iZ%L<}{
zXtzP>A(jw}i1mbDPmA9SOTy>hTdEgRw3d2(Yzqr7mO+l$SeFfiDYuxp2Z+0fe&R|Q
zxKhE@#87N+MZQ<zZekhZhx-W2aEan>zBSg@pkK6&L^E*@VexzJ-f%<u;klpaCM-U>
z+Xy$a-+Rl$gl~&qK}%POV#bP_#&^`hW)BY%w-B2Ni+jN0``kn<FZ__aI4wU>nJ&-v
z4`w#^6ecUj%PI#4`nH$a`KnY+zAIIqU!A(zWiYjOM*i*U1r_y8{ZEWO^=Nbc)9TOi
cFQgOypLnafE`KDQq*pDLU;U$SJUvzRAG@-)u>b%7

delta 2095
zcmYk-ZD^KN7{KxK=-g&|p0+kuHk;+r<~Fl6)0)-F`94dV&V1>`52Xz<6$J}rJrHD(
zgu%!U8AeuLLJC}hU`0qT6iEb`gTnlv;7Tkc$q2Fk|K25d*meKz_j9i6ocq~-&A&}9
zo~SN)Gtr(PZX!xXrc}hUqu9{Sl%-UGLs-BIn8%UjDP4zEScwf`Ti6-bmxfQ{81CDO
zHMkS2?dlzN>Ns%#Z@{B?Bc8^wcsY*8j!vnT<F;@CI^ZX<6t`mwzJyKq5jwy@oPfWh
z{p7F7I!=w4H`ST!a4pS8`bynsrmN$8Z=BzZ{H5(|%wz}NjC;_I4x=3$#VR}#=l=~W
zC?grCdh~iL)>`UW?3n2aH1kbpNnZ=!LNomkug7oD`%c91MI6U*CG#>7ThK~Af)2D7
zeP18i@#|<M_hQjZKVip_9YN>j7?$7=T9I>Th5kW1%JGoaqZzlO&-aASpdD`uccJfn
zA6-_5!p{rT-;sUEi4ph{`oiPbfalQ?*Iqk3httsttUxQUA$%2mZXa67&(H*ZMhEf>
z+RtA|4%q>(PK8S9@8TK9)v_F&BGpXI)X5uWpbyMJ=eQev(NkzewuF7ihm&3jccSmz
zg=V}P9njn8d*4MX`*D#SJ2-?s@D*CB@8gD(;Sl=ZdGtO<W68^qQ>hN^paspi6}^8h
z@|Tve@&2{wfL=hp<Wzi-9W&Vx7v4Z$v>WYcPh8)J^&Iby>))Xr|A1zGGR~h0htQ7B
z#r40@j4z@U&M_JiFQx)J&V3y^ka~2E8_^p((8bmj$Lo;4w3&@-<7KphAE3`42tP%>
zy!3VWBbxEA;VCTl`#&2eE@UTCx`e){lzFg(RpEHFqbX>G+QSaCQnSM@^to=d0&Bvx
z=m4HY6W)TQ^q;n}a|`yNneRn2JBZ$R4DEOjec@@Ois_H=5;~wtCf>Op6E>mGb)W-U
zgg(CtS?gJ||8)QGe!30)VR)2yh`59BbLt^%uKd-6({e9yb#ralZYNd}O~g#XW;Gq~
zDi3HTwU}U9v;IAores@wwXl;|LM$LA6SfB8aU%Qvv5~MXBK+rN8&6CmNH9G>_$zp&
zb+a>zaItm}cM@0kpQdp*kLV&M5%&<bTM4Jb5?^T#v$K?Vka&!kO4uxOGjTV;Z%sC>
zb8!yQMob`<6aJjrrklTu$JRPbww=MYg_uwH%jTzc7qN_RPHnDk8|yXQN3aaCUqwg@
z-O!wG7oDG;t(}<dPUrHTo+XRd478RHju@C)u`SpCXTH#XJYO?VTj(9t|6cXC{m)fb
Sl&;&je*MPh2fnB|ockY1TBFJU

diff --git a/locales/messages.pot b/locales/messages.pot
index 6eb56e6..34baf9b 100644
--- a/locales/messages.pot
+++ b/locales/messages.pot
@@ -281,6 +281,8 @@ msgstr ""
 msgid "MUSIC_MANAGER/EFFECT_VOLUME"
 msgstr ""
 
+msgid "MUSIC_MANAGER/QUIT"
+msgstr ""
 
 msgid "EDIT_CONTROL/MOVE_CAMERA_REVERSE_HORIZONTAL"
 msgstr ""
diff --git a/player/player.gd b/player/player.gd
index 8b37d4c..36e6608 100644
--- a/player/player.gd
+++ b/player/player.gd
@@ -452,14 +452,10 @@ func _input(event):
 			switch_camera_fps()
 		if event is InputEventMouseMotion:
 			if input_action_camera_move_player_mouse:
-				Common.msg_debug("Move " + str(Common.get_mul_mouse_camera_player_move_reverse_horizontal()) + " / " + str(Common.get_mul_mouse_camera_player_move_reverse_vertical()))
 				move_camera( Common.get_mul_mouse_camera_player_move_reverse_vertical() * event.relative.y * 0.01 , Common.get_mul_mouse_camera_player_move_reverse_horizontal() * event.relative.x *0.01)
 			elif input_view_camera_move_player_follow_mouse:
 				move_camera( Common.get_mul_mouse_camera_player_reverse_vertical() * event.relative.y * 0.01 , Common.get_mul_mouse_camera_player_reverse_horizontal() * event.relative.x *0.01)
-				#move_camera(event.relative.y * 0.01 , - event.relative.x *0.01)
 			elif  input_view_camera_move_only_mouse:
-				# move_camera(event.relative.y * 0.01 , - event.relative.x *0.01)
-				Common.msg_debug("Move " + str(Common.get_mul_mouse_camera_only_reverse_vertical()) + " / " + str(Common.get_mul_mouse_camera_only_reverse_horizontal()))
 				move_camera( Common.get_mul_mouse_camera_only_reverse_vertical() * event.relative.y * 0.01 , Common.get_mul_mouse_camera_only_reverse_horizontal() * event.relative.x *0.01)
 		if input_view_camera_move_player_follow_mouse or input_action_camera_move_player_mouse:
 			reconciliate_rotate_camera_player = true
diff --git a/scenes/languages/languages.tscn b/scenes/languages/languages.tscn
index 8206419..b7c38e0 100644
--- a/scenes/languages/languages.tscn
+++ b/scenes/languages/languages.tscn
@@ -12,8 +12,11 @@ visible = false
 [node name="VBoxContainer" type="VBoxContainer" parent="Window"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_right = 40.0
-offset_bottom = 40.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
@@ -23,11 +26,15 @@ text = "Select language"
 [node name="Select" type="OptionButton" parent="Window/VBoxContainer"]
 offset_right = 43.0
 offset_bottom = 31.0
+size_flags_vertical = 3
+metadata/_edit_use_custom_anchors = false
 
 [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"]
diff --git a/scenes/music/music_manager.gd b/scenes/music/music_manager.gd
index 910f8c8..c28f698 100644
--- a/scenes/music/music_manager.gd
+++ b/scenes/music/music_manager.gd
@@ -10,6 +10,7 @@ var music_play:bool = false
 var select_rand:bool = true
 var list_music:Array = []
 
+
 func _ready():
 	var directory:Directory = Directory.new()
 	var files = []
@@ -42,6 +43,7 @@ func _ready():
 #	var u = db2linear($Music.get_volume_db())
 #	Common.msg_debug("volume :" + str(u))
 	$Window/VBox/Tab/Mixer/MusicLevel/music.set_value( int(db2linear($Music.get_volume_db()) * 100.0))
+	$Window/VBox/Tab/Mixer/MusicLevel/Value.set_text(str(int(db2linear($Music.get_volume_db()) * 100.0)))
 	var bus_name = $Music.get_bus()
 	Common.msg_debug("bus_name: " + str(bus_name))
 	var bus_id = AudioServer.get_bus_index(bus_name)
@@ -50,6 +52,7 @@ func _ready():
 	Common.msg_debug("GLB Volume: " + str(glb_volume))
 	# AudioServer.get_bus_volume_db(AudioServer.get_bus_index($Music.get_bus()))
 	$Window/VBox/Tab/Mixer/GlobalLevel/global.set_value( int(db2linear(AudioServer.get_bus_volume_db(AudioServer.get_bus_index($Music.get_bus()))) * 100.0))
+	$Window/VBox/Tab/Mixer/GlobalLevel/Value.set_text(str(int(db2linear(AudioServer.get_bus_volume_db(AudioServer.get_bus_index($Music.get_bus()))) * 100.0)))
 
 
 func select_domain(new_domain:String):
@@ -208,20 +211,21 @@ func _on_reinit_pressed():
 
 
 func _on_mute_toggled(button_pressed):
-	Common.msg_debug("Mute:" + str(button_pressed))
 	AudioServer.set_bus_mute(AudioServer.get_bus_index($Music.get_bus()), button_pressed)
 
 
 func _on_effect_value_changed(value):
-	pass # Replace with function body.
+	$Window/VBox/Tab/Mixer/EffectLevel/Value.set_text(str(value))
 
 
 func _on_music_value_changed(value):
 	$Music.set_volume_db(linear2db(value/100.0))
+	$Window/VBox/Tab/Mixer/MusicLevel/Value.set_text(str(value))
 
 
 func _on_global_value_changed(value):
 	AudioServer.set_bus_volume_db(AudioServer.get_bus_index($Music.get_bus()), linear2db(value/100.0))
+	$Window/VBox/Tab/Mixer/GlobalLevel/Value.set_text(str(value))
 
 
 func _on_window_close_requested():
diff --git a/scenes/music/music_manager.tscn b/scenes/music/music_manager.tscn
index 72676c9..eeadc05 100644
--- a/scenes/music/music_manager.tscn
+++ b/scenes/music/music_manager.tscn
@@ -94,6 +94,12 @@ offset_right = 8.0
 offset_bottom = 16.0
 size_flags_horizontal = 3
 
+[node name="Value" type="Label" parent="Window/VBox/Tab/Mixer/GlobalLevel"]
+minimum_size = Vector2(50, 0)
+offset_right = 40.0
+offset_bottom = 23.0
+text = "0"
+
 [node name="MusicLevel" type="HBoxContainer" parent="Window/VBox/Tab/Mixer"]
 offset_right = 40.0
 offset_bottom = 40.0
@@ -109,6 +115,12 @@ offset_right = 8.0
 offset_bottom = 16.0
 size_flags_horizontal = 3
 
+[node name="Value" type="Label" parent="Window/VBox/Tab/Mixer/MusicLevel"]
+minimum_size = Vector2(50, 0)
+offset_right = 40.0
+offset_bottom = 23.0
+text = "0"
+
 [node name="EffectLevel" type="HBoxContainer" parent="Window/VBox/Tab/Mixer"]
 offset_right = 40.0
 offset_bottom = 40.0
@@ -124,6 +136,12 @@ offset_right = 8.0
 offset_bottom = 16.0
 size_flags_horizontal = 3
 
+[node name="Value" type="Label" parent="Window/VBox/Tab/Mixer/EffectLevel"]
+minimum_size = Vector2(50, 0)
+offset_right = 40.0
+offset_bottom = 23.0
+text = "0"
+
 [node name="HBoxContainer" type="HBoxContainer" parent="Window/VBox"]
 offset_right = 40.0
 offset_bottom = 40.0
@@ -141,7 +159,7 @@ offset_right = 527.0
 offset_bottom = 600.0
 size_flags_horizontal = 6
 size_flags_vertical = 8
-text = "OK"
+text = "MUSIC_MANAGER/QUIT"
 
 [node name="Mute" type="CheckButton" parent="Window/VBox/HBoxContainer"]
 offset_right = 236.0
diff --git a/scenes/themes/themes.tscn b/scenes/themes/themes.tscn
index 99b5980..8d4d5e6 100644
--- a/scenes/themes/themes.tscn
+++ b/scenes/themes/themes.tscn
@@ -6,16 +6,16 @@
 anchor_right = 1.0
 anchor_bottom = 1.0
 script = ExtResource( "1_a1yak" )
-__meta__ = {
-"_edit_use_anchors_": false
-}
 
 [node name="Window" type="Window" parent="."]
 visible = false
 
 [node name="VBoxContainer" type="VBoxContainer" parent="Window"]
-offset_right = 40.0
-offset_bottom = 40.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+metadata/_edit_use_custom_anchors = false
 
 [node name="Label" type="Label" parent="Window/VBoxContainer"]
 offset_right = 98.0
@@ -26,11 +26,13 @@ text = "Select theme"
 offset_top = 30.0
 offset_right = 98.0
 offset_bottom = 61.0
+size_flags_vertical = 3
 
 [node name="Quit" type="Button" parent="Window/VBoxContainer"]
 offset_top = 65.0
 offset_right = 98.0
 offset_bottom = 96.0
+size_flags_horizontal = 4
 text = "Quit"
 
 [connection signal="close_requested" from="Window" to="." method="_on_quit_pressed"]