From 2413e4f8e02ee398db5cf4e4ac496f8391806dfc Mon Sep 17 00:00:00 2001 From: Andrin Fassbind Date: Fri, 29 Apr 2022 12:27:22 +0200 Subject: [PATCH] refactored GUI to be able to just switch between diffrent pane in center refactored dictionary hirarchy --- .gitignore | 4 + .gradle/7.4/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../turnierverwaltung/main/MainWindow.fxml | 94 ---------------- .../participandFormular.fxml | 2 +- .../main/tournamentList/tournamentList.fxml | 100 ++++++++++++++++++ .../tournamentList/tournamentList.fxml | 14 --- .../compileJava/previous-compilation-data.bin | Bin 20975 -> 21079 bytes .../turnierverwaltung/main/MainWindow.java | 15 ++- .../main/MainWindowController.java | 57 ---------- .../participantFormularController.java | 25 +---- .../tournamentListController.java | 51 +++++++++ .../tournamentListController.java | 4 - .../turnierverwaltung/main/MainWindow.fxml | 94 ---------------- .../participandFormular.fxml | 2 +- .../main/tournamentList/tournamentList.fxml | 100 ++++++++++++++++++ .../tournamentList/tournamentList.fxml | 14 --- 17 files changed, 268 insertions(+), 308 deletions(-) rename app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/{ => main}/participandAddFormular/participandFormular.fxml (98%) create mode 100644 app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml delete mode 100644 app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml rename app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/{ => main}/participandAddFormular/participantFormularController.java (76%) create mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentListController.java delete mode 100644 app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentListController.java rename app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/{ => main}/participandAddFormular/participandFormular.fxml (98%) create mode 100644 app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml delete mode 100644 app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml diff --git a/.gitignore b/.gitignore index c25f212..f3e80ea 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,7 @@ hs_err_pid* .gradle .idea +/app/build/tmp/compileJava/previous-compilation-data.bin +/.gradle/7.4/fileHashes/fileHashes.lock +/.gradle/buildOutputCleanup/buildOutputCleanup.lock + diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock index f90d1f6ef300d9003e5562ccdf55481c550c68a4..45a4b0d383b500974c9077d200d937e69195696d 100644 GIT binary patch literal 17 VcmZRcx~p9LshesS0~j#=0st{B1hxPG literal 17 VcmZRcx~p9LshesS0~j#Y0st_u1UUcz diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 46c3158f912dca0ffbe8f4cc82a675e5685ce001..0a00c1c795fcaf0ed811071101e382768fbab381 100644 GIT binary patch literal 17 VcmZQBJ^h>gkcECJ0~j#!0RS@*1M>g? literal 17 UcmZQBJ^h>gkcECJ0|cB005i}8vj6}9 diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml index 831d491..af04e72 100644 --- a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml +++ b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml @@ -1,108 +1,14 @@ - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml similarity index 98% rename from app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml rename to app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml index c64bf07..df5040e 100644 --- a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml +++ b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml @@ -17,7 +17,7 @@ - + diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml new file mode 100644 index 0000000..9a52479 --- /dev/null +++ b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml b/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml deleted file mode 100644 index 2372a7f..0000000 --- a/app/build/resources/main/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - diff --git a/app/build/tmp/compileJava/previous-compilation-data.bin b/app/build/tmp/compileJava/previous-compilation-data.bin index 840f5c6796c7465c0a95063ce875f0685824a9be..611f7c9c3177b4dfc7159dacea1dc5134fdf899b 100644 GIT binary patch delta 15736 zcmY*=d0fqD^#AkOKcCCxW9(&@eO$}f$J%YtbX%sIVvMEbQnaa?(ae~eXfM%+l$26P ziz2D)TO}bBX_GBknnFZ~-+40M@9X>f>wTVcp7lKEIp;jj=ib&7qAHcx;UF50s??3w z4?bM{WAxD#vGgxHHw@DCQTA2!Q}kC2P|yQWxYpCx+rzSWhVKv3U_wPx zsE@wnMi_i2B*KW$m+ljTN#K4U#_IGDvQe3;QJ{mP#*F|jLbi5GRHk}%Fl)^p-#PY{ zs-us1qya^@bmQ5%H=E3R?kfY0j*aVu2z~lpdc4dS0~L% zg6M;gqiTW^3i5Pt)_8Yy;B2iiT)qZ4-p=DR-fPh|2aoSPgR~byF4nH5%h#c8-mcDT zzmLD(dih%E963mrOu4DtRg*kmG7iq3CZhNP{&)IDDkFn0upHOTe z6aj={E1}p%C;|x>%+oyxz{l5PY%qbg`m7BhP>`3mtB<>UsT5DeQ`?9TX*NBV*eY$L ze;u!v4PqAu4;WKiF-}=d2W##3OfP?6^}+dC4qMNW5(!poQ1otA-gioa1XVT~kY2QgIzLJXT#3e%hjYJ{du3862 zH%&R=FRkuAp#K(19Y9%E5L+n}?yd2Gqk*N{q^Rx#W(88pV?-?>Rv-U2enaNxO=Ht{ z8#E=_PhTcx2l*|qdGt^2gP+;34w6*{QOaP-d|?QMwrc!BrH1Z9=7&+LaLO!#f|2Es z6pHZJ=-}q+?4Wh^^zanxdEX%~b$gOb*XNB{k{GscJ7p0?Ssx>IP$1VmV zE}F8ED7E)4U~2u`G`lGjxrYJ^^w5fb zUwCqLM2g$^g%{?&*zrGcD77XPCaLxIT(1$;SM+KVM-Q&OyWS>#LhHQV2PxY_l+9tvV6!|; zn%_ge?-9y6ol;~_3d2ljxYs7Z)hV-?k9(|LtE|&(01N+{h zOm9<0cPOI@%D`M+NudA_`CaK3QIEeznN?AS%kN8W;!s^RrLLh=wUj{}Wm`|F9#Dz~ zO7W0VyeA$}D0tmePsepmkHOv?JUl$LUFPN^e}YZJ)9Wd=aR(0{w=OntcTwWBDSg$B z-7lQycOv)pO}~3LQfAL6>rSGHLLpFZ4S04qTzz)Dts*E^6Wulld;srCz=I z>t0Z*m(-$HltD9P|1V`drv)_Z>E-LyQ{Dfz+#>3xwD*ABbi`1@hE6#{#1%FKex zL9Z!m-5YFSS{L!_mDfM_Z1N4ixAS-7>g38PZz=0GF!^^B3dJUmjSbX3{Lt{l1B54| zr}*BO6Zm(W>OG}0ZKu${U>qPc&SGw+JhSQS7MsisW%q|f2cr+t1(@AO%B+J@exj^C zQ@=c*zJNlfc7owLu9JVo=MmhZ7bpTo5QW<5pE`fh`RWbr=6L#YzR@?z#Gkg_LfhAn z-^gq-hZH}pZ1j15a!_P0Jt?n}9NH8>8*inJ7Hp#-Bsi>{C3ZK6v})a^bK>TuY_?Fo zyAVh#bwRX2Fs%xqm7%mnCUJnuCOqZYglMy&p~mp++iRw%c=7?gzDZ%UDx6k-CgypH znyruaBjFo~_ zbbDxvSXx;@#L*}ewBhOFs?{tN-(L(Lo?pM-V2|n1j!nB${@F|0&*>?yxvbwYWkTl$ z+Qs5vZT!t;@wCZ4+VCEcK%-z^S2u{Gm4x`L4=e9?Wy>4Kq)jU`^Z$-Xq}8**$jtwo z6H#-iJW7A<@~P=dN2c$mZIft=CnS+9?eDG69-wWW5Gm4y-UAn=(uN0Vl`4Tsq{Q=+ z4fO0+wht_dYH~L}Da<-VTOXzkM#*;(V&t^SjP?5_zqT9YlPwz`zATNlK0+G?lj+jH zK7*JH+QceTn$u^Heip4fN*iR;${gCvDvUS=a|IXa?dc{zE^X+e$L7-5pGZ6V4APZS z;z6sgcLGm*dHw3(ttE2|&)MYB)>YI=8qyn34ESx)$YX?Q$a^PEQLFM)to2HDK5be- z6hH-U2QL>_Cm-?pw?D5RI@W*BtqX41KV{$jxsbMqq)&m7XgqwygeG&N#OcPWp%d3` zzaCya{WNW80?Sl9Xt{2;TpHbX@NZ{m!?Sos=Wq)r?RnT>PhSsbAMrrhgVpa$qo$6& zOGJM5-S_kYZ52T!Q{qi0r-8r!5V+zqH(FZhHr@3iZE=YU173isLX`q9l!_0P^8$NlJtGTLy# zFQWCxy4e>7oFBV0N4F%vW0vW4T3tomz%%(%BThGos>nH3I`89y=yuipiDftGCFQh1 z5-Gp6m_~s<4r?`{4P43dlGo)O8PfG5mM_19d_oegw2I#73qZ-;emB=IH;x?~dEzidH zdUjXQU>9w^Bd3!UzPjNkM`+&A>plvF^^(T{J z`H0_w(&h~Pb$D`V|Dk(%y@#~TBihXLF-+UTS+l8#5T_sb`D)RpmJzeB)K6}(H-7qr zwtZ?&n>Eq~&uE(_TK$|>yr2~c#7o#!9~TENjXaNf1t(eK1^K}-Qj9fvpjh2{qT#LH zp|>k<58B;KTl`C#n6|(Oo=(0#tx|IT0mB@{%f379OEn%0hXhrw9%RurVP3(Do0jZ_&$Kd~`hut9 z=IJfkbX&33I5@w!G$!HPQLDCh_F|EoR_xOsam#Cd)bt-!8HJs+@mJcAx<;f+IRpB1 z`$jAM8TCCPj@%-Z4;bWBMTxqG{&(!^XS=uEsFZ#A^KNngW4D#D{6e;q{*?G!VHtDr z+M0;R^{Ek=X`f5CF-p~LQcO-hJ7&i4Tvd>`^IS#ah0B4A^#ckv@N8j+Wt~(x_19m^ zO{{hj$ATE+V99b|e<6fXgfgIwFv(-!cwIPS7{REo!7Of2V!s{%o-MV^I(2H^&^ra2 z$3-$G+Zk09qc};*cQ7cZ>msp}!3p|WA90$_ec)-kgzZ@?_C@F|Re41-hNT4bGE^0) zcoi|GPl(&e?4>`a&5;lebQ_W|kWc{W9PG+W#BW#W%t z6B!Hd{W_SFgVxDK+;!CR(w-01M>q8IJF4AW=aR%IC29*Jk|`$=ZR*{w_!JIuK4CG| zF_}>xU<^_ivkKw}DNltNYrI_@+{EzoIRkdC`nI+0Sd;9XU{!pOS$v2wKFk61KxE(VmbbTX&RUZmnT+9eyj#=9)7t0J==J=N#Tz>m`+8(C)<+qmV6vQm z?f-3qN6XY#YrWsSa{OEG)V%T8j4FpQImRfCGm0!CmqAflocgG7Li0WSIl;hP%}uNE z);Q~lkH;?mb;8SxM*nlFSkI4_59cvcmv1=9S)4R_hlm zPb*;5g^cY9()yJ2Tz{PIG-GmxFwlk<$? z0s~(8B5c7Lh(hu`)Fn`-*4q`5<%zp&i{o96TNcGrq(gA%>C24W6~^of_$C;-=ZW+T z`&r~Jx97eKYk%uyRK!>nGxiUt5>TYZVf|I;P}(u5udb9)USm{cjQTpGxWOn4U()ha z>L%8<2c+!cq-7Ox-G13-nKAcUSkbA7P34T?Ek<>XxD7Sn&H);}mFnu*vU`u)!OMUC zUHR42;|^m}PF7$sBuQ=|=Qb?6lY8MorMDPkRJXX2vAfGy z{`mUi59xm%{+WHw*yPju332G(Y4tZ!>$z&5)OgE*g%@8iHZK{~E5_yl)r@DUg?oy| z`Crhvr;~$Q3j+>(jY#Z2vip&wKct(km9cxx80ItSG-#vO#QQ5yTkW&h`hz*Y>st369;BGhtVPxp_EQ3s>=gk9BV2BM?4!$ys_j|1f<|01Og86@ju7Jp@ozcB`% zq?<$f>HJyc7S<+!wcg4qwz1I2NFK<7VK}W1VnLTazHZuJ76rR_dcqw~^c~+v%A65v zTs~7b=hPpsSBJ1Rp{(`7KsJaK6O%jTM!N3&g^u>=A^mFp3S;fUS!?eI=*Gd@N8=33 ze&6X=wr$2-UGjvI;dQ2?tRh)G>+S5KDAvGUzJo=PPEHyhA6G|LH&?CSPU)YagLToY zwZtlRu@D|JDR~wpj_JN7>sMIpp=#$zyWmK!w=8Ji5+jQ?W>Md?R@7S%UZ;-276icF(QwWFBO0LrF*gYo!lG4 zcK_>e{GQL2cvgLs+z0daH1hR!f-{)2^ia0Oam<9DH}>d$=J7A9#E{L(!wZir_O?wt ze5dwUkW~U}naEo2XAP2A>(R+93iZ~wbv+@;li35(s$oNWr?7UZ?2=Q&K~Sd0dJoS( zJPt`ahxHQFnYRR-MTzRSm>0Dhuy`n-}Q4$Kv|strId$uPoe> z6=<-_`Y3Cg%`SSx!l0vtWAfNVCt1TN<~*G*EgP;c6tIdyJeyO}=HdG6X;%G& zI3pzvAHbevtz)Qj(wX6Uy7R2X1y*f(5mpH&(+TIlt+Y5S{^XoRmz1;rc8{j^jyiMw z61(^^YkY+@C}Qm*X}hij<4+^EO?3quM)fxsz^ro7Qx&tePlyt%EpWit|B6xQr7FW} z#M1NE{vP^k%)b+^vPPvWBrw-l6y^%glRmDV(vlHrIQ`XHjWp@N@PzIMvG`YDfCv&XFB39A_U6xQnC;rd@NYLr4o4riaS7U!8J zDSM>e*ypVE3)V1{Os65Ztt_oIv$ANPyP`8{W|+mKzhAP8Ua`tZ`YPQly%{-J_b;Am z%lF-1Bl3$Kq7V0^t3QleyLsp6J9GCj;$8G7JvjN`s~*GM^+r4`KGDj8n|Y13jRPRQ zWs7bGQTa1QMg2LI9jS7%&-n6&HS{}Ai!*PHRXaaY*+gEScxV~-x#KNscnv2#SDPmO zxZqQ1V9J`aa@_=@y3uW{?K{@+J!{a;8h!xP5{cA#T7I5}gE?XAU-@;9oD1!J*EV#Y zzAE7vExK7oT%Wt+<>22Nd+6`C&|mS9HSS=ot`YZ`TZGuwbfhF<`kd%ht(oTy2-$x`OcM;Hv7q#sSXyLWfQ&ER7meut|4+UB#-bEgWbtfWznKr!`{D zx{sVJ<7ocCz0}*pNq0QAa>_UKHV!Vy@H`0a-&@@A*EcVXnEs>M@5OdkI{C{Ffl}0{ z@wy<+BA8Q`kh>^|x9-nBUYvdA=sZP<@MO};C7vOiDwMN5#)NTb`~Mt;u2e)%?39ww zjJBw8F*75J3nTY`3FnL>uqN)!{AcQ+3pZsYDe5(|Cl0EP;1)-6X4|=6qd228WGwNL ztfY3pyj)?~-cByktkFN%?c`L^oTbDq+Qlh$bMSsOLmtDS5Jw+~5l-4Y9QZq}>l!~# z(Y;Lw?PFop9@EWbXyfx?m9ZR{6lB;I)g98ZJqhbwKIHa1yLI52IL=11S4ti|kcsCk z7VeYIkJi^EaOy;E(SFV>iBlwV5SNb<^6lgSP@uQBgI@{^;^*N6dfNB{+e$9j-CF9? z%jm3Z?%Pz(@he~T_KRnZa~8SW z;uD;49;Y~oRWJj4zkKQS7`;^moLwQOEFn*EaLC=9;GI(26&Z`$`fQr`lhe#q&8`&@ zGg=3n=4{SzV7!6sSq{wGPfUzH{!n%Bw}#(p4|o=M4zxMP8J*{BFL0&-$rg{I(YbKD1fwmjgAIPS~<00&?0WpcGqjrB8nbw_%Eahykab{(l!F5i3 ziM}B*gZX;**jI%Js`K_4u zQ^Jj;lW%4(eq5m6Pc58j;ue*Y&*9K&A@z6k)oR2)TIcqoYf~LvCe?pAf5U)z!P&j! z%<`G8*VqdBYtQHOJBHV5xIHGu#4s!F4y%+ z8FBkP2d|AcXtA+o?FL7C-*KHibp;7^hjz7diVqxQ3m?IYIC;9^WB{(TcU7H|{RFwL zgR}j_8L2))#~LrK%NNkR#z!l9-{KD5{Jm#g+muyCM6GReC#U|(8CDSApq_(|t5Yf^ ze)O`m(C^tWe7l~_@GBD&>il`gL$>fJ5b|n`czEm0h%;w>t~OgwX?&V8_i+Gky_H|| zfZE2Ra9?ookd!$1Xp*ES6Mh&G$lG`a@o1Ybw7YwEgZRQAN01e-2)15xYhf^NA47#m z{ePUG3*~LYc*6j2A|_x0ko4hvqRQ-vv{5(KxN&&Ewk% zd})OvQfyYdJoNqLneJ;+%5*-X#^l8C7JGQxV?->EKSjYe3^&a+c*omi6{?zT%=y@8 z`EVlg&p6)rItBj!-PmmreNPx)-_1U?>-bSRvzJ%J^VTioK3J?qBy-$YxZ_G9;EM5|Hs$nqrCDSkqw%0aC38Xa9S_+&c>UPo{;vs(b9ng9wp843B{FE#+`rOdW4*?Fii>u)5o_&x>>G4!?2;(o{ts(x z92Xzsf4RmShhf0j#T#{h9t!rHEiF(8KjiW@CwPlsCa-IgTs)mmO1~-eb@{wS0dHE! z+n(Z;=b6*c(8a;~437dl3&^uj)xitr=cYp9t)F+=&DgY1C9YjPC+r-rKF_N!@CHeY zJdV5w`;QG%>>Q&Uv!icfr1seU{(EK&nSF^@U*;EG;Z2gb8xSK?II&Q%=jp~k&8Ct0 z0Ru0dn0RG$5w9%ftxa1fc(^&{IickJrP|Gb#JIDchqt+x@J3g8rRj0HRMMNIr`yhn zLyT%NCmlC`G%Y0X=EXqA1=o1%GJY|>SBm`}8W~j_nlZxPm$Gy&UoTwe7v113BdD7& zIr#GLT+XAd-fP9M;C^lyLvKIP^pCL^(^>!O7Qgs5uT&l4%31LbDIuz;rGl@OQzMtV zj4imso1SM1NUG-lB$A*YXyo zb?>*(M8hOiSym1q6`xSY!gZtOrF3p`Klv+uaWilHFK^JoFN%~NO&*}ri0^2dQTx^9n!c0#IBG!C!B*Zl zn3^Si-1O_uUzX=Z@9AtAd%9p@(`#Ps{Ra1kJtR!<&?w^t`_B+Bn$}Giw$pL4^IP7o zjkkTrD+9>)umlH>61JKZpQO}{wY%SO=6(OkCBNQ16yDC;EN`R54NpSz9i|A4?PEtQ z=n?vAmQ6b=W)FHeV8O)0abt#b9`FjEG~ffT_{b|dc<{~liBD4UlwrbWUhxH&JEdz= z^mJc&!*9IWUr=umlmUW45f3YtZx!%oWM_D4KlIXP|8K)gb#X6_t<2f!@nxH!HVqWe zw)Jpks)N7mh+lq4ePN}!kvhZpLXco`iH;$~s)+`bhX?<)e}i$^^pT}^`C!55HBrKe zkJo6oCq*n=ms8L$^UjTSuMk01jlb&uLEne9C@^$v!@+Zm0mIF#< z^3%Ho>qt5VmhQSq z5c{R{pN5$v35sM~JOKT9Yu5Z1H#^-Y?yfQF^(|}JtJRweW}JJ*i6sVKtp?_fec?Qz zSW($qDoYV;Q-wtb1%r>I{E*ahnx5{kpv>VzDX~+z?0&oD#^%KI`LCXqqWUjE}grLY16ek76St4IRVLrZ&T0bwif?p=&8N8_W`SW1y z-lY@7Eu|N1Pvlq@2=GP;#*q_r`}%VC?Z;+?Srt|{JX&2SSo?t!+pP?^yy=}6Z##6$Q(}K+z4fHN3&IyY1c$oXd1px(nYrH(YwJ^#>*xN1|hLe4(I{k4-|Fot7 zQT29b{H|RRY%U8nR|K1LR2o$T7Vhb(g{Lgur}N+PCf~mrm#;k6qTO(?Sg<+4l}PE+ z2g|MsMx}y5C@;Sz-JU*>DHE(!*QM6!1BDxc;wIkIa;eu0NQVWB+t>)JK(X^TOlcom zZ;{ZRzxv(AgsXS%2zC{MQ9c8|G@-;NqkHK)_71#uczlcaHOG5!rJxww$%};p=GPQI zc+z{$>daYZ^Ka|l73?+lu#q}zU3|pRAN3Dk@%ghdz@~cXx|uzRD#7Bupfvr!oTA0w zm-n{ZC}qtUVo)upY6SH$rWV?PD)4Lelp#dwi!+oli%>>^sbh6!SVwLiH`!rC65=p_($-{0J{h8$1V@;HNC=rNMR8x&c4`O z|BG(bistd=``c`kZa;Pi>QBPr(Vwv~`e?tv`Gw!sz^~JM#EMOZzYp#H;r-p`SyK+I z%b0ba7ZYYrh*}vR@}|epk*^c9+_L~moa=n6=kVWV#XYcH7TRsV6pv29?yF$+1=3fr zw(+_Zb`RFcG#ztyr9S*z>Gw^rHT9PvU9hJo4zJ>_`>N>MAC}D1b6EX+g8EpGEi#*G zGC&3g2>%{V{Khv$R$g78xUypZS>vKqZWVp<1i?nb~pWzWQbqfAv3b%QJ&5C{H&HdFUhi=~C<{c?B z*)D_aiIRNh{HWU@Q|**le z;fTBlL>KYtto>0A{XwAaG0Xw_G@DBlv;J%dTSM4CCj9v~EZPjUGdUCvKVIw^!bnVl z5KAQqZ;2c5INQ!;!#CV$;RFAfKg^;ys6!@@Cn=N+6w%3{BbXD<>|;<4P{QUIr02;@%^s9PX~RZ&AcCgQ2nY!0FG=Zo3Xa2o_6W1CIa(#`aF7VUr{v5i4{0Qqb> zfq74T6B;@DB7Qd7i>rbPQ|U6npG66{Y8-)*0O@)nq^z`Wv5)Ap;-Z4zZk$(H@4 z4fFJLcsl4l)M2;CzEO9$Mk#50*p zIa5ZV?I0t-UZMe+I^s6{mI~wxI1~eA4vaXPPU_l#Fc!rFi~KYPcfTJ<*lTmgK-wO* zIR%O^p@SGUqay%(1)oCgCCxMW_ta;)KtM;S|5R8vzi+P`sKJ@TmcOUg!z$5niC8dI zcM>UTB>zbg~;1+sb=B{wXLMuQ2wGb?TxxXUQg#WSkGf=PF9X^@J zrSUupnB!DCdz=grwsPnKmhEE>|7XczR0i1ceyW`54(5Cj4-h1vI=msjl;BdRfJ!lf zv9!UY!86wpja(7`n*YjUODY2)6+qALAkcMO50-NCzxuZ^2J)za?(&yaP$a)mu(#Df z$x6RuxJZa#C9_1Gp18%-4+@68G8baNN4ldVzBbPWIVTQeIxwdHIO$48@DOq z!TjlV-not1Cb&G~3Ivlfp-O1sap?IbM6zJcow&EFoP8RNzF{(h-b1cJRoIf-;kko> zIbUWzk!TyHz&!>+jPZfL4LC`HF?`>^-1)8W#sdWXk?o}4fgeMWP$J3%6pguYd>MI_ zXb?~gl;F30kBK_?#E88;iUkgsO%jRXaSO2b1l*#_6|6#unD?4TNw`)W0X`=gb5a;| z5Mu<5+|n>%k1_z*V{8%G6&TtmlnD%~LBKH-cwuVJj zn7Yq5F{lA3Jmsf=R1ulMKxk>gJlNIefb4DJDwRN%Qb}Z+fL`E1;5P#x@1)Ti+@?@y z=Uvb{AQ`ZY17ueu`-mmx_Hdv(ab0j6{w$1GCfK78Ag}>LKnw$tNMcYVMtc;Et2}|Q zj+*iI7V&5|7C?-Q#RzMP$G8PzN&+TEp%eh>Da5Rk1WLy&dvp{-1A~rXe9E9)j9@8w z7z-(M8Y67&SwJ$KjiJzaOxS@IY`Q1JnT%1%ojX z`zdq-3&8K+!ng`m{#U#YD4gR$`9KO1fVaFqcqKS$HNYmrxhxvh;fgT~dIShD=Z{Z^JJdUrW@j=RB8iY>zIU7i#Paws6 z{{?rFOoRxaz;BorA)qZB93O7o$CD#Q@RkJ;qoLb$n-cVu0oQ z^MG(Z1Ng2W7Kn@BV}k*|A6IjTr>S%mS0>aDE&MHToAzMgFxgP3GI(<`kq6#82fBcZ z3;EriGr7~;IWC^+5RFy6hG0|z$&BY2<#fU;#c)pXHR zQ7Pc{J4k1gilq>Q4)OoRFU>G-jaKShFv>L(iy-+s3dr8!+97y4+M^sOQLX%8Ayz=g zfd20Fb8%gJl#c{ zHbi~&1Sq&Lc3u0Pem9R-xJe6-Gyve_TcJps2f@t1z+U6(5OLsOz6FxR-WauGDuG## z+QAQroAclo^*IDijGobu4&m692|n^1pGFc7S{{cE9ENE2Y6LvU@J4d&C&=q#Z?ILlzegZ@H6f^(E`K%BTm08;gI04xb@ z$Fi=#9fhS}C;RZBj;GOXC_|)+tqmYgD4b_o4_UU89qedYEqy~ zZU$F+7z@H_lm;l6L-x^1;QST)6F6g;SPF433!^{yDnRBI7bbg4bqWCxI|XbJ{R*%c zv|EV9_~ctUqf=d?8JDmK{AV#nxF}u)Bts$Ep)#Oob9;QRLAS8f9^Jukl|YqJqU8kL zU0k(;OrcN}rW!%JC=1d`CJ8dGNLdPV60SSA1!O|uSQVh!I$X1v0_p*ll+vgHV>#Sn zF~ZgTF|M%;{1h&Od8a^Fgw&<$ru_`_!0?&?W$>I(Mnyv|jy?K2vJBEf=;k?Yo(Y#h z)C?38Dl~8<^e5~J=YzmJfJQA~6R@rh0>@vd(-m-X1@s!%zrxiCugK$YQ9x~2c9kl{ zZxru<=A)TA!d2o0m&c^Scxg0;+Pie9D*{WTw@@woB^LIz1L{I%b03=?q+kI!6M{h7 z32ZV@_LxK8a0SrS78wi}-gSN3jkCtBP=?D@Ab@hZS=P-r(usc<@s-mBwLEN&7{A>;CCerqkWEUFO-hwb;ssf^;Uh*Gj1&*TGuJwYjSkR;I3!aZ zmYJl<6h~wx>9R!`G6nO!Ql?CiB~u=isj_90a%8GwxTk@7@JC{34egH0bjnV!;@ zCsUn-R$a1unW8|ZER>m?lG&b?O*$hpIg8t!g8{V~2ltWk^D_KPX7{c+Kra_$%8N3S zOETNbGQ|~{NfGpOPKIlZ6pLkw5}ERlm(?Yv?pcr{SKHOxJMKp=i=zc26oz8t{aoA{C7) zA}K?ZR7f&JsYEwph6)YxT|4*ldi{R>@LqfEY3;SwUTf|BoF2#HAL8)+YGI8|yWgrm zKlhurcFz#IHSr-%92*$u=3T-=;I9o24w{@+TEfr5}+e~Br$vgyqaZ)LxCeR~-XmJd-3 zl?_u2m(e4zeI72JZq8~ajkAY7=Ih|@F+yJu`b=A$7-agrD41N(vijxsNgaK}LAZh> zu)d-buHTJ^a6`PW_!J+6m~HqNZC?yinySoAtTA7Wv*!}b*F)okLnVgUC`^`Od)4bS zjz7!GY?dob^jE-anyo)MD-Hg(StVO7GgyQ9JF2(4czQ^sYcU^}Z9l8k2J7S|wwRy2 zi-WCZEskRtW~Ugh!Tem*b{aPvG4P={-Uq|hTWv5|Wsmu~IoLU1zG`R9&jB`Ct#S~H ziGkV^q<`OI!boXV?qJYxDaoAKv-LITu4$tIaYu*%)^$ zaD&FhN#o(RUFrc7Iyig$Ar=0LKL73$Gi%GM`M)|Ioz|M+Dc@qXRklqwW;^C<>+UYy zf%&;>JndX|VtXCc?(RaCXXEv&doK1is2zD?(2GA`^w?#(+vpz)t;`FT?ZIW4W==^QpPGx44V?%RoOJ z8riFzH)x!NRb%C4l)uN)Bh$)iEWg^7WZ)K=xXD@ELMw$41oPBS5%smfB|RLxE(fY~ zo6q5fS-92abG>N|j&Bt`83!1%miZg^73Z=FsW<)ur101zl}gQ>#Y60IsGY_Y;yz*r zr~Sx*IhCL#bAJNQAQH@;oele{7~Lz(Uo4xNwo2++0@ z2CF&<(4`w}UJ@ZpNvR0yV$$EJ-3O0%Dm01iBy7GDhF!$cAB4<{l-DH#~v6kVa$K6G$e*3&bk#){OfN%$+4vQNzyVEk0Y_5b?zFsEl3gZupYImu&)2i#QE8?l+J8+B?{~ z3(rETv16-#$?um_9c{a3{iU;{)j85Il#IZ~g%N_-|C%{fwKnML*v+L4pF8Jdk*f2g zG9JGGd#bVZ04qm6E?d0cYn=8XX_Z4NFOk;A@L1wFegYTPdzSw)+v2|a?3z_|4WG;l zb4jB-Qg#_6O(dj&xDaRB^N+icMHlQ{w;^jo)BO={A8y~iK`t~aKwIwt`{{#7U>t!|QrMWpF1QdUgL zyv3N_1GFWiO(|(!f!~IqH175*ggM;3&w8$oLwoZZ=D%D*MlKW9Z!>L;tFWIkV&KYU zf3CYE-XRU{lBOkiC{adY{tnJ|4$d2dlgnDR_x%w0yVJ#os`!l)F5e@q%1OgOq6`O3 z9UthmBX88_A%6G;dn>s?^?lN$f;4YGU)k(jr$^s%^5(A8FwrcX$NRZqbh z)V7;8xVd;b+ri2En7Mp#d%%YNC4U>lMa`5KRgtP{Qt^z`uOY2#Nkttgdrr#gNm(oY z0%Y1a#bw<_+n1mLwX?GeoG7q;cWDDG(Z$8}Uv%Wu&hC!gY~UUyg{hN&Q?2WH?J6f6 zz?{Bp``fLNG<`){eaBymZ-haAydkX*5MW&o(yk9%5=azyygm2n??dxsZ%M^Fa^ZVY zzlmJ>fwY?a5%$H!)zh`N^piNdkDmT#((0dPWcMESLRZ1ZIlUV__dPoBx6zZ>2a{V! zt5!HoU&QTw2Gd_jg~>NDs*mo}Hqv50ei#=7#k70cIl{=V0~8%AD;l1+lcpV{ypy#2 zPA;w^yFg=8e!wAFw^8aviEsK0Ubcra_NJ_SsHIPdJ!CqOK?v=u8{Atj3=BC(O+5dA z7}DrV8SSME=lf9*bkrMW3O)5hEI;^aZP`ELcALvvuK82)07^fQQUp=*eUy1B9#5v@ z&f?l%`pyof6d{zV1OL-m(D*z*j@c!AUK|sUP_`{@aVVt`z zvNuntI(Bz?G-Vt^89c&|i_3q7=t-$&!M>X9m>vA|dRds>hLuy2myJk{rL0d<<}dI# z5L4~p=CBPm)x?3DUT3wzbLiNlu`_$#{18tmU*HMQ02z)(s1F+6(l&W}mTc`!YI^D` z<5QHuX-c6uPM#oztCRF~m#+RYpfIe_$?O6@Gm)}NqVz|?s#|{jg-@oeQYZs|B310& zcOacc8C#waC-ohuO{e4;lzt{9KTDZf2I1!@%-_Y?!_CD}n)Q=}Xdt}UwArF!VAnr; zoOMb@z3;K)JcT?9DCVbUanuM)W^DV{zmP3fwHbdNZQ~bHN(u>dNb75F9bSzo<@xs-VrWi3QEnivpG>7Yy`3=gnfRYtbkSyGUE)EVZ(j=ltjQmYcr-l@~Jv4j%c)e^{i_;SH~R4&@SqIq{{glWcM6&abue}1bu_(f4U zp|p%za*xtKK}gFfY_Gd|gGN|)p{xtj+~_-ynr^DQCps(qKBd}PL195C#JSsRG#&z9 zym#SWW4*jndk_4>%4lA|14{moGJZtK^9U(;t@M7nR3&BoM7+~aNBfjAtfH*q@$8uPNCZN*0a31ygpnSG#JY+2lJol^Rz_3&8Fp3~OX- zKV;Q@);;xkb@{+U?Hbkn@2@k|PPpNDU}^F0mf9I_%&Yi@j^ ztUgo9X38)g&nH{N#{M$Cm6Cm-An<<`2kQ)we4`e%QAX{Qey+Gsr=PZiS{g?67T#9> z*qZ9qkaFU{yKBAgr#Y?{(gXY+tQ~0HJpRv%ukTtg*E%VAD)}AF?&#tsD0{5hVC0{D zv-oiIl{1#jEnSp_0(?QCl#)g14Zr6)FKpWHije&lGn3Rwt0E z5ZWM=R+WHYWu(xrm$yq(6}?dve}2gQi@V2$(Z>5}#Q|D&fsh`g!BL@GhDf6XeS^C& zRqHe$*CskNZBRg;F014-2p3((&oqLrT3^P8ifW|(DS_YD>^%?`W&up zH_GU;Zs{LQ8^q9xlcYX)y-7Y(tmu^nLptYqU8w85Kj=6uH#tWM5&UE)yXZb%zd5NZ zn>x)fs(~mLDR0Xn}~!icvmuEO5^mXqRO^W?dYuil_AxXwwQjiIAQW zYjg)lPScALX`>`sKUBo^`q?DY1}U`R0Xm;d1=$=t+=X!WHFg8q@V@c8?dy(t)Y_%d zs*_|1A-ElrKh?+6D|?(jnlpQYaj!G9!EL17Y2zr5R|m0=^8yxaX_H0uN~f(dL?^ug z8#8IeS=#s1Y4~{>3-dr}!Fsrx{>%(6&~WQ=gk)G_r!UlxS^3xaHz^HXR}>L0 z-)@}Frfn|L#yPa*4J z-0_v?f~pmL42x*XTlCU8vKW-1QEw`N&YmEkpnbfA{5N*dpT?Mf$wAYDk)^c!Hm$fr ztM1aWGFoQvmXe+#?;#C3LvAfhTwW2`W3jJA%G@78g_nZ2mD2|IX+;TML1S89xCMaP z?!`N}G#xtPm~dmqt_NKv&JSp18SxNCaDmX{7;t6t^84qm)jV($4jWc4dPLhirY&>m zO0d>-8zDx3=)ZgH{PAw>^&v^t9n!mJ!cRS+4WH7cRkV3EEqg{o!caqFfp!{4%?60F zQtKtPplv8=QBfG=wIy^fU6wzl$1FoL_4lcDwCXu+RZq)aAe~hc(sbe_%%$-_i*GJ- zeW(+6aO#A-ILlsrJgXaM#lN(?kyfSRB?M$Jf~LiFxXH4(g`2};mhW9)cabd`=#AkQnpRrHeKRfa`0u%>Q{`$l)?1aMsyetmEv z^`_~8?bp8q2U-m1?bJpaw$ri>wboJk9Te)|2HHoF-Yn0d=T?)A zyMLDk+;n=KnAAlt`av6cG5Q^pbY?Rl+}8h*YUP|f`qTG4uiiA*m+xWZ-i*?RvGQeP zdl?wqQ0m8kz1VK@XF$>Jo{k;?4CZg|;sSRx!E;<+F?D)`QP~Xb>`Plet_@^XD1#WQ z1%8Y_BgDjhml|q&a@X3vObh7ubmu8Uo{}-P|>Hpr6+7+e>|?&(+3`FB(>D zGSV`Xu?k}r?q~G7DCq$P3$eA;xVt;7b8vL<*nUt99x_NPGFIV?><|M1?F>dKo)!PujvZ0yY?qpt-Wwm0xM^Eu2|A7RWR82u7T8jnKW#=5Vs zgb8h*N}`^GC=RrEMKb0`8U167DihBp(WAqP#XWDD-9L9{=%M%Ovya^OL@}x}L^KF) z1W!-48eu}lvQz1rb)(16+0v_LUj1UV5U^W*dO^}6H|v5O#-v#_4dWFS7c z+N)ueYfR?+<9*A*z|t4Lb(b^tJ^<8%S25 zuf}$YoiNA$&o3T7Y9BhUnD%vn-s#?>H)kzGQP=ZZnY^t5@5>IHrohP2nH-GnC1uq567wL5El?S8zQVA^?wv5FwC z!qQ#bJv`ksf_L(`KgNXC7Do3uedz(Veatn+JfBgSTnEj8H|VzIkCZU<*oD~(ughoc zaym#J9hrCg2D7MuF)C#AZ!$Jv)QWD4-eKstt@`5TsU!RA>(FcLbrnU7^$YwK+JgVw zx)6rFQKVQ7Uv{-**O0#szaL-B7?v=Q$dro9h7X>3n=!n@C^siU>Xw)G$#1Y3d3Eq? zJn6^S>b5{i$SEHC*wVOTQvB0}ylTB^(p_dz8Dpr;C+~^r!~1K?8T0#$sscoR0DA>D zVn@w&1|)wlAve~j;QWwbn{o~Xj$3>9A!GiC(SOVs#1oZh%i!Sx8D3TBreMnp*G6?T z$?FF^kXt-K`|`AVU;eNY;*PXs{?+gL-Fs%SC&!Q3MpZF3)r=~KjzlrS<@;yv^g+p* z#Fb;Um(7@Joo9@^hFMt4EUaVnBWP(P{ajR!&>K+Cn7&|SFB#dG1_mzI&JO>Dxqrn& zBZe`Jpm+L}m^VUq%xlK#4Py{Uq*9RMtS+uHwKV@Sch&c>8A0X~cfDm6zGLKJR5A5l z>>4qMX+na25QpjOXk%#MA-01W6r1q2*DxpD;V*AyePqC^eS+z_y&8Ji5ghfyvZs#> z+cAY1p|D+=()pP&*nEu=X51U2vU{#jhTNWTYB}4{*33Xw2XW|DpzO>`qAI9deX zp1c3epuZb>=^Z!MTh+!GwKJ9_cqI+_Vsm3sQS`Lg2iJT^y;AG4=xGOIkV|!nKlJQ9E)V?k7f#9H;eX z%>!6f5pkG=DC_jiuJJA+xHP$c1_8UIW9uX|M*gCA=?kqSp z^MQTMEx#P@VLznd)zAl#EbJ?!yXH^Y#N|h#H`#wZ*ZZ>1fb~aNWjk?9OdBNvab1Zx`0%1*Knl+WPOP$G`S_PV*Lx5vXQ+nsH}Uv2q?`9RD+^r6_j zkKtv>+|LQD@hMiWJq-=jw)UE@v@oq>*00G$ZNn!`!s9pFBnKq2HaRrdwFj-2zTYNC zo_;F&nbYg$+9cMXg@E+)%UUD-eh$n$qqgVQCzL$Q`ZbwVq_8Hbtl>k_k9tfx3r!hr zXO4vjwdpE~U7kiIO-f^p&#*??KpbWZ9_JXA_;PGh-!320WZ0?+>8vV)m1nY6MZ}Js zex&fn>P>XQkeWyRjf(G&&A2}Ktaxv9|NiG#^DK7JdDiFxE6YZ!osL}2MX_tN?wTCd z<`OF}B63+cRgSjs=I7BJ<8C(h-8SJ5+Zk)#IaCBs|Dcn{DlfBOQhv-87G5{E3o!@J z)+rKJ)UK#H>2lF!fbuG9c#XBrXHC3`>n!GvUi;OKH^i-D29GXa7k$JbYJaKiRTVU_ zDBRce{LVEkiC+p?!<(#85i7sI9;0U767$9k(iXD@UNoGXVP|hroY(I4OJ6n=56k%H$px+a?ER=kBB2Ug}5wa--h3bKIO8Lm!X$P|n)iXSD`h;5lIb z4zJwJ9?QMH=E&6S@g3tPrBtv6PlyL#7@q6bgJE=RoBE4#M%44ozgH0tHkD3%$f_Q( zmL`uu2uNt$Je}eBCV4^F`9j;p0}ag|TNnozf0^x`=K+Yo^ol#P*JYuVMgwcPxt0(b-DEq8=RSRKZDnt_fk~E|&MAfS ze?;FoapBXfMfDf;`l*ddVI#{eqnvW z*8KT~UD`;z1@Y}+ozr@5_;@qyn8VfnhX#$>#m;-j8oy`d2k2V(WFb82U*lA@XJ~!s z%*S8a+|TDVv8oTO{zum86KlQTGw902)7HKjA$kG_Ltn6dA+dYU&~f=@n{QP2i5p(t z!oow|T}o(px?%IWrJiHI_tsvFu09ps%F4d55Z%9uYsL?<`o>zfv4)Cv7)j&mVc!9= zY1};ow|i{D-M@QRH&0$;h*w#^>tt2mS%V6^3);c^v+XHT_~vS1uGhPESg5XYSiywo z>K`oR30~su@jCn-&dQrxSV#JZ@5c`v?#n5+?&UCFPly%|A8r<2>u2zio2&e-*56y; z$1RN@{l$sDj~^AlSqE|k-ry2$F+#@9>ya&smiUuX-Vp6iGOL0(t9_iMKT#=q{oYp_ z%-Mu+%1}-o#>w_`vI88v6CdQ@mEO(G#m&{t#aZ)`l!_cmS!_3jbLe6LUmC%NZ<^j* z8Q6MbhSU1EQumRgGY)a)hdJv^{0N6W^1utfqvkfefrVQJDrOn6?n)1CA0DzJf-|~H zg7J>fWb1;)?|;>E>neuD8^v;_n@@_469&wT<80zN zMGjqoyyov#tE|29Khs7t^zVLowK_k6TXKrCI?c%vIoTDW5|<{y@;u=K)pp1;Ck$p% zIO8W|s`z|Del7b$dEHq~d5$v=q_etJYVTrq zUfe9xGrGW;XLBYOIqMuwo=;zb&h~1zTn_Vgxk%(eQ?)C~bWQk}dvgxhOy9OZA#7MX zJLoc}y27cha{4DBry;J1;T(*g18RwdjbbZ-;-)fpOAoSHt|%agRQE8E1Eatm*B7NO)FFdO(LZFiT$ zeB3q&LH_+5Q-+kk(DXlSKKlE!w`JU-dz@Txn!U#eTgB+G!lnwYN=lAcX+P#-IcJhj zUnGRm#3$Cd#bU`s33s2fs^Cw%YOQqIVVi!a6urCt}+|exv1Ujgxx-iM^+V&H1pp7cS!#J`_qDW(quN~uBcVg?vdmes!4)C&rJS<-1!A*KNIl_D5hY=<_>EK(9$OZ~SCJcX(wyR)>tmKB_+0{pR#W7w#jFsvO zqyFw2RyOsM@Sw-Mw{u-y4~pVt(MYryG5?RD{Bd4(0+nLLH-8M$sDvW@F3SPu#=N#0 ze^d70SF!XYZym=kjOX>g5z+)$4BToRVZD>jSHD~R&s^QX*K21i)vfG2#mm#VeWdVR zzP$2_#g=z5$@AX6EQ)hJ&C3(f<|To&4(_gM4_o_W(P^rVHid_qEBMTYT zKW6f(kKdK4sk}iNztEeAq#=2|_pN6~$gfj&FPv|;X6e;qac6j0IubSmRMh?18Pt01 ziiJtc(Zz}gMaq_abH7~8MC9z%CN}h;Xx3rE5on+_DZMF%$Y%! zIZtYzuf51yZ3Y*2NbY@OTZ>9{X6C`JZz1HC9Dd0qUYX0w@?Zj9b_GpSiC^V0e>aV* zi<<{bat-9}rjzG$g5<~J+;4;XCpPMYJ+sN%UXsr%uk*?qyz&~EOcsD;xwv@1`w-{; z{e4-Z=gx+etFJV9Y)&ZTmFL-;V*a#2i;H-}TVM;Ev>1)M!A+wPwg<|SLz{I>tl$1- zP;jSrNeOSID1}I|{AJ8D^XMkZ-CJ^cT$9k1;Wns(myPM< zgdClDPjA+|_;vQ$)R~vF%k>`cOWTQuFuQ}DhrPQn>YLu_0{0ycyp>OuZJf~?f5e+V z=H({eXlvo`mA_hu*QXEBujCa^c-1-jDf9xJp||A8gYozq@t(QUmKEjy;rU}kh)B=S zpIOBlR`W(p#7uAtOsGiYRTgxlzc&m0i9j-qWJ1#xim|B?ZBU8QWp$XpooVQw457z4D;DX}5U^nTi z!5xp7luB`TxhAfM-V5IF5&jYyc)E38M}@L|TVDUFmk;AZm%PM+G%!9fV`VNgB0U77b+?Q-4UCpnyX%ga0PV$pD> zzV%{%_D_q=Hy(FDHGd5Z(Q5jtw#5Q4%MzY_H4s!eUv z4}MW+^8lY24|lG5`D_cd zZA^2@u;H#|2b+1D7TzLimim zw)(I3wy9|yvof&HvO3- z-8k(ko0^RhP21e?__~e<+q-yclOMczeAWQQOQL*2>=Ccb8bEtX%xC+E)wA??Uy0RT ziDe*Bd2n`L-cO?RmnhWnK1Dv?HX=x3>O;YA zE!H~PH%#+rh$)S|pZoXRH52wpR0-%u6725r%2iQi@A|7Q4B5Tk(JfeF93lZVhKl=U z|E>*_DE3RNI`AsiS>SsZX-g0K++V;&wQj5Gx#)mIQ4a6$8!BV#ZJomM59uizhfIy1 zc~GJdCGsELZ}fpH`=9KSnDpo0-|Utw3|*abgcnYZ53uIX>ommkqo?YW9%u=d$PY=3 zzvCaM!xAtaPxvv>y^ZUJ#%bO*JQ$^Qi?x(_`5uuNMo8c}H&TLrXXdJbU%;L6Pkk2> z?RKhSm5WNqNCuaPRIGr_-#IiX=TsA_s;|TiZ5I{m&jm|(1?g8E|OR* zP`^vm~%-tUnn|ekPAduyervPm-T<+=glE@v~gFBo}aTvcY8S zEi_6volaxrK#_;I9BMy_Jw)6%`Yn$=MO?G{+))Cn29j7lC6v{7Iyor+7UcP3AG$4A4svlLyy1 zsHB%=Qq|OZ>KcRXha&DrV@CkFOzJrNl% z)lfN9IsS~tPC|*?mB4-@uw)>K1Uikt&LZk6okL+cK;dDNSnN7tnRQWEA>zQclp;Js zV|M}BOzJ&%oPNXQ!HU#aIU(MiH$eR7PhBmN2dji8a8CA66>KA!Kp&y7XTTw0v^E;6 zL;Ww{FSxUO4xhla^6?Dz5_tGN9D9qfipN?2i6r)49{UQ^uaEd5#zL9bt-ChdY}q`d zNVTe4jptbG8?>QzWq{G-YDugOjRE`6iSQo$XorNc%5h)#p%S9naad&lP}C`2IV+0A zf`RUlPZbge*>pC9E@s2&X!;CYPTwK1{ZNO4&4dHe)%bm?h4kfeSS$j{EHc+j>SXs8 z>;rWJkC@dxd@PWR(#*~u#DtAbfFhFUG{Rk23IN@u`rU_Bt_ebmzot3>dG#HtY1kl6f2 zAizw{ve+BM+D~9_5jK(7XH=7c6xxC~)j0MQacuIyxDf+(w4LlePkSg3(My7?p_0IS zp@h%F{1F6FSTGEBQ=1kj0Lm_CXSC7Qjd>5|v=; zC_tu)H;d$&$hX8SEE@6cuoDPoVX**2gqDT_8IL%Crw|M2EfFzBV#xqKGvUk>F|JiXcnFf{|OP2RS#(W*k zu$RYby0^si7AgjS!5{>KX$7&t1y|$B0`3F%o$I!y+fYgRQuErtpinzlOxb_!?<4f( zum|EKgDKidC=q)o*xaW;Nw2ap)dL9c-QAQMUj{Xp4+~H%TIKyDPHUM$wHE~!75L6rUgK7aM zhJ`^1FX6Fp#EsxeiCcILk3~R=B~cm?{Q)f~d#bD{%inA*mYx$wDHHhS2f~@nBzH12W}!2^me4k|&7I zJocu08u;1|4SrDAXVmE;-^#7WT7jg&JWdkbv8)Z%z>dJN?m~^hee7Xi&Jr*@ED$JU z#Sj$t0g0cau~39iC89?45ZuBsO!Uh`4LI@Uf0bwqQ806{ET=Qj6V2#C>>M0t>}sN$f5vLkuWKsKy@tS9}7Sqv5f${yB+H#323F}qO-N9_)|>=4RFq9Ec_!eN8a;IM_zD6Af* z(V45{&(N6=V4Fxa_7RQs-yVKObP)p`ux3P}U<@fh3!{aZ(R^4VT0XdpHmL3y#3fVr z$Ox{QLPsi{uHk=BubI6B)&aH10KTI^VsU>yi^RNG;O*lvZ$JuprzZ@I=Zi|aK7k_z zFXIOVCWs4^q|?b%9R~xogENM}WTwUZQTG)1xD7~T(v>_GjHnR04o*8zBuZrIAnf(SqqLNhD|0R)Bwgs^>yfYMu_y;8!D4Q78(HT)wwf@|hK(t(nL5-bVo zsav?V^ykS+M%~P?wEudiBRm0C2gttVE8(;TNm{vE6ij#yctjPi#Bxw0kUS5N_9szh zh)e^!`m_8L#7JPl{0pEg{a>PGwyX&fTD2;Qg7m781^uI}tQd7^W00KPjx7`Ih6Ppv zY!p|@0LcPK3w^*FAl_>Rs{kZ|BoIm;BI;*$i0aI+Y6K#K)u4)O>Jg9CAx<)jy+C+` zz&65o-?^3Ru}uxYp_i@vii`$r1oUI?=&+}>qffekTE#aTy@45TnKD#I| zaga6u+6>wii(ddgo&jUj<6gv1gHB`f*sE+b*~w;+KiFK-EFO~ZpOFw{Usve{cte8T zzhpwdxyC5d>DNpv*qxd79*Oe(ucWU8&C~6sgQ21H|Gy6X?=pn$Lf9dwN2zKAAaRET z>y1PlIJi*=!3o6z@+(osxxSrvLMA`}07HpGwGfXIxSx^CRx{L1oMSM0QwpkpJTMKA zsbE_nh}wZB)1gQU#&RiKAmd8~N%l!*VP$C843I5>#ma$3p6)(EkoF-UM5QM* zR>}1O)-r4){Qr%|s=LiVrw-L;LJok{0|ghz?pxrCpEmLa4f3AD+EH=>zP<^{lvw}> z2g%Y0)E>niIG&$?CXiFcS`l@e-iUn#&m`=+z@QWkB}$Fp^nYfOX>2w)@LUpFe}~p6 zAo=i+JQ|m=$LUAB#j-BmMh(opTHvBM>IcX`;QPQA@~3&&ZhzDq<%c;`BMb_|(Z~Q{ zzyPS}&RT*{Ur6Ql0g^S8FRTj-L6zN+JQUS}y~Lp79Zg~3P=?4I#YD0<8KkXTl$@&% zqt3_-0!ZvA>Jr9cDgY&R5=z7_@TjK{JA}ec1M+5&jeNjSMhk8Qj#>(;g!q?=(2Kw_ z0qJr!P|`wn^1k5J#C*#seX~(5X!jx@g&cqdmV+wh=B}r$7w7Lc9T8xa$KImakz1Sx6=uGWAA?<>^|j#; zi{C+`?%;El$3CDAg=`i7mN*CZ2kbMdDoICm_)KzE7GO* zCYU4TL%!#3FtD@Vpea5QdyLF47k=4~@*;@2oxmo1B`;X43pD^;c}ZZtpzcfE5p-Mf zhB92ad;vzF`(_%%e|W@zpp3Snn);auWKzhKSE4k)LYYaMExV^BQCvV7I5KUNYxtp& zK0>%fGazT^D|yYpF${t-X$D_uC~O~U0$K_N{Fya}AxI9|UCocNO~YLVpA; z0^A3Qg+nbFLIuOMQ;QuzU7|@0^Fn_@${dx*j!EQE660ve#2AV3amm6Hl8LdBi6HnT!X=3;SF$h<^_TwobNoJ+C9*3L`Bll%YZCK($;9iZvZu6H@Bc=_Zb)QT MB|qCjS_A+74|HmfNdN!< diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java index f3e735c..c124308 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.java @@ -3,22 +3,27 @@ package ch.zhaw.projekt2.turnierverwaltung.main; import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Scene; +import javafx.scene.layout.BorderPane; import javafx.scene.layout.Pane; import javafx.stage.Stage; +import java.awt.*; import java.io.IOException; public class MainWindow extends Application { - - @Override public void start(Stage primaryStage) throws Exception { FXMLLoader loader = new FXMLLoader(getClass().getResource("mainWindow.fxml")); - Pane pane = loader.load(); + BorderPane pane = loader.load(); + + //test add center pane + loader = new FXMLLoader(getClass().getResource("tournamentList/tournamentList.fxml")); + pane.setCenter(loader.load()); + Scene scene = new Scene(pane); primaryStage.setScene(scene); - primaryStage.setFullScreen(true); + primaryStage.setMaximized(true); primaryStage.setResizable(false); primaryStage.show(); } @@ -26,7 +31,7 @@ public class MainWindow extends Application { //Can be used to Open new Scene in same Stage. //This way possible to later give object to Controller public void startParticipand(Stage stage) { - FXMLLoader loader = new FXMLLoader(getClass().getResource("../participandAddFormular/participandFormular.fxml")); + FXMLLoader loader = new FXMLLoader(getClass().getResource("participandAddFormular/participandFormular.fxml")); try { Pane pane = loader.load(); Scene scene = new Scene(pane); diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java index 84c410d..577a538 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/MainWindowController.java @@ -2,55 +2,9 @@ package ch.zhaw.projekt2.turnierverwaltung.main; import javafx.event.ActionEvent; import javafx.fxml.FXML; -import javafx.scene.control.Button; -import javafx.scene.control.ChoiceBox; -import javafx.scene.control.Label; -import javafx.scene.control.ListView; -import javafx.scene.control.MenuItem; -import javafx.scene.layout.GridPane; -import javafx.scene.layout.VBox; public class MainWindowController { - @FXML - private MenuItem closeBtn; - - @FXML - private Button createBtn; - - @FXML - private MenuItem germanSelect; - - @FXML - private GridPane grid; - - @FXML - private VBox mainContainer; - - @FXML - private Label mainTitle; - - @FXML - private ChoiceBox modusChoiceBox; - - @FXML - private Label newTournamentFormularTitle; - - @FXML - private Button openBtn; - - @FXML - private Label tournierListTitle; - - @FXML - private ListView tournierListView; - - @FXML - private Label tournierModLabel; - - @FXML - private Label turnierNameLabel; - @FXML void changeLangToGerman(ActionEvent event) { @@ -60,15 +14,4 @@ public class MainWindowController { void closeApplication(ActionEvent event) { } - - @FXML - void createTournament(ActionEvent event) { - - } - - @FXML - void openTournier(ActionEvent event) { - - } - } diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participantFormularController.java similarity index 76% rename from app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java rename to app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participantFormularController.java index a80622b..adc2c20 100644 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participantFormularController.java +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participantFormularController.java @@ -1,11 +1,10 @@ -package ch.zhaw.projekt2.turnierverwaltung.participandAddFormular; +package ch.zhaw.projekt2.turnierverwaltung.main.participandAddFormular; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.ListView; -import javafx.scene.control.MenuItem; import javafx.scene.control.TextField; import javafx.scene.input.MouseEvent; import javafx.scene.layout.GridPane; @@ -25,27 +24,15 @@ public class participantFormularController { @FXML private VBox changeBtn; - @FXML - private MenuItem closeBtn; - @FXML private Label firstNameLabel; @FXML private TextField firstNameTextField; - @FXML - private MenuItem germanSelect; - @FXML private GridPane grid; - @FXML - private VBox mainContainer; - - @FXML - private Label mainTitle; - @FXML private Label newParticipantFormularTitle; @@ -78,21 +65,11 @@ public class participantFormularController { } - @FXML - void changeLangToGerman(ActionEvent event) { - - } - @FXML void changeParticipant(MouseEvent event) { } - @FXML - void closeApplication(ActionEvent event) { - - } - @FXML void save(ActionEvent event) { diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentListController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentListController.java new file mode 100644 index 0000000..916b5d6 --- /dev/null +++ b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentListController.java @@ -0,0 +1,51 @@ +package ch.zhaw.projekt2.turnierverwaltung.main.tournamentList; + +import javafx.event.ActionEvent; +import javafx.fxml.FXML; +import javafx.scene.control.Button; +import javafx.scene.control.ChoiceBox; +import javafx.scene.control.Label; +import javafx.scene.control.ListView; +import javafx.scene.layout.GridPane; + +public class tournamentListController { + + @FXML + private Button createBtn; + + @FXML + private GridPane grid; + + @FXML + private ChoiceBox modusChoiceBox; + + @FXML + private Label newTournamentFormularTitle; + + @FXML + private Button openBtn; + + @FXML + private Label tournierListTitle; + + @FXML + private ListView tournierListView; + + @FXML + private Label tournierModLabel; + + @FXML + private Label turnierNameLabel; + + @FXML + void createTournament(ActionEvent event) { + + } + + @FXML + void openTournier(ActionEvent event) { + + } + +} + diff --git a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentListController.java b/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentListController.java deleted file mode 100644 index adbfb59..0000000 --- a/app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentListController.java +++ /dev/null @@ -1,4 +0,0 @@ -package ch.zhaw.projekt2.turnierverwaltung.tournamentList; - -public class tournamentListController { -} diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml index 831d491..af04e72 100644 --- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml +++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/MainWindow.fxml @@ -1,108 +1,14 @@ - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml similarity index 98% rename from app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml rename to app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml index c64bf07..df5040e 100644 --- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participandAddFormular/participandFormular.fxml +++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/participandAddFormular/participandFormular.fxml @@ -17,7 +17,7 @@ - + diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml new file mode 100644 index 0000000..9a52479 --- /dev/null +++ b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/main/tournamentList/tournamentList.fxml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml b/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml deleted file mode 100644 index 2372a7f..0000000 --- a/app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/tournamentList/tournamentList.fxml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - -