From 59bfe126c58161ebcec4e5649f8a8e9706d28ed6 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Wed, 7 Jun 2017 01:42:18 +0200 Subject: [PATCH] Settings-UI clean up * cleand up the settings ui #15 * the menu button si now a hamburger menu --- bin/application/Main.class | Bin 7044 -> 7161 bytes bin/application/MainWindow.fxml | 37 ++++-- bin/application/MainWindowController$1.class | Bin 3402 -> 3402 bytes bin/application/MainWindowController$2.class | Bin 3056 -> 3056 bytes bin/application/MainWindowController$3.class | Bin 2002 -> 2002 bytes bin/application/MainWindowController$4.class | Bin 1946 -> 1946 bytes bin/application/MainWindowController$5.class | Bin 2511 -> 2511 bytes bin/application/MainWindowController$6.class | Bin 2471 -> 2471 bytes bin/application/MainWindowController$7.class | Bin 4118 -> 4118 bytes bin/application/MainWindowController.class | Bin 35356 -> 36406 bytes bin/application/application.css | 1 - src/application/Main.java | 2 +- src/application/MainWindow.css | 4 + src/application/MainWindow.fxml | 37 ++++-- src/application/MainWindowController.java | 105 ++++++++++-------- src/application/application.css | 1 - src/resources/HomeFlix-Local_de_DE.properties | 22 +++- src/resources/HomeFlix-Local_en_US.properties | 22 +++- 18 files changed, 150 insertions(+), 81 deletions(-) delete mode 100644 bin/application/application.css create mode 100644 src/application/MainWindow.css delete mode 100644 src/application/application.css diff --git a/bin/application/Main.class b/bin/application/Main.class index a2798b7280e2397b2db22ab47cb7606c9d76378b..7ea09ff47580c23e025b2b11f28662f947ac6b08 100644 GIT binary patch delta 1161 zcmY*XNmN`#6utNN@PGFydSE!v7y=55FbEze6g38c5FikRAYum6rhk~bWA{&Jj1e_~ z7~@*_?tSlg<@HMU@;{fa z0=SdkPrJ_vllO45;DeYVJl&?%W(^ORu^!X3Vg{?#TXV2C+|e5jMTW}v$6{{Quuf+! zA^L)cgB4-Zs%UTBF1Qtqs@RIu#Vs=$4i0RMLy_Da7e%ht~US?t;13iF`O2$3VFJUI@*CmEIfp0<2T zARQSl_VBRa5C;fneO+sFb&JknB3G{Zvt*awVYqmNM|D0eS3SkHXE-8Dy;Vk>&k1bc z^K#Hz?u_G%!BIKo&FTyDgy0Lfi*T*k8SM>syBX(;f~T;VNQ;@)HZvG9qdU#GW$7~4ye zY?%fXu|O+C2sZ3dOSg>MWnT8|$T7{2<5~ctS^>tiBAn1R;UxB^))J0XGjw5}LSD_! zN7$eC~S&nX9phx*{Nzb!udC@={Tfgtl}?B_*XFs>WZt5kR2L+ zMx#O-0ojz3#>Zu6P9gWmqdEB_!6bf|Kw$#6m1c1N8gM31Sdu|=hTV%CoM$Y7f^~f8 zKkWNoeu?qU89ueZXPe8?$CEr(Rx-y}29GB>mgLDB=%qFEN?DSxw0@vI!z6uoDY%|6)X*-qOOTBMF++Dc^p(P-9E|uAygR01tJvUO z($a_R3gRIDuEd^1_$#OR`mKJE*nE)%-5`1*lW;Y z>=QrwmZvN_uHsq#uj?9PMUCssMAFO_8$V~@d0Gk5`b|4#XVX@{4ht_Bc#&3tN^<56 z?q+kJt>R@+;AWMUjAfgaUA!=2U{u8YW!(7{0|)V{*zb?5IE*6-USrWWHFpl$>5P?N zJ+IRUyUJ}fya}P;El`c<4c4&!xABhn(_fFH;kzA}vaoWzvhk3MN9oHzw6|Bbw zk}%I-HzGsI4+jIow>p>QXj&j4*f7ewRyUeLCx zGOV6y49;RtdqeP;gQwXQq(gYdL3F=^12^DH4j2tLI2h|-%MMNBjY+D#jPagXyxZ)q zbT4>#tXZzBlpXqg1}E~QbEgmZ#1&77FDvb)5AhL6^cCHMkMRk6`wNxg6ef8lzmbMK zm6MFqEY4u}7FcJ%-Ru?Ft| diff --git a/bin/application/MainWindow.fxml b/bin/application/MainWindow.fxml index 12ceeba..032c390 100644 --- a/bin/application/MainWindow.fxml +++ b/bin/application/MainWindow.fxml @@ -2,9 +2,11 @@ + + @@ -46,10 +48,14 @@ - + + + + + - + @@ -86,16 +92,23 @@ - - - - diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index bb0df82ab79215c08be529f2fbf681c6986d048e..83f39ab48e238eb32e265592d37b4ecdde2d51f3 100644 GIT binary patch delta 92 zcmV-i0HgoP8p;~5)*!l>!+6 yu>u+Z!U7ur#R41v-2xr}-~t~2@&X_M4gw(oDgq(_I|3sCJ^~~GRstuJ#0-X$*Ag%Q delta 92 zcmV-i0HgoP8p;~5*W^l>#XM yu>vXp!U8J*#R4n<-2yHE-~ulI@&Ygc4gxU&DgrVAI|4HSJ_0lWRsuJZ#0-YX#}jY> diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class index 21e3cf2bbec462b9262d11c609d0303a8ab58ae4..05989309eab0d8625e93ea82dad2b762439a5aa7 100644 GIT binary patch delta 85 zcmew${y}_07$;-U=5WqnM#nG)5vFhkW2Q(3C#EO{Z>DGlKc*OlaHe>MSf&JqCZ90=5WqnMn@k85hh;-VB&7Kc*mtaHdd(Sf((BCZ=$P m*+BLxrf7x@Ofd{Mfb<)tI7Visct#$k1V&+|q|L9nSQ!CMgA&#N diff --git a/bin/application/MainWindowController$3.class b/bin/application/MainWindowController$3.class index 05dc50b80c2721ae7196909d4c2c0be3c7d4bbe7..d3984f0ea209c5ebee712fdfdb01e244a97ba1cb 100644 GIT binary patch delta 39 ucmcb_e~EuX6&qvz?Arn5X$oKf delta 39 ucmcb_e~EuX6&qvfFf diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class index 5859bec6d3b1e858e8720ad7e8bc960c27451990..805fc8428c9736ad7f744769281c867b52607167 100644 GIT binary patch delta 35 rcmbQmKZ}1u3>#zR#zq0*?T90+9fZ0+Ile0+Rrq d0+axx0+j%&0+s-<0+#@^0+|520-BR0393+;7RCSo delta 71 zcmV-N0J#6p6VDT{^alZbll2GtHGlvQ0)YTI0)hZM0)qf%0)+r~0*3&P0*C;U0*L^g d0*U~n0*e5u0*nB#0*wH)0*?T@0+5p>393CW7BBz+ diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class index 03e225afbc55911fe39561cb767a1f904e8ab715..e7f5c3dd0dc5b7152625d50b53449ea4c7f9a224 100644 GIT binary patch delta 71 zcmV-N0J#6B6Q>if%m)FTlg$VFHJ|_w0-*po0-^vs0;2$C0;K?V0;d3v0;m9!0;vF= d0;&L{0;>S30;~YA0<8eF0if%m)FJlg$VFHI@Jm0+#?e0+;|i0+|420-FGL0-XSl0-gYq0-pe$ d0-yk-0-*q^0-^x00;2%50;K@E0;ZGw2&zD{7qI{U diff --git a/bin/application/MainWindowController$7.class b/bin/application/MainWindowController$7.class index 770d9bc0379158cdea085ac68c6682629f9a086d..b5e693611216b99421f085a3520fe8c2ce4546b1 100644 GIT binary patch delta 158 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 literal 35356 zcmcJ234B!5_5Zo|zBe-&9t22O0;rLl1PHs5D6)hl8Wss#5XDI{fq`TuW+p7+TD7+B z)w+PzU2&@mB@+a<+G^Em>so8ATK87#R;??_|9kFxZ|2Qpg8Y7;|1Te%`|f#nIrrRi z&pG#;`z}xYu=^n*n&eyUCn=~n)Y8%vsShP0v1r-+P$arM5^acWoE3{ET4PO3;Z{Ex zf_knCZ3vY$g`#W97S^o`*Czz|LeZ8`G>jIi`DNp#vUq(s8b+bbv9?6njA;GZSnDE` zs1Q`NxGkE9G>4Z(;*q+h@Qi3Qme4)M1@(5TH*RWfDx0%nel;reh=&u2NOVoyZbneQ zc%n5NY6hq#>y1AVYneAQwn@+cx1|h3_#Ilb;*o~%{BX2w*?!9MJCyB(zQRjFz;sz8 zys7U>}D?^D;#Wb|lS7#Z8 z8h7vwc-M*IDO_BPQFm$=eY-{W*KZ&Z-jtZr6x%3hP-ZjyqHKxt7QF=H^~@wZ%YqKg zEbC%blPZD={$|WTT_Vb3sE;+5t!s>hqmfNzPT_dj(Q{VJY)d3!Q7+s9UeblT$6CVC z##mEBxK-!#TEif5bS5_xY>c&T47E1sj6Z^6`l*}CK{{91iG4IUFTOF7s9&p}0}bK2 zwly}mtp$V*>u0MW(h7c$wQkngKBN&G=HUU`9bhGhV5=n$X>ti!3cuC+vYrnm9Vt{TO#pT1Gut#YHcsp%+Q0S z?SfEqc$S_CL4&(MiiN6O2A$0R(L(<-+Vyg=m>q3!5ecvuO|-TFX|a-Zo1+tLP+CU0 zx^jsw8e|!@REstin~~OdBAy7fg6++gR<}4>ohTZ|Cb7wM$mVLaACcp$$MZz-of^ z7#i5nRKFmWsEUFVFn3U}UwvC^YdD%%9&25Xg_@G{5E3m~Qm6UEmcVAcEpm;hrh*?6 zX1_3+H5NTu^@^{FwI-HqZbA2ElPz)0L?qFKys=sHyw5I&;kLBZHAUiU!wm~T%s@jM zzhI6v*My^NSui=ZQUc94wqo64DtsZejWh>f z&jpC*zVX#z=6I;KjaG&w-&D33i@&WEx<$VOmw+dmFqTSfflsv+Gh_EjN}3K0Onl$6-I-TNlbLsGDH+L^C~7BE$itdBq-8KCj%> z5lGe5bxooA^WaC;)rJ#cN`bf*_me%lwNUSZsIycmu zu)sFDg}flQl*?0_q0VC$R#%iczob0_2^RKt3%9-hR+};uOO_69MF-?#fISO*i zm<0ilM}qFNXbCOCWJBDAZQ-evDWlG^U|Fa&!d&eDeMjhKf}|*E(N4PCPrG2tWbCuR zLX1^e%J>RW2PL_)Jr<3l@qT(x&_Ow?xaN$X9tLr|14=Lw%&ETVh1ewGFF?P87#JU* z$1ojOpUrwaf3T>6%7gR}J<0ezC1};is;a6=d!F<@5i)@7zXOJ(HjvpS%F0p8g7g4A z%^f`hd`Ehkv^S#_qn7cw|7_6_bfll2!)~q1aeHi-0KEVSU<DR^0kwh`9j<)C;F7&-c3#gi(_F1%$7U4+< zi;lIQltqi}C)1)DTBOcNe6)^>1T0!g%K{<@nvEMfdF*%wS{5y*6#>x$D`otI!x+@l zqFM&^28s|^@#au*eQYDYDYR%Mt?-M!SdBbH*RJr3{?IuZ;^DZNY@dW%17ZN?qYZLw z?Alm!I4A~*gZ<*53|B_Y<~WRcOB^DKp>)@T6OL?wJQ(ifGM5KDjOT!YVz3zM7eg|e z)tqmMVPZIDZ9}N3ExfQXt4Wt}b2ZtIUJ8g&&;wy@IDY7Xj`iW9Y zj22^9nYY01fj%B{K*&0Tso*BcEHO@C+Y?B{?2!m6962f%GJQ0Mh)EV5N2>y23W%CQ zh9~E6i;kyNXp@rMa0TObL>5Y24%S5}ARscku@|5*vSuv&K-}_li%y_b{4~>|)!av= znBy0-(~R!b`EypxO4|vRm@DRifU%UhFr&3Kw3%%N?2Mg(?$>Cj;C_#`=mNShAgUp_ zXGhntNme{E99_M%W>i2d0I)LLmWbB_*brV_IeQdixQP2c7W>4J$9c$^L4hCdxW=N3 z=|VL4FQJ(P;gZn*@uEr~_gqF+*ZKwy`%(ds#SKhvVCsoXEl@|X-c zZN8xRi8eCCPc6EJe&rWG^VHD(U)L^S6ON6)09_jt=h{-_0*kJt>jHE=&-ld_T~F8f z#V^te+IHN!EzC;Wf6W-t+yy0xO~2z$2kIkXC2?DK zTU0`&L2<9x;TQM8DchB!O?z?Ksc4DcuqN5s+7@@6_H9ut4?i^n0#^$cc~wZsz|%NDNQ6b%TNp{DjHuv&iF63>V~ zLB%n9U`K$N9q84Qv(|=MYr-eBg`@T1icu>A;#rhk0uCs~e*y8lAPR~X#b5m5B}4>t z_u9&ELK&8LS^O2V0J1p{HXOYw)B$5eFc_sEIDGY%+!i!f9 zV*_SMeK;Pk@QZ(7r{Yp#W?N%pxHa6cI2?k#;}c_b zpkP3jLbBN5&3HhUb+;y%D z$|>@2zdXz}|3e!SWtHLhdW0k`IaQY1^1*?4Ol(g%P!i^{SjA0Ev*b~7Iwq6DU0A8< zWyAYQJ%pJMC2=k|*B8*>VxF&^|W z7Byhdaz56Z_M~FHX;m#3Sro>mOD=}k)KbN%ShE?@bW>^t0$I2`(7q2c9Wn<)X~A0c zn7*#?LJtv^N{|_;3Ca{*v zGT&foG9rwQR>!oa0*wxciPm6IKJ^UBM!D86!GnWyiWPRUXjRC8CQC--I!ppYY>oDj zLU^%@8j+Bh>Fr3S`IFJW(2QJW8@yMMO%|O)%Yrg0Tl^9x@U$OCYJY87@+1k*na}p< zVwOi%u|um@I@szV2rS=o32%Ei(O2hHKyCsBG5>sEpxE8PGO{OIw3hU$JH?_~=+-=W znmofVVZ8SAdZXC(vgDcaC*X33_~uaSW(axqXcuZ0VzH^MR1MXF^=wO?BY%oT!Va{B z8>8&TbaYgzv@HU#0^ogv7}Vzs5Zp~o`oPoztI6@UXDVjwRAA|Jz9lbUvC0+`&npk| zB8!I5z@WTDUh0=Hau4px6tiQ&mb}bu!M4L5ke6HX3f{-EYhu<~xHS-#=q9g{+x&7X zOgm?Wy}RH{|F}hG$*Z+5vWlzy%97X0>oBRU;pP~JK}`7U*tsU;4VJu-HECX`p@H3h zOCdV)-GF$CFqR#wo}r!bAYRI24C>iHY!BpiOWr17#s*nZS4KijF|3hcX+@`J%$xn`GBfJ5Yb~rTRdKJpG$4QD zY)Xp9tP8akI~?dT;8?)m4wCJbOfrwd2#Y|8?n0d~8-I!7a3oqhC%hKYra08rh%O)n zSRm)Kw;67RSgSo+Mi=JqSSkz32j#)GNwl4dy=2M1xctiw zP=@{0lCNk}4y%*}w`F&4_X7U$G-$&hy$do9QaD@%gkHDg8@%md+h>L+j@c*cK!nSj z=|!C4pwzH=fNxv$bNH0-^sXh}W6XP^Wtb!ODI;bkE(WjcXzZu(^noQmWR~lRS<5Kq zta{9hHWRW17)a!opYXsu2d$hKL{NS#KV$m-2N9@|Kfdqu5DX}=dz~Bq0$k#4+#8h$ z%FpGO+ygA=1M0!skPf8Sh5|gqchX&c`5k!GTf~i&1m(994&t5i2b>@{kdb&B@giK& zi3%7aWVtWQSr6H~FS7v11f)-Ye5mKILcY6%shKX?di957ihWD@QH!O>dd5 z3;L$lJ)$4r_*UI5)q^W=@O)8gxKY>eO<#Y8E)h_@Vf&70+%zWCgcDuZ?I+5MXU$%) zWcK0;?yk^MeVA$3%&tjnZUVnIs(zO0uV5Fm7O;;H3{H!^4Ce@Ia~&DO*idnxr3NYZ zri*4RTu`%Q@rThrWVRn!$MV&Dc7)KGl_6w%k$`3Wl^o6TA$oygPBHBoGyMz(P_- zS!%kP0Zw*R3Qq;J1jiLYu5sz%)`dfGinchf5U~y+B;T~zZqTh!;a9U@1$sF;m)B_M z_@J7pW@C}4Ia(q9SOqYCP|Z_E`xUhDXlM2h2qQ}!qpC5ZARPO=aV!&h&IxJ246@tM zfeC~UaZEr*)43FPi3wR?sf7yR%G55=j>u-H@eF?Uxa!bEZ}Kx+e6C7*Q$P*l)eAp% z0Tl+-ay8MfR%H9QTn}E#Ugm-;Ep?n)WiK(FAnd}@L#R(X`?C)PuwB=U%|BZe#JT&` z7LCzvF%_~@ovO#OPhjip&LHnfZH7rvCpG7`pmj@PuA#1fe6A-1RfC!xRBL(qB5AKe z*7RjIjtH(=kFA0Nua8M1l({Xaf!J??2hKSYp?47#K^0Xkeg(UKR8G4;S0ziGq`(#s z8ulrUs%S%alRHj9aL=V+B%1*E~!`*G4t45~PjW+RgZI|SHh+ADKlz3^;e z`!JCv1=T6)G`~7^KbEz9n$S|Gt21CZXoh#O-QSc~#&G^7?3Tp1umSn;aRH$-d0gl4 zxUdCr9Z6Z^%52=Pes&;jPY$Yc(Y82Ooo}fN)P=URUg%iepg>B(hc`e~mCfegc_BV? z!)w~FEN7aTxFlp7voXiGY#UxOPoDSK-_1-(&hi=|8A;p%Z$B$GqF3VKgwH9snim zkhX97NNvSXP(7j^^($;PwA+}sz*=sz@GIl{oxnq<6Jz@}8Eq)Uzo&#gSRq zWvJ&Z^#boQjCHX{G^k#JzgWRC)2C(Z!;37aT3g#%aCj}{3=+<+05jdn1Pl!ZrV4sW;iTsGyyF)0a-yGv%A! zTI@V5av@b3K)&g-&v0JNb|G`@2ROT+TlzHNfFour^ZST^`W*JyF}#;u)EH_gW;MSi zTo;aF|E&INsV^0_1aRJQNF0F+Z?xK(`GEQcK7z69a99>TQT3gr_9}SM12}UKUmjue zI>RgKvh7Od_I;K?e5xWCTN@4AXGp*#5K65$xCOj&bcenY5q$*NXn+gCZ^(dwMI^?e zb0g0(f(HED-S{w~)>M3?B4__qT)w+y^f2<;6n+MjxP45isB+AE(RcFBQh{iOKR}SnV~lD=Uh- ztXzba?bp2e#xzEnn#zl3R?nDq44NF6>*ex!RZC`9_zmm~>S)(V>ue2DS%%nBpFi+EioVRLCVOEE-G$`RPcD zitVSPEE;Y<&9G>M{WQy>LG}|&^n>iDxfUI4KUGIS~P$$J+?EZ_T+=_WQS>N={wkQc2Cm1LC4V($l ztcH>3tzM;b_SiB)MjhI32G??sya*d>S3hMGtOy#l20Y|D4Gd^>YUVS`xHWBlaERqQ z>Xohhw~bqfSjIYccRr^z)@-X$ylAqFW`4osUlP+`zX5h}t*!Jx^&p#Y*eyNUpb<41 ze2=(Z0OS&u(dMdZ?q>xT*=QM?7zpn-`dHyNPKIBv6CoFcTKU9ylehWJI0a>FmY4gD z)6(I_G)gnvSwJD<49hrE>n#qHW3L4v?Lk$fzo$yq&zw8zb%eWSrFhA*^?i`WGn;13M=Fl@lM z1pKa#O9hNe@u-he1&m)pwxo`|jCEbLV{}7##udg@e&b5l4AZ=%--In=s{xx)F0Dzq z6FqOii`N*}`VE+fTFTih4d008*tum~XIu}-1FY?H=z^x_5T&--@V4z}5)I01lH)PP zjTW6p=VM8OB#%)l(94=uL@34$JSy?g?wo(chFfQ4A)WL~> zaSuW-P*PbMo=RBk?y!vCuq%o^qcGE(TXaM>V6>wJI7jujVF9B96UH$v`$T@gxF6O{ z{n~K-`lb4V5NN(V8p21v?J_)y2Q4~`rUZ3dl|c%c>Prt zSN^?4hodspa0VxaCv#?bz`!vLQ5-Oy#(;}Q>LY;V$ifN~qXNdWz!NeIJ}m7;rf1>L zr=tQ?8KBt#nirrs0XmTze8r*@IbIv$49?(&I8z^>h5&^Fq*dKp7Bw=I511M6TC|2U zb)11)w+>2eF>ye4GiOfbjA7BqoY}$|zeQU(a|&mI7M;SGQ#sS!qEk6@ z8fOr?KaDe|bEd$e(>ZenXZl)n24~LXOp!%ra^@$T8D!B<5MC4e%!4iS5I(42&R)ED z;o^XKC_i%W+;0wXjS3vyu$gYT{*okU4yL5v91h{aB99N->hn47+hOKNNOyA--aG3A zCG3~1&Bd1{&ZmB3vayhU?`eSxnS(`{-z@9u=-3k2M>D|eL31pk+2&Ytf@My0P5;@5 za_G$*;FB$LiVI&3UCb4Ir+>0f|DmEXxpswR9^vW|xQ6G2BWukYlrD&M;?U+0Lk5KBE>wChL2`tkM-hv(lX7H)nUz>fF{y1Ai=QnRCr~_5xo9 zBXgsmNhwX~(TT1gwn5o_F&!(-qb>6ox2<{H7JyJfW+jik(p-qmh6zueCkCoFfLiD3 z=%3hYF1E}Xa|t8}|;#z7ay(#hgcXdl^vx9O7tUIxQJQq3?&upD$as>@GR zT$W?K7T(n29F6H}zTJ7O2$mfowodfkNCQ^=5P_VJtWo!Or@IAix5zzdp}n?L1YZMDp8dv6IP55r)UtK=WS-L?Y;Yn0m~C?V2U~oFkOJ{Eif;CJ_vhmI38?*O8%sV!Rr0z_|z1kh8gj;oJ46uBlc*;sa~7OQ$Ndp?jf3s#VNF>Uk2Yg*PqrSKgoEL*nMT zh7j}E@mW@iYw~ByehvZiF`_wPeHBXF(PeNd*ujtu93J+>?esPtisD`KeZTphpvewB zx?odB!({h@V>RYKv2X6mYGEvO&>f!>%7^jsqWPg^{+ok=-Qjpl2YfK(dS?Kh4}UEy_vJ*~1tsVu{W!iNIO2n?dW9}r;^j!z;tc~Y!er}mxnE%B%;RITf3T$!M zAte#AqEt1J<`yVieb4Fov;P;mK0~hSgE(QCu%g!ain zS(MDGVEFCF^qiV@<95(EKD0U(Ti@1_!x+{S z%IMOr$e%@ci)XaD-*R&<4((b1gZuBql$c=4-pdQY>16n*Acj$zM)WVz7dxB zmiabn4)1Bc?Z8G`=4TpKnud+H%&#!JPn&}`GOjDR2nwh z^7YWL$~5d~%h%gi09>ki`U)Ie7Fxa{4O;*h#8Xuir*mc@_!SSw{k|oRw8=3Ine*rO z!Bq7`LNg}CDGC$Xo@^KZsSjMhb=j*HLd)IL`F%K-)5WTEw}EU+4uxYB9z)j*fWXNH z3{060Tt4$u3nD!53m`mkGD$MYhnycdP6J3K;j6h$Fno*F35F0>Cm3R2onScCk5+r> zwsD3jqc5CZO18Wg>I6gdsS^xws7^3Mq&mS6;pzlK zq^uJRF|kfC99QoI!)b~v7S|=F7{#h`5#6zW>U^sP~1(SS)D+>k_ zhRQm@aQj7St|ny674!m4$|^6}G2ICUw|6HPyxCbWqN!A#1(SR=26%_~Hi{G;(=zZN zzDFYUZbsHSTqluwH!JHMZj|Wq9qyFq@*VD$NWGhz)h2G3=<*$|ndsu3pbpmq;ERBISUAwAOj(cZuB{bFJX_oQ`3`!qonE#xujtIHcIGvmdBe`UsWWfenRj*OeLM3no%ztte55m< zAd~7nKS$r6p}^<0z5m-mU$xWMcII21*;}I8=?DBkYU4-pk5N(}eC@)IB(Gg`L(;un zvgeabkxEwTlK1u+ass^#Iqoz$Onc>H=Flz*ZNS@BlZsz)c?D$u95| z5AZY>cm{w!sqGMFw~KS|crMWWd51W!U7YXaF4Vb;kh`Q7!#}rHfr#g0{75dU=@6H; zi_7uyO0==HU2ID;_YQpjLRk9-T?AIXh9=+!hof+DLp9b>E!I#Y)=wO3=M1cy3-wyL zhxX8Y^aPf}Ggt`E6S$X>^mp1tZ`1ws0qv&GP~vNPKn%haRnzGqQHOh|&ZdvV`MBoj zM*2kDPM?Z<=`+zm{}E5q=i*KJ0-vS+S9YT>WifpvC)3yRX!=I3rf=ms`c7`5z4E8@ zy}XHjkaq)DUWjb*VcCgmgq8#1S}aMKp@(=yKMEKx-X&OiKWwA?k`8fQi2)AZP8ObT zw7Gq!z}*~&fKs>MtmgI-Jp4K-?n#QBVBrpXE$kF>EA_;i-MR=b4W^;e0%95{M%2 z0krKSqaZN20GBvFm}_im3r1_A-zRs7hYG}_SbRzGd;6h4Jed@K+)Dq#D|>DJS+7dF z5HCz!^tt)F#0v%Dm85ue!5;Aj*1?;#W0K<@NjY)g`IfFnobL688ba)>PmYLfEM<=g3%a)W_Gxsl=9=_zN> z5(5Jsz1=L31r6@n9}UpT*aA5&DaUW6X}jcPSD1NGsK`J85-ll@+)hiYH43E~gL!s4 zGjuy6xE(pGmeKBzvy*bpb{e5eA6@#0_)=Hsw?}+gTOg}DA-8iMrn3U)5jJ8m zJV>8laeRrdX5wN4(o4h*;%0fQo#MUCcvnDWkvN1bfo*{}lnxU^s6q^<*(!*lDctRYj8Tw=_ zQ81^oKv$8JH84R0zB=#iJXO%|TDcNWSJNT# zIJpW>Ur!zmaqpH7cJ@835Laez`gyi&BPiElOO5U|>8%0~}^zMsisu zP+f}kav!$_L#i+}i}+#+lv+l;#B%B*R#1^xsVUgkZpoowA2OT~^XPE5`x2mo&SYIq zMA&lYj`G2V^+_24mfmGJ{@Hj$&*dNkXRv)K(fn>`Iv z&t#jB79Q25w#Y!T5fY>n1K13~!ReNr^3*TdV^a*VCb* ziAIZN8ZV+Al1^|2*^NeM#zO2+o|_Y|+Z`%mfeT!~Gy+K{JpkA(5QN*IR|Gz)-LD== z>x>C{d9;EFH0n`ori41IAjO%z*bnmC1Kic@K>INd|fdG-jjo-j!b z%pZs${4D1XE_H^$R+Y4e0By&r%+_{LWrWObcL;KOmwK)QHvy6ODR4d)IR6Yd{~S1< z51cOm&KCmbi-7aRbh!A12iK|DxLUyV=Q(lx0&Kucdp0IHC71h^6i7(c^8mY0%j%1_ z)1h_&Ti_O=07SS`0I-X--rh-nO3Git4$|rU@=8JX%WD*2NnW2Cy{phuwtyx_rh1dI@@q}%KPqLa7>>*ij{M_*}Fd#2jHC1=|&IIFgn+dfAm<*n`V4$RCQf1rFeO5|NI z7q-(8crEWp%DY{Q3W%^=Ov?M%{*XIhe=JwK@AaT;d0OiX>KN+o zk*5JthpdA@?T*>NJyu`bW;LyJYTvc$!Ny_nSEz$;E(gfpTx5%_zm)OY5Z*~4_ z8@9Jy?n^UGU%gxSmQ3*-7;`TT6W;^dA3T_qJB)+=_|_H{J_rvwt`3aDWQb^lM18qX z$)tiYPp=lLfc^AF4?F$3Pz969!n?hND&Ky3xj^+wssf-@ujR4o%a1$MfTTK@pHxx} z=Eim_eAt#$qwxIlZiStx{rtvmHO75@d$$_vKEJm%=^_; zNsrL8!1YKCli{SAwnxpZE$L8|Ni~;&SV)&A)qGU{dbc{3aafG!y}MP7^Q@L6)iU!z zxL+8ZuWfYprn*wtsfrazRhyo-MnoD&nlOERR4Dy4NCs#)E(#kbgH$eY)3EGL3vnsf za@mXOWp9e%2Cyx%kj|BT=rY-tu9N-fPFX~s$N@shgG7H>A%@6lqD&qoD&!2YQqB}% zIV-*FM5D_G>Uekd;Vr`lU*N=bB|Fs#Np<2L)xhI!OsX{)$L^$BmsHJrRGfirNwopR zHYe4VJ?cz`oRw72>Eir7>RitLJgLq@_M$!NBFAeZKxf+VcQIb?QC)I69bvJ75M((~{YG+b);NATNYEPkhaF=>GsUBlO zpz7kJdJ+i)>UflR3JpKqg+wn+s^_-jHZ7ztZio0qX>|WIZxOcOveT{VB}e)$z}NL8 z-=qQZEgCG}rV{xsO_uM`EcreiEB{3y`2jV_e^VTiV~hL*bN?w_BtN4|<$vf3`8jQq zU(mJkOS(aRMYqduG{uV1HsQt%+kLow69DHC1 zxUpo~0m;Pt5M@HTTj;T%02^Hx$SdrE1Qo!~>J?|{JOsz*{pwXk*ux)g*Rw4+81>op zmgTI+JYnl2EzRU!DDm$>i65{E_E9sWRoZ%q+9Pvy(czOoL0p1l<1Z&bn(+qc6fgca zs3WjfcaU)hFfarAHy{zt7GfX|P1}?=?0X&+AQ0b53B-5wla?C3PEtcn@aKR9a=?0K zRNhW6cuDqn4pf(QiRv;Bs*u=_&n&y&E>!Q?PeA{l_S5@?>I3`f!$S3M`{|QH^|5}+ z919H#!|xkYA>{ z(`~8;?Na&lpz2AlBmG$Qrmx}cm8wwS))vuM^%cdcpD0oN#WY;kvRDlexPnD&Q3s{@ zUYz3aeLhW6pTego;J0+1G{@lblD*hQ4*8Z6dtu8V-3r$G%;g_!(Yv!gr5$WYXeZbB zZPbG^u!G@E(gv{lk2ZiWVYd>$Vo!kjqFTX!G`)1tgaY+-Qhm!}0+|l=!vZ95Z9xHe zBL`#HX=Vow?pK=qq!?8C&<*<@;dYo?Kf{u9xOK&#&fJRP+@{L{X{wjQyFsd$`m00f zP&Jr_sv)5KP&!-T&VWX~0qK3vy1dS&u}w%j97;~4(+pv- z*I_cv(KMA*O~VZZ7mq@`?@+_QlYwtvY&uJa&Vl~jzNZ4eVT!3TIOH4bizRhUy0!I##*TXq^Z>buTG^~4pg)J4dVXP+L;+cumLrtPSYI1tc zVXN7)j%bk46S&~K0`)L@VfJlYAmK3SJs{R3?$)vqP?bO#!<0VlNHu!1?tlh>?kF${ zZ4FXwzv}CK)!%+KKgX*9_NxVZj6vWEbzje(9mc`s24@S5L+u=_6Jtne(inzxBvM#; z>I5##n#UM}`GkUUb45mxnKZ_OB-fz${k>Fq$ z;FY!A?Kki-T%2A!kK!NUAXQESRRv8^M_{2GNhhjl6jjq{gPK97shME8kMjcHrt7GU5RZZ`!`SgieKwqhav=5i^_|>r@Uo92`R1NNqSR%%$ zrJ_PDgD6`r=HY6c#i~}UQY#_SjuS1oKWCFVUYwy$5I<9^#U<)Qag_>*>s6h&4F@ED zqZ-6RDlDE28-ws4(RXxt5q942iMXc23lN;} zcoK|dV~CM7R_rlqYYUCzb{WSrq{FDME-f?~lg8T8{G_pdj}gsy+cJN2p>a~uh>z}( zG&bxpHrI9-TNZ#NPca@ePOVj=9b+1h(|Nk=AnsUv=uYY++*cH*0V)A`*G9wDM##EN zbd=f*dA9}f?i4yfol14;G%YnsY&0Fx44^9GC&pP23x`vwakg;|TCS#k#!roNK^h51 zk2^p}DqZuq90S9M*4m@XH86}QZjbJO2d15J>MW?uv#B5A(Fdz@X`K2QO;$grBh>jA z*afsqT}Ug{MV>(&=M1WMYEa`+gQ`poiVXHCYJ<=CEd~XHN!?MBG=5%Noir}E6T~Ha zgaQ(q_ny5E=|J<*_Aii*gqXe_%kE@4#KfTY`oy59!uaskFP8?ZYCn4S%Izy>^|8+`*G z_)B;F1b|Ku%s?;?@?UgAQegbi&gARNGx+5#jDhCpRlB)A>*k&V;AI=|d0Y$CPG%}(S0=Eh~dllw?_^|6!t zROdc(a-Zwm7f$X=o%_nkeWP>VI=Q_%_q~(b$2pVioGEoqIXS3myz@D^fX?MPxo$dV zIXOrJlyvYkd+A(n=Ut)B^>K3jbgsXX8=!Lo)4J+)eC18*7c@;>M#rdMLLOXBwdzW0 zR9DeSYAYqw)pVx12Kwqc`jxt#?p8O@!|F!(I&Pvj)y?!Db&F8yR#Avcm4>O?#1wpB zI2ZROtx$K0E7V-3uLapV+H*$e{X-?5}pp;i_Fuf^TuA>X3`z z={-T+FPqeExkv4hPpSvy%jzNdu6kI0t{zcB{Z{3xN7X^Nxu{hAUQJbxsk!QLwGoCWa`-}W4X^t=Q3J^7*;~3-lQXF3g<>nF;|(# zgQ`c;N#+UWYN(5&slnuPcs~3KQMG2stV49-JQ`}&n++6ze}NtCTDc&YVq5vIv-{r+ zYnP1JR$#8du4zEhTni^0XPdO;?Pd*l-p%G+=1J)S2^6?FX||;xavZCxRMy&?*!?%T76BiQsfJ(&t;EXJv0QlC?v`VzaauV{q&nx?96ut>j! z!u}4kwU;)j@99GI16`x`(QUAs?lc5-U|01h_EV1=COu{N=vl*0uNVP(&FJP)@~=BH zcN;1567v_JbqDo!o}Qut9saO)K1F1FM|bX}ZhrHkeF#qLm^a743-F=XrKxH9%AO{1 zke;T?Fio9E1oxdL(UmrdbQUDK(k4;Tyb2W2Gn+K8Za1%SavOB+S|`_}bJsh$1aiB~ z8{5rWZGiEZ2HeI6({x)1{&8EscFJ$jxqIwxHX>6y-!)d|@$&g-T>mY@gN#Y(na96_W}EXvG4ngkcFg=lddYqg zc^NZ5l!7DlyzkgcS7}+9m-j9C_OW}94?fsTAo&Vvd#%FYv)AfDteZ=*=bb-VK?)|9 zmw?B|wwu?xfg{`S){Z*ka14Gb^)$*sfC_BCkI={#qbVG%NC}vOBp>(XMN(+)Hupfl z2=jqd$J3C91xh{yL(J>bqEMe?Fs74f%+RgcaXxoPgYr(RLg9iwXApd-oCO*7+2-}^ zKkyv&G%9s7TA^TrV^dNf;OJ5y1CeX85t#=>s`ihF#6PEz1CeX85vk6F2;9Co5xF)S zkwrknK8w>OMfl3=9Ee<-jmVN*h?ozW4>^@*U?O>H@=D;!z70z?8aaR_nc+a?`IK}*3?g{#JHX>_*NTf?dcp(S_cP@2C#Qb$OMVdSm zNg=}jW`R>VO%VhV$7Una0z^*QKO%gEL}x_g*la`+xezgbpR2O@Sa#)2IV-0{k9QR2 zW7(rP1*14M_bB*NdlEeZ<`d?V&M5e>w<7^$eHJ3PJc#|9;Am8N%KW2KWjG+V02_)E7?&dvDH-FAuCy`y}pPo9;A|zyoaMHtp zJbf;^&YwMXUdUNT9+F+>Sx=o8&6hfppcB84eQ?31^j~sSF`vtx94}@s=c*zP$*$r> z?62l4IS|{IRYge8SpH`6DGCmIdALSYWmTb%JXQW~zSg;lIw8Btd7dh-=VBV+&t{rk zo+@v^v6zimhxw1Jd6D0xss#D7NTAnZp zG(KA0U(@+Hn(lXiP2<~Fr|G#!nIPRtlD@*++&0bAXg3TTn_LgKF{HmH1wNkbve8Z~ zanyk{O3F6?xJlnYAH3E$Ih^Mk0@yI$NZ%;^RN@=s8>^qnd=q>V_0uHZVZOul(^TIP zz9aS1G~W#0O#L*=H^(ka$NCndhgL+WW+KI(YH-rHlb-3M=Q=5W zQH4LaZS` diff --git a/bin/application/application.css b/bin/application/application.css deleted file mode 100644 index 83d6f33..0000000 --- a/bin/application/application.css +++ /dev/null @@ -1 +0,0 @@ -/* JavaFX CSS - Leave this comment until you have at least create one rule which uses -fx-Property */ \ No newline at end of file diff --git a/src/application/Main.java b/src/application/Main.java index b853e3a..b40c599 100644 --- a/src/application/Main.java +++ b/src/application/Main.java @@ -128,7 +128,7 @@ public class Main extends Application { mainWindowController.addDataUI(); Scene scene = new Scene(pane); //create new scene, append pane to scene - + scene.getStylesheets().add(Main.class.getResource("MainWindow.css").toExternalForm()); primaryStage.setScene(scene); //append scene to stage primaryStage.show(); //show stage } catch (IOException e) { diff --git a/src/application/MainWindow.css b/src/application/MainWindow.css new file mode 100644 index 0000000..cb1165b --- /dev/null +++ b/src/application/MainWindow.css @@ -0,0 +1,4 @@ +.jfx-hamburgerW StackPane { -fx-background-color: white; + -fx-background-radius: 5px; } +.jfx-hamburgerB StackPane { -fx-background-color: black; + -fx-background-radius: 5px; } \ No newline at end of file diff --git a/src/application/MainWindow.fxml b/src/application/MainWindow.fxml index 12ceeba..032c390 100644 --- a/src/application/MainWindow.fxml +++ b/src/application/MainWindow.fxml @@ -2,9 +2,11 @@ + + @@ -46,10 +48,14 @@ - + + + + + - + @@ -86,16 +92,23 @@ - - - - diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index 7004377..37b237e 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -42,9 +42,11 @@ import java.util.Properties; import java.util.ResourceBundle; import com.jfoenix.controls.JFXButton; import com.jfoenix.controls.JFXColorPicker; +import com.jfoenix.controls.JFXHamburger; import com.jfoenix.controls.JFXSlider; import com.jfoenix.controls.JFXTextField; import com.jfoenix.controls.JFXToggleButton; +import com.jfoenix.transitions.hamburger.HamburgerBackArrowBasicTransition; import javafx.animation.FadeTransition; import javafx.animation.ParallelTransition; @@ -72,6 +74,7 @@ import javafx.scene.control.TreeTableColumn.SortType; import javafx.scene.control.TreeTableView; import javafx.scene.image.Image; import javafx.scene.image.ImageView; +import javafx.scene.input.MouseEvent; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.GridPane; import javafx.scene.layout.HBox; @@ -103,8 +106,6 @@ public class MainWindowController { @FXML ScrollPane scrollPane; @FXML - private JFXButton menubtn; //TODO switch to hamburger menu - @FXML private JFXButton playbtn; @FXML private JFXButton openfolderbtn; @@ -129,6 +130,8 @@ public class MainWindowController { @FXML private JFXButton streamingDirectoryBtn; @FXML + private JFXHamburger menuHam; + @FXML private JFXToggleButton autoupdateBtn; @FXML public JFXTextField tfPath; @@ -143,13 +146,20 @@ public class MainWindowController { @FXML public JFXSlider sliderFontSize; @FXML - private Label versionlbl; + private Label versionLabel; @FXML - private Label sizelbl; + private Label fontsizeLabel; @FXML - private Label aulbl; + private Label autoUpdateLabel; + @FXML + private Label settingsHead1Label; + @FXML + private Label mainColorLabel; + @FXML + private Label localLabel; @FXML ImageView image1; + private ImageView imv1; @FXML @@ -176,14 +186,14 @@ public class MainWindowController { @FXML private TableColumn dataNameEndColumn = new TableColumn<>("Datei Name mit Endung"); - private boolean menutrue = false; //saves the position of menuBtn (opened or closed) - private boolean settingstrue = false; + private boolean menuTrue = false; //saves the position of menuBtn (opened or closed) + private boolean settingsTrue = false; private boolean streamingSettingsTrue = false; private boolean autoUpdate = false; static boolean firststart = false; private int hashA = -2055934614; private String version = "0.5.1"; - private String buildNumber = "127"; + private String buildNumber = "129"; private String versionName = "plasma cow"; private File dirWin = new File(System.getProperty("user.home") + "/Documents/HomeFlix"); private File dirLinux = new File(System.getProperty("user.home") + "/HomeFlix"); @@ -239,8 +249,6 @@ public class MainWindowController { ObservableList localFilms = FXCollections.observableArrayList(); ObservableList streamingFilms = FXCollections.observableArrayList(); ObservableList streamingData = FXCollections.observableArrayList(); - private ImageView menu_icon_black = new ImageView(new Image("resources/icons/menu_icon_black.png")); - private ImageView menu_icon_white = new ImageView(new Image("resources/icons/menu_icon_white.png")); private ImageView skip_previous_white = new ImageView(new Image("resources/icons/ic_skip_previous_white_18dp_1x.png")); private ImageView skip_previous_black = new ImageView(new Image("resources/icons/ic_skip_previous_black_18dp_1x.png")); private ImageView skip_next_white = new ImageView(new Image("resources/icons/ic_skip_next_white_18dp_1x.png")); @@ -258,30 +266,6 @@ public class MainWindowController { private apiQuery ApiQuery; DBController dbController; - /** - * TODO change value of Text-color change - */ - @FXML - private void menubtnclicked(){ - if(menutrue == false){ - sideMenuSlideIn(); - menutrue = true; - }else{ - sideMenuSlideOut(); - menutrue = false; - } - if(settingstrue == true){ - settingsAnchor.setVisible(false); - setPath(tfPath.getText()); - saveSettings(); - settingstrue = false; - } - if(streamingSettingsTrue == true){ - streamingSettingsAnchor.setVisible(false); - streamingSettingsTrue = false; - } - } - @FXML private void playbtnclicked(){ System.out.println(System.getProperty("os.name")); @@ -367,18 +351,18 @@ public class MainWindowController { @FXML private void settingsBtnclicked(){ - if(settingstrue == false){ + if(settingsTrue == false){ if(streamingSettingsTrue == true){ streamingSettingsAnchor.setVisible(false); streamingSettingsTrue = false; } settingsAnchor.setVisible(true); - settingstrue = true; + settingsTrue = true; }else{ settingsAnchor.setVisible(false); setPath(tfPath.getText()); saveSettings(); - settingstrue = false; + settingsTrue = false; } } @@ -388,9 +372,9 @@ public class MainWindowController { @FXML private void streamingSettingsBtnclicked(){ if(streamingSettingsTrue == false){ - if(settingstrue == true){ + if(settingsTrue == true){ settingsAnchor.setVisible(false); - settingstrue = false; + settingsTrue = false; } streamingSettingsAnchor.setVisible(true); streamingSettingsTrue = true; @@ -415,8 +399,8 @@ public class MainWindowController { settingsAnchor.setVisible(false); streamingSettingsAnchor.setVisible(false); sideMenuSlideOut(); //disables side-menu - menutrue = false; - settingstrue = false; + menuTrue = false; + settingsTrue = false; streamingSettingsTrue = false; } @@ -581,6 +565,32 @@ public class MainWindowController { //Initializing the actions void initActions(){ + HamburgerBackArrowBasicTransition burgerTask = new HamburgerBackArrowBasicTransition(menuHam); + menuHam.addEventHandler(MouseEvent.MOUSE_PRESSED, (e)->{ + if(menuTrue == false){ + sideMenuSlideIn(); + burgerTask.setRate(1.0); + burgerTask.play(); + menuTrue = true; + }else{ + sideMenuSlideOut(); + burgerTask.setRate(-1.0); + burgerTask.play(); + menuTrue = false; + } + if(settingsTrue == true){ + settingsAnchor.setVisible(false); + setPath(tfPath.getText()); + saveSettings(); + settingsTrue = false; + } + if(streamingSettingsTrue == true){ + streamingSettingsAnchor.setVisible(false); + streamingSettingsTrue = false; + } + + }); + tfsearch.textProperty().addListener(new ChangeListener() { @Override public void changed(ObservableValue observable,String oldValue, String newValue) { @@ -850,7 +860,7 @@ public class MainWindowController { playbtn.setGraphic(play_arrow_white); returnBtn.setGraphic(skip_previous_white); forwardBtn.setGraphic(skip_next_white); - menubtn.setGraphic(menu_icon_white); + menuHam.getStyleClass().add("jfx-hamburgerW"); }else{ settingsBtn.setStyle("-fx-text-fill: BLACK;"); streamingSettingsBtn.setStyle("-fx-text-fill: BLACK;"); @@ -867,7 +877,7 @@ public class MainWindowController { playbtn.setGraphic(play_arrow_black); returnBtn.setGraphic(skip_previous_black); forwardBtn.setGraphic(skip_next_black); - menubtn.setGraphic(menu_icon_black); + menuHam.getStyleClass().add("jfx-hamburgerB"); } if(mode.equals("local")){ @@ -934,9 +944,12 @@ public class MainWindowController { updateBtn.setText(bundle.getString("checkUpdates")); directoryBtn.setText(bundle.getString("chooseFolder")); streamingDirectoryBtn.setText(bundle.getString("chooseFolder")); - sizelbl.setText(bundle.getString("fontSize")); - aulbl.setText(bundle.getString("autoUpdate")); - versionlbl.setText(bundle.getString("version")+" "+version+" (Build: "+buildNumber+")"); + settingsHead1Label.setText(bundle.getString("settingsHead1Label")); + mainColorLabel.setText(bundle.getString("mainColorLabel")); + fontsizeLabel.setText(bundle.getString("fontsizeLabel")); + localLabel.setText(bundle.getString("localLabel")); + autoUpdateLabel.setText(bundle.getString("autoUpdateLabel")); + versionLabel.setText(bundle.getString("version")+" "+version+" (Build: "+buildNumber+")"); columnTitel.setText(bundle.getString("columnName")); columnRating.setText(bundle.getString("columnRating")); columnStreamUrl.setText(bundle.getString("columnStreamUrl")); diff --git a/src/application/application.css b/src/application/application.css deleted file mode 100644 index 83d6f33..0000000 --- a/src/application/application.css +++ /dev/null @@ -1 +0,0 @@ -/* JavaFX CSS - Leave this comment until you have at least create one rule which uses -fx-Property */ \ No newline at end of file diff --git a/src/resources/HomeFlix-Local_de_DE.properties b/src/resources/HomeFlix-Local_de_DE.properties index 24bfba5..aa9c214 100644 --- a/src/resources/HomeFlix-Local_de_DE.properties +++ b/src/resources/HomeFlix-Local_de_DE.properties @@ -1,24 +1,35 @@ -# HomeFlix-Local_de_DE.properties German Local +#HomeFlix-Local_de_DE.properties German Local + +#main window translations info = Info settings = Einstellungen streamingSettings = Stream Einst. -tfPath = Pfad... tfSearch = Suche... openFolder = Ordner \u00F6ffnen + +#settings translations +settingsHead1Label = HomeFlix Einstellungen +tfPath = Pfad... chooseFolder = Ordner ausw\u00E4hlen -fontSize = Schriftgr\u00F6\u00DFe: +mainColorLabel = Hauptfarbe: +fontsizeLabel = Schriftgr\u00F6\u00DFe: +localLabel = Sprache: checkUpdates = Auf Update pr\u00FCfen checkingUpdates = Es wird nach Updates gesucht... updateBtnavail = Update verf\u00FCgbar updateBtnNotavail = Kein Update verf\u00FCgbar -autoUpdate = beim Start nach Updates suchen: +autoUpdateLabel = beim Start nach Updates suchen: version = Version: + +#column translations columnName = Name columnRating = Bewertung columnStreamUrl = Datei Name columnResolution = Aufl\u00F6sung columnSeason = Staffel columnYear = Jahr + +#error translations errorUpdateV = Beim ausf\u00FChren des Updates ist ein Fehler aufgetreten! \nError: could not check update version (nvc)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz errorUpdateD = Beim ausf\u00FChren des Updates ist ein Fehler aufgetreten! \nError: could not download update files (ndf)\nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz errorPlay = Beim \u00F6ffnen der Datei ist ein Fehler aufgetreten! \nError: could not open file (nof) \nWeitere Hilfe erhalten sie unter www.kellerkinder.xyz \noder wenden sie sich an support@kellerkinder.xyz @@ -29,6 +40,8 @@ errorSave = Beim speichern der Einstellungen ist ein Fehler aufgetreten! noFilmFound = Kein Film mit diesem Titel gefunden! vlcNotInstalled = Um einen Film abspielen wird der VLC Media Player ben\u00F6tigt! infoText = \nMaintainer: seilo@kellerkinder.xyz und \nhendrik.schutter@coptersicht.de \n(c) 2016-2017 Kellerkinder www.kellerkinder.xyz + +#textFlow translations title = Titel year = Jahr rating = Einstufung @@ -45,5 +58,6 @@ awards = Auszeichnungen metascore = Metascore imdbRating = IMDB-Bewertung type = Type + firstStartHeader = Es ist kein Stammverzeichnis f\u00FCr Filme angegeben! firstStartContent = Stammverzeichniss angeben? diff --git a/src/resources/HomeFlix-Local_en_US.properties b/src/resources/HomeFlix-Local_en_US.properties index 379c88f..d166f04 100644 --- a/src/resources/HomeFlix-Local_en_US.properties +++ b/src/resources/HomeFlix-Local_en_US.properties @@ -1,24 +1,35 @@ -# HomeFlix-Local_en_US.properties US-English Local and default +#HomeFlix-Local_en_US.properties US-English Local and default + +#main window translations info = Info settings = Settings streamingSettings = Stream Settings -tfPath = Path... tfSearch = Search... openFolder = open Folder + +#settings translations +settingsHead1Label = HomeFlix Settings +tfPath = Path... chooseFolder = choose Directory -fontSize = font size: +mainColorLabel = main color: +fontsizeLabel = font size: +localLabel = local: checkUpdates = check for updates checkingUpdates = checking for updates... updateBtnavail = update available updateBtnNotavail = no update available -autoUpdate = check at startup for updates: +autoUpdateLabel = check at startup for updates: version = Version: + +#column translations columnName = Name columnRating = Rating columnStreamUrl = File Name columnResolution = Resolution columnSeason = Season columnYear = Year + +#error translations errorUpdateV = An error has occurred during update! \nError: could not check update version (nvc) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz errorUpdateD = An error has occurred during update! \nError: could not download update files (ndf) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz errorPlay = An error has occurred during opening the file! \nError: could not open file (nof) \nTo get help, visit www.kellerkinder.xyz \nor contcat support@kellerkinder.xyz @@ -29,6 +40,8 @@ errorSave = An error occurred while saving the settings! noFilmFound = No film with this title found! vlcNotInstalled = VLC Media Player is required to play a movie! infoText = \nMaintainer: seilo@kellerkinder.xyz and \nhendrik.schutter@coptersicht.de \n(c) 2016-2017 Kellerkinder www.kellerkinder.xyz + +#textFlow translations title = Title year = Year rating = Rating @@ -45,5 +58,6 @@ awards = Awards metascore = Metascore imdbRating = IMDB-Rating type = Type + firstStartHeader = There is no root directory for movies! firstStartContent = Specify a root directory?