From d63704c2562b362ceaaa20b862a3fc8bd7836cdb Mon Sep 17 00:00:00 2001 From: Lurkars Date: Wed, 24 Jul 2019 13:16:52 +0200 Subject: [PATCH] small menu improvements --- resources/ui/.~lock.i18n.csv# | 2 +- resources/ui/i18n.csv | 1 + resources/ui/i18n.de.translation | Bin 3436 -> 3464 bytes resources/ui/i18n.en.translation | Bin 3161 -> 3185 bytes scenes/menus/BaseMenu.tscn | 3 +++ scenes/menus/SettingsMenu.tscn | 44 ++++++++++++++++++++++++------- scripts/menus/settings.gd | 9 ++++--- 7 files changed, 45 insertions(+), 14 deletions(-) diff --git a/resources/ui/.~lock.i18n.csv# b/resources/ui/.~lock.i18n.csv# index 39f0bff..6b7bf00 100644 --- a/resources/ui/.~lock.i18n.csv# +++ b/resources/ui/.~lock.i18n.csv# @@ -1 +1 @@ -,lhaubaum,lhaubaum-ThinkPad-T430s,24.07.2019 12:59,file:///home/lhaubaum/.config/libreoffice/4; \ No newline at end of file +,lhaubaum,lhaubaum-ThinkPad-T430s,24.07.2019 13:14,file:///home/lhaubaum/.config/libreoffice/4; \ No newline at end of file diff --git a/resources/ui/i18n.csv b/resources/ui/i18n.csv index 271749d..0889bc1 100644 --- a/resources/ui/i18n.csv +++ b/resources/ui/i18n.csv @@ -38,6 +38,7 @@ LOCALE_EN,english,Englisch (english) LOCALE_DE,german (Deutsch),Deutsch GRAPHICS,graphics,Grafik SAVE,save,Speichern +APPLY,apply,Übernehmen KEYBOARD,keyboard,Tastatur JOYPAD,joypad,Joypad SERVER_ADDR,server address,Server Adresse diff --git a/resources/ui/i18n.de.translation b/resources/ui/i18n.de.translation index a9570404f31add3f777db6c00ae72e184418f39b..689a73a50e5db6e3c78f14f8b15dcaaca149f084 100644 GIT binary patch literal 3464 zcmbtXe@vA38UJ!rcl>D2QHLTGkE#TXN*&hO;%cEBD8hN;C~YZ|9mm__yyK4E`$8j4 zNGq}yB&oVgJd24&w5jz+i|e%UN2;XNuE}PzE>38dn_JVhT`IMk8Do2IpU->m*Imf| z+nYRjzR&Z0ete!E@9|RWu6<0HPbzo{i2S=C*LsiIS{Lzz)SyT6heJ^Pe~%UJb3qYB z4R=JmN>ecG^#q%=aFgm)LW;O2`7Y#XQ$!jxZHlUTe2OZ*1Htf6LZH=t;yf|*n;;t%-}ZmKupZ`YtqRG1EKM0&WWXr;(x(Rlu6&3EB~4Vhu`7DZ5H z2YEnz;&=#swt1dsa_afmAs2wwnEEo4uLpOU=Q@*b25&LX^kvhDyBjo+q~DG6kSQNY z(jQAYkKlX`^gifg&=@ENV%#rH&hrG$w@ulKUQov;3+K6@JX2Q)zQQ~wEaLH1N%F%u zKbj=drV6sl)YY53(d5nGt>&4wA)K`&nYwPs+d=)HouGZ7VG!?r34RX5(bz$kaF#p# z>?_L;Zi8TheirEVy5GOv1evy^dv7c~u?jrXB)A&8zjl817sD1|EFSNq{x|RKJpU+U z=`Z!MfBxaaCt*JmcOoy)sm z&l>smNPXVv>+_dDU~ayAGGAof&YVH$v!EkYROcO@0%v_B>EHWi&EG$S%%0B%N&jmd zZ38DEvu4(^$!Uo`2R^<3`uEqaOe@0)Mspy}WXHP%bpY%t1$2!fv6Qk50_*3Q82Ox09tVzb5ns~mO zcEnDa+WM0bz6)~B((aG3Uw^*@dd`eB{QKkk`@Vt9Si~Uv^U%AE_g{b$^N<>D&0pOQ zF6Z*}w(Z{@$31=6KZG!-sN&%A8xUA`vc97wzI_gY%ep0=%NtLPegJ!kyQZXH|1o67 zCCRvN|8Cdvop6$KmHJPv%^o5?IVbu4bbo1SV@%dVTI9Uaxd{H!Zlqzyp>zb{PP2BO zcydF6 z9(}&~0|>d$Ed~{?d~xtJIP(*a^#AS4&gf^5vq7|#`s_K+j?aO>9w+OIYk#n5BXGz% zr2TGZGLglN!vb@giq$% zc*wRo4rlHR`=z{g^GFHu%YI0^$)f93P6)Ce%FSEqBD0^=$-O;$`>Dm>z>YQX_h2Mz zYhwerd~cfiv|j%0<1X>uw&lY9ax*S-$~ul&!Y}nC`APlPzMK85nKNMy?!yAmeqd?n zh>V`|2E+!JaBC5ts1AqQ@ns}*ckbsxFP)oz#G(t`xyQb&I74@@wT?h6b#1Vhw%|ie zRmA$Rs>vX#qID@DQ5D|W?r9N~5zjOJfY57Wb7T86V`p>`PZ=F*%-oUnFJ06s-d0Tw zbVNE8;ZC^e?yEgrX*wc$TZO*SV$0C$a~o`M9xpK9#8dKxUN(_;HVQ<9^2n82#kwe0 znmc^tp@;t<$rD@pBycA8JX+0*(w-xb@Yjtb&@t^mZE$I4;4#On^MPtg^?6H z0!K!NeTqPRU5dS$;S;4+cp}Y;&>eMy=@<3F;*!Dita!>2;RxZ&(cSJ>g2KI3)s!|- z=K-^~7_(7AH(od*9uN6O&jmHVPqA-sb*_>FU`xLGAySt`lr|OJk6WCh!_k_IJ8kHz z%g}4DWu>O;fjwb>Ew|?DfrX7G^n`S_h7rP=Dqu98@!!rl`JwF!M>K%8)r@4vSoob3 z^_#5o90*x^*Yc~6&*WHmI?q|V!m53xIc9V-YSjbtGV-H9VWzm_V{V|iJXjZa>tzRu zIN1(O}0h~56Dh(2agtSK}U=>=`{t}Rcrg)xrpX= z6y(NAbm8!akkWVsxV9BaYfy<`W^{eyQ^#JkJwJ-obw@Mtb_`F-?o{Uf1$&F97XO3& E2i@vUng9R* literal 3436 zcmbtXdu&tp6~1vGa~{Pdr5Pa&IHhC|LDMX21`7kl!wH1MWOmw>M@b#$Vmo&1)c2Z- zAfdD&Z4;tV*hX**QW!6dQrd>0rsA>Ds6bn(Wm+dnQZ}#C#Av6ILC2OwyWaO*-ygN2 z{|lNH77l@;k*Fmw-D%Er-$>Y7w{b5NG< zf!Q4O1Z33!m`PD1{*X86rg$R$b`@ZBA<-;MJ=!#yLvMs`G0wc(igSC4O{@cUC**lZA7l??0K#{J&_fW8#tJ!yv)JLM zcP={6ZIUDl@OvS5mVffAz0kZ%x$m=*6V=c;hQL*#EG^8t(T@WckM9Kj(Yr65TGHe6-8uef8E{e0w8c9P|Kl6#kRI(D?FBCGiTYl7{q2hdFxVr% z9)Zt(>uMoq&fMfc&b5w!RB6 z*fV=s<1obvVNd2?yZ_Yrl9c|1|F)NH4@6;*W7hV3@PLE6N6wfFE_w}%fA?$4+Xluu zziK&p7)sB}-1qhkjO~Y>%tzHPJQq3KYsl~)Ipmf>U-nO z{QLofH`X^bUtSr8&DqlrM_sa(b&pJk6Z>Y}0w4HG&E+6$&X_%kxD#Vrx0S(W?Uacv zPYo_dvtr-Gy+6l4{B8ws&Wt_$_u~h9*288j)*$#<^4kp$&Vj)^ly$cXD{e!JxvYO~ z`|Y12D1FGEsIRp8z@j?%vFB7g+LGA512}u8h}N z;No88$@W(}Q*4pV}$fdyV>7C!lzw7Lu^@~2|9^2Zy43`Rk&4bJ@d$zv| zTFg=S|NccsY%PpDyyIPg=Y9L>(SN}pr>S_k^ZRQij5ypCaeud?X5u$6CeQ!s?vbJe zC`#0KI>)zsItU^M6yaZA=zk^?_rzQTer&8`=v^3->;CtW7Z?5%{@kh5zY`-r3%k}J zPCjsoh~w>g*9QE=Vb&H`+TnVTK{(p zJ9RG6&htY@f%9j@1BNea>B>5Pq87o#yopgNUr@L2#6i?2@~u8-skjD%T$3;P=*=TH zU<*FPz46kkwft@cAM(vxN`?`SnD{$?`p(*UPr_zT{Qd`Xw`}-3wD?Y%derVy2+CdJ zdrRxN{nrtPF_@FJQjVL#FFXS+`~?1`_h#=B;G79_a3AJCc4Ox2qLJYJ+_l#Pv+?0e>3cM(E*x&hPbEon6-6}^C-S>1% zlkEP`CdnRBH%Xdfk9A>rwtfq#T9Lho~v| z8?vsDo1R`lkR&Jm&-x!R_el)^ diff --git a/resources/ui/i18n.en.translation b/resources/ui/i18n.en.translation index aff3f0113c94586ac966cec199bbc335bfe9bf8a..03d8316bdf28ffad1aad84ebcfc9244ba8506721 100644 GIT binary patch literal 3185 zcmbtXc}x^%6#qD+u%IX^f+Dg~2^f%ig0j(ifnr&ykQ$G;&hCy2vX?u%7-~Y5LY1SD z+IVZLQLtJ;MXfZb^{CR+wA$3xinP%-jg>!?YD=o5Lw|3W4=2X|I?2m>@Atj?eX|UU z@)pfz>JtF&2O>TQlsiw53i3UIQ?d)*LYEWJ|9gVr9tHAJ$=dja-#r~_9bO-oH3&%&r_JTL8;h7kyg0|_8{dhk%KLsWUV$_b|@4tfG8UBzdq zd>*(_mGf1;0^F*~!H;U>Cdg+&S3x&HZJ@g#irb-bk~<-H zsd_M)Cybs5$WfqJ6-xvkr^>w+Jw1~&`ZUO|Yjm>7hMucpZ>fB_%FW;fs!X;{$X<<3 zSSj>!P!*^avkol!uvpHpdsXtS02HlRX89yBspur-?Hly}E9Srav4h zc5HIZ9i1i~$9Et5ytNYcRA0DiOJ}iXZjZbUPPu3{JfCMqZS*i0kS)C!nQz3_HGV?#*NO!6`lww>y3!IywzHue)EgI4?`>gX|zGq?=yR=7ST>mS)fKeZOVh_!0Vx zd+zRBS4y@Nmwv^%OI9|8!inD>p8ww6Zzr_loa6uA99_8#c9fg)@cB%=uzYj}aGrnZ z#;&}h6#2OD2!srh2xba8U znV$e32rLqmIDW(ScfhF^?eEO@n~Xa@21f6bcFvK**4+6582Jwc@q7~(r7g@w624E4 zZ!uU^5&(QIOnT=-o6oM6jK}5xBgfzk}?AATSGcz7H9~LRFndwadGF$B`aSK+K zQD#^bqmx<8Hdky}ilHuOW{AuLx7%LAJQ)%3zOd>r=vFI}gkq5~*|^ddQXTXD=9Ng( z2%6$zOz`c7h2=y=N3Syteg~7v7xkqrg<9u$`H&ZN+T1Rl4qJ?vTDF&8+Aj&qF{*OGFJq>F}>hVjQ zMX?gbW^7;DTmD$nED)SQppQ3*?Z0{0_#1gYh@K}2n!qmEQ z$`B6~;JS?3+ZS+Rtg=I;pOl2iY(r(<2$}hErARcz?}k$COuOju>RAl3D=wZwTfy_a OOurn+!?Q*BXX8JdJg3b7 literal 3161 zcmbtXYfMyE5I(F(VMXvs0Tab04^O7Xvm#5$Xdf z*2cFc8U<4;KA=_`s;RY=rj3uLS}WRy+B8;8lweDWq?dlPoKtU%|9X>QX1+7?otZi3 z-YnTU+4C5G20{BlNDqf(Ewso*xo(S7wp%>KE+?S>_XHw69O9N_m)D&yneDE8i{0#T zndN-RDX|dsn$zNtSP&40B+HgUNoKFX@nuMC2+Sf>XZBdEc8LvzYxU-rN*)f-PO`^c z>?|Belk?rhWgdV79crO{Of!>`CbM8_8qX_xreXL)^biY#o_;)3>nLtVa!oirdiZgW z6pqj3dLgul+qqn?g0^v+a%sv`XceShh3|lUfcs4<{DjJGf&Dq;3gjlF1JVg0-bY-M z-37ac`~GO2FnU5@kAg&UEEakqw+ABn`zNXVX|RndpJLMBFX31=*Gsux1#ROt#g@P> zQ~88d!e0-04^j`=1vvzvwHD~}kin>354i|iT-r4aiHAGk)6F31nf=p8mC%5EGV=b! zlT%^SjiPmd8>7M=PJttQp|5|v{el&7boR8Lz&oG+^4&F+FYw6^P4^ms2Sey?P#&%2 z<_7w?Gy@#O6Ob+?y~+Im_|4DG<>$c{JbR)K?DxQ@HM;OHeQWhSC#EjsdBhWvQrGA} zlE@R9O|8Fccm=-y)MxEKB9H0|<(!lgeeO=wb!gg)W+V1<&)yz!6af@VFGkvu=*Czq z(yK$So7k`RbjDx3a0sWqMgDECqh1R~#ATW^d$;j8b-ptC?4>z~qy5$WR_&XsyM=h) z%&_*J{jljVG@TvoBhEeL`%gl*!54M?X*)*8;LD@jVfBZ))14MS+yOtaA>wPdx0PN zZNZJD@LxXXzOHpuvA~I!zG8h9t6Q?MDb=X1^ViO6Q!-TeKR3s1k$9c7kC@MlFIJ9A z0WS7m-W@gVBIhE$71cG*9-}Cl=}3sEFDdPC;!@<%97d>cudTmk6L6|ceP7xaw_Y|Q znff8gNZqPbz9RqZtq&6EJ0SKE`rhqP2Z&SnqW-E!8VA)$K1ryBJQ zl9(5^^l^Oot!7yVaKV?_TK4f>I3iErCu>*i8-pC`g+$;(x5n2~--OYf6TC6U*IDV? zISdj8iJ!b-cL6ljuKuq4u-UXX0A%$3sOK8?`kK2=;FLcaBKAwpo}PIbKHVMlJ=tMe z(6<;tR5#64)NyA=hhYzJiluwn7F;wt8H*xL@Mc66udRY3?y10!cU7Lx;<&o+zh`Vt zaDtC`)!&JZ4_!I*?WLYc1W)0{NzI$!6Th0LW7Xgz?*gNlP_H7MJqg+{3%+>2L_h8E zN<*Hio{L+5-hCf&#Hr@>uD^7CCgP~)2#Da_sJ(Qu70%1&o4UzUGY&Y_KsjQ+#YaM? zjfO+#M!ibMo;F3n7k!Ah-lRL}q6Rt}>1nro6GTPJPi{Eh8#cehMw# z6Y~~N?I6xiSZK+`gAz!{CJ}rmG_Fnbn}B!)H?2J>e7f}wXsUtEh3>*wNCP;nmi$t- zD2uV`L}O#XoFIj1oA<1WOEfC1RI0GLEN&YM3kWc#Da;)FAR;{6(4;VbV_<~O(CuTg#Vk7se9M;$jN0Nok%NMT!YU==U=)W!~62-TM;~{JZ9oTlf4_ z&J6`W3ms*Q^#(Uj==Y0%Tl1B6Z@=FJ#!6fjWfmJ#Osl;?$ZA-P!BCbrY$Ap1aM6B^<0)-^IHk<7OKy*W=}?MqKBz9n8(bHxu&}WQ^AfnN zWEq;KFHlM~IZme&Ww|^uTjVUa*o$rYMOo!<=`m*fE|v|1M=D^9ME zJ(6Q!vl3UalNHjBZ>s-AGsLHq1cWMVjknmt4B9x{1(b7DBU;R;9ylzPjejcs1?~W& A4*&oF diff --git a/scenes/menus/BaseMenu.tscn b/scenes/menus/BaseMenu.tscn index 21392a0..e152c0a 100644 --- a/scenes/menus/BaseMenu.tscn +++ b/scenes/menus/BaseMenu.tscn @@ -23,7 +23,10 @@ anchor_top = 1.0 anchor_bottom = 1.0 margin_top = -56.0 margin_right = 132.0 +size_flags_horizontal = 6 +size_flags_vertical = 6 custom_fonts/font = ExtResource( 1 ) text = "BACK" icon = ExtResource( 2 ) flat = true +align = 0 diff --git a/scenes/menus/SettingsMenu.tscn b/scenes/menus/SettingsMenu.tscn index 6d9ab9e..ab31707 100644 --- a/scenes/menus/SettingsMenu.tscn +++ b/scenes/menus/SettingsMenu.tscn @@ -1,11 +1,12 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://resources/ui/theme.tres" type="Theme" id=1] [ext_resource path="res://scripts/menus/settings.gd" type="Script" id=2] [ext_resource path="res://scenes/menus/BaseMenu.tscn" type="PackedScene" id=3] [ext_resource path="res://scenes/menus/SettingsPlayerMenu.tscn" type="PackedScene" id=4] [ext_resource path="res://scenes/menus/SettingsControlsMenu.tscn" type="PackedScene" id=5] -[ext_resource path="res://assets/icons/save.png" type="Texture" id=6] +[ext_resource path="res://assets/icons/checkmark.png" type="Texture" id=6] +[ext_resource path="res://assets/icons/save.png" type="Texture" id=7] [node name="settings_menu" type="Control"] anchor_right = 1.0 @@ -35,7 +36,6 @@ size_flags_vertical = 3 tab_align = 0 [node name="game" type="Tabs" parent="menu/tabs"] -visible = false anchor_right = 1.0 anchor_bottom = 1.0 margin_left = 4.0 @@ -44,7 +44,6 @@ margin_right = -4.0 margin_bottom = -4.0 [node name="GridContainer" type="GridContainer" parent="menu/tabs/game"] -editor/display_folded = true margin_left = 9.0 margin_top = 10.0 margin_right = 416.0 @@ -114,6 +113,7 @@ margin_right = -4.0 margin_bottom = -4.0 [node name="system" type="Tabs" parent="menu/tabs"] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 margin_left = 4.0 @@ -167,24 +167,48 @@ margin_top = 72.0 margin_right = 895.0 margin_bottom = 109.0 -[node name="save" type="Button" parent="menu"] +[node name="GridContainer" type="GridContainer" parent="menu"] anchor_left = 1.0 anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -margin_left = -147.0 +margin_left = -286.0 margin_top = -56.0 grow_horizontal = 0 grow_vertical = 0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -text = "SAVE" +size_flags_horizontal = 10 +size_flags_vertical = 10 +columns = 2 + +[node name="apply" type="Button" parent="menu/GridContainer"] +margin_right = 150.0 +margin_bottom = 56.0 +grow_horizontal = 0 +grow_vertical = 0 +size_flags_horizontal = 10 +size_flags_vertical = 10 +text = "APPLY" icon = ExtResource( 6 ) flat = true +align = 0 + +[node name="save" type="Button" parent="menu/GridContainer"] +margin_left = 154.0 +margin_right = 286.0 +margin_bottom = 56.0 +grow_horizontal = 0 +grow_vertical = 0 +size_flags_horizontal = 10 +size_flags_vertical = 10 +text = "SAVE" +icon = ExtResource( 7 ) +flat = true +align = 0 [connection signal="item_selected" from="menu/tabs/system/GridContainer/locales" to="." method="_on_locales_item_selected"] [connection signal="tree_exiting" from="menu/tabs/system/GridContainer/locales" to="." method="_on_locales_tree_exiting"] [connection signal="visibility_changed" from="menu/tabs/system/GridContainer/locales" to="." method="_init_locales"] -[connection signal="pressed" from="menu/save" to="." method="_on_save_pressed"] +[connection signal="pressed" from="menu/GridContainer/apply" to="." method="_on_apply_pressed"] +[connection signal="pressed" from="menu/GridContainer/save" to="." method="_on_save_pressed"] [editable path="menu"] diff --git a/scripts/menus/settings.gd b/scripts/menus/settings.gd index bb67087..ebcf116 100644 --- a/scripts/menus/settings.gd +++ b/scripts/menus/settings.gd @@ -60,6 +60,11 @@ func _on_locales_tree_exiting(): func _on_save_pressed(): + _on_apply_pressed() + _on_back_pressed() + + +func _on_apply_pressed(): var values = {} values['player_name'] = player_settings.get_name_node().get_text() values['player_color'] = player_settings.get_color_node().color.to_html() @@ -78,6 +83,4 @@ func _on_save_pressed(): local_storage.write_values(values) game_server.set_server_addr(server_addr) - game_server.set_api_addr(api_addr) - - _on_back_pressed() + game_server.set_api_addr(local_storage.read_value("api_addr",game_server.API_ADDR))